From 38125c0c6c88725e95d9e7dca06446b3cc3ccee1 Mon Sep 17 00:00:00 2001
From: "Steven R. Loomis" <srl295@gmail.com>
Date: Tue, 3 Oct 2023 18:06:28 -0500
Subject: [PATCH] CLDR-17113 kbd: element/attr renaming

- layers/@form > layers/@formId
- key/@flicks > key/@flickId
- key/@switch >  key/@layerId
- key/@to > key/@output
- display/@to > display/@output

- updates to dtd, samples
- drop some old data in tests
---
 keyboards/3.0/fr-t-k0-azerty.xml              | 51 +++++++++----------
 keyboards/3.0/ja-Latn.xml                     |  2 +-
 keyboards/3.0/mt-t-k0-47key.xml               | 40 +++++++--------
 keyboards/3.0/mt.xml                          | 40 +++++++--------
 keyboards/3.0/pcm.xml                         | 18 +++----
 keyboards/3.0/pt-t-k0-abnt2.xml               | 36 ++++++-------
 keyboards/dtd/ldmlKeyboard3.dtd               | 12 ++---
 keyboards/dtd/ldmlKeyboard3.xsd               | 10 ++--
 .../unicode/cldr/unittest/TestDtdData.java    | 28 ++++------
 .../KeyboardFlatten/broken-import-missing.xml | 40 +++++++--------
 .../broken-import-unknownbase.xml             | 40 +++++++--------
 .../broken-import-unknownver.xml              | 42 +++++++--------
 .../broken-import-wrongparent.xml             | 40 +++++++--------
 13 files changed, 195 insertions(+), 204 deletions(-)

diff --git a/keyboards/3.0/fr-t-k0-azerty.xml b/keyboards/3.0/fr-t-k0-azerty.xml
index 942ffe83f58..818ed39632e 100644
--- a/keyboards/3.0/fr-t-k0-azerty.xml
+++ b/keyboards/3.0/fr-t-k0-azerty.xml
@@ -22,7 +22,7 @@
 		<!-- Note: displays is only used for keycap presentation -->
 		<!-- this example is not required for this keyboard as we use the spacing
 			modifiers -->
-		<display to="\u{0300}" display="${grave}" /> <!-- display combining grave as modifier letter grave ˋ -->
+		<display output="\u{0300}" display="${grave}" /> <!-- display combining grave as modifier letter grave ˋ -->
 		<!-- Note: We discussed why the existing displayMap was used for display.
 			rather than adding something closer to the key layout. 1. This way we can
 			tell the renderer what to do. Could be double diacritics, spacing issues,
@@ -37,10 +37,10 @@
 		<import base="cldr" path="techpreview/keys-Zyyy-currency.xml" />
 
 		<!-- switch keys -->
-		<key id="shift" switch="shift" />
-		<key id="numeric" switch="numeric" />
-		<key id="symbol" switch="symbol" />
-		<key id="base" switch="base" />
+		<key id="shift" layerId="shift" />
+		<key id="numeric" layerId="numeric" />
+		<key id="symbol" layerId="symbol" />
+		<key id="base" layerId="base" />
 
 		<!--
 			TODO: need discussion
@@ -52,40 +52,39 @@
 		-->
 		<key id="enter" gap="true" />
 
-
 		<!-- extra keys -->
-		<key id="u-grave" to="ü" />
-		<key id="e-grave" to="é" /> <!-- 2 -->
-		<key id="e-acute" to="è" /> <!-- 7 -->
-		<key id="c-cedilla" to="ç" /> <!-- 9 -->
-		<key id="a-acute" to="à" /> <!-- 0 -->
+		<key id="u-grave" output="ü" />
+		<key id="e-grave" output="é" /> <!-- 2 -->
+		<key id="e-acute" output="è" /> <!-- 7 -->
+		<key id="c-cedilla" output="ç" /> <!-- 9 -->
+		<key id="a-acute" output="à" /> <!-- 0 -->
 
 		<!-- extra symbols -->
-		<key id="bullet" to="•" />
-		<key id="umlaut" to="¨" />
-		<key id="super-2" to="²" longPress="₂" />
+		<key id="bullet" output="•" />
+		<key id="umlaut" output="¨" />
+		<key id="super-2" output="²" longPress="₂" />
 
 		<!-- test key -->
-		<key id="a" flicks="a" to="a" longPress="à â á ä ã å ā" />
+		<key id="a" flickId="a" output="a" longPress="à â á ä ã å ā" />
 		<!-- test key -->
-		<key id="A" flicks="b" to="A" longPress="À Á Ä Ã Å Ā" />
+		<key id="A" flickId="b" output="A" longPress="À Á Ä Ã Å Ā" />
 		<!-- TODO: all additional maps, hardware and touch -->
 	</keys>
 
 	<flicks>
-		<flick id="a">
-			<flickSegment directions="nw" to="\u{1234}" />
-			<flickSegment directions="nw se" to="\u{FFFF}" />
-			<flickSegment directions="e" to="\u{FFF0}" />
-		</flick>
 		<flick id="b">
-			<flickSegment directions="nw" to="\u{4567}" />
-			<flickSegment directions="nw se" to="\u{FFFF}" />
-			<flickSegment directions="e" to="\u{FFF0}" />
+			<flickSegment directions="nw" output="\u{4567}" />
+			<flickSegment directions="nw se" output="\u{FFFF}" />
+			<flickSegment directions="e" output="\u{FFF0}" />
+		</flick>
+		<flick id="a">
+			<flickSegment directions="nw" output="\u{1234}" />
+			<flickSegment directions="nw se" output="\u{FFFF}" />
+			<flickSegment directions="e" output="\u{FFF0}" />
 		</flick>
 	</flicks>
 
-	<layers form="iso">
+	<layers formId="iso">
 		<!-- in DTD: required if conformsTo ≥ 41 -->
 		<layer modifier="none">
 			<row
@@ -105,7 +104,7 @@
 		</layer>
 	</layers>
 
-	<layers form="touch" minDeviceWidth="150">
+	<layers formId="touch" minDeviceWidth="150">
 		<!-- optional attribute for min physical device size -->
 		<layer id="base">
 			<row keys="a z e r t y u i o p" />
diff --git a/keyboards/3.0/ja-Latn.xml b/keyboards/3.0/ja-Latn.xml
index 0e7be47e8d6..8c79ee4f373 100644
--- a/keyboards/3.0/ja-Latn.xml
+++ b/keyboards/3.0/ja-Latn.xml
@@ -12,7 +12,7 @@
 		<import base="cldr" path="techpreview/keys-Zyyy-currency.xml" />
 	</keys>
 
-	<layers form="jis">
+	<layers formId="jis">
 		<layer modifier="none">
 			<row keys="1 2 3 4 5 6 7 8 9 0 hyphen caret yen" />
 			<row keys="q w e r t y u i o p at open-square" />
diff --git a/keyboards/3.0/mt-t-k0-47key.xml b/keyboards/3.0/mt-t-k0-47key.xml
index 56361ae242c..3adc34aa684 100644
--- a/keyboards/3.0/mt-t-k0-47key.xml
+++ b/keyboards/3.0/mt-t-k0-47key.xml
@@ -14,36 +14,36 @@
         <import base="cldr" path="techpreview/keys-Zyyy-currency.xml" />
 
         <!-- accent grave -->
-        <key id="a-grave" to="à" />
-        <key id="A-grave" to="À" />
-        <key id="e-grave" to="è" />
-        <key id="E-grave" to="È" />
-        <key id="i-grave" to="ì" />
-        <key id="I-grave" to="Ì" />
-        <key id="o-grave" to="ò" />
-        <key id="O-grave" to="Ò" />
-        <key id="u-grave" to="ù" />
-        <key id="U-grave" to="Ù" />
+        <key id="a-grave" output="à" />
+        <key id="A-grave" output="À" />
+        <key id="e-grave" output="è" />
+        <key id="E-grave" output="È" />
+        <key id="i-grave" output="ì" />
+        <key id="I-grave" output="Ì" />
+        <key id="o-grave" output="ò" />
+        <key id="O-grave" output="Ò" />
+        <key id="u-grave" output="ù" />
+        <key id="U-grave" output="Ù" />
 
         <!-- tikka and maqtugha -->
-        <key id="c-tikka" to="ċ" /> <!-- tikka is a dot -->
-        <key id="C-tikka" to="Ċ" />
-        <key id="g-tikka" to="ġ" />
-        <key id="G-tikka" to="Ġ" />
-        <key id="h-maqtugha" to="ħ" /> <!-- maqtugħa, i.e. cut -->
-        <key id="H-maqtugha" to="Ħ" /> <!-- maqtugħa, i.e. cut -->
-        <key id="z-tikka" to="ż" />
-        <key id="Z-tikka" to="Ż" />
+        <key id="c-tikka" output="ċ" /> <!-- tikka is a dot -->
+        <key id="C-tikka" output="Ċ" />
+        <key id="g-tikka" output="ġ" />
+        <key id="G-tikka" output="Ġ" />
+        <key id="h-maqtugha" output="ħ" /> <!-- maqtugħa, i.e. cut -->
+        <key id="H-maqtugha" output="Ħ" /> <!-- maqtugħa, i.e. cut -->
+        <key id="z-tikka" output="ż" />
+        <key id="Z-tikka" output="Ż" />
 
         <!-- Cedilla -->
-        <key id="c-cedilla" to="ç" />
+        <key id="c-cedilla" output="ç" />
 
         <!-- gaps -->
         <key id="gap" gap="true" width="1" />
     </keys>
 
     <!-- 47-key: MSA 100:2002, Appendix, figure A.1 -->
-    <layers form="us">
+    <layers formId="us">
         <layer modifier="none">
             <row keys="c-tikka 1 2 3 4 5 6 7 8 9 0 hyphen equal" />
             <row keys="q w e r t y u i o p g-tikka h-maqtugha z-tikka" />
diff --git a/keyboards/3.0/mt.xml b/keyboards/3.0/mt.xml
index 84985d1c0ad..f63e0845476 100644
--- a/keyboards/3.0/mt.xml
+++ b/keyboards/3.0/mt.xml
@@ -20,33 +20,33 @@
         <import base="cldr" path="techpreview/keys-Zyyy-currency.xml"/>
 
         <!-- accent grave -->
-        <key id="a-grave" to="à" />
-        <key id="A-grave" to="À" />
-        <key id="e-grave" to="è" />
-        <key id="E-grave" to="È" />
-        <key id="i-grave" to="ì" />
-        <key id="I-grave" to="Ì" />
-        <key id="o-grave" to="ò" />
-        <key id="O-grave" to="Ò" />
-        <key id="u-grave" to="ù" />
-        <key id="U-grave" to="Ù" />
+        <key id="a-grave" output="à" />
+        <key id="A-grave" output="À" />
+        <key id="e-grave" output="è" />
+        <key id="E-grave" output="È" />
+        <key id="i-grave" output="ì" />
+        <key id="I-grave" output="Ì" />
+        <key id="o-grave" output="ò" />
+        <key id="O-grave" output="Ò" />
+        <key id="u-grave" output="ù" />
+        <key id="U-grave" output="Ù" />
 
         <!-- tikka and maqtugha -->
-        <key id="c-tikka" to="ċ" /> <!-- tikka is a dot -->
-        <key id="C-tikka" to="Ċ" />
-        <key id="g-tikka" to="ġ" />
-        <key id="G-tikka" to="Ġ" />
-        <key id="h-maqtugha" to="ħ" /> <!-- maqtugħa, i.e. cut -->
-        <key id="H-maqtugha" to="Ħ" /> <!-- maqtugħa, i.e. cut -->
-        <key id="z-tikka" to="ż" />
-        <key id="Z-tikka" to="Ż" />
+        <key id="c-tikka" output="ċ" /> <!-- tikka is a dot -->
+        <key id="C-tikka" output="Ċ" />
+        <key id="g-tikka" output="ġ" />
+        <key id="G-tikka" output="Ġ" />
+        <key id="h-maqtugha" output="ħ" /> <!-- maqtugħa, i.e. cut -->
+        <key id="H-maqtugha" output="Ħ" /> <!-- maqtugħa, i.e. cut -->
+        <key id="z-tikka" output="ż" />
+        <key id="Z-tikka" output="Ż" />
 
         <!-- Cedilla -->
-        <key id="c-cedilla" to="ç" />
+        <key id="c-cedilla" output="ç" />
     </keys>
 
      <!-- 48-key -->
-    <layers form="iso">
+    <layers formId="iso">
         <layer modifier="none">
             <row keys="c-tikka 1 2 3 4 5 6 7 8 9 0 hyphen equal" />
             <row keys="q w e r t y u i o p g-tikka h-maqtugha" />
diff --git a/keyboards/3.0/pcm.xml b/keyboards/3.0/pcm.xml
index 4bc34be49ac..50a308b81c1 100644
--- a/keyboards/3.0/pcm.xml
+++ b/keyboards/3.0/pcm.xml
@@ -6,21 +6,21 @@
   <keys>
     <import base="cldr" path="techpreview/keys-Zyyy-punctuation.xml" />
     <import base="cldr" path="techpreview/keys-Zyyy-currency.xml" />
-    <key id="grave" to="\u{300}" />
-    <key id="backquote" to="`" />
-    <key id="acute" to="\u{301}" />
+    <key id="grave" output="\u{300}" />
+    <key id="backquote" output="`" />
+    <key id="acute" output="\u{301}" />
 
     <!-- accented vowels -->
-    <key id="odot" to="ọ" />
-    <key id="Odot" to="Ọ" />
-    <key id="edot" to="ẹ" />
-    <key id="Edot" to="Ẹ" />
+    <key id="odot" output="ọ" />
+    <key id="Odot" output="Ọ" />
+    <key id="edot" output="ẹ" />
+    <key id="Edot" output="Ẹ" />
 
     <!-- currency -->
-    <key id="naira" to="₦" />
+    <key id="naira" output="₦" />
   </keys>
 
-  <layers form="iso">
+  <layers formId="iso">
     <layer modifier="none">
       <row keys="grave 1 2 3 4 5 6 7 8 9 0 hyphen equal" />
       <row keys="acute w e r t y u i o p open-square close-square" />
diff --git a/keyboards/3.0/pt-t-k0-abnt2.xml b/keyboards/3.0/pt-t-k0-abnt2.xml
index 8d056de3a1c..41060ea6403 100644
--- a/keyboards/3.0/pt-t-k0-abnt2.xml
+++ b/keyboards/3.0/pt-t-k0-abnt2.xml
@@ -7,11 +7,11 @@
 	<version number="0.0.0" />
 	<info name="Portuguese (Brazil) (ABNT2)" />
 	<displays>
-		<display to="\m{acute}"  display="´"/>
-		<display to="\m{grave}"  display="`"/>
-		<display to="\m{umlaut}" display="¨"/>
-		<display to="\m{caret}"  display="^"/>
-		<display to="\m{tilde}"  display="~"/>
+		<display output="\m{acute}"  display="´"/>
+		<display output="\m{grave}"  display="`"/>
+		<display output="\m{umlaut}" display="¨"/>
+		<display output="\m{caret}"  display="^"/>
+		<display output="\m{tilde}"  display="~"/>
 	</displays>
 
 	<keys>
@@ -19,22 +19,22 @@
 		<import base="cldr" path="techpreview/keys-Zyyy-currency.xml" />
 
 		<!-- TODO: using the proposed deadkey format -->
-		<key id="d-acute"  to="\m{acute}"/>
-		<key id="d-grave"  to="\m{grave}"/>
-		<key id="d-umlaut" to="\m{umlaut}"/>
-		<key id="d-caret"  to="\m{caret}"/>
-		<key id="d-tilde"  to="\m{tilde}"/>
+		<key id="d-acute"  output="\m{acute}"/>
+		<key id="d-grave"  output="\m{grave}"/>
+		<key id="d-umlaut" output="\m{umlaut}"/>
+		<key id="d-caret"  output="\m{caret}"/>
+		<key id="d-tilde"  output="\m{tilde}"/>
 
-		<key id="c-cedilla"         to="ç" />
-		<key id="C-cedilla"         to="Ç" />
+		<key id="c-cedilla"         output="ç" />
+		<key id="C-cedilla"         output="Ç" />
 
-		<key id="super-1"           to="¹" />
-		<key id="super-2"           to="²" />
-		<key id="super-3"           to="³" />
-		<key id="ordinal-feminine"  to="ª" />
-		<key id="ordinal-masculine" to="º" />
+		<key id="super-1"           output="¹" />
+		<key id="super-2"           output="²" />
+		<key id="super-3"           output="³" />
+		<key id="ordinal-feminine"  output="ª" />
+		<key id="ordinal-masculine" output="º" />
 	</keys>
-	<layers form="abnt2">
+	<layers formId="abnt2">
 		<layer modifier="none">
 			<row keys="apos 1 2 3 4 5 6 7 8 9 0 hyphen equal" />
 			<row keys="q w e r t y u i o p d-acute open-square" />
diff --git a/keyboards/dtd/ldmlKeyboard3.dtd b/keyboards/dtd/ldmlKeyboard3.dtd
index a667f0f12d2..64b2fd185de 100644
--- a/keyboards/dtd/ldmlKeyboard3.dtd
+++ b/keyboards/dtd/ldmlKeyboard3.dtd
@@ -71,7 +71,7 @@ Please view the subcommittee page for the most recent information.
     <!--@TECHPREVIEW-->
 <!ATTLIST display id NMTOKEN #IMPLIED >
     <!--@MATCH:any-->
-<!ATTLIST display to CDATA #IMPLIED >
+<!ATTLIST display output CDATA #IMPLIED >
     <!--@MATCH:any-->
     <!--@ALLOWS_UESC-->
 <!ATTLIST display display CDATA #REQUIRED >
@@ -96,11 +96,11 @@ Please view the subcommittee page for the most recent information.
     <!--@TECHPREVIEW-->
 <!ATTLIST key id NMTOKEN #REQUIRED >
     <!--@MATCH:any-->
-<!ATTLIST key flicks NMTOKEN #IMPLIED >
+<!ATTLIST key flickId NMTOKEN #IMPLIED >
     <!--@MATCH:any-->
 <!ATTLIST key gap (true) #IMPLIED >
     <!--@VALUE-->
-<!ATTLIST key to CDATA #IMPLIED >
+<!ATTLIST key output CDATA #IMPLIED >
     <!--@MATCH:any-->
     <!--@VALUE-->
     <!--@ALLOWS_UESC-->
@@ -117,7 +117,7 @@ Please view the subcommittee page for the most recent information.
     <!--@ALLOWS_UESC-->
 <!ATTLIST key stretch (true) #IMPLIED >
     <!--@VALUE-->
-<!ATTLIST key switch NMTOKEN #IMPLIED >
+<!ATTLIST key layerId NMTOKEN #IMPLIED >
     <!--@MATCH:any-->
     <!--@VALUE-->
 <!ATTLIST key transform (no) #IMPLIED >
@@ -137,7 +137,7 @@ Please view the subcommittee page for the most recent information.
     <!--@TECHPREVIEW-->
 <!ATTLIST flickSegment directions NMTOKENS #REQUIRED >
     <!--@MATCH:regex/(n|e|s|w|ne|nw|se|sw)([ ]+(n|e|s|w|ne|nw|se|sw))*-->
-<!ATTLIST flickSegment to CDATA #REQUIRED >
+<!ATTLIST flickSegment output CDATA #REQUIRED >
     <!--@MATCH:any-->
     <!--@VALUE-->
     <!--@ALLOWS_UESC-->
@@ -158,7 +158,7 @@ Please view the subcommittee page for the most recent information.
 
 <!ELEMENT layers ( import*, layer*, special* ) >
     <!--@TECHPREVIEW-->
-<!ATTLIST layers form NMTOKEN #REQUIRED >
+<!ATTLIST layers formId NMTOKEN #REQUIRED >
     <!--@MATCH:any-->
 <!ATTLIST layers minDeviceWidth CDATA #IMPLIED >
     <!--@MATCH:range/1~999-->
diff --git a/keyboards/dtd/ldmlKeyboard3.xsd b/keyboards/dtd/ldmlKeyboard3.xsd
index f780408bf53..05a86684b13 100644
--- a/keyboards/dtd/ldmlKeyboard3.xsd
+++ b/keyboards/dtd/ldmlKeyboard3.xsd
@@ -140,7 +140,7 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
   <xs:element name="display">
     <xs:complexType>
       <xs:attribute name="id" type="xs:NMTOKEN"/>
-      <xs:attribute name="to"/>
+      <xs:attribute name="output"/>
       <xs:attribute name="display" use="required"/>
     </xs:complexType>
   </xs:element>
@@ -175,7 +175,7 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
   <xs:element name="key">
     <xs:complexType>
       <xs:attribute name="id" type="xs:NMTOKEN" use="required"/>
-      <xs:attribute name="flicks" type="xs:NMTOKEN"/>
+      <xs:attribute name="flickId" type="xs:NMTOKEN"/>
       <xs:attribute name="gap">
         <xs:simpleType>
           <xs:restriction base="xs:token">
@@ -183,7 +183,7 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
           </xs:restriction>
         </xs:simpleType>
       </xs:attribute>
-      <xs:attribute name="to"/>
+      <xs:attribute name="output"/>
       <xs:attribute name="longPress"/>
       <xs:attribute name="longPressDefault"/>
       <xs:attribute name="multiTap"/>
@@ -194,7 +194,7 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
           </xs:restriction>
         </xs:simpleType>
       </xs:attribute>
-      <xs:attribute name="switch" type="xs:NMTOKEN"/>
+      <xs:attribute name="layerId" type="xs:NMTOKEN"/>
       <xs:attribute name="transform">
         <xs:simpleType>
           <xs:restriction base="xs:token">
@@ -293,7 +293,7 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
         <xs:element maxOccurs="unbounded" minOccurs="0" ref="layer"/>
         <xs:element maxOccurs="unbounded" minOccurs="0" ref="special"/>
       </xs:sequence>
-      <xs:attribute name="form" type="xs:NMTOKEN" use="required"/>
+      <xs:attribute name="formId" type="xs:NMTOKEN" use="required"/>
       <xs:attribute name="minDeviceWidth"/>
     </xs:complexType>
   </xs:element>
diff --git a/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestDtdData.java b/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestDtdData.java
index 7cf5608c617..b1a15621793 100644
--- a/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestDtdData.java
+++ b/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestDtdData.java
@@ -1,9 +1,5 @@
 package org.unicode.cldr.unittest;
 
-import com.google.common.base.Joiner;
-import com.google.common.collect.Multimap;
-import com.google.common.collect.TreeMultimap;
-import com.ibm.icu.dev.test.TestFmwk;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -17,6 +13,7 @@
 import java.util.Map.Entry;
 import java.util.Set;
 import java.util.TreeSet;
+
 import org.unicode.cldr.util.CLDRConfig;
 import org.unicode.cldr.util.CLDRPaths;
 import org.unicode.cldr.util.DtdData;
@@ -34,6 +31,11 @@
 import org.unicode.cldr.util.XMLFileReader;
 import org.unicode.cldr.util.XPathParts;
 
+import com.google.common.base.Joiner;
+import com.google.common.collect.Multimap;
+import com.google.common.collect.TreeMultimap;
+import com.ibm.icu.dev.test.TestFmwk;
+
 public class TestDtdData extends TestFmwk {
     private static final String COMMON_DIR = CLDRPaths.BASE_DIRECTORY + "common/";
     static CLDRConfig testInfo = CLDRConfig.getInstance();
@@ -758,14 +760,12 @@ public boolean isDistinguishingOld(DtdType dtdType, String elementName, String a
 
             case keyboard3:
                 if (elementName.equals("keyboard3") && attribute.equals("locale")
-                        || elementName.equals("vkeys") && attribute.equals("from")
-                        || elementName.equals("layers") && attribute.equals("form")
+                        || elementName.equals("layers") && attribute.equals("formId")
                         || elementName.equals("layers") && attribute.equals("minDeviceWidth")
-                        || elementName.equals("vkey") && attribute.equals("from")
                         || elementName.equals("layer") && attribute.equals("modifier")
                         || elementName.equals("form") && attribute.equals("id")
-                        || elementName.equals("map") && attribute.equals("id")
                         || elementName.equals("key") && attribute.equals("id")
+                        || elementName.equals("flick") && attribute.equals("id")
                         || elementName.equals("import") && attribute.equals("path")
                         || elementName.equals("import") && attribute.equals("base")
                         || elementName.equals("layer") && attribute.equals("id")
@@ -778,19 +778,11 @@ public boolean isDistinguishingOld(DtdType dtdType, String elementName, String a
                 return attribute.equals("_q")
                         || elementName.equals("keyboard3") && attribute.equals("locale")
                         || elementName.equals("keyMap") && attribute.equals("modifiers")
-                        || elementName.equals("key") && attribute.equals("flicks")
+                        || elementName.equals("key") && attribute.equals("flickId")
                         || elementName.equals("transforms") && attribute.equals("type")
-                        || elementName.equals("layerMap") && attribute.equals("modifier")
-                        || elementName.equals("transform") && attribute.equals("before")
                         || elementName.equals("transform") && attribute.equals("after")
-                        || elementName.equals("backspace") && attribute.equals("before")
-                        || elementName.equals("backspace") && attribute.equals("from")
-                        || elementName.equals("backspace") && attribute.equals("after")
-                        || elementName.equals("vkeys") && attribute.equals("type")
                         || elementName.equals("flickSegment") && attribute.equals("directions")
-                        // || elementName.equals("row") && attribute.equals("keys")
-                        || elementName.equals("vkey") && attribute.equals("iso")
-                        || elementName.equals("display") && attribute.equals("to")
+                        || elementName.equals("display") && attribute.equals("output")
                         || elementName.equals("display") && attribute.equals("id")
                         || elementName.equals("flick") && attribute.equals("id");
             case keyboardTest3:
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 73088028861..dad045e1e46 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
@@ -16,35 +16,35 @@
         <import base="cldr" path="techpreview/keys-Zyyy-DOESNOTEXIST.xml"/>
 
         <!-- accent grave -->
-        <key id="a-grave" to="à" />
-        <key id="A-grave" to="À" />
-        <key id="e-grave" to="è" />
-        <key id="E-grave" to="È" />
-        <key id="i-grave" to="ì" />
-        <key id="I-grave" to="Ì" />
-        <key id="o-grave" to="ò" />
-        <key id="O-grave" to="Ò" />
-        <key id="u-grave" to="ù" />
-        <key id="U-grave" to="Ù" />
+        <key id="a-grave" output="à" />
+        <key id="A-grave" output="À" />
+        <key id="e-grave" output="è" />
+        <key id="E-grave" output="È" />
+        <key id="i-grave" output="ì" />
+        <key id="I-grave" output="Ì" />
+        <key id="o-grave" output="ò" />
+        <key id="O-grave" output="Ò" />
+        <key id="u-grave" output="ù" />
+        <key id="U-grave" output="Ù" />
 
         <!-- tikka and maqtua -->
-        <key id="c-tikka" to="ċ" />
-        <key id="C-tikka" to="Ċ" />
-        <key id="g-tikka" to="ġ" />
-        <key id="G-tikka" to="Ġ" />
-        <key id="h-maqtua" to="ħ" />
-        <key id="H-maqtua" to="Ħ" />
-        <key id="z-tikka" to="ż" />
-        <key id="Z-tikka" to="Ż" />
+        <key id="c-tikka" output="ċ" />
+        <key id="C-tikka" output="Ċ" />
+        <key id="g-tikka" output="ġ" />
+        <key id="G-tikka" output="Ġ" />
+        <key id="h-maqtua" output="ħ" />
+        <key id="H-maqtua" output="Ħ" />
+        <key id="z-tikka" output="ż" />
+        <key id="Z-tikka" output="Ż" />
 
         <!-- Cedilla -->
-        <key id="c-cedilla" to="ç" />
+        <key id="c-cedilla" output="ç" />
 
         <!-- gaps -->
         <key id="gap" gap="true" width="1" />
     </keys>
 
-    <layers form="hardware" hardware="iso">
+    <layers formId="iso">
         <layer modifier="none">
             <row keys="c-tikka 1 2 3 4 5 6 7 8 9 0 minus equals" />
             <row keys="q w e r t y u i o p g-tikka h-maqtua" />
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 a1e902f480e..a7fe30b2763 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
@@ -16,35 +16,35 @@
         <import base="UNKNOWN" path="techpreview/keys-Zyyy-punctuation.xml"/>
 
         <!-- accent grave -->
-        <key id="a-grave" to="à" />
-        <key id="A-grave" to="À" />
-        <key id="e-grave" to="è" />
-        <key id="E-grave" to="È" />
-        <key id="i-grave" to="ì" />
-        <key id="I-grave" to="Ì" />
-        <key id="o-grave" to="ò" />
-        <key id="O-grave" to="Ò" />
-        <key id="u-grave" to="ù" />
-        <key id="U-grave" to="Ù" />
+        <key id="a-grave" output="à" />
+        <key id="A-grave" output="À" />
+        <key id="e-grave" output="è" />
+        <key id="E-grave" output="È" />
+        <key id="i-grave" output="ì" />
+        <key id="I-grave" output="Ì" />
+        <key id="o-grave" output="ò" />
+        <key id="O-grave" output="Ò" />
+        <key id="u-grave" output="ù" />
+        <key id="U-grave" output="Ù" />
 
         <!-- tikka and maqtua -->
-        <key id="c-tikka" to="ċ" />
-        <key id="C-tikka" to="Ċ" />
-        <key id="g-tikka" to="ġ" />
-        <key id="G-tikka" to="Ġ" />
-        <key id="h-maqtua" to="ħ" />
-        <key id="H-maqtua" to="Ħ" />
-        <key id="z-tikka" to="ż" />
-        <key id="Z-tikka" to="Ż" />
+        <key id="c-tikka" output="ċ" />
+        <key id="C-tikka" output="Ċ" />
+        <key id="g-tikka" output="ġ" />
+        <key id="G-tikka" output="Ġ" />
+        <key id="h-maqtua" output="ħ" />
+        <key id="H-maqtua" output="Ħ" />
+        <key id="z-tikka" output="ż" />
+        <key id="Z-tikka" output="Ż" />
 
         <!-- Cedilla -->
-        <key id="c-cedilla" to="ç" />
+        <key id="c-cedilla" output="ç" />
 
         <!-- gaps -->
         <key id="gap" gap="true" width="1" />
     </keys>
 
-    <layers form="hardware" hardware="iso">
+    <layers formId="iso">
         <layer modifier="none">
             <row keys="c-tikka 1 2 3 4 5 6 7 8 9 0 minus equals" />
             <row keys="q w e r t y u i o p g-tikka h-maqtua" />
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 1ff9b4fa415..f1443c3eb02 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,7 +8,7 @@
         <!-- English is also an official language in Malta.-->
         <locale id="en" />
     </locales>
-    <info  name="Maltese (48-key)" author="Steven R. Loomis" layout="QWERTY" indicator="MT" />
+    <info name="Maltese (48-key)" author="Steven R. Loomis" layout="QWERTY" indicator="MT" />
 
     <!-- MSA 100:2002 -->
 
@@ -18,35 +18,35 @@
         <import base="cldr" path="1.1.1/keys-Zyyy-punctuation.xml"/>
 
         <!-- accent grave -->
-        <key id="a-grave" to="à" />
-        <key id="A-grave" to="À" />
-        <key id="e-grave" to="è" />
-        <key id="E-grave" to="È" />
-        <key id="i-grave" to="ì" />
-        <key id="I-grave" to="Ì" />
-        <key id="o-grave" to="ò" />
-        <key id="O-grave" to="Ò" />
-        <key id="u-grave" to="ù" />
-        <key id="U-grave" to="Ù" />
+        <key id="a-grave" output="à" />
+        <key id="A-grave" output="À" />
+        <key id="e-grave" output="è" />
+        <key id="E-grave" output="È" />
+        <key id="i-grave" output="ì" />
+        <key id="I-grave" output="Ì" />
+        <key id="o-grave" output="ò" />
+        <key id="O-grave" output="Ò" />
+        <key id="u-grave" output="ù" />
+        <key id="U-grave" output="Ù" />
 
         <!-- tikka and maqtua -->
-        <key id="c-tikka" to="ċ" />
-        <key id="C-tikka" to="Ċ" />
-        <key id="g-tikka" to="ġ" />
-        <key id="G-tikka" to="Ġ" />
-        <key id="h-maqtua" to="ħ" />
-        <key id="H-maqtua" to="Ħ" />
-        <key id="z-tikka" to="ż" />
-        <key id="Z-tikka" to="Ż" />
+        <key id="c-tikka" output="ċ" />
+        <key id="C-tikka" output="Ċ" />
+        <key id="g-tikka" output="ġ" />
+        <key id="G-tikka" output="Ġ" />
+        <key id="h-maqtua" output="ħ" />
+        <key id="H-maqtua" output="Ħ" />
+        <key id="z-tikka" output="ż" />
+        <key id="Z-tikka" output="Ż" />
 
         <!-- Cedilla -->
-        <key id="c-cedilla" to="ç" />
+        <key id="c-cedilla" output="ç" />
 
         <!-- gaps -->
         <key id="gap" gap="true" width="1" />
     </keys>
 
-    <layers form="hardware" hardware="iso">
+    <layers formId="iso">
         <layer modifier="none">
             <row keys="c-tikka 1 2 3 4 5 6 7 8 9 0 minus equals" />
             <row keys="q w e r t y u i o p g-tikka h-maqtua" />
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 5ee1baa544d..de14815c45a 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
@@ -16,35 +16,35 @@
         <!-- imports -->
 
         <!-- accent grave -->
-        <key id="a-grave" to="à" />
-        <key id="A-grave" to="À" />
-        <key id="e-grave" to="è" />
-        <key id="E-grave" to="È" />
-        <key id="i-grave" to="ì" />
-        <key id="I-grave" to="Ì" />
-        <key id="o-grave" to="ò" />
-        <key id="O-grave" to="Ò" />
-        <key id="u-grave" to="ù" />
-        <key id="U-grave" to="Ù" />
+        <key id="a-grave" output="à" />
+        <key id="A-grave" output="À" />
+        <key id="e-grave" output="è" />
+        <key id="E-grave" output="È" />
+        <key id="i-grave" output="ì" />
+        <key id="I-grave" output="Ì" />
+        <key id="o-grave" output="ò" />
+        <key id="O-grave" output="Ò" />
+        <key id="u-grave" output="ù" />
+        <key id="U-grave" output="Ù" />
 
         <!-- tikka and maqtua -->
-        <key id="c-tikka" to="ċ" />
-        <key id="C-tikka" to="Ċ" />
-        <key id="g-tikka" to="ġ" />
-        <key id="G-tikka" to="Ġ" />
-        <key id="h-maqtua" to="ħ" />
-        <key id="H-maqtua" to="Ħ" />
-        <key id="z-tikka" to="ż" />
-        <key id="Z-tikka" to="Ż" />
+        <key id="c-tikka" output="ċ" />
+        <key id="C-tikka" output="Ċ" />
+        <key id="g-tikka" output="ġ" />
+        <key id="G-tikka" output="Ġ" />
+        <key id="h-maqtua" output="ħ" />
+        <key id="H-maqtua" output="Ħ" />
+        <key id="z-tikka" output="ż" />
+        <key id="Z-tikka" output="Ż" />
 
         <!-- Cedilla -->
-        <key id="c-cedilla" to="ç" />
+        <key id="c-cedilla" output="ç" />
 
         <!-- gaps -->
         <key id="gap" gap="true" width="1" />
     </keys>
 
-    <layers form="hardware" hardware="iso">
+    <layers formId="iso">
         <layer modifier="none">
             <row keys="c-tikka 1 2 3 4 5 6 7 8 9 0 minus equals" />
             <row keys="q w e r t y u i o p g-tikka h-maqtua" />