diff options
| author | svu <svu> | 2004-04-24 00:28:51 +0000 |
|---|---|---|
| committer | svu <svu> | 2004-04-24 00:28:51 +0000 |
| commit | 8e1e2d8195a0deb742464821a463322a29bdca08 (patch) | |
| tree | 83d9877bbf8b0875909713dc6a5a2f881d33b084 | |
| parent | de82d2e5c50cf0cb674367d72cda30dee0ad8622 (diff) | |
a lot of layouts cleaned up - but way way more to go
92 files changed, 1053 insertions, 1220 deletions
diff --git a/geometry/digital.vndr/pc b/geometry/digital.vndr/pc index 1529ed20..6c02fae4 100644 --- a/geometry/digital.vndr/pc +++ b/geometry/digital.vndr/pc @@ -164,7 +164,7 @@ partial xkb_geometry "leds_alone" { }; xkb_geometry "pc101" { - include "digital/pc(common)" + include "digital.vndr/pc(common)" shape.cornerRadius = 1; shape "BKSP" { primary = { [36,19] }, { [3,2], [33,16] } }; @@ -225,7 +225,7 @@ xkb_geometry "pc101" { }; xkb_geometry "pc102" { - include "digital/pc(common)" + include "digital.vndr/pc(common)" shape.cornerRadius = 1; shape "BKSP" { primary = { [36,19] }, { [3,2], [33,16] } }; @@ -289,7 +289,7 @@ xkb_geometry "pc102" { }; xkb_geometry "pcxaj" { - include "digital/pc(common)" + include "digital.vndr/pc(common)" shape.cornerRadius = 1; shape "BKSP" { primary = { [36,19] }, { [3,2], [33,16] } }; diff --git a/geometry/ibm.vndr/thinkpad b/geometry/ibm.vndr/thinkpad index c9b769cc..9eaf5323 100644 --- a/geometry/ibm.vndr/thinkpad +++ b/geometry/ibm.vndr/thinkpad @@ -167,7 +167,7 @@ xkb_geometry "common" { // 85 keys // US/English (FRU 02K4785). xkb_geometry "us" { - include "thinkpad(common)" + include "ibm.vndr/thinkpad(common)" description = "IBM ThinkPad 560Z/600/600E/A22E, US"; shape "RTRN" { cornerRadius = 1, { [43, 18] }, { [2.5, 0], [40.5, 14] } }; @@ -217,7 +217,7 @@ xkb_geometry "us" { // 86 keys // Tested on: DE/German, UK/English (FRU 02K4787). xkb_geometry "intl" { - include "thinkpad(common)" + include "ibm.vndr/thinkpad(common)" description = "IBM ThinkPad 560Z/600/600E/A22E, Intl"; shape "RTRN" { cornerRadius = 1, { [28, 0], [28, 37], [4, 37], [4, 18], diff --git a/keycodes/digital.vndr/lk b/keycodes/digital.vndr/lk index 2d8c5842..d9fbcba6 100644 --- a/keycodes/digital.vndr/lk +++ b/keycodes/digital.vndr/lk @@ -151,7 +151,7 @@ xkb_keycodes "lk_common" { }; xkb_keycodes "lkx01" { - include "digital/lk(lk_common)" + include "digital.vndr/lk(lk_common)" <AB00> = 201; <FK13> = 115; <FK14> = 116; @@ -178,7 +178,7 @@ xkb_keycodes "lkx01" { }; xkb_keycodes "lk201" { - include "digital/lk(lkx01)" + include "digital.vndr/lk(lkx01)" indicator 4 = "Scroll Lock"; indicator 3 = "Caps Lock"; indicator 2 = "Compose"; @@ -186,20 +186,20 @@ xkb_keycodes "lk201" { }; xkb_keycodes "lk421" { - include "digital/lk(lkx01)" + include "digital.vndr/lk(lkx01)" <LALT> = 172; <RALT> = 178; <RCMP> = 173; }; xkb_keycodes "lk401" { - include "digital/lk(lk421)" + include "digital.vndr/lk(lk421)" indicator 4 = "Scroll Lock"; indicator 3 = "Caps Lock"; }; xkb_keycodes "lk44x" { - include "digital/lk(lk_common)" + include "digital.vndr/lk(lk_common)" <ESC> = 85; <PRSC> = 115; <SCLK> = 116; @@ -221,7 +221,7 @@ xkb_keycodes "lk44x" { }; xkb_keycodes "lk443" { - include "digital/lk(lk44x)" + include "digital.vndr/lk(lk44x)" <BKSL> = 247; indicator 3 = "Caps Lock"; indicator 4 = "Scroll Lock"; @@ -229,7 +229,7 @@ xkb_keycodes "lk443" { }; xkb_keycodes "lk444" { - include "digital/lk(lk44x)" + include "digital.vndr/lk(lk44x)" <BKSL> = 201; <AC12> = 247; indicator 3 = "Caps Lock"; @@ -247,25 +247,25 @@ xkb_keycodes "lk444" { // LK441-LT = lk443 xkb_keycodes "lk421aj" { - include "digital/lk(lk421)" + include "digital.vndr/lk(lk421)" <AB11> = 252; }; xkb_keycodes "lk421jj" { - include "digital/lk(lk421aj)" + include "digital.vndr/lk(lk421aj)" <MUHE> = 94; <KANJ> = 95; <HIRA> = 97; }; xkb_keycodes "lk401bj" { - include "digital/lk(lk401)" + include "digital.vndr/lk(lk401)" <MUHE> = 94; <KANJ> = 95; <HIRA> = 97; }; xkb_keycodes "lk401jj" { - include "digital/lk(lk401bj)" + include "digital.vndr/lk(lk401bj)" <AB11> = 252; }; diff --git a/keycodes/digital.vndr/pc b/keycodes/digital.vndr/pc index b0aebc3e..d37053aa 100644 --- a/keycodes/digital.vndr/pc +++ b/keycodes/digital.vndr/pc @@ -160,7 +160,7 @@ xkb_keycodes "pc_common" { }; xkb_keycodes "pc10x" { - include "digital/pc(pc_common)" + include "digital.vndr/pc(pc_common)" <ESC> = 8; <AE00> = 14; <PRSC> = 87; @@ -186,28 +186,28 @@ xkb_keycodes "pc10x" { }; xkb_keycodes "pc101" { - include "digital/pc(pc10x)" + include "digital.vndr/pc(pc10x)" <BKSL> = 92; indicator 5 = "Num Lock"; }; xkb_keycodes "pc102" { - include "digital/pc(pc10x)" + include "digital.vndr/pc(pc10x)" <BKSL> = 19; <AC12> = 83; indicator 5 = "Num Lock"; }; xkb_keycodes "pc104" { - include "digital/pc(pc101)" + include "digital.vndr/pc(pc101)" <LWIN> = 139; <RWIN> = 140; <MENU> = 141; }; xkb_keycodes "lk411_common" { - include "digital/pc(pc_common)" + include "digital.vndr/pc(pc_common)" <AE00> = 8; <AB00> = 14; <FK13> = 24; @@ -240,12 +240,12 @@ xkb_keycodes "lk411_common" { }; xkb_keycodes "lk411" { - include "digital/pc(lk411_common)" + include "digital.vndr/pc(lk411_common)" <BKSL> = 92; }; xkb_keycodes "lk450" { - include "digital/pc(lk411)" + include "digital.vndr/pc(lk411)" indicator 2 = "Compose"; indicator 1 = "Wait"; }; @@ -258,7 +258,7 @@ xkb_keycodes "lk450" { // LK411-LT = lk411 xkb_keycodes "pcxajaa" { - include "digital/pc(pc10x)" + include "digital.vndr/pc(pc10x)" <BKSL> = 93; <AC12> = 83; <AB11> = 81; @@ -269,7 +269,7 @@ xkb_keycodes "pcxajaa" { }; xkb_keycodes "lk411jj" { - include "digital/pc(lk411_common)" + include "digital.vndr/pc(lk411_common)" <AB11> = 81; <BKSL> = 83; <MUHE> = 133; diff --git a/keycodes/sgi.vndr/indigo b/keycodes/sgi.vndr/indigo index df868026..35aef870 100644 --- a/keycodes/sgi.vndr/indigo +++ b/keycodes/sgi.vndr/indigo @@ -135,6 +135,6 @@ default xkb_keycodes "pc101" { indicator 7 = "Scroll Lock"; }; xkb_keycodes "pc102" { - include "sgi/indigo(pc101)" + include "sgi.vndr/indigo(pc101)" <LSGT> = 118; }; diff --git a/keycodes/sgi.vndr/indy b/keycodes/sgi.vndr/indy index f59609d8..cd242677 100644 --- a/keycodes/sgi.vndr/indy +++ b/keycodes/sgi.vndr/indy @@ -2,7 +2,7 @@ default xkb_keycodes "universal" { minimum= 15; maximum= 149; - include "sgi/indy(pc105)" + include "sgi.vndr/indy(pc105)" alternate <BKSL> = 91; alternate <BKSL> = 100; alternate <BKSL> = 101; @@ -146,12 +146,12 @@ xkb_keycodes "pc101" { xkb_keycodes "pc102" { <BKSL> = 91; <LSGT> = 27; - augment "sgi/indy(pc101)" + augment "sgi.vndr/indy(pc101)" maximum= 149; minimum= 15; }; xkb_keycodes "pc104" { - include "sgi/indy(pc101)" + include "sgi.vndr/indy(pc101)" minimum= 15; maximum= 149; @@ -163,7 +163,7 @@ xkb_keycodes "pc104" { }; xkb_keycodes "pc105" { <LSGT> = 27; - augment "sgi/indy(pc104)" + augment "sgi.vndr/indy(pc104)" minimum= 15; maximum= 149; }; @@ -177,7 +177,7 @@ xkb_keycodes "jp106" { alias <TLDE> = <HZTG>; alias <AE00> = <HZTG>; alias <AE13> = <BKSL>; - augment "sgi/indy(pc101)" + augment "sgi.vndr/indy(pc101)" minimum= 15; maximum= 149; }; diff --git a/keycodes/sgi.vndr/iris b/keycodes/sgi.vndr/iris index 30375e9b..70cf9be3 100644 --- a/keycodes/sgi.vndr/iris +++ b/keycodes/sgi.vndr/iris @@ -1,6 +1,6 @@ // $Xorg: iris,v 1.3 2000/08/17 19:54:39 cpqbld Exp $ default xkb_keycodes "iris" { - include "sgi/indigo(pc101)" + include "sgi.vndr/indigo(pc101)" indicator 1 = "L1"; indicator 2 = "L2"; indicator 3 = "L3"; diff --git a/keymap/digital.vndr/us b/keymap/digital.vndr/us index 00058cd8..c1648be5 100644 --- a/keymap/digital.vndr/us +++ b/keymap/digital.vndr/us @@ -55,134 +55,134 @@ // ************************************************************** xkb_keymap "lk201" { - xkb_keycodes { include "digital/lk(lk201)" }; + xkb_keycodes { include "digital.vndr/lk(lk201)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "digital/us(vt105)" }; + xkb_symbols { include "digital.vndr/us(vt105)" }; xkb_geometry { description = "Digital US LK201"; - include "digital/lk(lk201)" }; + include "digital.vndr/lk(lk201)" }; }; xkb_keymap "lk401" { - xkb_keycodes { include "digital/lk(lk401)" }; + xkb_keycodes { include "digital.vndr/lk(lk401)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "digital/us(vt108)" }; + xkb_symbols { include "digital.vndr/us(vt108)" }; xkb_geometry { description = "Digital US LK401"; - include "digital/lk(lk401)" }; + include "digital.vndr/lk(lk401)" }; }; xkb_keymap "lk411" { - xkb_keycodes { include "digital/pc(lk411)" }; + xkb_keycodes { include "digital.vndr/pc(lk411)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "digital/us(vt108)" }; + xkb_symbols { include "digital.vndr/us(vt108)" }; xkb_geometry { description = "Digital US LK411"; - include "digital/lk(lk401)" }; + include "digital.vndr/lk(lk401)" }; }; xkb_keymap "lk421" { - xkb_keycodes { include "digital/lk(lk421)" }; + xkb_keycodes { include "digital.vndr/lk(lk421)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "digital/us(unix)" }; + xkb_symbols { include "digital.vndr/us(unix)" }; xkb_geometry { description = "Digital US LK421"; - include "digital/unix(unix)" }; + include "digital.vndr/unix(unix)" }; }; xkb_keymap "lk441" { - xkb_keycodes { include "digital/lk(lk443)" }; + xkb_keycodes { include "digital.vndr/lk(lk443)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "digital/us(lk44x)" }; + xkb_symbols { include "digital.vndr/us(lk44x)" }; xkb_geometry { description = "Digital US LK441"; - include "digital/pc(pc101)" - include "digital/pc(leds_alone)" }; + include "digital.vndr/pc(pc101)" + include "digital.vndr/pc(leds_alone)" }; }; xkb_keymap "lk443" { - xkb_keycodes { include "digital/lk(lk443)" }; + xkb_keycodes { include "digital.vndr/lk(lk443)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "digital/us(lk44x)" }; + xkb_symbols { include "digital.vndr/us(lk44x)" }; xkb_geometry { description = "Digital US LK443"; - include "digital/pc(pc101)" - include "digital/pc(leds_alone)" }; + include "digital.vndr/pc(pc101)" + include "digital.vndr/pc(leds_alone)" }; }; xkb_keymap "lk44x" { - xkb_keycodes { include "digital/lk(lk443)" }; + xkb_keycodes { include "digital.vndr/lk(lk443)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "digital/us(lk44x)" }; + xkb_symbols { include "digital.vndr/us(lk44x)" }; xkb_geometry { description = "Digital US LK443"; - include "digital/pc(pc101)" - include "digital/pc(leds_alone)" }; + include "digital.vndr/pc(pc101)" + include "digital.vndr/pc(leds_alone)" }; }; xkb_keymap "lk450" { - xkb_keycodes { include "digital/pc(lk450)" }; + xkb_keycodes { include "digital.vndr/pc(lk450)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "digital/us(vt108)" }; + xkb_symbols { include "digital.vndr/us(vt108)" }; xkb_geometry { description = "Digital US LK450"; - include "digital/lk(lk450)" }; + include "digital.vndr/lk(lk450)" }; }; xkb_keymap "pcxalaa" { - xkb_keycodes { include "digital/pc(pc101)" }; + xkb_keycodes { include "digital.vndr/pc(pc101)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "digital/us(pcxalaa)" }; + xkb_symbols { include "digital.vndr/us(pcxalaa)" }; xkb_geometry { description = "Digital US PCXAL-AA"; - include "digital/pc(pc101)" - include "digital/pc(leds_alone)" }; + include "digital.vndr/pc(pc101)" + include "digital.vndr/pc(leds_alone)" }; }; xkb_keymap "pcxalfa" { - xkb_keycodes { include "digital/pc(pc101)" }; + xkb_keycodes { include "digital.vndr/pc(pc101)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "digital/us(pcxalfa)" }; + xkb_symbols { include "digital.vndr/us(pcxalfa)" }; xkb_geometry { description = "Digital US PCXAL-FA"; - include "digital/pc(pc101)" - include "digital/pc(leds_on_keys)" }; + include "digital.vndr/pc(pc101)" + include "digital.vndr/pc(leds_on_keys)" }; }; xkb_keymap "pcxalga" { - xkb_keycodes { include "digital/pc(pc101)" }; + xkb_keycodes { include "digital.vndr/pc(pc101)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "digital/us(pcxalga)" }; + xkb_symbols { include "digital.vndr/us(pcxalga)" }; xkb_geometry { description = "Digital US PCXAL-GA"; - include "digital/pc(pc101)" - include "digital/pc(leds_alone)" }; + include "digital.vndr/pc(pc101)" + include "digital.vndr/pc(leds_alone)" }; }; xkb_keymap "pcxalka" { - xkb_keycodes { include "digital/pc(pc101)" }; + xkb_keycodes { include "digital.vndr/pc(pc101)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "digital/us(pcxalka)" }; + xkb_symbols { include "digital.vndr/us(pcxalka)" }; xkb_geometry { description = "Digital US PCXAL-KA"; - include "digital/pc(pc101)" - include "digital/pc(leds_alone)" }; + include "digital.vndr/pc(pc101)" + include "digital.vndr/pc(leds_alone)" }; }; xkb_keymap "pcxal" { - xkb_keycodes { include "digital/pc(pc101)" }; + xkb_keycodes { include "digital.vndr/pc(pc101)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "digital/us(pcxal)" }; + xkb_symbols { include "digital.vndr/us(pcxal)" }; xkb_geometry { description = "Digital US PCXAL"; - include "digital/pc(pc101)" - include "digital/pc(leds_alone)" }; + include "digital.vndr/pc(pc101)" + include "digital.vndr/pc(leds_alone)" }; }; xkb_keymap "mnk" { - xkb_keycodes { include "digital/pc(pc104)" }; + xkb_keycodes { include "digital.vndr/pc(pc104)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "digital/us(pc104)" }; + xkb_symbols { include "digital.vndr/us(pc104)" }; xkb_geometry { include "microsoft" }; }; diff --git a/keymap/macintosh b/keymap/macintosh index d230dca9..80aa12c7 100644 --- a/keymap/macintosh +++ b/keymap/macintosh @@ -4,7 +4,7 @@ default xkb_keymap "macintosh" { xkb_keycodes { include "xfree86" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "macintosh/us(extended)" }; + xkb_symbols { include "macintosh.vndr/us(extended)" }; xkb_geometry { include "macintosh" }; }; @@ -12,6 +12,6 @@ xkb_keymap "macintosh_old" { xkb_keycodes { include "macintosh" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "macintosh/us(extended)" }; + xkb_symbols { include "macintosh.vndr/us(extended)" }; xkb_geometry { include "macintosh" }; }; diff --git a/keymap/sgi.vndr/Makefile.am b/keymap/sgi.vndr/Makefile.am index 1c1cb522..8020d247 100644 --- a/keymap/sgi.vndr/Makefile.am +++ b/keymap/sgi.vndr/Makefile.am @@ -1,13 +1,13 @@ km_DATA = \ be bg ca \ -cz cz_qwerty de \ -de_CH dk dvorak \ -en_US es fi \ -fr fr_CH gb \ +ch cz de \ +dk dvorak \ +es fi \ +fr gb \ hu it jp \ no pl pt \ ru se sk \ -sk_qwerty th us +th us EXTRA_DIST= $(km_DATA) diff --git a/keymap/sgi.vndr/be b/keymap/sgi.vndr/be index ef8c3dca..ed80bd32 100644 --- a/keymap/sgi.vndr/be +++ b/keymap/sgi.vndr/be @@ -1,34 +1,34 @@ // $Xorg: be,v 1.3 2000/08/17 19:54:40 cpqbld Exp $ default xkb_keymap "indy" { - xkb_keycodes { include "sgi/indy(universal)" }; + xkb_keycodes { include "sgi.vndr/indy(universal)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc_universal)+be" }; - xkb_geometry { include "sgi/indy(pc102)" }; + xkb_geometry { include "sgi.vndr/indy(pc102)" }; }; xkb_keymap "indy_nodeadkeys" { - xkb_keycodes { include "sgi/indy(universal)" }; + xkb_keycodes { include "sgi.vndr/indy(universal)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc_universal_nodeadkeys)+be(nodeadkeys)" }; - xkb_geometry { include "sgi/indy(pc102)" }; + xkb_geometry { include "sgi.vndr/indy(pc102)" }; }; xkb_keymap "indigo" { - xkb_keycodes { include "sgi/indigo(pc102)" }; + xkb_keycodes { include "sgi.vndr/indigo(pc102)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc102)+be" }; - xkb_geometry { include "sgi/indigo(pc102)" }; + xkb_geometry { include "sgi.vndr/indigo(pc102)" }; }; xkb_keymap "indigo_nodeadkeys" { - xkb_keycodes { include "sgi/indigo(pc102)" }; + xkb_keycodes { include "sgi.vndr/indigo(pc102)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc102_nodeadkeys)+be(nodeadkeys)" }; - xkb_geometry { include "sgi/indigo(pc102)" }; + xkb_geometry { include "sgi.vndr/indigo(pc102)" }; }; diff --git a/keymap/sgi.vndr/bg b/keymap/sgi.vndr/bg index 46cd5450..c1709884 100644 --- a/keymap/sgi.vndr/bg +++ b/keymap/sgi.vndr/bg @@ -1,19 +1,19 @@ // $Xorg: bg,v 1.3 2000/08/17 19:54:40 cpqbld Exp $ default xkb_keymap "indy" { - xkb_keycodes { include "sgi/indy(universal)" }; + xkb_keycodes { include "sgi.vndr/indy(universal)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "us(pc_universal)+bg+group(shift_toggle)" }; - xkb_geometry { include "sgi/indy(pc102)" }; + xkb_geometry { include "sgi.vndr/indy(pc102)" }; }; xkb_keymap "indigo" { - xkb_keycodes { include "sgi/indigo(pc102)" }; + xkb_keycodes { include "sgi.vndr/indigo(pc102)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "us(pc102)+bg+group(shift_toggle)" }; - xkb_geometry { include "sgi/indigo(pc102)" }; + xkb_geometry { include "sgi.vndr/indigo(pc102)" }; }; diff --git a/keymap/sgi.vndr/ca b/keymap/sgi.vndr/ca index 9030e157..e1b862c5 100644 --- a/keymap/sgi.vndr/ca +++ b/keymap/sgi.vndr/ca @@ -1,33 +1,33 @@ // $Xorg: ca,v 1.3 2000/08/17 19:54:40 cpqbld Exp $ default xkb_keymap "indy" { - xkb_keycodes { include "sgi/indy(universal)" }; + xkb_keycodes { include "sgi.vndr/indy(universal)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc_universal)+ca" }; - xkb_geometry { include "sgi/indy(pc102)" }; + xkb_geometry { include "sgi.vndr/indy(pc102)" }; }; xkb_keymap "indy_nodeadkeys" { - xkb_keycodes { include "sgi/indy(universal)" }; + xkb_keycodes { include "sgi.vndr/indy(universal)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc_universal_nodeadkeys)+ca(nodeadkeys)" }; - xkb_geometry { include "sgi/indy(pc102)" }; + xkb_geometry { include "sgi.vndr/indy(pc102)" }; }; xkb_keymap "indigo" { - xkb_keycodes { include "sgi/indigo(pc102)" }; + xkb_keycodes { include "sgi.vndr/indigo(pc102)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc102)+ca" }; - xkb_geometry { include "sgi/indigo(pc102)" }; + xkb_geometry { include "sgi.vndr/indigo(pc102)" }; }; xkb_keymap "indigo_nodeadkeys" { - xkb_keycodes { include "sgi/indigo(pc102)" }; + xkb_keycodes { include "sgi.vndr/indigo(pc102)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc102_nodeadkeys)+ca(nodeadkeys)" }; - xkb_geometry { include "sgi/indigo(pc102)" }; + xkb_geometry { include "sgi.vndr/indigo(pc102)" }; }; diff --git a/keymap/sgi.vndr/ch b/keymap/sgi.vndr/ch new file mode 100644 index 00000000..e7ba8689 --- /dev/null +++ b/keymap/sgi.vndr/ch @@ -0,0 +1,67 @@ +// $Xorg: de_CH,v 1.3 2000/08/17 19:54:40 cpqbld Exp $ +default xkb_keymap "de_indy" { + xkb_keycodes { include "sgi.vndr/indy(universal)" }; + xkb_types { include "default" }; + xkb_compatibility { include "default" }; + xkb_symbols { include "en_US(pc_universal)+ch(de)" }; + xkb_geometry { include "sgi.vndr/indy(pc102)" }; +}; +xkb_keymap "de_indy_nodeadkeys" { + xkb_keycodes { include "sgi.vndr/indy(universal)" }; + xkb_types { include "default" }; + xkb_compatibility { include "default" }; + xkb_symbols { + include "en_US(pc_universal_nodeadkeys)+ch(de_nodeadkeys)" + }; + xkb_geometry { include "sgi.vndr/indy(pc102)" }; +}; +xkb_keymap "de_indigo" { + xkb_keycodes { include "sgi.vndr/indigo(pc102)" }; + xkb_types { include "default" }; + xkb_compatibility { include "default" }; + xkb_symbols { include "en_US(pc102)+ch(de)" }; + xkb_geometry { include "sgi.vndr/indigo(pc102)" }; +}; +xkb_keymap "de_indigo_nodeadkeys" { + xkb_keycodes { include "sgi.vndr/indigo(pc102)" }; + xkb_types { include "default" }; + xkb_compatibility { include "default" }; + xkb_symbols { + include "en_US(pc102_nodeadkeys)+ch(dr_nodeadkeys)" + }; + xkb_geometry { include "sgi.vndr/indigo(pc102)" }; +}; + +default xkb_keymap "fr_indy" { + xkb_keycodes { include "sgi.vndr/indy(universal)" }; + xkb_types { include "default" }; + xkb_compatibility { include "default" }; + xkb_symbols { include "en_US(pc_universal)+ch(fr)" }; + xkb_geometry { include "sgi.vndr/indy(pc102)" }; +}; +xkb_keymap "fr_indy_nodeadkeys" { + xkb_keycodes { include "sgi.vndr/indy(universal)" }; + xkb_types { include "default" }; + xkb_compatibility { include "default" }; + xkb_symbols { + include "en_US(pc_universal_nodeadkeys)+ch(fr_nodeadkeys)" + }; + xkb_geometry { include "sgi.vndr/indy(pc102)" }; +}; +xkb_keymap "fr_indigo" { + xkb_keycodes { include "sgi.vndr/indigo(pc102)" }; + xkb_types { include "default" }; + xkb_compatibility { include "default" }; + xkb_symbols { include "en_US(pc102)+ch(fr)" }; + xkb_geometry { include "sgi.vndr/indigo(pc102)" }; +}; +xkb_keymap "fr_indigo_nodeadkeys" { + xkb_keycodes { include "sgi.vndr/indigo(pc102)" }; + xkb_types { include "default" }; + xkb_compatibility { include "default" }; + xkb_symbols { + include "en_US(pc102_nodeadkeys)+ch(fr_nodeadkeys)" + }; + xkb_geometry { include "sgi.vndr/indigo(pc102)" }; +}; + diff --git a/keymap/sgi.vndr/cz b/keymap/sgi.vndr/cz index b1c8598b..df8c707e 100644 --- a/keymap/sgi.vndr/cz +++ b/keymap/sgi.vndr/cz @@ -5,17 +5,32 @@ // $XFree86$ default xkb_keymap "indy" { - xkb_keycodes { include "sgi/indy(universal)" }; + xkb_keycodes { include "sgi.vndr/indy(universal)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "us(pc_universal)+cz" }; - xkb_geometry { include "sgi/indy(pc102)" }; + xkb_geometry { include "sgi.vndr/indy(pc102)" }; }; xkb_keymap "indigo" { - xkb_keycodes { include "sgi/indigo(pc102)" }; + xkb_keycodes { include "sgi.vndr/indigo(pc102)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "us(pc102)+cz" }; - xkb_geometry { include "sgi/indigo(pc102)" }; + xkb_geometry { include "sgi.vndr/indigo(pc102)" }; +}; + +default xkb_keymap "indy_qwerty" { + xkb_keycodes { include "sgi.vndr/indy(universal)" }; + xkb_types { include "default" }; + xkb_compatibility { include "default" }; + xkb_symbols { include "us(pc_universal)+cz(qwerty)" }; + xkb_geometry { include "sgi.vndr/indy(pc102)" }; +}; +xkb_keymap "indigo_qwerty" { + xkb_keycodes { include "sgi.vndr/indigo(pc102)" }; + xkb_types { include "default" }; + xkb_compatibility { include "default" }; + xkb_symbols { include "us(pc102)+cz(qwerty)" }; + xkb_geometry { include "sgi.vndr/indigo(pc102)" }; }; diff --git a/keymap/sgi.vndr/cz_qwerty b/keymap/sgi.vndr/cz_qwerty deleted file mode 100644 index a87e7d5a..00000000 --- a/keymap/sgi.vndr/cz_qwerty +++ /dev/null @@ -1,21 +0,0 @@ -// $Xorg: cs,v 1.3 2000/08/17 19:54:40 cpqbld Exp $ -// -// -// -// $XFree86$ - -default xkb_keymap "indy" { - xkb_keycodes { include "sgi/indy(universal)" }; - xkb_types { include "default" }; - xkb_compatibility { include "default" }; - xkb_symbols { include "us(pc_universal)+cz_qwerty" }; - xkb_geometry { include "sgi/indy(pc102)" }; -}; -xkb_keymap "indigo" { - xkb_keycodes { include "sgi/indigo(pc102)" }; - xkb_types { include "default" }; - xkb_compatibility { include "default" }; - xkb_symbols { include "us(pc102)+cz_qwerty" }; - xkb_geometry { include "sgi/indigo(pc102)" }; -}; - diff --git a/keymap/sgi.vndr/de b/keymap/sgi.vndr/de index 1e4cfe73..3286de2c 100644 --- a/keymap/sgi.vndr/de +++ b/keymap/sgi.vndr/de @@ -1,34 +1,34 @@ // $Xorg: de,v 1.3 2000/08/17 19:54:40 cpqbld Exp $ default xkb_keymap "indy" { - xkb_keycodes { include "sgi/indy(universal)" }; + xkb_keycodes { include "sgi.vndr/indy(universal)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc_universal)+de" }; - xkb_geometry { include "sgi/indy(pc102)" }; + xkb_geometry { include "sgi.vndr/indy(pc102)" }; }; xkb_keymap "indy_nodeadkeys" { - xkb_keycodes { include "sgi/indy(universal)" }; + xkb_keycodes { include "sgi.vndr/indy(universal)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc_universal_nodeadkeys)+de(nodeadkeys)" }; - xkb_geometry { include "sgi/indy(pc102)" }; + xkb_geometry { include "sgi.vndr/indy(pc102)" }; }; xkb_keymap "indigo" { - xkb_keycodes { include "sgi/indigo(pc102)" }; + xkb_keycodes { include "sgi.vndr/indigo(pc102)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc102)+de" }; - xkb_geometry { include "sgi/indigo(pc102)" }; + xkb_geometry { include "sgi.vndr/indigo(pc102)" }; }; xkb_keymap "indigo_nodeadkeys" { - xkb_keycodes { include "sgi/indigo(pc102)" }; + xkb_keycodes { include "sgi.vndr/indigo(pc102)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc102_nodeadkeys)+de(nodeadkeys)" }; - xkb_geometry { include "sgi/indigo(pc102)" }; + xkb_geometry { include "sgi.vndr/indigo(pc102)" }; }; diff --git a/keymap/sgi.vndr/de_CH b/keymap/sgi.vndr/de_CH deleted file mode 100644 index 093a5b10..00000000 --- a/keymap/sgi.vndr/de_CH +++ /dev/null @@ -1,34 +0,0 @@ -// $Xorg: de_CH,v 1.3 2000/08/17 19:54:40 cpqbld Exp $ -default xkb_keymap "indy" { - xkb_keycodes { include "sgi/indy(universal)" }; - xkb_types { include "default" }; - xkb_compatibility { include "default" }; - xkb_symbols { include "en_US(pc_universal)+de_CH" }; - xkb_geometry { include "sgi/indy(pc102)" }; -}; -xkb_keymap "indy_nodeadkeys" { - xkb_keycodes { include "sgi/indy(universal)" }; - xkb_types { include "default" }; - xkb_compatibility { include "default" }; - xkb_symbols { - include "en_US(pc_universal_nodeadkeys)+de_CH(nodeadkeys)" - }; - xkb_geometry { include "sgi/indy(pc102)" }; -}; -xkb_keymap "indigo" { - xkb_keycodes { include "sgi/indigo(pc102)" }; - xkb_types { include "default" }; - xkb_compatibility { include "default" }; - xkb_symbols { include "en_US(pc102)+de_CH" }; - xkb_geometry { include "sgi/indigo(pc102)" }; -}; -xkb_keymap "indigo_nodeadkeys" { - xkb_keycodes { include "sgi/indigo(pc102)" }; - xkb_types { include "default" }; - xkb_compatibility { include "default" }; - xkb_symbols { - include "en_US(pc102_nodeadkeys)+de_CH(nodeadkeys)" - }; - xkb_geometry { include "sgi/indigo(pc102)" }; -}; - diff --git a/keymap/sgi.vndr/dk b/keymap/sgi.vndr/dk index 9eceffd1..9fb71ad1 100644 --- a/keymap/sgi.vndr/dk +++ b/keymap/sgi.vndr/dk @@ -1,34 +1,34 @@ // $Xorg: dk,v 1.3 2000/08/17 19:54:40 cpqbld Exp $ default xkb_keymap "indy" { - xkb_keycodes { include "sgi/indy(universal)" }; + xkb_keycodes { include "sgi.vndr/indy(universal)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc_universal)+dk" }; - xkb_geometry { include "sgi/indy(pc102)" }; + xkb_geometry { include "sgi.vndr/indy(pc102)" }; }; xkb_keymap "indy_nodeadkeys" { - xkb_keycodes { include "sgi/indy(universal)" }; + xkb_keycodes { include "sgi.vndr/indy(universal)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc_universal_nodeadkeys)+dk(nodeadkeys)" }; - xkb_geometry { include "sgi/indy(pc102)" }; + xkb_geometry { include "sgi.vndr/indy(pc102)" }; }; xkb_keymap "indigo" { - xkb_keycodes { include "sgi/indigo(pc102)" }; + xkb_keycodes { include "sgi.vndr/indigo(pc102)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc102)+dk" }; - xkb_geometry { include "sgi/indigo(pc102)" }; + xkb_geometry { include "sgi.vndr/indigo(pc102)" }; }; xkb_keymap "indigo_nodeadkeys" { - xkb_keycodes { include "sgi/indigo(pc102)" }; + xkb_keycodes { include "sgi.vndr/indigo(pc102)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc102_nodeadkeys)+dk(nodeadkeys)" }; - xkb_geometry { include "sgi/indigo(pc102)" }; + xkb_geometry { include "sgi.vndr/indigo(pc102)" }; }; diff --git a/keymap/sgi.vndr/dvorak b/keymap/sgi.vndr/dvorak index a282cd18..9c51632b 100644 --- a/keymap/sgi.vndr/dvorak +++ b/keymap/sgi.vndr/dvorak @@ -1,15 +1,15 @@ // $Xorg: dvorak,v 1.3 2000/08/17 19:54:40 cpqbld Exp $ default xkb_keymap "indy" { - xkb_keycodes { include "sgi/indy(universal)" }; + xkb_keycodes { include "sgi.vndr/indy(universal)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "us(pc_universal)+dvorak" }; - xkb_geometry { include "sgi/indy(pc101)" }; + xkb_geometry { include "sgi.vndr/indy(pc101)" }; }; xkb_keymap "indigo" { - xkb_keycodes { include "sgi/indigo" }; + xkb_keycodes { include "sgi.vndr/indigo" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "us(pc101)+dvorak" }; - xkb_geometry { include "sgi/indigo(pc101)" }; + xkb_geometry { include "sgi.vndr/indigo(pc101)" }; }; diff --git a/keymap/sgi.vndr/en_US b/keymap/sgi.vndr/en_US index 446f5632..b4702236 100644 --- a/keymap/sgi.vndr/en_US +++ b/keymap/sgi.vndr/en_US @@ -1,58 +1,58 @@ // $Xorg: en_US,v 1.3 2000/08/17 19:54:40 cpqbld Exp $ default xkb_keymap "indy" { - xkb_keycodes { include "sgi/indy(universal)" }; + xkb_keycodes { include "sgi.vndr/indy(universal)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc_universal)" }; - xkb_geometry { include "sgi/indy(pc102)" }; + xkb_geometry { include "sgi.vndr/indy(pc102)" }; }; xkb_keymap "indy_nodeadkeys" { - xkb_keycodes { include "sgi/indy(universal)" }; + xkb_keycodes { include "sgi.vndr/indy(universal)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc_universal_nodeadkeys)" }; - xkb_geometry { include "sgi/indy(pc102)" }; + xkb_geometry { include "sgi.vndr/indy(pc102)" }; }; xkb_keymap "indy101" { - xkb_keycodes { include "sgi/indy(universal)" }; + xkb_keycodes { include "sgi.vndr/indy(universal)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc_universal)" }; - xkb_geometry { include "sgi/indy(pc101)" }; + xkb_geometry { include "sgi.vndr/indy(pc101)" }; }; xkb_keymap "indy101_nodeadkeys" { - xkb_keycodes { include "sgi/indy(universal)" }; + xkb_keycodes { include "sgi.vndr/indy(universal)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc_universal_nodeadkeys)" }; - xkb_geometry { include "sgi/indy(pc101)" }; + xkb_geometry { include "sgi.vndr/indy(pc101)" }; }; xkb_keymap "indy104" { - xkb_keycodes { include "sgi/indy(universal)" }; + xkb_keycodes { include "sgi.vndr/indy(universal)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc_universal)" }; xkb_geometry { include "microsoft(natural)" }; }; xkb_keymap "indy104_nodeadkeys" { - xkb_keycodes { include "sgi/indy(universal)" }; + xkb_keycodes { include "sgi.vndr/indy(universal)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc_universal_nodeadkeys)" }; xkb_geometry { include "microsoft(natural)" }; }; xkb_keymap "indigo" { - xkb_keycodes { include "sgi/indigo(pc102)" }; + xkb_keycodes { include "sgi.vndr/indigo(pc102)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc102)" }; - xkb_geometry { include "sgi/indigo(pc102)" }; + xkb_geometry { include "sgi.vndr/indigo(pc102)" }; }; xkb_keymap "indigo_nodeadkeys" { - xkb_keycodes { include "sgi/indigo(pc102)" }; + xkb_keycodes { include "sgi.vndr/indigo(pc102)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc102_nodeadkeys)" }; - xkb_geometry { include "sgi/indigo(pc102)" }; + xkb_geometry { include "sgi.vndr/indigo(pc102)" }; }; diff --git a/keymap/sgi.vndr/es b/keymap/sgi.vndr/es index a57750c9..69556713 100644 --- a/keymap/sgi.vndr/es +++ b/keymap/sgi.vndr/es @@ -1,34 +1,34 @@ // $Xorg: es,v 1.3 2000/08/17 19:54:40 cpqbld Exp $ default xkb_keymap "indy" { - xkb_keycodes { include "sgi/indy(universal)" }; + xkb_keycodes { include "sgi.vndr/indy(universal)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc_universal)+es" }; - xkb_geometry { include "sgi/indy(pc102)" }; + xkb_geometry { include "sgi.vndr/indy(pc102)" }; }; xkb_keymap "indy_nodeadkeys" { - xkb_keycodes { include "sgi/indy(universal)" }; + xkb_keycodes { include "sgi.vndr/indy(universal)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc_universal_nodeadkeys)+es(nodeadkeys)" }; - xkb_geometry { include "sgi/indy(pc102)" }; + xkb_geometry { include "sgi.vndr/indy(pc102)" }; }; xkb_keymap "indigo" { - xkb_keycodes { include "sgi/indigo(pc102)" }; + xkb_keycodes { include "sgi.vndr/indigo(pc102)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc102)+es" }; - xkb_geometry { include "sgi/indigo(pc102)" }; + xkb_geometry { include "sgi.vndr/indigo(pc102)" }; }; xkb_keymap "indigo_nodeadkeys" { - xkb_keycodes { include "sgi/indigo(pc102)" }; + xkb_keycodes { include "sgi.vndr/indigo(pc102)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc102_nodeadkeys)+es(nodeadkeys)" }; - xkb_geometry { include "sgi/indigo(pc102)" }; + xkb_geometry { include "sgi.vndr/indigo(pc102)" }; }; diff --git a/keymap/sgi.vndr/fi b/keymap/sgi.vndr/fi index bb0fd208..0d40592e 100644 --- a/keymap/sgi.vndr/fi +++ b/keymap/sgi.vndr/fi @@ -1,34 +1,34 @@ // $Xorg: fi,v 1.3 2000/08/17 19:54:40 cpqbld Exp $ default xkb_keymap "indy" { - xkb_keycodes { include "sgi/indy(universal)" }; + xkb_keycodes { include "sgi.vndr/indy(universal)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc_universal)+fi" }; - xkb_geometry { include "sgi/indy(pc102)" }; + xkb_geometry { include "sgi.vndr/indy(pc102)" }; }; xkb_keymap "indy_nodeadkeys" { - xkb_keycodes { include "sgi/indy(universal)" }; + xkb_keycodes { include "sgi.vndr/indy(universal)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc_universal_nodeadkeys)+fi(nodeadkeys)" }; - xkb_geometry { include "sgi/indy(pc102)" }; + xkb_geometry { include "sgi.vndr/indy(pc102)" }; }; xkb_keymap "indigo" { - xkb_keycodes { include "sgi/indigo(pc102)" }; + xkb_keycodes { include "sgi.vndr/indigo(pc102)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc102)+fi" }; - xkb_geometry { include "sgi/indigo(pc102)" }; + xkb_geometry { include "sgi.vndr/indigo(pc102)" }; }; xkb_keymap "indigo_nodeadkeys" { - xkb_keycodes { include "sgi/indigo(pc102)" }; + xkb_keycodes { include "sgi.vndr/indigo(pc102)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc102_nodeadkeys)+fi(nodeadkeys)" }; - xkb_geometry { include "sgi/indigo(pc102)" }; + xkb_geometry { include "sgi.vndr/indigo(pc102)" }; }; diff --git a/keymap/sgi.vndr/fr b/keymap/sgi.vndr/fr index ecf615f6..c23b2f30 100644 --- a/keymap/sgi.vndr/fr +++ b/keymap/sgi.vndr/fr @@ -1,34 +1,34 @@ // $Xorg: fr,v 1.3 2000/08/17 19:54:40 cpqbld Exp $ default xkb_keymap "indy" { - xkb_keycodes { include "sgi/indy(universal)" }; + xkb_keycodes { include "sgi.vndr/indy(universal)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc_universal)+fr" }; - xkb_geometry { include "sgi/indy(pc102)" }; + xkb_geometry { include "sgi.vndr/indy(pc102)" }; }; xkb_keymap "indy_nodeadkeys" { - xkb_keycodes { include "sgi/indy(universal)" }; + xkb_keycodes { include "sgi.vndr/indy(universal)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc_universal_nodeadkeys)+fr(nodeadkeys)" }; - xkb_geometry { include "sgi/indy(pc102)" }; + xkb_geometry { include "sgi.vndr/indy(pc102)" }; }; xkb_keymap "indigo" { - xkb_keycodes { include "sgi/indigo(pc102)" }; + xkb_keycodes { include "sgi.vndr/indigo(pc102)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc102)+fr" }; - xkb_geometry { include "sgi/indigo(pc102)" }; + xkb_geometry { include "sgi.vndr/indigo(pc102)" }; }; xkb_keymap "indigo_nodeadkeys" { - xkb_keycodes { include "sgi/indigo(pc102)" }; + xkb_keycodes { include "sgi.vndr/indigo(pc102)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc102_nodeadkeys)+fr(nodeadkeys)" }; - xkb_geometry { include "sgi/indigo(pc102)" }; + xkb_geometry { include "sgi.vndr/indigo(pc102)" }; }; diff --git a/keymap/sgi.vndr/fr_CH b/keymap/sgi.vndr/fr_CH deleted file mode 100644 index 3f825e04..00000000 --- a/keymap/sgi.vndr/fr_CH +++ /dev/null @@ -1,34 +0,0 @@ -// $Xorg: fr_CH,v 1.3 2000/08/17 19:54:40 cpqbld Exp $ -default xkb_keymap "indy" { - xkb_keycodes { include "sgi/indy(universal)" }; - xkb_types { include "default" }; - xkb_compatibility { include "default" }; - xkb_symbols { include "en_US(pc_universal)+fr_CH" }; - xkb_geometry { include "sgi/indy(pc102)" }; -}; -xkb_keymap "indy_nodeadkeys" { - xkb_keycodes { include "sgi/indy(universal)" }; - xkb_types { include "default" }; - xkb_compatibility { include "default" }; - xkb_symbols { - include "en_US(pc_universal_nodeadkeys)+fr_CH(nodeadkeys)" - }; - xkb_geometry { include "sgi/indy(pc102)" }; -}; -xkb_keymap "indigo" { - xkb_keycodes { include "sgi/indigo(pc102)" }; - xkb_types { include "default" }; - xkb_compatibility { include "default" }; - xkb_symbols { include "en_US(pc102)+fr_CH" }; - xkb_geometry { include "sgi/indigo(pc102)" }; -}; -xkb_keymap "indigo_nodeadkeys" { - xkb_keycodes { include "sgi/indigo(pc102)" }; - xkb_types { include "default" }; - xkb_compatibility { include "default" }; - xkb_symbols { - include "en_US(pc102_nodeadkeys)+fr_CH(nodeadkeys)" - }; - xkb_geometry { include "sgi/indigo(pc102)" }; -}; - diff --git a/keymap/sgi.vndr/gb b/keymap/sgi.vndr/gb index 5c7566cc..dfb2b884 100644 --- a/keymap/sgi.vndr/gb +++ b/keymap/sgi.vndr/gb @@ -1,34 +1,34 @@ // $Xorg: gb,v 1.3 2000/08/17 19:54:40 cpqbld Exp $ default xkb_keymap "indy" { - xkb_keycodes { include "sgi/indy(universal)" }; + xkb_keycodes { include "sgi.vndr/indy(universal)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc_universal)+gb" }; - xkb_geometry { include "sgi/indy(pc102)" }; + xkb_geometry { include "sgi.vndr/indy(pc102)" }; }; xkb_keymap "indy_nodeadkeys" { - xkb_keycodes { include "sgi/indy(universal)" }; + xkb_keycodes { include "sgi.vndr/indy(universal)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc_universal_nodeadkeys)+gb(nodeadkeys)" }; - xkb_geometry { include "sgi/indy(pc102)" }; + xkb_geometry { include "sgi.vndr/indy(pc102)" }; }; xkb_keymap "indigo" { - xkb_keycodes { include "sgi/indigo(pc102)" }; + xkb_keycodes { include "sgi.vndr/indigo(pc102)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc102)+gb" }; - xkb_geometry { include "sgi/indigo(pc102)" }; + xkb_geometry { include "sgi.vndr/indigo(pc102)" }; }; xkb_keymap "indigo_nodeadkeys" { - xkb_keycodes { include "sgi/indigo(pc102)" }; + xkb_keycodes { include "sgi.vndr/indigo(pc102)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc102_nodeadkeys)+gb(nodeadkeys)" }; - xkb_geometry { include "sgi/indigo(pc102)" }; + xkb_geometry { include "sgi.vndr/indigo(pc102)" }; }; diff --git a/keymap/sgi.vndr/hu b/keymap/sgi.vndr/hu index 92d31a89..773992fa 100644 --- a/keymap/sgi.vndr/hu +++ b/keymap/sgi.vndr/hu @@ -1,105 +1,105 @@ // $Xorg: hu,v 1.3 2000/08/17 19:54:41 cpqbld Exp $ default xkb_keymap "indy" { - xkb_keycodes { include "sgi/indy(universal)" }; + xkb_keycodes { include "sgi.vndr/indy(universal)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc_universal)+hu(basic)" }; - xkb_geometry { include "sgi/indy(pc102)" }; + xkb_geometry { include "sgi.vndr/indy(pc102)" }; }; xkb_keymap "indy_toggle" { - xkb_keycodes { include "sgi/indy(universal)" }; + xkb_keycodes { include "sgi.vndr/indy(universal)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc_universal)+hu(basic)+group(toggle)" }; - xkb_geometry { include "sgi/indy(pc102)" }; + xkb_geometry { include "sgi.vndr/indy(pc102)" }; }; xkb_keymap "indy_shift_toggle" { - xkb_keycodes { include "sgi/indy(universal)" }; + xkb_keycodes { include "sgi.vndr/indy(universal)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc_universal)+hu(basic)+group(shift_toggle)" }; - xkb_geometry { include "sgi/indy(pc102)" }; + xkb_geometry { include "sgi.vndr/indy(pc102)" }; }; xkb_keymap "indy_ctrl_shift_toggle" { - xkb_keycodes { include "sgi/indy(universal)" }; + xkb_keycodes { include "sgi.vndr/indy(universal)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc_universal)+hu(basic)+group(ctrl_shift_toggle)" }; - xkb_geometry { include "sgi/indy(pc102)" }; + xkb_geometry { include "sgi.vndr/indy(pc102)" }; }; xkb_keymap "indy_ctrl_alt_toggle" { - xkb_keycodes { include "sgi/indy(universal)" }; + xkb_keycodes { include "sgi.vndr/indy(universal)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc_universal)+hu(basic)+group(ctrl_alt_toggle)" }; - xkb_geometry { include "sgi/indy(pc102)" }; + xkb_geometry { include "sgi.vndr/indy(pc102)" }; }; xkb_keymap "indy_caps_toggle" { - xkb_keycodes { include "sgi/indy(universal)" }; + xkb_keycodes { include "sgi.vndr/indy(universal)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc_universal)+hu(basic)+group(caps_toggle)" }; - xkb_geometry { include "sgi/indy(pc102)" }; + xkb_geometry { include "sgi.vndr/indy(pc102)" }; }; xkb_keymap "indigo" { - xkb_keycodes { include "sgi/indigo(pc102)" }; + xkb_keycodes { include "sgi.vndr/indigo(pc102)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc102)+hu(basic)" }; - xkb_geometry { include "sgi/indigo(pc102)" }; + xkb_geometry { include "sgi.vndr/indigo(pc102)" }; }; xkb_keymap "indigo_toggle" { - xkb_keycodes { include "sgi/indigo(pc102)" }; + xkb_keycodes { include "sgi.vndr/indigo(pc102)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc102)+hu(basic)+group(toggle)" }; - xkb_geometry { include "sgi/indigo(pc102)" }; + xkb_geometry { include "sgi.vndr/indigo(pc102)" }; }; xkb_keymap "indigo_shift_toggle" { - xkb_keycodes { include "sgi/indigo(pc102)" }; + xkb_keycodes { include "sgi.vndr/indigo(pc102)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc102)+hu(basic)+group(shift_toggle)" }; - xkb_geometry { include "sgi/indigo(pc102)" }; + xkb_geometry { include "sgi.vndr/indigo(pc102)" }; }; xkb_keymap "indigo_ctrl_shift_toggle" { - xkb_keycodes { include "sgi/indigo(pc102)" }; + xkb_keycodes { include "sgi.vndr/indigo(pc102)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc102)+hu(basic)+group(ctrl_shift_toggle)" }; - xkb_geometry { include "sgi/indigo(pc102)" }; + xkb_geometry { include "sgi.vndr/indigo(pc102)" }; }; xkb_keymap "indigo_ctrl_alt_toggle" { - xkb_keycodes { include "sgi/indigo(pc102)" }; + xkb_keycodes { include "sgi.vndr/indigo(pc102)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc102)+hu(basic)+group(ctrl_alt_toggle)" }; - xkb_geometry { include "sgi/indigo(pc102)" }; + xkb_geometry { include "sgi.vndr/indigo(pc102)" }; }; xkb_keymap "indigo_caps_toggle" { - xkb_keycodes { include "sgi/indigo(pc102)" }; + xkb_keycodes { include "sgi.vndr/indigo(pc102)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc102)+hu(basic)+group(caps_toggle)" }; - xkb_geometry { include "sgi/indigo(pc102)" }; + xkb_geometry { include "sgi.vndr/indigo(pc102)" }; }; diff --git a/keymap/sgi.vndr/it b/keymap/sgi.vndr/it index 17d6a106..cb99344f 100644 --- a/keymap/sgi.vndr/it +++ b/keymap/sgi.vndr/it @@ -1,34 +1,34 @@ // $Xorg: it,v 1.3 2000/08/17 19:54:41 cpqbld Exp $ default xkb_keymap "indy" { - xkb_keycodes { include "sgi/indy(universal)" }; + xkb_keycodes { include "sgi.vndr/indy(universal)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc_universal)+it" }; - xkb_geometry { include "sgi/indy(pc102)" }; + xkb_geometry { include "sgi.vndr/indy(pc102)" }; }; xkb_keymap "indy_nodeadkeys" { - xkb_keycodes { include "sgi/indy(universal)" }; + xkb_keycodes { include "sgi.vndr/indy(universal)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc_universal_nodeadkeys)+it(nodeadkeys)" }; - xkb_geometry { include "sgi/indy(pc102)" }; + xkb_geometry { include "sgi.vndr/indy(pc102)" }; }; xkb_keymap "indigo" { - xkb_keycodes { include "sgi/indigo(pc102)" }; + xkb_keycodes { include "sgi.vndr/indigo(pc102)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc102)+it" }; - xkb_geometry { include "sgi/indigo(pc102)" }; + xkb_geometry { include "sgi.vndr/indigo(pc102)" }; }; xkb_keymap "indigo_nodeadkeys" { - xkb_keycodes { include "sgi/indigo(pc102)" }; + xkb_keycodes { include "sgi.vndr/indigo(pc102)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc102_nodeadkeys)+it(nodeadkeys)" }; - xkb_geometry { include "sgi/indigo(pc102)" }; + xkb_geometry { include "sgi.vndr/indigo(pc102)" }; }; diff --git a/keymap/sgi.vndr/jp b/keymap/sgi.vndr/jp index c83900ae..d42baea6 100644 --- a/keymap/sgi.vndr/jp +++ b/keymap/sgi.vndr/jp @@ -1,8 +1,8 @@ // $Xorg: jp,v 1.3 2000/08/17 19:54:41 cpqbld Exp $ default xkb_keymap "indy" { - xkb_keycodes { include "sgi/indy(jp106)" }; + xkb_keycodes { include "sgi.vndr/indy(jp106)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "us(pc101)+sgi/jp" }; - xkb_geometry { include "sgi/indy(jp106)" }; + xkb_symbols { include "us(pc101)+sgi.vndr/jp" }; + xkb_geometry { include "sgi.vndr/indy(jp106)" }; }; diff --git a/keymap/sgi.vndr/no b/keymap/sgi.vndr/no index ed293d21..3b9f838e 100644 --- a/keymap/sgi.vndr/no +++ b/keymap/sgi.vndr/no @@ -1,34 +1,34 @@ // $Xorg: no,v 1.3 2000/08/17 19:54:41 cpqbld Exp $ default xkb_keymap "indy" { - xkb_keycodes { include "sgi/indy(universal)" }; + xkb_keycodes { include "sgi.vndr/indy(universal)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc_universal)+no" }; - xkb_geometry { include "sgi/indy(pc102)" }; + xkb_geometry { include "sgi.vndr/indy(pc102)" }; }; xkb_keymap "indy_nodeadkeys" { - xkb_keycodes { include "sgi/indy(universal)" }; + xkb_keycodes { include "sgi.vndr/indy(universal)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc_universal_nodeadkeys)+no(nodeadkeys)" }; - xkb_geometry { include "sgi/indy(pc102)" }; + xkb_geometry { include "sgi.vndr/indy(pc102)" }; }; xkb_keymap "indigo" { - xkb_keycodes { include "sgi/indigo(pc102)" }; + xkb_keycodes { include "sgi.vndr/indigo(pc102)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc102)+no" }; - xkb_geometry { include "sgi/indigo(pc102)" }; + xkb_geometry { include "sgi.vndr/indigo(pc102)" }; }; xkb_keymap "indigo_nodeadkeys" { - xkb_keycodes { include "sgi/indigo(pc102)" }; + xkb_keycodes { include "sgi.vndr/indigo(pc102)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc102_nodeadkeys)+no(nodeadkeys)" }; - xkb_geometry { include "sgi/indigo(pc102)" }; + xkb_geometry { include "sgi.vndr/indigo(pc102)" }; }; diff --git a/keymap/sgi.vndr/pl b/keymap/sgi.vndr/pl index b75f1f3c..ee422386 100644 --- a/keymap/sgi.vndr/pl +++ b/keymap/sgi.vndr/pl @@ -1,29 +1,29 @@ // $Xorg: pl,v 1.3 2000/08/17 19:54:41 cpqbld Exp $ default xkb_keymap "indy" { - xkb_keycodes { include "sgi/indy(universal)" }; + xkb_keycodes { include "sgi.vndr/indy(universal)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "us(pc_universal)+pl" }; - xkb_geometry { include "sgi/indy(pc102)" }; + xkb_geometry { include "sgi.vndr/indy(pc102)" }; }; xkb_keymap "indy_nodeadkeys" { - xkb_keycodes { include "sgi/indy(universal)" }; + xkb_keycodes { include "sgi.vndr/indy(universal)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "us(pc_universal)+pl(nodeadkeys)" }; - xkb_geometry { include "sgi/indy(pc102)" }; + xkb_geometry { include "sgi.vndr/indy(pc102)" }; }; xkb_keymap "indigo" { - xkb_keycodes { include "sgi/indigo(pc102)" }; + xkb_keycodes { include "sgi.vndr/indigo(pc102)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "us(pc102)+pl" }; - xkb_geometry { include "sgi/indigo(pc102)" }; + xkb_geometry { include "sgi.vndr/indigo(pc102)" }; }; xkb_keymap "indigo_nodeadkeys" { - xkb_keycodes { include "sgi/indigo(pc102)" }; + xkb_keycodes { include "sgi.vndr/indigo(pc102)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "us(pc102)+pl(nodeadkeys)" }; - xkb_geometry { include "sgi/indigo(pc102)" }; + xkb_geometry { include "sgi.vndr/indigo(pc102)" }; }; diff --git a/keymap/sgi.vndr/pt b/keymap/sgi.vndr/pt index eda00357..1b487246 100644 --- a/keymap/sgi.vndr/pt +++ b/keymap/sgi.vndr/pt @@ -1,34 +1,34 @@ // $Xorg: pt,v 1.3 2000/08/17 19:54:41 cpqbld Exp $ default xkb_keymap "indy" { - xkb_keycodes { include "sgi/indy(universal)" }; + xkb_keycodes { include "sgi.vndr/indy(universal)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc_universal)+pt" }; - xkb_geometry { include "sgi/indy(pc102)" }; + xkb_geometry { include "sgi.vndr/indy(pc102)" }; }; xkb_keymap "indy_nodeadkeys" { - xkb_keycodes { include "sgi/indy(universal)" }; + xkb_keycodes { include "sgi.vndr/indy(universal)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc_universal_nodeadkeys)+pt(nodeadkeys)" }; - xkb_geometry { include "sgi/indy(pc102)" }; + xkb_geometry { include "sgi.vndr/indy(pc102)" }; }; xkb_keymap "indigo" { - xkb_keycodes { include "sgi/indigo(pc102)" }; + xkb_keycodes { include "sgi.vndr/indigo(pc102)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc102)+pt" }; - xkb_geometry { include "sgi/indigo(pc102)" }; + xkb_geometry { include "sgi.vndr/indigo(pc102)" }; }; xkb_keymap "indigo_nodeadkeys" { - xkb_keycodes { include "sgi/indigo(pc102)" }; + xkb_keycodes { include "sgi.vndr/indigo(pc102)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc102_nodeadkeys)+pt(nodeadkeys)" }; - xkb_geometry { include "sgi/indigo(pc102)" }; + xkb_geometry { include "sgi.vndr/indigo(pc102)" }; }; diff --git a/keymap/sgi.vndr/ru b/keymap/sgi.vndr/ru index 6a2a1897..89e6d832 100644 --- a/keymap/sgi.vndr/ru +++ b/keymap/sgi.vndr/ru @@ -1,105 +1,105 @@ // $Xorg: ru,v 1.3 2000/08/17 19:54:41 cpqbld Exp $ default xkb_keymap "indy" { - xkb_keycodes { include "sgi/indy(universal)" }; + xkb_keycodes { include "sgi.vndr/indy(universal)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc_universal)+ru(basic)" }; - xkb_geometry { include "sgi/indy(pc102)" }; + xkb_geometry { include "sgi.vndr/indy(pc102)" }; }; xkb_keymap "indy_toggle" { - xkb_keycodes { include "sgi/indy(universal)" }; + xkb_keycodes { include "sgi.vndr/indy(universal)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc_universal)+ru(basic)+group(toggle)" }; - xkb_geometry { include "sgi/indy(pc102)" }; + xkb_geometry { include "sgi.vndr/indy(pc102)" }; }; xkb_keymap "indy_shift_toggle" { - xkb_keycodes { include "sgi/indy(universal)" }; + xkb_keycodes { include "sgi.vndr/indy(universal)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc_universal)+ru(basic)+group(shift_toggle)" }; - xkb_geometry { include "sgi/indy(pc102)" }; + xkb_geometry { include "sgi.vndr/indy(pc102)" }; }; xkb_keymap "indy_ctrl_shift_toggle" { - xkb_keycodes { include "sgi/indy(universal)" }; + xkb_keycodes { include "sgi.vndr/indy(universal)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc_universal)+ru(basic)+group(ctrl_shift_toggle)" }; - xkb_geometry { include "sgi/indy(pc102)" }; + xkb_geometry { include "sgi.vndr/indy(pc102)" }; }; xkb_keymap "indy_ctrl_alt_toggle" { - xkb_keycodes { include "sgi/indy(universal)" }; + xkb_keycodes { include "sgi.vndr/indy(universal)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc_universal)+ru(basic)+group(ctrl_alt_toggle)" }; - xkb_geometry { include "sgi/indy(pc102)" }; + xkb_geometry { include "sgi.vndr/indy(pc102)" }; }; xkb_keymap "indy_caps_toggle" { - xkb_keycodes { include "sgi/indy(universal)" }; + xkb_keycodes { include "sgi.vndr/indy(universal)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc_universal)+ru(basic)+group(caps_toggle)" }; - xkb_geometry { include "sgi/indy(pc102)" }; + xkb_geometry { include "sgi.vndr/indy(pc102)" }; }; xkb_keymap "indigo" { - xkb_keycodes { include "sgi/indigo(pc102)" }; + xkb_keycodes { include "sgi.vndr/indigo(pc102)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc102)+ru(basic)" }; - xkb_geometry { include "sgi/indigo(pc102)" }; + xkb_geometry { include "sgi.vndr/indigo(pc102)" }; }; xkb_keymap "indigo_toggle" { - xkb_keycodes { include "sgi/indigo(pc102)" }; + xkb_keycodes { include "sgi.vndr/indigo(pc102)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc102)+ru(basic)+group(toggle)" }; - xkb_geometry { include "sgi/indigo(pc102)" }; + xkb_geometry { include "sgi.vndr/indigo(pc102)" }; }; xkb_keymap "indigo_shift_toggle" { - xkb_keycodes { include "sgi/indigo(pc102)" }; + xkb_keycodes { include "sgi.vndr/indigo(pc102)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc102)+ru(basic)+group(shift_toggle)" }; - xkb_geometry { include "sgi/indigo(pc102)" }; + xkb_geometry { include "sgi.vndr/indigo(pc102)" }; }; xkb_keymap "indigo_ctrl_shift_toggle" { - xkb_keycodes { include "sgi/indigo(pc102)" }; + xkb_keycodes { include "sgi.vndr/indigo(pc102)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc102)+ru(basic)+group(ctrl_shift_toggle)" }; - xkb_geometry { include "sgi/indigo(pc102)" }; + xkb_geometry { include "sgi.vndr/indigo(pc102)" }; }; xkb_keymap "indigo_ctrl_alt_toggle" { - xkb_keycodes { include "sgi/indigo(pc102)" }; + xkb_keycodes { include "sgi.vndr/indigo(pc102)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc102)+ru(basic)+group(ctrl_alt_toggle)" }; - xkb_geometry { include "sgi/indigo(pc102)" }; + xkb_geometry { include "sgi.vndr/indigo(pc102)" }; }; xkb_keymap "indigo_caps_toggle" { - xkb_keycodes { include "sgi/indigo(pc102)" }; + xkb_keycodes { include "sgi.vndr/indigo(pc102)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc102)+ru(basic)+group(caps_toggle)" }; - xkb_geometry { include "sgi/indigo(pc102)" }; + xkb_geometry { include "sgi.vndr/indigo(pc102)" }; }; diff --git a/keymap/sgi.vndr/se b/keymap/sgi.vndr/se index 3fe54e27..9cc7da75 100644 --- a/keymap/sgi.vndr/se +++ b/keymap/sgi.vndr/se @@ -1,34 +1,34 @@ // $Xorg: se,v 1.3 2000/08/17 19:54:41 cpqbld Exp $ default xkb_keymap "indy" { - xkb_keycodes { include "sgi/indy(universal)" }; + xkb_keycodes { include "sgi.vndr/indy(universal)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc_universal)+se" }; - xkb_geometry { include "sgi/indy(pc102)" }; + xkb_geometry { include "sgi.vndr/indy(pc102)" }; }; xkb_keymap "indy_nodeadkeys" { - xkb_keycodes { include "sgi/indy(universal)" }; + xkb_keycodes { include "sgi.vndr/indy(universal)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc_universal_nodeadkeys)+se(nodeadkeys)" }; - xkb_geometry { include "sgi/indy(pc102)" }; + xkb_geometry { include "sgi.vndr/indy(pc102)" }; }; xkb_keymap "indigo" { - xkb_keycodes { include "sgi/indigo(pc102)" }; + xkb_keycodes { include "sgi.vndr/indigo(pc102)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc102)+se" }; - xkb_geometry { include "sgi/indigo(pc102)" }; + xkb_geometry { include "sgi.vndr/indigo(pc102)" }; }; xkb_keymap "indigo_nodeadkeys" { - xkb_keycodes { include "sgi/indigo(pc102)" }; + xkb_keycodes { include "sgi.vndr/indigo(pc102)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc102_nodeadkeys)+se(nodeadkeys)" }; - xkb_geometry { include "sgi/indigo(pc102)" }; + xkb_geometry { include "sgi.vndr/indigo(pc102)" }; }; diff --git a/keymap/sgi.vndr/sk b/keymap/sgi.vndr/sk index 89bd9b52..cfc77e6e 100644 --- a/keymap/sgi.vndr/sk +++ b/keymap/sgi.vndr/sk @@ -5,17 +5,32 @@ // $XFree86$ default xkb_keymap "indy" { - xkb_keycodes { include "sgi/indy(universal)" }; + xkb_keycodes { include "sgi.vndr/indy(universal)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "us(pc_universal)+sk" }; - xkb_geometry { include "sgi/indy(pc102)" }; + xkb_geometry { include "sgi.vndr/indy(pc102)" }; }; xkb_keymap "indigo" { - xkb_keycodes { include "sgi/indigo(pc102)" }; + xkb_keycodes { include "sgi.vndr/indigo(pc102)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "us(pc102)+sk" }; - xkb_geometry { include "sgi/indigo(pc102)" }; + xkb_geometry { include "sgi.vndr/indigo(pc102)" }; +}; + +default xkb_keymap "indy_qwerty" { + xkb_keycodes { include "sgi.vndr/indy(universal)" }; + xkb_types { include "default" }; + xkb_compatibility { include "default" }; + xkb_symbols { include "us(pc_universal)+sk(qwerty)" }; + xkb_geometry { include "sgi.vndr/indy(pc102)" }; +}; +xkb_keymap "indigo_qwerty" { + xkb_keycodes { include "sgi.vndr/indigo(pc102)" }; + xkb_types { include "default" }; + xkb_compatibility { include "default" }; + xkb_symbols { include "us(pc102)+sk(qwerty)" }; + xkb_geometry { include "sgi.vndr/indigo(pc102)" }; }; diff --git a/keymap/sgi.vndr/sk_qwerty b/keymap/sgi.vndr/sk_qwerty deleted file mode 100644 index 9094cbc3..00000000 --- a/keymap/sgi.vndr/sk_qwerty +++ /dev/null @@ -1,21 +0,0 @@ -// $Xorg: cs,v 1.3 2000/08/17 19:54:40 cpqbld Exp $ -// -// -// -// $XFree86$ - -default xkb_keymap "indy" { - xkb_keycodes { include "sgi/indy(universal)" }; - xkb_types { include "default" }; - xkb_compatibility { include "default" }; - xkb_symbols { include "us(pc_universal)+sk_qwerty" }; - xkb_geometry { include "sgi/indy(pc102)" }; -}; -xkb_keymap "indigo" { - xkb_keycodes { include "sgi/indigo(pc102)" }; - xkb_types { include "default" }; - xkb_compatibility { include "default" }; - xkb_symbols { include "us(pc102)+sk_qwerty" }; - xkb_geometry { include "sgi/indigo(pc102)" }; -}; - diff --git a/keymap/sgi.vndr/th b/keymap/sgi.vndr/th index b614913e..25cd2521 100644 --- a/keymap/sgi.vndr/th +++ b/keymap/sgi.vndr/th @@ -1,17 +1,17 @@ // $Xorg: th,v 1.3 2000/08/17 19:54:41 cpqbld Exp $ default xkb_keymap "indy" { - xkb_keycodes { include "sgi/indy(universal)" }; + xkb_keycodes { include "sgi.vndr/indy(universal)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc_universal)+th+group(shift_toggle)" }; - xkb_geometry { include "sgi/indy(pc102)" }; + xkb_geometry { include "sgi.vndr/indy(pc102)" }; }; xkb_keymap "indigo" { - xkb_keycodes { include "sgi/indigo(pc102)" }; + xkb_keycodes { include "sgi.vndr/indigo(pc102)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "en_US(pc102)+th+group(shift_toggle)" }; - xkb_geometry { include "sgi/indigo(pc102)" }; + xkb_geometry { include "sgi.vndr/indigo(pc102)" }; }; diff --git a/keymap/sgi.vndr/us b/keymap/sgi.vndr/us index 2d704ca5..76c1a001 100644 --- a/keymap/sgi.vndr/us +++ b/keymap/sgi.vndr/us @@ -1,43 +1,43 @@ // $Xorg: us,v 1.3 2000/08/17 19:54:41 cpqbld Exp $ default xkb_keymap "indy" { - xkb_keycodes { include "sgi/indy(universal)" }; + xkb_keycodes { include "sgi.vndr/indy(universal)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "us(pc_universal)" }; - xkb_geometry { include "sgi/indy(pc101)" }; + xkb_geometry { include "sgi.vndr/indy(pc101)" }; }; xkb_keymap "indy101_euro" { - xkb_keycodes { include "sgi/indy(universal)" }; + xkb_keycodes { include "sgi.vndr/indy(universal)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "us(pc_universal)" }; - xkb_geometry { include "sgi/indy(pc101)" }; + xkb_geometry { include "sgi.vndr/indy(pc101)" }; }; xkb_keymap "indy_compose" { - xkb_keycodes { include "sgi/indy(universal)" }; + xkb_keycodes { include "sgi.vndr/indy(universal)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "us(pc_universal)" }; - xkb_geometry { include "sgi/indy(pc101)" }; + xkb_geometry { include "sgi.vndr/indy(pc101)" }; }; xkb_keymap "indigo" { - xkb_keycodes { include "sgi/indigo(pc101)" }; + xkb_keycodes { include "sgi.vndr/indigo(pc101)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "us(pc101)" }; - xkb_geometry { include "sgi/indigo(pc101)" }; + xkb_geometry { include "sgi.vndr/indigo(pc101)" }; }; xkb_keymap "indigo_compose" { - xkb_keycodes { include "sgi/indigo(pc101)" }; + xkb_keycodes { include "sgi.vndr/indigo(pc101)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "us(pc101compose)" }; - xkb_geometry { include "sgi/indigo(pc101)" }; + xkb_geometry { include "sgi.vndr/indigo(pc101)" }; }; xkb_keymap "indigo101_compose" { - xkb_keycodes { include "sgi/indigo(pc101)" }; + xkb_keycodes { include "sgi.vndr/indigo(pc101)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { include "us(pc101euro)" }; - xkb_geometry { include "sgi/indigo(pc101)" }; + xkb_geometry { include "sgi.vndr/indigo(pc101)" }; }; diff --git a/keymap/sony b/keymap/sony index 5380c4e5..4f5a6e6b 100644 --- a/keymap/sony +++ b/keymap/sony @@ -28,6 +28,6 @@ xkb_keymap "news5000-nwp5461" { xkb_keycodes { include "sony(nwp5461)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "sony/us(nwp5461)" }; + xkb_symbols { include "sony.vndr/us(nwp5461)" }; xkb_geometry { include "sony(nwp5461)" }; }; diff --git a/keymap/sun.vndr/de b/keymap/sun.vndr/de index 0b4bd53f..152b6248 100644 --- a/keymap/sun.vndr/de +++ b/keymap/sun.vndr/de @@ -29,7 +29,7 @@ xkb_keymap "type4_de" { xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { - include "sun/us(sun4)+iso9995-3(basic)+de" + include "sun.vndr/us(sun4)+iso9995-3(basic)+de" }; xkb_geometry { include "sun(type4)" }; }; @@ -38,7 +38,7 @@ xkb_keymap "type4_de_nodeadkeys" { xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { - include "sun/us(sun4)+iso9995-3(nodeadkeys)+de(nodeadkeys)" + include "sun.vndr/us(sun4)+iso9995-3(nodeadkeys)+de(nodeadkeys)" }; xkb_geometry { include "sun(type4)" }; }; @@ -47,7 +47,7 @@ xkb_keymap "type4_de_openlook" { xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { - include "sun/us(sun4ol)+iso9995-3(basic)+de" + include "sun.vndr/us(sun4ol)+iso9995-3(basic)+de" }; xkb_geometry { include "sun(type4)" }; }; @@ -56,7 +56,7 @@ default xkb_keymap "type5_de" { xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { - include "sun/us(sun5)+iso9995-3(basic)+de" + include "sun.vndr/us(sun5)+iso9995-3(basic)+de" }; xkb_geometry { include "sun(type5euro)" }; }; @@ -65,7 +65,7 @@ xkb_keymap "type5_de_nodeadkeys" { xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { - include "sun/us(sun5)+iso9995-3(nodeadkeys)+de(nodeadkeys)" + include "sun.vndr/us(sun5)+iso9995-3(nodeadkeys)+de(nodeadkeys)" }; xkb_geometry { include "sun(type5euro)" }; }; @@ -73,6 +73,6 @@ xkb_keymap "type5_de_openlook" { xkb_keycodes { include "sun(type5_euro)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "sun/us(sun5ol)+iso9995-3+de" }; + xkb_symbols { include "sun.vndr/us(sun5ol)+iso9995-3+de" }; xkb_geometry { include "sun(type5euro)" }; }; diff --git a/keymap/sun.vndr/es b/keymap/sun.vndr/es index ab29c434..227d38ce 100644 --- a/keymap/sun.vndr/es +++ b/keymap/sun.vndr/es @@ -24,14 +24,14 @@ //other dealings in this Software without prior written authorization //from The Open Group. // -// $XFree86: xc/programs/xkbcomp/keymap/sun/es,v 1.2 2000/10/28 00:34:05 dawes Exp $ +// $XFree86: xc/programs/xkbcomp/keymap/sun.vndr/es,v 1.2 2000/10/28 00:34:05 dawes Exp $ // xkb_keymap "type4_es" { xkb_keycodes { include "sun(type4_euro)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { - include "sun/us(sun4)+iso9995-3(basic)+es" + include "sun.vndr/us(sun4)+iso9995-3(basic)+es" }; xkb_geometry { include "sun(type4)" }; }; @@ -40,7 +40,7 @@ xkb_keymap "type4_es_openlook" { xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { - include "sun/us(sun4ol)+iso9995-3(basic)+es" + include "sun.vndr/us(sun4ol)+iso9995-3(basic)+es" }; xkb_geometry { include "sun(type4)" }; }; @@ -49,7 +49,7 @@ default xkb_keymap "type5_es" { xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { - include "sun/us(sun5)+iso9995-3(basic)+es" + include "sun.vndr/us(sun5)+iso9995-3(basic)+es" }; xkb_geometry { include "sun(type5euro)" }; }; @@ -57,6 +57,6 @@ xkb_keymap "type5_es_openlook" { xkb_keycodes { include "sun(type5_euro)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "sun/us(sun5ol)+iso9995-3+es" }; + xkb_symbols { include "sun.vndr/us(sun5ol)+iso9995-3+es" }; xkb_geometry { include "sun(type5euro)" }; }; diff --git a/keymap/sun.vndr/fi b/keymap/sun.vndr/fi index 3ca6003d..a1973697 100644 --- a/keymap/sun.vndr/fi +++ b/keymap/sun.vndr/fi @@ -24,14 +24,14 @@ //other dealings in this Software without prior written authorization //from The Open Group. // -// $XFree86: xc/programs/xkbcomp/keymap/sun/fi,v 1.2 2000/10/28 00:34:05 dawes Exp $ +// $XFree86: xc/programs/xkbcomp/keymap/sun.vndr/fi,v 1.2 2000/10/28 00:34:05 dawes Exp $ // xkb_keymap "type4_fi" { xkb_keycodes { include "sun(type4_euro)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { - include "sun/us(sun4)+iso9995-3(basic)+fi" + include "sun.vndr/us(sun4)+iso9995-3(basic)+fi" }; xkb_geometry { include "sun(type4)" }; }; @@ -40,7 +40,7 @@ xkb_keymap "type4_fi_openlook" { xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { - include "sun/us(sun4ol)+iso9995-3(basic)+fi" + include "sun.vndr/us(sun4ol)+iso9995-3(basic)+fi" }; xkb_geometry { include "sun(type4)" }; }; @@ -49,7 +49,7 @@ default xkb_keymap "type5_fi" { xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { - include "sun/us(sun5)+iso9995-3(basic)+fi" + include "sun.vndr/us(sun5)+iso9995-3(basic)+fi" }; xkb_geometry { include "sun(type5euro)" }; }; @@ -57,6 +57,6 @@ xkb_keymap "type5_fi_openlook" { xkb_keycodes { include "sun(type5_euro)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "sun/us(sun5ol)+iso9995-3+fi" }; + xkb_symbols { include "sun.vndr/us(sun5ol)+iso9995-3+fi" }; xkb_geometry { include "sun(type5euro)" }; }; diff --git a/keymap/sun.vndr/fr b/keymap/sun.vndr/fr index 60be0d1d..6ed6b6f7 100644 --- a/keymap/sun.vndr/fr +++ b/keymap/sun.vndr/fr @@ -24,14 +24,14 @@ //other dealings in this Software without prior written authorization //from The Open Group. // -// $XFree86: xc/programs/xkbcomp/keymap/sun/fr,v 1.2 2000/10/28 00:34:05 dawes Exp $ +// $XFree86: xc/programs/xkbcomp/keymap/sun.vndr/fr,v 1.2 2000/10/28 00:34:05 dawes Exp $ // xkb_keymap "type4_fr" { xkb_keycodes { include "sun(type4_euro)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { - include "sun/us(sun4)+iso9995-3(basic)+fr" + include "sun.vndr/us(sun4)+iso9995-3(basic)+fr" }; xkb_geometry { include "sun(type4)" }; }; @@ -40,7 +40,7 @@ xkb_keymap "type4_fr_openlook" { xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { - include "sun/us(sun4ol)+iso9995-3(basic)+fr" + include "sun.vndr/us(sun4ol)+iso9995-3(basic)+fr" }; xkb_geometry { include "sun(type4)" }; }; @@ -49,7 +49,7 @@ default xkb_keymap "type5_fr" { xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { - include "sun/us(sun5)+iso9995-3(basic)+fr" + include "sun.vndr/us(sun5)+iso9995-3(basic)+fr" }; xkb_geometry { include "sun(type5euro)" }; }; @@ -57,6 +57,6 @@ xkb_keymap "type5_fr_openlook" { xkb_keycodes { include "sun(type5_euro)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "sun/us(sun5ol)+iso9995-3+fr" }; + xkb_symbols { include "sun.vndr/us(sun5ol)+iso9995-3+fr" }; xkb_geometry { include "sun(type5euro)" }; }; diff --git a/keymap/sun.vndr/no b/keymap/sun.vndr/no index d57fc49b..32868d1f 100644 --- a/keymap/sun.vndr/no +++ b/keymap/sun.vndr/no @@ -24,14 +24,14 @@ //other dealings in this Software without prior written authorization //from The Open Group. // -// $XFree86: xc/programs/xkbcomp/keymap/sun/no,v 1.2 2000/10/28 00:34:05 dawes Exp $ +// $XFree86: xc/programs/xkbcomp/keymap/sun.vndr/no,v 1.2 2000/10/28 00:34:05 dawes Exp $ // xkb_keymap "type4_no" { xkb_keycodes { include "sun(type4_euro)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { - include "sun/us(sun4)+iso9995-3(basic)+no" + include "sun.vndr/us(sun4)+iso9995-3(basic)+no" }; xkb_geometry { include "sun(type4)" }; }; @@ -40,7 +40,7 @@ xkb_keymap "type4_no_openlook" { xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { - include "sun/us(sun4ol)+iso9995-3(basic)+no" + include "sun.vndr/us(sun4ol)+iso9995-3(basic)+no" }; xkb_geometry { include "sun(type4)" }; }; @@ -49,7 +49,7 @@ default xkb_keymap "type5_no" { xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { - include "sun/us(sun5)+iso9995-3(basic)+no" + include "sun.vndr/us(sun5)+iso9995-3(basic)+no" }; xkb_geometry { include "sun(type5euro)" }; }; @@ -57,6 +57,6 @@ xkb_keymap "type5_no_openlook" { xkb_keycodes { include "sun(type5_euro)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "sun/us(sun5ol)+iso9995-3+no" }; + xkb_symbols { include "sun.vndr/us(sun5ol)+iso9995-3+no" }; xkb_geometry { include "sun(type5euro)" }; }; diff --git a/keymap/sun.vndr/pl b/keymap/sun.vndr/pl index d672db78..cfcca7b0 100644 --- a/keymap/sun.vndr/pl +++ b/keymap/sun.vndr/pl @@ -24,14 +24,14 @@ //other dealings in this Software without prior written authorization //from The Open Group. // -// $XFree86: xc/programs/xkbcomp/keymap/sun/pl,v 1.2 2000/10/28 00:34:05 dawes Exp $ +// $XFree86: xc/programs/xkbcomp/keymap/sun.vndr/pl,v 1.2 2000/10/28 00:34:05 dawes Exp $ // xkb_keymap "type4_pl" { xkb_keycodes { include "sun(type4_euro)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { - include "sun/us(sun4)+iso9995-3(basic)+pl" + include "sun.vndr/us(sun4)+iso9995-3(basic)+pl" }; xkb_geometry { include "sun(type4)" }; }; @@ -40,7 +40,7 @@ xkb_keymap "type4_pl_openlook" { xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { - include "sun/us(sun4ol)+iso9995-3(basic)+pl" + include "sun.vndr/us(sun4ol)+iso9995-3(basic)+pl" }; xkb_geometry { include "sun(type4)" }; }; @@ -49,7 +49,7 @@ default xkb_keymap "type5_pl" { xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { - include "sun/us(sun5)+iso9995-3(basic)+pl" + include "sun.vndr/us(sun5)+iso9995-3(basic)+pl" }; xkb_geometry { include "sun(type5euro)" }; }; @@ -57,6 +57,6 @@ xkb_keymap "type5_pl_openlook" { xkb_keycodes { include "sun(type5_euro)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "sun/us(sun5ol)+iso9995-3+pl" }; + xkb_symbols { include "sun.vndr/us(sun5ol)+iso9995-3+pl" }; xkb_geometry { include "sun(type5euro)" }; }; diff --git a/keymap/sun.vndr/ru b/keymap/sun.vndr/ru index 9dead904..e5d18c60 100644 --- a/keymap/sun.vndr/ru +++ b/keymap/sun.vndr/ru @@ -24,14 +24,14 @@ //other dealings in this Software without prior written authorization //from The Open Group. // -// $XFree86: xc/programs/xkbcomp/keymap/sun/ru,v 1.2 2000/10/28 00:34:05 dawes Exp $ +// $XFree86: xc/programs/xkbcomp/keymap/sun.vndr/ru,v 1.2 2000/10/28 00:34:05 dawes Exp $ // xkb_keymap "type4_ru" { xkb_keycodes { include "sun(type4_euro)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { - include "sun/us(sun4)+iso9995-3(basic)+ru" + include "sun.vndr/us(sun4)+iso9995-3(basic)+ru" }; xkb_geometry { include "sun(type4)" }; }; @@ -40,7 +40,7 @@ xkb_keymap "type4_ru_openlook" { xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { - include "sun/us(sun4ol)+iso9995-3(basic)+ru" + include "sun.vndr/us(sun4ol)+iso9995-3(basic)+ru" }; xkb_geometry { include "sun(type4)" }; }; @@ -49,7 +49,7 @@ default xkb_keymap "type5_ru" { xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { - include "sun/us(sun5)+iso9995-3(basic)+ru" + include "sun.vndr/us(sun5)+iso9995-3(basic)+ru" }; xkb_geometry { include "sun(type5euro)" }; }; @@ -57,6 +57,6 @@ xkb_keymap "type5_ru_openlook" { xkb_keycodes { include "sun(type5_euro)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "sun/us(sun5ol)+iso9995-3+ru" }; + xkb_symbols { include "sun.vndr/us(sun5ol)+iso9995-3+ru" }; xkb_geometry { include "sun(type5euro)" }; }; diff --git a/keymap/sun.vndr/se b/keymap/sun.vndr/se index dd0a1670..5d0e601e 100644 --- a/keymap/sun.vndr/se +++ b/keymap/sun.vndr/se @@ -1,11 +1,11 @@ -// $XFree86: xc/programs/xkbcomp/keymap/sun/se,v 1.2 1998/12/20 09:34:42 dawes Exp $ +// $XFree86: xc/programs/xkbcomp/keymap/sun.vndr/se,v 1.2 1998/12/20 09:34:42 dawes Exp $ default xkb_keymap "type5c_se_fixdollar" { xkb_keycodes { include "sun(type5_se)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { - include "sun/se(sun5)+se(fixdollar)" + include "sun.vndr/se(sun5)+se(fixdollar)" }; xkb_geometry { include "sun(type5c_se)" }; }; @@ -14,7 +14,7 @@ xkb_keymap "type5c_se" { xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { - include "sun/se(sun5)" + include "sun.vndr/se(sun5)" }; xkb_geometry { include "sun(type5c_se)" }; }; @@ -23,7 +23,7 @@ xkb_keymap "type5_se" { xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { - include "sun/se(sun5)" + include "sun.vndr/se(sun5)" }; xkb_geometry { include "sun(type5_se)" }; }; @@ -32,7 +32,7 @@ xkb_keymap "type4_se_fixdollar_swapctl" { xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { - include "sun/se(sun4)+se(fixdollar)" + include "sun.vndr/se(sun4)+se(fixdollar)" }; xkb_geometry { include "sun(type4_se)" }; }; @@ -41,7 +41,7 @@ xkb_keymap "type4_se_fixdollar" { xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { - include "sun/se(sun4)+se(fixdollar)" + include "sun.vndr/se(sun4)+se(fixdollar)" }; xkb_geometry { include "sun(type4_se)" }; }; @@ -50,7 +50,7 @@ xkb_keymap "type4_se" { xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { - include "sun/se(sun4)" + include "sun.vndr/se(sun4)" }; xkb_geometry { include "sun(type4_se)" }; }; diff --git a/keymap/sun.vndr/uk b/keymap/sun.vndr/uk index d99e2ff4..0918bfa0 100644 --- a/keymap/sun.vndr/uk +++ b/keymap/sun.vndr/uk @@ -24,14 +24,14 @@ //other dealings in this Software without prior written authorization //from The Open Group. // -// $XFree86: xc/programs/xkbcomp/keymap/sun/uk,v 1.2 2000/10/28 00:34:05 dawes Exp $ +// $XFree86: xc/programs/xkbcomp/keymap/sun.vndr/uk,v 1.2 2000/10/28 00:34:05 dawes Exp $ // xkb_keymap "type4_uk" { xkb_keycodes { include "sun(type4_euro)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { - include "sun/us(sun4)+iso9995-3(basic)+uk" + include "sun.vndr/us(sun4)+iso9995-3(basic)+uk" }; xkb_geometry { include "sun(type4)" }; }; @@ -40,7 +40,7 @@ xkb_keymap "type4_uk_openlook" { xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { - include "sun/us(sun4ol)+iso9995-3(basic)+uk" + include "sun.vndr/us(sun4ol)+iso9995-3(basic)+uk" }; xkb_geometry { include "sun(type4)" }; }; @@ -49,7 +49,7 @@ default xkb_keymap "type5_uk" { xkb_types { include "default" }; xkb_compatibility { include "default" }; xkb_symbols { - include "sun/us(sun5)+iso9995-3(basic)+uk" + include "sun.vndr/us(sun5)+iso9995-3(basic)+uk" }; xkb_geometry { include "sun(type5euro)" }; }; @@ -57,6 +57,6 @@ xkb_keymap "type5_uk_openlook" { xkb_keycodes { include "sun(type5_euro)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "sun/us(sun5ol)+iso9995-3+uk" }; + xkb_symbols { include "sun.vndr/us(sun5ol)+iso9995-3+uk" }; xkb_geometry { include "sun(type5euro)" }; }; diff --git a/keymap/sun.vndr/us b/keymap/sun.vndr/us index 2133c21d..971311e7 100644 --- a/keymap/sun.vndr/us +++ b/keymap/sun.vndr/us @@ -28,41 +28,41 @@ xkb_keymap "type4_us" { xkb_keycodes { include "sun(type4)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "sun/us(sun4)" }; + xkb_symbols { include "sun.vndr/us(sun4)" }; xkb_geometry { include "sun(type4)" }; }; xkb_keymap "type4_us_openlook" { xkb_keycodes { include "sun(type4)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "sun/us(sun4ol)" }; + xkb_symbols { include "sun.vndr/us(sun4ol)" }; xkb_geometry { include "sun(type4)" }; }; default xkb_keymap "type5_us" { xkb_keycodes { include "sun(type5)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "sun/us(sun5)" }; + xkb_symbols { include "sun.vndr/us(sun5)" }; xkb_geometry { include "sun(type5)" }; }; xkb_keymap "type5_us_openlook" { xkb_keycodes { include "sun(type5)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "sun/us(sun5ol)" }; + xkb_symbols { include "sun.vndr/us(sun5ol)" }; xkb_geometry { include "sun(type5)" }; }; xkb_keymap "type5_unix" { xkb_keycodes { include "sun(type5)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "sun/us(sun5)" }; + xkb_symbols { include "sun.vndr/us(sun5)" }; xkb_geometry { include "sun(type5unix)" }; }; xkb_keymap "type5_unix_openlook" { xkb_keycodes { include "sun(type5)" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "sun/us(sun5ol)" }; + xkb_symbols { include "sun.vndr/us(sun5ol)" }; xkb_geometry { include "sun(type5unix)" }; }; diff --git a/keymap/xfree86 b/keymap/xfree86 index e1967a1b..aa70c979 100644 --- a/keymap/xfree86 +++ b/keymap/xfree86 @@ -49,25 +49,25 @@ xkb_keymap "cz" { xkb_symbols { include "en_US(pc105)+cz" }; xkb_geometry { include "pc" }; }; -xkb_keymap "cz_qwerty" { +xkb_keymap "de" { xkb_keycodes { include "xfree86" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "en_US(pc105)+cz_qwerty" }; - xkb_geometry { include "pc" }; + xkb_symbols { include "en_US(pc105)+de" }; + xkb_geometry { include "pc(pc102)" }; }; -xkb_keymap "de" { +xkb_keymap "ch_de" { xkb_keycodes { include "xfree86" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "en_US(pc105)+de" }; + xkb_symbols { include "en_US(pc105)+ch(de)" }; xkb_geometry { include "pc(pc102)" }; }; -xkb_keymap "de_CH" { +xkb_keymap "ch_fr" { xkb_keycodes { include "xfree86" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "en_US(pc105)+de_CH" }; + xkb_symbols { include "en_US(pc105)+ch(fr)" }; xkb_geometry { include "pc(pc102)" }; }; xkb_keymap "dk" { @@ -119,13 +119,6 @@ xkb_keymap "fr_CA" { xkb_symbols { include "en_US(pc105)+ca" }; xkb_geometry { include "pc(pc102)" }; }; -xkb_keymap "fr_CH" { - xkb_keycodes { include "xfree86" }; - xkb_types { include "default" }; - xkb_compatibility { include "default" }; - xkb_symbols { include "en_US(pc105)+fr_CH" }; - xkb_geometry { include "pc(pc102)" }; -}; xkb_keymap "gb" { xkb_keycodes { include "xfree86" }; xkb_types { include "default" }; @@ -189,13 +182,6 @@ xkb_keymap "mt" { xkb_symbols { include "en_US(pc105)+mt" }; xkb_geometry { include "pc(pc102)" }; }; -xkb_keymap "mt_us" { - xkb_keycodes { include "xfree86" }; - xkb_types { include "default" }; - xkb_compatibility { include "default" }; - xkb_symbols { include "en_US(pc105)+mt_us" }; - xkb_geometry { include "pc(pc102)" }; -}; xkb_keymap "no" { xkb_keycodes { include "xfree86" }; xkb_types { include "default" }; @@ -277,13 +263,6 @@ xkb_keymap "sk" { xkb_symbols { include "en_US(pc105)+sk" }; xkb_geometry { include "pc" }; }; -xkb_keymap "sk_qwerty" { - xkb_keycodes { include "xfree86" }; - xkb_types { include "default" }; - xkb_compatibility { include "default" }; - xkb_symbols { include "en_US(pc105)+sk_qwerty" }; - xkb_geometry { include "pc" }; -}; // Additions by Emil Soleyman-Zomalan, <emil@nishra.com> xkb_keymap "syr" { xkb_keycodes { include "xfree86" }; @@ -341,7 +320,7 @@ xkb_keymap "us_intl" { xkb_keycodes { include "xfree86" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "us(pc101)+us_intl" }; + xkb_symbols { include "us(pc101)+us(intl)" }; xkb_geometry { include "pc" }; }; xkb_keymap "us_microsoft" { @@ -360,3 +339,39 @@ xkb_keymap "uz" { xkb_geometry { include "pc(pc102)" }; }; +# svu: compatibility keymaps, based on variants +xkb_keymap "cz_qwerty" { + xkb_keycodes { include "xfree86" }; + xkb_types { include "default" }; + xkb_compatibility { include "default" }; + xkb_symbols { include "en_US(pc105)+cz(qwerty)" }; + xkb_geometry { include "pc" }; +}; +xkb_keymap "de_CH" { + xkb_keycodes { include "xfree86" }; + xkb_types { include "default" }; + xkb_compatibility { include "default" }; + xkb_symbols { include "en_US(pc105)+ch(de)" }; + xkb_geometry { include "pc(pc102)" }; +}; +xkb_keymap "fr_CH" { + xkb_keycodes { include "xfree86" }; + xkb_types { include "default" }; + xkb_compatibility { include "default" }; + xkb_symbols { include "en_US(pc105)+ch(fr)" }; + xkb_geometry { include "pc(pc102)" }; +}; +xkb_keymap "mt_us" { + xkb_keycodes { include "xfree86" }; + xkb_types { include "default" }; + xkb_compatibility { include "default" }; + xkb_symbols { include "en_US(pc105)+mt(us)" }; + xkb_geometry { include "pc(pc102)" }; +}; +xkb_keymap "sk_qwerty" { + xkb_keycodes { include "xfree86" }; + xkb_types { include "default" }; + xkb_compatibility { include "default" }; + xkb_symbols { include "en_US(pc105)+sk(qwerty)" }; + xkb_geometry { include "pc" }; +}; diff --git a/keymap/xfree98 b/keymap/xfree98 index e78b15ce..c47c483f 100644 --- a/keymap/xfree98 +++ b/keymap/xfree98 @@ -30,6 +30,6 @@ default xkb_keymap "jp" { xkb_keycodes { include "xfree98" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "nec/jp(pc98)" }; + xkb_symbols { include "nec.vndr/jp(pc98)" }; xkb_geometry { include "nec(pc98)" }; }; diff --git a/rules/base.lst b/rules/base.lst index 9f018cbf..a373af83 100644 --- a/rules/base.lst +++ b/rules/base.lst @@ -111,7 +111,6 @@ ! layout us U.S. English en_US U.S. English w/ ISO9995-3 - us_intl U.S. English w/ deadkeys al Albanian ar Arabic am Armenian @@ -128,7 +127,6 @@ hr Croatian hr_US Croatian (US) cz Czech - cz_qwerty Czech (qwerty) dk Danish nl Dutch dvorak Dvorak @@ -138,8 +136,7 @@ fi Finnish fr French fr-latin9 French (alternative) - ge_la Georgian (latin) - ge_ru Georgian (russian) + ge Georgian (latin) de German el Greek guj Gujarati @@ -163,7 +160,6 @@ mk Macedonian ml Malayalam mt Maltese - mt_us Maltese (US layout) mn Mongolian no Norwegian ogham Ogham @@ -173,18 +169,14 @@ pt Portuguese ro Romanian ru Russian - se_FI Northern Saami (Finland) - se_NO Northern Saami (Norway) - se_SE Northern Saami (Sweden) + sapmi Northern Saami sr Serbian (Cyrillic) yu Serbian (Latin) si Slovenian sk Slovak - sk_qwerty Slovak (qwerty) es Spanish se Swedish - fr_CH Swiss French - de_CH Swiss German + ch Swiss syr Syriac tj Tajik tml Tamil @@ -193,7 +185,6 @@ th_tis Thai (TIS-820.2538) th_pat Thai (Pattachote) tr Turkish - tr_f Turkish (F) ua Ukrainian gb United Kingdom uz Uzbek diff --git a/rules/base.xml.in b/rules/base.xml.in index d69643e3..eaeedea5 100644 --- a/rules/base.xml.in +++ b/rules/base.xml.in @@ -642,14 +642,6 @@ </layout> <layout> <configItem> - <name>us_intl</name> - <_shortDescription>USA</_shortDescription> - <_description>U.S. English w/ dead keys</_description> - </configItem> - <variantList/> - </layout> - <layout> - <configItem> <name>al</name> <_shortDescription>Alb</_shortDescription> <_description>Albanian</_description> @@ -864,25 +856,16 @@ <_description>Sun dead keys</_description> </configItem> </variant> - </variantList> - </layout> - <layout> - <configItem> - <name>ca_enhanced</name> - <_shortDescription>Can</_shortDescription> - <_description>French Canadian</_description> - </configItem> - <variantList> <variant> <configItem> - <name>basic</name> - <_description>Basic</_description> + <name>enhanced</name> + <_description>French Canadian</_description> </configItem> </variant> <variant> <configItem> - <name>sundeadkeys</name> - <_description>Sun dead keys</_description> + <name>enhanced_sundeadkeys</name> + <_description>French, Sun dead keys</_description> </configItem> </variant> </variantList> @@ -904,35 +887,20 @@ <variantList> <variant> <configItem> - <name>basic</name> - <_description>Basic</_description> - </configItem> - </variant> - <variant> - <configItem> <name>bksl</name> - <_description>bksl</_description> + <_description>Extended Backslash</_description> </configItem> </variant> - </variantList> - </layout> - <layout> - <configItem> - <name>cz_qwerty</name> - <_shortDescription>Cze</_shortDescription> - <_description>Czech (qwerty)</_description> - </configItem> - <variantList> <variant> <configItem> - <name>basic</name> - <_description>Basic</_description> + <name>qwerty</name> + <_description>qwerty</_description> </configItem> </variant> <variant> <configItem> - <name>bksl</name> - <_description>bksl</_description> + <name>qwerty_bksl</name> + <_description>qwerty, extended Backslash</_description> </configItem> </variant> </variantList> @@ -1058,8 +1026,8 @@ <variantList> <variant> <configItem> - <name>basic</name> - <_description>Basic</_description> + <name>nodeadkeys</name> + <_description>Eliminate dead keys</_description> </configItem> </variant> </variantList> @@ -1108,19 +1076,24 @@ </layout> <layout> <configItem> - <name>ge_la</name> + <name>ge</name> <_shortDescription>Geo</_shortDescription> <_description>Georgian (latin)</_description> </configItem> - <variantList/> - </layout> - <layout> - <configItem> - <name>ge_ru</name> - <_shortDescription>Geo</_shortDescription> - <_description>Georgian (russian)</_description> - </configItem> - <variantList/> + <variantList> + <variant> + <configItem> + <name>la</name> + <_description>Latin</_description> + </configItem> + </variant> + <variant> + <configItem> + <name>ru</name> + <_description>Russian</_description> + </configItem> + </variant> + </variantList> </layout> <layout> <configItem> @@ -1131,12 +1104,6 @@ <variantList> <variant> <configItem> - <name>basic</name> - <_description>Basic</_description> - </configItem> - </variant> - <variant> - <configItem> <name>deadacute</name> <_description>Dead acute</_description> </configItem> @@ -1385,6 +1352,12 @@ <_description>si1452</_description> </configItem> </variant> + <variant> + <configItem> + <name>phonetic</name> + <_description>Phonetic</_description> + </configItem> + </variant> </variantList> </layout> <layout> @@ -1468,7 +1441,7 @@ </variant> </variantList> </layout> - <layout> + <!--<layout> <configItem> <name>lt_std</name> <_shortDescription>Ltu</_shortDescription> @@ -1488,7 +1461,7 @@ </configItem> </variant> </variantList> - </layout> + </layout>--> <layout> <configItem> <name>lv</name> @@ -1533,15 +1506,14 @@ <_shortDescription>Mlt</_shortDescription> <_description>Maltese</_description> </configItem> - <variantList/> - </layout> - <layout> - <configItem> - <name>mt_us</name> - <_shortDescription>Mlt</_shortDescription> - <_description>Maltese (US layout)</_description> - </configItem> - <variantList/> + <variantList> + <variant> + <configItem> + <name>us</name> + <_description>US layout</_description> + </configItem> + </variant> + </variantList> </layout> <layout> <configItem> @@ -1560,12 +1532,6 @@ <variantList> <variant> <configItem> - <name>basic</name> - <_description>Basic</_description> - </configItem> - </variant> - <variant> - <configItem> <name>nodeadkeys</name> <_description>Eliminate dead keys</_description> </configItem> @@ -1653,10 +1619,16 @@ <variantList> <variant> <configItem> - <name>ro_us</name> + <name>us</name> <_description>US keyboard with Romanian letters</_description> </configItem> </variant> + <variant> + <configItem> + <name>de</name> + <_description>German for Romanian keyboard</_description> + </configItem> + </variant> </variantList> </layout> <layout> @@ -1688,30 +1660,6 @@ </layout> <layout> <configItem> - <name>se_FI</name> - <_shortDescription>Sme</_shortDescription> - <_description>Northern Saami (Finland)</_description> - </configItem> - <variantList/> - </layout> - <layout> - <configItem> - <name>se_NO</name> - <_shortDescription>Sme</_shortDescription> - <_description>Northern Saami (Norway)</_description> - </configItem> - <variantList/> - </layout> - <layout> - <configItem> - <name>se_SE</name> - <_shortDescription>Sme</_shortDescription> - <_description>Northern Saami (Sweden)</_description> - </configItem> - <variantList/> - </layout> - <layout> - <configItem> <name>sr</name> <_shortDescription>Scg</_shortDescription> <_description>Serbian</_description> @@ -1742,35 +1690,20 @@ <variantList> <variant> <configItem> - <name>basic</name> - <_description>Basic</_description> - </configItem> - </variant> - <variant> - <configItem> <name>bksl</name> - <_description>bksl</_description> + <_description>Extended Backslash</_description> </configItem> </variant> - </variantList> - </layout> - <layout> - <configItem> - <name>sk_qwerty</name> - <_shortDescription>Svk</_shortDescription> - <_description>Slovak (qwerty)</_description> - </configItem> - <variantList> <variant> <configItem> - <name>basic</name> - <_description>Basic</_description> + <name>qwerty</name> + <_description>qwerty</_description> </configItem> </variant> <variant> <configItem> - <name>bksl</name> - <_description>bksl</_description> + <name>bksl_qwerty</name> + <_description>qwerty, extended Backslash</_description> </configItem> </variant> </variantList> @@ -1805,12 +1738,6 @@ <variantList> <variant> <configItem> - <name>basic</name> - <_description>Basic</_description> - </configItem> - </variant> - <variant> - <configItem> <name>nodeadkeys</name> <_description>Eliminate dead keys</_description> </configItem> @@ -1819,42 +1746,45 @@ </layout> <layout> <configItem> - <name>fr_CH</name> - <_shortDescription>Fra</_shortDescription> - <_description>Swiss French</_description> + <name>ch</name> + <_shortDescription>Swi</_shortDescription> + <_description>Swiss</_description> </configItem> <variantList> <variant> <configItem> - <name>nodeadkeys</name> - <_description>Eliminate dead keys</_description> + <name>de</name> + <_description>German</_description> </configItem> </variant> <variant> <configItem> - <name>sundeadkeys</name> - <_description>Sun dead keys</_description> + <name>de_nodeadkeys</name> + <_description>German, eliminate dead keys</_description> </configItem> </variant> - </variantList> - </layout> - <layout> - <configItem> - <name>de_CH</name> - <_shortDescription>Deu</_shortDescription> - <_description>Swiss German</_description> - </configItem> - <variantList> <variant> <configItem> - <name>nodeadkeys</name> - <_description>Eliminate dead keys</_description> + <name>de_sundeadkeys</name> + <_description>German, Sun dead keys</_description> </configItem> </variant> <variant> <configItem> - <name>sundeadkeys</name> - <_description>Sun dead keys</_description> + <name>fr</name> + <_description>French</_description> + </configItem> + </variant> + <variant> + <configItem> + <name>fr_nodeadkeys</name> + <_description>French, eliminate dead keys</_description> + </configItem> + </variant> + <variant> + <configItem> + <name>fr_sundeadkeys</name> + <_description>French, Sun dead keys</_description> </configItem> </variant> </variantList> @@ -1865,15 +1795,14 @@ <_shortDescription>Syr</_shortDescription> <_description>Syriac</_description> </configItem> - <variantList/> - </layout> - <layout> - <configItem> - <name>syr_phonetic</name> - <_shortDescription>Syr</_shortDescription> - <_description>Syriac phonetic</_description> - </configItem> - <variantList/> + <variantList> + <variant> + <configItem> + <name>phonetic</name> + <_description>Phonetic</_description> + </configItem> + </variant> + </variantList> </layout> <layout> <configItem> @@ -1928,23 +1857,28 @@ <configItem> <name>th</name> <_shortDescription>Tha</_shortDescription> - <_description>Thai (Kedmanee)</_description> - </configItem> - <variantList/> - </layout> - <layout> - <configItem> - <name>th_tis</name> - <_description>Thai (TIS-820.2538)</_description> - </configItem> - <variantList/> - </layout> - <layout> - <configItem> - <name>th_pat</name> - <_description>Thai (Pattachote)</_description> + <_description>Thai</_description> </configItem> - <variantList/> + <variantList> + <variant> + <configItem> + <name>basic</name> + <_description>Kedmanee</_description> + </configItem> + </variant> + <variant> + <configItem> + <name>tis</name> + <_description>TIS-820.2538</_description> + </configItem> + </variant> + <variant> + <configItem> + <name>pat</name> + <_description>Pattachote</_description> + </configItem> + </variant> + </variantList> </layout> <layout> <configItem> @@ -2095,23 +2029,15 @@ </layout> <layout> <configItem> - <name>il_phonetic</name> - <_shortDescription>Isr</_shortDescription> - <_description>Israeli phonetic</_description> - </configItem> - <variantList/> - </layout> - <layout> - <configItem> <name>sapmi</name> <_shortDescription>Sme</_shortDescription> - <_description>Sapmi</_description> + <_description>Northern Saami</_description> </configItem> <variantList> <variant> <configItem> <name>basic</name> - <_description>Basic</_description> + <_description>Norwegian</_description> </configItem> </variant> <variant> @@ -2123,7 +2049,7 @@ <variant> <configItem> <name>sefi</name> - <_description>sefi</_description> + <_description>Finish and Swedish</_description> </configItem> </variant> </variantList> diff --git a/symbols/Makefile.am b/symbols/Makefile.am index 3c4e67b0..79178ada 100644 --- a/symbols/Makefile.am +++ b/symbols/Makefile.am @@ -4,29 +4,29 @@ symbols_DATA = \ al am ar \ be ben bg \ br bs by ch cz \ -cz_qwerty de dev \ +de dev \ dk dvorak dz \ ee el en_US \ es fi fo \ fr fr-latin9 gb \ -ge_la ge_ru guj \ +ge guj \ gur hr ie \ -il il_phonetic ir \ +il ir \ is it iu \ kan la latin \ lo lt lv \ mk ml mm \ -mt mt_us nl \ +mt nl \ no ogham ori \ pc pl pl2 \ pt ro ru \ -sapmi se se_FI \ -se_NO se_SE si \ -sk sk_qwerty sr \ -syr syr_phonetic tel \ -th th_pat th_tis \ +sapmi se \ +si \ +sk sk sr \ +syr tel \ +th \ tj tml tr \ -ua us us_intl \ +ua us \ uz yu \ altwin compose ctrl group inet keypad level3 lock srvr_ctrl @@ -73,7 +73,7 @@ xkb_symbols "de" { }; partial alphanumeric_keys -xkb_symbols "de-Sundeadkeys" { +xkb_symbols "de_Sundeadkeys" { // modify the default Swiss German layout to use Sun dead keys include "ch(basic)" key <AE11> { [ apostrophe, question ], @@ -85,12 +85,12 @@ xkb_symbols "de-Sundeadkeys" { }; partial alphanumeric_keys -xkb_symbols "de-sundeadkeys" { +xkb_symbols "de_sundeadkeys" { include "ch(Sundeadkeys)" }; partial alphanumeric_keys -xkb_symbols "de-nodeadkeys" { +xkb_symbols "de_nodeadkeys" { // modify the default Swiss German layout not to have any dead keys include "ch(basic)" key <AE11> { [ apostrophe, question ], @@ -101,7 +101,7 @@ xkb_symbols "de-nodeadkeys" { [ bracketright ] }; }; -partial default alphanumeric_keys +partial alphanumeric_keys xkb_symbols "fr" { // Describes the differences between a very simple US/ASCII @@ -124,7 +124,7 @@ xkb_symbols "fr" { }; partial alphanumeric_keys -xkb_symbols "fr-Sundeadkeys" { +xkb_symbols "fr_Sundeadkeys" { // modify the default Swiss French layout to use Sun dead keys include "ch(fr)" key <AE11> { [ apostrophe, question ], @@ -136,12 +136,12 @@ xkb_symbols "fr-Sundeadkeys" { }; partial alphanumeric_keys -xkb_symbols "fr-sundeadkeys" { - include "ch(fr-Sundeadkeys)" +xkb_symbols "fr_sundeadkeys" { + include "ch(fr_Sundeadkeys)" }; partial alphanumeric_keys -xkb_symbols "fr-nodeadkeys" { +xkb_symbols "fr_nodeadkeys" { // modify the default Swiss French layout not to have any dead keys include "ch(fr)" key <AE11> { [ apostrophe, question ], @@ -81,3 +81,23 @@ xkb_symbols "bksl" { key <BKSL> { [ backslash, bar, slash, NoSymbol ] }; }; + +partial alphanumeric_keys +xkb_symbols "qwerty" { + + // This layout should work exactly as a cz with the exception + // of 'Z' and 'Y' keys, which are in the qwerty style (ie. swapped). + // 2001 by Kamil Toman <ktoman@email.cz> + + include "cz(basic)" + + key <AB01> { [ z, Z, degree, NoSymbol ] }; + key <AD06> { [ y, Y, NoSymbol, NoSymbol ] }; +}; + +// Use <BKSL> instead of <LSGT> (useful for keyboard without <LSGT> key) +xkb_symbols "qwerty_bksl" { + include "cz(qwerty)" + + key <BKSL> { [ backslash, bar, slash, NoSymbol ] }; +}; diff --git a/symbols/cz_qwerty b/symbols/cz_qwerty deleted file mode 100644 index 86d8dfdb..00000000 --- a/symbols/cz_qwerty +++ /dev/null @@ -1,21 +0,0 @@ -// $XFree86$ - -partial alphanumeric_keys -xkb_symbols "basic" { - - // This layout should work exactly as a cz with the exception - // of 'Z' and 'Y' keys, which are in the qwerty style (ie. swapped). - // 2001 by Kamil Toman <ktoman@email.cz> - - include "cz(basic)" - - key <AB01> { [ z, Z, degree, NoSymbol ] }; - key <AD06> { [ y, Y, NoSymbol, NoSymbol ] }; -}; - -// Use <BKSL> instead of <LSGT> (useful for keyboard without <LSGT> key) -xkb_symbols "bksl" { - include "cz_qwerty(basic)" - - key <BKSL> { [ backslash, bar, slash, NoSymbol ] }; -}; diff --git a/symbols/digital.vndr/lk b/symbols/digital.vndr/lk index e5732a30..3bf14fd9 100644 --- a/symbols/digital.vndr/lk +++ b/symbols/digital.vndr/lk @@ -124,7 +124,7 @@ default xkb_symbols "common" { }; xkb_symbols "lk401" { - include "symbols/digital/lk(common)" + include "symbols/digital.vndr/lk(common)" key <RALT> { [ Alt_R, Meta_R ] }; key <LCMP> { [ Multi_key ] }; key <RCMP> { [ Multi_key ] }; diff --git a/symbols/digital.vndr/pc b/symbols/digital.vndr/pc index c6cc777d..450e6c47 100644 --- a/symbols/digital.vndr/pc +++ b/symbols/digital.vndr/pc @@ -167,7 +167,7 @@ xkb_symbols "pc" { }; xkb_symbols "pc104" { - include "digital/pc(pc)" + include "digital.vndr/pc(pc)" replace key <LALT> { [ Alt_L ] }; key <LWIN> { [ Meta_L ] }; diff --git a/symbols/digital.vndr/us b/symbols/digital.vndr/us index 21636aa6..69994cd1 100644 --- a/symbols/digital.vndr/us +++ b/symbols/digital.vndr/us @@ -129,8 +129,8 @@ xkb_symbols "us" { // * * // ************************************************************** xkb_symbols "vt105-tw" { - include "digital/us(us)" - include "digital/vt(vt105)" + include "digital.vndr/us(us)" + include "digital.vndr/vt(vt105)" override key <AE03> { symbols[Group1]= [ 3, numbersign ], symbols[Group2]= [ sterling ] @@ -138,8 +138,8 @@ xkb_symbols "vt105-tw" { key <AB00> { [ less, greater ] }; }; -xkb_symbols "vt105-dp" { include "digital/us(vt105-tw)" }; -xkb_symbols "vt105" { include "digital/us(vt105-tw)" }; +xkb_symbols "vt105-dp" { include "digital.vndr/us(vt105-tw)" }; +xkb_symbols "vt105" { include "digital.vndr/us(vt105-tw)" }; // ************************************************************** // * * @@ -150,8 +150,8 @@ xkb_symbols "vt105" { include "digital/us(vt105-tw)" }; // * * // ************************************************************** xkb_symbols "vt108-tw" { - include "digital/us(us)" - include "digital/vt(vt108)" + include "digital.vndr/us(us)" + include "digital.vndr/vt(vt108)" replace key <LCMP> { [ Multi_key ] }; override key <AE03> { symbols[Group1]= [ 3, numbersign ], @@ -160,8 +160,8 @@ xkb_symbols "vt108-tw" { key <AB00> { [ less, greater ] }; }; -xkb_symbols "vt108-dp" { include "digital/us(vt108-tw)" }; -xkb_symbols "vt108" { include "digital/us(vt108-tw)" }; +xkb_symbols "vt108-dp" { include "digital.vndr/us(vt108-tw)" }; +xkb_symbols "vt108" { include "digital.vndr/us(vt108-tw)" }; // ************************************************************** // * * @@ -175,7 +175,7 @@ xkb_symbols "vt108" { include "digital/us(vt108-tw)" }; // * * // ************************************************************** xkb_symbols "unix" { - include "digital/us(vt108)" + include "digital.vndr/us(vt108)" override key <AE00> { [ Escape ] }; override key <AB00> { [ grave, asciitilde ] }; }; @@ -189,16 +189,16 @@ xkb_symbols "unix" { // * * // ************************************************************** xkb_symbols "pcxalga" { - include "digital/pc(pc)" - include "digital/us(us)" + include "digital.vndr/pc(pc)" + include "digital.vndr/us(us)" replace key <RALT> { [ Alt_R, Meta_R ] }; }; -xkb_symbols "pcxal" { include "digital/us(pcxalga)" }; -xkb_symbols "pcxalaa" { include "digital/us(pcxalga)" }; -xkb_symbols "pcxalfa" { include "digital/us(pcxalga)" }; -xkb_symbols "pcxalka" { include "digital/us(pcxalga)" }; -xkb_symbols "lk44x" { include "digital/us(pcxalga)" }; +xkb_symbols "pcxal" { include "digital.vndr/us(pcxalga)" }; +xkb_symbols "pcxalaa" { include "digital.vndr/us(pcxalga)" }; +xkb_symbols "pcxalfa" { include "digital.vndr/us(pcxalga)" }; +xkb_symbols "pcxalka" { include "digital.vndr/us(pcxalga)" }; +xkb_symbols "lk44x" { include "digital.vndr/us(pcxalga)" }; // ************************************************************** // * * @@ -206,7 +206,7 @@ xkb_symbols "lk44x" { include "digital/us(pcxalga)" }; // * * // ************************************************************** xkb_symbols "pc104" { - include "digital/pc(pc104)" - include "digital/us(us)" + include "digital.vndr/pc(pc104)" + include "digital.vndr/us(us)" replace key <RALT> { [ Alt_R ] }; }; diff --git a/symbols/digital.vndr/vt b/symbols/digital.vndr/vt index 62257abf..c382dc2c 100644 --- a/symbols/digital.vndr/vt +++ b/symbols/digital.vndr/vt @@ -149,7 +149,7 @@ xkb_symbols "vt105" { xkb_symbols "vt108" { - include "digital/vt(vt105)" + include "digital.vndr/vt(vt105)" replace key <LCMP> { [ Mode_switch ] }; diff --git a/symbols/fujitsu.vndr/jp b/symbols/fujitsu.vndr/jp index bc578ae7..a3599b2e 100644 --- a/symbols/fujitsu.vndr/jp +++ b/symbols/fujitsu.vndr/jp @@ -27,7 +27,7 @@ // Japanese layout for a Fujitsu 140 key keyboard xkb_symbols { - override "fujitsu/us" + override "fujitsu.vndr/us" augment key <AE01> { [], [ kana_NU ] }; key <AE02> { [ 2, quotedbl ], [ kana_FU ] }; key <AE03> { [ 3, numbersign ], [ kana_A, kana_a ] }; diff --git a/symbols/ge_ru b/symbols/ge index 4fd347b4..a9b68e28 100644 --- a/symbols/ge_ru +++ b/symbols/ge @@ -1,15 +1,66 @@ // based on -// Georgian keyboard map, in the so called "russian" layout. +// Georgian keyboard map, in the so called "latin" layout. // 1999, Pablo Saratxaga <srtxg@chanae.alphanet.ch> // -// $XFree86$ +// $XdotOrg: xc/programs/xkbcomp/symbols/ge_la,v 1.1.4.2 2004/03/05 13:41:33 eich Exp $ +// $XFree86: xc/programs/xkbcomp/symbols/ge_la,v 1.2 2002/11/22 04:03:28 dawes Exp $ partial default alphanumeric_keys xkb_symbols "basic" { name[Group1]= "Georgian"; + key <AD01> { [ 0x010010e5, q ] }; + key <AD02> { [ 0x010010ec, 0x010010ed ] }; + key <AD03> { [ 0x010010d4, e ] }; + key <AD04> { [ 0x010010e0, 0x010010e6 ] }; + key <AD05> { [ 0x010010e2, 0x010010d7 ] }; + key <AD06> { [ 0x010010e7, y ] }; + key <AD07> { [ 0x010010e3, u ] }; + key <AD08> { [ 0x010010d8, i ] }; + key <AD09> { [ 0x010010dd, o ] }; + key <AD10> { [ 0x010010de, p ] }; + key <AD11> { [ bracketleft, braceleft ] }; + key <AD12> { [ bracketright,braceright ] }; + + key <AC01> { [ 0x010010d0, a ] }; + key <AC02> { [ 0x010010e1, 0x010010e8 ] }; + key <AC03> { [ 0x010010d3, d ] }; + key <AC04> { [ 0x010010e4, f ] }; + key <AC05> { [ 0x010010d2, g ] }; + key <AC06> { [ 0x010010f0, h ] }; + key <AC07> { [ 0x010010ef, 0x010010df ] }; + key <AC08> { [ 0x010010d9, k ] }; + key <AC09> { [ 0x010010da, l ] }; + key <AC10> { [ semicolon, colon ] }; + key <AC11> { [ apostrophe, quotedbl ] }; + key <BKSL> { [ backslash, bar ] }; + + key <LSGT> { [ guillemotleft,guillemotright ] }; + key <AB01> { [ 0x010010d6, 0x010010eb ] }; + key <AB02> { [ 0x010010ee, x ] }; + key <AB03> { [ 0x010010ea, 0x010010e9 ] }; + key <AB04> { [ 0x010010d5, v ] }; + key <AB05> { [ 0x010010d1, b ] }; + key <AB06> { [ 0x010010dc, n ] }; + key <AB07> { [ 0x010010db, m ] }; + key <AB08> { [ comma, less ] }; + key <AB09> { [ period, greater ] }; + key <AB10> { [ slash, question ] }; + +}; + +partial alphanumeric_keys +xkb_symbols "la" { + include "ge(basic)" +} + +partial alphanumeric_keys +xkb_symbols "ru" { + + name[Group1]= "Georgian"; + key <TLDE> { [ asciicircum, asciitilde ] }; key <AE01> { [ 1, exclam ] }; key <AE02> { [ 2, at ] }; // 2 0xeb diff --git a/symbols/ge_la b/symbols/ge_la deleted file mode 100644 index 528b8f16..00000000 --- a/symbols/ge_la +++ /dev/null @@ -1,52 +0,0 @@ - -// based on -// Georgian keyboard map, in the so called "latin" layout. -// 1999, Pablo Saratxaga <srtxg@chanae.alphanet.ch> -// -// $XdotOrg: xc/programs/xkbcomp/symbols/ge_la,v 1.1.4.2 2004/03/05 13:41:33 eich Exp $ -// $XFree86: xc/programs/xkbcomp/symbols/ge_la,v 1.2 2002/11/22 04:03:28 dawes Exp $ - -partial default alphanumeric_keys -xkb_symbols "basic" { - - name[Group1]= "Georgian"; - - key <AD01> { [ 0x010010e5, q ] }; - key <AD02> { [ 0x010010ec, 0x010010ed ] }; - key <AD03> { [ 0x010010d4, e ] }; - key <AD04> { [ 0x010010e0, 0x010010e6 ] }; - key <AD05> { [ 0x010010e2, 0x010010d7 ] }; - key <AD06> { [ 0x010010e7, y ] }; - key <AD07> { [ 0x010010e3, u ] }; - key <AD08> { [ 0x010010d8, i ] }; - key <AD09> { [ 0x010010dd, o ] }; - key <AD10> { [ 0x010010de, p ] }; - key <AD11> { [ bracketleft, braceleft ] }; - key <AD12> { [ bracketright,braceright ] }; - - key <AC01> { [ 0x010010d0, a ] }; - key <AC02> { [ 0x010010e1, 0x010010e8 ] }; - key <AC03> { [ 0x010010d3, d ] }; - key <AC04> { [ 0x010010e4, f ] }; - key <AC05> { [ 0x010010d2, g ] }; - key <AC06> { [ 0x010010f0, h ] }; - key <AC07> { [ 0x010010ef, 0x010010df ] }; - key <AC08> { [ 0x010010d9, k ] }; - key <AC09> { [ 0x010010da, l ] }; - key <AC10> { [ semicolon, colon ] }; - key <AC11> { [ apostrophe, quotedbl ] }; - key <BKSL> { [ backslash, bar ] }; - - key <LSGT> { [ guillemotleft,guillemotright ] }; - key <AB01> { [ 0x010010d6, 0x010010eb ] }; - key <AB02> { [ 0x010010ee, x ] }; - key <AB03> { [ 0x010010ea, 0x010010e9 ] }; - key <AB04> { [ 0x010010d5, v ] }; - key <AB05> { [ 0x010010d1, b ] }; - key <AB06> { [ 0x010010dc, n ] }; - key <AB07> { [ 0x010010db, m ] }; - key <AB08> { [ comma, less ] }; - key <AB09> { [ period, greater ] }; - key <AB10> { [ slash, question ] }; - -}; @@ -152,3 +152,47 @@ xkb_symbols "si1452" { key <BKSL> { [ backslash, backslash, 0x10005bb ]}; // Qubuts }; + +// $XFree86$ + +partial alphanumeric_keys +xkb_symbols "phonetic" { + + // uses the phonetic layout from old Slackware 'il.map' file + + name[Group1]= "Israelian(phonetic)"; + + key <AE12> { [ equal, plus ], + [ hebrew_doublelowline, hebrew_doublelowline ]}; + + key <LatQ> { [ hebrew_qoph, hebrew_qoph ] }; + key <LatW> { [ hebrew_waw, hebrew_waw ] }; + key <LatE> { [ hebrew_aleph, hebrew_aleph ] }; + key <LatR> { [ hebrew_resh, hebrew_resh ] }; + key <LatT> { [ hebrew_taw, hebrew_tet ] }; + key <LatY> { [ hebrew_ayin, hebrew_ayin ] }; + key <LatU> { [ hebrew_waw, hebrew_waw ] }; + key <LatI> { [ hebrew_yod, hebrew_yod ] }; + key <LatO> { [ hebrew_samech, hebrew_samech ] }; + key <LatP> { [ hebrew_pe, hebrew_finalpe ] }; + + key <LatA> { [ hebrew_aleph, hebrew_aleph ] }; + key <LatS> { [ hebrew_shin, hebrew_shin ] }; + key <LatD> { [ hebrew_dalet, hebrew_dalet ] }; + key <LatF> { [ hebrew_pe, hebrew_finalpe ] }; + key <LatG> { [ hebrew_gimel, hebrew_gimel ] }; + key <LatH> { [ hebrew_he, hebrew_he ] }; + key <LatJ> { [ hebrew_yod, hebrew_yod ] }; + key <LatK> { [ hebrew_kaph, hebrew_finalkaph ] }; + key <LatL> { [ hebrew_lamed, hebrew_lamed ] }; + + key <LatZ> { [ hebrew_zain, hebrew_zain ] }; + key <LatX> { [ hebrew_chet, hebrew_chet ] }; + key <LatC> { [ hebrew_zade, hebrew_finalzade ] }; + key <LatV> { [ hebrew_waw, hebrew_waw ] }; + key <LatB> { [ hebrew_bet, hebrew_bet ] }; + key <LatN> { [ hebrew_nun, hebrew_finalnun ] }; + key <LatM> { [ hebrew_mem, hebrew_finalmem ] }; +}; + + diff --git a/symbols/il_phonetic b/symbols/il_phonetic deleted file mode 100644 index b16c9354..00000000 --- a/symbols/il_phonetic +++ /dev/null @@ -1,46 +0,0 @@ - -// based on a keyboard map from an 'xkb/symbols/il_phonetic' file -// -// $XFree86$ - -partial default alphanumeric_keys -xkb_symbols "basic" { - - // uses the phonetic layout from old Slackware 'il.map' file - - name[Group1]= "Israelian(phonetic)"; - - key <AE12> { [ equal, plus ], - [ hebrew_doublelowline, hebrew_doublelowline ]}; - - key <LatQ> { [ hebrew_qoph, hebrew_qoph ] }; - key <LatW> { [ hebrew_waw, hebrew_waw ] }; - key <LatE> { [ hebrew_aleph, hebrew_aleph ] }; - key <LatR> { [ hebrew_resh, hebrew_resh ] }; - key <LatT> { [ hebrew_taw, hebrew_tet ] }; - key <LatY> { [ hebrew_ayin, hebrew_ayin ] }; - key <LatU> { [ hebrew_waw, hebrew_waw ] }; - key <LatI> { [ hebrew_yod, hebrew_yod ] }; - key <LatO> { [ hebrew_samech, hebrew_samech ] }; - key <LatP> { [ hebrew_pe, hebrew_finalpe ] }; - - key <LatA> { [ hebrew_aleph, hebrew_aleph ] }; - key <LatS> { [ hebrew_shin, hebrew_shin ] }; - key <LatD> { [ hebrew_dalet, hebrew_dalet ] }; - key <LatF> { [ hebrew_pe, hebrew_finalpe ] }; - key <LatG> { [ hebrew_gimel, hebrew_gimel ] }; - key <LatH> { [ hebrew_he, hebrew_he ] }; - key <LatJ> { [ hebrew_yod, hebrew_yod ] }; - key <LatK> { [ hebrew_kaph, hebrew_finalkaph ] }; - key <LatL> { [ hebrew_lamed, hebrew_lamed ] }; - - key <LatZ> { [ hebrew_zain, hebrew_zain ] }; - key <LatX> { [ hebrew_chet, hebrew_chet ] }; - key <LatC> { [ hebrew_zade, hebrew_finalzade ] }; - key <LatV> { [ hebrew_waw, hebrew_waw ] }; - key <LatB> { [ hebrew_bet, hebrew_bet ] }; - key <LatN> { [ hebrew_nun, hebrew_finalnun ] }; - key <LatM> { [ hebrew_mem, hebrew_finalmem ] }; -}; - - @@ -35,7 +35,7 @@ xkb_symbols "basic" { // Similar to the above, but you should use Right Alt + numeric row // for Lithuanian letters -partial default alphanumeric_keys modifier_keys +partial alphanumeric_keys modifier_keys xkb_symbols "lt_us" { include "latin" @@ -67,7 +67,7 @@ xkb_symbols "lt_us" { // Extensions: B01 L3 is "<" , B02 L3 is ">" and B03 L3 is endash to make this // layout usable with pc101 and pc104 keyboards. -partial default alphanumeric_keys modifier_keys +partial alphanumeric_keys modifier_keys xkb_symbols "lt_std" { include "latin" diff --git a/symbols/macintosh.vndr/Makefile.am b/symbols/macintosh.vndr/Makefile.am index 35c56e67..8bc7e8bc 100644 --- a/symbols/macintosh.vndr/Makefile.am +++ b/symbols/macintosh.vndr/Makefile.am @@ -1,7 +1,7 @@ symbols_DATA = \ -de de_CH dk \ +ch de dk \ es fi fr \ -fr_CH gb it \ +gb it \ nl no pt \ se us diff --git a/symbols/macintosh.vndr/de_CH b/symbols/macintosh.vndr/ch index 75eb9479..ea8448e4 100644 --- a/symbols/macintosh.vndr/de_CH +++ b/symbols/macintosh.vndr/ch @@ -148,3 +148,35 @@ xkb_symbols "extended" { key <KPDL> { [ KP_Separator , KP_Delete ] }; }; + +partial alphanumeric_keys +xkb_symbols "de" { + include "macintosh.vndr/ch(extended)" +}; + +partial alphanumeric_keys +xkb_symbols "fr" { + + // Describes the differences between a very simple US/ASCII + // keyboard and a very simple Swiss/French keybaord + + include "macintosh.vndr/ch(extended)" + name[Group1]= "Swiss French"; + + override key <AD11> { + [ egrave, udiaeresis ], + [ bracketleft ] + }; + override key <AC10> { + [ eacute, odiaeresis ] + }; + override key <AC11> { + [ agrave, adiaeresis ], + [ braceleft ] + }; +}; + +partial alphanumeric_keys +xkb_symbols "nodeadkeys" { + include "macintosh.vndr/fr_CH" // for consistent naming +}; diff --git a/symbols/macintosh.vndr/de b/symbols/macintosh.vndr/de index b4bf6aa5..0d85d2f5 100644 --- a/symbols/macintosh.vndr/de +++ b/symbols/macintosh.vndr/de @@ -99,7 +99,7 @@ xkb_symbols "basic" { partial alphanumeric_keys xkb_symbols "Sundeadkeys" { // modify the default German layout to use Sun dead keys - include "macintosh/de(basic)" + include "macintosh.vndr/de(basic)" key <TLDE> { [ SunFA_Circum, degree ], [ notsign ] }; key <AE12> { [ SunFA_Acute, SunFA_Grave ], @@ -119,13 +119,13 @@ xkb_symbols "Sundeadkeys" { partial alphanumeric_keys xkb_symbols "sundeadkeys" { - include "macintosh/de(Sundeadkeys)" + include "macintosh.vndr/de(Sundeadkeys)" }; partial alphanumeric_keys xkb_symbols "nodeadkeys" { // modify the default German layout to not have any dead keys - include "macintosh/de(basic)" + include "macintosh.vndr/de(basic)" key <TLDE> { [ asciicircum, degree ], [ notsign ] }; key <AE12> { [ acute, grave ], diff --git a/symbols/macintosh.vndr/dk b/symbols/macintosh.vndr/dk index c5879763..fded9984 100644 --- a/symbols/macintosh.vndr/dk +++ b/symbols/macintosh.vndr/dk @@ -84,7 +84,7 @@ xkb_symbols "full" { partial alphanumeric_keys xkb_symbols "nodeadkeys" { - include "macintosh/dk(basic)" + include "macintosh.vndr/dk(basic)" key <AE12> { [ acute, grave ], [ bar, ogonek ] }; key <AD12> { [ diaeresis, asciicircum ], diff --git a/symbols/macintosh.vndr/fi b/symbols/macintosh.vndr/fi index 6f08ddbf..a197891a 100644 --- a/symbols/macintosh.vndr/fi +++ b/symbols/macintosh.vndr/fi @@ -8,12 +8,12 @@ xkb_symbols "basic" { // keyboard and a very simple Swedish(Finland) keybaord name[Group1]= "Finnish"; - include "macintosh/se(basic)" // for consistent naming + include "macintosh.vndr/se(basic)" // for consistent naming }; partial alphanumeric_keys xkb_symbols "nodeadkeys" { - include "macintosh/se(basic)" // for consistent naming + include "macintosh.vndr/se(basic)" // for consistent naming }; diff --git a/symbols/macintosh.vndr/fr_CH b/symbols/macintosh.vndr/fr_CH deleted file mode 100644 index e8480c55..00000000 --- a/symbols/macintosh.vndr/fr_CH +++ /dev/null @@ -1,28 +0,0 @@ -// $XConsortium: fr_CH /main/3 1996/08/31 12:19:48 kaleb $ -// $XFree86: xc/programs/xkbcomp/symbols/macintosh/fr_CH,v 1.1 2000/09/19 12:46:25 eich Exp $ -partial default alphanumeric_keys -xkb_symbols "basic" { - - // Describes the differences between a very simple US/ASCII - // keyboard and a very simple Swiss/French keybaord - - include "macintosh/de_CH" - name[Group1]= "Swiss French"; - - override key <AD11> { - [ egrave, udiaeresis ], - [ bracketleft ] - }; - override key <AC10> { - [ eacute, odiaeresis ] - }; - override key <AC11> { - [ agrave, adiaeresis ], - [ braceleft ] - }; -}; - -partial alphanumeric_keys -xkb_symbols "nodeadkeys" { - include "macintosh/fr_CH" // for consistent naming -}; diff --git a/symbols/macintosh.vndr/no b/symbols/macintosh.vndr/no index 689da9da..8b4586fb 100644 --- a/symbols/macintosh.vndr/no +++ b/symbols/macintosh.vndr/no @@ -49,7 +49,7 @@ xkb_symbols "nodeadkeys" { // Modifies the basic Norwegian layout to eliminate dead keys - include "macintosh/no(basic)" + include "macintosh.vndr/no(basic)" key <AE12> { [ grave, acute ], [ acute, ogonek ] }; key <AD12> { [ diaeresis, asciicircum ], diff --git a/symbols/macintosh.vndr/pt b/symbols/macintosh.vndr/pt index f48b3e37..ebeffe19 100644 --- a/symbols/macintosh.vndr/pt +++ b/symbols/macintosh.vndr/pt @@ -42,7 +42,7 @@ xkb_symbols "basic" { partial alphanumeric_keys xkb_symbols "Sundeadkeys" { - include "macintosh/pt(basic)" // for consistent naming + include "macintosh.vndr/pt(basic)" // for consistent naming key <AE12> { [ plus, asterisk ], [ SunFA_Diaeresis, SunFA_Diaeresis ] }; @@ -52,12 +52,12 @@ xkb_symbols "Sundeadkeys" { partial alphanumeric_keys xkb_symbols "sundeadkeys" { - include "macintosh/pt(Sundeadkeys)" // for consistent naming + include "macintosh.vndr/pt(Sundeadkeys)" // for consistent naming }; partial alphanumeric_keys xkb_symbols "nodeadkeys" { - include "macintosh/pt(basic)" // for consistent naming + include "macintosh.vndr/pt(basic)" // for consistent naming key <AE12> { [ plus, asterisk ], [ quotedbl, quotedbl ] }; diff --git a/symbols/macintosh.vndr/se b/symbols/macintosh.vndr/se index 510c5ca8..a1cf333a 100644 --- a/symbols/macintosh.vndr/se +++ b/symbols/macintosh.vndr/se @@ -52,5 +52,5 @@ xkb_symbols "basic" { partial alphanumeric_keys xkb_symbols "nodeadkeys" { - include "macintosh/se(basic)" // for consistent naming + include "macintosh.vndr/se(basic)" // for consistent naming }; @@ -32,3 +32,26 @@ xkb_symbols "basic" { include "level3(ralt_switch_multikey)" }; + +// Maltese keyboard map (based on MSA Standard DMS100, annex A) +// by Ramon Casha (ramon.casha@linux.org.mt) +// +// $XFree86$ + +partial default alphanumeric_keys +xkb_symbols "us" { + + include "mt(basic)" + + // Describes the differences between the mt + // keyboard and a US-based physical keyboard + + name[Group1]="Maltese (US layout)"; + + key <BKSL> { [ zabovedot, Zabovedot, backslash, bar ] }; + + key <TLDE> { [ cabovedot, Cabovedot, grave, asciitilde ] }; + + key <AE03> { [ 3, EuroSign, numbersign ] }; + +}; diff --git a/symbols/mt_us b/symbols/mt_us deleted file mode 100644 index 75d34b8b..00000000 --- a/symbols/mt_us +++ /dev/null @@ -1,22 +0,0 @@ -// Maltese keyboard map (based on MSA Standard DMS100, annex A) -// by Ramon Casha (ramon.casha@linux.org.mt) -// -// $XFree86$ - -partial default alphanumeric_keys -xkb_symbols "basic" { - - include "mt" - - // Describes the differences between the mt - // keyboard and a US-based physical keyboard - - name[Group1]="Maltese (US layout)"; - - key <BKSL> { [ zabovedot, Zabovedot, backslash, bar ] }; - - key <TLDE> { [ cabovedot, Cabovedot, grave, asciitilde ] }; - - key <AE03> { [ 3, EuroSign, numbersign ] }; - -}; @@ -65,7 +65,7 @@ xkb_symbols "basic" { // Modified by Marius Andreiana, <mandreiana@yahoo.com> (C) 2001 // partial alphanumeric_keys -xkb_symbols "us_ro" { +xkb_symbols "us" { include "latin" @@ -86,7 +86,7 @@ xkb_symbols "us_ro" { // German umlauts are accessible with <AltGr> and a, o , u, s (+shift for capital letters) // partial alphanumeric_keys -xkb_symbols "ro_de" { +xkb_symbols "de" { include "ro(basic)" diff --git a/symbols/se_FI b/symbols/se_FI deleted file mode 100644 index 76cb655f..00000000 --- a/symbols/se_FI +++ /dev/null @@ -1,10 +0,0 @@ -// Northern Sami keyboard for Finland -// Written by Børre Gaup <boerre.gaup@pc.nu> -// Quick usage: setxkbmap se_FI -// -// $XFree86: xc/programs/xkbcomp/symbols/se_FI,v 1.1 2001/11/21 21:20:55 dawes Exp $ - -partial alphanumeric_keys - xkb_symbols "basic" { - include "sapmi(sefi)" -}; diff --git a/symbols/se_NO b/symbols/se_NO deleted file mode 100644 index b7697a21..00000000 --- a/symbols/se_NO +++ /dev/null @@ -1,10 +0,0 @@ -// Northern Sami keyboard for Norway -// Written by Børre Gaup <boerre.gaup@pc.nu> -// Quick usage: setxkbmap se_FI -// -// $XFree86: xc/programs/xkbcomp/symbols/se_NO,v 1.1 2001/11/21 21:20:55 dawes Exp $ - -partial alphanumeric_keys - xkb_symbols "basic" { - include "sapmi(basic)" -}; diff --git a/symbols/se_SE b/symbols/se_SE deleted file mode 100644 index 86bca436..00000000 --- a/symbols/se_SE +++ /dev/null @@ -1,10 +0,0 @@ -// Northern Sami keyboard for Sweden -// Written by Børre Gaup <boerre.gaup@pc.nu> -// Quick usage: setxkbmap se_FI -// -// $XFree86: xc/programs/xkbcomp/symbols/se_SE,v 1.1 2001/11/21 21:20:55 dawes Exp $ - -partial alphanumeric_keys - xkb_symbols "basic" { - include "sapmi(sefi)" -}; @@ -81,3 +81,24 @@ xkb_symbols "bksl" { key <BKSL> { [ backslash, bar, slash, NoSymbol ] }; }; +// $XFree86$ + +partial alphanumeric_keys +xkb_symbols "qwerty" { + + // This layout should work exactly as a sk with the exception + // of 'Z' and 'Y' keys, which are in the qwerty style (ie. swapped). + // 2001 by Kamil Toman <ktoman@email.cz> + + include "sk(basic)" + + key <AB01> { [ z, Z, degree, NoSymbol ] }; + key <AD06> { [ y, Y, NoSymbol, NoSymbol ] }; +}; + +// Use <BKSL> instead of <LSGT> (useful for keyboard without <LSGT> key) +xkb_symbols "qwerty_bksl" { + include "sk(qwerty)" + + key <BKSL> { [ backslash, bar, slash, NoSymbol ] }; +}; diff --git a/symbols/sk_qwerty b/symbols/sk_qwerty deleted file mode 100644 index be05dd74..00000000 --- a/symbols/sk_qwerty +++ /dev/null @@ -1,21 +0,0 @@ -// $XFree86$ - -partial alphanumeric_keys -xkb_symbols "basic" { - - // This layout should work exactly as a sk with the exception - // of 'Z' and 'Y' keys, which are in the qwerty style (ie. swapped). - // 2001 by Kamil Toman <ktoman@email.cz> - - include "sk(basic)" - - key <AB01> { [ z, Z, degree, NoSymbol ] }; - key <AD06> { [ y, Y, NoSymbol, NoSymbol ] }; -}; - -// Use <BKSL> instead of <LSGT> (useful for keyboard without <LSGT> key) -xkb_symbols "bksl" { - include "sk_qwerty(basic)" - - key <BKSL> { [ backslash, bar, slash, NoSymbol ] }; -}; diff --git a/symbols/sun.vndr/se b/symbols/sun.vndr/se index 40e8a875..f4ffa29f 100644 --- a/symbols/sun.vndr/se +++ b/symbols/sun.vndr/se @@ -1,4 +1,4 @@ -// $XFree86: xc/programs/xkbcomp/symbols/sun/se,v 1.2 1998/12/20 09:40:28 dawes Exp $ +// $XFree86: xc/programs/xkbcomp/symbols/sun.vndr/se,v 1.2 1998/12/20 09:40:28 dawes Exp $ // // Swedish layout for a Type 5/5c Sun keyboard xkb_symbols "sun5" { diff --git a/symbols/sun.vndr/us b/symbols/sun.vndr/us index 520e0216..d893fa28 100644 --- a/symbols/sun.vndr/us +++ b/symbols/sun.vndr/us @@ -24,7 +24,7 @@ //other dealings in this Software without prior written authorization //from The Open Group. // -// $XFree86: xc/programs/xkbcomp/symbols/sun/us,v 1.6 2001/12/14 20:02:05 dawes Exp $ +// $XFree86: xc/programs/xkbcomp/symbols/sun.vndr/us,v 1.6 2001/12/14 20:02:05 dawes Exp $ // // US/ASCII layout for a Type 4 Sun keyboard xkb_symbols "sun4" { @@ -124,8 +124,8 @@ hidden partial function_keys xkb_symbols "broken_openlook_map" { // US/ASCII layout for a Type 4 Sun keyboard w/ broken OpenLook keymap xkb_symbols "sun4ol" { - override "sun/us(sun4)" - include "sun/us(broken_openlook_map)" + override "sun.vndr/us(sun4)" + include "sun.vndr/us(broken_openlook_map)" }; // US/ASCII layout for a Type 5 Sun keyboard @@ -228,8 +228,8 @@ xkb_symbols "sun5" { // US/ASCII layout for a Type 5 Sun keyboard w/ broken OpenLook keymap xkb_symbols "sun5ol" { - override "sun/us(sun5)" - include "sun/us(broken_openlook_map)" + override "sun.vndr/us(sun5)" + include "sun.vndr/us(broken_openlook_map)" }; // US/ASCII layout for a Type 6 Sun keyboard @@ -310,7 +310,7 @@ xkb_symbols "sun6" { key <VOL+> { [ SunAudioRaiseVolume,SunVideoRaiseBrightness ] }; key <POWR> { [ SunPowerSwitch, SunPowerSwitchShift ] }; - // from symbols/sun/us(type5) + // from symbols/sun.vndr/us(type5) key <STOP> { [ Cancel ], [ F11 ] }; key <AGAI> { [ Redo ], [ F12 ] }; key <PROP> { [ SunProps ], [ F13 ] }; @@ -333,6 +333,6 @@ xkb_symbols "sun6" { // US/ASCII layout for a Type 6 Sun keyboard w/ broken OpenLook keymap xkb_symbols "sun6ol" { - override "sun/us(sun6)" - include "sun/us(broken_openlook_map)" + override "sun.vndr/us(sun6)" + include "sun.vndr/us(broken_openlook_map)" }; diff --git a/symbols/syr b/symbols/syr index 54ef4d4d..b9b85c9d 100644 --- a/symbols/syr +++ b/symbols/syr @@ -70,3 +70,75 @@ xkb_symbols "basic" { modifier_map Mod2 { Mode_switch }; }; +// +// $XFree86: xc/programs/xkbcomp/symbols/syr_phonetic,v 1.1 2002/11/22 03:06:50 dawes Exp $ +// + +partial alphanumeric_keys +xkb_symbols "phonetic" { + name[Group1]= "Syriac(phonetic)"; + + key <TLDE> { [ 0x100070F, 0x100032E, Arabic_shadda ] }; + key <AE01> { [ 1, exclam, 0x1000701 ] }; + key <AE02> { [ 2, 0x100030A, 0x1000702 ] }; + key <AE03> { [ 3, 0x1000325, 0x1000703 ] }; + key <AE04> { [ 4, 0x1000749, 0x1000704 ] }; + key <AE05> { [ 5, 0x1002670, 0x1000705 ] }; + key <AE06> { [ 6, 0x1002671, 0x1000708 ] }; + key <AE07> { [ 7, 0x100070A, 0x1000709 ] }; + key <AE08> { [ 8, 0x10000BB, 0x100070B ] }; + key <AE09> { [ 9, parenright, 0x100070C ] }; + key <AE10> { [ 0, parenleft, 0x100070D ] }; + key <AE11> { [ minus, 0x10000AB, 0x100250C ] }; + key <AE12> { [ equal, plus, 0x1002510 ] }; + + key <AD01> { [ 0x1000729, 0x1000730, Arabic_fatha ] }; + key <AD02> { [ 0x1000718, 0x1000733, Arabic_fathatan ] }; + key <AD03> { [ 0x1000716, 0x1000736, Arabic_damma ] }; + key <AD04> { [ 0x100072A, 0x100073A, Arabic_dammatan ] }; + key <AD05> { [ 0x100072C, 0x100073D, Arabic_madda_above ] }; + key <AD06> { [ 0x100071D, 0x1000740, Arabic_hamza_above ] }; + key <AD07> { [ 0x100071C, 0x1000741, 0x1000747 ] }; + key <AD08> { [ 0x1000725, 0x1000308, 0x1000743 ] }; + key <AD09> { [ 0x1000727, 0x1000304, 0x1000745 ] }; + key <AD10> { [ 0x1000726, 0x1000307, 0x100032D ] }; + key <AD11> { [ bracketright, 0x1000303 ] }; + key <AD12> { [ bracketleft, 0x100074A ] }; + key <BKSL> { [ 0x1000706, colon ] }; + + key <AC01> { [ 0x1000710, 0x1000731, Arabic_kasra ] }; + key <AC02> { [ 0x1000723, 0x1000734, Arabic_kasratan ] }; + key <AC03> { [ 0x1000715, 0x1000737 ] }; + key <AC04> { [ 0x1000714, 0x100073B, Arabic_hamza ] }; + key <AC05> { [ 0x1000713, 0x100073E, Arabic_hamza_below ] }; + key <AC06> { [ 0x1000717, 0x1000711, Arabic_superscript_alef ] }; + key <AC07> { [ 0x100071B, Arabic_tatweel, 0x1000748 ] }; + key <AC08> { [ 0x100071F, 0x1000324, 0x1000744 ] }; + key <AC09> { [ 0x1000720, 0x1000331, 0x1000746 ] }; + key <AC10> { [ 0x100071A, 0x1000323 ] }; + key <AC11> { [ 0x100071E, 0x1000330 ] }; + + key <SPCE> { [ space, 0x100200c ] }; + key <AB01> { [ 0x1000719, 0x1000732, Arabic_sukun ] }; + key <AB02> { [ 0x1000728, 0x1000735 ] }; + key <AB03> { [ 0x1000724, 0x1000738, 0x100200D ] }; + key <AB04> { [ 0x100072B, 0x100073C, 0x100200C ] }; + key <AB05> { [ 0x1000712, 0x100073F, 0x100200E ] }; + key <AB06> { [ 0x1000722, 0x1000739, 0x100200F ] }; + key <AB07> { [ 0x1000721, 0x1000742 ] }; + key <AB08> { [ 0x1000700, Arabic_comma ] }; + key <AB09> { [ 0x100002E, Arabic_semicolon ] }; + key <AB10> { [ 0x1000707, Arabic_question_mark ] }; + + // End Alphanumeric Section + + + // Begin Modifier Mappings + + modifier_map Shift { Shift_L, Shift_R }; + modifier_map Lock { Caps_Lock, ISO_Lock }; + modifier_map Control{ Control_L, Control_R }; + modifier_map Mod1 { Alt_L, Alt_R }; + modifier_map Mod2 { Mode_switch }; + +}; diff --git a/symbols/syr_phonetic b/symbols/syr_phonetic deleted file mode 100644 index e0df79bc..00000000 --- a/symbols/syr_phonetic +++ /dev/null @@ -1,72 +0,0 @@ -// -// $XFree86: xc/programs/xkbcomp/symbols/syr_phonetic,v 1.1 2002/11/22 03:06:50 dawes Exp $ -// - -partial default alphanumeric_keys -xkb_symbols "basic" { - name[Group1]= "Syriac(phonetic)"; - - key <TLDE> { [ 0x100070F, 0x100032E, Arabic_shadda ] }; - key <AE01> { [ 1, exclam, 0x1000701 ] }; - key <AE02> { [ 2, 0x100030A, 0x1000702 ] }; - key <AE03> { [ 3, 0x1000325, 0x1000703 ] }; - key <AE04> { [ 4, 0x1000749, 0x1000704 ] }; - key <AE05> { [ 5, 0x1002670, 0x1000705 ] }; - key <AE06> { [ 6, 0x1002671, 0x1000708 ] }; - key <AE07> { [ 7, 0x100070A, 0x1000709 ] }; - key <AE08> { [ 8, 0x10000BB, 0x100070B ] }; - key <AE09> { [ 9, parenright, 0x100070C ] }; - key <AE10> { [ 0, parenleft, 0x100070D ] }; - key <AE11> { [ minus, 0x10000AB, 0x100250C ] }; - key <AE12> { [ equal, plus, 0x1002510 ] }; - - key <AD01> { [ 0x1000729, 0x1000730, Arabic_fatha ] }; - key <AD02> { [ 0x1000718, 0x1000733, Arabic_fathatan ] }; - key <AD03> { [ 0x1000716, 0x1000736, Arabic_damma ] }; - key <AD04> { [ 0x100072A, 0x100073A, Arabic_dammatan ] }; - key <AD05> { [ 0x100072C, 0x100073D, Arabic_madda_above ] }; - key <AD06> { [ 0x100071D, 0x1000740, Arabic_hamza_above ] }; - key <AD07> { [ 0x100071C, 0x1000741, 0x1000747 ] }; - key <AD08> { [ 0x1000725, 0x1000308, 0x1000743 ] }; - key <AD09> { [ 0x1000727, 0x1000304, 0x1000745 ] }; - key <AD10> { [ 0x1000726, 0x1000307, 0x100032D ] }; - key <AD11> { [ bracketright, 0x1000303 ] }; - key <AD12> { [ bracketleft, 0x100074A ] }; - key <BKSL> { [ 0x1000706, colon ] }; - - key <AC01> { [ 0x1000710, 0x1000731, Arabic_kasra ] }; - key <AC02> { [ 0x1000723, 0x1000734, Arabic_kasratan ] }; - key <AC03> { [ 0x1000715, 0x1000737 ] }; - key <AC04> { [ 0x1000714, 0x100073B, Arabic_hamza ] }; - key <AC05> { [ 0x1000713, 0x100073E, Arabic_hamza_below ] }; - key <AC06> { [ 0x1000717, 0x1000711, Arabic_superscript_alef ] }; - key <AC07> { [ 0x100071B, Arabic_tatweel, 0x1000748 ] }; - key <AC08> { [ 0x100071F, 0x1000324, 0x1000744 ] }; - key <AC09> { [ 0x1000720, 0x1000331, 0x1000746 ] }; - key <AC10> { [ 0x100071A, 0x1000323 ] }; - key <AC11> { [ 0x100071E, 0x1000330 ] }; - - key <SPCE> { [ space, 0x100200c ] }; - key <AB01> { [ 0x1000719, 0x1000732, Arabic_sukun ] }; - key <AB02> { [ 0x1000728, 0x1000735 ] }; - key <AB03> { [ 0x1000724, 0x1000738, 0x100200D ] }; - key <AB04> { [ 0x100072B, 0x100073C, 0x100200C ] }; - key <AB05> { [ 0x1000712, 0x100073F, 0x100200E ] }; - key <AB06> { [ 0x1000722, 0x1000739, 0x100200F ] }; - key <AB07> { [ 0x1000721, 0x1000742 ] }; - key <AB08> { [ 0x1000700, Arabic_comma ] }; - key <AB09> { [ 0x100002E, Arabic_semicolon ] }; - key <AB10> { [ 0x1000707, Arabic_question_mark ] }; - - // End Alphanumeric Section - - - // Begin Modifier Mappings - - modifier_map Shift { Shift_L, Shift_R }; - modifier_map Lock { Caps_Lock, ISO_Lock }; - modifier_map Control{ Control_L, Control_R }; - modifier_map Mod1 { Alt_L, Alt_R }; - modifier_map Mod2 { Mode_switch }; - -}; @@ -61,3 +61,127 @@ xkb_symbols "basic" { key <BKSL> { [ Thai_khokhuat, Thai_khokhon ] }; }; + +partial alphanumeric_keys +xkb_symbols "pat" { + name[Group1]= "Thai (Pattachote)"; + // The thai layout defines a second keyboard group and changes + // the behavior of a few modifier keys. + + // converted to THai keysysms - Pablo Saratxaga pablo@mandrakesoft.com + // Pattachote modification by Visanu Euarchukiati -- visanu@inet.co.th + key <TLDE> { [ underscore, Thai_baht ] }; + key <AE01> { [ equal, plus ] }; + key <AE02> { [ Thai_leksong, quotedbl ] }; + key <AE03> { [ Thai_leksam, slash ] }; + key <AE04> { [ Thai_leksi, comma ] }; + key <AE05> { [ Thai_lekha, question ] }; + key <AE06> { [ Thai_sarauu, Thai_sarau ] }; + key <AE07> { [ Thai_lekchet, underscore ] }; + key <AE08> { [ Thai_lekpaet, period ] }; + key <AE09> { [ Thai_lekkao, parenleft ] }; + key <AE10> { [ Thai_leksun, parenright ] }; + key <AE11> { [ Thai_leknung, minus ] }; + key <AE12> { [ Thai_lekhok, percent ] }; + + key <AD01> { [ Thai_maitaikhu, Thai_maitri ] }; + key <AD02> { [ Thai_totao, Thai_ru ] }; + key <AD03> { [ Thai_yoyak, Thai_maiyamok ] }; + key <AD04> { [ Thai_oang, Thai_yoying ] }; + key <AD05> { [ Thai_rorua, Thai_sorusi ] }; + key <AD06> { [ Thai_maiek, Thai_saraue ] }; + key <AD07> { [ Thai_dodek, Thai_fofa ] }; + key <AD08> { [ Thai_moma, Thai_soso ] }; + key <AD09> { [ Thai_wowaen, Thai_thothung ] }; + key <AD10> { [ Thai_saraae, Thai_thophuthao ] }; + key <AD11> { [ Thai_saraaimaimuan, Thai_paiyannoi ] }; + key <AD12> { [ Thai_chochoe, Thai_lu ] }; + + key <AC01> { [ Thai_maitho, Thai_maichattawa] }; + key <AC02> { [ Thai_thothahan, Thai_thothong ] }; + key <AC03> { [ Thai_ngongu, Thai_saraam ] }; + key <AC04> { [ Thai_kokai, Thai_nonen ] }; + key <AC05> { [ Thai_maihanakat, Thai_thanthakhat] }; + key <AC06> { [ Thai_saraii, Thai_sarauee ] }; + key <AC07> { [ Thai_saraaa, Thai_phophung ] }; + key <AC08> { [ Thai_nonu, Thai_chochang ] }; + key <AC09> { [ Thai_sarae, Thai_sarao ] }; + key <AC10> { [ Thai_saraaimaimalai, Thai_khorakhang ] }; + key <AC11> { [ Thai_khokhai, Thai_thonangmontho ] }; + + key <AB01> { [ Thai_bobaimai, Thai_dochada ] }; + key <AB02> { [ Thai_popla, Thai_topatak ] }; + key <AB03> { [ Thai_loling, Thai_thothan ] }; + key <AB04> { [ Thai_hohip, Thai_phosamphao ] }; + key <AB05> { [ Thai_sarai, Thai_phinthu ] }; + key <AB06> { [ Thai_khokhwai, Thai_sosala ] }; + key <AB07> { [ Thai_sosua, Thai_honokhuk ] }; + key <AB08> { [ Thai_saraa, Thai_fofan ] }; + key <AB09> { [ Thai_chochan, Thai_choching ] }; + key <AB10> { [ Thai_phophan, Thai_lochula ] }; + + key <BKSL> { [ Thai_lakkhangyao, Thai_nikhahit ] }; +}; + + +partial alphanumeric_keys +xkb_symbols "tis" { + name[Group1]= "Thai (TIS-820.2538)"; + // The thai layout defines a second keyboard group and changes + // the behavior of a few modifier keys. + + // converted to THai keysysms - Pablo Saratxaga <pablo@mandrakesoft.com> + // modified to TIS-820.2538 - Theppitak Karoonboonyanan <thep@linux.thai.net> + key <TLDE> { [ 0x1000e4f, 0x1000e5b ] }; + key <AE01> { [ Thai_baht, Thai_lakkhangyao] }; + key <AE02> { [ slash, Thai_leknung ] }; + key <AE03> { [ minus, Thai_leksong ] }; + key <AE04> { [ Thai_phosamphao, Thai_leksam ] }; + key <AE05> { [ Thai_thothung, Thai_leksi ] }; + key <AE06> { [ Thai_sarau, Thai_sarauu ] }; + key <AE07> { [ Thai_saraue, 0x1000e4e ] }; + key <AE08> { [ Thai_khokhwai, Thai_lekha ] }; + key <AE09> { [ Thai_totao, Thai_lekhok ] }; + key <AE10> { [ Thai_chochan, Thai_lekchet ] }; + key <AE11> { [ Thai_khokhai, Thai_lekpaet ] }; + key <AE12> { [ Thai_chochang, Thai_lekkao ] }; + + key <AD01> { [ Thai_maiyamok, Thai_leksun ] }; + key <AD02> { [ Thai_saraaimaimalai, quotedbl ] }; + key <AD03> { [ Thai_saraam, Thai_dochada ] }; + key <AD04> { [ Thai_phophan, Thai_thonangmontho ] }; + key <AD05> { [ Thai_saraa, Thai_thothong ] }; + key <AD06> { [ Thai_maihanakat, Thai_nikhahit ] }; + key <AD07> { [ Thai_saraii, Thai_maitri ] }; + key <AD08> { [ Thai_rorua, Thai_nonen ] }; + key <AD09> {type[Group1]="THREE_LEVEL", + [ Thai_nonu, Thai_paiyannoi, 0x1000e5a] }; + key <AD10> { [ Thai_yoyak, Thai_yoying ] }; + key <AD11> { [ Thai_bobaimai, Thai_thothan ] }; + key <AD12> { [ Thai_loling, comma ] }; + + key <AC01> { [ Thai_fofan, Thai_ru ] }; + key <AC02> { [ Thai_hohip, Thai_khorakhang ] }; + key <AC03> { [ Thai_kokai, Thai_topatak ] }; + key <AC04> { [ Thai_dodek, Thai_sarao ] }; + key <AC05> { [ Thai_sarae, Thai_chochoe ] }; + key <AC06> { [ Thai_maitho, Thai_maitaikhu ] }; + key <AC07> { [ Thai_maiek, Thai_maichattawa ] }; + key <AC08> { [ Thai_saraaa, Thai_sorusi ] }; + key <AC09> { [ Thai_sosua, Thai_sosala ] }; + key <AC10> { [ Thai_wowaen, Thai_soso ] }; + key <AC11> { [ Thai_ngongu, period ] }; + + key <AB01> { [ Thai_phophung, parenleft ] }; + key <AB02> { [ Thai_popla, parenright ] }; + key <AB03> { [ Thai_saraae, Thai_choching ] }; + key <AB04> { [ Thai_oang, Thai_honokhuk ] }; + key <AB05> { [ Thai_sarai, Thai_phinthu ] }; + key <AB06> { [ Thai_sarauee, Thai_thanthakhat ] }; + key <AB07> { [ Thai_thothahan, question ] }; + key <AB08> { [ Thai_moma, Thai_thophuthao ] }; + key <AB09> { [ Thai_saraaimaimuan, Thai_lochula ] }; + key <AB10> { [ Thai_fofa, Thai_lu ] }; + + key <BKSL> { [ Thai_khokhon, Thai_khokhuat ] }; +}; diff --git a/symbols/th_pat b/symbols/th_pat deleted file mode 100644 index 1f733dbf..00000000 --- a/symbols/th_pat +++ /dev/null @@ -1,64 +0,0 @@ -// $XFree86$ -// -partial default alphanumeric_keys -xkb_symbols "basic" { - name[Group1]= "Thai (Pattachote)"; - // The thai layout defines a second keyboard group and changes - // the behavior of a few modifier keys. - - // converted to THai keysysms - Pablo Saratxaga pablo@mandrakesoft.com - // Pattachote modification by Visanu Euarchukiati -- visanu@inet.co.th - key <TLDE> { [ underscore, Thai_baht ] }; - key <AE01> { [ equal, plus ] }; - key <AE02> { [ Thai_leksong, quotedbl ] }; - key <AE03> { [ Thai_leksam, slash ] }; - key <AE04> { [ Thai_leksi, comma ] }; - key <AE05> { [ Thai_lekha, question ] }; - key <AE06> { [ Thai_sarauu, Thai_sarau ] }; - key <AE07> { [ Thai_lekchet, underscore ] }; - key <AE08> { [ Thai_lekpaet, period ] }; - key <AE09> { [ Thai_lekkao, parenleft ] }; - key <AE10> { [ Thai_leksun, parenright ] }; - key <AE11> { [ Thai_leknung, minus ] }; - key <AE12> { [ Thai_lekhok, percent ] }; - - key <AD01> { [ Thai_maitaikhu, Thai_maitri ] }; - key <AD02> { [ Thai_totao, Thai_ru ] }; - key <AD03> { [ Thai_yoyak, Thai_maiyamok ] }; - key <AD04> { [ Thai_oang, Thai_yoying ] }; - key <AD05> { [ Thai_rorua, Thai_sorusi ] }; - key <AD06> { [ Thai_maiek, Thai_saraue ] }; - key <AD07> { [ Thai_dodek, Thai_fofa ] }; - key <AD08> { [ Thai_moma, Thai_soso ] }; - key <AD09> { [ Thai_wowaen, Thai_thothung ] }; - key <AD10> { [ Thai_saraae, Thai_thophuthao ] }; - key <AD11> { [ Thai_saraaimaimuan, Thai_paiyannoi ] }; - key <AD12> { [ Thai_chochoe, Thai_lu ] }; - - key <AC01> { [ Thai_maitho, Thai_maichattawa] }; - key <AC02> { [ Thai_thothahan, Thai_thothong ] }; - key <AC03> { [ Thai_ngongu, Thai_saraam ] }; - key <AC04> { [ Thai_kokai, Thai_nonen ] }; - key <AC05> { [ Thai_maihanakat, Thai_thanthakhat] }; - key <AC06> { [ Thai_saraii, Thai_sarauee ] }; - key <AC07> { [ Thai_saraaa, Thai_phophung ] }; - key <AC08> { [ Thai_nonu, Thai_chochang ] }; - key <AC09> { [ Thai_sarae, Thai_sarao ] }; - key <AC10> { [ Thai_saraaimaimalai, Thai_khorakhang ] }; - key <AC11> { [ Thai_khokhai, Thai_thonangmontho ] }; - - key <AB01> { [ Thai_bobaimai, Thai_dochada ] }; - key <AB02> { [ Thai_popla, Thai_topatak ] }; - key <AB03> { [ Thai_loling, Thai_thothan ] }; - key <AB04> { [ Thai_hohip, Thai_phosamphao ] }; - key <AB05> { [ Thai_sarai, Thai_phinthu ] }; - key <AB06> { [ Thai_khokhwai, Thai_sosala ] }; - key <AB07> { [ Thai_sosua, Thai_honokhuk ] }; - key <AB08> { [ Thai_saraa, Thai_fofan ] }; - key <AB09> { [ Thai_chochan, Thai_choching ] }; - key <AB10> { [ Thai_phophan, Thai_lochula ] }; - - key <BKSL> { [ Thai_lakkhangyao, Thai_nikhahit ] }; -}; - - diff --git a/symbols/th_tis b/symbols/th_tis deleted file mode 100644 index 4ba166cb..00000000 --- a/symbols/th_tis +++ /dev/null @@ -1,63 +0,0 @@ -// $XFree86$ -// -partial default alphanumeric_keys -xkb_symbols "basic" { - name[Group1]= "Thai (TIS-820.2538)"; - // The thai layout defines a second keyboard group and changes - // the behavior of a few modifier keys. - - // converted to THai keysysms - Pablo Saratxaga <pablo@mandrakesoft.com> - // modified to TIS-820.2538 - Theppitak Karoonboonyanan <thep@linux.thai.net> - key <TLDE> { [ 0x1000e4f, 0x1000e5b ] }; - key <AE01> { [ Thai_baht, Thai_lakkhangyao] }; - key <AE02> { [ slash, Thai_leknung ] }; - key <AE03> { [ minus, Thai_leksong ] }; - key <AE04> { [ Thai_phosamphao, Thai_leksam ] }; - key <AE05> { [ Thai_thothung, Thai_leksi ] }; - key <AE06> { [ Thai_sarau, Thai_sarauu ] }; - key <AE07> { [ Thai_saraue, 0x1000e4e ] }; - key <AE08> { [ Thai_khokhwai, Thai_lekha ] }; - key <AE09> { [ Thai_totao, Thai_lekhok ] }; - key <AE10> { [ Thai_chochan, Thai_lekchet ] }; - key <AE11> { [ Thai_khokhai, Thai_lekpaet ] }; - key <AE12> { [ Thai_chochang, Thai_lekkao ] }; - - key <AD01> { [ Thai_maiyamok, Thai_leksun ] }; - key <AD02> { [ Thai_saraaimaimalai, quotedbl ] }; - key <AD03> { [ Thai_saraam, Thai_dochada ] }; - key <AD04> { [ Thai_phophan, Thai_thonangmontho ] }; - key <AD05> { [ Thai_saraa, Thai_thothong ] }; - key <AD06> { [ Thai_maihanakat, Thai_nikhahit ] }; - key <AD07> { [ Thai_saraii, Thai_maitri ] }; - key <AD08> { [ Thai_rorua, Thai_nonen ] }; - key <AD09> {type[Group1]="THREE_LEVEL", - [ Thai_nonu, Thai_paiyannoi, 0x1000e5a] }; - key <AD10> { [ Thai_yoyak, Thai_yoying ] }; - key <AD11> { [ Thai_bobaimai, Thai_thothan ] }; - key <AD12> { [ Thai_loling, comma ] }; - - key <AC01> { [ Thai_fofan, Thai_ru ] }; - key <AC02> { [ Thai_hohip, Thai_khorakhang ] }; - key <AC03> { [ Thai_kokai, Thai_topatak ] }; - key <AC04> { [ Thai_dodek, Thai_sarao ] }; - key <AC05> { [ Thai_sarae, Thai_chochoe ] }; - key <AC06> { [ Thai_maitho, Thai_maitaikhu ] }; - key <AC07> { [ Thai_maiek, Thai_maichattawa ] }; - key <AC08> { [ Thai_saraaa, Thai_sorusi ] }; - key <AC09> { [ Thai_sosua, Thai_sosala ] }; - key <AC10> { [ Thai_wowaen, Thai_soso ] }; - key <AC11> { [ Thai_ngongu, period ] }; - - key <AB01> { [ Thai_phophung, parenleft ] }; - key <AB02> { [ Thai_popla, parenright ] }; - key <AB03> { [ Thai_saraae, Thai_choching ] }; - key <AB04> { [ Thai_oang, Thai_honokhuk ] }; - key <AB05> { [ Thai_sarai, Thai_phinthu ] }; - key <AB06> { [ Thai_sarauee, Thai_thanthakhat ] }; - key <AB07> { [ Thai_thothahan, question ] }; - key <AB08> { [ Thai_moma, Thai_thophuthao ] }; - key <AB09> { [ Thai_saraaimaimuan, Thai_lochula ] }; - key <AB10> { [ Thai_fofa, Thai_lu ] }; - - key <BKSL> { [ Thai_khokhon, Thai_khokhuat ] }; -}; diff --git a/symbols/us_intl b/symbols/us_intl deleted file mode 100644 index 14296208..00000000 --- a/symbols/us_intl +++ /dev/null @@ -1,54 +0,0 @@ -// $XFree86$ - -// Based on symbols/us_intl keyboard map: -// Dead-keys definition for a very simple US/ASCII layout. -// by Conectiva (http://www.conectiva.com.br) -// modified by Ricardo Y. Igarashi (iga@that.com.br) - -// Added the following deadkeys, to make it truly international: -// -// dead_macron: on AltGr-minus -// dead_breve: on AltGr-parenleft -// dead_abovedot: on AltGr-period -// dead_abovering: on AltGr-0 -// dead_doubleacute: on AltGr-equal (as quotedbl is already used) -// dead_caron: on AltGr-less (AltGr-shift-comma) -// dead_cedilla: on AltGr-comma -// dead_ogonek: on AltGr-semicolon -// dead_belowdot: on AltGr-underscore (AltGr-shift-minus) -// dead_hook: on AltGr-question -// dead_horn: on AltGr-plus (AltGr-shift-equal) -// dead_diaeresis: on AltGr-colon (Alt-shift-semicolon) -// -// those were already there: -// dead_grave -// dead_acute -// dead_circumflex -// dead_tilde -// dead_diaeresis - -partial default alphanumeric_keys -xkb_symbols "basic" { - - name[Group1]= "US/ASCII"; - include "us" - - key <TLDE> { [ dead_grave, dead_tilde, grave, asciitilde ] }; - key <AE05> { [ 5, percent, EuroSign ] }; - key <AE06> { [ 6, dead_circumflex, asciicircum, asciicircum ] }; - key <AE09> { [ 9, parenleft, dead_breve, dead_breve ] }; - key <AE10> { [ 0, parenright, dead_abovering, dead_abovering] }; - key <AE11> { [ minus, underscore, dead_macron, dead_belowdot ] }; - key <AE12> { [ equal, plus, dead_doubleacute, dead_horn ] }; - - key <AD03> { [ e, E, EuroSign, cent ] }; - - key <AC10> { [ semicolon, colon, dead_ogonek, dead_diaeresis ] }; - key <AC11> { [ dead_acute, dead_diaeresis, apostrophe, quotedbl ] }; - - key <AB08> { [ comma, less, dead_cedilla, dead_caron ] }; - key <AB09> { [ period, greater, dead_abovedot, dead_circumflex ] }; - key <AB10> { [ slash, question, dead_hook, dead_hook ] }; - - include "level3(ralt_switch_multikey)" -}; |