Skip to content

Commit 6725b77

Browse files
committed
CLDR-19098 ExemplarSets: change Japn to Jpan; comments
-TODO comments referencing tickets
1 parent 83d7699 commit 6725b77

File tree

2 files changed

+14
-6
lines changed

2 files changed

+14
-6
lines changed

tools/cldr-code/src/main/java/org/unicode/cldr/test/CheckExemplars.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ private void checkMixedScripts(String title, UnicodeSet set, List<CheckStatus> r
290290
return; // allow 2 scripts in exemplars for currencies.
291291
}
292292
// allowable combinations
293-
if (s.equals(ExemplarSets.Japn) || s.equals(ExemplarSets.Kore)) {
293+
if (s.equals(ExemplarSets.Jpan) || s.equals(ExemplarSets.Kore)) {
294294
return;
295295
}
296296
StringBuilder scripts = new StringBuilder();

tools/cldr-code/src/main/java/org/unicode/cldr/util/ExemplarSets.java

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,28 @@ public class ExemplarSets {
1111
new UnicodeSet(
1212
"[[[:Nd:][:script=common:][:script=inherited:]-[:Default_Ignorable_Code_Point:]-[:C:] - [_]] [\u05BE \u05F3 \u066A-\u066C]"
1313
+ "[[؉][་ །༌][ཱ]‎‎{য়}য়]"
14-
+ // TODO Fix this Hack
14+
+ // TODO Fix this Hack; reference:
15+
// https://unicode-org.atlassian.net/browse/CLDR-19115
1516
"-[❮❯]]")
1617
.freeze(); // [\\u200c-\\u200f]
1718
// [:script=common:][:script=inherited:]
1819

1920
public static final UnicodeSet HangulSyllables =
2021
new UnicodeSet("[[:Hangul_Syllable_Type=LVT:][:Hangul_Syllable_Type=LV:]]").freeze();
21-
public static final BitSet Japn = new BitSet();
22+
public static final BitSet Jpan = new BitSet();
2223
public static final BitSet Kore = new BitSet();
2324

25+
/*
26+
TODO: all of this should be dynamic, using the script data as below:
27+
<scriptData>
28+
<scriptVariant type="compound" id='Hanb' base='Hani Bopo'/> <!-- Han with Bopomofo (alias for Han + Bopomofo) -->
29+
...
30+
Reference: https://unicode-org.atlassian.net/browse/CLDR-18950
31+
*/
2432
static {
25-
ExemplarSets.Japn.set(UScript.HAN);
26-
ExemplarSets.Japn.set(UScript.HIRAGANA);
27-
ExemplarSets.Japn.set(UScript.KATAKANA);
33+
ExemplarSets.Jpan.set(UScript.HAN);
34+
ExemplarSets.Jpan.set(UScript.HIRAGANA);
35+
ExemplarSets.Jpan.set(UScript.KATAKANA);
2836
ExemplarSets.Kore.set(UScript.HAN);
2937
ExemplarSets.Kore.set(UScript.HANGUL);
3038
}

0 commit comments

Comments
 (0)