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 73% 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 a4b41335917..09085142d86 100644 --- a/resources/standards-data/ldml-keyboards/techpreview/3.0/bn.xml +++ b/resources/standards-data/ldml-keyboards/45/3.0/bn.xml @@ -1,6 +1,5 @@ - - + + + - + + + - - - @@ -32,86 +32,67 @@ - - - + + + + - - - - - - - - - + + - + - + + + + + + + - + + + + + + + + + - - - - - - - - - - - - - - - - - + + - - - - - - - + + + + - - + + + + - + + - - - - - - - - - - - - - - - - - - + + + + + + - + @@ -120,7 +101,7 @@ - + @@ -128,8 +109,8 @@ - - + + @@ -154,17 +135,34 @@ - - + + + + + + + + - + + + + + diff --git a/resources/standards-data/ldml-keyboards/techpreview/3.0/fr-t-k0-azerty.xml b/resources/standards-data/ldml-keyboards/45/3.0/fr-t-k0-azerty.xml similarity index 92% rename from resources/standards-data/ldml-keyboards/techpreview/3.0/fr-t-k0-azerty.xml rename to resources/standards-data/ldml-keyboards/45/3.0/fr-t-k0-azerty.xml index c969ecf5431..a45e198e23b 100644 --- a/resources/standards-data/ldml-keyboards/techpreview/3.0/fr-t-k0-azerty.xml +++ b/resources/standards-data/ldml-keyboards/45/3.0/fr-t-k0-azerty.xml @@ -1,14 +1,8 @@ - - + @@ -37,8 +31,8 @@ - - + + @@ -52,7 +46,7 @@ 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 79% 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 b5364c5f928..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,6 +1,5 @@ - - + @@ -8,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 92% 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 62f90b47bce..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,6 +1,5 @@ - - + @@ -10,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 86% 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 5dcc9ea5c35..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,12 +1,10 @@ - - + @@ -16,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 87% 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 89994773f67..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,11 +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 89% 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 010f5150734..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,6 +1,5 @@ - - + @@ -15,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..9b2dd391853 --- /dev/null +++ b/resources/standards-data/ldml-keyboards/45/cldr_info.json @@ -0,0 +1,5 @@ +{ + "sha": "3cdc78664e1f5c133073a82ff3e0cd5543437853", + "description": "release-45-alpha1-88-g3cdc78664e", + "date": "Fri, 01 Mar 2024 04:57:59 +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 80% rename from resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd rename to resources/standards-data/ldml-keyboards/45/dtd/ldmlKeyboard3.dtd index ef577e98bf8..32765796906 100644 --- a/resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd +++ b/resources/standards-data/ldml-keyboards/45/dtd/ldmlKeyboard3.dtd @@ -1,50 +1,42 @@ - + - - + + + + - - - - - - - - + + - @@ -60,15 +52,12 @@ Please view the subcommittee page for the most recent information. - - - @@ -80,20 +69,16 @@ Please view the subcommittee page for the most recent information. - - - - @@ -125,12 +110,10 @@ Please view the subcommittee page for the most recent information. - - @@ -138,28 +121,23 @@ Please view the subcommittee page for the most recent information. - - - - - @@ -167,13 +145,11 @@ Please view the subcommittee page for the most recent information. - - - + @@ -191,20 +167,18 @@ Please view the subcommittee page for the most recent information. - - + + - + - - @@ -219,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 93% rename from resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.xsd rename to resources/standards-data/ldml-keyboards/45/dtd/ldmlKeyboard3.xsd index 96a6f821e91..6cad096c41b 100644 --- a/resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.xsd +++ b/resources/standards-data/ldml-keyboards/45/dtd/ldmlKeyboard3.xsd @@ -5,16 +5,13 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file --> @@ -37,7 +34,7 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file - + @@ -47,6 +44,7 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file + @@ -60,7 +58,6 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file - @@ -68,22 +65,19 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file - - - - + - + @@ -92,8 +86,6 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file - - @@ -111,7 +103,6 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file - @@ -125,7 +116,6 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file - @@ -136,7 +126,6 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file - @@ -150,7 +139,6 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file - @@ -159,9 +147,7 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file - - @@ -171,7 +157,6 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file - @@ -215,7 +200,6 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file - @@ -235,7 +219,6 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file - @@ -245,7 +228,6 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file - @@ -255,7 +237,6 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file - @@ -266,7 +247,6 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file - @@ -274,7 +254,6 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file - @@ -288,7 +267,6 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file - @@ -301,7 +279,6 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file - @@ -310,19 +287,17 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file - - + - @@ -343,7 +318,7 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file - + @@ -370,7 +345,6 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file - @@ -383,7 +357,6 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR 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 90% rename from resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboardTest3.dtd rename to resources/standards-data/ldml-keyboards/45/dtd/ldmlKeyboardTest3.dtd index 992e83a7559..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 93% rename from resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboardTest3.xsd rename to resources/standards-data/ldml-keyboards/45/dtd/ldmlKeyboardTest3.xsd index 1c61ec482ff..dd1fc39f994 100644 --- a/resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboardTest3.xsd +++ b/resources/standards-data/ldml-keyboards/45/dtd/ldmlKeyboardTest3.xsd @@ -5,19 +5,14 @@ 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-techpreview.sh similarity index 100% rename from resources/standards-data/ldml-keyboards/techpreview/fetch-latest-cldr-techpreview.sh rename to resources/standards-data/ldml-keyboards/45/fetch-latest-cldr-techpreview.sh 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 100% rename from resources/standards-data/ldml-keyboards/techpreview/ldml-keyboard3.schema.json rename to resources/standards-data/ldml-keyboards/45/ldml-keyboard3.schema.json 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 100% rename from resources/standards-data/ldml-keyboards/techpreview/ldml-keyboardtest3.schema.json rename to resources/standards-data/ldml-keyboards/45/ldml-keyboardtest3.schema.json 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 61% rename from resources/standards-data/ldml-keyboards/techpreview/test/bn-test.xml rename to resources/standards-data/ldml-keyboards/45/test/bn-test.xml index ad95223ca6e..ce19f9bda6c 100644 --- a/resources/standards-data/ldml-keyboards/techpreview/test/bn-test.xml +++ b/resources/standards-data/ldml-keyboards/45/test/bn-test.xml @@ -2,27 +2,14 @@ - - - - - - - - - - - - + - - + - 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/3.0/fr-t-k0-optimise-test.xml b/resources/standards-data/ldml-keyboards/techpreview/3.0/fr-t-k0-optimise-test.xml deleted file mode 100644 index 593b8bd2e72..00000000000 --- a/resources/standards-data/ldml-keyboards/techpreview/3.0/fr-t-k0-optimise-test.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/resources/standards-data/ldml-keyboards/techpreview/3.0/fr-t-k0-optimise.xml b/resources/standards-data/ldml-keyboards/techpreview/3.0/fr-t-k0-optimise.xml deleted file mode 100644 index b8c6f76b47d..00000000000 --- a/resources/standards-data/ldml-keyboards/techpreview/3.0/fr-t-k0-optimise.xml +++ /dev/null @@ -1,200 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/resources/standards-data/ldml-keyboards/techpreview/3.0/fr-t-k0-test-test.xml b/resources/standards-data/ldml-keyboards/techpreview/3.0/fr-t-k0-test-test.xml deleted file mode 100644 index c03ce54362a..00000000000 --- a/resources/standards-data/ldml-keyboards/techpreview/3.0/fr-t-k0-test-test.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/resources/standards-data/ldml-keyboards/techpreview/3.0/fr-t-k0-test.xml b/resources/standards-data/ldml-keyboards/techpreview/3.0/fr-t-k0-test.xml deleted file mode 100644 index 76b35304ef5..00000000000 --- a/resources/standards-data/ldml-keyboards/techpreview/3.0/fr-t-k0-test.xml +++ /dev/null @@ -1,213 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 3eff296a319..00000000000 --- a/resources/standards-data/ldml-keyboards/techpreview/cldr_info.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "sha": "022ff3ce172735f4a251003b1f429528deab44b3", - "description": "release-44-beta3-18-g022ff3ce17", - "date": "Tue, 24 Oct 2023 13:00:38 +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