summaryrefslogtreecommitdiff
authorDaniel Drake <dsd@laptop.org>2012-05-17 20:21:00 (GMT)
committer Sergey V. Udaltsov <svu@gnome.org>2012-05-17 22:49:34 (GMT)
commit5001e0b41a9ee22633b0a56571b2dc61bc55df4d (patch) (side-by-side diff)
treef3e2ec5397e96c0943f8be7592aaea2a9b0779ae
parent7ba98d0e4b4505ba2f0b91bdc6cafa247f50aa06 (diff)
downloadxkeyboard-config-5001e0b41a9ee22633b0a56571b2dc61bc55df4d.zip
xkeyboard-config-5001e0b41a9ee22633b0a56571b2dc61bc55df4d.tar.gz
Update FR OLPC layout
Some keys have only two characters printed: the unmodified character, and a character in the Shift+AltGr position (upper right). For such keys, users were confused why the "other" character could not be accessed with AltGr alone. Make such keys behave shift-invariant to remove this confusion. Also add some obvious omissions from the previous submission fixing various other keys that weren't working as printed. The corresponding keyboard can be seen here: http://wiki.laptop.org/go/OLPC_Azerty_Keyboard Investigation and original patch from Walter Bender. https://bugs.freedesktop.org/show_bug.cgi?id=50064
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--symbols/fr18
1 files changed, 11 insertions, 7 deletions
diff --git a/symbols/fr b/symbols/fr
index 85bcd55..45ef6a4 100644
--- a/symbols/fr
+++ b/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