diff options
| -rw-r--r-- | xorg-server/xkbdata.src/rules/base.xml.in | 8 | ||||
| -rw-r--r-- | xorg-server/xkbdata.src/symbols/Makefile.am | 3 | ||||
| -rw-r--r-- | xorg-server/xkbdata.src/symbols/gb | 373 | ||||
| -rw-r--r-- | xorg-server/xkbdata.src/symbols/ke | 13 | ||||
| -rw-r--r-- | xorg-server/xkbdata.src/symbols/tz | 63 |
5 files changed, 268 insertions, 192 deletions
diff --git a/xorg-server/xkbdata.src/rules/base.xml.in b/xorg-server/xkbdata.src/rules/base.xml.in index ba03a0e85..d588790d6 100644 --- a/xorg-server/xkbdata.src/rules/base.xml.in +++ b/xorg-server/xkbdata.src/rules/base.xml.in @@ -4424,6 +4424,14 @@ <languageList><iso639Id>swa</iso639Id></languageList> </configItem> </layout> + <layout> + <configItem> + <name>ke</name> + <_shortDescription>Ken</_shortDescription> + <_description>Kenya</_description> + <languageList><iso639Id>swa</iso639Id></languageList> + </configItem> + </layout> </layoutList> <optionList> <group allowMultipleSelection="true"> diff --git a/xorg-server/xkbdata.src/symbols/Makefile.am b/xorg-server/xkbdata.src/symbols/Makefile.am index 61562eeb9..c9fcd4bb5 100644 --- a/xorg-server/xkbdata.src/symbols/Makefile.am +++ b/xorg-server/xkbdata.src/symbols/Makefile.am @@ -16,7 +16,8 @@ gb ge gh gn \ gr hr hu \ ie il in iq \ ir is it jp \ -kg kh kr kz \ +ke kg kh \ +kr kz \ la latam latin \ lk lt lv \ ma mao me \ diff --git a/xorg-server/xkbdata.src/symbols/gb b/xorg-server/xkbdata.src/symbols/gb index 6139f244f..9352f503d 100644 --- a/xorg-server/xkbdata.src/symbols/gb +++ b/xorg-server/xkbdata.src/symbols/gb @@ -1,191 +1,182 @@ -// $XKeyboardConfig$
-
-// based on a keyboard map from an 'xkb/symbols/gb' file
-//
-// $XFree86: xc/programs/xkbcomp/symbols/gb,v 1.6 2003/10/04 10:25:14 pascal Exp $
-
-partial default alphanumeric_keys
-xkb_symbols "basic" {
-
- // Describes the differences between a very simple en_US
- // keyboard and a very simple U.K. keyboard layout defined by
- // the SVR4 European Language Supplement and sometimes also
- // known as the IBM 166 layout.
-
- include "latin"
-
- name[Group1]="United Kingdom";
-
- key <AE02> { [ 2, quotedbl, twosuperior, oneeighth ] };
- key <AE03> { [ 3, sterling, threesuperior, sterling ] };
- key <AE04> { [ 4, dollar, EuroSign, onequarter ] };
-
- key <AC11> { [apostrophe, at, dead_circumflex, dead_caron] };
- key <TLDE> { [ grave, notsign, bar, bar ] };
-
- key <BKSL> { [numbersign, asciitilde, dead_grave, dead_breve ] };
- key <LSGT> { [ backslash, bar, bar, brokenbar ] };
-
- include "level3(ralt_switch_multikey)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "intl" {
-
- // Describes the differences between a very simple en_US
- // keyboard and a very simple U.K. keyboard layout with
- // dead keys. By Phil Jones (philjones1@blueyonder.co.uk)
-
- // Includes the following keys:
- // dead_grave
- // dead_acute
- // dead_circumflex
- // dead_tilde
- // dead_diaeresis
-
- include "latin"
-
- name[Group1]="United Kingdom - International (with dead keys)";
-
- key <AE02> { [ 2, dead_diaeresis, twosuperior, onehalf ] };
- key <AE03> { [ 3, sterling, threesuperior, onethird ] };
- key <AE04> { [ 4, dollar, EuroSign, onequarter ] };
- key <AE06> { [ 6, dead_circumflex, NoSymbol, onesixth ] };
-
- key <AC11> { [ dead_acute, at, apostrophe, bar ] };
- key <TLDE> { [ dead_grave, notsign, bar, bar ] };
-
- key <BKSL> { [ numbersign, dead_tilde, bar, bar ] };
- key <LSGT> { [ backslash, bar, bar, bar ] };
-
- include "level3(ralt_switch)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "extd" {
- // Clone of the Microsoft "United Kingdom - Extended" layout, which
- // includes dead keys for: grave; diaeresis; circumflex; tilde; and
- // accute. It also enables direct access to accute characters using
- // the Multi_key (Alt Gr).
- //
- // Taken from...
- // "Windows Keyboard Layouts"
- // http://msdn.microsoft.com/en-us/goglobal/bb964651.aspx
- //
- // -- Jonathan Miles <jon@cybah.co.uk>
-
- include "latin"
-
- name[Group1]="United Kingdom - Extended - Winkeys";
-
- // Alphanumeric section
- key <TLDE> { [ dead_grave, notsign, brokenbar, NoSymbol ] };
-
- key <AE02> { [ 2, quotedbl, dead_diaeresis, onehalf ] };
- key <AE03> { [ 3, sterling, threesuperior, onethird ] };
- key <AE04> { [ 4, dollar, EuroSign, onequarter ] };
- key <AE06> { [ 6, asciicircum, dead_circumflex, NoSymbol ] };
-
- key <AD02> { [ w, W, wacute, Wacute ] };
- key <AD03> { [ e, E, eacute, Eacute ] };
- key <AD06> { [ y, Y, yacute, Yacute ] };
- key <AD07> { [ u, U, uacute, Uacute ] };
- key <AD08> { [ i, I, iacute, Iacute ] };
- key <AD09> { [ o, O, oacute, Oacute ] };
-
- key <AC01> { [ a, A, aacute, Aacute ] };
- key <AC11> { [ apostrophe, at, dead_acute, NoSymbol ] };
-
- key <AB03> { [ c, C, ccedilla, Ccedilla ] };
-
- key <BKSL> { [ numbersign, asciitilde, dead_tilde, NoSymbol ] };
- key <LSGT> { [ backslash, bar, NoSymbol, NoSymbol ] };
- // End alphanumeric section
-
- include "level3(ralt_switch)"
-};
-
-// Describe the differences between the US Colemak layout
-// and a UK variant. By Andy Buckley (andy@insectnation.org)
-
-partial alphanumeric_keys
-xkb_symbols "colemak" {
- include "us(colemak)"
-
- name[Group1]="United Kingdom - Colemak";
-
- key <AE02> { [ 2, quotedbl, twosuperior, oneeighth ] };
- key <AE03> { [ 3, sterling, threesuperior, sterling ] };
- key <AE04> { [ 4, dollar, EuroSign, onequarter ] };
-
- key <AC11> { [apostrophe, at, dead_circumflex, dead_caron] };
- key <TLDE> { [ grave, notsign, bar, bar ] };
-
- key <BKSL> { [numbersign, asciitilde, dead_grave, dead_breve ] };
- key <LSGT> { [ z, Z, ae, AE ] };
- key <AB01> { [ x, X, dead_circumflex, asciitilde ] };
- key <AB02> { [ c, C, ccedilla, Ccedilla ] };
- key <AB03> { [ v, V, oe, OE ] };
- key <AB04> { [ b, B, dead_breve, asciitilde ] };
- key <AB05> { [ k, K, dead_abovering, asciitilde ] };
- key <AB06> { [ m, M, dead_macron, asciitilde ] };
- key <AB07> { [ comma, less, dead_cedilla, asciitilde ] };
- key <AB08> { [ period, greater, dead_abovedot, asciitilde ] };
- key <AB09> { [ backslash, bar, asciitilde, asciitilde ] };
- key <AB10> { [ slash, question, questiondown, asciitilde ] };
- include "level3(ralt_switch_multikey)"
-};
-
-
-// Dvorak (UK) keymap (by odaen) allowing the usage of
-// the £ and ? key and swapping the @ and " keys.
-
-partial alphanumeric_keys
-xkb_symbols "dvorak" {
- include "us(dvorak-alt-intl)"
-
- name[Group1]="United Kingdom - Dvorak";
-
- key <AD01> { [ apostrophe, at ] };
- key <AE02> { [ 2, quotedbl, twosuperior, NoSymbol ] };
- key <AE03> { [ 3, sterling, threesuperior, NoSymbol ] };
- key <BKSL> { [ numbersign, asciitilde ] };
- key <LSGT> { [ backslash, bar ] };
- key <TLDE> { [ grave, notsign, bar, bar ] };
-};
-
-// Dvorak letter positions, but punctuation all in the normal UK positions.
-partial alphanumeric_keys
-xkb_symbols "dvorakukp" {
- include "gb(dvorak)"
-
- name[Group1]="United Kingdom - Dvorak (UK Punctuation)";
-
- key <AE11> { [ minus, underscore ] };
- key <AE12> { [ equal, plus ] };
- key <AD11> { [ bracketleft, braceleft ] };
- key <AD12> { [ bracketright, braceright ] };
- key <AD01> { [ slash, question ] };
- key <AC11> { [apostrophe, at, dead_circumflex, dead_caron] };
-};
-
-// Copied from macintosh_vndr/gb
-partial alphanumeric_keys
-xkb_symbols "mac" {
-
- // Describes the differences between a very simple en_US
- // keyboard and a very simple U.K. keyboard layout
-
- include "latin"
-
- name[Group1]= "United Kingdom - Macintosh";
-
- key <AE02> { [ 2, at, EuroSign ] };
- key <AE03> { [ 3, sterling, numbersign ] };
-
- // End alphanumeric section
-
- include "level3(ralt_switch)"
-};
-
-
+// $XKeyboardConfig$ + +// based on a keyboard map from an 'xkb/symbols/gb' file +// +// $XFree86: xc/programs/xkbcomp/symbols/gb,v 1.6 2003/10/04 10:25:14 pascal Exp $ + +partial default alphanumeric_keys +xkb_symbols "basic" { + + // Describes the differences between a very simple en_US + // keyboard and a very simple U.K. keyboard layout defined by + // the SVR4 European Language Supplement and sometimes also + // known as the IBM 166 layout. + + include "latin" + + name[Group1]="United Kingdom"; + + key <AE02> { [ 2, quotedbl, twosuperior, oneeighth ] }; + key <AE03> { [ 3, sterling, threesuperior, sterling ] }; + key <AE04> { [ 4, dollar, EuroSign, onequarter ] }; + + key <AC11> { [apostrophe, at, dead_circumflex, dead_caron] }; + key <TLDE> { [ grave, notsign, bar, bar ] }; + + key <BKSL> { [numbersign, asciitilde, dead_grave, dead_breve ] }; + key <LSGT> { [ backslash, bar, bar, brokenbar ] }; + + include "level3(ralt_switch_multikey)" +}; + +partial alphanumeric_keys +xkb_symbols "intl" { + + // Describes the differences between a very simple en_US + // keyboard and a very simple U.K. keyboard layout with + // dead keys. By Phil Jones (philjones1@blueyonder.co.uk) + + // Includes the following keys: + // dead_grave + // dead_acute + // dead_circumflex + // dead_tilde + // dead_diaeresis + + include "latin" + + name[Group1]="United Kingdom - International (with dead keys)"; + + key <AE02> { [ 2, dead_diaeresis, twosuperior, onehalf ] }; + key <AE03> { [ 3, sterling, threesuperior, onethird ] }; + key <AE04> { [ 4, dollar, EuroSign, onequarter ] }; + key <AE06> { [ 6, dead_circumflex, NoSymbol, onesixth ] }; + + key <AC11> { [ dead_acute, at, apostrophe, bar ] }; + key <TLDE> { [ dead_grave, notsign, bar, bar ] }; + + key <BKSL> { [ numbersign, dead_tilde, bar, bar ] }; + key <LSGT> { [ backslash, bar, bar, bar ] }; + + include "level3(ralt_switch)" +}; + +partial alphanumeric_keys +xkb_symbols "extd" { + // Clone of the Microsoft "United Kingdom - Extended" layout, which + // includes dead keys for: grave; diaeresis; circumflex; tilde; and + // accute. It also enables direct access to accute characters using + // the Multi_key (Alt Gr). + // + // Taken from... + // "Windows Keyboard Layouts" + // http://msdn.microsoft.com/en-us/goglobal/bb964651.aspx + // + // -- Jonathan Miles <jon@cybah.co.uk> + + include "latin" + + name[Group1]="United Kingdom - Extended - Winkeys"; + + // Alphanumeric section + key <TLDE> { [ dead_grave, notsign, brokenbar, NoSymbol ] }; + + key <AE02> { [ 2, quotedbl, dead_diaeresis, onehalf ] }; + key <AE03> { [ 3, sterling, threesuperior, onethird ] }; + key <AE04> { [ 4, dollar, EuroSign, onequarter ] }; + key <AE06> { [ 6, asciicircum, dead_circumflex, NoSymbol ] }; + + key <AD02> { [ w, W, wacute, Wacute ] }; + key <AD03> { [ e, E, eacute, Eacute ] }; + key <AD06> { [ y, Y, yacute, Yacute ] }; + key <AD07> { [ u, U, uacute, Uacute ] }; + key <AD08> { [ i, I, iacute, Iacute ] }; + key <AD09> { [ o, O, oacute, Oacute ] }; + + key <AC01> { [ a, A, aacute, Aacute ] }; + key <AC11> { [ apostrophe, at, dead_acute, NoSymbol ] }; + + key <AB03> { [ c, C, ccedilla, Ccedilla ] }; + + key <BKSL> { [ numbersign, asciitilde, dead_tilde, NoSymbol ] }; + key <LSGT> { [ backslash, bar, NoSymbol, NoSymbol ] }; + // End alphanumeric section + + include "level3(ralt_switch)" +}; + +// Describe the differences between the US Colemak layout +// and a UK variant. By Andy Buckley (andy@insectnation.org) + +partial alphanumeric_keys +xkb_symbols "colemak" { + include "us(colemak)" + + name[Group1]="United Kingdom - Colemak"; + + key <AE02> { [ 2, quotedbl, twosuperior, oneeighth ] }; + key <AE03> { [ 3, sterling, threesuperior, sterling ] }; + key <AE04> { [ 4, dollar, EuroSign, onequarter ] }; + + key <AC11> { [apostrophe, at, dead_circumflex, dead_caron] }; + key <TLDE> { [ grave, notsign, bar, bar ] }; + + key <BKSL> { [numbersign, asciitilde, dead_grave, dead_breve ] }; + key <LSGT> { [ backslash, bar, bar, brokenbar ] }; + + include "level3(ralt_switch_multikey)" +}; + + +// Dvorak (UK) keymap (by odaen) allowing the usage of +// the £ and ? key and swapping the @ and " keys. + +partial alphanumeric_keys +xkb_symbols "dvorak" { + include "us(dvorak-alt-intl)" + + name[Group1]="United Kingdom - Dvorak"; + + key <AD01> { [ apostrophe, at ] }; + key <AE02> { [ 2, quotedbl, twosuperior, NoSymbol ] }; + key <AE03> { [ 3, sterling, threesuperior, NoSymbol ] }; + key <BKSL> { [ numbersign, asciitilde ] }; + key <LSGT> { [ backslash, bar ] }; + key <TLDE> { [ grave, notsign, bar, bar ] }; +}; + +// Dvorak letter positions, but punctuation all in the normal UK positions. +partial alphanumeric_keys +xkb_symbols "dvorakukp" { + include "gb(dvorak)" + + name[Group1]="United Kingdom - Dvorak (UK Punctuation)"; + + key <AE11> { [ minus, underscore ] }; + key <AE12> { [ equal, plus ] }; + key <AD11> { [ bracketleft, braceleft ] }; + key <AD12> { [ bracketright, braceright ] }; + key <AD01> { [ slash, question ] }; + key <AC11> { [apostrophe, at, dead_circumflex, dead_caron] }; +}; + +// Copied from macintosh_vndr/gb +partial alphanumeric_keys +xkb_symbols "mac" { + + // Describes the differences between a very simple en_US + // keyboard and a very simple U.K. keyboard layout + + include "latin" + + name[Group1]= "United Kingdom - Macintosh"; + + key <AE02> { [ 2, at, EuroSign ] }; + key <AE03> { [ 3, sterling, numbersign ] }; + + // End alphanumeric section + + include "level3(ralt_switch)" +}; + + diff --git a/xorg-server/xkbdata.src/symbols/ke b/xorg-server/xkbdata.src/symbols/ke new file mode 100644 index 000000000..71629b0c4 --- /dev/null +++ b/xorg-server/xkbdata.src/symbols/ke @@ -0,0 +1,13 @@ +// $XKeyboardConfig$ + +// Keyboard layout for Swahili in Arabic script. +// Based on Martin Vidner's Buckwalter transliteration variant of the Arabic keyboard +// Please notify any corrections or omissions to +// Kevin Donnelly (kevin@dotmon.com) + +partial default alphanumeric_keys +xkb_symbols "swa" { + include "tz(swa)" + + name[Group1]= "Kenya"; +}; diff --git a/xorg-server/xkbdata.src/symbols/tz b/xorg-server/xkbdata.src/symbols/tz new file mode 100644 index 000000000..8936a0363 --- /dev/null +++ b/xorg-server/xkbdata.src/symbols/tz @@ -0,0 +1,63 @@ +// $XKeyboardConfig$ + +// Keyboard layout for Swahili in Arabic script. +// Based on Martin Vidner's Buckwalter transliteration variant of the Arabic keyboard +// Please notify any corrections or omissions to +// Kevin Donnelly (kevin@dotmon.com) + +partial default alphanumeric_keys +xkb_symbols "swa" { + name[Group1]= "Tanzania"; + + key <TLDE> { [ 0x1000670, VoidSymbol ] }; + + key <AE01> { [ 0x1000661, VoidSymbol ] }; + key <AE02> { [ 0x1000662, VoidSymbol ] }; + key <AE03> { [ 0x1000663, VoidSymbol ] }; + key <AE04> { [ 0x1000664, VoidSymbol ] }; + key <AE05> { [ 0x1000665, Arabic_percent ] }; + key <AE06> { [ 0x1000666, VoidSymbol ] }; + key <AE07> { [ 0x1000667, VoidSymbol ] }; + key <AE08> { [ 0x1000668, VoidSymbol ] }; + key <AE09> { [ 0x1000669, 0x100fd3e ] }; + key <AE10> { [ 0x1000660, 0x100fd3f ] }; + key <AE11> { [ minus, Arabic_tatweel ] }; + key <AE12> { [ equal, plus ] }; + + key <AD01> { [ Arabic_qaf, Arabic_gaf ] }; + key <AD02> { [ Arabic_waw, Arabic_hamzaonwaw ] }; + key <AD03> { [ 0x1000656, Arabic_ain ] }; + key <AD04> { [ Arabic_ra, Arabic_tteh ] }; + key <AD05> { [ Arabic_teh, Arabic_tah ] }; + key <AD06> { [ Arabic_yeh, Arabic_alefmaksura ] }; + key <AD07> { [ Arabic_damma, Arabic_dammatan ] }; + key <AD08> { [ Arabic_kasra, Arabic_hamzaonyeh ] }; + key <AD09> { [ Arabic_sukun, 0x1000657 ] }; + key <AD10> { [ Arabic_peh, Arabic_tehmarbuta ] }; + key <AD12> { [ VoidSymbol, VoidSymbol ] }; + + key <AC01> { [ Arabic_fatha, Arabic_alef ] }; + key <AC02> { [ Arabic_seen, Arabic_sad ] }; + key <AC03> { [ Arabic_dal, Arabic_dad ] }; + key <AC04> { [ Arabic_feh, Arabic_fathatan ] }; + key <AC05> { [ 0x10006A0, Arabic_ghain ] }; + key <AC06> { [ Arabic_ha, Arabic_hah ] }; + key <AC07> { [ Arabic_jeem, VoidSymbol ] }; + key <AC08> { [ Arabic_kaf, Arabic_kasratan ] }; + key <AC09> { [ Arabic_lam, Arabic_shadda ] }; + key <AC10> { [ Arabic_semicolon, VoidSymbol ] }; + key <AC11> { [ Arabic_hamza, VoidSymbol ] }; + + key <AB01> { [ Arabic_zain, Arabic_zah ] }; + key <AB02> { [ Arabic_khah, VoidSymbol ] }; + key <AB03> { [ Arabic_tcheh, Arabic_sheen ] }; + key <AB04> { [ 0x10006A8, Arabic_theh ] }; + key <AB05> { [ Arabic_beh, Arabic_thal ] }; + key <AB06> { [ Arabic_noon, VoidSymbol ] }; + key <AB07> { [ Arabic_meem, VoidSymbol ] }; + key <AB08> { [ Arabic_comma, Arabic_hamzaunderalef ] }; + key <AB09> { [ 0x10006d4, Arabic_hamzaonalef ] }; + key <AB10> { [ VoidSymbol, Arabic_question_mark ] }; +}; + + |