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 @@ - + diff --git a/core/tests/unit/ldml/keyboards/k_001_tiny.xml b/core/tests/unit/ldml/keyboards/k_001_tiny.xml index aae89fd4119..b8a543cd2d7 100644 --- 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 --> - - + diff --git a/core/tests/unit/ldml/keyboards/k_002_tinyu32.xml b/core/tests/unit/ldml/keyboards/k_002_tinyu32.xml index a8c5e372339..078e8aec3cf 100644 --- 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 --> - - + diff --git a/core/tests/unit/ldml/keyboards/k_003_transform.xml b/core/tests/unit/ldml/keyboards/k_003_transform.xml index ba837a7115b..2fc8d61e3dc 100644 --- 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 --> - - + diff --git a/core/tests/unit/ldml/keyboards/k_004_tinyshift.xml b/core/tests/unit/ldml/keyboards/k_004_tinyshift.xml index e2c442b28ad..4346fa801b0 100644 --- 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 --> - - + diff --git a/core/tests/unit/ldml/keyboards/k_005_modbittest.xml b/core/tests/unit/ldml/keyboards/k_005_modbittest.xml index 2af7cf2be05..054c81d8c06 100644 --- 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 --> - - + diff --git a/core/tests/unit/ldml/keyboards/k_006_backspace-test.xml b/core/tests/unit/ldml/keyboards/k_006_backspace-test.xml index 5239fe3409c..c0157f88287 100644 --- 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 @@ - + diff --git a/core/tests/unit/ldml/keyboards/k_006_backspace.xml b/core/tests/unit/ldml/keyboards/k_006_backspace.xml index d9f29956957..763d90bc7f7 100644 --- a/core/tests/unit/ldml/keyboards/k_006_backspace.xml +++ b/core/tests/unit/ldml/keyboards/k_006_backspace.xml @@ -1,7 +1,6 @@ - - + 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 index 6fe824270e3..80f3bbafabe 100644 --- 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 @@ - + diff --git a/core/tests/unit/ldml/keyboards/k_007_transform_rgx.xml b/core/tests/unit/ldml/keyboards/k_007_transform_rgx.xml index 6a74ea5a77a..18356b2c3e3 100644 --- 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 --> - - + 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 index 7717ef5c30a..52323ea0717 100644 --- 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 @@ - + diff --git a/core/tests/unit/ldml/keyboards/k_008_transform_norm.xml b/core/tests/unit/ldml/keyboards/k_008_transform_norm.xml index aa121f66fdb..cc1a7ab43d1 100644 --- 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 --> - - + 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 index f6462c61d7f..8d63e86e02a 100644 --- 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 @@ - + diff --git a/core/tests/unit/ldml/keyboards/k_009_transform_nfc.xml b/core/tests/unit/ldml/keyboards/k_009_transform_nfc.xml index 877aeefc8e8..e975260dcb8 100644 --- 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 @@ - - + diff --git a/core/tests/unit/ldml/keyboards/k_010_mt.xml b/core/tests/unit/ldml/keyboards/k_010_mt.xml index 2fd3e2b44f9..af50d2cb751 100644 --- 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. --> - - - + @@ -21,8 +19,8 @@ Gets part of the way, - - + + diff --git a/core/tests/unit/ldml/keyboards/k_011_mt_iso.xml b/core/tests/unit/ldml/keyboards/k_011_mt_iso.xml index 59496726fad..0ea0b7f3177 100644 --- 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 --> - - + @@ -21,8 +20,8 @@ Exact copy of mt.xml from CLDR, but with: - - + + diff --git a/core/tests/unit/ldml/keyboards/k_020_fr-test.xml b/core/tests/unit/ldml/keyboards/k_020_fr-test.xml index f4ac30aa9f6..22fce785389 100644 --- 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 @@ - + diff --git a/core/tests/unit/ldml/keyboards/k_020_fr.xml b/core/tests/unit/ldml/keyboards/k_020_fr.xml index 297062e5d18..671f1b8b9b6 100644 --- a/core/tests/unit/ldml/keyboards/k_020_fr.xml +++ b/core/tests/unit/ldml/keyboards/k_020_fr.xml @@ -1,7 +1,6 @@ - - + @@ -28,8 +27,8 @@ - - + + diff --git a/core/tests/unit/ldml/keyboards/k_100_keytest.xml b/core/tests/unit/ldml/keyboards/k_100_keytest.xml index 47457bb99f8..6c2d6934477 100644 --- 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 --> - - + diff --git a/core/tests/unit/ldml/keyboards/k_101_keytest.xml b/core/tests/unit/ldml/keyboards/k_101_keytest.xml index 9dc35408fa4..2af4ee26c94 100644 --- 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 --> - - + diff --git a/core/tests/unit/ldml/keyboards/k_102_keytest.xml b/core/tests/unit/ldml/keyboards/k_102_keytest.xml index de61b8a9c2d..5b47eb5f155 100644 --- a/core/tests/unit/ldml/keyboards/k_102_keytest.xml +++ b/core/tests/unit/ldml/keyboards/k_102_keytest.xml @@ -16,8 +16,7 @@ qaz Az enter=not mappable, should cause context reset of qaz. TODO-LDML no invalidate here? --> - - + 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 index e207d191931..d23e596bbb3 100644 --- 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 @@ - + diff --git a/core/tests/unit/ldml/keyboards/k_200_reorder_nod_Lana.xml b/core/tests/unit/ldml/keyboards/k_200_reorder_nod_Lana.xml index f5f5adf7535..b6e6cc2e924 100644 --- a/core/tests/unit/ldml/keyboards/k_200_reorder_nod_Lana.xml +++ b/core/tests/unit/ldml/keyboards/k_200_reorder_nod_Lana.xml @@ -5,8 +5,7 @@ see https://keyman.com/keyboards/sil_boonkit --> - - + diff --git a/core/tests/unit/ldml/keyboards/k_201_reorder_esk-test.xml b/core/tests/unit/ldml/keyboards/k_201_reorder_esk-test.xml index c1510ba1dae..fbb3427878c 100644 --- a/core/tests/unit/ldml/keyboards/k_201_reorder_esk-test.xml +++ b/core/tests/unit/ldml/keyboards/k_201_reorder_esk-test.xml @@ -1,5 +1,5 @@ - + diff --git a/core/tests/unit/ldml/keyboards/k_201_reorder_esk.xml b/core/tests/unit/ldml/keyboards/k_201_reorder_esk.xml index 5f3134ee05e..419d4d17943 100644 --- a/core/tests/unit/ldml/keyboards/k_201_reorder_esk.xml +++ b/core/tests/unit/ldml/keyboards/k_201_reorder_esk.xml @@ -1,7 +1,6 @@ - - + diff --git a/core/tests/unit/ldml/keyboards/k_210_marker-test.xml b/core/tests/unit/ldml/keyboards/k_210_marker-test.xml index 8b05aca859d..df6b65422b6 100644 --- a/core/tests/unit/ldml/keyboards/k_210_marker-test.xml +++ b/core/tests/unit/ldml/keyboards/k_210_marker-test.xml @@ -1,5 +1,5 @@ - + diff --git a/core/tests/unit/ldml/keyboards/k_210_marker.xml b/core/tests/unit/ldml/keyboards/k_210_marker.xml index 750a1870bba..4d3d66ce986 100644 --- a/core/tests/unit/ldml/keyboards/k_210_marker.xml +++ b/core/tests/unit/ldml/keyboards/k_210_marker.xml @@ -4,8 +4,7 @@ Test Keyboard --> - - + diff --git a/core/tests/unit/ldml/keyboards/k_211_marker_escape-test.xml b/core/tests/unit/ldml/keyboards/k_211_marker_escape-test.xml index f8eb8ed921a..5fb09e7fc58 100644 --- a/core/tests/unit/ldml/keyboards/k_211_marker_escape-test.xml +++ b/core/tests/unit/ldml/keyboards/k_211_marker_escape-test.xml @@ -1,5 +1,5 @@ - + diff --git a/core/tests/unit/ldml/keyboards/k_211_marker_escape.xml b/core/tests/unit/ldml/keyboards/k_211_marker_escape.xml index 8ddae398195..4130e22850f 100644 --- a/core/tests/unit/ldml/keyboards/k_211_marker_escape.xml +++ b/core/tests/unit/ldml/keyboards/k_211_marker_escape.xml @@ -4,8 +4,7 @@ Test Keyboard --> - - + diff --git a/core/tests/unit/ldml/keyboards/ldml_test-test.xml b/core/tests/unit/ldml/keyboards/ldml_test-test.xml index a771562bda9..ea196dab893 100644 --- a/core/tests/unit/ldml/keyboards/ldml_test-test.xml +++ b/core/tests/unit/ldml/keyboards/ldml_test-test.xml @@ -1,5 +1,5 @@ - + diff --git a/core/tests/unit/ldml/keyboards/ldml_test.xml b/core/tests/unit/ldml/keyboards/ldml_test.xml index 2885d6cc32d..684e9fdd395 100644 --- a/core/tests/unit/ldml/keyboards/ldml_test.xml +++ b/core/tests/unit/ldml/keyboards/ldml_test.xml @@ -1,11 +1,11 @@ - + - - + + diff --git a/core/tests/unit/ldml/keyboards/meson.build b/core/tests/unit/ldml/keyboards/meson.build index 890a4e65f7a..ca047a67bc6 100644 --- a/core/tests/unit/ldml/keyboards/meson.build +++ b/core/tests/unit/ldml/keyboards/meson.build @@ -5,13 +5,13 @@ # -# keyboards in resources/standards-data/ldml-keyboards/techpreview/3.0/ -# tests in resources/standards-data/ldml-keyboards/techpreview/test/ +# keyboards in resources/standards-data/ldml-keyboards/45/3.0/ +# tests in resources/standards-data/ldml-keyboards/45/test/ tests_from_cldr = [ 'ja-Latn', 'pt-t-k0-abnt2', # 'fr-t-k0-optimise', (not yet) - # 'fr-t-k0-test', + 'fr-t-k0-azerty', 'pcm', 'bn', ] @@ -55,7 +55,7 @@ tests += tests_from_cldr # Setup kmc kmc_root = join_paths(meson.source_root(),'..','developer','src','kmc') -ldml_root = join_paths(meson.source_root(),'..','resources','standards-data','ldml-keyboards','techpreview') +ldml_root = join_paths(meson.source_root(),'..','resources','standards-data','ldml-keyboards','45') ldml_data = join_paths(ldml_root, '3.0') ldml_testdata = join_paths(ldml_root, 'test') kmc_cmd = [node, '--enable-source-maps', kmc_root] diff --git a/core/tests/unit/ldml/ldml_test_source.cpp b/core/tests/unit/ldml/ldml_test_source.cpp index 9bb08b11f25..b638379bb6d 100644 --- a/core/tests/unit/ldml/ldml_test_source.cpp +++ b/core/tests/unit/ldml/ldml_test_source.cpp @@ -753,7 +753,7 @@ int LdmlJsonTestSourceFactory::load(const km::core::path &compiled, const km::co } auto conformsTo = data["/keyboardTest3/conformsTo"_json_pointer].get(); - assert_or_return(std::string(LDML_CLDR_VERSION_LATEST) == conformsTo); + assert_or_return(std::string(LDML_CLDR_TEST_VERSION_LATEST) == conformsTo); auto info_keyboard = data["/keyboardTest3/info/keyboard"_json_pointer].get(); auto info_author = data["/keyboardTest3/info/author"_json_pointer].get(); auto info_name = data["/keyboardTest3/info/name"_json_pointer].get(); diff --git a/developer/src/inst/kmdev.wxs b/developer/src/inst/kmdev.wxs index b76f0ac34ad..f804b8b9cf8 100644 --- a/developer/src/inst/kmdev.wxs +++ b/developer/src/inst/kmdev.wxs @@ -59,7 +59,7 @@ - + @@ -198,7 +198,7 @@ - + diff --git a/developer/src/kmc-ldml/test/fixtures/basic.txt b/developer/src/kmc-ldml/test/fixtures/basic.txt index 0c46c3451b6..124b9bdbc32 100644 --- a/developer/src/kmc-ldml/test/fixtures/basic.txt +++ b/developer/src/kmc-ldml/test/fixtures/basic.txt @@ -489,6 +489,7 @@ block(strs) # struct COMP_KMXPLUS_STRS { diff(strs,strNull) sizeof(strNull,2) diff(strs,strVersion) sizeof(strVersion,2) + diff(strs,strConformsTo) sizeof(strConformsTo,2) diff(strs,strName) sizeof(strName,2) diff(strs,strFromSet) sizeof(strFromSet,2) diff(strs,strUSet) sizeof(strUSet,2) @@ -508,7 +509,6 @@ block(strs) # struct COMP_KMXPLUS_STRS { diff(strs,strLocale) sizeof(strLocale,2) diff(strs,strLayout) sizeof(strLayout,2) diff(strs,strAuthor) sizeof(strAuthor,2) - diff(strs,strConformsTo) sizeof(strConformsTo,2) diff(strs,strThat) sizeof(strThat,2) diff(strs,strUs) sizeof(strUs,2) diff(strs,strVse) sizeof(strVse,2) @@ -524,6 +524,7 @@ block(strs) # struct COMP_KMXPLUS_STRS { #str #00 block(strNull) block(x) 00 00 # the zero-length string block(strVersion) 31 00 2e 00 30 00 2e 00 30 00 block(x) 00 00 # '1.0.0' + block(strConformsTo) 34 00 35 00 block(x) 00 00 # '45' block(strName) 54 00 65 00 73 00 74 00 4b 00 62 00 64 00 block(x) 00 00 # 'TestKbd' block(strFromSet) 5B 00 5C 00 75 00 31 00 41 00 37 00 35 00 2D 00 5C 00 75 00 31 00 41 00 37 00 39 00 5D 00 block(x) 00 00 # [\u1a75-\u1a79] block(strUSet) 5b 00 61 00 62 00 63 00 5d 00 block(x) 00 00 # '[abc]' @@ -545,8 +546,6 @@ block(strs) # struct COMP_KMXPLUS_STRS { block(strLocale) 6d 00 74 00 block(x) 00 00 # 'mt' block(strLayout) 71 00 77 00 65 00 72 00 74 00 79 00 block(x) 00 00 # 'qwerty' block(strAuthor) 73 00 72 00 6c 00 32 00 39 00 35 00 block(x) 00 00 # 'srl295' - block(strConformsTo) 74 00 65 00 63 00 68 00 70 00 72 00 65 00 76 00 - 69 00 65 00 77 00 block(x) 00 00 # 'techpreview' block(strThat) 74 00 68 00 61 00 74 00 block(x) 00 00 # 'that' block(strUs) 75 00 73 00 block(x) 00 00 # 'us' (layout) block(strVse) 76 00 73 00 65 00 block(x) 00 00 # 'vse' diff --git a/developer/src/kmc-ldml/test/fixtures/basic.xml b/developer/src/kmc-ldml/test/fixtures/basic.xml index 568eb39cf85..c8565271ed1 100644 --- a/developer/src/kmc-ldml/test/fixtures/basic.xml +++ b/developer/src/kmc-ldml/test/fixtures/basic.xml @@ -4,8 +4,7 @@ @@keys: [K_Q][K_W][K_Q] @@expected: \u0127\u1790\u17B6\u0127 --> - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/bksp/minimal.xml b/developer/src/kmc-ldml/test/fixtures/sections/bksp/minimal.xml index 184991ad4c1..d0a05695c36 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/bksp/minimal.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/bksp/minimal.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/disp/escaped.xml b/developer/src/kmc-ldml/test/fixtures/sections/disp/escaped.xml index 44412e2c1fd..d2a2dd611a0 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/disp/escaped.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/disp/escaped.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/disp/invalid-both.xml b/developer/src/kmc-ldml/test/fixtures/sections/disp/invalid-both.xml index 41c414b41e3..1f0c35dfd0e 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/disp/invalid-both.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/disp/invalid-both.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/disp/invalid-dupid.xml b/developer/src/kmc-ldml/test/fixtures/sections/disp/invalid-dupid.xml index c3db581640f..6ff77d83b0d 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/disp/invalid-dupid.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/disp/invalid-dupid.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/disp/invalid-dupto.xml b/developer/src/kmc-ldml/test/fixtures/sections/disp/invalid-dupto.xml index ec5cda2e425..1046e0f4d85 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/disp/invalid-dupto.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/disp/invalid-dupto.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/disp/invalid-none.xml b/developer/src/kmc-ldml/test/fixtures/sections/disp/invalid-none.xml index e6c43aafd97..0eb1435edca 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/disp/invalid-none.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/disp/invalid-none.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/disp/invalid-var.xml b/developer/src/kmc-ldml/test/fixtures/sections/disp/invalid-var.xml index 8ba588ce14b..af46b249951 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/disp/invalid-var.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/disp/invalid-var.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/disp/maximal.xml b/developer/src/kmc-ldml/test/fixtures/sections/disp/maximal.xml index d3b66576731..aeab3a71a5c 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/disp/maximal.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/disp/maximal.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/disp/minimal.xml b/developer/src/kmc-ldml/test/fixtures/sections/disp/minimal.xml index 15590710ba3..ead9c5d2031 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/disp/minimal.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/disp/minimal.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/disp/options-only.xml b/developer/src/kmc-ldml/test/fixtures/sections/disp/options-only.xml index ee967fc027c..7f08c5dd984 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/disp/options-only.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/disp/options-only.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/disp/typical.xml b/developer/src/kmc-ldml/test/fixtures/sections/disp/typical.xml index 9486e904b7c..958e5d83815 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/disp/typical.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/disp/typical.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/finl/minimal.xml b/developer/src/kmc-ldml/test/fixtures/sections/finl/minimal.xml index 022241b4f57..bb437bec764 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/finl/minimal.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/finl/minimal.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/keys/escaped.xml b/developer/src/kmc-ldml/test/fixtures/sections/keys/escaped.xml index 00e67686e4c..99f9609d21b 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/keys/escaped.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/keys/escaped.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/keys/escaped2.xml b/developer/src/kmc-ldml/test/fixtures/sections/keys/escaped2.xml index 13835331a91..20991504b78 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/keys/escaped2.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/keys/escaped2.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/keys/gap-switch.xml b/developer/src/kmc-ldml/test/fixtures/sections/keys/gap-switch.xml index e714f74c76f..a22eb6dc8e9 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/keys/gap-switch.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/keys/gap-switch.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/keys/hardware.xml b/developer/src/kmc-ldml/test/fixtures/sections/keys/hardware.xml index 6f7884888cb..c793eefa4e6 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/keys/hardware.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/keys/hardware.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/keys/hardware_iso.xml b/developer/src/kmc-ldml/test/fixtures/sections/keys/hardware_iso.xml index 39947cd1898..1d2d53aa131 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/keys/hardware_iso.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/keys/hardware_iso.xml @@ -1,11 +1,10 @@ - - + - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/keys/hardware_us.xml b/developer/src/kmc-ldml/test/fixtures/sections/keys/hardware_us.xml index 238f89e4329..0c4a0ee78a0 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/keys/hardware_us.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/keys/hardware_us.xml @@ -1,11 +1,10 @@ - - + - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-bad-modifier.xml b/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-bad-modifier.xml index 5bde7c586c1..29a2ba7b73c 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-bad-modifier.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-bad-modifier.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-hardware-too-many-keys.xml b/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-hardware-too-many-keys.xml index f4d78bf203c..6255e04d559 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-hardware-too-many-keys.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-hardware-too-many-keys.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-hardware-too-many-rows.xml b/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-hardware-too-many-rows.xml index 77ec94b805f..a80f26e39c1 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-hardware-too-many-rows.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-hardware-too-many-rows.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-key-missing-attrs.xml b/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-key-missing-attrs.xml index 0aa7fe9562a..0dec7a50fc7 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-key-missing-attrs.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-key-missing-attrs.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-missing-flick.xml b/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-missing-flick.xml index 494d61fe59e..d5ea11be313 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-missing-flick.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-missing-flick.xml @@ -1,6 +1,5 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-undefined-key.xml b/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-undefined-key.xml index 395e9204a0a..6417058b5c4 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-undefined-key.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-undefined-key.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-undefined-var-1.xml b/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-undefined-var-1.xml index 233aa516db8..d679a35421d 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-undefined-var-1.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-undefined-var-1.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-undefined-var-1b.xml b/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-undefined-var-1b.xml index 9e8f15bb960..384babd70c7 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-undefined-var-1b.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-undefined-var-1b.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/keys/markers.xml b/developer/src/kmc-ldml/test/fixtures/sections/keys/markers.xml index 4dab6ea4f25..2f5183600e1 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/keys/markers.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/keys/markers.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/keys/maximal-nfc.xml b/developer/src/kmc-ldml/test/fixtures/sections/keys/maximal-nfc.xml index 11a08b1e9b1..c7c6dccd712 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/keys/maximal-nfc.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/keys/maximal-nfc.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/keys/maximal.xml b/developer/src/kmc-ldml/test/fixtures/sections/keys/maximal.xml index 20c1e5534c7..b7c5ade4bc2 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/keys/maximal.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/keys/maximal.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/keys/minimal.xml b/developer/src/kmc-ldml/test/fixtures/sections/keys/minimal.xml index 38002138f97..f670d95d4f1 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/keys/minimal.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/keys/minimal.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/layr/error-custom-us-form.xml b/developer/src/kmc-ldml/test/fixtures/sections/layr/error-custom-us-form.xml index 916ea8cb088..3a242dddfd7 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/layr/error-custom-us-form.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/layr/error-custom-us-form.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/layr/error-custom-zzz-form.xml b/developer/src/kmc-ldml/test/fixtures/sections/layr/error-custom-zzz-form.xml index 12d3f6f77bb..b1ca16c5a18 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/layr/error-custom-zzz-form.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/layr/error-custom-zzz-form.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-invalid-form.xml b/developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-invalid-form.xml index 469c8d0d8f0..c15dac8c269 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-invalid-form.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-invalid-form.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-missing-hardware.xml b/developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-missing-hardware.xml index 51707442338..ddc77d70abb 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-missing-hardware.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-missing-hardware.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-missing-layer.xml b/developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-missing-layer.xml index b3ca93e0775..211961d6162 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-missing-layer.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-missing-layer.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-missing-layer2.xml b/developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-missing-layer2.xml index 26b5b98bdc8..c8a38602eac 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-missing-layer2.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-missing-layer2.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-multi-hardware.xml b/developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-multi-hardware.xml index df544e40705..7d3df0cb34f 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-multi-hardware.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-multi-hardware.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/layr/warn-custom-us-form.xml b/developer/src/kmc-ldml/test/fixtures/sections/layr/warn-custom-us-form.xml index ec1a75afe7b..ace1485521c 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/layr/warn-custom-us-form.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/layr/warn-custom-us-form.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/layr/warn-custom-zzz-form.xml b/developer/src/kmc-ldml/test/fixtures/sections/layr/warn-custom-zzz-form.xml index bf17a8a0879..52c6e3a2e9f 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/layr/warn-custom-zzz-form.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/layr/warn-custom-zzz-form.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/loca/invalid-locale.xml b/developer/src/kmc-ldml/test/fixtures/sections/loca/invalid-locale.xml index 3dd5e8b1c3e..3d63234dbe7 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/loca/invalid-locale.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/loca/invalid-locale.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/loca/minimal.xml b/developer/src/kmc-ldml/test/fixtures/sections/loca/minimal.xml index 99e84cdaa9e..aa44f8180b8 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/loca/minimal.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/loca/minimal.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/loca/multiple.xml b/developer/src/kmc-ldml/test/fixtures/sections/loca/multiple.xml index 4df6a1b0f4e..8a3a73100d8 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/loca/multiple.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/loca/multiple.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/meta/hint-normalization.xml b/developer/src/kmc-ldml/test/fixtures/sections/meta/hint-normalization.xml index 3921edc4412..49cb176d295 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/meta/hint-normalization.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/meta/hint-normalization.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/meta/invalid-version-1.0.xml b/developer/src/kmc-ldml/test/fixtures/sections/meta/invalid-version-1.0.xml index f8fe4bdeec3..ada70bb7df8 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/meta/invalid-version-1.0.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/meta/invalid-version-1.0.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/meta/invalid-version-v1.0.3.xml b/developer/src/kmc-ldml/test/fixtures/sections/meta/invalid-version-v1.0.3.xml index de81a4b701a..81efa7472bf 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/meta/invalid-version-v1.0.3.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/meta/invalid-version-v1.0.3.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/meta/maximal.xml b/developer/src/kmc-ldml/test/fixtures/sections/meta/maximal.xml index ab22d5a1401..816fc4f8191 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/meta/maximal.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/meta/maximal.xml @@ -1,6 +1,5 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/meta/minimal.xml b/developer/src/kmc-ldml/test/fixtures/sections/meta/minimal.xml index 35e60b04160..6c6340f965e 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/meta/minimal.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/meta/minimal.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/ordr/minimal.xml b/developer/src/kmc-ldml/test/fixtures/sections/ordr/minimal.xml index baae3588f92..35d25ecef87 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/ordr/minimal.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/ordr/minimal.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/ordr/multi-escape.xml b/developer/src/kmc-ldml/test/fixtures/sections/ordr/multi-escape.xml index 430bdb24179..c679470d9ca 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/ordr/multi-escape.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/ordr/multi-escape.xml @@ -1,6 +1,5 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/ordr/nod-Lana.xml b/developer/src/kmc-ldml/test/fixtures/sections/ordr/nod-Lana.xml index ec1fe5c6e80..8b79031c803 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/ordr/nod-Lana.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/ordr/nod-Lana.xml @@ -1,6 +1,5 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/strs/hint-pua.xml b/developer/src/kmc-ldml/test/fixtures/sections/strs/hint-pua.xml index 450ee66a631..9ce063580bf 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/strs/hint-pua.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/strs/hint-pua.xml @@ -4,8 +4,7 @@ @@keys: [K_Q][K_W][K_Q] @@expected: \u0127\u1790\u17B6\u0127 --> - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/strs/invalid-illegal.xml b/developer/src/kmc-ldml/test/fixtures/sections/strs/invalid-illegal.xml index 0b76fbe1ce2..3eddaffdeea 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/strs/invalid-illegal.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/strs/invalid-illegal.xml @@ -4,8 +4,7 @@ @@keys: [K_Q][K_W][K_Q] @@expected: \u0127\u1790\u17B6\u0127 --> - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/strs/warn-unassigned.xml b/developer/src/kmc-ldml/test/fixtures/sections/strs/warn-unassigned.xml index 62e1e781192..fa21ebe28cf 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/strs/warn-unassigned.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/strs/warn-unassigned.xml @@ -4,8 +4,7 @@ @@keys: [K_Q][K_W][K_Q] @@expected: \u0127\u1790\u17B6\u0127 --> - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-bad-reorder-1.xml b/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-bad-reorder-1.xml index 00eeb302a85..739a8f7ef56 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-bad-reorder-1.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-bad-reorder-1.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-bad-reorder-2.xml b/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-bad-reorder-2.xml index 2f54cb328af..c109649e0ea 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-bad-reorder-2.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-bad-reorder-2.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-bad-reorder-3.xml b/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-bad-reorder-3.xml index 68add1ff7b4..a685984aaf7 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-bad-reorder-3.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-bad-reorder-3.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-bad-tran-1.xml b/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-bad-tran-1.xml index 92066dcfcaf..a644d5875fe 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-bad-tran-1.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-bad-tran-1.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-bad-tran-2.xml b/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-bad-tran-2.xml index 48b15801934..fba5698c000 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-bad-tran-2.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-bad-tran-2.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-duplicate-type.xml b/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-duplicate-type.xml index 70be7647e3a..883adfc41fd 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-duplicate-type.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-duplicate-type.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-empty.xml b/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-empty.xml index f37d9e5c57a..6c28d3f00d7 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-empty.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-empty.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-invalid-duplicate-type.xml b/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-invalid-duplicate-type.xml index 050bd4466dd..6ccd7987fdb 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-invalid-duplicate-type.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-invalid-duplicate-type.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-invalid-type.xml b/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-invalid-type.xml index 2c921d90464..012c5513d7a 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-invalid-type.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-invalid-type.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-missing-var-1.xml b/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-missing-var-1.xml index d9eb951b4db..655b6c8f5e5 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-missing-var-1.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-missing-var-1.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-missing-var-2.xml b/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-missing-var-2.xml index 0bbf24c44f7..a3868c795c6 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-missing-var-2.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-missing-var-2.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-missing-var-3.xml b/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-missing-var-3.xml index d5af2a70fe3..b3c42f79993 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-missing-var-3.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-missing-var-3.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-missing-var-4.xml b/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-missing-var-4.xml index 9cdd6a5799f..69439184cec 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-missing-var-4.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-missing-var-4.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-missing-var-5.xml b/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-missing-var-5.xml index 6264b114a11..6875591fac4 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-missing-var-5.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-missing-var-5.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-missing-var-6.xml b/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-missing-var-6.xml index bce70eb2275..497b75b8560 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-missing-var-6.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-missing-var-6.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-mixed.xml b/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-mixed.xml index e9498288374..e86bf34df74 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-mixed.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/tran/fail-mixed.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/tran/minimal.xml b/developer/src/kmc-ldml/test/fixtures/sections/tran/minimal.xml index a8a99bb0d5d..329c6de64a6 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/tran/minimal.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/tran/minimal.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/tran/tran-hint-range.xml b/developer/src/kmc-ldml/test/fixtures/sections/tran/tran-hint-range.xml index 4323a879376..130c4ce4072 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/tran/tran-hint-range.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/tran/tran-hint-range.xml @@ -1,6 +1,5 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/tran/tran-hint-range2.xml b/developer/src/kmc-ldml/test/fixtures/sections/tran/tran-hint-range2.xml index 9c9e3ae0554..a161320e2d0 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/tran/tran-hint-range2.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/tran/tran-hint-range2.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/tran/tran-vars-nfc.xml b/developer/src/kmc-ldml/test/fixtures/sections/tran/tran-vars-nfc.xml index b99361915ca..2b4c55fc903 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/tran/tran-vars-nfc.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/tran/tran-vars-nfc.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/tran/tran-vars.xml b/developer/src/kmc-ldml/test/fixtures/sections/tran/tran-vars.xml index 956cb616ecd..07d58a435d2 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/tran/tran-vars.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/tran/tran-vars.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/tran/tran-warn-range.xml b/developer/src/kmc-ldml/test/fixtures/sections/tran/tran-warn-range.xml index 9ac22715818..7cbc13c9215 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/tran/tran-warn-range.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/tran/tran-warn-range.xml @@ -1,6 +1,5 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/vars/dup0.xml b/developer/src/kmc-ldml/test/fixtures/sections/vars/dup0.xml index 0ad3b3f7ad5..c0d966cfbb8 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/vars/dup0.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/vars/dup0.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/vars/dup1.xml b/developer/src/kmc-ldml/test/fixtures/sections/vars/dup1.xml index 5c2d4af4eee..bc502a9d627 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/vars/dup1.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/vars/dup1.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-0.xml b/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-0.xml index 018770ff0d5..1d1b8368145 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-0.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-0.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-1.xml b/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-1.xml index 1ba9dbec8fb..dfb28b8c427 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-1.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-1.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-2.xml b/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-2.xml index b263b303659..9e5a0d3bb46 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-2.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-2.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-3.xml b/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-3.xml index d6d6349ec66..48bc2ed3446 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-3.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-3.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-4.xml b/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-4.xml index 2233d4a32a9..761856fef5f 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-4.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-4.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-5.xml b/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-5.xml index 70e14736ee7..48d17dd4606 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-5.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-5.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-6.xml b/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-6.xml index e06fef4353e..4a69ec87b94 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-6.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-6.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-markers-badref-0.xml b/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-markers-badref-0.xml index 780c00e776e..44b9754d573 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-markers-badref-0.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-markers-badref-0.xml @@ -4,8 +4,7 @@ This will fail because the two markers given don't exist anywhere. --> - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-uset-props1.xml b/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-uset-props1.xml index 097912a7fba..cd6b752aa49 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-uset-props1.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-uset-props1.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-uset-props2.xml b/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-uset-props2.xml index aa8cbcb616c..d6528623bac 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-uset-props2.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-uset-props2.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-uset-strings.xml b/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-uset-strings.xml index 129a6acfa52..10c744e5ca1 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-uset-strings.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-uset-strings.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-uset-syntax.xml b/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-uset-syntax.xml index a7313ad03b0..219ee763f19 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-uset-syntax.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-uset-syntax.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/vars/markers-maximal.xml b/developer/src/kmc-ldml/test/fixtures/sections/vars/markers-maximal.xml index 7c183bdc223..b3363bb703b 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/vars/markers-maximal.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/vars/markers-maximal.xml @@ -8,8 +8,7 @@ into something testable for implementation. --> - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/vars/maximal.xml b/developer/src/kmc-ldml/test/fixtures/sections/vars/maximal.xml index a57b1042978..767f4979268 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/vars/maximal.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/vars/maximal.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/vars/minimal.xml b/developer/src/kmc-ldml/test/fixtures/sections/vars/minimal.xml index a0ec80e4887..7f3a44b4fda 100644 --- a/developer/src/kmc-ldml/test/fixtures/sections/vars/minimal.xml +++ b/developer/src/kmc-ldml/test/fixtures/sections/vars/minimal.xml @@ -1,7 +1,6 @@ - - + diff --git a/developer/src/kmc-ldml/test/fixtures/test-fr.xml b/developer/src/kmc-ldml/test/fixtures/test-fr.xml index 519140174fb..a1509159010 100644 --- a/developer/src/kmc-ldml/test/fixtures/test-fr.xml +++ b/developer/src/kmc-ldml/test/fixtures/test-fr.xml @@ -1,5 +1,5 @@ - + diff --git a/developer/src/kmc-ldml/test/test-meta.ts b/developer/src/kmc-ldml/test/test-meta.ts index 428d96f4b79..1e5a5a1aeb6 100644 --- a/developer/src/kmc-ldml/test/test-meta.ts +++ b/developer/src/kmc-ldml/test/test-meta.ts @@ -16,7 +16,7 @@ describe('meta', function () { assert.equal(compilerTestCallbacks.messages.length, 0); assert.isEmpty(meta.author.value); // TODO-LDML: default author string "unknown"? - assert.equal(meta.conform.value, 'techpreview'); + assert.equal(meta.conform.value, '45'); assert.isEmpty(meta.layout.value); // TODO-LDML: assumed layout? assert.isEmpty(meta.indicator.value); // TODO-LDML: synthesize an indicator? assert.equal(meta.settings, KeyboardSettings.none); @@ -28,7 +28,7 @@ describe('meta', function () { assert.equal(compilerTestCallbacks.messages.length, 0); assert.equal(meta.author.value, 'The Keyman Team'); - assert.equal(meta.conform.value, 'techpreview'); + assert.equal(meta.conform.value, '45'); assert.equal(meta.layout.value, 'QWIRKY'); assert.equal(meta.indicator.value, 'QW'); assert.equal(meta.version.value, "1.2.3"); diff --git a/developer/src/kmconvert/Keyman.Developer.System.LdmlKeyboardProjectTemplate.pas b/developer/src/kmconvert/Keyman.Developer.System.LdmlKeyboardProjectTemplate.pas index e8d577f0432..66036c5697f 100644 --- a/developer/src/kmconvert/Keyman.Developer.System.LdmlKeyboardProjectTemplate.pas +++ b/developer/src/kmconvert/Keyman.Developer.System.LdmlKeyboardProjectTemplate.pas @@ -77,10 +77,10 @@ function TLDMLKeyboardProjectTemplate.GetKeyboardFilename: string; ''#13#10+ // We won't inject the DOCTYPE because of pathing challenges, CLDR-15505 // ''#13#10+ - ''#13#10+ + ''#13#10+ ' '#13#10+ - ' '#13#10+ - ' '#13#10+ + ' '#13#10+ + ' '#13#10+ ' '#13#10+ ' '#13#10+ ' '#13#10+ @@ -130,7 +130,7 @@ procedure TLDMLKeyboardProjectTemplate.WriteLDML; root := doc.DocumentElement; root.Attributes['locale'] := tag; - root.Attributes['conformsTo'] := 'techpreview'; + root.Attributes['conformsTo'] := '45'; doc.DocumentElement := root; diff --git a/resources/standards-data/ldml-keyboards/techpreview/3.0/bn.xml b/resources/standards-data/ldml-keyboards/45/3.0/bn.xml similarity index 97% rename from resources/standards-data/ldml-keyboards/techpreview/3.0/bn.xml rename to resources/standards-data/ldml-keyboards/45/3.0/bn.xml index e9260520672..b579e39f389 100644 --- a/resources/standards-data/ldml-keyboards/techpreview/3.0/bn.xml +++ b/resources/standards-data/ldml-keyboards/45/3.0/bn.xml @@ -1,5 +1,5 @@ - + - + @@ -36,8 +31,8 @@ - - + + diff --git a/resources/standards-data/ldml-keyboards/techpreview/3.0/ja-Latn.xml b/resources/standards-data/ldml-keyboards/45/3.0/ja-Latn.xml similarity index 84% rename from resources/standards-data/ldml-keyboards/techpreview/3.0/ja-Latn.xml rename to resources/standards-data/ldml-keyboards/45/3.0/ja-Latn.xml index d48acb70b01..a2ffda522a9 100644 --- a/resources/standards-data/ldml-keyboards/techpreview/3.0/ja-Latn.xml +++ b/resources/standards-data/ldml-keyboards/45/3.0/ja-Latn.xml @@ -1,5 +1,5 @@ - + @@ -7,8 +7,8 @@ - - + + diff --git a/resources/standards-data/ldml-keyboards/techpreview/3.0/mt-t-k0-47key.xml b/resources/standards-data/ldml-keyboards/45/3.0/mt-t-k0-47key.xml similarity index 94% rename from resources/standards-data/ldml-keyboards/techpreview/3.0/mt-t-k0-47key.xml rename to resources/standards-data/ldml-keyboards/45/3.0/mt-t-k0-47key.xml index 788be91a296..9c7ed0fcccd 100644 --- a/resources/standards-data/ldml-keyboards/techpreview/3.0/mt-t-k0-47key.xml +++ b/resources/standards-data/ldml-keyboards/45/3.0/mt-t-k0-47key.xml @@ -1,5 +1,5 @@ - + @@ -9,8 +9,8 @@ - - + + diff --git a/resources/standards-data/ldml-keyboards/techpreview/3.0/mt.xml b/resources/standards-data/ldml-keyboards/45/3.0/mt.xml similarity index 88% rename from resources/standards-data/ldml-keyboards/techpreview/3.0/mt.xml rename to resources/standards-data/ldml-keyboards/45/3.0/mt.xml index 64e29cc1dc8..d552888f7ed 100644 --- a/resources/standards-data/ldml-keyboards/techpreview/3.0/mt.xml +++ b/resources/standards-data/ldml-keyboards/45/3.0/mt.xml @@ -1,11 +1,10 @@ - + @@ -15,8 +14,8 @@ - - + + diff --git a/resources/standards-data/ldml-keyboards/techpreview/3.0/pcm.xml b/resources/standards-data/ldml-keyboards/45/3.0/pcm.xml similarity index 90% rename from resources/standards-data/ldml-keyboards/techpreview/3.0/pcm.xml rename to resources/standards-data/ldml-keyboards/45/3.0/pcm.xml index 867e35ec4f2..84473302841 100644 --- a/resources/standards-data/ldml-keyboards/techpreview/3.0/pcm.xml +++ b/resources/standards-data/ldml-keyboards/45/3.0/pcm.xml @@ -1,10 +1,10 @@ - + - - + + diff --git a/resources/standards-data/ldml-keyboards/techpreview/3.0/pt-t-k0-abnt2.xml b/resources/standards-data/ldml-keyboards/45/3.0/pt-t-k0-abnt2.xml similarity index 92% rename from resources/standards-data/ldml-keyboards/techpreview/3.0/pt-t-k0-abnt2.xml rename to resources/standards-data/ldml-keyboards/45/3.0/pt-t-k0-abnt2.xml index 64977cd23bf..d612141166e 100644 --- a/resources/standards-data/ldml-keyboards/techpreview/3.0/pt-t-k0-abnt2.xml +++ b/resources/standards-data/ldml-keyboards/45/3.0/pt-t-k0-abnt2.xml @@ -1,5 +1,5 @@ - + @@ -14,8 +14,8 @@ - - + + diff --git a/resources/standards-data/ldml-keyboards/45/cldr_info.json b/resources/standards-data/ldml-keyboards/45/cldr_info.json new file mode 100644 index 00000000000..0ac427a95bc --- /dev/null +++ b/resources/standards-data/ldml-keyboards/45/cldr_info.json @@ -0,0 +1,5 @@ +{ + "sha": "40fa7fd5b074a203581d04ca0c0b004ab9aa491b", + "description": "release-45-alpha1-88-g40fa7fd5b0", + "date": "Fri, 01 Mar 2024 17:28:53 +0000" +} diff --git a/resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd b/resources/standards-data/ldml-keyboards/45/dtd/ldmlKeyboard3.dtd similarity index 83% rename from resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd rename to resources/standards-data/ldml-keyboards/45/dtd/ldmlKeyboard3.dtd index a5160c3119e..32765796906 100644 --- a/resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd +++ b/resources/standards-data/ldml-keyboards/45/dtd/ldmlKeyboard3.dtd @@ -1,52 +1,42 @@ - + - - - + + - - - - - - - + + - @@ -62,15 +52,12 @@ Please view the subcommittee page for the most recent information. - - - @@ -82,20 +69,16 @@ Please view the subcommittee page for the most recent information. - - - - @@ -127,12 +110,10 @@ Please view the subcommittee page for the most recent information. - - @@ -140,28 +121,23 @@ Please view the subcommittee page for the most recent information. - - - - - @@ -169,13 +145,11 @@ Please view the subcommittee page for the most recent information. - - @@ -201,12 +175,10 @@ Please view the subcommittee page for the most recent information. - - @@ -221,7 +193,6 @@ Please view the subcommittee page for the most recent information. - diff --git a/resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.xsd b/resources/standards-data/ldml-keyboards/45/dtd/ldmlKeyboard3.xsd similarity index 94% rename from resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.xsd rename to resources/standards-data/ldml-keyboards/45/dtd/ldmlKeyboard3.xsd index 9a445135fc8..6cad096c41b 100644 --- a/resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.xsd +++ b/resources/standards-data/ldml-keyboards/45/dtd/ldmlKeyboard3.xsd @@ -7,14 +7,11 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file @@ -37,16 +34,17 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file - + - - - - + + + + + @@ -59,8 +57,7 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file - - + @@ -68,32 +65,28 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file - - - + - + - + - - - - - - + + + + @@ -102,15 +95,14 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file - - - - - - - - - + + + + + + + + @@ -122,9 +114,8 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file - - - + + @@ -135,7 +126,6 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file - @@ -143,24 +133,21 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file - - - - - - - + + + + + + - - - - + + + - @@ -170,7 +157,6 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file - @@ -197,24 +183,23 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + @@ -233,18 +218,16 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file - - + - - - - + + + @@ -254,7 +237,6 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file - @@ -264,16 +246,14 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file - - + - - - + + @@ -285,9 +265,8 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file - - - + + @@ -298,18 +277,16 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file - - - + + - - - - + + + @@ -321,36 +298,35 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file - - - - - + + + + - - - - + + + + - - - + + + @@ -368,8 +344,7 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file - - + @@ -382,20 +357,19 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file - - - - - - - - + + + + + + + @@ -411,4 +385,4 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file - + \ No newline at end of file diff --git a/resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboardTest3.dtd b/resources/standards-data/ldml-keyboards/45/dtd/ldmlKeyboardTest3.dtd similarity index 91% rename from resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboardTest3.dtd rename to resources/standards-data/ldml-keyboards/45/dtd/ldmlKeyboardTest3.dtd index ccb1078b81d..ba78772fbd6 100644 --- a/resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboardTest3.dtd +++ b/resources/standards-data/ldml-keyboards/45/dtd/ldmlKeyboardTest3.dtd @@ -1,17 +1,12 @@ +This DTD describes a technical preview of Keyboard Test Data --> diff --git a/resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboardTest3.xsd b/resources/standards-data/ldml-keyboards/45/dtd/ldmlKeyboardTest3.xsd similarity index 94% rename from resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboardTest3.xsd rename to resources/standards-data/ldml-keyboards/45/dtd/ldmlKeyboardTest3.xsd index da82a29b19c..dd1fc39f994 100644 --- a/resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboardTest3.xsd +++ b/resources/standards-data/ldml-keyboards/45/dtd/ldmlKeyboardTest3.xsd @@ -7,17 +7,12 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file diff --git a/resources/standards-data/ldml-keyboards/techpreview/fetch-latest-cldr-techpreview.sh b/resources/standards-data/ldml-keyboards/45/fetch-latest-cldr.sh old mode 100755 new mode 100644 similarity index 96% rename from resources/standards-data/ldml-keyboards/techpreview/fetch-latest-cldr-techpreview.sh rename to resources/standards-data/ldml-keyboards/45/fetch-latest-cldr.sh index b2ddcbda58d..e12c8f8cbce --- a/resources/standards-data/ldml-keyboards/techpreview/fetch-latest-cldr-techpreview.sh +++ b/resources/standards-data/ldml-keyboards/45/fetch-latest-cldr.sh @@ -73,7 +73,7 @@ do base=$(basename "${xsd}" .xsd | tr A-Z a-z | sed -e 's%^ldml%ldml-%g' ) json=${base}.schema.json echo "${xsd} -> ${json}" - (cd .. ; npx -p jgexml xsd2json techpreview/"${xsd}" techpreview/"${json}") || exit + (cd .. ; npx -p jgexml xsd2json 45/"${xsd}" 45/"${json}") || exit echo 'fixup-schema.js' "${json}" node fixup-schema.js "${json}" || builder_die "failed to fixup schema ${json}" mv "${json}" tmp.json diff --git a/resources/standards-data/ldml-keyboards/techpreview/fixup-schema.js b/resources/standards-data/ldml-keyboards/45/fixup-schema.js similarity index 100% rename from resources/standards-data/ldml-keyboards/techpreview/fixup-schema.js rename to resources/standards-data/ldml-keyboards/45/fixup-schema.js diff --git a/resources/standards-data/ldml-keyboards/techpreview/import/README.md b/resources/standards-data/ldml-keyboards/45/import/README.md similarity index 63% rename from resources/standards-data/ldml-keyboards/techpreview/import/README.md rename to resources/standards-data/ldml-keyboards/45/import/README.md index 561b503fc87..462f072f016 100644 --- a/resources/standards-data/ldml-keyboards/techpreview/import/README.md +++ b/resources/standards-data/ldml-keyboards/45/import/README.md @@ -3,10 +3,10 @@ The XML files in this directory are importable using the keyboard syntax as follows: ```xml - + ``` -As an experiment, a naming convention is being attempted: +This is the naming convention being used: - _type_`-`_script_`-`_description_`.xml` @@ -16,11 +16,8 @@ So, - `keys-Zyyy-punctuation.xml` is of [script](https://www.unicode.org/iso15924/iso15924-codes.html) `Zyyy`, aka "Common". - See [tr35-keyboard.md](../../docs/ldml/tr35-keyboards.md#Element_import) -## Copyright +## Copyright and License -Copyright © 2022 Unicode, Inc. -All rights reserved. -[Terms of use](http://www.unicode.org/copyright.html) +See the top level [README.md](../../README.md#copyright--licenses) diff --git a/resources/standards-data/ldml-keyboards/techpreview/import/keys-Latn-implied.xml b/resources/standards-data/ldml-keyboards/45/import/keys-Latn-implied.xml similarity index 100% rename from resources/standards-data/ldml-keyboards/techpreview/import/keys-Latn-implied.xml rename to resources/standards-data/ldml-keyboards/45/import/keys-Latn-implied.xml diff --git a/resources/standards-data/ldml-keyboards/techpreview/import/keys-Zyyy-currency.xml b/resources/standards-data/ldml-keyboards/45/import/keys-Zyyy-currency.xml similarity index 52% rename from resources/standards-data/ldml-keyboards/techpreview/import/keys-Zyyy-currency.xml rename to resources/standards-data/ldml-keyboards/45/import/keys-Zyyy-currency.xml index dd88113501b..e3981b7a542 100644 --- a/resources/standards-data/ldml-keyboards/techpreview/import/keys-Zyyy-currency.xml +++ b/resources/standards-data/ldml-keyboards/45/import/keys-Zyyy-currency.xml @@ -1,16 +1,9 @@ - diff --git a/resources/standards-data/ldml-keyboards/techpreview/import/keys-Zyyy-punctuation.xml b/resources/standards-data/ldml-keyboards/45/import/keys-Zyyy-punctuation.xml similarity index 85% rename from resources/standards-data/ldml-keyboards/techpreview/import/keys-Zyyy-punctuation.xml rename to resources/standards-data/ldml-keyboards/45/import/keys-Zyyy-punctuation.xml index 59c6280826d..b55b15c15ee 100644 --- a/resources/standards-data/ldml-keyboards/techpreview/import/keys-Zyyy-punctuation.xml +++ b/resources/standards-data/ldml-keyboards/45/import/keys-Zyyy-punctuation.xml @@ -1,9 +1,8 @@ diff --git a/resources/standards-data/ldml-keyboards/techpreview/import/scanCodes-implied.xml b/resources/standards-data/ldml-keyboards/45/import/scanCodes-implied.xml similarity index 100% rename from resources/standards-data/ldml-keyboards/techpreview/import/scanCodes-implied.xml rename to resources/standards-data/ldml-keyboards/45/import/scanCodes-implied.xml diff --git a/resources/standards-data/ldml-keyboards/techpreview/ldml-keyboard3.schema.json b/resources/standards-data/ldml-keyboards/45/ldml-keyboard3.schema.json similarity index 99% rename from resources/standards-data/ldml-keyboards/techpreview/ldml-keyboard3.schema.json rename to resources/standards-data/ldml-keyboards/45/ldml-keyboard3.schema.json index b4861e6d7d9..fe6496c17e3 100644 --- a/resources/standards-data/ldml-keyboards/techpreview/ldml-keyboard3.schema.json +++ b/resources/standards-data/ldml-keyboards/45/ldml-keyboard3.schema.json @@ -601,7 +601,7 @@ "properties": { "cldrVersion": { "enum": [ - "techpreview" + "45" ], "type": "string" }, @@ -618,7 +618,7 @@ "properties": { "conformsTo": { "enum": [ - "techpreview" + "45" ], "type": "string" }, @@ -691,6 +691,6 @@ "required": [ "keyboard3" ], - "title": "techpreview/dtd/ldmlKeyboard3.xsd", + "title": "45/dtd/ldmlKeyboard3.xsd", "type": "object" } diff --git a/resources/standards-data/ldml-keyboards/techpreview/ldml-keyboardtest3.schema.json b/resources/standards-data/ldml-keyboards/45/ldml-keyboardtest3.schema.json similarity index 98% rename from resources/standards-data/ldml-keyboards/techpreview/ldml-keyboardtest3.schema.json rename to resources/standards-data/ldml-keyboards/45/ldml-keyboardtest3.schema.json index f9edcd67474..b386de88826 100644 --- a/resources/standards-data/ldml-keyboards/techpreview/ldml-keyboardtest3.schema.json +++ b/resources/standards-data/ldml-keyboards/45/ldml-keyboardtest3.schema.json @@ -220,6 +220,6 @@ "required": [ "keyboardTest3" ], - "title": "techpreview/dtd/ldmlKeyboardTest3.xsd", + "title": "45/dtd/ldmlKeyboardTest3.xsd", "type": "object" } diff --git a/resources/standards-data/ldml-keyboards/techpreview/readme.md b/resources/standards-data/ldml-keyboards/45/readme.md similarity index 100% rename from resources/standards-data/ldml-keyboards/techpreview/readme.md rename to resources/standards-data/ldml-keyboards/45/readme.md diff --git a/resources/standards-data/ldml-keyboards/techpreview/test/bn-test.xml b/resources/standards-data/ldml-keyboards/45/test/bn-test.xml similarity index 100% rename from resources/standards-data/ldml-keyboards/techpreview/test/bn-test.xml rename to resources/standards-data/ldml-keyboards/45/test/bn-test.xml diff --git a/resources/standards-data/ldml-keyboards/techpreview/test/fr-t-k0-azerty-test.xml b/resources/standards-data/ldml-keyboards/45/test/fr-t-k0-azerty-test.xml similarity index 100% rename from resources/standards-data/ldml-keyboards/techpreview/test/fr-t-k0-azerty-test.xml rename to resources/standards-data/ldml-keyboards/45/test/fr-t-k0-azerty-test.xml diff --git a/resources/standards-data/ldml-keyboards/techpreview/test/ja-Latn-test.xml b/resources/standards-data/ldml-keyboards/45/test/ja-Latn-test.xml similarity index 100% rename from resources/standards-data/ldml-keyboards/techpreview/test/ja-Latn-test.xml rename to resources/standards-data/ldml-keyboards/45/test/ja-Latn-test.xml diff --git a/resources/standards-data/ldml-keyboards/techpreview/test/pcm-test.xml b/resources/standards-data/ldml-keyboards/45/test/pcm-test.xml similarity index 100% rename from resources/standards-data/ldml-keyboards/techpreview/test/pcm-test.xml rename to resources/standards-data/ldml-keyboards/45/test/pcm-test.xml diff --git a/resources/standards-data/ldml-keyboards/techpreview/test/pt-t-k0-abnt2-test.xml b/resources/standards-data/ldml-keyboards/45/test/pt-t-k0-abnt2-test.xml similarity index 100% rename from resources/standards-data/ldml-keyboards/techpreview/test/pt-t-k0-abnt2-test.xml rename to resources/standards-data/ldml-keyboards/45/test/pt-t-k0-abnt2-test.xml diff --git a/resources/standards-data/ldml-keyboards/readme.md b/resources/standards-data/ldml-keyboards/readme.md index 4cf068a39b0..aec3717571b 100644 --- a/resources/standards-data/ldml-keyboards/readme.md +++ b/resources/standards-data/ldml-keyboards/readme.md @@ -1,9 +1,6 @@ # ldml-keyboards -Data will eventually be versioned, so there would be a `42`, `43` etc directory. - -Currently there is a `techpreview` directory referring to the technical previewβ€”work in progress work in 2022. -That will very roughly correspond to , or pull requests thereunto. +Data is versioned, so each directory has its version such as `45`. ## Data Format @@ -23,4 +20,4 @@ Each directory contains: ## License -- [unicode-license.txt](unicode-license.txt) - Unicode license \ No newline at end of file +- [unicode-license.txt](unicode-license.txt) - Unicode license diff --git a/resources/standards-data/ldml-keyboards/techpreview/cldr_info.json b/resources/standards-data/ldml-keyboards/techpreview/cldr_info.json deleted file mode 100644 index b9e9c1fd35d..00000000000 --- a/resources/standards-data/ldml-keyboards/techpreview/cldr_info.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "sha": "60df7f18424258b91868901230c6f22cf00acb90", - "description": "release-45-alpha1-63-g60df7f1842", - "date": "Tue, 27 Feb 2024 23:18:40 +0000" -} diff --git a/resources/standards-data/ldml-keyboards/unicode-license.txt b/resources/standards-data/ldml-keyboards/unicode-license.txt index 82a990624dc..99bd0beafbb 100644 --- a/resources/standards-data/ldml-keyboards/unicode-license.txt +++ b/resources/standards-data/ldml-keyboards/unicode-license.txt @@ -36,4 +36,6 @@ FILES OR SOFTWARE. Except as contained in this notice, the name of a copyright holder shall not be used in advertising or otherwise to promote the sale, use or other dealings in these Data Files or Software without prior written -authorization of the copyright holder. \ No newline at end of file +authorization of the copyright holder. + +SPDX-License-Identifier: Unicode-3.0 diff --git a/resources/standards-data/readme.md b/resources/standards-data/readme.md index 2458d7d629a..23e2958cb41 100644 --- a/resources/standards-data/readme.md +++ b/resources/standards-data/readme.md @@ -12,7 +12,7 @@ the version data in this file also. | iso639-3 | 2023 | | langtags | 2023-05-04 | | langtags-subtag-registry | 2023-05-11 | -| ldml-keyboards | techpreview | +| ldml-keyboards | 45 | | unicode-character-database | 15 | | windows-lcid-to-bcp-47 | ? |