From a1a86123dbbe9bc8eccd30e0e9eac2b954d56f78 Mon Sep 17 00:00:00 2001
From: "Steven R. Loomis" <srl295@gmail.com>
Date: Mon, 9 Oct 2023 11:59:07 -0500
Subject: [PATCH] CLDR-17113 kbd shuffle element deck chairs

- longPress, multiTap now use a new keyList id
- keyList is a list of keys, has a default key
- flickSegment now uses a keyId instead of output

This means that each part of longPress, flick, and multiTap can:
- have a <display> customization
- perform a layer switch if desired
---
 .../supplemental/attributeValueValidity.xml   |  2 -
 keyboards/3.0/fr-t-k0-azerty.xml              | 44 ++++++++++++++-----
 keyboards/dtd/ldmlKeyboard3.dtd               | 28 +++++++-----
 keyboards/dtd/ldmlKeyboard3.xsd               | 28 +++++++++---
 4 files changed, 75 insertions(+), 27 deletions(-)

diff --git a/common/supplemental/attributeValueValidity.xml b/common/supplemental/attributeValueValidity.xml
index 6ce3c371322..91a8b5296ed 100644
--- a/common/supplemental/attributeValueValidity.xml
+++ b/common/supplemental/attributeValueValidity.xml
@@ -450,8 +450,6 @@
 			<attributeValues dtds='ldml' elements='relativeTimePattern' attributes='count' type='localeSpecific'>pluralOrdinal</attributeValues>
 			<attributeValues dtds='ldml' elements='unitPattern' attributes='count' type='localeSpecific'>pluralOrdinal</attributeValues>
 			<attributeValues dtds='keyboard3' elements='keyboard3' attributes='locale' type='TODO'></attributeValues>
-			<!-- <attributeValues dtds='keyboard3' elements='map' attributes='longPress' type='TODO'></attributeValues>
-			<attributeValues dtds='keyboard3' elements='map' attributes='to' type='TODO'></attributeValues> -->
 			<attributeValues dtds='keyboard3' elements='info' attributes='name' type='TODO'></attributeValues>
 			<attributeValues dtds='keyboard3' elements='transform' attributes='from' type='TODO'></attributeValues>
 			<attributeValues dtds='keyboard3' elements='transform' attributes='to' type='TODO'></attributeValues>
diff --git a/keyboards/3.0/fr-t-k0-azerty.xml b/keyboards/3.0/fr-t-k0-azerty.xml
index e0a5760f271..333b44ddb01 100644
--- a/keyboards/3.0/fr-t-k0-azerty.xml
+++ b/keyboards/3.0/fr-t-k0-azerty.xml
@@ -61,30 +61,54 @@
 		<key id="e-grave" output="é" /> <!-- 2 -->
 		<key id="e-acute" output="è" /> <!-- 7 -->
 		<key id="c-cedilla" output="ç" /> <!-- 9 -->
-		<key id="a-acute" output="à" /> <!-- 0 -->
+		<key id="a-grave" output="à" /> <!-- 0 -->
+		<key id="a-acute" output="á" />
+		<key id="a-caret" output="â" />
+		<key id="a-umlaut" output="ä" />
+		<key id="a-tilde" output="ã" />
+		<key id="a-ring" output="å" />
+		<key id="a-caron" output="ā" />
+
+		<key id="A-grave" output="À" /> <!-- 0 -->
+		<key id="A-acute" output="Á" />
+		<key id="A-caret" output="Â" />
+		<key id="A-umlaut" output="Ä" />
+		<key id="A-tilde" output="Ã" />
+		<key id="A-ring" output="Å" />
+		<key id="A-caron" output="Ā" />
+
 
 		<!-- extra symbols -->
 		<key id="bullet" output="•" />
 		<key id="umlaut" output="¨" />
-		<key id="super-2" output="²" longPress="₂" />
+		<key id="super-2" output="²" longPressKeyListId="sub-2" multiTapKeyListId="list-2" />
+		<key id="sub-2" output="₂" />
 
 		<!-- test key -->
-		<key id="a" flickId="a" output="a" longPress="à â á ä ã å ā" />
+		<key id="a" flickId="a" output="a" longPressKeyListId="lower-a"  />
 		<!-- test key -->
-		<key id="A" flickId="b" output="A" longPress="À Á Ä Ã Å Ā" />
+		<key id="A" flickId="b" output="A" longPressKeyListId="upper-a" />
 		<!-- TODO: all additional maps, hardware and touch -->
 	</keys>
 
+	<keyLists>
+		<keyList id="sub-2" keyIds="sub-2" />
+		<keyList id="list-2" keyIds="2 super-2 sub-2" />
+		<keyList id="lower-a" defaultKeyId="a" keyIds="a-grave a-caret a-acute a-umlaut a-tilde a-ring a-caron" />
+		<keyList id="upper-a" defaultKeyId="A" keyIds="A-grave A-caret A-acute A-umlaut A-tilde A-ring A-caron" />
+	</keyLists>
+
 	<flicks>
 		<flick id="b">
-			<flickSegment directions="nw" output="\u{4567}" />
-			<flickSegment directions="nw se" output="\u{FFFF}" />
-			<flickSegment directions="e" output="\u{FFF0}" />
+			<flickSegment directions="nw" keyId="A-grave" />
+			<flickSegment directions="nw se" keyId="A-acute" />
+			<flickSegment directions="e" keyId="A-caron" />
+			<flickSegment directions="s" keyId="numeric" /> <!-- layer shifting flick-->
 		</flick>
 		<flick id="a">
-			<flickSegment directions="nw" output="\u{1234}" />
-			<flickSegment directions="nw se" output="\u{FFFF}" />
-			<flickSegment directions="e" output="\u{FFF0}" />
+			<flickSegment directions="nw" keyId="a-grave" />
+			<flickSegment directions="nw se" keyId="a-acute" />
+			<flickSegment directions="e" keyId="a-caron" />
 		</flick>
 	</flicks>
 
diff --git a/keyboards/dtd/ldmlKeyboard3.dtd b/keyboards/dtd/ldmlKeyboard3.dtd
index d74f948a44f..07ee8edf1d4 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, settings?, displays?, keys?, flicks?, forms?, layers*, variables?, transforms*, special* ) >
+<!ELEMENT keyboard3 ( import*, locales?, version?, info, settings?, displays?, keys?, keyLists?, flicks?, forms?, layers*, variables?, transforms*, special* ) >
     <!--@TECHPREVIEW-->
 <!ATTLIST keyboard3 locale CDATA #REQUIRED >
     <!--@MATCH:validity/bcp47-wellformed-->
@@ -104,17 +104,12 @@ Please view the subcommittee page for the most recent information.
     <!--@MATCH:any-->
     <!--@VALUE-->
     <!--@ALLOWS_UESC-->
-<!ATTLIST key longPress CDATA #IMPLIED >
+<!ATTLIST key longPressKeyListId NMTOKEN #IMPLIED >
     <!--@MATCH:any-->
     <!--@VALUE-->
-    <!--@ALLOWS_UESC-->
-<!ATTLIST key longPressDefault CDATA #IMPLIED >
+<!ATTLIST key multiTapKeyListId NMTOKEN #IMPLIED >
     <!--@MATCH:any-->
     <!--@VALUE-->
-    <!--@ALLOWS_UESC-->
-<!ATTLIST key multiTap CDATA #IMPLIED >
-    <!--@VALUE-->
-    <!--@ALLOWS_UESC-->
 <!ATTLIST key stretch (true) #IMPLIED >
     <!--@VALUE-->
 <!ATTLIST key layerId NMTOKEN #IMPLIED >
@@ -126,6 +121,20 @@ Please view the subcommittee page for the most recent information.
     <!--@MATCH:range/0.01~100.0-->
     <!--@VALUE-->
 
+<!ELEMENT keyLists ( import*, keyList*, special* ) >
+    <!--@TECHPREVIEW-->
+
+<!ELEMENT keyList EMPTY >
+    <!--@TECHPREVIEW-->
+<!ATTLIST keyList id NMTOKEN #REQUIRED >
+    <!--@MATCH:any-->
+<!ATTLIST keyList keyIds NMTOKENS #REQUIRED >
+    <!--@MATCH:any-->
+    <!--@VALUE-->
+<!ATTLIST keyList defaultKeyId NMTOKEN #IMPLIED >
+    <!--@MATCH:any-->
+    <!--@VALUE-->
+
 <!ELEMENT flicks ( import*, flick*, special* ) >
 
 <!ELEMENT flick ( flickSegment+, special* ) >
@@ -137,10 +146,9 @@ 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 output CDATA #REQUIRED >
+<!ATTLIST flickSegment keyId NMTOKEN #REQUIRED >
     <!--@MATCH:any-->
     <!--@VALUE-->
-    <!--@ALLOWS_UESC-->
 
 <!ELEMENT forms ( import*, form*, special* ) >
     <!--@TECHPREVIEW-->
diff --git a/keyboards/dtd/ldmlKeyboard3.xsd b/keyboards/dtd/ldmlKeyboard3.xsd
index 0c1a51fa45d..07b03282db3 100644
--- a/keyboards/dtd/ldmlKeyboard3.xsd
+++ b/keyboards/dtd/ldmlKeyboard3.xsd
@@ -26,6 +26,7 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
         <xs:element minOccurs="0" ref="settings"/>
         <xs:element minOccurs="0" ref="displays"/>
         <xs:element minOccurs="0" ref="keys"/>
+        <xs:element minOccurs="0" ref="keyLists"/>
         <xs:element minOccurs="0" ref="flicks"/>
         <xs:element minOccurs="0" ref="forms"/>
         <xs:element maxOccurs="unbounded" minOccurs="0" ref="layers"/>
@@ -184,9 +185,8 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
         </xs:simpleType>
       </xs:attribute>
       <xs:attribute name="output"/>
-      <xs:attribute name="longPress"/>
-      <xs:attribute name="longPressDefault"/>
-      <xs:attribute name="multiTap"/>
+      <xs:attribute name="longPressKeyListId" type="xs:NMTOKEN"/>
+      <xs:attribute name="multiTapKeyListId" type="xs:NMTOKEN"/>
       <xs:attribute name="stretch">
         <xs:simpleType>
           <xs:restriction base="xs:token">
@@ -222,6 +222,25 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
   
   
   
+  <xs:element name="keyLists">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element maxOccurs="unbounded" minOccurs="0" ref="import"/>
+        <xs:element maxOccurs="unbounded" minOccurs="0" ref="keyList"/>
+        <xs:element maxOccurs="unbounded" minOccurs="0" ref="special"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  
+  <xs:element name="keyList">
+    <xs:complexType>
+      <xs:attribute name="id" type="xs:NMTOKEN" use="required"/>
+      <xs:attribute name="keyIds" type="xs:NMTOKENS" use="required"/>
+      <xs:attribute name="defaultKeyId" type="xs:NMTOKEN"/>
+    </xs:complexType>
+  </xs:element>
+  
+  
   
   
   
@@ -249,14 +268,13 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
   <xs:element name="flickSegment">
     <xs:complexType>
       <xs:attribute name="directions" type="xs:NMTOKENS" use="required"/>
-      <xs:attribute name="output" use="required"/>
+      <xs:attribute name="keyId" type="xs:NMTOKEN" use="required"/>
     </xs:complexType>
   </xs:element>
   
   
   
   
-  
   <xs:element name="forms">
     <xs:complexType>
       <xs:sequence>