jdk-sandbox: comparison src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-tag.cc

equal deleted inserted replaced

-:e2065f7505eb
+:51772bf1fb0c
 * Red Hat Author(s): Behdad Esfahbod
 * Google Author(s): Behdad Esfahbod, Roozbeh Pournader
 */
 #include "hb-private.hh"
-#include <string.h>
 /* hb_script_t */
 static hb_tag_t
 {"ak",        HB_TAG('T','W','I',' ')},       /* Akan [macrolanguage] */
 {"aka",       HB_TAG('A','K','A',' ')},       /* Akan */
 {"alt",       HB_TAG('A','L','T',' ')},       /* [Southern] Altai */
 {"am",        HB_TAG('A','M','H',' ')},       /* Amharic */
 {"amf",       HB_TAG('H','B','N',' ')},       /* Hammer-Banna */
+{"amw",       HB_TAG('S','Y','R',' ')},       /* Western Neo-Aramaic */
 {"an",        HB_TAG('A','R','G',' ')},       /* Aragonese */
 {"ang",       HB_TAG('A','N','G',' ')},       /* Old English (ca. 450-1100) */
 {"ar",        HB_TAG('A','R','A',' ')},       /* Arabic [macrolanguage] */
 {"arb",       HB_TAG('A','R','A',' ')},       /* Standard Arabic */
 {"arn",       HB_TAG('M','A','P',' ')},       /* Mapudungun */
 {"bfu",       HB_TAG('L','A','H',' ')},       /* Lahuli */
 {"bfy",       HB_TAG('B','A','G',' ')},       /* Baghelkhandi */
 {"bg",        HB_TAG('B','G','R',' ')},       /* Bulgarian */
 {"bgc",       HB_TAG('B','G','C',' ')},       /* Haryanvi */
 {"bgq",       HB_TAG('B','G','Q',' ')},       /* Bagri */
+{"bgr",       HB_TAG('Q','I','N',' ')},       /* Bawm Chin */
 {"bhb",       HB_TAG('B','H','I',' ')},       /* Bhili */
 {"bhk",       HB_TAG('B','I','K',' ')},       /* Albay Bicolano (retired code) */
 {"bho",       HB_TAG('B','H','O',' ')},       /* Bhojpuri */
 {"bi",        HB_TAG('B','I','S',' ')},       /* Bislama */
 {"bik",       HB_TAG('B','I','K',' ')},       /* Bikol [macrolanguage] */
 {"bxr",       HB_TAG('R','B','U',' ')},       /* Russian Buriat */
 {"byn",       HB_TAG('B','I','L',' ')},       /* Bilen */
 {"ca",        HB_TAG('C','A','T',' ')},       /* Catalan */
 {"cak",       HB_TAG('C','A','K',' ')},       /* Kaqchikel */
 {"cbk",       HB_TAG('C','B','K',' ')},       /* Chavacano */
+{"cbl",       HB_TAG('Q','I','N',' ')},       /* Bualkhaw Chin */
+{"cco",       HB_TAG('C','C','H','N')},       /* Chinantec */
 {"ce",        HB_TAG('C','H','E',' ')},       /* Chechen */
 {"ceb",       HB_TAG('C','E','B',' ')},       /* Cebuano */
+{"cfm",       HB_TAG('H','A','L',' ')},       /* Halam/Falam Chin */
 {"cgg",       HB_TAG('C','G','G',' ')},       /* Chiga */
 {"ch",        HB_TAG('C','H','A',' ')},       /* Chamorro */
+{"chj",       HB_TAG('C','C','H','N')},       /* Chinantec */
 {"chk",       HB_TAG('C','H','K','0')},       /* Chuukese */
 {"cho",       HB_TAG('C','H','O',' ')},       /* Choctaw */
 {"chp",       HB_TAG('C','H','P',' ')},       /* Chipewyan */
+{"chq",       HB_TAG('C','C','H','N')},       /* Chinantec */
 {"chr",       HB_TAG('C','H','R',' ')},       /* Cherokee */
 {"chy",       HB_TAG('C','H','Y',' ')},       /* Cheyenne */
+{"chz",       HB_TAG('C','C','H','N')},       /* Chinantec */
+{"cja",       HB_TAG('C','J','A',' ')},       /* Western Cham */
+{"cjm",       HB_TAG('C','J','M',' ')},       /* Eastern Cham */
+{"cka",       HB_TAG('Q','I','N',' ')},       /* Khumi Awa Chin */
 {"ckb",       HB_TAG('K','U','R',' ')},       /* Central Kurdish (Sorani) */
 {"ckt",       HB_TAG('C','H','K',' ')},       /* Chukchi */
+{"cld",       HB_TAG('S','Y','R',' ')},       /* Chaldean Neo-Aramaic */
+{"cle",       HB_TAG('C','C','H','N')},       /* Chinantec */
+{"cmr",       HB_TAG('Q','I','N',' ')},       /* Mro-Khimi Chin */
+{"cnb",       HB_TAG('Q','I','N',' ')},       /* Chinbon Chin */
+{"cnh",       HB_TAG('Q','I','N',' ')},       /* Hakha Chin */
+{"cnk",       HB_TAG('Q','I','N',' ')},       /* Khumi Chin */
+{"cnl",       HB_TAG('C','C','H','N')},       /* Chinantec */
+{"cnt",       HB_TAG('C','C','H','N')},       /* Chinantec */
+{"cnw",       HB_TAG('Q','I','N',' ')},       /* Ngawn Chin */
 {"cop",       HB_TAG('C','O','P',' ')},       /* Coptic */
+{"cpa",       HB_TAG('C','C','H','N')},       /* Chinantec */
 {"cpp",       HB_TAG('C','P','P',' ')},       /* Creoles */
 {"cr",        HB_TAG('C','R','E',' ')},       /* Cree */
 {"cre",       HB_TAG('Y','C','R',' ')},       /* Y-Cree */
 {"crh",       HB_TAG('C','R','T',' ')},       /* Crimean Tatar */
 {"crj",       HB_TAG('E','C','R',' ')},       /* [Southern] East Cree */
 {"crk",       HB_TAG('W','C','R',' ')},       /* West-Cree */
 {"crl",       HB_TAG('E','C','R',' ')},       /* [Northern] East Cree */
 {"crm",       HB_TAG('M','C','R',' ')},       /* Moose Cree */
 {"crx",       HB_TAG('C','R','R',' ')},       /* Carrier */
 {"cs",        HB_TAG('C','S','Y',' ')},       /* Czech */
+{"csa",       HB_TAG('C','C','H','N')},       /* Chinantec */
 {"csb",       HB_TAG('C','S','B',' ')},       /* Kashubian */
+{"csh",       HB_TAG('Q','I','N',' ')},       /* Asho Chin */
+{"cso",       HB_TAG('C','C','H','N')},       /* Chinantec */
+{"csy",       HB_TAG('Q','I','N',' ')},       /* Siyin Chin */
+{"ctd",       HB_TAG('Q','I','N',' ')},       /* Tedim Chin */
+{"cte",       HB_TAG('C','C','H','N')},       /* Chinantec */
 {"ctg",       HB_TAG('C','T','G',' ')},       /* Chittagonian */
+{"ctl",       HB_TAG('C','C','H','N')},       /* Chinantec */
 {"cts",       HB_TAG('B','I','K',' ')},       /* Northern Catanduanes Bikol */
 {"cu",        HB_TAG('C','S','L',' ')},       /* Church Slavic */
+{"cuc",       HB_TAG('C','C','H','N')},       /* Chinantec */
 {"cuk",       HB_TAG('C','U','K',' ')},       /* San Blas Kuna */
 {"cv",        HB_TAG('C','H','U',' ')},       /* Chuvash */
+{"cvn",       HB_TAG('C','C','H','N')},       /* Chinantec */
 {"cwd",       HB_TAG('D','C','R',' ')},       /* Woods Cree */
 {"cy",        HB_TAG('W','E','L',' ')},       /* Welsh */
+{"czt",       HB_TAG('Q','I','N',' ')},       /* Zotung Chin */
 {"da",        HB_TAG('D','A','N',' ')},       /* Danish */
+{"dao",       HB_TAG('Q','I','N',' ')},       /* Daai Chin */
 {"dap",       HB_TAG('N','I','S',' ')},       /* Nisi (India) */
 {"dar",       HB_TAG('D','A','R',' ')},       /* Dargwa */
 {"dax",       HB_TAG('D','A','X',' ')},       /* Dayi */
 {"de",        HB_TAG('D','E','U',' ')},       /* German */
 {"dgo",       HB_TAG('D','G','O',' ')},       /* Dogri */
 {"fat",       HB_TAG('F','A','T',' ')},       /* Fanti */
 {"ff",        HB_TAG('F','U','L',' ')},       /* Fulah [macrolanguage] */
 {"fi",        HB_TAG('F','I','N',' ')},       /* Finnish */
 {"fil",       HB_TAG('P','I','L',' ')},       /* Filipino */
 {"fj",        HB_TAG('F','J','I',' ')},       /* Fijian */
-{"flm",       HB_TAG('H','A','L',' ')},       /* Halam */
+{"flm",       HB_TAG('H','A','L',' ')},       /* Halam/Falam Chin [retired ISO639 code] */
 {"fo",        HB_TAG('F','O','S',' ')},       /* Faroese */
 {"fon",       HB_TAG('F','O','N',' ')},       /* Fon */
 {"fr",        HB_TAG('F','R','A',' ')},       /* French */
 {"frc",       HB_TAG('F','R','C',' ')},       /* Cajun French */
 {"frp",       HB_TAG('F','R','P',' ')},       /* Arpitan/Francoprovençal */
 {"gih",       HB_TAG('G','I','H',' ')},       /* Githabul */
 {"gil",       HB_TAG('G','I','L','0')},       /* Kiribati (Gilbertese) */
 {"gkp",       HB_TAG('G','K','P',' ')},       /* Kpelle (Guinea) */
 {"gl",        HB_TAG('G','A','L',' ')},       /* Galician */
 {"gld",       HB_TAG('N','A','N',' ')},       /* Nanai */
-{"gle",       HB_TAG('I','R','T',' ')},       /* Irish Traditional */
 {"glk",       HB_TAG('G','L','K',' ')},       /* Gilaki */
 {"gn",        HB_TAG('G','U','A',' ')},       /* Guarani [macrolanguage] */
 {"gnn",       HB_TAG('G','N','N',' ')},       /* Gumatj */
 {"gno",       HB_TAG('G','O','N',' ')},       /* Northern Gondi */
 {"gog",       HB_TAG('G','O','G',' ')},       /* Gogo */
 {"hay",       HB_TAG('H','A','Y',' ')},       /* Haya */
 {"haz",       HB_TAG('H','A','Z',' ')},       /* Hazaragi */
 {"he",        HB_TAG('I','W','R',' ')},       /* Hebrew */
 {"hi",        HB_TAG('H','I','N',' ')},       /* Hindi */
 {"hil",       HB_TAG('H','I','L',' ')},       /* Hiligaynon */
+{"hlt",       HB_TAG('Q','I','N',' ')},       /* Matu Chin */
 {"hmn",       HB_TAG('H','M','N',' ')},       /* Hmong */
 {"hnd",       HB_TAG('H','N','D',' ')},       /* [Southern] Hindko */
 {"hne",       HB_TAG('C','H','H',' ')},       /* Chattisgarhi */
 {"hno",       HB_TAG('H','N','D',' ')},       /* [Northern] Hindko */
 {"ho",        HB_TAG('H','M','O',' ')},       /* Hiri Motu */
 {"lzz",       HB_TAG('L','A','Z',' ')},       /* Laz */
 {"mad",       HB_TAG('M','A','D',' ')},       /* Madurese */
 {"mag",       HB_TAG('M','A','G',' ')},       /* Magahi */
 {"mai",       HB_TAG('M','T','H',' ')},       /* Maithili */
 {"mak",       HB_TAG('M','K','R',' ')},       /* Makasar */
-{"mal",       HB_TAG('M','A','L',' ')},       /* Malayalam */
 {"mam",       HB_TAG('M','A','M',' ')},       /* Mam */
 {"man",       HB_TAG('M','N','K',' ')},       /* Manding/Mandingo [macrolanguage] */
 {"mdc",       HB_TAG('M','L','E',' ')},       /* Male (Papua New Guinea) */
 {"mdf",       HB_TAG('M','O','K',' ')},       /* Moksha */
 {"mdr",       HB_TAG('M','D','R',' ')},       /* Mandar */
 {"mo",        HB_TAG('M','O','L',' ')},       /* Moldavian */
 {"moh",       HB_TAG('M','O','H',' ')},       /* Mohawk */
 {"mos",       HB_TAG('M','O','S',' ')},       /* Mossi */
 {"mpe",       HB_TAG('M','A','J',' ')},       /* Majang */
 {"mr",        HB_TAG('M','A','R',' ')},       /* Marathi */
+{"mrh",       HB_TAG('Q','I','N',' ')},       /* Mara Chin */
 {"mrj",       HB_TAG('H','M','A',' ')},       /* High Mari */
 {"ms",        HB_TAG('M','L','Y',' ')},       /* Malay [macrolanguage] */
 {"msc",       HB_TAG('M','N','K',' ')},       /* Sankaran Maninka */
 {"mt",        HB_TAG('M','T','S',' ')},       /* Maltese */
 {"mtr",       HB_TAG('M','A','W',' ')},       /* Mewari */
 {"pap",       HB_TAG('P','A','P','0')},       /* Papiamento */
 {"pau",       HB_TAG('P','A','U',' ')},       /* Palauan */
 {"pcc",       HB_TAG('P','C','C',' ')},       /* Bouyei */
 {"pcd",       HB_TAG('P','C','D',' ')},       /* Picard */
 {"pce",       HB_TAG('P','L','G',' ')},       /* [Ruching] Palaung */
+{"pck",       HB_TAG('Q','I','N',' ')},       /* Paite Chin */
 {"pdc",       HB_TAG('P','D','C',' ')},       /* Pennsylvania German */
 {"pes",       HB_TAG('F','A','R',' ')},       /* Iranian Persian */
 {"phk",       HB_TAG('P','H','K',' ')},       /* Phake */
 {"pi",        HB_TAG('P','A','L',' ')},       /* Pali */
 {"pih",       HB_TAG('P','I','H',' ')},       /* Pitcairn-Norfolk */
 {"scs",       HB_TAG('S','L','A',' ')},       /* [North] Slavey */
 {"sd",        HB_TAG('S','N','D',' ')},       /* Sindhi */
 {"se",        HB_TAG('N','S','M',' ')},       /* Northern Sami */
 {"seh",       HB_TAG('S','N','A',' ')},       /* Sena */
 {"sel",       HB_TAG('S','E','L',' ')},       /* Selkup */
+{"sez",       HB_TAG('Q','I','N',' ')},       /* Senthang Chin */
 {"sg",        HB_TAG('S','G','O',' ')},       /* Sango */
 {"sga",       HB_TAG('S','G','A',' ')},       /* Old Irish (to 900) */
 {"sgs",       HB_TAG('S','G','S',' ')},       /* Samogitian */
 {"sgw",       HB_TAG('C','H','G',' ')},       /* Sebat Bet Gurage */
 /*{"sgw",       HB_TAG('S','G','W',' ')},*/     /* Sebat Bet Gurage (in SIL fonts) */
 {"sw",        HB_TAG('S','W','K',' ')},       /* Swahili [macrolanguage] */
 {"swb",       HB_TAG('C','M','R',' ')},       /* Comorian */
 {"swh",       HB_TAG('S','W','K',' ')},       /* Kiswahili/Swahili */
 {"swv",       HB_TAG('M','A','W',' ')},       /* Shekhawati */
 {"sxu",       HB_TAG('S','X','U',' ')},       /* Upper Saxon */
+{"syc",       HB_TAG('S','Y','R',' ')},       /* Classical Syriac */
 {"syl",       HB_TAG('S','Y','L',' ')},       /* Sylheti */
 {"syr",       HB_TAG('S','Y','R',' ')},       /* Syriac [macrolanguage] */
 {"szl",       HB_TAG('S','Z','L',' ')},       /* Silesian */
 {"ta",        HB_TAG('T','A','M',' ')},       /* Tamil */
 {"tab",       HB_TAG('T','A','B',' ')},       /* Tabasaran */
+{"tcp",       HB_TAG('Q','I','N',' ')},       /* Tawr Chin */
 {"tcy",       HB_TAG('T','U','L',' ')},       /* Tulu */
+{"tcz",       HB_TAG('Q','I','N',' ')},       /* Thado Chin */
 {"tdd",       HB_TAG('T','D','D',' ')},       /* Tai Nüa */
 {"te",        HB_TAG('T','E','L',' ')},       /* Telugu */
 {"tem",       HB_TAG('T','M','N',' ')},       /* Temne */
 {"tet",       HB_TAG('T','E','T',' ')},       /* Tetum */
 {"tg",        HB_TAG('T','A','J',' ')},       /* Tajik */
 {"xwo",       HB_TAG('T','O','D',' ')},       /* Written Oirat (Todo) */
 {"yao",       HB_TAG('Y','A','O',' ')},       /* Yao */
 {"yap",       HB_TAG('Y','A','P',' ')},       /* Yapese */
 {"yi",        HB_TAG('J','I','I',' ')},       /* Yiddish [macrolanguage] */
 {"yo",        HB_TAG('Y','B','A',' ')},       /* Yoruba */
+{"yos",       HB_TAG('Q','I','N',' ')},       /* Yos, deprecated by IANA in favor of Zou [zom] */
 {"yso",       HB_TAG('N','I','S',' ')},       /* Nisi (China) */
 {"za",        HB_TAG('Z','H','A',' ')},       /* Chuang/Zhuang [macrolanguage] */
 {"zea",       HB_TAG('Z','E','A',' ')},       /* Zeeuws */
 {"zgh",       HB_TAG('Z','G','H',' ')},       /* Standard Morrocan Tamazigh */
 {"zne",       HB_TAG('Z','N','D',' ')},       /* Zande */
+{"zom",       HB_TAG('Q','I','N',' ')},       /* Zou */
 {"zu",        HB_TAG('Z','U','L',' ')},       /* Zulu */
 {"zum",       HB_TAG('L','R','C',' ')},       /* Kumzari */
 {"zza",       HB_TAG('Z','Z','A',' ')},       /* Zazaki */
 /* The corresponding languages IDs for the following IDs are unclear,
 {"zh-hant-mo",HB_TAG('Z','H','H',' ')},       /* Chinese (Macao) */
 {"zh-hant",   HB_TAG('Z','H','T',' ')},       /* Chinese (Traditional) */
 };
 static int
-lang_compare_first_component (const char *a,
+lang_compare_first_component (const void *pa,
-const char *b)
+const void *pb)
 {
+const char *a = (const char *) pa;
+const char *b = (const char *) pb;
 unsigned int da, db;
 const char *p;
 p = strchr (a, '-');
 da = p ? (unsigned int) (p - a) : strlen (a);
 for (i = 0; i < 4 && ISALPHA (s[i]); i++)
 tag[i] = TOUPPER (s[i]);
 if (i) {
 for (; i < 4; i++)
 tag[i] = ' ';
-return HB_TAG_CHAR4 (tag);
+return HB_TAG (tag[0], tag[1], tag[2], tag[3]);
 }
 }
 /*
 * "fonipa" is a variant tag in BCP-47, meaning the International Phonetic Alphabet.
 */
 if (strstr (lang_str, "-fonnapa")) {
 return HB_TAG('A','P','P','H');  /* Phonetic transcription—Americanist conventions */
 }
+/*
+* "Syre" is a BCP-47 script tag, meaning the Estrangela variant of the Syriac script.
+* It can be applied to any language.
+*/
+if (strstr (lang_str, "-syre")) {
+return HB_TAG('S','Y','R','E');  /* Estrangela Syriac */
+}
+/*
+* "Syrj" is a BCP-47 script tag, meaning the Western variant of the Syriac script.
+* It can be applied to any language.
+*/
+if (strstr (lang_str, "-syrj")) {
+return HB_TAG('S','Y','R','J');  /* Western Syriac */
+}
+/*
+* "Syrn" is a BCP-47 script tag, meaning the Eastern variant of the Syriac script.
+* It can be applied to any language.
+*/
+if (strstr (lang_str, "-syrn")) {
+return HB_TAG('S','Y','R','N');  /* Eastern Syriac */
+}
 /* Find a language matching in the first component */
 {
 const LangTag *lang_tag;
 lang_tag = (LangTag *) bsearch (lang_str, ot_languages,
 ARRAY_LENGTH (ot_languages), sizeof (LangTag),
-(hb_compare_func_t) lang_compare_first_component);
+lang_compare_first_component);
 if (lang_tag)
 return lang_tag->tag;
 }
 /* Otherwise, check the Chinese ones */
 }
 /**
 * hb_ot_tag_to_language:
 *
 *
 *
 * Return value: (transfer none):
 *
 * Since: 0.9.2
 **/
 hb_ot_tag_to_language (hb_tag_t tag)
 {
 unsigned int i;
 if (tag == HB_OT_TAG_DEFAULT_LANGUAGE)
-return NULL;
+return nullptr;
+/* struct LangTag has only room for 3-letter language tags. */
+switch (tag) {
+case HB_TAG('A','P','P','H'):  /* Phonetic transcription—Americanist conventions */
+return hb_language_from_string ("und-fonnapa", -1);
+case HB_TAG('I','P','P','H'):  /* Phonetic transcription—IPA conventions */
+return hb_language_from_string ("und-fonipa", -1);
+case HB_TAG('S','Y','R',' '):  /* Syriac [macrolanguage] */
+return hb_language_from_string ("syr", -1);
+case HB_TAG('S','Y','R','E'):  /* Estrangela Syriac */
+return hb_language_from_string ("und-Syre", -1);
+case HB_TAG('S','Y','R','J'):  /* Western Syriac */
+return hb_language_from_string ("und-Syrj", -1);
+case HB_TAG('S','Y','R','N'):  /* Eastern Syriac */
+return hb_language_from_string ("und-Syrn", -1);
+}
 for (i = 0; i < ARRAY_LENGTH (ot_languages); i++)
 if (ot_languages[i].tag == tag)
 return hb_language_from_string (ot_languages[i].language, -1);
 case HB_TAG('Z','H','H',' '): return hb_language_from_string ("zh-hk", -1); /* Hong Kong */
 case HB_TAG('Z','H','S',' '): return hb_language_from_string ("zh-Hans", -1); /* Simplified */
 case HB_TAG('Z','H','T',' '): return hb_language_from_string ("zh-Hant", -1); /* Traditional */
 default: break; /* Fall through */
 }
-}
-/* struct LangTag has only room for 3-letter language tags. */
-switch (tag) {
-case HB_TAG('A','P','P','H'):  /* Phonetic transcription—Americanist conventions */
-return hb_language_from_string ("und-fonnapa", -1);
-case HB_TAG('I','P','P','H'):  /* Phonetic transcription—IPA conventions */
-return hb_language_from_string ("und-fonipa", -1);
 }
 /* Else return a custom language in the form of "x-hbotABCD" */
 {
 unsigned char buf[11] = "x-hbot";

changeset 48274	51772bf1fb0c
parent 47216	71c04702a3d5
child 50352	25db2c8f3cf8