🚧 WIP

keymanapp · Mar 1, 2024 · 0c9ef49 · 0c9ef49
1 parent 25cd323
commit 0c9ef49
Show file tree

Hide file tree

Showing 147 changed files with 172 additions and 299 deletions.
diff --git a/common/web/types/build.sh b/common/web/types/build.sh
@@ -29,8 +29,8 @@ builder_parse "$@"
 function compile_schemas() {
   # We need the schema files at runtime and bundled, so always copy it for all actions except `clean`
   local schemas=(
-    "$KEYMAN_ROOT/resources/standards-data/ldml-keyboards/techpreview/ldml-keyboard3.schema.json"
-    "$KEYMAN_ROOT/resources/standards-data/ldml-keyboards/techpreview/ldml-keyboardtest3.schema.json"
+    "$KEYMAN_ROOT/resources/standards-data/ldml-keyboards/45/ldml-keyboard3.schema.json"
+    "$KEYMAN_ROOT/resources/standards-data/ldml-keyboards/45/ldml-keyboardtest3.schema.json"
     "$KEYMAN_ROOT/common/schemas/kvks/kvks.schema.json"
     "$KEYMAN_ROOT/common/schemas/kpj/kpj.schema.json"
     "$KEYMAN_ROOT/common/schemas/kpj-9.0/kpj-9.0.schema.json"

diff --git a/common/web/types/test/fixtures/import-minimal.xml b/common/web/types/test/fixtures/import-minimal.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
-<keyboard3 locale="und" conformsTo="45">
+<keyboard3 xmlns="https://schemas.unicode.org/cldr/45/keyboard3" locale="und" conformsTo="45">
   <info author="srl295" indicator="🙀" layout="qwerty"  name="Test Minimal Keyboard"/>
 </keyboard3>
diff --git a/common/web/types/test/fixtures/import-minimal1.xml b/common/web/types/test/fixtures/import-minimal1.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
-<keyboard3 locale="und" conformsTo="45">
+<keyboard3 xmlns="https://schemas.unicode.org/cldr/45/keyboard3" locale="und" conformsTo="45">
   <info author="srl295" indicator="🙀" layout="qwerty"  name="Test Minimal Keyboard"/>
   <keys>
 

diff --git a/common/web/types/test/fixtures/import-minimal2.xml b/common/web/types/test/fixtures/import-minimal2.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
-<keyboard3 locale="und" conformsTo="45">
+<keyboard3 xmlns="https://schemas.unicode.org/cldr/45/keyboard3" locale="und" conformsTo="45">
   <info author="srl295" indicator="🙀" layout="qwerty"  name="Test Minimal Keyboard"/>
   <keys>
     <key id="a" output="å"/> <!-- override -->

diff --git a/common/web/types/test/fixtures/import-symbols.xml b/common/web/types/test/fixtures/import-symbols.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
-<keyboard3 locale="und" conformsTo="45">
+<keyboard3 xmlns="https://schemas.unicode.org/cldr/45/keyboard3" locale="und" conformsTo="45">
   <info author="srl295" indicator="🙀" layout="qwerty"  name="Test Minimal Keyboard"/>
   <keys>
-    <import base="cldr" path="techpreview/keys-Zyyy-punctuation.xml"/>
+    <import base="cldr" path="45/keys-Zyyy-punctuation.xml"/>
     <key id="zz" output="zz"/>
     <key id="hash" output="##"/> <!-- override -->
   </keys>

diff --git a/common/web/types/test/fixtures/invalid-conforms-to.xml b/common/web/types/test/fixtures/invalid-conforms-to.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  DOCTYPE keyboard SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd"
-  Disabling doctype for this invalid file, not used by compiler, and avoids complaints in IDEs etc.
--->
-<keyboard3 locale="mt" conformsTo="nothing-anyone-ever-heard-of"> <!-- invalid -->
+<keyboard3 xmlns="https://schemas.unicode.org/cldr/45/keyboard3" locale="mt" conformsTo="nothing-anyone-ever-heard-of"> <!-- invalid -->
   <info author="srl295" indicator="🙀" layout="qwerty"  name="TestKbd"/>
 
   <keys>

diff --git a/common/web/types/test/fixtures/invalid-import-base.xml b/common/web/types/test/fixtures/invalid-import-base.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
-<keyboard3 locale="mt" conformsTo="45">
+<keyboard3 xmlns="https://schemas.unicode.org/cldr/45/keyboard3" locale="mt" conformsTo="45">
   <info author="srl295" indicator="🙀" layout="qwerty"  name="TestKbd"/>
 
   <keys>

diff --git a/common/web/types/test/fixtures/invalid-import-path.xml b/common/web/types/test/fixtures/invalid-import-path.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
-<keyboard3 locale="mt" conformsTo="45">
+<keyboard3 xmlns="https://schemas.unicode.org/cldr/45/keyboard3" locale="mt" conformsTo="45">
   <info author="srl295" indicator="🙀" layout="qwerty"  name="TestKbd"/>
 
   <keys>
-    <import base="cldr" path="techpreview/too/many/slashes/leading/to/nothing-Zxxx-does-not-exist.xml"/> <!-- invalid -->
+    <import base="cldr" path="45/too/many/slashes/leading/to/nothing-Zxxx-does-not-exist.xml"/> <!-- invalid -->
     <key id="hmaqtugha" output="ħ" />
     <key id="that" output="ថា" />
   </keys>

diff --git a/common/web/types/test/fixtures/invalid-import-readfail.xml b/common/web/types/test/fixtures/invalid-import-readfail.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
-<keyboard3 locale="mt" conformsTo="45">
+<keyboard3 xmlns="https://schemas.unicode.org/cldr/45/keyboard3" locale="mt" conformsTo="45">
   <info author="srl295" indicator="🙀" layout="qwerty"  name="TestKbd"/>
 
   <keys>
-    <import base="cldr" path="techpreview/none-Zxxx-does-not-exist.xml"/> <!-- invalid -->
+    <import base="cldr" path="45/none-Zxxx-does-not-exist.xml"/> <!-- invalid -->
     <key id="hmaqtugha" output="ħ" />
     <key id="that" output="ថា" />
   </keys>

diff --git a/common/web/types/test/fixtures/invalid-import-wrongroot.xml b/common/web/types/test/fixtures/invalid-import-wrongroot.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
-<keyboard3 locale="mt" conformsTo="45">
+<keyboard3 xmlns="https://schemas.unicode.org/cldr/45/keyboard3" locale="mt" conformsTo="45">
   <info name="TestKbd" author="srl295" indicator="🙀" layout="qwerty" />
 
 
@@ -10,7 +9,7 @@
   </keys>
 
   <flicks>
-    <import base="cldr" path="techpreview/keys-Zyyy-punctuation.xml"/> <!-- wrong root! -->
+    <import base="cldr" path="45/keys-Zyyy-punctuation.xml"/> <!-- wrong root! -->
     <flick id="test">
       <flickSegment directions="n nw" keyId="hmaqtugha" />
     </flick>

diff --git a/common/web/types/test/fixtures/invalid-structure-per-dtd.xml b/common/web/types/test/fixtures/invalid-structure-per-dtd.xml
@@ -1,8 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  DOCTYPE keyboard SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd"
-  Disabling doctype for this invalid file, not used by compiler, and avoids complaints in IDEs etc.
--->
-<keyboard3 locale="mt" conformsTo="45">
+<keyboard3 xmlns="https://schemas.unicode.org/cldr/45/keyboard3" locale="mt" conformsTo="45">
 </keyboard3>
diff --git a/common/web/types/test/fixtures/test-fr.xml b/common/web/types/test/fixtures/test-fr.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE keyboardTest3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboardTest3.dtd">
-<keyboardTest3 conformsTo="45">
+<!DOCTYPE keyboardTest3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/45/dtd/ldmlKeyboardTest3.dtd">
+<keyboardTest3 conformsTo="techpreview">
     <!--
       Read by:
       - common/web/types/test/ldml-keyboard/test-ldml-keyboard-testdata-reader.ts

diff --git a/common/web/types/test/ldml-keyboard/test-ldml-keyboard-testdata-reader.ts b/common/web/types/test/ldml-keyboard/test-ldml-keyboard-testdata-reader.ts
@@ -14,7 +14,7 @@ describe('ldml keyboard xml reader tests', function () {
       callback: (data, source) => {
         assert.ok(source);
         assert.ok(source.keyboardTest3);
-        assert.equal(source.keyboardTest3.conformsTo, constants.cldr_version_latest);
+        assert.equal(source.keyboardTest3.conformsTo, constants.cldr_test_version_latest);
 
         assert.deepEqual(source.keyboardTest3.info, {
           keyboard: 'fr-t-k0-azerty.xml',

diff --git a/core/include/ldml/keyman_core_ldml.h b/core/include/ldml/keyman_core_ldml.h
@@ -19,6 +19,7 @@
 #define LDML_CLDR_IMPLIED_FORMS_IMPORT "45/scanCodes-implied.xml"
 #define LDML_CLDR_IMPLIED_KEYS_IMPORT "45/keys-Latn-implied.xml"
 #define LDML_CLDR_IMPORT_BASE "cldr"
+#define LDML_CLDR_TEST_VERSION_LATEST "techpreview"
 #define LDML_CLDR_VERSION_LATEST "45"
 #define LDML_ELEM_FLAGS_ORDER_BITSHIFT 0x10
 #define LDML_ELEM_FLAGS_ORDER_MASK 0xFF0000

diff --git a/core/include/ldml/keyman_core_ldml.ts b/core/include/ldml/keyman_core_ldml.ts
@@ -60,6 +60,10 @@ class Constants {
    * The current CLDR version
    */
   readonly cldr_version_latest = '45';
+  /**
+   * The version for testdata files
+   */
+  readonly cldr_test_version_latest = 'techpreview';
   /**
    * import base
    */

diff --git a/core/src/ldml/C7532_ldml_updating.md b/core/src/ldml/C7532_ldml_updating.md
@@ -22,7 +22,7 @@ working on ‘layr’, using ‘disp’ as a model from https://github.com/keyma
 
 ## XML changes
 
-- `resources/standards-data/ldml-keyboards/techpreview/`  : update / reimport / fix fixup script if needed
+- `resources/standards-data/ldml-keyboards/45/`  : update / reimport / fix fixup script if needed
 - E/C: `common/web/types/src/ldml-keyboard/ldml-keyboard-xml.ts`
     - add to `LKKeyboard` and subproperties as needed to support the structure on the XML side
 - Now would be a good time to stop and make sure everything compiles. It didn’t, there was an unrelated issue with snprintf!

diff --git a/core/tests/unit/ldml/keyboards/k_001_tiny-test.xml b/core/tests/unit/ldml/keyboards/k_001_tiny-test.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE keyboardTest3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboardTest3.dtd">
+<!DOCTYPE keyboardTest3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/45/dt/ldmlKeyboardTest3.dtd">
 <keyboardTest3 conformsTo="techpreview">
   <info keyboard="k_001_tiny.xml" author="srl295" name="k_001_tiny" />
   <!-- <repertoire chars="[ħ ថា]" type="simple" name="our-little-language" /> TODO-LDML: not working yet -->

diff --git a/core/tests/unit/ldml/keyboards/k_001_tiny.xml b/core/tests/unit/ldml/keyboards/k_001_tiny.xml
@@ -8,8 +8,7 @@
 @@expected: \u0127\u1790\u17B6\u0127
 
 -->
-<!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
-<keyboard3 locale="mt" conformsTo="45">
+<keyboard3 xmlns="https://schemas.unicode.org/cldr/45/keyboard3" locale="mt" conformsTo="45">
   <info author="srl295" indicator="🙀" layout="qwerty"  name="TestKbd"/>
 
   <keys>

diff --git a/core/tests/unit/ldml/keyboards/k_002_tinyu32.xml b/core/tests/unit/ldml/keyboards/k_002_tinyu32.xml
@@ -6,8 +6,7 @@
 @@expected: \u0127\u1790\u17B6\u0127\uD83D\uDE40\u0127
 
 -->
-<!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
-<keyboard3 locale="mt" conformsTo="45">
+<keyboard3 xmlns="https://schemas.unicode.org/cldr/45/keyboard3" locale="mt" conformsTo="45">
   <info author="srl295" indicator="🙀" layout="qwerty"  name="TestKbd-UTF32"/>
 
   <keys>

diff --git a/core/tests/unit/ldml/keyboards/k_003_transform.xml b/core/tests/unit/ldml/keyboards/k_003_transform.xml
@@ -7,8 +7,7 @@ from https://github.com/unicode-org/cldr/blob/keyboard-preview/docs/ldml/tr35-ke
 @@expected: qu\u00ea
 
 -->
-<!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
-<keyboard3 locale="en" conformsTo="45">
+<keyboard3 xmlns="https://schemas.unicode.org/cldr/45/keyboard3" locale="en" conformsTo="45">
   <info author="srl295" indicator="🙀" layout="qwerty"  name="TransformKbd"/>
 
   <keys>

diff --git a/core/tests/unit/ldml/keyboards/k_004_tinyshift.xml b/core/tests/unit/ldml/keyboards/k_004_tinyshift.xml
@@ -6,8 +6,7 @@
 @@expected: \u0037\u1790\u17B6\u0127
 
 -->
-<!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
-<keyboard3 locale="mt" conformsTo="45">
+<keyboard3 xmlns="https://schemas.unicode.org/cldr/45/keyboard3" locale="mt" conformsTo="45">
   <info author="srl295" indicator="🙀" layout="qwerty"  name="TestKbd"/>
 
   <keys>

diff --git a/core/tests/unit/ldml/keyboards/k_005_modbittest.xml b/core/tests/unit/ldml/keyboards/k_005_modbittest.xml
@@ -6,8 +6,7 @@
 @@expected: \u0061\u0041\u0062\u0063\u0064\u0064\u0065\u0066\u0067\u0067
 
 -->
-<!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
-<keyboard3 locale="mt" conformsTo="45">
+<keyboard3 xmlns="https://schemas.unicode.org/cldr/45/keyboard3" locale="mt" conformsTo="45">
   <info author="srl295" indicator="🙀" layout="qwerty"  name="TestKbd"/>
 
   <keys/> <!-- implied only -->

diff --git a/core/tests/unit/ldml/keyboards/k_006_backspace-test.xml b/core/tests/unit/ldml/keyboards/k_006_backspace-test.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE keyboardTest3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboardTest3.dtd">
+<!DOCTYPE keyboardTest3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/45/dt/ldmlKeyboardTest3.dtd">
 <keyboardTest3 conformsTo="techpreview">
   <info keyboard="k_006_backspace.xml" author="Team Keyboard" name="backspace" />
   <tests name="backspace">

diff --git a/core/tests/unit/ldml/keyboards/k_006_backspace.xml b/core/tests/unit/ldml/keyboards/k_006_backspace.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
-<keyboard3 locale="en" conformsTo="45">
+<keyboard3 xmlns="https://schemas.unicode.org/cldr/45/keyboard3" locale="en" conformsTo="45">
   <info author="srl295" indicator="🙀" layout="qwerty"  name="TransformKbd"/>
 
   <keys>

diff --git a/core/tests/unit/ldml/keyboards/k_007_transform_rgx-test.xml b/core/tests/unit/ldml/keyboards/k_007_transform_rgx-test.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE keyboardTest3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboardTest3.dtd">
+<!DOCTYPE keyboardTest3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/45/dt/ldmlKeyboardTest3.dtd">
 <keyboardTest3 conformsTo="techpreview">
   <info keyboard="k_007_transform_rgx.xml" author="Team Keyboard" name="marker" />
   <tests name="regex-tests">

diff --git a/core/tests/unit/ldml/keyboards/k_007_transform_rgx.xml b/core/tests/unit/ldml/keyboards/k_007_transform_rgx.xml
@@ -4,8 +4,7 @@
 from https://github.com/unicode-org/cldr/blob/keyboard-preview/docs/ldml/tr35-keyboards.md#element-transform
 
 -->
-<!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
-<keyboard3 locale="en" conformsTo="45">
+<keyboard3 xmlns="https://schemas.unicode.org/cldr/45/keyboard3" locale="en" conformsTo="45">
   <info author="srl295" indicator="🙀" layout="qwerty" name="k_007_transform_rgx" />
 
   <keys>

diff --git a/core/tests/unit/ldml/keyboards/k_008_transform_norm-test.xml b/core/tests/unit/ldml/keyboards/k_008_transform_norm-test.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE keyboardTest3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboardTest3.dtd">
+<!DOCTYPE keyboardTest3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/45/dt/ldmlKeyboardTest3.dtd">
 <keyboardTest3 conformsTo="techpreview">
   <info keyboard="k_008_transform_norm.xml" author="Team Keyboard" name="transform-norm" />
   <tests name="regex-test-dot0">

diff --git a/core/tests/unit/ldml/keyboards/k_008_transform_norm.xml b/core/tests/unit/ldml/keyboards/k_008_transform_norm.xml
@@ -5,8 +5,7 @@ from
 https://github.com/unicode-org/cldr/blob/keyboard-preview/docs/ldml/tr35-keyboards.md#element-transform
 
 -->
-<!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
-<keyboard3 locale="en" conformsTo="45">
+<keyboard3 xmlns="https://schemas.unicode.org/cldr/45/keyboard3" locale="en" conformsTo="45">
   <info author="srl295" indicator="🙀" layout="qwerty" name="k_008_transform_norm" />
 
   <keys>

diff --git a/core/tests/unit/ldml/keyboards/k_009_transform_nfc-test.xml b/core/tests/unit/ldml/keyboards/k_009_transform_nfc-test.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE keyboardTest3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboardTest3.dtd">
+<!DOCTYPE keyboardTest3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/45/dt/ldmlKeyboardTest3.dtd">
 <keyboardTest3 conformsTo="techpreview">
   <info keyboard="k_009_transform_nfc.xml" author="Team Keyboard" name="transform-norm" />
   <tests name="regex-test-dot0">

diff --git a/core/tests/unit/ldml/keyboards/k_009_transform_nfc.xml b/core/tests/unit/ldml/keyboards/k_009_transform_nfc.xml
@@ -3,8 +3,7 @@
 <!--
 like k_008 but in NFC (and other normalizations)
 -->
-<!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
-<keyboard3 locale="en" conformsTo="45">
+<keyboard3 xmlns="https://schemas.unicode.org/cldr/45/keyboard3" locale="en" conformsTo="45">
   <info author="srl295" indicator="🙀" layout="qwerty" name="k_009_transform_nfc" />
 
   <settings normalization="disabled" />

diff --git a/core/tests/unit/ldml/keyboards/k_010_mt.xml b/core/tests/unit/ldml/keyboards/k_010_mt.xml
@@ -10,9 +10,7 @@ Gets part of the way,
     Based on mt.xml from CLDR.  'TODO-LDML' denotes modifications.
     Note this is the 47-key version.
 -->
-<!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
-<!-- remainder entirely from resources/standards-data/ldml-keyboards/techpreview/3.0/mt-t-k0-47key.xml -->
-<keyboard3 locale="mt-t-k0-47key" conformsTo="45">
+<keyboard3 xmlns="https://schemas.unicode.org/cldr/45/keyboard3" locale="mt-t-k0-47key" conformsTo="45">
     <locales>
         <!-- English is also an official language in Malta.-->
         <locale id="en" />
@@ -21,8 +19,8 @@ Gets part of the way,
 
     <keys>
         <!-- imports -->
-        <import base="cldr" path="techpreview/keys-Zyyy-punctuation.xml" />
-        <import base="cldr" path="techpreview/keys-Zyyy-currency.xml" />
+        <import base="cldr" path="45/keys-Zyyy-punctuation.xml" />
+        <import base="cldr" path="45/keys-Zyyy-currency.xml" />
 
         <!-- accent grave -->
         <key id="a-grave" output="à" />

diff --git a/core/tests/unit/ldml/keyboards/k_011_mt_iso.xml b/core/tests/unit/ldml/keyboards/k_011_mt_iso.xml
@@ -11,8 +11,7 @@ Exact copy of mt.xml from CLDR, but with:
   - an updated DTD path
   - test case
 -->
-<!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
-<keyboard3 locale="mt" conformsTo="45">
+<keyboard3 xmlns="https://schemas.unicode.org/cldr/45/keyboard3" locale="mt" conformsTo="45">
     <locales>
         <!-- English is also an official language in Malta.-->
         <locale id="en" />
@@ -21,8 +20,8 @@ Exact copy of mt.xml from CLDR, but with:
 
     <keys>
         <!-- imports -->
-        <import base="cldr" path="techpreview/keys-Zyyy-punctuation.xml"/>
-        <import base="cldr" path="techpreview/keys-Zyyy-currency.xml"/>
+        <import base="cldr" path="45/keys-Zyyy-punctuation.xml"/>
+        <import base="cldr" path="45/keys-Zyyy-currency.xml"/>
 
         <!-- accent grave -->
         <key id="a-grave" output="à" />

diff --git a/core/tests/unit/ldml/keyboards/k_020_fr-test.xml b/core/tests/unit/ldml/keyboards/k_020_fr-test.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Note: similar to, but slightly ahead of, fr-t-k0-azerty -->
-<!DOCTYPE keyboardTest3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboardTest3.dtd">
+<!DOCTYPE keyboardTest3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/45/dt/ldmlKeyboardTest3.dtd">
 <keyboardTest3 conformsTo="techpreview">
     <info keyboard="k_020_fr.xml" author="Team Keyboard" name="fr-test-updated" />
     <repertoire name="simple-repertoire" chars="[a b c d e \u0022]" type="simple" /> <!-- verify that these outputs are all available from simple keys on any layer, for all form factors -->

diff --git a/core/tests/unit/ldml/keyboards/k_020_fr.xml b/core/tests/unit/ldml/keyboards/k_020_fr.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Note: similar to, but slightly ahead of, fr-t-k0-azerty -->
-<!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
-<keyboard3 locale="fr-t-k0-azerty" conformsTo="45">
+<keyboard3 xmlns="https://schemas.unicode.org/cldr/45/keyboard3" locale="fr-t-k0-azerty" conformsTo="45">
 	<locales>
 		<locale id="br" /> <!-- example of including Breton -->
 	</locales>
@@ -28,8 +27,8 @@
 	</displays>
 
 	<keys>
-		<import base="cldr" path="techpreview/keys-Zyyy-punctuation.xml" />
-		<import base="cldr" path="techpreview/keys-Zyyy-currency.xml" />
+		<import base="cldr" path="45/keys-Zyyy-punctuation.xml" />
+		<import base="cldr" path="45/keys-Zyyy-currency.xml" />
 
 		<!-- switch keys -->
 		<key id="shift" layerId="shift" />

diff --git a/core/tests/unit/ldml/keyboards/k_100_keytest.xml b/core/tests/unit/ldml/keyboards/k_100_keytest.xml
@@ -5,8 +5,7 @@
 @@expected: \u0061
 -->
 
-<!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
-<keyboard3 locale="en" conformsTo="45">
+<keyboard3 xmlns="https://schemas.unicode.org/cldr/45/keyboard3" locale="en" conformsTo="45">
   <info author="srl295" indicator="🙀" layout="qwerty"  name="TestKbd"/>
 
   <keys>

diff --git a/core/tests/unit/ldml/keyboards/k_101_keytest.xml b/core/tests/unit/ldml/keyboards/k_101_keytest.xml
@@ -4,8 +4,7 @@
 @@keys: [K_BKQUOTE]
 @@expected: \u0061
 -->
-<!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
-<keyboard3 locale="en" conformsTo="45">
+<keyboard3 xmlns="https://schemas.unicode.org/cldr/45/keyboard3" locale="en" conformsTo="45">
   <info author="srl295" indicator="🙀" layout="qwerty"  name="TestKbd"/>
 
   <displays>

diff --git a/core/tests/unit/ldml/keyboards/k_102_keytest.xml b/core/tests/unit/ldml/keyboards/k_102_keytest.xml
@@ -16,8 +16,7 @@
   q<enter>az     Az         enter=not mappable, should cause context reset of qaz. TODO-LDML no invalidate here?
 -->
 
-<!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
-<keyboard3 locale="en" conformsTo="45">
+<keyboard3 xmlns="https://schemas.unicode.org/cldr/45/keyboard3" locale="en" conformsTo="45">
   <info author="srl295" indicator="🙀" layout="qwerty"  name="TestKbd"/>
   <!-- TODO-LDML: split to separate test with only implied keys - the <keys/> element is omitted. -->
   <keys>

diff --git a/core/tests/unit/ldml/keyboards/k_200_reorder_nod_Lana-test.xml b/core/tests/unit/ldml/keyboards/k_200_reorder_nod_Lana-test.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE keyboardTest3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboardTest3.dtd">
+<!DOCTYPE keyboardTest3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/45/dt/ldmlKeyboardTest3.dtd">
 <keyboardTest3 conformsTo="techpreview">
   <info keyboard="k_200_reorder_nod_Lana.xml" author="Team Keyboard" name="nod-Lana" />
   <tests name="reorder-tests">