From 982ac918afe6a1c02d5cf735d7b6c56443a048cc Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 7 Feb 2014 23:28:38 +0100 Subject: xkbcomp xkeyboard-config libxcb libxtrans fontconfig libX11 libxcb mesa xserver git update 7 Feb 2014 Update to openssl1.0.1f xserver commit 83e38eb73fd8c852513aac2da2975b4c01070ec2 libxcb commit d7eb0bdf3b5b11ee9f40ee5e73df8fc0bdfa59f3 xkeyboard-config commit 7596672b96315465df8d8d691e3a567a52f70743 libX11 commit aacf95dacc7c598e7297894580d4d655593813b2 xkbcomp commit 31b90ee4ffc774e0da540277907fc5540c0b012c libxtrans commit 3f0de269abe59353acbd7a5587d68ce0da91db67 fontconfig commit e310d2fac2d874d5aa76c609df70cc7b871c0b6d mesa commit dd2229d4c68ed78a50104637aef904f8ab6d7dd3 --- xorg-server/xkeyboard-config/symbols/Makefile.am | 2 +- xorg-server/xkeyboard-config/symbols/af | 12 ++--- xorg-server/xkeyboard-config/symbols/ba | 16 ++---- xorg-server/xkeyboard-config/symbols/ca | 11 ++--- xorg-server/xkeyboard-config/symbols/cm | 16 +++--- xorg-server/xkeyboard-config/symbols/de | 30 ++++++++--- xorg-server/xkeyboard-config/symbols/dk | 8 +++ xorg-server/xkeyboard-config/symbols/es | 8 +++ xorg-server/xkeyboard-config/symbols/eu | 63 ++++++++++++++++++++++++ xorg-server/xkeyboard-config/symbols/fi | 8 +++ xorg-server/xkeyboard-config/symbols/fr | 2 - xorg-server/xkeyboard-config/symbols/hr | 17 ++----- xorg-server/xkeyboard-config/symbols/in | 42 ++++------------ xorg-server/xkeyboard-config/symbols/inet | 34 ++++++------- xorg-server/xkeyboard-config/symbols/ir | 2 +- xorg-server/xkeyboard-config/symbols/is | 3 +- xorg-server/xkeyboard-config/symbols/it | 10 +++- xorg-server/xkeyboard-config/symbols/jp | 4 +- xorg-server/xkeyboard-config/symbols/ma | 2 +- xorg-server/xkeyboard-config/symbols/nl | 2 - xorg-server/xkeyboard-config/symbols/no | 8 +++ xorg-server/xkeyboard-config/symbols/rs | 33 ++++++------- xorg-server/xkeyboard-config/symbols/ru | 4 +- xorg-server/xkeyboard-config/symbols/se | 8 +-- xorg-server/xkeyboard-config/symbols/si | 13 +++-- xorg-server/xkeyboard-config/symbols/tm | 6 +-- xorg-server/xkeyboard-config/symbols/tw | 12 ++--- xorg-server/xkeyboard-config/symbols/ua | 2 +- xorg-server/xkeyboard-config/symbols/us | 41 ++++++--------- 29 files changed, 241 insertions(+), 178 deletions(-) create mode 100644 xorg-server/xkeyboard-config/symbols/eu (limited to 'xorg-server/xkeyboard-config/symbols') diff --git a/xorg-server/xkeyboard-config/symbols/Makefile.am b/xorg-server/xkeyboard-config/symbols/Makefile.am index 509a549cd..77ec0ff0e 100644 --- a/xorg-server/xkeyboard-config/symbols/Makefile.am +++ b/xorg-server/xkeyboard-config/symbols/Makefile.am @@ -11,7 +11,7 @@ bt bw by \ ca cd ch \ cm cn cz \ de dk \ -ee es et epo \ +ee es et epo eu \ fi fo fr \ gb ge gh gn \ gr hr hu \ diff --git a/xorg-server/xkeyboard-config/symbols/af b/xorg-server/xkeyboard-config/symbols/af index b93019a95..67f07c862 100644 --- a/xorg-server/xkeyboard-config/symbols/af +++ b/xorg-server/xkeyboard-config/symbols/af @@ -26,7 +26,7 @@ xkb_symbols "basic" { key { [ 0x10006f9, 0x1000029, 0x100200e ] }; key { [ 0x10006f0, 0x1000028, 0x100200f ] }; key { [ minus, Arabic_tatweel, 0x100005f ] }; - key { [ plus, equal ] }; + key { [ equal, plus ] }; key { [ Arabic_dad, Arabic_sukun, 0x10000b0 ] }; key { [ Arabic_sad, Arabic_dammatan ] }; @@ -97,7 +97,7 @@ xkb_symbols "ps" { key { [ 0x10006f9, 0x1000029, 0x100200e ] }; key { [ 0x10006f0, 0x1000028, 0x100200f ] }; key { [ minus, Arabic_tatweel, 0x100005f ] }; - key { [ plus, equal ] }; + key { [ equal, plus ] }; key { [ Arabic_dad, Arabic_sukun, 0x10000b0 ] }; key { [ Arabic_sad, Arabic_dammatan, 0x1000653 ] }; @@ -168,7 +168,7 @@ xkb_symbols "uz" { key { [ 0x10006f9, 0x1000029, 0x100200e ] }; key { [ 0x10006f0, 0x1000028, 0x100200f ] }; key { [ minus, Arabic_tatweel, 0x100005f ] }; - key { [ plus, equal ] }; + key { [ equal, plus ] }; key { [ Arabic_dad, Arabic_sukun, 0x10000b0 ] }; key { [ Arabic_sad, Arabic_dammatan, 0x1000653 ] }; @@ -229,7 +229,7 @@ xkb_symbols "olpc-ps" { key { [ 0x10006F9, parenright, enfilledcircbullet ] }; // Arabic nine key { [ 0x10006F0, parenleft, degree ] }; // Arabic zero key { [ minus, 0x1000640, underscore ] }; // Arabic_tatweel - key { [ plus, equal, division ] }; + key { [ equal, plus, division ] }; key { [ 0x1000636, 0x1000652, EuroSign ] }; // Arabic dad, Arabic sukun key { [ 0x1000635, 0x100064C, 0x1000671 ] }; // Arabic sad, Arabic dammatan, Arabic alef walsa @@ -290,7 +290,7 @@ xkb_symbols "fa-olpc" { key { [ 0x10006F9, parenright, 0x100200E ] }; // Arabic nine, left-to-right mark key { [ 0x10006F0, parenleft, 0x100200F ] }; // Arabic zero, right-to-left mark key { [ minus, 0x1000640, underscore ] }; // Arabic_tatweel - key { [ plus, equal ] }; + key { [ equal, plus ] }; key { [ 0x1000636, 0x1000652, degree ] }; // Arabic dad, Arabic sukun key { [ 0x1000635, 0x100064C ] }; // Arabic sad, Arabic dammatan @@ -351,7 +351,7 @@ xkb_symbols "uz-olpc" { key { [ 0x10006F9, parenright, 0x100200E ] }; // Arabic nine, left-to-right mark key { [ 0x10006F0, parenleft, 0x100200F ] }; // Arabic zero, right-to-left mark key { [ minus, 0x1000640, underscore ] }; // Arabic_tatweel - key { [ plus, equal ] }; + key { [ equal, plus ] }; key { [ 0x1000636, 0x1000652, degree ] }; // Arabic dad, Arabic sukun key { [ 0x1000635, 0x100064C, 0x1000653 ] }; // Arabic sad, Arabic dammatan, Arabic maddah above diff --git a/xorg-server/xkeyboard-config/symbols/ba b/xorg-server/xkeyboard-config/symbols/ba index 0cc4988d4..63331b858 100644 --- a/xorg-server/xkeyboard-config/symbols/ba +++ b/xorg-server/xkeyboard-config/symbols/ba @@ -1,40 +1,34 @@ default partial alphanumeric_keys xkb_symbols "basic" { - name[Group1]="Bosnian"; - include "rs(latin)" + name[Group1]="Bosnian"; }; partial alphanumeric_keys xkb_symbols "us" { - name[Group1]= "Bosnian (US keyboard with Bosnian letters)"; - include "rs(latinyz)" + name[Group1]= "Bosnian (US keyboard with Bosnian letters)"; }; - partial alphanumeric_keys xkb_symbols "alternatequotes" { - name[Group1]= "Bosnian (use guillemets for quotes)"; - include "rs(latinalternatequotes)" + name[Group1]= "Bosnian (with guillemets for quotes)"; }; partial alphanumeric_keys xkb_symbols "unicode" { - name[Group1]= "Bosnian (use Bosnian digraphs)"; - include "rs(latinunicode)" + name[Group1]= "Bosnian (with Bosnian digraphs)"; }; partial alphanumeric_keys xkb_symbols "unicodeus" { - name[Group1]= "Bosnian (US keyboard with Bosnian digraphs)"; - include "rs(latinunicodeyz)" + name[Group1]= "Bosnian (US keyboard with Bosnian digraphs)"; }; diff --git a/xorg-server/xkeyboard-config/symbols/ca b/xorg-server/xkeyboard-config/symbols/ca index abfbbd9f7..2ba48b480 100644 --- a/xorg-server/xkeyboard-config/symbols/ca +++ b/xorg-server/xkeyboard-config/symbols/ca @@ -122,10 +122,10 @@ xkb_symbols "fr-dvorak" { partial xkb_symbols "fr-legacy" { - name[Group1] = "French (Canada, legacy)"; - include "ca(fr)" + name[Group1] = "French (Canada, legacy)"; + key { [ degree, degree, notsign ] }; key { [ 1, exclam, onesuperior ] }; @@ -168,10 +168,10 @@ xkb_symbols "fr-legacy" { partial xkb_symbols "multi" { - name[Group1] = "Canadian Multilingual (first part)"; - include "ca(fr)" + name[Group1] = "Canadian Multilingual (first part)"; + key { [ slash, backslash, bar ] }; key { [ 1, exclam ] }; key { [ 2, at ] }; @@ -259,7 +259,6 @@ xkb_symbols "multi-2gr" { key { [ Greek_horizbar, multiply ] }; key { [ periodcentered, division ] }; key { [ NoSymbol, dead_abovedot ] }; - }; // based on @@ -466,8 +465,8 @@ xkb_symbols "olpc" { partial alphanumeric_keys xkb_symbols "eng" { - name[Group1] = "English (Canada)"; include "us(basic)" + name[Group1] = "English (Canada)"; }; // EXTRAS: diff --git a/xorg-server/xkeyboard-config/symbols/cm b/xorg-server/xkeyboard-config/symbols/cm index 6404c97aa..6b7a51854 100644 --- a/xorg-server/xkeyboard-config/symbols/cm +++ b/xorg-server/xkeyboard-config/symbols/cm @@ -96,8 +96,8 @@ xkb_symbols "basic" { partial alphanumeric_keys xkb_symbols "french" { - name[Group1]="French (Cameroon)"; include "latin" + name[Group1]="French (Cameroon)"; key { [ ampersand, 1, onesuperior, exclamdown ] }; key { [ eacute, 2, asciitilde, oneeighth ] }; @@ -133,13 +133,11 @@ xkb_symbols "french" include "level3(ralt_switch)" }; - partial alphanumeric_keys xkb_symbols "azerty" { - name[Group1] = "Cameroon Multilingual (azerty)"; - include "level3(ralt_switch)" include "cm(basic)" + name[Group1] = "Cameroon Multilingual (azerty)"; key { [ w, W, U1E85, U1E84 ] }; // SMALL LETTER W, CAPITAL LETTER W, SMALL LETTER W WITH DIAERESIS, CAPITAL LETTER W WITH DIAERESIS key { [ x, X, U2039, U203A ] }; // SMALL LETTER X, CAPITAL LETTER X, SINGLE LEFT-POINTING ANGLE QUOTATION MARK, SINGLE RIGHT-POINTING ANGLE QUOTATION MARK key { [ c, C, U0327, copyright ] }; // SMALL LETTER C, CAPITAL LETTER C, COMBINING CEDILLA, COPYRIGHT SIGN @@ -189,14 +187,14 @@ xkb_symbols "azerty" key { [ U003C, U003E, U00AB, U00BB ] }; // LESS THAN, GREATER THAN, LEFT GUILLEMET, RIGHT GUILLEMET key { [ U0024, U20AC, U00B2, U00B3 ] }; // DOLLAR, EURO, SUPERSCRIPT 2, SUPERSCRIPT 3 include "cm(exclamation_switch)" + include "level3(ralt_switch)" }; partial alphanumeric_keys xkb_symbols "qwerty" { - name[Group1] = "Cameroon Multilingual (qwerty)"; - include "level3(ralt_switch)" include "cm(basic)" + name[Group1] = "Cameroon Multilingual (qwerty)"; key { [ z, Z, U2026, U2020 ] }; // SMALL LETTER Z, CAPITAL LETTER Z, ELLIPSIS, DAGGER key { [ x, X ] }; // SMALL LETTER X, CAPITAL LETTER X key { [ c, C, U0327, U00A9 ] }; // SMALL LETTER C, CAPITAL LETTER C, CEDILLA, COPYRIGHT @@ -242,15 +240,14 @@ xkb_symbols "qwerty" key { [ U005C, U007C ] }; // BACKSLASH, BAR key { [ U030D, U0303, U0060, U007E ] }; // COMBINING VERTICAL LINE ABOVE, COMBINING TILDE ABOVE, GRAVE ACCENT, TILDE include "cm(semicolon_switch)" + include "level3(ralt_switch)" }; - partial alphanumeric_keys xkb_symbols "dvorak" { - name[Group1] = "Cameroon Multilingual (Dvorak)"; - include "level3(ralt_switch)" include "us(dvorak)" + name[Group1] = "Cameroon Multilingual (Dvorak)"; key { [ semicolon, colon ] }; // SEMICOLON, COLON key { [ q, Q, U2014, U2013 ] }; // SMALL LETTER Q, CAPITAL LETTER Q, EM DASH, EN DASH key { [ j, J, U0330, U0323 ] }; // SMALL LETTER J, CAPITAL LETTER J, COMBINING TILDE (NASAL) BELOW, COMBINING DOT BELOW @@ -299,6 +296,7 @@ xkb_symbols "dvorak" key { [ backslash, bar ] }; // BACKSLASH, BAR key { [ U030D, U0303, U0060, U007E ] }; // COMBINING VERTICAL LINE ABOVE, COMBINING TILDE ABOVE, GRAVE ACCENT, TILDE include "cm(semicolon_switch_dvorak)" + include "level3(ralt_switch)" }; // The following code creates the "Cameroon key" phenomenon. diff --git a/xorg-server/xkeyboard-config/symbols/de b/xorg-server/xkeyboard-config/symbols/de index a497d7f48..150c081c9 100644 --- a/xorg-server/xkeyboard-config/symbols/de +++ b/xorg-server/xkeyboard-config/symbols/de @@ -526,10 +526,8 @@ xkb_symbols "mac_nodeadkeys" { partial alphanumeric_keys xkb_symbols "dsb" { - name[Group1] = "Lower Sorbian"; include "latin(basic)" - include "level3(ralt_switch)" - include "kpdl(comma)" + name[Group1] = "Lower Sorbian"; key { [ z, Z, zcaron, Zcaron ] }; key { [ x, X, zacute, Zacute ] }; key { [ c, C, cacute, Cacute ] }; @@ -544,15 +542,15 @@ xkb_symbols "dsb" key { [ r, R, racute, Racute ] }; key { [ t, T, U20B5, EuroSign ] }; key { [ o, O, oacute, Oacute ] }; + include "kpdl(comma)" + include "level3(ralt_switch)" }; partial alphanumeric_keys xkb_symbols "dsb_qwertz" { - name[Group1] = "Lower Sorbian (qwertz)"; include "latin(basic)" - include "level3(ralt_switch)" - include "kpdl(comma)" + name[Group1] = "Lower Sorbian (qwertz)"; key { [ y, Y ] }; key { [ x, X ] }; key { [ c, C, cacute, Cacute ] }; @@ -569,6 +567,8 @@ xkb_symbols "dsb_qwertz" key { [ z, Z, zcaron, Zcaron ] }; key { [ u, U, zacute, Zacute ] }; key { [ o, O, oacute, Oacute ] }; + include "kpdl(comma)" + include "level3(ralt_switch)" }; partial alphanumeric_keys @@ -681,6 +681,24 @@ xkb_symbols "htcdream" { include "level3(alt_switch)" }; +partial alphanumeric_keys +xkb_symbols "tr" { + + // add turkish-specific letters to the basic German layout. + // Turkish symbols are accessible with combination of and + // 'i', 's', 'g', 'c'' (+ for capital letters). + + include "de(basic)" + + name[Group1]="Turkish (Germany)"; + + key { [ i, I, U0131, U0130 ] }; + key { [ s, S, U015F, U015E ] }; + key { [ g, G, U011F, U011E ] }; + key { [ c, C, U0E7, U0C7 ] }; + +}; + // EXTRAS: partial alphanumeric_keys diff --git a/xorg-server/xkeyboard-config/symbols/dk b/xorg-server/xkeyboard-config/symbols/dk index 838478bf8..509802753 100644 --- a/xorg-server/xkeyboard-config/symbols/dk +++ b/xorg-server/xkeyboard-config/symbols/dk @@ -42,6 +42,14 @@ xkb_symbols "nodeadkeys" { }; +partial alphanumeric_keys +xkb_symbols "winkeys" { + + include "dk(basic)" + name[Group1] = "Danish (Winkeys)"; + include "eurosign(5)" +}; + // Copied from macintosh_vndr/dk partial alphanumeric_keys xkb_symbols "mac" { diff --git a/xorg-server/xkeyboard-config/symbols/es b/xorg-server/xkeyboard-config/symbols/es index 9e963a23f..749a86d71 100644 --- a/xorg-server/xkeyboard-config/symbols/es +++ b/xorg-server/xkeyboard-config/symbols/es @@ -26,6 +26,14 @@ xkb_symbols "basic" { include "level3(ralt_switch)" }; +partial alphanumeric +xkb_symbols "winkeys" { + + include "es(basic)" + name[Group1]="Spanish (Winkeys)"; + include "eurosign(5)" +}; + partial alphanumeric_keys xkb_symbols "Sundeadkeys" { diff --git a/xorg-server/xkeyboard-config/symbols/eu b/xorg-server/xkeyboard-config/symbols/eu new file mode 100644 index 000000000..0a4d31a21 --- /dev/null +++ b/xorg-server/xkeyboard-config/symbols/eu @@ -0,0 +1,63 @@ +// Based on +// Copyright: Copyright 2012 Steffen Bruentjen (eurkey (at) steffen dot bruentjen dot de) +// License: GPLv3 +// modified by Christoph Roeper (use firstName to mail) + +default partial alphanumeric_keys modifier_keys +xkb_symbols "basic" { + + include "us(basic)" + + name[Group1] = "EurKEY (US based layout with european letters)"; + + key { [ z, Z, agrave, Agrave ] }; + key { [ x, X, aacute, Aacute ] }; + key { [ c, C, ccedilla, Ccedilla ] }; + key { [ v, V, igrave, Igrave ] }; + key { [ b, B, iacute, Iacute ] }; + key { [ n, N, ntilde, Ntilde ] }; + key { [ m, M, Multi_key, Multi_key ] }; + key { [ comma, less, ograve, Ograve ] }; + key { [ period, greater, oacute, Oacute ] }; + key { [ slash, question, questiondown, 0x1002026 ] }; + key { [ a, A, adiaeresis, Adiaeresis ] }; + key { [ s, S, ssharp, section ] }; + key { [ d, D, eth, Eth ] }; + key { [ f, F, egrave, Egrave ] }; + key { [ g, G, eacute, Eacute ] }; + key { [ h, H, ugrave, Ugrave ] }; + key { [ j, J, uacute, Uacute ] }; + key { [ k, K, U0133, U0132 ] }; + key { [ l, L, oslash, Oslash ] }; + key { [ semicolon, colon, dead_diaeresis, periodcentered ] }; + key { [ apostrophe, quotedbl, dead_acute, dagger] }; + key { [ q, Q, ae, AE ] }; + key { [ w, W, aring, Aring ] }; + key { [ e, E, ediaeresis, Ediaeresis ] }; + key { [ r, R, yacute, Yacute ] }; + key { [ t, T, thorn, Thorn ] }; + key { [ y, Y, ydiaeresis, Ydiaeresis ] }; + key { [ u, U, udiaeresis, Udiaeresis ] }; + key { [ i, I, idiaeresis, Idiaeresis ] }; + key { [ o, O, odiaeresis, Odiaeresis ] }; + key { [ p, P, oe, OE ] }; + key { [ bracketleft, braceleft, guillemotleft, U2039 ] }; + key { [ bracketright, braceright, guillemotright, U203A ] }; + key { [ 1, exclam, exclamdown, onesuperior ] }; + key { [ 2, at, ordfeminine, twosuperior ] }; + key { [ 3, numbersign, masculine, threesuperior ] }; + key { [ 4, dollar, sterling, yen ] }; + key { [ 5, percent, EuroSign, cent ] }; + key { [ 6, asciicircum, dead_circumflex, dead_caron ] }; + key { [ 7, ampersand, dead_abovering, dead_macron ] }; + key { [ 8, asterisk, doublelowquotemark, singlelowquotemark ] }; + key { [ 9, parenleft, leftdoublequotemark, leftsinglequotemark ] }; + key { [ 0, parenright, rightdoublequotemark, rightsinglequotemark ] }; + key { [ minus, underscore, copyright, numerosign ] }; + key { [ equal, plus, multiply, division ] }; + key { [ backslash, bar, notsign, brokenbar ] }; + key { [ grave, asciitilde, dead_grave, dead_tilde ] }; + key { [ KP_Delete, KP_Decimal, comma, comma ] }; + + include "level3(ralt_switch)" +}; diff --git a/xorg-server/xkeyboard-config/symbols/fi b/xorg-server/xkeyboard-config/symbols/fi index 4fdcc2a25..1818243dd 100644 --- a/xorg-server/xkeyboard-config/symbols/fi +++ b/xorg-server/xkeyboard-config/symbols/fi @@ -82,6 +82,14 @@ xkb_symbols "kotoistus" { include "compose(rwin)" }; +partial alphanumeric_keys +xkb_symbols "winkeys" { + + include "fi(kotoistus)" + name[Group1]="Finnish (Winkeys)"; + include "eurosign(5)" +}; + partial alphanumeric_keys xkb_symbols "classic" { diff --git a/xorg-server/xkeyboard-config/symbols/fr b/xorg-server/xkeyboard-config/symbols/fr index 9c89db825..3898b1c57 100644 --- a/xorg-server/xkeyboard-config/symbols/fr +++ b/xorg-server/xkeyboard-config/symbols/fr @@ -36,8 +36,6 @@ xkb_symbols "basic" { key { [ colon, slash, periodcentered, division ] }; key { [ exclam, section, dead_belowdot, dead_abovedot ] }; - include "kpdl(comma)" - include "level3(ralt_switch)" }; diff --git a/xorg-server/xkeyboard-config/symbols/hr b/xorg-server/xkeyboard-config/symbols/hr index 1ec0c809a..61fc39221 100644 --- a/xorg-server/xkeyboard-config/symbols/hr +++ b/xorg-server/xkeyboard-config/symbols/hr @@ -1,9 +1,8 @@ default partial alphanumeric_keys xkb_symbols "basic" { - name[Group1]="Croatian"; - include "rs(latin)" + name[Group1]="Croatian"; // Redefine these keys to match XFree86 Croatian layout key { [ 1, exclam, asciitilde, dead_tilde ] }; @@ -16,9 +15,8 @@ xkb_symbols "basic" { partial alphanumeric_keys xkb_symbols "us" { - name[Group1]= "Croatian (US keyboard with Croatian letters)"; - include "us" + name[Group1]= "Croatian (US keyboard with Croatian letters)"; key { [ any, any, backslash ] }; key { [ any, any, bar ] }; @@ -44,30 +42,25 @@ xkb_symbols "us" { key { [ any, any, zcaron, Zcaron ] }; include "level3(ralt_switch)" - }; - partial alphanumeric_keys xkb_symbols "alternatequotes" { - name[Group1]= "Croatian (use guillemets for quotes)"; - include "rs(latinalternatequotes)" + name[Group1]= "Croatian (with guillemets for quotes)"; }; partial alphanumeric_keys xkb_symbols "unicode" { - name[Group1]= "Croatian (use Croatian digraphs)"; - include "rs(latinunicode)" + name[Group1]= "Croatian (with Croatian digraphs)"; }; partial alphanumeric_keys xkb_symbols "unicodeus" { - name[Group1]= "Croatian (US keyboard with Croatian digraphs)"; - include "rs(latinunicodeyz)" + name[Group1]= "Croatian (US keyboard with Croatian digraphs)"; }; diff --git a/xorg-server/xkeyboard-config/symbols/in b/xorg-server/xkeyboard-config/symbols/in index f70e215e6..054671513 100644 --- a/xorg-server/xkeyboard-config/symbols/in +++ b/xorg-server/xkeyboard-config/symbols/in @@ -107,7 +107,7 @@ partial alphanumeric_keys xkb_symbols "bolnagri" { name[Group1] = "Hindi (Bolnagri)"; key.type="FOUR_LEVEL"; - //Top Alphanumeric row + // Roman digits key { [ U0902, U0901, apostrophe, asciitilde ] }; // apostrophe: anusvara, candrabindu key { [ 1, exclam, U0967, exclam ] }; @@ -393,8 +393,6 @@ xkb_symbols "ben_baishakhi" { // modifier_map Shift { Shift_L }; // modifier_map Lock { Caps_Lock }; // modifier_map Control{ Control_L }; - - }; xkb_symbols "ben_inscript" { @@ -536,8 +534,6 @@ xkb_symbols "ben_gitanjali" { // modifier_map Shift { Shift_L }; // modifier_map Lock { Caps_Lock }; // modifier_map Control{ Control_L }; - - }; @@ -613,7 +609,6 @@ xkb_symbols "ben_bornona" { // modifier_map Control{ Control_L }; // third level with right-alt include "level3(ralt_switch)" - }; partial alphanumeric_keys @@ -842,7 +837,6 @@ xkb_symbols "mal" { include "rupeesign(4)" include "level3(ralt_switch)" - }; //Name : Lalitha @@ -854,7 +848,7 @@ partial alphanumeric_keys xkb_symbols "mal_lalitha" { name[Group1] = "Malayalam (Lalitha)"; key.type="FOUR_LEVEL"; - //Top Alphanumeric row + // Roman digits key { [ U0D4D, U0D02, apostrophe, asciitilde ] }; // apostrophe: virama(chandrakala),anusvara key { [ 1, exclam, U0D67, exclam ] }; @@ -1237,7 +1231,6 @@ xkb_symbols "tam_TSCII" { key { [ 0x10000ab, 0x10000ac ] }; // a, A key { [ 0x10000fe, 0x10000ae ] }; // i, I -}; partial alphanumeric_keys xkb_symbols "tam_TAB" { @@ -1462,7 +1455,7 @@ partial alphanumeric_keys xkb_symbols "jhelum" { name[Group1] = "Punjabi (Gurmukhi Jhelum)"; key.type="FOUR_LEVEL"; - //Top Alphanumeric row + // Roman digits key { [ apostrophe, asciitilde, U0A02,U0A01 ] }; // apostrophe: anusvara, candrabindu key { [ 1,exclam, U0A67, exclam ] }; @@ -1660,12 +1653,10 @@ xkb_symbols "hin-wx" { partial alphanumeric_keys xkb_symbols "eng" { - name[Group1]= "English (India, with RupeeSign)"; - include "us(basic)" + name[Group1]= "English (India, with rupee sign)"; include "rupeesign(4)" - include "level3(ralt_switch)" }; @@ -1681,7 +1672,7 @@ xkb_symbols "eng" { partial alphanumeric_keys xkb_symbols "mal_enhanced" { - name[Group1] = "Malayalam (enhanced Inscript with Rupee Sign)"; + name[Group1] = "Malayalam (enhanced Inscript, with rupee sign)"; //From grave to backslash (\) @@ -1744,11 +1735,8 @@ xkb_symbols "mal_enhanced" { key { [ period , U0d7d ] }; //chillu l key { [ U0d2f , question ] }; - // hope this includes the rupee sign at alt + 4 - include "rupeesign(4)" include "level3(ralt_switch)" - }; @@ -1780,13 +1768,12 @@ xkb_symbols "hin-kagapa" { name[Group1] = "Hindi (KaGaPa phonetic)"; key.type="FOUR_LEVEL"; - //Top Alphanumeric row // Roman digits key { [ apostrophe, asciitilde, U201C ] }; // U201C: left double quotation mark key { [ 1, exclam, U0967 ] }; key { [ 2, at, U0968, U20A8 ] }; // U20A8: generic rupee sign (Rs) key { [ 3, numbersign, U0969 ] }; - key { [ 4, dollar, U096A, U20B9 ] }; // U20B9: new Indian Rupee sign + key { [ 4, dollar, U096A, U20B9 ] }; // U20B9: new Indian rupee sign key { [ 5, percent, U096B ] }; key { [ 6, asciicircum, U096C, U200C ] }; // ZWNJ key { [ 7, ampersand, U096D, U200D ] }; // ZWJ @@ -1824,7 +1811,6 @@ xkb_symbols "hin-kagapa" { key { [ semicolon, colon, U1CF2, U1CF3 ] }; // U1CF2/3: ardhavisarga/rotated ardhavisarga key { [ apostrophe, quotedbl, U0951, U201D ] }; // U0951: Devanagari stress sign udatta // U201D: Right double quotation mark - //Z Row key { [ U091E, U0919 ] }; // Z: nya, nga key { [ U0937, U093C, U0934 ] }; // X: ssa, nukta below, lla-nukta @@ -1844,17 +1830,15 @@ xkb_symbols "hin-kagapa" { // Sanskrit uses Devanagari layout of Hindi partial alphanumeric_keys xkb_symbols "san-kagapa" { - name[Group1] = "Sanskrit (KaGaPa phonetic)"; include "in(hin-kagapa)" - + name[Group1] = "Sanskrit (KaGaPa phonetic)"; }; // Marathi uses Devanagari layout of Hindi partial alphanumeric_keys xkb_symbols "mar-kagapa" { - name[Group1] = "Marathi (KaGaPa phonetic)"; include "in(hin-kagapa)" - + name[Group1] = "Marathi (KaGaPa phonetic)"; }; @@ -1875,13 +1859,12 @@ xkb_symbols "kan-kagapa" { name[Group1] = "Kannada (KaGaPa phonetic)"; key.type="FOUR_LEVEL"; - //Top Alphanumeric row // Roman digits key { [ apostrophe, asciitilde, U201C ] }; // U201C: left double quotation mark key { [ 1, exclam, U0CE7 ] }; key { [ 2, at, U0CE8, U20A8 ] }; // U20A8: generic rupee sign (Rs) key { [ 3, numbersign, U0CE9 ] }; - key { [ 4, dollar, U0CEA, U20B9 ] }; // U20B9: new Indian Rupee sign + key { [ 4, dollar, U0CEA, U20B9 ] }; // U20B9: new Indian rupee sign key { [ 5, percent, U0CEB ] }; key { [ 6, asciicircum, U0CEC, U200C ] }; // ZWNJ key { [ 7, ampersand, U0CED, U200D ] }; // ZWJ @@ -1919,7 +1902,6 @@ xkb_symbols "kan-kagapa" { key { [ semicolon, colon ] }; key { [ apostrophe, quotedbl, U0951, U201D ] }; // U0951: Devanagari stress sign udatta // U201D: Right double quotation mark - //Z Row key { [ U0C9E, U0C99 ] }; // Z: nya, nga key { [ U0CB7, U0CBC, U0CDE ] }; // X: ssa, nukta below, LLLA @@ -1954,13 +1936,12 @@ xkb_symbols "tel-kagapa" { name[Group1] = "Telugu (KaGaPa phonetic)"; key.type="FOUR_LEVEL"; - //Top Alphanumeric row // Roman digits key { [ apostrophe, asciitilde, U201C ] }; // U201C: left double quotation mark key { [ 1, exclam, U0C67 ] }; key { [ 2, at, U0C68, U20A8 ] }; // U20A8: generic rupee sign (Rs) key { [ 3, numbersign, U0C69 ] }; - key { [ 4, dollar, U0C6A, U20B9 ] }; // U20B9: new Indian Rupee sign + key { [ 4, dollar, U0C6A, U20B9 ] }; // U20B9: new Indian rupee sign key { [ 5, percent, U0C6B ] }; key { [ 6, asciicircum, U0C6C, U200C ] }; // ZWNJ key { [ 7, ampersand, U0C6D, U200D ] }; // ZWJ @@ -1998,7 +1979,6 @@ xkb_symbols "tel-kagapa" { key { [ semicolon, colon ] }; key { [ apostrophe, quotedbl, U0951, U201D ] }; // U0951: Devanagari stress sign udatta // U201D: Right double quotation mark - //Z Row key { [ U0C1E, U0C19 ] }; // Z: nya, nga key { [ U0C37 ] }; // X: ssa @@ -2026,7 +2006,6 @@ xkb_symbols "eeyek" { name[Group1]= "Manipuri (Eeyek)"; - // Alphanumeric section key { [ grave, asciitilde ] }; key { [ Uabf1, exclam ] }; key { [ Uabf2, at ] }; @@ -2078,7 +2057,6 @@ xkb_symbols "eeyek" { key { [ slash, question ] }; key { [ backslash, bar ] }; - // End alphanumeric section include "level3(ralt_switch)" }; diff --git a/xorg-server/xkeyboard-config/symbols/inet b/xorg-server/xkeyboard-config/symbols/inet index fe21f1ed7..f7ccc6f81 100644 --- a/xorg-server/xkeyboard-config/symbols/inet +++ b/xorg-server/xkeyboard-config/symbols/inet @@ -256,7 +256,7 @@ xkb_symbols "acer_c300" { key { [ XF86AudioRaiseVolume ] }; key { [ XF86Launch2 ] }; key { [ Help ] }; - key { [ XF86Launch1 ] }; + key { [ XF86Launch1 ] }; }; // Acer Ferrari 4000 Keyboard @@ -461,7 +461,7 @@ xkb_symbols "cherryblue" { key { [ XF86AudioMute ] }; key { [ XF86Standby ] }; key { [ XF86Terminal ] }; - key { [ XF86Go ] }; + key { [ XF86Go ] }; }; // Cherry CyMotion Master XPress @@ -488,7 +488,7 @@ xkb_symbols "cherryblueb" { key { [ XF86Book ] }; key { [ XF86Book ] }; key { [ XF86Terminal ] }; - key { [ XF86Go ] }; + key { [ XF86Go ] }; }; // Cherry Blue Line CyBo@rd (alternate option) @@ -505,7 +505,7 @@ xkb_symbols "cherrycyboard" { key { [ XF86Search ] }; key { [ XF86HomePage ] }; key { [ XF86Terminal ] }; - key { [ XF86AudioMedia ] }; + key { [ XF86AudioMedia ] }; }; // Cherry CyMotion Expert @@ -695,8 +695,8 @@ xkb_symbols "inspiron" { key { [ XF86AudioNext ] }; key { [ XF86Eject ] }; key { [ XF86Display ] }; - key { [ XF86AudioPrev ] }; - key { [ XF86AudioPlay, XF86AudioPause ] }; + key { [ XF86AudioPrev ] }; + key { [ XF86AudioPlay, XF86AudioPause ] }; }; // DELL USB Multimedia Keyboard (former 8135, generalized, superset of 8125) @@ -707,7 +707,7 @@ xkb_symbols "dellusbmm" { include "inet(media_nav_acpi_common)" key { [ XF86HomePage ] }; key { [ XF86MyComputer ] }; - key { [ XF86AudioMedia ] }; + key { [ XF86AudioMedia ] }; }; @@ -727,7 +727,7 @@ xkb_symbols "diamond" { partial alphanumeric_keys xkb_symbols "ennyah_dkb1008" { include "inet(media_nav_acpi_common)" - key { [ XF86AudioMedia ] }; + key { [ XF86AudioMedia ] }; }; @@ -1033,7 +1033,7 @@ xkb_symbols "logitech_set3" { key { [ XF86Save ] }; // F8 key { [ XF86Documents ] }; // F10 key { [ XF86Go ] }; - key { [ XF86AudioMedia ] }; + key { [ XF86AudioMedia ] }; }; // Logitech Access Keyboard @@ -1170,7 +1170,7 @@ xkb_symbols "logidinovo" { key { [ XF86AudioRaiseVolume ] }; key { [ XF86AudioLowerVolume ] }; key { [ XF86AudioMute ] }; - key { [ XF86AudioMedia ] }; + key { [ XF86AudioMedia ] }; }; partial alphanumeric_keys @@ -1179,7 +1179,7 @@ xkb_symbols "logidinovoedge" { key { [ XF86HomePage ] }; key { [ XF86Mail ] }; key { [ XF86Search ] }; - key { [ XF86AudioMedia ] }; + key { [ XF86AudioMedia ] }; }; partial alphanumeric_keys @@ -1218,8 +1218,8 @@ xkb_symbols "logitech_g15" { key { [ XF86WWW ] }; key { [ XF86LaunchE ] }; key { [ XF86Launch1 ] }; - key { [ XF86Launch2 ] }; - key { [ XF86Launch8 ] }; + key { [ XF86Launch2 ] }; + key { [ XF86Launch8 ] }; }; @@ -1364,7 +1364,7 @@ xkb_symbols "microsoftprose" { key { [ XF86Standby ] }; key { [ XF86AudioStop ] }; key { [ XF86MyComputer ] }; - key { [ XF86AudioMedia ] }; + key { [ XF86AudioMedia ] }; }; // Microsoft Office Keyboard @@ -1511,7 +1511,7 @@ xkb_symbols "samsung4500" { key { [ XF86Eject ] }; key { [ Help ] }; key { [ XF86Explorer ] }; - key { [ XF86Launch2 ] }; + key { [ XF86Launch2 ] }; }; // Samsung SDM 4510P @@ -1521,7 +1521,7 @@ xkb_symbols "samsung4510" { key { [ XF86Launch1 ] }; key { [ XF86Launch3 ] }; key { [ XF86Eject ] }; - key { [ XF86Launch2 ] }; + key { [ XF86Launch2 ] }; }; @@ -1748,7 +1748,7 @@ xkb_symbols "cymotionlinux" { key { [ XF86Copy ] }; key { [ XF86Paste ] }; key { [ XF86ScrollUp ] }; - key { [ XF86AudioMedia ] }; + key { [ XF86AudioMedia ] }; }; partial alphanumeric_keys diff --git a/xorg-server/xkeyboard-config/symbols/ir b/xorg-server/xkeyboard-config/symbols/ir index 983bf60d9..1be5e7a22 100644 --- a/xorg-server/xkeyboard-config/symbols/ir +++ b/xorg-server/xkeyboard-config/symbols/ir @@ -26,7 +26,7 @@ xkb_symbols "pes" { partial alphanumeric_keys xkb_symbols "pes_keypad" { - name[Group1]= "Persian (with Persian Keypad)"; + name[Group1]= "Persian (with Persian keypad)"; include "ir(pes_part_basic)" include "ir(pes_part_keypad)" diff --git a/xorg-server/xkeyboard-config/symbols/is b/xorg-server/xkeyboard-config/symbols/is index 34d6bed33..93af3f803 100644 --- a/xorg-server/xkeyboard-config/symbols/is +++ b/xorg-server/xkeyboard-config/symbols/is @@ -193,11 +193,12 @@ xkb_symbols "mac" { // Icelandic Dvorak partial alphanumeric_keys xkb_symbols "dvorak" { - name[Group1]= "Icelandic (Dvorak)"; include "us(dvorak)" include "eurosign(4)" + name[Group1]= "Icelandic (Dvorak)"; + key { [ slash, question, U201e, U201c ] }; key { [ d, D, eth, ETH ] }; key { [ s, S, ae, AE ] }; diff --git a/xorg-server/xkeyboard-config/symbols/it b/xorg-server/xkeyboard-config/symbols/it index 8a66a306a..8dd4365de 100644 --- a/xorg-server/xkeyboard-config/symbols/it +++ b/xorg-server/xkeyboard-config/symbols/it @@ -33,8 +33,6 @@ xkb_symbols "basic" { key { [ less, greater,guillemotleft,guillemotright] }; - include "kpdl(comma)" - include "level3(ralt_switch)" }; @@ -63,6 +61,14 @@ xkb_symbols "nodeadkeys" { key { [ ugrave, section, grave, breve ] }; }; +partial alphanueric_keys +xkb_symbols "winkeys" { + + include "it(basic)" + name[Group1]="Italian (Winkeys)"; + include "eurosign(5)" +}; + // Copied from macintosh_vndr/it partial alphanumeric_keys xkb_symbols "mac" { diff --git a/xorg-server/xkeyboard-config/symbols/jp b/xorg-server/xkeyboard-config/symbols/jp index 52f574623..f0b2c4d75 100644 --- a/xorg-server/xkeyboard-config/symbols/jp +++ b/xorg-server/xkeyboard-config/symbols/jp @@ -243,8 +243,8 @@ xkb_symbols "nicola_f_bs" { // Copied from macintosh_vndr/jp partial alphanumeric_keys xkb_symbols "mac" { - name[Group1]= "Japanese (Macintosh)"; include "jp(kana)" + name[Group1]= "Japanese (Macintosh)"; replace key { [ Caps_Lock ] }; }; @@ -256,8 +256,8 @@ xkb_symbols "hztg_escape" { partial alphanumeric_keys xkb_symbols "dvorak" { - name[Group1]= "Japanese (Dvorak)"; include "jp(OADG109A)" + name[Group1]= "Japanese (Dvorak)"; key { [ at, grave ] }; diff --git a/xorg-server/xkeyboard-config/symbols/ma b/xorg-server/xkeyboard-config/symbols/ma index 2d128837e..db7b5bb38 100644 --- a/xorg-server/xkeyboard-config/symbols/ma +++ b/xorg-server/xkeyboard-config/symbols/ma @@ -82,9 +82,9 @@ xkb_symbols "tifinagh" { partial alphanumeric_keys xkb_symbols "tifinagh-phonetic" { + include "ma(tifinagh)" name[Group1]="Berber (Morocco, Tifinagh phonetic)"; - include "ma(tifinagh)" key { [ 0x1002d30 ] }; key { [ 0x1002d63, 0x1002d65 ] }; diff --git a/xorg-server/xkeyboard-config/symbols/nl b/xorg-server/xkeyboard-config/symbols/nl index 1dde405f8..76cb0183e 100644 --- a/xorg-server/xkeyboard-config/symbols/nl +++ b/xorg-server/xkeyboard-config/symbols/nl @@ -49,8 +49,6 @@ xkb_symbols "basic" { key { [bracketright, bracketleft, bar, brokenbar ] }; - include "kpdl(comma)" - include "level3(ralt_switch)" }; diff --git a/xorg-server/xkeyboard-config/symbols/no b/xorg-server/xkeyboard-config/symbols/no index 5609de06e..fe79d9ba4 100644 --- a/xorg-server/xkeyboard-config/symbols/no +++ b/xorg-server/xkeyboard-config/symbols/no @@ -52,6 +52,14 @@ xkb_symbols "nodeadkeys" { key { [ period, colon, periodcentered, abovedot ] }; }; +partial alphanumeric_keys +xkb_symbols "winkeys" { + + include "no(basic)" + name[Group1]="Norwegian (Winkeys)"; + include "eurosign(5)" +}; + // Norwegian Dvorak partial alphanumeric_keys xkb_symbols "dvorak" { diff --git a/xorg-server/xkeyboard-config/symbols/rs b/xorg-server/xkeyboard-config/symbols/rs index 86b54632a..06025e17e 100644 --- a/xorg-server/xkeyboard-config/symbols/rs +++ b/xorg-server/xkeyboard-config/symbols/rs @@ -40,12 +40,10 @@ xkb_symbols "latin" { partial alphanumeric_keys xkb_symbols "yz" { - // Cyrillic_zhe and Cyrillic_ze swapped. - - name[Group1]= "Serbian (Cyrillic, Z and ZHE swapped)"; - include "rs(basic)" + name[Group1]= "Serbian (Cyrillic, ZE and ZHE swapped)"; + key { [ Cyrillic_zhe, Cyrillic_ZHE, any,any ] }; // y key { [ Cyrillic_ze, Cyrillic_ZE, any,any ] }; // z }; @@ -247,9 +245,10 @@ xkb_symbols "latinunicode" { // This mapping supports the Unicode characters 0x1c4-0x1cc (dz, lj, and nj // as single character). You get the title form with AltGr+Shift. + include "rs(latin)" + name[Group1]= "Serbian (Latin Unicode)"; - include "rs(latin)" include "rs(twoletter)" }; @@ -257,10 +256,10 @@ partial alphanumeric_keys xkb_symbols "latinyz" { // For those who insist on using "english-position" Z and Y. - name[Group1]= "Serbian (Latin qwerty)"; - include "rs(latin)" + name[Group1]= "Serbian (Latin qwerty)"; + key { [ y, Y, any,any ] }; // y key { [ z, Z, any,any ] }; // z }; @@ -269,10 +268,10 @@ partial alphanumeric_keys xkb_symbols "latinunicodeyz" { // Unicode, ZHE and Z swapped. - name[Group1]= "Serbian (Latin Unicode qwerty)"; - include "rs(latinunicode)" + name[Group1]= "Serbian (Latin Unicode qwerty)"; + key { [ zcaron, Zcaron, any,any ] }; // y key { [ z, Z, any,any ] }; // z }; @@ -280,10 +279,10 @@ xkb_symbols "latinunicodeyz" { xkb_symbols "alternatequotes" { // Another acceptable »pair of quotes« for Serbian - name[Group1]= "Serbian (Cyrillic with guillemets)"; - include "rs(basic)" + name[Group1]= "Serbian (Cyrillic with guillemets)"; + key { [ any,any, guillemotright, NoSymbol ] }; // s key { [ any,any, guillemotleft, NoSymbol ] }; // d }; @@ -291,10 +290,10 @@ xkb_symbols "alternatequotes" { xkb_symbols "latinalternatequotes" { // Another acceptable »pair of quotes« for Serbian - name[Group1]= "Serbian (Latin with guillemets)"; - include "rs(latin)" + name[Group1]= "Serbian (Latin with guillemets)"; + key { [ any,any, guillemotright, NoSymbol ] }; // s key { [ any,any, guillemotleft, NoSymbol ] }; // d }; @@ -306,10 +305,10 @@ xkb_symbols "rue" { // Ljubomir J. Papuga (Любомир Я. Папуґа) // Mihajlo Hornjak - name[Group1]= "Pannonian Rusyn"; - include "rs(basic)" + name[Group1]= "Pannonian Rusyn"; + key { [ Cyrillic_softsign, Cyrillic_SOFTSIGN ] }; // ` key { [ Cyrillic_ya, Cyrillic_YA ] }; // q @@ -330,10 +329,10 @@ xkb_symbols "combiningkeys" { // Raw combining characters instead of dead keys, // especially good for post-accenting texts. - name[Group1]= "Serbian (combining accents instead of dead keys)"; - include "rs(basic)" + name[Group1]= "Serbian (combining accents instead of dead keys)"; + key { [ any,any, U0302, dead_circumflex ] }; // 3, U0302 = COMBINING CIRCUMFLEX ACCENT key { [ any,any, U0300, NoSymbol ] }; // 7, U0300 = COMBINING GRAVE ACCENT key { [ any,any, U030F, NoSymbol ] }; // 8, U030F = COMBINING DOUBLE GRAVE ACCENT diff --git a/xorg-server/xkeyboard-config/symbols/ru b/xorg-server/xkeyboard-config/symbols/ru index 043e011e6..782a3d75a 100644 --- a/xorg-server/xkeyboard-config/symbols/ru +++ b/xorg-server/xkeyboard-config/symbols/ru @@ -201,7 +201,7 @@ xkb_symbols "phonetic" { key { [ Cyrillic_pe, Cyrillic_PE ] }; key { [ Cyrillic_sha, Cyrillic_SHA ] }; - key { [ Cyrillic_softsign, Cyrillic_softsign ] }; + key { [ Cyrillic_softsign, Cyrillic_SOFTSIGN ] }; key { [ Cyrillic_shcha, Cyrillic_SHCHA ] }; key { [ Cyrillic_e, Cyrillic_E ] }; }; @@ -214,7 +214,7 @@ xkb_symbols "phonetic_winkeys" { key { [ Cyrillic_ha, Cyrillic_HA ] }; key { [ Cyrillic_che, Cyrillic_CHE ] }; - key { [ Cyrillic_softsign, Cyrillic_softsign ] }; + key { [ Cyrillic_softsign, Cyrillic_SOFTSIGN ] }; }; diff --git a/xorg-server/xkeyboard-config/symbols/se b/xorg-server/xkeyboard-config/symbols/se index 7c37d2a1d..320a1861d 100644 --- a/xorg-server/xkeyboard-config/symbols/se +++ b/xorg-server/xkeyboard-config/symbols/se @@ -48,10 +48,10 @@ xkb_symbols "nodeadkeys" { partial alphanumeric_keys xkb_symbols "dvorak" { - name[Group1]="Swedish (Dvorak)"; - include "se(basic)" + name[Group1]="Swedish (Dvorak)"; + key { [ aring, Aring, backslash ] }; key { [ adiaeresis, Adiaeresis, braceleft, bracketleft ] }; key { [ odiaeresis, Odiaeresis, braceright, bracketright ] }; @@ -202,10 +202,10 @@ xkb_symbols "mac" { partial alphanumeric_keys xkb_symbols "svdvorak" { - name[Group1]="Swedish (Svdvorak)"; - include "se(basic)" + name[Group1]="Swedish (Svdvorak)"; + key { [ aring, Aring, braceleft ] }; key { [ comma, semicolon, bracketleft ] }; key { [ period, colon, bracketright ] }; diff --git a/xorg-server/xkeyboard-config/symbols/si b/xorg-server/xkeyboard-config/symbols/si index cff5f5602..7e214fba8 100644 --- a/xorg-server/xkeyboard-config/symbols/si +++ b/xorg-server/xkeyboard-config/symbols/si @@ -1,30 +1,29 @@ default partial alphanumeric_keys xkb_symbols "basic" { - name[Group1]="Slovenian"; - include "rs(latin)" + name[Group1]="Slovenian"; + key { type[Group1]="TWO_LEVEL", [ cedilla, diaeresis ] }; }; partial alphanumeric_keys xkb_symbols "us" { - name[Group1]= "Slovenian (US keyboard with Slovenian letters)"; - include "rs(latinyz)" + name[Group1]= "Slovenian (US keyboard with Slovenian letters)"; + key { type[Group1]="TWO_LEVEL", [ cedilla, diaeresis ] }; }; - partial alphanumeric_keys xkb_symbols "alternatequotes" { - name[Group1]= "Slovenian (use guillemets for quotes)"; - include "rs(latinalternatequotes)" + name[Group1]= "Slovenian (with guillemets for quotes)"; + key { type[Group1]="TWO_LEVEL", [ cedilla, diaeresis ] }; }; diff --git a/xorg-server/xkeyboard-config/symbols/tm b/xorg-server/xkeyboard-config/symbols/tm index e861b35c3..6c71f48bf 100644 --- a/xorg-server/xkeyboard-config/symbols/tm +++ b/xorg-server/xkeyboard-config/symbols/tm @@ -3,9 +3,10 @@ // Default layout (based on Vista Turkmen layout) default partial xkb_symbols "basic" { - name[Group1]="Turkmen"; include "us" + name[Group1]="Turkmen"; + key { [ zcaron, Zcaron, grave, asciitilde ] }; key { [ adiaeresis, Adiaeresis, q, Q ] }; @@ -25,9 +26,9 @@ xkb_symbols "basic" { // This layout provides turkmen letter via the AltGr key partial xkb_symbols "alt" { - name[Group1]="Turkmen (Alt-Q)"; include "us" + name[Group1]="Turkmen (Alt-Q)"; key { [ y, Y, yacute, Yacute ] }; key { [ u, U, udiaeresis, Udiaeresis ] }; @@ -41,5 +42,4 @@ xkb_symbols "alt" { key { [ n, N, ncaron, Ncaron ] }; include "level3(ralt_switch)" - }; diff --git a/xorg-server/xkeyboard-config/symbols/tw b/xorg-server/xkeyboard-config/symbols/tw index 8ea31dda6..3a2287222 100644 --- a/xorg-server/xkeyboard-config/symbols/tw +++ b/xorg-server/xkeyboard-config/symbols/tw @@ -1,10 +1,10 @@ default partial alphanumeric_keys xkb_symbols "tw" { - name[Group1]= "Taiwanese"; - include "us(basic)" + name[Group1]= "Taiwanese"; + key { [ grave, asciitilde, dead_grave, dead_tilde ] }; key { [ 1, exclam, U030D, exclamdown ] }; key { [ 2, at, U0358, twosuperior ] }; @@ -49,10 +49,10 @@ xkb_symbols "tw" { partial alphanumeric_keys xkb_symbols "indigenous" { - name[Group1]= "Taiwanese (indigenous)"; - include "tw(tw)" + name[Group1]= "Taiwanese (indigenous)"; + key { [ U02BC, quotedbl, apostrophe, dead_doubleacute ] }; include "level3(ralt_switch)" @@ -61,10 +61,10 @@ xkb_symbols "indigenous" { partial alphanumeric_keys xkb_symbols "saisiyat" { - name[Group1]= "Saisiyat (Taiwan)"; - include "tw(indigenous)" + name[Group1]= "Saisiyat (Taiwan)"; + key { [ U02D0, colon, semicolon, dead_diaeresis ] }; include "level3(ralt_switch)" diff --git a/xorg-server/xkeyboard-config/symbols/ua b/xorg-server/xkeyboard-config/symbols/ua index 9aea09e05..81d696ec4 100644 --- a/xorg-server/xkeyboard-config/symbols/ua +++ b/xorg-server/xkeyboard-config/symbols/ua @@ -12,7 +12,7 @@ xkb_symbols "unicode" { name[Group1]= "Ukrainian"; key { [ U2019, apostrophe, U0301, asciitilde ] }; // Apostrophe and Stress symbol - key { [ 1, exclam, onesuperior ] }; + key { [ 1, exclam, onesuperior ] }; key { [ 2, quotedbl, twosuperior ] }; key { [ 3, numerosign, U00A7, U20B4 ] }; // Paragraph and Hryvnia sign key { [ 4, semicolon, dollar, EuroSign ] }; diff --git a/xorg-server/xkeyboard-config/symbols/us b/xorg-server/xkeyboard-config/symbols/us index 4948a6345..d5a6c18e4 100644 --- a/xorg-server/xkeyboard-config/symbols/us +++ b/xorg-server/xkeyboard-config/symbols/us @@ -59,9 +59,8 @@ xkb_symbols "basic" { partial alphanumeric_keys xkb_symbols "euro" { - name[Group1]= "English (US, with euro on 5)"; - include "us(basic)" + name[Group1]= "English (US, with euro on 5)"; include "eurosign(5)" @@ -72,9 +71,8 @@ xkb_symbols "euro" { partial alphanumeric_keys xkb_symbols "intl" { - name[Group1]= "English (US, international with dead keys)"; - include "us(basic)" + name[Group1]= "English (US, international with dead keys)"; key { [dead_grave, dead_tilde, grave, asciitilde ] }; key { [ 1, exclam, exclamdown, onesuperior ] }; @@ -163,9 +161,8 @@ xkb_symbols "intl" { partial alphanumeric_keys xkb_symbols "alt-intl" { - name[Group1]= "English (US, alternative international)"; - include "us" + name[Group1]= "English (US, alternative international)"; key { [ dead_grave, dead_tilde, grave, asciitilde ] }; key { [ 5, percent, EuroSign ] }; @@ -257,9 +254,8 @@ xkb_symbols "dvorak" { partial alphanumeric_keys xkb_symbols "dvorak-intl" { - name[Group1]= "English (Dvorak, international with dead keys)"; - include "us(dvorak)" + name[Group1]= "English (Dvorak, international with dead keys)"; key { [dead_grave, dead_tilde, grave, asciitilde ] }; @@ -336,9 +332,8 @@ xkb_symbols "dvorak-intl" { partial alphanumeric_keys xkb_symbols "dvorak-alt-intl" { - name[Group1]= "English (Dvorak alternative international no dead keys)"; - include "us(dvorak)" + name[Group1]= "English (Dvorak alternative international no dead keys)"; key { [ 4, dollar, EuroSign ] }; @@ -548,8 +543,8 @@ xkb_symbols "dvorak-classic" { // symbols that usually follows, accented characters are possible for I18N. partial alphanumeric_keys xkb_symbols "dvp" { - include "us(dvorak)" + include "us(dvorak)" name[Group1] = "English (programmer Dvorak)"; // Unmodified Shift AltGr Shift+AltGr @@ -619,9 +614,8 @@ xkb_symbols "dvp" { partial alphanumeric_keys xkb_symbols "rus" { - name[Group1]= "Russian (US, phonetic)"; - include "us(basic)" + name[Group1]= "Russian (US, phonetic)"; key.type[group1]="FOUR_LEVEL_ALPHABETIC"; @@ -732,6 +726,7 @@ xkb_symbols "mac" { partial alphanumeric_keys xkb_symbols "colemak" { + include "us" name[Group1]= "English (Colemak)"; @@ -812,9 +807,8 @@ xkb_symbols "colemak" { partial alphanumeric_keys xkb_symbols "altgr-intl" { - name[Group1]= "English (international AltGr dead keys)"; - include "us(intl)" + name[Group1]= "English (international AltGr dead keys)"; // five dead keys moved into level3: @@ -1175,9 +1169,8 @@ xkb_symbols "chr" { partial alphanumeric_keys xkb_symbols "hbs" { - name[Group1]= "Serbo-Croatian (US)"; - include "us" + name[Group1]= "Serbo-Croatian (US)"; key { [ grave, asciitilde ] }; key { [ 6, dead_caron, asciicircum, asciicircum ] }; @@ -1247,9 +1240,8 @@ xkb_symbols "htcdream" { partial alphanumeric_keys xkb_symbols "workman" { - name[Group1]= "English (Workman)"; - include "us(basic)" + name[Group1]= "English (Workman)"; key { [ q, Q ] }; key { [ d, D ] }; @@ -1289,9 +1281,8 @@ xkb_symbols "workman" { partial alphanumeric_keys xkb_symbols "workman-intl" { - name[Group1]= "English (Workman, international with dead keys)"; - include "us(intl)" + name[Group1]= "English (Workman, international with dead keys)"; key { [ q, Q, adiaeresis, Adiaeresis ] }; key { [ d, D, eth, ETH ] }; @@ -1337,11 +1328,9 @@ xkb_symbols "workman-intl" { partial alphanumeric_keys xkb_symbols "norman" { - name[Group1]= "English (Norman)"; - include "us(basic)" + name[Group1]= "English (Norman)"; - // Alphanumeric section key { [ q, Q ] }; key { [ w, W ] }; key { [ d, D ] }; @@ -1371,7 +1360,6 @@ xkb_symbols "norman" { key { [ b, B ] }; key { [ p, P ] }; key { [ m, M ] }; - // End alphanumeric section key { [ BackSpace ] }; @@ -1383,6 +1371,7 @@ xkb_symbols "norman" { // Czech, Slovak and German charecters added as third level symbols to US keyboard layout. partial alphanumeric_keys xkb_symbols "cz_sk_de" { + include "us" name[Group1]="Czech Slovak and German (US)"; @@ -1518,7 +1507,6 @@ partial alphanumeric_keys xkb_symbols "ats" { include "us" - name[Group1]= "Atsina"; //Using Dead key to get COMBINING COMMA ABOVE for ejectives on @@ -1548,7 +1536,6 @@ partial alphanumeric_keys xkb_symbols "crd" { include "us" - name[Group1]= "Coeur d'Alene Salish"; key { [ w, W, U02B7, U02B7 ] }; -- cgit v1.2.3