diff options
Diffstat (limited to 'Build/source/libs/harfbuzz/harfbuzz-src/src/gen-tag-table.py')
-rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-src/src/gen-tag-table.py | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/gen-tag-table.py b/Build/source/libs/harfbuzz/harfbuzz-src/src/gen-tag-table.py index 4769ee809fa..451949fe30b 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-src/src/gen-tag-table.py +++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/gen-tag-table.py @@ -699,8 +699,6 @@ ot.add_language ('ber', 'BBR') ot.remove_language_ot ('PGR') ot.add_language ('el-polyton', 'PGR') -bcp_47.macrolanguages['et'] = {'ekk'} - bcp_47.names['flm'] = 'Falam Chin' bcp_47.scopes['flm'] = ' (retired code)' bcp_47.macrolanguages['flm'] = {'cfm'} @@ -711,7 +709,6 @@ ot.add_language ('und-fonipa', 'IPPH') ot.add_language ('und-fonnapa', 'APPH') -ot.remove_language_ot ('IRT') ot.add_language ('ga-Latg', 'IRT') ot.add_language ('hy-arevmda', 'HYE') @@ -719,10 +716,6 @@ ot.add_language ('hy-arevmda', 'HYE') ot.remove_language_ot ('KGE') ot.add_language ('und-Geok', 'KGE') -bcp_47.macrolanguages['id'] = {'in'} - -bcp_47.macrolanguages['ijo'] = {'ijc'} - ot.add_language ('kht', 'KHN') ot.names['KHN'] = ot.names['KHT'] + ' (Microsoft fonts)' ot.ranks['KHN'] = ot.ranks['KHT'] + 1 @@ -809,8 +802,6 @@ ot.add_language ('lzh-Hans', 'ZHS') ot.add_language ('yue', 'ZHH') ot.add_language ('yue-Hans', 'ZHS') -bcp_47.macrolanguages['zom'] = {'yos'} - def rank_delta (bcp_47, ot): """Return a delta to apply to a BCP 47 tag's rank. @@ -1188,7 +1179,11 @@ def verify_disambiguation_dict (): if len (macrolanguages) != 1: macrolanguages = list (t for t in primary_tags if 'retired code' not in bcp_47.scopes.get (t, '')) if len (macrolanguages) != 1: - expect (ot_tag in disambiguation, 'ambiguous OT tag: %s %s' % (ot_tag, str (macrolanguages))) + macrolanguages = list (t for t in primary_tags if t.lower () == ISO_639_3_TO_1.get (ot_tag.lower (), ot_tag.lower ())) + if len (macrolanguages) != 1: + macrolanguages = list (t for t in primary_tags if '-' not in t) + if len (macrolanguages) != 1: + expect (ot_tag in disambiguation, 'ambiguous OT tag: %s %s' % (ot_tag, sorted (primary_tags))) expect (disambiguation[ot_tag] in bcp_47_tags, '%s is not a valid disambiguation for %s' % (disambiguation[ot_tag], ot_tag)) elif ot_tag not in disambiguation: |