From b40d91e43aee022d2060fbd0b8129e6f7dd1a601 Mon Sep 17 00:00:00 2001
From: "Steven R. Loomis" <srl295@gmail.com>
Date: Tue, 3 Oct 2023 17:07:09 -0500
Subject: [PATCH] =?UTF-8?q?CLDR-17091=20kbd:=20move=20names=20into=20info?=
 =?UTF-8?q?=20name=3D"=E2=80=A6"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- drop the <names> element
- make <info> required
- add <info name="…"> as a required attribute
- update docs and dtd
---
 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/ldmlKeyboard.dtd                | 12 ++-
 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, 53 insertions(+), 166 deletions(-)

diff --git a/docs/ldml/tr35-keyboards.md b/docs/ldml/tr35-keyboards.md
index d2be0295a26..b8c2b88fb9a 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
-<info author="{author}"
+<info
+      name="{keyboard name}"
+      author="{author}"
       layout="{hint of the layout}"
       indicator="{short identifier}" />
 ```
@@ -496,10 +496,27 @@ Element containing informative properties about the layout, for displaying in us
 >
 > Children: _none_
 >
-> Occurrence: optional, single
+> Occurrence: required, single
 >
 > </small>
 
+_Attribute:_ `name` (required)
+
+> This is the only required attribute.
+>
+> This name is not localized, but is an informative name for the keyboard.
+
+```xml
+<keyboard3 locale="bg-t-k0-phonetic-trad">
+    …
+    <info name="Bulgarian (Phonetic Traditional)" />
+    …
+</keyboard3>
+```
+
+* * *
+
+
 _Attribute:_ `author`
 
 > The `author` attribute contains the name of the author of the layout file.
@@ -519,69 +536,6 @@ _Attribute:_ `indicator`
 
 * * *
 
-### <a name="Element_names" href="#Element_names">Element: names</a>
-
-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
-<names>
-    {set of name elements}
-</names>
-```
-
-> <small>
->
-> Parents: [keyboard3](#Element_keyboard)
->
-> Children: [name](#Element_name), [_special_](tr35.md#special)
->
-> Occurrence: required, single
->
-> </small>
-
-### <a name="Element_name" href="#Element_name">Element: name</a>
-
-A single name given to the layout.
-
-**Syntax**
-
-```xml
-<name value="..">
-```
-
-> <small>
->
-> Parents: [names](#Element_names)
->
-> Children: _none_
->
-> Occurrence: required, multiple
->
-> </small>
-
-_Attribute:_ `value` (required)
-
-> The name of the layout.
-
-
-**Example**
-
-```xml
-<keyboard3 locale="bg-t-k0-phonetic-trad">
-    …
-    <names>
-        <name value="Bulgarian (Phonetic Traditional)" />
-    </names>
-    …
-</keyboard3>
-```
-
-* * *
-
 ### <a name="Element_settings" href="#Element_settings">Element: settings</a>
 
 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 -->
 	<!-- 'version' element is now optional -->
 	<version number="1.0.0" />
-	<info author="Team Keyboard" layout="AZERTY" indicator="FR" />
-	<names>
-		<name value="French Test" />
-		<name value="French Test AZERTY" />
-	</names>
+	<info name="French Test AZERTY" author="Team Keyboard" layout="AZERTY" indicator="FR" />
 
 	<displays>
 		<!-- Note: displays is only used for keycap presentation -->
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 @@
 		<locale id="en" />
 	</locales>
 	<version number="0.0.0" />
-	<names>
-		<!-- this is the Romaji (English) layer of the JIS keyboard -->
-		<name value="Romaji (JIS)" />
-	</names>
+	<info name="Romaji (JIS)" />
 
 	<keys>
 		<import base="cldr" path="techpreview/keys-Zyyy-punctuation.xml" />
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 @@
         <!-- English is also an official language in Malta.-->
         <locale id="en" />
     </locales>
-    <info author="Steven R. Loomis" layout="QWERTY" indicator="MT" />
-
-    <names>
-        <name value="Maltese 47-key" />
-        <name value="MSA 100:2002 47-key" />
-    </names>
+    <info name="Maltese 47-key" author="Steven R. Loomis" layout="QWERTY" indicator="MT" />
+    <!-- MSA 100:2002 -->
 
     <keys>
         <!-- imports -->
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 @@
         <!-- English is also an official language in Malta.-->
         <locale id="en" />
     </locales>
-    <info author="Steven R. Loomis" layout="QWERTY" indicator="MT" />
-
-    <names>
-        <name value="Maltese" />
-        <name value="MSA 100:2002" />
-    </names>
+    <info name="Maltese" author="Steven R. Loomis" layout="QWERTY" indicator="MT" />
+    <!-- MSA 100:2002 -->
 
     <keys>
         <!-- imports -->
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 @@
 <!DOCTYPE keyboard3 SYSTEM '../dtd/ldmlKeyboard3.dtd'>
 <keyboard3 locale="pcm" conformsTo="techpreview">
   <version number="1.0.0" />
-  <names>
-    <name value="Nigerian Pidgin" />
-    <name value="Naijíriá Píjin" />
-  </names>
+  <info name="Naijíriá Píjin" />
   <keys>
     <import base="cldr" path="techpreview/keys-Zyyy-punctuation.xml" />
     <import base="cldr" path="techpreview/keys-Zyyy-currency.xml" />
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 @@
 		<locale id="pt" />
 	</locales>
 	<version number="0.0.0" />
-	<names>
-		<name value="Portuguese (Brazil) (ABNT2)" />
-	</names>
-
+	<info name="Portuguese (Brazil) (ABNT2)" />
 	<displays>
 		<display to="\m{acute}"  display="´"/>
 		<display to="\m{grave}"  display="`"/>
diff --git a/keyboards/dtd/ldmlKeyboard.dtd b/keyboards/dtd/ldmlKeyboard.dtd
index 49eaef96201..ebe98bb04bd 100644
--- a/keyboards/dtd/ldmlKeyboard.dtd
+++ b/keyboards/dtd/ldmlKeyboard.dtd
@@ -31,6 +31,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
     <!--@DEPRECATED-->
 
 <!ELEMENT info EMPTY >
+
+<!ATTLIST info name CDATA #REQUIRED >
+    <!--@MATCH:any-->
+    <!--@VALUE-->
+
 <!ATTLIST info author CDATA #IMPLIED >
     <!--@VALUE-->
 <!ATTLIST info normalization CDATA #IMPLIED >
@@ -41,13 +46,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 <!ATTLIST info indicator CDATA #IMPLIED >
     <!--@VALUE-->
 
-<!ELEMENT names ( name+ ) >
-
-<!ELEMENT name EMPTY >
-<!ATTLIST name value CDATA #REQUIRED >
-    <!--@MATCH:any-->
-    <!--@VALUE-->
-
 <!ELEMENT settings EMPTY >
     <!--@ORDERED-->
 <!ATTLIST settings fallback (omit) #IMPLIED >
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.
 <https://cldr.unicode.org/index/keyboard-workgroup> -->
 
-<!ELEMENT keyboard3 ( import*, locales?, version?, info?, names, settings?, displays?, keys?, forms?, layers*, variables?, transforms*, special* ) >
+<!ELEMENT keyboard3 ( import*, locales?, version?, info, settings?, displays?, keys?, forms?, layers*, variables?, transforms*, special* ) >
     <!--@TECHPREVIEW-->
 <!ATTLIST keyboard3 locale CDATA #REQUIRED >
     <!--@MATCH:validity/bcp47-wellformed-->
@@ -45,6 +45,9 @@ Please view the subcommittee page for the most recent information.
 
 <!ELEMENT info EMPTY >
     <!--@TECHPREVIEW-->
+<!ATTLIST info name CDATA #REQUIRED >
+    <!--@MATCH:any-->
+    <!--@VALUE-->
 <!ATTLIST info author CDATA #IMPLIED >
     <!--@MATCH:any-->
     <!--@VALUE-->
@@ -55,26 +58,12 @@ Please view the subcommittee page for the most recent information.
     <!--@MATCH:any-->
     <!--@VALUE-->
 
-<!ELEMENT names ( import*, name+, special* ) >
-    <!--@TECHPREVIEW-->
-
-<!ELEMENT name EMPTY >
-    <!--@ORDERED-->
-    <!--@TECHPREVIEW-->
-<!ATTLIST name value CDATA #REQUIRED >
-    <!--@MATCH:any-->
-    <!--@VALUE-->
-
-<!ELEMENT special ANY >
-    <!--@TECHPREVIEW-->
-
 <!ELEMENT settings EMPTY >
     <!--@ORDERED-->
     <!--@TECHPREVIEW-->
 <!ATTLIST settings normalization (disabled) #IMPLIED >
     <!--@VALUE-->
 
-
 <!ELEMENT displays ( import*, display*, displayOptions*, special* ) >
     <!--@TECHPREVIEW-->
 
@@ -97,6 +86,9 @@ Please view the subcommittee page for the most recent information.
     <!--@VALUE-->
     <!--@ALLOWS_UESC-->
 
+<!ELEMENT special ANY >
+    <!--@TECHPREVIEW-->
+
 <!ELEMENT keys ( import*, ( key | flicks )*, special* ) >
     <!--@TECHPREVIEW-->
 
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
         <xs:element maxOccurs="unbounded" minOccurs="0" ref="import"/>
         <xs:element minOccurs="0" ref="locales"/>
         <xs:element minOccurs="0" ref="version"/>
-        <xs:element minOccurs="0" ref="info"/>
-        <xs:element ref="names"/>
+        <xs:element ref="info"/>
         <xs:element minOccurs="0" ref="settings"/>
         <xs:element minOccurs="0" ref="displays"/>
         <xs:element minOccurs="0" ref="keys"/>
@@ -97,6 +96,7 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
   
   <xs:element name="info">
     <xs:complexType>
+      <xs:attribute name="name" use="required"/>
       <xs:attribute name="author"/>
       <xs:attribute name="layout"/>
       <xs:attribute name="indicator"/>
@@ -109,27 +109,8 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
   
   
   
-  <xs:element name="names">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element maxOccurs="unbounded" minOccurs="0" ref="import"/>
-        <xs:element maxOccurs="unbounded" ref="name"/>
-        <xs:element maxOccurs="unbounded" minOccurs="0" ref="special"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  
-  <xs:element name="name">
-    <xs:complexType>
-      <xs:attribute name="value" use="required"/>
-    </xs:complexType>
-  </xs:element>
-  
-  
   
   
-  <xs:element name="special" type="any"/>
-  
   <xs:element name="settings">
     <xs:complexType>
       <xs:attribute name="normalization">
@@ -178,6 +159,8 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
   
   
   
+  <xs:element name="special" type="any"/>
+  
   <xs:element name="keys">
     <xs:complexType>
       <xs:sequence>
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 @@
         <!-- English is also an official language in Malta.-->
         <locale id="en" />
     </locales>
-    <info author="Steven R. Loomis" layout="QWERTY" indicator="MT" />
-
-    <names>
-        <name value="Maltese (48-key)" />
-        <!-- <name value="MSA 100:2002" /> -->
-    </names>
+    <info name="Broken Import Test" author="Steven R. Loomis" layout="QWERTY" indicator="MT" />
 
     <keys>
         <!-- imports -->
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 @@
         <!-- English is also an official language in Malta.-->
         <locale id="en" />
     </locales>
-    <info author="Steven R. Loomis" layout="QWERTY" indicator="MT" />
-
-    <names>
-        <name value="Maltese (48-key)" />
-        <!-- <name value="MSA 100:2002" /> -->
-    </names>
+    <info name="Broken Test" author="Steven R. Loomis" layout="QWERTY" indicator="MT" />
 
     <keys>
         <!-- imports -->
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 @@
         <!-- English is also an official language in Malta.-->
         <locale id="en" />
     </locales>
-    <info author="Steven R. Loomis" layout="QWERTY" indicator="MT" />
+    <info  name="Maltese (48-key)" author="Steven R. Loomis" layout="QWERTY" indicator="MT" />
 
-    <names>
-        <name value="Maltese (48-key)" />
-        <!-- <name value="MSA 100:2002" /> -->
-    </names>
+    <!-- MSA 100:2002 -->
 
     <keys>
         <!-- imports -->
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 @@
     <!DOCTYPE keyboard3 SYSTEM "../../../../../../../../../../keyboards/dtd/ldmlKeyboard3.dtd"> -->
 <keyboard3 locale="mt" conformsTo="techpreview">
     <locales>
+        <!-- Error - can't import 'keys' into a 'locales' section. -->
+        <import base="cldr" path="techpreview/keys-Zyyy-punctuation.xml"/>
         <!-- English is also an official language in Malta.-->
         <locale id="en" />
     </locales>
-    <info author="Steven R. Loomis" layout="QWERTY" indicator="MT" />
-
-    <names>
-        <!-- Error - can't import 'keys' into a 'names' section. -->
-        <import base="cldr" path="techpreview/keys-Zyyy-punctuation.xml"/>
-
-        <name value="Maltese (48-key)" />
-        <!-- <name value="MSA 100:2002" /> -->
-    </names>
+    <info name="Broken Test" author="Steven R. Loomis" layout="QWERTY" indicator="MT" />
 
     <keys>
         <!-- imports -->