From fcba89b0c3186ae17e251bed69a522efecc0e08e Mon Sep 17 00:00:00 2001 From: "Steven R. Loomis" Date: Mon, 9 Oct 2023 09:20:53 -0500 Subject: [PATCH] =?UTF-8?q?CLDR-17091=20kbd:=20move=20names=20into=20info?= =?UTF-8?q?=20name=3D"=E2=80=A6"=20(#3310)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - drop the element - make required - add as a required attribute - update docs and dtd - test fix for XML validity - update the info name= attribute --- .../supplemental/attributeValueValidity.xml | 2 +- docs/ldml/tr35-keyboards.md | 90 +++++-------------- keyboards/3.0/fr-t-k0-azerty.xml | 6 +- keyboards/3.0/ja-Latn.xml | 5 +- keyboards/3.0/mt-t-k0-47key.xml | 8 +- keyboards/3.0/mt.xml | 8 +- keyboards/3.0/pcm.xml | 5 +- keyboards/3.0/pt-t-k0-abnt2.xml | 5 +- keyboards/dtd/ldmlKeyboard3.dtd | 22 ++--- keyboards/dtd/ldmlKeyboard3.xsd | 25 +----- .../KeyboardFlatten/broken-import-missing.xml | 7 +- .../broken-import-unknownbase.xml | 7 +- .../broken-import-unknownver.xml | 7 +- .../broken-import-wrongparent.xml | 12 +-- 14 files changed, 49 insertions(+), 160 deletions(-) diff --git a/common/supplemental/attributeValueValidity.xml b/common/supplemental/attributeValueValidity.xml index 33e9ee45a3c..6ce3c371322 100644 --- a/common/supplemental/attributeValueValidity.xml +++ b/common/supplemental/attributeValueValidity.xml @@ -452,7 +452,7 @@ - + simple diff --git a/docs/ldml/tr35-keyboards.md b/docs/ldml/tr35-keyboards.md index d2be0295a26..557a19c6796 100644 --- a/docs/ldml/tr35-keyboards.md +++ b/docs/ldml/tr35-keyboards.md @@ -74,8 +74,6 @@ The LDML specification is divided into the following parts: * [Element: locale](#Element_locale) * [Element: version](#Element_version) * [Element: info](#Element_info) - * [Element: names](#Element_names) - * [Element: name](#Element_name) * [Element: settings](#Element_settings) * [Element: keys](#Element_keys) * [Element: key](#Element_key) @@ -334,7 +332,7 @@ This is the top level element. All other elements defined below are under this e > > Parents: _none_ > -> Children: [displays](#Element_displays), [import](#Element_import), [info](#Element_info), [keys](#Element_keys), [layers](#Element_layers), [locales](#Element_locales), [names](#Element_names), [settings](#Element_settings), [_special_](tr35.md#special), [transforms](#Element_transforms), [variables](#Element_variables), [version](#Element_version) +> Children: [displays](#Element_displays), [import](#Element_import), [info](#Element_info), [keys](#Element_keys), [layers](#Element_layers), [locales](#Element_locales), [settings](#Element_settings), [_special_](tr35.md#special), [transforms](#Element_transforms), [variables](#Element_variables), [version](#Element_version) > > Occurrence: required, single > @@ -485,7 +483,9 @@ Element containing informative properties about the layout, for displaying in us **Syntax** ```xml - ``` @@ -496,10 +496,27 @@ Element containing informative properties about the layout, for displaying in us > > Children: _none_ > -> Occurrence: optional, single +> Occurrence: required, single > > +_Attribute:_ `name` (required) + +> Note that this is the only required attribute for the `` element. +> +> This attribute is an informative name for the keyboard. + +```xml + + … + + … + +``` + +* * * + + _Attribute:_ `author` > The `author` attribute contains the name of the author of the layout file. @@ -519,69 +536,6 @@ _Attribute:_ `indicator` * * * -### Element: names - -Element used to store any names given to the layout. - -These names are not localized but are informative names for the keyboard. Localization of these names would be done as separate data items elsewhere in CLDR. - -**Syntax** - -```xml - - {set of name elements} - -``` - -> -> -> Parents: [keyboard3](#Element_keyboard) -> -> Children: [name](#Element_name), [_special_](tr35.md#special) -> -> Occurrence: required, single -> -> - -### Element: name - -A single name given to the layout. - -**Syntax** - -```xml - -``` - -> -> -> Parents: [names](#Element_names) -> -> Children: _none_ -> -> Occurrence: required, multiple -> -> - -_Attribute:_ `value` (required) - -> The name of the layout. - - -**Example** - -```xml - - … - - - - … - -``` - -* * * - ### Element: settings An element used to keep track of layout-specific settings by implementations. This element may or may not show up on a layout. These settings reflect the normal practice by the implementation. However, an implementation using the data may customize the behavior. diff --git a/keyboards/3.0/fr-t-k0-azerty.xml b/keyboards/3.0/fr-t-k0-azerty.xml index 106a3970d2c..f9a39ab80fd 100644 --- a/keyboards/3.0/fr-t-k0-azerty.xml +++ b/keyboards/3.0/fr-t-k0-azerty.xml @@ -16,11 +16,7 @@ keyboard formats --> - - - - - + diff --git a/keyboards/3.0/ja-Latn.xml b/keyboards/3.0/ja-Latn.xml index 8b5b845bf25..0e7be47e8d6 100644 --- a/keyboards/3.0/ja-Latn.xml +++ b/keyboards/3.0/ja-Latn.xml @@ -5,10 +5,7 @@ - - - - + diff --git a/keyboards/3.0/mt-t-k0-47key.xml b/keyboards/3.0/mt-t-k0-47key.xml index 11ca8cda824..56361ae242c 100644 --- a/keyboards/3.0/mt-t-k0-47key.xml +++ b/keyboards/3.0/mt-t-k0-47key.xml @@ -5,12 +5,8 @@ - - - - - - + + diff --git a/keyboards/3.0/mt.xml b/keyboards/3.0/mt.xml index 4e5fbfca37e..84985d1c0ad 100644 --- a/keyboards/3.0/mt.xml +++ b/keyboards/3.0/mt.xml @@ -11,12 +11,8 @@ - - - - - - + + diff --git a/keyboards/3.0/pcm.xml b/keyboards/3.0/pcm.xml index 15242ed8121..4bc34be49ac 100644 --- a/keyboards/3.0/pcm.xml +++ b/keyboards/3.0/pcm.xml @@ -2,10 +2,7 @@ - - - - + diff --git a/keyboards/3.0/pt-t-k0-abnt2.xml b/keyboards/3.0/pt-t-k0-abnt2.xml index 6de82a8f9d3..8d056de3a1c 100644 --- a/keyboards/3.0/pt-t-k0-abnt2.xml +++ b/keyboards/3.0/pt-t-k0-abnt2.xml @@ -5,10 +5,7 @@ - - - - + diff --git a/keyboards/dtd/ldmlKeyboard3.dtd b/keyboards/dtd/ldmlKeyboard3.dtd index 044112a4099..5e0d7e4c458 100644 --- a/keyboards/dtd/ldmlKeyboard3.dtd +++ b/keyboards/dtd/ldmlKeyboard3.dtd @@ -10,7 +10,7 @@ The CLDR Keyboard Subcommittee is currently developing major changes to the CLDR Please view the subcommittee page for the most recent information. --> - + @@ -45,6 +45,9 @@ Please view the subcommittee page for the most recent information. + + + @@ -55,26 +58,12 @@ Please view the subcommittee page for the most recent information. - - - - - - - - - - - - - - @@ -97,6 +86,9 @@ Please view the subcommittee page for the most recent information. + + + diff --git a/keyboards/dtd/ldmlKeyboard3.xsd b/keyboards/dtd/ldmlKeyboard3.xsd index 0009638d985..ee10f8040ef 100644 --- a/keyboards/dtd/ldmlKeyboard3.xsd +++ b/keyboards/dtd/ldmlKeyboard3.xsd @@ -22,8 +22,7 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file - - + @@ -97,6 +96,7 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file + @@ -109,27 +109,8 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file - - - - - - - - - - - - - - - - - - - @@ -178,6 +159,8 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file + + diff --git a/tools/cldr-code/src/test/resources/org/unicode/cldr/tool/KeyboardFlatten/broken-import-missing.xml b/tools/cldr-code/src/test/resources/org/unicode/cldr/tool/KeyboardFlatten/broken-import-missing.xml index f706ab3fcd1..73088028861 100644 --- a/tools/cldr-code/src/test/resources/org/unicode/cldr/tool/KeyboardFlatten/broken-import-missing.xml +++ b/tools/cldr-code/src/test/resources/org/unicode/cldr/tool/KeyboardFlatten/broken-import-missing.xml @@ -8,12 +8,7 @@ - - - - - - + diff --git a/tools/cldr-code/src/test/resources/org/unicode/cldr/tool/KeyboardFlatten/broken-import-unknownbase.xml b/tools/cldr-code/src/test/resources/org/unicode/cldr/tool/KeyboardFlatten/broken-import-unknownbase.xml index 65e0307e8d9..a1e902f480e 100644 --- a/tools/cldr-code/src/test/resources/org/unicode/cldr/tool/KeyboardFlatten/broken-import-unknownbase.xml +++ b/tools/cldr-code/src/test/resources/org/unicode/cldr/tool/KeyboardFlatten/broken-import-unknownbase.xml @@ -8,12 +8,7 @@ - - - - - - + diff --git a/tools/cldr-code/src/test/resources/org/unicode/cldr/tool/KeyboardFlatten/broken-import-unknownver.xml b/tools/cldr-code/src/test/resources/org/unicode/cldr/tool/KeyboardFlatten/broken-import-unknownver.xml index 4b9bae247b2..1ff9b4fa415 100644 --- a/tools/cldr-code/src/test/resources/org/unicode/cldr/tool/KeyboardFlatten/broken-import-unknownver.xml +++ b/tools/cldr-code/src/test/resources/org/unicode/cldr/tool/KeyboardFlatten/broken-import-unknownver.xml @@ -8,12 +8,9 @@ - + - - - - + diff --git a/tools/cldr-code/src/test/resources/org/unicode/cldr/tool/KeyboardFlatten/broken-import-wrongparent.xml b/tools/cldr-code/src/test/resources/org/unicode/cldr/tool/KeyboardFlatten/broken-import-wrongparent.xml index 730ff719c96..5ee1baa544d 100644 --- a/tools/cldr-code/src/test/resources/org/unicode/cldr/tool/KeyboardFlatten/broken-import-wrongparent.xml +++ b/tools/cldr-code/src/test/resources/org/unicode/cldr/tool/KeyboardFlatten/broken-import-wrongparent.xml @@ -5,18 +5,12 @@ --> + + - - - - - - - - - +