From f405c6c71f8fa060f8345c0e056d6960bc69dfe1 Mon Sep 17 00:00:00 2001 From: btangmu Date: Mon, 20 Oct 2025 11:36:21 -0400 Subject: [PATCH 1/4] CLDR-18963 Explicit numberSystem attribute -Revise ldml.dtd to allow numberSystem attribute for pattern element -Add numberSystem (latn) for pattern/decimal/group elements where needed in locales ca, el, en_150, en_AT, eu, gl, it, tr -Re-enable the check for numberSystem in CheckNumbers.java -Use parts.containsAttribute instead of parts.getAttribute(2, ...) since the element index may not be 2 --- common/dtd/ldml.dtd | 6 ++++-- common/main/ca.xml | 6 +++--- common/main/el.xml | 6 +++--- common/main/en_150.xml | 2 +- common/main/en_AT.xml | 2 +- common/main/eu.xml | 6 +++--- common/main/gl.xml | 6 +++--- common/main/it.xml | 6 +++--- common/main/tr.xml | 2 +- .../src/main/java/org/unicode/cldr/test/CheckNumbers.java | 7 +------ 10 files changed, 23 insertions(+), 26 deletions(-) diff --git a/common/dtd/ldml.dtd b/common/dtd/ldml.dtd index aebedd33a43..93784a7536f 100644 --- a/common/dtd/ldml.dtd +++ b/common/dtd/ldml.dtd @@ -1441,6 +1441,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + @@ -2062,7 +2064,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - + @@ -2073,7 +2075,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - + diff --git a/common/main/ca.xml b/common/main/ca.xml index 8514523115f..8836139c7c9 100644 --- a/common/main/ca.xml +++ b/common/main/ca.xml @@ -6502,13 +6502,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ↑↑↑ - ¤ #,##0.00 + ¤ #,##0.00 pesseta espanyola pesseta espanyola pessetes espanyoles ₧ - , - . + , + . birr etíop diff --git a/common/main/el.xml b/common/main/el.xml index fced38d71bd..0b41a38d407 100644 --- a/common/main/el.xml +++ b/common/main/el.xml @@ -6576,13 +6576,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ εκουέλε Ισημερινής Γουινέας - #,##0.00 ¤ + #,##0.00 ¤ Δραχμή Ελλάδας δραχμή Ελλάδας δραχμές Ελλάδας Δρχ - , - . + , + . Κουετσάλ Γουατεμάλας diff --git a/common/main/en_150.xml b/common/main/en_150.xml index 1bd1324fb61..b0d03094670 100755 --- a/common/main/en_150.xml +++ b/common/main/en_150.xml @@ -83,7 +83,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - ¤#,##0.00 + ¤#,##0.00 diff --git a/common/main/en_AT.xml b/common/main/en_AT.xml index 10704a052d9..1cdc88eb845 100755 --- a/common/main/en_AT.xml +++ b/common/main/en_AT.xml @@ -40,7 +40,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - ¤ #,##0.00 + ¤ #,##0.00 diff --git a/common/main/eu.xml b/common/main/eu.xml index 9fca525b4ce..7271df1844b 100644 --- a/common/main/eu.xml +++ b/common/main/eu.xml @@ -13962,14 +13962,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ↑↑↑ - ¤ #,##0.00 + ¤ #,##0.00 pezeta espainiarra ↑↑↑ pezeta espainiar ₧ ↑↑↑ - , - . + , + . birr etiopiarra diff --git a/common/main/gl.xml b/common/main/gl.xml index 715b8213a7a..89b41471fa1 100644 --- a/common/main/gl.xml +++ b/common/main/gl.xml @@ -5383,13 +5383,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ Peseta española (conta convertible) - #,##0.00 ¤ + #,##0.00 ¤ Peseta española peseta pesetas ₧ - , -   + , + ❰NBTSP❱ birr etíope diff --git a/common/main/it.xml b/common/main/it.xml index 6aa9f956f07..22ef2162143 100644 --- a/common/main/it.xml +++ b/common/main/it.xml @@ -6093,13 +6093,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ↑↑↑ - ¤ #,##0.00 + ¤ #,##0.00 lira italiana ↑↑↑ lire italiane ↑↑↑ - , - . + , + . dollaro giamaicano diff --git a/common/main/tr.xml b/common/main/tr.xml index 5cc03c0017b..31b25c11469 100644 --- a/common/main/tr.xml +++ b/common/main/tr.xml @@ -7650,7 +7650,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ ↑↑↑ - ¤#,##0.00 + ¤#,##0.00 Türk lirası ↑↑↑ ↑↑↑ diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/test/CheckNumbers.java b/tools/cldr-code/src/main/java/org/unicode/cldr/test/CheckNumbers.java index c25dbb66730..b9706ab40ac 100644 --- a/tools/cldr-code/src/main/java/org/unicode/cldr/test/CheckNumbers.java +++ b/tools/cldr-code/src/main/java/org/unicode/cldr/test/CheckNumbers.java @@ -259,12 +259,8 @@ public CheckCLDR handleCheck( } XPathParts parts = XPathParts.getFrozenInstance(path); - // TODO: re-enable this commented-out check - // Reference: https://unicode-org.atlassian.net/browse/CLDR-18722 - /* // Check that number formats are for an explicit number system. - String numberSystem = parts.getAttributeValue(2, "numberSystem"); - if (numberSystem == null) { + if (!parts.containsAttribute("numberSystem")) { result.add( new CheckStatus() .setCause(this) @@ -273,7 +269,6 @@ public CheckCLDR handleCheck( .setMessage( "Number formats must have an explicit numberSystem attribute.")); } - */ // Do tests that need to split the values From 2b9d2d92262a3a9ac976afb090d817c180d8c3a7 Mon Sep 17 00:00:00 2001 From: btangmu Date: Mon, 20 Oct 2025 12:35:24 -0400 Subject: [PATCH 2/4] CLDR-18963 Explicit numberSystem attribute -Revise ldml.dtd to allow numberSystem attribute for pattern element -Add numberSystem (latn) for pattern/decimal/group elements where needed in locales ca, el, en_150, en_AT, eu, gl, it, tr -Re-enable the check for numberSystem in CheckNumbers.java -Use parts.containsAttribute instead of parts.getAttribute(2, ...) since the element index may not be 2 --- common/dtd/ldml.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/dtd/ldml.dtd b/common/dtd/ldml.dtd index 93784a7536f..a70c762d094 100644 --- a/common/dtd/ldml.dtd +++ b/common/dtd/ldml.dtd @@ -1436,13 +1436,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + - - From 855e1457565767c8a60a6c587b7a4615decf56d0 Mon Sep 17 00:00:00 2001 From: btangmu Date: Mon, 20 Oct 2025 20:18:48 -0400 Subject: [PATCH 3/4] CLDR-18963 Explicit numberSystem attribute -Revise ldml.dtd to allow numberSystem attribute for pattern element -Add numberSystem (latn) for pattern/decimal/group elements where needed in locales ca, el, en_150, en_AT, eu, gl, it, tr -Re-enable the check for numberSystem in CheckNumbers.java -Use parts.containsAttribute instead of parts.getAttribute(2, ...) since the element index may not be 2 --- common/dtd/ldml.dtd | 4 ++-- .../test/java/org/unicode/cldr/unittest/TestDtdData.java | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/common/dtd/ldml.dtd b/common/dtd/ldml.dtd index a70c762d094..93784a7536f 100644 --- a/common/dtd/ldml.dtd +++ b/common/dtd/ldml.dtd @@ -1436,13 +1436,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic - - + + diff --git a/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestDtdData.java b/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestDtdData.java index 962d7812b6b..b62b614bfcd 100644 --- a/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestDtdData.java +++ b/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestDtdData.java @@ -949,6 +949,12 @@ public void testEmptyPcdata() { // OPTIONAL "//ldml…/symbols[@ references < numberSystem", // Status: metadata ≠ // distinguished Mode: OPTIONAL + "//ldml…/pattern[@ references < numberSystem", // Status: metadata ≠ + // distinguished Mode: OPTIONAL + "//ldml…/decimal[@ references < numberSystem", // Status: metadata ≠ + // distinguished Mode: OPTIONAL + "//ldml…/group[@ references < numberSystem", // Status: metadata ≠ distinguished + // Mode: OPTIONAL "//supplementalData…/languagePopulation[@ writingPercent < populationPercent", // Status: value Mode: OPTIONAL ≠ REQUIRED "//supplementalData…/metazoneId[@ longId < deprecated", // Status: value // Mode: OPTIONAL ≠ NULL From ead0c2725f48ef4b6f271c0b369859096909edaf Mon Sep 17 00:00:00 2001 From: btangmu Date: Mon, 20 Oct 2025 20:39:32 -0400 Subject: [PATCH 4/4] CLDR-18963 Explicit numberSystem attribute fix NBTSP MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -Change ❰NBTSP❱ to U+202F NARROW NO-BREAK SPACE (as had evidently been done in an earlier commit; this would have been a reversion) --- common/main/gl.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/main/gl.xml b/common/main/gl.xml index 89b41471fa1..c9ba42b5271 100644 --- a/common/main/gl.xml +++ b/common/main/gl.xml @@ -5389,7 +5389,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ pesetas ₧ , - ❰NBTSP❱ +   birr etíope