diff --git a/common/web/types/build.sh b/common/web/types/build.sh
index e565b03acc7..2ca21319ee4 100755
--- 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/src/ldml-keyboard/ldml-keyboard-xml-reader.ts b/common/web/types/src/ldml-keyboard/ldml-keyboard-xml-reader.ts
index 5c58bd383e1..4f5c30bb1ac 100644
--- a/common/web/types/src/ldml-keyboard/ldml-keyboard-xml-reader.ts
+++ b/common/web/types/src/ldml-keyboard/ldml-keyboard-xml-reader.ts
@@ -156,7 +156,7 @@ export class LDMLKeyboardXMLSourceFileReader {
}
// then, the implied imports
if (subtag === 'keys') {
- //
+ //
if (!this.resolveOneImport(obj, subtag, {
base: constants.cldr_import_base,
path: constants.cldr_implied_keys_import
@@ -164,7 +164,7 @@ export class LDMLKeyboardXMLSourceFileReader {
return false;
}
} else if (subtag === 'forms') {
- //
+ //
if (!this.resolveOneImport(obj, subtag, {
base: constants.cldr_import_base,
path: constants.cldr_implied_forms_import
diff --git a/common/web/types/src/ldml-keyboard/ldml-keyboard-xml.ts b/common/web/types/src/ldml-keyboard/ldml-keyboard-xml.ts
index d47cb656198..696194573f8 100644
--- a/common/web/types/src/ldml-keyboard/ldml-keyboard-xml.ts
+++ b/common/web/types/src/ldml-keyboard/ldml-keyboard-xml.ts
@@ -1,5 +1,5 @@
//
-// Conforms to techpreview
+// Conforms to 45
//
// The interfaces in this file are designed with reference to the mapped
// structures produced by xml2js when passed a LDML keyboard .xml file.
@@ -40,7 +40,7 @@ export interface LKImport {
*/
base: string;
/**
- * path to imported resource, of the form `techpreview/*.xml`
+ * path to imported resource, of the form `45/*.xml`
*/
path: string;
};
diff --git a/common/web/types/test/fixtures/import-minimal.xml b/common/web/types/test/fixtures/import-minimal.xml
index 02a4c0fdfe9..1510e81a476 100644
--- a/common/web/types/test/fixtures/import-minimal.xml
+++ b/common/web/types/test/fixtures/import-minimal.xml
@@ -1,5 +1,4 @@
-
-
+
diff --git a/common/web/types/test/fixtures/import-minimal1.xml b/common/web/types/test/fixtures/import-minimal1.xml
index 7239fc9a85e..cfaf73abb9b 100644
--- a/common/web/types/test/fixtures/import-minimal1.xml
+++ b/common/web/types/test/fixtures/import-minimal1.xml
@@ -1,6 +1,5 @@
-
-
+
diff --git a/common/web/types/test/fixtures/import-minimal2.xml b/common/web/types/test/fixtures/import-minimal2.xml
index 3e30044f268..6e768dc0958 100644
--- a/common/web/types/test/fixtures/import-minimal2.xml
+++ b/common/web/types/test/fixtures/import-minimal2.xml
@@ -1,6 +1,5 @@
-
-
+
diff --git a/common/web/types/test/fixtures/import-symbols.xml b/common/web/types/test/fixtures/import-symbols.xml
index 763de4e78a6..43cc1a7de73 100644
--- a/common/web/types/test/fixtures/import-symbols.xml
+++ b/common/web/types/test/fixtures/import-symbols.xml
@@ -1,9 +1,8 @@
-
-
+
-
+
diff --git a/common/web/types/test/fixtures/invalid-conforms-to.xml b/common/web/types/test/fixtures/invalid-conforms-to.xml
index de19c3a3bf0..96059891911 100644
--- a/common/web/types/test/fixtures/invalid-conforms-to.xml
+++ b/common/web/types/test/fixtures/invalid-conforms-to.xml
@@ -1,10 +1,5 @@
-
-
-
+
diff --git a/common/web/types/test/fixtures/invalid-import-base.xml b/common/web/types/test/fixtures/invalid-import-base.xml
index 05dcaad299a..29b06045822 100644
--- a/common/web/types/test/fixtures/invalid-import-base.xml
+++ b/common/web/types/test/fixtures/invalid-import-base.xml
@@ -1,6 +1,5 @@
-
-
+
diff --git a/common/web/types/test/fixtures/invalid-import-path.xml b/common/web/types/test/fixtures/invalid-import-path.xml
index b6d4c9da665..58d36967579 100644
--- a/common/web/types/test/fixtures/invalid-import-path.xml
+++ b/common/web/types/test/fixtures/invalid-import-path.xml
@@ -1,10 +1,9 @@
-
-
+
-
+
diff --git a/common/web/types/test/fixtures/invalid-import-readfail.xml b/common/web/types/test/fixtures/invalid-import-readfail.xml
index 00f02e7da82..82e609b0b76 100644
--- a/common/web/types/test/fixtures/invalid-import-readfail.xml
+++ b/common/web/types/test/fixtures/invalid-import-readfail.xml
@@ -1,10 +1,9 @@
-
-
+
-
+
diff --git a/common/web/types/test/fixtures/invalid-import-wrongroot.xml b/common/web/types/test/fixtures/invalid-import-wrongroot.xml
index fbe75ffe19b..3d194933f55 100644
--- a/common/web/types/test/fixtures/invalid-import-wrongroot.xml
+++ b/common/web/types/test/fixtures/invalid-import-wrongroot.xml
@@ -1,6 +1,5 @@
-
-
+
@@ -10,7 +9,7 @@
-
+
diff --git a/common/web/types/test/fixtures/invalid-structure-per-dtd.xml b/common/web/types/test/fixtures/invalid-structure-per-dtd.xml
index 961e6033fa6..cb47dcb1f37 100644
--- 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 @@
-
-
-
+
diff --git a/common/web/types/test/fixtures/test-fr.xml b/common/web/types/test/fixtures/test-fr.xml
index c705605521b..b92ba413605 100644
--- a/common/web/types/test/fixtures/test-fr.xml
+++ b/common/web/types/test/fixtures/test-fr.xml
@@ -1,5 +1,5 @@
-
+