X Strike Force XFree86 SVN commit: r1943 - in trunk/debian: . patches
Author: barbier
Date: 2004-10-12 07:15:09 -0500 (Tue, 12 Oct 2004)
New Revision: 1943
Added:
trunk/debian/patches/099z_xkb_level3_ralt_switch.diff
Modified:
trunk/debian/CHANGESETS
trunk/debian/changelog
trunk/debian/patches/099j_xkb_new_layouts.diff
trunk/debian/patches/099z_xkb_fix_rules_xfree86.diff
Log:
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)
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2004-10-11 23:05:06 UTC (rev 1942)
+++ trunk/debian/CHANGESETS 2004-10-12 12:15:09 UTC (rev 1943)
@@ -113,4 +113,9 @@
Bunk for this suggestion.
1941
+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)
+ 1943
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-10-11 23:05:06 UTC (rev 1942)
+++ trunk/debian/changelog 2004-10-12 12:15:09 UTC (rev 1943)
@@ -65,6 +65,7 @@
(Closes: #263561)
+ ch (Switzerland) replaces de_CH and fr_CH.
+ mn (Mongolia) and vn (Vietnam) are simple layouts.
+
* In UTF-8 compose files, replace U00xx Unicode codepoints by the
corresponding keysyms. Otherwise the compose character is in
the range 0x01000000-0x010000FF which is not valid according to
@@ -73,6 +74,10 @@
xemacs and users are then unable to use composition when in UTF-8
locales. (Closes: #235574)
+ * 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)
+
Changes by Fabio M. Di Nitto:
* Update wacom input driver from http://linuxwacom.sourceforge.net/ up to
Modified: trunk/debian/patches/099j_xkb_new_layouts.diff
===================================================================
--- trunk/debian/patches/099j_xkb_new_layouts.diff 2004-10-11 23:05:06 UTC (rev 1942)
+++ trunk/debian/patches/099j_xkb_new_layouts.diff 2004-10-12 12:15:09 UTC (rev 1943)
@@ -23,9 +23,7 @@
Layouts were taken (2004-10-08) from
http://freedesktop.org/cgi-bin/viewcvs.cgi/xlibs/xkbdesc/symbols/
-and customized to fix include paths and default level3 key.
-Ca, ch and hu layout needed patches, which have been submitted to their
-bugzilla.
+and customized to fix include paths.
diff -ruN xc-old/programs/xkbcomp/rules/xfree86 xc/programs/xkbcomp/rules/xfree86
--- xc-old/programs/xkbcomp/rules/xfree86 2004-10-08 22:36:45.000000000 +0000
@@ -190,7 +188,7 @@
+
+ key <SPCE> { [ space, space, nobreakspace ] };
+
-+ include "level3(ralt_switch_multikey)"
++ include "level3(ralt_switch)"
+};
+
+partial
@@ -382,7 +380,7 @@
+ key <AB09> { [ period, colon ] };
+ key <AB10> { [ minus, underscore ] };
+
-+ include "level3(ralt_switch_multikey)"
++ include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys
@@ -520,7 +518,7 @@
+ include "keypad(comma)"
+ include "pc/hu(def_dead)"
+ include "pc/hu(def_common)"
-+ include "level3(ralt_switch_multikey)"
++ include "level3(ralt_switch)"
+};
+
+// 101_qwertz_comma_nodead
@@ -536,7 +534,7 @@
+ include "keypad(comma)"
+ include "pc/hu(def_nodead)"
+ include "pc/hu(def_common)"
-+ include "level3(ralt_switch_multikey)"
++ include "level3(ralt_switch)"
+};
+
+// 101_qwertz_dot_dead
@@ -552,7 +550,7 @@
+ include "pc/hu(def_dot)"
+ include "pc/hu(def_dead)"
+ include "pc/hu(def_common)"
-+ include "level3(ralt_switch_multikey)"
++ include "level3(ralt_switch)"
+};
+
+// 101_qwertz_dot_nodead
@@ -568,7 +566,7 @@
+ include "pc/hu(def_dot)"
+ include "pc/hu(def_nodead)"
+ include "pc/hu(def_common)"
-+ include "level3(ralt_switch_multikey)"
++ include "level3(ralt_switch)"
+};
+
+// 101_qwerty_comma_dead
@@ -584,7 +582,7 @@
+ include "keypad(comma)"
+ include "pc/hu(def_dead)"
+ include "pc/hu(def_common)"
-+ include "level3(ralt_switch_multikey)"
++ include "level3(ralt_switch)"
+};
+
+// 101_qwerty_comma_nodead
@@ -600,7 +598,7 @@
+ include "keypad(comma)"
+ include "pc/hu(def_nodead)"
+ include "pc/hu(def_common)"
-+ include "level3(ralt_switch_multikey)"
++ include "level3(ralt_switch)"
+};
+
+// 101_qwerty_dot_dead
@@ -616,7 +614,7 @@
+ include "pc/hu(def_dot)"
+ include "pc/hu(def_dead)"
+ include "pc/hu(def_common)"
-+ include "level3(ralt_switch_multikey)"
++ include "level3(ralt_switch)"
+};
+
+// 101_qwerty_dot_nodead
@@ -632,7 +630,7 @@
+ include "pc/hu(def_dot)"
+ include "pc/hu(def_nodead)"
+ include "pc/hu(def_common)"
-+ include "level3(ralt_switch_multikey)"
++ include "level3(ralt_switch)"
+};
+
+// 102_qwertz_comma_dead
@@ -648,7 +646,7 @@
+ include "pc/hu(def_comma)"
+ include "pc/hu(def_dead)"
+ include "pc/hu(def_common)"
-+ include "level3(ralt_switch_multikey)"
++ include "level3(ralt_switch)"
+};
+
+// 102_qwertz_comma_nodead
@@ -664,7 +662,7 @@
+ include "pc/hu(def_comma)"
+ include "pc/hu(def_nodead)"
+ include "pc/hu(def_common)"
-+ include "level3(ralt_switch_multikey)"
++ include "level3(ralt_switch)"
+};
+
+// 102_qwertz_dot_dead
@@ -680,7 +678,7 @@
+ include "pc/hu(def_dot)"
+ include "pc/hu(def_dead)"
+ include "pc/hu(def_common)"
-+ include "level3(ralt_switch_multikey)"
++ include "level3(ralt_switch)"
+};
+
+// 102_qwertz_dot_nodead
@@ -696,7 +694,7 @@
+ include "pc/hu(def_dot)"
+ include "pc/hu(def_nodead)"
+ include "pc/hu(def_common)"
-+ include "level3(ralt_switch_multikey)"
++ include "level3(ralt_switch)"
+};
+
+// 102_qwerty_comma_dead
@@ -712,7 +710,7 @@
+ include "pc/hu(def_comma)"
+ include "pc/hu(def_dead)"
+ include "pc/hu(def_common)"
-+ include "level3(ralt_switch_multikey)"
++ include "level3(ralt_switch)"
+};
+
+// 102_qwerty_comma_nodead
@@ -728,7 +726,7 @@
+ include "pc/hu(def_comma)"
+ include "pc/hu(def_nodead)"
+ include "pc/hu(def_common)"
-+ include "level3(ralt_switch_multikey)"
++ include "level3(ralt_switch)"
+};
+
+// 102_qwerty_dot_dead
@@ -744,7 +742,7 @@
+ include "pc/hu(def_dot)"
+ include "pc/hu(def_dead)"
+ include "pc/hu(def_common)"
-+ include "level3(ralt_switch_multikey)"
++ include "level3(ralt_switch)"
+};
+
+// 102_qwerty_dot_nodead
@@ -760,7 +758,7 @@
+ include "pc/hu(def_dot)"
+ include "pc/hu(def_nodead)"
+ include "pc/hu(def_common)"
-+ include "level3(ralt_switch_multikey)"
++ include "level3(ralt_switch)"
+};
+
+// Partial layouts
@@ -1103,7 +1101,7 @@
+
+ key <SPCE> { [ space, space, nobreakspace ] };
+
-+ include "level3(ralt_switch_multikey)"
++ include "level3(ralt_switch)"
+};
diff -ruN xc-old/programs/xkbcomp/symbols/pc/us xc/programs/xkbcomp/symbols/pc/us
--- xc-old/programs/xkbcomp/symbols/pc/us 2004-10-08 22:36:37.000000000 +0000
@@ -1174,7 +1172,7 @@
+ key <AB10> { [ slash, question, questiondown, dead_hook ] };
+ key <BKSL> { [ backslash, bar, notsign, brokenbar ] };
+
-+ include "level3(ralt_switch_multikey)"
++ include "level3(ralt_switch)"
+};
+
+// Based on symbols/us_intl keyboard map:
@@ -1227,7 +1225,7 @@
+ 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/vn xc/programs/xkbcomp/symbols/pc/vn
--- xc-old/programs/xkbcomp/symbols/pc/vn 1970-01-01 00:00:00.000000000 +0000
@@ -1268,5 +1266,5 @@
+
+ // End alphanumeric section
+
-+ include "level3(ralt_switch_multikey)"
++ include "level3(ralt_switch)"
+};
Modified: trunk/debian/patches/099z_xkb_fix_rules_xfree86.diff
===================================================================
--- trunk/debian/patches/099z_xkb_fix_rules_xfree86.diff 2004-10-11 23:05:06 UTC (rev 1942)
+++ trunk/debian/patches/099z_xkb_fix_rules_xfree86.diff 2004-10-12 12:15:09 UTC (rev 1943)
@@ -10,6 +10,7 @@
Lajos). (Closes: #247463, #270810)
+ Support the lv3:ralt_switch option, which exists in xfree86.lst but was
forgotten in this file.
+ + Add support for a lv3:ralt_switch_multikey option.
rules/xfree86.{lst,xml}:
+ Replace the options altwin:meta_super and altwin:meta_hyper with the
@@ -17,8 +18,8 @@
+ Synchronize these files.
diff -ruN xc-old/programs/xkbcomp/rules/xfree86 xc/programs/xkbcomp/rules/xfree86
---- xc-old/programs/xkbcomp/rules/xfree86 2004-10-07 21:34:56.000000000 +0000
-+++ xc/programs/xkbcomp/rules/xfree86 2004-10-07 21:36:31.000000000 +0000
+--- xc-old/programs/xkbcomp/rules/xfree86 2004-10-12 08:58:00.000000000 +0000
++++ xc/programs/xkbcomp/rules/xfree86 2004-10-12 09:01:25.000000000 +0000
@@ -9,7 +9,7 @@
//
@@ -28,17 +29,18 @@
// If you want non-latin layouts implicitly include the en_US layout
// uncomment lines below
-@@ -159,6 +159,7 @@
+@@ -159,6 +159,8 @@
lv3:win_switch = +level3(win_switch)
lv3:lwin_switch = +level3(lwin_switch)
lv3:rwin_switch = +level3(rwin_switch)
+ lv3:ralt_switch = +level3(ralt_switch)
++ lv3:ralt_switch_multikey = +level3(ralt_switch_multikey)
ctrl:nocaps = +ctrl(nocaps)
ctrl:swapcaps = +ctrl(swapcaps)
ctrl:ctrl_ac = +ctrl(ctrl_ac)
diff -ruN xc-old/programs/xkbcomp/rules/xfree86.lst xc/programs/xkbcomp/rules/xfree86.lst
---- xc-old/programs/xkbcomp/rules/xfree86.lst 2004-10-07 21:34:55.000000000 +0000
-+++ xc/programs/xkbcomp/rules/xfree86.lst 2004-10-07 21:42:28.000000000 +0000
+--- xc-old/programs/xkbcomp/rules/xfree86.lst 2004-10-12 08:58:00.000000000 +0000
++++ xc/programs/xkbcomp/rules/xfree86.lst 2004-10-12 09:08:58.000000000 +0000
@@ -140,11 +140,14 @@
gur Gurmukhi
dev Hindi
@@ -72,15 +74,16 @@
grp:lwin_switch Left Win-key switches group while pressed
grp:rwin_switch Right Win-key switches group while pressed
grp:win_switch Both Win-keys switch group while pressed
-@@ -225,6 +230,7 @@
+@@ -225,6 +230,8 @@
lv3:win_switch Press any of Win-keys to choose 3rd level
lv3:lwin_switch Press Left Win-key to choose 3rd level
lv3:rwin_switch Press Right Win-key to choose 3rd level
+ lv3:ralt_switch Press Right Alt-key to choose 3rd level
++ lv3:ralt_switch_multikey Press Right Alt-key to choose 3rd level, Shift+Right Alt-key is Multi_Key
ctrl Control Key Position
ctrl:nocaps Make CapsLock an additional Control
ctrl:swapcaps Swap Control and Caps Lock
-@@ -245,8 +251,8 @@
+@@ -245,8 +252,8 @@
altwin:meta_alt Alt and Meta on the Alt keys (default).
altwin:meta_win Meta is mapped to the Win-keys.
altwin:left_meta_win Meta is mapped to the left Win-key.
@@ -92,8 +95,8 @@
compose:ralt Right Alt is Compose
compose:rwin Right Win-key is Compose
diff -ruN xc-old/programs/xkbcomp/rules/xfree86.xml xc/programs/xkbcomp/rules/xfree86.xml
---- xc-old/programs/xkbcomp/rules/xfree86.xml 2004-10-07 21:34:55.000000000 +0000
-+++ xc/programs/xkbcomp/rules/xfree86.xml 2004-10-07 22:11:54.000000000 +0000
+--- xc-old/programs/xkbcomp/rules/xfree86.xml 2004-10-12 08:58:00.000000000 +0000
++++ xc/programs/xkbcomp/rules/xfree86.xml 2004-10-12 09:09:59.000000000 +0000
@@ -276,8 +276,14 @@
</model>
<model>
@@ -154,18 +157,16 @@
- <description>Eliminate dead keys</description>
- <description xml:lang="bg">Изключи специалните клавиши (dead keys)</description>
- <description xml:lang="ru">Исключить специальные клавиши (dead keys)</description>
-+ <name>fr-legacy</name>
-+ <description>French (legacy)</description>
- </configItem>
- </variant>
- <variant>
- <configItem>
+- </configItem>
+- </variant>
+- <variant>
+- <configItem>
- <name>sundeadkeys</name>
- <description>ca(sundeadkeys) - No decription</description>
- <description xml:lang="bg">ca(sundeadkeys) - без описание</description>
- <description xml:lang="ru">sundeadkeys</description>
-+ <name>multi</name>
-+ <description>Multilingual</description>
++ <name>fr-legacy</name>
++ <description>French (legacy)</description>
</configItem>
</variant>
- </variantList>
@@ -183,10 +184,12 @@
- <description>ca_enhanced(Sundeadkeys) - No decription</description>
- <description xml:lang="bg">ca_enhanced(Sundeadkeys) - без описание</description>
- <description xml:lang="ru">Sundeadkeys</description>
-- </configItem>
-- </variant>
-- <variant>
-- <configItem>
++ <name>multi</name>
++ <description>Multilingual</description>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
- <name>basic</name>
- <description>ca_enhanced(basic) - No decription</description>
- <description xml:lang="bg">ca_enhanced(basic) - без описание</description>
@@ -649,7 +652,7 @@
<description xml:lang="bg">Десният Alt сменя групата докато е натиснат</description>
<description xml:lang="ru">Правая клавиша Alt переключает группу на время нажатия</description>
</configItem>
-@@ -2464,6 +2411,12 @@
+@@ -2464,6 +2411,18 @@
<description xml:lang="ru">Выбор 3-го уровня нажатием правой клавиши Win</description>
</configItem>
</option>
@@ -659,10 +662,16 @@
+ <description>Press Right Alt-key to choose 3rd level</description>
+ </configItem>
+ </option>
++ <option>
++ <configItem>
++ <name>lv3:ralt_switch_multikey</name>
++ <description>Press Right Alt-key to choose 3rd level, Shift+Right Alt-key is Multi_Key</description>
++ </configItem>
++ </option>
</group>
<group allowMultipleSelection="false">
<configItem>
-@@ -2617,7 +2570,7 @@
+@@ -2617,7 +2576,7 @@
</option>
<option>
<configItem>
@@ -671,7 +680,7 @@
<description>Super is mapped to the Win-keys (default).</description>
<description xml:lang="bg">Win клавишите функционират като Super</description>
<description xml:lang="ru">Super соответствует клавишам Win (по умолчанию)</description>
-@@ -2625,7 +2578,7 @@
+@@ -2625,7 +2584,7 @@
</option>
<option>
<configItem>
Added: trunk/debian/patches/099z_xkb_level3_ralt_switch.diff
===================================================================
--- trunk/debian/patches/099z_xkb_level3_ralt_switch.diff 2004-10-11 23:05:06 UTC (rev 1942)
+++ trunk/debian/patches/099z_xkb_level3_ralt_switch.diff 2004-10-12 12:15:09 UTC (rev 1943)
@@ -0,0 +1,428 @@
+$Id$
+
+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-10-12 08:49:28.000000000 +0000
++++ xc/programs/xkbcomp/symbols/pc/al 2004-10-12 08:53:12.000000000 +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-10-12 08:49:28.000000000 +0000
++++ xc/programs/xkbcomp/symbols/pc/be 2004-10-12 08:53:12.000000000 +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-10-12 08:49:28.000000000 +0000
++++ xc/programs/xkbcomp/symbols/pc/br 2004-10-12 08:53:12.000000000 +0000
+@@ -40,7 +40,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 2004-10-12 08:49:28.000000000 +0000
++++ xc/programs/xkbcomp/symbols/pc/cz 2004-10-12 08:53:12.000000000 +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-12 08:49:34.000000000 +0000
++++ xc/programs/xkbcomp/symbols/pc/de 2004-10-12 08:53:12.000000000 +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-10-12 08:49:28.000000000 +0000
++++ xc/programs/xkbcomp/symbols/pc/dk 2004-10-12 08:53:12.000000000 +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-10-12 08:49:28.000000000 +0000
++++ xc/programs/xkbcomp/symbols/pc/dvorak 2004-10-12 08:53:12.000000000 +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-10-12 08:49:28.000000000 +0000
++++ xc/programs/xkbcomp/symbols/pc/ee 2004-10-12 08:53:12.000000000 +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-10-12 08:49:28.000000000 +0000
++++ xc/programs/xkbcomp/symbols/pc/en_US 2004-10-12 08:53:12.000000000 +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-10-12 08:49:28.000000000 +0000
++++ xc/programs/xkbcomp/symbols/pc/es 2004-10-12 08:53:12.000000000 +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-10-12 08:49:28.000000000 +0000
++++ xc/programs/xkbcomp/symbols/pc/fi 2004-10-12 08:53:12.000000000 +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-10-12 08:49:28.000000000 +0000
++++ xc/programs/xkbcomp/symbols/pc/fr 2004-10-12 08:53:12.000000000 +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-10-12 08:49:28.000000000 +0000
++++ xc/programs/xkbcomp/symbols/pc/fr-latin9 2004-10-12 08:53:12.000000000 +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-10-12 08:49:28.000000000 +0000
++++ xc/programs/xkbcomp/symbols/pc/gb 2004-10-12 08:53:12.000000000 +0000
+@@ -25,5 +25,5 @@
+ key <BKSL> { [numbersign, asciitilde, dead_grave, dead_breve ] };
+ key <LSGT> { [ backslash, bar, bar, brokenbar ] };
+
+- include "level3(ralt_switch_multikey)"
++ include "level3(ralt_switch)"
+ };
+diff -ruN xc-old/programs/xkbcomp/symbols/pc/hr xc/programs/xkbcomp/symbols/pc/hr
+--- xc-old/programs/xkbcomp/symbols/pc/hr 2004-10-12 08:49:28.000000000 +0000
++++ xc/programs/xkbcomp/symbols/pc/hr 2004-10-12 08:53:12.000000000 +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-10-12 08:49:28.000000000 +0000
++++ xc/programs/xkbcomp/symbols/pc/is 2004-10-12 08:53:12.000000000 +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-10-12 08:49:28.000000000 +0000
++++ xc/programs/xkbcomp/symbols/pc/it 2004-10-12 08:53:12.000000000 +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-10-12 08:49:28.000000000 +0000
++++ xc/programs/xkbcomp/symbols/pc/la 2004-10-12 08:53:12.000000000 +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-12 08:49:34.000000000 +0000
++++ xc/programs/xkbcomp/symbols/pc/lt 2004-10-12 08:53:12.000000000 +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-10-12 08:49:28.000000000 +0000
++++ xc/programs/xkbcomp/symbols/pc/lv 2004-10-12 08:53:12.000000000 +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-10-12 08:49:28.000000000 +0000
++++ xc/programs/xkbcomp/symbols/pc/mt 2004-10-12 08:53:12.000000000 +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-10-12 08:49:28.000000000 +0000
++++ xc/programs/xkbcomp/symbols/pc/nl 2004-10-12 08:53:12.000000000 +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-10-12 08:49:28.000000000 +0000
++++ xc/programs/xkbcomp/symbols/pc/no 2004-10-12 08:53:12.000000000 +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/pl xc/programs/xkbcomp/symbols/pc/pl
+--- xc-old/programs/xkbcomp/symbols/pc/pl 2004-10-12 08:49:37.000000000 +0000
++++ xc/programs/xkbcomp/symbols/pc/pl 2004-10-12 08:53:12.000000000 +0000
+@@ -25,5 +25,5 @@
+ key <KPDL> { [ KP_Delete, KP_Separator ] };
+ // End of keypad section
+
+- include "level3(ralt_switch_multikey)"
++ include "level3(ralt_switch)"
+ };
+diff -ruN xc-old/programs/xkbcomp/symbols/pc/pl2 xc/programs/xkbcomp/symbols/pc/pl2
+--- xc-old/programs/xkbcomp/symbols/pc/pl2 2004-10-12 08:49:37.000000000 +0000
++++ xc/programs/xkbcomp/symbols/pc/pl2 2004-10-12 08:53:12.000000000 +0000
+@@ -45,6 +45,6 @@
+ key <KPDL> { [ KP_Delete, KP_Separator ] };
+ // End of keypad section
+
+- include "level3(ralt_switch_multikey)"
++ include "level3(ralt_switch)"
+ };
+
+diff -ruN xc-old/programs/xkbcomp/symbols/pc/pt xc/programs/xkbcomp/symbols/pc/pt
+--- xc-old/programs/xkbcomp/symbols/pc/pt 2004-10-12 08:49:28.000000000 +0000
++++ xc/programs/xkbcomp/symbols/pc/pt 2004-10-12 08:53:12.000000000 +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-10-12 08:49:28.000000000 +0000
++++ xc/programs/xkbcomp/symbols/pc/ro 2004-10-12 08:53:12.000000000 +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,5 +78,5 @@
+ key <AC01> { [ a, A, abreve, Abreve ] };
+ key <AC02> { [ s, S, scedilla, Scedilla ] };
+
+- include "level3(ralt_switch_multikey)"
++ include "level3(ralt_switch)"
+ };
+diff -ruN xc-old/programs/xkbcomp/symbols/pc/sapmi xc/programs/xkbcomp/symbols/pc/sapmi
+--- xc-old/programs/xkbcomp/symbols/pc/sapmi 2004-10-12 08:49:28.000000000 +0000
++++ xc/programs/xkbcomp/symbols/pc/sapmi 2004-10-12 08:53:12.000000000 +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-10-12 08:49:28.000000000 +0000
++++ xc/programs/xkbcomp/symbols/pc/se 2004-10-12 08:53:12.000000000 +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-12 08:49:34.000000000 +0000
++++ xc/programs/xkbcomp/symbols/pc/si 2004-10-12 08:53:12.000000000 +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 2004-10-12 08:49:28.000000000 +0000
++++ xc/programs/xkbcomp/symbols/pc/sk 2004-10-12 08:53:12.000000000 +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-10-12 08:49:29.000000000 +0000
++++ xc/programs/xkbcomp/symbols/pc/tr 2004-10-12 08:53:12.000000000 +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,5 +119,5 @@
+ key <SPCE> { [ space, space, nobreakspace, nobreakspace ] };
+ key <LSGT> { [ less, greater, bar, brokenbar ] };
+
+- include "level3(ralt_switch_multikey)"
++ include "level3(ralt_switch)"
+ };
+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-10-12 08:49:29.000000000 +0000
++++ xc/programs/xkbcomp/symbols/pc/us_intl 2004-10-12 08:53:12.000000000 +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-10-12 08:49:29.000000000 +0000
++++ xc/programs/xkbcomp/symbols/pc/yu 2004-10-12 08:53:12.000000000 +0000
+@@ -38,5 +38,5 @@
+ key <BKSL> { [ zcaron, Zcaron, dead_grave, dead_breve ] };
+ key <AB01> { [ z, Z, guillemotleft, less ] };
+
+- include "level3(ralt_switch_multikey)"
++ include "level3(ralt_switch)"
+ };
Reply to: