walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix names for language tag in gen-tag-table.py 

A BCP 47 language tag with both a script subtag and a region subtag
would be printed as a human-readable name in hb-ot-tag-table.hh as if it
only had its language subtag.
This commit is contained in:
David Corbett 2020-10-28 18:02:55 -04:00 committed by Behdad Esfahbod
parent 5091ea7e24
commit 27170e058d
2 changed files with 73 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/gen-tag-table.py
View File

@ -995,22 +995,24 @@ for initial, items in sorted (complex_tags.items ()):
print (" case '%s':" % initial) print (" case '%s':" % initial)
for lt, tags in items: for lt, tags in items:
print (' if (', end='') print (' if (', end='')
script = lt.script
region = lt.region
if lt.grandfathered: if lt.grandfathered:
print ('0 == strcmp (&lang_str[1], "%s")' % lt.language[1:], end='') print ('0 == strcmp (&lang_str[1], "%s")' % lt.language[1:], end='')
else: else:
string_literal = lt.language[1:] + '-' string_literal = lt.language[1:] + '-'
if lt.script: if script:
string_literal += lt.script string_literal += script
lt.script = None script = None
if lt.region: if region:
string_literal += '-' + lt.region string_literal += '-' + region
lt.region = None region = None
if string_literal[-1] == '-': if string_literal[-1] == '-':
print ('0 == strncmp (&lang_str[1], "%s", %i)' % (string_literal, len (string_literal)), end='') print ('0 == strncmp (&lang_str[1], "%s", %i)' % (string_literal, len (string_literal)), end='')
else: else:
print ('lang_matches (&lang_str[1], "%s")' % string_literal, end='') print ('lang_matches (&lang_str[1], "%s")' % string_literal, end='')
print_subtag_matches (lt.script, True) print_subtag_matches (script, True)
print_subtag_matches (lt.region, True) print_subtag_matches (region, True)
print_subtag_matches (lt.variant, True) print_subtag_matches (lt.variant, True)
print (')') print (')')
print (' {') print (' {')

126
src/hb-ot-tag-table.hh
View File

@ -1227,224 +1227,224 @@ hb_ot_tags_from_complex_language (const char *lang_str,
case 'c': case 'c':
if (lang_matches (&lang_str[1], "do-hant-hk")) if (lang_matches (&lang_str[1], "do-hant-hk"))
{ {
/* Min Dong Chinese */ /* Min Dong Chinese; Han (Traditional variant); Hong Kong */
tags[0] = HB_TAG('Z','H','H',' '); /* Chinese, Hong Kong SAR */ tags[0] = HB_TAG('Z','H','H',' '); /* Chinese, Hong Kong SAR */
*count = 1; *count = 1;
return true; return true;
} }
if (lang_matches (&lang_str[1], "do-hant-mo")) if (lang_matches (&lang_str[1], "do-hant-mo"))
{ {
/* Min Dong Chinese */ /* Min Dong Chinese; Han (Traditional variant); Macao */
tags[0] = HB_TAG('Z','H','H',' '); /* Chinese, Hong Kong SAR */ tags[0] = HB_TAG('Z','H','H',' '); /* Chinese, Hong Kong SAR */
*count = 1; *count = 1;
return true; return true;
} }
if (lang_matches (&lang_str[1], "jy-hant-hk")) if (lang_matches (&lang_str[1], "jy-hant-hk"))
{ {
/* Jinyu Chinese */ /* Jinyu Chinese; Han (Traditional variant); Hong Kong */
tags[0] = HB_TAG('Z','H','H',' '); /* Chinese, Hong Kong SAR */ tags[0] = HB_TAG('Z','H','H',' '); /* Chinese, Hong Kong SAR */
*count = 1; *count = 1;
return true; return true;
} }
if (lang_matches (&lang_str[1], "jy-hant-mo")) if (lang_matches (&lang_str[1], "jy-hant-mo"))
{ {
/* Jinyu Chinese */ /* Jinyu Chinese; Han (Traditional variant); Macao */
tags[0] = HB_TAG('Z','H','H',' '); /* Chinese, Hong Kong SAR */ tags[0] = HB_TAG('Z','H','H',' '); /* Chinese, Hong Kong SAR */
*count = 1; *count = 1;
return true; return true;
} }
if (lang_matches (&lang_str[1], "mn-hant-hk")) if (lang_matches (&lang_str[1], "mn-hant-hk"))
{ {
/* Mandarin Chinese */ /* Mandarin Chinese; Han (Traditional variant); Hong Kong */
tags[0] = HB_TAG('Z','H','H',' '); /* Chinese, Hong Kong SAR */ tags[0] = HB_TAG('Z','H','H',' '); /* Chinese, Hong Kong SAR */
*count = 1; *count = 1;
return true; return true;
} }
if (lang_matches (&lang_str[1], "mn-hant-mo")) if (lang_matches (&lang_str[1], "mn-hant-mo"))
{ {
/* Mandarin Chinese */ /* Mandarin Chinese; Han (Traditional variant); Macao */
tags[0] = HB_TAG('Z','H','H',' '); /* Chinese, Hong Kong SAR */ tags[0] = HB_TAG('Z','H','H',' '); /* Chinese, Hong Kong SAR */
*count = 1; *count = 1;
return true; return true;
} }
if (lang_matches (&lang_str[1], "np-hant-hk")) if (lang_matches (&lang_str[1], "np-hant-hk"))
{ {
/* Northern Ping Chinese */ /* Northern Ping Chinese; Han (Traditional variant); Hong Kong */
tags[0] = HB_TAG('Z','H','H',' '); /* Chinese, Hong Kong SAR */ tags[0] = HB_TAG('Z','H','H',' '); /* Chinese, Hong Kong SAR */
*count = 1; *count = 1;
return true; return true;
} }
if (lang_matches (&lang_str[1], "np-hant-mo")) if (lang_matches (&lang_str[1], "np-hant-mo"))
{ {
/* Northern Ping Chinese */ /* Northern Ping Chinese; Han (Traditional variant); Macao */
tags[0] = HB_TAG('Z','H','H',' '); /* Chinese, Hong Kong SAR */ tags[0] = HB_TAG('Z','H','H',' '); /* Chinese, Hong Kong SAR */
*count = 1; *count = 1;
return true; return true;
} }
if (lang_matches (&lang_str[1], "px-hant-hk")) if (lang_matches (&lang_str[1], "px-hant-hk"))
{ {
/* Pu-Xian Chinese */ /* Pu-Xian Chinese; Han (Traditional variant); Hong Kong */
tags[0] = HB_TAG('Z','H','H',' '); /* Chinese, Hong Kong SAR */ tags[0] = HB_TAG('Z','H','H',' '); /* Chinese, Hong Kong SAR */
*count = 1; *count = 1;
return true; return true;
} }
if (lang_matches (&lang_str[1], "px-hant-mo")) if (lang_matches (&lang_str[1], "px-hant-mo"))
{ {
/* Pu-Xian Chinese */ /* Pu-Xian Chinese; Han (Traditional variant); Macao */
tags[0] = HB_TAG('Z','H','H',' '); /* Chinese, Hong Kong SAR */ tags[0] = HB_TAG('Z','H','H',' '); /* Chinese, Hong Kong SAR */
*count = 1; *count = 1;
return true; return true;
} }
if (lang_matches (&lang_str[1], "sp-hant-hk")) if (lang_matches (&lang_str[1], "sp-hant-hk"))
{ {
/* Southern Ping Chinese */ /* Southern Ping Chinese; Han (Traditional variant); Hong Kong */
tags[0] = HB_TAG('Z','H','H',' '); /* Chinese, Hong Kong SAR */ tags[0] = HB_TAG('Z','H','H',' '); /* Chinese, Hong Kong SAR */
*count = 1; *count = 1;
return true; return true;
} }
if (lang_matches (&lang_str[1], "sp-hant-mo")) if (lang_matches (&lang_str[1], "sp-hant-mo"))
{ {
/* Southern Ping Chinese */ /* Southern Ping Chinese; Han (Traditional variant); Macao */
tags[0] = HB_TAG('Z','H','H',' '); /* Chinese, Hong Kong SAR */ tags[0] = HB_TAG('Z','H','H',' '); /* Chinese, Hong Kong SAR */
*count = 1; *count = 1;
return true; return true;
} }
if (lang_matches (&lang_str[1], "zh-hant-hk")) if (lang_matches (&lang_str[1], "zh-hant-hk"))
{ {
/* Huizhou Chinese */ /* Huizhou Chinese; Han (Traditional variant); Hong Kong */
tags[0] = HB_TAG('Z','H','H',' '); /* Chinese, Hong Kong SAR */ tags[0] = HB_TAG('Z','H','H',' '); /* Chinese, Hong Kong SAR */
*count = 1; *count = 1;
return true; return true;
} }
if (lang_matches (&lang_str[1], "zh-hant-mo")) if (lang_matches (&lang_str[1], "zh-hant-mo"))
{ {
/* Huizhou Chinese */ /* Huizhou Chinese; Han (Traditional variant); Macao */
tags[0] = HB_TAG('Z','H','H',' '); /* Chinese, Hong Kong SAR */ tags[0] = HB_TAG('Z','H','H',' '); /* Chinese, Hong Kong SAR */
*count = 1; *count = 1;
return true; return true;
} }
if (lang_matches (&lang_str[1], "zo-hant-hk")) if (lang_matches (&lang_str[1], "zo-hant-hk"))
{ {
/* Min Zhong Chinese */ /* Min Zhong Chinese; Han (Traditional variant); Hong Kong */
tags[0] = HB_TAG('Z','H','H',' '); /* Chinese, Hong Kong SAR */ tags[0] = HB_TAG('Z','H','H',' '); /* Chinese, Hong Kong SAR */
*count = 1; *count = 1;
return true; return true;
} }
if (lang_matches (&lang_str[1], "zo-hant-mo")) if (lang_matches (&lang_str[1], "zo-hant-mo"))
{ {
/* Min Zhong Chinese */ /* Min Zhong Chinese; Han (Traditional variant); Macao */
tags[0] = HB_TAG('Z','H','H',' '); /* Chinese, Hong Kong SAR */ tags[0] = HB_TAG('Z','H','H',' '); /* Chinese, Hong Kong SAR */
*count = 1; *count = 1;
return true; return true;
} }
if (lang_matches (&lang_str[1], "do-hans")) if (lang_matches (&lang_str[1], "do-hans"))
{ {
/* Min Dong Chinese */ /* Min Dong Chinese; Han (Simplified variant) */
tags[0] = HB_TAG('Z','H','S',' '); /* Chinese Simplified */ tags[0] = HB_TAG('Z','H','S',' '); /* Chinese Simplified */
*count = 1; *count = 1;
return true; return true;
} }
if (lang_matches (&lang_str[1], "do-hant")) if (lang_matches (&lang_str[1], "do-hant"))
{ {
/* Min Dong Chinese */ /* Min Dong Chinese; Han (Traditional variant) */
tags[0] = HB_TAG('Z','H','T',' '); /* Chinese Traditional */ tags[0] = HB_TAG('Z','H','T',' '); /* Chinese Traditional */
*count = 1; *count = 1;
return true; return true;
} }
if (lang_matches (&lang_str[1], "jy-hans")) if (lang_matches (&lang_str[1], "jy-hans"))
{ {
/* Jinyu Chinese */ /* Jinyu Chinese; Han (Simplified variant) */
tags[0] = HB_TAG('Z','H','S',' '); /* Chinese Simplified */ tags[0] = HB_TAG('Z','H','S',' '); /* Chinese Simplified */
*count = 1; *count = 1;
return true; return true;
} }
if (lang_matches (&lang_str[1], "jy-hant")) if (lang_matches (&lang_str[1], "jy-hant"))
{ {
/* Jinyu Chinese */ /* Jinyu Chinese; Han (Traditional variant) */
tags[0] = HB_TAG('Z','H','T',' '); /* Chinese Traditional */ tags[0] = HB_TAG('Z','H','T',' '); /* Chinese Traditional */
*count = 1; *count = 1;
return true; return true;
} }
if (lang_matches (&lang_str[1], "mn-hans")) if (lang_matches (&lang_str[1], "mn-hans"))
{ {
/* Mandarin Chinese */ /* Mandarin Chinese; Han (Simplified variant) */
tags[0] = HB_TAG('Z','H','S',' '); /* Chinese Simplified */ tags[0] = HB_TAG('Z','H','S',' '); /* Chinese Simplified */
*count = 1; *count = 1;
return true; return true;
} }
if (lang_matches (&lang_str[1], "mn-hant")) if (lang_matches (&lang_str[1], "mn-hant"))
{ {
/* Mandarin Chinese */ /* Mandarin Chinese; Han (Traditional variant) */
tags[0] = HB_TAG('Z','H','T',' '); /* Chinese Traditional */ tags[0] = HB_TAG('Z','H','T',' '); /* Chinese Traditional */
*count = 1; *count = 1;
return true; return true;
} }
if (lang_matches (&lang_str[1], "np-hans")) if (lang_matches (&lang_str[1], "np-hans"))
{ {
/* Northern Ping Chinese */ /* Northern Ping Chinese; Han (Simplified variant) */
tags[0] = HB_TAG('Z','H','S',' '); /* Chinese Simplified */ tags[0] = HB_TAG('Z','H','S',' '); /* Chinese Simplified */
*count = 1; *count = 1;
return true; return true;
} }
if (lang_matches (&lang_str[1], "np-hant")) if (lang_matches (&lang_str[1], "np-hant"))
{ {
/* Northern Ping Chinese */ /* Northern Ping Chinese; Han (Traditional variant) */
tags[0] = HB_TAG('Z','H','T',' '); /* Chinese Traditional */ tags[0] = HB_TAG('Z','H','T',' '); /* Chinese Traditional */
*count = 1; *count = 1;
return true; return true;
} }
if (lang_matches (&lang_str[1], "px-hans")) if (lang_matches (&lang_str[1], "px-hans"))
{ {
/* Pu-Xian Chinese */ /* Pu-Xian Chinese; Han (Simplified variant) */
tags[0] = HB_TAG('Z','H','S',' '); /* Chinese Simplified */ tags[0] = HB_TAG('Z','H','S',' '); /* Chinese Simplified */
*count = 1; *count = 1;
return true; return true;
} }
if (lang_matches (&lang_str[1], "px-hant")) if (lang_matches (&lang_str[1], "px-hant"))
{ {
/* Pu-Xian Chinese */ /* Pu-Xian Chinese; Han (Traditional variant) */
tags[0] = HB_TAG('Z','H','T',' '); /* Chinese Traditional */ tags[0] = HB_TAG('Z','H','T',' '); /* Chinese Traditional */
*count = 1; *count = 1;
return true; return true;
} }
if (lang_matches (&lang_str[1], "sp-hans")) if (lang_matches (&lang_str[1], "sp-hans"))
{ {
/* Southern Ping Chinese */ /* Southern Ping Chinese; Han (Simplified variant) */
tags[0] = HB_TAG('Z','H','S',' '); /* Chinese Simplified */ tags[0] = HB_TAG('Z','H','S',' '); /* Chinese Simplified */
*count = 1; *count = 1;
return true; return true;
} }
if (lang_matches (&lang_str[1], "sp-hant")) if (lang_matches (&lang_str[1], "sp-hant"))
{ {
/* Southern Ping Chinese */ /* Southern Ping Chinese; Han (Traditional variant) */
tags[0] = HB_TAG('Z','H','T',' '); /* Chinese Traditional */ tags[0] = HB_TAG('Z','H','T',' '); /* Chinese Traditional */
*count = 1; *count = 1;
return true; return true;
} }
if (lang_matches (&lang_str[1], "zh-hans")) if (lang_matches (&lang_str[1], "zh-hans"))
{ {
/* Huizhou Chinese */ /* Huizhou Chinese; Han (Simplified variant) */
tags[0] = HB_TAG('Z','H','S',' '); /* Chinese Simplified */ tags[0] = HB_TAG('Z','H','S',' '); /* Chinese Simplified */
*count = 1; *count = 1;
return true; return true;
} }
if (lang_matches (&lang_str[1], "zh-hant")) if (lang_matches (&lang_str[1], "zh-hant"))
{ {
/* Huizhou Chinese */ /* Huizhou Chinese; Han (Traditional variant) */
tags[0] = HB_TAG('Z','H','T',' '); /* Chinese Traditional */ tags[0] = HB_TAG('Z','H','T',' '); /* Chinese Traditional */
*count = 1; *count = 1;
return true; return true;
} }
if (lang_matches (&lang_str[1], "zo-hans")) if (lang_matches (&lang_str[1], "zo-hans"))
{ {
/* Min Zhong Chinese */ /* Min Zhong Chinese; Han (Simplified variant) */
tags[0] = HB_TAG('Z','H','S',' '); /* Chinese Simplified */ tags[0] = HB_TAG('Z','H','S',' '); /* Chinese Simplified */
*count = 1; *count = 1;
return true; return true;
} }
if (lang_matches (&lang_str[1], "zo-hant")) if (lang_matches (&lang_str[1], "zo-hant"))
{ {
/* Min Zhong Chinese */ /* Min Zhong Chinese; Han (Traditional variant) */
tags[0] = HB_TAG('Z','H','T',' '); /* Chinese Traditional */ tags[0] = HB_TAG('Z','H','T',' '); /* Chinese Traditional */
*count = 1; *count = 1;
return true; return true;
@ -1645,35 +1645,35 @@ hb_ot_tags_from_complex_language (const char *lang_str,
case 'g': case 'g':
if (lang_matches (&lang_str[1], "an-hant-hk")) if (lang_matches (&lang_str[1], "an-hant-hk"))
{ {
/* Gan Chinese */ /* Gan Chinese; Han (Traditional variant); Hong Kong */
tags[0] = HB_TAG('Z','H','H',' '); /* Chinese, Hong Kong SAR */ tags[0] = HB_TAG('Z','H','H',' '); /* Chinese, Hong Kong SAR */
*count = 1; *count = 1;
return true; return true;
} }
if (lang_matches (&lang_str[1], "an-hant-mo")) if (lang_matches (&lang_str[1], "an-hant-mo"))
{ {
/* Gan Chinese */ /* Gan Chinese; Han (Traditional variant); Macao */
tags[0] = HB_TAG('Z','H','H',' '); /* Chinese, Hong Kong SAR */ tags[0] = HB_TAG('Z','H','H',' '); /* Chinese, Hong Kong SAR */
*count = 1; *count = 1;
return true; return true;
} }
if (lang_matches (&lang_str[1], "an-hans")) if (lang_matches (&lang_str[1], "an-hans"))
{ {
/* Gan Chinese */ /* Gan Chinese; Han (Simplified variant) */
tags[0] = HB_TAG('Z','H','S',' '); /* Chinese Simplified */ tags[0] = HB_TAG('Z','H','S',' '); /* Chinese Simplified */
*count = 1; *count = 1;
return true; return true;
} }
if (lang_matches (&lang_str[1], "an-hant")) if (lang_matches (&lang_str[1], "an-hant"))
{ {
/* Gan Chinese */ /* Gan Chinese; Han (Traditional variant) */
tags[0] = HB_TAG('Z','H','T',' '); /* Chinese Traditional */ tags[0] = HB_TAG('Z','H','T',' '); /* Chinese Traditional */
*count = 1; *count = 1;
return true; return true;
} }
if (lang_matches (&lang_str[1], "a-latg")) if (lang_matches (&lang_str[1], "a-latg"))
{ {
/* Irish */ /* Irish; Latin (Gaelic variant) */
tags[0] = HB_TAG('I','R','T',' '); /* Irish Traditional */ tags[0] = HB_TAG('I','R','T',' '); /* Irish Traditional */
*count = 1; *count = 1;
return true; return true;
@ -1706,56 +1706,56 @@ hb_ot_tags_from_complex_language (const char *lang_str,
case 'h': case 'h':
if (lang_matches (&lang_str[1], "ak-hant-hk")) if (lang_matches (&lang_str[1], "ak-hant-hk"))
{ {
/* Hakka Chinese */ /* Hakka Chinese; Han (Traditional variant); Hong Kong */
tags[0] = HB_TAG('Z','H','H',' '); /* Chinese, Hong Kong SAR */ tags[0] = HB_TAG('Z','H','H',' '); /* Chinese, Hong Kong SAR */
*count = 1; *count = 1;
return true; return true;
} }
if (lang_matches (&lang_str[1], "ak-hant-mo")) if (lang_matches (&lang_str[1], "ak-hant-mo"))
{ {
/* Hakka Chinese */ /* Hakka Chinese; Han (Traditional variant); Macao */
tags[0] = HB_TAG('Z','H','H',' '); /* Chinese, Hong Kong SAR */ tags[0] = HB_TAG('Z','H','H',' '); /* Chinese, Hong Kong SAR */
*count = 1; *count = 1;
return true; return true;
} }
if (lang_matches (&lang_str[1], "sn-hant-hk")) if (lang_matches (&lang_str[1], "sn-hant-hk"))
{ {
/* Xiang Chinese */ /* Xiang Chinese; Han (Traditional variant); Hong Kong */
tags[0] = HB_TAG('Z','H','H',' '); /* Chinese, Hong Kong SAR */ tags[0] = HB_TAG('Z','H','H',' '); /* Chinese, Hong Kong SAR */
*count = 1; *count = 1;
return true; return true;
} }
if (lang_matches (&lang_str[1], "sn-hant-mo")) if (lang_matches (&lang_str[1], "sn-hant-mo"))
{ {
/* Xiang Chinese */ /* Xiang Chinese; Han (Traditional variant); Macao */
tags[0] = HB_TAG('Z','H','H',' '); /* Chinese, Hong Kong SAR */ tags[0] = HB_TAG('Z','H','H',' '); /* Chinese, Hong Kong SAR */
*count = 1; *count = 1;
return true; return true;
} }
if (lang_matches (&lang_str[1], "ak-hans")) if (lang_matches (&lang_str[1], "ak-hans"))
{ {
/* Hakka Chinese */ /* Hakka Chinese; Han (Simplified variant) */
tags[0] = HB_TAG('Z','H','S',' '); /* Chinese Simplified */ tags[0] = HB_TAG('Z','H','S',' '); /* Chinese Simplified */
*count = 1; *count = 1;
return true; return true;
} }
if (lang_matches (&lang_str[1], "ak-hant")) if (lang_matches (&lang_str[1], "ak-hant"))
{ {
/* Hakka Chinese */ /* Hakka Chinese; Han (Traditional variant) */
tags[0] = HB_TAG('Z','H','T',' '); /* Chinese Traditional */ tags[0] = HB_TAG('Z','H','T',' '); /* Chinese Traditional */
*count = 1; *count = 1;
return true; return true;
} }
if (lang_matches (&lang_str[1], "sn-hans")) if (lang_matches (&lang_str[1], "sn-hans"))
{ {
/* Xiang Chinese */ /* Xiang Chinese; Han (Simplified variant) */
tags[0] = HB_TAG('Z','H','S',' '); /* Chinese Simplified */ tags[0] = HB_TAG('Z','H','S',' '); /* Chinese Simplified */
*count = 1; *count = 1;
return true; return true;
} }
if (lang_matches (&lang_str[1], "sn-hant")) if (lang_matches (&lang_str[1], "sn-hant"))
{ {
/* Xiang Chinese */ /* Xiang Chinese; Han (Traditional variant) */
tags[0] = HB_TAG('Z','H','T',' '); /* Chinese Traditional */ tags[0] = HB_TAG('Z','H','T',' '); /* Chinese Traditional */
*count = 1; *count = 1;
return true; return true;
@ -1841,7 +1841,7 @@ hb_ot_tags_from_complex_language (const char *lang_str,
case 'l': case 'l':
if (lang_matches (&lang_str[1], "zh-hans")) if (lang_matches (&lang_str[1], "zh-hans"))
{ {
/* Literary Chinese */ /* Literary Chinese; Han (Simplified variant) */
tags[0] = HB_TAG('Z','H','S',' '); /* Chinese Simplified */ tags[0] = HB_TAG('Z','H','S',' '); /* Chinese Simplified */
*count = 1; *count = 1;
return true; return true;
@ -1850,28 +1850,28 @@ hb_ot_tags_from_complex_language (const char *lang_str,
case 'm': case 'm':
if (lang_matches (&lang_str[1], "np-hant-hk")) if (lang_matches (&lang_str[1], "np-hant-hk"))
{ {
/* Min Bei Chinese */ /* Min Bei Chinese; Han (Traditional variant); Hong Kong */
tags[0] = HB_TAG('Z','H','H',' '); /* Chinese, Hong Kong SAR */ tags[0] = HB_TAG('Z','H','H',' '); /* Chinese, Hong Kong SAR */
*count = 1; *count = 1;
return true; return true;
} }
if (lang_matches (&lang_str[1], "np-hant-mo")) if (lang_matches (&lang_str[1], "np-hant-mo"))
{ {
/* Min Bei Chinese */ /* Min Bei Chinese; Han (Traditional variant); Macao */
tags[0] = HB_TAG('Z','H','H',' '); /* Chinese, Hong Kong SAR */ tags[0] = HB_TAG('Z','H','H',' '); /* Chinese, Hong Kong SAR */
*count = 1; *count = 1;
return true; return true;
} }
if (lang_matches (&lang_str[1], "np-hans")) if (lang_matches (&lang_str[1], "np-hans"))
{ {
/* Min Bei Chinese */ /* Min Bei Chinese; Han (Simplified variant) */
tags[0] = HB_TAG('Z','H','S',' '); /* Chinese Simplified */ tags[0] = HB_TAG('Z','H','S',' '); /* Chinese Simplified */
*count = 1; *count = 1;
return true; return true;
} }
if (lang_matches (&lang_str[1], "np-hant")) if (lang_matches (&lang_str[1], "np-hant"))
{ {
/* Min Bei Chinese */ /* Min Bei Chinese; Han (Traditional variant) */
tags[0] = HB_TAG('Z','H','T',' '); /* Chinese Traditional */ tags[0] = HB_TAG('Z','H','T',' '); /* Chinese Traditional */
*count = 1; *count = 1;
return true; return true;
@ -1904,28 +1904,28 @@ hb_ot_tags_from_complex_language (const char *lang_str,
case 'n': case 'n':
if (lang_matches (&lang_str[1], "an-hant-hk")) if (lang_matches (&lang_str[1], "an-hant-hk"))
{ {
/* Min Nan Chinese */ /* Min Nan Chinese; Han (Traditional variant); Hong Kong */
tags[0] = HB_TAG('Z','H','H',' '); /* Chinese, Hong Kong SAR */ tags[0] = HB_TAG('Z','H','H',' '); /* Chinese, Hong Kong SAR */
*count = 1; *count = 1;
return true; return true;
} }
if (lang_matches (&lang_str[1], "an-hant-mo")) if (lang_matches (&lang_str[1], "an-hant-mo"))
{ {
/* Min Nan Chinese */ /* Min Nan Chinese; Han (Traditional variant); Macao */
tags[0] = HB_TAG('Z','H','H',' '); /* Chinese, Hong Kong SAR */ tags[0] = HB_TAG('Z','H','H',' '); /* Chinese, Hong Kong SAR */
*count = 1; *count = 1;
return true; return true;
} }
if (lang_matches (&lang_str[1], "an-hans")) if (lang_matches (&lang_str[1], "an-hans"))
{ {
/* Min Nan Chinese */ /* Min Nan Chinese; Han (Simplified variant) */
tags[0] = HB_TAG('Z','H','S',' '); /* Chinese Simplified */ tags[0] = HB_TAG('Z','H','S',' '); /* Chinese Simplified */
*count = 1; *count = 1;
return true; return true;
} }
if (lang_matches (&lang_str[1], "an-hant")) if (lang_matches (&lang_str[1], "an-hant"))
{ {
/* Min Nan Chinese */ /* Min Nan Chinese; Han (Traditional variant) */
tags[0] = HB_TAG('Z','H','T',' '); /* Chinese Traditional */ tags[0] = HB_TAG('Z','H','T',' '); /* Chinese Traditional */
*count = 1; *count = 1;
return true; return true;
@ -1988,28 +1988,28 @@ hb_ot_tags_from_complex_language (const char *lang_str,
case 'w': case 'w':
if (lang_matches (&lang_str[1], "uu-hant-hk")) if (lang_matches (&lang_str[1], "uu-hant-hk"))
{ {
/* Wu Chinese */ /* Wu Chinese; Han (Traditional variant); Hong Kong */
tags[0] = HB_TAG('Z','H','H',' '); /* Chinese, Hong Kong SAR */ tags[0] = HB_TAG('Z','H','H',' '); /* Chinese, Hong Kong SAR */
*count = 1; *count = 1;
return true; return true;
} }
if (lang_matches (&lang_str[1], "uu-hant-mo")) if (lang_matches (&lang_str[1], "uu-hant-mo"))
{ {
/* Wu Chinese */ /* Wu Chinese; Han (Traditional variant); Macao */
tags[0] = HB_TAG('Z','H','H',' '); /* Chinese, Hong Kong SAR */ tags[0] = HB_TAG('Z','H','H',' '); /* Chinese, Hong Kong SAR */
*count = 1; *count = 1;
return true; return true;
} }
if (lang_matches (&lang_str[1], "uu-hans")) if (lang_matches (&lang_str[1], "uu-hans"))
{ {
/* Wu Chinese */ /* Wu Chinese; Han (Simplified variant) */
tags[0] = HB_TAG('Z','H','S',' '); /* Chinese Simplified */ tags[0] = HB_TAG('Z','H','S',' '); /* Chinese Simplified */
*count = 1; *count = 1;
return true; return true;
} }
if (lang_matches (&lang_str[1], "uu-hant")) if (lang_matches (&lang_str[1], "uu-hant"))
{ {
/* Wu Chinese */ /* Wu Chinese; Han (Traditional variant) */
tags[0] = HB_TAG('Z','H','T',' '); /* Chinese Traditional */ tags[0] = HB_TAG('Z','H','T',' '); /* Chinese Traditional */
*count = 1; *count = 1;
return true; return true;
@ -2042,7 +2042,7 @@ hb_ot_tags_from_complex_language (const char *lang_str,
case 'y': case 'y':
if (lang_matches (&lang_str[1], "ue-hans")) if (lang_matches (&lang_str[1], "ue-hans"))
{ {
/* Yue Chinese */ /* Yue Chinese; Han (Simplified variant) */
tags[0] = HB_TAG('Z','H','S',' '); /* Chinese Simplified */ tags[0] = HB_TAG('Z','H','S',' '); /* Chinese Simplified */
*count = 1; *count = 1;
return true; return true;
@ -2051,14 +2051,14 @@ hb_ot_tags_from_complex_language (const char *lang_str,
case 'z': case 'z':
if (lang_matches (&lang_str[1], "h-hant-hk")) if (lang_matches (&lang_str[1], "h-hant-hk"))
{ {
/* Chinese [macrolanguage] */ /* Chinese [macrolanguage]; Han (Traditional variant); Hong Kong */
tags[0] = HB_TAG('Z','H','H',' '); /* Chinese, Hong Kong SAR */ tags[0] = HB_TAG('Z','H','H',' '); /* Chinese, Hong Kong SAR */
*count = 1; *count = 1;
return true; return true;
} }
if (lang_matches (&lang_str[1], "h-hant-mo")) if (lang_matches (&lang_str[1], "h-hant-mo"))
{ {
/* Chinese [macrolanguage] */ /* Chinese [macrolanguage]; Han (Traditional variant); Macao */
tags[0] = HB_TAG('Z','H','H',' '); /* Chinese, Hong Kong SAR */ tags[0] = HB_TAG('Z','H','H',' '); /* Chinese, Hong Kong SAR */
*count = 1; *count = 1;
return true; return true;
@ -2072,14 +2072,14 @@ hb_ot_tags_from_complex_language (const char *lang_str,
} }
if (lang_matches (&lang_str[1], "h-hans")) if (lang_matches (&lang_str[1], "h-hans"))
{ {
/* Chinese [macrolanguage] */ /* Chinese [macrolanguage]; Han (Simplified variant) */
tags[0] = HB_TAG('Z','H','S',' '); /* Chinese Simplified */ tags[0] = HB_TAG('Z','H','S',' '); /* Chinese Simplified */
*count = 1; *count = 1;
return true; return true;
} }
if (lang_matches (&lang_str[1], "h-hant")) if (lang_matches (&lang_str[1], "h-hant"))
{ {
/* Chinese [macrolanguage] */ /* Chinese [macrolanguage]; Han (Traditional variant) */
tags[0] = HB_TAG('Z','H','T',' '); /* Chinese Traditional */ tags[0] = HB_TAG('Z','H','T',' '); /* Chinese Traditional */
*count = 1; *count = 1;
return true; return true;