From 59056a6030da24413673c43f46bac0dc3699744a Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Wed, 25 Jan 2023 00:18:44 +0100
Subject: fix xkb layout

---
 xkb/symbols/custom-fr | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

(limited to 'xkb')

diff --git a/xkb/symbols/custom-fr b/xkb/symbols/custom-fr
index bb03fbf..795c7ff 100644
--- a/xkb/symbols/custom-fr
+++ b/xkb/symbols/custom-fr
@@ -1,5 +1,5 @@
 xkb_keymap {
-xkb_keycodes "(unnamed)" {
+xkb_keycodes "LX Variant" {
     minimum = 8;
     maximum = 255;
      <ESC> = 9;
@@ -297,7 +297,7 @@ xkb_keycodes "(unnamed)" {
     alias <LatN> = <AB06>;
 };
 
-xkb_types "(unnamed)" {
+xkb_types "LX Variant" {
 
     virtual_modifiers NumLock,Alt,LevelThree,LAlt,RAlt,RControl,LControl,ScrollLock,LevelFive,AltGr,Meta,Super,Hyper;
 
@@ -684,7 +684,7 @@ xkb_types "(unnamed)" {
     };
 };
 
-xkb_compatibility "(unnamed)" {
+xkb_compatibility "LX Variant" {
 
     virtual_modifiers NumLock,Alt,LevelThree,LAlt,RAlt,RControl,LControl,ScrollLock,LevelFive,AltGr,Meta,Super,Hyper;
 
@@ -1168,7 +1168,7 @@ xkb_compatibility "(unnamed)" {
     };
 };
 
-xkb_symbols "(unnamed)" {
+xkb_symbols "LX Variant" {
 
     name[group1]="French (alt.)";
 
@@ -1316,14 +1316,9 @@ xkb_symbols "(unnamed)" {
         type= "FOUR_LEVEL_ALPHABETIC",
         symbols[Group1]= [               p,               P,     ocircumflex,     Ocircumflex ]
     };
-
-    #key <AD11> {
-    #    type= "FOUR_LEVEL",
-    #    symbols[Group1]= [ dead_circumflex,  dead_diaeresis,      dead_tilde,  dead_abovering ]
-    #};
     key <AD11> {
         type= "FOUR_LEVEL",
-        symbols[Group1]= [ dead_circumflex,  less,      dead_diaeresis,  dead_tilde	 ]
+        symbols[Group1]= [ dead_circumflex,  dead_diaeresis,      dead_tilde,  dead_abovering ]
     };
 
     #key <AD12> {
@@ -1332,7 +1327,7 @@ xkb_symbols "(unnamed)" {
     #};
     key <AD12> {
         type= "FOUR_LEVEL",
-        symbols[Group1]= [          dollar,        greater,          oslash,          Oslash ]
+        symbols[Group1]= [          dollar,        at,          oslash,          Oslash ]
     };
 
     key <RTRN> {         [          Return ] };
@@ -1733,7 +1728,6 @@ xkb_symbols "(unnamed)" {
     modifier_map Control { <LCTL> };
     modifier_map Shift { <LFSH> };
     modifier_map Shift { <RTSH> };
-
     modifier_map Mod1 { <LALT> };
     #modifier_map Mod1 { <LWIN> };
 
@@ -1743,10 +1737,8 @@ xkb_symbols "(unnamed)" {
     modifier_map Mod2 { <NMLK> };
     modifier_map Mod5 { <LVL3> };
     modifier_map Control { <RCTL> };
-
     modifier_map Mod4 { <LWIN> };
     #modifier_map Mod4 { <LALT> };
-
     modifier_map Mod4 { <RWIN> };
     modifier_map Mod5 { <MDSW> };
     modifier_map Mod1 { <META> };
-- 
cgit v1.2.3