Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CLDR-17226 Unicode 16 new scripts & script metadata #3624

Merged
merged 2 commits into from
Apr 10, 2024
Merged

CLDR-17226 Unicode 16 new scripts & script metadata #3624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
48653b5
CLDR-17226 Unicode 16 new scripts & script metadata
markusicu Apr 9, 2024
6d22218
CLDR-17226 test hack for stale und_Aghb likely subtags
markusicu Apr 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions common/main/en.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -755,6 +755,7 @@ annotations.
<script type="Elba">Elbasan</script>
<script type="Elym">Elymaic</script>
<script type="Ethi">Ethiopic</script>
<script type="Gara">Garay</script>
<script type="Geok">Georgian Khutsuri</script>
<script type="Geor">Georgian</script>
<script type="Glag">Glagolitic</script>
Expand All @@ -764,6 +765,7 @@ annotations.
<script type="Gran">Grantha</script>
<script type="Grek">Greek</script>
<script type="Gujr">Gujarati</script>
<script type="Gukh">Gurung Khema</script>
<script type="Guru">Gurmukhi</script>
<script type="Hanb">Han with Bopomofo</script>
<script type="Hang">Hangul</script>
Expand Down Expand Up @@ -797,6 +799,7 @@ annotations.
<script type="Knda">Kannada</script>
<script type="Kore">Korean</script>
<script type="Kpel">Kpelle</script>
<script type="Krai">Kirat Rai</script>
<script type="Kthi">Kaithi</script>
<script type="Lana">Lanna</script>
<script type="Laoo">Lao</script>
Expand Down Expand Up @@ -839,6 +842,7 @@ annotations.
<script type="Nshu">Nüshu</script>
<script type="Ogam">Ogham</script>
<script type="Olck">Ol Chiki</script>
<script type="Onao">Ol Onal</script>
<script type="Orkh">Orkhon</script>
<script type="Orya">Odia</script>
<script type="Osge">Osage</script>
Expand Down Expand Up @@ -875,6 +879,7 @@ annotations.
<script type="Sora">Sora Sompeng</script>
<script type="Soyo">Soyombo</script>
<script type="Sund">Sundanese</script>
<script type="Sunu">Sunuwar</script>
<script type="Sylo">Syloti Nagri</script>
<script type="Syrc">Syriac</script>
<script type="Syre">Estrangelo Syriac</script>
Expand All @@ -896,7 +901,9 @@ annotations.
<script type="Tibt">Tibetan</script>
<script type="Tirh">Tirhuta</script>
<script type="Tnsa">Tangsa</script>
<script type="Todr">Todhri</script>
<script type="Toto">Toto</script>
<script type="Tutg">Tulu-Tigalari</script>
<script type="Ugar">Ugaritic</script>
<script type="Vaii">Vai</script>
<script type="Visp">Visible Speech</script>
Expand Down
7 changes: 7 additions & 0 deletions common/main/fr.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -729,6 +729,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
<script type="Elba" draft="unconfirmed">elbasan</script>
<script type="Elym">élymaïque</script>
<script type="Ethi">éthiopique</script>
<script type="Gara" draft="provisional">garay</script>
<script type="Geok">géorgien khoutsouri</script>
<script type="Geor">géorgien</script>
<script type="Glag">glagolitique</script>
Expand All @@ -738,6 +739,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
<script type="Gran" draft="unconfirmed">grantha</script>
<script type="Grek">grec</script>
<script type="Gujr">goudjarâtî</script>
<script type="Gukh" draft="provisional">gurung khema</script>
<script type="Guru">gourmoukhî</script>
<script type="Hanb">han avec bopomofo</script>
<script type="Hang">hangûl</script>
Expand Down Expand Up @@ -771,6 +773,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
<script type="Knda">kannara</script>
<script type="Kore">coréen</script>
<script type="Kpel" draft="unconfirmed">kpelle</script>
<script type="Krai" draft="provisional">kirat rai</script>
<script type="Kthi">kaithî</script>
<script type="Lana">lanna</script>
<script type="Laoo">lao</script>
Expand Down Expand Up @@ -813,6 +816,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
<script type="Nshu" draft="unconfirmed">nüshu</script>
<script type="Ogam">ogam</script>
<script type="Olck">ol-chiki</script>
<script type="Onao" draft="provisional">ol onal</script>
<script type="Orkh">orkhon</script>
<script type="Orya">odia</script>
<script type="Osge" draft="unconfirmed">osage</script>
Expand Down Expand Up @@ -848,6 +852,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
<script type="Sora" draft="unconfirmed">sora sompeng</script>
<script type="Soyo" draft="unconfirmed">soyombo</script>
<script type="Sund">sundanais</script>
<script type="Sunu" draft="provisional">sunuwar</script>
<script type="Sylo">sylotî nâgrî</script>
<script type="Syrc">syriaque</script>
<script type="Syre">syriaque estranghélo</script>
Expand All @@ -869,7 +874,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
<script type="Tibt">tibétain</script>
<script type="Tirh" draft="unconfirmed">tirhouta</script>
<script type="Tnsa" draft="provisional">tangsa</script>
<script type="Todr" draft="provisional">todhri</script>
<script type="Toto" draft="provisional">toto</script>
<script type="Tutg" draft="provisional">tulu-tigalari</script>
<script type="Ugar">ougaritique</script>
<script type="Vaii">vaï</script>
<script type="Visp">parole visible</script>
Expand Down
13 changes: 10 additions & 3 deletions common/properties/scriptMetadata.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ Orya; 30; 0B15; IN; 1; RECOMMENDED; NO; NO; YES; NO; NO
Zzzz; 31; FDD0; ZZ; -1; UNKNOWN; UNKNOWN; UNKNOWN; UNKNOWN; UNKNOWN; UNKNOWN
Cans; 32; 14C0; CA; 2; LIMITED_USE; NO; NO; NO; YES; NO
Adlm; 33; 1E909; GN; 1; LIMITED_USE; YES; NO; MIN; NO; YES
Aghb; 33; 10537; RU; 1; EXCLUSION; NO; NO; NO; NO; NO
Aghb; 33; 10537; AZ; 1; EXCLUSION; NO; NO; NO; NO; NO
Ahom; 33; 11717; IN; 1; EXCLUSION; NO; YES; YES; NO; NO
Armi; 33; 10840; IR; 1; EXCLUSION; YES; NO; NO; NO; NO
Avst; 33; 10B00; IR; 1; EXCLUSION; YES; NO; YES; NO; NO
Expand Down Expand Up @@ -123,11 +123,13 @@ Dupl; 33; 1BC20; FR; 1; EXCLUSION; NO; NO; NO; YES; NO
Egyp; 33; 13153; EG; 3; EXCLUSION; NO; NO; YES; YES; NO
Elba; 33; 10500; AL; 1; EXCLUSION; NO; NO; NO; NO; NO
Elym; 33; 10FF1; IR; 1; EXCLUSION; YES; NO; NO; NO; NO
Gara; 33; 10D5D; SN; 1; EXCLUSION; YES; NO; YES; NO; YES # provisional data for future Unicode 16.0 script
Glag; 33; 2C00; BG; 1; EXCLUSION; NO; NO; NO; NO; YES
Gong; 33; 11D71; IN; 1; LIMITED_USE; NO; NO; YES; NO; NO
Gonm; 33; 11D10; IN; 1; EXCLUSION; NO; NO; YES; NO; NO
Goth; 33; 10330; UA; 1; EXCLUSION; NO; NO; NO; NO; NO
Gran; 33; 11315; IN; 1; EXCLUSION; NO; NO; NO; NO; NO
Gukh; 33; 1611C; NP; 1; EXCLUSION; NO; NO; YES; NO; NO # provisional data for future Unicode 16.0 script
Hano; 33; 1723; PH; 1; EXCLUSION; NO; NO; YES; NO; NO
Hatr; 33; 108F4; IQ; 1; EXCLUSION; YES; NO; NO; NO; NO
Hluw; 33; 14400; TR; 1; EXCLUSION; NO; NO; NO; YES; NO
Expand All @@ -137,10 +139,11 @@ Hung; 33; 10CA1; HU; 1; EXCLUSION; YES; NO; NO; NO; YES
Ital; 33; 10300; IT; 1; EXCLUSION; NO; NO; NO; NO; NO
Java; 33; A984; ID; 1; LIMITED_USE; NO; NO; YES; NO; NO
Kali; 33; A90A; MM; 1; LIMITED_USE; NO; NO; MIN; NO; NO
Kawi; 33; 11F1B; ID; 1; EXCLUSION; NO; YES; YES; NO; NO # provisional data for future Unicode 15.0 script
Kawi; 33; 11F1B; ID; 1; EXCLUSION; NO; YES; YES; NO; NO
Khar; 33; 10A00; PK; 1; EXCLUSION; YES; NO; YES; NO; NO
Khoj; 33; 11208; IN; 1; EXCLUSION; NO; NO; NO; NO; NO
Kits; 33; 18C65; CN; 2; EXCLUSION; NO; YES; NO; YES; NO
Krai; 33; 16D45; IN; 1; EXCLUSION; NO; NO; NO; NO; NO # provisional data for future Unicode 16.0 script
Kthi; 33; 11083; IN; 1; EXCLUSION; NO; NO; MIN; NO; NO
Lana; 33; 1A20; TH; 1; LIMITED_USE; NO; YES; YES; NO; NO
Lepc; 33; 1C00; IN; 1; LIMITED_USE; NO; NO; YES; NO; NO
Expand All @@ -164,7 +167,7 @@ Mong; 33; 1826; MN; 1; EXCLUSION; NO; NO; YES; NO; NO
Mroo; 33; 16A4F; BD; 1; EXCLUSION; NO; NO; NO; NO; NO
Mtei; 33; ABC0; IN; 1; LIMITED_USE; NO; NO; YES; NO; NO
Mult; 33; 1128F; PK; 1; EXCLUSION; NO; NO; NO; NO; NO
Nagm; 33; 1E4E6; IN; 1; EXCLUSION; NO; NO; NO; NO; NO # provisional data for future Unicode 15.0 script
Nagm; 33; 1E4E6; IN; 1; EXCLUSION; NO; NO; NO; NO; NO
Nand; 33; 119CE; IN; 1; EXCLUSION; NO; NO; YES; NO; NO
Narb; 33; 10A95; SA; 1; EXCLUSION; YES; NO; NO; NO; NO
Nbat; 33; 10896; JO; 1; EXCLUSION; YES; NO; NO; NO; NO
Expand All @@ -173,6 +176,7 @@ Nkoo; 33; 07CA; GN; 1; LIMITED_USE; YES; NO; YES; NO; NO
Nshu; 33; 1B1C4; CN; 2; EXCLUSION; NO; YES; NO; YES; NO
Ogam; 33; 168F; IE; 1; EXCLUSION; NO; NO; NO; NO; NO
Olck; 33; 1C5A; IN; 1; LIMITED_USE; NO; NO; NO; NO; NO
Onao; 33; 1E5D0; IN; 1; EXCLUSION; NO; NO; MIN; NO; NO # provisional data for future Unicode 16.0 script
Orkh; 33; 10C00; MN; 1; EXCLUSION; YES; NO; NO; NO; NO
Osge; 33; 104B5; US; 1; LIMITED_USE; NO; NO; NO; NO; YES
Osma; 33; 10480; SO; 1; EXCLUSION; NO; NO; NO; NO; NO
Expand Down Expand Up @@ -202,6 +206,7 @@ Sogo; 33; 10F19; UZ; 1; EXCLUSION; YES; NO; NO; NO; NO
Sora; 33; 110D0; IN; 1; EXCLUSION; NO; NO; NO; NO; NO
Soyo; 33; 11A5C; MN; 1; EXCLUSION; NO; NO; YES; NO; NO
Sund; 33; 1B83; ID; 1; LIMITED_USE; NO; NO; YES; NO; NO
Sunu; 33; 11BC4; NP; 1; EXCLUSION; NO; NO; NO; NO; NO # provisional data for future Unicode 16.0 script
Sylo; 33; A800; BD; 1; LIMITED_USE; NO; NO; YES; NO; NO
Syrc; 33; 0710; SY; 1; LIMITED_USE; YES; NO; YES; NO; NO
Tagb; 33; 1763; PH; 1; EXCLUSION; NO; NO; NO; NO; NO
Expand All @@ -214,7 +219,9 @@ Tfng; 33; 2D30; MA; 1; LIMITED_USE; NO; NO; NO; NO; NO
Tglg; 33; 1703; PH; 1; EXCLUSION; NO; NO; MIN; NO; NO
Tirh; 33; 11484; IN; 1; EXCLUSION; NO; NO; NO; NO; NO
Tnsa; 33; 16ABC; IN; 1; EXCLUSION; NO; NO; NO; NO; NO
Todr; 33; 105C2; AL; 1; EXCLUSION; NO; NO; NO; NO; NO # provisional data for future Unicode 16.0 script
Toto; 33; 1E290; IN; 1; EXCLUSION; NO; NO; NO; NO; NO
Tutg; 33; 11392; IN; 1; EXCLUSION; NO; NO; YES; NO; NO # provisional data for future Unicode 16.0 script
Ugar; 33; 10380; SY; 1; EXCLUSION; NO; NO; NO; NO; NO
Vaii; 33; A549; LR; 2; LIMITED_USE; NO; NO; NO; YES; NO
Vith; 33; 10582; AL; 1; EXCLUSION; NO; NO; NO; NO; YES
Expand Down
2 changes: 1 addition & 1 deletion common/supplemental/coverageLevels.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ For terms of use, see http://www.unicode.org/copyright.html
<coverageVariable key="%script40" value="(Latn|Hans|Hant|Cyrl|Arab)"/>
<coverageVariable key="%script60" value="(Jpan|Kore)"/>
<coverageVariable key="%script80" value="(Adlm|Aran|Armn|Beng|Bopo|Brai|Cakm|Cans|Cher|Deva|Ethi|Geor|Grek|Gujr|Guru|Hani|Hang|Hebr|Hira|Knda|Kana|Khmr|Laoo|Mlym|Mong|Mtei|Mymr|Nkoo|Olck|Orya|Rohg|Sinh|Sund|Syrc|Taml|Telu|Tfng|Thaa|Thai|Tibt|Vaii|Yiii|Hanb|Hrkt|Jamo|Jpan|Kore|Zmth|Zsye|Zsym|Zxxx|Zyyy|Zzzz)"/>
<coverageVariable key="%script100" value="(Afak|Aghb|Ahom|Armi|Avst|Bali|Bamu|Bass|Batk|Blis|Brah|Bugi|Buhd|Cari|Cham|Chrs|Cirt|Copt|Cpmn|Cprt|Cyrs|Diak|Dogr|Dsrt|Dupl|Egy[dhp]|Elba|Elym|Geok|Glag|Gong|Gonm|Goth|Gran|Hatr|Hano|Hluw|Hmng|Hmnp|Hrkt|Hung|Inds|Ital|Java|Jurc|Kali|Kawi|Khar|Khoj|Kits|Kpel|Kthi|Lana|Lat[fg]|Lepc|Limb|Lin[ab]|Lisu|Loma|Ly[cd]i|Mahj|Maka|Man[di]|Maya|Medf|Mend|Mer[co]|Modi|Moon|Mroo|Mult|Nagm|Nand|Narb|Nbat|Nkgb|Nshu|Ogam|Orkh|Osma|Ougr|Palm|Pauc|Perm|Phag|Phl[ipv]|Phnx|Plrd|Prti|Rjng|Roro|Runr|Samr|Sar[ab]|Saur|Sgnw|Shaw|Shrd|Sidd|Sind|Sogd|Sogo|Sora|Soyo|Sylo|Syr[cejn]|Tagb|Takr|Tal[eu]|Tang|Tavt|Teng|Tglg|Tirh|Tnsa|Toto|Ugar|Visp|Vith|Wara|Wcho|Wole|Xpeo|Xsux|Yezi|Zanb|Zinh|Zmth)"/>
<coverageVariable key="%script100" value="(Afak|Aghb|Ahom|Armi|Avst|Bali|Bamu|Bass|Batk|Blis|Brah|Bugi|Buhd|Cari|Cham|Chrs|Cirt|Copt|Cpmn|Cprt|Cyrs|Diak|Dogr|Dsrt|Dupl|Egy[dhp]|Elba|Elym|Gara|Geok|Glag|Gong|Gonm|Goth|Gran|Gukh|Hatr|Hano|Hluw|Hmng|Hmnp|Hrkt|Hung|Inds|Ital|Java|Jurc|Kali|Kawi|Khar|Khoj|Kits|Kpel|Kthi|Krai|Lana|Lat[fg]|Lepc|Limb|Lin[ab]|Lisu|Loma|Ly[cd]i|Mahj|Maka|Man[di]|Maya|Medf|Mend|Mer[co]|Modi|Moon|Mroo|Mult|Nagm|Nand|Narb|Nbat|Nkgb|Nshu|Ogam|Onao|Orkh|Osma|Ougr|Palm|Pauc|Perm|Phag|Phl[ipv]|Phnx|Plrd|Prti|Rjng|Roro|Runr|Samr|Sar[ab]|Saur|Sgnw|Shaw|Shrd|Sidd|Sind|Sogd|Sogo|Sora|Soyo|Sunu|Sylo|Syr[cejn]|Tagb|Takr|Tal[eu]|Tang|Tavt|Teng|Tglg|Tirh|Tnsa|Todr|Toto|Tutg|Ugar|Visp|Vith|Wara|Wcho|Wole|Xpeo|Xsux|Yezi|Zanb|Zinh|Zmth)"/>
<coverageVariable key="%shortLong" value="(short|long)"/>
<coverageVariable key="%anyAlphaNum" value="([-a-zA-Z0-9]+)"/>
<coverageVariable key="%ssTypes" value="(standard|none)"/>
Expand Down
12 changes: 6 additions & 6 deletions common/validity/script.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,25 @@
<supplementalData>
<version number="$Revision$"/>
<idValidity>
<id type='script' idStatus='regular'> <!-- 175 items -->
<id type='script' idStatus='regular'> <!-- 182 items -->
Adlm Aghb Ahom Arab Aran Armi Armn Avst
Bali Bamu Bass Batk Beng Bhks Bopo Brah~i Bugi Buhd
Cakm Cans Cari Cham Cher Chrs Copt Cpmn Cprt Cyrl Cyrs
Deva Diak Dogr Dsrt Dupl
Egyp Elba Elym Ethi
Geor Glag Gong Gonm Goth Gran Grek Gujr Guru
Gara Geor Glag Gong Gonm Goth Gran Grek Gujr Gukh Guru
Hanb Hang Hani Hano Hans~t Hatr Hebr Hira Hluw Hmng Hmnp Hrkt Hung
Ital
Jamo Java Jpan
Kali Kana Kawi Khar Khmr Khoj Kits Knda Kore Kthi
Kali Kana Kawi Khar Khmr Khoj Kits Knda Kore Krai Kthi
Lana Laoo Latf~g Latn Lepc Limb Lina~b Lisu Lyci Lydi
Mahj Maka Mand Mani Marc Medf Mend Merc Mero Mlym Modi Mong Mroo Mtei Mult Mymr
Nagm Nand Narb Nbat Newa Nkoo Nshu
Ogam Olck Orkh Orya Osge Osma Ougr
Ogam Olck Onao Orkh Orya Osge Osma Ougr
Palm Pauc Perm Phag Phli Phlp Phnx Plrd Prti
Rjng Rohg Runr
Samr Sarb Saur Sgnw Shaw Shrd Sidd Sind Sinh Sogd Sogo Sora Soyo Sund Sylo Syrc Syre Syrj Syrn
Tagb Takr Tale Talu Taml Tang Tavt Telu Tfng Tglg Thaa Thai Tibt Tirh Tnsa Toto
Samr Sarb Saur Sgnw Shaw Shrd Sidd Sind Sinh Sogd Sogo Sora Soyo Sund Sunu Sylo Syrc Syre Syrj Syrn
Tagb Takr Tale Talu Taml Tang Tavt Telu Tfng Tglg Thaa Thai Tibt Tirh Tnsa Todr Toto Tutg
Ugar
Vaii Vith
Wara Wcho
Expand Down
6 changes: 3 additions & 3 deletions tools/cldr-code/src/main/java/org/unicode/cldr/draft/ScriptMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public class ScriptMetadata {
private static final int MAX_RANK = 33;
private static final String DATA_FILE = "/org/unicode/cldr/util/data/Script_Metadata.csv";
private static final VersionInfo UNICODE_VERSION =
VersionInfo.getInstance(CldrUtility.getProperty("SCRIPT_UNICODE_VERSION", "15"));
VersionInfo.getInstance(CldrUtility.getProperty("SCRIPT_UNICODE_VERSION", "16"));

// To get the data, go do the Script MetaData spreadsheet
// Download As Comma Separated Items into DATA_FILE
Expand Down Expand Up @@ -432,14 +432,14 @@ public static Set<String> getExtras() {
}

public static Transform<String, String> TO_SHORT_SCRIPT =
new Transform<String, String>() {
new Transform<>() {
@Override
public String transform(String source) {
return UScript.getShortName(UScript.getCodeFromName(source));
}
};
public static Transform<String, String> TO_LONG_SCRIPT =
new Transform<String, String>() {
new Transform<>() {
@Override
public String transform(String source) {
return UScript.getName(UScript.getCodeFromName(source));
Expand Down
13 changes: 10 additions & 3 deletions tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/Script_Metadata.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ WR,Name,Script_Code,Age,Size,Sample,Sample_Code,Origin Country,~Density,Likely L
101,Sora_Sompeng,Sora,6.1,35,𑃐,110D0,India,1,Sora,srb,Exclusion,no,no,no,no,no
102,Takri,Takr,6.1,66,𑚀,11680,India,1,Dogri,doi,Exclusion,no,no,Yes,no,no
103,Braille,Brai,3.0,256,⠎,280E,France,n/a,n/a,n/a,n/a,n/a,n/a,n/a,n/a,n/a
104,Caucasian_Albanian,Aghb,7.0,53,𐔷,10537,Russia,1,Udi,udi,Exclusion,no,no,no,no,no
104,Caucasian_Albanian,Aghb,7.0,53,𐔷,10537,Azerbaijan,1,Old Udi,xag,Exclusion,no,no,no,no,no
105,Bassa_Vah,Bass,7.0,36,𖫦,16AE6,Liberia,1,Bassa,bsq,Exclusion,no,no,no,no,no
106,Duployan,Dupl,7.0,143,𛰠,1BC20,France,1,French,fr,Exclusion,no,no,no,Yes,no
107,Elbasan,Elba,7.0,40,𐔀,10500,Albania,1,Albanian,sq,Exclusion,no,no,no,no,no
Expand Down Expand Up @@ -162,5 +162,12 @@ WR,Name,Script_Code,Age,Size,Sample,Sample_Code,Origin Country,~Density,Likely L
160,Tangsa,Tnsa,14.0,0,𖪼,16ABC,India,1,Tangsa,nst,Exclusion,no,no,no,no,no
161,Toto,Toto,14.0,0,𞊐,1E290,India,1,Toto,txo,Exclusion,no,no,no,no,no
162,Vithkuqi,Vith,14.0,0,𐖂,10582,Albania,1,Albanian,sq,Exclusion,no,no,no,no,Yes
163,Kawi,Kawi,15.0,0,𑼛,11F1B,Indonesia,1,Kawi,kaw,Exclusion,no,yes,Yes,no,no
164,Nag Mundari,Nagm,15.0,0,𞓦,1E4E6,India,1,Mundari,unr,Exclusion,no,no,no,no,no
163,Kawi,Kawi,15.0,0,𑼛,11F1B,Indonesia,1,Kawi,kaw,Exclusion,no,Yes,Yes,no,no
164,Nag Mundari,Nagm,15.0,0,𞓦,1E4E6,India,1,Mundari,unr,Exclusion,no,no,no,no,no
165,Garay,Gara,16.0,0,𐵝,10D5D,Senegal,1,Wolof,wo,Exclusion,Yes,no,Yes,no,Yes
166,Gurung Khema,Gukh,16.0,0,𖄜,1611C,Nepal,1,Gurung,gvr,Exclusion,no,no,Yes,no,no
167,Kirat Rai,Krai,16.0,0,𖵅,16D45,India,1,Bantawa,bap,Exclusion,no,no,no,no,no
168,Ol Onal,Onao,16.0,0,𞗐,1E5D0,India,1,Mundari,unr,Exclusion,no,no,min,no,no
169,Sunuwar,Sunu,16.0,0,𑯄,11BC4,Nepal,1,Sunuwar,suz,Exclusion,no,no,no,no,no
170,Todhri,Todr,16.0,0,𐗂,105C2,Albania,1,Albanian,sq,Exclusion,no,no,no,no,no
171,Tulu-Tigalari,Tutg,16.0,0,𑎒,11392,India,1,Sanskrit,sa,Exclusion,no,no,Yes,no,no
11 changes: 11 additions & 0 deletions tools/cldr-code/src/test/java/org/unicode/cldr/unittest/LikelySubtagsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@
if (!metadataScripts.isEmpty()) {
// Warning, not error, so that we can add scripts to the script metadata
// and later update to the Unicode version that has characters for those scripts.
warnln("Script Metadata for characters not in Unicode: " + metadataScripts);

Check warning on line 319 in tools/cldr-code/src/test/java/org/unicode/cldr/unittest/LikelySubtagsTest.java

View workflow job for this annotation

GitHub Actions / build 

 (LikelySubtagsTest.java:319)  Warning: Script Metadata for characters not in Unicode: [Gara, Gukh, Krai, Onao, Sunu, Todr, Tutg]
}
}

Expand Down Expand Up @@ -402,6 +402,17 @@
// we minimize away und_X, when the code puts in en...US
continue;
}
// Temporary exception for CLDR 46 Unicode 16 (CLDR-17226) because
// GenerateMaximalLocales is currently not usable.
if (script.equals("Aghb")) {
// The script metadata for Aghb=Caucasian_Albanian changed
// the likely region from Russia to Azerbaijan, and
// the likely language from udi=Udi to xag=Old Udi.
// Error: likelySubtags.xml has wrong language for script (und_Aghb).
// Should not be udi_Aghb_RU, but Script Metadata suggests something like:
// {"und_Aghb", "xag_Aghb_AZ"},
continue;
}
Info i = ScriptMetadata.getInfo(script);
// System.out.println(i);
String likelyLanguage = i.likelyLanguage;
Expand All @@ -421,7 +432,7 @@
errln(msg);
} else {
// Warning: Missing data for a script in a future Unicode version.
warnln(msg);

Check warning on line 435 in tools/cldr-code/src/test/java/org/unicode/cldr/unittest/LikelySubtagsTest.java

View workflow job for this annotation

GitHub Actions / build 

 (LikelySubtagsTest.java:435)  Warning: likelySubtags.xml missing language for script (und_Gara). Script Metadata suggests that it should be something like:	 {"und_Gara", "wo_Gara_SN"},

Check warning on line 435 in tools/cldr-code/src/test/java/org/unicode/cldr/unittest/LikelySubtagsTest.java

View workflow job for this annotation

GitHub Actions / build 

 (LikelySubtagsTest.java:435)  Warning: likelySubtags.xml missing language for script (und_Gukh). Script Metadata suggests that it should be something like:	 {"und_Gukh", "gvr_Gukh_NP"},

Check warning on line 435 in tools/cldr-code/src/test/java/org/unicode/cldr/unittest/LikelySubtagsTest.java

View workflow job for this annotation

GitHub Actions / build 

 (LikelySubtagsTest.java:435)  Warning: likelySubtags.xml missing language for script (und_Krai). Script Metadata suggests that it should be something like:	 {"und_Krai", "bap_Krai_IN"},

Check warning on line 435 in tools/cldr-code/src/test/java/org/unicode/cldr/unittest/LikelySubtagsTest.java

View workflow job for this annotation

GitHub Actions / build 

 (LikelySubtagsTest.java:435)  Warning: likelySubtags.xml missing language for script (und_Onao). Script Metadata suggests that it should be something like:	 {"und_Onao", "unr_Onao_IN"},

Check warning on line 435 in tools/cldr-code/src/test/java/org/unicode/cldr/unittest/LikelySubtagsTest.java

View workflow job for this annotation

GitHub Actions / build 

 (LikelySubtagsTest.java:435)  Warning: likelySubtags.xml missing language for script (und_Sunu). Script Metadata suggests that it should be something like:	 {"und_Sunu", "suz_Sunu_NP"},

Check warning on line 435 in tools/cldr-code/src/test/java/org/unicode/cldr/unittest/LikelySubtagsTest.java

View workflow job for this annotation

GitHub Actions / build 

 (LikelySubtagsTest.java:435)  Warning: likelySubtags.xml missing language for script (und_Todr). Script Metadata suggests that it should be something like:	 {"und_Todr", "sq_Todr_AL"},

Check warning on line 435 in tools/cldr-code/src/test/java/org/unicode/cldr/unittest/LikelySubtagsTest.java

View workflow job for this annotation

GitHub Actions / build 

 (LikelySubtagsTest.java:435)  Warning: likelySubtags.xml missing language for script (und_Tutg). Script Metadata suggests that it should be something like:	 {"und_Tutg", "sa_Tutg_IN"},
}
}
} else if (!exceptions2.contains(likelyExpansion)
Expand Down Expand Up @@ -536,7 +547,7 @@
}

if (!collectedBad.isEmpty()) {
warnln(

Check warning on line 550 in tools/cldr-code/src/test/java/org/unicode/cldr/unittest/LikelySubtagsTest.java

View workflow job for this annotation

GitHub Actions / build 

 (LikelySubtagsTest.java:550)  Warning: Locales have 224 unexpected characters in main and/or aux:	[҂״܀-܍०-९৲-৺੦-੯૰౦-౯೦-೯໐-໙၀-၉၏႐-႙႞႟፠-፼᎐-᎙᠐-᠙꒐-꓆𞅏{a\:}{ch’}{e\:}{i\:}{k’}{o\:}{ts’}{tł’}{t’}{à\:}{á\:}{è\:}{é\:}{ì\:}{í\:}{ò\:}{ó\:}{ଅ\:}{ଆ\:}{ଏ\:}]
"Locales have "
+ collectedBad.size()
+ " unexpected characters in main and/or aux:\t"
Expand Down Expand Up @@ -781,7 +792,7 @@
// SUPPLEMENTAL_DATA_INFO.getLikelyOrigins().get(value);
// fieldToOrigin.put(value, origin == null ? "n/a" : origin);
// }
warnln("Bad status=" + entry.getKey() + " for " + entry.getValue());

Check warning on line 795 in tools/cldr-code/src/test/java/org/unicode/cldr/unittest/LikelySubtagsTest.java

View workflow job for this annotation

GitHub Actions / build 

 (LikelySubtagsTest.java:795)  Warning: Bad status=macroregion for [001, 419]
}
}
}
Expand Down
Loading