From ebda7b2c3e47d1b9b173a63df244283aa42e8044 Mon Sep 17 00:00:00 2001
From: Jules Aguillon
Date: Sat, 2 Mar 2024 17:38:50 +0100
Subject: Improve the AZERTY layout

Add éèàç directly to the layout, which removes the corresponding dead
keys.

Remove the requirement for ù and ÿ from method.xml, which are extremely
rare and can be typed via the compose key.
---
 res/xml/method.xml              |  2 +-
 srcs/layouts/latn_azerty_fr.xml | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/res/xml/method.xml b/res/xml/method.xml
index d8e77ad..4bd2b39 100644
--- a/res/xml/method.xml
+++ b/res/xml/method.xml
@@ -16,7 +16,7 @@
   <subtype android:label="%s" android:languageTag="fa" android:imeSubtypeLocale="fa_IR" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=arab_pc_ir"/>
   <subtype android:label="%s" android:languageTag="fr-CA" android:imeSubtypeLocale="fr_CA" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_azerty_fr,extra_keys=accent_grave:à:è:ù|accent_aigu:é|accent_circonflexe:â:ê:ô|accent_cedille:ç|accent_trema:ë:ï:ü:ÿ"/>
   <subtype android:label="%s" android:languageTag="fr-CH" android:imeSubtypeLocale="fr_CH" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwertz_fr_ch,extra_keys=accent_grave:à:è:ù|accent_aigu:é|accent_circonflexe:â:ê:ô|accent_cedille:ç|accent_trema:ë:ï:ü:ÿ|€"/>
-  <subtype android:label="%s" android:languageTag="fr-FR" android:imeSubtypeLocale="fr_FR" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_azerty_fr,extra_keys=accent_grave:à:è:ù@a|accent_aigu:é@e|accent_circonflexe:â:ê:ô@e|accent_cedille:ç@c|accent_trema:ë:ï:ü:ÿ@l|€"/>
+  <subtype android:label="%s" android:languageTag="fr-FR" android:imeSubtypeLocale="fr_FR" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_azerty_fr,extra_keys=accent_grave:à:è@a|accent_aigu:é@e|accent_circonflexe:â:ê:ô@e|accent_cedille:ç@c|accent_trema:ë:ï:ü@l|€"/>
   <subtype android:label="%s" android:languageTag="he" android:imeSubtypeLocale="he_IL" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=hebrew,default_layout=hebr_1_il,extra_keys=₪|€"/>
   <subtype android:label="%s" android:languageTag="hi" android:imeSubtypeLocale="hi_IN" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=devanagari,default_layout=deva_inscript,extra_keys=₹"/>
   <subtype android:label="%s" android:languageTag="hu" android:imeSubtypeLocale="hu_HU" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwertz_hu,extra_keys=accent_aigu:á:é:í:ó:ú|accent_trema:ö:ü|accent_ogonek|accent_double_aigu:ő:ű|€"/>
diff --git a/srcs/layouts/latn_azerty_fr.xml b/srcs/layouts/latn_azerty_fr.xml
index cf8b185..cecafa5 100644
--- a/srcs/layouts/latn_azerty_fr.xml
+++ b/srcs/layouts/latn_azerty_fr.xml
@@ -9,7 +9,7 @@
     <key key0="r" key2="4" key3="'"/>
     <key key0="t" key2="5" key3="(" key4=")"/>
     <key key0="y" key2="6" key3="-" key4="|"/>
-    <key key0="u" key2="7" key4="`"/>
+    <key key0="u" key2="7" key3="à" key4="`"/>
     <key key0="i" key2="8" key3="_" key4="\\"/>
     <key key0="o" key2="9" key3="\@" key4="f11_placeholder"/>
     <key key0="p" key2="0" key3="f12_placeholder"/>
@@ -17,12 +17,12 @@
   <row>
     <key key0="q" key2="tab"/>
     <key key0="s" key3="loc ß"/>
-    <key key0="d" key1="accent_grave" key3="accent_aigu"/>
+    <key key0="d" key1="loc accent_grave" key2="é" key3="loc accent_aigu"/>
     <key key0="f" key3="{" key4="}"/>
     <key key0="g" key3="[" key4="]"/>
     <key key0="h" key3="=" key4="+"/>
-    <key key0="j" key1="accent_trema" key2="accent_circonflexe" key3="^"/>
-    <key key0="k" key2="€" key3="$"/>
+    <key key0="j" key1="loc accent_trema" key2="loc accent_circonflexe" key3="^"/>
+    <key key0="k" key1="è" key2="€" key3="$"/>
     <key key0="l" key2="%"/>
     <key key0="m" key3="*"/>
   </row>
@@ -30,7 +30,7 @@
     <key width="2.0" key0="shift" key2="loc capslock"/>
     <key key0="w" key3="&lt;" key4="&gt;"/>
     <key key0="x" key1="loc †"/>
-    <key key0="c" key1="accent_cedille" key3="," key4="\?"/>
+    <key key0="c" key1="loc accent_cedille" key2="ç" key3="," key4="\?"/>
     <key key0="v" key3=";" key4="."/>
     <key key0="b" key3=":" key4="/"/>
     <key key0="n" key1="loc accent_tilde" key2="§" key4="!"/>
-- 
cgit v1.2.3