xserver libX11 Xextproto mesa Git update 28 Feb 2011

5 files changed, 747 insertions, 732 deletions

diff --git a/xorg-server/xkeyboard-config/symbols/af b/xorg-server/xkeyboard-config/symbols/af
index 90bfe127d..d7d866d34 100644
--- a/xorg-server/xkeyboard-config/symbols/af
+++ b/xorg-server/xkeyboard-config/symbols/af
@@ -1,397 +1,397 @@
-//

-// Keymap for the Afghan dari keybord layout

-// Based on the specification "Computer Locale Requirements for 

-// Afghanstan" [1] from the "United Nations Development Programme

-// Afghanistan" and the "Afghan Transitional Islamic 

-// Administration Ministry of Communications". 

-// [1] http://www.evertype.com/standards/af/

-// For a MINI HOWTO see [2].

-// [2] http://www.afghanischerKulturverein.de/en/afghanComputer_en.php

-//

-// 2006-02-15 file created by M. Emal Alekozai <memala@gmx.net>

-

-partial default alphanumeric_keys 

-xkb_symbols "basic" {

-   //name[Group1]= "Afghanistan Dari";

-   name[Group1]= "Afghanistan";

-

-   key <TLDE> { [ 0x100200d, 0x10000f7, dead_tilde ] };

-   key <AE01> { [ 0x10006f1, exclam, 0x1000060 ] };

-   key <AE02> { [ 0x10006f2, 0x100066c, 0x1000040 ] };

-   key <AE03> { [ 0x10006f3, 0x100066b, numbersign ] };

-   key <AE04> { [ 0x10006f4, 0x100e60b, 0x1000024] };

-   key <AE05> { [ 0x10006f5, 0x100066a, 0x1000025 ] };

-   key <AE06> { [ 0x10006f6, multiply, 0x100005e ] };

-   key <AE07> { [ 0x10006f7, Arabic_comma, 0x1000026 ] };

-   key <AE08> { [ 0x10006f8, asterisk, 0x1002022 ] };

-   key <AE09> { [ 0x10006f9, 0x1000029, 0x100200e ] };

-   key <AE10> { [ 0x10006f0, 0x1000028, 0x100200f ] };

-   key <AE11> { [ minus, Arabic_tatweel, 0x100005f ] };

-   key <AE12> { [ plus, equal ] };

-

-   key <AD01> { [ Arabic_dad, Arabic_sukun, 0x10000b0 ] };

-   key <AD02> { [ Arabic_sad, Arabic_dammatan ] };

-   key <AD03> { [ Arabic_theh, Arabic_kasratan, 0x10020ac ] };

-   key <AD04> { [ Arabic_qaf, Arabic_fathatan, 0x100fd3e ] };

-   key <AD05> { [ Arabic_feh, Arabic_damma, 0x100fd3f ] };

-   key <AD06> { [ Arabic_ghain, Arabic_kasra, 0x100e656] };

-   key <AD07> { [ Arabic_ain, Arabic_fatha, 0x100e659] };

-   key <AD08> { [ Arabic_heh, Arabic_shadda, 0x1000655] };

-   key <AD09> { [ Arabic_khah, bracketright, 0x1000027] };

-   key <AD10> { [ Arabic_hah, bracketleft, 0x1000022] };

-   key <AD11> { [ Arabic_jeem, braceright, 0x1000681 ] };

-   key <AD12> { [ 0x1000686, braceleft, 0x1000685 ] };

-

-   key <AC01> { [ Arabic_sheen, Arabic_hamzaonwaw, 0x100069a ] };

-   key <AC02> { [ Arabic_seen, Arabic_hamzaonyeh, 0x10006cd ] };

-   key <AC03> { [ 0x10006cc, Arabic_yeh, 0x1000649 ] };

-   key <AC04> { [ Arabic_beh, Arabic_hamzaunderalef, 0x10006d0 ] };

-   key <AC05> { [ Arabic_lam, Arabic_hamzaonalef, 0x10006b7 ] };

-   key <AC06> { [ Arabic_alef, Arabic_maddaonalef, 0x1000671 ] };

-   key <AC07> { [ Arabic_teh, Arabic_tehmarbuta, 0x100067c ] };

-   key <AC08> { [ Arabic_noon, 0x10000bb, 0x10006bc ] };

-   key <AC09> { [ Arabic_meem, 0x10000ab, 0x10006ba ] };

-   key <AC10> { [ 0x10006a9, colon, 0x100003b ] };

-   key <AC11> { [ 0x10006af, Arabic_semicolon, 0x10006ab ] };

-

-   key <BKSL> { [ backslash, bar, 0x100003f ] };

-

-   key <AB01> { [ Arabic_zah, Arabic_kaf, 0x10006d2] };

-   key <AB02> { [ Arabic_tah, 0x1000653 , 0x1000691 ] };

-   key <AB03> { [ Arabic_zain, 0x1000698, 0x1000696 ] };

-   key <AB04> { [ Arabic_ra, 0x1000670 , 0x1000693 ] };

-   key <AB05> { [ Arabic_thal, 0x100200c, 0x1000688  ] };

-   key <AB06> { [ Arabic_dal, 0x1000654, 0x1000689 ] };

-   key <AB07> { [ 0x100067e, Arabic_hamza, 0x1000679 ] };

-   key <AB08> { [ Arabic_waw, greater, 0x100002c ] };

-   key <AB09> { [ period, less, 0x10006c7 ] };

-   key <AB10> { [ slash, Arabic_question_mark, 0x10006c9 ] };

-

-   include "nbsp(zwnj2nb3)"

-   include "level3(ralt_switch)"

-};

-

-// Keymap for the Afghan pashto keybord layout

-// Based on the specification "Computer Locale Requirements for 

-// Afghanstan" [1] from the "United Nations Development Programme

-// Afghanistan"" and the "Afghan Transitional Islamic 

-// Administration Ministry of Communications". 

-// [1] http://www.evertype.com/standards/af/

-// For a MINI HOWTO see [2].

-// [2] http://www.afghanischerKulturverein.de/en/afghanComputer_en.php

-// 

-// 2006-02-15 file created by M. Emal Alekozai <memala@gmx.net>

-

-partial alphanumeric_keys 

-xkb_symbols "ps" {

-   name[Group1]= "Afghanistan - Pashto";

-

-   key <TLDE> { [ 0x100200d, 0x10000f7, dead_tilde ] };

-   key <AE01> { [ 0x10006f1, exclam, 0x1000060 ] };

-   key <AE02> { [ 0x10006f2, 0x100066c, 0x1000040 ] };

-   key <AE03> { [ 0x10006f3, 0x100066b, numbersign ] };

-   key <AE04> { [ 0x10006f4, 0x100e60b, 0x1000024] };

-   key <AE05> { [ 0x10006f5, 0x100066a, 0x1000025 ] };

-   key <AE06> { [ 0x10006f6, multiply, 0x100005e ] };

-   key <AE07> { [ 0x10006f7, 0x10000bb, 0x1000026 ] };

-   key <AE08> { [ 0x10006f8, 0x10000ab, 0x1002022 ] };

-   key <AE09> { [ 0x10006f9, 0x1000029, 0x100200e ] };

-   key <AE10> { [ 0x10006f0, 0x1000028, 0x100200f ] };

-   key <AE11> { [ minus, Arabic_tatweel, 0x100005f ] };

-   key <AE12> { [ plus, equal ] };

-

-   key <AD01> { [ Arabic_dad, Arabic_sukun, 0x10000b0 ] };

-   key <AD02> { [ Arabic_sad, Arabic_dammatan, 0x1000653 ] };

-   key <AD03> { [ Arabic_theh, Arabic_kasratan, 0x10020ac ] };

-   key <AD04> { [ Arabic_qaf, Arabic_fathatan, 0x100fd3e ] };

-   key <AD05> { [ Arabic_feh, Arabic_damma, 0x100fd3f ] };

-   key <AD06> { [ Arabic_ghain, Arabic_kasra, 0x100e656] };

-   key <AD07> { [ Arabic_ain, Arabic_fatha, 0x100e659] };

-   key <AD08> { [ Arabic_heh, Arabic_shadda, 0x1000670] };

-   key <AD09> { [ Arabic_khah, 0x1000681, 0x1000027] };

-   key <AD10> { [ Arabic_hah, 0x1000685, 0x1000022] };

-   key <AD11> { [ Arabic_jeem, 0x100005d, 0x100007d ] };

-   key <AD12> { [ 0x1000686, 0x100005b, 0x100007b ] };

-

-   key <AC01> { [ Arabic_sheen, 0x100069a ] };

-   key <AC02> { [ Arabic_seen, Arabic_hamzaonyeh, 0x10006d2 ] };

-   key <AC03> { [ 0x10006cc, Arabic_yeh, 0x1000649 ] };

-   key <AC04> { [ Arabic_beh, 0x100067e, 0x10006ba ] };

-   key <AC05> { [ Arabic_lam, Arabic_hamzaonalef, 0x10006b7 ] };

-   key <AC06> { [ Arabic_alef, Arabic_maddaonalef, 0x1000671 ] };

-   key <AC07> { [ Arabic_teh, 0x100067c, 0x1000679 ] };

-   key <AC08> { [ Arabic_noon, 0x10006bc, 0x100003e ] };

-   key <AC09> { [ Arabic_meem, 0x1000629, 0x100003c ] };

-   key <AC10> { [ 0x10006a9, colon, 0x1000643 ] };

-   key <AC11> { [ 0x10006ab, Arabic_semicolon, 0x10006af ] };

-

-   key <BKSL> { [ backslash, 0x100002a, 0x100007c ] };

-

-   key <AB01> { [ 0x10006cd, 0x1000638, 0x100003f] };

-   key <AB02> { [ 0x10006d0, 0x1000637, 0x100003b ] };

-   key <AB03> { [ Arabic_zain, 0x1000698, 0x1000655 ] };

-   key <AB04> { [ Arabic_ra, 0x1000621, 0x1000654 ] };

-   key <AB05> { [ Arabic_thal, 0x100200c, 0x1000625  ] };

-   key <AB06> { [ Arabic_dal, 0x1000689, 0x1000688 ] };

-   key <AB07> { [ 0x1000693, 0x1000624, 0x1000691 ] };

-   key <AB08> { [ Arabic_waw, 0x100060c, 0x100002c ] };

-   key <AB09> { [ 0x1000696, 0x100002e, 0x10006c7 ] };

-   key <AB10> { [ slash, Arabic_question_mark, 0x10006c9 ] };

-

-   include "nbsp(zwnj2nb3)"

-   include "level3(ralt_switch)"

-};

-

-// Keymap for the Afghan southern uzbek keybord layout

-// Based on the specification "Computer Locale Requirements for 

-// Afghanstan" [1] from the "United Nations Development Programme

-// Afghanistan"" and the "Afghan Transitional Islamic 

-// Administration Ministry of Communications". 

-// [1] http://www.evertype.com/standards/af/

-// For a MINI HOWTO see [2].

-// [2] http://www.afghanischerKulturverein.de/en/afghanComputer_en.php

-// 

-// 2006-02-15 file created by M. Emal Alekozai <memala@gmx.net>

-

-partial alphanumeric_keys 

-xkb_symbols "uz" {

-   name[Group1]= "Afghanistan - Southern Uzbek";

-

-   key <TLDE> { [ 0x100200d, 0x10000f7, dead_tilde ] };

-   key <AE01> { [ 0x10006f1, exclam, 0x1000060 ] };

-   key <AE02> { [ 0x10006f2, 0x100066c, 0x1000040 ] };

-   key <AE03> { [ 0x10006f3, 0x100066b, numbersign ] };

-   key <AE04> { [ 0x10006f4, 0x100e60b, 0x1000024] };

-   key <AE05> { [ 0x10006f5, 0x100066a, 0x1000025 ] };

-   key <AE06> { [ 0x10006f6, multiply, 0x100005e ] };

-   key <AE07> { [ 0x10006f7, Arabic_comma, 0x1000026 ] };

-   key <AE08> { [ 0x10006f8, asterisk, 0x1002022 ] };

-   key <AE09> { [ 0x10006f9, 0x1000029, 0x100200e ] };

-   key <AE10> { [ 0x10006f0, 0x1000028, 0x100200f ] };

-   key <AE11> { [ minus, Arabic_tatweel, 0x100005f ] };

-   key <AE12> { [ plus, equal ] };

-

-   key <AD01> { [ Arabic_dad, Arabic_sukun, 0x10000b0 ] };

-   key <AD02> { [ Arabic_sad, Arabic_dammatan, 0x1000653 ] };

-   key <AD03> { [ Arabic_theh, Arabic_kasratan, 0x10020ac ] };

-   key <AD04> { [ Arabic_qaf, Arabic_fathatan, 0x100fd3e ] };

-   key <AD05> { [ Arabic_feh, Arabic_damma, 0x100fd3f ] };

-   key <AD06> { [ Arabic_ghain, Arabic_kasra, 0x100e656] };

-   key <AD07> { [ Arabic_ain, Arabic_fatha, 0x100e659] };

-   key <AD08> { [ Arabic_heh, Arabic_shadda, 0x1000670] };

-   key <AD09> { [ Arabic_khah, bracketright, 0x1000027] };

-   key <AD10> { [ Arabic_hah, bracketleft, 0x1000022] };

-   key <AD11> { [ Arabic_jeem, braceright, 0x1000681 ] };

-   key <AD12> { [ 0x1000686, braceleft, 0x1000685 ] };

-

-   key <AC01> { [ Arabic_sheen, Arabic_hamzaonwaw, 0x100069a ] };

-   key <AC02> { [ Arabic_seen, Arabic_hamzaonyeh, 0x10006cd ] };

-   key <AC03> { [ 0x10006cc, Arabic_yeh, 0x1000649 ] };

-   key <AC04> { [ Arabic_beh, 0x10006d0, 0x1000643 ] };

-   key <AC05> { [ Arabic_lam, Arabic_hamzaonalef, 0x10006b7 ] };

-   key <AC06> { [ Arabic_alef, Arabic_maddaonalef, 0x1000671 ] };

-   key <AC07> { [ Arabic_teh, Arabic_tehmarbuta, 0x100067c ] };

-   key <AC08> { [ Arabic_noon, 0x10000bb, 0x10006bc ] };

-   key <AC09> { [ Arabic_meem, 0x10000ab, 0x10006ba ] };

-   key <AC10> { [ 0x10006a9, colon, 0x100003b ] };

-   key <AC11> { [ 0x10006af, Arabic_semicolon, 0x10006ab ] };

-

-   key <BKSL> { [ backslash, bar, 0x100003f ] };

-

-   key <AB01> { [ Arabic_zah, 0x10006c9, 0x10006d2] };

-   key <AB02> { [ Arabic_tah, 0x10006c7, 0x1000691 ] };

-   key <AB03> { [ Arabic_zain, 0x1000698, 0x1000696 ] };

-   key <AB04> { [ Arabic_ra, 0x1000625, 0x1000693 ] };

-   key <AB05> { [ Arabic_thal, 0x100200c, 0x1000688  ] };

-   key <AB06> { [ Arabic_dal, 0x1000654, 0x1000689 ] };

-   key <AB07> { [ 0x100067e, Arabic_hamza, 0x1000679 ] };

-   key <AB08> { [ Arabic_waw, greater, 0x100002c ] };

-   key <AB09> { [ period, less ] };

-   key <AB10> { [ slash, Arabic_question_mark, 0x1000655 ] };

-

-   include "nbsp(zwnj2nb3)"

-   include "level3(ralt_switch)"

-};

-

-partial alphanumeric_keys 

-xkb_symbols "olpc-ps" {

-

-   name[Group1]= "Afghanistan - OLPC Pashto";

-

-   key <TLDE> { [ 0x100200D, 0x1000654, grave ] }; // zero width joiner, Arabic hamza above

-   key <AE01> { [ 0x10006F1, exclam, asciitilde ] }; // Arabic one

-   key <AE02> { [ 0x10006F2, 0x100066C, at ] }; // Arabic two, Arabic thousands separator

-   key <AE03> { [ 0x10006F3, 0x100066B, numbersign ] }; // Arabic three, Arabic decimal separator

-   key <AE04> { [ 0x10006F4, 0x100060B, dollar ] }; // Arabic four, Afghani sign

-   key <AE05> { [ 0x10006F5, 0x100066A, percent ] }; // Arabic five, Arabic percent sign

-   key <AE06> { [ 0x10006F6, multiply, asciicircum ] }; // Arabic six

-   key <AE07> { [ 0x10006F7, guillemotright, ampersand ] }; // Arabic seven

-   key <AE08> { [ 0x10006F8, guillemotleft, 0x100066D ] }; // Arabic eight, Arabic five-pointed star

-   key <AE09> { [ 0x10006F9, parenright, enfilledcircbullet ] }; // Arabic nine

-   key <AE10> { [ 0x10006F0, parenleft, degree ] }; // Arabic zero

-   key <AE11> { [ minus, 0x1000640, underscore ] }; // Arabic_tatweel

-   key <AE12> { [ plus, equal, division ] };

-

-   key <AD01> { [ 0x1000636, 0x1000652, EuroSign ] }; // Arabic dad, Arabic sukun

-   key <AD02> { [ 0x1000635, 0x100064C, 0x1000671 ] }; // Arabic sad, Arabic dammatan, Arabic alef walsa

-   key <AD03> { [ 0x100062B, 0x100064D, 0x1000649 ] }; // Arabic theh, Arabic kasratan, Arabic alef maksura initial form

-   key <AD04> { [ 0x1000642, 0x100064B, 0x100200E ] }; // Arabic qaf, Arabic fathatan, left-to-right mark

-   key <AD05> { [ 0x1000641, 0x100064F, 0x100200F ] }; // Arabic feh, Arabic damma, right-to-left mark

-   key <AD06> { [ 0x100063A, 0x1000650, 0x100e653 ] }; // Arabic ghain, Arabic kasra, Arabic alef with madda above

-   key <AD07> { [ 0x1000639, 0x100064E, 0x100e659 ] }; // Arabic ain, Arabic fatha, Arabic zwarakay

-   key <AD08> { [ 0x1000647, 0x1000651, 0x1000670 ] }; // Arabic heh, Arabic shadda, Arabic superscript alef

-   key <AD09> { [ 0x100062E, 0x1000681, apostrophe ] }; // Arabic khah, Arabic hah with hamza above, 

-   key <AD10> { [ 0x100062D, 0x1000685, quotedbl ] }; // Arabic hah, Arabic hah with three dots above

-   key <AD11> { [ 0x100062C, bracketright, braceleft ] }; // Arabic jeem

-   key <AD12> { [ 0x1000686, bracketleft, braceright ] }; // Arabic tcheh

-

-   key <AC01> { [ 0x1000634, 0x100069A ] }; // Arabic sheen, Arabic seen with dot below and dot above

-   key <AC02> { [ 0x1000633, 0x10006CD ] }; // Arabic seen, Arabic yeh with tail

-   key <AC03> { [ 0x10006CC, 0x100064A, 0x10006D2 ] }; // Farsi yeh, Arabic yeh, Arabic yeh barree

-   key <AC04> { [ 0x1000628, 0x100067E, 0x10006BA ] }; // Arabic beh, Arabic peh, Arabic noon ghunna

-   key <AC05> { [ 0x1000644, 0x1000623, 0x10006B7 ] }; // Arabic lam, Arabic hamza on alef, Arabic alef with hamza above

-   key <AC06> { [ 0x1000627, 0x1000622, 0x1000625 ] }; // Arabic alef, Arabic madda on alef, Arabic alef with hamza below

-   key <AC07> { [ 0x100062A, 0x100067C, 0x1000679 ] }; // Arabic teh, Arabic teh with ring, Arabic tteh

-   key <AC08> { [ 0x1000646, 0x10006BC, greater ] }; // Arabic noon, Arabic noon with ring

-   key <AC09> { [ 0x1000645, 0x1000629, less ] }; // Arabic meem, Arabic teh marbuta

-   key <AC10> { [ 0x10006A9, colon, 0x1000643 ] }; // Arabic keheh, Arabic kaf

-   key <AC11> { [ 0x10006AB, 0x100061B, 0x10006AF ] }; // Arabic kaf with ring, Arabic semicolon, Arabic gaf

-

-   key <BKSL> { [ backslash, asterisk, bar ] };

-

-   key <AB01> { [ 0x1000638, 0x1000626, question] }; // Arabic zah, Arabic yeh with hamza above

-   key <AB02> { [ 0x10006D0, 0x1000637, semicolon ] }; // Arabic tah, Arabic E

-   key <AB03> { [ 0x1000632, 0x1000698 ] }; // Arabic zain, Arabic jeh

-   key <AB04> { [ 0x1000631, 0x1000621 ] }; // Arabic_ra (reh?), Arabic hamza

-   key <AB05> { [ 0x1000630, 0x100200C ] }; // Arabic_thal, zero width non-joiner

-   key <AB06> { [ 0x100062F, 0x1000689, 0x1000688 ] }; // Arabic_dal, Arabic dal with ring, Arabic ddal

-   key <AB07> { [ 0x1000693, 0x1000624, 0x1000691 ] }; // Arabic reh with ring, Arabic waw with hamza above, Arabic rreh

-   key <AB08> { [ 0x1000648, period, comma ] }; // Arabic_waw, Arabic comma

-   key <AB09> { [ 0x1000696, 0x100002E, 0x10006C7 ] }; // Arabic reh with dot below and dot above, full stop, Arabic letter U

-   key <AB10> { [ slash, 0x100061F, 0x10006C9 ] }; // Arabic question mark, Arabic kirghiz yu

-

-   include "nbsp(zwnj2nb3)"

-   include "group(olpc)"

-};

-

-partial alphanumeric_keys 

-xkb_symbols "olpc-fa" {

-

-   name[Group1]= "Afghanistan - OLPC Dari";

-

-   key <TLDE> { [ 0x100200D, division, asciitilde ] }; // zero width joiner

-   key <AE01> { [ 0x10006F1, exclam, grave ] }; // Arabic one

-   key <AE02> { [ 0x10006F2, 0x100066C, at ] }; // Arabic two, Arabic thousands separator

-   key <AE03> { [ 0x10006F3, 0x100066B, numbersign ] }; // Arabic three, Arabic decimal separator

-   key <AE04> { [ 0x10006F4, 0x100060B, dollar ] }; // Arabic four, Afghani sign

-   key <AE05> { [ 0x10006F5, 0x100066A, percent ] }; // Arabic five, Arabic percent sign

-   key <AE06> { [ 0x10006F6, multiply, asciicircum ] }; // Arabic six

-   key <AE07> { [ 0x10006F7, 0x100060C, ampersand ] }; // Arabic seven, Arabic comma

-   key <AE08> { [ 0x10006F8, asterisk, enfilledcircbullet ] }; // Arabic eight, 

-   key <AE09> { [ 0x10006F9, parenright, 0x100200E ] }; // Arabic nine, left-to-right mark

-   key <AE10> { [ 0x10006F0, parenleft, 0x100200F ] }; // Arabic zero, right-to-left mark

-   key <AE11> { [ minus, 0x1000640, underscore ] }; // Arabic_tatweel

-   key <AE12> { [ plus, equal ] };

-

-   key <AD01> { [ 0x1000636, 0x1000652, degree ] }; // Arabic dad, Arabic sukun

-   key <AD02> { [ 0x1000635, 0x100064C ] }; // Arabic sad, Arabic dammatan

-   key <AD03> { [ 0x100062B, 0x100064D, EuroSign ] }; // Arabic theh, Arabic kasratan

-   key <AD04> { [ 0x1000642, 0x100064B, 0x100FD3E ] }; // Arabic qaf, Arabic fathatan, ornate left paren

-   key <AD05> { [ 0x1000641, 0x100064F, 0x100FD3F ] }; // Arabic feh, Arabic damma, ornate right paren

-   key <AD06> { [ 0x100063A, 0x1000650, 0x1000656 ] }; // Arabic ghain, Arabic kasra, Arabic subscript alef

-   key <AD07> { [ 0x1000639, 0x100064E, 0x100e659 ] }; // Arabic ain, Arabic fatha, Arabic zwarakay

-   key <AD08> { [ 0x1000647, 0x1000651, 0x1000655 ] }; // Arabic heh, Arabic shadda, Arabic hamza below

-   key <AD09> { [ 0x100062E, bracketright, apostrophe ] }; // Arabic khah

-   key <AD10> { [ 0x100062D, bracketleft, quotedbl ] }; // Arabic hah

-   key <AD11> { [ 0x100062C, braceright, 0x1000681 ] }; // Arabic jeem, Arabic hah with hamza above

-   key <AD12> { [ 0x1000686, braceleft, 0x1000685 ] }; // Arabic tcheh, Arabic hah with three dots above

-

-   key <AC01> { [ 0x1000634, 0x1000624, 0x100069A ] }; // Arabic sheen, Arabic waw with hamza above, Arabic seen with dot below and dot above

-   key <AC02> { [ 0x1000633, 0x1000626, 0x10006CD ] }; // Arabic seen, Arabic yeh with hamza above, Arabic yeh with tail

-   key <AC03> { [ 0x10006CC, 0x100064A, 0x1000649 ] }; // Farsi yeh, Arabic yeh, Arabic alef maksura

-   key <AC04> { [ 0x1000628, 0x1000625, 0x10006D0 ] }; // Arabic beh, Arabic alef with hamza below, Arabic e

-   key <AC05> { [ 0x1000644, 0x1000623, 0x10006B7 ] }; // Arabic lam, Arabic hamza on alef, Arabic alef with hamza above

-   key <AC06> { [ 0x1000627, 0x1000622, 0x1000671 ] }; // Arabic alef, Arabic madda on alef, Arabic alef wasla

-   key <AC07> { [ 0x100062A, 0x1000629, 0x100067C ] }; // Arabic teh, Arabic teh marbuta, Arabic tteh

-   key <AC08> { [ 0x1000646, guillemotright, 0x10006BC ] }; // Arabic noon, Arabic noon with ring

-   key <AC09> { [ 0x1000645, guillemotleft, 0x10006BA ] }; // Arabic meem, Arabic noon ghunna

-   key <AC10> { [ 0x10006A9, colon, semicolon ] }; // Arabic keheh, 

-   key <AC11> { [ 0x10006AF, 0x100061B, 0x10006AB ] }; // Arabic gaf, Arabic semicolon, Arabic kaf with ring

-

-   key <BKSL> { [ backslash, bar, question ] };

-

-   key <AB01> { [ 0x1000638, 0x1000643, 0x10006D2 ] }; // Arabic zah, Arabic kaf, Arabic yeh barree

-   key <AB02> { [ 0x1000637, 0x1000653, 0x1000691 ] }; // Arabic tah, Arabic maddah above, Arabic rreh

-   key <AB03> { [ 0x1000632, 0x1000698, 0x1000696 ] }; // Arabic zain, Arabic jeh,  Arabic reh with dot below and dot above

-   key <AB04> { [ 0x1000631, 0x1000670, 0x1000693 ] }; // Arabic_ra (reh?), Arabic superscript alef, Arabic reh with ring

-   key <AB05> { [ 0x1000630, 0x100200C, 0x1000688 ] }; // Arabic_thal, zero width non-joiner, Arabic ddal

-   key <AB06> { [ 0x100062F, 0x1000654, 0x1000689 ] }; // Arabic dal, Arabic hamza above, Arabic dal with ring

-   key <AB07> { [ 0x100067E, 0x1000621, 0x1000679 ] }; // Arabic peh, Arabic hamza, Arabic tteh

-   key <AB08> { [ 0x1000648, greater, comma ] }; // Arabic_waw

-   key <AB09> { [ period, less, 0x10006C7 ] }; // Arabic u

-   key <AB10> { [ slash, 0x100061F, 0x10006C9 ] }; // Arabic question mark, Arabic kirghiz yu

-

-   include "nbsp(zwnj2nb3)"

-   include "group(olpc)"

-};

-

-partial alphanumeric_keys 

-xkb_symbols "olpc-uz" {

-

-   name[Group1]= "Afghanistan - OLPC Southern Uzbek";

-

-   key <TLDE> { [ 0x100200D, division, asciitilde ] }; // zero width joiner

-   key <AE01> { [ 0x10006F1, exclam, grave ] }; // Arabic one

-   key <AE02> { [ 0x10006F2, 0x100066C, at ] }; // Arabic two, Arabic thousands separator

-   key <AE03> { [ 0x10006F3, 0x100066B, numbersign ] }; // Arabic three, Arabic decimal separator

-   key <AE04> { [ 0x10006F4, 0x100060B, dollar ] }; // Arabic four, Afghani sign

-   key <AE05> { [ 0x10006F5, 0x100066A, percent ] }; // Arabic five, Arabic percent sign

-   key <AE06> { [ 0x10006F6, multiply, asciicircum ] }; // Arabic six

-   key <AE07> { [ 0x10006F7, 0x100060C, ampersand ] }; // Arabic seven, Arabic comma

-   key <AE08> { [ 0x10006F8, asterisk, enfilledcircbullet ] }; // Arabic eight, 

-   key <AE09> { [ 0x10006F9, parenright, 0x100200E ] }; // Arabic nine, left-to-right mark

-   key <AE10> { [ 0x10006F0, parenleft, 0x100200F ] }; // Arabic zero, right-to-left mark

-   key <AE11> { [ minus, 0x1000640, underscore ] }; // Arabic_tatweel

-   key <AE12> { [ plus, equal ] };

-

-   key <AD01> { [ 0x1000636, 0x1000652, degree ] }; // Arabic dad, Arabic sukun

-   key <AD02> { [ 0x1000635, 0x100064C, 0x1000653 ] }; // Arabic sad, Arabic dammatan, Arabic maddah above

-   key <AD03> { [ 0x100062B, 0x100064D, EuroSign ] }; // Arabic theh, Arabic kasratan

-   key <AD04> { [ 0x1000642, 0x100064B, 0x100FD3E ] }; // Arabic qaf, Arabic fathatan, ornate left paren

-   key <AD05> { [ 0x1000641, 0x100064F, 0x100FD3F ] }; // Arabic feh, Arabic damma, ornate right paren

-   key <AD06> { [ 0x100063A, 0x1000650, 0x1000656 ] }; // Arabic ghain, Arabic kasra, Arabic subscript alef

-   key <AD07> { [ 0x1000639, 0x100064E, 0x100e659 ] }; // Arabic ain, Arabic fatha, Arabic zwarakay

-   key <AD08> { [ 0x1000647, 0x1000651, 0x1000670 ] }; // Arabic heh, Arabic shadda, Arabic superscript alef

-   key <AD09> { [ 0x100062E, bracketright, apostrophe ] }; // Arabic khah

-   key <AD10> { [ 0x100062D, bracketleft, quotedbl ] }; // Arabic hah

-   key <AD11> { [ 0x100062C, braceright, 0x1000681 ] }; // Arabic jeem, Arabic hah with hamza above

-   key <AD12> { [ 0x1000686, braceleft, 0x1000685 ] }; // Arabic tcheh, Arabic hah with three dots above

-

-   key <AC01> { [ 0x1000634, 0x1000624, 0x100069A ] }; // Arabic sheen, Arabic waw with hamza above, Arabic seen with dot below and dot above

-   key <AC02> { [ 0x1000633, 0x1000626, 0x10006CD ] }; // Arabic seen, Arabic yeh with hamza above, Arabic yeh with tail

-   key <AC03> { [ 0x10006CC, 0x100064A, 0x1000649 ] }; // Farsi yeh, Arabic yeh, Arabic alef maksura

-   key <AC04> { [ 0x1000628, 0x10006D0, 0x1000643  ] }; // Arabic beh, Arabic e, Arabic kaf

-   key <AC05> { [ 0x1000644, 0x1000623, 0x10006B7 ] }; // Arabic lam, Arabic hamza on alef, Arabic alef with hamza above

-   key <AC06> { [ 0x1000627, 0x1000622, 0x1000671 ] }; // Arabic alef, Arabic madda on alef, Arabic alef wasla

-   key <AC07> { [ 0x100062A, 0x1000629, 0x100067C ] }; // Arabic teh, Arabic teh marbuta, Arabic tteh

-   key <AC08> { [ 0x1000646, guillemotright, 0x10006BC ] }; // Arabic noon, Arabic noon with ring

-   key <AC09> { [ 0x1000645, guillemotleft, 0x10006BA ] }; // Arabic meem, Arabic noon ghunna

-   key <AC10> { [ 0x10006A9, colon, semicolon ] }; // Arabic keheh, 

-   key <AC11> { [ 0x10006AF, 0x100061B, 0x10006AB ] }; // Arabic gaf, Arabic semicolon, Arabic kaf with ring

-

-   key <BKSL> { [ backslash, bar, question ] };

-

-   key <AB01> { [ 0x1000638, 0x10006C9, 0x10006D2 ] }; // Arabic zah, Arabic kirghiz yu, Arabic yeh barree

-   key <AB02> { [ 0x1000637, 0x10006C7, 0x1000691 ] }; // Arabic tah, Arabic u, Arabic rreh

-   key <AB03> { [ 0x1000632, 0x1000698, 0x1000696 ] }; // Arabic zain, Arabic jeh,  Arabic reh with dot below and dot above

-   key <AB04> { [ 0x1000631, 0x1000625, 0x1000693 ] }; // Arabic_ra (reh?), Arabic alef with hamza below, Arabic reh with ring

-   key <AB05> { [ 0x1000630, 0x100200C, 0x1000688 ] }; // Arabic_thal, zero width non-joiner, Arabic ddal

-   key <AB06> { [ 0x100062F, 0x1000654, 0x1000689 ] }; // Arabic dal, Arabic hamza above, Arabic dal with ring

-   key <AB07> { [ 0x100067E, 0x1000621, 0x1000679 ] }; // Arabic peh, Arabic hamza, Arabic tteh

-   key <AB08> { [ 0x1000648, greater, comma ] }; // Arabic_waw

-   key <AB09> { [ period, less ] };

-   key <AB10> { [ slash, 0x100061F, 0x1000655 ] }; // Arabic question mark, Arabic hamza below

-

-   include "nbsp(zwnj2nb3)"

-   include "group(olpc)"

-};

+//
+// Keymap for the Afghan dari keybord layout
+// Based on the specification "Computer Locale Requirements for 
+// Afghanstan" [1] from the "United Nations Development Programme
+// Afghanistan" and the "Afghan Transitional Islamic 
+// Administration Ministry of Communications". 
+// [1] http://www.evertype.com/standards/af/
+// For a MINI HOWTO see [2].
+// [2] http://www.afghanischerKulturverein.de/en/afghanComputer_en.php
+//
+// 2006-02-15 file created by M. Emal Alekozai <memala@gmx.net>
+
+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+   //name[Group1]= "Afghanistan Dari";
+   name[Group1]= "Afghanistan";
+
+   key <TLDE> { [ 0x100200d, 0x10000f7, dead_tilde ] };
+   key <AE01> { [ 0x10006f1, exclam, 0x1000060 ] };
+   key <AE02> { [ 0x10006f2, 0x100066c, 0x1000040 ] };
+   key <AE03> { [ 0x10006f3, 0x100066b, numbersign ] };
+   key <AE04> { [ 0x10006f4, 0x100e60b, 0x1000024] };
+   key <AE05> { [ 0x10006f5, 0x100066a, 0x1000025 ] };
+   key <AE06> { [ 0x10006f6, multiply, 0x100005e ] };
+   key <AE07> { [ 0x10006f7, Arabic_comma, 0x1000026 ] };
+   key <AE08> { [ 0x10006f8, asterisk, 0x1002022 ] };
+   key <AE09> { [ 0x10006f9, 0x1000029, 0x100200e ] };
+   key <AE10> { [ 0x10006f0, 0x1000028, 0x100200f ] };
+   key <AE11> { [ minus, Arabic_tatweel, 0x100005f ] };
+   key <AE12> { [ plus, equal ] };
+
+   key <AD01> { [ Arabic_dad, Arabic_sukun, 0x10000b0 ] };
+   key <AD02> { [ Arabic_sad, Arabic_dammatan ] };
+   key <AD03> { [ Arabic_theh, Arabic_kasratan, 0x10020ac ] };
+   key <AD04> { [ Arabic_qaf, Arabic_fathatan, 0x100fd3e ] };
+   key <AD05> { [ Arabic_feh, Arabic_damma, 0x100fd3f ] };
+   key <AD06> { [ Arabic_ghain, Arabic_kasra, 0x100e656] };
+   key <AD07> { [ Arabic_ain, Arabic_fatha, 0x100e659] };
+   key <AD08> { [ Arabic_heh, Arabic_shadda, 0x1000655] };
+   key <AD09> { [ Arabic_khah, bracketright, 0x1000027] };
+   key <AD10> { [ Arabic_hah, bracketleft, 0x1000022] };
+   key <AD11> { [ Arabic_jeem, braceright, 0x1000681 ] };
+   key <AD12> { [ 0x1000686, braceleft, 0x1000685 ] };
+
+   key <AC01> { [ Arabic_sheen, Arabic_hamzaonwaw, 0x100069a ] };
+   key <AC02> { [ Arabic_seen, Arabic_hamzaonyeh, 0x10006cd ] };
+   key <AC03> { [ 0x10006cc, Arabic_yeh, 0x1000649 ] };
+   key <AC04> { [ Arabic_beh, Arabic_hamzaunderalef, 0x10006d0 ] };
+   key <AC05> { [ Arabic_lam, Arabic_hamzaonalef, 0x10006b7 ] };
+   key <AC06> { [ Arabic_alef, Arabic_maddaonalef, 0x1000671 ] };
+   key <AC07> { [ Arabic_teh, Arabic_tehmarbuta, 0x100067c ] };
+   key <AC08> { [ Arabic_noon, 0x10000bb, 0x10006bc ] };
+   key <AC09> { [ Arabic_meem, 0x10000ab, 0x10006ba ] };
+   key <AC10> { [ 0x10006a9, colon, 0x100003b ] };
+   key <AC11> { [ 0x10006af, Arabic_semicolon, 0x10006ab ] };
+
+   key <BKSL> { [ backslash, bar, 0x100003f ] };
+
+   key <AB01> { [ Arabic_zah, Arabic_kaf, 0x10006d2] };
+   key <AB02> { [ Arabic_tah, 0x1000653 , 0x1000691 ] };
+   key <AB03> { [ Arabic_zain, 0x1000698, 0x1000696 ] };
+   key <AB04> { [ Arabic_ra, 0x1000670 , 0x1000693 ] };
+   key <AB05> { [ Arabic_thal, 0x100200c, 0x1000688  ] };
+   key <AB06> { [ Arabic_dal, 0x1000654, 0x1000689 ] };
+   key <AB07> { [ 0x100067e, Arabic_hamza, 0x1000679 ] };
+   key <AB08> { [ Arabic_waw, greater, 0x100002c ] };
+   key <AB09> { [ period, less, 0x10006c7 ] };
+   key <AB10> { [ slash, Arabic_question_mark, 0x10006c9 ] };
+
+   include "nbsp(zwnj2nb3)"
+   include "level3(ralt_switch)"
+};
+
+// Keymap for the Afghan pashto keybord layout
+// Based on the specification "Computer Locale Requirements for 
+// Afghanstan" [1] from the "United Nations Development Programme
+// Afghanistan"" and the "Afghan Transitional Islamic 
+// Administration Ministry of Communications". 
+// [1] http://www.evertype.com/standards/af/
+// For a MINI HOWTO see [2].
+// [2] http://www.afghanischerKulturverein.de/en/afghanComputer_en.php
+// 
+// 2006-02-15 file created by M. Emal Alekozai <memala@gmx.net>
+
+partial alphanumeric_keys 
+xkb_symbols "ps" {
+   name[Group1]= "Afghanistan - Pashto";
+
+   key <TLDE> { [ 0x100200d, 0x10000f7, dead_tilde ] };
+   key <AE01> { [ 0x10006f1, exclam, 0x1000060 ] };
+   key <AE02> { [ 0x10006f2, 0x100066c, 0x1000040 ] };
+   key <AE03> { [ 0x10006f3, 0x100066b, numbersign ] };
+   key <AE04> { [ 0x10006f4, 0x100e60b, 0x1000024] };
+   key <AE05> { [ 0x10006f5, 0x100066a, 0x1000025 ] };
+   key <AE06> { [ 0x10006f6, multiply, 0x100005e ] };
+   key <AE07> { [ 0x10006f7, 0x10000bb, 0x1000026 ] };
+   key <AE08> { [ 0x10006f8, 0x10000ab, 0x1002022 ] };
+   key <AE09> { [ 0x10006f9, 0x1000029, 0x100200e ] };
+   key <AE10> { [ 0x10006f0, 0x1000028, 0x100200f ] };
+   key <AE11> { [ minus, Arabic_tatweel, 0x100005f ] };
+   key <AE12> { [ plus, equal ] };
+
+   key <AD01> { [ Arabic_dad, Arabic_sukun, 0x10000b0 ] };
+   key <AD02> { [ Arabic_sad, Arabic_dammatan, 0x1000653 ] };
+   key <AD03> { [ Arabic_theh, Arabic_kasratan, 0x10020ac ] };
+   key <AD04> { [ Arabic_qaf, Arabic_fathatan, 0x100fd3e ] };
+   key <AD05> { [ Arabic_feh, Arabic_damma, 0x100fd3f ] };
+   key <AD06> { [ Arabic_ghain, Arabic_kasra, 0x100e656] };
+   key <AD07> { [ Arabic_ain, Arabic_fatha, 0x100e659] };
+   key <AD08> { [ Arabic_heh, Arabic_shadda, 0x1000670] };
+   key <AD09> { [ Arabic_khah, 0x1000681, 0x1000027] };
+   key <AD10> { [ Arabic_hah, 0x1000685, 0x1000022] };
+   key <AD11> { [ Arabic_jeem, 0x100005d, 0x100007d ] };
+   key <AD12> { [ 0x1000686, 0x100005b, 0x100007b ] };
+
+   key <AC01> { [ Arabic_sheen, 0x100069a ] };
+   key <AC02> { [ Arabic_seen, Arabic_hamzaonyeh, 0x10006d2 ] };
+   key <AC03> { [ 0x10006cc, Arabic_yeh, 0x1000649 ] };
+   key <AC04> { [ Arabic_beh, 0x100067e, 0x10006ba ] };
+   key <AC05> { [ Arabic_lam, Arabic_hamzaonalef, 0x10006b7 ] };
+   key <AC06> { [ Arabic_alef, Arabic_maddaonalef, 0x1000671 ] };
+   key <AC07> { [ Arabic_teh, 0x100067c, 0x1000679 ] };
+   key <AC08> { [ Arabic_noon, 0x10006bc, 0x100003e ] };
+   key <AC09> { [ Arabic_meem, 0x1000629, 0x100003c ] };
+   key <AC10> { [ 0x10006a9, colon, 0x1000643 ] };
+   key <AC11> { [ 0x10006ab, Arabic_semicolon, 0x10006af ] };
+
+   key <BKSL> { [ backslash, 0x100002a, 0x100007c ] };
+
+   key <AB01> { [ 0x10006cd, 0x1000638, 0x100003f] };
+   key <AB02> { [ 0x10006d0, 0x1000637, 0x100003b ] };
+   key <AB03> { [ Arabic_zain, 0x1000698, 0x1000655 ] };
+   key <AB04> { [ Arabic_ra, 0x1000621, 0x1000654 ] };
+   key <AB05> { [ Arabic_thal, 0x100200c, 0x1000625  ] };
+   key <AB06> { [ Arabic_dal, 0x1000689, 0x1000688 ] };
+   key <AB07> { [ 0x1000693, 0x1000624, 0x1000691 ] };
+   key <AB08> { [ Arabic_waw, 0x100060c, 0x100002c ] };
+   key <AB09> { [ 0x1000696, 0x100002e, 0x10006c7 ] };
+   key <AB10> { [ slash, Arabic_question_mark, 0x10006c9 ] };
+
+   include "nbsp(zwnj2nb3)"
+   include "level3(ralt_switch)"
+};
+
+// Keymap for the Afghan southern uzbek keybord layout
+// Based on the specification "Computer Locale Requirements for 
+// Afghanstan" [1] from the "United Nations Development Programme
+// Afghanistan"" and the "Afghan Transitional Islamic 
+// Administration Ministry of Communications". 
+// [1] http://www.evertype.com/standards/af/
+// For a MINI HOWTO see [2].
+// [2] http://www.afghanischerKulturverein.de/en/afghanComputer_en.php
+// 
+// 2006-02-15 file created by M. Emal Alekozai <memala@gmx.net>
+
+partial alphanumeric_keys 
+xkb_symbols "uz" {
+   name[Group1]= "Afghanistan - Southern Uzbek";
+
+   key <TLDE> { [ 0x100200d, 0x10000f7, dead_tilde ] };
+   key <AE01> { [ 0x10006f1, exclam, 0x1000060 ] };
+   key <AE02> { [ 0x10006f2, 0x100066c, 0x1000040 ] };
+   key <AE03> { [ 0x10006f3, 0x100066b, numbersign ] };
+   key <AE04> { [ 0x10006f4, 0x100e60b, 0x1000024] };
+   key <AE05> { [ 0x10006f5, 0x100066a, 0x1000025 ] };
+   key <AE06> { [ 0x10006f6, multiply, 0x100005e ] };
+   key <AE07> { [ 0x10006f7, Arabic_comma, 0x1000026 ] };
+   key <AE08> { [ 0x10006f8, asterisk, 0x1002022 ] };
+   key <AE09> { [ 0x10006f9, 0x1000029, 0x100200e ] };
+   key <AE10> { [ 0x10006f0, 0x1000028, 0x100200f ] };
+   key <AE11> { [ minus, Arabic_tatweel, 0x100005f ] };
+   key <AE12> { [ plus, equal ] };
+
+   key <AD01> { [ Arabic_dad, Arabic_sukun, 0x10000b0 ] };
+   key <AD02> { [ Arabic_sad, Arabic_dammatan, 0x1000653 ] };
+   key <AD03> { [ Arabic_theh, Arabic_kasratan, 0x10020ac ] };
+   key <AD04> { [ Arabic_qaf, Arabic_fathatan, 0x100fd3e ] };
+   key <AD05> { [ Arabic_feh, Arabic_damma, 0x100fd3f ] };
+   key <AD06> { [ Arabic_ghain, Arabic_kasra, 0x100e656] };
+   key <AD07> { [ Arabic_ain, Arabic_fatha, 0x100e659] };
+   key <AD08> { [ Arabic_heh, Arabic_shadda, 0x1000670] };
+   key <AD09> { [ Arabic_khah, bracketright, 0x1000027] };
+   key <AD10> { [ Arabic_hah, bracketleft, 0x1000022] };
+   key <AD11> { [ Arabic_jeem, braceright, 0x1000681 ] };
+   key <AD12> { [ 0x1000686, braceleft, 0x1000685 ] };
+
+   key <AC01> { [ Arabic_sheen, Arabic_hamzaonwaw, 0x100069a ] };
+   key <AC02> { [ Arabic_seen, Arabic_hamzaonyeh, 0x10006cd ] };
+   key <AC03> { [ 0x10006cc, Arabic_yeh, 0x1000649 ] };
+   key <AC04> { [ Arabic_beh, 0x10006d0, 0x1000643 ] };
+   key <AC05> { [ Arabic_lam, Arabic_hamzaonalef, 0x10006b7 ] };
+   key <AC06> { [ Arabic_alef, Arabic_maddaonalef, 0x1000671 ] };
+   key <AC07> { [ Arabic_teh, Arabic_tehmarbuta, 0x100067c ] };
+   key <AC08> { [ Arabic_noon, 0x10000bb, 0x10006bc ] };
+   key <AC09> { [ Arabic_meem, 0x10000ab, 0x10006ba ] };
+   key <AC10> { [ 0x10006a9, colon, 0x100003b ] };
+   key <AC11> { [ 0x10006af, Arabic_semicolon, 0x10006ab ] };
+
+   key <BKSL> { [ backslash, bar, 0x100003f ] };
+
+   key <AB01> { [ Arabic_zah, 0x10006c9, 0x10006d2] };
+   key <AB02> { [ Arabic_tah, 0x10006c7, 0x1000691 ] };
+   key <AB03> { [ Arabic_zain, 0x1000698, 0x1000696 ] };
+   key <AB04> { [ Arabic_ra, 0x1000625, 0x1000693 ] };
+   key <AB05> { [ Arabic_thal, 0x100200c, 0x1000688  ] };
+   key <AB06> { [ Arabic_dal, 0x1000654, 0x1000689 ] };
+   key <AB07> { [ 0x100067e, Arabic_hamza, 0x1000679 ] };
+   key <AB08> { [ Arabic_waw, greater, 0x100002c ] };
+   key <AB09> { [ period, less ] };
+   key <AB10> { [ slash, Arabic_question_mark, 0x1000655 ] };
+
+   include "nbsp(zwnj2nb3)"
+   include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys 
+xkb_symbols "olpc-ps" {
+
+   name[Group1]= "Afghanistan - OLPC Pashto";
+
+   key <TLDE> { [ 0x100200D, 0x1000654, grave ] }; // zero width joiner, Arabic hamza above
+   key <AE01> { [ 0x10006F1, exclam, asciitilde ] }; // Arabic one
+   key <AE02> { [ 0x10006F2, 0x100066C, at ] }; // Arabic two, Arabic thousands separator
+   key <AE03> { [ 0x10006F3, 0x100066B, numbersign ] }; // Arabic three, Arabic decimal separator
+   key <AE04> { [ 0x10006F4, 0x100060B, dollar ] }; // Arabic four, Afghani sign
+   key <AE05> { [ 0x10006F5, 0x100066A, percent ] }; // Arabic five, Arabic percent sign
+   key <AE06> { [ 0x10006F6, multiply, asciicircum ] }; // Arabic six
+   key <AE07> { [ 0x10006F7, guillemotright, ampersand ] }; // Arabic seven
+   key <AE08> { [ 0x10006F8, guillemotleft, 0x100066D ] }; // Arabic eight, Arabic five-pointed star
+   key <AE09> { [ 0x10006F9, parenright, enfilledcircbullet ] }; // Arabic nine
+   key <AE10> { [ 0x10006F0, parenleft, degree ] }; // Arabic zero
+   key <AE11> { [ minus, 0x1000640, underscore ] }; // Arabic_tatweel
+   key <AE12> { [ plus, equal, division ] };
+
+   key <AD01> { [ 0x1000636, 0x1000652, EuroSign ] }; // Arabic dad, Arabic sukun
+   key <AD02> { [ 0x1000635, 0x100064C, 0x1000671 ] }; // Arabic sad, Arabic dammatan, Arabic alef walsa
+   key <AD03> { [ 0x100062B, 0x100064D, 0x1000649 ] }; // Arabic theh, Arabic kasratan, Arabic alef maksura initial form
+   key <AD04> { [ 0x1000642, 0x100064B, 0x100200E ] }; // Arabic qaf, Arabic fathatan, left-to-right mark
+   key <AD05> { [ 0x1000641, 0x100064F, 0x100200F ] }; // Arabic feh, Arabic damma, right-to-left mark
+   key <AD06> { [ 0x100063A, 0x1000650, 0x100e653 ] }; // Arabic ghain, Arabic kasra, Arabic alef with madda above
+   key <AD07> { [ 0x1000639, 0x100064E, 0x100e659 ] }; // Arabic ain, Arabic fatha, Arabic zwarakay
+   key <AD08> { [ 0x1000647, 0x1000651, 0x1000670 ] }; // Arabic heh, Arabic shadda, Arabic superscript alef
+   key <AD09> { [ 0x100062E, 0x1000681, apostrophe ] }; // Arabic khah, Arabic hah with hamza above, 
+   key <AD10> { [ 0x100062D, 0x1000685, quotedbl ] }; // Arabic hah, Arabic hah with three dots above
+   key <AD11> { [ 0x100062C, bracketright, braceleft ] }; // Arabic jeem
+   key <AD12> { [ 0x1000686, bracketleft, braceright ] }; // Arabic tcheh
+
+   key <AC01> { [ 0x1000634, 0x100069A ] }; // Arabic sheen, Arabic seen with dot below and dot above
+   key <AC02> { [ 0x1000633, 0x10006CD ] }; // Arabic seen, Arabic yeh with tail
+   key <AC03> { [ 0x10006CC, 0x100064A, 0x10006D2 ] }; // Farsi yeh, Arabic yeh, Arabic yeh barree
+   key <AC04> { [ 0x1000628, 0x100067E, 0x10006BA ] }; // Arabic beh, Arabic peh, Arabic noon ghunna
+   key <AC05> { [ 0x1000644, 0x1000623, 0x10006B7 ] }; // Arabic lam, Arabic hamza on alef, Arabic alef with hamza above
+   key <AC06> { [ 0x1000627, 0x1000622, 0x1000625 ] }; // Arabic alef, Arabic madda on alef, Arabic alef with hamza below
+   key <AC07> { [ 0x100062A, 0x100067C, 0x1000679 ] }; // Arabic teh, Arabic teh with ring, Arabic tteh
+   key <AC08> { [ 0x1000646, 0x10006BC, greater ] }; // Arabic noon, Arabic noon with ring
+   key <AC09> { [ 0x1000645, 0x1000629, less ] }; // Arabic meem, Arabic teh marbuta
+   key <AC10> { [ 0x10006A9, colon, 0x1000643 ] }; // Arabic keheh, Arabic kaf
+   key <AC11> { [ 0x10006AB, 0x100061B, 0x10006AF ] }; // Arabic kaf with ring, Arabic semicolon, Arabic gaf
+
+   key <BKSL> { [ backslash, asterisk, bar ] };
+
+   key <AB01> { [ 0x1000638, 0x1000626, question] }; // Arabic zah, Arabic yeh with hamza above
+   key <AB02> { [ 0x10006D0, 0x1000637, semicolon ] }; // Arabic tah, Arabic E
+   key <AB03> { [ 0x1000632, 0x1000698 ] }; // Arabic zain, Arabic jeh
+   key <AB04> { [ 0x1000631, 0x1000621 ] }; // Arabic_ra (reh?), Arabic hamza
+   key <AB05> { [ 0x1000630, 0x100200C ] }; // Arabic_thal, zero width non-joiner
+   key <AB06> { [ 0x100062F, 0x1000689, 0x1000688 ] }; // Arabic_dal, Arabic dal with ring, Arabic ddal
+   key <AB07> { [ 0x1000693, 0x1000624, 0x1000691 ] }; // Arabic reh with ring, Arabic waw with hamza above, Arabic rreh
+   key <AB08> { [ 0x1000648, period, comma ] }; // Arabic_waw, Arabic comma
+   key <AB09> { [ 0x1000696, 0x100002E, 0x10006C7 ] }; // Arabic reh with dot below and dot above, full stop, Arabic letter U
+   key <AB10> { [ slash, 0x100061F, 0x10006C9 ] }; // Arabic question mark, Arabic kirghiz yu
+
+   include "nbsp(zwnj2nb3)"
+   include "group(olpc)"
+};
+
+partial alphanumeric_keys 
+xkb_symbols "fa-olpc" {
+
+   name[Group1]= "Afghanistan - OLPC Dari";
+
+   key <TLDE> { [ 0x100200D, division, asciitilde ] }; // zero width joiner
+   key <AE01> { [ 0x10006F1, exclam, grave ] }; // Arabic one
+   key <AE02> { [ 0x10006F2, 0x100066C, at ] }; // Arabic two, Arabic thousands separator
+   key <AE03> { [ 0x10006F3, 0x100066B, numbersign ] }; // Arabic three, Arabic decimal separator
+   key <AE04> { [ 0x10006F4, 0x100060B, dollar ] }; // Arabic four, Afghani sign
+   key <AE05> { [ 0x10006F5, 0x100066A, percent ] }; // Arabic five, Arabic percent sign
+   key <AE06> { [ 0x10006F6, multiply, asciicircum ] }; // Arabic six
+   key <AE07> { [ 0x10006F7, 0x100060C, ampersand ] }; // Arabic seven, Arabic comma
+   key <AE08> { [ 0x10006F8, asterisk, enfilledcircbullet ] }; // Arabic eight, 
+   key <AE09> { [ 0x10006F9, parenright, 0x100200E ] }; // Arabic nine, left-to-right mark
+   key <AE10> { [ 0x10006F0, parenleft, 0x100200F ] }; // Arabic zero, right-to-left mark
+   key <AE11> { [ minus, 0x1000640, underscore ] }; // Arabic_tatweel
+   key <AE12> { [ plus, equal ] };
+
+   key <AD01> { [ 0x1000636, 0x1000652, degree ] }; // Arabic dad, Arabic sukun
+   key <AD02> { [ 0x1000635, 0x100064C ] }; // Arabic sad, Arabic dammatan
+   key <AD03> { [ 0x100062B, 0x100064D, EuroSign ] }; // Arabic theh, Arabic kasratan
+   key <AD04> { [ 0x1000642, 0x100064B, 0x100FD3E ] }; // Arabic qaf, Arabic fathatan, ornate left paren
+   key <AD05> { [ 0x1000641, 0x100064F, 0x100FD3F ] }; // Arabic feh, Arabic damma, ornate right paren
+   key <AD06> { [ 0x100063A, 0x1000650, 0x1000656 ] }; // Arabic ghain, Arabic kasra, Arabic subscript alef
+   key <AD07> { [ 0x1000639, 0x100064E, 0x100e659 ] }; // Arabic ain, Arabic fatha, Arabic zwarakay
+   key <AD08> { [ 0x1000647, 0x1000651, 0x1000655 ] }; // Arabic heh, Arabic shadda, Arabic hamza below
+   key <AD09> { [ 0x100062E, bracketright, apostrophe ] }; // Arabic khah
+   key <AD10> { [ 0x100062D, bracketleft, quotedbl ] }; // Arabic hah
+   key <AD11> { [ 0x100062C, braceright, 0x1000681 ] }; // Arabic jeem, Arabic hah with hamza above
+   key <AD12> { [ 0x1000686, braceleft, 0x1000685 ] }; // Arabic tcheh, Arabic hah with three dots above
+
+   key <AC01> { [ 0x1000634, 0x1000624, 0x100069A ] }; // Arabic sheen, Arabic waw with hamza above, Arabic seen with dot below and dot above
+   key <AC02> { [ 0x1000633, 0x1000626, 0x10006CD ] }; // Arabic seen, Arabic yeh with hamza above, Arabic yeh with tail
+   key <AC03> { [ 0x10006CC, 0x100064A, 0x1000649 ] }; // Farsi yeh, Arabic yeh, Arabic alef maksura
+   key <AC04> { [ 0x1000628, 0x1000625, 0x10006D0 ] }; // Arabic beh, Arabic alef with hamza below, Arabic e
+   key <AC05> { [ 0x1000644, 0x1000623, 0x10006B7 ] }; // Arabic lam, Arabic hamza on alef, Arabic alef with hamza above
+   key <AC06> { [ 0x1000627, 0x1000622, 0x1000671 ] }; // Arabic alef, Arabic madda on alef, Arabic alef wasla
+   key <AC07> { [ 0x100062A, 0x1000629, 0x100067C ] }; // Arabic teh, Arabic teh marbuta, Arabic tteh
+   key <AC08> { [ 0x1000646, guillemotright, 0x10006BC ] }; // Arabic noon, Arabic noon with ring
+   key <AC09> { [ 0x1000645, guillemotleft, 0x10006BA ] }; // Arabic meem, Arabic noon ghunna
+   key <AC10> { [ 0x10006A9, colon, semicolon ] }; // Arabic keheh, 
+   key <AC11> { [ 0x10006AF, 0x100061B, 0x10006AB ] }; // Arabic gaf, Arabic semicolon, Arabic kaf with ring
+
+   key <BKSL> { [ backslash, bar, question ] };
+
+   key <AB01> { [ 0x1000638, 0x1000643, 0x10006D2 ] }; // Arabic zah, Arabic kaf, Arabic yeh barree
+   key <AB02> { [ 0x1000637, 0x1000653, 0x1000691 ] }; // Arabic tah, Arabic maddah above, Arabic rreh
+   key <AB03> { [ 0x1000632, 0x1000698, 0x1000696 ] }; // Arabic zain, Arabic jeh,  Arabic reh with dot below and dot above
+   key <AB04> { [ 0x1000631, 0x1000670, 0x1000693 ] }; // Arabic_ra (reh?), Arabic superscript alef, Arabic reh with ring
+   key <AB05> { [ 0x1000630, 0x100200C, 0x1000688 ] }; // Arabic_thal, zero width non-joiner, Arabic ddal
+   key <AB06> { [ 0x100062F, 0x1000654, 0x1000689 ] }; // Arabic dal, Arabic hamza above, Arabic dal with ring
+   key <AB07> { [ 0x100067E, 0x1000621, 0x1000679 ] }; // Arabic peh, Arabic hamza, Arabic tteh
+   key <AB08> { [ 0x1000648, greater, comma ] }; // Arabic_waw
+   key <AB09> { [ period, less, 0x10006C7 ] }; // Arabic u
+   key <AB10> { [ slash, 0x100061F, 0x10006C9 ] }; // Arabic question mark, Arabic kirghiz yu
+
+   include "nbsp(zwnj2nb3)"
+   include "group(olpc)"
+};
+
+partial alphanumeric_keys 
+xkb_symbols "uz-olpc" {
+
+   name[Group1]= "Afghanistan - OLPC Southern Uzbek";
+
+   key <TLDE> { [ 0x100200D, division, asciitilde ] }; // zero width joiner
+   key <AE01> { [ 0x10006F1, exclam, grave ] }; // Arabic one
+   key <AE02> { [ 0x10006F2, 0x100066C, at ] }; // Arabic two, Arabic thousands separator
+   key <AE03> { [ 0x10006F3, 0x100066B, numbersign ] }; // Arabic three, Arabic decimal separator
+   key <AE04> { [ 0x10006F4, 0x100060B, dollar ] }; // Arabic four, Afghani sign
+   key <AE05> { [ 0x10006F5, 0x100066A, percent ] }; // Arabic five, Arabic percent sign
+   key <AE06> { [ 0x10006F6, multiply, asciicircum ] }; // Arabic six
+   key <AE07> { [ 0x10006F7, 0x100060C, ampersand ] }; // Arabic seven, Arabic comma
+   key <AE08> { [ 0x10006F8, asterisk, enfilledcircbullet ] }; // Arabic eight, 
+   key <AE09> { [ 0x10006F9, parenright, 0x100200E ] }; // Arabic nine, left-to-right mark
+   key <AE10> { [ 0x10006F0, parenleft, 0x100200F ] }; // Arabic zero, right-to-left mark
+   key <AE11> { [ minus, 0x1000640, underscore ] }; // Arabic_tatweel
+   key <AE12> { [ plus, equal ] };
+
+   key <AD01> { [ 0x1000636, 0x1000652, degree ] }; // Arabic dad, Arabic sukun
+   key <AD02> { [ 0x1000635, 0x100064C, 0x1000653 ] }; // Arabic sad, Arabic dammatan, Arabic maddah above
+   key <AD03> { [ 0x100062B, 0x100064D, EuroSign ] }; // Arabic theh, Arabic kasratan
+   key <AD04> { [ 0x1000642, 0x100064B, 0x100FD3E ] }; // Arabic qaf, Arabic fathatan, ornate left paren
+   key <AD05> { [ 0x1000641, 0x100064F, 0x100FD3F ] }; // Arabic feh, Arabic damma, ornate right paren
+   key <AD06> { [ 0x100063A, 0x1000650, 0x1000656 ] }; // Arabic ghain, Arabic kasra, Arabic subscript alef
+   key <AD07> { [ 0x1000639, 0x100064E, 0x100e659 ] }; // Arabic ain, Arabic fatha, Arabic zwarakay
+   key <AD08> { [ 0x1000647, 0x1000651, 0x1000670 ] }; // Arabic heh, Arabic shadda, Arabic superscript alef
+   key <AD09> { [ 0x100062E, bracketright, apostrophe ] }; // Arabic khah
+   key <AD10> { [ 0x100062D, bracketleft, quotedbl ] }; // Arabic hah
+   key <AD11> { [ 0x100062C, braceright, 0x1000681 ] }; // Arabic jeem, Arabic hah with hamza above
+   key <AD12> { [ 0x1000686, braceleft, 0x1000685 ] }; // Arabic tcheh, Arabic hah with three dots above
+
+   key <AC01> { [ 0x1000634, 0x1000624, 0x100069A ] }; // Arabic sheen, Arabic waw with hamza above, Arabic seen with dot below and dot above
+   key <AC02> { [ 0x1000633, 0x1000626, 0x10006CD ] }; // Arabic seen, Arabic yeh with hamza above, Arabic yeh with tail
+   key <AC03> { [ 0x10006CC, 0x100064A, 0x1000649 ] }; // Farsi yeh, Arabic yeh, Arabic alef maksura
+   key <AC04> { [ 0x1000628, 0x10006D0, 0x1000643  ] }; // Arabic beh, Arabic e, Arabic kaf
+   key <AC05> { [ 0x1000644, 0x1000623, 0x10006B7 ] }; // Arabic lam, Arabic hamza on alef, Arabic alef with hamza above
+   key <AC06> { [ 0x1000627, 0x1000622, 0x1000671 ] }; // Arabic alef, Arabic madda on alef, Arabic alef wasla
+   key <AC07> { [ 0x100062A, 0x1000629, 0x100067C ] }; // Arabic teh, Arabic teh marbuta, Arabic tteh
+   key <AC08> { [ 0x1000646, guillemotright, 0x10006BC ] }; // Arabic noon, Arabic noon with ring
+   key <AC09> { [ 0x1000645, guillemotleft, 0x10006BA ] }; // Arabic meem, Arabic noon ghunna
+   key <AC10> { [ 0x10006A9, colon, semicolon ] }; // Arabic keheh, 
+   key <AC11> { [ 0x10006AF, 0x100061B, 0x10006AB ] }; // Arabic gaf, Arabic semicolon, Arabic kaf with ring
+
+   key <BKSL> { [ backslash, bar, question ] };
+
+   key <AB01> { [ 0x1000638, 0x10006C9, 0x10006D2 ] }; // Arabic zah, Arabic kirghiz yu, Arabic yeh barree
+   key <AB02> { [ 0x1000637, 0x10006C7, 0x1000691 ] }; // Arabic tah, Arabic u, Arabic rreh
+   key <AB03> { [ 0x1000632, 0x1000698, 0x1000696 ] }; // Arabic zain, Arabic jeh,  Arabic reh with dot below and dot above
+   key <AB04> { [ 0x1000631, 0x1000625, 0x1000693 ] }; // Arabic_ra (reh?), Arabic alef with hamza below, Arabic reh with ring
+   key <AB05> { [ 0x1000630, 0x100200C, 0x1000688 ] }; // Arabic_thal, zero width non-joiner, Arabic ddal
+   key <AB06> { [ 0x100062F, 0x1000654, 0x1000689 ] }; // Arabic dal, Arabic hamza above, Arabic dal with ring
+   key <AB07> { [ 0x100067E, 0x1000621, 0x1000679 ] }; // Arabic peh, Arabic hamza, Arabic tteh
+   key <AB08> { [ 0x1000648, greater, comma ] }; // Arabic_waw
+   key <AB09> { [ period, less ] };
+   key <AB10> { [ slash, 0x100061F, 0x1000655 ] }; // Arabic question mark, Arabic hamza below
+
+   include "nbsp(zwnj2nb3)"
+   include "group(olpc)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/capslock b/xorg-server/xkeyboard-config/symbols/capslock
index 288a1d293..3e0880573 100644
--- a/xorg-server/xkeyboard-config/symbols/capslock
+++ b/xorg-server/xkeyboard-config/symbols/capslock
@@ -1,62 +1,74 @@
-default partial hidden modifier_keys

-xkb_symbols "capslock" {

-    replace key <CAPS> {	[	Caps_Lock		]	};

-    modifier_map Lock { Caps_Lock };

-};

-

-partial hidden modifier_keys

-xkb_symbols "shiftlock" {

-    replace key <CAPS> {	[	Shift_Lock		]	};

-    modifier_map Shift { Shift_Lock };

-};

-

-partial hidden modifier_keys

-xkb_symbols "grouplock" {

-    replace key <CAPS> {	[	ISO_Next_Group,	Caps_Lock	]	};

-};

-

-partial hidden modifier_keys

-xkb_symbols "swapescape" {

-    key <CAPS> {        [       Escape  ]       };

-    key <ESC>  {        [     Caps_Lock    ]       };

-};

-

-partial hidden modifier_keys

-xkb_symbols "groupshift" {

-    key <CAPS> {

-       type[Group1]="PC_ALT_LEVEL2",

-       [       Mode_switch,    Caps_Lock       ]

-    };

-};

-

-partial hidden modifier_keys

-xkb_symbols "escape" {

-    key <CAPS> {        [       Escape  ]       };

-};

-

-partial hidden modifier_keys

-xkb_symbols "backspace" {

-    key <CAPS> {        [       BackSpace  ]       };

-};

-

-partial hidden modifier_keys

-xkb_symbols "super" {

-    key <CAPS> {        [       Super_L  ]       };

-    modifier_map Mod4   { <CAPS> };

-};

-

-partial hidden modifier_keys

-xkb_symbols "hyper" {

-    key <CAPS> {        [       Hyper_L  ]       };

-    modifier_map Mod4   { <CAPS> };

-};

-

-partial hidden modifier_keys

-xkb_symbols "none" {

-    key <CAPS> {        [       VoidSymbol  ]       };

-};

-

-partial hidden modifier_keys

-xkb_symbols "numlock" {

-    key <CAPS> {        [       Num_Lock  ]       };

-};

+default partial hidden modifier_keys
+xkb_symbols "capslock" {
+    replace key <CAPS> {	[	Caps_Lock		]	};
+    modifier_map Lock { Caps_Lock };
+};
+
+partial hidden modifier_keys
+xkb_symbols "shiftlock" {
+    replace key <CAPS> {	[	Shift_Lock		]	};
+    modifier_map Shift { Shift_Lock };
+};
+
+partial hidden modifier_keys
+xkb_symbols "grouplock" {
+    replace key <CAPS> {	[	ISO_Next_Group,	Caps_Lock	]	};
+};
+
+partial hidden modifier_keys
+xkb_symbols "swapescape" {
+    key <CAPS> {        [       Escape  ]       };
+    key <ESC>  {        [     Caps_Lock    ]       };
+};
+
+partial hidden modifier_keys
+xkb_symbols "groupshift" {
+    key <CAPS> {
+       type[Group1]="PC_ALT_LEVEL2",
+       [       Mode_switch,    Caps_Lock       ]
+    };
+};
+
+partial hidden modifier_keys
+xkb_symbols "escape" {
+    key <CAPS> {        [       Escape  ]       };
+};
+
+partial hidden modifier_keys
+xkb_symbols "backspace" {
+    key <CAPS> {        [       BackSpace  ]       };
+};
+
+partial hidden modifier_keys
+xkb_symbols "super" {
+    key <CAPS> {        [       Super_L  ]       };
+    modifier_map Mod4   { <CAPS> };
+};
+
+partial hidden modifier_keys
+xkb_symbols "hyper" {
+    key <CAPS> {        [       Hyper_L  ]       };
+    modifier_map Mod4   { <CAPS> };
+};
+
+partial hidden modifier_keys
+xkb_symbols "none" {
+    key <CAPS> {        [       VoidSymbol  ]       };
+};
+
+partial hidden modifier_keys
+xkb_symbols "numlock" {
+    key <CAPS> {        [       Num_Lock  ]       };
+};
+
+// This changes the modifier behavior of the <CAPS> key.
+// The keysym will be reset to Caps_Lock
+partial hidden modifier_keys
+xkb_symbols "ctrl_modifier" {
+    replace key <CAPS> {
+        type[Group1] = "ONE_LEVEL",
+        symbols[Group1] = [ Caps_Lock ],
+        actions[Group1] = [ SetMods(modifiers=Control) ]    
+    };
+    modifier_map Control { <CAPS> };
+};
diff --git a/xorg-server/xkeyboard-config/symbols/et b/xorg-server/xkeyboard-config/symbols/et
index 6f71b2f97..7d15967e2 100644
--- a/xorg-server/xkeyboard-config/symbols/et
+++ b/xorg-server/xkeyboard-config/symbols/et
@@ -1,73 +1,73 @@
-//

-// Ethiopia

-// Designed as a part of OLPC project

-//

-// 2007 Sergey Udaltsov <svu@gnome.org>

-//

-

-partial default alphanumeric_keys

-xkb_symbols "basic" {

-    include "et(olpc)"

-    name[Group1]="Ethiopia";

-};

-

-partial alphanumeric_keys

-xkb_symbols "olpc" {

-

-    name[Group1]="Ethiopia";

-

-    key <AE01>	{ [        0x01001369,  0x01001372 ] }; // 1

-    key <AE02>	{ [        0x0100136a,  0x01001373 ] }; // 2

-    key <AE03>	{ [        0x0100136b,  0x01001374 ] }; // 3 

-    key <AE04>	{ [        0x0100136c,  0x01001375 ] }; // 4

-    key <AE05>	{ [        0x0100136d,  0x01001376 ] }; // 5

-    key <AE06>	{ [        0x0100136e,  0x01001377 ] }; // 6

-    key <AE07>	{ [        0x0100136f,  0x01001378 ] }; // 7

-    key <AE08>	{ [        0x01001370,  0x01001379 ] }; // 8

-    key <AE09>	{ [        0x01001371,  0x0100137a ] }; // 9

-    key <AE10>	{ [        0x0100137b,  0x0100137c ] }; // 0

-    key <AE11>	{ [        minus,       underscore ] }; // -_

-    key <AE12>	{ [        equal,       plus       ] }; // =+

-

-    key <AD01>	{ [        0x01001240,  0x01001250 ]	}; // q

-    key <AD02>	{ [        0x010012C8,  VoidSymbol ]	}; // w

-    key <AD03>	{ [        e,           E          ]	}; // e

-    key <AD04>	{ [        0x01001228,  VoidSymbol ]	}; // r

-    key <AD05>	{ [        0x01001270,  0x01001320 ]	}; // t

-    key <AD06>	{ [        0x010012E8,  VoidSymbol ]	}; // y

-    key <AD07>	{ [        u,           U          ]	}; // u

-    key <AD08>	{ [        i,           I          ]	}; // i

-    key <AD09>	{ [        o,           O          ]	}; // o

-    key <AD10>	{ [        0x01001350,  0x01001330 ]	}; // p

-    key <AD11>	{ [        0x01001340,  0x01001338 ]	}; // [

-    key <AD12>	{ [        0x01001328,  0x01001280 ]	}; // ]

-

-    key <AC01>	{ [        a,           A          ]	}; // a

-    key <AC02>	{ [        0x01001230,  0x01001220 ]	}; // s

-    key <AC03>	{ [        0x010012F0,  0x010012F8 ]	}; // d

-    key <AC04>	{ [        0x01001348,  VoidSymbol ]	}; // f

-    key <AC05>	{ [        0x01001308,  0x01001318 ]	}; // g

-    key <AC06>	{ [        0x01001200,  0x01001210 ]	}; // h

-    key <AC07>	{ [        0x01001300,  VoidSymbol ]	}; // j

-    key <AC08>	{ [        0x010012A8,  0x010012B8 ]	}; // k

-    key <AC09>	{ [        0x01001208,  VoidSymbol ]	}; // l

-

-    key <AC10>	{ [        0x01001362,  0x01001361 ]	}; // :;

-    key <AC11>  { [        0x01001366,  0x01001365 ]    }; // '"

-

-    key <AB01>	{ [        0x010012D8,  0x010012E0 ]	}; // z

-    key <AB02>	{ [        0x010012A0,  0x010012D0 ]	}; // x

-    key <AB03>  { [        0x01001278,  VoidSymbol ]    }; // c

-    key <AB04>	{ [        0x01001238,  0x01001268 ]	}; // v

-    key <AB05>	{ [        0x01001260,  VoidSymbol ]	}; // b

-    key <AB06>	{ [        0x01001290,  0x01001298 ]	}; // n

-    key <AB07>	{ [        0x01001218,  VoidSymbol ]	}; // m

-

-    key <AB08>	{ [        0x01001363,  VoidSymbol ]	}; // <

-    key <AB09>	{ [        0x01001364,  VoidSymbol ]	}; // >

-    key <AB10>  { [        0x01001367,  VoidSymbol ]    }; // ?

-

-    key <BKSL> {  [        VoidSymbol,  0x01002010 ]    }; // bksl

-

-    include "group(olpc)"

-};

+//
+// Ethiopia
+// Designed as a part of OLPC project
+//
+// 2007 Sergey Udaltsov <svu@gnome.org>
+//
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+    include "et(olpc)"
+    name[Group1]="Ethiopia";
+};
+
+partial alphanumeric_keys
+xkb_symbols "olpc" {
+
+    name[Group1]="Ethiopia";
+
+    key <AE01>	{ [        0x01001369,  0x01001372 ] }; // 1
+    key <AE02>	{ [        0x0100136a,  0x01001373 ] }; // 2
+    key <AE03>	{ [        0x0100136b,  0x01001374 ] }; // 3 
+    key <AE04>	{ [        0x0100136c,  0x01001375 ] }; // 4
+    key <AE05>	{ [        0x0100136d,  0x01001376 ] }; // 5
+    key <AE06>	{ [        0x0100136e,  0x01001377 ] }; // 6
+    key <AE07>	{ [        0x0100136f,  0x01001378 ] }; // 7
+    key <AE08>	{ [        0x01001370,  0x01001379 ] }; // 8
+    key <AE09>	{ [        0x01001371,  0x0100137a ] }; // 9
+    key <AE10>	{ [        0x0100137b,  0x0100137c ] }; // 0
+    key <AE11>	{ [        minus,       underscore ] }; // -_
+    key <AE12>	{ [        equal,       plus       ] }; // =+
+
+    key <AD01>	{ [        0x01001240,  0x01001250 ]	}; // q
+    key <AD02>	{ [        0x010012C8,  VoidSymbol ]	}; // w
+    key <AD03>	{ [        0x0100FE69,  0x0100FE70 ]	}; // dead e
+    key <AD04>	{ [        0x01001228,  VoidSymbol ]	}; // r
+    key <AD05>	{ [        0x01001270,  0x01001320 ]	}; // t
+    key <AD06>	{ [        0x010012E8,  VoidSymbol ]	}; // y
+    key <AD07>	{ [        0x0100FE75,  0x0100FE76 ]	}; // dead u
+    key <AD08>	{ [        0x0100FE71,  0x0100FE72 ]	}; // dead i
+    key <AD09>	{ [        0x0100FE73,  0x0100FE74 ]	}; // dead o
+    key <AD10>	{ [        0x01001350,  0x01001330 ]	}; // p
+    key <AD11>	{ [        0x01001340,  0x01001338 ]	}; // [
+    key <AD12>	{ [        0x01001328,  0x01001280 ]	}; // ]
+
+    key <AC01>	{ [        0x0100FE67,  0x0100FE68 ]	}; // dead a
+    key <AC02>	{ [        0x01001230,  0x01001220 ]	}; // s
+    key <AC03>	{ [        0x010012F0,  0x010012F8 ]	}; // d
+    key <AC04>	{ [        0x01001348,  VoidSymbol ]	}; // f
+    key <AC05>	{ [        0x01001308,  0x01001318 ]	}; // g
+    key <AC06>	{ [        0x01001200,  0x01001210 ]	}; // h
+    key <AC07>	{ [        0x01001300,  VoidSymbol ]	}; // j
+    key <AC08>	{ [        0x010012A8,  0x010012B8 ]	}; // k
+    key <AC09>	{ [        0x01001208,  VoidSymbol ]	}; // l
+
+    key <AC10>	{ [        0x01001362,  0x01001361 ]	}; // :;
+    key <AC11>  { [        0x01001366,  0x01001365 ]    }; // '"
+
+    key <AB01>	{ [        0x010012D8,  0x010012E0 ]	}; // z
+    key <AB02>	{ [        0x010012A0,  0x010012D0 ]	}; // x
+    key <AB03>  { [        0x01001278,  0x0100FE78 ]    }; // c
+    key <AB04>	{ [        0x01001238,  0x01001268 ]	}; // v
+    key <AB05>	{ [        0x01001260,  VoidSymbol ]	}; // b
+    key <AB06>	{ [        0x01001290,  0x01001298 ]	}; // n
+    key <AB07>	{ [        0x01001218,  VoidSymbol ]	}; // m
+
+    key <AB08>	{ [        0x01001363,  VoidSymbol ]	}; // <
+    key <AB09>	{ [        0x01001364,  VoidSymbol ]	}; // >
+    key <AB10>  { [        0x01001367,  question   ]    }; // ?
+
+    key <BKSL> {  [        VoidSymbol,  0x01002010 ]    }; // bksl
+
+    include "group(olpc)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/mn b/xorg-server/xkeyboard-config/symbols/mn
index 44e5e4e67..a838bd5e0 100644
--- a/xorg-server/xkeyboard-config/symbols/mn
+++ b/xorg-server/xkeyboard-config/symbols/mn
@@ -1,80 +1,82 @@
-// based on:

-// Mongolian standard keyboard

-// Author Sanlig Badral <badral@chinggis.com>

-// 2002/12/7 Version 1.0

-

-partial default alphanumeric_keys

-xkb_symbols "basic" {

-

-  name[Group1]= "Mongolia";

-

-  key <TLDE> { [ equal,       	   plus,  		degree          ] };

-  key <AE01> { [ 1,                numerosign,        	multiply        ] };

-  key <AE02> { [ 2,                minus,              	division        ] };

-  key <AE03> { [ 3,                quotedbl,        	plusminus       ] };

-  key <AE04> { [ 4,                U20ae,  		notsign         ] }; // Tugrik sign

-  key <AE05> { [ 5,                colon,		NoSymbol       	] };

-  key <AE06> { [ 6,                period,              notequal        ] };

-  key <AE07> { [ 7,                underscore,          ampersand    	] };

-  key <AE08> { [ 8,                comma,            	asterisk        ] };

-  key <AE09> { [ 9,                percent,          	bracketleft     ] };

-  key <AE10> { [ 0,                question,       	bracketright   	] };

-  key <AE11> { [ Cyrillic_ie,      Cyrillic_IE,        	X               ] };

-  key <AE12> { [ Cyrillic_shcha,   Cyrillic_SHCHA,   	L       	] };

-

-  key <AD01> { [ Cyrillic_ef,       Cyrillic_EF,       	apostrophe      ] };

-  key <AD02> { [ Cyrillic_tse,      Cyrillic_TSE,       grave           ] };

-  key <AD03> { [ Cyrillic_u,        Cyrillic_U,        	EuroSign        ] };

-  key <AD04> { [ Cyrillic_zhe,      Cyrillic_ZHE,      	registered      ] };

-  key <AD05> { [ Cyrillic_e,        Cyrillic_E,        	trademark       ] };

-  key <AD06> { [ Cyrillic_en,       Cyrillic_EN,       	yen             ] };

-  key <AD07> { [ Cyrillic_ghe,      Cyrillic_GHE,      	doublelowquotemark   ] };

-  key <AD08> { [ Cyrillic_sha,      Cyrillic_SHA,      	leftdoublequotemark  ] };

-  key <AD09> { [ Cyrillic_u_straight,Cyrillic_U_straight,rightdoublequotemark] };

-  key <AD10> { [ Cyrillic_ze,       Cyrillic_ZE,       	NoSymbol        ] };

-  key <AD11> { [ Cyrillic_ka,       Cyrillic_KA,      	braceleft       ] };

-  key <AD12> { [ Cyrillic_hardsign, Cyrillic_HARDSIGN, 	braceright      ] };

-

-  key <AC01> { [ Cyrillic_shorti,   Cyrillic_SHORTI,   	mu              ] };

-  key <AC02> { [ Cyrillic_yeru,     Cyrillic_YERU,     	sterling        ] };

-  key <AC03> { [ Cyrillic_be,       Cyrillic_BE,       	dollar          ] };

-  key <AC04> { [ Cyrillic_o_bar,    Cyrillic_O_bar,     rightdoublequotemark ] };

-  key <AC05> { [ Cyrillic_a,        Cyrillic_A,        	Cyrillic_yeru   ] };

-  key <AC06> { [ Cyrillic_ha,       Cyrillic_HA,       	Cyrillic_YERU   ] };

-  key <AC07> { [ Cyrillic_er,       Cyrillic_ER,       	Cyrillic_e      ] };

-  key <AC08> { [ Cyrillic_o,        Cyrillic_O,       	Cyrillic_E      ] };

-  key <AC09> { [ Cyrillic_el,       Cyrillic_EL,       	numerosign      ] };

-  key <AC10> { [ Cyrillic_de,       Cyrillic_DE,       	section         ] };

-  key <AC11> { [ Cyrillic_pe,       Cyrillic_PE,       	ellipsis        ] };

-  key <BKSL> { [ exclam,            bar,     		bar             ] };

-

-  key <LSGT> { [ parenleft,         parenright,         NoSymbol        ] };

-  key <AB01> { [ Cyrillic_ya,       Cyrillic_YA,       	emdash          ] };

-  key <AB02> { [ Cyrillic_che,      Cyrillic_CHE,      	endash          ] };

-  key <AB03> { [ Cyrillic_io,       Cyrillic_IO,       	copyright       ] };

-  key <AB04> { [ Cyrillic_es,       Cyrillic_ES,       	NoSymbol        ] };

-  key <AB05> { [ Cyrillic_em,       Cyrillic_EM,       	NoSymbol        ] };

-  key <AB06> { [ Cyrillic_i,        Cyrillic_I,        	less            ] };

-  key <AB07> { [ Cyrillic_te,       Cyrillic_TE,       	greater         ] };

-  key <AB08> { [ Cyrillic_softsign, Cyrillic_SOFTSIGN, 	guillemotleft   ] };

-  key <AB09> { [ Cyrillic_ve,       Cyrillic_VE,       	guillemotright  ] };

-  key <AB10> { [ Cyrillic_yu,       Cyrillic_YU,       	backslash       ] };

-

-  // End alphanumeric section

-

-  key <SPCE> { [ space,             space,             	nobreakspace    ] };

-

-  include "level3(ralt_switch)"

-};

-

-partial alphanumeric_keys

-xkb_symbols "olpc" {

-

-// Contact: Walter Bender <walter@laptop.org>

-

-  include "mn(basic)"

-

-  key <BKSL> { [ backslash,         bar,     		exclam          ] };

-

-  include "group(olpc)"

-};

+// based on:
+// Mongolian standard keyboard
+// Author Sanlig Badral <badral@chinggis.com>
+// 2002/12/7 Version 1.0
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+
+  name[Group1]= "Mongolia";
+
+  key <TLDE> { [ equal,       	   plus,  		degree          ] };
+  key <AE01> { [ 1,                numerosign,        	multiply        ] };
+  key <AE02> { [ 2,                minus,              	division        ] };
+  key <AE03> { [ 3,                quotedbl,        	plusminus       ] };
+  key <AE04> { [ 4,                U20ae,  		notsign         ] }; // Tugrik sign
+  key <AE05> { [ 5,                colon,		NoSymbol       	] };
+  key <AE06> { [ 6,                period,              notequal        ] };
+  key <AE07> { [ 7,                underscore,          ampersand    	] };
+  key <AE08> { [ 8,                comma,            	asterisk        ] };
+  key <AE09> { [ 9,                percent,          	bracketleft     ] };
+  key <AE10> { [ 0,                question,       	bracketright   	] };
+  key <AE11> { [ Cyrillic_ie,      Cyrillic_IE,        	X               ] };
+  key <AE12> { [ Cyrillic_shcha,   Cyrillic_SHCHA,   	L       	] };
+
+  key <AD01> { [ Cyrillic_ef,       Cyrillic_EF,       	apostrophe      ] };
+  key <AD02> { [ Cyrillic_tse,      Cyrillic_TSE,       grave           ] };
+  key <AD03> { [ Cyrillic_u,        Cyrillic_U,        	EuroSign        ] };
+  key <AD04> { [ Cyrillic_zhe,      Cyrillic_ZHE,      	registered      ] };
+  key <AD05> { [ Cyrillic_e,        Cyrillic_E,        	trademark       ] };
+  key <AD06> { [ Cyrillic_en,       Cyrillic_EN,       	yen             ] };
+  key <AD07> { [ Cyrillic_ghe,      Cyrillic_GHE,      	doublelowquotemark   ] };
+  key <AD08> { [ Cyrillic_sha,      Cyrillic_SHA,      	leftdoublequotemark  ] };
+  key <AD09> { [ Cyrillic_u_straight,Cyrillic_U_straight,rightdoublequotemark] };
+  key <AD10> { [ Cyrillic_ze,       Cyrillic_ZE,       	NoSymbol        ] };
+  key <AD11> { [ Cyrillic_ka,       Cyrillic_KA,      	braceleft       ] };
+  key <AD12> { [ Cyrillic_hardsign, Cyrillic_HARDSIGN, 	braceright      ] };
+
+  key <AC01> { [ Cyrillic_shorti,   Cyrillic_SHORTI,   	mu              ] };
+  key <AC02> { [ Cyrillic_yeru,     Cyrillic_YERU,     	sterling        ] };
+  key <AC03> { [ Cyrillic_be,       Cyrillic_BE,       	dollar          ] };
+  key <AC04> { [ Cyrillic_o_bar,    Cyrillic_O_bar,     rightdoublequotemark ] };
+  key <AC05> { [ Cyrillic_a,        Cyrillic_A,        	Cyrillic_yeru   ] };
+  key <AC06> { [ Cyrillic_ha,       Cyrillic_HA,       	Cyrillic_YERU   ] };
+  key <AC07> { [ Cyrillic_er,       Cyrillic_ER,       	Cyrillic_e      ] };
+  key <AC08> { [ Cyrillic_o,        Cyrillic_O,       	Cyrillic_E      ] };
+  key <AC09> { [ Cyrillic_el,       Cyrillic_EL,       	numerosign      ] };
+  key <AC10> { [ Cyrillic_de,       Cyrillic_DE,       	section         ] };
+  key <AC11> { [ Cyrillic_pe,       Cyrillic_PE,       	ellipsis        ] };
+  key <BKSL> { [ exclam,            bar,     		bar             ] };
+
+  key <LSGT> { [ parenleft,         parenright,         NoSymbol        ] };
+  key <AB01> { [ Cyrillic_ya,       Cyrillic_YA,       	emdash          ] };
+  key <AB02> { [ Cyrillic_che,      Cyrillic_CHE,      	endash          ] };
+  key <AB03> { [ Cyrillic_io,       Cyrillic_IO,       	copyright       ] };
+  key <AB04> { [ Cyrillic_es,       Cyrillic_ES,       	NoSymbol        ] };
+  key <AB05> { [ Cyrillic_em,       Cyrillic_EM,       	NoSymbol        ] };
+  key <AB06> { [ Cyrillic_i,        Cyrillic_I,        	less            ] };
+  key <AB07> { [ Cyrillic_te,       Cyrillic_TE,       	greater         ] };
+  key <AB08> { [ Cyrillic_softsign, Cyrillic_SOFTSIGN, 	guillemotleft   ] };
+  key <AB09> { [ Cyrillic_ve,       Cyrillic_VE,       	guillemotright  ] };
+  key <AB10> { [ Cyrillic_yu,       Cyrillic_YU,       	backslash       ] };
+
+  // End alphanumeric section
+
+  key <SPCE> { [ space,             space,             	nobreakspace    ] };
+
+  include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "olpc" {
+
+// Contact: Walter Bender <walter@laptop.org>
+
+  include "mn(basic)"
+
+  key <AE07> { [ 7,                 semicolon,          ampersand       ] };
+
+  key <BKSL> { [ backslash,         bar,     		exclam          ] };
+
+  include "group(olpc)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/np b/xorg-server/xkeyboard-config/symbols/np
index 635fa348a..e139b0ff7 100644
--- a/xorg-server/xkeyboard-config/symbols/np
+++ b/xorg-server/xkeyboard-config/symbols/np
@@ -1,120 +1,121 @@
-// based on a keyboard map from an 'xkb/symbols/dev' file

-

-partial default alphanumeric_keys 

-xkb_symbols "basic" {

-

-      name[Group1]= "Nepal";

-

-// `,1,2,3,4,5,6,7,8,9,0,-,=

-

-      key <TLDE> { [      0x100093D,0x100093C ]	};

-      key <AE01> { [      0x1000967	 		]	};

-      key <AE02> { [      0x1000968			]	};

-      key <AE03> { [      0x1000969 	 		]	};

-      key <AE04> { [      0x100096A  	 		]	};

-      key <AE05> { [      0x100096B  	 		]	};

-      key <AE06> { [      0x100096C  	 		]	};

-      key <AE07> { [      0x100096D                     ]	};

-      key <AE08> { [      0x100096e  	 		]	};

-      key <AE09> { [      0x100096F	 		]	};

-      key <AE10> { [      0x1000966,0x1000970		]	};

-      key <AE11> { [      minus, 0x1000952 		]	};

-      key <AE12> { [      equal, 0x100200C 		]	};

-

-// q,w,e,r,t,y,u,i,o,p,[,]

-

-      key <AD01> { [      0x100091F,  0x1000920       	]	};

-      key <AD02> { [      0x100094C,  0x1000914       	]	};

-      key <AD03> { [      0x1000947,  0x1000948       	]	};

-      key <AD04> { [      0x1000930,  0x1000943       	]	};

-      key <AD05> { [      0x1000924,  0x1000925       	]	};

-      key <AD06> { [      0x100092F,  0x100091E 	]	};

-      key <AD07> { [      0x1000941,  0x1000942 	]	};

-      key <AD08> { [      0x100093F,  0x1000940 	]	};

-      key <AD09> { [      0x100094B,  0x1000913		]	};

-      key <AD10> { [      0x100092A,  0x100092B 	]	};

-      key <AD11> { [      0x1000907,  0x1000908		]	};

-      key <AD12> { [      0x100090F,  0x1000910		]	};

-

-// a,s,d,f,g,h,j,k,l,;,',Backslash 

-      key <AC01> { [      0x100093E,  0x1000906       	]	};

-      key <AC02> { [      0x1000938,  0x1000936       	]	};

-      key <AC03> { [      0x1000926,  0x1000927       	]	};

-      key <AC04> { [      0x1000909,  0x100090A       	]	};

-      key <AC05> { [      0x1000917,  0x1000918       	]	};

-      key <AC06> { [      0x1000939,  0x1000905 	]	};

-      key <AC07> { [      0x100091C,  0x100091D 	]	};

-      key <AC08> { [      0x1000915,  0x1000916 	]	};

-      key <AC09> { [      0x1000932,  0x1000933 	]	};

-      key <AC10> { [      semicolon,  colon 		]	};

-      key <AC11> { [      quoteright, quotedbl 		]	};

-      key <BKSL> { [      0x1000950,  0x1000903 	]	};

-

-

-// z,x,c,v,b,n,m,,,.,/ 

-      key <AB01> { [      0x1000937,  0x100090B		]	};

-      key <AB02> { [      0x1000921,  0x1000922		]	};

-      key <AB03> { [      0x100091B,  0x100091A         ]       };

-      key <AB04> { [      0x1000935,  0x1000901		]       };

-      key <AB05> { [      0x100092C,  0x100092D		]       };

-      key <AB06> { [      0x1000928,  0x1000923         ]       };

-      key <AB07> { [      0x100092E,  0x1000902         ]       };

-      key <AB08> { [      comma,      0x1000919         ]       };

-      key <AB09> { [      0x1000964,  0x1000965		]       };

-      key <AB10> { [      0x100094D,  question		]       };

-};

-

-partial alphanumeric_keys

-xkb_symbols "olpc" {

-

-// Contact: Walter Bender <walter@laptop.org>

-

-  include "np"

-      key <TLDE> { [      grave,     asciitilde 	]	};

-      key <AE01> { [      0x1000967	 		]	}; // Nepali digit one

-      key <AE02> { [      0x1000968			]	}; // Nepali digit two

-      key <AE03> { [      0x1000969 	 		]	}; // Nepali digit three

-      key <AE04> { [      0x100096A  	 		]	}; // Nepali digit four

-      key <AE05> { [      0x100096B  	 		]	}; // Nepali digit five

-      key <AE06> { [      0x100096C,  sterling 	 	]	}; // Nepali digit six

-      key <AE07> { [      0x100096D,  eurosign 	 	]	}; // Nepali digit seven

-      key <AE08> { [      0x100096e  	 		]	}; // Nepali digit eight

-      key <AE09> { [      0x100096F	 		]	}; // Nepali digit nine

-      key <AE10> { [      0x1000966			]	}; // Nepali digit zero

-      key <AE12> { [      0x1000950,  0x1000903 	]	}; // OM, SIGN VISARGA

-

-      key <AD01> { [      0x100091C,  0x100091D 	]	}; // JA, JHA

-      key <AD02> { [      0x1000917,  0x1000918       	]	}; // GA, GHA

-      key <AD03> { [      0x100092F,  0x100091E 	]	}; // YA, YNA

-      key <AD04> { [      0x1000938,  0x1000936       	]	}; // SA, SHA

-      key <AD05> { [      0x100090F,  0x1000910		]	}; // E, AI

-      key <AD06> { [      0x100091B,  0x100091A         ]       }; // CHHA, CHA

-      key <AD07> { [      0x100092A,  0x100092B 	]	}; // PA, PHA

-      key <AD08> { [      0x1000947,  0x1000948       	]	}; // VOWEL SIGN E, VOWEL SIGN AI

-      key <AD09> { [      0x100094B,  0x100093E		]	}; // VOWEL SIGN O, VOWEL SIGN AA

-      key <AD10> { [      0x1000924,  0x1000925       	]	}; // TA, THA

-      key <AD11> { [      0x1000909,  0x100090A 	]	}; // HRSHWA U, DIRGHA UU

-      key <AD12> { [      0x100093F,  0x1000940 	]	}; // VOWEL SIGN HRSHWA I, VOWEL SIGN DIRGHA II

-

-      key <AC01> { [      0x100092E,  0x1000902         ]       }; // MA, SIGN ANUSVARA

-      key <AC02> { [      0x1000907,  0x1000908		]	}; // HRSHWA I, DIRGHA II

-      key <AC03> { [      0x1000928,  0x1000923         ]       }; // NA, NNA

-      key <AC04> { [      0x100094D,  0x1000921		]       }; // VIRAMA (HALANTA?), DDA

-      key <AC05> { [      0x100091F,  0x1000920       	]	}; // TTA, TTHA

-      key <AC06> { [      0x1000926,  0x1000927       	]	}; // DA, DHA

-      key <AC07> { [      0x100093E,  0x1000901       	]	}; // SIGN AA, SIGN CANDRABINDU

-      key <AC08> { [      0x1000930,  0x1000943       	]	}; // RA, VOWEL SIGN VOCALIC R

-      key <AC09> { [      0x1000915,  0x1000916 	]	}; // KA, KHA

-

-      key <AB01> { [      0x1000937,  0x100090B		]	}; // SSA, VOCALIC R (RRI)

-      key <AB02> { [      0x100092C,  0x100092D		]       }; // BA, BHA

-      key <AB03> { [      0x1000941,  0x1000942       	]	}; // VOWEL SIGN HRSHWA U, VOWEL SIGN DIRGHA U (UU)

-      key <AB04> { [      0x1000939,  0x1000922 	]	}; // HA, DDHA

-      key <AB05> { [      0x1000913,  0x1000914		]	}; // O, AU

-      key <AB06> { [      0x1000905,  0x1000906		]	}; // A, AA

-      key <AB07> { [      0x1000932,  0x1000919 	]	}; // LA, NGA

-      key <AB08> { [      comma,  0x1000935		]       }; // VA

-      key <AB09> { [      0x1000964,  0x1000965		]       }; // PURNA VIRAM, DIRGHA VIRAM

-

-      include "group(olpc)"

-};

+// based on a keyboard map from an 'xkb/symbols/dev' file
+
+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+
+      name[Group1]= "Nepal";
+
+// `,1,2,3,4,5,6,7,8,9,0,-,=
+
+      key <TLDE> { [      0x100093D,0x100093C ]	};
+      key <AE01> { [      0x1000967	 		]	};
+      key <AE02> { [      0x1000968			]	};
+      key <AE03> { [      0x1000969 	 		]	};
+      key <AE04> { [      0x100096A  	 		]	};
+      key <AE05> { [      0x100096B  	 		]	};
+      key <AE06> { [      0x100096C  	 		]	};
+      key <AE07> { [      0x100096D                     ]	};
+      key <AE08> { [      0x100096e  	 		]	};
+      key <AE09> { [      0x100096F	 		]	};
+      key <AE10> { [      0x1000966,0x1000970		]	};
+      key <AE11> { [      minus, 0x1000952 		]	};
+      key <AE12> { [      equal, 0x100200C 		]	};
+
+// q,w,e,r,t,y,u,i,o,p,[,]
+
+      key <AD01> { [      0x100091F,  0x1000920       	]	};
+      key <AD02> { [      0x100094C,  0x1000914       	]	};
+      key <AD03> { [      0x1000947,  0x1000948       	]	};
+      key <AD04> { [      0x1000930,  0x1000943       	]	};
+      key <AD05> { [      0x1000924,  0x1000925       	]	};
+      key <AD06> { [      0x100092F,  0x100091E 	]	};
+      key <AD07> { [      0x1000941,  0x1000942 	]	};
+      key <AD08> { [      0x100093F,  0x1000940 	]	};
+      key <AD09> { [      0x100094B,  0x1000913		]	};
+      key <AD10> { [      0x100092A,  0x100092B 	]	};
+      key <AD11> { [      0x1000907,  0x1000908		]	};
+      key <AD12> { [      0x100090F,  0x1000910		]	};
+
+// a,s,d,f,g,h,j,k,l,;,',Backslash 
+      key <AC01> { [      0x100093E,  0x1000906       	]	};
+      key <AC02> { [      0x1000938,  0x1000936       	]	};
+      key <AC03> { [      0x1000926,  0x1000927       	]	};
+      key <AC04> { [      0x1000909,  0x100090A       	]	};
+      key <AC05> { [      0x1000917,  0x1000918       	]	};
+      key <AC06> { [      0x1000939,  0x1000905 	]	};
+      key <AC07> { [      0x100091C,  0x100091D 	]	};
+      key <AC08> { [      0x1000915,  0x1000916 	]	};
+      key <AC09> { [      0x1000932,  0x1000933 	]	};
+      key <AC10> { [      semicolon,  colon 		]	};
+      key <AC11> { [      quoteright, quotedbl 		]	};
+      key <BKSL> { [      0x1000950,  0x1000903 	]	};
+
+
+// z,x,c,v,b,n,m,,,.,/ 
+      key <AB01> { [      0x1000937,  0x100090B		]	};
+      key <AB02> { [      0x1000921,  0x1000922		]	};
+      key <AB03> { [      0x100091B,  0x100091A         ]       };
+      key <AB04> { [      0x1000935,  0x1000901		]       };
+      key <AB05> { [      0x100092C,  0x100092D		]       };
+      key <AB06> { [      0x1000928,  0x1000923         ]       };
+      key <AB07> { [      0x100092E,  0x1000902         ]       };
+      key <AB08> { [      comma,      0x1000919         ]       };
+      key <AB09> { [      0x1000964,  0x1000965		]       };
+      key <AB10> { [      0x100094D,  question		]       };
+};
+
+partial alphanumeric_keys
+
+xkb_symbols "olpc" {
+// Contact: Walter Bender <walter@laptop.org>
+
+  include "np"
+      key <TLDE> { [      0x100091E,  0x1000965 	]	}; // NYA; double danda
+      key <AE01> { [      0x1000967,  0x10FFFFD	]	}; // Nepali digit one; U091C+U094D+U091E
+      key <AE02> { [      0x1000968,  0x1000908		]	}; // Nepali digit two;      key <AE03> { [      0x1000969,  0x1000918 	]	}; // Nepali digit three;
+      key <AE04> { [      0x100096A,  0x10FFFFC  	]	}; // Nepali digit four; U0926+U094D+U0927
+      key <AE05> { [      0x100096B,  0x100091B  	]	}; // Nepali digit five
+      key <AE06> { [      0x100096C,  0x100091F  	]	}; // Nepali digit six
+      key <AE07> { [      0x100096D,  0x1000920  	]	}; // Nepali digit seven
+      key <AE08> { [      0x100096e,  0x1000921  	]	}; // Nepali digit eight
+      key <AE09> { [      0x100096F,  0x1000922	 	]	}; // Nepali digit nine
+      key <AE10> { [      0x1000966,  0x1000923		]	}; // Nepali digit zero
+      key <AE11> { [      0x1000914,  0x1000913         ]       }; // O, AU
+      key <AE12> { [      0x100200C,  0x1000902 	]       }; // ZERO-WIDTH-NON-JOINER (ZWNJ); SIGN ANUSVARA
+      key <BKSL> { [      0x100094D,  0x100200D 	]	}; // SIGN VIRAMA; ZERO-WIDTH-JOINER (ZWJ)
+      key <AD01> { [      0x10FFFFB,  0x10FFFFA 	]	}; // U0924+U094D+U0930; U0924+U094D+U0924
+      key <AD02> { [      0x1000927,  0x10FFFF9   	]	}; // DHA; U0921+U094D+U0922
+      key <AD03> { [      0x100092D,  0x1000910 	]	}; // BHA, AI
+      key <AD04> { [      0x100091A,  0x10FFFF8       ]	}; // CA; U0926+U094D+U0935
+      key <AD05> { [      0x1000924,  0x10FFFF7		]	}; // TA; U091F+U094D+U091F
+      key <AD06> { [      0x1000925,  0x10FFFF6   ]       }; // THA; U0920+U094D+U0920
+      key <AD07> { [      0x1000917,  0x100090A 	]	}; // GA, UU
+      key <AD08> { [      0x1000937,  0x10FFFF5    	]	}; // SSA; U0915+U094D+U0937
+      key <AD09> { [      0x100092F,  0x1000907 	]	}; // YA, I
+      key <AD10> { [      0x1000909,  0x100090F 	]	}; // U, E
+      key <AD11> { [      0x10FFFF4,  0x1000943 	]	}; // U0928+U094D+ZWJ; VOWEL SIGN VOCALIC R
+      key <AD12> { [      0x1000947,  0x1000948 	]	}; // SIGN E; SIGN AI
+      key <AC01> { [      0x100092C,  0x1000906         ]       }; // BA, AA
+      key <AC02> { [      0x1000915,  0x10FFFF3	]	}; // KA; U0919+U094D+U0915
+      key <AC03> { [      0x100092E,  0x10FFFF2      ]       }; // MA; U0919+U094D+U0917
+      key <AC04> { [      0x100093E,  0x1000901		]       }; // CANDRABINDU, VOWEL SIGN AA
+      key <AC05> { [      0x1000928,  0x10FFFF1      	]	}; // NA; U0926+U094D+U0926
+      key <AC06> { [      0x100091C,  0x100091D       	]	}; // JA, JHA
+      key <AC07> { [      0x1000935,  0x100094B       	]	}; // VA, VOWEL SIGN O
+      key <AC08> { [      0x100092A,  0x100092B       	]	}; // PA, PHA
+      key <AC09> { [      0x100093F,  0x1000940 	]	}; // VOWEL SIGN I, VOWEL SIGN II
+      key <AC10> { [      0x1000938,  0x10FFFF0 	]	}; // SA; U091F+U094D+U0920
+      key <AC11> { [      0x1000941,  0x1000942 	]	}; // VOWEL SIGN U, VOWEL SIGN UU
+      key <AB01> { [      0x1000936,  0x10FFFEF	]	}; // SHA; U0915+U094D+U0915
+      key <AB02> { [      0x1000939,  0x10FFFEE	]       }; // HA; U0939+U094D+U092F
+      key <AB03> { [      0x1000905, 0x100090B         	]	}; // A; U0909+U090B
+      key <AB04> { [      0x1000916,  0x1000950 	]	}; // KHA, OM
+      key <AB05> { [      0x1000926,  0x100094C		]	}; // DA, VOWEL SIGN AU
+      key <AB06> { [      0x1000932,  0x10FFFED	]	}; // LA; U0926+U094D+U092F
+      key <AB07> { [      0x1000903,  0x10FFFEC 	]	}; // SIGN VISARGA; U0921+U094D+U0921
+      key <AB08> { [      0x100093D,  0x1000919		]       }; // SIGN AVAGRHA; NGA
+      key <AB09> { [      0x1000964,  0x10FFFEB	]       }; // DANDA; U0936+U094D+U0930
+      key <AB10> { [      0x1000930,  0x10FFFEA   		]       }; // RA; U0930+U0941
+
+      include "group(olpc)"
+};