From f543ceaca6820260f15a4eff86938214cf43c7d2 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Mon, 21 May 2012 09:10:35 +0200
Subject: fontconfig mesa xkeyboard-config xserver pixman git update 21 Mar
 2012

---
 xorg-server/xkeyboard-config/symbols/fr | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

(limited to 'xorg-server/xkeyboard-config/symbols/fr')

diff --git a/xorg-server/xkeyboard-config/symbols/fr b/xorg-server/xkeyboard-config/symbols/fr
index 85bcd5564..45ef6a475 100644
--- a/xorg-server/xkeyboard-config/symbols/fr
+++ b/xorg-server/xkeyboard-config/symbols/fr
@@ -48,13 +48,17 @@ xkb_symbols "olpc" {
 
     name[Group1]="French";
 
-    key <AD02>	{ [ z,  Z,  VoidSymbol, guillemotleft ]	};
-
-    key <AC02>	{ [ s,  S,  VoidSymbol, ssharp ] };
-
-    key <AB02>	{ [  x,  X,  VoidSymbol,     guillemotright ] };
-
-    key <I219>  { [ less, greater ] };
+    key <I219>	{ [ less, greater ]	};
+    key <AD11>	{ [ dead_circumflex, dead_diaeresis, notsign, dead_abovering ]	};
+    key <AB08>	{ [ semicolon, period, underscore, multiply ]	};
+    key <TLDE>	{ [ twosuperior, asciitilde, VoidSymbol, VoidSymbol ]	};
+
+    // Some keys only have the Shift+AltGr character printed on them (alongside
+    // the unmodified one). Make such keys shift-invariant so that the printed
+    // value is achieved by pressing AltGr or Shift+AltGr.
+    key <AB02>	{ [ x,  X,  guillemotright, guillemotright ]	};
+    key <AC02>	{ [ s,  S,  ssharp, ssharp ]	};
+    key <AD02>	{ [ z,  Z,  guillemotleft, guillemotleft ]	};
 };
 
 partial alphanumeric_keys
-- 
cgit v1.2.3