diff options
| author | marha <marha@users.sourceforge.net> | 2013-09-30 09:00:43 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-09-30 09:00:43 +0200 |
| commit | 3aaead2ee2e0f925b33c1ccbde7fa3c0b119d064 (patch) | |
| tree | b5487ebc7c6056e0b248afc471edf40b90a3b0b4 /xorg-server | |
| parent | 1245204b2091d108a8688ff7f749f2c6cc830381 (diff) | |
| parent | a12cf779e828ec70da714832e1eaa730119fe10c (diff) | |
| download | vcxsrv-3aaead2ee2e0f925b33c1ccbde7fa3c0b119d064.tar.gz vcxsrv-3aaead2ee2e0f925b33c1ccbde7fa3c0b119d064.tar.bz2 vcxsrv-3aaead2ee2e0f925b33c1ccbde7fa3c0b119d064.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
git update fontconfig mesa libXau pixman xkeyboard-config 30 Sep 2013
Diffstat (limited to 'xorg-server')
62 files changed, 334 insertions, 654 deletions
diff --git a/xorg-server/xkeyboard-config/AUTHORS b/xorg-server/xkeyboard-config/AUTHORS index 451e9c08d..1b4b7b672 100644 --- a/xorg-server/xkeyboard-config/AUTHORS +++ b/xorg-server/xkeyboard-config/AUTHORS @@ -1,8 +1,15 @@ +== Initiator and maintainer: Сергей Удальцов (Sergey Udaltsov) <svu@users.sourceforge.net> +== Major contributions by: Andriy Rysin <arysin@myrealbox.com> Denis Barbier <barbier@linuxfr.org> Frank Murphy <murphyf+xfree86@f-m.fm> Ivan Pascal <pascal@info.tsu.ru> Nicolas Mailhot <nicolas.mailhot@laposte.net> Данило Шеган <dsegan@gmx.net> + +== Substantial contributions by: +Ivan A Derzhanski <iad@math.bas.bg> +Runa Aruna <runa_aruna@yahoo.com> +Frédéric BOITEUX <fboiteux@calistel.com> diff --git a/xorg-server/xkeyboard-config/BUGS b/xorg-server/xkeyboard-config/BUGS deleted file mode 100644 index cb48ff636..000000000 --- a/xorg-server/xkeyboard-config/BUGS +++ /dev/null @@ -1,70 +0,0 @@ --- Freedesktop.ORG - -http://freedesktop.org/bugzilla/show_bug.cgi?id=320 -http://bugs.xfree86.org/show_bug.cgi?id=1155 - - DONE: Added microsoftprousb - -http://freedesktop.org/bugzilla/show_bug.cgi?id=326 -http://bugs.xfree86.org/show_bug.cgi?id=1227 - - ?: Which of 'inet' files is right? - -http://freedesktop.org/bugzilla/show_bug.cgi?id=365 - - DONE: Two keysyms swapped in us(intl) - -http://freedesktop.org/bugzilla/show_bug.cgi?id=371 - - ?: What exactly is broken? Some patch would be nice - -http://freedesktop.org/bugzilla/show_bug.cgi?id=458 - - DONE: Changed Farsi to Iranian - -http://freedesktop.org/bugzilla/show_bug.cgi?id=463 - - ?: Don't know how to fix, really. Let's see. - -http://freedesktop.org/bugzilla/show_bug.cgi?id=496 - - DONE: Added Gyration Compact Keyboard - -http://freedesktop.org/bugzilla/show_bug.cgi?id=574 - - DONE: The patch applied - -http://freedesktop.org/bugzilla/show_bug.cgi?id=587 - - ?: Which of altwin options should be included? - Some part of meta_win is already there - -http://freedesktop.org/bugzilla/show_bug.cgi?id=630 - - DONE: Logitech iTouch Cordless Keyboard (model Y-RB6) added - -http://freedesktop.org/bugzilla/show_bug.cgi?id=666 - - DONE: Long ago added alt_super_win - -http://freedesktop.org/bugzilla/show_bug.cgi?id=711 - - DONE: Added Super Power Multimedia Keyboard - -http://freedesktop.org/bugzilla/show_bug.cgi?id=743 - - DONE: Armenian fixed - -http://freedesktop.org/bugzilla/show_bug.cgi?id=744 - - DONE: Model a4techKB21 added - -http://freedesktop.org/bugzilla/show_bug.cgi?id=926 - - TODO: --- GNOME - -http://bugzilla.gnome.org/show_bug.cgi?id=144646 -http://bugs.xfree86.org/show_bug.cgi?id=1415 - - DONE: Fixed, thanks to Dmitry diff --git a/xorg-server/xkeyboard-config/CREDITS b/xorg-server/xkeyboard-config/CREDITS deleted file mode 100644 index 7a05b27ec..000000000 --- a/xorg-server/xkeyboard-config/CREDITS +++ /dev/null @@ -1,3 +0,0 @@ -Ivan A Derzhanski <iad@math.bas.bg> -Runa Aruna <runa_aruna@yahoo.com> -Fr?d?ric BOITEUX <fboiteux@calistel.com> diff --git a/xorg-server/xkeyboard-config/symbols/am b/xorg-server/xkeyboard-config/symbols/am index abe6e1270..c3be81db0 100644 --- a/xorg-server/xkeyboard-config/symbols/am +++ b/xorg-server/xkeyboard-config/symbols/am @@ -5,10 +5,9 @@ xkb_symbols "basic" { name[Group1]= "Armenian"; - // Alphanumeric section - key <TLDE> { [ 0x100055d, 0x100055c ] }; - key <LSGT> { [ question, 0x100058a ] }; - key <BKSL> { [ guillemotright, guillemotleft ] }; + key <TLDE> { [ 0x100055d, 0x100055c ] }; + key <LSGT> { [ question, 0x100058a ] }; + key <BKSL> { [ guillemotright, guillemotleft]}; key <AE01> { [ 0x1000586, 0x1000556 ] }; key <AE02> { [ 0x1000571, 0x1000541 ] }; @@ -23,7 +22,6 @@ xkb_symbols "basic" { key <AE11> { [ 0x1000567, 0x1000537 ] }; key <AE12> { [ 0x1000572, 0x1000542 ] }; - key <AD01> { [ 0x1000573, 0x1000543 ] }; key <AD02> { [ 0x1000583, 0x1000553 ] }; key <AD03> { [ 0x1000562, 0x1000532 ] }; @@ -152,23 +150,22 @@ xkb_symbols "eastern" { // This is the closer phonetic transliteration for Eastern Armenian // than the Windows XP layout for Eastern Armenian, which seems - // to have contained a bug, with the reversal of 'g' for keh and 'c' for gim - // Also, AE01 (the colon) has been replaced with the Armenian_full_stop and - // capital AE07 (ken) with the Armenian ligature ew + // to have contained a bug, with the reversal of 'g' for keh and 'c' for gim. + // Also, AE01 (the colon) has been replaced with the Armenian_full_stop, + // and capital AE07 (ken) with the Armenian ligature ew. key <TLDE> { [ Armenian_separation_mark, Armenian_exclam ] }; -// key <AE01> { [ colon, KP_1 ] }; - key <AE01> { [ Armenian_full_stop, KP_1 ] }; + key <AE01> { [ Armenian_full_stop, KP_1 ] }; key <AE02> { [ Armenian_dza, Armenian_DZA ] }; key <AE03> { [ Armenian_hi, Armenian_HI ] }; - key <AE04> { [ Armenian_accent, KP_3 ] }; - key <AE05> { [ comma, KP_4 ] }; - key <AE06> { [ minus, KP_9 ] }; + key <AE04> { [ Armenian_accent, KP_3 ] }; + key <AE05> { [ comma, KP_4 ] }; + key <AE06> { [ minus, KP_9 ] }; key <AE07> { [ period, Armenian_ligature_ew ] }; key <AE08> { [ guillemotleft, parenleft ] }; key <AE09> { [ guillemotright, parenright ] }; key <AE10> { [ Armenian_o, Armenian_O ] }; - key <AE11> { [ Armenian_ra, Armenian_RA ] }; + key <AE11> { [ Armenian_ra, Armenian_RA ] }; key <AE12> { [ Armenian_zhe, Armenian_ZHE ] }; key <LatQ> { [ Armenian_khe, Armenian_KHE ] }; @@ -204,8 +201,8 @@ xkb_symbols "eastern" { key <LatB> { [ Armenian_ben, Armenian_BEN ] }; key <LatN> { [ Armenian_nu, Armenian_NU ] }; key <LatM> { [ Armenian_men, Armenian_MEN ] }; - key <AB08> { [ Armenian_sha, Armenian_SHA ] }; - key <AB09> { [ Armenian_ghat, Armenian_GHAT ] }; + key <AB08> { [ Armenian_sha, Armenian_SHA ] }; + key <AB09> { [ Armenian_ghat, Armenian_GHAT ] }; key <AB10> { [ Armenian_tsa, Armenian_TSA ] }; }; diff --git a/xorg-server/xkeyboard-config/symbols/ara b/xorg-server/xkeyboard-config/symbols/ara index 1944b25ce..f39fddb56 100644 --- a/xorg-server/xkeyboard-config/symbols/ara +++ b/xorg-server/xkeyboard-config/symbols/ara @@ -61,8 +61,6 @@ xkb_symbols "basic" { key <AB08> { [ Arabic_waw, comma ] }; key <AB09> { [ Arabic_zain, period ] }; key <AB10> { [ Arabic_zah, Arabic_question_mark ] }; - - // End alphanumeric section }; partial alphanumeric_keys @@ -117,7 +115,7 @@ xkb_symbols "digits_KP" { key <KP2> { [ KP_Down, 0x1000662 ] }; // key <KP3> { [ KP_Next, 0x1000663 ] }; // - key <KP0> { [ KP_Insert, 0x1000660 ] }; // + key <KP0> { [ KP_Insert, 0x1000660 ] }; // }; partial alphanumeric_keys @@ -235,8 +233,6 @@ xkb_symbols "buckwalter" { // ARABIC FULL STOP (Urdu) key <AB09> { [ 0x10006d4, Arabic_hamzaonalef ] }; key <AB10> { [ VoidSymbol, Arabic_question_mark ] }; - - // End alphanumeric section }; partial alphanumeric_keys @@ -244,21 +240,21 @@ xkb_symbols "olpc" { include "ara(basic)" - // As part of the olpc design some changes were made to the Arabic + // As part of the OLPC design, some changes were made to the Arabic // keyboard design. Major changes are: // - // * Removed the lam-alef single character. Poeple type as they + // * Removed the lam-alef single character. People type as they // pronounce, and lam-alef is just a visual formatting of the // sequence and is not often used on the keyboard. It is // similar to the Allah single character, which is also not on // the keyboard. // * Moved the following keys: - // o Thal from TLDE to AB05: Due to space limitation on the - // keybaord, but also accessibility - // o Shadda from TLDE to AD05 + // o Thal from TLDE to AB05: due to space limitation on the + // keyboard, but also accessibility. + // o Shadda from TLDE to AD05. // * Placed currency letters on number keys and moved the ^ and & - // characters to lower keys (This change is worth revisiting - // before end of test period) + // characters to lower keys. (This change is worth revisiting + // before end of test period). key <TLDE> { [ grave, asciitilde ] }; @@ -287,7 +283,6 @@ xkb_symbols "olpc" { key <BKSL> { [ backslash, bar ] }; - // REH isolated form? key <AB03> { [ Arabic_hamzaonwaw, Arabic_kasra ] }; key <AB04> { [ Arabic_ra, Arabic_kasratan ] }; diff --git a/xorg-server/xkeyboard-config/symbols/az b/xorg-server/xkeyboard-config/symbols/az index 3c399cf96..2dab93a3c 100644 --- a/xorg-server/xkeyboard-config/symbols/az +++ b/xorg-server/xkeyboard-config/symbols/az @@ -1,5 +1,4 @@ -// based on: -// symbols definition for a very simple Azerbaidjani keyboard layout. +// Symbols definition for a very simple Azerbaidjani keyboard layout. // 2001 - Pablo Saratxaga <pablo@mandrakesoft.com> partial default alphanumeric_keys @@ -32,9 +31,8 @@ xkb_symbols "latin" { key <AB08> { [ ccedilla, Ccedilla ] }; key <AB09> { [ scedilla, Scedilla ] }; key <AB10> { [ period, comma ] }; - // End alphanumeric section - include "level3(ralt_switch)" + include "level3(ralt_switch)" }; partial alphanumeric_keys @@ -87,6 +85,4 @@ xkb_symbols "cyrillic" { key <AB08> {[ Cyrillic_be, Cyrillic_BE ] }; key <AB09> {[ Cyrillic_o_bar, Cyrillic_O_bar ] }; key <AB10> {[ period, comma ] }; - - // End alphanumeric section }; diff --git a/xorg-server/xkeyboard-config/symbols/ca b/xorg-server/xkeyboard-config/symbols/ca index e93995302..b039c48ff 100644 --- a/xorg-server/xkeyboard-config/symbols/ca +++ b/xorg-server/xkeyboard-config/symbols/ca @@ -323,8 +323,6 @@ xkb_symbols "ike" { key <TLDE> { [ 0x0100157b, 0x01001575 ] }; key <LSGT> { [ 0x01001579, 0x01001577 ] }; key <BKSL> { [ backslash, bar ] }; - -// End alphanumeric section }; partial @@ -477,13 +475,11 @@ xkb_symbols "eng" { partial alphanumeric_keys xkb_symbols "kut" { - //Ejective U0313 and compose accents are from shs layout + // Ejective U0313 and acute accents are taken from shs layout. include "ca(shs)" name[Group1]= "Kutenai"; - // Alphanumeric section - // Alveolar Click key <AD05> { [ t, T,U01C2 ,U01C2 ] }; @@ -505,7 +501,6 @@ xkb_symbols "kut" { // Secwepemctsin keyboard for X11 // written by Neskie Manuel <neskiem@gmail.com> - partial alphanumeric_keys xkb_symbols "shs" { @@ -513,9 +508,9 @@ xkb_symbols "shs" { name[Group1]= "Secwepemctsin"; - //Using Dead key to get COMBINING COMMA ABOVE for ejectives on - //q, l, t, s, m, g, k, p, w, y, r - //XCompose key is used for the other accute and grave. + // Using a "dead key" to get a COMBINING COMMA ABOVE + // for ejectives on q, l, t, s, m, g, k, p, w, y, r. + // The Compose key is used for the other acutes and grave. key <AB08> { [ comma, less, U0313 ] }; key <AC01> { [ a, A, aacute, Aacute ] }; diff --git a/xorg-server/xkeyboard-config/symbols/cd.in b/xorg-server/xkeyboard-config/symbols/cd.in index a4f2fa2d2..384422ac4 100644 --- a/xorg-server/xkeyboard-config/symbols/cd.in +++ b/xorg-server/xkeyboard-config/symbols/cd.in @@ -8,9 +8,8 @@ xkb_symbols "basic" { key.type[Group1] = "FOUR_LEVEL"; - // Alphanumeric section - // TILDE, COMBINING TILDE - key <TLDE> { [ grave, asciitilde, 0x01000303] }; + // GRAVE, TILDE, COMBINING TILDE + key <TLDE> { [ grave, asciitilde, 0x01000303 ] }; key <AE01> { [ ampersand, 1, numbersign ] }; key <AE02> { [0x01000301, 2, at ] }; key <AE03> { [0x01000300, 3, guillemotleft ] }; @@ -34,8 +33,8 @@ xkb_symbols "basic" { key <AD08> { [ i, I, 0x01000268, 0x01000197 ] }; key <AD09> { [ o, O, oslash, Ooblique ] }; key <AD10> { [ p, P ] }; - key <AD11> { [0x0100025B, 0x01000190, asciicircum ] }; - key <AD12> { [ asterisk, asciicircum, dollar ] }; + key <AD11> { [0x0100025B, 0x01000190, asciicircum ] }; + key <AD12> { [ asterisk, asciicircum, dollar ] }; key <AC01> { [ q, Q ] }; key <AC02> { [ s, S ] }; @@ -47,22 +46,22 @@ xkb_symbols "basic" { key <AC08> { [ k, K ] }; key <AC09> { [ l, L ] }; key <AC10> { [ m, M ] }; - key <AC11> { [0x01000254, 0x01000186 ] }; - key <LSGT> { [ backslash, bar ] }; + key <AC11> { [0x01000254, 0x01000186 ] }; + key <LSGT> { [ backslash, bar ] }; key <AB01> { [ w, W ] }; key <AB02> { [ x, X ] }; key <AB03> { [ c, C ] }; key <AB04> { [ v, V ] }; key <AB05> { [ b, B ] }; - key <AB06> { [ n, N, 0x0100014B, 0x0100014A ] }; - key <AB07> { [ comma, question, 0x01000327 ] }; + key <AB06> { [ n, N, 0x0100014B, 0x0100014A ] }; + key <AB07> { [ comma, question, 0x01000327 ] }; key <AB08> { [ semicolon, period ] }; key <AB09> { [ colon, slash ] }; - key <AB10> { [ exclam, apostrophe, 0x01002019 ] }; - key <BKSL> { [ quotedbl, backslash, bar ] }; + key <AB10> { [ exclam, apostrophe, 0x01002019 ] }; + key <BKSL> { [ quotedbl, backslash, bar ] }; - // SPACE, SPACE, SPACE, NO-BREAK SPACE, SPACE + // SPACE, SPACE, NO-BREAK SPACE, NARROW NO_BREAK SPACE key <SPCE> { [ space, space, nobreakspace, 0x0100202F ] }; include "level3(ralt_switch)" diff --git a/xorg-server/xkeyboard-config/symbols/ch b/xorg-server/xkeyboard-config/symbols/ch index 989a2df27..59174076e 100644 --- a/xorg-server/xkeyboard-config/symbols/ch +++ b/xorg-server/xkeyboard-config/symbols/ch @@ -2,9 +2,8 @@ partial default alphanumeric_keys xkb_symbols "basic" { include "latin" - - // Alphanumeric section name[Group1]= "German (Switzerland)"; + key <TLDE> { [ section, degree ] }; key <AE01> { [ 1, plus, bar, exclamdown ] }; key <AE02> { [ 2, quotedbl, at, oneeighth ] }; @@ -78,9 +77,6 @@ xkb_symbols "de_nodeadkeys" { partial alphanumeric_keys xkb_symbols "fr" { - // Describes the differences between a very simple US/ASCII - // keyboard and a very simple Swiss/French keybaord - include "ch(basic)" name[Group1]= "French (Switzerland)"; @@ -130,8 +126,6 @@ xkb_symbols "de_mac" { name[Group1]= "German (Switzerland, Macintosh)"; - // Alphanumeric section - key <AE01> { [ 1, plus, plusminus, infinity ] }; key <AE02> { [ 2, quotedbl, leftdoublequotemark, rightdoublequotemark ] }; key <AE03> { [ 3, asterisk, numbersign, leftcaret ] }; @@ -195,9 +189,6 @@ xkb_symbols "de_mac" { partial alphanumeric_keys xkb_symbols "fr_mac" { - // Describes the differences between a very simple US/ASCII - // keyboard and a very simple Swiss/French keybaord - include "ch(de_mac)" name[Group1]= "French (Switzerland, Macintosh)"; diff --git a/xorg-server/xkeyboard-config/symbols/cm b/xorg-server/xkeyboard-config/symbols/cm index 9b2da163c..cdc8577e0 100644 --- a/xorg-server/xkeyboard-config/symbols/cm +++ b/xorg-server/xkeyboard-config/symbols/cm @@ -42,7 +42,6 @@ xkb_symbols "basic" { name[Group1]="English (Cameroon)"; - // Alphanumeric section key <TLDE> { [ grave, asciitilde ] }; key <AE01> { [ 1, exclam ] }; key <AE02> { [ 2, at ] }; @@ -93,7 +92,6 @@ xkb_symbols "basic" { key <AB10> { [ slash, U003F ] }; key <BKSL> { [ backslash, bar ] }; - // End alphanumeric section }; partial alphanumeric_keys diff --git a/xorg-server/xkeyboard-config/symbols/de b/xorg-server/xkeyboard-config/symbols/de index adc60ed36..01bde5d20 100644 --- a/xorg-server/xkeyboard-config/symbols/de +++ b/xorg-server/xkeyboard-config/symbols/de @@ -485,7 +485,6 @@ xkb_symbols "mac" { include "de" name[Group1]= "German (Macintosh)"; - // Alphanumeric section key <AE01> { [ 1, exclam, exclamdown, at ] }; key <AE05> { [ 5, percent, bracketleft ] }; key <AE06> { [ 6, ampersand, bracketright ] }; @@ -512,9 +511,9 @@ xkb_symbols "mac_nodeadkeys" { // modify the standard German mac layout to not have any dead keys include "de(mac)" name[Group1]= "German (Macintosh, eliminate dead keys)"; - key <AE04> { [ 4, dollar, onequarter, currency ] }; key <TLDE> { [ asciicircum, degree, notsign ] }; + key <AE04> { [ 4, dollar, onequarter, currency ] }; key <AE12> { [ acute, grave, cedilla ] }; key <AD11> { [ udiaeresis, Udiaeresis, diaeresis ] }; key <AD12> { [ plus, asterisk, asciitilde, macron ] }; @@ -598,7 +597,7 @@ xkb_symbols "ru" { name[Group1]= "Russian (Germany, phonetic)"; -key.type[group1]="FOUR_LEVEL_ALPHABETIC"; + key.type[group1]="FOUR_LEVEL_ALPHABETIC"; key <LatA> { [ Cyrillic_a, Cyrillic_A ] }; key <LatB> { [ Cyrillic_be, Cyrillic_BE ] }; @@ -725,8 +724,6 @@ xkb_symbols "hu" { key <AE12> { [ acute, grave, oacute, Oacute ] }; key <BKSL> { [numbersign, apostrophe, grave, grave ] }; key <TLDE> { [asciicircum, degree, notsign, notsign ] }; - - }; partial alphanumeric_keys diff --git a/xorg-server/xkeyboard-config/symbols/es b/xorg-server/xkeyboard-config/symbols/es index ea4a28b1f..4196762a6 100644 --- a/xorg-server/xkeyboard-config/symbols/es +++ b/xorg-server/xkeyboard-config/symbols/es @@ -1,6 +1,4 @@ -// based on a keyboard -// Modified for a real Spanish Keyboard by Jon Tombs -// +// Modified for a real Spanish keyboard by Jon Tombs. partial default alphanumeric_keys xkb_symbols "basic" { @@ -66,7 +64,6 @@ xkb_symbols "dvorak" { name[Group1]="Spanish (Dvorak)"; - // Alphanumeric section key <TLDE> {[ masculine, ordfeminine, backslash, degree ]}; key <AE01> {[ 1, exclam, bar, onesuperior ]}; key <AE02> {[ 2, quotedbl, at, twosuperior ]}; @@ -146,13 +143,8 @@ xkb_symbols "ast" { // Copied from macintosh_vndr/es partial alphanumeric_keys xkb_symbols "mac" { - - // Describes the differences between a very simple mac_US - // keyboard and a very simple Spanish keybaord - include "es" name[Group1]= "Spanish (Macintosh)"; - }; partial alphanumeric_keys @@ -230,7 +222,6 @@ xkb_symbols "olpcm" { key <AA06> { [ bracketleft, braceleft, ccedilla, Ccedilla ] }; key <AA07> { [ bracketright, braceright ] }; - include "level3(ralt_switch)" }; diff --git a/xorg-server/xkeyboard-config/symbols/fr b/xorg-server/xkeyboard-config/symbols/fr index 1bf007e77..71b20b44b 100644 --- a/xorg-server/xkeyboard-config/symbols/fr +++ b/xorg-server/xkeyboard-config/symbols/fr @@ -1,5 +1,3 @@ -// based on a keyboard map from an 'xkb/symbols/fr' file - partial default alphanumeric_keys xkb_symbols "basic" { @@ -109,13 +107,13 @@ xkb_symbols "nodeadkeys" { // © 2003-2006 Nicolas Mailhot <nicolas.mailhot @ laposte.net> // // ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┲━━━━━━━━━┓ -// │ ³ ¸ │ 1 ̨ │ 2 É │ 3 ˘ │ 4 — │ 5 – │ 6 ‑ │ 7 È │ 8 ™ │ 9 Ç │ 0 À │ ° ≠ │ + ± ┃ ⌫ Retour┃ +// │ ³ ¸ │ 1 ̨ │ 2 É │ 3 ˘ │ 4 — │ 5 – │ 6 ‑ │ 7 È │ 8 ™ │ 9 Ç │ 0 À │ ° ≠ │ + ± ┃ ⌫ Retour┃ // │ ² ¹ │ & ˇ │ é ~ │ " # │ ' { │ ( [ │ - | │ è ` │ _ \ │ ç ^ │ à @ │ ) ] │ = } ┃ arrière┃ // ┢━━━━━┷━┱───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┺━┳━━━━━━━┫ // ┃ ┃ A Æ │ Z  │ E ¢ │ R Ê │ T Þ │ Y Ÿ │ U Û │ I Î │ O Œ │ P Ô │ ¨ ˚ │ £ Ø ┃Entrée ┃ // ┃Tab ↹ ┃ a æ │ z â │ e € │ r ê │ t þ │ y ÿ │ u û │ i î │ o œ │ p ô │ ^ ~ │ $ ø ┃ ⏎ ┃ // ┣━━━━━━━┻┱────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┺┓ ┃ -// ┃ ┃ Q Ä │ S „ │ D Ë │ F ‚ │ G ¥ │ H Ð │ J Ü │ K Ï │ L Ŀ │ M Ö │ % Ù │ µ ̄ ┃ ┃ +// ┃ ┃ Q Ä │ S „ │ D Ë │ F ‚ │ G ¥ │ H Ð │ J Ü │ K Ï │ L Ŀ │ M Ö │ % Ù │ µ ̄ ┃ ┃ // ┃Maj ⇬ ┃ q ä │ s ß │ d ë │ f ‘ │ g ’ │ h ð │ j ü │ k ï │ l ŀ │ m ö │ ù ' │ * ` ┃ ┃ // ┣━━━━━━━┳┹────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┲┷━━━━━┻━━━━━━┫ // ┃ ┃ > ≥ │ W “ │ X ” │ C ® │ V ← │ B ↑ │ N → │ ? … │ . . │ / ∕ │ § − ┃ ┃ @@ -136,7 +134,7 @@ xkb_symbols "oss" { name[Group1]="French (alternative)"; // First row - key <TLDE> { [ twosuperior, threesuperior, onesuperior, dead_cedilla ] }; // ² ³ ¹ ¸ + key <TLDE> { [ twosuperior, threesuperior, onesuperior, dead_cedilla ] }; // ² ³ ¹ ¸ key <AE01> { [ ampersand, 1, dead_caron, dead_ogonek ] }; // & 1 ˇ ̨ key <AE02> { [ eacute, 2, asciitilde, Eacute ] }; // é 2 ~ É key <AE03> { [ quotedbl, 3, numbersign, dead_breve ] }; // " 3 # ˘ @@ -147,7 +145,7 @@ xkb_symbols "oss" { key <AE08> { [ underscore, 8, backslash, trademark ] }; // _ 8 \ ™ key <AE09> { [ ccedilla, 9, asciicircum, Ccedilla ] }; // ç 9 ^ Ç key <AE10> { [ agrave, 0, at, Agrave ] }; // à 0 @ À - key <AE11> { [ parenright, degree, bracketright, notequal ] }; // ) ° ] ≠ + key <AE11> { [ parenright, degree, bracketright, notequal ] }; // ) ° ] ≠ key <AE12> { [ equal, plus, braceright, plusminus ] }; // = + } ± // Second row @@ -166,7 +164,7 @@ xkb_symbols "oss" { // Third row key <AC01> { [ q, Q, adiaeresis, Adiaeresis ] }; // q Q ä Ä - key <AC02> { [ s, S, ssharp, doublelowquotemark ] }; // s S ß „ + key <AC02> { [ s, S, ssharp, doublelowquotemark ] }; // s S ß „ key <AC03> { [ d, D, ediaeresis, Ediaeresis ] }; // d D ë Ë key <AC04> { [ f, F, leftsinglequotemark, singlelowquotemark ] }; // f F ‘ ‚ key <AC05> { [ g, G, rightsinglequotemark, yen ] }; // g G ’ ¥ @@ -207,16 +205,16 @@ xkb_symbols "oss_latin9" { key <AE03> { [ quotedbl, 3, numbersign, dead_tilde ] }; // " 3 # ~ key <AE04> { [ apostrophe, 4, braceleft, underscore ] }; // ' 4 { _ key <AE05> { [ parenleft, 5, bracketleft, minus ] }; // ( 5 [ - - key <AE06> { [ minus, 6, bar, minus ] }; // - 6 | - - key <AE08> { [ underscore, 8, backslash, backslash ] }; // _ 8 \ \ + key <AE06> { [ minus, 6, bar, minus ] }; // - 6 | - + key <AE08> { [ underscore, 8, backslash, backslash ] }; // _ 8 \ \ key <AE11> { [ parenright, degree, bracketright, equal ] }; // ) ° ] = // Third row - key <AC02> { [ s, S, ssharp, guillemotleft ] }; // s S ß « + key <AC02> { [ s, S, ssharp, guillemotleft ] }; // s S ß « key <AC04> { [ f, F, apostrophe, apostrophe ] }; // f F ' ' key <AC05> { [ g, G, apostrophe, yen ] }; // g G ' ¥ - key <AC09> { [ l, L, periodcentered, periodcentered ] }; // l L · · - key <BKSL> { [ asterisk, mu, dead_grave, dead_circumflex ] }; // * µ ` ^ + key <AC09> { [ l, L, periodcentered, periodcentered ] }; // l L · · + key <BKSL> { [ asterisk, mu, dead_grave, dead_circumflex ] }; // * µ ` ^ // Fourth row key <LSGT> { [ less, greater, less, greater ] }; // < > < > @@ -238,15 +236,12 @@ xkb_symbols "oss_Sundeadkeys" { include "fr(oss)" - // First row - key <TLDE> { [ twosuperior, threesuperior, onesuperior, dead_cedilla ] }; // ¹ ² ³ ¸ + key <TLDE> { [ twosuperior, threesuperior, onesuperior, dead_cedilla ] }; // ¹ ² ³ ¸ - // Second row - key <AD11> { [ dead_circumflex, dead_diaeresis, dead_tilde, dead_abovering ] }; // ^ ̈ ̃ ˚ + key <AD11> { [ dead_circumflex, dead_diaeresis, dead_tilde, dead_abovering ] }; // ^ ̈ ̃ ˚ - //Third row - key <AC11> { [ ugrave, percent, dead_acute, Ugrave ] }; // ù % ' Ù - key <BKSL> { [ asterisk, mu, dead_grave, dead_macron ] }; // * µ ` ̄ + key <AC11> { [ ugrave, percent, dead_acute, Ugrave ] }; // ù % ' Ù + key <BKSL> { [ asterisk, mu, dead_grave, dead_macron ] }; // * µ ` ̄ }; partial alphanumeric_keys @@ -266,12 +261,11 @@ xkb_symbols "oss_nodeadkeys" { name[Group1]="French (alternative, eliminate dead keys)"; - key <TLDE> { [ twosuperior, threesuperior, onesuperior, cedilla ] }; // ² ³ ¹ ¸ + key <TLDE> { [ twosuperior, threesuperior, onesuperior, cedilla ] }; // ² ³ ¹ ¸ key <AE01> { [ ampersand, 1, caron, ogonek ] }; // & 1 ˇ ̨ key <AE03> { [ quotedbl, 3, numbersign, breve ] }; // " 3 # ˘ - // Second row - key <AD11> { [ asciicircum, diaeresis, asciitilde, Aring ] }; // ^ ̈ ̃ Å + key <AD11> { [ asciicircum, diaeresis, asciitilde, Aring ] }; // ^ ̈ ̃ Å key <AC11> { [ ugrave, percent, acute, Ugrave ] }; // ù % ' Ù key <BKSL> { [ asterisk, mu, grave, macron ] }; // * µ ` ̄ }; @@ -286,16 +280,16 @@ xkb_symbols "oss_nodeadkeys" { // This layout has long been distributed and refined outside official channels. // To this day it remains more feature-rich and popular than the 'fr' layout. // -// This file is derived from an original version by Guylhem Aznar. The -// original version is always available from: +// This layout is derived from an original version by Guylhem Aznar. +// The original version is always available from: // http://en.tldp.org/HOWTO/Francophones-HOWTO.html // and is distributed under a GPL license. // // The author has given permission for this derived version to be distributed // under the standard XFree86 license. He would like all changes to this -// version be send to him at <clavier @ externe.net> so he can sync the -// identically named linux console map (kbd, linux-console) and this -// fileout-of-tree GPL version. +// version to be sent to him at <clavier @ externe.net>, so he can sync +// the identically named linux console map (kbd, linux-console) and his +// out-of-tree GPL version. // // Now follows the keyboard design description in French. // (If you can't read it you probably have no business changing this file anyway:) @@ -331,15 +325,16 @@ xkb_symbols "oss_nodeadkeys" { // // (^) : accent circonflexe, // Shift+(^) : tréma, -// Shift+AltGr (^) : tilde, -// AltGr (1) : accent aigu, -// AltGr (7) : accent grave +// Shift+AltGr+(^) : tilde, +// AltGr+(1) : accent aigu, +// AltGr+(7) : accent grave // // Pour s'en servir, procéder comme avec l'accent circonflexe & le tréma // sur les vielles machines à écrire : // -// AltGr (1) puis e : é -// Shift+AltGr (1) puis e : É ... +// AltGr+(1) puis e : é +// AltGr+(1) puis E : É +// partial alphanumeric_keys xkb_symbols "latin9" { @@ -418,7 +413,6 @@ xkb_symbols "latin9_Sundeadkeys" { key <AE01> { [ ampersand, 1, dead_acute, periodcentered ] }; key <AE07> { [ egrave, 7, dead_grave, Egrave ] }; key <AD11> { [ dead_circumflex, dead_diaeresis, dead_tilde, apostrophe ] }; - }; partial alphanumeric_keys @@ -451,22 +445,22 @@ xkb_symbols "latin9_nodeadkeys" { // by Frédéric Boiteux <fboiteux at free dot fr> // // Bépo layout (1.0rc2 version) for a pc105 keyboard (french) : -// ┌────┐ -// │ S A│ S = Shift, A = AltGr + Shift -// │ s a│ s = normal, a = AltGr -// └────┘ +// ┌─────┐ +// │ S A │ S = Shift, A = AltGr + Shift +// │ s a │ s = normal, a = AltGr +// └─────┘ // // ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┲━━━━━━━━━┓ // │ # ¶ │ 1 „ │ 2 “ │ 3 ” │ 4 ≤ │ 5 ≥ │ 6 │ 7 ¬ │ 8 ¼ │ 9 ½ │ 0 ¾ │ ° ′ │ ` ″ ┃ ⌫ Retour┃ // │ $ – │ " — │ « < │ » > │ ( [ │ ) ] │ @ ^ │ + ± │ - − │ / ÷ │ * × │ = ≠ │ % ‰ ┃ arrière┃ // ┢━━━━━┷━┱───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┺━┳━━━━━━━┫ // ┃ ┃ B ¦ │ É ˝ │ P § │ O Œ │ È ` │ ! │ V │ D Ð │ L │ J IJ │ Z Ə │ W ┃Entrée ┃ -// ┃Tab ↹ ┃ b | │ é ˊ │ p & │ o œ │ è ` │ ˆ ¡ │ v ˇ │ d ð │ l / │ j ij │ z ə │ w ̆ ┃ ⏎ ┃ +// ┃Tab ↹ ┃ b | │ é ˊ │ p & │ o œ │ è ` │ ˆ ¡ │ v ˇ │ d ð │ l / │ j ij │ z ə │ w ̆ ┃ ⏎ ┃ // ┣━━━━━━━┻┱────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┺┓ ┃ -// ┃ ┃ A Æ │ U Ù │ I ˙ │ E ¤ │ ; ̛ │ C ſ │ T Þ │ S ẞ │ R ™ │ N │ M º │ Ç , ┃ ┃ -// ┃Maj ⇬ ┃ a æ │ u ù │ i ̈ │ e € │ , ’ │ c © │ t þ │ s ß │ r ® │ n ˜ │ m ¯ │ ç ¸ ┃ ┃ +// ┃ ┃ A Æ │ U Ù │ I ˙ │ E ¤ │ ; ̛ │ C ſ │ T Þ │ S ẞ │ R ™ │ N │ M º │ Ç , ┃ ┃ +// ┃Maj ⇬ ┃ a æ │ u ù │ i ̈ │ e € │ , ’ │ c © │ t þ │ s ß │ r ® │ n ˜ │ m ¯ │ ç ¸ ┃ ┃ // ┣━━━━━━━┳┹────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┲┷━━━━━┻━━━━━━┫ -// ┃ ┃ Ê │ À │ Y ‘ │ X ’ │ : · │ K │ ? ̉ │ Q ̣ │ G │ H ‡ │ F ª ┃ ┃ +// ┃ ┃ Ê │ À │ Y ‘ │ X ’ │ : · │ K │ ? ̉ │ Q ̣ │ G │ H ‡ │ F ª ┃ ┃ // ┃Shift ⇧┃ ê / │ à \ │ y { │ x } │ . … │ k ~ │ ' ¿ │ q ˚ │ g µ │ h † │ f ˛ ┃Shift ⇧ ┃ // ┣━━━━━━━╋━━━━━┷━┳━━━┷━━━┱─┴─────┴─────┴─────┴─────┴─────┴───┲━┷━━━━━╈━━━━━┻━┳━━━━━━━┳━━━┛ // ┃ ┃ ┃ ┃ Espace inséc. Espace inséc. fin ┃ ┃ ┃ ┃ @@ -692,10 +686,10 @@ xkb_symbols "dvorak" { // Copyright © 2009 Dominique Pellé <dominique.pelle@gmail.com> // Version: 0.1 // -// ┌────┐ -// │ S A│ S = Reol = Shift, A = ArErl + Pennlizherenn = AltGr + Shift -// │ s a│ s = normal, a = AltGr -// └────┘ +// ┌─────┐ +// │ S A │ S = Reol = Shift, A = ArErl + Pennlizherenn = AltGr + Shift +// │ s a │ s = normal, a = ArErl = AltGr +// └─────┘ // // ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┲━━━━━━━━━┓ // │ $ Γ │ 1 Δ │ 2 Θ │ 3 Λ │ 4 Ξ │ 5 Π │ 6 Σ │ 7 Φ │ 8 Ψ │ 9 Ç │ 0 Ω │ ° ß │ + ¬ ┃ ⌫ Souzañ┃ @@ -789,20 +783,20 @@ xkb_symbols "bre" { // Occitan layout // Author : 2009 Thomas Metz <tmetz @ free.fr> -// Derivated from the layout defined at http://www.panoccitan.org +// Derived from the layout defined at http://www.panoccitan.org // Version: 0.1 -// From OSS french keyboard : +// Differences from OSS French keyboard : // - add á, í, ò, ó et ú, Á, Í, Ò, Ó, Ú, ñ, Ñ // - change position of æ, ü, î, û, œ, ô, ö, ï, â, ë -// +// // ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┲━━━━━━━━━┓ -// │ ³ ¸ │ 1 ̨ │ 2 É │ 3 ˘ │ 4 — │ 5 – │ 6 ‑ │ 7 È │ 8 ™ │ 9 Ç │ 0 À │ ° ≠ │ + ± ┃ ⌫ Retour┃ +// │ ³ ¸ │ 1 ̨ │ 2 É │ 3 ˘ │ 4 — │ 5 – │ 6 ‑ │ 7 È │ 8 ™ │ 9 Ç │ 0 À │ ° ≠ │ + ± ┃ ⌫ Retour┃ // │ ² ¹ │ & ˇ │ é ~ │ " # │ ' { │ ( [ │ - | │ è ` │ _ \ │ ç ^ │ à @ │ ) ] │ = } ┃ arrière┃ // ┢━━━━━┷━┱───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┺━┳━━━━━━━┫ // ┃ ┃ A Á │ Z Æ │ E ¢ │ R Ê │ T Ë │ Y Û │ U Ú │ I Í │ O Ó │ P Ò │ ¨ Œ │ £ Ø ┃Entrée ┃ // ┃Tab ↹ ┃ a á │ z æ │ e € │ r ê │ t ë │ y û │ u ú │ i í │ o ó │ p ò │ ^ œ │ $ ø ┃ ⏎ ┃ // ┣━━━━━━━┻┱────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┺┓ ┃ -// ┃ ┃ Q Ä │ S „ │ D  │ F ‚ │ G ¥ │ H Ü │ J Î │ K Ï │ L Ô │ M Ö │ % Ù │ µ ̄ ┃ ┃ +// ┃ ┃ Q Ä │ S „ │ D  │ F ‚ │ G ¥ │ H Ü │ J Î │ K Ï │ L Ô │ M Ö │ % Ù │ µ ̄ ┃ ┃ // ┃Maj ⇬ ┃ q ä │ s ß │ d â │ f ‘ │ g ’ │ h ü │ j î │ k ï │ l ô │ m ö │ ù ' │ * ` ┃ ┃ // ┣━━━━━━━┳┹────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┲┷━━━━━┻━━━━━━┫ // ┃ ┃ > ≥ │ W “ │ X ” │ C ® │ V ← │ B ↑ │ N Ñ │ ? … │ . . │ / ∕ │ § − ┃ ┃ @@ -818,26 +812,8 @@ xkb_symbols "oci" { name[Group1]= "Occitan"; - // First row - key <TLDE> { [ twosuperior, threesuperior, onesuperior, dead_cedilla ] }; // ² ³ ¹ ¸ - key <AE01> { [ ampersand, 1, dead_caron, dead_ogonek ] }; // & 1 ˇ ̨ - key <AE02> { [ eacute, 2, asciitilde, Eacute ] }; // é 2 ~ É - key <AE03> { [ quotedbl, 3, numbersign, dead_breve ] }; // " 3 # ˘ - key <AE04> { [ apostrophe, 4, braceleft, 0x1002014 ] }; // ' 4 { — (tiret cadratin) - key <AE05> { [ parenleft, 5, bracketleft, 0x1002013 ] }; // ( 5 [ – (tiret demi-cadratin) - key <AE06> { [ minus, 6, bar, 0x1002011 ] }; // - 6 | ‑ (tiret insécable) - key <AE07> { [ egrave, 7, grave, Egrave ] }; // è 7 ` È - key <AE08> { [ underscore, 8, backslash, trademark ] }; // _ 8 \ ™ - key <AE09> { [ ccedilla, 9, asciicircum, Ccedilla ] }; // ç 9 ^ Ç - key <AE10> { [ agrave, 0, at, Agrave ] }; // à 0 @ À - key <AE11> { [ parenright, degree, bracketright, notequal ] }; // ) ° ] ≠ - key <AE12> { [ equal, plus, braceright, plusminus ] }; // = + } ± - - // Second row key <AD01> { [ a, A, aacute, Aacute ] }; // a A á Á key <AD02> { [ z, Z, ae, AE ] }; // z Z æ Æ - key <AD03> { [ e, E, EuroSign, cent ] }; // e E € ¢ - key <AD04> { [ r, R, ecircumflex, Ecircumflex ] }; // r R ê Ê key <AD05> { [ t, T, ediaeresis, Ediaeresis ] }; // t T ë Ë key <AD06> { [ y, Y, ucircumflex, Ucircumflex ] }; // y Y û Û key <AD07> { [ u, U, uacute, Uacute ] }; // u U ú Ú @@ -845,41 +821,22 @@ xkb_symbols "oci" { key <AD09> { [ o, O, oacute, Oacute ] }; // o O ó Ó key <AD10> { [ p, P, ograve, Ograve ] }; // p P ò Ò key <AD11> { [ dead_circumflex, dead_diaeresis, oe, OE ] }; // ^ ̈ ̃ œ Œ - key <AD12> { [ dollar, sterling, oslash, Ooblique ] }; // $ £ ø Ø - // Third row - key <AC01> { [ q, Q, adiaeresis, Adiaeresis ] }; // q Q ä Ä - key <AC02> { [ s, S, ssharp, doublelowquotemark ] }; // s S ß „ - key <AC03> { [ d, D, acircumflex, Acircumflex ] }; // d D â  - key <AC04> { [ f, F, leftsinglequotemark, singlelowquotemark ] }; // f F ‘ ‚ - key <AC05> { [ g, G, rightsinglequotemark, yen ] }; // g G ’ ¥ + key <AC03> { [ d, D, acircumflex, Acircumflex ] }; // d D â  key <AC06> { [ h, H, udiaeresis, Udiaeresis ] }; // h H ü Ü - key <AC07> { [ j, J, icircumflex, Icircumflex] }; // j J î Î - key <AC08> { [ k, K, idiaeresis, Idiaeresis] }; // k K ï Ï + key <AC07> { [ j, J, icircumflex, Icircumflex ] }; // j J î Î + key <AC08> { [ k, K, idiaeresis, Idiaeresis ] }; // k K ï Ï key <AC09> { [ l, L, ocircumflex, Ocircumflex ] }; // l L ô Ô - key <AC10> { [ m, M, odiaeresis, Odiaeresis ] }; // m M ö Ö - key <AC11> { [ ugrave, percent, dead_acute, Ugrave ] }; // ù % ' Ù - key <BKSL> { [ asterisk, mu, dead_grave, dead_macron ] }; // * µ ` ̄ - // Fourth row - key <LSGT> { [ less, greater, lessthanequal, greaterthanequal ] }; // < > ≤ ≥ - key <AB01> { [ w, W, guillemotleft, leftdoublequotemark ] }; // w W « “ - key <AB02> { [ x, X, guillemotright, rightdoublequotemark ] }; // x X » ” - key <AB03> { [ c, C, copyright, registered ] }; // c C © ® - key <AB04> { [ v, V, rightarrow, leftarrow ] }; // v V → ← - key <AB05> { [ b, B, downarrow, uparrow ] }; // b B ↓ ↑ - key <AB06> { [ n, N, ntilde, Ntilde ] }; // n N ñ Ñ - key <AB07> { [ comma, question, questiondown, 0x1002026 ] }; // , ? ¿ … - key <AB08> { [ semicolon, period, multiply, 0x10022C5 ] }; // ; . × ⋅ - key <AB09> { [ colon, slash, division, 0x1002215 ] }; // : / ÷ ∕ - key <AB10> { [ exclam, section, exclamdown, 0x1002212 ] }; // ! § ¡ − + key <AB04> { [ v, V, rightarrow, leftarrow ] }; // v V → ← + key <AB06> { [ n, N, ntilde, Ntilde ] }; // n N ñ Ñ }; // Marc.Shapiro@inria.fr 19-sep-1998 // modifications : Etienne Herlent <eherlent@linux-france.org> june 2000 // adapted to the new input layer : // Martin Costabel <costabel@wanadoo.fr> 3-jan-2001 -// adapted for Latin9 alphabet (ISO-8859-15): +// adapted for Latin9 alphabet (ISO-8859-15): // Etienne Herlent <eherlent@linux-france.org> march 2005 // This map is an almost-complete mapping of the standard French @@ -903,8 +860,7 @@ xkb_symbols "mac" { name[Group1]= "French (Macintosh)"; - // Alphanumeric section - key <TLDE> { [ at, numbersign, periodcentered, Ydiaeresis ] }; // MISSING: Ydiaeresis; eherlent : ok in Latin9 + key <TLDE> { [ at, numbersign, periodcentered, Ydiaeresis ] }; // MISSING: Ydiaeresis; eherlent : ok in Latin9 key <AE01> { [ ampersand, 1, VoidSymbol, dead_acute ] }; // MISSING: Apple key <AE02> { [ eacute, 2, ediaeresis, Eacute ] }; key <AE03> { [ quotedbl, 3, VoidSymbol, VoidSymbol ] }; // CHECK all quotemarks @@ -920,19 +876,19 @@ xkb_symbols "mac" { key <AE12> { [ minus, underscore, emdash, endash ] }; // CHECK dashes key <AD01> { [ a, A, ae, AE ] }; - key <AD02> { [ z, Z, Acircumflex, Aring ] }; + key <AD02> { [ z, Z, Acircumflex, Aring ] }; key <AD03> { [ e, E, ecircumflex, Ecircumflex ] }; key <AD04> { [ r, R, registered, currency ] }; key <AD05> { [ t, T, VoidSymbol, VoidSymbol ] }; key <AD06> { [ y, Y, Uacute, Ydiaeresis ] }; // MISSING: Ydiaeresis; eherlent : ok in Latin9 key <AD07> { [ u, U, VoidSymbol, ordfeminine ] }; // MISSING: ordmasculine? key <AD08> { [ i, I, icircumflex, idiaeresis ] }; - key <AD09> { [ o, O, oe, OE ] }; // MISSING: oe, OE lacking in Latin1; eherlent ok in Latin9 + key <AD09> { [ o, O, oe, OE ] }; // MISSING: oe, OE lacking in Latin1; eherlent ok in Latin9 key <AD10> { [ p, P, VoidSymbol, VoidSymbol ] }; key <AD11> { [dead_circumflex,dead_diaeresis, ocircumflex, Ocircumflex ] }; - key <AD12> { [ dollar, asterisk, EuroSign, yen ] }; // eherlent : EuroSign in Latin9 + key <AD12> { [ dollar, asterisk, EuroSign, yen ] }; // eherlent : EuroSign in Latin9 - key <AC01> { [ q, Q, acircumflex, Agrave ] }; + key <AC01> { [ q, Q, acircumflex, Agrave ] }; key <AC02> { [ s, S, Ograve, VoidSymbol ] }; key <AC03> { [ d, D, VoidSymbol, VoidSymbol ] }; key <AC04> { [ f, F, VoidSymbol, periodcentered ] }; // MISSING: oblong script f?? @@ -946,7 +902,7 @@ xkb_symbols "mac" { key <BKSL> { [ dead_grave, sterling, at, numbersign ] }; key <LSGT> { [ less, greater, VoidSymbol, VoidSymbol ] }; - key <AB01> { [ w, W, VoidSymbol, VoidSymbol ] }; // MISSING: half-guillemot (single angle bracket) + key <AB01> { [ w, W, VoidSymbol, VoidSymbol ] }; // MISSING: half-guillemot (single angle bracket) key <AB02> { [ x, X, VoidSymbol, VoidSymbol ] }; // CHECK similarequal; MISSING: extra-slanted slash key <AB03> { [ c, C, copyright, cent ] }; key <AB04> { [ v, V, diamond, leftradical ] }; // CHECK diamond, leftradical @@ -958,7 +914,6 @@ xkb_symbols "mac" { key <AB10> { [ equal, plus, VoidSymbol, plusminus ] }; key <SPCE> { [ space, space, nobreakspace, nobreakspace ] }; - // End alphanumeric section key <KPDL> { [ comma,KP_Decimal ] }; diff --git a/xorg-server/xkeyboard-config/symbols/fujitsu_vndr/us b/xorg-server/xkeyboard-config/symbols/fujitsu_vndr/us index b856393fd..30661dbb2 100644 --- a/xorg-server/xkeyboard-config/symbols/fujitsu_vndr/us +++ b/xorg-server/xkeyboard-config/symbols/fujitsu_vndr/us @@ -133,7 +133,6 @@ xkb_symbols { key <KP00> { [ KP_0 ] }; // End "Keypad" section - // begin modifier mappings modifier_map Shift { Shift_R }; modifier_map Mod1 { Meta_L, Meta_R }; modifier_map Mod2 { Mode_switch }; diff --git a/xorg-server/xkeyboard-config/symbols/gb b/xorg-server/xkeyboard-config/symbols/gb index 10372afcd..949b2491f 100644 --- a/xorg-server/xkeyboard-config/symbols/gb +++ b/xorg-server/xkeyboard-config/symbols/gb @@ -74,7 +74,6 @@ xkb_symbols "extd" { name[Group1]="English (UK, extended WinKeys)"; - // Alphanumeric section key <TLDE> { [ dead_grave, notsign, brokenbar, NoSymbol ] }; key <AE02> { [ 2, quotedbl, dead_diaeresis, onehalf ] }; @@ -96,7 +95,6 @@ xkb_symbols "extd" { key <BKSL> { [ numbersign, asciitilde, dead_tilde, NoSymbol ] }; key <LSGT> { [ backslash, bar, NoSymbol, NoSymbol ] }; - // End alphanumeric section include "level3(ralt_switch)" }; @@ -172,8 +170,6 @@ xkb_symbols "mac" { key <TLDE> { [ section, plusminus ] }; key <LSGT> { [ grave, asciitilde ] }; - // End alphanumeric section - include "level3(ralt_switch)" include "level3(enter_switch)" }; diff --git a/xorg-server/xkeyboard-config/symbols/hp_vndr/us b/xorg-server/xkeyboard-config/symbols/hp_vndr/us index aedda92d2..8bbe2e606 100644 --- a/xorg-server/xkeyboard-config/symbols/hp_vndr/us +++ b/xorg-server/xkeyboard-config/symbols/hp_vndr/us @@ -69,8 +69,9 @@ xkb_symbols "hil" { key <DOWN> { [ Down ] }; key <UP> { [ Up ] }; key <RGHT> { [ Right ]}; + // End "Editing" section - // End "Editing" section, begin "Keypad" + // Begin "Keypad" section key <KPMU> { [ KP_Multiply ]}; key <KPDV> { [ KP_Divide ]}; key <KPAD> { [ KP_Add ]}; @@ -95,8 +96,6 @@ xkb_symbols "hil" { key <KPDL> { [ KP_Decimal ] }; // End "Keypad" section - - // begin modifier mappings modifier_map Shift { Shift_R }; modifier_map Mod1 { Meta_L, Meta_R }; modifier_map Mod2 { Alt_L }; diff --git a/xorg-server/xkeyboard-config/symbols/in b/xorg-server/xkeyboard-config/symbols/in index 5336232d1..9f0594928 100644 --- a/xorg-server/xkeyboard-config/symbols/in +++ b/xorg-server/xkeyboard-config/symbols/in @@ -163,7 +163,6 @@ xkb_symbols "bolnagri" { key <AB09> { [ period, U093C ] }; // period: period, nukta key <AB10> { [ slash, question ] }; - // begin modifier mappings // modifier_map Shift { Shift_L }; // modifier_map Lock { Caps_Lock }; // modifier_map Control{ Control_L }; @@ -911,7 +910,6 @@ xkb_symbols "mal_lalitha" { key <AB09> { [ period, U003E ] }; // period: period key <AB10> { [ slash, question ] }; - // begin modifier mappings // modifier_map Shift { Shift_L }; // modifier_map Lock { Caps_Lock }; // modifier_map Control{ Control_L }; @@ -1518,9 +1516,8 @@ xkb_symbols "jhelum" { key <AB07> { [ U0A2E, U0A2E ] }; // M: ma key <AB08> { [ comma, U262C ] };// comma: comma, dev abbreviation sign key <AB09> { [ period, U0A74 ] }; // period: period, nukta - key <AB10> { [ slash, question ] }; + key <AB10> { [ slash, question ] }; -// begin modifier mappings // modifier_map Shift { Shift_L }; // modifier_map Lock { Caps_Lock }; // modifier_map Control{ Control_L }; diff --git a/xorg-server/xkeyboard-config/symbols/it b/xorg-server/xkeyboard-config/symbols/it index f0336e58b..d2a5461b5 100644 --- a/xorg-server/xkeyboard-config/symbols/it +++ b/xorg-server/xkeyboard-config/symbols/it @@ -67,7 +67,6 @@ xkb_symbols "mac" { name[Group1]= "Italian (Macintosh)"; - // Alphanumeric section key <LSGT> { [ less, greater ] }; key <TLDE> { [ at, numbersign, periodcentered ] }; key <AE01> { [ ampersand, 1, guillemotleft,guillemotright ] }; @@ -120,8 +119,6 @@ xkb_symbols "mac" { key <AB09> { [ colon, slash, bar, backslash ] }; key <AB10> { [ ograve, exclam, exclamdown ] }; - // End alphanumeric section - include "kpdl(dot)" include "level3(ralt_switch)" }; @@ -132,8 +129,8 @@ partial alphanumeric_keys xkb_symbols "geo" { include "it" include "ge(basic)" - name[Group1]= "Georgian (Italy)"; + key <TLDE> { [ backslash, bar, notsign, brokenbar ] }; key <AE01> { [ 1, exclam, onesuperior ] }; key <AE02> { [ 2, quotedbl, twosuperior, dead_doubleacute ] }; @@ -145,10 +142,10 @@ xkb_symbols "geo" { key <AE08> { [ 8, parenleft, bracketleft ] }; key <AE09> { [ 9, parenright ] }; key <AE10> { [ 0, equal, braceright, dead_ogonek ] }; - key <AE11> { [apostrophe, question, grave, questiondown ] }; + key <AE11> { [ apostrophe, question, grave, questiondown ] }; key <AE12> { [ igrave, asciicircum, asciitilde, dead_circumflex ] }; - key <AD03> { [0x010010d4, E, EuroSign ] }; + key <AD03> { [ 0x010010d4, E, EuroSign ] }; key <AD11> { [ egrave, eacute, bracketleft, braceleft ] }; key <AD12> { [ plus, asterisk, bracketright, braceright ] }; @@ -179,8 +176,6 @@ xkb_symbols "us" { name[Group1]= "Italian (US keyboard with Italian letters)"; - // Alphanumeric section - key <TLDE> { [ grave, asciitilde, dead_grave, dead_tilde ] }; key <AE01> { [ 1, exclam, onesuperior ] }; key <AE02> { [ 2, at, twosuperior ] }; @@ -295,7 +290,6 @@ xkb_symbols "ibm" { include "level3(ralt_switch)" include "kpdl(comma)" - }; diff --git a/xorg-server/xkeyboard-config/symbols/jp b/xorg-server/xkeyboard-config/symbols/jp index 72985fd3e..dfb56b7c2 100644 --- a/xorg-server/xkeyboard-config/symbols/jp +++ b/xorg-server/xkeyboard-config/symbols/jp @@ -1,22 +1,19 @@ -// based on: -// symbols for a Japanese 106 keyboard(by tsuka@kawalab.dnj.ynu.ac.jp) +// Symbols for Japanese 106-keys keyboards (by tsuka@kawalab.dnj.ynu.ac.jp). -// jp106 keyboard map partial default alphanumeric_keys xkb_symbols "106" { + include "jp(common)" name[Group1]= "Japanese"; key <AE10> { [ 0, asciitilde ] }; - key <AE13> { [ backslash, bar ] }; + key <AE13> { [ backslash, bar ] }; }; -// common latin part of jp keyboard map partial hidden alphanumeric_keys xkb_symbols "common" { - // "Common" keys for jp 106/109A layout + // "Common" keys for jp 106/109A layouts. - // Alphanumeric section key <HZTG> { type[Group1]="PC_ALT_LEVEL2", symbols[Group1]= [ Zenkaku_Hankaku, Kanji ] @@ -81,29 +78,28 @@ xkb_symbols "common" { type[Group1]="PC_ALT_LEVEL2", symbols[Group1]= [ Henkan, Mode_switch ] }; + key <HKTG> { type[Group1]="PC_ALT_LEVEL2", symbols[Group1]= [ Hiragana_Katakana, Romaji ] }; key <EISU> { - type[Group1]="PC_ALT_LEVEL2", - symbols[Group1]= [ Eisu_toggle ] + type[Group1]="PC_ALT_LEVEL2", + symbols[Group1]= [ Eisu_toggle ] }; key <KANA> { - type[Group1]="PC_ALT_LEVEL2", - symbols[Group1]= [ Hiragana_Katakana ] + type[Group1]="PC_ALT_LEVEL2", + symbols[Group1]= [ Hiragana_Katakana ] }; - key <PRSC> { - type[Group1]= "PC_ALT_LEVEL2", - symbols[Group1]= [ Print, Execute ] + type[Group1]= "PC_ALT_LEVEL2", + symbols[Group1]= [ Print, Execute ] }; }; -// OADG109A map partial alphanumeric_keys xkb_symbols "OADG109A" { @@ -111,7 +107,7 @@ xkb_symbols "OADG109A" { name[Group1]= "Japanese (OADG 109A)"; key <AE10> { [ 0 ] }; - key <AE13> { [ yen, bar ] }; + key <AE13> { [ yen, bar ] }; }; // 86 keys with kana map @@ -126,8 +122,8 @@ xkb_symbols "kana86" { include "jp(OADG109A)" name[Group1]= "Japanese (Kana 86)"; - key <ESC> { [ Escape ] }; - key <NMLK> { [ Num_Lock, Pointer_EnableKeys ] }; + key <ESC> { [ Escape ] }; + key <NMLK> { [ Num_Lock, Pointer_EnableKeys ] }; key <BKSP> { [ BackSpace ] }; key <TAB> { [ Tab, ISO_Left_Tab ] }; key <RTRN> { [ Return ] }; @@ -137,9 +133,9 @@ xkb_symbols "kana86" { key <LALT> { [ Alt_L ] }; key <SPCE> { [ space ] }; key <RALT> { [ Alt_R ] }; -// for compatability with other keyboards connected at the same time - key <RWIN> { [ Super_R ] }; - key <RCTL> { [ Control_R ] }; + // For compatibility with other keyboards connected at the same time: + key <RWIN> { [ Super_R ] }; + key <RCTL> { [ Control_R ] }; }; partial alphanumeric_keys @@ -147,11 +143,11 @@ xkb_symbols "kana" { name[Group1]= "Japanese (Kana)"; - // Alphanumeric section key <HZTG> { type[Group1]="PC_ALT_LEVEL2", symbols[Group1]= [ Zenkaku_Hankaku, Kanji ] }; + key <AE01> { [ kana_NU ] }; key <AE02> { [ kana_FU ] }; key <AE03> { [ kana_A, kana_a ] }; @@ -176,7 +172,7 @@ xkb_symbols "kana" { key <AD08> { [ kana_NI ] }; key <AD09> { [ kana_RA ] }; key <AD10> { [ kana_SE ] }; - key <AD11> { [ voicedsound ] }; + key <AD11> { [ voicedsound ] }; key <AD12> { [ semivoicedsound, kana_openingbracket ] }; key <CAPS> { [ Eisu_toggle, Caps_Lock ] }; @@ -217,21 +213,19 @@ xkb_symbols "kana" { symbols[Group1]= [ Hiragana_Katakana, Romaji ] }; - // End alphanumeric section - key <PRSC> { - type[Group1]= "PC_ALT_LEVEL2", - symbols[Group1]= [ Print, Execute ] + type[Group1]= "PC_ALT_LEVEL2", + symbols[Group1]= [ Print, Execute ] }; }; partial alphanumeric_keys xkb_symbols "nicola_f_bs" { key <BKSP> { - type="", - symbols[Group1]= [ bracketright, braceright ] + type="", + symbols[Group1]= [ bracketright, braceright ] }; - key <AE10> { [ 0,underscore ] }; + key <AE10> { [ 0, underscore ] }; key <AD11> { [ colon, asterisk ] }; key <AC11> { [ BackSpace, BackSpace ] }; key <AC12> { [ Escape ] }; @@ -241,7 +235,7 @@ xkb_symbols "nicola_f_bs" { // Copied from macintosh_vndr/jp partial alphanumeric_keys xkb_symbols "mac" { - name[Group1] = "Japanese (Macintosh)"; + name[Group1]= "Japanese (Macintosh)"; include "jp(kana)" replace key <CAPS> { [ Caps_Lock ] }; @@ -254,13 +248,13 @@ xkb_symbols "hztg_escape" { partial alphanumeric_keys xkb_symbols "dvorak" { - name[Group1] = "Japanese (Dvorak)"; + name[Group1]= "Japanese (Dvorak)"; include "jp(OADG109A)" key <AE11> { [ at, grave ] }; key <AD01> { [ colon, asterisk ] }; - key <AD02> { [ comma, less ] }; + key <AD02> { [ comma, less ] }; key <AD03> { [ period, greater ] }; key <AD04> { [ p, P ] }; key <AD05> { [ y, Y ] }; diff --git a/xorg-server/xkeyboard-config/symbols/la b/xorg-server/xkeyboard-config/symbols/la index dc101bc22..b302f5e71 100644 --- a/xorg-server/xkeyboard-config/symbols/la +++ b/xorg-server/xkeyboard-config/symbols/la @@ -3,13 +3,11 @@ partial default alphanumeric_keys xkb_symbols "basic" { - // Describes the differences between a very simple US/ASCII - // keyboard and a Lao keyboard - // This keymap uses the Lao keyboard standard [kind of] widely used inLaos + // This keymap describes the Lao keyboard standard, + // which is [kind of] widely used in Laos. name[Group1]= "Lao"; - // Alphanumeric section key <TLDE> { [ 0x100200D ]}; key <AE01> { [ 0x1000ea2, 0x1000ed1 ]}; key <AE01> { [ 0x1000ea2, 0x1000ed1 ]}; @@ -37,7 +35,7 @@ xkb_symbols "basic" { key <AD10> { [ 0x1000e8d, 0x1000ebd ]}; key <AD11> { [ 0x1000e9a, minus ]}; key <AD12> { [ 0x1000ea5, braceright ]}; - key <BKSL> { [ 0x1000edc, 0x1000edd ]}; + key <BKSL> { [ 0x1000edc, 0x1000edd ]}; key <AC01> { [ 0x1000eb1 ]}; key <AC02> { [ 0x1000eab, semicolon ]}; @@ -61,27 +59,23 @@ xkb_symbols "basic" { key <AB08> { [ 0x1000ea1, grave ]}; key <AB09> { [ 0x1000ec3, dollar ]}; key <AB10> { [ 0x1000e9d, parenright ]}; - }; + partial xkb_symbols "stea" { - // Describes the differences between a very simple US/ASCII - // keyboard and a Lao keyboard - // This keymap uses the proposed Lao keyboard standard by the - // PAN Localization Project + // This keymap describes the proposed Lao keyboard standard by + // the PAN Localization Project. // Science Technology and Environment Agency of Lao PDR // National University Computer and Emergency Science of Pakistan // International Development Research Center - // Caveat: assigning multiple codepoints to a single key doesn't - // work in XKB. Therefor the combining codepoint assignments + // Caveat: assigning multiple codepoints to a single key doesn't + // work in XKB. Therefore the combining codepoint assignments // have been omitted. - name[Group1]= "Lao (STEA proposed standard layout)"; - // Alphanumeric section key <TLDE> { [ quotedbl, apostrophe ]}; key <AE01> { [ 0x1000ea2, 1, 0x1000ed1 ]}; key <AE02> { [ 0x1000e9f, 2, 0x1000ed2 ]}; @@ -94,23 +88,23 @@ xkb_symbols "stea" { key <AE09> { [ 0x1000e88, 7, 0x1000ed9 ]}; key <AE10> { [ 0x1000e82, 8, 0x1000ed0 ]}; key <AE11> { [ 0x1000e8a, 9 ]}; - key <AE12> { [ 0x1000ecd ]}; + key <AE12> { [ 0x1000ecd ]}; - key <AD01> { [ 0x1000ebb ]}; + key <AD01> { [ 0x1000ebb ]}; key <AD02> { [ 0x1000ec4, 0 ]}; key <AD03> { [ 0x1000eb3, asterisk ]}; key <AD04> { [ 0x1000e9e, underscore ]}; key <AD05> { [ 0x1000eb0, plus ]}; - key <AD06> { [ 0x1000eb4 ]}; - key <AD07> { [ 0x1000eb5 ]}; + key <AD06> { [ 0x1000eb4 ]}; + key <AD07> { [ 0x1000eb5 ]}; key <AD08> { [ 0x1000eae, 0x1000ea3 ]}; key <AD09> { [ 0x1000e99, 0x1000edc ]}; - key <AD10> { [ 0x1000e8d, 0x1000ebd ]}; - key <AD11> { [ 0x1000e9a, minus ]}; - key <AD12> { [ 0x1000ea5 ]}; + key <AD10> { [ 0x1000e8d, 0x1000ebd ]}; + key <AD11> { [ 0x1000e9a, minus ]}; + key <AD12> { [ 0x1000ea5 ]}; key <BKSL> { [ slash, backslash ]}; - key <AC01> { [ 0x1000eb1 ]}; + key <AC01> { [ 0x1000eb1 ]}; key <AC02> { [ 0x1000eab, semicolon ]}; key <AC03> { [ 0x1000e81, period ]}; key <AC04> { [ 0x1000e94, comma ]}; @@ -126,8 +120,8 @@ xkb_symbols "stea" { key <AB02> { [ 0x1000e9b, parenleft ]}; key <AB03> { [ 0x1000ec1, 0x1000eaf ]}; key <AB04> { [ 0x1000ead, x ]}; - key <AB05> { [ 0x1000eb6 ]}; - key <AB06> { [ 0x1000eb7 ]}; + key <AB05> { [ 0x1000eb6 ]}; + key <AB06> { [ 0x1000eb7 ]}; key <AB07> { [ 0x1000e97, 0x1000ec6 ]}; key <AB08> { [ 0x1000ea1, 0x1000edd ]}; key <AB09> { [ 0x1000ec3, dollar ]}; @@ -138,5 +132,4 @@ xkb_symbols "stea" { key <KPDL> { [ comma, period ]}; include "level3(ralt_switch)" - }; diff --git a/xorg-server/xkeyboard-config/symbols/lv b/xorg-server/xkeyboard-config/symbols/lv index 0eee7deea..4b0ba6c04 100644 --- a/xorg-server/xkeyboard-config/symbols/lv +++ b/xorg-server/xkeyboard-config/symbols/lv @@ -1,4 +1,3 @@ -// $XKeyboardConfig$ // Latvian keymap version 1.1 // Copyright (C) Dmitry Golubev <lastguru@mail.ru>, 2003-2004 // @@ -29,7 +28,7 @@ // Modified by Aldis Berjoza <aldis@bsdroot.lv>, 12 april 2011 // Changes: -// * Added Latvian Ergonomic, Latvian Adapted and Latvian Modernd variants +// * Added Latvian Ergonomic, Latvian Adapted and Latvian Modern variants // Author of this work is Valdis Vītoliņš // http://odo.lv/LatvianKeyboard // http://odo.lv/Recipes/LatvianKeyboard#HErgonomiskC481stastatC5ABrasuzlikC5A1anauzLinuxdatora%22 diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/ch b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/ch index 54b61d215..7948ab19d 100644 --- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/ch +++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/ch @@ -8,21 +8,19 @@ xkb_symbols "extended" { name[Group1]= "Switzerland - German, Mac"; - // Alphanumeric section - - key <AE01> { [ 1, plus, plusminus, infinity ] }; - key <AE02> { [ 2, quotedbl, leftdoublequotemark, rightdoublequotemark ] }; + key <AE01> { [ 1, plus, plusminus, infinity ] }; + key <AE02> { [ 2, quotedbl, leftdoublequotemark, rightdoublequotemark ] }; key <AE03> { [ 3, asterisk, numbersign, leftcaret ] }; // not displayed here key <AE04> { [ 4, ccedilla, Ccedilla, slash ] }; key <AE05> { [ 5, percent, bracketleft ] }; key <AE06> { [ 6, ampersand, bracketright ] }; - key <AE07> { [ 7, slash, bar, backslash ] }; + key <AE07> { [ 7, slash, bar, backslash ] }; key <AE08> { [ 8, parenleft, braceleft, Ograve ] }; key <AE09> { [ 9, parenright, braceright, Ocircumflex ] }; key <AE10> { [ 0, equal, notequal, Uacute ] }; - key <AE11> { [ apostrophe, question, questiondown, NoSymbol ] }; - key <AE12> { [ dead_circumflex,dead_grave, dead_acute, asciicircum ] }; + key <AE11> { [ apostrophe, question, questiondown, NoSymbol ] }; + key <AE12> { [ dead_circumflex,dead_grave, dead_acute, asciicircum ] }; key <AD01> { [ q, Q, oe, OE ] }; key <AD02> { [ w, W, Greek_SIGMA, Aacute ] }; key <AD03> { [ e, E, EuroSign, Ediaeresis ] }; @@ -33,8 +31,8 @@ xkb_symbols "extended" { key <AD08> { [ i, I, exclamdown, idotless ] }; key <AD09> { [ o, O, oslash, Ooblique ] }; key <AD10> { [ p, P, Greek_pi, Greek_PI ] }; - key <AD11> { [ udiaeresis, egrave, section, ydiaeresis ] }; - key <AD12> { [ dead_diaeresis, exclam, grave, apostrophe ] }; + key <AD11> { [ udiaeresis, egrave, section, ydiaeresis ] }; + key <AD12> { [ dead_diaeresis, exclam, grave, apostrophe ] }; key <AC01> { [ a, A, aring, Aring ] }; key <AC02> { [ s, S, ssharp, NoSymbol ] }; // ligature fl @@ -60,11 +58,11 @@ xkb_symbols "extended" { key <AB08> { [ comma, semicolon, guillemotleft, guillemotright ] }; key <AB09> { [ period, colon, ellipsis, division ] }; key <AB10> { [ minus, underscore, hyphen, emdash ] }; - key <TLDE> { [ section, degree, NoSymbol, NoSymbol ] }; + key <TLDE> { [ section, degree, NoSymbol, NoSymbol ] }; // ligature fi // per mille key <SPCE> { [ space, nobreakspace, nobreakspace ] }; - key <LSGT> { [ less, greater, lessthanequal, greaterthanequal ] }; - key <BKSL> { [ dollar, sterling, paragraph, enfilledcircbullet ] }; + key <LSGT> { [ less, greater, lessthanequal, greaterthanequal ] }; + key <BKSL> { [ dollar, sterling, paragraph, enfilledcircbullet ] }; include "kpdl(comma)" include "level3(ralt_switch)" @@ -78,9 +76,6 @@ xkb_symbols "de" { 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]= "Switzerland - French, Mac"; diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/de b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/de index da5bc7772..66da8281e 100644 --- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/de +++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/de @@ -4,12 +4,11 @@ default partial alphanumeric_keys xkb_symbols "basic" { // Describes the differences between a very simple US/ASCII - // keyboard and a very simple German keybaord + // keyboard and a simple German keyboard. include "latin" name[Group1]= "Germany - Mac"; - // Alphanumeric section key <TLDE> { [ dead_circumflex, degree, notsign ] }; key <AE01> { [ 1, exclam, exclamdown, at ] }; key <AE02> { [ 2, quotedbl, twosuperior ] }; @@ -53,7 +52,6 @@ xkb_symbols "basic" { include "kpdl(comma)" include "level3(ralt_switch)" - }; partial alphanumeric_keys @@ -62,14 +60,14 @@ xkb_symbols "Sundeadkeys" { include "macintosh_vndr/de(basic)" name[Group1]= "Germany - Mac, Sun dead keys"; - key <TLDE> { [ SunFA_Circum, degree, notsign ] }; - key <AE12> { [ SunFA_Acute, SunFA_Grave, SunFA_Cedilla ] }; + key <TLDE> { [ SunFA_Circum, degree, notsign ] }; + key <AE12> { [ SunFA_Acute, SunFA_Grave, SunFA_Cedilla ] }; key <AD11> { [ udiaeresis, Udiaeresis, SunFA_Diaeresis ] }; - key <AD12> { [ plus, asterisk, SunFA_Tilde, dead_macron ] }; - key <AC10> { [ odiaeresis, Odiaeresis, SunFA_Acute ] }; - key <AC11> { [ adiaeresis, Adiaeresis, SunFA_Circum ] }; + key <AD12> { [ plus, asterisk, SunFA_Tilde, dead_macron ] }; + key <AC10> { [ odiaeresis, Odiaeresis, SunFA_Acute ] }; + key <AC11> { [ adiaeresis, Adiaeresis, SunFA_Circum ] }; - key <BKSL> { [ numbersign, acute, SunFA_Grave ] }; + key <BKSL> { [ numbersign, acute, SunFA_Grave ] }; }; partial alphanumeric_keys diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/dk b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/dk index 11e38598c..e464519e0 100644 --- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/dk +++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/dk @@ -21,26 +21,24 @@ xkb_symbols "basic" { key <AE08> { [ 8, parenleft, bracketleft, guillemotleft ]}; key <AE09> { [ 9, parenright, bracketright, guillemotright ]}; key <AE10> { [ 0, equal, braceright, degree ]}; + key <AE11> { [ plus, question, plusminus, questiondown ]}; + key <AE12> { [ dead_acute, dead_grave, bar, brokenbar ]}; + key <AB03> { [ c, C, copyright, NoSymbol ]}; key <AB08> { [ comma, semicolon, dead_cedilla, dead_ogonek ]}; key <AB09> { [ period, colon, periodcentered, dead_abovedot ]}; - key <AB03> { [ c, C, copyright, NoSymbol ]}; key <AB10> { [ minus, underscore, hyphen, macron ]}; - key <AC01> { [ a, A, ordfeminine, masculine ]}; - key <AC03> { [ d, D, eth, ETH ]}; - key <AD03> { [ e, E, EuroSign, cent ]}; - key <AD04> { [ r, R, registered, NoSymbol ]}; - key <AD05> { [ t, T, thorn, THORN ]}; - key <AD08> { [ i, I, NoSymbol, NoSymbol ]}; - key <AD09> { [ o, O, oe, OE ]}; - key <AC10> { [ ae, AE ]}; - key <AE11> { [ plus, question, plusminus, questiondown ]}; + key <AC01> { [ a, A, ordfeminine, masculine ]}; + key <AC03> { [ d, D, eth, ETH ]}; + key <AC10> { [ ae, AE ]}; key <AC11> { [ oslash, Ooblique ]}; - key <BKSL> { [ apostrophe, asterisk, dead_doubleacute, multiply ]}; + key <AD03> { [ e, E, EuroSign, cent ]}; + key <AD04> { [ r, R, registered, NoSymbol ]}; + key <AD05> { [ t, T, thorn, THORN ]}; + key <AD08> { [ i, I, NoSymbol, NoSymbol ]}; + key <AD09> { [ o, O, oe, OE ]}; key <AD11> { [ aring, Aring ]}; - key <AE12> { [ dead_acute, dead_grave, bar, brokenbar ]}; - key <AD12> { [ dead_diaeresis, dead_circumflex, dead_tilde, dead_caron ]}; - - // End alphanumeric section + key <AD12> { [ dead_diaeresis, dead_circumflex, dead_tilde, dead_caron ]}; + key <BKSL> { [ apostrophe, asterisk, dead_doubleacute, multiply ]}; include "eurosign(e)" include "level3(ralt_switch)" @@ -52,7 +50,7 @@ xkb_symbols "nodeadkeys" { name[Group1]= "Denmark - Mac, eliminate dead keys"; key <AE12> { [ acute, grave, bar, ogonek ] }; - key <AD12> { [ diaeresis, asciicircum, asciitilde, dead_macron ] }; + key <AD12> { [ diaeresis, asciicircum, asciitilde, dead_macron ] }; }; partial alphanumeric_keys diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/fi b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/fi index 7a865d2bc..842c7b6cf 100644 --- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/fi +++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/fi @@ -1,15 +1,9 @@ partial default alphanumeric_keys xkb_symbols "basic" { - - // Describes the differences between a very simple mac_US - // keyboard and a very simple Swedish(Finland) keybaord - include "macintosh_vndr/se(basic)" // for consistent naming name[Group1]= "Finland - Mac"; - }; - partial alphanumeric_keys xkb_symbols "nodeadkeys" { include "macintosh_vndr/se(basic)" // for consistent naming diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/fr b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/fr index 9a8f8de23..b2c9354e0 100644 --- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/fr +++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/fr @@ -33,7 +33,6 @@ xkb_symbols "extended" { key <ESC> { [ Escape ] }; - // Alphanumeric section key <TLDE> { [ at, numbersign, periodcentered, Ydiaeresis ] }; key <ENTR> { [ KP_Enter ] }; key <AE01> { [ ampersand, 1, VoidSymbol, dead_acute ] }; // MISSING: Apple @@ -91,7 +90,6 @@ xkb_symbols "extended" { key <AB10> { [ equal, plus, notequal, plusminus ] }; key <SPCE> { [ space, space, nobreakspace, nobreakspace ] }; - // End alphanumeric section include "level3(ralt_switch)" }; diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/gb b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/gb index 4e4248561..f85078aaa 100644 --- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/gb +++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/gb @@ -12,8 +12,6 @@ xkb_symbols "basic" { key <AE03> { [ 3, sterling, numbersign ] }; key <TLDE> { [ section, plusminus ] }; key <LSGT> { [ grave, asciitilde ] }; - - // End alphanumeric section include "level3(ralt_switch)" }; diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/it b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/it index 2438231cd..3784b0e05 100644 --- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/it +++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/it @@ -2,7 +2,6 @@ xkb_symbols "extended" { name[Group1]= "Italy - Mac"; - // Alphanumeric section key <LSGT> { [ less, greater ] }; key <TLDE> { [ at, numbersign, periodcentered ] }; key <AE01> { [ ampersand, 1, guillemotleft,guillemotright ] }; @@ -55,8 +54,6 @@ xkb_symbols "extended" { key <AB09> { [ colon, slash, bar, backslash ] }; key <AB10> { [ ograve, exclam, exclamdown ] }; - // End alphanumeric section - include "kpdl(dot)" include "level3(ralt_switch)" }; diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/latam b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/latam index dcb9db624..485f12720 100644 --- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/latam +++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/latam @@ -2,7 +2,7 @@ partial default alphanumeric_keys xkb_symbols "basic" { // Describes the differences between a very simple mac_US - // keyboard and a very simple Spanish keybaord + // keyboard and a very simple Spanish keyboard. include "latin" name[Group1]= "Latin American - Mac"; @@ -31,7 +31,5 @@ xkb_symbols "basic" { key <AC11> { [ semicolon, colon ] }; key <BKSL> { [ apostrophe, quotedbl ] }; - // End alphanumeric section - include "level3(ralt_switch)" }; diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/nl b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/nl index 5eb66c444..ad0ee4bf2 100644 --- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/nl +++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/nl @@ -1,15 +1,9 @@ partial default alphanumeric_keys xkb_symbols "basic" { - // Describes the differences between a very simple mac_US - // keyboard and a very simple netherland keybaord - include "latin" name[Group1]= "Netherlands - Mac"; include "level3(ralt_switch)" - -// do just nothing - }; diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/no b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/no index fb0cb74a2..53e62cf6d 100644 --- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/no +++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/no @@ -2,7 +2,7 @@ partial default alphanumeric_keys xkb_symbols "basic" { // Describes the differences between a very simple en_US - // keyboard and a very simple Norwegian keybaord + // keyboard and a very simple Norwegian keyboard. include "latin" @@ -10,28 +10,26 @@ xkb_symbols "basic" { key <TLDE> { [ bar, section ] }; key <AE02> { [ 2, quotedbl, at, oneeighth ] }; + key <AE03> { [ 3, numbersign, sterling, sterling ] }; key <AE04> { [ 4, currency, dollar, dollar ] }; - key <AE03> { [ 3, numbersign, sterling, sterling ] }; key <AE06> { [ 6, ampersand ] }; key <AE07> { [ 7, slash, bar, backslash ] }; - key <AE08> { [ 8, parenleft, bracketleft, braceleft ] }; - key <AE09> { [ 9, parenright, bracketright, braceright ] }; + key <AE08> { [ 8, parenleft, bracketleft, braceleft ] }; + key <AE09> { [ 9, parenright, bracketright, braceright ] }; key <AE10> { [ 0, equal ] }; + key <AE11> { [ plus, question ] }; + key <AE12> { [ dead_grave, dead_acute, acute, dead_ogonek ] }; key <AB08> { [ comma, semicolon ] }; key <AB09> { [ period, colon ] }; key <AB10> { [ minus, underscore ] }; - key <AC10> { [ oslash, Ooblique, odiaeresis, Odiaeresis ] }; - key <AE11> { [ plus, question ] }; + key <AC10> { [ oslash, Ooblique, odiaeresis, Odiaeresis ] }; key <AC11> { [ ae, AE ] }; key <AD11> { [ aring, Aring ] }; - key <AE12> { [ dead_grave, dead_acute, acute, dead_ogonek ] }; - key <AD12> { [ diaeresis, asciicircum, asciitilde, dead_macron ] }; + key <AD12> { [ diaeresis, asciicircum, asciitilde, dead_macron ] }; key <BKSL> { [ at, asterisk ] }; key <LSGT> { [ less, greater ] }; - // End alphanumeric section - include "eurosign(e)" include "level3(ralt_switch)" }; @@ -45,6 +43,6 @@ xkb_symbols "nodeadkeys" { name[Group1]= "Norway - Mac, eliminate dead keys"; key <AE12> { [ grave, acute, acute, ogonek ] }; - key <AD12> { [ diaeresis, asciicircum, asciitilde, macron ] }; + key <AD12> { [ diaeresis, asciicircum, asciitilde, macron ] }; }; diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/pt b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/pt index 01ac86d85..f5b56a2c2 100644 --- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/pt +++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/pt @@ -4,7 +4,7 @@ partial default alphanumeric_keys xkb_symbols "basic" { // Describes the differences between a very simple en_US - // keyboard and a very simple Portuguese keybaord + // keyboard and a very simple Portuguese keyboard. include "latin" @@ -12,8 +12,8 @@ xkb_symbols "basic" { key <LSGT> { [ less, greater, bar, brokenbar ] }; key <AE02> { [ 2, quotedbl, at, oneeighth ] }; - key <AE04> { [ 4, dollar, section, dollar ] }; - key <AE03> { [ 3, numbersign, sterling, sterling ] }; + key <AE03> { [ 3, numbersign, sterling, sterling ] }; + key <AE04> { [ 4, dollar, section, dollar ] }; key <AE06> { [ 6, ampersand ] }; key <AE07> { [ 7, slash ] }; key <AE08> { [ 8, parenleft, bracketleft, braceleft ] }; @@ -29,7 +29,6 @@ xkb_symbols "basic" { key <AC12> { [ backslash, bar ] }; key <AD11> { [ masculine, ordfeminine ] }; key <AD12> { [ dead_acute, dead_grave ] }; - // End alphanumeric section include "eurosign(e)" include "level3(ralt_switch)" diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/se b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/se index d2d05f248..beb226fa3 100644 --- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/se +++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/se @@ -2,7 +2,7 @@ partial default alphanumeric_keys xkb_symbols "basic" { // Describes the differences between a very simple en_US - // keyboard and a very simple Swedish(Sweden) keybaord + // keyboard and a very simple Swedish(Sweden) keyboard. include "latin" @@ -11,25 +11,25 @@ xkb_symbols "basic" { key <TLDE> { [ section, degree ] }; key <AE01> { [ 1, exclam, copyright, exclamdown ] }; - key <AE02> { [ 2, quotedbl, at, oneeighth ] }; + key <AE02> { [ 2, quotedbl, at, oneeighth ] }; key <AE03> { [ 3, numbersign, sterling, yen ] }; - key <AE04> { [ 4, currency, dollar, cent ] }; + key <AE04> { [ 4, currency, dollar, cent ] }; key <AE06> { [ 6, ampersand ] }; - key <AE07> { [ 7, slash, bar, backslash ] }; + key <AE07> { [ 7, slash, bar, backslash ] }; key <AE08> { [ 8, parenleft, bracketleft, braceleft ] }; key <AE09> { [ 9, parenright, bracketright, braceright ] }; key <AB08> { [ comma, semicolon ] }; key <AE10> { [ 0, equal ] }; + key <AE11> { [ plus, question ] }; + key <AE12> { [ acute, grave ] }; key <AB09> { [ period, colon ] }; key <AB10> { [ minus, underscore ] }; - key <AC10> { [ odiaeresis, Odiaeresis, oslash, Ooblique ] }; - key <AE11> { [ plus, question ] }; - key <AC11> { [ adiaeresis, Adiaeresis, ae, AE ] }; + key <AC10> { [ odiaeresis, Odiaeresis, oslash, Ooblique ] }; + key <AC11> { [ adiaeresis, Adiaeresis, ae, AE ] }; key <AD11> { [ aring, Aring ] }; - key <AE12> { [ acute, grave ] }; key <AD12> { [ diaeresis, asciicircum, asciitilde ] }; - key <BKSL> { [ apostrophe, asterisk, at ] }; - key <LSGT> { [ less, greater, bar, brokenbar ] }; + key <BKSL> { [ apostrophe, asterisk, at ] }; + key <LSGT> { [ less, greater, bar, brokenbar ] }; include "kpdl(comma)" include "eurosign(e)" diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/us b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/us index d0cf5600b..81e4b77b9 100644 --- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/us +++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/us @@ -5,7 +5,6 @@ xkb_symbols "extended" { name[Group1]= "USA"; key <ESC> { [ Escape ] }; - // Alphanumeric section key <TLDE> { [ grave, asciitilde ] }; key <AE01> { [ 1, exclam ] }; key <AE02> { [ 2, at ] }; @@ -58,13 +57,11 @@ xkb_symbols "extended" { key <AB10> { [ slash, question ] }; key <SPCE> { [ space ] }; - // End alphanumeric section - include "eurosign(e)" include "keypad" - key <KPEQ> { [ equal ] }; + key <KPEQ> { [ equal ] }; }; hidden @@ -104,11 +101,11 @@ xkb_symbols "oldmac" { key <RGHT> { [ Right ] }; // End "Editing" section - key <BKSP> { [ BackSpace ] }; - key <TAB> { [ Tab, ISO_Left_Tab ] }; + key <BKSP> { [ BackSpace ] }; + key <TAB> { [ Tab, ISO_Left_Tab ] }; key <RTRN> { [ Return ] }; key <CAPS> { [ Caps_Lock ] }; - key <NMLK> { [ Num_Lock, Pointer_EnableKeys ] }; + key <NMLK> { [ Num_Lock, Pointer_EnableKeys ] }; // Begin "Modifier" section key <LFSH> { [ Shift_L ] }; diff --git a/xorg-server/xkeyboard-config/symbols/md b/xorg-server/xkeyboard-config/symbols/md index f7700e930..18b32fdee 100644 --- a/xorg-server/xkeyboard-config/symbols/md +++ b/xorg-server/xkeyboard-config/symbols/md @@ -30,12 +30,10 @@ xkb_symbols "basic" { partial alphanumeric_keys xkb_symbols "gag" { -include "level3(ralt_switch)" -include "us(basic)" + include "us(basic)" -name[Group1]="Moldavian (Gagauz)"; + name[Group1]="Moldavian (Gagauz)"; - // Alphanumeric section key <TLDE> { [ grave, asciitilde ] }; key <AE01> { [ 1, exclam ] }; key <AE02> { [ 2, quotedbl, at ] }; @@ -87,6 +85,6 @@ name[Group1]="Moldavian (Gagauz)"; key <AB10> { [ period, greater, slash ] }; key <BKSL> { [ backslash, bar ] }; - // End alphanumeric section - + + include "level3(ralt_switch)" }; diff --git a/xorg-server/xkeyboard-config/symbols/mm b/xorg-server/xkeyboard-config/symbols/mm index 8ab8f0de2..060e76ade 100644 --- a/xorg-server/xkeyboard-config/symbols/mm +++ b/xorg-server/xkeyboard-config/symbols/mm @@ -2,7 +2,6 @@ partial default alphanumeric_keys xkb_symbols "basic" { name[Group1]= "Burmese"; - // Alphanumeric section key <TLDE> { [ U1050, U100E, grave, asciitilde ] }; key <AE01> { [ U1041, U100D, 1, exclam ] }; key <AE02> { [ U1042, U1052, 2, at ] }; @@ -54,5 +53,4 @@ xkb_symbols "basic" { key <AB10> { [ slash, question ] }; key <BKSL> { [ U104F, U1051, backslash, bar ] }; - // End alphanumeric section }; diff --git a/xorg-server/xkeyboard-config/symbols/mn b/xorg-server/xkeyboard-config/symbols/mn index 279514a4a..943cc0c1f 100644 --- a/xorg-server/xkeyboard-config/symbols/mn +++ b/xorg-server/xkeyboard-config/symbols/mn @@ -60,8 +60,6 @@ xkb_symbols "basic" { key <AB09> { [ Cyrillic_ve, Cyrillic_VE, guillemotright ] }; key <AB10> { [ Cyrillic_yu, Cyrillic_YU, backslash ] }; - // End alphanumeric section - key <SPCE> { [ space, space, nobreakspace ] }; include "level3(ralt_switch)" diff --git a/xorg-server/xkeyboard-config/symbols/mv b/xorg-server/xkeyboard-config/symbols/mv index e82b1e873..5c9177b06 100644 --- a/xorg-server/xkeyboard-config/symbols/mv +++ b/xorg-server/xkeyboard-config/symbols/mv @@ -1,7 +1,4 @@ -// -// NOTES: -// -//Keymap for thaana/divehi script (divehi language) +// Keymap for Thaana/Dhivehi script (Dhivehi language). partial default alphanumeric_keys xkb_symbols "basic" { @@ -32,12 +29,9 @@ xkb_symbols "basic" { key <AD08> { [ 0x10007A8, 0x10007A9 ] }; key <AD09> { [ 0x10007AE, 0x10007AF ] }; key <AD10> { [ 0x1000795, division ] }; -// The following brackets are as they appear on the US_en keyboard. -//Please verify whether the names used are correct. I referred to keysymdef.h key <AD11> { [ bracketleft, braceleft ] }; key <AD12> { [ bracketright, braceright ] }; - key <AC01> { [ 0x10007A6, 0x10007A7 ] }; key <AC02> { [ 0x1000790, 0x1000781 ] }; key <AC03> { [ 0x100078B, 0x1000791 ] }; @@ -53,7 +47,6 @@ xkb_symbols "basic" { key <LSGT> { [ bar, brokenbar ] }; key <AB01> { [ 0x1000792, 0x10007A1 ] }; -//multiply sign is the same as the algebraic symbol which looks like an italicized x. I am presuming its the same thing here. If not, please substitute an 'x' instead key <AB02> { [ multiply, 0x1000798 ] }; key <AB03> { [ 0x1000797, 0x100079D ] }; key <AB04> { [ 0x1000788, 0x10007A5 ] }; @@ -64,10 +57,6 @@ xkb_symbols "basic" { key <AB09> { [ period, greater ] }; key <AB10> { [ slash, Arabic_question_mark ] }; - // End alphanumeric section - - // Begin modifier mappings - modifier_map Shift { Shift_L }; modifier_map Lock { Caps_Lock }; modifier_map Control{ Control_L }; diff --git a/xorg-server/xkeyboard-config/symbols/nec_vndr/jp b/xorg-server/xkeyboard-config/symbols/nec_vndr/jp index 6a9c32832..2931f3ad5 100644 --- a/xorg-server/xkeyboard-config/symbols/nec_vndr/jp +++ b/xorg-server/xkeyboard-config/symbols/nec_vndr/jp @@ -93,7 +93,6 @@ default xkb_symbols "pc98" { key <NFER> { [ Muhenkan ] }; key <SPCE> { [ space ] }; key <XFER> { [ Henkan, Kanji ] }; - // End alphanumeric section // Begin "Function" section @@ -154,7 +153,6 @@ default xkb_symbols "pc98" { // key <KPEN> { [ KP_Enter ] }; // End "Keypad" section - // begin modifier mappings modifier_map Shift { Shift_L }; modifier_map Lock { Caps_Lock }; modifier_map Control{ Control_L }; diff --git a/xorg-server/xkeyboard-config/symbols/nl b/xorg-server/xkeyboard-config/symbols/nl index 5e3940b99..ed25af68f 100644 --- a/xorg-server/xkeyboard-config/symbols/nl +++ b/xorg-server/xkeyboard-config/symbols/nl @@ -120,7 +120,6 @@ xkb_symbols "Sundeadkeys" { // For naming consistency include "nl(basic)" - }; partial alphanumeric_keys @@ -136,17 +135,11 @@ xkb_symbols "sundeadkeys" { partial alphanumeric_keys xkb_symbols "mac" { - // Describes the differences between a very simple mac_US - // keyboard and a very simple netherland keybaord - include "latin" name[Group1]= "Dutch (Macintosh)"; include "level3(ralt_switch)" - -// do just nothing - }; // EXTRAS: diff --git a/xorg-server/xkeyboard-config/symbols/no b/xorg-server/xkeyboard-config/symbols/no index 208d1ecb2..5e4cffdcf 100644 --- a/xorg-server/xkeyboard-config/symbols/no +++ b/xorg-server/xkeyboard-config/symbols/no @@ -11,11 +11,11 @@ xkb_symbols "basic" { name[Group1]="Norwegian"; - key <AB09> { [ period, colon, ellipsis, periodcentered ] }; + key <AB09> { [ period, colon, ellipsis, periodcentered ] }; key <AB10> { [ minus, underscore, endash, emdash ] }; key <AD04> { [ r, R, registered, trademark ] }; - key <AD10> { [ p, P, Greek_pi, Greek_PI ] }; - key <AE05> { [ 5, percent, onehalf, 0x1002030 ] }; + key <AD10> { [ p, P, Greek_pi, Greek_PI ] }; + key <AE05> { [ 5, percent, onehalf, 0x1002030 ] }; key <AE11> { [ plus, question, plusminus, questiondown ] }; key <AE12> { [ backslash, dead_grave, dead_acute, notsign ] }; @@ -45,7 +45,7 @@ xkb_symbols "nodeadkeys" { name[Group1]="Norwegian (eliminate dead keys)"; key <AE12> { [ backslash, grave, acute, ogonek ] }; - key <AD12> { [ diaeresis, asciicircum, asciitilde, macron ] }; + key <AD12> { [ diaeresis, asciicircum, asciitilde, macron ] }; key <AC10> { [ oslash, Ooblique, acute, doubleacute ] }; key <AC11> { [ ae, AE, asciicircum, caron ] }; key <AB08> { [ comma, semicolon, cedilla, ogonek ] }; @@ -64,7 +64,7 @@ xkb_symbols "dvorak" { key <AE01> { [ 1, exclam, exclamdown, onesuperior ] }; key <AE02> { [ 2, quotedbl, at, twosuperior ] }; key <AE03> { [ 3, numbersign, sterling, threesuperior ] }; - key <AE04> { [ 4, currency, dollar,onequarter ] }; + key <AE04> { [ 4, currency, dollar, onequarter ] }; key <AE05> { [ 5, percent, onehalf, onehalf ] }; key <AE06> { [ 6, ampersand, threequarters, threequarters ] }; key <AE07> { [ 7, slash, braceleft, division ] }; @@ -72,7 +72,7 @@ xkb_symbols "dvorak" { key <AE09> { [ 9, parenright, bracketright ] }; key <AE10> { [ 0, equal, braceright ] }; key <AE11> { [ plus, question, plusminus, questiondown ] }; - key <AE12> { [ backslash, grave, dead_acute, dead_grave ] }; + key <AE12> { [ backslash, grave, dead_acute, dead_grave ] }; key <AD01> { [ aring, Aring, braceright, bracketright ] }; key <AD02> { [ comma, semicolon, dead_cedilla, cedilla ] }; @@ -104,18 +104,17 @@ xkb_symbols "dvorak" { include "level3(ralt_switch)" }; -// based on -// Northern Sami keyboards for Finland, Norway and Sweden -// -// Describes the differences between a very simple en_US -// keyboard and a Norwegian Northern Sami keyboard (with -// dead key support) according to the spec on -// http://www.hum.uit.no/a/trond/se-lat9-no-keys.html -// Written by Børre Gaup <boerre.gaup@pc.nu> -// - partial alphanumeric_keys xkb_symbols "smi" { + + // Northern Sami keyboards for Finland, Norway and Sweden + // + // Describes the differences between a very simple en_US + // keyboard and a Norwegian Northern Sami keyboard (with + // dead-key support) according to the spec on + // http://www.hum.uit.no/a/trond/se-lat9-no-keys.html + // Written by Børre Gaup <boerre.gaup@pc.nu>. + include "latin" name[Group1]= "Northern Saami (Norway)"; @@ -191,7 +190,7 @@ partial alphanumeric_keys xkb_symbols "mac" { // Describes the differences between a very simple en_US - // keyboard and a very simple Norwegian keybaord + // keyboard and a very simple Norwegian keyboard. include "latin(type4)" name[Group1]= "Norwegian (Macintosh)"; diff --git a/xorg-server/xkeyboard-config/symbols/nokia_vndr/su-8w b/xorg-server/xkeyboard-config/symbols/nokia_vndr/su-8w index 441b3fee3..029906d47 100644 --- a/xorg-server/xkeyboard-config/symbols/nokia_vndr/su-8w +++ b/xorg-server/xkeyboard-config/symbols/nokia_vndr/su-8w @@ -428,13 +428,13 @@ xkb_symbols "base" { key <FK11> { [ F10 ] }; key <FK12> { [ F12 ] }; - // begin modifier mappings + // Begin modifier mappings modifier_map Shift { Shift_L, Shift_R }; modifier_map Lock { Caps_Lock }; modifier_map Control{ Control_L, Control_R }; modifier_map Mod2 { Num_Lock }; - // Fake keys for virtual<->real modifiers mapping + // Fake keys for virtual<->real modifiers mapping: key <LVL3> { [ ISO_Level3_Shift ] }; key <MDSW> { [ Mode_switch ] }; modifier_map Mod5 { <LVL3>, <MDSW> }; @@ -450,6 +450,7 @@ xkb_symbols "base" { key <HYPR> { [ NoSymbol, Hyper_L ] }; modifier_map Mod4 { <HYPR> }; + // End modifier mappings key <INS> { [ Insert ] }; key <DELE> { [ Delete ] }; diff --git a/xorg-server/xkeyboard-config/symbols/pc b/xorg-server/xkeyboard-config/symbols/pc index d25970963..20bb92f31 100644 --- a/xorg-server/xkeyboard-config/symbols/pc +++ b/xorg-server/xkeyboard-config/symbols/pc @@ -1,14 +1,14 @@ default partial alphanumeric_keys modifier_keys xkb_symbols "pc105" { - key <ESC> { [ Escape ] }; + key <ESC> { [ Escape ] }; - // the extra key on most European keyboards - key <LSGT> { [ less, greater, bar, brokenbar ] }; + // The extra key on many European keyboards: + key <LSGT> { [ less, greater, bar, brokenbar ] }; - // these keys are common to all layouts - key <BKSL> { [ backslash, bar ] }; - key <SPCE> { [ space ] }; + // The following keys are common to all layouts. + key <BKSL> { [ backslash, bar ] }; + key <SPCE> { [ space ] }; include "srvr_ctrl(fkey2vt)" include "pc(editing)" @@ -17,32 +17,28 @@ xkb_symbols "pc105" { key <BKSP> { [ BackSpace, BackSpace ] }; key <TAB> { [ Tab, ISO_Left_Tab ] }; - key <RTRN> { [ Return ] }; + key <RTRN> { [ Return ] }; - key <CAPS> { [ Caps_Lock ] }; + key <CAPS> { [ Caps_Lock ] }; + key <NMLK> { [ Num_Lock ] }; - key <NMLK> { [ Num_Lock ] }; - - key <LFSH> { [ Shift_L ] }; - key <LCTL> { [ Control_L ] }; - - key <LWIN> { [ Super_L ] }; - - key <RTSH> { [ Shift_R ] }; - key <RCTL> { [ Control_R ] }; - - key <RWIN> { [ Super_R ] }; + key <LFSH> { [ Shift_L ] }; + key <LCTL> { [ Control_L ] }; + key <LWIN> { [ Super_L ] }; + key <RTSH> { [ Shift_R ] }; + key <RCTL> { [ Control_R ] }; + key <RWIN> { [ Super_R ] }; key <MENU> { [ Menu ] }; - // begin modifier mappings + // Beginning of modifier mappings. modifier_map Shift { Shift_L, Shift_R }; modifier_map Lock { Caps_Lock }; modifier_map Control{ Control_L, Control_R }; modifier_map Mod2 { Num_Lock }; modifier_map Mod4 { Super_L, Super_R }; - // Fake keys for virtual<->real modifiers mapping + // Fake keys for virtual<->real modifiers mapping: key <LVL3> { [ ISO_Level3_Shift ] }; key <MDSW> { [ Mode_switch ] }; modifier_map Mod5 { <LVL3>, <MDSW> }; @@ -58,6 +54,7 @@ xkb_symbols "pc105" { key <HYPR> { [ NoSymbol, Hyper_L ] }; modifier_map Mod4 { <HYPR> }; + // End of modifier mappings. key <OUTP> { [ XF86Display ] }; key <KITG> { [ XF86KbdLightOnOff ] }; @@ -71,7 +68,7 @@ xkb_symbols "editing" { type= "PC_ALT_LEVEL2", symbols[Group1]= [ Print, Sys_Req ] }; - key <SCLK> { [ Scroll_Lock ] }; + key <SCLK> { [ Scroll_Lock ] }; key <PAUS> { type= "PC_CONTROL_LEVEL2", symbols[Group1]= [ Pause, Break ] diff --git a/xorg-server/xkeyboard-config/symbols/pk b/xorg-server/xkeyboard-config/symbols/pk index abf2f6695..de800d4c7 100644 --- a/xorg-server/xkeyboard-config/symbols/pk +++ b/xorg-server/xkeyboard-config/symbols/pk @@ -2,10 +2,9 @@ // Developed by: // Zaeem Arshad <zaeem@linux.net.pk> // Last update: 2004-03-12 -//Notice: -//Alt key combinations are yet to be put in. The unavailable keys are those which do not have a corresponding //glyph in unicode. - -// based on a keyboard map from an 'xkb/symbols/ur' file +// Notice: +// Alt-key combinations are yet to be put in. The unavailable keys are +// those which do not have a corresponding glyph in Unicode. partial default alphanumeric_keys xkb_symbols "urd-phonetic" { @@ -38,27 +37,27 @@ xkb_symbols "urd-phonetic" { key <AD11> { [ 0x100005d , 0x100007D ] }; key <AD12> { [ 0x100005b , 0x100007B ] }; - key <AC01> { [ 0x1000627 , 0x1000622 ] }; + key <AC01> { [ 0x1000627 , 0x1000622 ] }; key <AC02> { [ 0x1000633 , 0x1000635 ] }; key <AC03> { [ 0x100062f , 0x1000688 ] }; - key <AC04> { [ 0x1000641 , 0x1000651 ] }; + key <AC04> { [ 0x1000641 , 0x1000651 ] }; key <AC05> { [ 0x10006af , 0x100063a ] }; - key <AC06> { [ 0x100062D, 0x10006BE ] }; + key <AC06> { [ 0x100062D , 0x10006BE ] }; key <AC07> { [ 0x100062c , 0x1000636 ] }; key <AC08> { [ 0x10006a9 , 0x100062e ] }; - key <AC09> { [ 0x1000644 , 0x1000654 ] }; + key <AC09> { [ 0x1000644 , 0x1000654 ] }; key <AC10> { [ 0x100061b , 0x100003a ] }; - key <AC11> { [ 0x1000027 , 0x1000022 ] }; - key <BKSL> { [ 0x100005C, 0x100007C ] }; + key <AC11> { [ 0x1000027 , 0x1000022 ] }; + key <BKSL> { [ 0x100005C , 0x100007C ] }; - key <LSGT> { [ bar , brokenbar ] }; - key <AB01> { [ 0x1000632 , 0x1000630, 0x100200E ] }; + key <LSGT> { [ bar , brokenbar ] }; + key <AB01> { [ 0x1000632 , 0x1000630, 0x100200E ] }; key <AB02> { [ 0x1000634 , 0x1000698, 0x100202A ] }; - key <AB03> { [ 0x1000686 , 0x100062b, 0x100202D ] }; + key <AB03> { [ 0x1000686 , 0x100062b, 0x100202D ] }; key <AB04> { [ 0x1000637 , 0x1000638, 0x100202C ] }; key <AB05> { [ 0x1000628 , 0x100002e, 0x100202E ] }; key <AB06> { [ 0x1000646 , 0x10006ba, 0x100202B ] }; - key <AB07> { [ 0x1000645 , 0x1000658, 0x100200F ] }; + key <AB07> { [ 0x1000645 , 0x1000658, 0x100200F ] }; key <AB08> { [ 0x100060c , 0x100003c ] }; key <AB09> { [ 0x10006d4 , 0x100003E ] }; key <AB10> { [ 0x100002f , 0x100061f ] }; @@ -66,8 +65,6 @@ xkb_symbols "urd-phonetic" { // key <RALT> { [ Mode_switch, Multi_key ] }; include "level3(ralt_switch)" - - // End alphanumeric section }; partial alphanumeric_keys @@ -77,61 +74,60 @@ xkb_symbols "urd-crulp" { // www.crulp.org phonetic v1.1 key <TLDE> { [ 0x100007E , 0x100064B ] }; - key <AE01> { [ 0x10006F1 , 0x1000031, 0x1000021 ] }; + key <AE01> { [ 0x10006F1 , 0x1000031, 0x1000021 ] }; key <AE02> { [ 0x10006F2 , 0x1000032, 0x1000040 ] }; key <AE03> { [ 0x10006F3 , 0x1000033, 0x1000023 ] }; key <AE04> { [ 0x10006F4 , 0x1000034 ] }; key <AE05> { [ 0x10006F5 , 0x1000035, 0x100066A ] }; - key <AE06> { [ 0x10006F6 , 0x1000036 ] }; - key <AE07> { [ 0x10006F7 , 0x1000037, 0x1000026 ] }; + key <AE06> { [ 0x10006F6 , 0x1000036 ] }; + key <AE07> { [ 0x10006F7 , 0x1000037, 0x1000026 ] }; key <AE08> { [ 0x10006F8 , 0x1000038, 0x100002A ] }; key <AE09> { [ 0x10006F9 , 0x1000039, 0x1000029 ] }; key <AE10> { [ 0x10006F0 , 0x1000030, 0x1000028 ] }; - key <AE11> { [ 0x100002D , 0x100005F ] }; + + key <AE11> { [ 0x100002D , 0x100005F ] }; key <AE12> { [ 0x100003D , 0x100002B ] }; - key <AD01> { [ 0x1000642 , 0x1000652 ] }; - key <AD02> { [ 0x1000648 , 0x1000651, 0x1000602 ] }; + key <AD01> { [ 0x1000642 , 0x1000652 ] }; + key <AD02> { [ 0x1000648 , 0x1000651, 0x1000602 ] }; key <AD03> { [ 0x1000639 , 0x1000670, 0x1000656 ] }; key <AD04> { [ 0x1000631 , 0x1000691, 0x1000613 ] }; key <AD05> { [ 0x100062a , 0x1000679, 0x1000614 ] }; key <AD06> { [ 0x10006d2 , 0x100064E, 0x1000601 ] }; key <AD07> { [ 0x1000621 , 0x1000626, 0x1000654 ] }; - key <AD08> { [ 0x10006cc , 0x1000650, 0x1000611 ] }; + key <AD08> { [ 0x10006cc , 0x1000650, 0x1000611 ] }; key <AD09> { [ 0x10006c1 , 0x10006c3 ] }; - key <AD10> { [ 0x100067e , 0x100064f, 0x1000657 ] }; + key <AD10> { [ 0x100067e , 0x100064f, 0x1000657 ] }; key <AD11> { [ 0x100005d , 0x100007D ] }; key <AD12> { [ 0x100005b , 0x100007B ] }; - key <AC01> { [ 0x1000627 , 0x1000622, 0x100FDF2 ] }; - key <AC02> { [ 0x1000633 , 0x1000635, 0x1000610 ] }; - key <AC03> { [ 0x100062f , 0x1000688, 0x100FDFA ] }; - key <AC04> { [ 0x1000641 , 0x1000651 ] }; + key <AC01> { [ 0x1000627 , 0x1000622, 0x100FDF2 ] }; + key <AC02> { [ 0x1000633 , 0x1000635, 0x1000610 ] }; + key <AC03> { [ 0x100062f , 0x1000688, 0x100FDFA ] }; + key <AC04> { [ 0x1000641 , 0x1000651 ] }; key <AC05> { [ 0x10006af , 0x100063a ] }; - key <AC06> { [ 0x100062D, 0x10006BE, 0x1000612 ] }; + key <AC06> { [ 0x100062D , 0x10006BE, 0x1000612 ] }; key <AC07> { [ 0x100062c , 0x1000636, 0x100FDFB ] }; key <AC08> { [ 0x10006a9 , 0x100062e ] }; - key <AC09> { [ 0x1000644 , 0x1000654 ] }; + key <AC09> { [ 0x1000644 , 0x1000654 ] }; key <AC10> { [ 0x100061b , 0x100003a ] }; - key <AC11> { [ 0x1000027 , 0x1000022 ] }; - key <BKSL> { [ 0x100005C, 0x100007C ] }; + key <AC11> { [ 0x1000027 , 0x1000022 ] }; + key <BKSL> { [ 0x100005C , 0x100007C ] }; - key <LSGT> { [ bar , brokenbar ] }; - key <AB01> { [ 0x1000632 , 0x1000630, 0x100060F ] }; + key <LSGT> { [ bar , brokenbar ] }; + key <AB01> { [ 0x1000632 , 0x1000630, 0x100060F ] }; key <AB02> { [ 0x1000634 , 0x1000698, 0x100060E ] }; - key <AB03> { [ 0x1000686 , 0x100062b, 0x1000603 ] }; + key <AB03> { [ 0x1000686 , 0x100062b, 0x1000603 ] }; key <AB04> { [ 0x1000637 , 0x1000638 ] }; - key <AB05> { [ 0x1000628 , 0x100002e, 0x100FDFD ] }; - key <AB06> { [ 0x1000646 , 0x10006ba, 0x1000600 ] }; - key <AB07> { [ 0x1000645 , 0x1000658 ] }; + key <AB05> { [ 0x1000628 , 0x100002e, 0x100FDFD ] }; + key <AB06> { [ 0x1000646 , 0x10006ba, 0x1000600 ] }; + key <AB07> { [ 0x1000645 , 0x1000658 ] }; key <AB08> { [ 0x100060c , 0x100003c, 0x100003C ] }; key <AB09> { [ 0x10006d4 , 0x100066B, 0x100003E ] }; - key <AB10> { [ 0x100002f , 0x100061F ] }; + key <AB10> { [ 0x100002f , 0x100061F ] }; // key <RALT> { [ Mode_switch, Multi_key ] }; include "level3(ralt_switch)" - - // End alphanumeric section }; @@ -151,12 +147,12 @@ xkb_symbols "urd-nla" { key <AE08> { [ 0x1000038 , 0x100066D ] }; key <AE09> { [ 0x1000039 , 0x1000029 ] }; key <AE10> { [ 0x1000030 , 0x1000028 ] }; - key <AE11> { [ 0x100002D , 0x100005F ] }; + key <AE11> { [ 0x100002D , 0x100005F ] }; key <AE12> { [ 0x100003D , 0x100002B ] }; key <AD01> { [ 0x1000637 , 0x1000638, 0x100200D ] }; - key <AD02> { [ 0x1000635 , 0x1000636, 0x100200C ] }; + key <AD02> { [ 0x1000635 , 0x1000636, 0x100200C ] }; key <AD03> { [ 0x10006BE , 0x1000630 ] }; - key <AD04> { [ 0x100062F , 0x1000688 ] }; + key <AD04> { [ 0x100062F , 0x1000688 ] }; key <AD05> { [ 0x1000679 , 0x100062B ] }; key <AD06> { [ 0x100067E , 0x1000651 ] }; key <AD07> { [ 0x100062A , 0x10006C3 ] }; @@ -176,13 +172,13 @@ xkb_symbols "urd-nla" { key <AC08> { [ 0x10006a9 , 0x10006AF ] }; key <AC09> { [ 0x10006CC , 0x100064A ] }; key <AC10> { [ 0x100061b , 0x100003a ] }; - key <AC11> { [ 0x1000027 , 0x1000022 ] }; - key <BKSL> { [ 0x100005C , 0x100007C ] }; + key <AC11> { [ 0x1000027 , 0x1000022 ] }; + key <BKSL> { [ 0x100005C , 0x100007C ] }; key <LSGT> { [ bar , brokenbar ] }; - key <AB01> { [ 0x1000642 , 0x100200D, 0x100200E ] }; + key <AB01> { [ 0x1000642 , 0x100200D, 0x100200E ] }; key <AB02> { [ 0x1000641 , 0x100200C, 0x100202A ] }; - key <AB03> { [ 0x10006D2 , 0x10006D3, 0x100202D ] }; + key <AB03> { [ 0x10006D2 , 0x10006D3, 0x100202D ] }; key <AB04> { [ 0x1000633 , 0x100200E, 0x100202C ] }; key <AB05> { [ 0x1000634 , 0x1000624, 0x100202E ] }; key <AB06> { [ 0x100063A , 0x1000626, 0x100202B ] }; @@ -191,10 +187,7 @@ xkb_symbols "urd-nla" { key <AB09> { [ 0x10006d4 , 0x100003C ] }; key <AB10> { [ 0x100002F , 0x100061f ] }; - include "level3(ralt_switch)" - - // End alphanumeric section }; partial alphanumeric_keys @@ -202,7 +195,7 @@ xkb_symbols "snd" { name[Group1]= "Sindhi"; // www.bhurgri.com - key <TLDE> { [ 0x1002019, 0x1002018 ] }; + key <TLDE> { [ 0x1002019, 0x1002018 ] }; key <AE01> { [ 1, exclam, 0x1000610 ] }; key <AE02> { [ 2, 0x1000670, 0x1000611 ] }; key <AE03> { [ 3, 0x1000621, 0x1000613 ] }; @@ -253,9 +246,7 @@ xkb_symbols "snd" { key <AB09> { [ period, 0x100201D, 0x10006D4 ] }; key <AB10> { [ 0x1000626, Arabic_question_mark, 0x100002F ] }; - include "level3(ralt_switch)" - - // End alphanumeric section + include "level3(ralt_switch)" }; partial alphanumeric_keys @@ -306,10 +297,10 @@ xkb_symbols "ara" { key <AC08> { [ 0x10006a9 , 0x100062e ] }; key <AC09> { [ 0x1000644 , 0x1000613 ] }; key <AC10> { [ 0x100061b , 0x100003a ] }; - key <AC11> { [ 0x1000670 , 0x1000022 ] }; - key <BKSL> { [ 0x100060e , 0x1000614 ] }; + key <AC11> { [ 0x1000670 , 0x1000022 ] }; + key <BKSL> { [ 0x100060e , 0x1000614 ] }; - key <LSGT> { [ bar , brokenbar ] }; + key <LSGT> { [ bar , brokenbar ] }; key <AB01> { [ 0x1000632 , 0x1000630 ] }; key <AB02> { [ 0x1000634 , 0x1000698 ] }; key <AB03> { [ 0x1000686 , 0x100062b ] }; @@ -320,8 +311,6 @@ xkb_symbols "ara" { key <AB08> { [ 0x100060c , 0x1000650 ] }; key <AB09> { [ 0x10006d4 , 0x100064e ] }; key <AB10> { [ 0x1000003 , 0x100061f ] }; - - // End alphanumeric section }; partial alphanumeric_keys diff --git a/xorg-server/xkeyboard-config/symbols/pl b/xorg-server/xkeyboard-config/symbols/pl index 4c8ed1d5c..e2559b3ac 100644 --- a/xorg-server/xkeyboard-config/symbols/pl +++ b/xorg-server/xkeyboard-config/symbols/pl @@ -80,9 +80,6 @@ xkb_symbols "legacy" { partial alphanumeric_keys xkb_symbols "qwertz" { - // Describes the differences between a very simple en_US - // keyboard and a very simple QWERTZ Polish keybaord - include "latin(type3)" name[Group1]="Polish (qwertz)"; @@ -152,11 +149,7 @@ xkb_symbols "dvorak" { include "kpdl(comma)" - // this to allow writing ALL CAPS with a Shift key include "level3(ralt_switch)" - - // use one of compose:* options to choose Multi_key, if you will, - // or layout +level3(ralt_switch_multikey) to revert standard behaviour }; // Default Polish keymap with Polish quotes on quotemark key @@ -222,7 +215,7 @@ xkb_symbols "dvp" { // upper row, left side - // // upper row, right side + // upper row, right side key <AD08> { [ c, C, cacute, Cacute ] }; key <AD10> { [ l, L, lstroke, Lstroke ] }; @@ -247,11 +240,7 @@ xkb_symbols "dvp" { include "kpdl(comma)" - // this to allow writing ALL CAPS with a Shift key include "level3(ralt_switch)" - - // use one of compose:* options to choose Multi_key, if you will, - // or layout +level3(ralt_switch_multikey) to revert standard behaviour }; // Silesian keyboard layout by Grzegorz Kulik <poslunsku@gmail.com> diff --git a/xorg-server/xkeyboard-config/symbols/pt b/xorg-server/xkeyboard-config/symbols/pt index b2e0b1255..010445570 100644 --- a/xorg-server/xkeyboard-config/symbols/pt +++ b/xorg-server/xkeyboard-config/symbols/pt @@ -63,9 +63,6 @@ xkb_symbols "nodeadkeys" { partial alphanumeric_keys xkb_symbols "mac" { - // Describes the differences between a very simple en_US - // keyboard and a very simple Portuguese keybaord - include "pt" name[Group1]= "Portuguese (Macintosh)"; diff --git a/xorg-server/xkeyboard-config/symbols/ro b/xorg-server/xkeyboard-config/symbols/ro index eea515995..46e275b72 100644 --- a/xorg-server/xkeyboard-config/symbols/ro +++ b/xorg-server/xkeyboard-config/symbols/ro @@ -120,8 +120,8 @@ xkb_symbols "std" { partial alphanumeric_keys xkb_symbols "std_cedilla" { - // Variant of the "std" layout with cedillas. - // Implements S and T with cedillas as in ISO-8859-2. + // Variant of the "std" layout using cedillas instead of commas. + // It implements S and T with cedillas as in ISO-8859-2. // Included for compatibility reasons. include "ro(std)" @@ -136,14 +136,13 @@ xkb_symbols "std_cedilla" { partial alphanumeric_keys xkb_symbols "winkeys" { // Describes the differences between a very simple US/ASCII - // keyboard and a very simple Romanian keybaord + // keyboard and a simple Romanian keyboard. // Created by Manfred Pohler, <Manfred.Pohler@t-online.de> (C) 2003 include "latin" name[Group1]="Romanian (WinKeys)"; - // Alphanumeric section key <TLDE> { [ bracketright, bracketleft ] }; key <AE01> { [ 1, exclam, asciitilde, asciitilde ] }; @@ -184,12 +183,9 @@ xkb_symbols "winkeys" { key <BKSL> { [ acircumflex, Acircumflex ] }; - // End alphanumeric section, begin "Keypad" include "kpdl(comma)" - // End "Keypad" section include "level3(ralt_switch)" - }; partial diff --git a/xorg-server/xkeyboard-config/symbols/rs b/xorg-server/xkeyboard-config/symbols/rs index 0a08c6211..b0d69ac18 100644 --- a/xorg-server/xkeyboard-config/symbols/rs +++ b/xorg-server/xkeyboard-config/symbols/rs @@ -108,7 +108,7 @@ xkb_symbols "cyralpha" { key <AC11> { [ Serbian_tshe, Serbian_TSHE, any,any ] }; // ' " key <BKSL> { [ Cyrillic_zhe, Cyrillic_ZHE, any,any ] }; // \ | - key <AB01> { [ U0455, U0405, any,any ] }; // z + key <AB01> { [ Cyrillic_zhe, Cyrillic_ZHE, any,any ] }; // z key <AB02> { [ Cyrillic_dzhe, Cyrillic_DZHE, any,any ] }; // x key <AB03> { [ Cyrillic_tse, Cyrillic_TSE, any,any ] }; // c key <AB04> { [ Cyrillic_ve, Cyrillic_VE, any,any ] }; // v diff --git a/xorg-server/xkeyboard-config/symbols/se b/xorg-server/xkeyboard-config/symbols/se index 04ce1d206..ef5e797ba 100644 --- a/xorg-server/xkeyboard-config/symbols/se +++ b/xorg-server/xkeyboard-config/symbols/se @@ -42,7 +42,6 @@ xkb_symbols "nodeadkeys" { name[Group1]="Swedish (eliminate dead keys)"; key <AE12> { [ acute, grave, plusminus, notsign ] }; - }; // Swedish Dvorak @@ -158,14 +157,7 @@ xkb_symbols "rus_nodeadkeys" { }; xkb_symbols "smi" { - - // Describes the differences between a Norwegian Northern Sami - // (keyboard with dead key support) and a Swedish/Finnish Sami - // keyboard according to the specs at: - // http://www.hum.uit.no/a/trond/se-lat9-sefi-keys.html - include "fi(smi)" - name[Group1]= "Northern Saami (Sweden)"; }; @@ -174,7 +166,7 @@ partial alphanumeric_keys xkb_symbols "mac" { // Describes the differences between a very simple en_US - // keyboard and a very simple Swedish(Sweden) keybaord + // keyboard and a very simple Swedish(Sweden) keyboard. include "latin" name[Group1]= "Swedish (Macintosh)"; @@ -188,17 +180,17 @@ xkb_symbols "mac" { key <AE07> { [ 7, slash, bar, backslash ] }; key <AE08> { [ 8, parenleft, bracketleft, braceleft ] }; key <AE09> { [ 9, parenright, bracketright, braceright ] }; - key <AB08> { [ comma, semicolon ] }; key <AE10> { [ 0, equal ] }; - key <AB09> { [ period, colon ] }; - key <AB10> { [ minus, underscore ] }; - key <AC10> { [ odiaeresis, Odiaeresis, oslash, Ooblique ] }; key <AE11> { [ plus, question ] }; - key <AC11> { [ adiaeresis, Adiaeresis, ae, AE ] }; - key <AD11> { [ aring, Aring ] }; key <AE12> { [ acute, grave ] }; + key <AD11> { [ aring, Aring ] }; key <AD12> { [ diaeresis, asciicircum, asciitilde ] }; + key <AC10> { [ odiaeresis, Odiaeresis, oslash, Ooblique ] }; + key <AC11> { [ adiaeresis, Adiaeresis, ae, AE ] }; key <BKSL> { [ apostrophe, asterisk, at ] }; + key <AB08> { [ comma, semicolon ] }; + key <AB09> { [ period, colon ] }; + key <AB10> { [ minus, underscore ] }; include "kpdl(comma)" include "level3(ralt_switch)" diff --git a/xorg-server/xkeyboard-config/symbols/sharp_vndr/sl-c3x00 b/xorg-server/xkeyboard-config/symbols/sharp_vndr/sl-c3x00 index d72f9f9f9..312384000 100644 --- a/xorg-server/xkeyboard-config/symbols/sharp_vndr/sl-c3x00 +++ b/xorg-server/xkeyboard-config/symbols/sharp_vndr/sl-c3x00 @@ -5,7 +5,6 @@ partial default alphanumeric_keys xkb_symbols "basic" { name[Group1]= "Sharp SL-C3x00"; - // Upper row key <AE01> { [ 1, exclam ] }; key <AE02> { [ 2, quotedbl ] }; key <AE03> { [ 3, numbersign ] }; @@ -60,9 +59,7 @@ xkb_symbols "basic" { key <SPCE> { [ space ] }; key <AB08> { [ comma, slash, less ] }; key <AB09> { [ period, question, greater ] }; - // End alphanumeric section - // keypad key <UP> { [ Up, Up, Prior ] }; key <LEFT> { [ Left, Left, Home ] }; key <DOWN> { [ Down, Down, Next ] }; diff --git a/xorg-server/xkeyboard-config/symbols/sharp_vndr/ws003sh b/xorg-server/xkeyboard-config/symbols/sharp_vndr/ws003sh index 575058ea7..25a55f1d5 100644 --- a/xorg-server/xkeyboard-config/symbols/sharp_vndr/ws003sh +++ b/xorg-server/xkeyboard-config/symbols/sharp_vndr/ws003sh @@ -4,7 +4,6 @@ partial default alphanumeric_keys xkb_symbols "basic" { name[Group1]= "Sharp WS003SH"; - // Upper row key <AE01> { [ 1, exclam ] }; key <AE02> { [ 2, quotedbl ] }; key <AE03> { [ 3, numbersign ] }; @@ -59,9 +58,7 @@ xkb_symbols "basic" { key <LCTL> { [ Control_L ] }; key <SPCE> { [ space ] }; - // End alphanumeric section - // keypad key <UP> { [ Up, Up, Prior ] }; key <LEFT> { [ Left, Left, Home ] }; key <DOWN> { [ Down, Down, Next ] }; diff --git a/xorg-server/xkeyboard-config/symbols/sharp_vndr/ws007sh b/xorg-server/xkeyboard-config/symbols/sharp_vndr/ws007sh index 57a075171..4dd08af2d 100644 --- a/xorg-server/xkeyboard-config/symbols/sharp_vndr/ws007sh +++ b/xorg-server/xkeyboard-config/symbols/sharp_vndr/ws007sh @@ -4,7 +4,6 @@ partial default alphanumeric_keys xkb_symbols "basic" { name[Group1]= "Sharp WS007SH"; - // Upper row key <AE01> { [ 1, exclam ] }; key <AE02> { [ 2, quotedbl ] }; key <AE03> { [ 3, numbersign ] }; @@ -59,9 +58,7 @@ xkb_symbols "basic" { key <LCTL> { [ Control_L ] }; key <SPCE> { [ space ] }; - // End alphanumeric section - // keypad key <UP> { [ Up, Up, Prior ] }; key <LEFT> { [ Left, Left, Home ] }; key <DOWN> { [ Down, Down, Next ] }; diff --git a/xorg-server/xkeyboard-config/symbols/sharp_vndr/ws011sh b/xorg-server/xkeyboard-config/symbols/sharp_vndr/ws011sh index 45976dff9..df230f6a5 100644 --- a/xorg-server/xkeyboard-config/symbols/sharp_vndr/ws011sh +++ b/xorg-server/xkeyboard-config/symbols/sharp_vndr/ws011sh @@ -4,7 +4,6 @@ partial default alphanumeric_keys xkb_symbols "basic" { name[Group1]= "Sharp WS011SH"; - // Upper row key <HZTG> { type[Group1] = "THREE_LEVEL", symbols[Group1] = [ Zenkaku_Hankaku, Zenkaku_Hankaku, exclam ] @@ -53,7 +52,6 @@ xkb_symbols "basic" { key <LCTL> { [ Control_L ] }; key <SPCE> { [ space ] }; - // End alphanumeric section key <UP> { [ Up, Up, Prior ] }; key <LEFT> { [ Left, Left, Home ] }; @@ -62,7 +60,6 @@ xkb_symbols "basic" { key <ESC> { [ Escape ] }; - // keypad key <KP1> { [ 1 ] }; key <KP2> { [ 2 ] }; key <KP3> { [ 3 ] }; diff --git a/xorg-server/xkeyboard-config/symbols/sharp_vndr/ws020sh b/xorg-server/xkeyboard-config/symbols/sharp_vndr/ws020sh index 5231e1483..0bde5f0a9 100644 --- a/xorg-server/xkeyboard-config/symbols/sharp_vndr/ws020sh +++ b/xorg-server/xkeyboard-config/symbols/sharp_vndr/ws020sh @@ -4,7 +4,6 @@ partial default alphanumeric_keys xkb_symbols "basic" { name[Group1]= "Sharp WS020SH"; - // Upper row key <HZTG> { type[Group1]="THREE_LEVEL", symbols[Group1]= [ Zenkaku_Hankaku, Zenkaku_Hankaku, exclam ] @@ -53,9 +52,7 @@ xkb_symbols "basic" { key <LCTL> { [ Control_L ] }; key <SPCE> { [ space ] }; - // End alphanumeric section - // keypad key <UP> { [ Up, Up, Prior ] }; key <LEFT> { [ Left, Left, Home ] }; key <DOWN> { [ Down, Down, Next ] }; diff --git a/xorg-server/xkeyboard-config/symbols/sony_vndr/us b/xorg-server/xkeyboard-config/symbols/sony_vndr/us index e91ca11b2..69102bfba 100644 --- a/xorg-server/xkeyboard-config/symbols/sony_vndr/us +++ b/xorg-server/xkeyboard-config/symbols/sony_vndr/us @@ -27,7 +27,7 @@ xkb_symbols "nwp5461" { include "us(basic)" - key <LALT> { [ Alt_L, Meta_L ] }; + key <LALT> { [ Alt_L, Meta_L ] }; key <RTSH> { [ Shift_R ] }; key <AB11> { [ NoSymbol ] }; @@ -84,8 +84,6 @@ xkb_symbols "nwp5461" { key <KPTB> { [ KP_Tab ] }; // End "Keypad" section - - // begin modifier mappings modifier_map Shift { Shift_R }; modifier_map Mod3 { Alt_L }; }; diff --git a/xorg-server/xkeyboard-config/symbols/sy b/xorg-server/xkeyboard-config/symbols/sy index 1a82f0e6e..aa6ce82f4 100644 --- a/xorg-server/xkeyboard-config/symbols/sy +++ b/xorg-server/xkeyboard-config/symbols/sy @@ -59,13 +59,9 @@ xkb_symbols "syc" { key <AB09> { [ 0x1000719, Arabic_semicolon ] }; key <AB10> { [ 0x1000707, Arabic_question_mark ] }; - // End Alphanumeric Section - - // Space + // Space plus zero-width non-joiner: include "nbsp(zwnj2)" - // Begin Modifier Mappings - modifier_map Shift { Shift_L, Shift_R }; modifier_map Lock { Caps_Lock }; modifier_map Control{ Control_L, Control_R }; @@ -130,11 +126,6 @@ xkb_symbols "syc_phonetic" { 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 }; modifier_map Control{ Control_L, Control_R }; diff --git a/xorg-server/xkeyboard-config/symbols/tw b/xorg-server/xkeyboard-config/symbols/tw index e97c0b60b..c01024a81 100644 --- a/xorg-server/xkeyboard-config/symbols/tw +++ b/xorg-server/xkeyboard-config/symbols/tw @@ -1,5 +1,3 @@ -// $XKeyboardConfig$ - partial default alphanumeric_keys xkb_symbols "tw" { @@ -7,7 +5,6 @@ xkb_symbols "tw" { include "us(basic)" - // Alphanumeric section key <TLDE> { [ grave, asciitilde, dead_grave, dead_tilde ] }; key <AE01> { [ 1, exclam, U030D, exclamdown ] }; key <AE02> { [ 2, at, U0358, twosuperior ] }; @@ -52,25 +49,25 @@ xkb_symbols "tw" { partial alphanumeric_keys xkb_symbols "indigenous" { - name[Group1]= "Taiwanese (indigenous)"; + name[Group1]= "Taiwanese (indigenous)"; - include "tw(tw)" + include "tw(tw)" - key <AC11> { [ U02BC, quotedbl, apostrophe, dead_doubleacute ] }; + key <AC11> { [ U02BC, quotedbl, apostrophe, dead_doubleacute ] }; - include "level3(ralt_switch)" + include "level3(ralt_switch)" }; partial alphanumeric_keys xkb_symbols "saisiyat" { - name[Group1]= "Saisiyat (Taiwan)"; + name[Group1]= "Saisiyat (Taiwan)"; - include "tw(indigenous)" + include "tw(indigenous)" - key <AC10> { [ U02D0, colon, semicolon, dead_diaeresis ] }; + key <AC10> { [ U02D0, colon, semicolon, dead_diaeresis ] }; - include "level3(ralt_switch)" + include "level3(ralt_switch)" }; // EXTRAS: diff --git a/xorg-server/xkeyboard-config/symbols/ua b/xorg-server/xkeyboard-config/symbols/ua index ddfe11f9f..f7a2a59a4 100644 --- a/xorg-server/xkeyboard-config/symbols/ua +++ b/xorg-server/xkeyboard-config/symbols/ua @@ -99,8 +99,7 @@ xkb_symbols "legacy" { key <AB09> { [ Cyrillic_yu, Cyrillic_YU ] }; key <AB10> { [ slash, question ] }; - key <LSGT> { [ slash, bar ] }; - // End alphanumeric section + key <LSGT> { [ slash, bar ] }; }; partial alphanumeric_keys diff --git a/xorg-server/xkeyboard-config/symbols/uz b/xorg-server/xkeyboard-config/symbols/uz index d0e3c04b6..f0e07ede1 100644 --- a/xorg-server/xkeyboard-config/symbols/uz +++ b/xorg-server/xkeyboard-config/symbols/uz @@ -47,9 +47,9 @@ xkb_symbols "cyrillic" { key <AE10> { [ 0, parenright ] }; key <BKSL> { [ backslash, bar ] }; key <AB10> { [ period, comma ] }; - key <LSGT> { [ slash, bar ] }; + key <LSGT> { [ slash, bar ] }; -key.type[group1]="ALPHABETIC"; + key.type[group1]="ALPHABETIC"; key <AE11> { [Cyrillic_ghe_bar, Cyrillic_GHE_bar ] }; key <AE12> { [Cyrillic_ha_descender, Cyrillic_HA_descender ] }; @@ -86,8 +86,6 @@ key.type[group1]="ALPHABETIC"; key <AB07> { [Cyrillic_softsign,Cyrillic_SOFTSIGN ] }; key <AB08> { [ Cyrillic_be, Cyrillic_BE ] }; key <AB09> { [ Cyrillic_yu, Cyrillic_YU ] }; - - // End alphanumeric section }; partial alphanumeric_keys diff --git a/xorg-server/xkeyboard-config/symbols/vn b/xorg-server/xkeyboard-config/symbols/vn index c5e4c118b..58eb595da 100644 --- a/xorg-server/xkeyboard-config/symbols/vn +++ b/xorg-server/xkeyboard-config/symbols/vn @@ -15,7 +15,6 @@ xkb_symbols "basic" { name[Group1]= "Vietnamese"; - // Alphanumeric section key <TLDE> { [ grave, asciitilde ] }; key <AE01> { [ abreve, Abreve ] }; key <AE02> { [ acircumflex, Acircumflex ] }; @@ -33,7 +32,5 @@ xkb_symbols "basic" { key <AD11> { [ uhorn, Uhorn ] }; key <AD12> { [ ohorn, Ohorn ] }; - // End alphanumeric section - include "level3(ralt_switch)" }; diff --git a/xorg-server/xkeyboard-config/symbols/xfree68_vndr/amiga b/xorg-server/xkeyboard-config/symbols/xfree68_vndr/amiga index 46d48a27e..f785288bb 100644 --- a/xorg-server/xkeyboard-config/symbols/xfree68_vndr/amiga +++ b/xorg-server/xkeyboard-config/symbols/xfree68_vndr/amiga @@ -113,10 +113,9 @@ default xkb_symbols "usa1" { key <KP0> { [ KP_0, KP_Insert ] }; key <KPDC> { [ KP_Decimal, KP_Delete ] }; - key <KPEN> { [ KP_Enter ] }; + key <KPEN> { [ KP_Enter ] }; // End "Keypad" section - // begin modifier mappings modifier_map Shift { Shift_L, Shift_R }; modifier_map Lock { Caps_Lock }; modifier_map Control{ Control_L }; diff --git a/xorg-server/xkeyboard-config/symbols/xfree68_vndr/ataritt b/xorg-server/xkeyboard-config/symbols/xfree68_vndr/ataritt index 65048bde4..0ceb3ed13 100644 --- a/xorg-server/xkeyboard-config/symbols/xfree68_vndr/ataritt +++ b/xorg-server/xkeyboard-config/symbols/xfree68_vndr/ataritt @@ -1,6 +1,7 @@ default xkb_symbols "us" { name[Group1]= "US/ASCII"; + key <ESC> { [ Escape ] }; // Alphanumeric section @@ -112,7 +113,6 @@ default xkb_symbols "us" { key <KPEN> { [ KP_Enter ] }; // End "Keypad" section - // begin modifier mappings modifier_map Shift { Shift_L, Shift_R }; modifier_map Lock { Caps_Lock }; modifier_map Control{ Control_L }; @@ -124,7 +124,6 @@ xkb_symbols "de" { name[Group1]= "German"; - // Alphanumeric section key <AE02> { [ 2, quotedbl ] }; key <AE03> { [ 3, section ] }; key <AE06> { [ 6, ampersand ] }; |