diff options
Diffstat (limited to '02-upstream-2015.12.05.patch')
| -rw-r--r-- | 02-upstream-2015.12.05.patch | 1098 |
1 files changed, 0 insertions, 1098 deletions
diff --git a/02-upstream-2015.12.05.patch b/02-upstream-2015.12.05.patch deleted file mode 100644 index d75206e149a5..000000000000 --- a/02-upstream-2015.12.05.patch +++ /dev/null @@ -1,1098 +0,0 @@ -From f8c20577897d17fb8a62e64fa3bf3ebec0691608 Mon Sep 17 00:00:00 2001 -From: Alexei Podtelezhnikov <apodtele@gmail.com> -Date: Sat, 28 Nov 2015 22:43:33 -0500 -Subject: [PATCH 2/2] * include/freetype/ftlcdfil.h: Documentation tweak. - ---- - ChangeLog | 4 ++++ - include/freetype/ftlcdfil.h | 5 ++--- - 2 files changed, 6 insertions(+), 3 deletions(-) - -diff --git a/ChangeLog b/ChangeLog -index 31c2ac9..9133021 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,3 +1,7 @@ -+2015-11-28 Alexei Podtelezhnikov <apodtele@gmail.com> -+ -+ * include/freetype/ftlcdfil.h: Documentation tweak. -+ - 2015-11-28 Werner Lemberg <wl@gnu.org> - - * Version 2.6.2 released. -diff --git a/include/freetype/ftlcdfil.h b/include/freetype/ftlcdfil.h -index 653ed36..a9dd3ea 100644 ---- a/include/freetype/ftlcdfil.h -+++ b/include/freetype/ftlcdfil.h -@@ -250,9 +250,8 @@ FT_BEGIN_HEADER - * @description: - * Use this function to override the filter weights selected by - * @FT_Library_SetLcdFilter. By default, FreeType uses the quintuple -- * (0x00, 0x55, 0x56, 0x55, 0x00) for FT_LCD_FILTER_LIGHT, and (0x10, -- * 0x40, 0x70, 0x40, 0x10) for FT_LCD_FILTER_DEFAULT and -- * FT_LCD_FILTER_LEGACY. -+ * (0x00, 0x55, 0x56, 0x55, 0x00) for FT_LCD_FILTER_LIGHT, and (0x08, -+ * 0x4D, 0x56, 0x4D, 0x08) for FT_LCD_FILTER_DEFAULT. - * - * @input: - * library :: --- -2.6.2 -From 5b05bc6638df2cac9622f03338253a720604d1be Mon Sep 17 00:00:00 2001 -From: Werner Lemberg <wl@gnu.org> -Date: Tue, 1 Dec 2015 12:09:02 +0100 -Subject: [PATCH 1/7] [type1] Avoid dangling pointer (#46572). - -* src/type1/t1afm.c (T1_Read_Metrics): Properly reset -`face->afm_data'. ---- - ChangeLog | 7 +++++++ - src/type1/t1afm.c | 2 ++ - 2 files changed, 9 insertions(+) - -diff --git a/ChangeLog b/ChangeLog -index 9133021..a9ce090 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,3 +1,10 @@ -+2015-12-01 Werner Lemberg <wl@gnu.org> -+ -+ [type1] Avoid dangling pointer (#46572). -+ -+ * src/type1/t1afm.c (T1_Read_Metrics): Properly reset -+ `face->afm_data'. -+ - 2015-11-28 Alexei Podtelezhnikov <apodtele@gmail.com> - - * include/freetype/ftlcdfil.h: Documentation tweak. -diff --git a/src/type1/t1afm.c b/src/type1/t1afm.c -index 7a7bf82..883a740 100644 ---- a/src/type1/t1afm.c -+++ b/src/type1/t1afm.c -@@ -248,6 +248,8 @@ - FT_TRACE1(( "T1_Read_Metrics:" - " Freeing previously attached metrics data.\n" )); - T1_Done_Metrics( memory, (AFM_FontInfo)face->afm_data ); -+ -+ face->afm_data = NULL; - } - - if ( FT_NEW( fi ) || --- -2.6.3 - -From 1b740a00761f5f14200d6d60cec8fa416b2fcbde Mon Sep 17 00:00:00 2001 -From: Alexei Podtelezhnikov <apodtele@gmail.com> -Date: Wed, 2 Dec 2015 00:30:57 -0500 -Subject: [PATCH 2/7] Minor rearrangement. - ---- - include/freetype/freetype.h | 32 ++++++++++++++++---------------- - 1 file changed, 16 insertions(+), 16 deletions(-) - -diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h -index 41379ea..f68718d 100644 ---- a/include/freetype/freetype.h -+++ b/include/freetype/freetype.h -@@ -3015,6 +3015,22 @@ FT_BEGIN_HEADER - /* the glyph image format, finding the relevant renderer, and */ - /* invoking it. */ - /* */ -+ /* <InOut> */ -+ /* slot :: A handle to the glyph slot containing the image to */ -+ /* convert. */ -+ /* */ -+ /* <Input> */ -+ /* render_mode :: This is the render mode used to render the glyph */ -+ /* image into a bitmap. See @FT_Render_Mode for a */ -+ /* list of possible values. */ -+ /* */ -+ /* <Return> */ -+ /* FreeType error code. 0~means success. */ -+ /* */ -+ /* <Note> */ -+ /* To get meaningful results, font scaling values must be set with */ -+ /* functions like @FT_Set_Char_Size before calling FT_Render_Glyph. */ -+ /* */ - /* When FreeType outputs a bitmap of a glyph, it really outputs an */ - /* alpha coverage map. If a pixel is completely covered by a */ - /* filled-in outline, the bitmap contains 0xFF at that pixel, meaning */ -@@ -3092,22 +3108,6 @@ FT_BEGIN_HEADER - /* linear blending is done 3~times per pixel: red foreground subpixel */ - /* to red background subpixel and so on for green and blue. */ - /* */ -- /* <InOut> */ -- /* slot :: A handle to the glyph slot containing the image to */ -- /* convert. */ -- /* */ -- /* <Input> */ -- /* render_mode :: This is the render mode used to render the glyph */ -- /* image into a bitmap. See @FT_Render_Mode for a */ -- /* list of possible values. */ -- /* */ -- /* <Return> */ -- /* FreeType error code. 0~means success. */ -- /* */ -- /* <Note> */ -- /* To get meaningful results, font scaling values must be set with */ -- /* functions like @FT_Set_Char_Size before calling FT_Render_Glyph. */ -- /* */ - FT_EXPORT( FT_Error ) - FT_Render_Glyph( FT_GlyphSlot slot, - FT_Render_Mode render_mode ); --- -2.6.3 - -From a415473820fcbf365040cecb1ac2a382c41e825d Mon Sep 17 00:00:00 2001 -From: Werner Lemberg <wl@gnu.org> -Date: Thu, 3 Dec 2015 07:49:46 +0100 -Subject: [PATCH 3/7] * builds/unix/install.mk (install): Remove stale - `ft2build.h'. - ---- - ChangeLog | 4 ++++ - builds/unix/install.mk | 3 +++ - 2 files changed, 7 insertions(+) - -diff --git a/ChangeLog b/ChangeLog -index a9ce090..64cfbc1 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,3 +1,7 @@ -+2015-12-03 Werner Lemberg <wl@gnu.org> -+ -+ * builds/unix/install.mk (install): Remove stale `ft2build.h'. -+ - 2015-12-01 Werner Lemberg <wl@gnu.org> - - [type1] Avoid dangling pointer (#46572). -diff --git a/builds/unix/install.mk b/builds/unix/install.mk -index c7a20a3..fbe2d81 100644 ---- a/builds/unix/install.mk -+++ b/builds/unix/install.mk -@@ -28,8 +28,11 @@ - # installing new files to avoid interferences with files installed by - # previous FreeType versions (which use slightly different locations). - # -+# We also remove `$(includedir)/ft2build.h' for the same reason. -+# - install: $(PROJECT_LIBRARY) - -$(DELDIR) $(DESTDIR)$(includedir)/freetype2 -+ -$(DELETE) $(DESTDIR)$(includedir)/ft2build.h - $(MKINSTALLDIRS) $(DESTDIR)$(libdir) \ - $(DESTDIR)$(libdir)/pkgconfig \ - $(DESTDIR)$(includedir)/freetype2/freetype/config \ --- -2.6.3 - -From 53696f03ce1c0e572609d375a44b348bb6097d30 Mon Sep 17 00:00:00 2001 -From: Werner Lemberg <wl@gnu.org> -Date: Sat, 5 Dec 2015 07:44:16 +0100 -Subject: [PATCH 4/7] * src/autofit/afwarp.c: s/INT_MIN/FT_INT_MIN/. - ---- - ChangeLog | 4 ++++ - src/autofit/afwarp.c | 2 +- - 2 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/ChangeLog b/ChangeLog -index 64cfbc1..51d951a 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,3 +1,7 @@ -+2015-12-05 Werner Lemberg <wl@gnu.org> -+ -+ * src/autofit/afwarp.c: s/INT_MIN/FT_INT_MIN/. -+ - 2015-12-03 Werner Lemberg <wl@gnu.org> - - * builds/unix/install.mk (install): Remove stale `ft2build.h'. -diff --git a/src/autofit/afwarp.c b/src/autofit/afwarp.c -index 59af4f0..ae92db1 100644 ---- a/src/autofit/afwarp.c -+++ b/src/autofit/afwarp.c -@@ -193,7 +193,7 @@ - - warper->best_scale = org_scale; - warper->best_delta = org_delta; -- warper->best_score = INT_MIN; -+ warper->best_score = FT_INT_MIN; - warper->best_distort = 0; - - axis = &hints->axis[dim]; --- -2.6.3 - -From f7e6d51a75fb07685f64d16985363a3b2d79b52f Mon Sep 17 00:00:00 2001 -From: Werner Lemberg <wl@gnu.org> -Date: Sat, 5 Dec 2015 13:08:45 +0100 -Subject: [PATCH 5/7] * src/autofit/afblue.hin (GET_UTF8_CHAR): Use - `do...while(0)'. - -* src/autofit/afblue.h: Regenerated. ---- - ChangeLog | 6 ++++++ - src/autofit/afblue.h | 55 ++++++++++++++++++++++++++------------------------ - src/autofit/afblue.hin | 55 ++++++++++++++++++++++++++------------------------ - 3 files changed, 64 insertions(+), 52 deletions(-) - -diff --git a/ChangeLog b/ChangeLog -index 51d951a..7446c25 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,5 +1,11 @@ - 2015-12-05 Werner Lemberg <wl@gnu.org> - -+ * src/autofit/afblue.hin (GET_UTF8_CHAR): Use `do...while(0)'. -+ -+ * src/autofit/afblue.h: Regenerated. -+ -+2015-12-05 Werner Lemberg <wl@gnu.org> -+ - * src/autofit/afwarp.c: s/INT_MIN/FT_INT_MIN/. - - 2015-12-03 Werner Lemberg <wl@gnu.org> -diff --git a/src/autofit/afblue.h b/src/autofit/afblue.h -index c26a9c7..a79098a 100644 ---- a/src/autofit/afblue.h -+++ b/src/autofit/afblue.h -@@ -28,32 +28,35 @@ FT_BEGIN_HEADER - - /* an auxiliary macro to decode a UTF-8 character -- since we only use */ - /* hard-coded, self-converted data, no error checking is performed */ --#define GET_UTF8_CHAR( ch, p ) \ -- ch = (unsigned char)*p++; \ -- if ( ch >= 0x80 ) \ -- { \ -- FT_UInt len; \ -- \ -- \ -- if ( ch < 0xE0 ) \ -- { \ -- len = 1; \ -- ch &= 0x1F; \ -- } \ -- else if ( ch < 0xF0 ) \ -- { \ -- len = 2; \ -- ch &= 0x0F; \ -- } \ -- else \ -- { \ -- len = 3; \ -- ch &= 0x07; \ -- } \ -- \ -- for ( ; len > 0; len-- ) \ -- ch = ( ch << 6 ) | ( *p++ & 0x3F ); \ -- } -+#define GET_UTF8_CHAR( ch, p ) \ -+ do \ -+ { \ -+ ch = (unsigned char)*p++; \ -+ if ( ch >= 0x80 ) \ -+ { \ -+ FT_UInt len_; \ -+ \ -+ \ -+ if ( ch < 0xE0 ) \ -+ { \ -+ len_ = 1; \ -+ ch &= 0x1F; \ -+ } \ -+ else if ( ch < 0xF0 ) \ -+ { \ -+ len_ = 2; \ -+ ch &= 0x0F; \ -+ } \ -+ else \ -+ { \ -+ len_ = 3; \ -+ ch &= 0x07; \ -+ } \ -+ \ -+ for ( ; len_ > 0; len_-- ) \ -+ ch = ( ch << 6 ) | ( *p++ & 0x3F ); \ -+ } \ -+ } while ( 0 ) - - - /*************************************************************************/ -diff --git a/src/autofit/afblue.hin b/src/autofit/afblue.hin -index ad43fe6..3f85ee7 100644 ---- a/src/autofit/afblue.hin -+++ b/src/autofit/afblue.hin -@@ -25,32 +25,35 @@ FT_BEGIN_HEADER - - /* an auxiliary macro to decode a UTF-8 character -- since we only use */ - /* hard-coded, self-converted data, no error checking is performed */ --#define GET_UTF8_CHAR( ch, p ) \ -- ch = (unsigned char)*p++; \ -- if ( ch >= 0x80 ) \ -- { \ -- FT_UInt len; \ -- \ -- \ -- if ( ch < 0xE0 ) \ -- { \ -- len = 1; \ -- ch &= 0x1F; \ -- } \ -- else if ( ch < 0xF0 ) \ -- { \ -- len = 2; \ -- ch &= 0x0F; \ -- } \ -- else \ -- { \ -- len = 3; \ -- ch &= 0x07; \ -- } \ -- \ -- for ( ; len > 0; len-- ) \ -- ch = ( ch << 6 ) | ( *p++ & 0x3F ); \ -- } -+#define GET_UTF8_CHAR( ch, p ) \ -+ do \ -+ { \ -+ ch = (unsigned char)*p++; \ -+ if ( ch >= 0x80 ) \ -+ { \ -+ FT_UInt len_; \ -+ \ -+ \ -+ if ( ch < 0xE0 ) \ -+ { \ -+ len_ = 1; \ -+ ch &= 0x1F; \ -+ } \ -+ else if ( ch < 0xF0 ) \ -+ { \ -+ len_ = 2; \ -+ ch &= 0x0F; \ -+ } \ -+ else \ -+ { \ -+ len_ = 3; \ -+ ch &= 0x07; \ -+ } \ -+ \ -+ for ( ; len_ > 0; len_-- ) \ -+ ch = ( ch << 6 ) | ( *p++ & 0x3F ); \ -+ } \ -+ } while ( 0 ) - - - /*************************************************************************/ --- -2.6.3 - -From 453722db8e0e7319c35a40eb592d7ead7d6d0211 Mon Sep 17 00:00:00 2001 -From: Werner Lemberg <wl@gnu.org> -Date: Sat, 5 Dec 2015 13:20:30 +0100 -Subject: [PATCH 6/7] * src/tools/afblue.pl (convert_ascii_chars): Don't ignore - spaces. - -Instead, reduce multiple spaces to a single one. We need this later -for supporting character clusters in `afblue.dat'. ---- - ChangeLog | 7 +++++++ - src/tools/afblue.pl | 15 +++++++++------ - 2 files changed, 16 insertions(+), 6 deletions(-) - -diff --git a/ChangeLog b/ChangeLog -index 7446c25..b1801a8 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,5 +1,12 @@ - 2015-12-05 Werner Lemberg <wl@gnu.org> - -+ * src/tools/afblue.pl (convert_ascii_chars): Don't ignore spaces. -+ -+ Instead, reduce multiple spaces to a single one. We need this later -+ for supporting character clusters in `afblue.dat'. -+ -+2015-12-05 Werner Lemberg <wl@gnu.org> -+ - * src/autofit/afblue.hin (GET_UTF8_CHAR): Use `do...while(0)'. - - * src/autofit/afblue.h: Regenerated. -diff --git a/src/tools/afblue.pl b/src/tools/afblue.pl -index 56b6452..a9c11b2 100644 ---- a/src/tools/afblue.pl -+++ b/src/tools/afblue.pl -@@ -38,7 +38,8 @@ my $curr_max; # Name of the current maximum value. - - my $curr_enum_element; # Name of the current enumeration element. - my $curr_offset; # The offset relative to current aux. variable. --my $curr_elem_size; # The size of the current string or block. -+my $curr_elem_size; # The number of non-space characters in the current string or -+ # the number of elements in the current block. - - my $have_sections = 0; # Boolean; set if start of a section has been seen. - my $have_strings; # Boolean; set if current section contains strings. -@@ -159,12 +160,14 @@ sub convert_ascii_chars - # A series of ASCII characters in the printable range. - my $s = shift; - -- # We ignore spaces. -- $s =~ s/ //g; -+ # We reduce multiple space characters to a single one. -+ $s =~ s/ +/ /g; - -- my $count = $s =~ s/\G(.)/'$1', /g; -- $curr_offset += $count; -- $curr_elem_size += $count; -+ # Count all non-space characters. Note that `()' applies a list context -+ # to the capture that is used to count the elements. -+ $curr_elem_size += () = $s =~ /[^ ]/g; -+ -+ $curr_offset += $s =~ s/\G(.)/'$1', /g; - - return $s; - } --- -2.6.3 - -From a8a54c30603ddedef5a2a96615e9fd66504356bf Mon Sep 17 00:00:00 2001 -From: Werner Lemberg <wl@gnu.org> -Date: Sat, 5 Dec 2015 13:26:44 +0100 -Subject: [PATCH 7/7] * src/autofit/afblue.dat: Separate blue zone characters - with spaces. - -Another preparation for character cluster support. - -* src/autofit/afblue.c, src/autofit.afblue.h: Regenerated. ---- - ChangeLog | 8 +++ - src/autofit/afblue.c | 162 ++++++++++++++++++++++++------------------------ - src/autofit/afblue.dat | 163 +++++++++++++++++++++++++------------------------ - src/autofit/afblue.h | 104 +++++++++++++++---------------- - 4 files changed, 224 insertions(+), 213 deletions(-) - -diff --git a/ChangeLog b/ChangeLog -index b1801a8..d696e8a 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,5 +1,13 @@ - 2015-12-05 Werner Lemberg <wl@gnu.org> - -+ * src/autofit/afblue.dat: Separate blue zone characters with spaces. -+ -+ Another preparation for character cluster support. -+ -+ * src/autofit/afblue.c, src/autofit.afblue.h: Regenerated. -+ -+2015-12-05 Werner Lemberg <wl@gnu.org> -+ - * src/tools/afblue.pl (convert_ascii_chars): Don't ignore spaces. - - Instead, reduce multiple spaces to a single one. We need this later -diff --git a/src/autofit/afblue.c b/src/autofit/afblue.c -index b871e0c..f528908 100644 ---- a/src/autofit/afblue.c -+++ b/src/autofit/afblue.c -@@ -26,139 +26,139 @@ - af_blue_strings[] = - { - /* */ -- '\xD8', '\xA7', '\xD8', '\xA5', '\xD9', '\x84', '\xD9', '\x83', '\xD8', '\xB7', '\xD8', '\xB8', /* ا إ ل ك ط ظ */ -+ '\xD8', '\xA7', ' ', '\xD8', '\xA5', ' ', '\xD9', '\x84', ' ', '\xD9', '\x83', ' ', '\xD8', '\xB7', ' ', '\xD8', '\xB8', /* ا إ ل ك ط ظ */ - '\0', -- '\xD8', '\xAA', '\xD8', '\xAB', '\xD8', '\xB7', '\xD8', '\xB8', '\xD9', '\x83', /* ت ث ط ظ ك */ -+ '\xD8', '\xAA', ' ', '\xD8', '\xAB', ' ', '\xD8', '\xB7', ' ', '\xD8', '\xB8', ' ', '\xD9', '\x83', /* ت ث ط ظ ك */ - '\0', - '\xD9', '\x80', /* ـ */ - '\0', -- '\xD0', '\x91', '\xD0', '\x92', '\xD0', '\x95', '\xD0', '\x9F', '\xD0', '\x97', '\xD0', '\x9E', '\xD0', '\xA1', '\xD0', '\xAD', /* БВЕПЗОСЭ */ -+ '\xD0', '\x91', ' ', '\xD0', '\x92', ' ', '\xD0', '\x95', ' ', '\xD0', '\x9F', ' ', '\xD0', '\x97', ' ', '\xD0', '\x9E', ' ', '\xD0', '\xA1', ' ', '\xD0', '\xAD', /* Б В Е П З О С Э */ - '\0', -- '\xD0', '\x91', '\xD0', '\x92', '\xD0', '\x95', '\xD0', '\xA8', '\xD0', '\x97', '\xD0', '\x9E', '\xD0', '\xA1', '\xD0', '\xAD', /* БВЕШЗОСЭ */ -+ '\xD0', '\x91', ' ', '\xD0', '\x92', ' ', '\xD0', '\x95', ' ', '\xD0', '\xA8', ' ', '\xD0', '\x97', ' ', '\xD0', '\x9E', ' ', '\xD0', '\xA1', ' ', '\xD0', '\xAD', /* Б В Е Ш З О С Э */ - '\0', -- '\xD1', '\x85', '\xD0', '\xBF', '\xD0', '\xBD', '\xD1', '\x88', '\xD0', '\xB5', '\xD0', '\xB7', '\xD0', '\xBE', '\xD1', '\x81', /* хпншезос */ -+ '\xD1', '\x85', ' ', '\xD0', '\xBF', ' ', '\xD0', '\xBD', ' ', '\xD1', '\x88', ' ', '\xD0', '\xB5', ' ', '\xD0', '\xB7', ' ', '\xD0', '\xBE', ' ', '\xD1', '\x81', /* х п н ш е з о с */ - '\0', -- '\xD1', '\x80', '\xD1', '\x83', '\xD1', '\x84', /* руф */ -+ '\xD1', '\x80', ' ', '\xD1', '\x83', ' ', '\xD1', '\x84', /* р у ф */ - '\0', -- '\xE0', '\xA4', '\x95', '\xE0', '\xA4', '\xAE', '\xE0', '\xA4', '\x85', '\xE0', '\xA4', '\x86', '\xE0', '\xA4', '\xA5', '\xE0', '\xA4', '\xA7', '\xE0', '\xA4', '\xAD', '\xE0', '\xA4', '\xB6', /* क म अ आ थ ध भ श */ -+ '\xE0', '\xA4', '\x95', ' ', '\xE0', '\xA4', '\xAE', ' ', '\xE0', '\xA4', '\x85', ' ', '\xE0', '\xA4', '\x86', ' ', '\xE0', '\xA4', '\xA5', ' ', '\xE0', '\xA4', '\xA7', ' ', '\xE0', '\xA4', '\xAD', ' ', '\xE0', '\xA4', '\xB6', /* क म अ आ थ ध भ श */ - '\0', -- '\xE0', '\xA4', '\x88', '\xE0', '\xA4', '\x90', '\xE0', '\xA4', '\x93', '\xE0', '\xA4', '\x94', '\xE0', '\xA4', '\xBF', '\xE0', '\xA5', '\x80', '\xE0', '\xA5', '\x8B', '\xE0', '\xA5', '\x8C', /* ई ऐ ओ औ ि ी ो ौ */ -+ '\xE0', '\xA4', '\x88', ' ', '\xE0', '\xA4', '\x90', ' ', '\xE0', '\xA4', '\x93', ' ', '\xE0', '\xA4', '\x94', ' ', '\xE0', '\xA4', '\xBF', ' ', '\xE0', '\xA5', '\x80', ' ', '\xE0', '\xA5', '\x8B', ' ', '\xE0', '\xA5', '\x8C', /* ई ऐ ओ औ ि ी ो ौ */ - '\0', -- '\xE0', '\xA4', '\x95', '\xE0', '\xA4', '\xAE', '\xE0', '\xA4', '\x85', '\xE0', '\xA4', '\x86', '\xE0', '\xA4', '\xA5', '\xE0', '\xA4', '\xA7', '\xE0', '\xA4', '\xAD', '\xE0', '\xA4', '\xB6', /* क म अ आ थ ध भ श */ -+ '\xE0', '\xA4', '\x95', ' ', '\xE0', '\xA4', '\xAE', ' ', '\xE0', '\xA4', '\x85', ' ', '\xE0', '\xA4', '\x86', ' ', '\xE0', '\xA4', '\xA5', ' ', '\xE0', '\xA4', '\xA7', ' ', '\xE0', '\xA4', '\xAD', ' ', '\xE0', '\xA4', '\xB6', /* क म अ आ थ ध भ श */ - '\0', -- '\xE0', '\xA5', '\x81', '\xE0', '\xA5', '\x83', /* ु ृ */ -+ '\xE0', '\xA5', '\x81', ' ', '\xE0', '\xA5', '\x83', /* ु ृ */ - '\0', -- '\xCE', '\x93', '\xCE', '\x92', '\xCE', '\x95', '\xCE', '\x96', '\xCE', '\x98', '\xCE', '\x9F', '\xCE', '\xA9', /* ΓΒΕΖΘΟΩ */ -+ '\xCE', '\x93', ' ', '\xCE', '\x92', ' ', '\xCE', '\x95', ' ', '\xCE', '\x96', ' ', '\xCE', '\x98', ' ', '\xCE', '\x9F', ' ', '\xCE', '\xA9', /* Γ Β Ε Ζ Θ Ο Ω */ - '\0', -- '\xCE', '\x92', '\xCE', '\x94', '\xCE', '\x96', '\xCE', '\x9E', '\xCE', '\x98', '\xCE', '\x9F', /* ΒΔΖΞΘΟ */ -+ '\xCE', '\x92', ' ', '\xCE', '\x94', ' ', '\xCE', '\x96', ' ', '\xCE', '\x9E', ' ', '\xCE', '\x98', ' ', '\xCE', '\x9F', /* Β Δ Ζ Ξ Θ Ο */ - '\0', -- '\xCE', '\xB2', '\xCE', '\xB8', '\xCE', '\xB4', '\xCE', '\xB6', '\xCE', '\xBB', '\xCE', '\xBE', /* βθδζλξ */ -+ '\xCE', '\xB2', ' ', '\xCE', '\xB8', ' ', '\xCE', '\xB4', ' ', '\xCE', '\xB6', ' ', '\xCE', '\xBB', ' ', '\xCE', '\xBE', /* β θ δ ζ λ ξ */ - '\0', -- '\xCE', '\xB1', '\xCE', '\xB5', '\xCE', '\xB9', '\xCE', '\xBF', '\xCF', '\x80', '\xCF', '\x83', '\xCF', '\x84', '\xCF', '\x89', /* αειοπστω */ -+ '\xCE', '\xB1', ' ', '\xCE', '\xB5', ' ', '\xCE', '\xB9', ' ', '\xCE', '\xBF', ' ', '\xCF', '\x80', ' ', '\xCF', '\x83', ' ', '\xCF', '\x84', ' ', '\xCF', '\x89', /* α ε ι ο π σ τ ω */ - '\0', -- '\xCE', '\xB2', '\xCE', '\xB3', '\xCE', '\xB7', '\xCE', '\xBC', '\xCF', '\x81', '\xCF', '\x86', '\xCF', '\x87', '\xCF', '\x88', /* βγημρφχψ */ -+ '\xCE', '\xB2', ' ', '\xCE', '\xB3', ' ', '\xCE', '\xB7', ' ', '\xCE', '\xBC', ' ', '\xCF', '\x81', ' ', '\xCF', '\x86', ' ', '\xCF', '\x87', ' ', '\xCF', '\x88', /* β γ η μ ρ φ χ ψ */ - '\0', -- '\xD7', '\x91', '\xD7', '\x93', '\xD7', '\x94', '\xD7', '\x97', '\xD7', '\x9A', '\xD7', '\x9B', '\xD7', '\x9D', '\xD7', '\xA1', /* בדהחךכםס */ -+ '\xD7', '\x91', ' ', '\xD7', '\x93', ' ', '\xD7', '\x94', ' ', '\xD7', '\x97', ' ', '\xD7', '\x9A', ' ', '\xD7', '\x9B', ' ', '\xD7', '\x9D', ' ', '\xD7', '\xA1', /* ב ד ה ח ך כ ם ס */ - '\0', -- '\xD7', '\x91', '\xD7', '\x98', '\xD7', '\x9B', '\xD7', '\x9D', '\xD7', '\xA1', '\xD7', '\xA6', /* בטכםסצ */ -+ '\xD7', '\x91', ' ', '\xD7', '\x98', ' ', '\xD7', '\x9B', ' ', '\xD7', '\x9D', ' ', '\xD7', '\xA1', ' ', '\xD7', '\xA6', /* ב ט כ ם ס צ */ - '\0', -- '\xD7', '\xA7', '\xD7', '\x9A', '\xD7', '\x9F', '\xD7', '\xA3', '\xD7', '\xA5', /* קךןףץ */ -+ '\xD7', '\xA7', ' ', '\xD7', '\x9A', ' ', '\xD7', '\x9F', ' ', '\xD7', '\xA3', ' ', '\xD7', '\xA5', /* ק ך ן ף ץ */ - '\0', -- '\xE0', '\xBA', '\xB2', '\xE0', '\xBA', '\x94', '\xE0', '\xBA', '\xAD', '\xE0', '\xBA', '\xA1', '\xE0', '\xBA', '\xA5', '\xE0', '\xBA', '\xA7', '\xE0', '\xBA', '\xA3', '\xE0', '\xBA', '\x87', /* າ ດ ອ ມ ລ ວ ຣ ງ */ -+ '\xE0', '\xBA', '\xB2', ' ', '\xE0', '\xBA', '\x94', ' ', '\xE0', '\xBA', '\xAD', ' ', '\xE0', '\xBA', '\xA1', ' ', '\xE0', '\xBA', '\xA5', ' ', '\xE0', '\xBA', '\xA7', ' ', '\xE0', '\xBA', '\xA3', ' ', '\xE0', '\xBA', '\x87', /* າ ດ ອ ມ ລ ວ ຣ ງ */ - '\0', -- '\xE0', '\xBA', '\xB2', '\xE0', '\xBA', '\xAD', '\xE0', '\xBA', '\x9A', '\xE0', '\xBA', '\x8D', '\xE0', '\xBA', '\xA3', '\xE0', '\xBA', '\xAE', '\xE0', '\xBA', '\xA7', '\xE0', '\xBA', '\xA2', /* າ ອ ບ ຍ ຣ ຮ ວ ຢ */ -+ '\xE0', '\xBA', '\xB2', ' ', '\xE0', '\xBA', '\xAD', ' ', '\xE0', '\xBA', '\x9A', ' ', '\xE0', '\xBA', '\x8D', ' ', '\xE0', '\xBA', '\xA3', ' ', '\xE0', '\xBA', '\xAE', ' ', '\xE0', '\xBA', '\xA7', ' ', '\xE0', '\xBA', '\xA2', /* າ ອ ບ ຍ ຣ ຮ ວ ຢ */ - '\0', -- '\xE0', '\xBA', '\x9B', '\xE0', '\xBA', '\xA2', '\xE0', '\xBA', '\x9F', '\xE0', '\xBA', '\x9D', /* ປ ຢ ຟ ຝ */ -+ '\xE0', '\xBA', '\x9B', ' ', '\xE0', '\xBA', '\xA2', ' ', '\xE0', '\xBA', '\x9F', ' ', '\xE0', '\xBA', '\x9D', /* ປ ຢ ຟ ຝ */ - '\0', -- '\xE0', '\xBB', '\x82', '\xE0', '\xBB', '\x84', '\xE0', '\xBB', '\x83', /* ໂ ໄ ໃ */ -+ '\xE0', '\xBB', '\x82', ' ', '\xE0', '\xBB', '\x84', ' ', '\xE0', '\xBB', '\x83', /* ໂ ໄ ໃ */ - '\0', -- '\xE0', '\xBA', '\x87', '\xE0', '\xBA', '\x8A', '\xE0', '\xBA', '\x96', '\xE0', '\xBA', '\xBD', '\xE0', '\xBB', '\x86', '\xE0', '\xBA', '\xAF', /* ງ ຊ ຖ ຽ ໆ ຯ */ -+ '\xE0', '\xBA', '\x87', ' ', '\xE0', '\xBA', '\x8A', ' ', '\xE0', '\xBA', '\x96', ' ', '\xE0', '\xBA', '\xBD', ' ', '\xE0', '\xBB', '\x86', ' ', '\xE0', '\xBA', '\xAF', /* ງ ຊ ຖ ຽ ໆ ຯ */ - '\0', -- 'T', 'H', 'E', 'Z', 'O', 'C', 'Q', 'S', /* THEZOCQS */ -+ 'T', ' ', 'H', ' ', 'E', ' ', 'Z', ' ', 'O', ' ', 'C', ' ', 'Q', ' ', 'S', /* T H E Z O C Q S */ - '\0', -- 'H', 'E', 'Z', 'L', 'O', 'C', 'U', 'S', /* HEZLOCUS */ -+ 'H', ' ', 'E', ' ', 'Z', ' ', 'L', ' ', 'O', ' ', 'C', ' ', 'U', ' ', 'S', /* H E Z L O C U S */ - '\0', -- 'f', 'i', 'j', 'k', 'd', 'b', 'h', /* fijkdbh */ -+ 'f', ' ', 'i', ' ', 'j', ' ', 'k', ' ', 'd', ' ', 'b', ' ', 'h', /* f i j k d b h */ - '\0', -- 'x', 'z', 'r', 'o', 'e', 's', 'c', /* xzroesc */ -+ 'x', ' ', 'z', ' ', 'r', ' ', 'o', ' ', 'e', ' ', 's', ' ', 'c', /* x z r o e s c */ - '\0', -- 'p', 'q', 'g', 'j', 'y', /* pqgjy */ -+ 'p', ' ', 'q', ' ', 'g', ' ', 'j', ' ', 'y', /* p q g j y */ - '\0', -- '\xE2', '\x82', '\x80', '\xE2', '\x82', '\x83', '\xE2', '\x82', '\x85', '\xE2', '\x82', '\x87', '\xE2', '\x82', '\x88', /* ₀₃₅₇₈ */ -+ '\xE2', '\x82', '\x80', ' ', '\xE2', '\x82', '\x83', ' ', '\xE2', '\x82', '\x85', ' ', '\xE2', '\x82', '\x87', ' ', '\xE2', '\x82', '\x88', /* ₀ ₃ ₅ ₇ ₈ */ - '\0', -- '\xE2', '\x82', '\x80', '\xE2', '\x82', '\x81', '\xE2', '\x82', '\x82', '\xE2', '\x82', '\x83', '\xE2', '\x82', '\x88', /* ₀₁₂₃₈ */ -+ '\xE2', '\x82', '\x80', ' ', '\xE2', '\x82', '\x81', ' ', '\xE2', '\x82', '\x82', ' ', '\xE2', '\x82', '\x83', ' ', '\xE2', '\x82', '\x88', /* ₀ ₁ ₂ ₃ ₈ */ - '\0', -- '\xE1', '\xB5', '\xA2', '\xE2', '\xB1', '\xBC', '\xE2', '\x82', '\x95', '\xE2', '\x82', '\x96', '\xE2', '\x82', '\x97', /* ᵢⱼₕₖₗ */ -+ '\xE1', '\xB5', '\xA2', ' ', '\xE2', '\xB1', '\xBC', ' ', '\xE2', '\x82', '\x95', ' ', '\xE2', '\x82', '\x96', ' ', '\xE2', '\x82', '\x97', /* ᵢ ⱼ ₕ ₖ ₗ */ - '\0', -- '\xE2', '\x82', '\x90', '\xE2', '\x82', '\x91', '\xE2', '\x82', '\x92', '\xE2', '\x82', '\x93', '\xE2', '\x82', '\x99', '\xE2', '\x82', '\x9B', '\xE1', '\xB5', '\xA5', '\xE1', '\xB5', '\xA4', '\xE1', '\xB5', '\xA3', /* ₐₑₒₓₙₛᵥᵤᵣ */ -+ '\xE2', '\x82', '\x90', ' ', '\xE2', '\x82', '\x91', ' ', '\xE2', '\x82', '\x92', ' ', '\xE2', '\x82', '\x93', ' ', '\xE2', '\x82', '\x99', ' ', '\xE2', '\x82', '\x9B', ' ', '\xE1', '\xB5', '\xA5', ' ', '\xE1', '\xB5', '\xA4', ' ', '\xE1', '\xB5', '\xA3', /* ₐ ₑ ₒ ₓ ₙ ₛ ᵥ ᵤ ᵣ */ - '\0', -- '\xE1', '\xB5', '\xA6', '\xE1', '\xB5', '\xA7', '\xE1', '\xB5', '\xA8', '\xE1', '\xB5', '\xA9', '\xE2', '\x82', '\x9A', /* ᵦᵧᵨᵩₚ */ -+ '\xE1', '\xB5', '\xA6', ' ', '\xE1', '\xB5', '\xA7', ' ', '\xE1', '\xB5', '\xA8', ' ', '\xE1', '\xB5', '\xA9', ' ', '\xE2', '\x82', '\x9A', /* ᵦ ᵧ ᵨ ᵩ ₚ */ - '\0', -- '\xE2', '\x81', '\xB0', '\xC2', '\xB3', '\xE2', '\x81', '\xB5', '\xE2', '\x81', '\xB7', '\xE1', '\xB5', '\x80', '\xE1', '\xB4', '\xB4', '\xE1', '\xB4', '\xB1', '\xE1', '\xB4', '\xBC', /* ⁰³⁵⁷ᵀᴴᴱᴼ */ -+ '\xE2', '\x81', '\xB0', ' ', '\xC2', '\xB3', ' ', '\xE2', '\x81', '\xB5', ' ', '\xE2', '\x81', '\xB7', ' ', '\xE1', '\xB5', '\x80', ' ', '\xE1', '\xB4', '\xB4', ' ', '\xE1', '\xB4', '\xB1', ' ', '\xE1', '\xB4', '\xBC', /* ⁰ ³ ⁵ ⁷ ᵀ ᴴ ᴱ ᴼ */ - '\0', -- '\xE2', '\x81', '\xB0', '\xC2', '\xB9', '\xC2', '\xB2', '\xC2', '\xB3', '\xE1', '\xB4', '\xB1', '\xE1', '\xB4', '\xB8', '\xE1', '\xB4', '\xBC', '\xE1', '\xB5', '\x81', /* ⁰¹²³ᴱᴸᴼᵁ */ -+ '\xE2', '\x81', '\xB0', ' ', '\xC2', '\xB9', ' ', '\xC2', '\xB2', ' ', '\xC2', '\xB3', ' ', '\xE1', '\xB4', '\xB1', ' ', '\xE1', '\xB4', '\xB8', ' ', '\xE1', '\xB4', '\xBC', ' ', '\xE1', '\xB5', '\x81', /* ⁰ ¹ ² ³ ᴱ ᴸ ᴼ ᵁ */ - '\0', -- '\xE1', '\xB5', '\x87', '\xE1', '\xB5', '\x88', '\xE1', '\xB5', '\x8F', '\xCA', '\xB0', '\xCA', '\xB2', '\xE1', '\xB6', '\xA0', '\xE2', '\x81', '\xB1', /* ᵇᵈᵏʰʲᶠⁱ */ -+ '\xE1', '\xB5', '\x87', ' ', '\xE1', '\xB5', '\x88', ' ', '\xE1', '\xB5', '\x8F', ' ', '\xCA', '\xB0', ' ', '\xCA', '\xB2', ' ', '\xE1', '\xB6', '\xA0', ' ', '\xE2', '\x81', '\xB1', /* ᵇ ᵈ ᵏ ʰ ʲ ᶠ ⁱ */ - '\0', -- '\xE1', '\xB5', '\x89', '\xE1', '\xB5', '\x92', '\xCA', '\xB3', '\xCB', '\xA2', '\xCB', '\xA3', '\xE1', '\xB6', '\x9C', '\xE1', '\xB6', '\xBB', /* ᵉᵒʳˢˣᶜᶻ */ -+ '\xE1', '\xB5', '\x89', ' ', '\xE1', '\xB5', '\x92', ' ', '\xCA', '\xB3', ' ', '\xCB', '\xA2', ' ', '\xCB', '\xA3', ' ', '\xE1', '\xB6', '\x9C', ' ', '\xE1', '\xB6', '\xBB', /* ᵉ ᵒ ʳ ˢ ˣ ᶜ ᶻ */ - '\0', -- '\xE1', '\xB5', '\x96', '\xCA', '\xB8', '\xE1', '\xB5', '\x8D', /* ᵖʸᵍ */ -+ '\xE1', '\xB5', '\x96', ' ', '\xCA', '\xB8', ' ', '\xE1', '\xB5', '\x8D', /* ᵖ ʸ ᵍ */ - '\0', -- '\xE0', '\xB0', '\x87', '\xE0', '\xB0', '\x8C', '\xE0', '\xB0', '\x99', '\xE0', '\xB0', '\x9E', '\xE0', '\xB0', '\xA3', '\xE0', '\xB0', '\xB1', '\xE0', '\xB1', '\xAF', /* ఇ ఌ ఙ ఞ ణ ఱ ౯ */ -+ '\xE0', '\xB0', '\x87', ' ', '\xE0', '\xB0', '\x8C', ' ', '\xE0', '\xB0', '\x99', ' ', '\xE0', '\xB0', '\x9E', ' ', '\xE0', '\xB0', '\xA3', ' ', '\xE0', '\xB0', '\xB1', ' ', '\xE0', '\xB1', '\xAF', /* ఇ ఌ ఙ ఞ ణ ఱ ౯ */ - '\0', -- '\xE0', '\xB0', '\x85', '\xE0', '\xB0', '\x95', '\xE0', '\xB0', '\x9A', '\xE0', '\xB0', '\xB0', '\xE0', '\xB0', '\xBD', '\xE0', '\xB1', '\xA8', '\xE0', '\xB1', '\xAC', /* అ క చ ర ఽ ౨ ౬ */ -+ '\xE0', '\xB0', '\x85', ' ', '\xE0', '\xB0', '\x95', ' ', '\xE0', '\xB0', '\x9A', ' ', '\xE0', '\xB0', '\xB0', ' ', '\xE0', '\xB0', '\xBD', ' ', '\xE0', '\xB1', '\xA8', ' ', '\xE0', '\xB1', '\xAC', /* అ క చ ర ఽ ౨ ౬ */ - '\0', -- '\xE0', '\xB8', '\x9A', '\xE0', '\xB9', '\x80', '\xE0', '\xB9', '\x81', '\xE0', '\xB8', '\xAD', '\xE0', '\xB8', '\x81', '\xE0', '\xB8', '\xB2', /* บ เ แ อ ก า */ -+ '\xE0', '\xB8', '\x9A', ' ', '\xE0', '\xB9', '\x80', ' ', '\xE0', '\xB9', '\x81', ' ', '\xE0', '\xB8', '\xAD', ' ', '\xE0', '\xB8', '\x81', ' ', '\xE0', '\xB8', '\xB2', /* บ เ แ อ ก า */ - '\0', -- '\xE0', '\xB8', '\x9A', '\xE0', '\xB8', '\x9B', '\xE0', '\xB8', '\xA9', '\xE0', '\xB8', '\xAF', '\xE0', '\xB8', '\xAD', '\xE0', '\xB8', '\xA2', '\xE0', '\xB8', '\xAE', /* บ ป ษ ฯ อ ย ฮ */ -+ '\xE0', '\xB8', '\x9A', ' ', '\xE0', '\xB8', '\x9B', ' ', '\xE0', '\xB8', '\xA9', ' ', '\xE0', '\xB8', '\xAF', ' ', '\xE0', '\xB8', '\xAD', ' ', '\xE0', '\xB8', '\xA2', ' ', '\xE0', '\xB8', '\xAE', /* บ ป ษ ฯ อ ย ฮ */ - '\0', -- '\xE0', '\xB8', '\x9B', '\xE0', '\xB8', '\x9D', '\xE0', '\xB8', '\x9F', /* ป ฝ ฟ */ -+ '\xE0', '\xB8', '\x9B', ' ', '\xE0', '\xB8', '\x9D', ' ', '\xE0', '\xB8', '\x9F', /* ป ฝ ฟ */ - '\0', -- '\xE0', '\xB9', '\x82', '\xE0', '\xB9', '\x83', '\xE0', '\xB9', '\x84', /* โ ใ ไ */ -+ '\xE0', '\xB9', '\x82', ' ', '\xE0', '\xB9', '\x83', ' ', '\xE0', '\xB9', '\x84', /* โ ใ ไ */ - '\0', -- '\xE0', '\xB8', '\x8E', '\xE0', '\xB8', '\x8F', '\xE0', '\xB8', '\xA4', '\xE0', '\xB8', '\xA6', /* ฎ ฏ ฤ ฦ */ -+ '\xE0', '\xB8', '\x8E', ' ', '\xE0', '\xB8', '\x8F', ' ', '\xE0', '\xB8', '\xA4', ' ', '\xE0', '\xB8', '\xA6', /* ฎ ฏ ฤ ฦ */ - '\0', -- '\xE0', '\xB8', '\x8D', '\xE0', '\xB8', '\x90', /* ญ ฐ */ -+ '\xE0', '\xB8', '\x8D', ' ', '\xE0', '\xB8', '\x90', /* ญ ฐ */ - '\0', -- '\xE0', '\xB9', '\x90', '\xE0', '\xB9', '\x91', '\xE0', '\xB9', '\x93', /* ๐ ๑ ๓ */ -+ '\xE0', '\xB9', '\x90', ' ', '\xE0', '\xB9', '\x91', ' ', '\xE0', '\xB9', '\x93', /* ๐ ๑ ๓ */ - #ifdef AF_CONFIG_OPTION_CJK - '\0', -- '\xE4', '\xBB', '\x96', '\xE4', '\xBB', '\xAC', '\xE4', '\xBD', '\xA0', '\xE4', '\xBE', '\x86', '\xE5', '\x80', '\x91', '\xE5', '\x88', '\xB0', '\xE5', '\x92', '\x8C', '\xE5', '\x9C', '\xB0', /* 他们你來們到和地 */ -- '\xE5', '\xAF', '\xB9', '\xE5', '\xB0', '\x8D', '\xE5', '\xB0', '\xB1', '\xE5', '\xB8', '\xAD', '\xE6', '\x88', '\x91', '\xE6', '\x97', '\xB6', '\xE6', '\x99', '\x82', '\xE6', '\x9C', '\x83', /* 对對就席我时時會 */ -- '\xE6', '\x9D', '\xA5', '\xE7', '\x82', '\xBA', '\xE8', '\x83', '\xBD', '\xE8', '\x88', '\xB0', '\xE8', '\xAA', '\xAA', '\xE8', '\xAF', '\xB4', '\xE8', '\xBF', '\x99', '\xE9', '\x80', '\x99', /* 来為能舰說说这這 */ -- '\xE9', '\xBD', '\x8A', '|', /* 齊 | */ -- '\xE5', '\x86', '\x9B', '\xE5', '\x90', '\x8C', '\xE5', '\xB7', '\xB2', '\xE6', '\x84', '\xBF', '\xE6', '\x97', '\xA2', '\xE6', '\x98', '\x9F', '\xE6', '\x98', '\xAF', '\xE6', '\x99', '\xAF', /* 军同已愿既星是景 */ -- '\xE6', '\xB0', '\x91', '\xE7', '\x85', '\xA7', '\xE7', '\x8E', '\xB0', '\xE7', '\x8F', '\xBE', '\xE7', '\x90', '\x86', '\xE7', '\x94', '\xA8', '\xE7', '\xBD', '\xAE', '\xE8', '\xA6', '\x81', /* 民照现現理用置要 */ -- '\xE8', '\xBB', '\x8D', '\xE9', '\x82', '\xA3', '\xE9', '\x85', '\x8D', '\xE9', '\x87', '\x8C', '\xE9', '\x96', '\x8B', '\xE9', '\x9B', '\xB7', '\xE9', '\x9C', '\xB2', '\xE9', '\x9D', '\xA2', /* 軍那配里開雷露面 */ -- '\xE9', '\xA1', '\xBE', /* 顾 */ -- '\0', -- '\xE4', '\xB8', '\xAA', '\xE4', '\xB8', '\xBA', '\xE4', '\xBA', '\xBA', '\xE4', '\xBB', '\x96', '\xE4', '\xBB', '\xA5', '\xE4', '\xBB', '\xAC', '\xE4', '\xBD', '\xA0', '\xE4', '\xBE', '\x86', /* 个为人他以们你來 */ -- '\xE5', '\x80', '\x8B', '\xE5', '\x80', '\x91', '\xE5', '\x88', '\xB0', '\xE5', '\x92', '\x8C', '\xE5', '\xA4', '\xA7', '\xE5', '\xAF', '\xB9', '\xE5', '\xB0', '\x8D', '\xE5', '\xB0', '\xB1', /* 個們到和大对對就 */ -- '\xE6', '\x88', '\x91', '\xE6', '\x97', '\xB6', '\xE6', '\x99', '\x82', '\xE6', '\x9C', '\x89', '\xE6', '\x9D', '\xA5', '\xE7', '\x82', '\xBA', '\xE8', '\xA6', '\x81', '\xE8', '\xAA', '\xAA', /* 我时時有来為要說 */ -- '\xE8', '\xAF', '\xB4', '|', /* 说 | */ -- '\xE4', '\xB8', '\xBB', '\xE4', '\xBA', '\x9B', '\xE5', '\x9B', '\xA0', '\xE5', '\xAE', '\x83', '\xE6', '\x83', '\xB3', '\xE6', '\x84', '\x8F', '\xE7', '\x90', '\x86', '\xE7', '\x94', '\x9F', /* 主些因它想意理生 */ -- '\xE7', '\x95', '\xB6', '\xE7', '\x9C', '\x8B', '\xE7', '\x9D', '\x80', '\xE7', '\xBD', '\xAE', '\xE8', '\x80', '\x85', '\xE8', '\x87', '\xAA', '\xE8', '\x91', '\x97', '\xE8', '\xA3', '\xA1', /* 當看着置者自著裡 */ -- '\xE8', '\xBF', '\x87', '\xE8', '\xBF', '\x98', '\xE8', '\xBF', '\x9B', '\xE9', '\x80', '\xB2', '\xE9', '\x81', '\x8E', '\xE9', '\x81', '\x93', '\xE9', '\x82', '\x84', '\xE9', '\x87', '\x8C', /* 过还进進過道還里 */ -- '\xE9', '\x9D', '\xA2', /* 面 */ -+ '\xE4', '\xBB', '\x96', ' ', '\xE4', '\xBB', '\xAC', ' ', '\xE4', '\xBD', '\xA0', ' ', '\xE4', '\xBE', '\x86', ' ', '\xE5', '\x80', '\x91', ' ', '\xE5', '\x88', '\xB0', ' ', '\xE5', '\x92', '\x8C', ' ', '\xE5', '\x9C', '\xB0', /* 他 们 你 來 們 到 和 地 */ -+ ' ', '\xE5', '\xAF', '\xB9', ' ', '\xE5', '\xB0', '\x8D', ' ', '\xE5', '\xB0', '\xB1', ' ', '\xE5', '\xB8', '\xAD', ' ', '\xE6', '\x88', '\x91', ' ', '\xE6', '\x97', '\xB6', ' ', '\xE6', '\x99', '\x82', ' ', '\xE6', '\x9C', '\x83', /* 对 對 就 席 我 时 時 會 */ -+ ' ', '\xE6', '\x9D', '\xA5', ' ', '\xE7', '\x82', '\xBA', ' ', '\xE8', '\x83', '\xBD', ' ', '\xE8', '\x88', '\xB0', ' ', '\xE8', '\xAA', '\xAA', ' ', '\xE8', '\xAF', '\xB4', ' ', '\xE8', '\xBF', '\x99', ' ', '\xE9', '\x80', '\x99', /* 来 為 能 舰 說 说 这 這 */ -+ ' ', '\xE9', '\xBD', '\x8A', ' ', '|', /* 齊 | */ -+ ' ', '\xE5', '\x86', '\x9B', ' ', '\xE5', '\x90', '\x8C', ' ', '\xE5', '\xB7', '\xB2', ' ', '\xE6', '\x84', '\xBF', ' ', '\xE6', '\x97', '\xA2', ' ', '\xE6', '\x98', '\x9F', ' ', '\xE6', '\x98', '\xAF', ' ', '\xE6', '\x99', '\xAF', /* 军 同 已 愿 既 星 是 景 */ -+ ' ', '\xE6', '\xB0', '\x91', ' ', '\xE7', '\x85', '\xA7', ' ', '\xE7', '\x8E', '\xB0', ' ', '\xE7', '\x8F', '\xBE', ' ', '\xE7', '\x90', '\x86', ' ', '\xE7', '\x94', '\xA8', ' ', '\xE7', '\xBD', '\xAE', ' ', '\xE8', '\xA6', '\x81', /* 民 照 现 現 理 用 置 要 */ -+ ' ', '\xE8', '\xBB', '\x8D', ' ', '\xE9', '\x82', '\xA3', ' ', '\xE9', '\x85', '\x8D', ' ', '\xE9', '\x87', '\x8C', ' ', '\xE9', '\x96', '\x8B', ' ', '\xE9', '\x9B', '\xB7', ' ', '\xE9', '\x9C', '\xB2', ' ', '\xE9', '\x9D', '\xA2', /* 軍 那 配 里 開 雷 露 面 */ -+ ' ', '\xE9', '\xA1', '\xBE', /* 顾 */ -+ '\0', -+ '\xE4', '\xB8', '\xAA', ' ', '\xE4', '\xB8', '\xBA', ' ', '\xE4', '\xBA', '\xBA', ' ', '\xE4', '\xBB', '\x96', ' ', '\xE4', '\xBB', '\xA5', ' ', '\xE4', '\xBB', '\xAC', ' ', '\xE4', '\xBD', '\xA0', ' ', '\xE4', '\xBE', '\x86', /* 个 为 人 他 以 们 你 來 */ -+ ' ', '\xE5', '\x80', '\x8B', ' ', '\xE5', '\x80', '\x91', ' ', '\xE5', '\x88', '\xB0', ' ', '\xE5', '\x92', '\x8C', ' ', '\xE5', '\xA4', '\xA7', ' ', '\xE5', '\xAF', '\xB9', ' ', '\xE5', '\xB0', '\x8D', ' ', '\xE5', '\xB0', '\xB1', /* 個 們 到 和 大 对 對 就 */ -+ ' ', '\xE6', '\x88', '\x91', ' ', '\xE6', '\x97', '\xB6', ' ', '\xE6', '\x99', '\x82', ' ', '\xE6', '\x9C', '\x89', ' ', '\xE6', '\x9D', '\xA5', ' ', '\xE7', '\x82', '\xBA', ' ', '\xE8', '\xA6', '\x81', ' ', '\xE8', '\xAA', '\xAA', /* 我 时 時 有 来 為 要 說 */ -+ ' ', '\xE8', '\xAF', '\xB4', ' ', '|', /* 说 | */ -+ ' ', '\xE4', '\xB8', '\xBB', ' ', '\xE4', '\xBA', '\x9B', ' ', '\xE5', '\x9B', '\xA0', ' ', '\xE5', '\xAE', '\x83', ' ', '\xE6', '\x83', '\xB3', ' ', '\xE6', '\x84', '\x8F', ' ', '\xE7', '\x90', '\x86', ' ', '\xE7', '\x94', '\x9F', /* 主 些 因 它 想 意 理 生 */ -+ ' ', '\xE7', '\x95', '\xB6', ' ', '\xE7', '\x9C', '\x8B', ' ', '\xE7', '\x9D', '\x80', ' ', '\xE7', '\xBD', '\xAE', ' ', '\xE8', '\x80', '\x85', ' ', '\xE8', '\x87', '\xAA', ' ', '\xE8', '\x91', '\x97', ' ', '\xE8', '\xA3', '\xA1', /* 當 看 着 置 者 自 著 裡 */ -+ ' ', '\xE8', '\xBF', '\x87', ' ', '\xE8', '\xBF', '\x98', ' ', '\xE8', '\xBF', '\x9B', ' ', '\xE9', '\x80', '\xB2', ' ', '\xE9', '\x81', '\x8E', ' ', '\xE9', '\x81', '\x93', ' ', '\xE9', '\x82', '\x84', ' ', '\xE9', '\x87', '\x8C', /* 过 还 进 進 過 道 還 里 */ -+ ' ', '\xE9', '\x9D', '\xA2', /* 面 */ - #ifdef AF_CONFIG_OPTION_CJK_BLUE_HANI_VERT - '\0', -- '\xE4', '\xBA', '\x9B', '\xE4', '\xBB', '\xAC', '\xE4', '\xBD', '\xA0', '\xE4', '\xBE', '\x86', '\xE5', '\x80', '\x91', '\xE5', '\x88', '\xB0', '\xE5', '\x92', '\x8C', '\xE5', '\x9C', '\xB0', /* 些们你來們到和地 */ -- '\xE5', '\xA5', '\xB9', '\xE5', '\xB0', '\x86', '\xE5', '\xB0', '\x87', '\xE5', '\xB0', '\xB1', '\xE5', '\xB9', '\xB4', '\xE5', '\xBE', '\x97', '\xE6', '\x83', '\x85', '\xE6', '\x9C', '\x80', /* 她将將就年得情最 */ -- '\xE6', '\xA0', '\xB7', '\xE6', '\xA8', '\xA3', '\xE7', '\x90', '\x86', '\xE8', '\x83', '\xBD', '\xE8', '\xAA', '\xAA', '\xE8', '\xAF', '\xB4', '\xE8', '\xBF', '\x99', '\xE9', '\x80', '\x99', /* 样樣理能說说这這 */ -- '\xE9', '\x80', '\x9A', '|', /* 通 | */ -- '\xE5', '\x8D', '\xB3', '\xE5', '\x90', '\x97', '\xE5', '\x90', '\xA7', '\xE5', '\x90', '\xAC', '\xE5', '\x91', '\xA2', '\xE5', '\x93', '\x81', '\xE5', '\x93', '\x8D', '\xE5', '\x97', '\x8E', /* 即吗吧听呢品响嗎 */ -- '\xE5', '\xB8', '\x88', '\xE5', '\xB8', '\xAB', '\xE6', '\x94', '\xB6', '\xE6', '\x96', '\xAD', '\xE6', '\x96', '\xB7', '\xE6', '\x98', '\x8E', '\xE7', '\x9C', '\xBC', '\xE9', '\x96', '\x93', /* 师師收断斷明眼間 */ -- '\xE9', '\x97', '\xB4', '\xE9', '\x99', '\x85', '\xE9', '\x99', '\x88', '\xE9', '\x99', '\x90', '\xE9', '\x99', '\xA4', '\xE9', '\x99', '\xB3', '\xE9', '\x9A', '\x8F', '\xE9', '\x9A', '\x9B', /* 间际陈限除陳随際 */ -- '\xE9', '\x9A', '\xA8', /* 隨 */ -- '\0', -- '\xE4', '\xBA', '\x8B', '\xE5', '\x89', '\x8D', '\xE5', '\xAD', '\xB8', '\xE5', '\xB0', '\x86', '\xE5', '\xB0', '\x87', '\xE6', '\x83', '\x85', '\xE6', '\x83', '\xB3', '\xE6', '\x88', '\x96', /* 事前學将將情想或 */ -- '\xE6', '\x94', '\xBF', '\xE6', '\x96', '\xAF', '\xE6', '\x96', '\xB0', '\xE6', '\xA0', '\xB7', '\xE6', '\xA8', '\xA3', '\xE6', '\xB0', '\x91', '\xE6', '\xB2', '\x92', '\xE6', '\xB2', '\xA1', /* 政斯新样樣民沒没 */ -- '\xE7', '\x84', '\xB6', '\xE7', '\x89', '\xB9', '\xE7', '\x8E', '\xB0', '\xE7', '\x8F', '\xBE', '\xE7', '\x90', '\x83', '\xE7', '\xAC', '\xAC', '\xE7', '\xB6', '\x93', '\xE8', '\xB0', '\x81', /* 然特现現球第經谁 */ -- '\xE8', '\xB5', '\xB7', '|', /* 起 | */ -- '\xE4', '\xBE', '\x8B', '\xE5', '\x88', '\xA5', '\xE5', '\x88', '\xAB', '\xE5', '\x88', '\xB6', '\xE5', '\x8A', '\xA8', '\xE5', '\x8B', '\x95', '\xE5', '\x90', '\x97', '\xE5', '\x97', '\x8E', /* 例別别制动動吗嗎 */ -- '\xE5', '\xA2', '\x9E', '\xE6', '\x8C', '\x87', '\xE6', '\x98', '\x8E', '\xE6', '\x9C', '\x9D', '\xE6', '\x9C', '\x9F', '\xE6', '\x9E', '\x84', '\xE7', '\x89', '\xA9', '\xE7', '\xA1', '\xAE', /* 增指明朝期构物确 */ -- '\xE7', '\xA7', '\x8D', '\xE8', '\xAA', '\xBF', '\xE8', '\xB0', '\x83', '\xE8', '\xB2', '\xBB', '\xE8', '\xB4', '\xB9', '\xE9', '\x82', '\xA3', '\xE9', '\x83', '\xBD', '\xE9', '\x96', '\x93', /* 种調调費费那都間 */ -- '\xE9', '\x97', '\xB4', /* 间 */ -+ ' ', '\xE4', '\xBA', '\x9B', ' ', '\xE4', '\xBB', '\xAC', ' ', '\xE4', '\xBD', '\xA0', ' ', '\xE4', '\xBE', '\x86', ' ', '\xE5', '\x80', '\x91', ' ', '\xE5', '\x88', '\xB0', ' ', '\xE5', '\x92', '\x8C', ' ', '\xE5', '\x9C', '\xB0', /* 些 们 你 來 們 到 和 地 */ -+ ' ', '\xE5', '\xA5', '\xB9', ' ', '\xE5', '\xB0', '\x86', ' ', '\xE5', '\xB0', '\x87', ' ', '\xE5', '\xB0', '\xB1', ' ', '\xE5', '\xB9', '\xB4', ' ', '\xE5', '\xBE', '\x97', ' ', '\xE6', '\x83', '\x85', ' ', '\xE6', '\x9C', '\x80', /* 她 将 將 就 年 得 情 最 */ -+ ' ', '\xE6', '\xA0', '\xB7', ' ', '\xE6', '\xA8', '\xA3', ' ', '\xE7', '\x90', '\x86', ' ', '\xE8', '\x83', '\xBD', ' ', '\xE8', '\xAA', '\xAA', ' ', '\xE8', '\xAF', '\xB4', ' ', '\xE8', '\xBF', '\x99', ' ', '\xE9', '\x80', '\x99', /* 样 樣 理 能 說 说 这 這 */ -+ ' ', '\xE9', '\x80', '\x9A', ' ', '|', /* 通 | */ -+ ' ', '\xE5', '\x8D', '\xB3', ' ', '\xE5', '\x90', '\x97', ' ', '\xE5', '\x90', '\xA7', ' ', '\xE5', '\x90', '\xAC', ' ', '\xE5', '\x91', '\xA2', ' ', '\xE5', '\x93', '\x81', ' ', '\xE5', '\x93', '\x8D', ' ', '\xE5', '\x97', '\x8E', /* 即 吗 吧 听 呢 品 响 嗎 */ -+ ' ', '\xE5', '\xB8', '\x88', ' ', '\xE5', '\xB8', '\xAB', ' ', '\xE6', '\x94', '\xB6', ' ', '\xE6', '\x96', '\xAD', ' ', '\xE6', '\x96', '\xB7', ' ', '\xE6', '\x98', '\x8E', ' ', '\xE7', '\x9C', '\xBC', ' ', '\xE9', '\x96', '\x93', /* 师 師 收 断 斷 明 眼 間 */ -+ ' ', '\xE9', '\x97', '\xB4', ' ', '\xE9', '\x99', '\x85', ' ', '\xE9', '\x99', '\x88', ' ', '\xE9', '\x99', '\x90', ' ', '\xE9', '\x99', '\xA4', ' ', '\xE9', '\x99', '\xB3', ' ', '\xE9', '\x9A', '\x8F', ' ', '\xE9', '\x9A', '\x9B', /* 间 际 陈 限 除 陳 随 際 */ -+ ' ', '\xE9', '\x9A', '\xA8', /* 隨 */ -+ '\0', -+ '\xE4', '\xBA', '\x8B', ' ', '\xE5', '\x89', '\x8D', ' ', '\xE5', '\xAD', '\xB8', ' ', '\xE5', '\xB0', '\x86', ' ', '\xE5', '\xB0', '\x87', ' ', '\xE6', '\x83', '\x85', ' ', '\xE6', '\x83', '\xB3', ' ', '\xE6', '\x88', '\x96', /* 事 前 學 将 將 情 想 或 */ -+ ' ', '\xE6', '\x94', '\xBF', ' ', '\xE6', '\x96', '\xAF', ' ', '\xE6', '\x96', '\xB0', ' ', '\xE6', '\xA0', '\xB7', ' ', '\xE6', '\xA8', '\xA3', ' ', '\xE6', '\xB0', '\x91', ' ', '\xE6', '\xB2', '\x92', ' ', '\xE6', '\xB2', '\xA1', /* 政 斯 新 样 樣 民 沒 没 */ -+ ' ', '\xE7', '\x84', '\xB6', ' ', '\xE7', '\x89', '\xB9', ' ', '\xE7', '\x8E', '\xB0', ' ', '\xE7', '\x8F', '\xBE', ' ', '\xE7', '\x90', '\x83', ' ', '\xE7', '\xAC', '\xAC', ' ', '\xE7', '\xB6', '\x93', ' ', '\xE8', '\xB0', '\x81', /* 然 特 现 現 球 第 經 谁 */ -+ ' ', '\xE8', '\xB5', '\xB7', ' ', '|', /* 起 | */ -+ ' ', '\xE4', '\xBE', '\x8B', ' ', '\xE5', '\x88', '\xA5', ' ', '\xE5', '\x88', '\xAB', ' ', '\xE5', '\x88', '\xB6', ' ', '\xE5', '\x8A', '\xA8', ' ', '\xE5', '\x8B', '\x95', ' ', '\xE5', '\x90', '\x97', ' ', '\xE5', '\x97', '\x8E', /* 例 別 别 制 动 動 吗 嗎 */ -+ ' ', '\xE5', '\xA2', '\x9E', ' ', '\xE6', '\x8C', '\x87', ' ', '\xE6', '\x98', '\x8E', ' ', '\xE6', '\x9C', '\x9D', ' ', '\xE6', '\x9C', '\x9F', ' ', '\xE6', '\x9E', '\x84', ' ', '\xE7', '\x89', '\xA9', ' ', '\xE7', '\xA1', '\xAE', /* 增 指 明 朝 期 构 物 确 */ -+ ' ', '\xE7', '\xA7', '\x8D', ' ', '\xE8', '\xAA', '\xBF', ' ', '\xE8', '\xB0', '\x83', ' ', '\xE8', '\xB2', '\xBB', ' ', '\xE8', '\xB4', '\xB9', ' ', '\xE9', '\x82', '\xA3', ' ', '\xE9', '\x83', '\xBD', ' ', '\xE9', '\x96', '\x93', /* 种 調 调 費 费 那 都 間 */ -+ ' ', '\xE9', '\x97', '\xB4', /* 间 */ - #endif /* AF_CONFIG_OPTION_CJK_BLUE_HANI_VERT */ - #endif /* AF_CONFIG_OPTION_CJK */ - '\0', -diff --git a/src/autofit/afblue.dat b/src/autofit/afblue.dat -index 1b52378..117f025 100644 ---- a/src/autofit/afblue.dat -+++ b/src/autofit/afblue.dat -@@ -20,9 +20,8 @@ - // labels separated by whitespace and followed by a colon (everything in a - // single line); the first label gives the name of the enumeration template, - // the second the name of the array template, and the third the name of the --// `maximum' template, holding the size of the largest array element. The --// script then fills the corresponding templates (indicated by `@' --// characters around the name). -+// `maximum' template. The script then fills the corresponding templates -+// (indicated by `@' characters around the name). - // - // A section contains one or more data records. Each data record consists - // of two or more lines. The first line holds the enumeration name, and the -@@ -30,15 +29,20 @@ - // - // There are two possible representations for array data. - // --// - A string of characters in UTF-8 encoding enclosed in double quotes, --// using C syntax. There can be only one string per line, thus the --// starting and ending double quote must be the first and last character --// in the line, respectively, ignoring whitespace before and after the --// string. Space characters within the string are ignored too. If there --// are multiple strings (in multiple lines), they are concatenated to a --// single string. In the output, a string gets represented as a series of --// singles bytes, followed by a zero byte. The enumeration values simply --// hold byte offsets to the start of the corresponding strings. -+// - A string of characters or character clusters (for example, representing -+// Aksharas, Devanagari syllables) in UTF-8 encoding enclosed in double -+// quotes, using C syntax, where the elements are separated by spaces. -+// There can be only one string per line, thus the starting and ending -+// double quote must be the first and last character in the line, -+// respectively, ignoring whitespace before and after the string. If -+// there are multiple strings (in multiple lines), they are concatenated -+// to a single string. In the output, a string gets represented as a -+// series of singles bytes, followed by a zero byte. The enumeration -+// values simply hold byte offsets to the start of the corresponding -+// strings. -+// -+// For strings, the `maximum' template holds the maximum number of -+// non-space characters in all strings. - // - // - Data blocks enclosed in balanced braces, which get copied verbatim and - // which can span multiple lines. The opening brace of a block must be -@@ -47,6 +51,9 @@ - // character after each block and counts the number of blocks to set the - // enumeration values. - // -+// For data blocks, the `maximum' template holds the maximum number of -+// array elements. -+// - // A section can contain either strings only or data blocks only. - // - // A comment line starts with `//'; it gets removed. A preprocessor -@@ -80,16 +87,14 @@ AF_BLUE_STRING_ENUM AF_BLUE_STRINGS_ARRAY AF_BLUE_STRING_MAX_LEN: - "ـ" - - AF_BLUE_STRING_CYRILLIC_CAPITAL_TOP -- "БВЕПЗОСЭ" -+ "Б В Е П З О С Э" - AF_BLUE_STRING_CYRILLIC_CAPITAL_BOTTOM -- "БВЕШЗОСЭ" -+ "Б В Е Ш З О С Э" - AF_BLUE_STRING_CYRILLIC_SMALL -- "хпншезос" -+ "х п н ш е з о с" - AF_BLUE_STRING_CYRILLIC_SMALL_DESCENDER -- "руф" -+ "р у ф" - -- // we separate the letters with spaces to avoid ligatures; -- // this is just for convenience to simplify reading - AF_BLUE_STRING_DEVANAGARI_BASE - "क म अ आ थ ध भ श" - AF_BLUE_STRING_DEVANAGARI_TOP -@@ -103,22 +108,22 @@ AF_BLUE_STRING_ENUM AF_BLUE_STRINGS_ARRAY AF_BLUE_STRING_MAX_LEN: - "ु ृ" - - AF_BLUE_STRING_GREEK_CAPITAL_TOP -- "ΓΒΕΖΘΟΩ" -+ "Γ Β Ε Ζ Θ Ο Ω" - AF_BLUE_STRING_GREEK_CAPITAL_BOTTOM -- "ΒΔΖΞΘΟ" -+ "Β Δ Ζ Ξ Θ Ο" - AF_BLUE_STRING_GREEK_SMALL_BETA_TOP -- "βθδζλξ" -+ "β θ δ ζ λ ξ" - AF_BLUE_STRING_GREEK_SMALL -- "αειοπστω" -+ "α ε ι ο π σ τ ω" - AF_BLUE_STRING_GREEK_SMALL_DESCENDER -- "βγημρφχψ" -+ "β γ η μ ρ φ χ ψ" - - AF_BLUE_STRING_HEBREW_TOP -- "בדהחךכםס" -+ "ב ד ה ח ך כ ם ס" - AF_BLUE_STRING_HEBREW_BOTTOM -- "בטכםסצ" -+ "ב ט כ ם ס צ" - AF_BLUE_STRING_HEBREW_DESCENDER -- "קךןףץ" -+ "ק ך ן ף ץ" - - AF_BLUE_STRING_LAO_TOP - "າ ດ ອ ມ ລ ວ ຣ ງ" -@@ -132,43 +137,41 @@ AF_BLUE_STRING_ENUM AF_BLUE_STRINGS_ARRAY AF_BLUE_STRING_MAX_LEN: - "ງ ຊ ຖ ຽ ໆ ຯ" - - AF_BLUE_STRING_LATIN_CAPITAL_TOP -- "THEZOCQS" -+ "T H E Z O C Q S" - AF_BLUE_STRING_LATIN_CAPITAL_BOTTOM -- "HEZLOCUS" -+ "H E Z L O C U S" - AF_BLUE_STRING_LATIN_SMALL_F_TOP -- "fijkdbh" -+ "f i j k d b h" - AF_BLUE_STRING_LATIN_SMALL -- "xzroesc" -+ "x z r o e s c" - AF_BLUE_STRING_LATIN_SMALL_DESCENDER -- "pqgjy" -+ "p q g j y" - - // we assume that both the subscript and superscript ranges - // don't contain oldstyle digits (actually, most fonts probably - // have digits only in those ranges) - AF_BLUE_STRING_LATIN_SUBS_CAPITAL_TOP -- "₀₃₅₇₈" -+ "₀ ₃ ₅ ₇ ₈" - AF_BLUE_STRING_LATIN_SUBS_CAPITAL_BOTTOM -- "₀₁₂₃₈" -+ "₀ ₁ ₂ ₃ ₈" - AF_BLUE_STRING_LATIN_SUBS_SMALL_F_TOP -- "ᵢⱼₕₖₗ" -+ "ᵢ ⱼ ₕ ₖ ₗ" - AF_BLUE_STRING_LATIN_SUBS_SMALL -- "ₐₑₒₓₙₛᵥᵤᵣ" -+ "ₐ ₑ ₒ ₓ ₙ ₛ ᵥ ᵤ ᵣ" - AF_BLUE_STRING_LATIN_SUBS_SMALL_DESCENDER -- "ᵦᵧᵨᵩₚ" -+ "ᵦ ᵧ ᵨ ᵩ ₚ" - - AF_BLUE_STRING_LATIN_SUPS_CAPITAL_TOP -- "⁰³⁵⁷ᵀᴴᴱᴼ" -+ "⁰ ³ ⁵ ⁷ ᵀ ᴴ ᴱ ᴼ" - AF_BLUE_STRING_LATIN_SUPS_CAPITAL_BOTTOM -- "⁰¹²³ᴱᴸᴼᵁ" -+ "⁰ ¹ ² ³ ᴱ ᴸ ᴼ ᵁ" - AF_BLUE_STRING_LATIN_SUPS_SMALL_F_TOP -- "ᵇᵈᵏʰʲᶠⁱ" -+ "ᵇ ᵈ ᵏ ʰ ʲ ᶠ ⁱ" - AF_BLUE_STRING_LATIN_SUPS_SMALL -- "ᵉᵒʳˢˣᶜᶻ" -+ "ᵉ ᵒ ʳ ˢ ˣ ᶜ ᶻ" - AF_BLUE_STRING_LATIN_SUPS_SMALL_DESCENDER -- "ᵖʸᵍ" -+ "ᵖ ʸ ᵍ" - -- // we separate the letters with spaces to avoid ligatures; -- // this is just for convenience to simplify reading - AF_BLUE_STRING_TELUGU_TOP - "ఇ ఌ ఙ ఞ ణ ఱ ౯" - AF_BLUE_STRING_TELUGU_BOTTOM -@@ -193,44 +196,44 @@ AF_BLUE_STRING_ENUM AF_BLUE_STRINGS_ARRAY AF_BLUE_STRING_MAX_LEN: - #ifdef AF_CONFIG_OPTION_CJK - - AF_BLUE_STRING_CJK_TOP -- "他们你來們到和地" -- "对對就席我时時會" -- "来為能舰說说这這" -- "齊 |" -- "军同已愿既星是景" -- "民照现現理用置要" -- "軍那配里開雷露面" -- "顾" -+ "他 们 你 來 們 到 和 地" -+ " 对 對 就 席 我 时 時 會" -+ " 来 為 能 舰 說 说 这 這" -+ " 齊 |" -+ " 军 同 已 愿 既 星 是 景" -+ " 民 照 现 現 理 用 置 要" -+ " 軍 那 配 里 開 雷 露 面" -+ " 顾" - AF_BLUE_STRING_CJK_BOTTOM -- "个为人他以们你來" -- "個們到和大对對就" -- "我时時有来為要說" -- "说 |" -- "主些因它想意理生" -- "當看着置者自著裡" -- "过还进進過道還里" -- "面" -+ "个 为 人 他 以 们 你 來" -+ " 個 們 到 和 大 对 對 就" -+ " 我 时 時 有 来 為 要 說" -+ " 说 |" -+ " 主 些 因 它 想 意 理 生" -+ " 當 看 着 置 者 自 著 裡" -+ " 过 还 进 進 過 道 還 里" -+ " 面" - - #ifdef AF_CONFIG_OPTION_CJK_BLUE_HANI_VERT - - AF_BLUE_STRING_CJK_LEFT -- "些们你來們到和地" -- "她将將就年得情最" -- "样樣理能說说这這" -- "通 |" -- "即吗吧听呢品响嗎" -- "师師收断斷明眼間" -- "间际陈限除陳随際" -- "隨" -+ " 些 们 你 來 們 到 和 地" -+ " 她 将 將 就 年 得 情 最" -+ " 样 樣 理 能 說 说 这 這" -+ " 通 |" -+ " 即 吗 吧 听 呢 品 响 嗎" -+ " 师 師 收 断 斷 明 眼 間" -+ " 间 际 陈 限 除 陳 随 際" -+ " 隨" - AF_BLUE_STRING_CJK_RIGHT -- "事前學将將情想或" -- "政斯新样樣民沒没" -- "然特现現球第經谁" -- "起 |" -- "例別别制动動吗嗎" -- "增指明朝期构物确" -- "种調调費费那都間" -- "间" -+ "事 前 學 将 將 情 想 或" -+ " 政 斯 新 样 樣 民 沒 没" -+ " 然 特 现 現 球 第 經 谁" -+ " 起 |" -+ " 例 別 别 制 动 動 吗 嗎" -+ " 增 指 明 朝 期 构 物 确" -+ " 种 調 调 費 费 那 都 間" -+ " 间" - - #endif /* AF_CONFIG_OPTION_CJK_BLUE_HANI_VERT */ - -@@ -307,11 +310,11 @@ AF_BLUE_STRING_ENUM AF_BLUE_STRINGS_ARRAY AF_BLUE_STRING_MAX_LEN: - // - // Characters in a blue string are *not* automatically classified. Instead, - // first come the characters used for the overshoot value, then the --// character `|', then the characters used for the reference value. The --// blue zone is then set up by the mean values of all reference values and --// all overshoot values, respectively. Both horizontal and vertical blue --// zones (i.e., adjusting vertical and horizontal coordinate values, --// respectively) are supported. -+// character `|', then the characters used for the reference value -+// (everything separated by space characters). The blue zone is then set up -+// by the mean values of all reference values and all overshoot values, -+// respectively. Both horizontal and vertical blue zones (i.e., adjusting -+// vertical and horizontal coordinate values, respectively) are supported. - // - // For the cjk auto-hinter, the overshoot should be smaller than the - // reference for top zones, and vice versa for bottom zones. -diff --git a/src/autofit/afblue.h b/src/autofit/afblue.h -index a79098a..2ee1ed1 100644 ---- a/src/autofit/afblue.h -+++ b/src/autofit/afblue.h -@@ -78,62 +78,62 @@ FT_BEGIN_HEADER - typedef enum AF_Blue_String_ - { - AF_BLUE_STRING_ARABIC_TOP = 0, -- AF_BLUE_STRING_ARABIC_BOTTOM = 13, -- AF_BLUE_STRING_ARABIC_JOIN = 24, -- AF_BLUE_STRING_CYRILLIC_CAPITAL_TOP = 27, -- AF_BLUE_STRING_CYRILLIC_CAPITAL_BOTTOM = 44, -- AF_BLUE_STRING_CYRILLIC_SMALL = 61, -- AF_BLUE_STRING_CYRILLIC_SMALL_DESCENDER = 78, -- AF_BLUE_STRING_DEVANAGARI_BASE = 85, -- AF_BLUE_STRING_DEVANAGARI_TOP = 110, -- AF_BLUE_STRING_DEVANAGARI_HEAD = 135, -- AF_BLUE_STRING_DEVANAGARI_BOTTOM = 160, -- AF_BLUE_STRING_GREEK_CAPITAL_TOP = 167, -- AF_BLUE_STRING_GREEK_CAPITAL_BOTTOM = 182, -- AF_BLUE_STRING_GREEK_SMALL_BETA_TOP = 195, -- AF_BLUE_STRING_GREEK_SMALL = 208, -- AF_BLUE_STRING_GREEK_SMALL_DESCENDER = 225, -- AF_BLUE_STRING_HEBREW_TOP = 242, -- AF_BLUE_STRING_HEBREW_BOTTOM = 259, -- AF_BLUE_STRING_HEBREW_DESCENDER = 272, -- AF_BLUE_STRING_LAO_TOP = 283, -- AF_BLUE_STRING_LAO_BOTTOM = 308, -- AF_BLUE_STRING_LAO_ASCENDER = 333, -- AF_BLUE_STRING_LAO_LARGE_ASCENDER = 346, -- AF_BLUE_STRING_LAO_DESCENDER = 356, -- AF_BLUE_STRING_LATIN_CAPITAL_TOP = 375, -- AF_BLUE_STRING_LATIN_CAPITAL_BOTTOM = 384, -- AF_BLUE_STRING_LATIN_SMALL_F_TOP = 393, -- AF_BLUE_STRING_LATIN_SMALL = 401, -- AF_BLUE_STRING_LATIN_SMALL_DESCENDER = 409, -- AF_BLUE_STRING_LATIN_SUBS_CAPITAL_TOP = 415, -- AF_BLUE_STRING_LATIN_SUBS_CAPITAL_BOTTOM = 431, -- AF_BLUE_STRING_LATIN_SUBS_SMALL_F_TOP = 447, -- AF_BLUE_STRING_LATIN_SUBS_SMALL = 463, -- AF_BLUE_STRING_LATIN_SUBS_SMALL_DESCENDER = 491, -- AF_BLUE_STRING_LATIN_SUPS_CAPITAL_TOP = 507, -- AF_BLUE_STRING_LATIN_SUPS_CAPITAL_BOTTOM = 531, -- AF_BLUE_STRING_LATIN_SUPS_SMALL_F_TOP = 553, -- AF_BLUE_STRING_LATIN_SUPS_SMALL = 573, -- AF_BLUE_STRING_LATIN_SUPS_SMALL_DESCENDER = 592, -- AF_BLUE_STRING_TELUGU_TOP = 601, -- AF_BLUE_STRING_TELUGU_BOTTOM = 623, -- AF_BLUE_STRING_THAI_TOP = 645, -- AF_BLUE_STRING_THAI_BOTTOM = 664, -- AF_BLUE_STRING_THAI_ASCENDER = 686, -- AF_BLUE_STRING_THAI_LARGE_ASCENDER = 696, -- AF_BLUE_STRING_THAI_DESCENDER = 706, -- AF_BLUE_STRING_THAI_LARGE_DESCENDER = 719, -- AF_BLUE_STRING_THAI_DIGIT_TOP = 726, -- af_blue_1_1 = 735, -+ AF_BLUE_STRING_ARABIC_BOTTOM = 18, -+ AF_BLUE_STRING_ARABIC_JOIN = 33, -+ AF_BLUE_STRING_CYRILLIC_CAPITAL_TOP = 36, -+ AF_BLUE_STRING_CYRILLIC_CAPITAL_BOTTOM = 60, -+ AF_BLUE_STRING_CYRILLIC_SMALL = 84, -+ AF_BLUE_STRING_CYRILLIC_SMALL_DESCENDER = 108, -+ AF_BLUE_STRING_DEVANAGARI_BASE = 117, -+ AF_BLUE_STRING_DEVANAGARI_TOP = 149, -+ AF_BLUE_STRING_DEVANAGARI_HEAD = 181, -+ AF_BLUE_STRING_DEVANAGARI_BOTTOM = 213, -+ AF_BLUE_STRING_GREEK_CAPITAL_TOP = 221, -+ AF_BLUE_STRING_GREEK_CAPITAL_BOTTOM = 242, -+ AF_BLUE_STRING_GREEK_SMALL_BETA_TOP = 260, -+ AF_BLUE_STRING_GREEK_SMALL = 278, -+ AF_BLUE_STRING_GREEK_SMALL_DESCENDER = 302, -+ AF_BLUE_STRING_HEBREW_TOP = 326, -+ AF_BLUE_STRING_HEBREW_BOTTOM = 350, -+ AF_BLUE_STRING_HEBREW_DESCENDER = 368, -+ AF_BLUE_STRING_LAO_TOP = 383, -+ AF_BLUE_STRING_LAO_BOTTOM = 415, -+ AF_BLUE_STRING_LAO_ASCENDER = 447, -+ AF_BLUE_STRING_LAO_LARGE_ASCENDER = 463, -+ AF_BLUE_STRING_LAO_DESCENDER = 475, -+ AF_BLUE_STRING_LATIN_CAPITAL_TOP = 499, -+ AF_BLUE_STRING_LATIN_CAPITAL_BOTTOM = 515, -+ AF_BLUE_STRING_LATIN_SMALL_F_TOP = 531, -+ AF_BLUE_STRING_LATIN_SMALL = 545, -+ AF_BLUE_STRING_LATIN_SMALL_DESCENDER = 559, -+ AF_BLUE_STRING_LATIN_SUBS_CAPITAL_TOP = 569, -+ AF_BLUE_STRING_LATIN_SUBS_CAPITAL_BOTTOM = 589, -+ AF_BLUE_STRING_LATIN_SUBS_SMALL_F_TOP = 609, -+ AF_BLUE_STRING_LATIN_SUBS_SMALL = 629, -+ AF_BLUE_STRING_LATIN_SUBS_SMALL_DESCENDER = 665, -+ AF_BLUE_STRING_LATIN_SUPS_CAPITAL_TOP = 685, -+ AF_BLUE_STRING_LATIN_SUPS_CAPITAL_BOTTOM = 716, -+ AF_BLUE_STRING_LATIN_SUPS_SMALL_F_TOP = 745, -+ AF_BLUE_STRING_LATIN_SUPS_SMALL = 771, -+ AF_BLUE_STRING_LATIN_SUPS_SMALL_DESCENDER = 796, -+ AF_BLUE_STRING_TELUGU_TOP = 807, -+ AF_BLUE_STRING_TELUGU_BOTTOM = 835, -+ AF_BLUE_STRING_THAI_TOP = 863, -+ AF_BLUE_STRING_THAI_BOTTOM = 887, -+ AF_BLUE_STRING_THAI_ASCENDER = 915, -+ AF_BLUE_STRING_THAI_LARGE_ASCENDER = 927, -+ AF_BLUE_STRING_THAI_DESCENDER = 939, -+ AF_BLUE_STRING_THAI_LARGE_DESCENDER = 955, -+ AF_BLUE_STRING_THAI_DIGIT_TOP = 963, -+ af_blue_1_1 = 974, - #ifdef AF_CONFIG_OPTION_CJK - AF_BLUE_STRING_CJK_TOP = af_blue_1_1 + 1, -- AF_BLUE_STRING_CJK_BOTTOM = af_blue_1_1 + 153, -- af_blue_1_1_1 = af_blue_1_1 + 304, -+ AF_BLUE_STRING_CJK_BOTTOM = af_blue_1_1 + 203, -+ af_blue_1_1_1 = af_blue_1_1 + 404, - #ifdef AF_CONFIG_OPTION_CJK_BLUE_HANI_VERT - AF_BLUE_STRING_CJK_LEFT = af_blue_1_1_1 + 1, -- AF_BLUE_STRING_CJK_RIGHT = af_blue_1_1_1 + 153, -- af_blue_1_1_2 = af_blue_1_1_1 + 304, -+ AF_BLUE_STRING_CJK_RIGHT = af_blue_1_1_1 + 204, -+ af_blue_1_1_2 = af_blue_1_1_1 + 405, - #else - af_blue_1_1_2 = af_blue_1_1_1 + 0, - #endif /* AF_CONFIG_OPTION_CJK_BLUE_HANI_VERT */ --- -2.6.3 - |