From d06aadb8f2777fd00b22b8cdc1cd0d7166402f0d Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex.auvolat@inria.fr>
Date: Thu, 11 Jun 2020 16:30:40 +0200
Subject: more remappings

---
 solanum/xkb/symbols/custom-fr | 101 +++++++++++++++++++++++++++++-------------
 1 file changed, 69 insertions(+), 32 deletions(-)

(limited to 'solanum/xkb/symbols/custom-fr')

diff --git a/solanum/xkb/symbols/custom-fr b/solanum/xkb/symbols/custom-fr
index 991d9cc..542e0fa 100644
--- a/solanum/xkb/symbols/custom-fr
+++ b/solanum/xkb/symbols/custom-fr
@@ -1173,20 +1173,29 @@ xkb_symbols "(unnamed)" {
     name[group1]="French (alt.)";
 
     key  <ESC> {         [          Escape ] };
-    key <AE01> {
+
+    #key <TLDE> {
+    #    type= "FOUR_LEVEL",
+    #    symbols[Group1]= [     twosuperior,   threesuperior,     onesuperior,    dead_cedilla ]
+    #};
+    key <TLDE> {
         type= "FOUR_LEVEL",
-        symbols[Group1]= [       ampersand,               1,      dead_caron,     dead_ogonek ]
+        symbols[Group1]= [     bar,   ampersand,     twosuperior,    threesuperior ]
     };
-
-    #key <AE02> {
+	
+    #key <AE01> {
     #    type= "FOUR_LEVEL",
-    #    symbols[Group1]= [          eacute,               2,      asciitilde,          Eacute ]
+    #    symbols[Group1]= [       ampersand,               1,      dead_caron,     dead_ogonek ]
     #};
-    key <AE02> {
+    key <AE01> {
         type= "FOUR_LEVEL",
-        symbols[Group1]= [          braceleft,               2,      asciitilde,          Eacute ]
+        symbols[Group1]= [       braceleft,               1,      dead_caron,     dead_ogonek ]
     };
 
+    key <AE02> {
+        type= "FOUR_LEVEL",
+        symbols[Group1]= [          eacute,               2,      asciitilde,          Eacute ]
+    };
     key <AE03> {
         type= "FOUR_LEVEL",
         symbols[Group1]= [        quotedbl,               3,      numbersign,      dead_breve ]
@@ -1198,7 +1207,7 @@ xkb_symbols "(unnamed)" {
     #};
     key <AE04> {
         type= "FOUR_LEVEL",
-        symbols[Group1]= [      apostrophe,               4,       eacute,           U2014 ]
+        symbols[Group1]= [      apostrophe,               4,       dead_acute,           U2014 ]
     };
 
     key <AE05> {
@@ -1210,34 +1219,32 @@ xkb_symbols "(unnamed)" {
     #    type= "FOUR_LEVEL",
     #    symbols[Group1]= [           minus,               6,             bar,           U2011 ]
     #};
+    key <AE06> {
+        type= "FOUR_LEVEL",
+        symbols[Group1]= [           minus,               6,             section,           U2011 ]
+    };
+
     #key <AE07> {
     #    type= "FOUR_LEVEL",
     #    symbols[Group1]= [          egrave,               7,           grave,          Egrave ]
     #};
-    key <AE06> {
-        type= "FOUR_LEVEL",
-        symbols[Group1]= [           minus,               6,             egrave,           U2011 ]
-    };
     key <AE07> {
         type= "FOUR_LEVEL",
-        symbols[Group1]= [          bar,               7,           grave,          Egrave ]
+        symbols[Group1]= [          dead_grave,               7,           grave,          Egrave ]
     };
 
     #key <AE08> {
     #    type= "FOUR_LEVEL",
     #    symbols[Group1]= [      underscore,               8,       backslash,       trademark ]
     #};
-    #key <AE09> {
-    #    type= "FOUR_LEVEL",
-    #    symbols[Group1]= [        ccedilla,               9,     asciicircum,        Ccedilla ]
-    #};
     key <AE08> {
         type= "FOUR_LEVEL",
-        symbols[Group1]= [      underscore,               8,       ccedilla,       Ccedilla ]
+        symbols[Group1]= [      underscore,               8,       onesuperior,       U2014 ]
     };
+
     key <AE09> {
         type= "FOUR_LEVEL",
-        symbols[Group1]= [        braceright,               9,     asciicircum,        trademark ]
+        symbols[Group1]= [        ccedilla,               9,     asciicircum,        Ccedilla ]
     };
 
     #key <AE10> {
@@ -1246,13 +1253,16 @@ xkb_symbols "(unnamed)" {
     #};
     key <AE10> {
         type= "FOUR_LEVEL",
-        symbols[Group1]= [          backslash,               0,              agrave,          Agrave ]
+        symbols[Group1]= [          braceright,               0,              at,          Agrave ]
     };
 	
-
+    #key <AE11> {
+    #    type= "FOUR_LEVEL",
+    #    symbols[Group1]= [      parenright,          degree,    bracketright,        notequal ]
+    #};
     key <AE11> {
         type= "FOUR_LEVEL",
-        symbols[Group1]= [      parenright,          degree,    bracketright,        notequal ]
+        symbols[Group1]= [      parenright,          bracketleft,    bracketright,        degree ]
     };
 
     #key <AE12> {
@@ -1261,9 +1271,10 @@ xkb_symbols "(unnamed)" {
     #};
     key <AE12> {
         type= "FOUR_LEVEL",
-        symbols[Group1]= [           equal,            plus,      at,       plusminus ]
+        symbols[Group1]= [           equal,            bracketright,      notequal,       plusminus ]
     };
 
+
     key <BKSP> {         [       BackSpace,       BackSpace ] };
     key  <TAB> {         [             Tab,    ISO_Left_Tab ] };
     key <AD01> {
@@ -1310,10 +1321,16 @@ xkb_symbols "(unnamed)" {
         type= "FOUR_LEVEL",
         symbols[Group1]= [ dead_circumflex,  dead_diaeresis,      dead_tilde,  dead_abovering ]
     };
+
+    #key <AD12> {
+    #    type= "FOUR_LEVEL",
+    #    symbols[Group1]= [          dollar,        sterling,          oslash,          Oslash ]
+    #};
     key <AD12> {
         type= "FOUR_LEVEL",
-        symbols[Group1]= [          dollar,        sterling,          oslash,          Oslash ]
+        symbols[Group1]= [          dollar,        asciicircum,          oslash,          Oslash ]
     };
+
     key <RTRN> {         [          Return ] };
     key <LCTL> {         [       Control_L ] };
     key <AC01> {
@@ -1356,19 +1373,27 @@ xkb_symbols "(unnamed)" {
         type= "FOUR_LEVEL_ALPHABETIC",
         symbols[Group1]= [               m,               M,      odiaeresis,      Odiaeresis ]
     };
+
+    #key <AC11> {
+    #    type= "FOUR_LEVEL",
+    #    symbols[Group1]= [          ugrave,         percent,      dead_acute,          Ugrave ]
+    #};
     key <AC11> {
         type= "FOUR_LEVEL",
-        symbols[Group1]= [          ugrave,         percent,      dead_acute,          Ugrave ]
-    };
-    key <TLDE> {
-        type= "FOUR_LEVEL",
-        symbols[Group1]= [     twosuperior,   threesuperior,     onesuperior,    dead_cedilla ]
+        symbols[Group1]= [          backslash,         percent,      dead_acute,          Ugrave ]
     };
+
     key <LFSH> {         [         Shift_L ] };
+
+    #key <BKSL> {
+    #    type= "FOUR_LEVEL",
+    #    symbols[Group1]= [        asterisk,              mu,      dead_grave,     dead_macron ]
+    #};
     key <BKSL> {
         type= "FOUR_LEVEL",
-        symbols[Group1]= [        asterisk,              mu,      dead_grave,     dead_macron ]
+        symbols[Group1]= [        asterisk,              at,      dead_grave,     dead_macron ]
     };
+
     key <AB01> {
         type= "FOUR_LEVEL_SEMIALPHABETIC",
         symbols[Group1]= [               w,               W,   guillemotleft, leftdoublequotemark ]
@@ -1393,10 +1418,16 @@ xkb_symbols "(unnamed)" {
         type= "FOUR_LEVEL_SEMIALPHABETIC",
         symbols[Group1]= [               n,               N,         notsign,      rightarrow ]
     };
+
+    #key <AB07> {
+    #    type= "FOUR_LEVEL",
+    #    symbols[Group1]= [           comma,        question,    questiondown,           U2026 ]
+    #};
     key <AB07> {
         type= "FOUR_LEVEL",
-        symbols[Group1]= [           comma,        question,    questiondown,           U2026 ]
+        symbols[Group1]= [           comma,        question,    dead_cedilla, questiondown ]
     };
+
     key <AB08> {
         type= "FOUR_LEVEL",
         symbols[Group1]= [       semicolon,          period,        multiply,           U22C5 ]
@@ -1405,10 +1436,16 @@ xkb_symbols "(unnamed)" {
         type= "FOUR_LEVEL",
         symbols[Group1]= [           colon,           slash,        division,           U2215 ]
     };
+
+    #key <AB10> {
+    #    type= "FOUR_LEVEL",
+    #    symbols[Group1]= [          exclam,         section,      exclamdown,           U2212 ]
+    #};
     key <AB10> {
         type= "FOUR_LEVEL",
-        symbols[Group1]= [          exclam,         section,      exclamdown,           U2212 ]
+        symbols[Group1]= [          exclam,         plus,      exclamdown,           U2212 ]
     };
+
     key <RTSH> {         [         Shift_R ] };
     key <KPMU> {
         type= "CTRL+ALT",
-- 
cgit v1.2.3