diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | rules/base.xml.in | 89 | ||||
| -rw-r--r-- | symbols/am | 1 | ||||
| -rw-r--r-- | symbols/ara | 5 | ||||
| -rw-r--r-- | symbols/az | 4 | ||||
| -rw-r--r-- | symbols/be | 9 | ||||
| -rw-r--r-- | symbols/ben | 2 | ||||
| -rw-r--r-- | symbols/bg | 2 | ||||
| -rw-r--r-- | symbols/br | 3 | ||||
| -rw-r--r-- | symbols/by | 1 | ||||
| -rw-r--r-- | symbols/ca | 10 | ||||
| -rw-r--r-- | symbols/ch | 16 | ||||
| -rw-r--r-- | symbols/cz | 6 | ||||
| -rw-r--r-- | symbols/de | 18 | ||||
| -rw-r--r-- | symbols/deva | 2 | ||||
| -rw-r--r-- | symbols/dk | 2 | ||||
| -rw-r--r-- | symbols/ee | 1 | ||||
| -rw-r--r-- | symbols/es | 4 | ||||
| -rw-r--r-- | symbols/fi | 2 | ||||
| -rw-r--r-- | symbols/fo | 4 | ||||
| -rw-r--r-- | symbols/fr | 10 | ||||
| -rw-r--r-- | symbols/gb | 6 | ||||
| -rw-r--r-- | symbols/ge | 2 | ||||
| -rw-r--r-- | symbols/gr | 6 | ||||
| -rw-r--r-- | symbols/hr | 2 | ||||
| -rw-r--r-- | symbols/hu | 58 | ||||
| -rw-r--r-- | symbols/ie | 8 | ||||
| -rw-r--r-- | symbols/il | 6 | ||||
| -rw-r--r-- | symbols/is | 8 | ||||
| -rw-r--r-- | symbols/it | 2 | ||||
| -rw-r--r-- | symbols/latam | 4 | ||||
| -rw-r--r-- | symbols/lt | 4 | ||||
| -rw-r--r-- | symbols/lv | 6 | ||||
| -rw-r--r-- | symbols/mal | 2 | ||||
| -rw-r--r-- | symbols/mkd | 1 | ||||
| -rw-r--r-- | symbols/mt | 4 | ||||
| -rw-r--r-- | symbols/no | 6 | ||||
| -rw-r--r-- | symbols/ogam | 8 | ||||
| -rw-r--r-- | symbols/pl | 12 | ||||
| -rw-r--r-- | symbols/pt | 3 | ||||
| -rw-r--r-- | symbols/ro | 4 | ||||
| -rw-r--r-- | symbols/ru | 5 | ||||
| -rw-r--r-- | symbols/se | 6 | ||||
| -rw-r--r-- | symbols/sk | 8 | ||||
| -rw-r--r-- | symbols/smi | 10 | ||||
| -rw-r--r-- | symbols/srp | 22 | ||||
| -rw-r--r-- | symbols/syr | 2 | ||||
| -rw-r--r-- | symbols/tam | 8 | ||||
| -rw-r--r-- | symbols/th | 6 | ||||
| -rw-r--r-- | symbols/tr | 6 | ||||
| -rw-r--r-- | symbols/ua | 8 | ||||
| -rw-r--r-- | symbols/us | 9 |
52 files changed, 269 insertions, 171 deletions
@@ -1,3 +1,10 @@ +2005-01-16 svu + + * symbols, rules/base.xml.in: HUGE commit - adjusting the group names + according to the descriptions. + Also, some layouts were missing the default variants - added one. + Also, some default variants were listed in the variantLists - now they are removed. + 2005-01-06 svu * symbols/am, rules/base.xml.in: Removing old Armenian layout, diff --git a/rules/base.xml.in b/rules/base.xml.in index 76141fdf..d4877b48 100644 --- a/rules/base.xml.in +++ b/rules/base.xml.in @@ -754,12 +754,6 @@ <_description>Cyrillic</_description> </configItem> </variant> - <variant> - <configItem> - <name>latin</name> - <_description>Latin</_description> - </configItem> - </variant> </variantList> </layout> <layout> @@ -810,7 +804,14 @@ <_shortDescription>Ben</_shortDescription> <_description>Bengali</_description> </configItem> - <variantList/> + <variantList> + <variant> + <configItem> + <name>probhat</name> + <_description>Probhat</_description> + </configItem> + </variant> + </variantList> </layout> <layout> <configItem> @@ -829,12 +830,6 @@ <variantList> <variant> <configItem> - <name>abnt2</name> - <_description>abnt2</_description> - </configItem> - </variant> - <variant> - <configItem> <name>nodeadkeys</name> <_description>Eliminate dead keys</_description> </configItem> @@ -873,12 +868,6 @@ <variantList> <variant> <configItem> - <name>fr</name> - <_description>French</_description> - </configItem> - </variant> - <variant> - <configItem> <name>fr-dvorak</name> <_description>French Dvorak</_description> </configItem> @@ -1082,12 +1071,6 @@ <variantList> <variant> <configItem> - <name>la</name> - <_description>Latin</_description> - </configItem> - </variant> - <variant> - <configItem> <name>ru</name> <_description>Russian</_description> </configItem> @@ -1119,6 +1102,18 @@ <_description>Eliminate dead keys</_description> </configItem> </variant> + <variant> + <configItem> + <name>ro</name> + <_description>Romanian keyboard with German letters</_description> + </configItem> + </variant> + <variant> + <configItem> + <name>ro_nodeadkeys</name> + <_description>Romanian keyboard with German letters, eliminate dead keys</_description> + </configItem> + </variant> </variantList> </layout> <layout> @@ -1399,6 +1394,14 @@ </layout> <layout> <configItem> + <name>lao</name> + <_shortDescription>Lao</_shortDescription> + <_description>Laos</_description> + </configItem> + <variantList/> + </layout> + <layout> + <configItem> <name>latam</name> <_shortDescription>LAm</_shortDescription> <_description>Latin American</_description> @@ -1448,12 +1451,6 @@ <variantList> <variant> <configItem> - <name>basic</name> - <_description>Basic (RALT) variant</_description> - </configItem> - </variant> - <variant> - <configItem> <name>apostrophe</name> <_description>Apostrophe (') variant</_description> </configItem> @@ -1726,13 +1723,13 @@ <variant> <configItem> <name>latinyz</name> - <_description>Latin QWERTY</_description> + <_description>Latin qwerty</_description> </configItem> </variant> <variant> <configItem> <name>latinunicodeyz</name> - <_description>Latin Unicode QWERTY</_description> + <_description>Latin Unicode qwerty</_description> </configItem> </variant> <variant> @@ -1843,12 +1840,6 @@ <variantList> <variant> <configItem> - <name>de</name> - <_description>German</_description> - </configItem> - </variant> - <variant> - <configItem> <name>de_nodeadkeys</name> <_description>German, eliminate dead keys</_description> </configItem> @@ -1911,12 +1902,6 @@ <variantList> <variant> <configItem> - <name>TSCII</name> - <_description>Typewrite-style keymap; TSCII encoding</_description> - </configItem> - </variant> - <variant> - <configItem> <name>TAB</name> <_description>Typewrite-style keymap; TAB encoding</_description> </configItem> @@ -1952,12 +1937,6 @@ <variantList> <variant> <configItem> - <name>basic</name> - <_description>Kedmanee</_description> - </configItem> - </variant> - <variant> - <configItem> <name>tis</name> <_description>TIS-820.2538</_description> </configItem> @@ -2098,7 +2077,7 @@ <variant> <configItem> <name>laptop</name> - <_description>laptop</_description> + <_description>Laptop</_description> </configItem> </variant> </variantList> @@ -2112,12 +2091,6 @@ <variantList> <variant> <configItem> - <name>basic</name> - <_description>Norwegian</_description> - </configItem> - </variant> - <variant> - <configItem> <name>nodeadkeys</name> <_description>Eliminate dead keys</_description> </configItem> @@ -68,6 +68,7 @@ xkb_symbols "basic" { xkb_symbols "phonetic" { include "am(basic)" + name[Group1]= "Armenia - Phonetic"; key <BKSL> { [ 0x1000577, 0x1000547 ] }; diff --git a/symbols/ara b/symbols/ara index c83724c4..508ba870 100644 --- a/symbols/ara +++ b/symbols/ara @@ -71,11 +71,13 @@ xkb_symbols "basic" { partial alphanumeric_keys xkb_symbols "qwerty" { include "ara(basic)" + name[Group1]= "Arabic - qwerty"; }; partial alphanumeric_keys xkb_symbols "azerty" { include "ara(basic)" + name[Group1]= "Arabic - azerty"; // the north african arabic keyboard differs from the middle east one // by the numeric row; it follows French keyboard style @@ -103,6 +105,7 @@ xkb_symbols "azerty" { partial alphanumeric_keys xkb_symbols "digits" { include "ara(basic)" + name[Group1]= "Arabic - digits"; // use arabic script digits @@ -121,11 +124,13 @@ xkb_symbols "digits" { partial alphanumeric_keys xkb_symbols "qwerty_digits" { include "ara(digits)" + name[Group1]= "Arabic - qwerty/digits"; }; partial alphanumeric_keys xkb_symbols "azerty_digits" { include "ara(azerty)" + name[Group1]= "Arabic - azerty/digits"; key <AE01> { [ ampersand, 0x1000661 ] }; key <AE02> { [ eacute, 0x1000662 ] }; @@ -9,7 +9,7 @@ xkb_symbols "latin" { include "us" - name[Group1]= "Azerbaijan (Latin)"; + name[Group1]= "Azerbaijan"; key <TLDE> { [ grave, asciitilde, dead_grave, dead_tilde ] }; @@ -42,7 +42,7 @@ xkb_symbols "latin" { partial alphanumeric_keys xkb_symbols "cyrillic" { - name[Group1]= "Azerbaijan (Cyrillic)"; + name[Group1]= "Azerbaijan - Cyrillic"; key <AE02> {[ 2, quotedbl ] }; key <AE03> {[ 3, numbersign ] }; @@ -49,6 +49,7 @@ xkb_symbols "basic" { partial alphanumeric_keys xkb_symbols "iso-alternate" { include "be(basic)" + name[Group1]="Belgium - ISO Alternate"; key <AD01> { [ a, A, ae, AE ] }; key <AD02> { [ z, Z, guillemotleft, less ] }; @@ -59,11 +60,12 @@ xkb_symbols "iso-alternate" { }; partial alphanumeric_keys -xkb_symbols "Sundeadkeys" { +xkb_symbols "sundeadkeys" { // Use the Sun dead keys include "be(basic)" + name[Group1]="Belgium - Sun dead keys"; key <AD11> { [SunFA_Circum, SunFA_Diaeresis, bracketleft, bracketleft] }; key <AC11> { [ ugrave, percent, SunFA_Acute, SunFA_Acute ] }; @@ -73,11 +75,11 @@ xkb_symbols "Sundeadkeys" { }; partial alphanumeric_keys -xkb_symbols "sundeadkeys" { +xkb_symbols "Sundeadkeys" { // Use the Sun dead keys - include "be(Sundeadkeys)" + include "be(sundeadkeys)" }; @@ -87,6 +89,7 @@ xkb_symbols "nodeadkeys" { // Eliminates dead keys from the basic Belgian layout include "be(basic)" + name[Group1]="Belgium - Eliminate dead keys"; key <AE12> { [ minus, underscore, cedilla, ogonek ] }; key <AD11> { [asciicircum, diaeresis, bracketleft, bracketleft] }; diff --git a/symbols/ben b/symbols/ben index 4ac9653f..05fb783b 100644 --- a/symbols/ben +++ b/symbols/ben @@ -70,7 +70,7 @@ xkb_symbols "basic" { }; xkb_symbols "probhat" { - name[Group1]= "Bengali"; + name[Group1]= "Bengali - Probhat"; key <ESC> { [ Escape ] }; // numbers @@ -81,7 +81,7 @@ xkb_symbols "bds" { partial alphanumeric_keys xkb_symbols "phonetic" { - name[Group1]= "Bulgaria (phonetic)"; + name[Group1]= "Bulgaria - Phonetic"; key <TLDE> { [ Cyrillic_che, Cyrillic_CHE ] }; key <AE01> { [ 1, exclam ] }; @@ -9,10 +9,10 @@ // $XdotOrg: xc/programs/xkbcomp/symbols/br,v 1.1.4.3 2004/03/05 13:41:32 eich Exp $ // $XFree86: xc/programs/xkbcomp/symbols/br,v 1.3 2003/04/19 12:22:11 pascal Exp $ +default xkb_symbols "abnt2" { include "latin" - name[Group1]="Brazil"; key <AE02> { [ 2, at, twosuperior, onehalf ] }; @@ -53,6 +53,7 @@ partial alphanumeric_keys xkb_symbols "nodeadkeys" { include "br(abnt2)" // for consistent naming + name[Group1]="Brazil - Eliminate dead keys"; key <AE06> { [ 6, diaeresis, notsign, notsign ] }; key <AD11> { [apostrophe, grave ] }; @@ -62,6 +62,7 @@ xkb_symbols "basic" { partial alphanumeric_keys xkb_symbols "winkeys" { include "by(basic)" + name[Group1]= "Belarus - Winkeys"; key <AE04> { [ 4, semicolon ] }; key <AE03> { [ 3, numbersign ] }; key <AE05> { [ 5, percent ] }; @@ -2,7 +2,7 @@ default partial xkb_symbols "fr" { - name[Group1] = "Canada (French)"; + name[Group1] = "Canada"; key <TLDE> { [ numbersign, bar, backslash ] }; key <AE01> { [ 1, exclam, plusminus ] }; @@ -62,7 +62,7 @@ xkb_symbols "fr" { }; xkb_symbols "fr-dvorak" { - name[Group1] = "Canada (French Dvorak)"; + name[Group1] = "Canada - French Dvorak"; key <TLDE> { [ numbersign, bar, backslash ] }; key <AE01> { [ 1, exclam, plusminus ] }; @@ -124,7 +124,7 @@ xkb_symbols "fr-dvorak" { partial xkb_symbols "fr-legacy" { - name[Group1] = "Canada (French Legacy)"; + name[Group1] = "Canada - French (legacy)"; include "ca(fr)" @@ -170,7 +170,7 @@ xkb_symbols "fr-legacy" { partial xkb_symbols "multi" { - name[Group1] = "Canada (Multilingual)"; + name[Group1] = "Canada - Multilingual"; include "ca(fr)" @@ -208,7 +208,7 @@ xkb_symbols "multi" { partial xkb_symbols "multi-2gr" { - name[Group1] = "Canada (Multilingual group2)"; + name[Group1] = "Canada - Multilingual, second part"; key <TLDE> { [ VoidSymbol, hyphen ] }; key <AE01> { [ onesuperior, exclamdown ] }; @@ -13,7 +13,7 @@ xkb_symbols "basic" { include "latin" // Alphanumeric section - name[Group1]= "Switzerland (German)"; + name[Group1]= "Switzerland"; key <TLDE> { [ section, degree ] }; key <AE01> { [ 1, plus, bar, exclamdown ] }; key <AE02> { [ 2, quotedbl, at, oneeighth ] }; @@ -53,7 +53,7 @@ xkb_symbols "de" { partial alphanumeric_keys xkb_symbols "de_Sundeadkeys" { - // modify the default Swiss German layout to use Sun dead keys + // modify the basic Swiss German layout to use Sun dead keys include "ch(basic)" key <AE11> { [ apostrophe, question, SunFA_Acute ] }; key <AE12> { [ SunFA_Circum, SunFA_Grave, SunFA_Tilde ] }; @@ -63,12 +63,14 @@ xkb_symbols "de_Sundeadkeys" { partial alphanumeric_keys xkb_symbols "de_sundeadkeys" { include "ch(de_Sundeadkeys)" + name[Group1]= "Switzerland - German, Sun dead keys"; }; partial alphanumeric_keys xkb_symbols "de_nodeadkeys" { - // modify the default Swiss German layout not to have any dead keys + // modify the basic Swiss German layout not to have any dead keys include "ch(basic)" + name[Group1]= "Switzerland - German, eliminate dead keys"; key <AE11> { [ apostrophe, question, acute ] }; key <AE12> { [ asciicircum, grave, asciitilde ] }; key <AD12> { [ diaeresis, exclam, bracketright ] }; @@ -81,7 +83,7 @@ xkb_symbols "fr" { // keyboard and a very simple Swiss/French keybaord include "ch(basic)" - name[Group1]= "Switzerland (French)"; + name[Group1]= "Switzerland - French"; override key <AD11> { [ egrave, udiaeresis, bracketleft ] @@ -96,7 +98,7 @@ xkb_symbols "fr" { partial alphanumeric_keys xkb_symbols "fr_Sundeadkeys" { - // modify the default Swiss French layout to use Sun dead keys + // modify the basic Swiss French layout to use Sun dead keys include "ch(fr)" key <AE11> { [ apostrophe, question, SunFA_Acute ] }; key <AE12> { [ SunFA_Circum, SunFA_Grave, SunFA_Tilde ] }; @@ -106,12 +108,14 @@ xkb_symbols "fr_Sundeadkeys" { partial alphanumeric_keys xkb_symbols "fr_sundeadkeys" { include "ch(fr_Sundeadkeys)" + name[Group1]= "Switzerland - French, Sun dead keys"; }; partial alphanumeric_keys xkb_symbols "fr_nodeadkeys" { - // modify the default Swiss French layout not to have any dead keys + // modify the basic Swiss French layout not to have any dead keys include "ch(fr)" + name[Group1]= "Switzerland - French, eliminate dead keys"; key <AE11> { [ apostrophe, question, acute ] }; key <AE12> { [ asciicircum, grave, asciitilde ] }; key <AD12> { [ diaeresis, exclam, bracketright ] }; @@ -2,7 +2,7 @@ // $XFree86: xc/programs/xkbcomp/symbols/cz,v 1.2 2002/11/22 04:02:22 dawes // Exp $ -partial alphanumeric_keys +partial default alphanumeric_keys xkb_symbols "basic" { // This layout conforms to a new cz compromise standard designed @@ -79,6 +79,7 @@ xkb_symbols "basic" { // Use <BKSL> instead of <LSGT> (useful for keyboard without <LSGT> key) xkb_symbols "bksl" { include "cz(basic)" + name[Group1]= "Czechia - Extended Backslash"; key <BKSL> { [ backslash, bar, slash, NoSymbol ] }; }; @@ -91,6 +92,7 @@ xkb_symbols "qwerty" { // 2001 by Kamil Toman <ktoman@email.cz> include "cz(basic)" + name[Group1]= "Czechia - qwerty"; key <AB01> { [ z, Z, degree, NoSymbol ] }; key <AD06> { [ y, Y, NoSymbol, NoSymbol ] }; @@ -100,5 +102,7 @@ xkb_symbols "qwerty" { xkb_symbols "qwerty_bksl" { include "cz(qwerty)" + name[Group1]= "Czechia - qwerty, extended Backslash"; + key <BKSL> { [ backslash, bar, slash, NoSymbol ] }; }; @@ -4,6 +4,7 @@ // $XKeyboardConfig$ // $XFree86: xc/programs/xkbcomp/symbols/de,v 1.6 2003/09/08 13:12:51 pascal Exp $ +default xkb_symbols "basic" { include "latin(type4)" @@ -36,9 +37,10 @@ xkb_symbols "basic" { partial alphanumeric_keys xkb_symbols "nodeadkeys" { - // modify the default German layout to not have any dead keys + // modify the basic German layout to not have any dead keys include "de(basic)" + name[Group1]="Germany - Eliminate dead keys"; key <TLDE> { [asciicircum, degree, notsign, notsign ] }; key <AE12> { [ acute, grave, cedilla, cedilla ] }; @@ -52,11 +54,12 @@ xkb_symbols "nodeadkeys" { partial alphanumeric_keys xkb_symbols "deadgraveacute" { - // modify the default German layout to have only acute and grave + // modify the basic German layout to have only acute and grave // as dead keys (tilde and circumflex are needed as spacing characters // in many programming languages) include "de(basic)" + name[Group1]="Germany - Dead grave acute"; key <TLDE> { [asciicircum, degree, notsign, notsign ] }; key <AD12> { [ plus, asterisk, asciitilde, dead_macron ] }; @@ -65,18 +68,20 @@ xkb_symbols "deadgraveacute" { partial alphanumeric_keys xkb_symbols "deadacute" { - // modify the default German layout to have only acute as + // modify the basic German layout to have only acute as // dead keys (ASCII grave, tilde and circumflex are needed as // spacing characters in many programming languages and text formatters) include "de(deadgraveacute)" + name[Group1]="Germany - Dead acute"; + key <AE12> { [dead_acute, grave, dead_cedilla, dead_ogonek ] }; key <BKSL> { [numbersign, apostrophe, dead_grave, dead_grave ] }; }; partial alphanumeric_keys -xkb_symbols "de_ro" { +xkb_symbols "ro" { // add romanian-specific letters to the basic German layout. // Romanian symbols are accessible with combination of <AltGr> and // 'a', 's', 't', 'i', 'ä (ä)' (+<Shift> for capital letters). @@ -85,7 +90,7 @@ xkb_symbols "de_ro" { include "de(basic)" - name[Group1]="Romanian for German keyboard"; + name[Group1]="Germany - Romanian keyboard with German letters"; key <AD05> { [ t, T, tcedilla, Tcedilla ] }; key <AD08> { [ i, I, icircumflex, Icircumflex ] }; @@ -95,11 +100,12 @@ xkb_symbols "de_ro" { }; partial alphanumeric_keys -xkb_symbols "de_ro_nodeadkeys" { +xkb_symbols "ro_nodeadkeys" { // add romanian-specific letters to the German nodeadkeys layout. // Read the comment for de_ro ! include "de(nodeadkeys)" + name[Group1]="Germany - Romanian keyboard with German letters, eliminate dead keys"; key <AD05> { [ t, T, tcedilla, Tcedilla ] }; key <AD08> { [ i, I, icircumflex, Icircumflex ] }; diff --git a/symbols/deva b/symbols/deva index 1c614f0e..32f57333 100644 --- a/symbols/deva +++ b/symbols/deva @@ -4,7 +4,7 @@ partial default alphanumeric_keys xkb_symbols "basic" { - name[Group1]= "Hindi"; + name[Group1]= "Devanagari"; key <TLDE> { [ 0x100094A, 0x1000912 ] }; @@ -33,6 +33,8 @@ xkb_symbols "nodeadkeys" { include "dk(basic)" + name[Group1]="Denmark - Eliminate dead keys"; + key <AE12> { [ acute, grave, bar, ogonek ] }; key <AD11> { [ aring, Aring, diaeresis, degree ] }; key <AD12> { [ diaeresis, asciicircum, asciitilde, macron ] }; @@ -44,6 +44,7 @@ xkb_symbols "nodeadkeys" { // Modifies the basic Estonian layout to eliminate all dead keys include "ee(basic)" + name[Group1]="Estonia - Eliminate dead keys"; key <TLDE> { [asciicircum,asciitilde ] }; key <AE12> { [apostrophe, grave ] }; @@ -44,6 +44,8 @@ partial alphanumeric_keys xkb_symbols "sundeadkeys" { include "es(Sundeadkeys)" + + name[Group1]="Spain - Sun dead keys"; }; partial alphanumeric_keys @@ -51,6 +53,8 @@ xkb_symbols "nodeadkeys" { include "es(basic)" + name[Group1]="Spain - Eliminate dead keys"; + key <AD11> { [ grave, asciicircum, bracketleft, degree ] }; key <AD12> { [ plus, asterisk, bracketright, macron ] }; key <AC10> { [ ntilde, Ntilde, asciitilde, doubleacute ] }; @@ -68,6 +68,8 @@ xkb_symbols "nodeadkeys" { include "latin(type2_nodeadkeys)" include "fi(fi)" + name[Group1]="Finland - Eliminate dead keys"; + key <AE12> { [ acute, grave ] }; key <AD12> { [ diaeresis, asciicircum, asciitilde, caron ] }; }; @@ -1,6 +1,6 @@ // $XKeyboardConfig$ -partial alphanumeric_keys +partial default alphanumeric_keys xkb_symbols "basic" { include "latin(type2)" @@ -37,6 +37,8 @@ xkb_symbols "nodeadkeys" { include "fo(basic)" + name[Group1]= "Faroe Islands - Eliminate dead keys"; + key <AE12> { [ acute, grave, bar, ogonek ] }; key <AD11> { [ aring, Aring, diaeresis, degree ] }; key <AD12> { [ diaeresis, asciicircum, asciitilde, macron ] }; @@ -60,6 +60,7 @@ partial alphanumeric_keys xkb_symbols "sundeadkeys" { include "fr(Sundeadkeys)" + name[Group1]="France - Sun dead keys"; }; partial alphanumeric_keys @@ -69,6 +70,8 @@ xkb_symbols "nodeadkeys" { include "fr(basic)" + name[Group1]="France - Eliminate dead keys"; + key <AE12> { [ equal, plus, braceright, ogonek ] }; key <AD11> { [asciicircum, diaeresis ] }; key <AD12> { [ dollar, sterling, currency, macron ] }; @@ -150,7 +153,7 @@ xkb_symbols "latin9" { include "latin" - name[Group1]="fr-latin9"; + name[Group1]="France - Alternative"; key <TLDE> { [ oe, OE, leftdoublequotemark, rightdoublequotemark ] }; key <AE01> { [ ampersand, 1, dead_acute, periodcentered ] }; @@ -231,6 +234,7 @@ xkb_symbols "latin9_sundeadkeys" { include "fr(latin9_Sundeadkeys)" + name[Group1]="France - Alternative, Sun dead keys"; }; partial alphanumeric_keys @@ -240,6 +244,8 @@ xkb_symbols "latin9_nodeadkeys" { include "fr(latin9)" + name[Group1]="France - Alternative, eliminate dead keys"; + key <AE01> { [ ampersand, 1, apostrophe, periodcentered ] }; key <AE07> { [ egrave, 7, grave, Egrave ] }; key <AE12> { [ equal, plus, braceright ] }; @@ -252,7 +258,7 @@ xkb_symbols "latin9_nodeadkeys" { partial alphanumeric_keys xkb_symbols "dvorak" { - name[Group1]= "French dvorak"; + name[Group1]= "France - Dvorak"; key <TLDE> { [ oe, OE, ae, AE ] }; @@ -29,7 +29,7 @@ xkb_symbols "basic" { include "level3(ralt_switch)" }; -partial default alphanumeric_keys +partial alphanumeric_keys xkb_symbols "intl" { // Describes the differences between a very simple en_US @@ -45,7 +45,7 @@ xkb_symbols "intl" { include "latin" - name[Group1]="United Kingdom"; + name[Group1]="United Kingdom - International (with dead keys)"; key <AE02> { [ 2, dead_diaeresis, twosuperior, onehalf ] }; key <AE03> { [ 3, sterling, threesuperior, onethird ] }; @@ -68,6 +68,8 @@ partial alphanumeric_keys xkb_symbols "dvorak" { include "us(dvorak)" + name[Group1]="United Kingdom - Dvorak"; + key <BKSL> { [ numbersign, asciitilde ] }; key <AE02> { [ 2, quotedbl, twosuperior, NoSymbol ] }; key <AE03> { [ 3, sterling, threesuperior, NoSymbol ] }; @@ -60,7 +60,7 @@ xkb_symbols "la" { partial alphanumeric_keys xkb_symbols "ru" { - name[Group1]= "Georgia"; + name[Group1]= "Georgia - Russian"; key <TLDE> { [ asciicircum, asciitilde ] }; key <AE01> { [ 1, exclam ] }; @@ -85,6 +85,8 @@ xkb_symbols "extended" { include "gr(basic)" + name[Group1] = "Greece - Extended"; + key.type = "THREE_LEVEL"; key <AE05> { [ 5, percent, EuroSign ] }; @@ -103,6 +105,8 @@ xkb_symbols "polytonic" { include "gr(extended)" + name[Group1] = "Greece - Polytonic"; + key.type = "THREE_LEVEL"; key <AD11> { [ dead_tilde, dead_diaeresis, dead_macron ] }; @@ -118,6 +122,8 @@ xkb_symbols "nodeadkeys" { include "gr(basic)" + name[Group1] = "Greece - Eliminate dead keys"; + key <AC10> { [ semicolon, colon ] }; }; @@ -57,7 +57,7 @@ xkb_symbols "us" { // by Vlatko Kosturjak (kost at linux.hr) // Alphanumeric section - name[Group1]= "Croatia (US)"; + name[Group1]= "Croatia - US keyboard with Croatian letters"; key <AD01> { [ q, Q ], [ backslash ] }; key <AD02> { [ w, W ], @@ -23,25 +23,29 @@ // Default layout default partial xkb_symbols "basic" { - include "hu(102_qwertz_comma_dead)" +include "hu(102_qwertz_comma_dead)" +name[Group1] = "Hungary"; }; // Standard layout partial xkb_symbols "standard" { - include "hu(102_qwertz_comma_dead)" +include "hu(102_qwertz_comma_dead)" +name[Group1] = "Hungary - Standard"; }; // Standard layout without dead key support partial xkb_symbols "nodeadkeys" { - include "hu(102_qwertz_comma_nodead)" +include "hu(102_qwertz_comma_nodead)" +name[Group1] = "Hungary - Eliminate dead keys"; }; // Qwerty layout partial xkb_symbols "qwerty" { - include "hu(101_qwerty_comma_dead)" +include "hu(101_qwerty_comma_dead)" +name[Group1] = "Hungary - qwerty"; }; // Main layouts @@ -52,14 +56,14 @@ xkb_symbols "qwerty" { // and with dead key support partial xkb_symbols "101_qwertz_comma_dead" { - name[Group1] = "Hungary"; - include "latin" - include "hu(def_101)" - include "hu(def_qwertz)" - include "keypad(comma)" - include "hu(def_dead)" - include "hu(def_common)" - include "level3(ralt_switch)" +name[Group1] = "Hungary - 101/qwertz/comma/Dead keys"; +include "latin" +include "hu(def_101)" +include "hu(def_qwertz)" +include "keypad(comma)" +include "hu(def_dead)" +include "hu(def_common)" +include "level3(ralt_switch)" }; // 101_qwertz_comma_nodead @@ -68,7 +72,7 @@ xkb_symbols "101_qwertz_comma_dead" { // and without dead key support partial xkb_symbols "101_qwertz_comma_nodead" { - name[Group1] = "Hungary"; + name[Group1] = "Hungary - 101/qwertz/comma/Eliminate dead keys"; include "latin" include "hu(def_101)" include "hu(def_qwertz)" @@ -84,7 +88,7 @@ xkb_symbols "101_qwertz_comma_nodead" { // and with dead key support partial xkb_symbols "101_qwertz_dot_dead" { - name[Group1] = "Hungary"; + name[Group1] = "Hungary - 101/qwertz/dot/Dead keys"; include "latin" include "hu(def_101)" include "hu(def_qwertz)" @@ -100,7 +104,7 @@ xkb_symbols "101_qwertz_dot_dead" { // and without dead key support partial xkb_symbols "101_qwertz_dot_nodead" { - name[Group1] = "Hungary"; + name[Group1] = "Hungary - 101/qwertz/dot/Eliminate dead keys"; include "latin" include "hu(def_101)" include "hu(def_qwertz)" @@ -116,7 +120,7 @@ xkb_symbols "101_qwertz_dot_nodead" { // and with dead key support partial xkb_symbols "101_qwerty_comma_dead" { - name[Group1] = "Hungary"; + name[Group1] = "Hungary - 101/qwerty/comma/Dead keys"; include "latin" include "hu(def_101)" include "hu(def_qwerty)" @@ -132,7 +136,7 @@ xkb_symbols "101_qwerty_comma_dead" { // and without dead key support partial xkb_symbols "101_qwerty_comma_nodead" { - name[Group1] = "Hungary"; + name[Group1] = "Hungary - 101/qwerty/comma/Eliminate dead keys"; include "latin" include "hu(def_101)" include "hu(def_qwerty)" @@ -148,7 +152,7 @@ xkb_symbols "101_qwerty_comma_nodead" { // and with dead key support partial xkb_symbols "101_qwerty_dot_dead" { - name[Group1] = "Hungary"; + name[Group1] = "Hungary - 101/qwerty/dot/Dead keys"; include "latin" include "hu(def_101)" include "hu(def_qwerty)" @@ -164,7 +168,7 @@ xkb_symbols "101_qwerty_dot_dead" { // and without dead key support partial xkb_symbols "101_qwerty_dot_nodead" { - name[Group1] = "Hungary"; + name[Group1] = "Hungary - 101/qwerty/dot/Eliminate dead keys"; include "latin" include "hu(def_101)" include "hu(def_qwerty)" @@ -180,7 +184,7 @@ xkb_symbols "101_qwerty_dot_nodead" { // and with dead key support partial xkb_symbols "102_qwertz_comma_dead" { - name[Group1] = "Hungary"; + name[Group1] = "Hungary - 102/qwertz/comma/Dead keys"; include "latin" include "hu(def_102)" include "hu(def_qwertz)" @@ -196,7 +200,7 @@ xkb_symbols "102_qwertz_comma_dead" { // and without dead key support partial xkb_symbols "102_qwertz_comma_nodead" { - name[Group1] = "Hungary"; + name[Group1] = "Hungary - 102/qwertz/comma/Eliminate dead keys"; include "latin" include "hu(def_102)" include "hu(def_qwertz)" @@ -212,7 +216,7 @@ xkb_symbols "102_qwertz_comma_nodead" { // and with dead key support partial xkb_symbols "102_qwertz_dot_dead" { - name[Group1] = "Hungary"; + name[Group1] = "Hungary - 102/qwertz/dot/Dead keys"; include "latin" include "hu(def_102)" include "hu(def_qwertz)" @@ -228,7 +232,7 @@ xkb_symbols "102_qwertz_dot_dead" { // and without dead key support partial xkb_symbols "102_qwertz_dot_nodead" { - name[Group1] = "Hungary"; + name[Group1] = "Hungary - 102/qwertz/dot/Eliminate dead keys"; include "latin" include "hu(def_102)" include "hu(def_qwertz)" @@ -244,7 +248,7 @@ xkb_symbols "102_qwertz_dot_nodead" { // and with dead key support partial xkb_symbols "102_qwerty_comma_dead" { - name[Group1] = "Hungary"; + name[Group1] = "Hungary - 102/qwerty/comma/Dead keys"; include "latin" include "hu(def_102)" include "hu(def_qwerty)" @@ -260,7 +264,7 @@ xkb_symbols "102_qwerty_comma_dead" { // and without dead key support partial xkb_symbols "102_qwerty_comma_nodead" { - name[Group1] = "Hungary"; + name[Group1] = "Hungary - 102/qwerty/comma/Eliminate dead keys"; include "latin" include "hu(def_102)" include "hu(def_qwerty)" @@ -276,7 +280,7 @@ xkb_symbols "102_qwerty_comma_nodead" { // and with dead key support partial xkb_symbols "102_qwerty_dot_dead" { - name[Group1] = "Hungary"; + name[Group1] = "Hungary - 102/qwerty/dot/Dead keys"; include "latin" include "hu(def_102)" include "hu(def_qwerty)" @@ -292,7 +296,7 @@ xkb_symbols "102_qwerty_dot_dead" { // and without dead key support partial xkb_symbols "102_qwerty_dot_nodead" { - name[Group1] = "Hungary"; + name[Group1] = "Hungary - 102/qwerty/dot/Eliminate dead keys"; include "latin" include "hu(def_102)" include "hu(def_qwerty)" @@ -123,6 +123,9 @@ xkb_symbols "laptop" { // For laptops which don't have the RWIN key but are otherwise // the same as 105-key layouts. include "ie(basic)" + + name[Group1] = "Ireland - Laptop"; + key <MENU> { type[Group1]="TWO_LEVEL", [ Multi_key, ISO_Next_Group ] }; }; @@ -142,7 +145,7 @@ xkb_symbols "CloGaelach" { include "ie(basic)" - name[Group1] = "Ireland (Clo Gaelach)"; + name[Group1] = "Ireland - CloGaelach"; key <TLDE> { [ grave, notsign, brokenbar, ssharp ] }; key <AD04> { [ r, R, 0x100027C, registered ] }; @@ -169,6 +172,7 @@ xkb_symbols "CloGaelachLaptop" { // For laptops which don't have the RWIN key but are otherwise // the same as 105-key layouts. include "ie(CloGaelach)" + name[Group1] = "Ireland - CloGaelach Laptop"; key <MENU> { type[Group1]="TWO_LEVEL", [ Multi_key, ISO_Next_Group ] }; }; @@ -177,7 +181,7 @@ xkb_symbols "UnicodeExpert" { // This should eventually be a "Unicode Expert" layout like the Mac one. - name[Group1] = "Ireland (Unicode Expert)"; + name[Group1] = "Ireland - UnicodeExpert"; // // Numeric row `1234567890-= @@ -60,7 +60,7 @@ xkb_symbols "basic" { // nikud patter based on Dekel Tsur's Hebrew mapping for LyX partial alphanumeric_keys xkb_symbols "lyx" { - name[Group1]= "Israel"; + name[Group1]= "Israel - lyx"; key <TLDE> { [ semicolon, asciitilde ] }; // On some key (e.g. AD01, right below) there is not yet mapping for the @@ -119,7 +119,7 @@ xkb_symbols "lyx" { // layout. partial alphanumeric_keys xkb_symbols "si1452" { - name[Group1]= "Israel"; + name[Group1]= "Israel - si1452"; include "il(basic)" @@ -159,7 +159,7 @@ xkb_symbols "phonetic" { // uses the phonetic layout from old Slackware 'il.map' file - name[Group1]= "Israel (phonetic)"; + name[Group1]= "Israel - Phonetic"; key <AE12> { [ equal, plus ], [ hebrew_doublelowline, hebrew_doublelowline ]}; @@ -34,10 +34,12 @@ xkb_symbols "basic" { partial alphanumeric_keys xkb_symbols "Sundeadkeys" { - // modify the default Icelandic layout to use Sun dead keys + // modify the basic Icelandic layout to use Sun dead keys include "is(basic)" + name[Group1]="Iceland - Sun dead keys"; + key <TLDE> { [SunFA_Circum, degree, notsign, notsign ] }; key <AE12> { [SunFA_Acute, SunFA_Grave, SunFA_Cedilla, SunFA_Cedilla ] }; key <AD11> { [udiaeresis, Udiaeresis, SunFA_Diaeresis, SunFA_Diaeresis ] }; @@ -50,10 +52,12 @@ xkb_symbols "Sundeadkeys" { partial alphanumeric_keys xkb_symbols "nodeadkeys" { - // modify the default Icelandic layout to not have any dead keys + // modify the basic Icelandic layout to not have any dead keys include "is(basic)" + name[Group1]="Iceland - Eliminate dead keys"; + key <TLDE> { [asciicircum, degree, notsign, notsign ] }; key <AE12> { [apostrophe, grave, cedilla, cedilla ] }; key <AD11> { [udiaeresis, Udiaeresis, diaeresis, diaeresis ] }; @@ -47,6 +47,8 @@ xkb_symbols "nodeadkeys" { include "it(basic)" + name[Group1]="Italy - Eliminate dead keys"; + key <AE02> { [ 2, quotedbl, twosuperior, doubleacute ] }; key <AE03> { [ 3, sterling,threesuperior, asciitilde ] }; diff --git a/symbols/latam b/symbols/latam index 10fdb7d6..02372d8b 100644 --- a/symbols/latam +++ b/symbols/latam @@ -42,7 +42,7 @@ xkb_symbols "Sundeadkeys" { partial alphanumeric_keys xkb_symbols "sundeadkeys" { include "latam(Sundeadkeys)" - + name[Group1]="Latin American - Sun dead keys"; }; partial alphanumeric_keys @@ -50,6 +50,8 @@ xkb_symbols "nodeadkeys" { include "latam(basic)" + name[Group1]="Latin American - Eliminate dead keys"; + key <AE12> { [questiondown, exclamdown, cedilla, ogonek ] }; key <AD11> { [ grave, asciicircum, bracketleft, degree ] }; key <AD12> { [ plus, asterisk, bracketright, macron ] }; @@ -43,7 +43,7 @@ xkb_symbols "us" { include "latin" - name[Group1]="Lithuania"; + name[Group1]="Lithuania - US keyboard with Lithuanian letters"; key <AE01> { [ 1, exclam, aogonek, Aogonek ] }; key <AE02> { [ 2, at, ccaron, Ccaron ] }; @@ -75,7 +75,7 @@ xkb_symbols "std" { include "latin" - name[Group1]= "Lithuania"; + name[Group1]= "Lithuania - Standard"; key <TLDE> {[ grave, asciitilde, acute ]}; key <AE01> {[ exclam, 1, at ]}; @@ -95,6 +95,8 @@ xkb_symbols "apostrophe" { include "lv(basic)" + name[Group1]= "Latvia - Apostrophe (') variant"; + key <AC11> {[ISO_Level3_Latch, quotedbl, apostrophe, quotedbl]}; key <SPCE> {[space, space, apostrophe]}; modifier_map Mod5 { <AC11> }; @@ -106,6 +108,8 @@ xkb_symbols "tilde" { include "lv(basic)" + name[Group1]= "Latvia - Tilde (~) variant"; + key <TLDE> {[ISO_Level3_Latch, asciitilde, grave, acute]}; key <SPCE> {[space, space, asciitilde]}; modifier_map Mod5 { <TLDE> }; @@ -117,6 +121,8 @@ xkb_symbols "fkey" { include "lv(basic)" + name[Group1]= "Latvia - F-letter (F) variant"; + key <AC04> {[ISO_Level3_Latch, ISO_Level3_Latch, f, F]}; key <SPCE> {[space, space, f, F]}; modifier_map Mod5 { <AC04> }; diff --git a/symbols/mal b/symbols/mal index fec72bf3..052afe9a 100644 --- a/symbols/mal +++ b/symbols/mal @@ -79,6 +79,8 @@ xkb_symbols "mlplusnum" { include "mal(basic)" + name[Group1] = "Malayalam - With Malayalam digits"; + key <AE01> { [ 0x01000d67 , exclam ] }; key <AE02> { [ 0x01000d68 , at ] }; key <AE03> { [ 0x01000d69 , numbersign ] }; diff --git a/symbols/mkd b/symbols/mkd index b39f8473..a8b64f85 100644 --- a/symbols/mkd +++ b/symbols/mkd @@ -62,5 +62,6 @@ xkb_symbols "basic" { partial alphanumeric_keys xkb_symbols "nodeadkeys" { include "mkd(basic)" + name[Group1]= "Macedonian - Eliminate dead keys"; key <TLDE> { [ grave, asciitilde ] }; }; @@ -38,7 +38,7 @@ xkb_symbols "basic" { // Maltese keyboard map (based on MSA Standard DMS100, annex A) // by Ramon Casha (ramon.casha@linux.org.mt) -partial default alphanumeric_keys +partial alphanumeric_keys xkb_symbols "us" { include "mt(basic)" @@ -46,7 +46,7 @@ xkb_symbols "us" { // Describes the differences between the mt // keyboard and a US-based physical keyboard - name[Group1]="Maltese (US layout)"; + name[Group1]="Malta - US keyboard with Maltian letters"; key <BKSL> { [ zabovedot, Zabovedot, backslash, bar ] }; @@ -4,7 +4,7 @@ // $XKeyboardConfig$ // $XFree86: xc/programs/xkbcomp/symbols/no,v 1.3 2002/12/19 01:07:56 dawes Exp $ -partial alphanumeric_keys +partial default alphanumeric_keys xkb_symbols "basic" { // Describes the differences between a very simple en_US @@ -38,6 +38,8 @@ xkb_symbols "nodeadkeys" { include "no(basic)" + name[Group1]="Norway - Eliminate dead keys"; + key <AE12> { [ backslash, grave, acute, ogonek ] }; key <AD12> { [ diaeresis, asciicircum, asciitilde, macron ] }; key <AC10> { [ oslash, Ooblique, acute, doubleacute ] }; @@ -51,6 +53,8 @@ partial alphanumeric_keys xkb_symbols "dvorak" { include "us(dvorak)" + name[Group1]="Norway - Dvorak"; + key <TLDE> { [ bar, section, brokenbar, paragraph ] }; key <AE01> { [ 1, exclam, exclamdown, onesuperior ] }; diff --git a/symbols/ogam b/symbols/ogam index 36feb531..aa17f112 100644 --- a/symbols/ogam +++ b/symbols/ogam @@ -83,6 +83,9 @@ xkb_symbols "laptop" { // For laptops which don't have the RWIN key but are otherwise // the same as 105-key layouts. include "ogam(basic)" + + name[Group1] = "Ogham - Laptop"; + key <MENU> { type[Group1]="TWO_LEVEL", [ Multi_key, ISO_Next_Group ] }; }; @@ -93,7 +96,7 @@ xkb_symbols "is434" { // This has the full layout of IS434 with an Irish QWERTY keyboard, // and the Ogham characters accessed when CAPS LOCK is on. - name[Group1] = "Ogham (IS434)"; + name[Group1] = "Ogham - IS434"; key.type[Group1] = "THREE_LEVEL"; @@ -197,6 +200,9 @@ xkb_symbols "is434laptop" { // For laptops which don't have the RWIN key but are otherwise // the same as 105-key layouts. include "ogam(is434)" + + name[Group1] = "Ogham - IS434 laptop"; + key <MENU> { type[Group1]="TWO_LEVEL", [ Multi_key, ISO_Next_Group ] }; }; @@ -35,7 +35,7 @@ xkb_symbols "qwertz" { include "latin(type3)" - name[Group1]="Poland"; + name[Group1]="Poland - qwertz"; key <AE01> { [ 1, exclam, asciitilde, exclamdown ] }; key <AE02> { [ 2, quotedbl, dead_caron, oneeighth ] }; @@ -73,8 +73,8 @@ xkb_symbols "qwertz" { // Polish Dvorak keymaps // by Rafal Rzepecki <divide@users.sf.net> -// The default keymap "pl" places Polish quotes on quotemark key and -// moves the dead symbols from there to "1/!" key. If you are used to default +// The base keymap "pl" places Polish quotes on quotemark key and +// moves the dead symbols from there to "1/!" key. If you are used to common // dead keys placement, you could use "pl_altquotes"; in this layout // dead keys remain in the old place, whereas Polish quotes are placed on the // "1/!" key. If you do not use Polish quotes at all, you can use "pl_basic" map. @@ -84,7 +84,7 @@ partial alphanumeric_keys xkb_symbols "dvorak" { include "us(dvorak)" - name[Group1] = "Poland (Dvorak)"; + name[Group1] = "Poland - Dvorak"; key <AD08> { [ c, C, cacute, Cacute ] }; key <AD10> { [ l, L, lstroke, Lstroke ] }; @@ -110,6 +110,8 @@ partial alphanumeric_keys xkb_symbols "dvorak_quotes" { include "pl(dvorak)" + name[Group1] = "Poland - Dvorak, Polish quotes on quotemark key"; + key <AD01> { [ apostrophe, quotedbl, doublelowquotemark, rightdoublequotemark ] }; // Dead symbols moved to this key @@ -121,5 +123,7 @@ partial alphanumeric_keys xkb_symbols "dvorak_altquotes" { include "pl(dvorak)" + name[Group1] = "Poland - Dvorak, Polish quotes on key 1/!"; + key <AE01> { [ 1, exclam, doublelowquotemark, rightdoublequotemark ] }; }; @@ -42,6 +42,7 @@ partial alphanumeric_keys xkb_symbols "sundeadkeys" { include "pt(Sundeadkeys)" // for consistent naming + name[Group1]="Portugal - Sun dead keys"; }; partial alphanumeric_keys @@ -49,6 +50,8 @@ xkb_symbols "nodeadkeys" { include "pt(basic)" // for consistent naming + name[Group1]="Portugal - Eliminate dead keys"; + key <AE12> { [guillemotleft, guillemotright, cedilla, ogonek ] }; key <AD11> { [ plus, asterisk, quotedbl, quotedbl ] }; key <AD12> { [ acute, grave ] }; @@ -70,7 +70,7 @@ xkb_symbols "us" { include "latin" - name[Group1]="Romanian for us-keyboard"; + name[Group1]="Romania - US keyboard with Romanian letters "; key <AD01> { [ q, Q, acircumflex, Acircumflex ] }; key <AD05> { [ t, T, tcedilla, Tcedilla ] }; @@ -91,7 +91,7 @@ xkb_symbols "de" { include "ro(basic)" - name[Group1]="German for Romanian keyboard"; + name[Group1]="Romania - Romanian keyboard with German letters"; key <AD07> { [ u, U, udiaeresis, Udiaeresis ] }; key <AD09> { [ o, O, odiaeresis, Odiaeresis ] }; @@ -72,6 +72,7 @@ key.type[group1]="TWO_LEVEL"; partial alphanumeric_keys xkb_symbols "winkeys" { include "ru(basic)" + name[Group1]= "Russia - Winkeys"; key <AE03> { [ 3, numerosign ] }; key <AE04> { [ 4, semicolon ] }; key <AE05> { [ 5, percent ] }; @@ -85,6 +86,7 @@ xkb_symbols "winkeys" { partial alphanumeric_keys xkb_symbols "typewriter" { include "ru(basic)" + name[Group1]= "Russia - Typewriter"; key <TLDE> { [ apostrophe, quotedbl ] }; key <AE01> { [ exclam, 1 ] }; key <AE02> { [ numerosign, 2 ] }; @@ -107,7 +109,7 @@ key.type[group1]="ALPHABETIC"; partial alphanumeric_keys xkb_symbols "phonetic" { - name[Group1]= "Russia (phonetic)"; + name[Group1]= "Russia - Phonetic"; key <AE01> { [ 1, exclam ] }; key <AE02> { [ 2, at ] }; @@ -169,6 +171,7 @@ key.type[group1]="ALPHABETIC"; partial alphanumeric_keys xkb_symbols "rstu" { include "ru(basic)" + name[Group1]= "Russia - Ukrainian standard RSTU"; key <TLDE> { [ apostrophe, question ] }; key <AE01> { [ exclam, 1 ] }; @@ -4,7 +4,7 @@ // $XKeyboardConfig$ // $XFree86: xc/programs/xkbcomp/symbols/se,v 1.5 2003/01/26 02:01:48 dawes Exp $ -partial alphanumeric_keys +partial default alphanumeric_keys xkb_symbols "basic" { include "latin(type2)" include "se(se)" @@ -42,6 +42,8 @@ xkb_symbols "nodeadkeys" { include "latin(type2_nodeadkeys)" include "se(se)" + name[Group1]="Sweden - Eliminate dead keys"; + key <AE12> { [ acute, grave, plusminus, notsign ] }; }; @@ -51,6 +53,8 @@ partial alphanumeric_keys xkb_symbols "dvorak" { include "no(dvorak)" + name[Group1]="Sweden - Dvorak"; + key <TLDE> { [ section, onehalf ] }; key <AE04> { [ 4, currency, dollar, onequarter ] }; @@ -3,7 +3,7 @@ // $XFree86: xc/programs/xkbcomp/symbols/sk,v 1.2 2002/11/22 04:02:22 dawes // Exp $ -partial alphanumeric_keys +partial default alphanumeric_keys xkb_symbols "basic" { // This layout conforms to a new sk compromise standard designed @@ -81,6 +81,8 @@ xkb_symbols "basic" { xkb_symbols "bksl" { include "sk(basic)" + name[Group1] = "Slovakia - Extended Backslash"; + key <BKSL> { [ backslash, bar, slash, NoSymbol ] }; }; @@ -93,6 +95,8 @@ xkb_symbols "qwerty" { include "sk(basic)" + name[Group1] = "Slovakia - qwerty"; + key <AB01> { [ z, Z, degree, NoSymbol ] }; key <AD06> { [ y, Y, NoSymbol, NoSymbol ] }; }; @@ -101,5 +105,7 @@ xkb_symbols "qwerty" { xkb_symbols "qwerty_bksl" { include "sk(qwerty)" + name[Group1] = "Slovakia - qwerty, extended Backslash"; + key <BKSL> { [ backslash, bar, slash, NoSymbol ] }; }; diff --git a/symbols/smi b/symbols/smi index 2ca6fe11..0154b7e4 100644 --- a/symbols/smi +++ b/symbols/smi @@ -11,11 +11,11 @@ // // $XFree86: xc/programs/xkbcomp/symbols/sapmi,v 1.2 2002/11/22 04:03:28 dawes Exp $ -partial alphanumeric_keys +partial default alphanumeric_keys xkb_symbols "basic" { include "latin" - name[Group1]= "Sami languages (Other)"; + name[Group1]= "Northern Saami"; key <AE01> { [ 1, exclam, copyright, exclamdown ] }; key <AE02> { [ 2, quotedbl, at, registered ] }; @@ -71,7 +71,7 @@ xkb_symbols "basic" { include "level3(ralt_switch)" }; - xkb_symbols "sefi" { +xkb_symbols "sefi" { // Describes the differences between a Norwegian Northern Sami // (keyboard with dead key support) and a Swedish/Finnish Sami @@ -80,6 +80,8 @@ xkb_symbols "basic" { include "smi(basic)" + name[Group1]= "Northern Saami - Finish and Swedish"; + key <AC10> { [odiaeresis, Odiaeresis, oslash, Ooblique ] }; key <AC11> { [adiaeresis, Adiaeresis, ae, AE ] }; }; @@ -91,5 +93,7 @@ xkb_symbols "nodeadkeys" { include "smi(basic)" + name[Group1]= "Northern Saami - Eliminate dead keys"; + key <AE12> { [ backslash, grave, acute, ogonek ] }; }; diff --git a/symbols/srp b/symbols/srp index 67e7ea82..18b448ba 100644 --- a/symbols/srp +++ b/symbols/srp @@ -11,9 +11,9 @@ // $XKeyboardConfig$ default partial alphanumeric_keys -xkb_symbols "default" { +xkb_symbols "basic" { - name[Group1]= "Serbian Cyrillic"; + name[Group1]= "Serbian"; include "srp(level3)" include "srp(common)" @@ -25,9 +25,9 @@ partial alphanumeric_keys xkb_symbols "yz" { // Cyrillic_zhe and Cyrillic_ze swapped. - name[Group1]= "Serbian Cyrillic (swap Zhe, Ze)"; + name[Group1]= "Serbian - Z and ZHE swapped"; - include "srp(default)" + include "srp(basic)" key <AD06> { [ Cyrillic_zhe, Cyrillic_ZHE, any,any ] }; // y key <AB01> { [ Cyrillic_ze, Cyrillic_ZE, any,any ] }; // z @@ -214,7 +214,7 @@ xkb_symbols "level3" { partial alphanumeric_keys xkb_symbols "latin" { - name[Group1]= "Serbian Latin"; + name[Group1]= "Serbian - Latin"; include "srp(level3)" include "srp(common)" @@ -227,7 +227,7 @@ 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. - name[Group1]= "Serbian Latin Unicode"; + name[Group1]= "Serbian - Latin Unicode"; include "srp(latin)" include "srp(twoletter)" @@ -237,7 +237,7 @@ partial alphanumeric_keys xkb_symbols "latinyz" { // For those who insist on using "english-position" Z and Y. - name[Group1]= "Serbian Latin (swap Y, Z)"; + name[Group1]= "Serbian - Latin qwerty"; include "srp(latin)" @@ -249,7 +249,7 @@ partial alphanumeric_keys xkb_symbols "latinunicodeyz" { // Unicode, ZHE and Z swapped. - name[Group1]= "Serbian Latin Unicode (swap ZHE, Z)"; + name[Group1]= "Serbian - Latin Unicode qwerty"; include "srp(latinunicode)" @@ -260,9 +260,9 @@ xkb_symbols "latinunicodeyz" { xkb_symbols "alternatequotes" { // Another acceptable »pair of quotes« for Serbian - name[Group1]= "Serbian Latin with alternate quotes"; + name[Group1]= "Serbian - With guillemots"; - include "srp(default)" + include "srp(basic)" key <AC02> { [ any,any, guillemotright, NoSymbol ] }; // s key <AC03> { [ any,any, guillemotleft, NoSymbol ] }; // d @@ -271,7 +271,7 @@ xkb_symbols "alternatequotes" { xkb_symbols "latinalternatequotes" { // Another acceptable »pair of quotes« for Serbian - name[Group1]= "Serbian Latin with alternate quotes"; + name[Group1]= "Serbian - Latin with guillemots"; include "srp(latin)" diff --git a/symbols/syr b/symbols/syr index 121cbccd..547aa16c 100644 --- a/symbols/syr +++ b/symbols/syr @@ -78,7 +78,7 @@ xkb_symbols "basic" { partial alphanumeric_keys xkb_symbols "phonetic" { - name[Group1]= "Syriac(phonetic)"; + name[Group1]= "Syriac - Phonetic"; key <TLDE> { [ 0x100070F, 0x100032E, Arabic_shadda ] }; key <AE01> { [ 1, exclam, 0x1000701 ] }; diff --git a/symbols/tam b/symbols/tam index b39d020e..1b4c763f 100644 --- a/symbols/tam +++ b/symbols/tam @@ -13,7 +13,7 @@ xkb_symbols "TSCII" { // Author : Thuraiappah Vaseeharan <vasee@ieee.org> // Last Modified: Sat Jan 5 17:11:26 CST 2002 - name[Group1]= "Tamil (TSCII)"; + name[Group1]= "Tamil"; key <AE01> { [ 0x10000b7, 0x10000a4 ] }; // aytham key <AE02> { [ 0x1000082, 0x10000a5 ] }; // shri @@ -69,7 +69,7 @@ xkb_symbols "TAB" { // Author: Thuraiappah Vaseeharan <t_vasee@yahoo.com> // Date : Sun Aug 12 02:23:00 CDT 2001 - name[Group1]= "Tamil"; + name[Group1]= "Tamil - Typewrite-style keymap; TAB encoding"; // numeral row key <AE01> { [ 0x10000e7, 0x10000a7 ] } ; @@ -126,7 +126,7 @@ xkb_symbols "UNI" { // Date : Sat Feb 9 21:10:48 CST 2002 // Mapping: - name[Group1]= "Tamil"; + name[Group1]= "Tamil - Typewrite-style keymap; Unicode encoding"; // granthas key <AE01> { [ 0x1000b83 ] } ; @@ -174,7 +174,7 @@ xkb_symbols "UNI" { partial alphanumeric_keys xkb_symbols "INSCRIPT" { - name[Group1]= "Tamil"; + name[Group1]= "Tamil - INSCRIPT layout"; key <TLDE> { [ 0x1000BCA, 0x1000B92 ] }; @@ -6,7 +6,7 @@ partial default alphanumeric_keys xkb_symbols "basic" { - name[Group1]= "Thailand (Kedmanee)"; + name[Group1]= "Thailand"; // converted to THai keysysms - Pablo Saratxaga <pablo@mandrakesoft.com> @@ -65,7 +65,7 @@ xkb_symbols "basic" { partial alphanumeric_keys xkb_symbols "pat" { - name[Group1]= "Thailand (Pattachote)"; + name[Group1]= "Thailand - Pattachote"; // The thai layout defines a second keyboard group and changes // the behavior of a few modifier keys. @@ -127,7 +127,7 @@ xkb_symbols "pat" { partial alphanumeric_keys xkb_symbols "tis" { - name[Group1]= "Thailand (TIS-820.2538)"; + name[Group1]= "Thailand - TIS-820.2538"; // The thai layout defines a second keyboard group and changes // the behavior of a few modifier keys. @@ -13,7 +13,7 @@ xkb_symbols "basic" { include "latin" - name[Group1]="Turkey"; + name[Group1]="Turkish"; key <AE01> { [ 1, exclam, onesuperior, exclamdown ] }; key <AE02> { [ 2, apostrophe, sterling, twosuperior ] }; @@ -66,7 +66,7 @@ xkb_symbols "f" { include "latin" - name[Group1]="Turkey"; + name[Group1]="Turkish - (F)"; key <AE01> { [ 1, exclam, onesuperior, exclamdown ] }; key <AE02> { [ 2, quotedbl, twosuperior, VoidSymbol ] }; @@ -129,7 +129,7 @@ xkb_symbols "alt" { include "latin" - name[Group1]="Turkey"; + name[Group1]="Turkish - Alt-Q"; key <AE07> { [ 7, ampersand, lowleftcorner, upleftcorner ] }; key <AE08> { [ 8, asterisk, leftt, topt ] }; @@ -71,6 +71,8 @@ partial alphanumeric_keys xkb_symbols "winkeys" { include "ua(basic)" + name[Group1]= "Ukraine - Winkeys"; + key <AE03> { [ 3, numerosign ] }; key <AE04> { [ 4, semicolon ] }; key <AE05> { [ 5, percent ] }; @@ -84,6 +86,8 @@ partial alphanumeric_keys xkb_symbols "typewriter" { include "ua(basic)" + name[Group1]= "Ukraine - Typewriter"; + key <TLDE> { [ apostrophe, quotedbl ] }; key <AE01> { [ exclam, 1 ] }; key <AE02> { [ numerosign, 2 ] }; @@ -111,6 +115,8 @@ partial alphanumeric_keys xkb_symbols "phonetic" { include "ua(basic)" + name[Group1]= "Ukraine - Phonetic"; + key <LatQ> { [ Cyrillic_ya, Cyrillic_YA ] }; key <LatW> { [ Cyrillic_ve, Cyrillic_VE ] }; key <LatE> { [ Cyrillic_ie, Cyrillic_IE ] }; @@ -155,6 +161,8 @@ partial alphanumeric_keys xkb_symbols "rstu" { include "ua(basic)" + name[Group1]= "Ukraine - Ukrainian standard RSTU"; + key <TLDE> { [ apostrophe, question ] }; key <AE01> { [ exclam, 1 ] }; key <AE02> { [ quotedbl, 2 ] }; @@ -8,7 +8,7 @@ default partial hidden alphanumeric_keys modifier_keys xkb_symbols "basic" { - name[Group1]= "United States"; + name[Group1]= "U.S. English"; include "pc(common)" @@ -71,7 +71,7 @@ xkb_symbols "basic" { partial alphanumeric_keys xkb_symbols "intl" { - name[Group1]= "United States (International)"; + name[Group1]= "U.S. English - International (with dead keys)"; include "us(basic)" @@ -153,7 +153,8 @@ xkb_symbols "intl" { partial alphanumeric_keys xkb_symbols "alt-intl" { - name[Group1]= "United States (us_intl)"; + name[Group1]= "U.S. English - Alternative international (former us_intl)"; + include "us" key <TLDE> { [ dead_grave, dead_tilde, grave, asciitilde ] }; @@ -183,7 +184,7 @@ xkb_symbols "alt-intl" { partial alphanumeric_keys xkb_symbols "dvorak" { - name[Group1]= "United States (Dvorak)"; + name[Group1]= "U.S. English - Dvorak"; // Alphanumeric section |