Imported Upstream version 2.0.1

diff --git a/.travis.yml b/.travis.yml
index 0ebbe34df8db5bd527807ed583c5bb65b8e88525..b871b47f3944eb626a2dba1eba579bae408cbbb9 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,4 +19,4 @@ script:
 env:
     # use JuliaLang caching (https://github.com/staticfloat/cache.julialang.org)
     # so that Travis builds do not depend on anyone's flaky servers but our own
-    - URLCACHE=https://cache.julialang.org/
+    - URLCACHE=https://cache.julialang.org/ CFLAGS="-O2 -Werror"

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ff0c819a3c302a2656fbefa94e1717395b5b7886..8958bcd2cbbea88b0ed12fac0257a7d24fb643a8 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,7 +9,7 @@ project (utf8proc C)
 # Be sure to also update these in Makefile!
 set(SO_MAJOR 2)
 set(SO_MINOR 0)
-set(SO_PATCH 0)
+set(SO_PATCH 1)
 
 add_definitions (
   -DUTF8PROC_EXPORTS

diff --git a/MANIFEST b/MANIFEST
index f79d541d9da4fd52e6af209fc15b8d6c8af950d1..0be40e0c80c39ad92be575958b9db92440124e9c 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -2,6 +2,6 @@ include/
 include/utf8proc.h
 lib/
 lib/libutf8proc.a
-lib/libutf8proc.so -> libutf8proc.so.2.0.0
-lib/libutf8proc.so.2 -> libutf8proc.so.2.0.0
-lib/libutf8proc.so.2.0.0
+lib/libutf8proc.so -> libutf8proc.so.2.0.1
+lib/libutf8proc.so.2 -> libutf8proc.so.2.0.1
+lib/libutf8proc.so.2.0.1

diff --git a/Makefile b/Makefile
index ff5e77142b9c25b8afb3dc15f6bba5a0dea9fac8..117974809d32801ff1b3d3beb6740ec91a4511f3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,7 @@ UCFLAGS = $(CFLAGS) $(PICFLAG) $(C99FLAG) $(WCFLAGS) -DUTF8PROC_EXPORTS
 # Be sure to also update these in MANIFEST and CMakeLists.txt!
 MAJOR=2
 MINOR=0
-PATCH=0
+PATCH=1
 
 OS := $(shell uname)
 ifeq ($(OS),Darwin) # MacOS X

diff --git a/NEWS.md b/NEWS.md
index d39d85a7c1ac96e2ac40c44b1c4d567231b48cca..ec8108e058059c4ba0751c455d329ffeea938608 100644 (file)
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,5 +1,14 @@
 # utf8proc release history #
 
+## Version 2.0.1 ##
+
+2016-07-13:
+
+- Bug fix in `utf8proc_grapheme_break_stateful` ([#77]).
+
+- Tests now use versioned Unicode files, so they will no longer
+  break when a new version of Unicode is released ([#78]).
+
 ## Version 2.0 ##
 
 2016-07-13:
@@ -254,3 +263,5 @@ Release of version 1.0.1
 [#66]: https://github.com/JuliaLang/utf8proc/issues/66
 [#68]: https://github.com/JuliaLang/utf8proc/issues/68
 [#70]: https://github.com/JuliaLang/utf8proc/issues/70
+[#77]: https://github.com/JuliaLang/utf8proc/issues/77
+[#78]: https://github.com/JuliaLang/utf8proc/issues/78

diff --git a/README.md b/README.md
index 40372c2b2e51cd22a44d27aafa60fad48ea5648c..cb9f69478dfcae0f68afb3439efb721f5450ef09 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
 # utf8proc
-[![Build Status](https://travis-ci.org/JuliaLang/utf8proc.png)](https://travis-ci.org/JuliaLang/utf8proc)
+[![Travis CI Status](https://travis-ci.org/JuliaLang/utf8proc.png)](https://travis-ci.org/JuliaLang/utf8proc)
+[![AppVeyor Status](https://ci.appveyor.com/api/projects/status/aou20lfkyhj8xbwq/branch/master?svg=true)](https://ci.appveyor.com/project/tkelman/utf8proc/branch/master)
+
 
 [utf8proc](http://julialang.org/utf8proc/) is a small, clean C
 library that provides Unicode normalization, case-folding, and other

diff --git a/data/Makefile b/data/Makefile
index f0ca83129a51cb24ed0954b18c472101266707bb..c41f6016f59429b16b9caa3948c7725322376a49 100644 (file)
--- a/data/Makefile
+++ b/data/Makefile
@@ -34,29 +34,32 @@ unifont_upper.ttf:
 CharWidths.txt: charwidths.jl unifont.sfd unifont_upper.sfd EastAsianWidth.txt
        $(JULIA) charwidths.jl > $@
 
+# Unicode data version
+UNICODE_VERSION=9.0.0
+
 UnicodeData.txt:
-       $(CURL) $(CURLFLAGS) -o $@ -O $(URLCACHE)http://www.unicode.org/Public/UNIDATA/UnicodeData.txt
+       $(CURL) $(CURLFLAGS) -o $@ -O $(URLCACHE)http://www.unicode.org/Public/$(UNICODE_VERSION)/ucd/UnicodeData.txt
 
 EastAsianWidth.txt:
-       $(CURL) $(CURLFLAGS) -o $@ -O $(URLCACHE)http://www.unicode.org/Public/UNIDATA/EastAsianWidth.txt
+       $(CURL) $(CURLFLAGS) -o $@ -O $(URLCACHE)http://www.unicode.org/Public/$(UNICODE_VERSION)/ucd/EastAsianWidth.txt
 
 GraphemeBreakProperty.txt:
-       $(CURL) $(CURLFLAGS) -o $@ -O $(URLCACHE)http://www.unicode.org/Public/UCD/latest/ucd/auxiliary/GraphemeBreakProperty.txt
+       $(CURL) $(CURLFLAGS) -o $@ -O $(URLCACHE)http://www.unicode.org/Public/$(UNICODE_VERSION)/ucd/auxiliary/GraphemeBreakProperty.txt
 
 DerivedCoreProperties.txt:
-       $(CURL) $(CURLFLAGS) -o $@ -O $(URLCACHE)http://www.unicode.org/Public/UNIDATA/DerivedCoreProperties.txt
+       $(CURL) $(CURLFLAGS) -o $@ -O $(URLCACHE)http://www.unicode.org/Public/$(UNICODE_VERSION)/ucd/DerivedCoreProperties.txt
 
 CompositionExclusions.txt:
-       $(CURL) $(CURLFLAGS) -o $@ -O $(URLCACHE)http://www.unicode.org/Public/UNIDATA/CompositionExclusions.txt
+       $(CURL) $(CURLFLAGS) -o $@ -O $(URLCACHE)http://www.unicode.org/Public/$(UNICODE_VERSION)/ucd/CompositionExclusions.txt
 
 CaseFolding.txt:
-       $(CURL) $(CURLFLAGS) -o $@ -O $(URLCACHE)http://www.unicode.org/Public/UNIDATA/CaseFolding.txt
+       $(CURL) $(CURLFLAGS) -o $@ -O $(URLCACHE)http://www.unicode.org/Public/$(UNICODE_VERSION)/ucd/CaseFolding.txt
 
 NormalizationTest.txt:
-       $(CURL) $(CURLFLAGS) -o $@ -O $(URLCACHE)http://www.unicode.org/Public/UNIDATA/NormalizationTest.txt
+       $(CURL) $(CURLFLAGS) -o $@ -O $(URLCACHE)http://www.unicode.org/Public/$(UNICODE_VERSION)/ucd/NormalizationTest.txt
 
 GraphemeBreakTest.txt:
-       $(CURL) $(CURLFLAGS) $(URLCACHE)http://www.unicode.org/Public/UCD/latest/ucd/auxiliary/GraphemeBreakTest.txt | $(PERL) -pe 's,÷,/,g;s,×,+,g' > $@
+       $(CURL) $(CURLFLAGS) $(URLCACHE)http://www.unicode.org/Public/$(UNICODE_VERSION)/ucd/auxiliary/GraphemeBreakTest.txt | $(PERL) -pe 's,÷,/,g;s,×,+,g' > $@
 
 clean:
        rm -f UnicodeData.txt EastAsianWidth.txt GraphemeBreakProperty.txt DerivedCoreProperties.txt CompositionExclusions.txt CaseFolding.txt NormalizationTest.txt GraphemeBreakTest.txt CharWidths.txt unifont*.ttf unifont*.sfd

diff --git a/utf8proc.c b/utf8proc.c
index b479750d5a3b2baf9edd40973a3c419285bfa6eb..ba5143a22290bc9ce5b93c3f70d782fb44f84073 100644 (file)
--- a/utf8proc.c
+++ b/utf8proc.c
@@ -287,7 +287,7 @@ static utf8proc_bool grapheme_break_extended(int lbc, int tbc, utf8proc_int32_t
   int lbc_override = lbc;
   if (state && *state != UTF8PROC_BOUNDCLASS_START)
     lbc_override = *state;
-  utf8proc_bool break_permitted = grapheme_break_simple(lbc, tbc);
+  utf8proc_bool break_permitted = grapheme_break_simple(lbc_override, tbc);
   if (state) {
     // Special support for GB 12/13 made possible by GB999. After two RI
     // class codepoints we want to force a break. Do this by resetting the

diff --git a/utf8proc.h b/utf8proc.h
index af4c81d215d2ee975149cbe2640b20eeeecd95c1..42ab25d34f8685c436cc5e8518a9f038146d6c73 100644 (file)
--- a/utf8proc.h
+++ b/utf8proc.h
@@ -72,7 +72,7 @@
 /** The MINOR version number (increased when new functionality is added in a backwards-compatible manner). */
 #define UTF8PROC_VERSION_MINOR 0
 /** The PATCH version (increased for fixes that do not change the API). */
-#define UTF8PROC_VERSION_PATCH 0
+#define UTF8PROC_VERSION_PATCH 1
 /** @} */
 
 #include <stdlib.h>