--- a/pkgmaps/prototype.xsun-keytables Fri Sep 26 12:26:44 2008 +0200
+++ b/pkgmaps/prototype.xsun-keytables Fri Sep 26 15:49:16 2008 +0200
@@ -266,49 +266,33 @@
f none openwin/lib/X11/xkb/symbols/sony/us 0444 root bin
d none openwin/lib/X11/xkb/symbols/sun 0755 root bin
-f none openwin/lib/X11/xkb/symbols/sun/am 0444 root bin
-f none openwin/lib/X11/xkb/symbols/sun/ar 0444 root bin
-f none openwin/lib/X11/xkb/symbols/sun/az 0444 root bin
-f none openwin/lib/X11/xkb/symbols/sun/be 0444 root bin
-f none openwin/lib/X11/xkb/symbols/sun/br 0444 root bin
f none openwin/lib/X11/xkb/symbols/sun/ca 0444 root bin
f none openwin/lib/X11/xkb/symbols/sun/cs 0444 root bin
f none openwin/lib/X11/xkb/symbols/sun/cz 0444 root bin
f none openwin/lib/X11/xkb/symbols/sun/de 0444 root bin
-f none openwin/lib/X11/xkb/symbols/sun/de_CH 0444 root bin
f none openwin/lib/X11/xkb/symbols/sun/dk 0444 root bin
f none openwin/lib/X11/xkb/symbols/sun/es 0444 root bin
f none openwin/lib/X11/xkb/symbols/sun/fi 0444 root bin
f none openwin/lib/X11/xkb/symbols/sun/fr 0444 root bin
-f none openwin/lib/X11/xkb/symbols/sun/fr_CH 0444 root bin
f none openwin/lib/X11/xkb/symbols/sun/gb 0444 root bin
-f none openwin/lib/X11/xkb/symbols/sun/ge 0444 root bin
f none openwin/lib/X11/xkb/symbols/sun/gr 0444 root bin
f none openwin/lib/X11/xkb/symbols/sun/hu 0444 root bin
f none openwin/lib/X11/xkb/symbols/sun/it 0444 root bin
f none openwin/lib/X11/xkb/symbols/sun/jp 0444 root bin
-f none openwin/lib/X11/xkb/symbols/sun/kg 0444 root bin
f none openwin/lib/X11/xkb/symbols/sun/ko 0444 root bin
-f none openwin/lib/X11/xkb/symbols/sun/kz 0444 root bin
f none openwin/lib/X11/xkb/symbols/sun/lt 0444 root bin
f none openwin/lib/X11/xkb/symbols/sun/lv 0444 root bin
f none openwin/lib/X11/xkb/symbols/sun/nl 0444 root bin
f none openwin/lib/X11/xkb/symbols/sun/no 0444 root bin
f none openwin/lib/X11/xkb/symbols/sun/pl 0444 root bin
-f none openwin/lib/X11/xkb/symbols/sun/pl_dev 0444 root bin
f none openwin/lib/X11/xkb/symbols/sun/pt 0444 root bin
f none openwin/lib/X11/xkb/symbols/sun/ru 0444 root bin
f none openwin/lib/X11/xkb/symbols/sun/se 0444 root bin
-f none openwin/lib/X11/xkb/symbols/sun/sk 0444 root bin
f none openwin/lib/X11/xkb/symbols/sun/sw 0444 root bin
-f none openwin/lib/X11/xkb/symbols/sun/tj 0444 root bin
f none openwin/lib/X11/xkb/symbols/sun/tr 0444 root bin
-f none openwin/lib/X11/xkb/symbols/sun/tr_f 0444 root bin
f none openwin/lib/X11/xkb/symbols/sun/tuv 0444 root bin
f none openwin/lib/X11/xkb/symbols/sun/tw 0444 root bin
-f none openwin/lib/X11/xkb/symbols/sun/ua 0444 root bin
f none openwin/lib/X11/xkb/symbols/sun/us 0444 root bin
-f none openwin/lib/X11/xkb/symbols/sun/uz 0444 root bin
d none openwin/lib/X11/xkb/symbols/xfree68 0755 root bin
f none openwin/lib/X11/xkb/symbols/xfree68/amiga 0444 root bin
--- a/src/xorg/keytables/sun-src/symbols/sun/br Fri Sep 26 12:26:44 2008 +0200
+++ b/src/xorg/keytables/sun-src/symbols/sun/br Fri Sep 26 15:49:16 2008 +0200
@@ -53,14 +53,6 @@
xkb_symbols "basic" {
include "us(basic)"
- // Describes the differences between a very simple us
- // keyboard and a very simple Brasilian ABNT2 keybaord
- // by Ricardo Y. Igarashi ([email protected])
- // Adds suport for dead-keys in I18N applications
- // by Conectiva (http://www.conectiva.com.br)
-
- name[Group1]= "Brazilian";
-
key <TLDE> { [ apostrophe, quotedbl ] };
key <AE01> { [ 1, exclam ],
[ onesuperior, exclamdown ] };
@@ -105,24 +97,12 @@
[ mu ] };
key <BKSL> { [ backslash, bar ] };
key <AB10> { [ semicolon, colon ] };
-// ABNT-2 keyboard has this special key
key <AB11> { [ slash, question ],
[ degree, questiondown ] };
key <KPPT> { [ KP_Decimal ] };
key <KPDL> { [ KP_Delete, comma ] };
- // begin modifier mappings
-
- modifier_map Shift { Shift_L };
- modifier_map Lock { Caps_Lock };
- modifier_map Control{ Control_L };
- key <RALT> {
- symbols[Group1]= [ Mode_switch, Multi_key ],
- virtualMods= AltGr
- };
-};
-
xkb_symbols "type6" {
--- a/src/xorg/keytables/sun-src/symbols/sun/de Fri Sep 26 12:26:44 2008 +0200
+++ b/src/xorg/keytables/sun-src/symbols/sun/de Fri Sep 26 15:49:16 2008 +0200
@@ -92,7 +92,7 @@
xkb_symbols "type6" {
include "sun/us(type6)"
- key <TLDE> { [ dead_circumflex, degree ] };
+ key <TLDE> { [ asciicircum, degree ] };
key <AE02> { [ 2, quotedbl ],
@@ -100,6 +100,8 @@
key <AE03> { [ 3, section ],
[ threesuperior ] };
key <AE04> { [ 4, dollar ] };
+ key <AE06> { [ 6, ampersand ],
+ [ section ] };
key <AE07> { [ 7, slash ],
[ braceleft ] };
key <AE08> { [ 8, parenleft ],
@@ -117,7 +119,7 @@
[ EuroSign ] };
key <AD11> { [ udiaeresis, Udiaeresis ] };
key <AD12> { [ plus, asterisk ],
- [ dead_tilde ] };
+ [ asciitilde ] };
key <AC10> { [ odiaeresis, Odiaeresis ] };
key <AC11> { [ adiaeresis, Adiaeresis ] };
--- a/src/xorg/keytables/sun-src/symbols/sun/dk Fri Sep 26 12:26:44 2008 +0200
+++ b/src/xorg/keytables/sun-src/symbols/sun/dk Fri Sep 26 15:49:16 2008 +0200
@@ -124,7 +124,7 @@
key <AD03> { [ e, E ],
[ EuroSign ] };
key <AD11> { [ aring, Aring ] };
- key <AD12> { [ SunFA_Diaeresis, SunFA_Circumflex ],
+ key <AD12> { [ SunFA_Diaeresis, SunFA_Circum ],
[ SunFA_Tilde ] };
key <BKSL> { [ apostrophe, asterisk ],
[ grave ] };
--- a/src/xorg/keytables/sun-src/symbols/sun/es Fri Sep 26 12:26:44 2008 +0200
+++ b/src/xorg/keytables/sun-src/symbols/sun/es Fri Sep 26 15:49:16 2008 +0200
@@ -114,9 +114,9 @@
key <AE03> { [ 3, periodcentered ],
[ numbersign ] };
key <AE04> { [ 4, dollar ],
- [ dead_tilde ] };
+ [ asciicircum ] };
key <AE05> { [ 5, percent ],
- [ tilde ] };
+ [ asciitilde ] };
key <AE06> { [ 6, ampersand ],
[ notsign ] };
key <AE07> { [ 7, slash ] };
--- a/src/xorg/keytables/sun-src/symbols/sun/fi Fri Sep 26 12:26:44 2008 +0200
+++ b/src/xorg/keytables/sun-src/symbols/sun/fi Fri Sep 26 15:49:16 2008 +0200
@@ -86,8 +86,8 @@
key <AD03> { [ e, E ],
[ EuroSign ] };
key <AD11> { [ aring, Aring ] };
- key <AD12> { [ SunFA_Diaeresis, dead_circumflex ],
- [ dead_tilde ] };
+ key <AD12> { [ SunFA_Diaeresis, asciicircum ],
+ [ asciitilde ] };
key <AC10> { [ odiaeresis, Odiaeresis ] };
key <AC11> { [ adiaeresis, Adiaeresis ] };
key <BKSL> { [ apostrophe, asterisk ],
--- a/src/xorg/keytables/sun-src/symbols/sun/fr Fri Sep 26 12:26:44 2008 +0200
+++ b/src/xorg/keytables/sun-src/symbols/sun/fr Fri Sep 26 15:49:16 2008 +0200
@@ -59,7 +59,7 @@
key <TLDE> { [ twosuperior ] };
key <AE01> { [ ampersand, 1 ] };
key <AE02> { [ eacute, 2 ],
- [ dead_tilde ] };
+ [ asciitilde ] };
key <AE03> { [ quotedbl, 3 ],
[ numbersign ] };
key <AE04> { [ apostrophe, 4 ],
@@ -69,7 +69,7 @@
key <AE06> { [ minus, 6 ],
[ bar ] };
key <AE07> { [ egrave, 7 ],
- [ dead_grave ] };
+ [ grave ] };
key <AE08> { [ underscore, 8 ],
[ backslash ] };
key <AE09> { [ ccedilla, 9 ],
@@ -90,7 +90,7 @@
key <AC01> { [ q, Q ] };
key <AC10> { [ m, M ] };
key <AC11> { [ ugrave, percent ] };
- key <LSGT> { [ less, greater ] };
+ key <LSGT> { [ less, greater ] };
key <AB01> { [ w, W ] };
key <AB07> { [ comma, question ] };
key <AB08> { [ semicolon, period ] };
@@ -99,11 +99,6 @@
key <BKSL> { [ asterisk, mu ] };
// End alphanumeric section
- // begin modifier mappings
- modifier_map Shift { Shift_L };
- modifier_map Lock { Caps_Lock };
- modifier_map Control{ Control_L };
- modifier_map Mod3 { Mode_switch };
};
--- a/src/xorg/keytables/sun-src/symbols/sun/nl Fri Sep 26 12:26:44 2008 +0200
+++ b/src/xorg/keytables/sun-src/symbols/sun/nl Fri Sep 26 15:49:16 2008 +0200
@@ -117,7 +117,7 @@
[ SunFA_Cedilla ] };
key <AD03> { [ e, E ],
[ EuroSign ] };
- key <AD11> { [ SunFA_Diaeresis, SunFA_Circumflex ] };
+ key <AD11> { [ SunFA_Diaeresis, SunFA_Circum ] };
key <AD12> { [ asterisk, bar ],
[ asciitilde ] };
key <AC02> { [ s, S ],
@@ -140,7 +140,7 @@
[ mu ] };
key <AB08> { [ comma, semicolon ] };
key <AB09> { [ period, colon ] };
- key <AB10> { [ minus, equals ] };
+ key <AB10> { [ minus, equal ] };
};
--- a/src/xorg/keytables/sun-src/symbols/sun/no Fri Sep 26 12:26:44 2008 +0200
+++ b/src/xorg/keytables/sun-src/symbols/sun/no Fri Sep 26 15:49:16 2008 +0200
@@ -107,7 +107,7 @@
key <AE03> { [ 3, numbersign ],
[ sterling ] };
key <AE04> { [ 4, currency ],
- [ dollar, ] };
+ [ dollar ] };
key <AE05> { [ 5, percent ],
[ asciitilde ] };
key <AE06> { [ 6, ampersand ],
@@ -126,8 +126,8 @@
key <AD03> { [ e, E ],
[ EuroSign ] };
key <AD11> { [ aring, Aring ] };
- key <AD12> { [ SunFA_Diaeresis, SunFA_Circumflex ],
- [ SunFA_Tilde, ] };
+ key <AD12> { [ SunFA_Diaeresis, SunFA_Circum ],
+ [ SunFA_Tilde ] };
key <AC10> { [ oslash, Oslash ] };
key <AC11> { [ ae, AE ] };
key <AB08> { [ comma, semicolon ] };
--- a/src/xorg/keytables/sun-src/symbols/sun/ru Fri Sep 26 12:26:44 2008 +0200
+++ b/src/xorg/keytables/sun-src/symbols/sun/ru Fri Sep 26 15:49:16 2008 +0200
@@ -54,18 +54,18 @@
xkb_symbols "type6" {
include "sun/us(type6)"
- key <AE02> { [ 2, at ],
- [ quotedbl ] };
- key <AE03> { [ 3, numbersign ],
- [ 3, numerosign ] };
- key <AE04> { [ 4, dollar ],
- [ 4, percent ] };
- key <AE05> { [ 5, percent ],
- [ 5, colon ] };
- key <AE07> { [ 7, ampersand ],
- [ 7, period ] };
- key <AE08> { [ 8, asterisk ],
- [ 8, semicolon ] };
+ key <AE02> { [ 2, quotedbl ],
+ [ at ] };
+ key <AE03> { [ 3, numerosign ],
+ [ 3, numbersign ] };
+ key <AE04> { [ 4, percent ],
+ [ 4, dollar ] };
+ key <AE05> { [ 5, colon ],
+ [ 5, percent ] };
+ key <AE07> { [ 7, period ],
+ [ 7, ampersand ] };
+ key <AE08> { [ 8, semicolon ],
+ [ 8, asterisk ] };
key <AD01> { [ Cyrillic_shorti, Cyrillic_SHORTI ],
[ q, Q ] };
@@ -131,10 +131,10 @@
[ comma, less ] };
key <AB09> { [ Cyrillic_yu, Cyrillic_YU ],
[ period, greater ] };
- key <BKSL> { [ backslash, bar ],
- [ slash, question ] };
- key <AB10> { [ slash, question ],
- [ ediaeresis, Ediaeresis ] };
+ key <BKSL> { [ slash, question ],
+ [ backslash, bar ] };
+ key <AB10> { [ ediaeresis, Ediaeresis ],
+ [ slash, question ] };
key <LSGT> { [ backslash, bar ] };
};
--- a/src/xorg/keytables/sun-src/symbols/sun/se Fri Sep 26 12:26:44 2008 +0200
+++ b/src/xorg/keytables/sun-src/symbols/sun/se Fri Sep 26 15:49:16 2008 +0200
@@ -272,8 +272,8 @@
key <AD03> { [ e, E ],
[ EuroSign ] };
key <AD11> { [ aring, Aring ] };
- key <AD12> { [ SunFA_Diaeresis, SunFA_Circumflex ],
- [ SunFA_tilde ] };
+ key <AD12> { [ SunFA_Diaeresis, asciicircum ],
+ [ asciitilde ] };
key <AC10> { [ odiaeresis, Odiaeresis ] };
key <AC11> { [ adiaeresis, Adiaeresis ] };
key <BKSL> { [ apostrophe, asterisk ],
--- a/src/xorg/keytables/sun-src/symbols/sun/sk Fri Sep 26 12:26:44 2008 +0200
+++ b/src/xorg/keytables/sun-src/symbols/sun/sk Fri Sep 26 15:49:16 2008 +0200
@@ -70,7 +70,7 @@
[ SunFA_Circum ] };
key <AE04> { [ ccaron, 4 ],
[ dead_breve ] };
- key <AE05> { [ tcaron, 5 ]
+ key <AE05> { [ tcaron, 5 ],
[ dead_abovering ] };
key <AE06> { [ zcaron, 6 ],
[ dead_ogonek ] };
--- a/src/xorg/keytables/sun-src/symbols/sun/tr Fri Sep 26 12:26:44 2008 +0200
+++ b/src/xorg/keytables/sun-src/symbols/sun/tr Fri Sep 26 15:49:16 2008 +0200
@@ -83,12 +83,12 @@
key <AD08> { [ idotless, I ] };
key <AD11> { [ gbreve, Gbreve ] };
key <AD12> { [ udiaeresis, Udiaeresis ],
- [ dead_tilde ] };
+ [ asciitilde ] };
key <AC10> { [ scedilla, Scedilla ],
- [ SunFA_Acute ] };
+ [ acute ] };
key <AC11> { [ i, Iabovedot ] };
key <BKSL> { [ comma, semicolon ],
- [ SunFA_Grave ] };
+ [ quoteleft ] };
key <AB08> { [ odiaeresis, Odiaeresis ],
[ less ] };
key <AB09> { [ ccedilla, Ccedilla ],