diff --git a/common/dtd/ldml.xsd b/common/dtd/ldml.xsd index b71c53d0f67..31ce0e4d87c 100644 --- a/common/dtd/ldml.xsd +++ b/common/dtd/ldml.xsd @@ -128,10 +128,10 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file - + - + diff --git a/common/dtd/ldmlBCP47.xsd b/common/dtd/ldmlBCP47.xsd index 80dc7c7c986..097efeb7f73 100644 --- a/common/dtd/ldmlBCP47.xsd +++ b/common/dtd/ldmlBCP47.xsd @@ -24,10 +24,10 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file - + - + diff --git a/common/dtd/ldmlSupplemental.dtd b/common/dtd/ldmlSupplemental.dtd index 5ad705b67aa..2478f3310d2 100644 --- a/common/dtd/ldmlSupplemental.dtd +++ b/common/dtd/ldmlSupplemental.dtd @@ -394,13 +394,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic - - + diff --git a/common/dtd/ldmlSupplemental.xsd b/common/dtd/ldmlSupplemental.xsd index bd449ad40cc..12fe5715c3b 100644 --- a/common/dtd/ldmlSupplemental.xsd +++ b/common/dtd/ldmlSupplemental.xsd @@ -28,6 +28,7 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file + @@ -63,17 +64,17 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file - + - + - + - + @@ -209,9 +210,11 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file + - + + @@ -251,6 +254,10 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file + + + + @@ -919,6 +926,32 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file + + + + + + + + + + + + + + + + + + + + + + + @@ -976,6 +1009,7 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file + @@ -991,6 +1025,8 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file + + @@ -2049,7 +2085,7 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file - + diff --git a/keyboards/dtd/ldmlKeyboard3.xsd b/keyboards/dtd/ldmlKeyboard3.xsd index 9a445135fc8..f314094239e 100644 --- a/keyboards/dtd/ldmlKeyboard3.xsd +++ b/keyboards/dtd/ldmlKeyboard3.xsd @@ -11,7 +11,7 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/) --> - - + + @@ -102,15 +102,15 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file - - - - - - - - - + + + + + + + + + @@ -122,9 +122,9 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file - - - + + + @@ -135,7 +135,7 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file - + @@ -143,24 +143,24 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file - - - - - - - + + + + + + + - - - - + + + + - + @@ -170,7 +170,7 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file - + @@ -197,24 +197,24 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + @@ -233,18 +233,18 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file - - + + - - - - + + + + @@ -254,7 +254,7 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file - + @@ -264,16 +264,16 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file - - + + - - - + + + @@ -285,9 +285,9 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file - - - + + + @@ -298,18 +298,18 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file - - - + + + - - - - + + + + @@ -321,36 +321,36 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file - + - - - - + + + + - - - - + + + + - - - + + + @@ -368,8 +368,8 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file - - + + @@ -382,20 +382,20 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file - + - - - - - - - + + + + + + + @@ -411,4 +411,4 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file - + \ No newline at end of file diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/util/DTD2XSD.java b/tools/cldr-code/src/main/java/org/unicode/cldr/util/DTD2XSD.java index 37a6e716261..eb5399098a2 100644 --- a/tools/cldr-code/src/main/java/org/unicode/cldr/util/DTD2XSD.java +++ b/tools/cldr-code/src/main/java/org/unicode/cldr/util/DTD2XSD.java @@ -16,6 +16,7 @@ import java.io.IOException; import java.io.OutputStream; import java.io.PrintWriter; +import java.nio.charset.StandardCharsets; import org.w3c.dom.Document; import org.w3c.dom.Node; import org.w3c.dom.NodeList; @@ -65,7 +66,7 @@ private static void writeXsd( // Step 4: write .xsd out try (OutputStream file = new BufferedOutputStream(new FileOutputStream(xsdPath, false)); // Append - PrintWriter pw = new PrintWriter(file); ) { + PrintWriter pw = new PrintWriter(file, false, StandardCharsets.UTF_8); ) { LDMLUtilities.printDOMTree( d, pw,