From: Peter Colberg Date: Sat, 16 Jul 2016 20:12:01 +0000 (-0400) Subject: Imported Upstream version 2.0.1 X-Git-Tag: archive/raspbian/2.11.3-2+rpi1^2~10^2~14 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=67bd2dfc2cb43f3fdd410d921087c1974a12c471;p=utf8proc.git Imported Upstream version 2.0.1 --- diff --git a/.travis.yml b/.travis.yml index 0ebbe34..b871b47 100644 --- 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 ff0c819..8958bcd 100644 --- 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 f79d541..0be40e0 100644 --- 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 ff5e771..1179748 100644 --- 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 d39d85a..ec8108e 100644 --- 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 40372c2..cb9f694 100644 --- 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 f0ca831..c41f601 100644 --- 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 b479750..ba5143a 100644 --- 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 af4c81d..42ab25d 100644 --- 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