From c350b5824398e72403a653ff46490ca02cecffe4 Mon Sep 17 00:00:00 2001
From: "Steven R. Loomis" <srl295@gmail.com>
Date: Fri, 27 Oct 2023 14:27:00 -0500
Subject: [PATCH 01/10] =?UTF-8?q?CLDR-12026=20kbd:=20add=20proper=20azerty?=
 =?UTF-8?q?-optimis=C3=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- rename the existing fr-t-k0-azerty to fr-t-k0-test  because it's really a test keyboard
- beginning of a proper optimisé keyboard.
---
 keyboards/3.0/fr-t-k0-optimise.xml            | 200 ++++++++++++++++++
 .../{fr-t-k0-azerty.xml => fr-t-k0-test.xml}  |   2 +-
 keyboards/test/fr-t-k0-optimise-test.xml      |  16 ++
 ...-azerty-test.xml => fr-t-k0-test-test.xml} |   2 +-
 .../cldr/util/ElementAttributeInfo.java       |   4 +-
 5 files changed, 220 insertions(+), 4 deletions(-)
 create mode 100644 keyboards/3.0/fr-t-k0-optimise.xml
 rename keyboards/3.0/{fr-t-k0-azerty.xml => fr-t-k0-test.xml} (99%)
 create mode 100644 keyboards/test/fr-t-k0-optimise-test.xml
 rename keyboards/test/{fr-t-k0-azerty-test.xml => fr-t-k0-test-test.xml} (93%)

diff --git a/keyboards/3.0/fr-t-k0-optimise.xml b/keyboards/3.0/fr-t-k0-optimise.xml
new file mode 100644
index 00000000000..8db073cc763
--- /dev/null
+++ b/keyboards/3.0/fr-t-k0-optimise.xml
@@ -0,0 +1,200 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE keyboard3 SYSTEM "../dtd/ldmlKeyboard3.dtd">
+<!--
+  New French
+-->
+<keyboard3 locale="fr-t-k0-optimise" conformsTo="techpreview">
+	<version number="1.0.0" />
+	<info author="Team Keyboard" name="French AZERTY optimisé" layout="AZERTY" indicator="FR" />
+
+	<displays>
+    <display output="\u0300" display="${grave}" />
+    <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>
+		<import base="cldr" path="techpreview/keys-Zyyy-punctuation.xml" />
+		<import base="cldr" path="techpreview/keys-Zyyy-currency.xml" />
+
+		<!-- deadkeys -->
+		<key id="mark-acute" output="\m{acute}" />
+		<key id="mark-breve" output="\m{breve}" />
+		<key id="mark-caret" output="\m{caret}" />
+		<key id="mark-caron" output="\m{caron}" />
+		<key id="mark-cedilla" output="\m{cedilla}" />
+		<key id="mark-circumflex" output="\m{circumflex}" />
+		<key id="mark-comma" output="\m{comma}" />
+		<key id="mark-currency" output="\m{currency}" />
+		<key id="mark-dotabove" output="\m{dotabove}" />
+		<key id="mark-dotbelow" output="\m{dotbelow}" />
+		<key id="mark-doubleacute" output="\m{doubleacute}" />
+		<key id="mark-doublegrave" output="\m{doublegrave}" />
+		<key id="mark-euro" output="\m{euro}" />
+		<key id="mark-grave" output="\m{grave}" />
+		<key id="mark-macron" output="\m{macron}" />
+		<key id="mark-ogonek" output="\m{ogonek}" />
+		<key id="mark-ring" output="\m{ring}" />
+		<key id="mark-scientific" output="\m{scientific}" />
+		<key id="mark-solidus" output="\m{solidus}" />
+		<key id="mark-stroke" output="\m{stroke}" />
+		<key id="mark-submacron" output="\m{submacron}" />
+		<key id="mark-tilde" output="\m{tilde}" />
+		<key id="mark-umlaut" output="\m{umlaut}" />
+
+
+		<!-- extra keys -->
+		<key id="e-grave" output="è" />
+		<key id="e-acute" output="é" />
+		<key id="c-cedilla" output="ç" />
+		<key id="a-acute" output="á" />
+		<key id="a-grave" output="à" />
+		<key id="e-caret" output="ê" />
+
+		<!-- extra symbols -->
+		<key id="bullet" output="•" />
+		<key id="umlaut" output="¨" />
+		<key id="sub-2" output="₂" />
+		<key id="super-2" output="²" longPressKeyIds="sub-2" />
+		<key id="en-dash" output="–" />
+		<key id="plus-minus" output="±" />
+		<key id="vulgar-half" output="½" />
+		<key id="vulgar-quarter" output="¼" />
+		<key id="ellipsis" output="…" />
+		<key id="open-apos" output="‘" />
+		<key id="close-apos" output="’" />
+		<key id="open-g" output="«" />
+		<key id="close-g" output="»" />
+
+		<key id="theta" output="θ" /> <!-- "for Romani" -->
+		<key id="Theta" output="ϴ" /> <!-- "for Romani" -->
+		<key id="tm" output="™" />
+		<key id="open-double" output="“" />
+		<key id="close-double" output="’" />
+		<key id="oe" output="œ" />
+		<key id="Oe" output="Œ" />
+		<key id="registered" output="®" />
+		<key id="minus-sign" output="−" />
+		<key id="ss" output="ß" />
+		<key id="ininity" output="∞" />
+		<key id="division" output="÷" />
+		<key id="less-equal" output="≤" />
+		<key id="greater-equal" output="≥" />
+		<key id="copy" output="©" />
+		<key id="inverse-question" output="¿" />
+		<key id="inverse-bang" output="¡" />
+		<key id="middle-dot" output="•" />
+		<key id="A-grave" output="À" />
+		<key id="E-acute" output="É" />
+		<key id="E-caret" output="Ê" />
+		<key id="em-dash" output="—" />
+		<key id="open-single" output="’" />
+		<key id="close-single" output="’" />
+		<key id="u-grave" output="Ù" />
+		<key id="radix" output="√" />
+		<key id="C-cedilla" output="Ç" />
+		<key id="not-equal" output="±" />
+
+		<key id="infinity" output="∞" />
+		<key id="E-grave" output="È" />
+		<key id="U-grave" output="Ù" />
+		<key id="nb-hyphen" output="‑" />
+		<key id="multiplication" output="×" />
+		<key id="ezh" output="ʒ" />
+		<key id="Ezh" output="Ʒ" />
+		<key id="ae" output="æ" />
+		<key id="Ae" output="Æ" />
+		<key id="permille" output="‰" />
+		<key id="dbl-dagger" output="‡" />
+		<key id="dagger" output="†" />
+		<key id="asym-equal" output="≃" />
+		<key id="Ss" output="ẞ" />
+	</keys>
+
+	<layers formId="iso">
+		<layer modifiers="none">
+      <row keys="at a-grave e-acute e-grave e-caret open-paren close-paren open-apos close-apos open-g close-g apos mark-caret" />
+			<row keys="a z e r t y u i o p hyphen plus" />
+			<row keys="q s d f g h j k l m slash asterisk" />
+			<row keys="open-angle w x c v b n period comma colon semi-colon" />
+			<row keys="space" />
+		</layer>
+
+		<layer modifiers="shift">
+			<row keys="hash 1 2 3 4 5 6 7 8 9 0 double-quote mark-umlaut" />
+			<row keys="A Z E R T Y U I O P en-dash plus-minus" />
+			<row keys="Q S D F G H J K L M backslash vulgar-half" />
+			<row keys="close-angle W X C V B N question bang ellipsis equal" />
+			<row keys="space" />
+		</layer>
+
+		<layer modifiers="alt">
+			<row keys="mark-breve section mark-acute mark-grave amp open-square close-square mark-macron underscore open-double close-double degree mark-caron"/>
+			<row keys="ae pound euro registered open-curly close-curly u-grave mark-dotabove oe percent minus-sign dagger"/>
+			<row keys="theta ss dollar mark-currency mark-scientific mark-euro gap mark-solidus pipe infinity division multiplication"/>
+			<row keys="less-equal ezh copy c-cedilla mark-cedilla mark-stroke mark-tilde inverse-question inverse-bang middle-dot asym-equal"/>
+			<row keys="space" />
+		</layer>
+
+		<layer modifiers="alt shift">
+			<row keys="mark-circumflex A-grave E-acute E-grave E-caret mark-doubleacute mark-doublegrave gap em-dash open-single close-single mark-ring gap"/>
+			<row keys="Ae gap gap gap tm gap U-grave mark-dotbelow Oe permille nb-hyphen dbl-dagger"/>
+			<row keys="Theta Ss gap gap gap mark-submacron gap gap gap gap radix vulgar-quarter"/>
+			<row keys="greater-equal Ezh gap C-cedilla mark-ogonek gap gap gap mark-comma gap not-equal"/>
+			<row keys="space" />
+		</layer>
+	</layers>
+
+	<variables>
+		<!-- spacing accents as string variables -->
+		<string id="grave"  value="`" />
+		<string id="caret"  value="^" />
+		<string id="umlaut" value="¨" />
+		<string id="tilde"  value="~" />
+
+		<!-- sets representing vowels and accented vowels.  -->
+		<!-- There's an extra space between the lower and upper case for visual separation -->
+		<!-- but, there are only 10 items in the following four sets -->
+		<set id="vowel"       value="a e i o u  A E I O U" />
+		<set id="graveVowel"  value="à è ì ò ù  À È Ì Ò Ù" />
+		<set id="caretVowel"  value="â ê î ô û  Â Ê Î Ô Û" />
+		<set id="umlautVowel" value="ä ë ï ö ü  Ä Ë Ï Ö Ü" />
+
+		<!-- a set containing all spacing accents -->
+		<set id="spacing_accent" value="${grave} ${caret} ${umlaut} ${tilde}" />
+	</variables>
+
+	<transforms type="simple">
+		<transformGroup>
+			<!-- use sets for those that fit neatly into sets -->
+			<transform from="${grave}($[vowel])"  to="$[1:graveVowel]" />
+			<transform from="${caret}($[vowel])"  to="$[1:caretVowel]" />
+			<transform from="${umlaut}($[vowel])" to="$[1:umlautVowel]" />
+
+			<!-- y also takes umlaut (in this sample) -->
+			<transform from="${umlaut}y" to="ÿ" />
+
+			<!-- tilde is on a subset, not all vowels, + n -->
+			<transform from="${tilde}a" to="ã" />
+			<transform from="${tilde}A" to="Ã" />
+			<transform from="${tilde}n" to="ñ" />
+			<transform from="${tilde}N" to="Ñ" />
+			<transform from="${tilde}o" to="õ" />
+			<transform from="${tilde}O" to="Õ" />
+
+			<!-- accent + space = spacing accent -->
+			<transform from="($[spacing_accent]) " to="$1" />
+		</transformGroup>
+		<transformGroup>
+			<!-- this is a reorder group -->
+			<!-- nod-Lana partial example -->
+			<reorder from="\u1A60" order="127" />
+			<reorder from="\u1A6B" order="42" />
+			<reorder from="[\u1A75-\u1A79]" order="55" />
+			<!-- ... partial example ... -->
+		</transformGroup>
+	</transforms>
+</keyboard3>
diff --git a/keyboards/3.0/fr-t-k0-azerty.xml b/keyboards/3.0/fr-t-k0-test.xml
similarity index 99%
rename from keyboards/3.0/fr-t-k0-azerty.xml
rename to keyboards/3.0/fr-t-k0-test.xml
index a45e198e23b..eb4032db38d 100644
--- a/keyboards/3.0/fr-t-k0-azerty.xml
+++ b/keyboards/3.0/fr-t-k0-test.xml
@@ -2,7 +2,7 @@
 <!--
     See CLDR-12026 for the real new azerty keyboard
 -->
-<keyboard3 xmlns="https://schemas.unicode.org/cldr/45/keyboard3" locale="fr-t-k0-azerty" conformsTo="45">
+<keyboard3 xmlns="https://schemas.unicode.org/cldr/45/keyboard3" locale="fr-t-k0-test" conformsTo="45">
 	<locales>
 		<locale id="br" /> <!-- example of including Breton -->
 	</locales>
diff --git a/keyboards/test/fr-t-k0-optimise-test.xml b/keyboards/test/fr-t-k0-optimise-test.xml
new file mode 100644
index 00000000000..593b8bd2e72
--- /dev/null
+++ b/keyboards/test/fr-t-k0-optimise-test.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE keyboardTest3 SYSTEM "../dtd/ldmlKeyboardTest3.dtd">
+<keyboardTest3 conformsTo="techpreview">
+    <info keyboard="fr-t-k0-optimise.xml" author="Team Keyboard" name="fr-test" />
+    <repertoire name="simple-repertoire" chars="[a b c d e \u{22}]" type="simple" /> <!-- verify that these outputs are all available from simple keys on any layer, for all form factors -->
+    <repertoire name="chars-repertoire" chars="[á é ó]" type="gesture" /> <!-- verify that these outputs are all available from simple or gesture keys on any layer, for touch -->
+    <tests name="key-tests">
+        <test name="key-test">
+            <startContext to="abc\u0022..."/>
+            <!-- tests by pressing key ids -->
+            <keystroke key="s"/>
+            <check result="abc\u0022...s" />
+            <!-- TODO -->
+        </test>
+    </tests>
+</keyboardTest3>
diff --git a/keyboards/test/fr-t-k0-azerty-test.xml b/keyboards/test/fr-t-k0-test-test.xml
similarity index 93%
rename from keyboards/test/fr-t-k0-azerty-test.xml
rename to keyboards/test/fr-t-k0-test-test.xml
index 0228dae7c14..c03ce54362a 100644
--- a/keyboards/test/fr-t-k0-azerty-test.xml
+++ b/keyboards/test/fr-t-k0-test-test.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE keyboardTest3 SYSTEM "../dtd/ldmlKeyboardTest3.dtd">
 <keyboardTest3 conformsTo="techpreview">
-    <info keyboard="fr-t-k0-azerty.xml" author="Team Keyboard" name="fr-test" />
+    <info keyboard="fr-t-k0-test.xml" author="Team Keyboard" name="fr-test" />
     <repertoire name="simple-repertoire" chars="[a b c d e \u{22}]" type="simple" /> <!-- verify that these outputs are all available from simple keys on any layer, for all form factors -->
     <repertoire name="chars-repertoire" chars="[á é ó]" type="gesture" /> <!-- verify that these outputs are all available from simple or gesture keys on any layer, for touch -->
     <tests name="key-tests">
diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/util/ElementAttributeInfo.java b/tools/cldr-code/src/main/java/org/unicode/cldr/util/ElementAttributeInfo.java
index 9b00c46b9cb..019eb80cde9 100644
--- a/tools/cldr-code/src/main/java/org/unicode/cldr/util/ElementAttributeInfo.java
+++ b/tools/cldr-code/src/main/java/org/unicode/cldr/util/ElementAttributeInfo.java
@@ -103,11 +103,11 @@ private static Map<DtdType, ElementAttributeInfo> makeElementAttributeInfoMap(
         addElementAttributeInfo(
                 result,
                 DtdType.keyboard3,
-                canonicalCommonDirectory + "/../keyboards/3.0/fr-t-k0-azerty.xml");
+                canonicalCommonDirectory + "/../keyboards/3.0/fr-t-k0-test.xml");
         addElementAttributeInfo(
                 result,
                 DtdType.keyboardTest3,
-                canonicalCommonDirectory + "/../keyboards/test/fr-t-k0-azerty-test.xml");
+                canonicalCommonDirectory + "/../keyboards/test/fr-t-k0-test-test.xml");
         return result;
     }
 

From 11b208eafca5a503a7086d046cb3c637d564ef73 Mon Sep 17 00:00:00 2001
From: "Steven R. Loomis" <srl295@gmail.com>
Date: Wed, 20 Mar 2024 19:48:09 -0500
Subject: [PATCH 02/10] CLDR-12026 move out of techpreview

---
 keyboards/3.0/fr-t-k0-optimise.xml | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/keyboards/3.0/fr-t-k0-optimise.xml b/keyboards/3.0/fr-t-k0-optimise.xml
index 8db073cc763..dae0c30d7f1 100644
--- a/keyboards/3.0/fr-t-k0-optimise.xml
+++ b/keyboards/3.0/fr-t-k0-optimise.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE keyboard3 SYSTEM "../dtd/ldmlKeyboard3.dtd">
-<!--
+<keyboard3 xmlns="https://schemas.unicode.org/cldr/45/keyboard3" locale="fr-t-k0-optimise" conformsTo="45">
+	<!--
   New French
 -->
-<keyboard3 locale="fr-t-k0-optimise" conformsTo="techpreview">
 	<version number="1.0.0" />
 	<info author="Team Keyboard" name="French AZERTY optimisé" layout="AZERTY" indicator="FR" />
 
@@ -188,13 +187,5 @@
 			<!-- accent + space = spacing accent -->
 			<transform from="($[spacing_accent]) " to="$1" />
 		</transformGroup>
-		<transformGroup>
-			<!-- this is a reorder group -->
-			<!-- nod-Lana partial example -->
-			<reorder from="\u1A60" order="127" />
-			<reorder from="\u1A6B" order="42" />
-			<reorder from="[\u1A75-\u1A79]" order="55" />
-			<!-- ... partial example ... -->
-		</transformGroup>
 	</transforms>
 </keyboard3>

From 54214f33022b71cf8b1ee20aa3ed129b9079464c Mon Sep 17 00:00:00 2001
From: "Steven R. Loomis" <srl295@gmail.com>
Date: Thu, 21 Mar 2024 09:25:47 -0500
Subject: [PATCH 03/10] CLDR-12026 kbd: fr: verified all non-marker chars

---
 keyboards/3.0/fr-t-k0-optimise.xml | 67 +++++++++++++++++-------------
 1 file changed, 38 insertions(+), 29 deletions(-)

diff --git a/keyboards/3.0/fr-t-k0-optimise.xml b/keyboards/3.0/fr-t-k0-optimise.xml
index dae0c30d7f1..b3dbb561379 100644
--- a/keyboards/3.0/fr-t-k0-optimise.xml
+++ b/keyboards/3.0/fr-t-k0-optimise.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<keyboard3 xmlns="https://schemas.unicode.org/cldr/45/keyboard3" locale="fr-t-k0-optimise" conformsTo="45">
+<keyboard3 xmlns="https://schemas.unicode.org/cldr/45/keyboard3" locale="fr-t-k0-optimise"
+	conformsTo="45">
 	<!--
   New French
 -->
@@ -7,17 +8,17 @@
 	<info author="Team Keyboard" name="French AZERTY optimisé" layout="AZERTY" indicator="FR" />
 
 	<displays>
-    <display output="\u0300" display="${grave}" />
-    <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>
+		<display output="\u0300" display="${grave}" />
+		<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>
-		<import base="cldr" path="techpreview/keys-Zyyy-punctuation.xml" />
-		<import base="cldr" path="techpreview/keys-Zyyy-currency.xml" />
+		<import base="cldr" path="45/keys-Zyyy-punctuation.xml" />
+		<import base="cldr" path="45/keys-Zyyy-currency.xml" />
 
 		<!-- deadkeys -->
 		<key id="mark-acute" output="\m{acute}" />
@@ -72,7 +73,7 @@
 		<key id="Theta" output="ϴ" /> <!-- "for Romani" -->
 		<key id="tm" output="™" />
 		<key id="open-double" output="“" />
-		<key id="close-double" output="’" />
+		<key id="close-double" output="”" />
 		<key id="oe" output="œ" />
 		<key id="Oe" output="Œ" />
 		<key id="registered" output="®" />
@@ -95,7 +96,7 @@
 		<key id="u-grave" output="Ù" />
 		<key id="radix" output="√" />
 		<key id="C-cedilla" output="Ç" />
-		<key id="not-equal" output="±" />
+		<key id="not-equal" output="≠" />
 
 		<key id="infinity" output="∞" />
 		<key id="E-grave" output="È" />
@@ -115,7 +116,8 @@
 
 	<layers formId="iso">
 		<layer modifiers="none">
-      <row keys="at a-grave e-acute e-grave e-caret open-paren close-paren open-apos close-apos open-g close-g apos mark-caret" />
+			<row
+				keys="at a-grave e-acute e-grave e-caret open-paren close-paren open-apos close-apos open-g close-g apos mark-caret" />
 			<row keys="a z e r t y u i o p hyphen plus" />
 			<row keys="q s d f g h j k l m slash asterisk" />
 			<row keys="open-angle w x c v b n period comma colon semi-colon" />
@@ -131,35 +133,41 @@
 		</layer>
 
 		<layer modifiers="alt">
-			<row keys="mark-breve section mark-acute mark-grave amp open-square close-square mark-macron underscore open-double close-double degree mark-caron"/>
-			<row keys="ae pound euro registered open-curly close-curly u-grave mark-dotabove oe percent minus-sign dagger"/>
-			<row keys="theta ss dollar mark-currency mark-scientific mark-euro gap mark-solidus pipe infinity division multiplication"/>
-			<row keys="less-equal ezh copy c-cedilla mark-cedilla mark-stroke mark-tilde inverse-question inverse-bang middle-dot asym-equal"/>
+			<row
+				keys="mark-breve section mark-acute mark-grave amp open-square close-square mark-macron underscore open-double close-double degree mark-caron" />
+			<row
+				keys="ae pound euro registered open-curly close-curly u-grave mark-dotabove oe percent minus-sign dagger" />
+			<row
+				keys="theta ss dollar mark-currency mark-scientific mark-euro gap mark-solidus pipe infinity division multiplication" />
+			<row
+				keys="less-equal ezh copy c-cedilla mark-cedilla mark-stroke mark-tilde inverse-question inverse-bang middle-dot asym-equal" />
 			<row keys="space" />
 		</layer>
 
 		<layer modifiers="alt shift">
-			<row keys="mark-circumflex A-grave E-acute E-grave E-caret mark-doubleacute mark-doublegrave gap em-dash open-single close-single mark-ring gap"/>
-			<row keys="Ae gap gap gap tm gap U-grave mark-dotbelow Oe permille nb-hyphen dbl-dagger"/>
-			<row keys="Theta Ss gap gap gap mark-submacron gap gap gap gap radix vulgar-quarter"/>
-			<row keys="greater-equal Ezh gap C-cedilla mark-ogonek gap gap gap mark-comma gap not-equal"/>
+			<row
+				keys="mark-circumflex A-grave E-acute E-grave E-caret mark-doubleacute mark-doublegrave gap em-dash open-angle close-single mark-ring gap" />
+			<row keys="Ae gap gap gap tm gap U-grave mark-dotbelow Oe permille nb-hyphen dbl-dagger" />
+			<row keys="Theta Ss gap gap gap mark-submacron gap gap gap gap radix vulgar-quarter" />
+			<row
+				keys="greater-equal Ezh gap C-cedilla mark-ogonek gap gap gap mark-comma gap not-equal" />
 			<row keys="space" />
 		</layer>
 	</layers>
 
 	<variables>
 		<!-- spacing accents as string variables -->
-		<string id="grave"  value="`" />
-		<string id="caret"  value="^" />
+		<string id="grave" value="`" />
+		<string id="caret" value="^" />
 		<string id="umlaut" value="¨" />
-		<string id="tilde"  value="~" />
+		<string id="tilde" value="~" />
 
 		<!-- sets representing vowels and accented vowels.  -->
 		<!-- There's an extra space between the lower and upper case for visual separation -->
 		<!-- but, there are only 10 items in the following four sets -->
-		<set id="vowel"       value="a e i o u  A E I O U" />
-		<set id="graveVowel"  value="à è ì ò ù  À È Ì Ò Ù" />
-		<set id="caretVowel"  value="â ê î ô û  Â Ê Î Ô Û" />
+		<set id="vowel" value="a e i o u  A E I O U" />
+		<set id="graveVowel" value="à è ì ò ù  À È Ì Ò Ù" />
+		<set id="caretVowel" value="â ê î ô û  Â Ê Î Ô Û" />
 		<set id="umlautVowel" value="ä ë ï ö ü  Ä Ë Ï Ö Ü" />
 
 		<!-- a set containing all spacing accents -->
@@ -169,8 +177,9 @@
 	<transforms type="simple">
 		<transformGroup>
 			<!-- use sets for those that fit neatly into sets -->
-			<transform from="${grave}($[vowel])"  to="$[1:graveVowel]" />
-			<transform from="${caret}($[vowel])"  to="$[1:caretVowel]" />
+			<transform from="${grave}($[vowel])" to="$[1:graveVowel]" />
+			<!-- next line has a workaround for https://github.com/keymanapp/keyman/issues/11037 -->
+			<transform from="\^($[vowel])" to="$[1:caretVowel]" />
 			<transform from="${umlaut}($[vowel])" to="$[1:umlautVowel]" />
 
 			<!-- y also takes umlaut (in this sample) -->

From df67cdb6889e07e25f349c92ce79924d3feb1871 Mon Sep 17 00:00:00 2001
From: "Steven R. Loomis" <srl295@gmail.com>
Date: Fri, 22 Mar 2024 11:22:36 -0500
Subject: [PATCH 04/10] CLDR-12026 kbd: fr: revamping some marker, greek layer
 working

---
 keyboards/3.0/fr-t-k0-optimise.xml | 52 ++++++++++++++----------------
 1 file changed, 24 insertions(+), 28 deletions(-)

diff --git a/keyboards/3.0/fr-t-k0-optimise.xml b/keyboards/3.0/fr-t-k0-optimise.xml
index b3dbb561379..3cf3378f65a 100644
--- a/keyboards/3.0/fr-t-k0-optimise.xml
+++ b/keyboards/3.0/fr-t-k0-optimise.xml
@@ -38,7 +38,7 @@
 		<key id="mark-macron" output="\m{macron}" />
 		<key id="mark-ogonek" output="\m{ogonek}" />
 		<key id="mark-ring" output="\m{ring}" />
-		<key id="mark-scientific" output="\m{scientific}" />
+		<key id="mark-greek" output="\m{greek}" />
 		<key id="mark-solidus" output="\m{solidus}" />
 		<key id="mark-stroke" output="\m{stroke}" />
 		<key id="mark-submacron" output="\m{submacron}" />
@@ -131,20 +131,20 @@
 			<row keys="close-angle W X C V B N question bang ellipsis equal" />
 			<row keys="space" />
 		</layer>
-
-		<layer modifiers="alt">
+        <!-- layer is for AltGr - for now we use ctrl alt -->
+		<layer modifiers="ctrl alt">
 			<row
 				keys="mark-breve section mark-acute mark-grave amp open-square close-square mark-macron underscore open-double close-double degree mark-caron" />
 			<row
 				keys="ae pound euro registered open-curly close-curly u-grave mark-dotabove oe percent minus-sign dagger" />
 			<row
-				keys="theta ss dollar mark-currency mark-scientific mark-euro gap mark-solidus pipe infinity division multiplication" />
+				keys="theta ss dollar mark-currency mark-greek mark-euro gap mark-solidus pipe infinity division multiplication" />
 			<row
 				keys="less-equal ezh copy c-cedilla mark-cedilla mark-stroke mark-tilde inverse-question inverse-bang middle-dot asym-equal" />
 			<row keys="space" />
 		</layer>
 
-		<layer modifiers="alt shift">
+		<layer modifiers="ctrl alt shift">
 			<row
 				keys="mark-circumflex A-grave E-acute E-grave E-caret mark-doubleacute mark-doublegrave gap em-dash open-angle close-single mark-ring gap" />
 			<row keys="Ae gap gap gap tm gap U-grave mark-dotbelow Oe permille nb-hyphen dbl-dagger" />
@@ -164,37 +164,33 @@
 
 		<!-- sets representing vowels and accented vowels.  -->
 		<!-- There's an extra space between the lower and upper case for visual separation -->
-		<!-- but, there are only 10 items in the following four sets -->
-		<set id="vowel" value="a e i o u  A E I O U" />
-		<set id="graveVowel" value="à è ì ò ù  À È Ì Ò Ù" />
-		<set id="caretVowel" value="â ê î ô û  Â Ê Î Ô Û" />
-		<set id="umlautVowel" value="ä ë ï ö ü  Ä Ë Ï Ö Ü" />
-
-		<!-- a set containing all spacing accents -->
-		<set id="spacing_accent" value="${grave} ${caret} ${umlaut} ${tilde}" />
+		<!-- but, there are only 10 vowels in the following four sets -->
+        <!-- plus space at end for the visible version -->
+		<set id="vowel"      value="a e i o u  A E I O U"  />
+
+        <!-- deviating from spec, uppercase final sigma (X) is encoded as another Σ  -->
+        <set id="greekfrom"   value="a z e r u i o p s d g h j k l m x b n A Z E R U I O P S D G H J K L M X B N" />
+        <set id="greekto"     value="α ζ ε ρ θ ι ο π σ δ γ η ξ κ λ μ ς β ν Α Ζ Ε Ρ Θ Ι Ο Π Σ Δ Γ Η Ξ Κ Λ Μ Σ Β Ν" />
 	</variables>
 
 	<transforms type="simple">
 		<transformGroup>
 			<!-- use sets for those that fit neatly into sets -->
-			<transform from="${grave}($[vowel])" to="$[1:graveVowel]" />
-			<!-- next line has a workaround for https://github.com/keymanapp/keyman/issues/11037 -->
-			<transform from="\^($[vowel])" to="$[1:caretVowel]" />
-			<transform from="${umlaut}($[vowel])" to="$[1:umlautVowel]" />
+			<transform from="\m{caret}($[vowel])" to="$1\u{0302}" />
+			<transform from="\m{umlaut}($[vowel])" to="$1\u{0308}" />
 
-			<!-- y also takes umlaut (in this sample) -->
-			<transform from="${umlaut}y" to="ÿ" />
+            <!-- greek layer for hardware -->
+            <transform from="\m{greek}($[greekfrom])" to="$[1:greekto]" />
+            <!-- drop greek+anything else -->
+            <transform from="\m{greek}(.)" to="$1" />
 
 			<!-- tilde is on a subset, not all vowels, + n -->
-			<transform from="${tilde}a" to="ã" />
-			<transform from="${tilde}A" to="Ã" />
-			<transform from="${tilde}n" to="ñ" />
-			<transform from="${tilde}N" to="Ñ" />
-			<transform from="${tilde}o" to="õ" />
-			<transform from="${tilde}O" to="Õ" />
-
-			<!-- accent + space = spacing accent -->
-			<transform from="($[spacing_accent]) " to="$1" />
+			<transform from="\m{tilde}a" to="ã" />
+			<transform from="\m{tilde}A" to="Ã" />
+			<transform from="\m{tilde}n" to="ñ" />
+			<transform from="\m{tilde}N" to="Ñ" />
+			<transform from="\m{tilde}o" to="õ" />
+			<transform from="\m{tilde}O" to="Õ" />
 		</transformGroup>
 	</transforms>
 </keyboard3>

From 527447a29802b2278c2b274f503d16177ce532b5 Mon Sep 17 00:00:00 2001
From: "Steven R. Loomis" <srl295@gmail.com>
Date: Fri, 22 Mar 2024 14:06:30 -0500
Subject: [PATCH 05/10] CLDR-12026 kbd: fr: further updates, eu layer working

---
 keyboards/3.0/fr-t-k0-optimise.xml | 32 +++++++++++++++++++++++++-----
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/keyboards/3.0/fr-t-k0-optimise.xml b/keyboards/3.0/fr-t-k0-optimise.xml
index 3cf3378f65a..4239b7462dc 100644
--- a/keyboards/3.0/fr-t-k0-optimise.xml
+++ b/keyboards/3.0/fr-t-k0-optimise.xml
@@ -8,12 +8,18 @@
 	<info author="Team Keyboard" name="French AZERTY optimisé" layout="AZERTY" indicator="FR" />
 
 	<displays>
+		<!-- display for diacritics -->
 		<display output="\u0300" display="${grave}" />
 		<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="~" />
+
+		<!-- display for 'mode' keys -->
+		<display keyId="mark-currency" display="\u{00A4}" />
+		<display keyId="mark-greek" display="μ" />
+		<display keyId="mark-euro" display="Eu" />
 	</displays>
 
 	<keys>
@@ -97,6 +103,8 @@
 		<key id="radix" output="√" />
 		<key id="C-cedilla" output="Ç" />
 		<key id="not-equal" output="≠" />
+        <key id="open-angle-quote" output="‹" />
+        <key id="close-angle-quote" output="›" />
 
 		<key id="infinity" output="∞" />
 		<key id="E-grave" output="È" />
@@ -146,7 +154,7 @@
 
 		<layer modifiers="ctrl alt shift">
 			<row
-				keys="mark-circumflex A-grave E-acute E-grave E-caret mark-doubleacute mark-doublegrave gap em-dash open-angle close-single mark-ring gap" />
+				keys="mark-circumflex A-grave E-acute E-grave E-caret mark-doubleacute mark-doublegrave gap em-dash open-angle-quote close-angle-quote mark-ring gap" />
 			<row keys="Ae gap gap gap tm gap U-grave mark-dotbelow Oe permille nb-hyphen dbl-dagger" />
 			<row keys="Theta Ss gap gap gap mark-submacron gap gap gap gap radix vulgar-quarter" />
 			<row
@@ -168,9 +176,17 @@
         <!-- plus space at end for the visible version -->
 		<set id="vowel"      value="a e i o u  A E I O U"  />
 
-        <!-- deviating from spec, uppercase final sigma (X) is encoded as another Σ  -->
+        <!-- currency key from/to -->
+        <set id="currfrom"    value="y"/> <!-- TODO: others -->
+        <set id="currto"      value="¥"/>
+
+        <!-- greek from/to: deviating from spec, uppercase final sigma (X) is encoded as another Σ  -->
         <set id="greekfrom"   value="a z e r u i o p s d g h j k l m x b n A Z E R U I O P S D G H J K L M X B N" />
         <set id="greekto"     value="α ζ ε ρ θ ι ο π σ δ γ η ξ κ λ μ ς β ν Α Ζ Ε Ρ Θ Ι Ο Π Σ Δ Γ Η Ξ Κ Λ Μ Σ Β Ν" />
+
+        <!-- euro key from/to -->
+        <set id="eurofrom" value="a e t i o s d g j  ‘ ’ «  » '   E T I D G J  7 8 9 0"/>
+        <set id="euroto"   value="ª ə þ ı º ſ ð ŋ ij ‚ ‘ „ ‟ ’    Ə Þ İ Đ Ŋ IJ › ‹ » «"/>
 	</variables>
 
 	<transforms type="simple">
@@ -179,10 +195,10 @@
 			<transform from="\m{caret}($[vowel])" to="$1\u{0302}" />
 			<transform from="\m{umlaut}($[vowel])" to="$1\u{0308}" />
 
-            <!-- greek layer for hardware -->
+            <!-- curr/greek/euro layer for hardware -->
+            <transform from="\m{currency}($[currfrom])" to="$[1:currto]" />
             <transform from="\m{greek}($[greekfrom])" to="$[1:greekto]" />
-            <!-- drop greek+anything else -->
-            <transform from="\m{greek}(.)" to="$1" />
+            <transform from="\m{euro}($[eurofrom])" to="$[1:euroto]" />
 
 			<!-- tilde is on a subset, not all vowels, + n -->
 			<transform from="\m{tilde}a" to="ã" />
@@ -192,5 +208,11 @@
 			<transform from="\m{tilde}o" to="õ" />
 			<transform from="\m{tilde}O" to="Õ" />
 		</transformGroup>
+        <transformGroup>
+            <!-- catch-all: drop any marker that didn't otherwise match before a char -->
+            <transform from="\m{.}(.)" to="$1" />
+            <!-- also drop any doubled marker -->
+          <!-- (not currently working) <transform from="\m{.}(\m{.})" to="$1" /> -->
+        </transformGroup>
 	</transforms>
 </keyboard3>

From fba0936a81b14b6d93f2ca0825ea79835932800c Mon Sep 17 00:00:00 2001
From: "Steven R. Loomis" <srl295@gmail.com>
Date: Sat, 23 Mar 2024 17:22:02 -0500
Subject: [PATCH 06/10] CLDR-12026 kbd: fr: currency layer working

---
 keyboards/3.0/fr-t-k0-optimise.xml | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/keyboards/3.0/fr-t-k0-optimise.xml b/keyboards/3.0/fr-t-k0-optimise.xml
index 4239b7462dc..3e1ea76a1fd 100644
--- a/keyboards/3.0/fr-t-k0-optimise.xml
+++ b/keyboards/3.0/fr-t-k0-optimise.xml
@@ -120,6 +120,8 @@
 		<key id="dagger" output="†" />
 		<key id="asym-equal" output="≃" />
 		<key id="Ss" output="ẞ" />
+        <!-- interestingly, this key has no output by itself, but is U+00A4 when preceded by the currency mark. -->
+        <key id="altshifte" output="\m{altshifte}"/>
 	</keys>
 
 	<layers formId="iso">
@@ -155,7 +157,7 @@
 		<layer modifiers="ctrl alt shift">
 			<row
 				keys="mark-circumflex A-grave E-acute E-grave E-caret mark-doubleacute mark-doublegrave gap em-dash open-angle-quote close-angle-quote mark-ring gap" />
-			<row keys="Ae gap gap gap tm gap U-grave mark-dotbelow Oe permille nb-hyphen dbl-dagger" />
+			<row keys="Ae gap altshifte gap tm gap U-grave mark-dotbelow Oe permille nb-hyphen dbl-dagger" />
 			<row keys="Theta Ss gap gap gap mark-submacron gap gap gap gap radix vulgar-quarter" />
 			<row
 				keys="greater-equal Ezh gap C-cedilla mark-ogonek gap gap gap mark-comma gap not-equal" />
@@ -177,8 +179,13 @@
 		<set id="vowel"      value="a e i o u  A E I O U"  />
 
         <!-- currency key from/to -->
-        <set id="currfrom"    value="y"/> <!-- TODO: others -->
-        <set id="currto"      value="¥"/>
+        <!-- currency key from/to -->
+        <set id="currfrom"    value="e r t y p s d f g h k l m w c b n A R T P S D F L M  C B"/>
+        <set id="currto"      value="₠ ₽ ₸ ¥ ₱ ₪ ₫ ƒ ₲ ₴ ₭ ₺ ₥ ₩ ¢ ₿ ₦ ₳ ₹ ₮ ₧ ₷ ₯ ₣ ₤ ℳ ₡ ﺀ"/>
+
+			<!-- <row keys="a z e r t y u i o p hyphen plus" />
+			<row keys="q s d f g h j k l m slash asterisk" />
+			<row keys="open-angle w x c v b n period comma colon semi-colon" /> -->
 
         <!-- greek from/to: deviating from spec, uppercase final sigma (X) is encoded as another Σ  -->
         <set id="greekfrom"   value="a z e r u i o p s d g h j k l m x b n A Z E R U I O P S D G H J K L M X B N" />
@@ -200,6 +207,15 @@
             <transform from="\m{greek}($[greekfrom])" to="$[1:greekto]" />
             <transform from="\m{euro}($[eurofrom])" to="$[1:euroto]" />
 
+            <!-- these are harder to see because they are from AltGr and AltGr+Shift layers -->
+            <transform from="\m{currency}®" to="₨"/> <!-- AltGr-R -->
+            <transform from="\m{currency}%" to="₰"/> <!-- AltGr-P -->
+            <transform from="\m{currency}\|" to="₾"/> <!-- AltGr-L -->
+            <transform from="\m{currency}∞" to="₼"/> <!-- AltGr-M -->
+            <transform from="\m{currency}ç" to="₢"/> <!-- AltGr-C -->
+            <transform from="\m{currency}\m{altshifte}" to="¤"/> <!-- AltGr-Shift-E -->
+            <transform from="\m{currency}Ç" to="₵"/> <!-- AltGr-Shift-C -->
+
 			<!-- tilde is on a subset, not all vowels, + n -->
 			<transform from="\m{tilde}a" to="ã" />
 			<transform from="\m{tilde}A" to="Ã" />

From d6c210a97e2041d7d44cfca29be3bdb8b27a9650 Mon Sep 17 00:00:00 2001
From: "Steven R. Loomis" <srl295@gmail.com>
Date: Sat, 23 Mar 2024 17:23:29 -0500
Subject: [PATCH 07/10] CLDR-12026 kbd: fr: currency layer working

---
 keyboards/3.0/fr-t-k0-optimise.xml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/keyboards/3.0/fr-t-k0-optimise.xml b/keyboards/3.0/fr-t-k0-optimise.xml
index 3e1ea76a1fd..334760b0589 100644
--- a/keyboards/3.0/fr-t-k0-optimise.xml
+++ b/keyboards/3.0/fr-t-k0-optimise.xml
@@ -183,10 +183,6 @@
         <set id="currfrom"    value="e r t y p s d f g h k l m w c b n A R T P S D F L M  C B"/>
         <set id="currto"      value="₠ ₽ ₸ ¥ ₱ ₪ ₫ ƒ ₲ ₴ ₭ ₺ ₥ ₩ ¢ ₿ ₦ ₳ ₹ ₮ ₧ ₷ ₯ ₣ ₤ ℳ ₡ ﺀ"/>
 
-			<!-- <row keys="a z e r t y u i o p hyphen plus" />
-			<row keys="q s d f g h j k l m slash asterisk" />
-			<row keys="open-angle w x c v b n period comma colon semi-colon" /> -->
-
         <!-- greek from/to: deviating from spec, uppercase final sigma (X) is encoded as another Σ  -->
         <set id="greekfrom"   value="a z e r u i o p s d g h j k l m x b n A Z E R U I O P S D G H J K L M X B N" />
         <set id="greekto"     value="α ζ ε ρ θ ι ο π σ δ γ η ξ κ λ μ ς β ν Α Ζ Ε Ρ Θ Ι Ο Π Σ Δ Γ Η Ξ Κ Λ Μ Σ Β Ν" />
@@ -210,11 +206,11 @@
             <!-- these are harder to see because they are from AltGr and AltGr+Shift layers -->
             <transform from="\m{currency}®" to="₨"/> <!-- AltGr-R -->
             <transform from="\m{currency}%" to="₰"/> <!-- AltGr-P -->
-            <transform from="\m{currency}\|" to="₾"/> <!-- AltGr-L -->
+            <transform from="\m{currency}\|" to="₾"/> <!-- AltGr-L  - note pipe is escaped -->
             <transform from="\m{currency}∞" to="₼"/> <!-- AltGr-M -->
             <transform from="\m{currency}ç" to="₢"/> <!-- AltGr-C -->
             <transform from="\m{currency}\m{altshifte}" to="¤"/> <!-- AltGr-Shift-E -->
-            <transform from="\m{currency}Ç" to="₵"/> <!-- AltGr-Shift-C -->
+            <transform from="\m{currency}Ç" to="₵"/> <!-- AltGr-Shift-C (Cedi sign) -->
 
 			<!-- tilde is on a subset, not all vowels, + n -->
 			<transform from="\m{tilde}a" to="ã" />

From 4c69aec243aa1f277ccff1338cd06e2c28655481 Mon Sep 17 00:00:00 2001
From: "Steven R. Loomis" <srl295@gmail.com>
Date: Wed, 10 Apr 2024 18:32:27 -0500
Subject: [PATCH 08/10] =?UTF-8?q?CLDR-12026=20kbd:=20update=20Fran=C3=A7ai?=
 =?UTF-8?q?s=20normalis=C3=A9=20(AZERTY)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- thanks to review notes from @dan-jac
---
 keyboards/3.0/fr-t-k0-optimise.xml | 43 +++++++++++++++++++-----------
 1 file changed, 28 insertions(+), 15 deletions(-)

diff --git a/keyboards/3.0/fr-t-k0-optimise.xml b/keyboards/3.0/fr-t-k0-optimise.xml
index 334760b0589..37124a05ce4 100644
--- a/keyboards/3.0/fr-t-k0-optimise.xml
+++ b/keyboards/3.0/fr-t-k0-optimise.xml
@@ -5,7 +5,7 @@
   New French
 -->
 	<version number="1.0.0" />
-	<info author="Team Keyboard" name="French AZERTY optimisé" layout="AZERTY" indicator="FR" />
+	<info author="Team Keyboard" name="Français normalisé (AZERTY)" layout="AZERTY" indicator="FR" />
 
 	<displays>
 		<!-- display for diacritics -->
@@ -15,10 +15,11 @@
 		<display output="\m{umlaut}" display="¨" />
 		<display output="\m{caret}" display="^" />
 		<display output="\m{tilde}" display="~" />
+        <display output="\m{invbreve}" display="\u{20}\u{0311}" /> 
 
 		<!-- display for 'mode' keys -->
 		<display keyId="mark-currency" display="\u{00A4}" />
-		<display keyId="mark-greek" display="μ" />
+		<display keyId="mark-greek" display="\u{B5}" />
 		<display keyId="mark-euro" display="Eu" />
 	</displays>
 
@@ -32,7 +33,7 @@
 		<key id="mark-caret" output="\m{caret}" />
 		<key id="mark-caron" output="\m{caron}" />
 		<key id="mark-cedilla" output="\m{cedilla}" />
-		<key id="mark-circumflex" output="\m{circumflex}" />
+		<key id="mark-invbreve" output="\m{invbreve}" />
 		<key id="mark-comma" output="\m{comma}" />
 		<key id="mark-currency" output="\m{currency}" />
 		<key id="mark-dotabove" output="\m{dotabove}" />
@@ -51,6 +52,9 @@
 		<key id="mark-tilde" output="\m{tilde}" />
 		<key id="mark-umlaut" output="\m{umlaut}" />
 
+        <!-- spaces -->
+        <key id="nbsp" output="\u{A0}" />
+        <key id="nnbsp" output="\u{202F}" />
 
 		<!-- extra keys -->
 		<key id="e-grave" output="è" />
@@ -85,10 +89,10 @@
 		<key id="registered" output="®" />
 		<key id="minus-sign" output="−" />
 		<key id="ss" output="ß" />
-		<key id="ininity" output="∞" />
+		<key id="infinity" output="∞" />
 		<key id="division" output="÷" />
-		<key id="less-equal" output="≤" />
-		<key id="greater-equal" output="≥" />
+		<key id="less-equal" output="⩽" />
+		<key id="greater-equal" output="⩾" />
 		<key id="copy" output="©" />
 		<key id="inverse-question" output="¿" />
 		<key id="inverse-bang" output="¡" />
@@ -106,7 +110,9 @@
         <key id="open-angle-quote" output="‹" />
         <key id="close-angle-quote" output="›" />
 
-		<key id="infinity" output="∞" />
+
+
+
 		<key id="E-grave" output="È" />
 		<key id="U-grave" output="Ù" />
 		<key id="nb-hyphen" output="‑" />
@@ -120,8 +126,6 @@
 		<key id="dagger" output="†" />
 		<key id="asym-equal" output="≃" />
 		<key id="Ss" output="ẞ" />
-        <!-- interestingly, this key has no output by itself, but is U+00A4 when preceded by the currency mark. -->
-        <key id="altshifte" output="\m{altshifte}"/>
 	</keys>
 
 	<layers formId="iso">
@@ -151,17 +155,17 @@
 				keys="theta ss dollar mark-currency mark-greek mark-euro gap mark-solidus pipe infinity division multiplication" />
 			<row
 				keys="less-equal ezh copy c-cedilla mark-cedilla mark-stroke mark-tilde inverse-question inverse-bang middle-dot asym-equal" />
-			<row keys="space" />
+			<row keys="nbsp" />
 		</layer>
 
 		<layer modifiers="ctrl alt shift">
 			<row
-				keys="mark-circumflex A-grave E-acute E-grave E-caret mark-doubleacute mark-doublegrave gap em-dash open-angle-quote close-angle-quote mark-ring gap" />
-			<row keys="Ae gap altshifte gap tm gap U-grave mark-dotbelow Oe permille nb-hyphen dbl-dagger" />
+				keys="mark-invbreve A-grave E-acute E-grave E-caret mark-doubleacute mark-doublegrave gap em-dash open-angle-quote close-angle-quote mark-ring gap" />
+			<row keys="Ae gap gap gap tm gap U-grave mark-dotbelow Oe permille nb-hyphen dbl-dagger" />
 			<row keys="Theta Ss gap gap gap mark-submacron gap gap gap gap radix vulgar-quarter" />
 			<row
 				keys="greater-equal Ezh gap C-cedilla mark-ogonek gap gap gap mark-comma gap not-equal" />
-			<row keys="space" />
+			<row keys="nnbsp" />
 		</layer>
 	</layers>
 
@@ -190,16 +194,22 @@
         <!-- euro key from/to -->
         <set id="eurofrom" value="a e t i o s d g j  ‘ ’ «  » '   E T I D G J  7 8 9 0"/>
         <set id="euroto"   value="ª ə þ ı º ſ ð ŋ ij ‚ ‘ „ ‟ ’    Ə Þ İ Đ Ŋ IJ › ‹ » «"/>
+
+        <set id="digits"      value="0 1 2 3 4 5 6 7 8 9"/>
+        <set id="superdigits" value="⁰ ¹ ² ³ ⁴ ⁵ ⁶ ⁷ ⁸ ⁹"/>
+        <set id="subdigits"   value="₀ ₁ ₂ ₃ ₄ ₅ ₆ ₇ ₈ ₉"/>
 	</variables>
 
 	<transforms type="simple">
 		<transformGroup>
 			<!-- use sets for those that fit neatly into sets -->
-			<transform from="\m{caret}($[vowel])" to="$1\u{0302}" />
+			<transform from="\m{breve}($[vowel])" to="$1\u{0306}" />
 			<transform from="\m{umlaut}($[vowel])" to="$1\u{0308}" />
+			<transform from="\m{invbreve}($[vowel])" to="$1\u{0311}" />
 
             <!-- curr/greek/euro layer for hardware -->
             <transform from="\m{currency}($[currfrom])" to="$[1:currto]" />
+            <transform from="\m{greek}\m{greek}" to="\u{B5}" />
             <transform from="\m{greek}($[greekfrom])" to="$[1:greekto]" />
             <transform from="\m{euro}($[eurofrom])" to="$[1:euroto]" />
 
@@ -209,7 +219,7 @@
             <transform from="\m{currency}\|" to="₾"/> <!-- AltGr-L  - note pipe is escaped -->
             <transform from="\m{currency}∞" to="₼"/> <!-- AltGr-M -->
             <transform from="\m{currency}ç" to="₢"/> <!-- AltGr-C -->
-            <transform from="\m{currency}\m{altshifte}" to="¤"/> <!-- AltGr-Shift-E -->
+            <transform from="\m{currency}\m{currency}" to="¤"/> <!-- AltGr-Shift-E -->
             <transform from="\m{currency}Ç" to="₵"/> <!-- AltGr-Shift-C (Cedi sign) -->
 
 			<!-- tilde is on a subset, not all vowels, + n -->
@@ -219,6 +229,9 @@
 			<transform from="\m{tilde}N" to="Ñ" />
 			<transform from="\m{tilde}o" to="õ" />
 			<transform from="\m{tilde}O" to="Õ" />
+
+            <transform from="\m{breve}($[digits])" to="$[1:superdigits]" />
+            <transform from="\m{invbreve}($[digits])" to="$[1:subdigits]" />
 		</transformGroup>
         <transformGroup>
             <!-- catch-all: drop any marker that didn't otherwise match before a char -->

From c6b9488823cbebd1f4c4c6d9a98132825b4639f1 Mon Sep 17 00:00:00 2001
From: "Steven R. Loomis" <srl295@gmail.com>
Date: Wed, 10 Apr 2024 18:34:16 -0500
Subject: [PATCH 09/10] CLDR-12026 Delete
 keyboards/test/fr-t-k0-optimise-test.xml

- delete for now
---
 keyboards/test/fr-t-k0-optimise-test.xml | 16 ----------------
 1 file changed, 16 deletions(-)
 delete mode 100644 keyboards/test/fr-t-k0-optimise-test.xml

diff --git a/keyboards/test/fr-t-k0-optimise-test.xml b/keyboards/test/fr-t-k0-optimise-test.xml
deleted file mode 100644
index 593b8bd2e72..00000000000
--- a/keyboards/test/fr-t-k0-optimise-test.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE keyboardTest3 SYSTEM "../dtd/ldmlKeyboardTest3.dtd">
-<keyboardTest3 conformsTo="techpreview">
-    <info keyboard="fr-t-k0-optimise.xml" author="Team Keyboard" name="fr-test" />
-    <repertoire name="simple-repertoire" chars="[a b c d e \u{22}]" type="simple" /> <!-- verify that these outputs are all available from simple keys on any layer, for all form factors -->
-    <repertoire name="chars-repertoire" chars="[á é ó]" type="gesture" /> <!-- verify that these outputs are all available from simple or gesture keys on any layer, for touch -->
-    <tests name="key-tests">
-        <test name="key-test">
-            <startContext to="abc\u0022..."/>
-            <!-- tests by pressing key ids -->
-            <keystroke key="s"/>
-            <check result="abc\u0022...s" />
-            <!-- TODO -->
-        </test>
-    </tests>
-</keyboardTest3>

From 40396b1515d6b02606020d85890e60e8face17aa Mon Sep 17 00:00:00 2001
From: "Steven R. Loomis" <srl295@gmail.com>
Date: Thu, 11 Apr 2024 17:12:26 -0500
Subject: [PATCH 10/10] =?UTF-8?q?CLDR-12026=20kbd:=20update=20Fran=C3=A7ai?=
 =?UTF-8?q?s=20normalis=C3=A9=20(AZERTY)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- hit all cases, simplified some
- renamed to just fr.xml
---
 .../3.0/{fr-t-k0-optimise.xml => fr.xml}      | 148 ++++++++++--------
 1 file changed, 82 insertions(+), 66 deletions(-)
 rename keyboards/3.0/{fr-t-k0-optimise.xml => fr.xml} (59%)

diff --git a/keyboards/3.0/fr-t-k0-optimise.xml b/keyboards/3.0/fr.xml
similarity index 59%
rename from keyboards/3.0/fr-t-k0-optimise.xml
rename to keyboards/3.0/fr.xml
index 37124a05ce4..45871726c06 100644
--- a/keyboards/3.0/fr-t-k0-optimise.xml
+++ b/keyboards/3.0/fr.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<keyboard3 xmlns="https://schemas.unicode.org/cldr/45/keyboard3" locale="fr-t-k0-optimise"
-	conformsTo="45">
-	<!--
-  New French
--->
+<keyboard3 xmlns="https://schemas.unicode.org/cldr/45/keyboard3" conformsTo="45"
+	locale="fr">
 	<version number="1.0.0" />
+
 	<info author="Team Keyboard" name="Français normalisé (AZERTY)" layout="AZERTY" indicator="FR" />
 
 	<displays>
@@ -15,7 +13,7 @@
 		<display output="\m{umlaut}" display="¨" />
 		<display output="\m{caret}" display="^" />
 		<display output="\m{tilde}" display="~" />
-        <display output="\m{invbreve}" display="\u{20}\u{0311}" /> 
+		<display output="\m{invbreve}" display="\u{20}\u{0311}" />
 
 		<!-- display for 'mode' keys -->
 		<display keyId="mark-currency" display="\u{00A4}" />
@@ -52,9 +50,9 @@
 		<key id="mark-tilde" output="\m{tilde}" />
 		<key id="mark-umlaut" output="\m{umlaut}" />
 
-        <!-- spaces -->
-        <key id="nbsp" output="\u{A0}" />
-        <key id="nnbsp" output="\u{202F}" />
+		<!-- spaces -->
+		<key id="nbsp" output="\u{A0}" />
+		<key id="nnbsp" output="\u{202F}" />
 
 		<!-- extra keys -->
 		<key id="e-grave" output="è" />
@@ -107,11 +105,8 @@
 		<key id="radix" output="√" />
 		<key id="C-cedilla" output="Ç" />
 		<key id="not-equal" output="≠" />
-        <key id="open-angle-quote" output="‹" />
-        <key id="close-angle-quote" output="›" />
-
-
-
+		<key id="open-angle-quote" output="‹" />
+		<key id="close-angle-quote" output="›" />
 
 		<key id="E-grave" output="È" />
 		<key id="U-grave" output="Ù" />
@@ -145,7 +140,7 @@
 			<row keys="close-angle W X C V B N question bang ellipsis equal" />
 			<row keys="space" />
 		</layer>
-        <!-- layer is for AltGr - for now we use ctrl alt -->
+		<!-- layer is for AltGr - for now we use ctrl alt -->
 		<layer modifiers="ctrl alt">
 			<row
 				keys="mark-breve section mark-acute mark-grave amp open-square close-square mark-macron underscore open-double close-double degree mark-caron" />
@@ -179,65 +174,86 @@
 		<!-- sets representing vowels and accented vowels.  -->
 		<!-- There's an extra space between the lower and upper case for visual separation -->
 		<!-- but, there are only 10 vowels in the following four sets -->
-        <!-- plus space at end for the visible version -->
-		<set id="vowel"      value="a e i o u  A E I O U"  />
+		<!-- plus space at end for the visible version -->
+		<set id="vowel" value="a e i o u  A E I O U" />
+
+		<!-- everything that should take an accented combining char -->
+		<set id="upaccentable" value="A B C D E F G H I J K L M N O P Q R S T U V W X Y Z    Ʒ Æ Œ" />
+		<set id="lwaccentable" value="a b c d e f g h i j k l m n o p q r s t u v w x y z    ʒ æ œ" />
+		<set id="accentable" value="$[upaccentable] $[lwaccentable]" />
 
-        <!-- currency key from/to -->
-        <!-- currency key from/to -->
-        <set id="currfrom"    value="e r t y p s d f g h k l m w c b n A R T P S D F L M  C B"/>
-        <set id="currto"      value="₠ ₽ ₸ ¥ ₱ ₪ ₫ ƒ ₲ ₴ ₭ ₺ ₥ ₩ ¢ ₿ ₦ ₳ ₹ ₮ ₧ ₷ ₯ ₣ ₤ ℳ ₡ ﺀ"/>
+		<!-- currency key from/to -->
+		<set id="currfrom" value="e r t y p s d f g h k l m w c b n A R T P S D F L M  C B" />
+		<set id="currto" value="₠ ₽ ₸ ¥ ₱ ₪ ₫ ƒ ₲ ₴ ₭ ₺ ₥ ₩ ¢ ₿ ₦ ₳ ₹ ₮ ₧ ₷ ₯ ₣ ₤ ℳ ₡ ﺀ" />
 
-        <!-- greek from/to: deviating from spec, uppercase final sigma (X) is encoded as another Σ  -->
-        <set id="greekfrom"   value="a z e r u i o p s d g h j k l m x b n A Z E R U I O P S D G H J K L M X B N" />
-        <set id="greekto"     value="α ζ ε ρ θ ι ο π σ δ γ η ξ κ λ μ ς β ν Α Ζ Ε Ρ Θ Ι Ο Π Σ Δ Γ Η Ξ Κ Λ Μ Σ Β Ν" />
+		<!-- greek from/to: deviating from spec, uppercase final sigma (X) is encoded as another Σ  -->
+		<set id="greekfrom"
+			value="a z e r u i o p s d g h j k l m x b n A Z E R U I O P S D G H J K L M X B N" />
+		<set id="greekto"
+			value="α ζ ε ρ θ ι ο π σ δ γ η ξ κ λ μ ς β ν Α Ζ Ε Ρ Θ Ι Ο Π Σ Δ Γ Η Ξ Κ Λ Μ Σ Β Ν" />
 
-        <!-- euro key from/to -->
-        <set id="eurofrom" value="a e t i o s d g j  ‘ ’ «  » '   E T I D G J  7 8 9 0"/>
-        <set id="euroto"   value="ª ə þ ı º ſ ð ŋ ij ‚ ‘ „ ‟ ’    Ə Þ İ Đ Ŋ IJ › ‹ » «"/>
+		<!-- euro key from/to -->
+		<set id="eurofrom" value="a e t i o s d g j  ‘ ’ «  » '   E T I D G J  7 8 9 0" />
+		<set id="euroto" value="ª ə þ ı º ſ ð ŋ ij ‚ ‘ „ ‟ ’    Ə Þ İ Đ Ŋ IJ › ‹ » «" />
 
-        <set id="digits"      value="0 1 2 3 4 5 6 7 8 9"/>
-        <set id="superdigits" value="⁰ ¹ ² ³ ⁴ ⁵ ⁶ ⁷ ⁸ ⁹"/>
-        <set id="subdigits"   value="₀ ₁ ₂ ₃ ₄ ₅ ₆ ₇ ₈ ₉"/>
+		<!-- numbers -->
+		<set id="digits" value="0 1 2 3 4 5 6 7 8 9" />
+		<set id="superdigits" value="⁰ ¹ ² ³ ⁴ ⁵ ⁶ ⁷ ⁸ ⁹" />
+		<set id="subdigits" value="₀ ₁ ₂ ₃ ₄ ₅ ₆ ₇ ₈ ₉" />
 	</variables>
 
 	<transforms type="simple">
 		<transformGroup>
-			<!-- use sets for those that fit neatly into sets -->
-			<transform from="\m{breve}($[vowel])" to="$1\u{0306}" />
-			<transform from="\m{umlaut}($[vowel])" to="$1\u{0308}" />
-			<transform from="\m{invbreve}($[vowel])" to="$1\u{0311}" />
-
-            <!-- curr/greek/euro layer for hardware -->
-            <transform from="\m{currency}($[currfrom])" to="$[1:currto]" />
-            <transform from="\m{greek}\m{greek}" to="\u{B5}" />
-            <transform from="\m{greek}($[greekfrom])" to="$[1:greekto]" />
-            <transform from="\m{euro}($[eurofrom])" to="$[1:euroto]" />
-
-            <!-- these are harder to see because they are from AltGr and AltGr+Shift layers -->
-            <transform from="\m{currency}®" to="₨"/> <!-- AltGr-R -->
-            <transform from="\m{currency}%" to="₰"/> <!-- AltGr-P -->
-            <transform from="\m{currency}\|" to="₾"/> <!-- AltGr-L  - note pipe is escaped -->
-            <transform from="\m{currency}∞" to="₼"/> <!-- AltGr-M -->
-            <transform from="\m{currency}ç" to="₢"/> <!-- AltGr-C -->
-            <transform from="\m{currency}\m{currency}" to="¤"/> <!-- AltGr-Shift-E -->
-            <transform from="\m{currency}Ç" to="₵"/> <!-- AltGr-Shift-C (Cedi sign) -->
-
-			<!-- tilde is on a subset, not all vowels, + n -->
-			<transform from="\m{tilde}a" to="ã" />
-			<transform from="\m{tilde}A" to="Ã" />
-			<transform from="\m{tilde}n" to="ñ" />
-			<transform from="\m{tilde}N" to="Ñ" />
-			<transform from="\m{tilde}o" to="õ" />
-			<transform from="\m{tilde}O" to="Õ" />
-
-            <transform from="\m{breve}($[digits])" to="$[1:superdigits]" />
-            <transform from="\m{invbreve}($[digits])" to="$[1:subdigits]" />
+			<!-- super/sub digits -->
+			<transform from="\m{breve}($[digits])" to="$[1:superdigits]" />
+			<transform from="\m{invbreve}($[digits])" to="$[1:subdigits]" />
+
+			<!-- special cases - any more of these? -->
+			<transform from="\m{dotabove}i" to="ı" />
+
+			<!-- match accentables with combining marks -->
+			<transform from="\m{breve}($[accentable])" to="$1\u{0306}" />
+			<transform from="\m{umlaut}($[accentable])" to="$1\u{0308}" />
+			<transform from="\m{invbreve}($[accentable])" to="$1\u{0311}" />
+			<transform from="\m{acute}($[accentable])" to="$1\u{0301}" />
+			<transform from="\m{caret}($[accentable])" to="$1\u{0302}" />
+			<transform from="\m{caron}($[accentable])" to="$1\u{030c}" />
+			<transform from="\m{cedilla}($[accentable])" to="$1\u{0327}" />
+			<transform from="\m{comma}($[accentable])" to="$1\u{0326}" />
+			<transform from="\m{dotabove}($[accentable])" to="$1\u{0307}" />
+			<transform from="\m{dotbelow}($[accentable])" to="$1\u{0323}" />
+			<transform from="\m{doubleacute}($[accentable])" to="$1\u{030b}" />
+			<transform from="\m{doublegrave}($[accentable])" to="$1\u{030f}" />
+			<transform from="\m{grave}($[accentable])" to="$1\u{0300}" />
+			<transform from="\m{macron}($[accentable])" to="$1\u{0304}" />
+			<transform from="\m{ogonek}($[accentable])" to="$1\u{0328}" />
+			<transform from="\m{ring}($[accentable])" to="$1\u{030a}" />
+			<transform from="\m{solidus}($[accentable])" to="$1\u{338}" />
+			<transform from="\m{stroke}($[accentable])" to="$1\u{0335}" />
+			<transform from="\m{submacron}($[accentable])" to="$1\u{0331}" />
+			<transform from="\m{tilde}($[accentable])" to="$1\u{0303}" />
+
+			<!-- curr/greek/euro layer for hardware -->
+			<transform from="\m{currency}($[currfrom])" to="$[1:currto]" />
+			<transform from="\m{greek}\m{greek}" to="\u{B5}" />
+			<transform from="\m{greek}($[greekfrom])" to="$[1:greekto]" />
+			<transform from="\m{euro}($[eurofrom])" to="$[1:euroto]" />
+
+			<!-- these are harder to see because they are from AltGr and AltGr+Shift layers -->
+			<transform from="\m{currency}®" to="₨" /> <!-- AltGr-R -->
+			<transform from="\m{currency}%" to="₰" /> <!-- AltGr-P -->
+			<transform from="\m{currency}\|" to="₾" /> <!-- AltGr-L  - note pipe is escaped -->
+			<transform from="\m{currency}∞" to="₼" /> <!-- AltGr-M -->
+			<transform from="\m{currency}ç" to="₢" /> <!-- AltGr-C -->
+			<transform from="\m{currency}\m{currency}" to="¤" /> <!-- AltGr-Shift-E -->
+			<transform from="\m{currency}Ç" to="₵" /> <!-- AltGr-Shift-C (Cedi sign) -->
+		</transformGroup>
+		<!-- now, cleanup -->
+		<transformGroup>
+			<!-- catch-all: drop any marker that didn't otherwise match before a char -->
+			<transform from="\m{.}(.)" to="$1" />
+			<!-- not defined, so drop double euro -->
+			<transform from="\m{euro}\m{euro}" />
 		</transformGroup>
-        <transformGroup>
-            <!-- catch-all: drop any marker that didn't otherwise match before a char -->
-            <transform from="\m{.}(.)" to="$1" />
-            <!-- also drop any doubled marker -->
-          <!-- (not currently working) <transform from="\m{.}(\m{.})" to="$1" /> -->
-        </transformGroup>
 	</transforms>
 </keyboard3>