diff options
Diffstat (limited to 'xorg-server')
| -rw-r--r-- | xorg-server/xkeyboard-config/rules/base.extras.xml.in | 33 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/rules/base.xml.in | 14 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/symbols/apl | 25 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/symbols/ara | 2 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/symbols/il | 4 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/symbols/rs | 4 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/symbols/us | 135 |
7 files changed, 119 insertions, 98 deletions
diff --git a/xorg-server/xkeyboard-config/rules/base.extras.xml.in b/xorg-server/xkeyboard-config/rules/base.extras.xml.in index 205f5c119..fcccd1b73 100644 --- a/xorg-server/xkeyboard-config/rules/base.extras.xml.in +++ b/xorg-server/xkeyboard-config/rules/base.extras.xml.in @@ -7,57 +7,50 @@ <configItem> <name>apl</name> <_shortDescription>apl</_shortDescription> - <_description>APL Keyboard Symbols</_description> + <_description>APL keyboard symbols</_description> <languageList><iso639Id>eng</iso639Id></languageList> </configItem> <variantList> <variant> <configItem> <name>dyalog</name> - <shortDescription>dyalog</shortDescription> - <description>dyalog</description> + <shortDescription>dlg</shortDescription> + <description>APL keyboard symbols (Dyalog)</description> </configItem> </variant> <variant> <configItem> <name>sax</name> <shortDescription>sax</shortDescription> - <description>sax</description> + <description>APL keyboard symbols (sax)</description> </configItem> </variant> <variant> <configItem> <name>unified</name> - <shortDescription>unified</shortDescription> - <description>unified</description> + <shortDescription>ufd</shortDescription> + <description>APL keyboard symbols (unified)</description> </configItem> </variant> <variant> <configItem> <name>apl2</name> <shortDescription>apl2</shortDescription> - <description>apl2</description> + <description>APL keyboard symbols (IBM APL2)</description> </configItem> </variant> <variant> <configItem> <name>aplplusII</name> - <shortDescription>aplplusII</shortDescription> - <description>aplplusII</description> + <shortDescription>aplII</shortDescription> + <description>APL keyboard symbols (Manugistics APL*PLUS II)</description> </configItem> </variant> <variant> <configItem> <name>aplx</name> <shortDescription>aplx</shortDescription> - <description>aplx</description> - </configItem> - </variant> - <variant> - <configItem> - <name>dyalog_base</name> - <shortDescription>dyalog_base</shortDescription> - <description>dyalog without box or op-codes</description> + <description>APL keyboard symbols (APLX unified)</description> </configItem> </variant> </variantList> @@ -362,14 +355,14 @@ <configItem> <name>il</name> <_shortDescription>he</_shortDescription> - <_description>Hebrew (Biblical SIL)</_description> + <_description>Hebrew</_description> <languageList><iso639Id>heb</iso639Id></languageList> </configItem> <variantList> <variant> <configItem> - <name>SIL Phonetic</name> - <_description>Biblical SIL phonetic</_description> + <name>biblicalSIL</name> + <_description>Hebrew (Biblical, SIL phonetic)</_description> <languageList><iso639Id>heb</iso639Id></languageList> </configItem> </variant> diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in index 313f4884d..5f0618166 100644 --- a/xorg-server/xkeyboard-config/rules/base.xml.in +++ b/xorg-server/xkeyboard-config/rules/base.xml.in @@ -1296,7 +1296,7 @@ <variant> <configItem> <name>dvorak-intl</name> - <_description>English (Dvorak international with dead keys)</_description> + <_description>English (Dvorak, international with dead keys)</_description> </configItem> </variant> <variant> @@ -1375,9 +1375,15 @@ <variant> <configItem> <name>workman</name> - <_description>English (US, Workman)</_description> + <_description>English (Workman)</_description> </configItem> </variant> + <variant> + <configItem> + <name>workman-intl</name> + <_description>English (Workman, international with dead keys)</_description> + </configItem> + </variant> </variantList> </layout> <layout> @@ -4235,7 +4241,7 @@ <name>rs</name> <!-- Keyboard indicator for Serbian layouts --> <_shortDescription>sr</_shortDescription> - <_description>Serbian (Cyrillic)</_description> + <_description>Serbian</_description> <languageList> <iso639Id>srp</iso639Id> </languageList> @@ -5511,7 +5517,7 @@ <configItem> <name>gag</name> <_shortDescription>gag</_shortDescription> - <_description>Gagauz</_description> + <_description>Moldavian (Gagauz)</_description> <languageList><iso639Id>gag</iso639Id></languageList> </configItem> </variant> diff --git a/xorg-server/xkeyboard-config/symbols/apl b/xorg-server/xkeyboard-config/symbols/apl index 6fa993e36..ebc4115e6 100644 --- a/xorg-server/xkeyboard-config/symbols/apl +++ b/xorg-server/xkeyboard-config/symbols/apl @@ -41,6 +41,8 @@ default partial alphanumeric_keys xkb_symbols "basic" { include "apl(dyalog_base)" // forward reference good APL keyboard without Dyalogs extras + + name[Group1]= "APL keyboard symbols"; }; // ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┲━━━━━━━━━┓ @@ -62,7 +64,6 @@ xkb_symbols "basic" { partial hidden alphanumeric_keys xkb_symbols "common" { - name[Group1]= "APL"; key <AB01> { [ U2282 ] }; // Z: ⊂ -- Subset Of key <AB02> { [ U2283 ] }; // X: ⊃ -- Superset Of @@ -127,7 +128,7 @@ xkb_symbols "common" { partial alphanumeric_keys xkb_symbols "unified" { - name[Group1]= "APL Keyboard Symbols: Unified Layout"; + name[Group1]= "APL keyboard symbols (unified)"; include "apl(common)" @@ -160,7 +161,7 @@ xkb_symbols "unified" { partial alphanumeric_keys xkb_symbols "sax" { - name[Group1]= "APL Keyboard Symbols"; + name[Group1]= "APL keyboard symbols (sax)"; include "apl(unified)" @@ -222,7 +223,7 @@ xkb_symbols "sax" { partial alphanumeric_keys xkb_symbols "apl2" { - name[Group1]= "APL Keyboard Symbols: IBM APL2"; + name[Group1]= "APL keyboard symbols (IBM APL2)"; include "apl(common)" @@ -282,10 +283,10 @@ xkb_symbols "apl2" { partial alphanumeric_keys xkb_symbols "aplplusII" { - name[Group1]= "APL Keyboard Symbols: Manugistics APL*PLUS II"; // AFS - short for APL Functional Symbol include "apl(apl2)" + name[Group1]= "APL keyboard symbols (Manugistics APL*PLUS II)"; key <AC10> { [ bracketleft, parenleft, U234E ] }; // ;: ⍎ -- [See B key in SAX layout] key <AC11> { [ bracketright, parenright, U2355 ] }; // ': ⍕ -- [See N key in SAX layout] @@ -319,10 +320,10 @@ xkb_symbols "aplplusII" { partial alphanumeric_keys xkb_symbols "aplx" { - name[Group1]= "APL Keyboard Symbols: APLX Unified APL Layout"; - include "apl(unified)" + name[Group1]= "APL keyboard symbols (APLX unified)"; + key <AB08> { [ U235D, U236A ] }; // ,: ⍝ ⍪ -- APL Functional Symbol Up Shoe Jot / APL Functional Symbol Comma Bar key <AB09> { [ U2340, U2364 ] }; // .: ⍀ ⍤ -- APL Functional Symbol Backslash Bar / APL Functional Symbol Jot Diaeresis key <AB10> { [ U233F ] }; // /: ⌿ -- APL Functional Symbol Slash Bar @@ -361,9 +362,8 @@ xkb_symbols "aplx" { // the alphabet and similar. If this keyboard is placed as the 2nd layout then it can // be reached with a latching shift to increase group by one. -partial alphanumeric_keys +partial hidden alphanumeric_keys xkb_symbols "dyalog_base" { - name[Group1]="APL"; // ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┲━━━━━━━━━┓ @@ -433,9 +433,8 @@ xkb_symbols "dyalog_base" { key <TLDE> { [ U22c4 ] }; // diamond }; -partial keypad_keys +partial hidden keypad_keys xkb_symbols "dyalog_box" { - name[Group1]="Dyalog box"; // ┌───┬───┬───┬───┐ // │ │ │ │ │ @@ -463,8 +462,8 @@ xkb_symbols "dyalog_box" { }; +partial hidden xkb_symbols "dyalog_codes" { - name[Group1]="Dyalog Codes"; // Layout of private use area for this. In the style of the Unicode book // @@ -601,6 +600,6 @@ xkb_symbols "dyalog" { include "apl(dyalog_base)" include "apl(dyalog_box)" include "apl(dyalog_codes)" - name[Group1] = "Dyalog APL complete"; + name[Group1] = "APL keyboard symbols (Dyalog)"; }; diff --git a/xorg-server/xkeyboard-config/symbols/ara b/xorg-server/xkeyboard-config/symbols/ara index 76e03b1dd..146e9b325 100644 --- a/xorg-server/xkeyboard-config/symbols/ara +++ b/xorg-server/xkeyboard-config/symbols/ara @@ -62,8 +62,6 @@ xkb_symbols "basic" { key <AB09> { [ Arabic_zain, period ] }; key <AB10> { [ Arabic_zah, Arabic_question_mark ] }; - include "level3(ralt_switch)" - // End alphanumeric section }; diff --git a/xorg-server/xkeyboard-config/symbols/il b/xorg-server/xkeyboard-config/symbols/il index 6617d2dfc..78425339b 100644 --- a/xorg-server/xkeyboard-config/symbols/il +++ b/xorg-server/xkeyboard-config/symbols/il @@ -258,6 +258,8 @@ xkb_symbols "biblical" { key <SPCE> { [ space, space, thinspace, nobreakspace ] }; }; +// EXTRAS + // Biblical hebrew (SIL) US Standard layout version 1.5 // This map is based closely on v 1.5 of the standard. The only deviation being the replacement of the composite characters sin and shin // by their more recent Unicodev6 counterparts @@ -267,7 +269,7 @@ xkb_symbols "biblical" { // This linux port created and maintained by Dennis Meulensteen, dennis@meulensteen.nl partial alphanumeric_keys xkb_symbols "biblicalSIL" { - name[Group1]= "Israel - Biblical Hebrew SIL Phonetic"; + name[Group1]= "Hebrew (Biblical, SIL phonetic)"; key.type = "FOUR_LEVEL_SEMIALPHABETIC"; key <TLDE> { [ U20AC, U20AA, U0024 ] }; //Euro, Shekel, Dollar - diff --git a/xorg-server/xkeyboard-config/symbols/rs b/xorg-server/xkeyboard-config/symbols/rs index 71541bcbc..1b88d0131 100644 --- a/xorg-server/xkeyboard-config/symbols/rs +++ b/xorg-server/xkeyboard-config/symbols/rs @@ -42,7 +42,7 @@ partial alphanumeric_keys xkb_symbols "yz" { // Cyrillic_zhe and Cyrillic_ze swapped. - name[Group1]= "Serbian (Z and ZHE swapped)"; + name[Group1]= "Serbian (Cyrillic, Z and ZHE swapped)"; include "rs(basic)" @@ -280,7 +280,7 @@ xkb_symbols "latinunicodeyz" { xkb_symbols "alternatequotes" { // Another acceptable »pair of quotes« for Serbian - name[Group1]= "Serbian (with guillemets)"; + name[Group1]= "Serbian (Cyrillic with guillemets)"; include "rs(basic)" diff --git a/xorg-server/xkeyboard-config/symbols/us b/xorg-server/xkeyboard-config/symbols/us index 06cd3ce33..84bf15e76 100644 --- a/xorg-server/xkeyboard-config/symbols/us +++ b/xorg-server/xkeyboard-config/symbols/us @@ -259,7 +259,7 @@ xkb_symbols "dvorak" { partial alphanumeric_keys xkb_symbols "dvorak-intl" { - name[Group1]= "English (Dvorak international with dead keys)"; + name[Group1]= "English (Dvorak, international with dead keys)"; include "us(dvorak)" @@ -729,7 +729,7 @@ xkb_symbols "mac" { }; // Colemak symbols for xkb on X.Org Server 7.x -// 2006-01-01 Shai Coleman, http://colemak.com/ . Public domain. +// 2006-01-01 Shai Coleman, http://colemak.com/ partial alphanumeric_keys xkb_symbols "colemak" { @@ -1190,69 +1190,92 @@ xkb_symbols "htcdream" { }; // Workman Keyboard Layout symbols for xkb on X.Org Server 7.x -// 09-06-2010 OJ Bucao. -partial default alphanumeric_keys +// 09-06-2010 OJ Bucao. http://www.workmanlayout.com + +partial alphanumeric_keys xkb_symbols "workman" { - include "us(basic)" + name[Group1]= "English (Workman)"; - name[Group1]= "English (US, Workman)"; + include "us(basic)" // Alphanumeric section - key <TLDE> { [ grave, asciitilde, dead_tilde, asciitilde ] }; - key <AE01> { [ 1, exclam, exclamdown, onesuperior ] }; - key <AE02> { [ 2, at, masculine, twosuperior ] }; - key <AE03> { [ 3, numbersign, ordfeminine, threesuperior ] }; - key <AE04> { [ 4, dollar, cent, sterling ] }; - key <AE05> { [ 5, percent, EuroSign, yen ] }; - key <AE06> { [ 6, asciicircum, hstroke, Hstroke ] }; - key <AE07> { [ 7, ampersand, eth, ETH ] }; - key <AE08> { [ 8, asterisk, thorn, THORN ] }; - key <AE09> { [ 9, parenleft, leftsinglequotemark, leftdoublequotemark ] }; - key <AE10> { [ 0, parenright, rightsinglequotemark, rightdoublequotemark ] }; - key <AE11> { [ minus, underscore, endash, emdash ] }; - key <AE12> { [ equal, plus, multiply, division ] }; + key <AD01> { [ q, Q ] }; + key <AD02> { [ d, D ] }; + key <AD03> { [ r, R ] }; + key <AD04> { [ w, W ] }; + key <AD05> { [ b, B ] }; + key <AD06> { [ j, J ] }; + key <AD07> { [ f, F ] }; + key <AD08> { [ u, U ] }; + key <AD09> { [ p, P ] }; + key <AD10> { [ semicolon, colon ] }; + + key <AC01> { [ a, A ] }; + key <AC02> { [ s, S ] }; + key <AC03> { [ h, H ] }; + key <AC04> { [ t, T ] }; + key <AC05> { [ g, G ] }; + key <AC06> { [ y, Y ] }; + key <AC07> { [ n, N ] }; + key <AC08> { [ e, E ] }; + key <AC09> { [ o, O ] }; + key <AC10> { [ i, I ] }; + + key <AB01> { [ z, Z ] }; + key <AB02> { [ x, X ] }; + key <AB03> { [ m, M ] }; + key <AB04> { [ c, C ] }; + key <AB05> { [ v, V ] }; + key <AB06> { [ k, K ] }; + key <AB07> { [ l, L ] }; + // End alphanumeric section - key <AD01> { [ q, Q, adiaeresis, Adiaeresis ] }; - key <AD02> { [ d, D, aring, Aring ] }; - key <AD03> { [ r, R, atilde, Atilde ] }; - key <AD04> { [ w, W, oslash, Ooblique ] }; - key <AD05> { [ b, B, dead_ogonek, asciitilde ] }; - key <AD06> { [ j, J, dstroke, Dstroke ] }; - key <AD07> { [ f, F, lstroke, Lstroke ] }; - key <AD08> { [ u, U, uacute, Uacute ] }; - key <AD09> { [ p, P, udiaeresis, Udiaeresis ] }; - key <AD10> { [ semicolon, colon, odiaeresis, Odiaeresis ] }; - key <AD11> { [ bracketleft, braceleft, guillemotleft, 0x1002039 ] }; - key <AD12> { [ bracketright, braceright, guillemotright, 0x100203a ] }; - key <BKSL> { [ backslash, bar, asciitilde, asciitilde ] }; + key <CAPS> { [ BackSpace, Escape, BackSpace, BackSpace ] }; - key <AC01> { [ a, A, aacute, Aacute ] }; - key <AC02> { [ s, S, dead_grave, asciitilde ] }; - key <AC03> { [ h, H, ssharp, asciitilde ] }; - key <AC04> { [ t, T, dead_acute, dead_doubleacute ] }; - key <AC05> { [ g, G, dead_diaeresis, asciitilde ] }; - key <AC06> { [ y, Y, dead_caron, asciitilde ] }; - key <AC07> { [ n, N, ntilde, Ntilde ] }; - key <AC08> { [ e, E, eacute, Eacute ] }; - key <AC09> { [ o, O, iacute, Iacute ] }; - key <AC10> { [ i, I, oacute, Oacute ] }; - key <AC11> { [ apostrophe, quotedbl, otilde, Otilde ] }; + include "level3(ralt_switch)" +}; - key <AB01> { [ z, Z, ae, AE ] }; - key <AB02> { [ x, X, dead_circumflex, asciitilde ] }; - key <AB03> { [ m, M, ccedilla, Ccedilla ] }; - key <AB04> { [ c, C, oe, OE ] }; - key <AB05> { [ v, V, dead_breve, asciitilde ] }; - key <AB06> { [ k, K, dead_abovering, asciitilde ] }; - key <AB07> { [ l, L, dead_macron, asciitilde ] }; - key <AB08> { [ comma, less, dead_cedilla, asciitilde ] }; - key <AB09> { [ period, greater, dead_abovedot, asciitilde ] }; - key <AB10> { [ slash, question, questiondown, asciitilde ] }; +partial alphanumeric_keys +xkb_symbols "workman-intl" { - key <CAPS> { [ BackSpace, Escape, BackSpace, BackSpace ] }; - key <LSGT> { [ minus, underscore, endash, emdash ] }; - key <SPCE> { [ space, space, space, nobreakspace ] }; + name[Group1]= "English (Workman, international with dead keys)"; + + include "us(intl)" + + // Alphanumeric section + key <AD01> { [ q, Q, adiaeresis, Adiaeresis ] }; + key <AD02> { [ d, D, eth, ETH ] }; + key <AD03> { [ r, R, registered, registered ] }; + key <AD04> { [ w, W, aring, Aring ] }; + key <AD05> { [ b, B, b, B ] }; + key <AD06> { [ j, J, j, J ] }; + key <AD07> { [ f, F, f, F ] }; + key <AD08> { [ u, U, uacute, Uacute ] }; + key <AD09> { [ p, P, odiaeresis, Odiaeresis ] }; + key <AD10> { [ semicolon, colon, paragraph, degree ] }; + + key <AC01> { [ a, A, aacute, Aacute ] }; + key <AC02> { [ s, S, ssharp, section ] }; + key <AC03> { [ h, H, h, H ] }; + key <AC04> { [ t, T, thorn, THORN ] }; + key <AC05> { [ g, G, g, G ] }; + key <AC06> { [ y, Y, udiaeresis, Udiaeresis ] }; + key <AC07> { [ n, N, ntilde, Ntilde ] }; + key <AC08> { [ e, E, eacute, Eacute ] }; + key <AC09> { [ o, O, oacute, Oacute ] }; + key <AC10> { [ i, I, iacute, Iacute ] }; + + key <AB01> { [ z, Z, ae, AE ] }; + key <AB02> { [ x, X, x, X ] }; + key <AB03> { [ m, M, mu, mu ] }; + key <AB04> { [ c, C, copyright, cent ] }; + key <AB05> { [ v, V, v, V ] }; + key <AB06> { [ k, K, oe, OE ] }; + key <AB07> { [ l, L, oslash, Ooblique ] }; + // End alphanumeric section + + key <CAPS> { [ BackSpace, Escape, BackSpace, BackSpace ] }; include "level3(ralt_switch)" }; |