From ac3f859a30731fcd2cf4be044d69a64cc43b5225 Mon Sep 17 00:00:00 2001 From: David Corbett Date: Wed, 9 Sep 2020 11:49:56 -0400 Subject: [PATCH] Demote unregistered vendor-specific language tags --- src/gen-tag-table.py | 12 +----------- src/hb-ot-tag-table.hh | 4 +--- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/src/gen-tag-table.py b/src/gen-tag-table.py index cea9ac735..9b5e6261e 100755 --- a/src/gen-tag-table.py +++ b/src/gen-tag-table.py @@ -676,19 +676,13 @@ ot.add_language ('ga-Latg', 'IRT') ot.remove_language_ot ('KGE') ot.add_language ('und-Geok', 'KGE') -ot.add_language ('guk', 'GUK') -ot.names['GUK'] = 'Gumuz (SIL fonts)' -ot.ranks['GUK'] = ot.ranks['GMZ'] + 1 - bcp_47.macrolanguages['id'] = {'in'} bcp_47.macrolanguages['ijo'] = {'ijc'} ot.add_language ('kht', 'KHN') ot.names['KHN'] = ot.names['KHT'] + ' (Microsoft fonts)' -ot.names['KHT'] = ot.names['KHT'] + ' (OpenType spec and SIL fonts)' -ot.ranks['KHN'] = ot.ranks['KHT'] -ot.ranks['KHT'] += 1 +ot.ranks['KHN'] = ot.ranks['KHT'] + 1 ot.ranks['LCR'] = ot.ranks['MCR'] + 1 @@ -736,10 +730,6 @@ ot.add_language ('qxw', 'QWH') bcp_47.macrolanguages['ro'].remove ('mo') bcp_47.macrolanguages['ro-MD'].add ('mo') -ot.add_language ('sgw', 'SGW') -ot.names['SGW'] = ot.names['CHG'] + ' (SIL fonts)' -ot.ranks['SGW'] = ot.ranks['CHG'] + 1 - ot.remove_language_ot ('SYRE') ot.remove_language_ot ('SYRJ') ot.remove_language_ot ('SYRN') diff --git a/src/hb-ot-tag-table.hh b/src/hb-ot-tag-table.hh index 03707742e..30d732d79 100644 --- a/src/hb-ot-tag-table.hh +++ b/src/hb-ot-tag-table.hh @@ -372,7 +372,6 @@ static const LangTag ot_languages[] = { {"gug", HB_TAG('G','U','A',' ')}, /* Paraguayan Guaraní -> Guarani */ {"gui", HB_TAG('G','U','A',' ')}, /* Eastern Bolivian Guaraní -> Guarani */ {"guk", HB_TAG('G','M','Z',' ')}, /* Gumuz */ - {"guk", HB_TAG('G','U','K',' ')}, /* Gumuz (SIL fonts) */ {"gun", HB_TAG('G','U','A',' ')}, /* Mbyá Guaraní -> Guarani */ /*{"guz", HB_TAG('G','U','Z',' ')},*/ /* Gusii */ {"gv", HB_TAG('M','N','X',' ')}, /* Manx */ @@ -484,8 +483,8 @@ static const LangTag ot_languages[] = { {"kha", HB_TAG('K','S','I',' ')}, /* Khasi */ {"khb", HB_TAG('X','B','D',' ')}, /* Lü */ {"khk", HB_TAG('M','N','G',' ')}, /* Halh Mongolian -> Mongolian */ + {"kht", HB_TAG('K','H','T',' ')}, /* Khamti -> Khamti Shan */ {"kht", HB_TAG('K','H','N',' ')}, /* Khamti -> Khamti Shan (Microsoft fonts) */ - {"kht", HB_TAG('K','H','T',' ')}, /* Khamti -> Khamti Shan (OpenType spec and SIL fonts) */ /*{"khw", HB_TAG('K','H','W',' ')},*/ /* Khowar */ {"ki", HB_TAG('K','I','K',' ')}, /* Kikuyu (Gikuyu) */ /*{"kiu", HB_TAG('K','I','U',' ')},*/ /* Kirmanjki */ @@ -856,7 +855,6 @@ static const LangTag ot_languages[] = { {"sgc", HB_TAG('K','A','L',' ')}, /* Kipsigis -> Kalenjin */ /*{"sgs", HB_TAG('S','G','S',' ')},*/ /* Samogitian */ {"sgw", HB_TAG('C','H','G',' ')}, /* Sebat Bet Gurage -> Chaha Gurage */ - {"sgw", HB_TAG('S','G','W',' ')}, /* Sebat Bet Gurage -> Chaha Gurage (SIL fonts) */ /*{"shi", HB_TAG('S','H','I',' ')},*/ /* Tachelhit */ /*{"shn", HB_TAG('S','H','N',' ')},*/ /* Shan */ {"shu", HB_TAG('A','R','A',' ')}, /* Chadian Arabic -> Arabic */