$Id: 099z_xkb_level3_ralt_switch.diff 1944 2004-10-12 12:19:48Z barbier $

This patch by Denis Barbier.

Replace level3(ralt_switch_multikey) by level3(ralt_switch) in all
layouts so that symbols on the 4th column may be accessed with
Shift+Alt_R or Alt_R+Shift.  (Closes: #270235)

diff -ruN xc-old/programs/xkbcomp/symbols/pc/al xc/programs/xkbcomp/symbols/pc/al
--- xc-old/programs/xkbcomp/symbols/pc/al	2004-04-23 19:54:55.000000000 +0000
+++ xc/programs/xkbcomp/symbols/pc/al	2004-10-26 14:20:12.699011936 +0000
@@ -39,5 +39,5 @@
     key <AB09>	{ [    period,      colon,      greater,     division ]	};
     key <AB10>	{ [     slash,   question, dead_belowdot, dead_abovedot ] };
 
-    include "level3(ralt_switch_multikey)"
+    include "level3(ralt_switch)"
 };
diff -ruN xc-old/programs/xkbcomp/symbols/pc/be xc/programs/xkbcomp/symbols/pc/be
--- xc-old/programs/xkbcomp/symbols/pc/be	2004-04-23 19:54:55.000000000 +0000
+++ xc/programs/xkbcomp/symbols/pc/be	2004-10-26 14:20:12.699011936 +0000
@@ -42,7 +42,7 @@
     key <AB10>	{ [     equal,       plus,   dead_tilde, dead_abovedot]	};
     key <LSGT>  { [      less,    greater,    backslash,    backslash ]	};
 
-    include "level3(ralt_switch_multikey)"
+    include "level3(ralt_switch)"
 };
 
 partial alphanumeric_keys
diff -ruN xc-old/programs/xkbcomp/symbols/pc/br xc/programs/xkbcomp/symbols/pc/br
--- xc-old/programs/xkbcomp/symbols/pc/br	2004-04-23 19:54:55.000000000 +0000
+++ xc/programs/xkbcomp/symbols/pc/br	2004-10-26 14:20:12.700011784 +0000
@@ -44,7 +44,7 @@
     key <KPPT>	{ [KP_Decimal ]	};
     key <KPDL>	{ [ KP_Delete,      comma ]	};
 
-    include "level3(ralt_switch_multikey)"
+    include "level3(ralt_switch)"
 };
 
 partial alphanumeric_keys
diff -ruN xc-old/programs/xkbcomp/symbols/pc/cz xc/programs/xkbcomp/symbols/pc/cz
--- xc-old/programs/xkbcomp/symbols/pc/cz	2003-11-25 19:29:14.000000000 +0000
+++ xc/programs/xkbcomp/symbols/pc/cz	2004-10-26 14:20:12.700011784 +0000
@@ -72,7 +72,7 @@
     key <KPDL>	{ type[Group1]="FOUR_LEVEL_KEYPAD",
                   [ KP_Delete,      comma,    KP_Delete,   KP_Decimal ]	};
 
-    include "level3(ralt_switch_multikey)"
+    include "level3(ralt_switch)"
 };
 
 // Use <BKSL> instead of <LSGT> (useful for keyboard without <LSGT> key)
diff -ruN xc-old/programs/xkbcomp/symbols/pc/de xc/programs/xkbcomp/symbols/pc/de
--- xc-old/programs/xkbcomp/symbols/pc/de	2004-10-26 14:19:42.428613000 +0000
+++ xc/programs/xkbcomp/symbols/pc/de	2004-10-26 14:20:12.700011784 +0000
@@ -29,7 +29,7 @@
 
     key <KPDL>	{ [ KP_Delete, KP_Separator                           ]	};
 
-    include "level3(ralt_switch_multikey)"
+    include "level3(ralt_switch)"
 };
 
 partial alphanumeric_keys
diff -ruN xc-old/programs/xkbcomp/symbols/pc/dk xc/programs/xkbcomp/symbols/pc/dk
--- xc-old/programs/xkbcomp/symbols/pc/dk	2004-04-23 19:54:55.000000000 +0000
+++ xc/programs/xkbcomp/symbols/pc/dk	2004-10-26 14:20:12.700011784 +0000
@@ -24,7 +24,7 @@
 
     key <KPDL>  { [ KP_Delete, KP_Separator                           ]	};
 
-    include "level3(ralt_switch_multikey)"
+    include "level3(ralt_switch)"
 };
 
 partial alphanumeric_keys
diff -ruN xc-old/programs/xkbcomp/symbols/pc/dvorak xc/programs/xkbcomp/symbols/pc/dvorak
--- xc-old/programs/xkbcomp/symbols/pc/dvorak	2004-04-23 19:54:55.000000000 +0000
+++ xc/programs/xkbcomp/symbols/pc/dvorak	2004-10-26 14:20:12.701011632 +0000
@@ -61,7 +61,7 @@
     key <AB09> { [	    v,	V		]	};
     key <AB10> { [	    z,	Z		]	};
 
-    include "level3(ralt_switch_multikey)"
+    include "level3(ralt_switch)"
 };
 
 // Norwegian Dvorak
diff -ruN xc-old/programs/xkbcomp/symbols/pc/ee xc/programs/xkbcomp/symbols/pc/ee
--- xc-old/programs/xkbcomp/symbols/pc/ee	2004-04-23 19:54:55.000000000 +0000
+++ xc/programs/xkbcomp/symbols/pc/ee	2004-10-26 14:20:12.701011632 +0000
@@ -34,7 +34,7 @@
     key <AB08>	{ [     comma,  semicolon,         less,     multiply ]	};
     key <AB09>	{ [    period,      colon,      greater,     division ]	};
 
-    include "level3(ralt_switch_multikey)"
+    include "level3(ralt_switch)"
 };
 
 partial alphanumeric_keys
diff -ruN xc-old/programs/xkbcomp/symbols/pc/en_US xc/programs/xkbcomp/symbols/pc/en_US
--- xc-old/programs/xkbcomp/symbols/pc/en_US	2004-04-23 19:54:55.000000000 +0000
+++ xc/programs/xkbcomp/symbols/pc/en_US	2004-10-26 14:20:12.701011632 +0000
@@ -9,7 +9,7 @@
     include "pc/latin"
     name[Group1]="en_US";
 
-    include "level3(ralt_switch_multikey)"
+    include "level3(ralt_switch)"
 };
 
 xkb_symbols "nodeadkeys" {
diff -ruN xc-old/programs/xkbcomp/symbols/pc/es xc/programs/xkbcomp/symbols/pc/es
--- xc-old/programs/xkbcomp/symbols/pc/es	2004-04-23 19:54:55.000000000 +0000
+++ xc/programs/xkbcomp/symbols/pc/es	2004-10-26 14:20:12.701011632 +0000
@@ -27,7 +27,7 @@
 
     key <BKSL>	{ [  ccedilla,   Ccedilla,   braceright,   dead_breve ]	};
 
-    include "level3(ralt_switch_multikey)"
+    include "level3(ralt_switch)"
 };
 
 partial alphanumeric_keys
diff -ruN xc-old/programs/xkbcomp/symbols/pc/fi xc/programs/xkbcomp/symbols/pc/fi
--- xc-old/programs/xkbcomp/symbols/pc/fi	2004-04-23 19:54:55.000000000 +0000
+++ xc/programs/xkbcomp/symbols/pc/fi	2004-10-26 14:20:12.702011480 +0000
@@ -58,7 +58,7 @@
     key <KPDL> {	[  KP_Delete,	KP_Separator	]	};
     // End "Keypad" section
 
-    include "level3(ralt_switch_multikey)"
+    include "level3(ralt_switch)"
 };
 
 partial alphanumeric_keys
diff -ruN xc-old/programs/xkbcomp/symbols/pc/fr xc/programs/xkbcomp/symbols/pc/fr
--- xc-old/programs/xkbcomp/symbols/pc/fr	2004-04-23 19:54:55.000000000 +0000
+++ xc/programs/xkbcomp/symbols/pc/fr	2004-10-26 14:20:12.702011480 +0000
@@ -41,7 +41,7 @@
     key <AB09>	{ [     colon,      slash, periodcentered,   division ]	};
     key <AB10>	{ [    exclam,    section, dead_belowdot, dead_abovedot ] };
 
-    include "level3(ralt_switch_multikey)"
+    include "level3(ralt_switch)"
 };
 
 partial alphanumeric_keys
diff -ruN xc-old/programs/xkbcomp/symbols/pc/fr-latin9 xc/programs/xkbcomp/symbols/pc/fr-latin9
--- xc-old/programs/xkbcomp/symbols/pc/fr-latin9	2004-04-23 19:54:55.000000000 +0000
+++ xc/programs/xkbcomp/symbols/pc/fr-latin9	2004-10-26 14:20:12.702011480 +0000
@@ -130,7 +130,7 @@
     // Will take effect when KP_Decimal is mapped to the locale decimal separator
     key <KPDL>  { [       KP_Delete,          period,           KP_Delete,           KP_Decimal ] };
 
-    include "level3(ralt_switch_multikey)"
+    include "level3(ralt_switch)"
 };
 
 partial alphanumeric_keys
diff -ruN xc-old/programs/xkbcomp/symbols/pc/gb xc/programs/xkbcomp/symbols/pc/gb
--- xc-old/programs/xkbcomp/symbols/pc/gb	2004-04-23 19:54:55.000000000 +0000
+++ xc/programs/xkbcomp/symbols/pc/gb	2004-10-26 14:20:12.702011480 +0000
@@ -25,7 +25,7 @@
     key <BKSL>	{ [numbersign, asciitilde,   dead_grave,   dead_breve ]	};
     key <LSGT>	{ [ backslash,        bar,          bar,    brokenbar ]	};
 
-    include "level3(ralt_switch_multikey)"
+    include "level3(ralt_switch)"
 };
 
 partial default alphanumeric_keys 
diff -ruN xc-old/programs/xkbcomp/symbols/pc/hr xc/programs/xkbcomp/symbols/pc/hr
--- xc-old/programs/xkbcomp/symbols/pc/hr	2004-04-23 19:54:55.000000000 +0000
+++ xc/programs/xkbcomp/symbols/pc/hr	2004-10-26 14:20:12.702011480 +0000
@@ -45,6 +45,6 @@
 
     key <KPDL>	{ [ KP_Delete,  KP_Seprator                           ]	};
 
-    include "level3(ralt_switch_multikey)"
+    include "level3(ralt_switch)"
 };
 
diff -ruN xc-old/programs/xkbcomp/symbols/pc/is xc/programs/xkbcomp/symbols/pc/is
--- xc-old/programs/xkbcomp/symbols/pc/is	2004-04-23 19:54:55.000000000 +0000
+++ xc/programs/xkbcomp/symbols/pc/is	2004-10-26 14:20:12.703011328 +0000
@@ -27,7 +27,7 @@
     key <BKSL>	{ [      plus,   asterisk,        grave,   dead_breve ]	};
     key <AB10>	{ [     thorn,      THORN, dead_belowdot, dead_abovedot ] };
 
-    include "level3(ralt_switch_multikey)"
+    include "level3(ralt_switch)"
 };
 
 partial alphanumeric_keys
diff -ruN xc-old/programs/xkbcomp/symbols/pc/it xc/programs/xkbcomp/symbols/pc/it
--- xc-old/programs/xkbcomp/symbols/pc/it	2004-04-23 19:54:55.000000000 +0000
+++ xc/programs/xkbcomp/symbols/pc/it	2004-10-26 14:20:12.703011328 +0000
@@ -36,7 +36,7 @@
 
     key <LSGT>	{ [      less,    greater,guillemotleft,guillemotright] };
 
-    include "level3(ralt_switch_multikey)"
+    include "level3(ralt_switch)"
 };
 
 partial alphanumeric_keys
diff -ruN xc-old/programs/xkbcomp/symbols/pc/la xc/programs/xkbcomp/symbols/pc/la
--- xc-old/programs/xkbcomp/symbols/pc/la	2004-04-23 19:54:55.000000000 +0000
+++ xc/programs/xkbcomp/symbols/pc/la	2004-10-26 14:20:12.703011328 +0000
@@ -27,7 +27,7 @@
 
     key <BKSL>	{ [braceright, bracketright, dead_grave,   braceright ]	};
 
-    include "level3(ralt_switch_multikey)"
+    include "level3(ralt_switch)"
 };
 
 partial alphanumeric_keys
diff -ruN xc-old/programs/xkbcomp/symbols/pc/lt xc/programs/xkbcomp/symbols/pc/lt
--- xc-old/programs/xkbcomp/symbols/pc/lt	2004-10-26 14:19:42.495603000 +0000
+++ xc/programs/xkbcomp/symbols/pc/lt	2004-10-26 14:20:12.703011328 +0000
@@ -31,7 +31,7 @@
 
     key <LSGT>	{ [    endash,   EuroSign   ]	};
 
-    include "level3(ralt_switch_multikey)"
+    include "level3(ralt_switch)"
 };
 
 // Similar to the above, but you should use Right Alt + numeric row
@@ -58,7 +58,7 @@
     key <AD03>	{ [         e,          E,       endash,     EuroSign ]	};
     key <LSGT>	{ [    endash,   EuroSign ]	};
 
-    include "level3(ralt_switch_multikey)"
+    include "level3(ralt_switch)"
 };
 
 // Lithuanian keyboard map by Gediminas Paulauskas <menesis@delfi.lt>
@@ -108,5 +108,5 @@
 
     key <LSGT> {[	less,		greater,	endash		]};
 
-    include "level3(ralt_switch_multikey)"
+    include "level3(ralt_switch)"
 };
diff -ruN xc-old/programs/xkbcomp/symbols/pc/lv xc/programs/xkbcomp/symbols/pc/lv
--- xc-old/programs/xkbcomp/symbols/pc/lv	2004-04-23 19:54:56.000000000 +0000
+++ xc/programs/xkbcomp/symbols/pc/lv	2004-10-26 14:20:12.704011176 +0000
@@ -30,5 +30,5 @@
     key <AB03>	{ [         c,          C,       ccaron,       Ccaron ]	};
     key <AB06>	{ [         n,          N,     ncedilla,     Ncedilla ]	};
 
-    include "level3(ralt_switch_multikey)"
+    include "level3(ralt_switch)"
 };
diff -ruN xc-old/programs/xkbcomp/symbols/pc/mt xc/programs/xkbcomp/symbols/pc/mt
--- xc-old/programs/xkbcomp/symbols/pc/mt	2004-04-23 19:54:56.000000000 +0000
+++ xc/programs/xkbcomp/symbols/pc/mt	2004-10-26 14:20:12.704011176 +0000
@@ -30,5 +30,5 @@
     key <AD09>	{ [         o,          O,       ograve,       Ograve ]	};
     key <AC01>	{ [         a,          A,       agrave,       Agrave ]	};
 
-    include "level3(ralt_switch_multikey)"
+    include "level3(ralt_switch)"
 };
diff -ruN xc-old/programs/xkbcomp/symbols/pc/nl xc/programs/xkbcomp/symbols/pc/nl
--- xc-old/programs/xkbcomp/symbols/pc/nl	2004-04-23 19:54:56.000000000 +0000
+++ xc/programs/xkbcomp/symbols/pc/nl	2004-10-26 14:20:12.704011176 +0000
@@ -49,6 +49,6 @@
 
     key <LSGT>	{ [bracketleft, bracketright,       bar,    brokenbar ]	};
 
-    include "level3(ralt_switch_multikey)"
+    include "level3(ralt_switch)"
 };
 
diff -ruN xc-old/programs/xkbcomp/symbols/pc/no xc/programs/xkbcomp/symbols/pc/no
--- xc-old/programs/xkbcomp/symbols/pc/no	2004-04-23 19:54:56.000000000 +0000
+++ xc/programs/xkbcomp/symbols/pc/no	2004-10-26 14:20:12.704011176 +0000
@@ -27,7 +27,7 @@
 
     key <KPDL>  { [ KP_Delete, KP_Separator                           ]	};
 
-    include "level3(ralt_switch_multikey)"
+    include "level3(ralt_switch)"
 };
 
 partial alphanumeric_keys
diff -ruN xc-old/programs/xkbcomp/symbols/pc/pt xc/programs/xkbcomp/symbols/pc/pt
--- xc-old/programs/xkbcomp/symbols/pc/pt	2004-04-23 19:54:56.000000000 +0000
+++ xc/programs/xkbcomp/symbols/pc/pt	2004-10-26 14:20:12.705011024 +0000
@@ -24,7 +24,7 @@
 
     key <BKSL>	{ [dead_tilde, dead_circumflex, dead_grave, dead_breve]	};
 
-    include "level3(ralt_switch_multikey)"
+    include "level3(ralt_switch)"
 };
 
 partial alphanumeric_keys
diff -ruN xc-old/programs/xkbcomp/symbols/pc/ro xc/programs/xkbcomp/symbols/pc/ro
--- xc-old/programs/xkbcomp/symbols/pc/ro	2004-04-23 19:54:56.000000000 +0000
+++ xc/programs/xkbcomp/symbols/pc/ro	2004-10-26 14:20:12.705011024 +0000
@@ -56,7 +56,7 @@
     key <KPDL> { [  KP_Delete,	KP_Separator		]	};
     // End "Keypad" section
 
-    include "level3(ralt_switch_multikey)"
+    include "level3(ralt_switch)"
 };
 
 // based on a keyboard
@@ -78,7 +78,7 @@
     key <AC01>	{ [         a,          A,       abreve,       Abreve ]	};
     key <AC02>	{ [         s,          S,     scedilla,     Scedilla ]	};
 
-    include "level3(ralt_switch_multikey)"
+    include "level3(ralt_switch)"
 };
 
 // Romanian keyboard with access to German umlauts";
diff -ruN xc-old/programs/xkbcomp/symbols/pc/sapmi xc/programs/xkbcomp/symbols/pc/sapmi
--- xc-old/programs/xkbcomp/symbols/pc/sapmi	2004-04-23 19:54:56.000000000 +0000
+++ xc/programs/xkbcomp/symbols/pc/sapmi	2004-10-26 14:20:12.705011024 +0000
@@ -67,7 +67,7 @@
     key <LSGT>	{ type[Group1] = "FOUR_LEVEL",
                   [    zcaron,     Zcaron,        U01EF,        U01EE ]	};
 
-    include "level3(ralt_switch_multikey)"
+    include "level3(ralt_switch)"
 };
 
  xkb_symbols "sefi" {
diff -ruN xc-old/programs/xkbcomp/symbols/pc/se xc/programs/xkbcomp/symbols/pc/se
--- xc-old/programs/xkbcomp/symbols/pc/se	2004-04-23 19:54:56.000000000 +0000
+++ xc/programs/xkbcomp/symbols/pc/se	2004-10-26 14:20:12.705011024 +0000
@@ -29,7 +29,7 @@
 
     key <KPDL>  { [ KP_Delete, KP_Separator                           ]	};
 
-    include "level3(ralt_switch_multikey)"
+    include "level3(ralt_switch)"
 };
 
 partial alphanumeric_keys
diff -ruN xc-old/programs/xkbcomp/symbols/pc/si xc/programs/xkbcomp/symbols/pc/si
--- xc-old/programs/xkbcomp/symbols/pc/si	2004-10-26 14:19:42.418615000 +0000
+++ xc/programs/xkbcomp/symbols/pc/si	2004-10-26 14:20:12.706010872 +0000
@@ -39,6 +39,6 @@
 
     key <KPDL>	{ [ KP_Delete, KP_Separator ]	};
 
-    include "level3(ralt_switch_multikey)"
+    include "level3(ralt_switch)"
 };
 
diff -ruN xc-old/programs/xkbcomp/symbols/pc/sk xc/programs/xkbcomp/symbols/pc/sk
--- xc-old/programs/xkbcomp/symbols/pc/sk	2003-11-25 19:29:14.000000000 +0000
+++ xc/programs/xkbcomp/symbols/pc/sk	2004-10-26 14:20:12.706010872 +0000
@@ -72,7 +72,7 @@
     key <KPDL>	{ type[Group1]="FOUR_LEVEL_KEYPAD",
                   [ KP_Delete,      comma,    KP_Delete,   KP_Decimal ]	};
 
-    include "level3(ralt_switch_multikey)"
+    include "level3(ralt_switch)"
 };
 
 // Use <BKSL> instead of <LSGT> (useful for keyboard without <LSGT> key)
diff -ruN xc-old/programs/xkbcomp/symbols/pc/tr xc/programs/xkbcomp/symbols/pc/tr
--- xc-old/programs/xkbcomp/symbols/pc/tr	2004-04-23 19:54:56.000000000 +0000
+++ xc/programs/xkbcomp/symbols/pc/tr	2004-10-26 14:20:12.706010872 +0000
@@ -55,7 +55,7 @@
     key <AB10>	{ [    period,      colon, dead_abovedot, dead_abovedot ] };
     key <SPCE>	{ [     space,      space, nobreakspace,   nobreakspace ] };
 
-    include "level3(ralt_switch_multikey)"
+    include "level3(ralt_switch)"
 };
 
 
@@ -119,7 +119,7 @@
     key <SPCE>	{ [    space,       space, nobreakspace, nobreakspace ]	};
     key <LSGT>	{ [     less,     greater,          bar,    brokenbar ]	};
    
-    include "level3(ralt_switch_multikey)"
+    include "level3(ralt_switch)"
 };
 
 // Turkish Alt-Q Layout
diff -ruN xc-old/programs/xkbcomp/symbols/pc/us_intl xc/programs/xkbcomp/symbols/pc/us_intl
--- xc-old/programs/xkbcomp/symbols/pc/us_intl	2004-04-23 19:54:56.000000000 +0000
+++ xc/programs/xkbcomp/symbols/pc/us_intl	2004-10-26 14:20:12.706010872 +0000
@@ -50,5 +50,5 @@
   key <AB09> { [     period, greater,	     dead_abovedot, dead_circumflex ] };
   key <AB10> { [      slash, question,	     dead_hook,	    dead_hook	    ] };
 
-  include "level3(ralt_switch_multikey)"
+  include "level3(ralt_switch)"
 };
diff -ruN xc-old/programs/xkbcomp/symbols/pc/yu xc/programs/xkbcomp/symbols/pc/yu
--- xc-old/programs/xkbcomp/symbols/pc/yu	2004-04-23 19:54:56.000000000 +0000
+++ xc/programs/xkbcomp/symbols/pc/yu	2004-10-26 14:35:40.527960496 +0000
@@ -19,7 +19,7 @@
   include "pc/sr(level3)"
   include "pc/sr(common)"
   include "pc/sr(latalpha)"
-  include "level3(ralt_switch_multikey)"
+  include "level3(ralt_switch)"
 };
 
 partial alphanumeric_keys