src/hb-ot-shape-complex-arabic-table.hh | 15 ++++++---- src/hb-ot-shape-complex-indic-table.cc | 7 ---- src/hb-ot-shape-complex-indic.cc | 5 +++ test/shaping/fonts/sha1sum/87f85d17d26f1fe9ad28d7365101958edaefb967.ttf |binary test/shaping/tests/indic-syllable.tests | 1 5 files changed, 15 insertions(+), 13 deletions(-)
New commits: commit cc79b666bc4a81a0342ed1e706dd7db109739dc5 Author: Behdad Esfahbod <beh...@behdad.org> Date: Mon Oct 2 09:19:15 2017 -0400 [indic] Add test for 1a0a356a0f2b2932581e4fd0437c01c058f4f6d1 https://github.com/behdad/harfbuzz/issues/538 diff --git a/test/shaping/fonts/sha1sum/87f85d17d26f1fe9ad28d7365101958edaefb967.ttf b/test/shaping/fonts/sha1sum/87f85d17d26f1fe9ad28d7365101958edaefb967.ttf new file mode 100644 index 00000000..89b62575 Binary files /dev/null and b/test/shaping/fonts/sha1sum/87f85d17d26f1fe9ad28d7365101958edaefb967.ttf differ diff --git a/test/shaping/tests/indic-syllable.tests b/test/shaping/tests/indic-syllable.tests index ecaad906..df3d7d82 100644 --- a/test/shaping/tests/indic-syllable.tests +++ b/test/shaping/tests/indic-syllable.tests @@ -1,3 +1,4 @@ fonts/sha1sum/54674a3111d209fb6be0ed31745314b7a8d2c244.ttf::U+0BA4,U+0BCD,U+00B3:[taprehalftamil=0+1509|uni00B3=2+674] fonts/sha1sum/3d0b77a2360aa6faa1385aaa510509ab70dfbeff.ttf::U+0CF1:[gid1=0+1129] fonts/sha1sum/3d0b77a2360aa6faa1385aaa510509ab70dfbeff.ttf::U+0CF2:[gid2=0+1539] +fonts/sha1sum/87f85d17d26f1fe9ad28d7365101958edaefb967.ttf::U+0980,U+0981:[anjibeng=0+520|candrabindubeng=0+0] commit 819cc360499a5f136325b5a1a18098ebc2aee081 Author: Behdad Esfahbod <beh...@behdad.org> Date: Mon Oct 2 09:03:16 2017 -0400 [indic] Move manual code out of generated table diff --git a/src/hb-ot-shape-complex-indic-table.cc b/src/hb-ot-shape-complex-indic-table.cc index 3bf5285e..f0f4dc3b 100644 --- a/src/hb-ot-shape-complex-indic-table.cc +++ b/src/hb-ot-shape-complex-indic-table.cc @@ -422,13 +422,6 @@ hb_indic_get_categories (hb_codepoint_t u) if (hb_in_range<hb_codepoint_t> (u, 0xAA60u, 0xAA7Fu)) return indic_table[u - 0xAA60u + indic_offset_0xaa60u]; break; - case 0x11u: - // According to ScriptExtensions.txt, these Grantha marks may also be used in Tamil, - // so the Indic shaper needs to know their categories. - if (unlikely (u == 0x11303)) return _(Vs,R); - if (unlikely (u == 0x1133c)) return _(N,B); - break; - default: break; } diff --git a/src/hb-ot-shape-complex-indic.cc b/src/hb-ot-shape-complex-indic.cc index 5acaadb5..c8640cc5 100644 --- a/src/hb-ot-shape-complex-indic.cc +++ b/src/hb-ot-shape-complex-indic.cc @@ -209,6 +209,11 @@ set_indic_properties (hb_glyph_info_t &info) pos = POS_ABOVE_C; } + /* According to ScriptExtensions.txt, these Grantha marks may also be used in Tamil, + * so the Indic shaper needs to know their categories. */ + else if (unlikely (u == 0x11303u)) cat = OT_SM; + else if (unlikely (u == 0x1133cu)) cat = OT_N; + else if (unlikely (u == 0x0980u)) cat = OT_PLACEHOLDER; /* https://github.com/behdad/harfbuzz/issues/538 */ else if (unlikely (u == 0x17C6u)) cat = OT_N; /* Khmer Bindu doesn't like to be repositioned. */ else if (unlikely (hb_in_range<hb_codepoint_t> (u, 0x2010u, 0x2011u))) commit da4866f7177a4e2836cc70b844e2e64ab671761f Author: Behdad Esfahbod <beh...@behdad.org> Date: Mon Oct 2 08:57:06 2017 -0400 [arabic] Update table to Unicode 10 data diff --git a/src/hb-ot-shape-complex-arabic-table.hh b/src/hb-ot-shape-complex-arabic-table.hh index 228f3665..cd6e4058 100644 --- a/src/hb-ot-shape-complex-arabic-table.hh +++ b/src/hb-ot-shape-complex-arabic-table.hh @@ -6,10 +6,10 @@ * * on files with these headers: * - * # ArabicShaping-9.0.0.txt - * # Date: 2016-02-24, 22:25:00 GMT [RP] - * # Blocks-9.0.0.txt - * # Date: 2016-02-05, 23:48:00 GMT [KW] + * # ArabicShaping-10.0.0.txt + * # Date: 2017-02-16, 00:00:00 GMT [RP, KW] + * # Blocks-10.0.0.txt + * # Date: 2017-04-12, 17:30:00 GMT [KW] * UnicodeData.txt does not have a header. */ @@ -72,7 +72,10 @@ static const uint8_t joining_table[] = /* Mandaic */ /* 0840 */ R,D,D,D,D,D,R,R,D,R,D,D,D,D,D,D,D,D,D,D,R,D,U,U,U,X,X,X,X,X,X,X, - /* 0860 */ X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X, + + /* Syriac Supplement */ + + /* 0860 */ D,U,D,D,D,D,U,R,D,R,R,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X, /* 0880 */ X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X, /* Arabic Extended-A */ @@ -130,7 +133,7 @@ static const uint8_t joining_table[] = /* 1E920 */ D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D, /* 1E940 */ D,D,D,D, -}; /* Table items: 1214; occupancy: 54% */ +}; /* Table items: 1214; occupancy: 55% */ static unsigned int _______________________________________________ HarfBuzz mailing list HarfBuzz@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/harfbuzz