Merge pull request #2660 from harfbuzz/arabic-shaping-in-use

[USE] Fix assertion failure for joining scripts
This commit is contained in:
Khaled Hosny 2020-08-29 00:14:01 +03:00 committed by GitHub
commit c0a76cb519
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 2 deletions

View File

@ -54,6 +54,8 @@ def read_joining_uu (f):
fields = [x.strip () for x in line.split (';')] fields = [x.strip () for x in line.split (';')]
if len (fields) == 1: if len (fields) == 1:
continue continue
if fields[2] in {'T', 'U'}:
continue
values.add (int (fields[0], 16)) values.add (int (fields[0], 16))

View File

@ -25,7 +25,6 @@ has_arabic_joining (hb_script_t script)
case HB_SCRIPT_ARABIC: case HB_SCRIPT_ARABIC:
case HB_SCRIPT_CHORASMIAN: case HB_SCRIPT_CHORASMIAN:
case HB_SCRIPT_HANIFI_ROHINGYA: case HB_SCRIPT_HANIFI_ROHINGYA:
case HB_SCRIPT_KAITHI:
case HB_SCRIPT_MANDAIC: case HB_SCRIPT_MANDAIC:
case HB_SCRIPT_MANICHAEAN: case HB_SCRIPT_MANICHAEAN:
case HB_SCRIPT_MONGOLIAN: case HB_SCRIPT_MONGOLIAN:

View File

@ -36,7 +36,7 @@
#include "hb-ot-shape-complex-vowel-constraints.hh" #include "hb-ot-shape-complex-vowel-constraints.hh"
/* buffer var allocations */ /* buffer var allocations */
#define use_category() complex_var_u8_0() #define use_category() complex_var_u8_1()
/* /*

View File

@ -12,3 +12,4 @@
../fonts/4afb0e8b9a86bb9bd73a1247de4e33fbe3c1fd93.ttf::U+1C00,U+1C27,U+1C28,U+1C34,U+1C35:[uni1C35=0+500|uni1C34=0+500|uni1C28=0+500|uni1C27=0+500|uni1C00=0+500] ../fonts/4afb0e8b9a86bb9bd73a1247de4e33fbe3c1fd93.ttf::U+1C00,U+1C27,U+1C28,U+1C34,U+1C35:[uni1C35=0+500|uni1C34=0+500|uni1C28=0+500|uni1C27=0+500|uni1C00=0+500]
../fonts/4afb0e8b9a86bb9bd73a1247de4e33fbe3c1fd93.ttf::U+0D4E,U+0D15,U+0D4D,U+0D15,U+0D46:[uni0D15=0+500|uni0D4E=0+500|uni0D4D=0+500|uni0D46=3+500|uni0D15=3+500] ../fonts/4afb0e8b9a86bb9bd73a1247de4e33fbe3c1fd93.ttf::U+0D4E,U+0D15,U+0D4D,U+0D15,U+0D46:[uni0D15=0+500|uni0D4E=0+500|uni0D4D=0+500|uni0D46=3+500|uni0D15=3+500]
../fonts/4afb0e8b9a86bb9bd73a1247de4e33fbe3c1fd93.ttf::U+1102D,U+11046,U+11013,U+11046,U+11013,U+11046:[u11013=0+500|u11046_u11013=0+500|u1102D_u11046=0+500|u11046=0+500] ../fonts/4afb0e8b9a86bb9bd73a1247de4e33fbe3c1fd93.ttf::U+1102D,U+11046,U+11013,U+11046,U+11013,U+11046:[u11013=0+500|u11046_u11013=0+500|u1102D_u11046=0+500|u11046=0+500]
../fonts/4afb0e8b9a86bb9bd73a1247de4e33fbe3c1fd93.ttf::U+11083:[.notdef=0+500]