From 44e1f0d3a008f7d6b1c04bbf9553bb06d2c2fed9 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Sat, 15 Sep 2012 11:11:18 +0200 Subject: [PATCH] [autofit] Correct previous Unicode 6.1.0 change. The auto-hinter's latin module only handles latin ligatures in the `Alphabetical Presentation Forms' block. * src/autofit/aflatin.c (af_latin_uniranges): Fix it. --- ChangeLog | 9 +++++++++ include/freetype/ftautoh.h | 9 ++++++--- src/autofit/aflatin.c | 2 +- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 38ee19a56..5081c33b5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2012-09-15 Werner Lemberg + + [autofit] Correct previous Unicode 6.1.0 change. + + The auto-hinter's latin module only handles latin ligatures in the + `Alphabetical Presentation Forms' block. + + * src/autofit/aflatin.c (af_latin_uniranges): Fix it. + 2012-09-15 Werner Lemberg * src/autofit/afmodule.c: s/FT_Err_/AF_Err_/. diff --git a/include/freetype/ftautoh.h b/include/freetype/ftautoh.h index 593c18f21..b04f8fc43 100644 --- a/include/freetype/ftautoh.h +++ b/include/freetype/ftautoh.h @@ -130,8 +130,8 @@ FT_BEGIN_HEADER * assigned to this submodule. * * { - * U+0020 - U+007F // Basic Latin (no control chars) - * U+00A0 - U+00FF // Latin-1 Supplement (no control chars) + * U+0020 - U+007F // Basic Latin (no control characters) + * U+00A0 - U+00FF // Latin-1 Supplement (no control characters) * U+0100 - U+017F // Latin Extended-A * U+0180 - U+024F // Latin Extended-B * U+0250 - U+02AF // IPA Extensions @@ -152,10 +152,12 @@ FT_BEGIN_HEADER * U+2460 - U+24FF // Enclosed Alphanumerics * U+2C60 - U+2C7F // Latin Extended-C * U+2DE0 - U+2DFF // Cyrillic Extended-A + * U+2E00 - U+2E7F // Supplemental Punctuation * U+A640 - U+A69F // Cyrillic Extended-B * U+A720 - U+A7FF // Latin Extended-D - * U+FB00 - U+FB06 // Alphab. Present. Forms (Latin Ligs) + * U+FB00 - U+FB06 // Alphab. Present. Forms (Latin Ligatures) * U+1D400 - U+1D7FF // Mathematical Alphanumeric Symbols + * U+1F100 - U+1F1FF // Enclosed Alphanumeric Supplement * } * * FT_AUTOHINTER_SCRIPT_CJK :: @@ -166,6 +168,7 @@ FT_BEGIN_HEADER * assigned to this submodule. * * { + * U+1100 - U+11FF // Hangul Jamo * U+2E80 - U+2EFF // CJK Radicals Supplement * U+2F00 - U+2FDF // Kangxi Radicals * U+2FF0 - U+2FFF // Ideographic Description Characters diff --git a/src/autofit/aflatin.c b/src/autofit/aflatin.c index 157c06e34..5455e6238 100644 --- a/src/autofit/aflatin.c +++ b/src/autofit/aflatin.c @@ -2396,7 +2396,7 @@ AF_UNIRANGE_REC( 0x2DE0UL, 0x2DFFUL ), /* Cyrillic Extended-A */ AF_UNIRANGE_REC( 0xA640UL, 0xA69FUL ), /* Cyrillic Extended-B */ AF_UNIRANGE_REC( 0xA720UL, 0xA7FFUL ), /* Latin Extended-D */ - AF_UNIRANGE_REC( 0xFB00UL, 0xFB4FUL ), /* Alphab. Present. Forms (Latin Ligs) */ + AF_UNIRANGE_REC( 0xFB00UL, 0xFB06UL ), /* Alphab. Present. Forms (Latin Ligs) */ AF_UNIRANGE_REC( 0x1D400UL, 0x1D7FFUL ), /* Mathematical Alphanumeric Symbols */ AF_UNIRANGE_REC( 0x1F100UL, 0x1F1FFUL ), /* Enclosed Alphanumeric Supplement */ AF_UNIRANGE_REC( 0UL, 0UL )