From 55f276ef63dcb0e0fcd372758e68003165bfceb5 Mon Sep 17 00:00:00 2001 From: marha Date: Wed, 31 Mar 2010 13:14:15 +0000 Subject: svn merge -r518:HEAD ^/branches/released . --- xorg-server/xkbdata.src/rules/base.xml.in | 8 + xorg-server/xkbdata.src/symbols/Makefile.am | 3 +- xorg-server/xkbdata.src/symbols/gb | 373 ++++++++++++++-------------- xorg-server/xkbdata.src/symbols/ke | 13 + xorg-server/xkbdata.src/symbols/tz | 63 +++++ 5 files changed, 268 insertions(+), 192 deletions(-) create mode 100644 xorg-server/xkbdata.src/symbols/ke create mode 100644 xorg-server/xkbdata.src/symbols/tz 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 @@ swa + + + ke + <_shortDescription>Ken + <_description>Kenya + swa + + 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 { [ 2, quotedbl, twosuperior, oneeighth ] }; - key { [ 3, sterling, threesuperior, sterling ] }; - key { [ 4, dollar, EuroSign, onequarter ] }; - - key { [apostrophe, at, dead_circumflex, dead_caron] }; - key { [ grave, notsign, bar, bar ] }; - - key { [numbersign, asciitilde, dead_grave, dead_breve ] }; - key { [ 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 { [ 2, dead_diaeresis, twosuperior, onehalf ] }; - key { [ 3, sterling, threesuperior, onethird ] }; - key { [ 4, dollar, EuroSign, onequarter ] }; - key { [ 6, dead_circumflex, NoSymbol, onesixth ] }; - - key { [ dead_acute, at, apostrophe, bar ] }; - key { [ dead_grave, notsign, bar, bar ] }; - - key { [ numbersign, dead_tilde, bar, bar ] }; - key { [ 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 - - include "latin" - - name[Group1]="United Kingdom - Extended - Winkeys"; - - // Alphanumeric section - key { [ dead_grave, notsign, brokenbar, NoSymbol ] }; - - key { [ 2, quotedbl, dead_diaeresis, onehalf ] }; - key { [ 3, sterling, threesuperior, onethird ] }; - key { [ 4, dollar, EuroSign, onequarter ] }; - key { [ 6, asciicircum, dead_circumflex, NoSymbol ] }; - - key { [ w, W, wacute, Wacute ] }; - key { [ e, E, eacute, Eacute ] }; - key { [ y, Y, yacute, Yacute ] }; - key { [ u, U, uacute, Uacute ] }; - key { [ i, I, iacute, Iacute ] }; - key { [ o, O, oacute, Oacute ] }; - - key { [ a, A, aacute, Aacute ] }; - key { [ apostrophe, at, dead_acute, NoSymbol ] }; - - key { [ c, C, ccedilla, Ccedilla ] }; - - key { [ numbersign, asciitilde, dead_tilde, NoSymbol ] }; - key { [ 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 { [ 2, quotedbl, twosuperior, oneeighth ] }; - key { [ 3, sterling, threesuperior, sterling ] }; - key { [ 4, dollar, EuroSign, onequarter ] }; - - key { [apostrophe, at, dead_circumflex, dead_caron] }; - key { [ grave, notsign, bar, bar ] }; - - key { [numbersign, asciitilde, dead_grave, dead_breve ] }; - key { [ z, Z, ae, AE ] }; - key { [ x, X, dead_circumflex, asciitilde ] }; - key { [ c, C, ccedilla, Ccedilla ] }; - key { [ v, V, oe, OE ] }; - key { [ b, B, dead_breve, asciitilde ] }; - key { [ k, K, dead_abovering, asciitilde ] }; - key { [ m, M, dead_macron, asciitilde ] }; - key { [ comma, less, dead_cedilla, asciitilde ] }; - key { [ period, greater, dead_abovedot, asciitilde ] }; - key { [ backslash, bar, asciitilde, asciitilde ] }; - key { [ 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 { [ apostrophe, at ] }; - key { [ 2, quotedbl, twosuperior, NoSymbol ] }; - key { [ 3, sterling, threesuperior, NoSymbol ] }; - key { [ numbersign, asciitilde ] }; - key { [ backslash, bar ] }; - key { [ 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 { [ minus, underscore ] }; - key { [ equal, plus ] }; - key { [ bracketleft, braceleft ] }; - key { [ bracketright, braceright ] }; - key { [ slash, question ] }; - key { [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 { [ 2, at, EuroSign ] }; - key { [ 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 { [ 2, quotedbl, twosuperior, oneeighth ] }; + key { [ 3, sterling, threesuperior, sterling ] }; + key { [ 4, dollar, EuroSign, onequarter ] }; + + key { [apostrophe, at, dead_circumflex, dead_caron] }; + key { [ grave, notsign, bar, bar ] }; + + key { [numbersign, asciitilde, dead_grave, dead_breve ] }; + key { [ 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 { [ 2, dead_diaeresis, twosuperior, onehalf ] }; + key { [ 3, sterling, threesuperior, onethird ] }; + key { [ 4, dollar, EuroSign, onequarter ] }; + key { [ 6, dead_circumflex, NoSymbol, onesixth ] }; + + key { [ dead_acute, at, apostrophe, bar ] }; + key { [ dead_grave, notsign, bar, bar ] }; + + key { [ numbersign, dead_tilde, bar, bar ] }; + key { [ 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 + + include "latin" + + name[Group1]="United Kingdom - Extended - Winkeys"; + + // Alphanumeric section + key { [ dead_grave, notsign, brokenbar, NoSymbol ] }; + + key { [ 2, quotedbl, dead_diaeresis, onehalf ] }; + key { [ 3, sterling, threesuperior, onethird ] }; + key { [ 4, dollar, EuroSign, onequarter ] }; + key { [ 6, asciicircum, dead_circumflex, NoSymbol ] }; + + key { [ w, W, wacute, Wacute ] }; + key { [ e, E, eacute, Eacute ] }; + key { [ y, Y, yacute, Yacute ] }; + key { [ u, U, uacute, Uacute ] }; + key { [ i, I, iacute, Iacute ] }; + key { [ o, O, oacute, Oacute ] }; + + key { [ a, A, aacute, Aacute ] }; + key { [ apostrophe, at, dead_acute, NoSymbol ] }; + + key { [ c, C, ccedilla, Ccedilla ] }; + + key { [ numbersign, asciitilde, dead_tilde, NoSymbol ] }; + key { [ 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 { [ 2, quotedbl, twosuperior, oneeighth ] }; + key { [ 3, sterling, threesuperior, sterling ] }; + key { [ 4, dollar, EuroSign, onequarter ] }; + + key { [apostrophe, at, dead_circumflex, dead_caron] }; + key { [ grave, notsign, bar, bar ] }; + + key { [numbersign, asciitilde, dead_grave, dead_breve ] }; + key { [ 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 { [ apostrophe, at ] }; + key { [ 2, quotedbl, twosuperior, NoSymbol ] }; + key { [ 3, sterling, threesuperior, NoSymbol ] }; + key { [ numbersign, asciitilde ] }; + key { [ backslash, bar ] }; + key { [ 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 { [ minus, underscore ] }; + key { [ equal, plus ] }; + key { [ bracketleft, braceleft ] }; + key { [ bracketright, braceright ] }; + key { [ slash, question ] }; + key { [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 { [ 2, at, EuroSign ] }; + key { [ 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 { [ 0x1000670, VoidSymbol ] }; + + key { [ 0x1000661, VoidSymbol ] }; + key { [ 0x1000662, VoidSymbol ] }; + key { [ 0x1000663, VoidSymbol ] }; + key { [ 0x1000664, VoidSymbol ] }; + key { [ 0x1000665, Arabic_percent ] }; + key { [ 0x1000666, VoidSymbol ] }; + key { [ 0x1000667, VoidSymbol ] }; + key { [ 0x1000668, VoidSymbol ] }; + key { [ 0x1000669, 0x100fd3e ] }; + key { [ 0x1000660, 0x100fd3f ] }; + key { [ minus, Arabic_tatweel ] }; + key { [ equal, plus ] }; + + key { [ Arabic_qaf, Arabic_gaf ] }; + key { [ Arabic_waw, Arabic_hamzaonwaw ] }; + key { [ 0x1000656, Arabic_ain ] }; + key { [ Arabic_ra, Arabic_tteh ] }; + key { [ Arabic_teh, Arabic_tah ] }; + key { [ Arabic_yeh, Arabic_alefmaksura ] }; + key { [ Arabic_damma, Arabic_dammatan ] }; + key { [ Arabic_kasra, Arabic_hamzaonyeh ] }; + key { [ Arabic_sukun, 0x1000657 ] }; + key { [ Arabic_peh, Arabic_tehmarbuta ] }; + key { [ VoidSymbol, VoidSymbol ] }; + + key { [ Arabic_fatha, Arabic_alef ] }; + key { [ Arabic_seen, Arabic_sad ] }; + key { [ Arabic_dal, Arabic_dad ] }; + key { [ Arabic_feh, Arabic_fathatan ] }; + key { [ 0x10006A0, Arabic_ghain ] }; + key { [ Arabic_ha, Arabic_hah ] }; + key { [ Arabic_jeem, VoidSymbol ] }; + key { [ Arabic_kaf, Arabic_kasratan ] }; + key { [ Arabic_lam, Arabic_shadda ] }; + key { [ Arabic_semicolon, VoidSymbol ] }; + key { [ Arabic_hamza, VoidSymbol ] }; + + key { [ Arabic_zain, Arabic_zah ] }; + key { [ Arabic_khah, VoidSymbol ] }; + key { [ Arabic_tcheh, Arabic_sheen ] }; + key { [ 0x10006A8, Arabic_theh ] }; + key { [ Arabic_beh, Arabic_thal ] }; + key { [ Arabic_noon, VoidSymbol ] }; + key { [ Arabic_meem, VoidSymbol ] }; + key { [ Arabic_comma, Arabic_hamzaunderalef ] }; + key { [ 0x10006d4, Arabic_hamzaonalef ] }; + key { [ VoidSymbol, Arabic_question_mark ] }; +}; + + -- cgit v1.2.3