Git update xkeyboard-config 28-2-2010

53 files changed, 10610 insertions, 7877 deletions

diff --git a/xorg-server/xkbdata.src/symbols/Makefile.am b/xorg-server/xkbdata.src/symbols/Makefile.am
index d22d6c39b..dea5a4ad8 100644
--- a/xorg-server/xkbdata.src/symbols/Makefile.am
+++ b/xorg-server/xkbdata.src/symbols/Makefile.am
@@ -1,38 +1,39 @@
-SUBDIRS = digital_vndr fujitsu_vndr hp_vndr macintosh_vndr nec_vndr nokia_vndr sgi_vndr sony_vndr sun_vndr xfree68_vndr extras
-
-symbolsdir = $(xkb_base)/symbols
-dist_symbols_DATA = \
-ad af al \
-am ara az \
-be bd \
-bg br ba \
-bt by brai \
-ca cd \
-ch cn cz \
-de dk \
-ee es et epo \
-fi fo fr \
-gb ge gh gn \
-gr hr hu \
-ie il in iq \
-ir is it jp \
-kg kh kr kz \
-la latam latin \
-lk lt lv \
-ma mao me mk \
-mm mn mt mv \
-ng nl no np \
-pc pk pl pt \
-ro rs ru \
-se si sk sn \
-sy th \
-terminate \
-tj tm tr \
-ua us uz vn \
-za \
-altwin capslock compose ctrl eurosign group inet \
-keypad kpdl level3 level5 nbsp olpc shift srvr_ctrl typo
-
-dir_data = $(dist_symbols_DATA)
-
-include $(top_srcdir)/xkbrules.am
+SUBDIRS = digital_vndr fujitsu_vndr hp_vndr macintosh_vndr nec_vndr nokia_vndr sgi_vndr sony_vndr sun_vndr xfree68_vndr extras

+

+symbolsdir = $(xkb_base)/symbols

+dist_symbols_DATA = \

+ad af al \

+am ara az \

+be bd \

+bg br ba \

+bt by brai \

+ca cd \

+ch cn cz \

+de dk \

+ee es et epo \

+fi fo fr \

+gb ge gh gn \

+gr hr hu \

+ie il in iq \

+ir is it jp \

+kg kh kr kz \

+la latam latin \

+lk lt lv \

+ma mao me \

+mk ml mm \

+mn mt mv \

+ng nl no np \

+pc pk pl pt \

+ro rs ru \

+se si sk sn \

+sy th \

+terminate \

+tj tm tr \

+ua us uz vn \

+za \

+altwin capslock compose ctrl empty eurosign group inet \

+keypad kpdl level3 level5 nbsp olpc shift srvr_ctrl typo

+

+dir_data = $(dist_symbols_DATA)

+

+include $(top_srcdir)/xkbrules.am

diff --git a/xorg-server/xkbdata.src/symbols/af b/xorg-server/xkbdata.src/symbols/af
index 3ff8ad4ed..d8a88526a 100644
--- a/xorg-server/xkbdata.src/symbols/af
+++ b/xorg-server/xkbdata.src/symbols/af
@@ -1,395 +1,398 @@
-// $XKeyboardConfig$
-//
-// 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 <SPCE> { [ space, 0x100200c, 0x10000a0 ] };
-
-   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 "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 <SPCE> { [ space, 0x100200c, 0x10000a0 ] };
-
-   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 "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 <SPCE> { [ space, 0x100200c, 0x10000a0 ] };
-
-   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 "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 <SPCE> { [ space, 0x100200C, 0x10000A0 ] }; // zero width non-joiner, no break space
-
-   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 "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 <SPCE> { [ space, 0x100200C, 0x10000A0 ] }; // zero width non-joiner, no break space
-
-   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 "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 <SPCE> { [ space, 0x100200C, 0x10000A0 ] }; // zero width non-joiner, no break space
-
-   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 "group(olpc)"
-};
+// $XKeyboardConfig$

+//

+// 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)"

+};

diff --git a/xorg-server/xkbdata.src/symbols/be b/xorg-server/xkbdata.src/symbols/be
index b3c4e53e5..040f1b42e 100644
--- a/xorg-server/xkbdata.src/symbols/be
+++ b/xorg-server/xkbdata.src/symbols/be
@@ -1,236 +1,236 @@
-// $XKeyboardConfig$
-
-// based on a keyboard map from an 'xkb/symbols/be' file
-//
-// $XFree86: xc/programs/xkbcomp/symbols/be,v 1.3 2003/04/12 10:53:48 pascal Exp $
-
-partial default alphanumeric_keys
-xkb_symbols "basic" {
-
-    include "latin"
-
-    name[Group1]="Belgium";
-
-    key <AE01>	{ [ ampersand,          1,          bar,   exclamdown ]	};
-    key <AE02>	{ [    eacute,          2,           at,    oneeighth ]	};
-    key <AE03>	{ [  quotedbl,          3,   numbersign,     sterling ]	};
-    key <AE04>	{ [apostrophe,          4,   onequarter,       dollar ]	};
-    key <AE05>	{ [ parenleft,          5,      onehalf, threeeighths ]	};
-    key <AE06>	{ [   section,          6,  asciicircum,  fiveeighths ]	};
-    key <AE07>	{ [    egrave,          7,    braceleft, seveneighths ]	};
-    key <AE08>	{ [    exclam,          8,  bracketleft,    trademark ]	};
-    key <AE09>	{ [  ccedilla,          9,    braceleft,    plusminus ]	};
-    key <AE10>	{ [    agrave,          0,   braceright,       degree ]	};
-    key <AE11>	{ [parenright,     degree,    backslash, questiondown ]	};
-    key <AE12>	{ [     minus, underscore, dead_cedilla,  dead_ogonek ]	};
-
-    key <AD01>	{ [         a,          A,           at,  Greek_OMEGA ]	};
-    key <AD02>	{ [         z,          Z,      lstroke,      Lstroke ]	};
-    key <AD03>	{ [         e,          E,     EuroSign,         cent ]	};
-    key <AD09>  { [         o,          O,           oe,           OE ] }; // o O œ Œ
-    key <AD11>	{ [dead_circumflex, dead_diaeresis,  bracketleft, dead_abovering ] };
-    key <AD12>	{ [    dollar,   asterisk, bracketright,  dead_macron ]	};
-
-    key <AC01>	{ [         q,          Q,           ae,           AE ]	};
-    key <AC10>	{ [         m,          M,   dead_acute, dead_doubleacute ] };
-    key <AC11>	{ [    ugrave,    percent,   dead_acute,   dead_caron ]	};
-    key <TLDE>	{ [twosuperior, threesuperior,  notsign,      notsign ]	};
-
-    key <BKSL>	{ [        mu,   sterling,   dead_grave,   dead_breve ]	};
-    key <AB01>	{ [         w,          W, guillemotleft,        less ]	};
-    key <AB07>	{ [     comma,   question, dead_cedilla,    masculine ]	};
-    key <AB08>	{ [ semicolon,     period, horizconnector,   multiply ]	};
-    key <AB09>	{ [     colon,      slash, periodcentered,   division ]	};
-    key <AB10>	{ [     equal,       plus,   dead_tilde, dead_abovedot]	};
-    key <LSGT>  { [      less,    greater,    backslash,    backslash ]	};
-
-    include "level3(ralt_switch)"
-};
-
-
-// Variant of the fr(oss) layout for Belgium
-// Copyright © 2006 Nicolas Mailhot <nicolas.mailhot @ laposte.net>
-//
-// ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┲━━━━━━━━━┓
-// │ ³ ≤ │ 1 ≥ │ 2 É │ 3 ˘ │ 4 — │ 5 – │ 6 ™ │ 7 È │ 8 ¡ │ 9 Ç │ 0 À │ ° Ø │ _ ± ┃ ⌫ Retour┃
-// │ ² ¹ │ & | │ é @ │ " # │ ' ¸ │ ( ˇ │ § ^ │ è ` │ ! ~ │ ç { │ à } │ ) ø │ - ‑ ┃  arrière┃
-// ┢━━━━━┷━┱───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┺━┳━━━━━━━┫
-// ┃       ┃ A Æ │ Z  │ E ¢ │ R Ê │ T Þ │ Y Ÿ │ U Û │ I Î │ O Œ │ P Ô │ ¨ ˚ │ * ̨ ┃Entrée ┃
-// ┃Tab ↹  ┃ a æ │ z â │ e € │ r ê │ t þ │ y ÿ │ u û │ i î │ o œ │ p ô │ ^ [ │ $ ] ┃   ⏎   ┃
-// ┣━━━━━━━┻┱────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┺┓      ┃
-// ┃        ┃ Q Ä │ S „ │ D Ë │ F ‚ │ G ¥ │ H Ð │ J Ü │ K Ï │ L Ł │ M Ö │ % Ù │ £ ̄ ┃      ┃
-// ┃Maj ⇬   ┃ q ä │ s ß │ d ë │ f ‘ │ g ’ │ h ð │ j ü │ k ï │ l ł │ m ö │ ù ' │ µ ` ┃      ┃
-// ┣━━━━━━━┳┹────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┲┷━━━━━┻━━━━━━┫
-// ┃       ┃ > ≠ │ W “ │ X ” │ C ® │ V ← │ B ↑ │ N → │ ? … │ . . │ / ∕ │ + − ┃             ┃
-// ┃Shift ⇧┃ < \ │ w « │ x » │ c © │ v ⍽ │ b ↓ │ n ¬ │ , ¿ │ ; × │ : ÷ │ = ~ ┃Shift ⇧      ┃
-// ┣━━━━━━━╋━━━━━┷━┳━━━┷━━━┱─┴─────┴─────┴─────┴─────┴─────┴───┲━┷━━━━━╈━━━━━┻━┳━━━━━━━┳━━━┛
-// ┃       ┃       ┃       ┃ ␣              Espace insécable ⍽ ┃       ┃       ┃       ┃
-// ┃Ctrl   ┃Meta   ┃Alt    ┃ ␣ Espace                        ␣ ┃AltGr ⇮┃Menu   ┃Ctrl   ┃
-// ┗━━━━━━━┻━━━━━━━┻━━━━━━━┹───────────────────────────────────┺━━━━━━━┻━━━━━━━┻━━━━━━━┛
-partial alphanumeric_keys
-xkb_symbols "oss" {
-
-    include "fr(oss)"
-    include "be(oss_frbe)"
-
-    name[Group1]="Belgium - Alternative";
-};
-
-partial alphanumeric_keys
-xkb_symbols "oss_frbe" {
-    // First row
-    key <TLDE>	{ [      twosuperior,    threesuperior,          onesuperior,         lessthanequal ] }; // ² ³ ¹ ≤ 
-    key <AE01>	{ [        ampersand,                1,                  bar,      greaterthanequal ] }; // & 1 | ≥
-    key <AE02>	{ [           eacute,                2,                   at,                Eacute ] }; // é 2 @ É
-    key <AE04>	{ [       apostrophe,                4,         dead_cedilla,             0x1002014 ] }; // ' 4 ¸ — (tiret cadratin)
-    key <AE05>	{ [        parenleft,                5,           dead_caron,             0x1002013 ] }; // ( 5 ˇ – (tiret demi-cadratin)
-    key <AE06>	{ [          section,                6,          asciicircum,             trademark ] }; // § 6 ^ ™
-    key <AE08>	{ [           exclam,                8,           asciitilde,            exclamdown ] }; // ! 8 ~ ¡
-    key <AE09>	{ [         ccedilla,                9,            braceleft,              Ccedilla ] }; // ç 9 { Ç
-    key <AE10>	{ [           agrave,                0,           braceright,                Agrave ] }; // à 0 } À
-    key <AE11>	{ [       parenright,           degree,               oslash,              Ooblique ] }; // ) ° ø Ø 
-    key <AE12>	{ [            minus,       underscore,            0x1002011,             plusminus ] }; // - _ - (tiret insécable) ±
-
-    // Second row
-    key <AD11>	{ [  dead_circumflex,   dead_diaeresis,          bracketleft,        dead_abovering ] }; // ^ ̈  [ ˚
-    key <AD12>	{ [           dollar,         asterisk,         bracketright,           dead_ogonek ] }; // $ * ] ̨
-
-    // Third row
-    key <AC09>  { [                l,                L,          dead_stroke ] }; // l L ł Ł
-    key <BKSL>	{ [              mu,          sterling,           dead_grave,           dead_macron ] }; // µ £ ` ̄
-
-    // Fourth row
-    key <LSGT>  { [             less,          greater,            backslash,              notequal ] }; // < > \ ≠
-    key <AB10>  { [            equal,             plus,           dead_tilde,             0x1002212 ] }; // = + ~ −
-};
-
-
-partial alphanumeric_keys
-xkb_symbols "oss_latin9" {
-
-    // Restricts the be(oss) layout to latin9 symbols
-
-    include "fr(oss_latin9)"
-    include "be(oss_frbe)"
-    include "keypad(oss_latin9)"
-
-    name[Group1]="Belgium - Alternative, latin-9 only";
-
-    // First row
-    key <TLDE>	{ [      twosuperior,    threesuperior,          onesuperior,                  less ] }; // ² ³ ¹ < 
-    key <AE01>	{ [        ampersand,                1,                  bar,               greater ] }; // & 1 | >
-    key <AE04>	{ [       apostrophe,                4,         dead_cedilla,                 minus ] }; // ' 4 ¸ -
-    key <AE05>	{ [        parenleft,                5,           dead_caron,                 minus ] }; // ( 5 ˇ -
-    key <AE06>	{ [          section,                6,          asciicircum,           asciicircum ] }; // § 6 ^ ^
-    key <AE12>	{ [            minus,       underscore,                minus,             plusminus ] }; // - _ - ±
-
-    // Second row
-    key <AD12>	{ [           dollar,         asterisk,         bracketright,          dead_cedilla ] }; // $ * ] ¸
-
-    // Third row
-    key <AC09>  { [                l,                L,                    l,                     L ] }; // l L l L
-    key <BKSL>	{ [              mu,          sterling,           dead_grave,       dead_circumflex ] }; // µ £ ` ^
-
-    // Fourth row
-    key <LSGT>  { [             less,          greater,            backslash,                 equal ] }; // < > \ =
-    key <AB10>  { [            equal,             plus,           dead_tilde,                 minus ] }; // = + ~ -
-};
-
-
-partial alphanumeric_keys
-xkb_symbols "oss_Sundeadkeys" {
-
-    // Modifies the basic be(oss) layout to use the Sun dead keys
-
-    include "be(oss)"
-
-    // First row
-    key <AE04>	{ [       apostrophe,                4,        SunFA_Cedilla,             0x1002014 ] }; // ' 4 ¸ — (tiret cadratin)
-
-    // Second row
-    key <AD11>	{ [     SunFA_Circum,  SunFA_Diaeresis,          bracketleft,        dead_abovering ] }; // ^ ̈ [ ˚
-
-    //Third row
-    key <AC11>	{ [           ugrave,          percent,          SunFA_Acute,                Ugrave ] }; // ù % ' Ù
-    key <BKSL>	{ [              mu,          sterling,          SunFA_Grave,           dead_macron ] }; // µ £ ` ̄
-
-    // Fourth row
-    key <AB10>  { [            equal,             plus,          SunFA_Tilde,             0x1002212 ] }; // = + ~ −
-};
-
-partial alphanumeric_keys
-xkb_symbols "oss_sundeadkeys" {
-
-    include "be(oss_Sundeadkeys)"
-
-    name[Group1]="Belgium - Alternative, Sun dead keys";
-};
-
-
-partial alphanumeric_keys
-xkb_symbols "iso-alternate" {
-    include "be(basic)"
-    name[Group1]="Belgium - ISO Alternate";
-
-    key <AD01>	{ [         a,          A,           ae,           AE ]	};
-    key <AD02>	{ [         z,          Z, guillemotleft,        less ]	};
-    key <AC01>	{ [         q,          Q,           at,  Greek_OMEGA ]	};
-    key <AC10>	{ [         m,          M,           mu,    masculine ]	};
-    key <AB01>	{ [         w,          W,      lstroke,      Lstroke ]	};
-    key <AB07>	{ [ comma,   question, dead_cedilla, dead_doubleacute ]	};
-};
-
-partial alphanumeric_keys
-xkb_symbols "sundeadkeys" {
-
-    // Use the Sun dead keys
-
-    include "be(basic)"
-    name[Group1]="Belgium - Sun dead keys";
-
-    key <AD11>	{ [SunFA_Circum, SunFA_Diaeresis, bracketleft, bracketleft] };
-    key <AC11>	{ [    ugrave,    percent,  SunFA_Acute,  SunFA_Acute ]	};
-    key <BKSL>	{ [        mu,   sterling,  SunFA_Grave,  SunFA_Grave ]	};
-    key <AB07>	{ [     comma,  question, SunFA_Cedilla, SunFA_Cedilla]	};
-    key <AB10>	{ [     equal,       plus,  SunFA_Tilde,  SunFA_Tilde ]	};
-};
-
-partial alphanumeric_keys
-xkb_symbols "Sundeadkeys" {
-
-    // Use the Sun dead keys
-
-    include "be(sundeadkeys)"
-
-};
-
-partial alphanumeric_keys
-xkb_symbols "nodeadkeys" {
-
-    // Eliminates dead keys from the basic Belgian layout
-
-    include "be(basic)"
-    name[Group1]="Belgium - Eliminate dead keys";
-
-    key <AE12>	{ [     minus, underscore,      cedilla,       ogonek ]	};
-    key <AD11>	{ [asciicircum,  diaeresis,  bracketleft,  bracketleft]	};
-    key <AD12>	{ [    dollar,   asterisk, bracketright,       macron ]	};
-    key <AC10>	{ [         m,          M,        acute,  doubleacute ]	};
-    key <AC11>	{ [    ugrave,    percent,   quoteright,   quoteright ]	};
-    key <BKSL>	{ [        mu,   sterling,    quoteleft,    quoteleft ]	};
-    key <AB07>	{ [     comma,   question,      cedilla,    masculine ]	};
-    key <AB10>	{ [     equal,       plus,   asciitilde,   asciitilde ]	};
-};
-
-// Wang model 724 azerty Belgium keyboard
-partial alphanumeric_keys
-xkb_symbols "wang" {
-
-    include "be(basic)"
-    include "keypad(legacy_wang)"
-    name[Group1]="Belgium - Wang model 724 azerty";
-
-    // Engravings on Wang 725-3771-ae
-    key <TLDE> { [ twosuperior, threesuperior,   notsign, asciitilde ] };
-    key <LSGT> { [        less,       greater, backslash,  brokenbar ] };
-};
+// $XKeyboardConfig$

+

+// based on a keyboard map from an 'xkb/symbols/be' file

+//

+// $XFree86: xc/programs/xkbcomp/symbols/be,v 1.3 2003/04/12 10:53:48 pascal Exp $

+

+partial default alphanumeric_keys

+xkb_symbols "basic" {

+

+    include "latin"

+

+    name[Group1]="Belgium";

+

+    key <AE01>	{ [ ampersand,          1,          bar,   exclamdown ]	};

+    key <AE02>	{ [    eacute,          2,           at,    oneeighth ]	};

+    key <AE03>	{ [  quotedbl,          3,   numbersign,     sterling ]	};

+    key <AE04>	{ [apostrophe,          4,   onequarter,       dollar ]	};

+    key <AE05>	{ [ parenleft,          5,      onehalf, threeeighths ]	};

+    key <AE06>	{ [   section,          6,  asciicircum,  fiveeighths ]	};

+    key <AE07>	{ [    egrave,          7,    braceleft, seveneighths ]	};

+    key <AE08>	{ [    exclam,          8,  bracketleft,    trademark ]	};

+    key <AE09>	{ [  ccedilla,          9,    braceleft,    plusminus ]	};

+    key <AE10>	{ [    agrave,          0,   braceright,       degree ]	};

+    key <AE11>	{ [parenright,     degree,    backslash, questiondown ]	};

+    key <AE12>	{ [     minus, underscore, dead_cedilla,  dead_ogonek ]	};

+

+    key <AD01>	{ [         a,          A,           at,  Greek_OMEGA ]	};

+    key <AD02>	{ [         z,          Z,      lstroke,      Lstroke ]	};

+    key <AD03>	{ [         e,          E,     EuroSign,         cent ]	};

+    key <AD09>  { [         o,          O,           oe,           OE ] }; // o O œ Œ

+    key <AD11>	{ [dead_circumflex, dead_diaeresis,  bracketleft, dead_abovering ] };

+    key <AD12>	{ [    dollar,   asterisk, bracketright,  dead_macron ]	};

+

+    key <AC01>	{ [         q,          Q,           ae,           AE ]	};

+    key <AC10>	{ [         m,          M,   dead_acute, dead_doubleacute ] };

+    key <AC11>	{ [    ugrave,    percent,   dead_acute,   dead_caron ]	};

+    key <TLDE>	{ [twosuperior, threesuperior,  notsign,      notsign ]	};

+

+    key <BKSL>	{ [        mu,   sterling,   dead_grave,   dead_breve ]	};

+    key <AB01>	{ [         w,          W, guillemotleft,        less ]	};

+    key <AB07>	{ [     comma,   question, dead_cedilla,    masculine ]	};

+    key <AB08>	{ [ semicolon,     period, horizconnector,   multiply ]	};

+    key <AB09>	{ [     colon,      slash, periodcentered,   division ]	};

+    key <AB10>	{ [     equal,       plus,   dead_tilde, dead_abovedot]	};

+    key <LSGT>  { [      less,    greater,    backslash,    backslash ]	};

+

+    include "level3(ralt_switch)"

+};

+

+

+// Variant of the fr(oss) layout for Belgium

+// Copyright © 2006 Nicolas Mailhot <nicolas.mailhot @ laposte.net>

+//

+// ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┲━━━━━━━━━┓

+// │ ³ ≤ │ 1 ≥ │ 2 É │ 3 ˘ │ 4 — │ 5 – │ 6 ™ │ 7 È │ 8 ¡ │ 9 Ç │ 0 À │ ° Ø │ _ ± ┃ ⌫ Retour┃

+// │ ² ¹ │ & | │ é @ │ " # │ ' ¸ │ ( ˇ │ § ^ │ è ` │ ! ~ │ ç { │ à } │ ) ø │ - ‑ ┃  arrière┃

+// ┢━━━━━┷━┱───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┺━┳━━━━━━━┫

+// ┃       ┃ A Æ │ Z  │ E ¢ │ R Ê │ T Þ │ Y Ÿ │ U Û │ I Î │ O Œ │ P Ô │ ¨ ˚ │ * ̨ ┃Entrée ┃

+// ┃Tab ↹  ┃ a æ │ z â │ e € │ r ê │ t þ │ y ÿ │ u û │ i î │ o œ │ p ô │ ^ [ │ $ ] ┃   ⏎   ┃

+// ┣━━━━━━━┻┱────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┺┓      ┃

+// ┃        ┃ Q Ä │ S „ │ D Ë │ F ‚ │ G ¥ │ H Ð │ J Ü │ K Ï │ L Ł │ M Ö │ % Ù │ £ ̄ ┃      ┃

+// ┃Maj ⇬   ┃ q ä │ s ß │ d ë │ f ‘ │ g ’ │ h ð │ j ü │ k ï │ l ł │ m ö │ ù ' │ µ ` ┃      ┃

+// ┣━━━━━━━┳┹────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┲┷━━━━━┻━━━━━━┫

+// ┃       ┃ > ≠ │ W “ │ X ” │ C ® │ V ← │ B ↑ │ N → │ ? … │ . . │ / ∕ │ + − ┃             ┃

+// ┃Shift ⇧┃ < \ │ w « │ x » │ c © │ v ⍽ │ b ↓ │ n ¬ │ , ¿ │ ; × │ : ÷ │ = ~ ┃Shift ⇧      ┃

+// ┣━━━━━━━╋━━━━━┷━┳━━━┷━━━┱─┴─────┴─────┴─────┴─────┴─────┴───┲━┷━━━━━╈━━━━━┻━┳━━━━━━━┳━━━┛

+// ┃       ┃       ┃       ┃ ␣              Espace insécable ⍽ ┃       ┃       ┃       ┃

+// ┃Ctrl   ┃Meta   ┃Alt    ┃ ␣ Espace                        ␣ ┃AltGr ⇮┃Menu   ┃Ctrl   ┃

+// ┗━━━━━━━┻━━━━━━━┻━━━━━━━┹───────────────────────────────────┺━━━━━━━┻━━━━━━━┻━━━━━━━┛

+partial alphanumeric_keys

+xkb_symbols "oss" {

+

+    include "fr(oss)"

+    include "be(oss_frbe)"

+

+    name[Group1]="Belgium - Alternative";

+};

+

+partial alphanumeric_keys

+xkb_symbols "oss_frbe" {

+    // First row

+    key <TLDE>	{ [      twosuperior,    threesuperior,          onesuperior,         lessthanequal ] }; // ² ³ ¹ ≤ 

+    key <AE01>	{ [        ampersand,                1,                  bar,      greaterthanequal ] }; // & 1 | ≥

+    key <AE02>	{ [           eacute,                2,                   at,                Eacute ] }; // é 2 @ É

+    key <AE04>	{ [       apostrophe,                4,         dead_cedilla,             0x1002014 ] }; // ' 4 ¸ — (tiret cadratin)

+    key <AE05>	{ [        parenleft,                5,           dead_caron,             0x1002013 ] }; // ( 5 ˇ – (tiret demi-cadratin)

+    key <AE06>	{ [          section,                6,          asciicircum,             trademark ] }; // § 6 ^ ™

+    key <AE08>	{ [           exclam,                8,           asciitilde,            exclamdown ] }; // ! 8 ~ ¡

+    key <AE09>	{ [         ccedilla,                9,            braceleft,              Ccedilla ] }; // ç 9 { Ç

+    key <AE10>	{ [           agrave,                0,           braceright,                Agrave ] }; // à 0 } À

+    key <AE11>	{ [       parenright,           degree,               oslash,              Ooblique ] }; // ) ° ø Ø 

+    key <AE12>	{ [            minus,       underscore,            0x1002011,             plusminus ] }; // - _ - (tiret insécable) ±

+

+    // Second row

+    key <AD11>	{ [  dead_circumflex,   dead_diaeresis,          bracketleft,        dead_abovering ] }; // ^ ̈  [ ˚

+    key <AD12>	{ [           dollar,         asterisk,         bracketright,           dead_ogonek ] }; // $ * ] ̨

+

+    // Third row

+    key <AC09>  { [                l,                L,          dead_stroke ] }; // l L ł Ł

+    key <BKSL>	{ [              mu,          sterling,           dead_grave,           dead_macron ] }; // µ £ ` ̄

+

+    // Fourth row

+    key <LSGT>  { [             less,          greater,            backslash,              notequal ] }; // < > \ ≠

+    key <AB10>  { [            equal,             plus,           dead_tilde,             0x1002212 ] }; // = + ~ −

+};

+

+

+partial alphanumeric_keys

+xkb_symbols "oss_latin9" {

+

+    // Restricts the be(oss) layout to latin9 symbols

+

+    include "fr(oss_latin9)"

+    include "be(oss_frbe)"

+    include "keypad(oss_latin9)"

+

+    name[Group1]="Belgium - Alternative, latin-9 only";

+

+    // First row

+    key <TLDE>	{ [      twosuperior,    threesuperior,          onesuperior,                  less ] }; // ² ³ ¹ < 

+    key <AE01>	{ [        ampersand,                1,                  bar,               greater ] }; // & 1 | >

+    key <AE04>	{ [       apostrophe,                4,         dead_cedilla,                 minus ] }; // ' 4 ¸ -

+    key <AE05>	{ [        parenleft,                5,           dead_caron,                 minus ] }; // ( 5 ˇ -

+    key <AE06>	{ [          section,                6,          asciicircum,           asciicircum ] }; // § 6 ^ ^

+    key <AE12>	{ [            minus,       underscore,                minus,             plusminus ] }; // - _ - ±

+

+    // Second row

+    key <AD12>	{ [           dollar,         asterisk,         bracketright,          dead_cedilla ] }; // $ * ] ¸

+

+    // Third row

+    key <AC09>  { [                l,                L,                    l,                     L ] }; // l L l L

+    key <BKSL>	{ [              mu,          sterling,           dead_grave,       dead_circumflex ] }; // µ £ ` ^

+

+    // Fourth row

+    key <LSGT>  { [             less,          greater,            backslash,                 equal ] }; // < > \ =

+    key <AB10>  { [            equal,             plus,           dead_tilde,                 minus ] }; // = + ~ -

+};

+

+

+partial alphanumeric_keys

+xkb_symbols "oss_Sundeadkeys" {

+

+    // Modifies the basic be(oss) layout to use the Sun dead keys

+

+    include "be(oss)"

+

+    // First row

+    key <AE04>	{ [       apostrophe,                4,        dead_cedilla,             0x1002014 ] }; // ' 4 ¸ — (tiret cadratin)

+

+    // Second row

+    key <AD11>	{ [     dead_circumflex,  dead_diaeresis,          bracketleft,        dead_abovering ] }; // ^ ̈ [ ˚

+

+    //Third row

+    key <AC11>	{ [           ugrave,          percent,          dead_acute,                Ugrave ] }; // ù % ' Ù

+    key <BKSL>	{ [              mu,          sterling,          dead_grave,           dead_macron ] }; // µ £ ` ̄

+

+    // Fourth row

+    key <AB10>  { [            equal,             plus,          dead_tilde,             0x1002212 ] }; // = + ~ −

+};

+

+partial alphanumeric_keys

+xkb_symbols "oss_sundeadkeys" {

+

+    include "be(oss_Sundeadkeys)"

+

+    name[Group1]="Belgium - Alternative, Sun dead keys";

+};

+

+

+partial alphanumeric_keys

+xkb_symbols "iso-alternate" {

+    include "be(basic)"

+    name[Group1]="Belgium - ISO Alternate";

+

+    key <AD01>	{ [         a,          A,           ae,           AE ]	};

+    key <AD02>	{ [         z,          Z, guillemotleft,        less ]	};

+    key <AC01>	{ [         q,          Q,           at,  Greek_OMEGA ]	};

+    key <AC10>	{ [         m,          M,           mu,    masculine ]	};

+    key <AB01>	{ [         w,          W,      lstroke,      Lstroke ]	};

+    key <AB07>	{ [ comma,   question, dead_cedilla, dead_doubleacute ]	};

+};

+

+partial alphanumeric_keys

+xkb_symbols "sundeadkeys" {

+

+    // Use the Sun dead keys

+

+    include "be(basic)"

+    name[Group1]="Belgium - Sun dead keys";

+

+    key <AD11>	{ [dead_circumflex, dead_diaeresis, bracketleft, bracketleft] };

+    key <AC11>	{ [    ugrave,    percent,  dead_acute,  dead_acute ]	};

+    key <BKSL>	{ [        mu,   sterling,  dead_grave,  dead_grave ]	};

+    key <AB07>	{ [     comma,  question, dead_cedilla, dead_cedilla]	};

+    key <AB10>	{ [     equal,       plus,  dead_tilde,  dead_tilde ]	};

+};

+

+partial alphanumeric_keys

+xkb_symbols "Sundeadkeys" {

+

+    // Use the Sun dead keys

+

+    include "be(sundeadkeys)"

+

+};

+

+partial alphanumeric_keys

+xkb_symbols "nodeadkeys" {

+

+    // Eliminates dead keys from the basic Belgian layout

+

+    include "be(basic)"

+    name[Group1]="Belgium - Eliminate dead keys";

+

+    key <AE12>	{ [     minus, underscore,      cedilla,       ogonek ]	};

+    key <AD11>	{ [asciicircum,  diaeresis,  bracketleft,  bracketleft]	};

+    key <AD12>	{ [    dollar,   asterisk, bracketright,       macron ]	};

+    key <AC10>	{ [         m,          M,        acute,  doubleacute ]	};

+    key <AC11>	{ [    ugrave,    percent,   quoteright,   quoteright ]	};

+    key <BKSL>	{ [        mu,   sterling,    quoteleft,    quoteleft ]	};

+    key <AB07>	{ [     comma,   question,      cedilla,    masculine ]	};

+    key <AB10>	{ [     equal,       plus,   asciitilde,   asciitilde ]	};

+};

+

+// Wang model 724 azerty Belgium keyboard

+partial alphanumeric_keys

+xkb_symbols "wang" {

+

+    include "be(basic)"

+    include "keypad(legacy_wang)"

+    name[Group1]="Belgium - Wang model 724 azerty";

+

+    // Engravings on Wang 725-3771-ae

+    key <TLDE> { [ twosuperior, threesuperior,   notsign, asciitilde ] };

+    key <LSGT> { [        less,       greater, backslash,  brokenbar ] };

+};

diff --git a/xorg-server/xkbdata.src/symbols/ch b/xorg-server/xkbdata.src/symbols/ch
index a0a2621a9..26dcb616f 100644
--- a/xorg-server/xkbdata.src/symbols/ch
+++ b/xorg-server/xkbdata.src/symbols/ch
@@ -1,218 +1,218 @@
-// $XKeyboardConfig$
-// $Xorg: ch,v 1.3 2000/08/17 19:54:42 cpqbld Exp $
-// $XFree86: xc/programs/xkbcomp/symbols/ch,v 3.6 2002/11/25 14:05:06 eich Exp $
-
-partial default alphanumeric_keys 
-xkb_symbols "basic" {
-
-    include "latin"
-
-    // Alphanumeric section
-    name[Group1]= "Switzerland";
-    key <TLDE> { [    section,     degree                           ] };
-    key <AE01> { [          1,       plus,          bar, exclamdown ] };
-    key <AE02> { [          2,   quotedbl,           at, oneeighth  ] };
-    key <AE03> { [          3,   asterisk,   numbersign             ] };
-    key <AE04> { [          4,   ccedilla                           ] };
-    key <AE05> { [          5,    percent                           ] };
-    key <AE06> { [          6,  ampersand,      notsign             ] };
-    key <AE07> { [          7,      slash,          bar             ] };
-    key <AE08> { [          8,  parenleft,         cent             ] };
-    key <AE09> { [          9, parenright                           ] };
-    key <AE10> { [          0,      equal                           ] };
-    key <AE11> { [ apostrophe,   question,   dead_acute             ] };
-    key <AE12> { [ dead_circumflex, dead_grave, dead_tilde          ] };
-
-    key <AD03> { [          e,          E,     EuroSign             ] };
-    key <AD06> { [          z,          Z                           ] };
-    key <AD11> { [ udiaeresis,     egrave,  bracketleft             ] };
-    key <AD12> { [ dead_diaeresis, exclam, bracketright             ] };
-
-    key <AC10> { [ odiaeresis,     eacute                           ] };
-    key <AC11> { [ adiaeresis,     agrave,    braceleft             ] };
-    key <BKSL> { [     dollar,   sterling,   braceright             ] };
-
-    key <LSGT> { [       less,    greater,    backslash, brokenbar  ] };
-    key <AB01> { [          y,          Y                           ] };
-    key <AB08> { [      comma,  semicolon                           ] };
-    key <AB09> { [     period,      colon                           ] };
-    key <AB10> { [      minus, underscore                           ] };
-
-    include "level3(ralt_switch)"
-};
-
-partial alphanumeric_keys 
-xkb_symbols "legacy" {
-    include "ch(basic)"
-
-    name[Group1]= "Switzerland - Legacy";
-    key <AE07> { [          7,      slash,    brokenbar             ] };
-};
-
-partial alphanumeric_keys 
-xkb_symbols "de" {
-    include "ch(basic)"
-};
-
-partial alphanumeric_keys 
-xkb_symbols "de_Sundeadkeys" {
-    // modify the basic Swiss German layout to use Sun dead keys
-    include "ch(basic)"
-    key <AE11> { [      apostrophe,    question,  SunFA_Acute   ] };
-    key <AE12> { [    SunFA_Circum, SunFA_Grave,  SunFA_Tilde   ] };
-    key <AD12> { [ SunFA_Diaeresis,      exclam, bracketright   ] };
-};
-
-partial alphanumeric_keys 
-xkb_symbols "de_sundeadkeys" {
-    include "ch(de_Sundeadkeys)"
-    name[Group1]= "Switzerland - German, Sun dead keys";
-};
-
-partial alphanumeric_keys 
-xkb_symbols "de_nodeadkeys" {
-    // modify the basic Swiss German layout not to have any dead keys
-    include "ch(basic)"
-    name[Group1]= "Switzerland - German, eliminate dead keys";
-    key <AE11> { [  apostrophe, question,        acute  ] };
-    key <AE12> { [ asciicircum,    grave,   asciitilde  ] };
-    key <AD12> { [   diaeresis,   exclam, bracketright  ] };
-};
-
-partial alphanumeric_keys 
-xkb_symbols "fr" {
-
-    // Describes the differences between a very simple US/ASCII
-    // keyboard and a very simple Swiss/French keybaord
-
-    include "ch(basic)"
-    name[Group1]= "Switzerland - French";
-
-    override key <AD11> {
-	[ egrave,	udiaeresis,	bracketleft	]
-    };
-    override key <AC10> {
-	[ eacute,	odiaeresis	]
-    };
-    override key <AC11> {
-	[ agrave,	adiaeresis,	braceleft	]
-    };
-};
-
-partial alphanumeric_keys
-xkb_symbols "fr_Sundeadkeys" {
-    // modify the basic Swiss French layout to use Sun dead keys
-    include "ch(fr)"
-    key <AE11> { [      apostrophe,    question,  SunFA_Acute   ] };
-    key <AE12> { [    SunFA_Circum, SunFA_Grave,  SunFA_Tilde   ] };
-    key <AD12> { [ SunFA_Diaeresis,      exclam, bracketright   ] };
-};
-
-partial alphanumeric_keys
-xkb_symbols "fr_sundeadkeys" {
-    include "ch(fr_Sundeadkeys)"
-    name[Group1]= "Switzerland - French, Sun dead keys";
-};
-
-partial alphanumeric_keys
-xkb_symbols "fr_nodeadkeys" {
-    // modify the basic Swiss French layout not to have any dead keys
-    include "ch(fr)"
-    name[Group1]= "Switzerland - French, eliminate dead keys";
-    key <AE11> { [  apostrophe, question,        acute  ] };
-    key <AE12> { [ asciicircum,    grave,   asciitilde  ] };
-    key <AD12> { [   diaeresis,   exclam, bracketright  ] };
-};
-
-// Copied from macintosh_vndr/ch
-// 03.01.2003
-// Andreas Tobler <a.tobler@schweiz.ch>
-// modified for Swiss German Apple Extended Keyboard II
-
-partial alphanumeric_keys
-xkb_symbols "de_mac" {
-    
-    name[Group1]= "Switzerland - German (Macintosh)";
-
-    // Alphanumeric section
-
-    key <AE01> { [	1,	plus, 	plusminus,	infinity		]	};
-    key <AE02> { [	2,	quotedbl, leftdoublequotemark, rightdoublequotemark 	]	};
-    key <AE03> { [	3,	asterisk, 	numbersign,	leftcaret	]	};
-					// not displayed here
-    key <AE04> { [	4,	ccedilla, 	Ccedilla,	slash		]	};
-    key <AE05> { [	5,	percent, 	bracketleft			]	};
-    key <AE06> { [	6,	ampersand, 	bracketright			]	};
-    key <AE07> { [	7,	slash, 	bar,		backslash		]	};
-    key <AE08> { [	8,	parenleft, 	braceleft,	Ograve		]	};
-    key <AE09> { [	9,	parenright, 	braceright,	Ocircumflex	]	};
-    key <AE10> { [	0,	equal, 	notequal,	Uacute			]	};
-    key <AE11> { [	apostrophe,	question, 	questiondown, 	NoSymbol		]	};
-    key <AE12> { [	dead_circumflex,dead_grave, 	dead_acute,	asciicircum		]	};
-    key <AD01> { [	q,	Q, 	oe,		OE			]	};
-    key <AD02> { [	w,	W, 	Greek_SIGMA,	Aacute			]	};
-    key <AD03> { [ 	e,	E, 	EuroSign,	Ediaeresis		]	};
-    key <AD04> { [ 	r,	R, 	registered,	Egrave			]	};
-    key <AD05> { [ 	t,	T, 	dagger,		Icircumflex		]	}; 
-    key <AD06> { [	z,	Z, 	Greek_OMEGA,	Iacute			]	};
-    key <AD07> { [ 	u,	U, 	degree,		Ugrave			]	};
-    key <AD08> { [ 	i,	I, 	exclamdown,	idotless		]	};
-    key <AD09> { [ 	o,	O, 	oslash,		Ooblique		]	};
-    key <AD10> { [ 	p,	P, 	Greek_pi,	Greek_PI		]	};
-    key <AD11> { [	udiaeresis,	egrave, 	section,	ydiaeresis		]	};
-    key <AD12> { [	dead_diaeresis,	exclam, 	grave,		apostrophe		]	};
-    key <AC01> { [ 	a,	A, 	aring,		Aring			]	};
-    key <AC02> { [ 	s,	S, 	ssharp, 	NoSymbol		]	}; 
-					// ligature fl
-    key <AC03> { [ 	d,	D, 	Greek_sigma,	NoSymbol		]	};
-			// partialderivative is not available here att
-    key <AC04> { [ 	f,	F, 	function,	doubledagger		]	};
-    key <AC05> { [ 	g,	G, 	at,		comma			]	};
-    key <AC06> { [ 	h,	H, 	ordfeminine,	periodcentered		]	};
-    key <AC07> { [ 	j,	J,  	masculine,	eth	 		]	};
-    key <AC08> { [ 	k,	K, 	Greek_DELTA,	macron			]	};
-    key <AC09> { [ 	l,	L, 	notsign,	caret			]	};
-    key <AC10> { [	odiaeresis,	eacute, 	cent,		breve	]	};
-    key <AC11> { [	adiaeresis,	agrave, 	ae,		AE	]	};
-    key <AB01> { [	y,	Y, 	yen,		Ydiaeresis		]	};
-    key <AB02> { [ 	x,	X, 	similarequal,	trademark		]	};
-    key <AB03> { [ 	c,	C, 	copyright,	NoSymbol		]	};
-    key <AB04> { [ 	v,	V, 	radical,	diamond			]	};
-    key <AB05> { [ 	b,	B, 	integral,	NoSymbol		]	};  
-    key <AB06> { [ 	n,	N, 	dead_tilde, 	enopencircbullet	]       };
-					// to be fixed att
-    key <AB07> { [ 	m,	M, 	mu,		dead_abovering		]       };
-					// not sure att
-    key <AB08> { [	comma,	semicolon, 	guillemotleft,	guillemotright	]	};
-    key <AB09> { [	period,	colon, 	ellipsis,	division		]	};
-    key <AB10> { [	minus,	underscore, 	hyphen,		emdash		]	};
-    key <TLDE> { [	section,	degree,   	NoSymbol, 	NoSymbol		]	};
-			// ligature fi	// per mille
-    key <SPCE> { [	space, 	nobreakspace,	nobreakspace		]	};
-    key <LSGT> { [	less,	greater, 	lessthanequal,	greaterthanequal	]  	};
-    key <BKSL> { [	dollar,	sterling, 	paragraph,	enfilledcircbullet	]	};
-
-    include "kpdl(comma)"
-    include "level3(ralt_switch)"
-};
-
-partial alphanumeric_keys 
-xkb_symbols "fr_mac" {
-
-    // Describes the differences between a very simple US/ASCII
-    // keyboard and a very simple Swiss/French keybaord
-
-    include "ch(de_mac)"
-    name[Group1]= "Switzerland - French (Macintosh)";
-
-    override key <AD11> {
-	[ egrave,	udiaeresis,  bracketleft	]
-    };
-    override key <AC10> {
-	[ eacute,	odiaeresis	]
-    };
-    override key <AC11> {
-	[ agrave,	adiaeresis,   braceleft		]
-    };
-};
-
+// $XKeyboardConfig$

+// $Xorg: ch,v 1.3 2000/08/17 19:54:42 cpqbld Exp $

+// $XFree86: xc/programs/xkbcomp/symbols/ch,v 3.6 2002/11/25 14:05:06 eich Exp $

+

+partial default alphanumeric_keys 

+xkb_symbols "basic" {

+

+    include "latin"

+

+    // Alphanumeric section

+    name[Group1]= "Switzerland";

+    key <TLDE> { [    section,     degree                           ] };

+    key <AE01> { [          1,       plus,          bar, exclamdown ] };

+    key <AE02> { [          2,   quotedbl,           at, oneeighth  ] };

+    key <AE03> { [          3,   asterisk,   numbersign             ] };

+    key <AE04> { [          4,   ccedilla                           ] };

+    key <AE05> { [          5,    percent                           ] };

+    key <AE06> { [          6,  ampersand,      notsign             ] };

+    key <AE07> { [          7,      slash,          bar             ] };

+    key <AE08> { [          8,  parenleft,         cent             ] };

+    key <AE09> { [          9, parenright                           ] };

+    key <AE10> { [          0,      equal                           ] };

+    key <AE11> { [ apostrophe,   question,   dead_acute             ] };

+    key <AE12> { [ dead_circumflex, dead_grave, dead_tilde          ] };

+

+    key <AD03> { [          e,          E,     EuroSign             ] };

+    key <AD06> { [          z,          Z                           ] };

+    key <AD11> { [ udiaeresis,     egrave,  bracketleft             ] };

+    key <AD12> { [ dead_diaeresis, exclam, bracketright             ] };

+

+    key <AC10> { [ odiaeresis,     eacute                           ] };

+    key <AC11> { [ adiaeresis,     agrave,    braceleft             ] };

+    key <BKSL> { [     dollar,   sterling,   braceright             ] };

+

+    key <LSGT> { [       less,    greater,    backslash, brokenbar  ] };

+    key <AB01> { [          y,          Y                           ] };

+    key <AB08> { [      comma,  semicolon                           ] };

+    key <AB09> { [     period,      colon                           ] };

+    key <AB10> { [      minus, underscore                           ] };

+

+    include "level3(ralt_switch)"

+};

+

+partial alphanumeric_keys 

+xkb_symbols "legacy" {

+    include "ch(basic)"

+

+    name[Group1]= "Switzerland - Legacy";

+    key <AE07> { [          7,      slash,    brokenbar             ] };

+};

+

+partial alphanumeric_keys 

+xkb_symbols "de" {

+    include "ch(basic)"

+};

+

+partial alphanumeric_keys 

+xkb_symbols "de_Sundeadkeys" {

+    // modify the basic Swiss German layout to use Sun dead keys

+    include "ch(basic)"

+    key <AE11> { [      apostrophe,    question,  dead_acute   ] };

+    key <AE12> { [    dead_circumflex, dead_grave,  dead_tilde   ] };

+    key <AD12> { [ dead_diaeresis,      exclam, bracketright   ] };

+};

+

+partial alphanumeric_keys 

+xkb_symbols "de_sundeadkeys" {

+    include "ch(de_Sundeadkeys)"

+    name[Group1]= "Switzerland - German, Sun dead keys";

+};

+

+partial alphanumeric_keys 

+xkb_symbols "de_nodeadkeys" {

+    // modify the basic Swiss German layout not to have any dead keys

+    include "ch(basic)"

+    name[Group1]= "Switzerland - German, eliminate dead keys";

+    key <AE11> { [  apostrophe, question,        acute  ] };

+    key <AE12> { [ asciicircum,    grave,   asciitilde  ] };

+    key <AD12> { [   diaeresis,   exclam, bracketright  ] };

+};

+

+partial alphanumeric_keys 

+xkb_symbols "fr" {

+

+    // Describes the differences between a very simple US/ASCII

+    // keyboard and a very simple Swiss/French keybaord

+

+    include "ch(basic)"

+    name[Group1]= "Switzerland - French";

+

+    override key <AD11> {

+	[ egrave,	udiaeresis,	bracketleft	]

+    };

+    override key <AC10> {

+	[ eacute,	odiaeresis	]

+    };

+    override key <AC11> {

+	[ agrave,	adiaeresis,	braceleft	]

+    };

+};

+

+partial alphanumeric_keys

+xkb_symbols "fr_Sundeadkeys" {

+    // modify the basic Swiss French layout to use Sun dead keys

+    include "ch(fr)"

+    key <AE11> { [      apostrophe,    question,  dead_acute   ] };

+    key <AE12> { [    dead_circumflex, dead_grave,  dead_tilde   ] };

+    key <AD12> { [ dead_diaeresis,      exclam, bracketright   ] };

+};

+

+partial alphanumeric_keys

+xkb_symbols "fr_sundeadkeys" {

+    include "ch(fr_Sundeadkeys)"

+    name[Group1]= "Switzerland - French, Sun dead keys";

+};

+

+partial alphanumeric_keys

+xkb_symbols "fr_nodeadkeys" {

+    // modify the basic Swiss French layout not to have any dead keys

+    include "ch(fr)"

+    name[Group1]= "Switzerland - French, eliminate dead keys";

+    key <AE11> { [  apostrophe, question,        acute  ] };

+    key <AE12> { [ asciicircum,    grave,   asciitilde  ] };

+    key <AD12> { [   diaeresis,   exclam, bracketright  ] };

+};

+

+// Copied from macintosh_vndr/ch

+// 03.01.2003

+// Andreas Tobler <a.tobler@schweiz.ch>

+// modified for Swiss German Apple Extended Keyboard II

+

+partial alphanumeric_keys

+xkb_symbols "de_mac" {

+    

+    name[Group1]= "Switzerland - German (Macintosh)";

+

+    // Alphanumeric section

+

+    key <AE01> { [	1,	plus, 	plusminus,	infinity		]	};

+    key <AE02> { [	2,	quotedbl, leftdoublequotemark, rightdoublequotemark 	]	};

+    key <AE03> { [	3,	asterisk, 	numbersign,	leftcaret	]	};

+					// not displayed here

+    key <AE04> { [	4,	ccedilla, 	Ccedilla,	slash		]	};

+    key <AE05> { [	5,	percent, 	bracketleft			]	};

+    key <AE06> { [	6,	ampersand, 	bracketright			]	};

+    key <AE07> { [	7,	slash, 	bar,		backslash		]	};

+    key <AE08> { [	8,	parenleft, 	braceleft,	Ograve		]	};

+    key <AE09> { [	9,	parenright, 	braceright,	Ocircumflex	]	};

+    key <AE10> { [	0,	equal, 	notequal,	Uacute			]	};

+    key <AE11> { [	apostrophe,	question, 	questiondown, 	NoSymbol		]	};

+    key <AE12> { [	dead_circumflex,dead_grave, 	dead_acute,	asciicircum		]	};

+    key <AD01> { [	q,	Q, 	oe,		OE			]	};

+    key <AD02> { [	w,	W, 	Greek_SIGMA,	Aacute			]	};

+    key <AD03> { [ 	e,	E, 	EuroSign,	Ediaeresis		]	};

+    key <AD04> { [ 	r,	R, 	registered,	Egrave			]	};

+    key <AD05> { [ 	t,	T, 	dagger,		Icircumflex		]	}; 

+    key <AD06> { [	z,	Z, 	Greek_OMEGA,	Iacute			]	};

+    key <AD07> { [ 	u,	U, 	degree,		Ugrave			]	};

+    key <AD08> { [ 	i,	I, 	exclamdown,	idotless		]	};

+    key <AD09> { [ 	o,	O, 	oslash,		Ooblique		]	};

+    key <AD10> { [ 	p,	P, 	Greek_pi,	Greek_PI		]	};

+    key <AD11> { [	udiaeresis,	egrave, 	section,	ydiaeresis		]	};

+    key <AD12> { [	dead_diaeresis,	exclam, 	grave,		apostrophe		]	};

+    key <AC01> { [ 	a,	A, 	aring,		Aring			]	};

+    key <AC02> { [ 	s,	S, 	ssharp, 	NoSymbol		]	}; 

+					// ligature fl

+    key <AC03> { [ 	d,	D, 	Greek_sigma,	NoSymbol		]	};

+			// partialderivative is not available here att

+    key <AC04> { [ 	f,	F, 	function,	doubledagger		]	};

+    key <AC05> { [ 	g,	G, 	at,		comma			]	};

+    key <AC06> { [ 	h,	H, 	ordfeminine,	periodcentered		]	};

+    key <AC07> { [ 	j,	J,  	masculine,	eth	 		]	};

+    key <AC08> { [ 	k,	K, 	Greek_DELTA,	macron			]	};

+    key <AC09> { [ 	l,	L, 	notsign,	caret			]	};

+    key <AC10> { [	odiaeresis,	eacute, 	cent,		breve	]	};

+    key <AC11> { [	adiaeresis,	agrave, 	ae,		AE	]	};

+    key <AB01> { [	y,	Y, 	yen,		Ydiaeresis		]	};

+    key <AB02> { [ 	x,	X, 	similarequal,	trademark		]	};

+    key <AB03> { [ 	c,	C, 	copyright,	NoSymbol		]	};

+    key <AB04> { [ 	v,	V, 	radical,	diamond			]	};

+    key <AB05> { [ 	b,	B, 	integral,	NoSymbol		]	};  

+    key <AB06> { [ 	n,	N, 	dead_tilde, 	enopencircbullet	]       };

+					// to be fixed att

+    key <AB07> { [ 	m,	M, 	mu,		dead_abovering		]       };

+					// not sure att

+    key <AB08> { [	comma,	semicolon, 	guillemotleft,	guillemotright	]	};

+    key <AB09> { [	period,	colon, 	ellipsis,	division		]	};

+    key <AB10> { [	minus,	underscore, 	hyphen,		emdash		]	};

+    key <TLDE> { [	section,	degree,   	NoSymbol, 	NoSymbol		]	};

+			// ligature fi	// per mille

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

+    key <LSGT> { [	less,	greater, 	lessthanequal,	greaterthanequal	]  	};

+    key <BKSL> { [	dollar,	sterling, 	paragraph,	enfilledcircbullet	]	};

+

+    include "kpdl(comma)"

+    include "level3(ralt_switch)"

+};

+

+partial alphanumeric_keys 

+xkb_symbols "fr_mac" {

+

+    // Describes the differences between a very simple US/ASCII

+    // keyboard and a very simple Swiss/French keybaord

+

+    include "ch(de_mac)"

+    name[Group1]= "Switzerland - French (Macintosh)";

+

+    override key <AD11> {

+	[ egrave,	udiaeresis,  bracketleft	]

+    };

+    override key <AC10> {

+	[ eacute,	odiaeresis	]

+    };

+    override key <AC11> {

+	[ agrave,	adiaeresis,   braceleft		]

+    };

+};

+

diff --git a/xorg-server/xkbdata.src/symbols/cz b/xorg-server/xkbdata.src/symbols/cz
index cd2e09efe..4a45b2ca4 100644
--- a/xorg-server/xkbdata.src/symbols/cz
+++ b/xorg-server/xkbdata.src/symbols/cz
@@ -1,144 +1,174 @@
-// $XKeyboardConfig$
-// $XFree86: xc/programs/xkbcomp/symbols/cz,v 1.2 2002/11/22 04:02:22 dawes 
-// Exp $
-
-partial default alphanumeric_keys 
-xkb_symbols "basic" {
-     
-     // This layout conforms to a new cz compromise standard designed 
-     // to satisfy most unix, windows and mac users.
-     // 2001 by Kamil Toman <ktoman@email.cz>
-
-    include "latin"
-
-    name[Group1]= "Czechia";
-
-    key <TLDE>	{ [ semicolon, dead_abovering,    grave,   asciitilde ]	};
-    key <AE01>	{ [      plus,          1,       exclam,   dead_tilde ]	};
-    key <AE02>	{ [    ecaron,          2,           at,   dead_caron ]	};
-    key <AE03>	{ [    scaron,          3,   numbersign, dead_circumflex ] };
-    key <AE04>	{ [    ccaron,          4,       dollar,   dead_breve ]	};
-    key <AE05>	{ [    rcaron,          5,      percent, dead_abovering ] };
-    key <AE06>	{ [    zcaron,          6,  asciicircum,  dead_ogonek ]	};
-    key <AE07>	{ [    yacute,          7,    ampersand,   dead_grave ]	};
-    key <AE08>	{ [    aacute,          8,     asterisk, dead_abovedot]	};
-    key <AE09>	{ [    iacute,          9,    braceleft,   dead_acute ]	};
-    key <AE10>	{ [    eacute,          0,   braceright, dead_doubleacute ] };
-    key <AE11>	{ [     equal,    percent,     NoSymbol, dead_diaeresis ] };
-    key <AE12>	{ [dead_acute, dead_caron,  dead_macron, dead_cedilla ]	};
-
-    key <AD01>	{ [         q,          Q,    backslash,     NoSymbol ]	};
-    key <AD02>	{ [         w,          W,          bar,     Nosymbol ]	};
-    key <AD03>	{ [         e,          E,     EuroSign,     NoSymbol ]	};
-    key <AD04>	{ [         r,          R,     NoSymbol,     NoSymbol ]	};
-    key <AD05>	{ [         t,          T,     NoSymbol,     NoSymbol ]	};
-    key <AD06>	{ [         z,          Z,     NoSymbol,     NoSymbol ]	};
-    key <AD07>	{ [         u,          U,     NoSymbol,     NoSymbol ]	};
-    key <AD08>	{ [         i,          I,     NoSymbol,     NoSymbol ]	};
-    key <AD09>	{ [         o,          O,     NoSymbol,     NoSymbol ]	};
-    key <AD10>	{ [         p,          P,     NoSymbol,     NoSymbol ]	};
-
-    key <AD11>	{ [    uacute,      slash,  bracketleft,     division ]	};
-    key <AD12>	{ [parenright,  parenleft, bracketright,     multiply ]	};
-
-    key <AC01>	{ [         a,          A,   asciitilde,     NoSymbol ]	};
-    key <AC02>	{ [         s,          S,      dstroke,     NoSymbol ]	};
-    key <AC03>	{ [         d,          D,      Dstroke,     NoSymbol ]	};
-    key <AC04>	{ [         f,          F,  bracketleft,     NoSymbol ]	};
-    key <AC05>	{ [         g,          G, bracketright,     NoSymbol ]	};
-    key <AC06>	{ [         h,          H,        grave,     NoSymbol ]	};
-    key <AC07>	{ [         j,          J,   apostrophe,     NoSymbol ]	};
-    key <AC08>	{ [         k,          K,      lstroke,     NoSymbol ]	};
-    key <AC09>	{ [         l,          L,      Lstroke,     NoSymbol ]	};
-                  
-    key <AC10>	{ [     uring,   quotedbl,       dollar,     NoSymbol ]	};
-    key <AC11>	{ [   section,     exclam,   apostrophe,       ssharp ]	};
-    key <AC12>	{ [  EuroSign, dead_diaeresis, NoSymbol,     NoSymbol ]	};
-    key <BKSL>	{ [dead_diaeresis, apostrophe, backslash,         bar ]	};
-
-    key <LSGT>	{ [ backslash,        bar,        slash,     NoSymbol ]	};
-    key <AB01>	{ [         y,          Y,       degree,     NoSymbol ]	};
-    key <AB02>	{ [         x,          X,   numbersign,     Nosymbol ]	};
-    key <AB03>	{ [         c,          C,    ampersand,     NoSymbol ]	};
-    key <AB04>	{ [         v,          V,           at,     NoSymbol ]	};
-    key <AB05>	{ [         b,          B,    braceleft,     NoSymbol ]	};
-    key <AB06>	{ [         n,          N,   braceright,     NoSymbol ]	};
-    key <AB07>	{ [         m,          M,  asciicircum,     NoSymbol ]	};
-    key <AB08>	{ [     comma,   question,         less,     NoSymbol ]	};
-    key <AB09>	{ [    period,      colon,      greater,     NoSymbol ]	};
-    key <AB10>	{ [     minus, underscore,     asterisk,     NoSymbol ]	};
-
-    key <SPCE>	{ [     space,      space, nobreakspace, nobreakspace ]	};
-
-    include "level3(ralt_switch)"
-};
-
-// Use <BKSL> instead of <LSGT> (useful for keyboard without <LSGT> key)
-xkb_symbols "bksl" {
-    include "cz(basic)"
-    name[Group1]= "Czechia - With <\|> key";
-
-    key <BKSL>	{ [ backslash,        bar,        slash,     NoSymbol ]	};
-};
-
-partial alphanumeric_keys 
-xkb_symbols "qwerty" {
- 
-    // This layout should work exactly as a cz with the exception 
-    // of 'Z' and 'Y' keys, which are in the qwerty style (ie. swapped).
-    // 2001 by Kamil Toman <ktoman@email.cz>
-    
-    include "cz(basic)"
-    name[Group1]= "Czechia - qwerty";
-
-    key <AB01>	{ [         z,          Z,       degree,     NoSymbol ]	};
-    key <AD06>	{ [         y,          Y,     NoSymbol,     NoSymbol ]	};
-};
-
-// Use <BKSL> instead of <LSGT> (useful for keyboard without <LSGT> key)
-xkb_symbols "qwerty_bksl" {
-    include "cz(qwerty)"
-
-    name[Group1]= "Czechia - qwerty, extended Backslash";
-
-    key <BKSL>	{ [ backslash,        bar,        slash,     NoSymbol ]	};
-};
-
-partial alphanumeric_keys alternate_group
-xkb_symbols "ucw" {
-
-    // This layout is usually used as the second group, it contains
-    // accented characters only, no 'latin' set.
-    // 2008 by Milan Vancura <mvancura@suse.cz>
-
-    name[Group1]= "Czechia - UCW layout (accented letters only)";
-
-    key <AB01> { [zcaron,      Zcaron      ] };
-    key <AB02> { [ssharp                   ] };
-    key <AB03> { [ccaron,      Ccaron      ] };
-    key <AB04> { [ccedilla,    Ccedilla    ] };
-    key <AB05> { [ntilde,      Ntilde      ] };
-    key <AB06> { [ncaron,      Ncaron      ] };
-    key <AB07> { [lacute,      Lacute      ] };
-
-    key <AC01> { [aacute,      Aacute      ] };
-    key <AC02> { [scaron,      Scaron      ] };
-    key <AC03> { [dcaron,      Dcaron      ] };
-    key <AC04> { [ediaeresis,  Ediaeresis  ] };
-    key <AC05> { [racute,      Racute      ] };
-    key <AC06> { [uacute,      Uacute      ] };
-    key <AC07> { [udiaeresis,  Udiaeresis  ] };
-    key <AC08> { [ocircumflex, Ocircumflex ] };
-    key <AC09> { [lcaron,      Lcaron      ] };
-
-    key <AD01> { [adiaeresis,  Adiaeresis  ] };
-    key <AD02> { [ecaron,      Ecaron      ] };
-    key <AD03> { [eacute,      Eacute      ] };
-    key <AD04> { [rcaron,      Rcaron      ] };
-    key <AD05> { [tcaron,      Tcaron      ] };
-    key <AD06> { [yacute,      Yacute      ] };
-    key <AD07> { [uring,       Uring       ] };
-    key <AD08> { [iacute,      Iacute      ] };
-    key <AD09> { [oacute,      Oacute      ] };
-    key <AD10> { [odiaeresis,  Odiaeresis  ] };
-};
+// $XKeyboardConfig$

+// $XFree86: xc/programs/xkbcomp/symbols/cz,v 1.2 2002/11/22 04:02:22 dawes 

+// Exp $

+

+partial default alphanumeric_keys 

+xkb_symbols "basic" {

+     

+     // This layout conforms to a new cz compromise standard designed 

+     // to satisfy most unix, windows and mac users.

+     // 2001 by Kamil Toman <ktoman@email.cz>

+

+    include "latin"

+

+    name[Group1]= "Czechia";

+

+    key <TLDE>	{ [ semicolon, dead_abovering,    grave,   asciitilde ]	};

+    key <AE01>	{ [      plus,          1,       exclam,   dead_tilde ]	};

+    key <AE02>	{ [    ecaron,          2,           at,   dead_caron ]	};

+    key <AE03>	{ [    scaron,          3,   numbersign, dead_circumflex ] };

+    key <AE04>	{ [    ccaron,          4,       dollar,   dead_breve ]	};

+    key <AE05>	{ [    rcaron,          5,      percent, dead_abovering ] };

+    key <AE06>	{ [    zcaron,          6,  asciicircum,  dead_ogonek ]	};

+    key <AE07>	{ [    yacute,          7,    ampersand,   dead_grave ]	};

+    key <AE08>	{ [    aacute,          8,     asterisk, dead_abovedot]	};

+    key <AE09>	{ [    iacute,          9,    braceleft,   dead_acute ]	};

+    key <AE10>	{ [    eacute,          0,   braceright, dead_doubleacute ] };

+    key <AE11>	{ [     equal,    percent,     NoSymbol, dead_diaeresis ] };

+    key <AE12>	{ [dead_acute, dead_caron,  dead_macron, dead_cedilla ]	};

+

+    key <AD01>	{ [         q,          Q,    backslash,     NoSymbol ]	};

+    key <AD02>	{ [         w,          W,          bar,     Nosymbol ]	};

+    key <AD03>	{ [         e,          E,     EuroSign,     NoSymbol ]	};

+    key <AD04>	{ [         r,          R,     NoSymbol,     NoSymbol ]	};

+    key <AD05>	{ [         t,          T,     NoSymbol,     NoSymbol ]	};

+    key <AD06>	{ [         z,          Z,     NoSymbol,     NoSymbol ]	};

+    key <AD07>	{ [         u,          U,     NoSymbol,     NoSymbol ]	};

+    key <AD08>	{ [         i,          I,     NoSymbol,     NoSymbol ]	};

+    key <AD09>	{ [         o,          O,     NoSymbol,     NoSymbol ]	};

+    key <AD10>	{ [         p,          P,     NoSymbol,     NoSymbol ]	};

+

+    key <AD11>	{ [    uacute,      slash,  bracketleft,     division ]	};

+    key <AD12>	{ [parenright,  parenleft, bracketright,     multiply ]	};

+

+    key <AC01>	{ [         a,          A,   asciitilde,     NoSymbol ]	};

+    key <AC02>	{ [         s,          S,      dstroke,     NoSymbol ]	};

+    key <AC03>	{ [         d,          D,      Dstroke,     NoSymbol ]	};

+    key <AC04>	{ [         f,          F,  bracketleft,     NoSymbol ]	};

+    key <AC05>	{ [         g,          G, bracketright,     NoSymbol ]	};

+    key <AC06>	{ [         h,          H,        grave,     NoSymbol ]	};

+    key <AC07>	{ [         j,          J,   apostrophe,     NoSymbol ]	};

+    key <AC08>	{ [         k,          K,      lstroke,     NoSymbol ]	};

+    key <AC09>	{ [         l,          L,      Lstroke,     NoSymbol ]	};

+                  

+    key <AC10>	{ [     uring,   quotedbl,       dollar,     NoSymbol ]	};

+    key <AC11>	{ [   section,     exclam,   apostrophe,       ssharp ]	};

+    key <AC12>	{ [  EuroSign, dead_diaeresis, NoSymbol,     NoSymbol ]	};

+    key <BKSL>	{ [dead_diaeresis, apostrophe, backslash,         bar ]	};

+

+    key <LSGT>	{ [ backslash,        bar,        slash,     NoSymbol ]	};

+    key <AB01>	{ [         y,          Y,       degree,     NoSymbol ]	};

+    key <AB02>	{ [         x,          X,   numbersign,     Nosymbol ]	};

+    key <AB03>	{ [         c,          C,    ampersand,     NoSymbol ]	};

+    key <AB04>	{ [         v,          V,           at,     NoSymbol ]	};

+    key <AB05>	{ [         b,          B,    braceleft,     NoSymbol ]	};

+    key <AB06>	{ [         n,          N,   braceright,     NoSymbol ]	};

+    key <AB07>	{ [         m,          M,  asciicircum,     NoSymbol ]	};

+    key <AB08>	{ [     comma,   question,         less,     NoSymbol ]	};

+    key <AB09>	{ [    period,      colon,      greater,     NoSymbol ]	};

+    key <AB10>	{ [     minus, underscore,     asterisk,     NoSymbol ]	};

+

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

+

+    include "level3(ralt_switch)"

+};

+

+// Use <BKSL> instead of <LSGT> (useful for keyboard without <LSGT> key)

+xkb_symbols "bksl" {

+    include "cz(basic)"

+    name[Group1]= "Czechia - With <\|> key";

+

+    key <BKSL>	{ [ backslash,        bar,        slash,     NoSymbol ]	};

+};

+

+partial alphanumeric_keys 

+xkb_symbols "qwerty" {

+ 

+    // This layout should work exactly as a cz with the exception 

+    // of 'Z' and 'Y' keys, which are in the qwerty style (ie. swapped).

+    // 2001 by Kamil Toman <ktoman@email.cz>

+    

+    include "cz(basic)"

+    name[Group1]= "Czechia - qwerty";

+

+    key <AB01>	{ [         z,          Z,       degree,     NoSymbol ]	};

+    key <AD06>	{ [         y,          Y,     NoSymbol,     NoSymbol ]	};

+};

+

+// Use <BKSL> instead of <LSGT> (useful for keyboard without <LSGT> key)

+xkb_symbols "qwerty_bksl" {

+    include "cz(qwerty)"

+

+    name[Group1]= "Czechia - qwerty, extended Backslash";

+

+    key <BKSL>	{ [ backslash,        bar,        slash,     NoSymbol ]	};

+};

+

+partial alphanumeric_keys alternate_group

+xkb_symbols "ucw" {

+

+    // This layout is usually used as the second group, it contains

+    // accented characters only, no 'latin' set.

+    // 2008 by Milan Vancura <mvancura@suse.cz>

+

+    name[Group1]= "Czechia - UCW layout (accented letters only)";

+

+    key <AB01> { [zcaron,      Zcaron      ] };

+    key <AB02> { [ssharp                   ] };

+    key <AB03> { [ccaron,      Ccaron      ] };

+    key <AB04> { [ccedilla,    Ccedilla    ] };

+    key <AB05> { [ntilde,      Ntilde      ] };

+    key <AB06> { [ncaron,      Ncaron      ] };

+    key <AB07> { [lacute,      Lacute      ] };

+

+    key <AC01> { [aacute,      Aacute      ] };

+    key <AC02> { [scaron,      Scaron      ] };

+    key <AC03> { [dcaron,      Dcaron      ] };

+    key <AC04> { [ediaeresis,  Ediaeresis  ] };

+    key <AC05> { [racute,      Racute      ] };

+    key <AC06> { [uacute,      Uacute      ] };

+    key <AC07> { [udiaeresis,  Udiaeresis  ] };

+    key <AC08> { [ocircumflex, Ocircumflex ] };

+    key <AC09> { [lcaron,      Lcaron      ] };

+

+    key <AD01> { [adiaeresis,  Adiaeresis  ] };

+    key <AD02> { [ecaron,      Ecaron      ] };

+    key <AD03> { [eacute,      Eacute      ] };

+    key <AD04> { [rcaron,      Rcaron      ] };

+    key <AD05> { [tcaron,      Tcaron      ] };

+    key <AD06> { [yacute,      Yacute      ] };

+    key <AD07> { [uring,       Uring       ] };

+    key <AD08> { [iacute,      Iacute      ] };

+    key <AD09> { [oacute,      Oacute      ] };

+    key <AD10> { [odiaeresis,  Odiaeresis  ] };

+};

+

+partial alphanumeric_keys

+xkb_symbols "dvorak-ucw" {

+

+    // US Dvorak layout extend with UCW - AltGr produces accented characters

+

+    include "us(dvorak)"

+

+    name[Group1]= "Czechia - US Dvorak with CZ UCW support";

+

+    key <AB03> { [ j, J, eacute, Eacute ] };

+    key <AB04> { [ k, K, uacute, Uacute ] };

+    key <AB10> { [ z, Z, zcaron, Zcaron ] };

+

+    key <AC01> { [ a, A, aacute, Aacute ] };

+    key <AC02> { [ o, O, oacute, Oacute ] };

+    key <AC03> { [ e, E, ecaron, Ecaron ] };

+    key <AC04> { [ u, U, uring,  Uring  ] };

+    key <AC05> { [ i, I, iacute, Iacute ] };

+    key <AC06> { [ d, D, dcaron, Dcaron ] };

+    key <AC08> { [ t, T, tcaron, Tcaron ] };

+    key <AC09> { [ n, N, ncaron, Ncaron ] };

+    key <AC10> { [ s, S, scaron, Scaron ] };

+

+    key <AD05> { [ y, Y, yacute, Yacute ] };

+    key <AD08> { [ c, C, ccaron, Ccaron ] };

+    key <AD09> { [ r, R, rcaron, Rcaron ] };

+

+    include "level3(ralt_switch)"

+};

diff --git a/xorg-server/xkbdata.src/symbols/empty b/xorg-server/xkbdata.src/symbols/empty
new file mode 100644
index 000000000..f315260ce
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/empty
@@ -0,0 +1,12 @@
+// $XKeyboardConfig$

+

+default partial alphanumeric_keys modifier_keys

+xkb_symbols "basic" {

+    name[Group1]= "Empty";

+};

+// $XKeyboardConfig$

+

+default partial alphanumeric_keys modifier_keys

+xkb_symbols "basic" {

+    name[Group1]= "Empty";

+};

diff --git a/xorg-server/xkbdata.src/symbols/es b/xorg-server/xkbdata.src/symbols/es
index 42b0e8cb1..70f8088a8 100644
--- a/xorg-server/xkbdata.src/symbols/es
+++ b/xorg-server/xkbdata.src/symbols/es
@@ -1,205 +1,205 @@
-// $XKeyboardConfig$
-
-// based on a keyboard
-// Modified for a real Spanish Keyboard by Jon Tombs
-//
-// $XFree86: xc/programs/xkbcomp/symbols/es,v 1.2 2002/11/22 04:03:28 dawes Exp $
-
-partial default alphanumeric_keys
-xkb_symbols "basic" {
-
-    include "latin(type4)"
-
-    name[Group1]="Spain";
-
-    key <AE01>	{ [         1,     exclam,          bar,   exclamdown ]	};
-    key <AE03>	{ [         3, periodcentered, numbersign,   sterling ]	};
-    key <AE04>	{ [         4,     dollar,   asciitilde,       dollar ]	};
-    key <AE06>	{ [         6,  ampersand,      notsign,  fiveeighths ]	};
-    key <AE11>	{ [apostrophe,   question,    backslash, questiondown ]	};
-    key <AE12>	{ [exclamdown, questiondown, dead_tilde,   asciitilde ]	};
-
-    key <AD11>	{ [dead_grave, dead_circumflex, bracketleft, dead_abovering ] };
-    key <AD12>	{ [      plus,   asterisk, bracketright,  dead_macron ]	};
-
-    key <AC10>	{ [    ntilde, Ntilde,   asciitilde, dead_doubleacute ]	};
-    key <AC11>	{ [dead_acute, dead_diaeresis, braceleft,   braceleft ]	};
-    key <TLDE>	{ [ masculine, ordfeminine,    backslash,   backslash ]	};
-
-    key <BKSL>	{ [  ccedilla,   Ccedilla,   braceright,   dead_breve ]	};
-
-    include "level3(ralt_switch)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "Sundeadkeys" {
-
-    include "es(basic)"
-
-    key <AC11>	{ [SunFA_Acute, SunFA_Diaeresis, braceleft, braceleft ]	};
-    key <AD11>	{ [SunFA_Grave, SunFA_Circum, bracketleft, dead_abovering ] };
-};
-
-partial alphanumeric_keys
-xkb_symbols "sundeadkeys" {
-
-    include "es(Sundeadkeys)"
-
-    name[Group1]="Spain - Sun dead keys";
-};
-
-partial alphanumeric_keys
-xkb_symbols "nodeadkeys" {
-
-    include "es(basic)"
-
-    name[Group1]="Spain - Eliminate dead keys";
-
-    key <AD11>	{ [     grave, asciicircum,  bracketleft,      degree ]	};
-    key <AD12>	{ [      plus,   asterisk, bracketright,       macron ]	};
-    key <AC10>	{ [    ntilde,     Ntilde,   asciitilde,  doubleacute ]	};
-    key <AC11>	{ [     acute,  diaeresis,    braceleft,    braceleft ]	};
-    key <BKSL>	{ [  ccedilla,   Ccedilla,   braceright,        breve ]	};
-    key <AB10>	{ [     minus, underscore, dead_belowdot,    abovedot ]	};
-};
-
-// Spanish mapping (note R-H exchange)
-partial alphanumeric_keys
-xkb_symbols "dvorak" {
-
-    name[Group1]="Spain - Dvorak";
-
-    // Alphanumeric section
-    key <TLDE> {[  masculine, ordfeminine, backslash, degree		]};
-    key <AE01> {[          1, exclam, bar, onesuperior			]};
-    key <AE02> {[          2, quotedbl, at, twosuperior			]};
-    key <AE03> {[          3, periodcentered, numbersign, threesuperior	]};
-    key <AE04> {[          4, dollar, asciitilde, onequarter		]};
-    key <AE05> {[          5, percent, brokenbar, fiveeighths		]};
-    key <AE06> {[          6, ampersand, notsign, threequarters		]};
-    key <AE07> {[          7, slash, onehalf, seveneighths		]};
-    key <AE08> {[          8, parenleft, oneeighth, threeeighths	]};
-    key <AE09> {[          9, parenright, asciicircum			]};
-    key <AE10> {[          0, equal, grave, dead_doubleacute		]};
-    key <AE11> {[ apostrophe, question, dead_macron, dead_ogonek	]};
-    key <AE12> {[ exclamdown, questiondown, dead_breve, dead_abovedot	]};
-
-    key <AD01> {[     period, colon					]};
-    key <AD02> {[      comma, semicolon					]};
-    key <AD03> {[     ntilde, Ntilde, lstroke, Lstroke			]};
-    key <AD04> {[          p, P, paragraph				]};
-    key <AD05> {[          y, Y, yen					]};
-    key <AD06> {[          f, F, tslash, Tslash				]};
-    key <AD07> {[          g, G, dstroke, Dstroke			]};
-    key <AD08> {[          c, C, cent, copyright			]};
-    key <AD09> {[          h, H, hstroke, Hstroke			]};
-    key <AD10> {[          l, L, sterling				]};
-    key <AD11> {[ dead_grave, dead_circumflex, bracketleft, dead_caron	]};
-    key <AD12> {[       plus, asterisk, bracketright, plusminus		]};
-
-    key <AC01> {[          a, A, ae, AE					]};
-    key <AC02> {[          o, O, oslash, Oslash				]};
-    key <AC03> {[          e, E, EuroSign				]};
-    key <AC04> {[          u, U, aring, Aring				]};
-    key <AC05> {[          i, I, oe, OE					]};
-    key <AC06> {[          d, D, eth, ETH				]};
-    key <AC07> {[          r, R, registered, trademark			]};
-    key <AC08> {[          t, T, thorn, THORN				]};
-    key <AC09> {[          n, N, eng, ENG				]};
-    key <AC10> {[          s, S, ssharp, section			]};
-    key <AC11> {[ dead_acute, dead_diaeresis, braceleft, dead_tilde	]};
-    key <BKSL> {[   ccedilla, Ccedilla, braceright, dead_cedilla	]};
-
-    key <LSGT> {[       less, greater, guillemotleft, guillemotright	]};
-    key <AB01> {[      minus, underscore, hyphen, macron		]};
-    key <AB02> {[          q, Q, currency				]};
-    key <AB03> {[          j, J						]};
-    key <AB04> {[          k, K, kra					]};
-    key <AB05> {[          x, X, multiply, division			]};
-    key <AB06> {[          b, B						]};
-    key <AB07> {[          m, M, mu					]};
-    key <AB08> {[          w, W						]};
-    key <AB09> {[          v, V						]};
-    key <AB10> {[          z, Z						]};
-
-    include "level3(ralt_switch)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "cat" {
-
-    include "es(basic)"
-
-    name[Group1]="Spain - Catalan variant with middle-dot L";
-
-    key <AC09>  { [	    l,      L,		0x1000140,  0x100013F ] };
-};
-
-partial alphanumeric_keys
-xkb_symbols "ast" {
-
-    include "es(basic)"
-
-    name[Group1]="Spain - Asturian variant with bottom-dot H and bottom-dot L";
-
-    key <AC06>  { [	    h,      H,		0x1001E25,  0x1001E24 ] };
-    key <AC09>  { [	    l,      L,		0x1001E37,  0x1001E36 ] };
-};
-
-// Copied from macintosh_vndr/es
-partial alphanumeric_keys 
-xkb_symbols "mac" {
-
-    // Describes the differences between a very simple mac_US
-    // keyboard and a very simple Spanish keybaord
-
-    include "es"
-    name[Group1]= "Spain - Macintosh";
-
-};
-
-partial alphanumeric_keys
-xkb_symbols "olpc" {
-
-    include "us(basic)"
-    name[Group1]="Spain";
-
-    key <TLDE> { [    masculine,    ordfeminine      ] };
-    key <AE01> { [            1,         exclam,             bar ] };
-    key <AE02> { [            2,       quotedbl,              at ] };
-    key <AE03> { [            3,     dead_grave,      numbersign,   grave           ] };
-    key <AE05> { [            5,        percent,     asciicircum,   dead_circumflex ] };
-    key <AE06> { [            6,      ampersand,         notsign ] };
-    key <AE07> { [            7,          slash,       backslash ] };
-    key <AE08> { [            8,      parenleft                         ] };
-    key <AE09> { [            9,     parenright                         ] };
-    key <AE10> { [            0,          equal                  ] };
-    key <AE11> { [   apostrophe,       question                  ] };
-    key <AE12> { [   exclamdown,   questiondown                  ] };
-
-    key <AD03> { [            e,              E,        EuroSign ] };
-    key <AD11> { [   dead_acute, dead_diaeresis,           acute,   dead_abovering  ] };
-    key <AD12> { [  bracketleft,      braceleft                  ] };
-
-    key <AC10> { [       ntilde,        Ntilde                  ] };
-    key <AC11> { [         plus,       asterisk,      dead_tilde ] };
-    key <BKSL> { [ bracketright,     braceright                  ] };
-
-    key <AB08> { [        comma,      semicolon                  ] };
-    key <AB09> { [       period,          colon                  ] };
-    key <AB10> { [        minus,     underscore                  ] };
-  
-    key <I219> { [         less,        greater,  ISO_Next_Group ] };
-
-    include "level3(ralt_switch)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "deadtilde" {
-
-    include "es(basic)"
-
-    name[Group1]="Spain - Include dead tilde";
-
-    key <AE04>	{ [         4,     dollar,   dead_tilde,       dollar ]	};
-};
+// $XKeyboardConfig$

+

+// based on a keyboard

+// Modified for a real Spanish Keyboard by Jon Tombs

+//

+// $XFree86: xc/programs/xkbcomp/symbols/es,v 1.2 2002/11/22 04:03:28 dawes Exp $

+

+partial default alphanumeric_keys

+xkb_symbols "basic" {

+

+    include "latin(type4)"

+

+    name[Group1]="Spain";

+

+    key <AE01>	{ [         1,     exclam,          bar,   exclamdown ]	};

+    key <AE03>	{ [         3, periodcentered, numbersign,   sterling ]	};

+    key <AE04>	{ [         4,     dollar,   asciitilde,       dollar ]	};

+    key <AE06>	{ [         6,  ampersand,      notsign,  fiveeighths ]	};

+    key <AE11>	{ [apostrophe,   question,    backslash, questiondown ]	};

+    key <AE12>	{ [exclamdown, questiondown, dead_tilde,   asciitilde ]	};

+

+    key <AD11>	{ [dead_grave, dead_circumflex, bracketleft, dead_abovering ] };

+    key <AD12>	{ [      plus,   asterisk, bracketright,  dead_macron ]	};

+

+    key <AC10>	{ [    ntilde, Ntilde,   asciitilde, dead_doubleacute ]	};

+    key <AC11>	{ [dead_acute, dead_diaeresis, braceleft,   braceleft ]	};

+    key <TLDE>	{ [ masculine, ordfeminine,    backslash,   backslash ]	};

+

+    key <BKSL>	{ [  ccedilla,   Ccedilla,   braceright,   dead_breve ]	};

+

+    include "level3(ralt_switch)"

+};

+

+partial alphanumeric_keys

+xkb_symbols "Sundeadkeys" {

+

+    include "es(basic)"

+

+    key <AC11>	{ [dead_acute, dead_diaeresis, braceleft, braceleft ]	};

+    key <AD11>	{ [dead_grave, dead_circumflex, bracketleft, dead_abovering ] };

+};

+

+partial alphanumeric_keys

+xkb_symbols "sundeadkeys" {

+

+    include "es(Sundeadkeys)"

+

+    name[Group1]="Spain - Sun dead keys";

+};

+

+partial alphanumeric_keys

+xkb_symbols "nodeadkeys" {

+

+    include "es(basic)"

+

+    name[Group1]="Spain - Eliminate dead keys";

+

+    key <AD11>	{ [     grave, asciicircum,  bracketleft,      degree ]	};

+    key <AD12>	{ [      plus,   asterisk, bracketright,       macron ]	};

+    key <AC10>	{ [    ntilde,     Ntilde,   asciitilde,  doubleacute ]	};

+    key <AC11>	{ [     acute,  diaeresis,    braceleft,    braceleft ]	};

+    key <BKSL>	{ [  ccedilla,   Ccedilla,   braceright,        breve ]	};

+    key <AB10>	{ [     minus, underscore, dead_belowdot,    abovedot ]	};

+};

+

+// Spanish mapping (note R-H exchange)

+partial alphanumeric_keys

+xkb_symbols "dvorak" {

+

+    name[Group1]="Spain - Dvorak";

+

+    // Alphanumeric section

+    key <TLDE> {[  masculine, ordfeminine, backslash, degree		]};

+    key <AE01> {[          1, exclam, bar, onesuperior			]};

+    key <AE02> {[          2, quotedbl, at, twosuperior			]};

+    key <AE03> {[          3, periodcentered, numbersign, threesuperior	]};

+    key <AE04> {[          4, dollar, asciitilde, onequarter		]};

+    key <AE05> {[          5, percent, brokenbar, fiveeighths		]};

+    key <AE06> {[          6, ampersand, notsign, threequarters		]};

+    key <AE07> {[          7, slash, onehalf, seveneighths		]};

+    key <AE08> {[          8, parenleft, oneeighth, threeeighths	]};

+    key <AE09> {[          9, parenright, asciicircum			]};

+    key <AE10> {[          0, equal, grave, dead_doubleacute		]};

+    key <AE11> {[ apostrophe, question, dead_macron, dead_ogonek	]};

+    key <AE12> {[ exclamdown, questiondown, dead_breve, dead_abovedot	]};

+

+    key <AD01> {[     period, colon					]};

+    key <AD02> {[      comma, semicolon					]};

+    key <AD03> {[     ntilde, Ntilde, lstroke, Lstroke			]};

+    key <AD04> {[          p, P, paragraph				]};

+    key <AD05> {[          y, Y, yen					]};

+    key <AD06> {[          f, F, tslash, Tslash				]};

+    key <AD07> {[          g, G, dstroke, Dstroke			]};

+    key <AD08> {[          c, C, cent, copyright			]};

+    key <AD09> {[          h, H, hstroke, Hstroke			]};

+    key <AD10> {[          l, L, sterling				]};

+    key <AD11> {[ dead_grave, dead_circumflex, bracketleft, dead_caron	]};

+    key <AD12> {[       plus, asterisk, bracketright, plusminus		]};

+

+    key <AC01> {[          a, A, ae, AE					]};

+    key <AC02> {[          o, O, oslash, Oslash				]};

+    key <AC03> {[          e, E, EuroSign				]};

+    key <AC04> {[          u, U, aring, Aring				]};

+    key <AC05> {[          i, I, oe, OE					]};

+    key <AC06> {[          d, D, eth, ETH				]};

+    key <AC07> {[          r, R, registered, trademark			]};

+    key <AC08> {[          t, T, thorn, THORN				]};

+    key <AC09> {[          n, N, eng, ENG				]};

+    key <AC10> {[          s, S, ssharp, section			]};

+    key <AC11> {[ dead_acute, dead_diaeresis, braceleft, dead_tilde	]};

+    key <BKSL> {[   ccedilla, Ccedilla, braceright, dead_cedilla	]};

+

+    key <LSGT> {[       less, greater, guillemotleft, guillemotright	]};

+    key <AB01> {[      minus, underscore, hyphen, macron		]};

+    key <AB02> {[          q, Q, currency				]};

+    key <AB03> {[          j, J						]};

+    key <AB04> {[          k, K, kra					]};

+    key <AB05> {[          x, X, multiply, division			]};

+    key <AB06> {[          b, B						]};

+    key <AB07> {[          m, M, mu					]};

+    key <AB08> {[          w, W						]};

+    key <AB09> {[          v, V						]};

+    key <AB10> {[          z, Z						]};

+

+    include "level3(ralt_switch)"

+};

+

+partial alphanumeric_keys

+xkb_symbols "cat" {

+

+    include "es(basic)"

+

+    name[Group1]="Spain - Catalan variant with middle-dot L";

+

+    key <AC09>  { [	    l,      L,		0x1000140,  0x100013F ] };

+};

+

+partial alphanumeric_keys

+xkb_symbols "ast" {

+

+    include "es(basic)"

+

+    name[Group1]="Spain - Asturian variant with bottom-dot H and bottom-dot L";

+

+    key <AC06>  { [	    h,      H,		0x1001E25,  0x1001E24 ] };

+    key <AC09>  { [	    l,      L,		0x1001E37,  0x1001E36 ] };

+};

+

+// Copied from macintosh_vndr/es

+partial alphanumeric_keys 

+xkb_symbols "mac" {

+

+    // Describes the differences between a very simple mac_US

+    // keyboard and a very simple Spanish keybaord

+

+    include "es"

+    name[Group1]= "Spain - Macintosh";

+

+};

+

+partial alphanumeric_keys

+xkb_symbols "olpc" {

+

+    include "us(basic)"

+    name[Group1]="Spain";

+

+    key <TLDE> { [    masculine,    ordfeminine      ] };

+    key <AE01> { [            1,         exclam,             bar ] };

+    key <AE02> { [            2,       quotedbl,              at ] };

+    key <AE03> { [            3,     dead_grave,      numbersign,   grave           ] };

+    key <AE05> { [            5,        percent,     asciicircum,   dead_circumflex ] };

+    key <AE06> { [            6,      ampersand,         notsign ] };

+    key <AE07> { [            7,          slash,       backslash ] };

+    key <AE08> { [            8,      parenleft                         ] };

+    key <AE09> { [            9,     parenright                         ] };

+    key <AE10> { [            0,          equal                  ] };

+    key <AE11> { [   apostrophe,       question                  ] };

+    key <AE12> { [   exclamdown,   questiondown                  ] };

+

+    key <AD03> { [            e,              E,        EuroSign ] };

+    key <AD11> { [   dead_acute, dead_diaeresis,           acute,   dead_abovering  ] };

+    key <AD12> { [  bracketleft,      braceleft                  ] };

+

+    key <AC10> { [       ntilde,        Ntilde                  ] };

+    key <AC11> { [         plus,       asterisk,      dead_tilde ] };

+    key <BKSL> { [ bracketright,     braceright                  ] };

+

+    key <AB08> { [        comma,      semicolon                  ] };

+    key <AB09> { [       period,          colon                  ] };

+    key <AB10> { [        minus,     underscore                  ] };

+  

+    key <I219> { [         less,        greater,  ISO_Next_Group ] };

+

+    include "level3(ralt_switch)"

+};

+

+partial alphanumeric_keys

+xkb_symbols "deadtilde" {

+

+    include "es(basic)"

+

+    name[Group1]="Spain - Include dead tilde";

+

+    key <AE04>	{ [         4,     dollar,   dead_tilde,       dollar ]	};

+};

diff --git a/xorg-server/xkbdata.src/symbols/fr b/xorg-server/xkbdata.src/symbols/fr
index 0d621a802..5039ca93c 100644
--- a/xorg-server/xkbdata.src/symbols/fr
+++ b/xorg-server/xkbdata.src/symbols/fr
@@ -1,1012 +1,1028 @@
-// $XKeyboardConfig$
-
-// based on a keyboard map from an 'xkb/symbols/fr' file
-//
-// $XFree86: xc/programs/xkbcomp/symbols/fr,v 1.2 2002/11/22 04:03:28 dawes Exp $
-
-partial default alphanumeric_keys
-xkb_symbols "basic" {
-
-    include "latin"
-
-    name[Group1]="France";
-
-    key <AE01>	{ [ ampersand,          1,  onesuperior,   exclamdown ]	};
-    key <AE02>	{ [    eacute,          2,   asciitilde,    oneeighth ]	};
-    key <AE03>	{ [  quotedbl,          3,   numbersign,     sterling ]	};
-    key <AE04>	{ [apostrophe,          4,    braceleft,       dollar ]	};
-    key <AE05>	{ [ parenleft,          5,  bracketleft, threeeighths ]	};
-    key <AE06>	{ [     minus,          6,          bar,  fiveeighths ]	};
-    key <AE07>	{ [    egrave,          7,        grave, seveneighths ]	};
-    key <AE08>	{ [underscore,          8,    backslash,    trademark ]	};
-    key <AE09>	{ [  ccedilla,          9,  asciicircum,    plusminus ]	};
-    key <AE10>	{ [    agrave,          0,           at,       degree ]	};
-    key <AE11>	{ [parenright,     degree, bracketright, questiondown ]	};
-    key <AE12>	{ [     equal,       plus,   braceright,  dead_ogonek ]	};
-
-    key <AD01>	{ [         a,          A,           ae,           AE ]	};
-    key <AD02>	{ [         z,          Z, guillemotleft,        less ]	};
-    key <AD03>	{ [         e,          E,     EuroSign,         cent ]	};
-    key <AD11>	{ [dead_circumflex, dead_diaeresis, dead_diaeresis, dead_abovering ] };
-    key <AD12>	{ [    dollar,   sterling,     currency,  dead_macron ]	};
-
-    key <AC01>	{ [         q,          Q,           at,  Greek_OMEGA ]	};
-    key <AC10>	{ [         m,          M,           mu,    masculine ]	};
-    key <AC11>	{ [    ugrave,    percent, dead_circumflex, dead_caron]	};
-    key <TLDE>	{ [twosuperior, asciitilde,     notsign,      notsign ]	};
-
-    key <BKSL>	{ [  asterisk,         mu,   dead_grave,   dead_breve ]	};
-    key <AB01>	{ [         w,          W,      lstroke,      Lstroke ]	};
-    key <AB07>	{ [     comma,   question,   dead_acute, dead_doubleacute ] };
-    key <AB08>	{ [ semicolon,     period, horizconnector,   multiply ]	};
-    key <AB09>	{ [     colon,      slash, periodcentered,   division ]	};
-    key <AB10>	{ [    exclam,    section, dead_belowdot, dead_abovedot ] };
-
-    include "level3(ralt_switch)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "Sundeadkeys" {
-
-    // Modifies the basic French layout to use the Sun dead keys
-
-    include "fr(basic)"
-
-    key <AD11>	{ [SunFA_Circum, SunFA_Diaeresis ]	};
-    key <AB07>	{ [comma,   question,  SunFA_Acute, dead_doubleacute ]	};
-};
-
-partial alphanumeric_keys
-xkb_symbols "sundeadkeys" {
-    include "fr(Sundeadkeys)"
-
-    name[Group1]="France - Sun dead keys";
-};
-
-partial alphanumeric_keys
-xkb_symbols "nodeadkeys" {
-
-    // Modifies the basic French layout to eliminate all dead keys
-
-    include "fr(basic)"
-
-    name[Group1]="France - Eliminate dead keys";
-
-    key <AE12>	{ [     equal,       plus,   braceright,       ogonek ]	};
-    key <AD11>	{ [asciicircum,  diaeresis ]	};
-    key <AD12>	{ [    dollar,   sterling,     currency,       macron ]	};
-    key <AC11>	{ [    ugrave,    percent,  asciicircum,        caron ]	};
-    key <BKSL>	{ [  asterisk,         mu,        grave,        breve ]	};
-    key <AB07>	{ [     comma,   question,        acute,  doubleacute ]	};
-    key <AB10>	{ [    exclam,    section, dead_belowdot,    abovedot ]	};
-};
-
-
-// Unicode French derivative
-// Loose refactoring of the historic Linux French keyboard layout
-//
-// Copyright © 2006-2008 Nicolas Mailhot <nicolas.mailhot @ laposte.net>
-//
-// Credits (fr-latin1, fr-latin0, fr-latin9)
-//   © 199x-1996 René Cougnenc ✝
-//   © 1997-2002 Guylhem Aznar <clavier @ externe.net>
-//   © 2003-2006 Nicolas Mailhot <nicolas.mailhot @ laposte.net>
-//
-// ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┲━━━━━━━━━┓
-// │ ³ ¸ │ 1 ̨ │ 2 É │ 3 ˘ │ 4 — │ 5 – │ 6 ‑ │ 7 È │ 8 ™ │ 9 Ç │ 0 À │ ° ≠ │ + ± ┃ ⌫ Retour┃
-// │ ² ¹ │ & ˇ │ é ~ │ " # │ ' { │ ( [ │ - | │ è ` │ _ \ │ ç ^ │ à @ │ ) ] │ = } ┃  arrière┃
-// ┢━━━━━┷━┱───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┺━┳━━━━━━━┫
-// ┃       ┃ A Æ │ Z  │ E ¢ │ R Ê │ T Þ │ Y Ÿ │ U Û │ I Î │ O Œ │ P Ô │ ¨ ˚ │ £ Ø ┃Entrée ┃
-// ┃Tab ↹  ┃ a æ │ z â │ e € │ r ê │ t þ │ y ÿ │ u û │ i î │ o œ │ p ô │ ^ ~ │ $ ø ┃   ⏎   ┃
-// ┣━━━━━━━┻┱────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┺┓      ┃
-// ┃        ┃ Q Ä │ S „ │ D Ë │ F ‚ │ G ¥ │ H Ð │ J Ü │ K Ï │ L Ŀ │ M Ö │ % Ù │ µ ̄ ┃      ┃
-// ┃Maj ⇬   ┃ q ä │ s ß │ d ë │ f ‘ │ g ’ │ h ð │ j ü │ k ï │ l ŀ │ m ö │ ù ' │ * ` ┃      ┃
-// ┣━━━━━━━┳┹────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┲┷━━━━━┻━━━━━━┫
-// ┃       ┃ > ≥ │ W “ │ X ” │ C ® │ V ← │ B ↑ │ N → │ ? … │ . . │ / ∕ │ § − ┃             ┃
-// ┃Shift ⇧┃ < ≤ │ w « │ x » │ c © │ v ⍽ │ b ↓ │ n ¬ │ , ¿ │ ; × │ : ÷ │ ! ¡ ┃Shift ⇧      ┃
-// ┣━━━━━━━╋━━━━━┷━┳━━━┷━━━┱─┴─────┴─────┴─────┴─────┴─────┴───┲━┷━━━━━╈━━━━━┻━┳━━━━━━━┳━━━┛
-// ┃       ┃       ┃       ┃ ␣         Espace fine insécable ⍽ ┃       ┃       ┃       ┃
-// ┃Ctrl   ┃Meta   ┃Alt    ┃ ␣ Espace       Espace insécable ⍽ ┃AltGr ⇮┃Menu   ┃Ctrl   ┃
-// ┗━━━━━━━┻━━━━━━━┻━━━━━━━┹───────────────────────────────────┺━━━━━━━┻━━━━━━━┻━━━━━━━┛
-partial alphanumeric_keys
-xkb_symbols "oss" {
-
-    include "latin"
-    include "level3(ralt_switch)"
-    include "nbsp(level4nl)"
-    include "keypad(oss)"
-
-    name[Group1]="France - Alternative";
-
-    // First row
-    key <TLDE>	{ [      twosuperior,    threesuperior,          onesuperior,          dead_cedilla ] }; // ² ³ ¹ ¸ 
-    key <AE01>	{ [        ampersand,                1,           dead_caron,           dead_ogonek ] }; // & 1 ˇ ̨
-    key <AE02>	{ [           eacute,                2,           asciitilde,                Eacute ] }; // é 2 ~ É
-    key <AE03>	{ [         quotedbl,                3,           numbersign,            dead_breve ] }; // " 3 # ˘
-    key <AE04>	{ [       apostrophe,                4,            braceleft,             0x1002014 ] }; // ' 4 { — (tiret cadratin)
-    key <AE05>	{ [        parenleft,                5,          bracketleft,             0x1002013 ] }; // ( 5 [ – (tiret demi-cadratin)
-    key <AE06>	{ [            minus,                6,                  bar,             0x1002011 ] }; // - 6 | ‑ (tiret insécable)
-    key <AE07>	{ [           egrave,                7,                grave,                Egrave ] }; // è 7 ` È
-    key <AE08>	{ [       underscore,                8,            backslash,             trademark ] }; // _ 8 \ ™
-    key <AE09>	{ [         ccedilla,                9,          asciicircum,              Ccedilla ] }; // ç 9 ^ Ç
-    key <AE10>	{ [           agrave,                0,                   at,                Agrave ] }; // à 0 @ À
-    key <AE11>	{ [       parenright,           degree,         bracketright,              notequal ] }; // ) ° ] ≠ 
-    key <AE12>	{ [            equal,             plus,           braceright,             plusminus ] }; // = + } ±
-
-    // Second row
-    key <AD01>	{ [                a,                A,                   ae,                    AE ] }; // a A æ Æ
-    key <AD02>	{ [                z,                Z,          acircumflex,           Acircumflex ] }; // z Z â Â
-    key <AD03>	{ [                e,                E,             EuroSign,                  cent ] }; // e E € ¢
-    key <AD04>	{ [                r,                R,          ecircumflex,           Ecircumflex ] }; // r R ê Ê
-    key <AD05>	{ [                t,                T,                thorn,                 THORN ] }; // t T þ Þ
-    key <AD06>	{ [                y,                Y,           ydiaeresis,            Ydiaeresis ] }; // y Y ÿ Ÿ
-    key <AD07>	{ [                u,                U,          ucircumflex,           Ucircumflex ] }; // u U û Û
-    key <AD08>	{ [                i,                I,          icircumflex,           Icircumflex ] }; // i I î Î
-    key <AD09>	{ [                o,                O,                   oe,                    OE ] }; // o O œ Œ
-    key <AD10>	{ [                p,                P,          ocircumflex,           Ocircumflex ] }; // p P ô Ô
-    key <AD11>	{ [  dead_circumflex,   dead_diaeresis,           dead_tilde,        dead_abovering ] }; // ^ ̈ ̃ ˚
-    key <AD12>	{ [           dollar,         sterling,               oslash,              Ooblique ] }; // $ £ ø Ø
-
-    // Third row
-    key <AC01>	{ [                q,                Q,           adiaeresis,            Adiaeresis ] }; // q Q ä Ä
-    key <AC02>	{ [                s,                S,               ssharp,    doublelowquotemark ] }; // s S ß „ 
-    key <AC03>	{ [                d,                D,           ediaeresis,            Ediaeresis ] }; // d D ë Ë
-    key <AC04>	{ [                f,                F,  leftsinglequotemark,    singlelowquotemark ] }; // f F ‘ ‚
-    key <AC05>	{ [                g,                G, rightsinglequotemark,                   yen ] }; // g G ’ ¥
-    key <AC06>	{ [                h,                H,                  eth,                   ETH ] }; // h H ð Ð
-    key <AC07>	{ [                j,                J,           udiaeresis,            Udiaeresis ] }; // j J ü Ü
-    key <AC08>	{ [                k,                K,           idiaeresis,            Idiaeresis ] }; // k K ï Ï
-    key <AC09>	{ [                l,                L,            0x1000140,             0x100013F ] }; // l L ŀ Ŀ
-    key <AC10>	{ [                m,                M,           odiaeresis,            Odiaeresis ] }; // m M ö Ö
-    key <AC11>	{ [           ugrave,          percent,           dead_acute,                Ugrave ] }; // ù % ' Ù
-    key <BKSL>	{ [         asterisk,               mu,           dead_grave,           dead_macron ] }; // * µ ` ̄
-
-    // Fourth row
-    key <LSGT>  { [             less,          greater,        lessthanequal,      greaterthanequal ] }; // < > ≤ ≥
-    key <AB01>  { [                w,                W,        guillemotleft,   leftdoublequotemark ] }; // w W « “
-    key <AB02>  { [                x,                X,       guillemotright,  rightdoublequotemark ] }; // x X » ”
-    key <AB03>  { [                c,                C,            copyright,            registered ] }; // c C © ®
-    key <AB04>  { [                v,                V,            0x100202F,             leftarrow ] }; // v V ⍽ ← (espace fine insécable)
-    key <AB05>  { [                b,                B,            downarrow,               uparrow ] }; // b B ↓ ↑
-    key <AB06>  { [                n,                N,              notsign,            rightarrow ] }; // n N ¬ →
-    key <AB07>  { [            comma,         question,         questiondown,             0x1002026 ] }; // , ? ¿ …
-    key <AB08>  { [        semicolon,           period,             multiply,             0x10022C5 ] }; // ; . × ⋅
-    key <AB09>  { [            colon,            slash,             division,             0x1002215 ] }; // : / ÷ ∕
-    key <AB10>  { [           exclam,          section,           exclamdown,             0x1002212 ] }; // ! § ¡ −
-};
-
-partial alphanumeric_keys
-xkb_symbols "oss_latin9" {
-
-    // Restricts the fr(oss) layout to latin9 symbols
-
-    include "fr(oss)"
-    include "keypad(oss_latin9)"
-
-    name[Group1]="France - Alternative, latin-9 only";
-
-    // First row
-    key <AE01>	{ [        ampersand,                1,           dead_caron,          dead_cedilla ] }; // & 1 ˇ ¸
-    key <AE03>	{ [         quotedbl,                3,           numbersign,            dead_tilde ] }; // " 3 # ~
-    key <AE04>	{ [       apostrophe,                4,            braceleft,            underscore ] }; // ' 4 { _
-    key <AE05>	{ [        parenleft,                5,          bracketleft,                 minus ] }; // ( 5 [ -
-    key <AE06>  { [            minus,                6,                  bar,                 minus ] }; // - 6 | -
-    key <AE08>  { [       underscore,                8,            backslash,             backslash ] }; // _ 8 \ \
-    key <AE11>	{ [       parenright,           degree,         bracketright,                 equal ] }; // ) ° ] =
-
-    // Third row
-    key <AC02>	{ [                s,                S,               ssharp,         guillemotleft ] }; // s S ß « 
-    key <AC04>	{ [                f,                F,           apostrophe,            apostrophe ] }; // f F ' '
-    key <AC05>	{ [                g,                G,           apostrophe,                   yen ] }; // g G ' ¥
-    key <AC09>  { [                l,                L,       periodcentered,        periodcentered ] }; // l L · ·
-    key <BKSL>	{ [         asterisk,               mu,           dead_grave,       dead_circumflex ] }; // * µ ` ^ 
-
-    // Fourth row
-    key <LSGT>  { [             less,          greater,                 less,               greater ] }; // < > < >
-    key <AB01>  { [                w,                W,        guillemotleft,         guillemotleft ] }; // w W « «
-    key <AB02>  { [                x,                X,       guillemotright,        guillemotright ] }; // x X » »
-    key <AB04>  { [                v,                V,         nobreakspace,                  less ] }; // v V ⍽ < (espace insécable)
-    key <AB05>  { [                b,                B,                minus,           asciicircum ] }; // b B - ^
-    key <AB06>  { [                n,                N,              notsign,               greater ] }; // n N ¬ >
-    key <AB07>  { [            comma,         question,         questiondown,                period ] }; // , ? ¿ .
-    key <AB08>  { [        semicolon,           period,             multiply,        periodcentered ] }; // ; . × ·
-    key <AB09>  { [            colon,            slash,             division,                 slash ] }; // : / ÷ /
-    key <AB10>  { [           exclam,          section,           exclamdown,                 minus ] }; // ! § ¡ -
-};
-
-partial alphanumeric_keys
-xkb_symbols "oss_Sundeadkeys" {
-
-    // Modifies the basic fr(oss) layout to use the Sun dead keys
-
-    include "fr(oss)"
-
-    // First row
-    key <TLDE>	{ [      twosuperior,    threesuperior,          onesuperior,         SunFA_Cedilla ] }; // ¹ ² ³ ¸ 
-
-    // Second row
-    key <AD11>	{ [     SunFA_Circum,  SunFA_Diaeresis,          SunFA_Tilde,        dead_abovering ] }; // ^ ̈ ̃ ˚
-
-    //Third row
-    key <AC11>	{ [           ugrave,          percent,          SunFA_Acute,                Ugrave ] }; // ù % ' Ù
-    key <BKSL>	{ [         asterisk,               mu,          SunFA_Grave,           dead_macron ] }; // * µ ` ̄
-};
-
-partial alphanumeric_keys
-xkb_symbols "oss_sundeadkeys" {
-
-    include "fr(oss_Sundeadkeys)"
-
-    name[Group1]="France - Alternative, Sun dead keys";
-};
-
-partial alphanumeric_keys
-xkb_symbols "oss_nodeadkeys" {
-
-    // Modifies the basic fr(oss) layout to eliminate all dead keys
-
-    include "fr(oss)"
-
-    name[Group1]="France - Alternative, eliminate dead keys";
-
-    key <TLDE>	{ [      twosuperior,    threesuperior,          onesuperior,               cedilla ] }; // ² ³ ¹ ¸ 
-    key <AE01>	{ [        ampersand,                1,                caron,                ogonek ] }; // & 1 ˇ ̨
-    key <AE03>	{ [         quotedbl,                3,           numbersign,                 breve ] }; // " 3 # ˘
-
-    // Second row
-    key <AD11>	{ [  asciicircum,   diaeresis,           asciitilde,                 Aring ] }; // ^ ̈ ̃ Å
-    key <AC11>	{ [           ugrave,          percent,                acute,                Ugrave ] }; // ù % ' Ù
-    key <BKSL>	{ [         asterisk,               mu,                grave,                macron ] }; // * µ ` ̄
-};
-
-
-// Historic Linux French keyboard layout (fr-latin9)
-// Copyright (c) 199x, 2002 Rene Cougnenc (original work)
-//                          Guylhem Aznar <clavier @ externe.net> (maintainer)
-//                          Nicolas Mailhot <Nicolas.Mailhot @ laposte.net>
-//                              (XFree86 submission)
-//
-//  $XFree86: xc/programs/xkbcomp/symbols/fr-latin9,v 1.1 2002/12/20 02:07:11 dawes Exp $
-//
-// This layout has long been distributed and refined outside official channels.
-// To this day it remains more feature-rich and popular than the 'fr' layout.
-//
-// This file is derived from an original version by Guylhem Aznar.  The
-// original version is always available from:
-// http://en.tldp.org/HOWTO/Francophones-HOWTO.html
-// and is distributed under a GPL license.
-//
-// The author has given permission for this derived version to be distributed
-// under the standard XFree86 license. He would like all changes to this
-// version be send to him at <clavier @ externe.net> so he can sync the
-// identically named linux console map (kbd, linux-console) and this
-// fileout-of-tree GPL version.
-//
-// Now follows the keyboard design description in French.
-// (If you can't read it you probably have no business changing this file anyway:)
-//
-// Les accents circonflexes des principales voyelles sont obtenus avec
-// la touche Alt_Gr, les trémas sont obtenus par Alt_Gr + Shift.
-//
-//  ____                                     _________ _____________ _______
-// | S A| S = Shift,  A = AltGr + Shift     | Imprime | Arrêt défil | Pause |
-// | s a| s = normal, a = AltGr             |  Exec   |             | Halte |
-//  ¯¯¯¯                                     ¯¯¯¯¯¯¯¯¯ ¯¯¯¯¯¯¯¯¯¯¯¯¯ ¯¯¯¯¯¯¯
-//  ____ ____ ____ ____ ____ ____ ____ ____ ____ ____ ____ ____ ____ _______
-// | œ "| 1 ·| 2 É| 3 ,| 4 '| 5 "| 6 || 7 È| 8 ¯| 9 Ç| 0 À| ° ÿ| + °| <--   |
-// | Œ "| & '| é ~| " #| ' {| ( [| - || è `| _ \| ç ^| à @| ) ]| = }|       |
-//  ========================================================================
-// | |<-  | A ä| Z Å| E ¢| R Ç| T Þ| Y Ý| U ü| I ï| O ö| P '| " `| $ ë|   , |
-// |  ->| | a â| z å| e €| r ç| t þ| y ý| u û| i î| o ô| p ¶| ^ ~| £ ê| <-' |
-//  ===================================================================¬    |
-// |       | Q Ä| S Ø| D Ë| F ª| G Æ| H Ð| J Ü| K Ï| L Ö| M º| % Ù| µ ¥|    |
-// | MAJ   | q Â| s ø| d Ê| f ±| g æ| h ð| j Û| k Î| l Ô| m ¹| ù ²| * ³|    |
-//  ========================================================================
-// | ^   | >  | W  | X  | C  | V  | B  | N  | ?  | .  | /  | §  |     ^     |
-// | |   | < || w «| x »| c ©| v ®| b ß| n ¬| , ¿| ; ×| : ÷| ! ¡|     |     |
-//  ========================================================================
-// |      |      |      |                       |       |      |     |      |
-// | Ctrl | Super| Alt  | Space    Nobreakspace | AltGr | Super|Menu | Ctrl |
-//  ¯¯¯¯¯¯ ¯¯¯¯¯¯ ¯¯¯¯¯¯ ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯ ¯¯¯¯¯¯¯ ¯¯¯¯¯¯ ¯¯¯¯¯ ¯¯¯¯¯¯
-//
-//
-//		Si les touches mortes fonctionnent, utiliser les accents dits
-//		« morts », i.e. fonctionnant comme l'accent circonflexe & le
-//		tréma des machines à écrire ; sont disponibles :
-//
-// (^) : accent circonflexe,
-// Shift+(^) : tréma,
-// Shift+AltGr (^) : tilde,
-// AltGr (1) : accent aigu,
-// AltGr (7) : accent grave
-//
-// Pour s'en servir, procéder comme avec l'accent circonflexe & le tréma
-// sur les vielles machines à écrire :
-//
-// AltGr (1) puis e : é
-// Shift+AltGr (1) puis e : É ...
-partial alphanumeric_keys
-
-xkb_symbols "latin9" {
-
-    include "latin"
-    include "nbsp(level3)"
-
-    name[Group1]="France - (Legacy) Alternative";
-
-    key <TLDE>	{ [              oe,              OE, leftdoublequotemark, rightdoublequotemark ] };
-    key <AE01>	{ [       ampersand,               1,          dead_acute,       periodcentered ] };
-    key <AE02>	{ [          eacute,               2,          asciitilde,               Eacute ] };
-    key <AE03>	{ [        quotedbl,               3,          numbersign,              cedilla ] };
-    key <AE04>	{ [      apostrophe,               4,           braceleft,                acute ] };
-    key <AE05>	{ [       parenleft,               5,         bracketleft,            diaeresis ] };
-    key <AE06>	{ [           minus,               6,                 bar,            brokenbar ] };
-    key <AE07>	{ [          egrave,               7,          dead_grave,               Egrave ] };
-    key <AE08>	{ [      underscore,               8,           backslash,               macron ] };
-    key <AE09>	{ [        ccedilla,               9,         asciicircum,             Ccedilla ] };
-    key <AE10>	{ [          agrave,               0,                  at,               Agrave ] };
-    key <AE11>	{ [      parenright,          degree,        bracketright,           ydiaeresis ] };
-    key <AE12>	{ [           equal,            plus,          braceright,       dead_abovering ] };
-
-    key <AD01>	{ [               a,               A,         acircumflex,           adiaeresis ] };
-    key <AD02>	{ [               z,               Z,               aring,                Aring ] };
-    key <AD03>	{ [               e,               E,            EuroSign,                 cent ] };
-    key <AD04>	{ [               r,               R,            ccedilla,             Ccedilla ] };
-    key <AD05>	{ [               t,               T,               thorn,                THORN ] };
-    key <AD06>	{ [               y,               Y,              yacute,               Yacute ] };
-    key <AD07>	{ [               u,               U,         ucircumflex,           udiaeresis ] };
-    key <AD08>	{ [               i,               I,         icircumflex,           idiaeresis ] };
-    key <AD09>	{ [               o,               O,         ocircumflex,           odiaeresis ] };
-    key <AD10>	{ [               p,               P,           paragraph,            quoteleft ] };
-    key <AD11>	{ [ dead_circumflex,  dead_diaeresis,          dead_tilde,           quoteright ] };
-    key <AD12>	{ [          dollar,	    sterling,         ecircumflex,           ediaeresis ] };
-
-    key <AC01>	{ [               q,               Q,         Acircumflex,           Adiaeresis ] };
-    key <AC02>	{ [               s,               S,              oslash,             Ooblique ] };
-    key <AC03>	{ [               d,               D,         Ecircumflex,           Ediaeresis ] };
-    key <AC04>	{ [               f,               F,           plusminus,          ordfeminine ] };
-    key <AC05>	{ [               g,               G,                  ae,                   AE ] };
-    key <AC06>	{ [               h,               H,                 eth,                  ETH ] };
-    key <AC07>	{ [               j,               J,         Ucircumflex,           Udiaeresis ] };
-    key <AC08>	{ [               k,               K,         Icircumflex,           Idiaeresis ] };
-    key <AC09>	{ [               l,               L,         Ocircumflex,           Odiaeresis ] };
-    key <AC10>	{ [               m,               M,         onesuperior,            masculine ] };
-    key <AC11>	{ [          ugrave,         percent,         twosuperior,               Ugrave ] };
-    key <BKSL>  { [        asterisk,              mu,       threesuperior,                  yen ] };
-
-    key <LSGT>	{ [            less,         greater,                 bar                       ] };
-    key <AB01>	{ [               w,               W,       guillemotleft	        	] };
-    key <AB02>	{ [               x,               X,      guillemotright                       ] };
-    key <AB03>	{ [               c,               C,           copyright                       ] };
-    key <AB04>	{ [               v,               V,          registered		        ] };
-    key <AB05>	{ [               b,               B,              ssharp                       ] };
-    key <AB06>	{ [               n,               N,             notsign                       ] };
-    key <AB07>	{ [           comma,        question,        questiondown                       ] };
-    key <AB08>	{ [       semicolon,          period,            multiply		        ] };
-    key <AB09>	{ [           colon,           slash,            division                       ] };
-    key <AB10>	{ [          exclam,         section,          exclamdown                       ] };
-
-    // French uses a comma as decimal separator, but keyboards are labeled with a period
-    // Will take effect when KP_Decimal is mapped to the locale decimal separator
-    key <KPDL>  { [       KP_Delete,      KP_Decimal,           KP_Delete,           KP_Decimal ] };
-
-    include "level3(ralt_switch)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "latin9_Sundeadkeys" {
-
-    // Modifies the basic fr-latin9 layout to use the Sun dead keys
-
-    include "fr(latin9)"
-
-    key <AE01>	{ [       ampersand,               1,         SunFA_Acute,       periodcentered ] };
-    key <AE07>	{ [          egrave,               7,         SunFA_Grave,               Egrave ] };
-    key <AD11>	{ [    SunFA_Circum, SunFA_Diaeresis,         SunFA_Tilde,           quoteright ] };
-
-};
-
-partial alphanumeric_keys
-xkb_symbols "latin9_sundeadkeys" {
-
-    include "fr(latin9_Sundeadkeys)"
-
-    name[Group1]="France - (Legacy) Alternative, Sun dead keys";
-};
-
-partial alphanumeric_keys
-xkb_symbols "latin9_nodeadkeys" {
-
-    // Modifies the basic fr-latin9 layout to eliminate all dead keys
-
-    include "fr(latin9)"
-
-    name[Group1]="France - (Legacy) Alternative, eliminate dead keys";
-
-    key <AE01>	{ [       ampersand,               1,          apostrophe,       periodcentered ] };
-    key <AE07>	{ [          egrave,               7,               grave,               Egrave ] };
-    key <AE12>	{ [           equal,            plus,          braceright         	        ] };
-    key <AD11>	{ [	asciicircum,  	   diaeresis,          asciitilde,           quoteright ] };
-};
-
-// Bépo : Improved ergonomic french keymap using Dvorak method.
-// Built by community on 'Dvorak Fr / Bépo' :
-// see http://www.clavier-dvorak.org/wiki/ to join and help.
-// XOrg integration (1.0rc2 version) in 2008
-// by Frédéric Boiteux <fboiteux at free dot fr>
-//
-// Bépo layout (1.0rc2 version) for a pc105 keyboard (french) :
-// ┌────┐
-// │ S A│   S = Shift,  A = AltGr + Shift
-// │ s a│   s = normal, a = AltGr
-// └────┘
-//
-// ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┲━━━━━━━━━┓
-// │ # ¶ │ 1 „ │ 2 “ │ 3 ” │ 4 ≤ │ 5 ≥ │ 6   │ 7 ¬ │ 8 ¼ │ 9 ½ │ 0 ¾ │ ° ′ │ ` ″ ┃ ⌫ Retour┃
-// │ $ – │ " — │ « < │ » > │ ( [ │ ) ] │ @ ^ │ + ± │ - − │ / ÷ │ * × │ = ≠ │ % ‰ ┃  arrière┃
-// ┢━━━━━┷━┱───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┺━┳━━━━━━━┫
-// ┃       ┃ B ¦ │ É ˝ │ P § │ O Œ │ È ` │ !   │ V   │ D Ð │ L   │ J IJ │ Z Ə │ W   ┃Entrée ┃
-// ┃Tab ↹  ┃ b | │ é ˊ │ p & │ o œ │ è ` │ ˆ ¡ │ v ˇ │ d ð │ l / │ j ij │ z ə │ w ̆ ┃   ⏎   ┃
-// ┣━━━━━━━┻┱────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┺┓      ┃
-// ┃        ┃ A Æ │ U Ù │ I ˙ │ E ¤ │ ; ̛ │ C ſ │ T Þ │ S ẞ │ R ™ │ N   │ M º │ Ç , ┃      ┃
-// ┃Maj ⇬   ┃ a æ │ u ù │ i ̈ │ e € │ , ’ │ c © │ t þ │ s ß │ r ® │ n ˜ │ m ¯ │ ç ¸ ┃      ┃
-// ┣━━━━━━━┳┹────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┲┷━━━━━┻━━━━━━┫
-// ┃       ┃ Ê   │ À   │ Y ‘ │ X ’ │ : · │ K   │ ? ̉ │ Q ̣ │ G   │ H ‡ │ F ª ┃             ┃
-// ┃Shift ⇧┃ ê / │ à \ │ y { │ x } │ . … │ k ~ │ ' ¿ │ q ˚ │ g µ │ h † │ f ˛ ┃Shift ⇧      ┃
-// ┣━━━━━━━╋━━━━━┷━┳━━━┷━━━┱─┴─────┴─────┴─────┴─────┴─────┴───┲━┷━━━━━╈━━━━━┻━┳━━━━━━━┳━━━┛
-// ┃       ┃       ┃       ┃ Espace inséc.   Espace inséc. fin ┃       ┃       ┃       ┃
-// ┃Ctrl   ┃Meta   ┃Alt    ┃ ␣ (Espace)      _               ␣ ┃AltGr ⇮┃Menu   ┃Ctrl   ┃
-// ┗━━━━━━━┻━━━━━━━┻━━━━━━━┹───────────────────────────────────┺━━━━━━━┻━━━━━━━┻━━━━━━━┛
-partial alphanumeric_keys
-xkb_symbols "bepo" {
-
-    include "level3(ralt_switch)"
-    include "keypad(oss)"
-
-    name[Group1]= "France - Bepo, ergonomic, Dvorak way";
-
-    // First row
-    key <TLDE> { [          dollar,   numbersign,        endash,       paragraph ] }; // $ # – ¶
-    key <AE01> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [        quotedbl,            1,         emdash, doublelowquotemark ] }; // " 1 — „
-    key <AE02> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [   guillemotleft,            2,           less,  leftdoublequotemark ] }; // « 2 < “
-    key <AE03> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [  guillemotright,            3,        greater, rightdoublequotemark ] }; // » 3 > ”
-    key <AE04> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [       parenleft,            4,    bracketleft,      lessthanequal ] }; // ( 4 [ ≤
-    key <AE05> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [      parenright,            5,   bracketright,   greaterthanequal ] }; // ) 5 ] ≥
-    key <AE06> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [              at,            6,    asciicircum                 ] }; // @ 6 ^
-    key <AE07> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [            plus,            7,      plusminus,        notsign ] }; // + 7 ± ¬
-    key <AE08> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [           minus,            8,          U2212,     onequarter ] }; // - 8 − ¼
-    key <AE09> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [           slash,            9,       division,        onehalf ] }; // / 9 ÷ ½
-    key <AE10> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [        asterisk,            0,       multiply,  threequarters ] }; // * 0 × ¾
-    key <AE11> { [           equal,       degree,       notequal,        minutes ] }; // = ° ≠ ′
-    key <AE12> { [         percent,        grave,          U2030,        seconds ] }; // % ` ‰ ″
-
-    // Second row
-    key <AD01> { [               b,            B,            bar,      brokenbar ] }; // b B | ¦
-    key <AD02> { [          eacute,       Eacute,     dead_acute, dead_doubleacute ] }; // é É ˊ ˝
-    key <AD03> { [               p,            P,      ampersand,        section ] }; // p P & §
-    key <AD04> { [               o,            O,             oe,             OE ] }; // o O œ Œ
-    key <AD05> { [          egrave,       Egrave,     dead_grave,          grave ] }; // è È ` `
-    key <AD06> { [ dead_circumflex,       exclam,     exclamdown                 ] }; // ^ ! ¡
-    key <AD07> { [               v,            V,     dead_caron                 ] }; // v V ˇ
-    key <AD08> { [               d,            D,            eth,            ETH ] }; // d D ð Ð
-    key <AD09> { [               l,            L,    dead_stroke                 ] }; // l L /
-    key <AD10> { [               j,            J,          U0133,          U0132 ] }; // j J ij IJ
-    key <AD11> { [               z,            Z,          schwa,          SCHWA ] }; // z Z ə Ə
-    key <AD12> { [               w,            W,     dead_breve                 ] }; // w W ̆
-
-    // Third row
-    key <AC01> { [               a,            A,             ae,             AE ] }; // a A æ Æ
-    key <AC02> { [               u,            U,         ugrave,         Ugrave ] }; // u U ù Ù
-    key <AC03> { [               i,            I, dead_diaeresis,  dead_abovedot ] }; // i I ̈ ˙
-    key <AC04> { [               e,            E,       EuroSign,  dead_currency ] }; // e E € ¤
-    key <AC05> { [           comma,    semicolon, rightsinglequotemark, dead_horn ] }; // , ; ’ ̛
-    key <AC06> { [               c,            C,      copyright,          U017F ] }; // c C © ſ
-    key <AC07> { [               t,            T,          thorn,          THORN ] }; // t T þ Þ
-    key <AC08> { [               s,            S,         ssharp,          U1E9E ] }; // s S ß ẞ
-    key <AC09> { [               r,            R,     registered,      trademark ] }; // r R ® ™
-    key <AC10> { [               n,            N,     dead_tilde                 ] }; // n N ~
-    key <AC11> { [               m,            M,    dead_macron,      masculine ] }; // m M ̄ º
-    key <BKSL> { [        ccedilla,     Ccedilla,   dead_cedilla, dead_belowcomma ] }; // ç Ç ¸ ,
-
-    // Fourth row
-    key <LSGT> { [     ecircumflex,  Ecircumflex,          slash                 ] }; // ê Ê /
-    key <AB01> { [          agrave,       Agrave,      backslash                 ] }; // à À \
-    key <AB02> { [               y,            Y,      braceleft, leftsinglequotemark  ] }; // y Y { ‘
-    key <AB03> { [               x,            X,     braceright, rightsinglequotemark ] }; // x X } ’
-    key <AB04> { [          period,        colon,       ellipsis, periodcentered ] }; // . : … ·
-    key <AB05> { [               k,            K,     asciitilde                 ] }; // k K ~
-    key <AB06> { [      apostrophe,     question,   questiondown,      dead_hook ] }; // ' ? ¿ ̉
-    key <AB07> { [               q,            Q, dead_abovering,  dead_belowdot ] }; // q Q ˚ ̣
-    key <AB08> { [               g,            G,             mu                 ] }; // g G µ
-    key <AB09> { [               h,            H,         dagger,   doubledagger ] }; // h H † ‡
-    key <AB10> { [               f,            F,    dead_ogonek,    ordfeminine ] }; // f F ̨ ª
-
-    key <SPCE> { [           space, nobreakspace,     underscore,          U202F ] }; // ␣ (espace insécable) _ (espace insécable fin)
-};
-
-partial alphanumeric_keys
-xkb_symbols "bepo_latin9" {
-
-    // Restricts the fr(bepo) layout to latin9 symbols
-
-    include "fr(bepo)"
-    include "keypad(oss_latin9)"
-
-    name[Group1]="France - Bepo, ergonomic, Dvorak way, latin-9 only";
-
-    key <TLDE> { [          dollar,   numbersign,        dollar,       paragraph ] }; // $ # $ ¶
-
-    key <AE01> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [        quotedbl,            1                                 ] }; // " 1
-    key <AE02> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [   guillemotleft,            2,           less                 ] }; // « 2 <
-    key <AE03> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [  guillemotright,            3,        greater                 ] }; // » 3 >
-    key <AE04> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [       parenleft,            4,    bracketleft                 ] }; // ( 4 [
-    key <AE05> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [      parenright,            5,   bracketright                 ] }; // ) 5 ]
-    key <AE08> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [           minus,            8,          minus,     onequarter ] }; // - 8 - ¼
-    key <AE11> { [           equal,       degree                                 ] }; // = °
-    key <AE12> { [         percent,        grave                                 ] }; // % `
-
-    key <AD01> { [               b,            B,            bar                 ] }; // b B |
-    key <AD02> { [          eacute,       Eacute,     dead_acute                 ] }; // é É ˊ
-    key <AD10> { [               j,            J                                 ] }; // j J
-    key <AD11> { [               z,            Z                                 ] }; // z Z
-    key <AD12> { [               w,            W                                 ] }; // w W
-
-    key <AC03> { [               i,            I, dead_diaeresis                 ] }; // i I ̈
-    key <AC05> { [           comma,    semicolon,          comma,      dead_horn ] }; // , ; , ̛
-    key <AC06> { [               c,            C,      copyright                 ] }; // c C ©
-    key <AC08> { [               s,            S,         ssharp                 ] }; // s S ß
-    key <AC09> { [               r,            R,     registered                 ] }; // r R ®
-    key <AC11> { [               m,            M,         macron,      masculine ] }; // m M ̄ º
-
-    key <AB02> { [               y,            Y,      braceleft                 ] }; // y Y {
-    key <AB03> { [               x,            X,     braceright                 ] }; // x X }
-    key <AB04> { [          period,        colon                                 ] }; // . :
-    key <AB09> { [               h,            H                                 ] }; // h H
-    key <AB10> { [               f,            F,              f,    ordfeminine ] }; // f F   ª
-
-    // Note : on a besoin de redéfinir les niveaux 3 et 4,
-    // donc nbsp(level2) ne suffit pas !
-    key <SPCE> { [           space,  nobreakspace,    underscore,   nobreakspace ] }; // ␣ (espace insécable) _ (espace insécable)
-};
-
-// Author   : Francis Leboutte, http://www.algo.be/ergo/dvorak-fr.html
-//            thanks to Fabien Cazenave for his help
-// Licence  : X11 (the layout itself is released under CC-NC-ND licence)
-// Version  : 0.3
-
-// Base layer + dead AltGr key (`):
-// ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┲━━━━━━━━━━┓
-// │ *   │ 1   │ 2   │ 3   │ 4   │ 5   │ 6   │ 7   │ 8   │ 9   │ 0   │ +   │ %   ┃          ┃
-// │ _   │ =   │ / ± │ - ¼ │ è ½ │ \ ¾ │ ^   │ (   │ ` ` │ )   │ "   │ [   │ ]   ┃ ⌫        ┃
-// ┢━━━━━┷━━┱──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┺━━┳━━━━━━━┫
-// ┃        ┃ ? Æ │ <   │ >   │ G   │ !   │ H   │ V   │ C Ç │ M   │ K   │ Z   │ &   ┃       ┃
-// ┃ ↹      ┃ : æ │ ' $ │ é É │ g € │ . ° │ h   │ v   │ c ç │ m µ │ k   │ z   │ ¨   ┃       ┃
-// ┣━━━━━━━━┻┱────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┺┓  ⏎   ┃
-// ┃         ┃ O Ò │ A À │ U Ù │ E È │ B   │ F   │ S   │ T   │ N   │ D   │ W   │ #   ┃      ┃
-// ┃ ⇬       ┃ o ò │ a à │ u ù │ e è │ b   │ f   │ s « │ t   │ n » │ d   │ w   │ ~   ┃      ┃
-// ┣━━━━━━┳━━┹──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┲━━┷━━━━━┻━━━━━━┫
-// ┃      ┃ ç Ç │ | Œ │ Q   │ @   │ I Ì │ Y   │ X   │ R   │ L   │ P   │ J   ┃               ┃
-// ┃ ⇧    ┃ à À │ ; œ │ q { │ , } │ i ì │ y £ │ x   │ r º │ l   │ p § │ j   ┃ ⇧             ┃
-// ┣━━━━━━┻┳━━━━┷━━┳━━┷━━━━┱┴─────┴─────┴─────┴─────┴─────┴─┲━━━┷━━━┳━┷━━━━━╋━━━━━━━┳━━━━━━━┫
-// ┃       ┃       ┃       ┃ ␣                            ⍽ ┃       ┃       ┃       ┃       ┃
-// ┃ ctrl  ┃ super ┃ alt   ┃ ␣ Espace    Espace insécable ⍽ ┃ alt   ┃ super ┃ menu  ┃ ctrl  ┃
-// ┗━━━━━━━┻━━━━━━━┻━━━━━━━┹────────────────────────────────┺━━━━━━━┻━━━━━━━┻━━━━━━━┻━━━━━━━┛
-
-// Notice the specific Caps_Lock layer:
-// ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┲━━━━━━━━━━┓
-// │ *   │ 1   │ 2   │ 3   │ 4   │ 5   │ 6   │ 7   │ 8   │ 9   │ 0   │ +   │ %   ┃          ┃
-// │     │     │     │     │     │     │     │     │     │     │     │     │     ┃ ⌫        ┃
-// ┢━━━━━┷━━┱──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┺━━┳━━━━━━━┫
-// ┃        ┃     │ <   │ >   │     │     │     │     │     │     │     │     │     ┃       ┃
-// ┃ ↹      ┃     │     │     │     │     │     │     │     │     │     │     │     ┃       ┃
-// ┣━━━━━━━━┻┱────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┺┓  ⏎   ┃
-// ┃         ┃     │     │     │     │     │     │     │     │     │     │     │     ┃      ┃
-// ┃ ⇬       ┃     │     │     │     │     │     │     │     │     │     │     │     ┃      ┃
-// ┣━━━━━━┳━━┹──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┲━━┷━━━━━┻━━━━━━┫
-// ┃      ┃ /   │ -   │     │     │     │     │     │     │     │     │     ┃               ┃
-// ┃ ⇧    ┃     │     │     │     │     │     │     │     │     │     │     ┃ ⇧             ┃
-// ┣━━━━━━┻┳━━━━┷━━┳━━┷━━━━┱┴─────┴─────┴─────┴─────┴─────┴─┲━━━┷━━━┳━┷━━━━━╋━━━━━━━┳━━━━━━━┫
-// ┃       ┃       ┃       ┃ ␣                            ⍽ ┃       ┃       ┃       ┃       ┃
-// ┃ ctrl  ┃ super ┃ alt   ┃ ␣ Espace    Espace insécable ⍽ ┃ alt   ┃ super ┃ menu  ┃ ctrl  ┃
-// ┗━━━━━━━┻━━━━━━━┻━━━━━━━┹────────────────────────────────┺━━━━━━━┻━━━━━━━┻━━━━━━━┻━━━━━━━┛
-
-partial alphanumeric_keys modifier_keys
-xkb_symbols "dvorak" {
-  name[Group1]="France - Dvorak";
-
-  // First row
-  key <TLDE> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [       underscore,   asterisk                  ] };
-  key <AE01> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [            equal,          1                  ] };
-  key <AE02> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [            slash,          2,       plusminus ] };
-  key <AE03> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [            minus,          3,      onequarter ] };
-  key <AE04> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [           egrave,          4,         onehalf ] };
-  key <AE05> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [        backslash,          5,   threequarters ] };
-  key <AE06> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [  dead_circumflex,          6                  ] };
-  key <AE07> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [        parenleft,          7                  ] };
-  key <AE08> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [ ISO_Level3_Latch,          8,           grave ] };
-  key <AE09> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [       parenright,          9                  ] };
-  key <AE10> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [         quotedbl,          0                  ] };
-  key <AE11> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [      bracketleft,       plus                  ] };
-  key <AE12> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [     bracketright,    percent                  ] };
-
-  // Second row
-  key <AD01> { [            colon,         question,              ae,               AE ] };
-  key <AD02> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [       apostrophe,       less,          dollar ] };
-  key <AD03> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [           eacute,    greater,          Eacute ] };
-  key <AD04> { [                g,                G,        EuroSign                   ] };
-  key <AD05> { [           period,           exclam,          degree                   ] };
-  key <AD06> { [                h,                H                                    ] };
-  key <AD07> { [                v,                V                                    ] };
-  key <AD08> { [                c,                C,        ccedilla,         Ccedilla ] };
-  key <AD09> { [                m,                M,              mu                   ] };
-  key <AD10> { [                k,                K                                    ] };
-  key <AD11> { [                z,                Z                                    ] };
-  key <AD12> { [   dead_diaeresis,        ampersand                                    ] };
-
-  // Third row
-  key <AC01> { [                o,                O,          ograve,           Ograve ] };
-  key <AC02> { [                a,                A,          agrave,           Agrave ] };
-  key <AC03> { [                u,                U,          ugrave,           Ugrave ] };
-  key <AC04> { [                e,                E,          egrave,           Egrave ] };
-  key <AC05> { [                b,                B                                    ] };
-  key <AC06> { [                f,                F                                    ] };
-  key <AC07> { [                s,                S,   guillemotleft                   ] };
-  key <AC08> { [                t,                T                                    ] };
-  key <AC09> { [                n,                N,  guillemotright                   ] };
-  key <AC10> { [                d,                D                                    ] };
-  key <AC11> { [                w,                W                                    ] };
-  key <BKSL> { [       asciitilde,       numbersign                                    ] };
-
-  // Fourth row
-  key <LSGT> { type[group1] = "FOUR_LEVEL_PLUS_LOCK", [       agrave, ccedilla,  Agrave, Ccedilla,   slash ] };
-  key <AB01> { type[group1] = "FOUR_LEVEL_PLUS_LOCK", [    semicolon,      bar,      oe,       OE,   minus ] };
-  key <AB02> { [                q,                Q,       braceleft                   ] };
-  key <AB03> { [            comma,               at,      braceright                   ] };
-  key <AB04> { [                i,                I,          igrave,           Igrave ] };
-  key <AB05> { [                y,                Y,        sterling                   ] };
-  key <AB06> { [                x,                X                                    ] };
-  key <AB07> { [                r,                R,       masculine                   ] };
-  key <AB08> { [                l,                L                                    ] };
-  key <AB09> { [                p,                P,         section                   ] };
-  key <AB10> { [                j,                J                                    ] };
-
-  key <SPCE> { [            space,            space,    nobreakspace,     nobreakspace ] };
-};
-
-// C'WHERTY: Breton keyboard. Ar c'hlavier brezhoneg.
-// Copyright © 2009 Dominique Pellé <dominique.pelle@gmail.com>
-// Version: 0.1
-//
-// ┌────┐
-// │ S A│   S = Reol = Shift,  A = ArErl + Pennlizherenn = AltGr + Shift
-// │ s a│   s = normal,        a = AltGr
-// └────┘
-//
-// ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┲━━━━━━━━━┓
-// │ $ Γ │ 1 Δ │ 2 Θ │ 3 Λ │ 4 Ξ │ 5 Π │ 6 Σ │ 7 Φ │ 8 Ψ │ 9 Ç │ 0 Ω │ ° ß │ + ¬ ┃ ⌫ Souzañ┃
-// │ ² ˙ │ & ¯ │ é ´ │ " # │ ' { │ ( [ │ - | │ è ` │ - \ │ ç ± │ à @ │ ) ] │ = } ┃         ┃
-// ┢━━━━━┷━┱───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┺━┳━━━━━━━┫
-// ┃Toalenn┃ C'h │ W ω │ E ε │ R ρ │ T τ │ Y ψ │ U υ │ I ι │ O OE│ P π │ ¨ ¥ │ * £ ┃Enankañ┃
-// ┃     ↹ ┃ c'h │ w   │ e € │ r   │ t   │ y   │ u   │ i ı │ o oe│ p   │ ^ « │ / » ┃   ⏎   ┃
-// ┣━━━━━━━┻┱────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┺┓      ┃
-// ┃Prenn   ┃ A Æ │ S σ │ D δ │ F φ │ G γ │ H η │ J ς │ K κ │ L λ │ M μ │ Ù ® │ ! ¡ ┃      ┃
-// ┃Pennli ⇬┃ a æ │ s   │ d $ │ f   │ g   │ h   │ j   │ k   │ l   │ m   │ ù ŭ │ ? ¿ ┃      ┃
-// ┣━━━━━━━┳┹────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┲┷━━━━━┻━━━━━━┫
-// ┃       ┃ Q θ │ Z ζ │ X ξ │ C χ │ V   │ B β │ N ν │ CH  │ Ñ   │ : © │ ;   ┃             ┃
-// ┃Shift ⇧┃ q < │ z > │ x   │ c ¢ │ v   │ b   │ n   │ ch  │ ñ   │ .   │ ,   ┃Shift ⇧      ┃
-// ┣━━━━━━━╋━━━━━┷━┳━━━┷━━━┱─┴─────┴─────┴─────┴─────┴─────┴───┲━┷━━━━━╈━━━━━┻━┳━━━━━━━┳━━━┛
-// ┃       ┃       ┃       ┃ ⍽ Espace insécable              ␣ ┃       ┃       ┃       ┃
-// ┃Reol   ┃Meta   ┃Erl    ┃ ␣ Espace                        ␣ ┃ArErl ⇮┃Menu   ┃Reol   ┃
-// ┗━━━━━━━┻━━━━━━━┻━━━━━━━┹───────────────────────────────────┺━━━━━━━┻━━━━━━━┻━━━━━━━┛
-partial alphanumeric_keys
-xkb_symbols "bre" {
-
-    include "keypad(oss)"
-
-    name[Group1]= "France - Breton";
-
-    // First row
-    key <TLDE> { [     twosuperior,     dead_tilde,   dead_abovedot,    Greek_GAMMA ] };
-    key <AE01> { [       ampersand,              1,     dead_macron,    Greek_DELTA ] };
-    key <AE02> { [          eacute,              2,      dead_acute,    Greek_THETA ] };
-    key <AE03> { [        quotedbl,              3,      numbersign,    Greek_LAMDA ] };
-    key <AE04> { [      apostrophe,              4,       braceleft,       Greek_XI ] };
-    key <AE05> { [       parenleft,              5,     bracketleft,       Greek_PI ] };
-    key <AE06> { [           minus,              6,             bar,    Greek_SIGMA ] };
-    key <AE07> { [          egrave,              7,      dead_grave,      Greek_PHI ] };
-    key <AE08> { [      underscore,              8,       backslash,      Greek_PSI ] };
-    key <AE09> { [        ccedilla,              9,       plusminus,       Ccedilla ] };
-    key <AE10> { [          agrave,              0,              at,    Greek_OMEGA ] };
-    key <AE11> { [      parenright, dead_abovering,    bracketright,         ssharp ] };
-    key <AE12> { [           equal,           plus,      braceright,        notsign ] };
-
-    // Second row
-    // Handling the C'H key correctly requires an inputmethod (XIM)
-    // See https://bugs.freedesktop.org/show_bug.cgi?id=19506
- // key <AD01> { [    trigraph_c_h,   trigraph_C_h,    trigraph_C_H,    Greek_alpha ] };
-    key <AD01> { [           UF8FD,          UF8FE,           UF8FF,    Greek_alpha ] };
-    key <AD02> { [               w,              W,     Greek_omega,    Greek_omega ] };
-    key <AD03> { [               e,              E,        EuroSign,  Greek_epsilon ] };
-    key <AD04> { [               r,              R,       Greek_rho,      Greek_rho ] };
-    key <AD05> { [               t,              T,       Greek_tau,      Greek_tau ] };
-    key <AD06> { [               y,              Y,       Greek_psi,      Greek_psi ] };
-    key <AD07> { [               u,              U,   Greek_upsilon,  Greek_upsilon ] };
-    key <AD08> { [               i,              I,        idotless,     Greek_iota ] };
-    key <AD09> { [               o,              O,              oe,             OE ] };
-    key <AD10> { [               p,              P,        Greek_pi,       Greek_pi ] };
-    key <AD11> { [ dead_circumflex, dead_diaeresis,   guillemotleft,            yen ] };
-    key <AD12> { [           slash,       asterisk,  guillemotright,       sterling ] };
-
-    // Third row
-    key <AC01> { [               a,              A,              ae,             AE ] };
-    key <AC02> { [               s,              S,     Greek_sigma,    Greek_sigma ] };
-    key <AC03> { [               d,              D,          dollar,    Greek_delta ] };
-    key <AC04> { [               f,              F,       Greek_phi,      Greek_phi ] };
-    key <AC05> { [               g,              G,     Greek_gamma,    Greek_gamma ] };
-    key <AC06> { [               h,              H,       Greek_eta,      Greek_eta ] };
-    key <AC07> { [               j,              J, Greek_finalsmallsigma, Greek_finalsmallsigma ] };
-    key <AC08> { [               k,              K,       Greek_kappa,  Greek_kappa ] };
-    key <AC09> { [               l,              L,       Greek_lamda, Greek_lambda ] };
-    key <AC10> { [               m,              M,          Greek_mu,     Greek_mu ] };
-    key <AC11> { [          ugrave,         Ugrave,            ubreve,   registered ] };
-    key <BKSL> { [        question,         exclam,      questiondown,   exclamdown ] };
-
-    // Fourth row
-    key <LSGT> { [               q,              Q,            less,    Greek_theta ] };
-    key <AB01> { [               z,              Z,         greater,     Greek_zeta ] };
-    key <AB02> { [               x,              X,        Greek_xi,       Greek_xi ] };
-    key <AB03> { [               c,              C,            cent,      Greek_chi ] };
-    key <AB04> { [               v,              V                                  ] };
-    key <AB05> { [               b,              B,      Greek_beta,     Greek_beta ] };
-    key <AB06> { [               n,              N,        Greek_nu,       Greek_nu ] };
-    // Handling the CH key correctly requires an inputmethod (XIM)
-    // See https://bugs.freedesktop.org/show_bug.cgi?id=19506
- // key <AB07> { [      digraph_ch,     digraph_Ch,      digraph_CH,  Greek_omicron ] };
-    key <AB07> { [           UF8FA,          UF8FB,           UF8FC,  Greek_omicron ] };
-    key <AB08> { [          ntilde,         Ntilde                                  ] };
-    key <AB09> { [          period,          colon,         section,      copyright ] };
-    key <AB10> { [           comma,      semicolon,         percent                 ] };
-
-    key <SPCE> { [           space,   nobreakspace,           space,   nobreakspace ] };
-
-    include "level3(ralt_switch)"
-};
-
-// Occitan layout
-// Author : 2009 Thomas Metz <tmetz @ free.fr>
-// Derivated from the layout defined at http://www.panoccitan.org
-// Version: 0.1
-// From OSS french keyboard :
-// - add á, í, ò, ó et ú, Á, Í, Ò, Ó, Ú, ñ, Ñ
-// - change position of æ, ü, î, û, œ, ô, ö, ï, â, ë
-// 
-// ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┲━━━━━━━━━┓
-// │ ³ ¸ │ 1 ̨ │ 2 É │ 3 ˘ │ 4 — │ 5 – │ 6 ‑ │ 7 È │ 8 ™ │ 9 Ç │ 0 À │ ° ≠ │ + ± ┃ ⌫ Retour┃
-// │ ² ¹ │ & ˇ │ é ~ │ " # │ ' { │ ( [ │ - | │ è ` │ _ \ │ ç ^ │ à @ │ ) ] │ = } ┃  arrière┃
-// ┢━━━━━┷━┱───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┺━┳━━━━━━━┫
-// ┃       ┃ A Á │ Z Æ │ E ¢ │ R Ê │ T Ë │ Y Û │ U Ú │ I Í │ O Ó │ P Ò │ ¨ Œ │ £ Ø ┃Entrée ┃
-// ┃Tab ↹  ┃ a á │ z æ │ e € │ r ê │ t ë │ y û │ u ú │ i í │ o ó │ p ò │ ^ œ │ $ ø ┃   ⏎   ┃
-// ┣━━━━━━━┻┱────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┺┓      ┃
-// ┃        ┃ Q Ä │ S „ │ D Â │ F ‚ │ G ¥ │ H Ü │ J Î │ K Ï │ L Ô │ M Ö │ % Ù │ µ ̄ ┃      ┃
-// ┃Maj ⇬   ┃ q ä │ s ß │ d â │ f ‘ │ g ’ │ h ü │ j î │ k ï │ l ô │ m ö │ ù ' │ * ` ┃      ┃
-// ┣━━━━━━━┳┹────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┲┷━━━━━┻━━━━━━┫
-// ┃       ┃ > ≥ │ W “ │ X ” │ C ® │ V ← │ B ↑ │ N Ñ │ ? … │ . . │ / ∕ │ § − ┃             ┃
-// ┃Shift ⇧┃ < ≤ │ w « │ x » │ c © │ v → │ b ↓ │ n ñ │ , ¿ │ ; × │ : ÷ │ ! ¡ ┃Shift ⇧      ┃
-// ┣━━━━━━━╋━━━━━┷━┳━━━┷━━━┱─┴─────┴─────┴─────┴─────┴─────┴───┲━┷━━━━━╈━━━━━┻━┳━━━━━━━┳━━━┛
-// ┃       ┃       ┃       ┃ ␣         Espace fine insécable ⍽ ┃       ┃       ┃       ┃
-// ┃Ctrl   ┃Meta   ┃Alt    ┃ ␣ Espace       Espace insécable ⍽ ┃AltGr ⇮┃Menu   ┃Ctrl   ┃
-// ┗━━━━━━━┻━━━━━━━┻━━━━━━━┹───────────────────────────────────┺━━━━━━━┻━━━━━━━┻━━━━━━━┛
-partial alphanumeric_keys
-xkb_symbols "oci" {
-
-    include "keypad(oss)"
-
-    name[Group1]= "France - Occitan";
-
-    // First row
-    key <TLDE>	{ [      twosuperior,    threesuperior,          onesuperior,          dead_cedilla ] }; // ² ³ ¹ ¸ 
-    key <AE01>	{ [        ampersand,                1,           dead_caron,           dead_ogonek ] }; // & 1 ˇ ̨
-    key <AE02>	{ [           eacute,                2,           asciitilde,                Eacute ] }; // é 2 ~ É
-    key <AE03>	{ [         quotedbl,                3,           numbersign,            dead_breve ] }; // " 3 # ˘
-    key <AE04>	{ [       apostrophe,                4,            braceleft,             0x1002014 ] }; // ' 4 { — (tiret cadratin)
-    key <AE05>	{ [        parenleft,                5,          bracketleft,             0x1002013 ] }; // ( 5 [ – (tiret demi-cadratin)
-    key <AE06>	{ [            minus,                6,                  bar,             0x1002011 ] }; // - 6 | ‑ (tiret insécable)
-    key <AE07>	{ [           egrave,                7,                grave,                Egrave ] }; // è 7 ` È
-    key <AE08>	{ [       underscore,                8,            backslash,             trademark ] }; // _ 8 \ ™
-    key <AE09>	{ [         ccedilla,                9,          asciicircum,              Ccedilla ] }; // ç 9 ^ Ç
-    key <AE10>	{ [           agrave,                0,                   at,                Agrave ] }; // à 0 @ À
-    key <AE11>	{ [       parenright,           degree,         bracketright,              notequal ] }; // ) ° ] ≠ 
-    key <AE12>	{ [            equal,             plus,           braceright,             plusminus ] }; // = + } ±
-
-    // Second row
-    key <AD01>	{ [                a,                A,               aacute,                Aacute ] }; // a A á Á
-    key <AD02>	{ [                z,                Z,                   ae,                    AE ] }; // z Z æ Æ
-    key <AD03>	{ [                e,                E,             EuroSign,                  cent ] }; // e E € ¢
-    key <AD04>	{ [                r,                R,          ecircumflex,           Ecircumflex ] }; // r R ê Ê
-    key <AD05>	{ [                t,                T,           ediaeresis,            Ediaeresis ] }; // t T ë Ë
-    key <AD06>	{ [                y,                Y,          ucircumflex,           Ucircumflex ] }; // y Y û Û
-    key <AD07>	{ [                u,                U,               uacute,                Uacute ] }; // u U ú Ú
-    key <AD08>	{ [                i,                I,               iacute,                Iacute ] }; // i I í Í
-    key <AD09>	{ [                o,                O,               oacute,                Oacute ] }; // o O ó Ó
-    key <AD10>	{ [                p,                P,               ograve,                Ograve ] }; // p P ò Ò
-    key <AD11>	{ [  dead_circumflex,   dead_diaeresis,                   oe,                    OE ] }; // ^ ̈ ̃ œ Œ
-    key <AD12>	{ [           dollar,         sterling,               oslash,              Ooblique ] }; // $ £ ø Ø
-
-    // Third row
-    key <AC01>	{ [                q,                Q,           adiaeresis,            Adiaeresis ] }; // q Q ä Ä
-    key <AC02>	{ [                s,                S,               ssharp,    doublelowquotemark ] }; // s S ß „ 
-    key <AC03>	{ [                d,                D,           acircumflex,          Acircumflex ] }; // d D â Â
-    key <AC04>	{ [                f,                F,  leftsinglequotemark,    singlelowquotemark ] }; // f F ‘ ‚
-    key <AC05>	{ [                g,                G, rightsinglequotemark,                   yen ] }; // g G ’ ¥
-    key <AC06>	{ [                h,                H,           udiaeresis,            Udiaeresis ] }; // h H ü Ü
-    key <AC07>	{ [                j,                J,          icircumflex,            Icircumflex] }; // j J î Î
-    key <AC08>	{ [                k,                K,           idiaeresis,             Idiaeresis] }; // k K ï Ï
-    key <AC09>	{ [                l,                L,          ocircumflex,           Ocircumflex ] }; // l L ô Ô
-    key <AC10>	{ [                m,                M,           odiaeresis,            Odiaeresis ] }; // m M ö Ö
-    key <AC11>	{ [           ugrave,          percent,           dead_acute,                Ugrave ] }; // ù % ' Ù
-    key <BKSL>	{ [         asterisk,               mu,           dead_grave,           dead_macron ] }; // * µ ` ̄
-
-    // Fourth row
-    key <LSGT>  { [             less,          greater,        lessthanequal,      greaterthanequal ] }; // < > ≤ ≥
-    key <AB01>  { [                w,                W,        guillemotleft,   leftdoublequotemark ] }; // w W « “
-    key <AB02>  { [                x,                X,       guillemotright,  rightdoublequotemark ] }; // x X » ”
-    key <AB03>  { [                c,                C,            copyright,            registered ] }; // c C © ®
-    key <AB04>  { [                v,                V,            rightarrow,            leftarrow ] }; // v V → ← 
-    key <AB05>  { [                b,                B,            downarrow,               uparrow ] }; // b B ↓ ↑
-    key <AB06>  { [                n,                N,              ntilde,                 Ntilde ] }; // n N ñ Ñ
-    key <AB07>  { [            comma,         question,         questiondown,             0x1002026 ] }; // , ? ¿ …
-    key <AB08>  { [        semicolon,           period,             multiply,             0x10022C5 ] }; // ; . × ⋅
-    key <AB09>  { [            colon,            slash,             division,             0x1002215 ] }; // : / ÷ ∕
-    key <AB10>  { [           exclam,          section,           exclamdown,             0x1002212 ] }; // ! § ¡ −
-};
-
-// Marc.Shapiro@inria.fr 19-sep-1998
-// modifications : Etienne Herlent <eherlent@linux-france.org> june 2000
-// adapted to the new input layer :
-//        Martin Costabel <costabel@wanadoo.fr> 3-jan-2001
-// adapted for Latin9 alphabet (ISO-8859-15): 
-//        Etienne Herlent <eherlent@linux-france.org> march 2005
-
-// This map is an almost-complete mapping of the standard French
-// MacIntosh keyboard under Xwindows.  I tried to remain as faithful
-// as possible to the Mac meaning of each key.	I did this entirely by
-// hand and by intuition, relying on the Clavier (Keyboard?) Desktop
-// Accessory for the Mac meaning of keys, and on reading keysymdef.h
-// to intuit the corresponding X names.	 Lacking proper documentation,
-// I may have made some mistakes.
-
-// Entries marked CHECK are particularly uncertain
-
-// Entries marked MISSING mark Mac characters for which I was unable
-// to find a corresponding keysym.  (Some for sure don't: e.g. the
-// Apple mark and the oe/OE character; others I may have simply not
-// found.)
-
-// Copied from macintosh_vndr/fr
-partial alphanumeric_keys
-xkb_symbols "mac" {
-
-    name[Group1]= "France - Macintosh";
-
-    // Alphanumeric section
-    key <TLDE> {	[          at,     numbersign, periodcentered,  Ydiaeresis	]	}; // MISSING: Ydiaeresis; eherlent : ok in Latin9
-    key <AE01> {	[   ampersand,    1,   VoidSymbol,    dead_acute	]	}; // MISSING: Apple
-    key <AE02> {	[      eacute,    2,   ediaeresis,        Eacute	]	};
-    key <AE03> {	[    quotedbl,    3,   VoidSymbol,    VoidSymbol	] 	}; // CHECK all quotemarks
-    key <AE04> {	[  apostrophe,    4,   VoidSymbol,    VoidSymbol	] 	};
-    key <AE05> {	[   parenleft,    5,    braceleft,   bracketleft	]	};
- // CHECK section
-    key <AE06> {	[     section,    6,    paragraph,         aring	]	};
-    key <AE07> {	[      egrave,    7, guillemotleft, guillemotright	]	};
-    key <AE08> {	[      exclam,    8,   exclamdown,   Ucircumflex	]	};
-    key <AE09> {	[    ccedilla,    9,     Ccedilla,        Aacute	]	};
-    key <AE10> {	[      agrave,    0,       oslash,    VoidSymbol	]	}; // MISSING: Oslash
-    key <AE11> {	[  parenright, degree, braceright,  bracketright	]	};
-    key <AE12> {	[       minus, underscore, emdash,        endash	]	}; // CHECK dashes
-
-    key <AD01> {	[           a,  A,           ae,          AE	]	};
-    key <AD02> {	[           z,  Z,  Acircumflex,       Aring		]	};
-    key <AD03> {	[           e,  E,  ecircumflex, Ecircumflex	]	};
-    key <AD04> {	[           r,  R,   registered,    currency	]	};
-    key <AD05> {	[           t,  T,   VoidSymbol,  VoidSymbol	]	};
-    key <AD06> {	[           y,  Y,       Uacute,  Ydiaeresis	]	}; // MISSING: Ydiaeresis; eherlent : ok in Latin9
-    key <AD07> {	[           u,  U,   VoidSymbol, ordfeminine	]	}; // MISSING: ordmasculine?
-    key <AD08> {	[           i,  I,  icircumflex,  idiaeresis	]	};
-    key <AD09> {	[           o,  O,           oe,          OE      	]	}; // MISSING: oe, OE lacking in Latin1; eherlent ok in Latin9
-    key <AD10> {	[           p,  P,   VoidSymbol,  VoidSymbol	]	};
-    key <AD11> {	[dead_circumflex,dead_diaeresis, ocircumflex, Ocircumflex	]	};
-    key <AD12> {	[      dollar, asterisk,   EuroSign, yen		]	}; // eherlent : EuroSign in Latin9
-
-    key <AC01> {	[         q, Q, acircumflex,         Agrave		]	};
-    key <AC02> {	[         s, S,      Ograve,     VoidSymbol	]	};
-    key <AC03> {	[         d, D,  VoidSymbol,     VoidSymbol	]	};
-    key <AC04> {	[         f, F,  VoidSymbol, periodcentered	]	}; // MISSING: oblong script f??
-    key <AC05> {	[         g, G,  VoidSymbol,     VoidSymbol	]	}; // MISSING: kerned fi, fl
-    key <AC06> {	[         h, H,      Igrave,    Icircumflex	]	};
-    key <AC07> {	[         j, J,  Idiaeresis,         Iacute	]	};
-    key <AC08> {	[         k, K,      Egrave,     Ediaeresis	]	};
-    key <AC09> {	[         l, L,     notsign,            bar	]	};
-    key <AC10> {	[         m, M,          mu,         Oacute	]	};
-    key <AC11> {	[    ugrave,percent, Ugrave,    ucircumflex	]	}; // MISSING: per-mille
-    key <BKSL> {	[ dead_grave, sterling,  at,     numbersign	]	};
-
-    key <LSGT> {	[      less, greater, VoidSymbol, VoidSymbol	]	};
-    key <AB01> {	[         w, W, VoidSymbol,   VoidSymbol	]	};	// MISSING: half-guillemot (single angle bracket)
-    key <AB02> {	[         x, X, VoidSymbol,   VoidSymbol	]	}; // CHECK similarequal; MISSING: extra-slanted slash
-    key <AB03> {	[         c, C,  copyright,         cent	]	};
-    key <AB04> {	[         v, V,    diamond,  leftradical	]	}; // CHECK diamond, leftradical
-    key <AB05> {	[         b, B,     ssharp,   VoidSymbol	]	}; // CHECK: Greek_beta or ssharp?; MISSING: oblong script s
-    key <AB06> {	[         n, N,  dead_tilde,  asciitilde	]	};
-    key <AB07> {	[     comma,  question, VoidSymbol,  questiondown	]	};
-    key <AB08> {	[ semicolon,  period, VoidSymbol,  periodcentered	]	};
-    key <AB09> {	[     colon,  slash,   division,        backslash	]	};
-    key <AB10> {	[     equal,   plus, VoidSymbol,        plusminus	]	};
-
-    key <SPCE> {	[     space,  space, nobreakspace,   nobreakspace	]	};
-    // End alphanumeric section
-
-    key <KPDL> {	[  comma,KP_Decimal	]	};
-
-    include "level3(ralt_switch)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "geo" {
-    include "ge(basic)"
-
-    name[Group1]= "France - Georgian AZERTY Tskapo";
-
-    key <TLDE> { [ exclam, noSymbol ] };
-    key <AE01> { [ 0x0100201e, 1 ] };
-    key <AE02> { [ 0x01002116, 2 ] };
-    key <AE03> { [ percent, 3    ] };
-    key <AE04> { [ parenleft, 4  ] };
-    key <AE05> { [ colon, 5      ] };
-    key <AE06> { [ semicolon, 6  ] };
-    key <AE07> { [ question, 7   ] };
-    key <AE08> { [ 0x01002116, 8 ] };
-    key <AE09> { [ degree, 9     ] };
-    key <AE10> { [ parenright, 0 ] };
-    key <AE11> { [ minus, underscore, 0x01002014 ] };
-    key <AE12> { [ less, greater ] };
-
-    key <AD01> { [ 0x010010d0,  0x010010fa     ] };
-    key <AD02> { [ 0x010010d6,  Z              ] };
-    key <AD03> { [ 0x010010d4,  E, 0x010010f1  ] };
-    key <AD04> { [ 0x010010e0,  0x010000ae     ] };
-    key <AD05> { [ 0x010010e2,  T              ] };
-    key <AD06> { [ 0x010010e7,  0x010010f8     ] };
-    key <AD07> { [ 0x010010e3,  U              ] };
-    key <AD08> { [ 0x010010d8,  0x010010f2     ] };
-    key <AD09> { [ 0x010010dd,  O              ] };
-    key <AD10> { [ 0x010010de,  P              ] };
-    key <AD11> { [ 0x010010d7,  T              ] };
-    key <AD12> { [ 0x010010eb,  Z              ] };
-
-    key <AC01> { [ 0x010010e5,  Q              ] };
-    key <AC02> { [ 0x010010e1,  S              ] };
-    key <AC03> { [ 0x010010d3,  D              ] };
-    key <AC04> { [ 0x010010e4,  0x010010f6     ] };
-    key <AC05> { [ 0x010010d2,  0x010010f9     ] };
-    key <AC06> { [ 0x010010f0,  0x010010f5     ] };
-    key <AC07> { [ 0x010010ef,  0x010010f7     ] };
-    key <AC08> { [ 0x010010d9,  K              ] };
-    key <AC09> { [ 0x010010da,  L              ] };
-    key <AC10> { [ 0x010010db,  M              ] };
-    key <AC11> { [ 0x010010df,  J              ] };
-    key <BKSL> { [ 0x010010e9,  0x010000a9     ] };
-
-    key <LSGT> { [ guillemotleft,guillemotright ] };
-    key <AB01> { [ 0x010010ec,  W               ] };
-    key <AB02> { [ 0x010010ee,  0x010010f4      ] };
-    key <AB03> { [ 0x010010ea,  0x010000a9      ] };
-    key <AB04> { [ 0x010010d5,  0x010010f3      ] };
-    key <AB05> { [ 0x010010d1,  B               ] };
-    key <AB06> { [ 0x010010dc,  0x010010fc      ] };
-    key <AB07> { [ comma,       0x01002014      ] };
-    key <AB08> { [ 0x010010e8,  S               ] };
-    key <AB09> { [ 0x010010e6,  noSymbol        ] };
-    key <AB10> { [ 0x010010ed,  noSymbol        ] };
-
-};
-
+// $XKeyboardConfig$

+

+// based on a keyboard map from an 'xkb/symbols/fr' file

+//

+// $XFree86: xc/programs/xkbcomp/symbols/fr,v 1.2 2002/11/22 04:03:28 dawes Exp $

+

+partial default alphanumeric_keys

+xkb_symbols "basic" {

+

+    include "latin"

+

+    name[Group1]="France";

+

+    key <AE01>	{ [ ampersand,          1,  onesuperior,   exclamdown ]	};

+    key <AE02>	{ [    eacute,          2,   asciitilde,    oneeighth ]	};

+    key <AE03>	{ [  quotedbl,          3,   numbersign,     sterling ]	};

+    key <AE04>	{ [apostrophe,          4,    braceleft,       dollar ]	};

+    key <AE05>	{ [ parenleft,          5,  bracketleft, threeeighths ]	};

+    key <AE06>	{ [     minus,          6,          bar,  fiveeighths ]	};

+    key <AE07>	{ [    egrave,          7,        grave, seveneighths ]	};

+    key <AE08>	{ [underscore,          8,    backslash,    trademark ]	};

+    key <AE09>	{ [  ccedilla,          9,  asciicircum,    plusminus ]	};

+    key <AE10>	{ [    agrave,          0,           at,       degree ]	};

+    key <AE11>	{ [parenright,     degree, bracketright, questiondown ]	};

+    key <AE12>	{ [     equal,       plus,   braceright,  dead_ogonek ]	};

+

+    key <AD01>	{ [         a,          A,           ae,           AE ]	};

+    key <AD02>	{ [         z,          Z, guillemotleft,        less ]	};

+    key <AD03>	{ [         e,          E,     EuroSign,         cent ]	};

+    key <AD11>	{ [dead_circumflex, dead_diaeresis, dead_diaeresis, dead_abovering ] };

+    key <AD12>	{ [    dollar,   sterling,     currency,  dead_macron ]	};

+

+    key <AC01>	{ [         q,          Q,           at,  Greek_OMEGA ]	};

+    key <AC10>	{ [         m,          M,           mu,    masculine ]	};

+    key <AC11>	{ [    ugrave,    percent, dead_circumflex, dead_caron]	};

+    key <TLDE>	{ [twosuperior, asciitilde,     notsign,      notsign ]	};

+

+    key <BKSL>	{ [  asterisk,         mu,   dead_grave,   dead_breve ]	};

+    key <AB01>	{ [         w,          W,      lstroke,      Lstroke ]	};

+    key <AB07>	{ [     comma,   question,   dead_acute, dead_doubleacute ] };

+    key <AB08>	{ [ semicolon,     period, horizconnector,   multiply ]	};

+    key <AB09>	{ [     colon,      slash, periodcentered,   division ]	};

+    key <AB10>	{ [    exclam,    section, dead_belowdot, dead_abovedot ] };

+

+    include "level3(ralt_switch)"

+};

+

+partial alphanumeric_keys

+xkb_symbols "olpc" {

+    // Contact: Sayamindu Dasgupta <sayamindu@laptop.org>

+    include "fr(basic)"

+

+    name[Group1]="France - OLPC";

+

+    key <AD02>	{ [ z,  Z,  VoidSymbol, guillemotleft ]	};

+

+    key <AC02>	{ [ s,  S,  VoidSymbol, ssharp ] };

+

+    key <AB02>	{ [  x,  X,  VoidSymbol,     guillemotright ] };

+

+    key <I219>  { [ less, greater ] };

+};

+

+partial alphanumeric_keys

+xkb_symbols "Sundeadkeys" {

+

+    // Modifies the basic French layout to use the Sun dead keys

+

+    include "fr(basic)"

+

+    key <AD11>	{ [dead_circumflex, dead_diaeresis ]	};

+    key <AB07>	{ [comma,   question,  dead_acute, dead_doubleacute ]	};

+};

+

+partial alphanumeric_keys

+xkb_symbols "sundeadkeys" {

+    include "fr(Sundeadkeys)"

+

+    name[Group1]="France - Sun dead keys";

+};

+

+partial alphanumeric_keys

+xkb_symbols "nodeadkeys" {

+

+    // Modifies the basic French layout to eliminate all dead keys

+

+    include "fr(basic)"

+

+    name[Group1]="France - Eliminate dead keys";

+

+    key <AE12>	{ [     equal,       plus,   braceright,       ogonek ]	};

+    key <AD11>	{ [asciicircum,  diaeresis ]	};

+    key <AD12>	{ [    dollar,   sterling,     currency,       macron ]	};

+    key <AC11>	{ [    ugrave,    percent,  asciicircum,        caron ]	};

+    key <BKSL>	{ [  asterisk,         mu,        grave,        breve ]	};

+    key <AB07>	{ [     comma,   question,        acute,  doubleacute ]	};

+    key <AB10>	{ [    exclam,    section, dead_belowdot,    abovedot ]	};

+};

+

+

+// Unicode French derivative

+// Loose refactoring of the historic Linux French keyboard layout

+//

+// Copyright © 2006-2008 Nicolas Mailhot <nicolas.mailhot @ laposte.net>

+//

+// Credits (fr-latin1, fr-latin0, fr-latin9)

+//   © 199x-1996 René Cougnenc ✝

+//   © 1997-2002 Guylhem Aznar <clavier @ externe.net>

+//   © 2003-2006 Nicolas Mailhot <nicolas.mailhot @ laposte.net>

+//

+// ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┲━━━━━━━━━┓

+// │ ³ ¸ │ 1 ̨ │ 2 É │ 3 ˘ │ 4 — │ 5 – │ 6 ‑ │ 7 È │ 8 ™ │ 9 Ç │ 0 À │ ° ≠ │ + ± ┃ ⌫ Retour┃

+// │ ² ¹ │ & ˇ │ é ~ │ " # │ ' { │ ( [ │ - | │ è ` │ _ \ │ ç ^ │ à @ │ ) ] │ = } ┃  arrière┃

+// ┢━━━━━┷━┱───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┺━┳━━━━━━━┫

+// ┃       ┃ A Æ │ Z  │ E ¢ │ R Ê │ T Þ │ Y Ÿ │ U Û │ I Î │ O Œ │ P Ô │ ¨ ˚ │ £ Ø ┃Entrée ┃

+// ┃Tab ↹  ┃ a æ │ z â │ e € │ r ê │ t þ │ y ÿ │ u û │ i î │ o œ │ p ô │ ^ ~ │ $ ø ┃   ⏎   ┃

+// ┣━━━━━━━┻┱────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┺┓      ┃

+// ┃        ┃ Q Ä │ S „ │ D Ë │ F ‚ │ G ¥ │ H Ð │ J Ü │ K Ï │ L Ŀ │ M Ö │ % Ù │ µ ̄ ┃      ┃

+// ┃Maj ⇬   ┃ q ä │ s ß │ d ë │ f ‘ │ g ’ │ h ð │ j ü │ k ï │ l ŀ │ m ö │ ù ' │ * ` ┃      ┃

+// ┣━━━━━━━┳┹────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┲┷━━━━━┻━━━━━━┫

+// ┃       ┃ > ≥ │ W “ │ X ” │ C ® │ V ← │ B ↑ │ N → │ ? … │ . . │ / ∕ │ § − ┃             ┃

+// ┃Shift ⇧┃ < ≤ │ w « │ x » │ c © │ v ⍽ │ b ↓ │ n ¬ │ , ¿ │ ; × │ : ÷ │ ! ¡ ┃Shift ⇧      ┃

+// ┣━━━━━━━╋━━━━━┷━┳━━━┷━━━┱─┴─────┴─────┴─────┴─────┴─────┴───┲━┷━━━━━╈━━━━━┻━┳━━━━━━━┳━━━┛

+// ┃       ┃       ┃       ┃ ␣         Espace fine insécable ⍽ ┃       ┃       ┃       ┃

+// ┃Ctrl   ┃Meta   ┃Alt    ┃ ␣ Espace       Espace insécable ⍽ ┃AltGr ⇮┃Menu   ┃Ctrl   ┃

+// ┗━━━━━━━┻━━━━━━━┻━━━━━━━┹───────────────────────────────────┺━━━━━━━┻━━━━━━━┻━━━━━━━┛

+partial alphanumeric_keys

+xkb_symbols "oss" {

+

+    include "latin"

+    include "level3(ralt_switch)"

+    include "nbsp(level4nl)"

+    include "keypad(oss)"

+

+    name[Group1]="France - Alternative";

+

+    // First row

+    key <TLDE>	{ [      twosuperior,    threesuperior,          onesuperior,          dead_cedilla ] }; // ² ³ ¹ ¸ 

+    key <AE01>	{ [        ampersand,                1,           dead_caron,           dead_ogonek ] }; // & 1 ˇ ̨

+    key <AE02>	{ [           eacute,                2,           asciitilde,                Eacute ] }; // é 2 ~ É

+    key <AE03>	{ [         quotedbl,                3,           numbersign,            dead_breve ] }; // " 3 # ˘

+    key <AE04>	{ [       apostrophe,                4,            braceleft,             0x1002014 ] }; // ' 4 { — (tiret cadratin)

+    key <AE05>	{ [        parenleft,                5,          bracketleft,             0x1002013 ] }; // ( 5 [ – (tiret demi-cadratin)

+    key <AE06>	{ [            minus,                6,                  bar,             0x1002011 ] }; // - 6 | ‑ (tiret insécable)

+    key <AE07>	{ [           egrave,                7,                grave,                Egrave ] }; // è 7 ` È

+    key <AE08>	{ [       underscore,                8,            backslash,             trademark ] }; // _ 8 \ ™

+    key <AE09>	{ [         ccedilla,                9,          asciicircum,              Ccedilla ] }; // ç 9 ^ Ç

+    key <AE10>	{ [           agrave,                0,                   at,                Agrave ] }; // à 0 @ À

+    key <AE11>	{ [       parenright,           degree,         bracketright,              notequal ] }; // ) ° ] ≠ 

+    key <AE12>	{ [            equal,             plus,           braceright,             plusminus ] }; // = + } ±

+

+    // Second row

+    key <AD01>	{ [                a,                A,                   ae,                    AE ] }; // a A æ Æ

+    key <AD02>	{ [                z,                Z,          acircumflex,           Acircumflex ] }; // z Z â Â

+    key <AD03>	{ [                e,                E,             EuroSign,                  cent ] }; // e E € ¢

+    key <AD04>	{ [                r,                R,          ecircumflex,           Ecircumflex ] }; // r R ê Ê

+    key <AD05>	{ [                t,                T,                thorn,                 THORN ] }; // t T þ Þ

+    key <AD06>	{ [                y,                Y,           ydiaeresis,            Ydiaeresis ] }; // y Y ÿ Ÿ

+    key <AD07>	{ [                u,                U,          ucircumflex,           Ucircumflex ] }; // u U û Û

+    key <AD08>	{ [                i,                I,          icircumflex,           Icircumflex ] }; // i I î Î

+    key <AD09>	{ [                o,                O,                   oe,                    OE ] }; // o O œ Œ

+    key <AD10>	{ [                p,                P,          ocircumflex,           Ocircumflex ] }; // p P ô Ô

+    key <AD11>	{ [  dead_circumflex,   dead_diaeresis,           dead_tilde,        dead_abovering ] }; // ^ ̈ ̃ ˚

+    key <AD12>	{ [           dollar,         sterling,               oslash,              Ooblique ] }; // $ £ ø Ø

+

+    // Third row

+    key <AC01>	{ [                q,                Q,           adiaeresis,            Adiaeresis ] }; // q Q ä Ä

+    key <AC02>	{ [                s,                S,               ssharp,    doublelowquotemark ] }; // s S ß „ 

+    key <AC03>	{ [                d,                D,           ediaeresis,            Ediaeresis ] }; // d D ë Ë

+    key <AC04>	{ [                f,                F,  leftsinglequotemark,    singlelowquotemark ] }; // f F ‘ ‚

+    key <AC05>	{ [                g,                G, rightsinglequotemark,                   yen ] }; // g G ’ ¥

+    key <AC06>	{ [                h,                H,                  eth,                   ETH ] }; // h H ð Ð

+    key <AC07>	{ [                j,                J,           udiaeresis,            Udiaeresis ] }; // j J ü Ü

+    key <AC08>	{ [                k,                K,           idiaeresis,            Idiaeresis ] }; // k K ï Ï

+    key <AC09>	{ [                l,                L,            0x1000140,             0x100013F ] }; // l L ŀ Ŀ

+    key <AC10>	{ [                m,                M,           odiaeresis,            Odiaeresis ] }; // m M ö Ö

+    key <AC11>	{ [           ugrave,          percent,           dead_acute,                Ugrave ] }; // ù % ' Ù

+    key <BKSL>	{ [         asterisk,               mu,           dead_grave,           dead_macron ] }; // * µ ` ̄

+

+    // Fourth row

+    key <LSGT>  { [             less,          greater,        lessthanequal,      greaterthanequal ] }; // < > ≤ ≥

+    key <AB01>  { [                w,                W,        guillemotleft,   leftdoublequotemark ] }; // w W « “

+    key <AB02>  { [                x,                X,       guillemotright,  rightdoublequotemark ] }; // x X » ”

+    key <AB03>  { [                c,                C,            copyright,            registered ] }; // c C © ®

+    key <AB04>  { [                v,                V,            0x100202F,             leftarrow ] }; // v V ⍽ ← (espace fine insécable)

+    key <AB05>  { [                b,                B,            downarrow,               uparrow ] }; // b B ↓ ↑

+    key <AB06>  { [                n,                N,              notsign,            rightarrow ] }; // n N ¬ →

+    key <AB07>  { [            comma,         question,         questiondown,             0x1002026 ] }; // , ? ¿ …

+    key <AB08>  { [        semicolon,           period,             multiply,             0x10022C5 ] }; // ; . × ⋅

+    key <AB09>  { [            colon,            slash,             division,             0x1002215 ] }; // : / ÷ ∕

+    key <AB10>  { [           exclam,          section,           exclamdown,             0x1002212 ] }; // ! § ¡ −

+};

+

+partial alphanumeric_keys

+xkb_symbols "oss_latin9" {

+

+    // Restricts the fr(oss) layout to latin9 symbols

+

+    include "fr(oss)"

+    include "keypad(oss_latin9)"

+

+    name[Group1]="France - Alternative, latin-9 only";

+

+    // First row

+    key <AE01>	{ [        ampersand,                1,           dead_caron,          dead_cedilla ] }; // & 1 ˇ ¸

+    key <AE03>	{ [         quotedbl,                3,           numbersign,            dead_tilde ] }; // " 3 # ~

+    key <AE04>	{ [       apostrophe,                4,            braceleft,            underscore ] }; // ' 4 { _

+    key <AE05>	{ [        parenleft,                5,          bracketleft,                 minus ] }; // ( 5 [ -

+    key <AE06>  { [            minus,                6,                  bar,                 minus ] }; // - 6 | -

+    key <AE08>  { [       underscore,                8,            backslash,             backslash ] }; // _ 8 \ \

+    key <AE11>	{ [       parenright,           degree,         bracketright,                 equal ] }; // ) ° ] =

+

+    // Third row

+    key <AC02>	{ [                s,                S,               ssharp,         guillemotleft ] }; // s S ß « 

+    key <AC04>	{ [                f,                F,           apostrophe,            apostrophe ] }; // f F ' '

+    key <AC05>	{ [                g,                G,           apostrophe,                   yen ] }; // g G ' ¥

+    key <AC09>  { [                l,                L,       periodcentered,        periodcentered ] }; // l L · ·

+    key <BKSL>	{ [         asterisk,               mu,           dead_grave,       dead_circumflex ] }; // * µ ` ^ 

+

+    // Fourth row

+    key <LSGT>  { [             less,          greater,                 less,               greater ] }; // < > < >

+    key <AB01>  { [                w,                W,        guillemotleft,         guillemotleft ] }; // w W « «

+    key <AB02>  { [                x,                X,       guillemotright,        guillemotright ] }; // x X » »

+    key <AB04>  { [                v,                V,         nobreakspace,                  less ] }; // v V ⍽ < (espace insécable)

+    key <AB05>  { [                b,                B,                minus,           asciicircum ] }; // b B - ^

+    key <AB06>  { [                n,                N,              notsign,               greater ] }; // n N ¬ >

+    key <AB07>  { [            comma,         question,         questiondown,                period ] }; // , ? ¿ .

+    key <AB08>  { [        semicolon,           period,             multiply,        periodcentered ] }; // ; . × ·

+    key <AB09>  { [            colon,            slash,             division,                 slash ] }; // : / ÷ /

+    key <AB10>  { [           exclam,          section,           exclamdown,                 minus ] }; // ! § ¡ -

+};

+

+partial alphanumeric_keys

+xkb_symbols "oss_Sundeadkeys" {

+

+    // Modifies the basic fr(oss) layout to use the Sun dead keys

+

+    include "fr(oss)"

+

+    // First row

+    key <TLDE>	{ [      twosuperior,    threesuperior,          onesuperior,         dead_cedilla ] }; // ¹ ² ³ ¸ 

+

+    // Second row

+    key <AD11>	{ [     dead_circumflex,  dead_diaeresis,          dead_tilde,        dead_abovering ] }; // ^ ̈ ̃ ˚

+

+    //Third row

+    key <AC11>	{ [           ugrave,          percent,          dead_acute,                Ugrave ] }; // ù % ' Ù

+    key <BKSL>	{ [         asterisk,               mu,          dead_grave,           dead_macron ] }; // * µ ` ̄

+};

+

+partial alphanumeric_keys

+xkb_symbols "oss_sundeadkeys" {

+

+    include "fr(oss_Sundeadkeys)"

+

+    name[Group1]="France - Alternative, Sun dead keys";

+};

+

+partial alphanumeric_keys

+xkb_symbols "oss_nodeadkeys" {

+

+    // Modifies the basic fr(oss) layout to eliminate all dead keys

+

+    include "fr(oss)"

+

+    name[Group1]="France - Alternative, eliminate dead keys";

+

+    key <TLDE>	{ [      twosuperior,    threesuperior,          onesuperior,               cedilla ] }; // ² ³ ¹ ¸ 

+    key <AE01>	{ [        ampersand,                1,                caron,                ogonek ] }; // & 1 ˇ ̨

+    key <AE03>	{ [         quotedbl,                3,           numbersign,                 breve ] }; // " 3 # ˘

+

+    // Second row

+    key <AD11>	{ [  asciicircum,   diaeresis,           asciitilde,                 Aring ] }; // ^ ̈ ̃ Å

+    key <AC11>	{ [           ugrave,          percent,                acute,                Ugrave ] }; // ù % ' Ù

+    key <BKSL>	{ [         asterisk,               mu,                grave,                macron ] }; // * µ ` ̄

+};

+

+

+// Historic Linux French keyboard layout (fr-latin9)

+// Copyright (c) 199x, 2002 Rene Cougnenc (original work)

+//                          Guylhem Aznar <clavier @ externe.net> (maintainer)

+//                          Nicolas Mailhot <Nicolas.Mailhot @ laposte.net>

+//                              (XFree86 submission)

+//

+//  $XFree86: xc/programs/xkbcomp/symbols/fr-latin9,v 1.1 2002/12/20 02:07:11 dawes Exp $

+//

+// This layout has long been distributed and refined outside official channels.

+// To this day it remains more feature-rich and popular than the 'fr' layout.

+//

+// This file is derived from an original version by Guylhem Aznar.  The

+// original version is always available from:

+// http://en.tldp.org/HOWTO/Francophones-HOWTO.html

+// and is distributed under a GPL license.

+//

+// The author has given permission for this derived version to be distributed

+// under the standard XFree86 license. He would like all changes to this

+// version be send to him at <clavier @ externe.net> so he can sync the

+// identically named linux console map (kbd, linux-console) and this

+// fileout-of-tree GPL version.

+//

+// Now follows the keyboard design description in French.

+// (If you can't read it you probably have no business changing this file anyway:)

+//

+// Les accents circonflexes des principales voyelles sont obtenus avec

+// la touche Alt_Gr, les trémas sont obtenus par Alt_Gr + Shift.

+//

+//  ____                                     _________ _____________ _______

+// | S A| S = Shift,  A = AltGr + Shift     | Imprime | Arrêt défil | Pause |

+// | s a| s = normal, a = AltGr             |  Exec   |             | Halte |

+//  ¯¯¯¯                                     ¯¯¯¯¯¯¯¯¯ ¯¯¯¯¯¯¯¯¯¯¯¯¯ ¯¯¯¯¯¯¯

+//  ____ ____ ____ ____ ____ ____ ____ ____ ____ ____ ____ ____ ____ _______

+// | œ "| 1 ·| 2 É| 3 ,| 4 '| 5 "| 6 || 7 È| 8 ¯| 9 Ç| 0 À| ° ÿ| + °| <--   |

+// | Œ "| & '| é ~| " #| ' {| ( [| - || è `| _ \| ç ^| à @| ) ]| = }|       |

+//  ========================================================================

+// | |<-  | A ä| Z Å| E ¢| R Ç| T Þ| Y Ý| U ü| I ï| O ö| P '| " `| $ ë|   , |

+// |  ->| | a â| z å| e €| r ç| t þ| y ý| u û| i î| o ô| p ¶| ^ ~| £ ê| <-' |

+//  ===================================================================¬    |

+// |       | Q Ä| S Ø| D Ë| F ª| G Æ| H Ð| J Ü| K Ï| L Ö| M º| % Ù| µ ¥|    |

+// | MAJ   | q Â| s ø| d Ê| f ±| g æ| h ð| j Û| k Î| l Ô| m ¹| ù ²| * ³|    |

+//  ========================================================================

+// | ^   | >  | W  | X  | C  | V  | B  | N  | ?  | .  | /  | §  |     ^     |

+// | |   | < || w «| x »| c ©| v ®| b ß| n ¬| , ¿| ; ×| : ÷| ! ¡|     |     |

+//  ========================================================================

+// |      |      |      |                       |       |      |     |      |

+// | Ctrl | Super| Alt  | Space    Nobreakspace | AltGr | Super|Menu | Ctrl |

+//  ¯¯¯¯¯¯ ¯¯¯¯¯¯ ¯¯¯¯¯¯ ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯ ¯¯¯¯¯¯¯ ¯¯¯¯¯¯ ¯¯¯¯¯ ¯¯¯¯¯¯

+//

+//

+//		Si les touches mortes fonctionnent, utiliser les accents dits

+//		« morts », i.e. fonctionnant comme l'accent circonflexe & le

+//		tréma des machines à écrire ; sont disponibles :

+//

+// (^) : accent circonflexe,

+// Shift+(^) : tréma,

+// Shift+AltGr (^) : tilde,

+// AltGr (1) : accent aigu,

+// AltGr (7) : accent grave

+//

+// Pour s'en servir, procéder comme avec l'accent circonflexe & le tréma

+// sur les vielles machines à écrire :

+//

+// AltGr (1) puis e : é

+// Shift+AltGr (1) puis e : É ...

+partial alphanumeric_keys

+

+xkb_symbols "latin9" {

+

+    include "latin"

+    include "nbsp(level3)"

+

+    name[Group1]="France - (Legacy) Alternative";

+

+    key <TLDE>	{ [              oe,              OE, leftdoublequotemark, rightdoublequotemark ] };

+    key <AE01>	{ [       ampersand,               1,          dead_acute,       periodcentered ] };

+    key <AE02>	{ [          eacute,               2,          asciitilde,               Eacute ] };

+    key <AE03>	{ [        quotedbl,               3,          numbersign,              cedilla ] };

+    key <AE04>	{ [      apostrophe,               4,           braceleft,                acute ] };

+    key <AE05>	{ [       parenleft,               5,         bracketleft,            diaeresis ] };

+    key <AE06>	{ [           minus,               6,                 bar,            brokenbar ] };

+    key <AE07>	{ [          egrave,               7,          dead_grave,               Egrave ] };

+    key <AE08>	{ [      underscore,               8,           backslash,               macron ] };

+    key <AE09>	{ [        ccedilla,               9,         asciicircum,             Ccedilla ] };

+    key <AE10>	{ [          agrave,               0,                  at,               Agrave ] };

+    key <AE11>	{ [      parenright,          degree,        bracketright,           ydiaeresis ] };

+    key <AE12>	{ [           equal,            plus,          braceright,       dead_abovering ] };

+

+    key <AD01>	{ [               a,               A,         acircumflex,           adiaeresis ] };

+    key <AD02>	{ [               z,               Z,               aring,                Aring ] };

+    key <AD03>	{ [               e,               E,            EuroSign,                 cent ] };

+    key <AD04>	{ [               r,               R,            ccedilla,             Ccedilla ] };

+    key <AD05>	{ [               t,               T,               thorn,                THORN ] };

+    key <AD06>	{ [               y,               Y,              yacute,               Yacute ] };

+    key <AD07>	{ [               u,               U,         ucircumflex,           udiaeresis ] };

+    key <AD08>	{ [               i,               I,         icircumflex,           idiaeresis ] };

+    key <AD09>	{ [               o,               O,         ocircumflex,           odiaeresis ] };

+    key <AD10>	{ [               p,               P,           paragraph,            quoteleft ] };

+    key <AD11>	{ [ dead_circumflex,  dead_diaeresis,          dead_tilde,           quoteright ] };

+    key <AD12>	{ [          dollar,	    sterling,         ecircumflex,           ediaeresis ] };

+

+    key <AC01>	{ [               q,               Q,         Acircumflex,           Adiaeresis ] };

+    key <AC02>	{ [               s,               S,              oslash,             Ooblique ] };

+    key <AC03>	{ [               d,               D,         Ecircumflex,           Ediaeresis ] };

+    key <AC04>	{ [               f,               F,           plusminus,          ordfeminine ] };

+    key <AC05>	{ [               g,               G,                  ae,                   AE ] };

+    key <AC06>	{ [               h,               H,                 eth,                  ETH ] };

+    key <AC07>	{ [               j,               J,         Ucircumflex,           Udiaeresis ] };

+    key <AC08>	{ [               k,               K,         Icircumflex,           Idiaeresis ] };

+    key <AC09>	{ [               l,               L,         Ocircumflex,           Odiaeresis ] };

+    key <AC10>	{ [               m,               M,         onesuperior,            masculine ] };

+    key <AC11>	{ [          ugrave,         percent,         twosuperior,               Ugrave ] };

+    key <BKSL>  { [        asterisk,              mu,       threesuperior,                  yen ] };

+

+    key <LSGT>	{ [            less,         greater,                 bar                       ] };

+    key <AB01>	{ [               w,               W,       guillemotleft	        	] };

+    key <AB02>	{ [               x,               X,      guillemotright                       ] };

+    key <AB03>	{ [               c,               C,           copyright                       ] };

+    key <AB04>	{ [               v,               V,          registered		        ] };

+    key <AB05>	{ [               b,               B,              ssharp                       ] };

+    key <AB06>	{ [               n,               N,             notsign                       ] };

+    key <AB07>	{ [           comma,        question,        questiondown                       ] };

+    key <AB08>	{ [       semicolon,          period,            multiply		        ] };

+    key <AB09>	{ [           colon,           slash,            division                       ] };

+    key <AB10>	{ [          exclam,         section,          exclamdown                       ] };

+

+    // French uses a comma as decimal separator, but keyboards are labeled with a period

+    // Will take effect when KP_Decimal is mapped to the locale decimal separator

+    key <KPDL>  { [       KP_Delete,      KP_Decimal,           KP_Delete,           KP_Decimal ] };

+

+    include "level3(ralt_switch)"

+};

+

+partial alphanumeric_keys

+xkb_symbols "latin9_Sundeadkeys" {

+

+    // Modifies the basic fr-latin9 layout to use the Sun dead keys

+

+    include "fr(latin9)"

+

+    key <AE01>	{ [       ampersand,               1,         dead_acute,       periodcentered ] };

+    key <AE07>	{ [          egrave,               7,         dead_grave,               Egrave ] };

+    key <AD11>	{ [    dead_circumflex, dead_diaeresis,         dead_tilde,           quoteright ] };

+

+};

+

+partial alphanumeric_keys

+xkb_symbols "latin9_sundeadkeys" {

+

+    include "fr(latin9_Sundeadkeys)"

+

+    name[Group1]="France - (Legacy) Alternative, Sun dead keys";

+};

+

+partial alphanumeric_keys

+xkb_symbols "latin9_nodeadkeys" {

+

+    // Modifies the basic fr-latin9 layout to eliminate all dead keys

+

+    include "fr(latin9)"

+

+    name[Group1]="France - (Legacy) Alternative, eliminate dead keys";

+

+    key <AE01>	{ [       ampersand,               1,          apostrophe,       periodcentered ] };

+    key <AE07>	{ [          egrave,               7,               grave,               Egrave ] };

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

+    key <AD11>	{ [	asciicircum,  	   diaeresis,          asciitilde,           quoteright ] };

+};

+

+// Bépo : Improved ergonomic french keymap using Dvorak method.

+// Built by community on 'Dvorak Fr / Bépo' :

+// see http://www.clavier-dvorak.org/wiki/ to join and help.

+// XOrg integration (1.0rc2 version) in 2008

+// by Frédéric Boiteux <fboiteux at free dot fr>

+//

+// Bépo layout (1.0rc2 version) for a pc105 keyboard (french) :

+// ┌────┐

+// │ S A│   S = Shift,  A = AltGr + Shift

+// │ s a│   s = normal, a = AltGr

+// └────┘

+//

+// ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┲━━━━━━━━━┓

+// │ # ¶ │ 1 „ │ 2 “ │ 3 ” │ 4 ≤ │ 5 ≥ │ 6   │ 7 ¬ │ 8 ¼ │ 9 ½ │ 0 ¾ │ ° ′ │ ` ″ ┃ ⌫ Retour┃

+// │ $ – │ " — │ « < │ » > │ ( [ │ ) ] │ @ ^ │ + ± │ - − │ / ÷ │ * × │ = ≠ │ % ‰ ┃  arrière┃

+// ┢━━━━━┷━┱───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┺━┳━━━━━━━┫

+// ┃       ┃ B ¦ │ É ˝ │ P § │ O Œ │ È ` │ !   │ V   │ D Ð │ L   │ J IJ │ Z Ə │ W   ┃Entrée ┃

+// ┃Tab ↹  ┃ b | │ é ˊ │ p & │ o œ │ è ` │ ˆ ¡ │ v ˇ │ d ð │ l / │ j ij │ z ə │ w ̆ ┃   ⏎   ┃

+// ┣━━━━━━━┻┱────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┺┓      ┃

+// ┃        ┃ A Æ │ U Ù │ I ˙ │ E ¤ │ ; ̛ │ C ſ │ T Þ │ S ẞ │ R ™ │ N   │ M º │ Ç , ┃      ┃

+// ┃Maj ⇬   ┃ a æ │ u ù │ i ̈ │ e € │ , ’ │ c © │ t þ │ s ß │ r ® │ n ˜ │ m ¯ │ ç ¸ ┃      ┃

+// ┣━━━━━━━┳┹────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┲┷━━━━━┻━━━━━━┫

+// ┃       ┃ Ê   │ À   │ Y ‘ │ X ’ │ : · │ K   │ ? ̉ │ Q ̣ │ G   │ H ‡ │ F ª ┃             ┃

+// ┃Shift ⇧┃ ê / │ à \ │ y { │ x } │ . … │ k ~ │ ' ¿ │ q ˚ │ g µ │ h † │ f ˛ ┃Shift ⇧      ┃

+// ┣━━━━━━━╋━━━━━┷━┳━━━┷━━━┱─┴─────┴─────┴─────┴─────┴─────┴───┲━┷━━━━━╈━━━━━┻━┳━━━━━━━┳━━━┛

+// ┃       ┃       ┃       ┃ Espace inséc.   Espace inséc. fin ┃       ┃       ┃       ┃

+// ┃Ctrl   ┃Meta   ┃Alt    ┃ ␣ (Espace)      _               ␣ ┃AltGr ⇮┃Menu   ┃Ctrl   ┃

+// ┗━━━━━━━┻━━━━━━━┻━━━━━━━┹───────────────────────────────────┺━━━━━━━┻━━━━━━━┻━━━━━━━┛

+partial alphanumeric_keys

+xkb_symbols "bepo" {

+

+    include "level3(ralt_switch)"

+    include "keypad(oss)"

+

+    name[Group1]= "France - Bepo, ergonomic, Dvorak way";

+

+    // First row

+    key <TLDE> { [          dollar,   numbersign,        endash,       paragraph ] }; // $ # – ¶

+    key <AE01> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [        quotedbl,            1,         emdash, doublelowquotemark ] }; // " 1 — „

+    key <AE02> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [   guillemotleft,            2,           less,  leftdoublequotemark ] }; // « 2 < “

+    key <AE03> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [  guillemotright,            3,        greater, rightdoublequotemark ] }; // » 3 > ”

+    key <AE04> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [       parenleft,            4,    bracketleft,      lessthanequal ] }; // ( 4 [ ≤

+    key <AE05> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [      parenright,            5,   bracketright,   greaterthanequal ] }; // ) 5 ] ≥

+    key <AE06> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [              at,            6,    asciicircum                 ] }; // @ 6 ^

+    key <AE07> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [            plus,            7,      plusminus,        notsign ] }; // + 7 ± ¬

+    key <AE08> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [           minus,            8,          U2212,     onequarter ] }; // - 8 − ¼

+    key <AE09> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [           slash,            9,       division,        onehalf ] }; // / 9 ÷ ½

+    key <AE10> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [        asterisk,            0,       multiply,  threequarters ] }; // * 0 × ¾

+    key <AE11> { [           equal,       degree,       notequal,        minutes ] }; // = ° ≠ ′

+    key <AE12> { [         percent,        grave,          U2030,        seconds ] }; // % ` ‰ ″

+

+    // Second row

+    key <AD01> { [               b,            B,            bar,      brokenbar ] }; // b B | ¦

+    key <AD02> { [          eacute,       Eacute,     dead_acute, dead_doubleacute ] }; // é É ˊ ˝

+    key <AD03> { [               p,            P,      ampersand,        section ] }; // p P & §

+    key <AD04> { [               o,            O,             oe,             OE ] }; // o O œ Œ

+    key <AD05> { [          egrave,       Egrave,     dead_grave,          grave ] }; // è È ` `

+    key <AD06> { [ dead_circumflex,       exclam,     exclamdown                 ] }; // ^ ! ¡

+    key <AD07> { [               v,            V,     dead_caron                 ] }; // v V ˇ

+    key <AD08> { [               d,            D,            eth,            ETH ] }; // d D ð Ð

+    key <AD09> { [               l,            L,    dead_stroke                 ] }; // l L /

+    key <AD10> { [               j,            J,          U0133,          U0132 ] }; // j J ij IJ

+    key <AD11> { [               z,            Z,          schwa,          SCHWA ] }; // z Z ə Ə

+    key <AD12> { [               w,            W,     dead_breve                 ] }; // w W ̆

+

+    // Third row

+    key <AC01> { [               a,            A,             ae,             AE ] }; // a A æ Æ

+    key <AC02> { [               u,            U,         ugrave,         Ugrave ] }; // u U ù Ù

+    key <AC03> { [               i,            I, dead_diaeresis,  dead_abovedot ] }; // i I ̈ ˙

+    key <AC04> { [               e,            E,       EuroSign,  dead_currency ] }; // e E € ¤

+    key <AC05> { [           comma,    semicolon, rightsinglequotemark, dead_horn ] }; // , ; ’ ̛

+    key <AC06> { [               c,            C,      copyright,          U017F ] }; // c C © ſ

+    key <AC07> { [               t,            T,          thorn,          THORN ] }; // t T þ Þ

+    key <AC08> { [               s,            S,         ssharp,          U1E9E ] }; // s S ß ẞ

+    key <AC09> { [               r,            R,     registered,      trademark ] }; // r R ® ™

+    key <AC10> { [               n,            N,     dead_tilde                 ] }; // n N ~

+    key <AC11> { [               m,            M,    dead_macron,      masculine ] }; // m M ̄ º

+    key <BKSL> { [        ccedilla,     Ccedilla,   dead_cedilla, dead_belowcomma ] }; // ç Ç ¸ ,

+

+    // Fourth row

+    key <LSGT> { [     ecircumflex,  Ecircumflex,          slash                 ] }; // ê Ê /

+    key <AB01> { [          agrave,       Agrave,      backslash                 ] }; // à À \

+    key <AB02> { [               y,            Y,      braceleft, leftsinglequotemark  ] }; // y Y { ‘

+    key <AB03> { [               x,            X,     braceright, rightsinglequotemark ] }; // x X } ’

+    key <AB04> { [          period,        colon,       ellipsis, periodcentered ] }; // . : … ·

+    key <AB05> { [               k,            K,     asciitilde                 ] }; // k K ~

+    key <AB06> { [      apostrophe,     question,   questiondown,      dead_hook ] }; // ' ? ¿ ̉

+    key <AB07> { [               q,            Q, dead_abovering,  dead_belowdot ] }; // q Q ˚ ̣

+    key <AB08> { [               g,            G,             mu                 ] }; // g G µ

+    key <AB09> { [               h,            H,         dagger,   doubledagger ] }; // h H † ‡

+    key <AB10> { [               f,            F,    dead_ogonek,    ordfeminine ] }; // f F ̨ ª

+

+    key <SPCE> { [           space, nobreakspace,     underscore,          U202F ] }; // ␣ (espace insécable) _ (espace insécable fin)

+};

+

+partial alphanumeric_keys

+xkb_symbols "bepo_latin9" {

+

+    // Restricts the fr(bepo) layout to latin9 symbols

+

+    include "fr(bepo)"

+    include "keypad(oss_latin9)"

+

+    name[Group1]="France - Bepo, ergonomic, Dvorak way, latin-9 only";

+

+    key <TLDE> { [          dollar,   numbersign,        dollar,       paragraph ] }; // $ # $ ¶

+

+    key <AE01> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [        quotedbl,            1                                 ] }; // " 1

+    key <AE02> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [   guillemotleft,            2,           less                 ] }; // « 2 <

+    key <AE03> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [  guillemotright,            3,        greater                 ] }; // » 3 >

+    key <AE04> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [       parenleft,            4,    bracketleft                 ] }; // ( 4 [

+    key <AE05> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [      parenright,            5,   bracketright                 ] }; // ) 5 ]

+    key <AE08> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [           minus,            8,          minus,     onequarter ] }; // - 8 - ¼

+    key <AE11> { [           equal,       degree                                 ] }; // = °

+    key <AE12> { [         percent,        grave                                 ] }; // % `

+

+    key <AD01> { [               b,            B,            bar                 ] }; // b B |

+    key <AD02> { [          eacute,       Eacute,     dead_acute                 ] }; // é É ˊ

+    key <AD10> { [               j,            J                                 ] }; // j J

+    key <AD11> { [               z,            Z                                 ] }; // z Z

+    key <AD12> { [               w,            W                                 ] }; // w W

+

+    key <AC03> { [               i,            I, dead_diaeresis                 ] }; // i I ̈

+    key <AC05> { [           comma,    semicolon,          comma,      dead_horn ] }; // , ; , ̛

+    key <AC06> { [               c,            C,      copyright                 ] }; // c C ©

+    key <AC08> { [               s,            S,         ssharp                 ] }; // s S ß

+    key <AC09> { [               r,            R,     registered                 ] }; // r R ®

+    key <AC11> { [               m,            M,         macron,      masculine ] }; // m M ̄ º

+

+    key <AB02> { [               y,            Y,      braceleft                 ] }; // y Y {

+    key <AB03> { [               x,            X,     braceright                 ] }; // x X }

+    key <AB04> { [          period,        colon                                 ] }; // . :

+    key <AB09> { [               h,            H                                 ] }; // h H

+    key <AB10> { [               f,            F,              f,    ordfeminine ] }; // f F   ª

+

+    // Note : on a besoin de redéfinir les niveaux 3 et 4,

+    // donc nbsp(level2) ne suffit pas !

+    key <SPCE> { [           space,  nobreakspace,    underscore,   nobreakspace ] }; // ␣ (espace insécable) _ (espace insécable)

+};

+

+// Author   : Francis Leboutte, http://www.algo.be/ergo/dvorak-fr.html

+//            thanks to Fabien Cazenave for his help

+// Licence  : X11 (the layout itself is released under CC-NC-ND licence)

+// Version  : 0.3

+

+// Base layer + dead AltGr key (`):

+// ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┲━━━━━━━━━━┓

+// │ *   │ 1   │ 2   │ 3   │ 4   │ 5   │ 6   │ 7   │ 8   │ 9   │ 0   │ +   │ %   ┃          ┃

+// │ _   │ =   │ / ± │ - ¼ │ è ½ │ \ ¾ │ ^   │ (   │ ` ` │ )   │ "   │ [   │ ]   ┃ ⌫        ┃

+// ┢━━━━━┷━━┱──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┺━━┳━━━━━━━┫

+// ┃        ┃ ? Æ │ <   │ >   │ G   │ !   │ H   │ V   │ C Ç │ M   │ K   │ Z   │ &   ┃       ┃

+// ┃ ↹      ┃ : æ │ ' $ │ é É │ g € │ . ° │ h   │ v   │ c ç │ m µ │ k   │ z   │ ¨   ┃       ┃

+// ┣━━━━━━━━┻┱────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┺┓  ⏎   ┃

+// ┃         ┃ O Ò │ A À │ U Ù │ E È │ B   │ F   │ S   │ T   │ N   │ D   │ W   │ #   ┃      ┃

+// ┃ ⇬       ┃ o ò │ a à │ u ù │ e è │ b   │ f   │ s « │ t   │ n » │ d   │ w   │ ~   ┃      ┃

+// ┣━━━━━━┳━━┹──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┲━━┷━━━━━┻━━━━━━┫

+// ┃      ┃ ç Ç │ | Œ │ Q   │ @   │ I Ì │ Y   │ X   │ R   │ L   │ P   │ J   ┃               ┃

+// ┃ ⇧    ┃ à À │ ; œ │ q { │ , } │ i ì │ y £ │ x   │ r º │ l   │ p § │ j   ┃ ⇧             ┃

+// ┣━━━━━━┻┳━━━━┷━━┳━━┷━━━━┱┴─────┴─────┴─────┴─────┴─────┴─┲━━━┷━━━┳━┷━━━━━╋━━━━━━━┳━━━━━━━┫

+// ┃       ┃       ┃       ┃ ␣                            ⍽ ┃       ┃       ┃       ┃       ┃

+// ┃ ctrl  ┃ super ┃ alt   ┃ ␣ Espace    Espace insécable ⍽ ┃ alt   ┃ super ┃ menu  ┃ ctrl  ┃

+// ┗━━━━━━━┻━━━━━━━┻━━━━━━━┹────────────────────────────────┺━━━━━━━┻━━━━━━━┻━━━━━━━┻━━━━━━━┛

+

+// Notice the specific Caps_Lock layer:

+// ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┲━━━━━━━━━━┓

+// │ *   │ 1   │ 2   │ 3   │ 4   │ 5   │ 6   │ 7   │ 8   │ 9   │ 0   │ +   │ %   ┃          ┃

+// │     │     │     │     │     │     │     │     │     │     │     │     │     ┃ ⌫        ┃

+// ┢━━━━━┷━━┱──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┺━━┳━━━━━━━┫

+// ┃        ┃     │ <   │ >   │     │     │     │     │     │     │     │     │     ┃       ┃

+// ┃ ↹      ┃     │     │     │     │     │     │     │     │     │     │     │     ┃       ┃

+// ┣━━━━━━━━┻┱────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┺┓  ⏎   ┃

+// ┃         ┃     │     │     │     │     │     │     │     │     │     │     │     ┃      ┃

+// ┃ ⇬       ┃     │     │     │     │     │     │     │     │     │     │     │     ┃      ┃

+// ┣━━━━━━┳━━┹──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┲━━┷━━━━━┻━━━━━━┫

+// ┃      ┃ /   │ -   │     │     │     │     │     │     │     │     │     ┃               ┃

+// ┃ ⇧    ┃     │     │     │     │     │     │     │     │     │     │     ┃ ⇧             ┃

+// ┣━━━━━━┻┳━━━━┷━━┳━━┷━━━━┱┴─────┴─────┴─────┴─────┴─────┴─┲━━━┷━━━┳━┷━━━━━╋━━━━━━━┳━━━━━━━┫

+// ┃       ┃       ┃       ┃ ␣                            ⍽ ┃       ┃       ┃       ┃       ┃

+// ┃ ctrl  ┃ super ┃ alt   ┃ ␣ Espace    Espace insécable ⍽ ┃ alt   ┃ super ┃ menu  ┃ ctrl  ┃

+// ┗━━━━━━━┻━━━━━━━┻━━━━━━━┹────────────────────────────────┺━━━━━━━┻━━━━━━━┻━━━━━━━┻━━━━━━━┛

+

+partial alphanumeric_keys modifier_keys

+xkb_symbols "dvorak" {

+  name[Group1]="France - Dvorak";

+

+  // First row

+  key <TLDE> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [       underscore,   asterisk                  ] };

+  key <AE01> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [            equal,          1                  ] };

+  key <AE02> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [            slash,          2,       plusminus ] };

+  key <AE03> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [            minus,          3,      onequarter ] };

+  key <AE04> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [           egrave,          4,         onehalf ] };

+  key <AE05> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [        backslash,          5,   threequarters ] };

+  key <AE06> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [  dead_circumflex,          6                  ] };

+  key <AE07> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [        parenleft,          7                  ] };

+  key <AE08> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [ ISO_Level3_Latch,          8,           grave ] };

+  key <AE09> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [       parenright,          9                  ] };

+  key <AE10> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [         quotedbl,          0                  ] };

+  key <AE11> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [      bracketleft,       plus                  ] };

+  key <AE12> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [     bracketright,    percent                  ] };

+

+  // Second row

+  key <AD01> { [            colon,         question,              ae,               AE ] };

+  key <AD02> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [       apostrophe,       less,          dollar ] };

+  key <AD03> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [           eacute,    greater,          Eacute ] };

+  key <AD04> { [                g,                G,        EuroSign                   ] };

+  key <AD05> { [           period,           exclam,          degree                   ] };

+  key <AD06> { [                h,                H                                    ] };

+  key <AD07> { [                v,                V                                    ] };

+  key <AD08> { [                c,                C,        ccedilla,         Ccedilla ] };

+  key <AD09> { [                m,                M,              mu                   ] };

+  key <AD10> { [                k,                K                                    ] };

+  key <AD11> { [                z,                Z                                    ] };

+  key <AD12> { [   dead_diaeresis,        ampersand                                    ] };

+

+  // Third row

+  key <AC01> { [                o,                O,          ograve,           Ograve ] };

+  key <AC02> { [                a,                A,          agrave,           Agrave ] };

+  key <AC03> { [                u,                U,          ugrave,           Ugrave ] };

+  key <AC04> { [                e,                E,          egrave,           Egrave ] };

+  key <AC05> { [                b,                B                                    ] };

+  key <AC06> { [                f,                F                                    ] };

+  key <AC07> { [                s,                S,   guillemotleft                   ] };

+  key <AC08> { [                t,                T                                    ] };

+  key <AC09> { [                n,                N,  guillemotright                   ] };

+  key <AC10> { [                d,                D                                    ] };

+  key <AC11> { [                w,                W                                    ] };

+  key <BKSL> { [       asciitilde,       numbersign                                    ] };

+

+  // Fourth row

+  key <LSGT> { type[group1] = "FOUR_LEVEL_PLUS_LOCK", [       agrave, ccedilla,  Agrave, Ccedilla,   slash ] };

+  key <AB01> { type[group1] = "FOUR_LEVEL_PLUS_LOCK", [    semicolon,      bar,      oe,       OE,   minus ] };

+  key <AB02> { [                q,                Q,       braceleft                   ] };

+  key <AB03> { [            comma,               at,      braceright                   ] };

+  key <AB04> { [                i,                I,          igrave,           Igrave ] };

+  key <AB05> { [                y,                Y,        sterling                   ] };

+  key <AB06> { [                x,                X                                    ] };

+  key <AB07> { [                r,                R,       masculine                   ] };

+  key <AB08> { [                l,                L                                    ] };

+  key <AB09> { [                p,                P,         section                   ] };

+  key <AB10> { [                j,                J                                    ] };

+

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

+};

+

+// C'WHERTY: Breton keyboard. Ar c'hlavier brezhoneg.

+// Copyright © 2009 Dominique Pellé <dominique.pelle@gmail.com>

+// Version: 0.1

+//

+// ┌────┐

+// │ S A│   S = Reol = Shift,  A = ArErl + Pennlizherenn = AltGr + Shift

+// │ s a│   s = normal,        a = AltGr

+// └────┘

+//

+// ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┲━━━━━━━━━┓

+// │ $ Γ │ 1 Δ │ 2 Θ │ 3 Λ │ 4 Ξ │ 5 Π │ 6 Σ │ 7 Φ │ 8 Ψ │ 9 Ç │ 0 Ω │ ° ß │ + ¬ ┃ ⌫ Souzañ┃

+// │ ² ˙ │ & ¯ │ é ´ │ " # │ ' { │ ( [ │ - | │ è ` │ - \ │ ç ± │ à @ │ ) ] │ = } ┃         ┃

+// ┢━━━━━┷━┱───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┺━┳━━━━━━━┫

+// ┃Toalenn┃ C'h │ W ω │ E ε │ R ρ │ T τ │ Y ψ │ U υ │ I ι │ O OE│ P π │ ¨ ¥ │ * £ ┃Enankañ┃

+// ┃     ↹ ┃ c'h │ w   │ e € │ r   │ t   │ y   │ u   │ i ı │ o oe│ p   │ ^ « │ / » ┃   ⏎   ┃

+// ┣━━━━━━━┻┱────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┺┓      ┃

+// ┃Prenn   ┃ A Æ │ S σ │ D δ │ F φ │ G γ │ H η │ J ς │ K κ │ L λ │ M μ │ Ù ® │ ! ¡ ┃      ┃

+// ┃Pennli ⇬┃ a æ │ s   │ d $ │ f   │ g   │ h   │ j   │ k   │ l   │ m   │ ù ŭ │ ? ¿ ┃      ┃

+// ┣━━━━━━━┳┹────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┲┷━━━━━┻━━━━━━┫

+// ┃       ┃ Q θ │ Z ζ │ X ξ │ C χ │ V   │ B β │ N ν │ CH  │ Ñ   │ : © │ ;   ┃             ┃

+// ┃Shift ⇧┃ q < │ z > │ x   │ c ¢ │ v   │ b   │ n   │ ch  │ ñ   │ .   │ ,   ┃Shift ⇧      ┃

+// ┣━━━━━━━╋━━━━━┷━┳━━━┷━━━┱─┴─────┴─────┴─────┴─────┴─────┴───┲━┷━━━━━╈━━━━━┻━┳━━━━━━━┳━━━┛

+// ┃       ┃       ┃       ┃ ⍽ Espace insécable              ␣ ┃       ┃       ┃       ┃

+// ┃Reol   ┃Meta   ┃Erl    ┃ ␣ Espace                        ␣ ┃ArErl ⇮┃Menu   ┃Reol   ┃

+// ┗━━━━━━━┻━━━━━━━┻━━━━━━━┹───────────────────────────────────┺━━━━━━━┻━━━━━━━┻━━━━━━━┛

+partial alphanumeric_keys

+xkb_symbols "bre" {

+

+    include "keypad(oss)"

+

+    name[Group1]= "France - Breton";

+

+    // First row

+    key <TLDE> { [     twosuperior,     dead_tilde,   dead_abovedot,    Greek_GAMMA ] };

+    key <AE01> { [       ampersand,              1,     dead_macron,    Greek_DELTA ] };

+    key <AE02> { [          eacute,              2,      dead_acute,    Greek_THETA ] };

+    key <AE03> { [        quotedbl,              3,      numbersign,    Greek_LAMDA ] };

+    key <AE04> { [      apostrophe,              4,       braceleft,       Greek_XI ] };

+    key <AE05> { [       parenleft,              5,     bracketleft,       Greek_PI ] };

+    key <AE06> { [           minus,              6,             bar,    Greek_SIGMA ] };

+    key <AE07> { [          egrave,              7,      dead_grave,      Greek_PHI ] };

+    key <AE08> { [      underscore,              8,       backslash,      Greek_PSI ] };

+    key <AE09> { [        ccedilla,              9,       plusminus,       Ccedilla ] };

+    key <AE10> { [          agrave,              0,              at,    Greek_OMEGA ] };

+    key <AE11> { [      parenright, dead_abovering,    bracketright,         ssharp ] };

+    key <AE12> { [           equal,           plus,      braceright,        notsign ] };

+

+    // Second row

+    // Handling the C'H key correctly requires an inputmethod (XIM)

+    // See https://bugs.freedesktop.org/show_bug.cgi?id=19506

+ // key <AD01> { [    trigraph_c_h,   trigraph_C_h,    trigraph_C_H,    Greek_alpha ] };

+    key <AD01> { [           UF8FD,          UF8FE,           UF8FF,    Greek_alpha ] };

+    key <AD02> { [               w,              W,     Greek_omega,    Greek_omega ] };

+    key <AD03> { [               e,              E,        EuroSign,  Greek_epsilon ] };

+    key <AD04> { [               r,              R,       Greek_rho,      Greek_rho ] };

+    key <AD05> { [               t,              T,       Greek_tau,      Greek_tau ] };

+    key <AD06> { [               y,              Y,       Greek_psi,      Greek_psi ] };

+    key <AD07> { [               u,              U,   Greek_upsilon,  Greek_upsilon ] };

+    key <AD08> { [               i,              I,        idotless,     Greek_iota ] };

+    key <AD09> { [               o,              O,              oe,             OE ] };

+    key <AD10> { [               p,              P,        Greek_pi,       Greek_pi ] };

+    key <AD11> { [ dead_circumflex, dead_diaeresis,   guillemotleft,            yen ] };

+    key <AD12> { [           slash,       asterisk,  guillemotright,       sterling ] };

+

+    // Third row

+    key <AC01> { [               a,              A,              ae,             AE ] };

+    key <AC02> { [               s,              S,     Greek_sigma,    Greek_sigma ] };

+    key <AC03> { [               d,              D,          dollar,    Greek_delta ] };

+    key <AC04> { [               f,              F,       Greek_phi,      Greek_phi ] };

+    key <AC05> { [               g,              G,     Greek_gamma,    Greek_gamma ] };

+    key <AC06> { [               h,              H,       Greek_eta,      Greek_eta ] };

+    key <AC07> { [               j,              J, Greek_finalsmallsigma, Greek_finalsmallsigma ] };

+    key <AC08> { [               k,              K,       Greek_kappa,  Greek_kappa ] };

+    key <AC09> { [               l,              L,       Greek_lamda, Greek_lambda ] };

+    key <AC10> { [               m,              M,          Greek_mu,     Greek_mu ] };

+    key <AC11> { [          ugrave,         Ugrave,            ubreve,   registered ] };

+    key <BKSL> { [        question,         exclam,      questiondown,   exclamdown ] };

+

+    // Fourth row

+    key <LSGT> { [               q,              Q,            less,    Greek_theta ] };

+    key <AB01> { [               z,              Z,         greater,     Greek_zeta ] };

+    key <AB02> { [               x,              X,        Greek_xi,       Greek_xi ] };

+    key <AB03> { [               c,              C,            cent,      Greek_chi ] };

+    key <AB04> { [               v,              V                                  ] };

+    key <AB05> { [               b,              B,      Greek_beta,     Greek_beta ] };

+    key <AB06> { [               n,              N,        Greek_nu,       Greek_nu ] };

+    // Handling the CH key correctly requires an inputmethod (XIM)

+    // See https://bugs.freedesktop.org/show_bug.cgi?id=19506

+ // key <AB07> { [      digraph_ch,     digraph_Ch,      digraph_CH,  Greek_omicron ] };

+    key <AB07> { [           UF8FA,          UF8FB,           UF8FC,  Greek_omicron ] };

+    key <AB08> { [          ntilde,         Ntilde                                  ] };

+    key <AB09> { [          period,          colon,         section,      copyright ] };

+    key <AB10> { [           comma,      semicolon,         percent                 ] };

+

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

+

+    include "level3(ralt_switch)"

+};

+

+// Occitan layout

+// Author : 2009 Thomas Metz <tmetz @ free.fr>

+// Derivated from the layout defined at http://www.panoccitan.org

+// Version: 0.1

+// From OSS french keyboard :

+// - add á, í, ò, ó et ú, Á, Í, Ò, Ó, Ú, ñ, Ñ

+// - change position of æ, ü, î, û, œ, ô, ö, ï, â, ë

+// 

+// ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┲━━━━━━━━━┓

+// │ ³ ¸ │ 1 ̨ │ 2 É │ 3 ˘ │ 4 — │ 5 – │ 6 ‑ │ 7 È │ 8 ™ │ 9 Ç │ 0 À │ ° ≠ │ + ± ┃ ⌫ Retour┃

+// │ ² ¹ │ & ˇ │ é ~ │ " # │ ' { │ ( [ │ - | │ è ` │ _ \ │ ç ^ │ à @ │ ) ] │ = } ┃  arrière┃

+// ┢━━━━━┷━┱───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┺━┳━━━━━━━┫

+// ┃       ┃ A Á │ Z Æ │ E ¢ │ R Ê │ T Ë │ Y Û │ U Ú │ I Í │ O Ó │ P Ò │ ¨ Œ │ £ Ø ┃Entrée ┃

+// ┃Tab ↹  ┃ a á │ z æ │ e € │ r ê │ t ë │ y û │ u ú │ i í │ o ó │ p ò │ ^ œ │ $ ø ┃   ⏎   ┃

+// ┣━━━━━━━┻┱────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┺┓      ┃

+// ┃        ┃ Q Ä │ S „ │ D Â │ F ‚ │ G ¥ │ H Ü │ J Î │ K Ï │ L Ô │ M Ö │ % Ù │ µ ̄ ┃      ┃

+// ┃Maj ⇬   ┃ q ä │ s ß │ d â │ f ‘ │ g ’ │ h ü │ j î │ k ï │ l ô │ m ö │ ù ' │ * ` ┃      ┃

+// ┣━━━━━━━┳┹────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┲┷━━━━━┻━━━━━━┫

+// ┃       ┃ > ≥ │ W “ │ X ” │ C ® │ V ← │ B ↑ │ N Ñ │ ? … │ . . │ / ∕ │ § − ┃             ┃

+// ┃Shift ⇧┃ < ≤ │ w « │ x » │ c © │ v → │ b ↓ │ n ñ │ , ¿ │ ; × │ : ÷ │ ! ¡ ┃Shift ⇧      ┃

+// ┣━━━━━━━╋━━━━━┷━┳━━━┷━━━┱─┴─────┴─────┴─────┴─────┴─────┴───┲━┷━━━━━╈━━━━━┻━┳━━━━━━━┳━━━┛

+// ┃       ┃       ┃       ┃ ␣         Espace fine insécable ⍽ ┃       ┃       ┃       ┃

+// ┃Ctrl   ┃Meta   ┃Alt    ┃ ␣ Espace       Espace insécable ⍽ ┃AltGr ⇮┃Menu   ┃Ctrl   ┃

+// ┗━━━━━━━┻━━━━━━━┻━━━━━━━┹───────────────────────────────────┺━━━━━━━┻━━━━━━━┻━━━━━━━┛

+partial alphanumeric_keys

+xkb_symbols "oci" {

+

+    include "keypad(oss)"

+

+    name[Group1]= "France - Occitan";

+

+    // First row

+    key <TLDE>	{ [      twosuperior,    threesuperior,          onesuperior,          dead_cedilla ] }; // ² ³ ¹ ¸ 

+    key <AE01>	{ [        ampersand,                1,           dead_caron,           dead_ogonek ] }; // & 1 ˇ ̨

+    key <AE02>	{ [           eacute,                2,           asciitilde,                Eacute ] }; // é 2 ~ É

+    key <AE03>	{ [         quotedbl,                3,           numbersign,            dead_breve ] }; // " 3 # ˘

+    key <AE04>	{ [       apostrophe,                4,            braceleft,             0x1002014 ] }; // ' 4 { — (tiret cadratin)

+    key <AE05>	{ [        parenleft,                5,          bracketleft,             0x1002013 ] }; // ( 5 [ – (tiret demi-cadratin)

+    key <AE06>	{ [            minus,                6,                  bar,             0x1002011 ] }; // - 6 | ‑ (tiret insécable)

+    key <AE07>	{ [           egrave,                7,                grave,                Egrave ] }; // è 7 ` È

+    key <AE08>	{ [       underscore,                8,            backslash,             trademark ] }; // _ 8 \ ™

+    key <AE09>	{ [         ccedilla,                9,          asciicircum,              Ccedilla ] }; // ç 9 ^ Ç

+    key <AE10>	{ [           agrave,                0,                   at,                Agrave ] }; // à 0 @ À

+    key <AE11>	{ [       parenright,           degree,         bracketright,              notequal ] }; // ) ° ] ≠ 

+    key <AE12>	{ [            equal,             plus,           braceright,             plusminus ] }; // = + } ±

+

+    // Second row

+    key <AD01>	{ [                a,                A,               aacute,                Aacute ] }; // a A á Á

+    key <AD02>	{ [                z,                Z,                   ae,                    AE ] }; // z Z æ Æ

+    key <AD03>	{ [                e,                E,             EuroSign,                  cent ] }; // e E € ¢

+    key <AD04>	{ [                r,                R,          ecircumflex,           Ecircumflex ] }; // r R ê Ê

+    key <AD05>	{ [                t,                T,           ediaeresis,            Ediaeresis ] }; // t T ë Ë

+    key <AD06>	{ [                y,                Y,          ucircumflex,           Ucircumflex ] }; // y Y û Û

+    key <AD07>	{ [                u,                U,               uacute,                Uacute ] }; // u U ú Ú

+    key <AD08>	{ [                i,                I,               iacute,                Iacute ] }; // i I í Í

+    key <AD09>	{ [                o,                O,               oacute,                Oacute ] }; // o O ó Ó

+    key <AD10>	{ [                p,                P,               ograve,                Ograve ] }; // p P ò Ò

+    key <AD11>	{ [  dead_circumflex,   dead_diaeresis,                   oe,                    OE ] }; // ^ ̈ ̃ œ Œ

+    key <AD12>	{ [           dollar,         sterling,               oslash,              Ooblique ] }; // $ £ ø Ø

+

+    // Third row

+    key <AC01>	{ [                q,                Q,           adiaeresis,            Adiaeresis ] }; // q Q ä Ä

+    key <AC02>	{ [                s,                S,               ssharp,    doublelowquotemark ] }; // s S ß „ 

+    key <AC03>	{ [                d,                D,           acircumflex,          Acircumflex ] }; // d D â Â

+    key <AC04>	{ [                f,                F,  leftsinglequotemark,    singlelowquotemark ] }; // f F ‘ ‚

+    key <AC05>	{ [                g,                G, rightsinglequotemark,                   yen ] }; // g G ’ ¥

+    key <AC06>	{ [                h,                H,           udiaeresis,            Udiaeresis ] }; // h H ü Ü

+    key <AC07>	{ [                j,                J,          icircumflex,            Icircumflex] }; // j J î Î

+    key <AC08>	{ [                k,                K,           idiaeresis,             Idiaeresis] }; // k K ï Ï

+    key <AC09>	{ [                l,                L,          ocircumflex,           Ocircumflex ] }; // l L ô Ô

+    key <AC10>	{ [                m,                M,           odiaeresis,            Odiaeresis ] }; // m M ö Ö

+    key <AC11>	{ [           ugrave,          percent,           dead_acute,                Ugrave ] }; // ù % ' Ù

+    key <BKSL>	{ [         asterisk,               mu,           dead_grave,           dead_macron ] }; // * µ ` ̄

+

+    // Fourth row

+    key <LSGT>  { [             less,          greater,        lessthanequal,      greaterthanequal ] }; // < > ≤ ≥

+    key <AB01>  { [                w,                W,        guillemotleft,   leftdoublequotemark ] }; // w W « “

+    key <AB02>  { [                x,                X,       guillemotright,  rightdoublequotemark ] }; // x X » ”

+    key <AB03>  { [                c,                C,            copyright,            registered ] }; // c C © ®

+    key <AB04>  { [                v,                V,            rightarrow,            leftarrow ] }; // v V → ← 

+    key <AB05>  { [                b,                B,            downarrow,               uparrow ] }; // b B ↓ ↑

+    key <AB06>  { [                n,                N,              ntilde,                 Ntilde ] }; // n N ñ Ñ

+    key <AB07>  { [            comma,         question,         questiondown,             0x1002026 ] }; // , ? ¿ …

+    key <AB08>  { [        semicolon,           period,             multiply,             0x10022C5 ] }; // ; . × ⋅

+    key <AB09>  { [            colon,            slash,             division,             0x1002215 ] }; // : / ÷ ∕

+    key <AB10>  { [           exclam,          section,           exclamdown,             0x1002212 ] }; // ! § ¡ −

+};

+

+// Marc.Shapiro@inria.fr 19-sep-1998

+// modifications : Etienne Herlent <eherlent@linux-france.org> june 2000

+// adapted to the new input layer :

+//        Martin Costabel <costabel@wanadoo.fr> 3-jan-2001

+// adapted for Latin9 alphabet (ISO-8859-15): 

+//        Etienne Herlent <eherlent@linux-france.org> march 2005

+

+// This map is an almost-complete mapping of the standard French

+// MacIntosh keyboard under Xwindows.  I tried to remain as faithful

+// as possible to the Mac meaning of each key.	I did this entirely by

+// hand and by intuition, relying on the Clavier (Keyboard?) Desktop

+// Accessory for the Mac meaning of keys, and on reading keysymdef.h

+// to intuit the corresponding X names.	 Lacking proper documentation,

+// I may have made some mistakes.

+

+// Entries marked CHECK are particularly uncertain

+

+// Entries marked MISSING mark Mac characters for which I was unable

+// to find a corresponding keysym.  (Some for sure don't: e.g. the

+// Apple mark and the oe/OE character; others I may have simply not

+// found.)

+

+// Copied from macintosh_vndr/fr

+partial alphanumeric_keys

+xkb_symbols "mac" {

+

+    name[Group1]= "France - Macintosh";

+

+    // Alphanumeric section

+    key <TLDE> {	[          at,     numbersign, periodcentered,  Ydiaeresis	]	}; // MISSING: Ydiaeresis; eherlent : ok in Latin9

+    key <AE01> {	[   ampersand,    1,   VoidSymbol,    dead_acute	]	}; // MISSING: Apple

+    key <AE02> {	[      eacute,    2,   ediaeresis,        Eacute	]	};

+    key <AE03> {	[    quotedbl,    3,   VoidSymbol,    VoidSymbol	] 	}; // CHECK all quotemarks

+    key <AE04> {	[  apostrophe,    4,   VoidSymbol,    VoidSymbol	] 	};

+    key <AE05> {	[   parenleft,    5,    braceleft,   bracketleft	]	};

+ // CHECK section

+    key <AE06> {	[     section,    6,    paragraph,         aring	]	};

+    key <AE07> {	[      egrave,    7, guillemotleft, guillemotright	]	};

+    key <AE08> {	[      exclam,    8,   exclamdown,   Ucircumflex	]	};

+    key <AE09> {	[    ccedilla,    9,     Ccedilla,        Aacute	]	};

+    key <AE10> {	[      agrave,    0,       oslash,    VoidSymbol	]	}; // MISSING: Oslash

+    key <AE11> {	[  parenright, degree, braceright,  bracketright	]	};

+    key <AE12> {	[       minus, underscore, emdash,        endash	]	}; // CHECK dashes

+

+    key <AD01> {	[           a,  A,           ae,          AE	]	};

+    key <AD02> {	[           z,  Z,  Acircumflex,       Aring		]	};

+    key <AD03> {	[           e,  E,  ecircumflex, Ecircumflex	]	};

+    key <AD04> {	[           r,  R,   registered,    currency	]	};

+    key <AD05> {	[           t,  T,   VoidSymbol,  VoidSymbol	]	};

+    key <AD06> {	[           y,  Y,       Uacute,  Ydiaeresis	]	}; // MISSING: Ydiaeresis; eherlent : ok in Latin9

+    key <AD07> {	[           u,  U,   VoidSymbol, ordfeminine	]	}; // MISSING: ordmasculine?

+    key <AD08> {	[           i,  I,  icircumflex,  idiaeresis	]	};

+    key <AD09> {	[           o,  O,           oe,          OE      	]	}; // MISSING: oe, OE lacking in Latin1; eherlent ok in Latin9

+    key <AD10> {	[           p,  P,   VoidSymbol,  VoidSymbol	]	};

+    key <AD11> {	[dead_circumflex,dead_diaeresis, ocircumflex, Ocircumflex	]	};

+    key <AD12> {	[      dollar, asterisk,   EuroSign, yen		]	}; // eherlent : EuroSign in Latin9

+

+    key <AC01> {	[         q, Q, acircumflex,         Agrave		]	};

+    key <AC02> {	[         s, S,      Ograve,     VoidSymbol	]	};

+    key <AC03> {	[         d, D,  VoidSymbol,     VoidSymbol	]	};

+    key <AC04> {	[         f, F,  VoidSymbol, periodcentered	]	}; // MISSING: oblong script f??

+    key <AC05> {	[         g, G,  VoidSymbol,     VoidSymbol	]	}; // MISSING: kerned fi, fl

+    key <AC06> {	[         h, H,      Igrave,    Icircumflex	]	};

+    key <AC07> {	[         j, J,  Idiaeresis,         Iacute	]	};

+    key <AC08> {	[         k, K,      Egrave,     Ediaeresis	]	};

+    key <AC09> {	[         l, L,     notsign,            bar	]	};

+    key <AC10> {	[         m, M,          mu,         Oacute	]	};

+    key <AC11> {	[    ugrave,percent, Ugrave,    ucircumflex	]	}; // MISSING: per-mille

+    key <BKSL> {	[ dead_grave, sterling,  at,     numbersign	]	};

+

+    key <LSGT> {	[      less, greater, VoidSymbol, VoidSymbol	]	};

+    key <AB01> {	[         w, W, VoidSymbol,   VoidSymbol	]	};	// MISSING: half-guillemot (single angle bracket)

+    key <AB02> {	[         x, X, VoidSymbol,   VoidSymbol	]	}; // CHECK similarequal; MISSING: extra-slanted slash

+    key <AB03> {	[         c, C,  copyright,         cent	]	};

+    key <AB04> {	[         v, V,    diamond,  leftradical	]	}; // CHECK diamond, leftradical

+    key <AB05> {	[         b, B,     ssharp,   VoidSymbol	]	}; // CHECK: Greek_beta or ssharp?; MISSING: oblong script s

+    key <AB06> {	[         n, N,  dead_tilde,  asciitilde	]	};

+    key <AB07> {	[     comma,  question, VoidSymbol,  questiondown	]	};

+    key <AB08> {	[ semicolon,  period, VoidSymbol,  periodcentered	]	};

+    key <AB09> {	[     colon,  slash,   division,        backslash	]	};

+    key <AB10> {	[     equal,   plus, VoidSymbol,        plusminus	]	};

+

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

+    // End alphanumeric section

+

+    key <KPDL> {	[  comma,KP_Decimal	]	};

+

+    include "level3(ralt_switch)"

+};

+

+partial alphanumeric_keys

+xkb_symbols "geo" {

+    include "ge(basic)"

+

+    name[Group1]= "France - Georgian AZERTY Tskapo";

+

+    key <TLDE> { [ exclam, noSymbol ] };

+    key <AE01> { [ 0x0100201e, 1 ] };

+    key <AE02> { [ 0x01002116, 2 ] };

+    key <AE03> { [ percent, 3    ] };

+    key <AE04> { [ parenleft, 4  ] };

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

+    key <AE06> { [ semicolon, 6  ] };

+    key <AE07> { [ question, 7   ] };

+    key <AE08> { [ 0x01002116, 8 ] };

+    key <AE09> { [ degree, 9     ] };

+    key <AE10> { [ parenright, 0 ] };

+    key <AE11> { [ minus, underscore, 0x01002014 ] };

+    key <AE12> { [ less, greater ] };

+

+    key <AD01> { [ 0x010010d0,  0x010010fa     ] };

+    key <AD02> { [ 0x010010d6,  Z              ] };

+    key <AD03> { [ 0x010010d4,  E, 0x010010f1  ] };

+    key <AD04> { [ 0x010010e0,  0x010000ae     ] };

+    key <AD05> { [ 0x010010e2,  T              ] };

+    key <AD06> { [ 0x010010e7,  0x010010f8     ] };

+    key <AD07> { [ 0x010010e3,  U              ] };

+    key <AD08> { [ 0x010010d8,  0x010010f2     ] };

+    key <AD09> { [ 0x010010dd,  O              ] };

+    key <AD10> { [ 0x010010de,  P              ] };

+    key <AD11> { [ 0x010010d7,  T              ] };

+    key <AD12> { [ 0x010010eb,  Z              ] };

+

+    key <AC01> { [ 0x010010e5,  Q              ] };

+    key <AC02> { [ 0x010010e1,  S              ] };

+    key <AC03> { [ 0x010010d3,  D              ] };

+    key <AC04> { [ 0x010010e4,  0x010010f6     ] };

+    key <AC05> { [ 0x010010d2,  0x010010f9     ] };

+    key <AC06> { [ 0x010010f0,  0x010010f5     ] };

+    key <AC07> { [ 0x010010ef,  0x010010f7     ] };

+    key <AC08> { [ 0x010010d9,  K              ] };

+    key <AC09> { [ 0x010010da,  L              ] };

+    key <AC10> { [ 0x010010db,  M              ] };

+    key <AC11> { [ 0x010010df,  J              ] };

+    key <BKSL> { [ 0x010010e9,  0x010000a9     ] };

+

+    key <LSGT> { [ guillemotleft,guillemotright ] };

+    key <AB01> { [ 0x010010ec,  W               ] };

+    key <AB02> { [ 0x010010ee,  0x010010f4      ] };

+    key <AB03> { [ 0x010010ea,  0x010000a9      ] };

+    key <AB04> { [ 0x010010d5,  0x010010f3      ] };

+    key <AB05> { [ 0x010010d1,  B               ] };

+    key <AB06> { [ 0x010010dc,  0x010010fc      ] };

+    key <AB07> { [ comma,       0x01002014      ] };

+    key <AB08> { [ 0x010010e8,  S               ] };

+    key <AB09> { [ 0x010010e6,  noSymbol        ] };

+    key <AB10> { [ 0x010010ed,  noSymbol        ] };

+

+};

+

diff --git a/xorg-server/xkbdata.src/symbols/il b/xorg-server/xkbdata.src/symbols/il
index 1d49bc874..143a7c5cd 100644
--- a/xorg-server/xkbdata.src/symbols/il
+++ b/xorg-server/xkbdata.src/symbols/il
@@ -1,252 +1,253 @@
-// $XKeyboardConfig$
-
-// based on a keyboard map from an 'xkb/symbols/il' file
-//
-// $XFree86: xc/programs/xkbcomp/symbols/il,v 1.3 2003/01/07 02:03:44 dawes Exp $
-
-// This is a partial implemetation of the Israeli standard SI-1452
-// It does not implement changes to the English layout ("Alt-English"), 
-// as I believe that it is not the job of this layout to modify the English
-// layout.
-partial default alphanumeric_keys 
-xkb_symbols "basic" {
-    // uses the kbd layout in use in Israel.
-
-    name[Group1]= "Israel";
-
-    key <AD01> { [ slash,	Q		]	};
-    key <AD02> { [ apostrophe,	W		]	};
-    key <AD03> { [ hebrew_qoph,	E		]       };
-    key <AD04> { [ hebrew_resh,	R		]	};
-    key <AD05> { [ hebrew_aleph,T		]       };
-    key <AD06> { [ hebrew_tet,	Y		]       };
-    key <AD07> { [ hebrew_waw,	U		]       };
-    key <AD08> { [ hebrew_finalnun,	I	]       };
-    key <AD09> { [ hebrew_finalmem,	O	]       };
-    key <AD10> { [ hebrew_pe,	P		]	};
-
-    key <AC01> { [ hebrew_shin,	A		]	};
-    key <AC02> { [ hebrew_dalet,S		]       };
-    key <AC03> { [ hebrew_gimel,D		]       };
-    key <AC04> { [ hebrew_kaph,	F		]	};
-    key <AC05> { [ hebrew_ayin,	G		]       };
-    key <AC06> { [ hebrew_yod,	H		]       };
-    key <AC07> { [ hebrew_chet,	J		]	};
-    key <AC08> { [ hebrew_lamed, K		]	};
-    key <AC09> { [ hebrew_finalkaph,	L	]       };
-    key <AC10> { [ hebrew_finalpe,	colon	]       };
-    key <AC11> { [ comma,	quotedbl	]	};
-
-    key <AB01> { [ hebrew_zain,	Z		]       };
-    key <AB02> { [ hebrew_samech, X		]       };
-    key <AB03> { [ hebrew_bet,	C		]       };
-    key <AB04> { [ hebrew_he,	V		]       };
-    key <AB05> { [ hebrew_nun,	B		]       };
-    key <AB06> { [ hebrew_mem,	N		]	};
-    key <AB07> { [ hebrew_zade,	M		]	};
-    // Mirrored:
-    key <AB08> { [ hebrew_taw,	greater		]	};
-    key <AB09> { [ hebrew_finalzade,	less	]	};
-
-    key.type[Group1] = "THREE_LEVEL";
-    
-    key <TLDE> { [ semicolon,	asciitilde,0x10005b0	]}; // Sheva
-    key <AB10> { [ period,	question,  0x10005c3	]}; // Sof Pasuq
-  
-    // The following may get overriden by the iso9995-3(basic101) symbols.
-    // therefore they are included here. 
-    // Including them isn't a great idea (for instance: what if group 1 uses
-    // UK keyboard mapping, and maps shift-3 to sterling? This mapping won't
-    // preserve that, and I'm not sure that this is a good feature.
-    key <AE01> { [     1, exclam      , 0x10005b1	]}; // H. Segol
-    key <AE02> { [     2, at          , 0x10005b2	]}; // H. Patah
-    key <AE03> { [     3, numbersign  , 0x10005b3	]}; // H.  Qamats
-    key <AE04> { [     4, dollar      , 0x10005b4	]}; // Hiriq
-    key <AE05> { [     5, percent     , 0x10005b5	]}; // Tsere
-    key <AE06> { [     6, asciicircum , 0x10005b6	]}; // Segol
-    key <AE07> { [     7, ampersand   , 0x10005b7	]}; // Patah
-    key <AE08> { [     8, asterisk    , 0x10005b8	]}; // Qamats
-    // Mirrored: 
-    key <AE09> { [     9, parenright   , 0x10005c2	]}; // Sin dot
-    key <AE10> { [     0, parenleft  , 0x10005c1	]}; // Shin dot
-    key <AE11> { [ minus, underscore  , 0x10005b9	]}; // Holam
-    key <AE12> { [ equal, plus        , 0x10005bc	]}; // Dagesh/Shuruq
-  
-    // Mirrored: 
-    key <AD11> { [ bracketright, braceright, 0x10005bf	]}; // Rafe
-    key <AD12> { [ bracketleft,  braceleft,  0x10005bd	]}; // Meteg
-                                      
-    key <BKSL> { [ backslash,    bar,  0x10005bb	]}; // Qubuts    
-};
-
-
-// nikud patter based on Dekel Tsur's Hebrew mapping for LyX
-partial alphanumeric_keys 
-xkb_symbols "lyx" {
-    name[Group1]= "Israel - lyx";
-
-    key <TLDE> { [ semicolon,	asciitilde	]	};
-    // On some key (e.g. AD01, right below) there is not yet mapping for the
-    // second shift level. Since I could not figure a simple way to map this
-    // to "emit nothing", it is currently mapped to the same letter of the
-    // first shift level (avoiding mapping may risk it be used by a character
-    // from a different group).
-    key <AD01> { [ slash,	slash		]       };
-    key <AD02> { [ apostrophe,	apostrophe	]       };
-    key <AD03> { [ hebrew_qoph,	0x10005b8	]	}; // Qamats
-    key <AD04> { [ hebrew_resh,	0x10005bc	]       }; // Dagesh/Shuruq
-    key <AD05> { [ hebrew_aleph,	0x100200e	]       }; // LRM
-    key <AD06> { [ hebrew_tet,	0x100200f	]       }; // RLM
-    key <AD07> { [ hebrew_waw,	0x10005b9	]       }; // Holam
-    key <AD08> { [ hebrew_finalnun,hebrew_finalnun]      };
-    key <AD09> { [ hebrew_finalmem,hebrew_finalmem]      };
-    key <AD10> { [ hebrew_pe,	0x10005b7	]	}; // Patah
-
-    key <AC01> { [ hebrew_shin,	0x10005b0	]	}; // Sheva
-    key <AC02> { [ hebrew_dalet,	0x10005bc	]       }; // Dagesh/Shuruq
-    key <AC03> { [ hebrew_gimel,	hebrew_gimel	]       };
-    key <AC04> { [ hebrew_kaph,	hebrew_kaph	]	}; 
-    key <AC05> { [ hebrew_ayin,	0x10005c2	]       }; // Sin dot
-    key <AC06> { [ hebrew_yod,	0x10005c1	]       }; // Shin dot
-    key <AC07> { [ hebrew_chet,	0x10005b4	]	}; // Hiriq
-    key <AC08> { [ hebrew_lamed, 0x10020aa	]	}; // NIS
-    key <AC09> { [ hebrew_finalkaph,hebrew_finalkaph]    };
-    key <AC10> { [ hebrew_finalpe,	colon	]       };
-    key <AC11> { [ comma,	quotedbl	]	};
-
-    key <AB01> { [ hebrew_zain,	hebrew_zain	]       };
-    key <AB02> { [ hebrew_samech,0x10005b6	]       }; // Segol
-    key <AB03> { [ hebrew_bet,	0x10005bb	]       }; // Qubuts
-    key <AB04> { [ hebrew_he,	0x10005b1	]       }; // H. Segol
-    key <AB05> { [ hebrew_nun,	0x10005b2	]	}; // H. Patah
-    key <AB06> { [ hebrew_mem,	0x10005b3	]       }; // H.  Qamats
-    key <AB07> { [ hebrew_zade,	0x10005b5	]	}; // Tsere
-    key <AB08> { [ hebrew_taw,	greater		]	};
-    key <AB09> { [ hebrew_finalzade,	less	]	};
-    key <AB10> { [ period,	question	]	};
-
-    // Note the parens mirroring below:
-    key <AD11> { [ bracketright,	braceright	]       };
-    key <AD12> { [ bracketleft,	braceleft	]       };
-    key <AE09> { [ 9         ,	parenright	]       };
-    key <AE10> { [ 0         ,	parenleft	]       };
-    
-    key <AE11> { [     minus,	0x10005be	]	}; // H. Hiphen
-};
-
-
-partial alphanumeric_keys 
-xkb_symbols "phonetic" {
-
-    // uses the phonetic layout from old Slackware 'il.map' file
-
-    name[Group1]= "Israel - Phonetic";
-
-    key <AE12> {        [     equal,    plus, hebrew_doublelowline, hebrew_doublelowline ]};
-
-    key <LatQ> {	[ hebrew_qoph, hebrew_qoph	]	};
-    key <LatW> {	[ hebrew_waw, hebrew_waw	]	};
-    key <LatE> {	[ hebrew_aleph, hebrew_aleph	]       };
-    key <LatR> {	[ hebrew_resh, hebrew_resh	]	};
-    key <LatT> {	[ hebrew_taw, hebrew_tet	]       };
-    key <LatY> {	[ hebrew_ayin, hebrew_ayin	]       };
-    key <LatU> {	[ hebrew_waw, hebrew_waw	]       };
-    key <LatI> {	[ hebrew_yod, hebrew_yod	]       };
-    key <LatO> {	[ hebrew_samech, hebrew_samech	]       };
-    key <LatP> {	[ hebrew_pe, hebrew_finalpe	]	};
-
-    key <LatA> {	[ hebrew_aleph, hebrew_aleph	]	};
-    key <LatS> {	[ hebrew_shin, hebrew_shin	]       };
-    key <LatD> {	[ hebrew_dalet, hebrew_dalet	]       };
-    key <LatF> {	[ hebrew_pe, hebrew_finalpe	]	};
-    key <LatG> {	[ hebrew_gimel, hebrew_gimel	]       };
-    key <LatH> {	[ hebrew_he, hebrew_he		]       };
-    key <LatJ> {	[ hebrew_yod, hebrew_yod	]	};
-    key <LatK> {	[ hebrew_kaph, hebrew_finalkaph	]	};
-    key <LatL> {	[ hebrew_lamed, hebrew_lamed	]       };
-
-    key <LatZ> {	[ hebrew_zain, hebrew_zain	]       };
-    key <LatX> {	[ hebrew_chet, hebrew_chet	]       };
-    key <LatC> {	[ hebrew_zade, hebrew_finalzade	]       };
-    key <LatV> {	[ hebrew_waw, hebrew_waw	]       };
-    key <LatB> {	[ hebrew_bet, hebrew_bet	]       };
-    key <LatN> {	[ hebrew_nun, hebrew_finalnun	]	};
-    key <LatM> {	[ hebrew_mem, hebrew_finalmem	]	};
-};
-
-// The 'Biblical Hebrew' keyboard layout as defined by Tiro for use with the
-// 'SBL Hebrew' font was added 2006.11.13 by Sebastian J. Bronner
-// <waschtl@sbronner.com>.  Its primary features (as compared to the lyx layout)
-// are that the consonants are in the Israeli standard positions, that a great
-// multitude of glyphs can be input directly from the keyboard, and that it is
-// the closest thing to a standard layout a theologian can hope for.
-// Documentation (including printable keyboard tables), SBL Hebrew font, and
-// keyboard layout for Windows are available at
-// http://www.sbl-site.org/Resources/Resources_BiblicalFonts.aspx.
-//
-// It is of interest that the 'basic' layout defined first in this file (as
-// ships with x.org disagrees in the non-consonant characters that the Tiro-
-// layout claims to be the Israeli standard.  Tiros apparent diligence in the
-// PDF-documentation accompanying the keyboard-layout-files lead me to put
-// greater stock in their claim than in this file.  Therefore, the 'biblical'
-// layout below does not include 'il(basic)' but redoes the _whole_ thing from
-// scratch.
-
-partial alphanumeric_keys 
-xkb_symbols "biblical" {
-	name[Group1]= "Israel - Biblical Hebrew (Tiro)";
-	key.type = "FOUR_LEVEL_SEMIALPHABETIC";
-
-	key <TLDE> { [ U05C3, U05AE, semicolon, asciitilde ] };
-	key <AE01> { [ 1,     U05A9, VoidSymbol, exclam ] };
-	key <AE02> { [ 2,     U0599, VoidSymbol, at ] };
-	key <AE03> { [ 3,     U0592, VoidSymbol, numbersign ] };
-	key <AE04> { [ 4,     U05AF, NewSheqelSign, dollar ] };
-	key <AE05> { [ 5,     VoidSymbol, U200D, percent ] };
-	key <AE06> { [ 6,     U05B9, U200C, asciicircum ] };
-	key <AE07> { [ 7,     U05BF, U034F, ampersand ] };
-	key <AE08> { [ 8,     U05C2, U200E, asterisk ] };
-	key <AE09> { [ 9,     U05C1, U200F, parenright ] };
-	key <AE10> { [ 0,     U059D, U25CC, parenleft ] };
-	key <AE11> { [ U05BE, U05A0, minus, underscore ] };
-	key <AE12> { [ equal, U05BC, VoidSymbol, plus ] };
-
-	key <AD01> { [ U0307, U05C4, U0308, slash ] };
-	key <AD02> { [ U05F3, U05AC, U05F4, apostrophe ] };
-	key <AD03> { [ hebrew_qoph, U05AB, U20AC ] };
-	key <AD04> { [ hebrew_resh, U059F ] };
-	key <AD05> { [ hebrew_aleph, U0593 ] };
-	key <AD06> { [ hebrew_tet, U059E ] };
-	key <AD07> { [ hebrew_waw, U059C, U05F0 ] };
-	key <AD08> { [ hebrew_finalnun, U05A1 ] };
-	key <AD09> { [ hebrew_finalmem, U0595 ] };
-	key <AD10> { [ hebrew_pe, U0594 ] };
-	key <AD11> { [ bracketright, U0597, VoidSymbol, braceright ] };
-	key <AD12> { [ bracketleft, U0598, VoidSymbol, braceleft ] };
-	key <BKSL> { [ U05C0, U05A8, backslash, bar ] };
-
-	key <AC01> { [ hebrew_shin, U05BD ] };
-	key <AC02> { [ hebrew_dalet, U05B0 ] };
-	key <AC03> { [ hebrew_gimel, U05BB ] };
-	key <AC04> { [ hebrew_kaph, U05B4 ] };
-	key <AC05> { [ hebrew_ayin, U05B1 ] };
-	key <AC06> { [ hebrew_yod, U05B6, U05F2 ] };
-	key <AC07> { [ hebrew_chet, U05B5, U05F1 ] };
-	key <AC08> { [ hebrew_lamed, U05B3 ] };
-	key <AC09> { [ hebrew_finalkaph, U05B8, U05C7 ] };
-	key <AC10> { [ hebrew_finalpe, U05B2, VoidSymbol, colon ] };
-	key <AC11> { [ U059a, U05B7, comma, quotedbl ] };
-
-	key <AB01> { [ hebrew_zain, U05C5 ] };
-	key <AB02> { [ hebrew_samech, U05A4 ] };
-	key <AB03> { [ hebrew_bet, U05AA, U05A2 ] };
-	key <AB04> { [ hebrew_he, U05A6 ] };
-	key <AB05> { [ hebrew_nun, U05A5, U05C6 ] };
-	key <AB06> { [ hebrew_mem, U05A7 ] };
-	key <AB07> { [ hebrew_zade, U059B ] };
-	key <AB08> { [ hebrew_taw, U0591, VoidSymbol, greater ] };
-	key <AB09> { [ hebrew_finalzade, U0596, VoidSymbol, less ] };
-	key <AB10> { [ U05AD, U05A3, period, question ] };
-
-	key <SPCE> { [ space, space, thinspace, nobreakspace ] };
-};
+// $XKeyboardConfig$

+

+// based on a keyboard map from an 'xkb/symbols/il' file

+//

+// $XFree86: xc/programs/xkbcomp/symbols/il,v 1.3 2003/01/07 02:03:44 dawes Exp $

+

+// This is a partial implemetation of the Israeli standard SI-1452

+// It does not implement changes to the English layout ("Alt-English"), 

+// as I believe that it is not the job of this layout to modify the English

+// layout.

+partial default alphanumeric_keys 

+xkb_symbols "basic" {

+    // uses the kbd layout in use in Israel.

+

+    name[Group1]= "Israel";

+

+    key <AD01> { [ slash,	Q		]	};

+    key <AD02> { [ apostrophe,	W		]	};

+    key <AD03> { [ hebrew_qoph,	E		]       };

+    key <AD04> { [ hebrew_resh,	R		]	};

+    key <AD05> { [ hebrew_aleph,T		]       };

+    key <AD06> { [ hebrew_tet,	Y		]       };

+    key <AD07> { [ hebrew_waw,	U		]       };

+    key <AD08> { [ hebrew_finalnun,	I	]       };

+    key <AD09> { [ hebrew_finalmem,	O	]       };

+    key <AD10> { [ hebrew_pe,	P		]	};

+

+    key <AC01> { [ hebrew_shin,	A		]	};

+    key <AC02> { [ hebrew_dalet,S		]       };

+    key <AC03> { [ hebrew_gimel,D		]       };

+    key <AC04> { [ hebrew_kaph,	F		]	};

+    key <AC05> { [ hebrew_ayin,	G		]       };

+    key <AC06> { [ hebrew_yod,	H		]       };

+    key <AC07> { [ hebrew_chet,	J		]	};

+    key <AC08> { [ hebrew_lamed, K		]	};

+    key <AC09> { [ hebrew_finalkaph,	L	]       };

+    key <AC10> { [ hebrew_finalpe,	colon	]       };

+    key <AC11> { [ comma,	quotedbl	]	};

+

+    key <AB01> { [ hebrew_zain,	Z		]       };

+    key <AB02> { [ hebrew_samech, X		]       };

+    key <AB03> { [ hebrew_bet,	C		]       };

+    key <AB04> { [ hebrew_he,	V		]       };

+    key <AB05> { [ hebrew_nun,	B		]       };

+    key <AB06> { [ hebrew_mem,	N		]	};

+    key <AB07> { [ hebrew_zade,	M		]	};

+    // Mirrored:

+    key <AB08> { [ hebrew_taw,	greater		]	};

+    key <AB09> { [ hebrew_finalzade,	less	]	};

+

+    key.type[Group1] = "THREE_LEVEL";

+    

+    key <TLDE> { [ semicolon,	asciitilde,0x10005b0	]}; // Sheva

+    key <AB10> { [ period,	question,  0x10005c3	]}; // Sof Pasuq

+  

+    // The following may get overriden by the iso9995-3(basic101) symbols.

+    // therefore they are included here. 

+    // Including them isn't a great idea (for instance: what if group 1 uses

+    // UK keyboard mapping, and maps shift-3 to sterling? This mapping won't

+    // preserve that, and I'm not sure that this is a good feature.

+    key <AE01> { [     1, exclam      , 0x10005b1	]}; // H. Segol

+    key <AE02> { [     2, at          , 0x10005b2	]}; // H. Patah

+    key <AE03> { [     3, numbersign  , 0x10005b3	]}; // H.  Qamats

+    key <AE04> { [     4, dollar      , 0x10005b4	]}; // Hiriq

+    key <AE05> { [     5, percent     , 0x10005b5	]}; // Tsere

+    key <AE06> { [     6, asciicircum , 0x10005b6	]}; // Segol

+    key <AE07> { [     7, ampersand   , 0x10005b7	]}; // Patah

+    key <AE08> { [     8, asterisk    , 0x10005b8	]}; // Qamats

+    // Mirrored: 

+    key <AE09> { [     9, parenright   , 0x10005c2	]}; // Sin dot

+    key <AE10> { [     0, parenleft  , 0x10005c1	]}; // Shin dot

+    key <AE11> { [ minus, underscore  , 0x10005b9	]}; // Holam

+    key <AE12> { [ equal, plus        , 0x10005bc	]}; // Dagesh/Shuruq

+  

+    // Mirrored: 

+    key <AD11> { [ bracketright, braceright, 0x10005bf	]}; // Rafe

+    key <AD12> { [ bracketleft,  braceleft,  0x10005bd	]}; // Meteg

+                                      

+    key <BKSL> { [ backslash,    bar,  0x10005bb	]}; // Qubuts    

+};

+

+

+// nikud patter based on Dekel Tsur's Hebrew mapping for LyX

+partial alphanumeric_keys 

+xkb_symbols "lyx" {

+    name[Group1]= "Israel - lyx";

+

+    key <TLDE> { [ semicolon,	asciitilde	]	};

+    // On some key (e.g. AD01, right below) there is not yet mapping for the

+    // second shift level. Since I could not figure a simple way to map this

+    // to "emit nothing", it is currently mapped to the same letter of the

+    // first shift level (avoiding mapping may risk it be used by a character

+    // from a different group).

+    key <AD01> { [ slash,	slash		]       };

+    key <AD02> { [ apostrophe,	apostrophe	]       };

+    key <AD03> { [ hebrew_qoph,	0x10005b8	]	}; // Qamats

+    key <AD04> { [ hebrew_resh,	0x10005bc	]       }; // Dagesh/Shuruq

+    key <AD05> { [ hebrew_aleph,	0x100200e	]       }; // LRM

+    key <AD06> { [ hebrew_tet,	0x100200f	]       }; // RLM

+    key <AD07> { [ hebrew_waw,	0x10005b9	]       }; // Holam

+    key <AD08> { [ hebrew_finalnun,hebrew_finalnun]      };

+    key <AD09> { [ hebrew_finalmem,hebrew_finalmem]      };

+    key <AD10> { [ hebrew_pe,	0x10005b7	]	}; // Patah

+

+    key <AC01> { [ hebrew_shin,	0x10005b0	]	}; // Sheva

+    key <AC02> { [ hebrew_dalet,	0x10005bc	]       }; // Dagesh/Shuruq

+    key <AC03> { [ hebrew_gimel,	hebrew_gimel	]       };

+    key <AC04> { [ hebrew_kaph,	hebrew_kaph	]	}; 

+    key <AC05> { [ hebrew_ayin,	0x10005c2	]       }; // Sin dot

+    key <AC06> { [ hebrew_yod,	0x10005c1	]       }; // Shin dot

+    key <AC07> { [ hebrew_chet,	0x10005b4	]	}; // Hiriq

+    key <AC08> { [ hebrew_lamed, 0x10020aa	]	}; // NIS

+    key <AC09> { [ hebrew_finalkaph,hebrew_finalkaph]    };

+    key <AC10> { [ hebrew_finalpe,	colon	]       };

+    key <AC11> { [ comma,	quotedbl	]	};

+

+    key <AB01> { [ hebrew_zain,	hebrew_zain	]       };

+    key <AB02> { [ hebrew_samech,0x10005b6	]       }; // Segol

+    key <AB03> { [ hebrew_bet,	0x10005bb	]       }; // Qubuts

+    key <AB04> { [ hebrew_he,	0x10005b1	]       }; // H. Segol

+    key <AB05> { [ hebrew_nun,	0x10005b2	]	}; // H. Patah

+    key <AB06> { [ hebrew_mem,	0x10005b3	]       }; // H.  Qamats

+    key <AB07> { [ hebrew_zade,	0x10005b5	]	}; // Tsere

+    key <AB08> { [ hebrew_taw,	greater		]	};

+    key <AB09> { [ hebrew_finalzade,	less	]	};

+    key <AB10> { [ period,	question	]	};

+

+    // Note the parens mirroring below:

+    key <AD11> { [ bracketright,	braceright	]       };

+    key <AD12> { [ bracketleft,	braceleft	]       };

+    key <AE09> { [ 9         ,	parenright	]       };

+    key <AE10> { [ 0         ,	parenleft	]       };

+    

+    key <AE11> { [ minus     ,	0x10005be	]	}; // H. Hiphen

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

+};

+

+

+partial alphanumeric_keys 

+xkb_symbols "phonetic" {

+

+    // uses the phonetic layout from old Slackware 'il.map' file

+

+    name[Group1]= "Israel - Phonetic";

+

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

+

+    key <LatQ> {	[ hebrew_qoph, hebrew_qoph	]	};

+    key <LatW> {	[ hebrew_waw, hebrew_waw	]	};

+    key <LatE> {	[ hebrew_aleph, hebrew_aleph	]       };

+    key <LatR> {	[ hebrew_resh, hebrew_resh	]	};

+    key <LatT> {	[ hebrew_taw, hebrew_tet	]       };

+    key <LatY> {	[ hebrew_ayin, hebrew_ayin	]       };

+    key <LatU> {	[ hebrew_waw, hebrew_waw	]       };

+    key <LatI> {	[ hebrew_yod, hebrew_yod	]       };

+    key <LatO> {	[ hebrew_samech, hebrew_samech	]       };

+    key <LatP> {	[ hebrew_pe, hebrew_finalpe	]	};

+

+    key <LatA> {	[ hebrew_aleph, hebrew_aleph	]	};

+    key <LatS> {	[ hebrew_shin, hebrew_shin	]       };

+    key <LatD> {	[ hebrew_dalet, hebrew_dalet	]       };

+    key <LatF> {	[ hebrew_pe, hebrew_finalpe	]	};

+    key <LatG> {	[ hebrew_gimel, hebrew_gimel	]       };

+    key <LatH> {	[ hebrew_he, hebrew_he		]       };

+    key <LatJ> {	[ hebrew_yod, hebrew_yod	]	};

+    key <LatK> {	[ hebrew_kaph, hebrew_finalkaph	]	};

+    key <LatL> {	[ hebrew_lamed, hebrew_lamed	]       };

+

+    key <LatZ> {	[ hebrew_zain, hebrew_zain	]       };

+    key <LatX> {	[ hebrew_chet, hebrew_chet	]       };

+    key <LatC> {	[ hebrew_zade, hebrew_finalzade	]       };

+    key <LatV> {	[ hebrew_waw, hebrew_waw	]       };

+    key <LatB> {	[ hebrew_bet, hebrew_bet	]       };

+    key <LatN> {	[ hebrew_nun, hebrew_finalnun	]	};

+    key <LatM> {	[ hebrew_mem, hebrew_finalmem	]	};

+};

+

+// The 'Biblical Hebrew' keyboard layout as defined by Tiro for use with the

+// 'SBL Hebrew' font was added 2006.11.13 by Sebastian J. Bronner

+// <waschtl@sbronner.com>.  Its primary features (as compared to the lyx layout)

+// are that the consonants are in the Israeli standard positions, that a great

+// multitude of glyphs can be input directly from the keyboard, and that it is

+// the closest thing to a standard layout a theologian can hope for.

+// Documentation (including printable keyboard tables), SBL Hebrew font, and

+// keyboard layout for Windows are available at

+// http://www.sbl-site.org/Resources/Resources_BiblicalFonts.aspx.

+//

+// It is of interest that the 'basic' layout defined first in this file (as

+// ships with x.org disagrees in the non-consonant characters that the Tiro-

+// layout claims to be the Israeli standard.  Tiros apparent diligence in the

+// PDF-documentation accompanying the keyboard-layout-files lead me to put

+// greater stock in their claim than in this file.  Therefore, the 'biblical'

+// layout below does not include 'il(basic)' but redoes the _whole_ thing from

+// scratch.

+

+partial alphanumeric_keys 

+xkb_symbols "biblical" {

+	name[Group1]= "Israel - Biblical Hebrew (Tiro)";

+	key.type = "FOUR_LEVEL_SEMIALPHABETIC";

+

+	key <TLDE> { [ U05C3, U05AE, semicolon, asciitilde ] };

+	key <AE01> { [ 1,     U05A9, VoidSymbol, exclam ] };

+	key <AE02> { [ 2,     U0599, VoidSymbol, at ] };

+	key <AE03> { [ 3,     U0592, VoidSymbol, numbersign ] };

+	key <AE04> { [ 4,     U05AF, NewSheqelSign, dollar ] };

+	key <AE05> { [ 5,     VoidSymbol, U200D, percent ] };

+	key <AE06> { [ 6,     U05B9, U200C, asciicircum ] };

+	key <AE07> { [ 7,     U05BF, U034F, ampersand ] };

+	key <AE08> { [ 8,     U05C2, U200E, asterisk ] };

+	key <AE09> { [ 9,     U05C1, U200F, parenright ] };

+	key <AE10> { [ 0,     U059D, U25CC, parenleft ] };

+	key <AE11> { [ U05BE, U05A0, minus, underscore ] };

+	key <AE12> { [ equal, U05BC, VoidSymbol, plus ] };

+

+	key <AD01> { [ U0307, U05C4, U0308, slash ] };

+	key <AD02> { [ U05F3, U05AC, U05F4, apostrophe ] };

+	key <AD03> { [ hebrew_qoph, U05AB, U20AC ] };

+	key <AD04> { [ hebrew_resh, U059F ] };

+	key <AD05> { [ hebrew_aleph, U0593 ] };

+	key <AD06> { [ hebrew_tet, U059E ] };

+	key <AD07> { [ hebrew_waw, U059C, U05F0 ] };

+	key <AD08> { [ hebrew_finalnun, U05A1 ] };

+	key <AD09> { [ hebrew_finalmem, U0595 ] };

+	key <AD10> { [ hebrew_pe, U0594 ] };

+	key <AD11> { [ bracketright, U0597, VoidSymbol, braceright ] };

+	key <AD12> { [ bracketleft, U0598, VoidSymbol, braceleft ] };

+	key <BKSL> { [ U05C0, U05A8, backslash, bar ] };

+

+	key <AC01> { [ hebrew_shin, U05BD ] };

+	key <AC02> { [ hebrew_dalet, U05B0 ] };

+	key <AC03> { [ hebrew_gimel, U05BB ] };

+	key <AC04> { [ hebrew_kaph, U05B4 ] };

+	key <AC05> { [ hebrew_ayin, U05B1 ] };

+	key <AC06> { [ hebrew_yod, U05B6, U05F2 ] };

+	key <AC07> { [ hebrew_chet, U05B5, U05F1 ] };

+	key <AC08> { [ hebrew_lamed, U05B3 ] };

+	key <AC09> { [ hebrew_finalkaph, U05B8, U05C7 ] };

+	key <AC10> { [ hebrew_finalpe, U05B2, VoidSymbol, colon ] };

+	key <AC11> { [ U059a, U05B7, comma, quotedbl ] };

+

+	key <AB01> { [ hebrew_zain, U05C5 ] };

+	key <AB02> { [ hebrew_samech, U05A4 ] };

+	key <AB03> { [ hebrew_bet, U05AA, U05A2 ] };

+	key <AB04> { [ hebrew_he, U05A6 ] };

+	key <AB05> { [ hebrew_nun, U05A5, U05C6 ] };

+	key <AB06> { [ hebrew_mem, U05A7 ] };

+	key <AB07> { [ hebrew_zade, U059B ] };

+	key <AB08> { [ hebrew_taw, U0591, VoidSymbol, greater ] };

+	key <AB09> { [ hebrew_finalzade, U0596, VoidSymbol, less ] };

+	key <AB10> { [ U05AD, U05A3, period, question ] };

+

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

+};

diff --git a/xorg-server/xkbdata.src/symbols/in b/xorg-server/xkbdata.src/symbols/in
index f80abfe91..84cf0cd25 100644
--- a/xorg-server/xkbdata.src/symbols/in
+++ b/xorg-server/xkbdata.src/symbols/in
@@ -1,1334 +1,1336 @@
-// $XKeyboardConfig$
-
-// This layout includes all Indian layouts, including:
-//     - Bengali
-//     - Gujarati 
-//     - Kannada 
-//     - Malayalam
-//     - Oriya 
-//     - Tamil
-//     - Telugu
-//     - Urdu
-
-// Links:
-// - Indic INSCRIPT keyboard layout diagrams:
-//     http://java.sun.com/products/jfc/tsc/articles/InputMethod/indiclayout.html
-// - Ekusheyr Shadhinota (Bengali layouts):
-//     http://ekushey.org/projects/shadhinota/index.html
-// - Microsoft Windows XP SP2: Indic Language Standards - an Introduction:
-//     http://www.bhashaindia.com/MSProducts/XpSp2/Articles/IndicLanguageStandards.aspx
-
-// based on a keyboard map from an 'xkb/symbols/dev' file
-
-// Devangari is the default. Kill me if I am wrong:)
-default partial alphanumeric_keys
-xkb_symbols "deva" {
-	// March 2004 -- David Holl <smyrph+dev_xkb@ece.wpi.edu>
-	name[Group1]="India";
-
-	key.type="FOUR_LEVEL";
-
-	key <TLDE> { [ U094a, U0912,   grave, asciitilde  ] };
-	key <AE01> { [ U0967, U090d,       1, exclam      ] };
-	key <AE02> { [ U0968, U0945,       2, at          ] };
-	// Shift+AE0[3-8] really need to return a macro of keys defined by
-	// INSCRIPT in place of the symbols that are here for now.  But this
-	// requires XKB to map 1 key into two to three other key presses.
-	key <AE03> { [ U0969, numbersign,  3, numbersign  ] };
-	key <AE04> { [ U096a, dollar,      4, dollar      ] };
-	key <AE05> { [ U096b, percent,     5, percent     ] };
-	key <AE06> { [ U096c, asciicircum, 6, asciicircum ] };
-	key <AE07> { [ U096d, ampersand,   7, ampersand   ] };
-	key <AE08> { [ U096e, asterisk,    8, asterisk    ] };
-	key <AE09> { [ U096f, parenleft,   9, parenleft   ] };
-	key <AE10> { [ U0966, parenright,  0, parenright  ] };
-	key <AE11> { [ minus, U0903, minus, underscore    ] };
-	key <AE12> { [ U0943, U090b, U0944, U0960 ] };
-
-	key <AD01> { [ U094c, U0914 ] };
-	key <AD02> { [ U0948, U0910 ] };
-	key <AD03> { [ U093e, U0906 ] };
-	key <AD04> { [ U0940, U0908, U0963, U0961 ] };
-	key <AD05> { [ U0942, U090a ] };
-	key <AD06> { [ U092c, U092d ] };
-	key <AD07> { [ U0939, U0919 ] };
-	key <AD08> { [ U0917, U0918, U095a ] };
-	key <AD09> { [ U0926, U0927 ] };
-	key <AD10> { [ U091c, U091d, U095b ] };
-	key <AD11> { [ U0921, U0922, U095c, U095d ] };
-	key <AD12> { [ U093c, U091e ] };
-	// I added \ / ? | for shell-convenience (file names and piping)
-	key <BKSL> { [ U0949, U0911, U005C, U007C ] };
-
-	key <AC01> { [ U094b, U0913 ] };
-	key <AC02> { [ U0947, U090f ] };
-	key <AC03> { [ U094d, U0905 ] };
-	key <AC04> { [ U093f, U0907, U0962, U090c ] };
-	key <AC05> { [ U0941, U0909 ] };
-	key <AC06> { [ U092a, U092b, NoSymbol, U095e ] };
-	key <AC07> { [ U0930, U0931 ] };
-	key <AC08> { [ U0915, U0916, U0958, U0959 ] };
-	key <AC09> { [ U0924, U0925 ] };
-	key <AC10> { [ U091a, U091b, U0952 ] };
-	key <AC11> { [ U091f, U0920, NoSymbol, U0951 ] };
-
-	key <AB01> { [ U0946, U090e, U0953 ] };
-	key <AB02> { [ U0902, U0901, NoSymbol, U0950 ] };
-	key <AB03> { [ U092e, U0923, U0954 ] };
-	key <AB04> { [ U0928, U0929 ] };
-	key <AB05> { [ U0935, U0934 ] };
-	key <AB06> { [ U0932, U0933 ] };
-	key <AB07> { [ U0938, U0936 ] };
-	key <AB08> { [ comma, U0937, U0970 ] };
-	key <AB09> { [ period, U0964, U0965, U093d ] };
-	// I added \ / ? | for shell-convenience (file names and piping)
-	key <AB10> { [ U092f, U095f, slash, question ] };
-
-	// space, space, Zero-Width-Non-Joiner (ZWNJ), Zero-Width-Joiner (ZWJ):
-	key <SPCE> { [ space, space, U200c, U200d ] };
-};
-
-//Name		:	Bolnagri (Combined)
-//Description	:	A phonetic keyboard layout for Devnagari(Hindi)
-//			http://www.indlinux.org/wiki/index.php/BolNagri
-//NOTE		: 	This is a combined map of bolnagri_matras and bolnagri_vowels.
-//Inspired by "devrom" keymap by Steve Smith for the windows tool "keyman"
-//Original Author :	Noah Levitt<nlevitt at columbia.edu>
-//Past Authors  : Pramod.R <pramodr at gmail.com> and Ravikant <ravikant at sarai.net>
-// Current Main.: G Karunakar <karunakar@sarai.net>
-
-partial alphanumeric_keys
-xkb_symbols "bolnagri" {
-     name[Group1] = "India - Hindi Bolnagri";
-     key.type="FOUR_LEVEL";
-    //Top Alphanumeric row
-    // Roman digits
-    key <TLDE>  { [   U0902,	U0901,		apostrophe, 	asciitilde ] }; // apostrophe: anusvara, candrabindu
-    key <AE01>  { [   1,	exclam,		U0967,		exclam	   ] };
-    key <AE02>  { [   2,	at,		U0968,		at	   ] };
-    key <AE03>  { [   3,    	numbersign, 	U0969,		numbersign ] };
-    key <AE04>  { [   4,	dollar,		U096A,		dollar     ] };
-    key <AE05>  { [   5,	percent,	U096B,		percent    ] };
-    key <AE06>  { [   6,	asciicircum,	U096C,		asciicircum ] };
-    key <AE07>  { [   7,	ampersand,	U096D,		ampersand  ] };
-    key <AE08>  { [   8,	asterisk,	U096E,		asterisk   ] };
-    key <AE09>  { [   9,	parenleft,	U096F,		parenleft  ] };
-    key <AE10>  { [   0,	parenright,	U0966,		parenright ] };
-    key <AE11>	{ [   minus,	underscore	     ] };
-    key <AE12>	{ [   equal,	plus		     ] };
-    key <BKSL>  { [   U0964,	U0965,		U007C,		U005C   ] }; //pipe : danda, double danda
-
-    //Q Row	
-    key <AD01>   { [   U200C, 	U200D   ] };  // Q: ZWNJ, ZWJ
-    key <AD02>   { [   U0935,  	U950	] };  // W: wa, OM
-    key <AD03>   { [   U0947,   U0948,	U090F,	U0910   ] };  // E: e, ai matras
-    key <AD04>   { [   U0930,	U0943  	] };  // R: ra, vocalic Ri
-    key <AD05>   { [   U0924,   U0925   ] };  // T: ta, tha
-    key <AD06>   { [   U092f,	U091E   ] };  // Y: ya, nya
-    key <AD07>   { [   U0941,   U0942,	U0909,	U090A   ] };  // U: u, uu matras
-    key <AD08>   { [   U093F,   U0940,	U0907,	U0908   ] };  // I: i, ii matras
-    key <AD09>   { [   U094B,   U094C,	U0913,	U0914   ] };  // O: o, au matras
-    key <AD10>   { [   U092A,   U092B   ] };  // P: pa, pha
-    key <AD11>   { [   bracketleft,   braceleft   ] };  
-    key <AD12>	 { [   bracketright, braceright   ] };
-    
-    //A Row
-    key <AC01>   { [   U093E,	 U0906,	U0905,	U0906  ] };   // A: aa
-    key <AC02>   { [   U0938,    U0937   ] };  // S: sa, ssa
-    key <AC03>   { [   U0926,    U0927   ] };  // D: da, dha
-    key <AC04>   { [   U091F,    U0920   ] };  // F: TA, THA
-    key <AC05>   { [   U0917,    U0918   ] };  // G: ga, gha
-    key <AC06>   { [   U0939,    U0903   ] };  // H: ha, visarg 
-    key <AC07>   { [   U091C,    U091D   ] };  // J: ja, jha
-    key <AC08>   { [   U0915,    U0916   ] };  // K: ka, kha
-    key <AC09>   { [   U0932,	 U0962   ] };  // L: la, vocalic L or lru matra`
-    key <AC10>   { [   semicolon, colon  ] }; 
-    key <AC11>   { [apostrophe, quotedbl ] };
-
-    //Z Row
-    key <AB01>   { [   U0936,	 U0945 	 ] };  // Z: sha, akaar candra
-    key <AB02>   { [   U094D,    U0949	 ] };  // X: halant, aakaar candra
-    key <AB03>   { [   U091A,    U091B   ] };  // C: ca, cha
-    key <AB04>   { [   U0921,    U0922   ] };  // V: da, dha
-    key <AB05>   { [   U092C,    U092D   ] };  // B: ba, bha
-    key <AB06>   { [   U0928,    U0923   ] };  // N: na, nha
-    key <AB07>   { [   U092E,    U093D,	U092E,	U093D   ] };  // M: ma, avagraha
-    key <AB08>   { [   comma,    U0970	 ] };// comma: comma, dev abbreviation sign
-    key <AB09>   { [   period,   U093C 	 ] };  // period: period, nukta
-    key <AB10>	 { [   slash,   question ] };
-
-   // begin modifier mappings
-//    modifier_map Shift  { Shift_L };
-//    modifier_map Lock   { Caps_Lock };
-//    modifier_map Control{ Control_L };
-//    modifier_map Mod3   { Mode_switch };
-    include "level3(ralt_switch)"
-};
-
-// based on a keyboard map from an 'xkb/symbols/ben' file
-//
-// $XFree86: xc/programs/xkbcomp/symbols/ben,v 1.2 2002/11/22 04:03:28 dawes Exp $
-
-partial alphanumeric_keys
-xkb_symbols "ben" {
-    name[Group1]= "India - Bengali";
-
-      // Mainly numbers.
-      key <AE01> { [      U09E7 		]	};
-      key <AE02> { [      U09E8 		]	};
-      key <AE03> { [      U09E9 		]	};
-      key <AE04> { [      U09EA 		]	};
-      key <AE05> { [      U09EB		]	};
-      key <AE06> { [      U09EC 		]	};
-      key <AE07> { [      U09ED	        ]	};
-      key <AE08> { [      U09EE 		]	};
-      key <AE09> { [      U09EF, parenleft	]	};
-      key <AE10> { [      U09E6, parenright	]	};
-      key <AE11> { [      minus, U0983 	]	};
-      key <AE12> { [      U098B, U09C3	]	};
-
-// Mainly long vowels
-
-      key <AD01> { [      U09CC,  U0994	]	};
-      key <AD02> { [      U09C8,  U0990	]	};
-      key <AD03> { [      U09BE,  U0986	]	};
-      key <AD04> { [      U09C0,  U0988	]	};
-      key <AD05> { [      U09C2,  U098A	]	};
-
-// Mainly voiced consonants
-
-      key <AD06> { [      U09AC,  U09AD	]	};
-      key <AD07> { [      U09B9,  U0999 ]	};
-      key <AD08> { [      U0997,  U0998 ]	};
-      key <AD09> { [      U09A6,  U09A7 ]	};
-      key <AD10> { [      U099C,  U099D ]	};
-      key <AD11> { [      U09A1, U09A2 	]	};
-      key <AD12> { [      U09BC, U099E 	]	};
-
-// Mainly short vowels
-      key <AC01> { [      U09CB,  U0993 ]	};
-      key <AC02> { [      U09C7,  U098F ]	};
-      key <AC03> { [      U09CD,  U0985 ]	};
-      key <AC04> { [      U09BF,  U0987 ]	};
-      key <AC05> { [      U09C1,  U0989 ]	};
-
-
-// Mainly unvoiced consonants
-
-      key <AC06> { [      U09AA,  U09AB ]	};
-      key <AC07> { [      U09B0,  U09DD ]	};
-      key <AC08> { [      U0995,  U0996 ]	};
-      key <AC09> { [      U09A4,  U09A5 ]	};
-      key <AC10> { [      U099A,  U099B ]	};
-      key <AC11> { [      U099F, U09A0 	]	};
-      key <BKSL> { [      U005C, U007C 	]	};
-
-      key <AB01> { [      z, Z  		]       };
-      key <AB02> { [      U0982,  U0981 ]       };
-      key <AB03> { [      U09AE,  U09A3 ]       };
-      key <AB04> { [      U09A8,  U09A8 ]       };
-      key <AB05> { [      U09AC,  U09AC ]       };
-      key <AB06> { [      U09B2,  U09B2 ]       };
-      key <AB07> { [      U09B8,  U09B6 ]       };
-      key <AB08> { [      comma,      U09B7 ]       };
-      key <AB09> { [      period,     U0964 ]       };
-      key <AB10> { [      U09DF,  U09AF	]       };
-};
-
-xkb_symbols "ben_probhat" {
- name[Group1]= "India - Bengali Probhat";
-   key <ESC>  { [ Escape ] };
-
-// numbers
-   key <TLDE> { [ U200D, asciitilde   ] };
-   key <AE01> { [ U09E7, exclam       ] };
-   key <AE02> { [ U09E8, at           ] };
-   key <AE03> { [ U09E9, numbersign   ] };
-   key <AE04> { [ U09EA, U09F3    ] };
-   key <AE05> { [ U09EB, percent      ] };
-   key <AE06> { [ U09EC, asciicircum  ] };
-   key <AE07> { [ U09ED, U099E    ] };
-   key <AE08> { [ U09EE, U09CE    ] };
-   key <AE09> { [ U09EF, parenleft    ] };
-   key <AE10> { [ U09E6, parenright   ] };
-   key <AE11> { [ minus,     underscore   ] };
-   key <AE12> { [ equal,     plus         ] };
-   key <BKSP> { [ BackSpace               ] };
-
-// tab, q to ] 
-   key <TAB>  { [   Tab,  ISO_Left_Tab     ] };
-   key <AD01> { [   U09A6,  U09A7  ] };
-   key <AD02> { [   U09C2,  U098A  ] };
-   key <AD03> { [   U09C0,  U0988  ] };
-   key <AD04> { [   U09B0,  U09DC  ] };
-   key <AD05> { [   U099F,  U09A0  ] };
-   key <AD06> { [   U098F,  U0990  ] };
-   key <AD07> { [   U09C1,  U0989  ] };
-   key <AD08> { [   U09BF,  U0987  ] };
-   key <AD09> { [   U0993,  U0994  ] };
-   key <AD10> { [   U09AA,  U09AB  ] };
-   key <AD11> { [   U09C7,  U09C8  ] };
-   key <AD12> { [   U09CB,  U09CC  ] };
-   key <RTRN> { [   Return                 ] };
-
-// caps, a to ' 
-//   key <CAPS> { [   Caps_Lock              ] };
-   key <AC01> { [   U09BE,  U0985  ] };
-   key <AC02> { [   U09B8,  U09B7  ] };
-   key <AC03> { [   U09A1,  U09A2  ] };
-   key <AC04> { [   U09A4,  U09A5  ] };
-   key <AC05> { [   U0997,  U0998  ] };
-   key <AC06> { [   U09B9,  U0983  ] };
-   key <AC07> { [   U099C,  U099D  ] };
-   key <AC08> { [   U0995,  U0996  ] };
-   key <AC09> { [   U09B2,  U0982  ] };
-   key <AC10> { [   semicolon,  colon      ] };
-   key <AC11> { [   quoteright, quotedbl   ] };
-
-// shift, z to /
-//   key <LFSH> { [   Shift_L                ] };
-   key <AB01> { [   U09DF,  U09AF  ] };
-   key <AB02> { [   U09B6,  U09DD  ] };
-   key <AB03> { [   U099A,  U099B  ] };
-   key <AB04> { [   U0986,  U098B  ] };
-   key <AB05> { [   U09AC,  U09AD  ] };
-   key <AB06> { [   U09A8,  U09A3  ] };
-   key <AB07> { [   U09AE,  U0999  ] };
-   key <AB08> { [   comma,      U09C3  ] };
-   key <AB09> { [   U0964,  U0981  ] };
-   key <AB10> { [   U09CD,  question   ] };
-   key <BKSL> { [   U200C,  U0965  ] };
-
-//   key <LCTL> { [   Control_L              ] };
-//   key <SPCE> { [   space                  ] };
-
-//   modifier_map Shift  { Shift_L };
-//   modifier_map Lock   { Caps_Lock };
-//   modifier_map Control{ Control_L };
-
-};
-
-partial alphanumeric_keys 
-xkb_symbols "guj" {
-      name[Group1]= "India - Gujarati";
-
-      // Mainly numbers.
-      key <AE01> { [      U0AE7, U0A8D 	]	};
-      key <AE02> { [      U0AE8, U0AC5 	]	};
-      key <AE03> { [      U0AE9 	 	]	};
-      key <AE04> { [      U0AEA  	 	]	};
-      key <AE05> { [      U0AEB  	 	]	};
-      key <AE06> { [      U0AEC  	 	]	};
-      key <AE07> { [      U0AED 		]	};
-      key <AE08> { [      U0AEE  	 	]	};
-      key <AE09> { [      U0AEF, parenleft 	]	};
-      key <AE10> { [      U0AE6, parenright ]	};
-      key <AE11> { [      minus,     U0A83  ]	};
-      key <AE12> { [      U0A8B, U0AC3 	]	};
-
-// Mainly long vowels
-
-      key <AD01> { [      U0ACC, U0A94  ]	};
-      key <AD02> { [      U0AC8, U0A90  ]	};
-      key <AD03> { [      U0ABE, U0A86  ]	};
-      key <AD04> { [      U0AC0, U0A88  ]	};
-      key <AD05> { [      U0AC2, U0A8A  ]	};
-
-// Mainly voiced consonants
-
-      key <AD06> { [      U0AAC, U0AAD 	]	};
-      key <AD07> { [      U0AB9, U0A99 	]	};
-      key <AD08> { [      U0A97, U0A98 	]	};
-      key <AD09> { [      U0AA6, U0AA7 	]	};
-      key <AD10> { [      U0A9C, U0A9D 	]	};
-      key <AD11> { [      U0AA1, U0AA2 	]	};
-      key <AD12> { [      U0ABC, U0A9E 	]	};
-
-// Mainly short vowels
-      key <AC01> { [      U0ACB, U0A93	]	};
-      key <AC02> { [      U0AC7, U0A8F	]	};
-      key <AC03> { [      U0ACD, U0A85  ]	};
-      key <AC04> { [      U0ABF, U0A87  ]	};
-      key <AC05> { [      U0AC1, U0A89  ]	};
-
-// Mainly unvoiced consonants
-
-      key <AC06> { [      U0AAA, U0AAB 	]	};
-      key <AC07> { [      U0AB0, U0AB0 	]	};
-      key <AC08> { [      U0A95, U0A96 	]	};
-      key <AC09> { [      U0AA4, U0AA5 	]	};
-      key <AC10> { [      U0A9A, U0A9B 	]	};
-      key <AC11> { [      U0A9F, U0AA0 	]	};
-      key <BKSL> { [      U0AC9, U0A91 	]	};
-
-      key <AB01> { [      z        , Z		]       };
-      key <AB02> { [      U0A82, U0A81	]       };
-      key <AB03> { [      U0AAE, U0AA3  ]       };
-      key <AB04> { [      U0AA8, U0AA8   ]       };
-      key <AB05> { [      U0AB5, U0AB5   ]       };
-      key <AB06> { [      U0AB2, U0AB3  ]       };
-      key <AB07> { [      U0AB8, U0AB6  ]       };
-      key <AB08> { [      comma,     U0AB7  ]       };
-      key <AB09> { [      period,    U0964  ]       };
-      key <AB10> { [      U0AAF, question   ]       };
-};
-
-partial alphanumeric_keys 
-xkb_symbols "kan" {
-
-    // Inscript layout for Kannada  
-    // Author : G Karunakar <karunakar@freedomink.org>
-    // Date   : Wed Nov 13 17:22:58 IST 2002
-    // Kannada digits mapped in basic only
-
-    name[Group1]= "India - Kannada";
-
-    key <TLDE> { [  U0cca, U0c92	] };
-    key <AE01> { [  U0ce7			] };
-    key <AE02> { [  U0ce8			] };
-    key <AE03> { [  U0ce9			] };
-    key <AE04> { [  U0cea			] };
-    key <AE05> { [  U0ceb			] };
-    key <AE06> { [  U0cec			] };
-    key <AE07> { [  U0ced			] };
-    key <AE08> { [  U0cee			] };
-    key <AE09> { [  U0cef			] };
-    key <AE10> { [  U0ce6			] };
-    key <AE11> { [  U0c83			] };
-    key <AE12> { [  U0cc3, U0c8b	] };
-
-    key <AD01> { [  U0ccc, U0c94	] };
-    key <AD02> { [  U0cc8, U0c90	] };
-    key <AD03> { [  U0cbe, U0c86	] };
-    key <AD04> { [  U0cc0, U0c88	] };
-    key <AD05> { [  U0cc2, U0c8a	] };
-    key <AD06> { [  U0cac, U0cad	] };
-    key <AD07> { [  U0cb9, U0c99	] };
-    key <AD08> { [  U0c97, U0c98	] };
-    key <AD09> { [  U0ca6, U0ca7	] };
-    key <AD10> { [  U0c9c, U0c9d	] };
-    key <AD11> { [  U0ca1, U0ca2	] };
-    key <AD12> { [  U0cbc, U0c9e	] };
- 
-    key <AC01> { [  U0ccb, U0c93	] };
-    key <AC02> { [  U0cc7, U0c8f	] };
-    key <AC03> { [  U0ccd, U0c85	] };
-    key <AC04> { [  U0cbf, U0c87	] };
-    key <AC05> { [  U0cc1, U0c89	] };
-    key <AC06> { [  U0caa, U0cab	] };
-    key <AC07> { [  U0cb0, U0cb1	] };
-    key <AC08> { [  U0c95, U0c96	] };
-    key <AC09> { [  U0ca4, U0ca5	] };
-    key <AC10> { [  U0c9a, U0c9b	] };
-    key <AC11> { [  U0c9f, U0ca0	] };
-
-    key <AB01> { [  U0cc6, U0c8e	] };
-    key <AB02> { [  U0c82			] };
-    key <AB03> { [  U0cae, U0ca3	] };
-    key <AB04> { [  U0ca8			] };
-    key <AB05> { [  U0cb5, U0cb4	] };
-    key <AB06> { [  U0cb2, U0cb3	] };
-    key <AB07> { [  U0cb8, U0cb6	] };
-    key <AB08> { [  comma     , U0cb7	] };
-    key <AB09> { [  period    				] };
-    key <AB10> { [  U0caf, U0040	] };
-
-    key <RALT> {
-	symbols[Group1] = [ Mode_switch, Multi_key ],
-	virtualMods = AltGr
-    };
-
-};
-
-// Description : A keymap for Malayalam
-// Encoding    : Unicode (http://www.unicode.org)
-// Author      : Baiju M <baiju@freeshell.org>
-// Date        : Sat Aug  17 21:10:48 IST 2002
-// Mapping:
-
-partial alphanumeric_keys 
-xkb_symbols "mal" {
-
-    name[Group1] = "India - Malayalam";
-
-    //From grave to backslash (\)
-    
-    key <TLDE> { [ U0d4a , U0d12           ] };
-
-// svu: 
-// These lines were in former "mal" variant - 
-// but the digits are replaced with the ones from 'mal_plusnum' -
-// for the integrity of all Indian layouts
-//
-//    key <AE01> { [1           ,     exclam           ] }; 
-//    key <AE02> { [2           ,         at           ] };
-//    key <AE03> { [3           , numbersign           ] };
-//    key <AE04> { [4           ,     dollar           ] };
-//    key <AE05> { [5           ,    percent           ] };
-//    key <AE06> { [6           ,asciicircum           ] };
-//    key <AE07> { [7           ,  ampersand           ] };
-//    key <AE08> { [8           , asterisk           ] };
-//    key <AE09> { [9           ,  parenleft           ] };
-//    key <AE10> { [0           , parenright           ] };
-
-      key <AE01> { [ U0d67 ,      exclam ] };
-      key <AE02> { [ U0d68 ,          at ] };
-      key <AE03> { [ U0d69 ,  numbersign ] };
-      key <AE04> { [ U0d6a ,      dollar ] };
-      key <AE05> { [ U0d6b ,     percent ] };
-      key <AE06> { [ U0d6c , asciicircum ] };
-      key <AE07> { [ U0d6d ,   ampersand ] };
-      key <AE08> { [ U0d6e ,  asterisk ] };
-      key <AE09> { [ U0d6f ,   parenleft ] };
-      key <AE10> { [ U0d66 ,  parenright ] };
-
-    key <AE11> { [ minus      , U0d03           ] };
-    key <AE12> { [ U0d43 , U0d0b           ] };
-    key <BKSL>  { [U0200c, U05C ]};//bksl: ZWNJ 
-
-  
-    // From 'q' to right bracket (])
-    
-    key <AD01> { [ U0d4c , U0d14 ] };
-    key <AD02> { [ U0d48 , U0d10 ] };
-    key <AD03> { [ U0d3e , U0d06 ] };
-    key <AD04> { [ U0d40 , U0d08 ] };
-    key <AD05> { [ U0d42 , U0d0a ] };
-    key <AD06> { [ U0d2c , U0d2d ] };
-    key <AD07> { [ U0d39 , U0d19 ] };
-    key <AD08> { [ U0d17 , U0d18 ] };
-    key <AD09> { [ U0d26 , U0d27 ] };
-    key <AD10> { [ U0d1c , U0d1d ] };
-    key <AD11> { [ U0d21 , U0d22 ] };
-    key <AD12> { [ U0200d , U0d1e ] };
-
-    // From 'a' to apostrophe (')
-    
-    key <AC01> { [ U0d4b , U0d13 ] };
-    key <AC02> { [ U0d47 , U0d0f ] };
-    key <AC03> { [ U0d4d , U0d05 ] };
-    key <AC04> { [ U0d3f , U0d07 ] };
-    key <AC05> { [ U0d41 , U0d09 ] };
-    key <AC06> { [ U0d2a , U0d2b ] };
-    key <AC07> { [ U0d30 , U0d31 ] };
-    key <AC08> { [ U0d15 , U0d16 ] };
-    key <AC09> { [ U0d24 , U0d25 ] };
-    key <AC10> { [ U0d1a , U0d1b ] };
-    key <AC11> { [ U0d1f , U0d20 ] };
-    
-    // From 'z' to slash (/)
-    
-    key <AB01> { [ U0d46 , U0d0e ] };
-    key <AB02> { [ U0d02 , U200b ] };//X:ZWSP
-    key <AB03> { [ U0d2e , U0d23 ] };
-    key <AB04> { [ U0d28 ] };
-    key <AB05> { [ U0d35 , U0d34 ] };
-    key <AB06> { [ U0d32 , U0d33 ] };
-    key <AB07> { [ U0d38 , U0d36 ] };
-    key <AB08> { [ comma      , U0d37 ] };
-    key <AB09> { [ period     , U0200d ] };
-    key <AB10> { [ U0d2f , question   ] };
-
-};
-
-//Name		:	Lalitha
-//Description	:	A transliteration keyboard layout for Malayalam
-//Original Author :	Noah Levitt<nlevitt at columbia.edu>
-//Current Main  : 	Jinesh K.J<jinesh.k@gmail.com>, Swathantra Malayalam Computing (SMC)<smc-discuss@googlegroups.com>
-
-partial alphanumeric_keys
-xkb_symbols "mal_lalitha" {
-     name[Group1] = "India - Malayalam Lalitha";
-     key.type="FOUR_LEVEL";
-    //Top Alphanumeric row
-    // Roman digits
-    key <TLDE>  { [   U0D4D,	U0D02,		apostrophe, 	asciitilde ] }; // apostrophe: virama(chandrakala),anusvara
-    key <AE01>  { [   1,	exclam,	U0D67,		exclam	   ] };
-    key <AE02>  { [   2,	at,		U0D68,		at	   ] };
-    key <AE03>  { [   3,    	numbersign, 	U0D69,		numbersign ] };
-    key <AE04>  { [   4,	dollar,		U0D6A,		dollar     ] };
-    key <AE05>  { [   5,	percent,	U0D6B,		percent    ] };
-    key <AE06>  { [   6,	asciicircum,	U0D6C,		asciicircum ] };
-    key <AE07>  { [   7,	ampersand,	U0D6D,		ampersand  ] };
-    key <AE08>  { [   8,	asterisk,	U0D6E,		asterisk   ] };
-    key <AE09>  { [   9,	parenleft,	U0D6F,		parenleft  ] };
-    key <AE10>  { [   0,	parenright,	U0D66,		parenright ] };
-    key <AE11>	{ [   minus,	underscore	     ] };
-    key <AE12>	{ [   equal,	plus		     ] };
-    key <BKSL>  { [   U005C,	U007C,		U200C	] };//backslash:pipe,backslash,ZWNJ 
-
-    //Q Row	
-    key <AD01>   { [   U0D48,	U0D4C,	U0D10,	U0D14  ] }; // Q: ai and au matras 
-    key <AD02>   { [   U0D35	] };  // W: wa, OM
-    key <AD03>   { [   U0D46,   U0D47,	U0D0E,	U0D0F   ] };  // E: e,ee matras
-    key <AD04>   { [   U0D30,	U0D31,	U0D43,	U0D0B  	] };  // R: ra,rra, vocalic Ri
-    key <AD05>   { [   U0D24,   U0D25,	U0D1F,	U0D20   ] };  // T: tha, ttha,ta,tta
-    key <AD06>   { [   U0D2f    ] };  // Y: ya
-    key <AD07>   { [   U0D41,   U0D42,	U0D09,	U0D0A   ] };  // U: u, uu matras
-    key <AD08>   { [   U0D3F,   U0D40,	U0D07,	U0D08   ] };  // I: i, ii matras
-    key <AD09>   { [   U0D4A,   U0D4B,	U0D12,	U0D13   ] };  // O: o, oo matras
-    key <AD10>   { [   U0D2A   ] };  // P: pa
-    key <AD11>   { [   bracketleft,   braceleft   ] };//braceleft:   
-    key <AD12>	 { [   bracketright, braceright   ] };//braceright:
-    
-    //A Row
-    key <AC01>   { [   U0D3E,	 U0D05,	U0D06,	U0D05  ] };   // A: a,aa
-    key <AC02>   { [   U0D38,    U0D37   ] };  // S: sa, ssa
-    key <AC03>   { [   U0D26,    U0D27,	U0D21,	U0D22   ] };  // D: soft da,soft dda,hard da,hard dda,
-    key <AC04>   { [   U0D2B     ] };  // F: pha
-    key <AC05>   { [   U0D17,    U0D18   ] };  // G: ga, gha
-    key <AC06>   { [   U0D39,    U0D03   ] };  // H: ha, visarg 
-    key <AC07>   { [   U0D1C,    U0D1D   ] };  // J: ja, jha
-    key <AC08>   { [   U0D15,    U0D16   ] };  // K: ka, kha
-    key <AC09>   { [   U0D32,	 U0D33   ] };  // L: la, vocalic L or lru matra`
-    key <AC10>   { [   semicolon, colon  ] }; 
-    key <AC11>   { [apostrophe, quotedbl ] };
-
-    //Z Row
-    key <AB01>   { [   U0D34,	 U0D36 	 ] };  // Z: sha,zha
-    key <AB02>   { [   U0D4D,	 U200B  ] };  // X: chandrakala,ZWSP
-    key <AB03>   { [   U0D1A,    U0D1B   ] };  // C: ca, cha
-    key <AB04>   { [   U0D35,	 U200D  ] };  // V: va,ZWJ
-    key <AB05>   { [   U0D2C,    U0D2D   ] };  // B: ba, bha
-    key <AB06>   { [   U0D28,    U0D23,	U0D19,	U0D1E   ] };  // N: na, hard na,nga,nha
-    key <AB07>   { [   U0D2E,	 U0D02  ] };  // M: ma
-    key <AB08>   { [   comma,    U003C ] };// comma: comma
-    key <AB09>   { [   period, 	 U003E ] };  // period: period
-    key <AB10>	 { [   slash,   question ] };
-
-   // begin modifier mappings
-//    modifier_map Shift  { Shift_L };
-//    modifier_map Lock   { Caps_Lock };
-//    modifier_map Control{ Control_L };
-//    modifier_map Mod3   { Mode_switch };
-    include "level3(ralt_switch)"
-};
-
-
-partial alphanumeric_keys 
-xkb_symbols "ori" {
-    // Inscript layout for Oriya  
-    // Author: G Karunakar <karunakar@freedomink.org>
-    // Date: Wed Nov 13 18:16:19 IST 2002
-
-    name[Group1]= "India - Oriya";
-    
-    key <AE01> { [  U0b67			] };
-    key <AE02> { [  U0b68			] };
-    key <AE03> { [  U0b69			] };
-    key <AE04> { [  U0b6a			] };
-    key <AE05> { [  U0b6b			] };
-    key <AE06> { [  U0b6c			] };
-    key <AE07> { [  U0b6d			] };
-    key <AE08> { [  U0b6e			] };
-    key <AE09> { [  U0b6f			] };
-    key <AE10> { [  U0b66			] };
-    key <AE11> { [  U0b03			] };
-    key <AE12> { [  U0b43, U0b0b	] };
-
-    key <AD01> { [  U0b4c, U0b14	] };
-    key <AD02> { [  U0b48, U0b10	] };
-    key <AD03> { [  U0b3e, U0b06	] };
-    key <AD04> { [  U0b40, U0b08	] };
-    key <AD05> { [  U0b42, U0b0a	] };
-    key <AD06> { [  U0b2c, U0b2d	] };
-    key <AD07> { [  U0b39, U0b19	] };
-    key <AD08> { [  U0b17, U0b18	] };
-    key <AD09> { [  U0b26, U0b27	] };
-    key <AD10> { [  U0b1c, U0b1d	] };
-    key <AD11> { [  U0b21, U0b22	] };
-    key <AD12> { [  U0b3c, U0b1e	] };
- 
-    key <AC01> { [  U0b4b, U0b13	] };
-    key <AC02> { [  U0b47, U0b0f	] };
-    key <AC03> { [  U0b4d, U0b05	] };
-    key <AC04> { [  U0b3f, U0b07	] };
-    key <AC05> { [  U0b41, U0b09	] };
-    key <AC06> { [  U0b2a, U0b2b	] };
-    key <AC07> { [  U0b30			] };
-    key <AC08> { [  U0b15, U0b16	] };
-    key <AC09> { [  U0b24, U0b25	] };
-    key <AC10> { [  U0b1a, U0b1b	] };
-    key <AC11> { [  U0b1f, U0b20	] };
- 
-    key <AB02> { [  U0b02, U0b01	] };
-    key <AB03> { [  U0b2e, U0b23	] };
-    key <AB04> { [  U0b28			] };
-    key <AB05> { [  U0b35			] };
-    key <AB06> { [  U0b32, U0b33	] };
-    key <AB07> { [  U0b38, U0b36	] };
-    key <AB08> { [  comma     , U0b37	] };
-    key <AB09> { [  period    				] };
-    key <AB10> { [  U0b2f, U0040	] };
-
-    key <RALT> {
-	symbols[Group1] = [ Mode_switch, Multi_key ],
-	virtualMods = AltGr
-    };
-};
-
-// based on a keyboard map from an 'xkb/symbols/tml' file
-//
-// $XFree86: xc/programs/xkbcomp/symbols/tml,v 1.2 2002/11/22 04:03:28 dawes Exp $
-// INSCRIPT
-partial alphanumeric_keys 
-xkb_symbols "tam" {
-      name[Group1]= "India - Tamil";
-
-      key <TLDE> { [      U0BCA, U0B92	]	};
-
-      // Mainly numbers.
-      key <AE01> { [      U0BE7 		]	};
-      key <AE02> { [      U0BE8 		]	};
-      key <AE03> { [      U0BE9 		]	};
-      key <AE04> { [      U0BEA 		]	};
-      key <AE05> { [      U0BEB 		]	};
-      key <AE06> { [      U0BEC 		]	};
-      key <AE07> { [      U0BED        	]	};
-      key <AE08> { [      U0BEE 		]	};
-      key <AE09> { [      U0BEF, parenleft	]	};
-      key <AE10> { [      U0BF0, parenright	]	};
-      key <AE11> { [      U0BF1, U0B83  ]	};
-      key <AE12> { [      U0BF2, plus	] 	};
-
-// Mainly long vowels
-
-      key <AD01> { [      U0BCC,  U0B94 ]	};
-      key <AD02> { [      U0BC8,  U0B90 ]	};
-      key <AD03> { [      U0BBE,  U0B86 ]	};
-      key <AD04> { [      U0BC0,  U0B88 ]	};
-      key <AD05> { [      U0BC2,  U0B8A ]	};
-
-// Mainly voiced consonants
-
-      key <AD07> { [      U0BB9, U0B99	]	};
-      key <AD12> { [      U0B9E				]	};
-
-// Mainly short vowels
-      key <AC01> { [      U0BCB,  U0B93 ]	};
-      key <AC02> { [      U0BC7,  U0B8F ]	};
-      key <AC03> { [      U0BCD,  U0B85 ]	};
-      key <AC04> { [      U0BBF,  U0B87 ]	};
-      key <AC05> { [      U0BC1,  U0B89 ]	};
-
-// Mainly unvoiced consonants
-
-      key <AC06> { [      U0BAA 		]	};
-      key <AC07> { [      U0BB0,  U0BB1 ]	};
-      key <AC08> { [      U0B95 		]	};
-      key <AC09> { [      U0BA4 		]	};
-      key <AC10> { [      U0B9A 		]	};
-      key <AC11> { [      U0B9F 		]	};
-      key <BKSL> { [      U005C, U007C	]	};//backslash-bar  - Changed to Unicode
-
-      key <AB01> { [      U0BC6,  U0B8E	]	};
-      key <AB02> { [      U0B82   		]       };
-      key <AB03> { [      U0BAE,  U0BA3 ]       };
-      key <AB04> { [      U0BA8,  U0BA9 ]       };
-      key <AB05> { [      U0BB5,  U0BB4 ]       };
-      key <AB06> { [      U0BB2,  U0BB3 ]       };
-      key <AB07> { [      U0BB8		]       };
-      key <AB08> { [      comma,      U0BB7 ]       };
-      key <AB09> { [      period,     U0964 ]       };
-      key <AB10> { [      U0BAF,  question  ]       };
-};
-
-partial alphanumeric_keys 
-xkb_symbols "tam_unicode" {
-
-// Description: A keymap based on the TamilNet'99 typewriter keyboard 
-// Encoding: Unicode (http://www.unicode.org)
-// Author: Thuraiappah Vaseeharan <vasee@ieee.org>
-// Modifed by: Malathi S <malathiramya@gmail.com>
-// Secondary contact: Sri Ramadoss M <amachu@au-kbc.org>
-// Date  : Fri Sep 4 11:32:00 CST 2009
-// Mapping:
-  
-    name[Group1]= "India - Tamil Unicode";
-
-    // granthas
-    key <TLDE> {  [ apostrophe, asciitilde ] };
-    key <AE01> {  [ U0031, exclam ] } ;
-    key <AE02> {  [ U0032, at ] } ;
-    key <AE03> {  [ U0033, numbersign ] } ;
-    key <AE04> {  [ U0034, U0BF9 ] } ;
-    key <AE05> {  [ U0035, percent ] } ;
-    key <AE06> {  [ U0036, asciicircum ] } ;
-    key <AE07> {  [ U0037, ampersand ] } ;
-    key <AE08> {  [ U0038, asterisk ] } ;
-    key <AE09> {  [ U0039, parenleft ] } ;
-    key <AE10> {  [ U0030, parenright ] } ;
-    key <AE11> {  [ minus, underscore ] };
-    key <AE12> {  [ equal, plus	] };
-
-
-    // Qrow
-    key <AD01> {  [ U0B9E, U0BB6 ] };
-    key <AD02> {  [ U0BB1, U0BB7 ] };
-    key <AD03> {  [ U0BA8, U0BB8 ] };
-    key <AD04> {  [ U0B9A, U0BB9 ] };
-    key <AD05> {  [ U0BB5, U0B9C ] };
-    key <AD06> {  [ U0BB2 ] };
-    key <AD07> {  [ U0BB0 ] };
-    key <AD08> {  [ U0BC8, U0B90 ] };
-    key <AD09> {  [ U0BCA, U0BCB ] };
-    key <AD10> {  [ U0BBF, U0BC0 ] };
-    key <AD11> {  [ U0BC1, U0BC2 ] };
-
-    // Arow
-    key <AC01> { [ U0BAF ] };
-    key <AC02> { [ U0BB3 ] };
-    key <AC03> { [ U0BA9 ] };
-    key <AC04> { [ U0B95 ] };
-    key <AC05> { [ U0BAA ] };
-    key <AC06> { [ U0BBE, U0BB4 ] };
-    key <AC07> { [ U0BA4 ] };
-    key <AC08> { [ U0BAE ] };
-    key <AC09> { [ U0B9F ] };
-    key <AC10> { [ U0BCD, U0B83 ] };
-    key <AC11> { [ U0B99 ] };
-    
-    // Zrow
-    key <AB01> { [ U0BA3 ]  };
-    key <AB02> { [ U0B92, U0B93 ]  };
-    key <AB03> { [ U0B89, U0B8A ]  };
-    key <AB04> { [ U0B8E, U0B8F ]  };
-    key <AB05> { [ U0BC6, U0BC7 ]  };
-    key <AB06> { [ U0B94, U0BCC ]  };
-    key <AB07> { [ U0B85, U0B86 ]  };
-    key <AB08> { [ U0B87, U0B88 ]  };
-};
-
-partial alphanumeric_keys
-xkb_symbols "tam_keyboard_with_numerals" {
-
-// Description: A keymap based on the TamilNet'99 typewriter keyboard 
-// Encoding: Unicode (http://www.unicode.org)
-// Author: Malathi S <malathiramya@gmail.com>
-// Secondary contact: Sri Ramadoss M <amachu@au-kbc.org>
-// Date  : Fri Sep 4 11:33:00 CST 2009
-// Mapping:
-
-      name[Group1]= "India - Tamil Keyboard with Numerals";
-
-      // Mainly numbers.
-      key <TLDE> { [ apostrophe, asciitilde ] };
-      key <AE01> { [ U0BE7, exclam ] };
-      key <AE02> { [ U0BE8, at ] };
-      key <AE03> { [ U0BE9, numbersign ] };
-      key <AE04> { [ U0BEA, U0BF9 ] };
-      key <AE05> { [ U0BEB, percent ] };
-      key <AE06> { [ U0BEC, asciicircum ] };
-      key <AE07> { [ U0BED, ampersand ] };
-      key <AE08> { [ U0BEE, asterisk ] };
-      key <AE09> { [ U0BEF, parenleft ] };
-      key <AE10> { [ U0BE6, parenright ] };
-      key <AE11> { [ minus, underscore ] };
-      key <AE12> { [ equal, plus ] };
-
-
-    // Qrow
-    key <AD01> {  [ U0B9E, U0BB6 ] };
-    key <AD02> {  [ U0BB1, U0BB7 ] };
-    key <AD03> {  [ U0BA8, U0BB8 ] };
-    key <AD04> {  [ U0B9a, U0BB9 ] };
-    key <AD05> {  [ U0BB5, U0B9c ] };
-    key <AD06> {  [ U0BB2 ] };
-    key <AD07> {  [ U0BB0 ] };
-    key <AD08> {  [ U0BC8, U0B90 ] };
-    key <AD09> {  [ U0BCA, U0BCB ] };
-    key <AD10> {  [ U0BBF, U0BC0 ] };
-    key <AD11> {  [ U0BC1, U0BC2 ] };
-
-    // Arow
-    key <AC01> { [ U0BAF ] };
-    key <AC02> { [ U0BB3 ] };
-    key <AC03> { [ U0BA9 ] };
-    key <AC04> { [ U0B95 ] };
-    key <AC05> { [ U0BAA ] };
-    key <AC06> { [ U0BBE, U0BB4 ] };
-    key <AC07> { [ U0BA4 ] };
-    key <AC08> { [ U0BAE ] };
-    key <AC09> { [ U0B9F ] };
-    key <AC10> { [ U0BCD, U0B83 ] };
-    key <AC11> { [ U0B99 ] };
-
-    // Zrow
-    key <AB01> { [ U0BA3 ]  };
-    key <AB02> { [ U0B92, U0B93 ]  };
-    key <AB03> { [ U0B89, U0B8A ]  };
-    key <AB04> { [ U0B8E, U0B8F ]  };
-    key <AB05> { [ U0BC6, U0BC7 ]  };
-    key <AB06> { [ U0B94, U0BCC ]  };
-    key <AB07> { [ U0B85, U0B86 ]  };
-    key <AB08> { [ U0B87, U0B88 ]  };
-};
-
-partial alphanumeric_keys 
-xkb_symbols "tam_TSCII" {
-
-// Description	: A Tamil typewrite-style keymap 
-//		  loosely based on TamilNet'99 reommendations 
-// Encoding	: TSCII (http://www.tscii.org)
-// Author	: Thuraiappah Vaseeharan <vasee@ieee.org>
-// Last Modified: Sat Jan  5 17:11:26 CST 2002
-
-    name[Group1]= "India - Tamil TSCII Typewriter";
-
-    key <AE01> {  [ 0x10000b7, 0x10000a4 ] }; // aytham
-    key <AE02> {  [ 0x1000082, 0x10000a5 ] }; // shri
-    key <AE03> {  [ 0x1000083, 0x1000088 ] }; // ja
-    key <AE04> {  [ 0x1000084, 0x1000089 ] }; // sha
-    key <AE05> {  [ 0x1000085, 0x100008a ] }; // sa
-    key <AE06> {  [ 0x1000086, 0x100008b ] }; // ha
-    key <AE07> {  [ 0x1000087, 0x100008c ] }; // ksha
-	
-    // Qrow
-    key <AD01> {  [ 0x10000bb, 0x100009a ] }; // nja
-    key <AD02> {  [ 0x10000c8, 0x10000da ] }; // Ra
-    key <AD03> {  [ 0x10000bf, 0x10000d1 ] }; // NNa
-    key <AD04> {  [ 0x10000ba, 0x10000cd ] }; // ca
-    key <AD05> {  [ 0x10000c5, 0x10000d7 ] }; // va
-    key <AD06> {  [ 0x10000c4, 0x10000d6 ] }; // la
-    key <AD07> {  [ 0x10000c3, 0x10000d5 ] }; // ra
-    key <AD08> {  [ 0x10000a8, 0x10000b3 ] }; // sangili, ai
-    key <AD09> {  [ 0x10000ca, 0x10000cb ] }; // di, dI
-    key <AD10> {  [ 0x10000a2, 0x10000a3 ] }; // visiri
-    key <AD11> {  [ dead_acute, 0x10000a3 ] }; // Ukaaram
-
-    // Arow
-    key <AC01> { [ 0x10000c2, 0x10000d4 ] }; // ya
-    key <AC02> { [ 0x10000c7, 0x10000d9 ] }; // La
-    key <AC03> { [ 0x10000c9, 0x10000db ] }; // na
-    key <AC04> { [ 0x10000b8, 0x10000cc ] }; // ka
-    key <AC05> { [ 0x10000c0, 0x10000d2 ] }; // pa
-    key <AC06> { [ dead_grave,0x10000a1 ] }; // pulli,aravu
-    key <AC07> { [ 0x10000be, 0x10000d0 ] }; // tha
-    key <AC08> { [ 0x10000c1, 0x10000d3 ] }; // ma
-    key <AC09> { [ 0x10000bc, 0x10000ce ] }; // da
-    key <AC10> { [ 0x10000c6, 0x10000d8 ] }; // zha
-    key <AC11> { [ 0x10000b9, 0x1000099 ] }; // nga
-    
-    // Zrow
-    key <AB01> { [ 0x10000bd, 0x10000cf ] }; // Na
-    key <AB02> { [ 0x10000b4, 0x10000b5 ] }; // o, O
-    key <AB03> { [ 0x10000af, 0x10000b0 ] }; // u, U
-    key <AB04> { [ 0x10000b1, 0x10000b2 ] }; // e, E
-    key <AB05> { [ 0x10000a6, 0x10000a7 ] }; // kombus
-    key <AB06> { [ 0x10000b6, 0x10000aa ] }; // au
-    key <AB07> { [ 0x10000ab, 0x10000ac ] }; // a, A
-    key <AB08> { [ 0x10000fe, 0x10000ae ] }; // i, I
-
-};
-
-partial alphanumeric_keys 
-xkb_symbols "tam_TAB" {
-
-// Description: A keymap based on the TamilNet'99 typewriter keyboard 
-// Encoding: TAB (http://www.tamilnet99.org)
-// Author: Thuraiappah Vaseeharan <t_vasee@yahoo.com>
-// Date  : Sun Aug 12 02:23:00 CDT 2001
-
-    name[Group1]= "India - Tamil TAB Typewriter";
-
-    // numeral row
-    key <AE01> {  [ 0x10000e7, 0x10000a7 ] } ;
-    key <AE02> {  [ 0x10000fa, 0x10000a8 ] } ;
-    key <AE03> {  [ 0x10000fb ] } ;
-    key <AE04> {  [ 0x10000fc ] } ;
-    key <AE05> {  [ 0x10000fd ] } ;
-    key <AE06> {  [ 0x10000fe ] } ;
-    key <AE07> {  [ 0x10000ff ] } ;
-	
-    // q-row
-    key <AD01> {  [ 0x10000eb, 0x10000b3 ] };
-    key <AD02> {  [ 0x10000f8, 0x10000c1 ] };
-    key <AD03> {  [ 0x10000ef, 0x10000b8 ] };
-    key <AD04> {  [ 0x10000ea, 0x10000b2 ] };
-    key <AD05> {  [ 0x10000f5, 0x10000be ] };
-    key <AD06> {  [ 0x10000f4, 0x10000bd ] };
-    key <AD07> {  [ 0x10000f3, 0x10000bc ] };
-    key <AD08> {  [ 0x10000ac, 0x10000e4 ] };
-    key <AD09> {  [ 0x10000ae, 0x10000af ] };
-    key <AD10> {  [ 0x10000a4, 0x10000a6 ] };
-    key <AD11> {  [ dead_circumflex, 0x10000a6 ] }; // Ukaaram
-
-    // a-row
-    key <AC01> {  [ 0x10000f2, 0x10000bb ] };
-    key <AC02> {  [ 0x10000f7, 0x10000c0 ] };
-    key <AC03> {  [ 0x10000f9, 0x10000c2 ] };
-    key <AC04> {  [ 0x10000e8, 0x10000b0 ] };
-    key <AC05> {  [ 0x10000f0, 0x10000b9 ] };
-    key <AC06> {  [ 0x10000a2, 0x10000a3 ] };
-    key <AC07> {  [ 0x10000ee, 0x10000b6 ] };
-    key <AC08> {  [ 0x10000f1, 0x10000ba ] };
-    key <AC09> {  [ 0x10000ec, 0x10000b4 ] };
-    key <AC10> {  [ 0x10000f6, 0x10000bf ] };
-    key <AC11> {  [ 0x10000e9, 0x10000b1 ] };
-    
-    // z-row
-    key <AB01> {  [ 0x10000ed, 0x10000b5 ] };
-    key <AB02> {  [ 0x10000e5, 0x10000e6 ] };
-    key <AB03> {  [ 0x10000e0, 0x10000e1 ] };
-    key <AB04> {  [ 0x10000e2, 0x10000e3 ] };
-    key <AB05> {  [ 0x10000aa, 0x10000ab ] };
-    key <AB06> {  [ 0x10000ac, 0x10000a3 ] };
-    key <AB07> {  [ 0x10000dc, 0x10000dd ] };
-    key <AB08> {  [ 0x10000de, 0x10000df ] };
-};
-
-partial alphanumeric_keys 
-xkb_symbols "tel" {
-
-    // Inscript layout for Telugu using Unicode 
-    // Author: G Karunakar <karunakar@freedomink.org>
-    // Date:
-    // See layout at http://www.indlinux.org/keymap/telugu.php
-
-    name[Group1]= "India - Telugu";
-
-    key <TLDE> { [  U0c4a, U0c12	] };
-    key <AE01> { [  U0c67			] };
-    key <AE02> { [  U0c68			] };
-    key <AE03> { [  U0c69, numbersign	] };
-    key <AE04> { [  U0c6a, dollar		] };
-    key <AE05> { [  U0c6b, percent		] };
-    key <AE06> { [  U0c6c, asciicircum	] };
-    key <AE07> { [  U0c6d, ampersand	] };
-    key <AE08> { [  U0c6e, asterisk	] };
-    key <AE09> { [  U0c6f, parenleft	] };
-    key <AE10> { [  U0c66, parenright	] };
-    key <AE11> { [  U0c03, underscore	] };
-    key <AE12> { [  U0c43, U0c0b	] };
-    key <BKSP> { [  BackSpace			] };    
- 
-    key <AD01> { [  U0c4c, U0c14	] };
-    key <AD02> { [  U0c48, U0c10	] };
-    key <AD03> { [  U0c3e, U0c06	] };
-    key <AD04> { [  U0c40, U0c08	] };
-    key <AD05> { [  U0c42, U0c0a	] };
-    key <AD06> { [  U0c2c, U0c2d	] };
-    key <AD07> { [  U0c39, U0c19	] };
-    key <AD08> { [  U0c17, U0c18	] };
-    key <AD09> { [  U0c26, U0c27	] };
-    key <AD10> { [  U0c1c, U0c1d	] };
-    key <AD11> { [  U0c21, U0c22	] };
-    key <AD12> { [  U0c1e			] };
-  
-    key <AC01> { [  U0c4b, U0c13	] };
-    key <AC02> { [  U0c47, U0c0f	] };
-    key <AC03> { [  U0c4d, U0c05	] };
-    key <AC04> { [  U0c3f, U0c07	] };
-    key <AC05> { [  U0c41, U0c09	] };
-    key <AC06> { [  U0c2a, U0c2b	] };
-    key <AC07> { [  U0c30, U0c31	] };
-    key <AC08> { [  U0c15, U0c16	] };
-    key <AC09> { [  U0c24, U0c25	] };
-    key <AC10> { [  U0c1a, U0c1b	] };
-    key <AC11> { [  U0c1f, U0c20	] };
- 
-    key <AB01> { [  U0c46, U0c0e	] };
-    key <AB02> { [  U0c02, U0c01	] };
-    key <AB03> { [  U0c2e, U0c23	] };
-    key <AB04> { [  U0c28			] };
-    key <AB05> { [  U0c35			] };
-    key <AB06> { [  U0c32, U0c33	] };
-    key <AB07> { [  U0c38, U0c36	] };
-    key <AB08> { [  comma     , U0c37	] };
-    key <AB09> { [  period    				] };
-    key <AB10> { [  U0c2f, U0040	] };
-
-    key <RALT> {        
-        symbols[Group1] = [ Mode_switch, Multi_key ],
-        virtualMods = AltGr
-    };
-};
-
-partial alphanumeric_keys 
-xkb_symbols "urd-phonetic" {
-    include "pk(urd-phonetic)"
-    name[Group1]= "India - Urdu, Phonetic";
-};
-
-partial alphanumeric_keys 
-xkb_symbols "urd-phonetic3" {
-    include "pk(urd-crulp)"
-    name[Group1]= "India - Urdu, Alternative phonetic";
-};
-
-partial alphanumeric_keys 
-xkb_symbols "urd-winkeys" {
-    include "pk(urd-nla)"
-    name[Group1]= "India - Urdu, Winkeys";
-};
-
-// based on a keyboard map from an 'xkb/symbols/gur' file
-
-partial alphanumeric_keys
-xkb_symbols "guru" {
-      name[Group1]= "India - Gurmukhi";
-
-      // Mainly numbers.
-      key <AE01> { [      U0A67 		]	};
-      key <AE02> { [      U0A68		]	};
-      key <AE03> { [      U0A69, U0A71	]	};
-      key <AE04> { [      U0A6A, U0A74	 	]	};
-      key <AE05> { [      U0A6B, U262C		]	};
-      key <AE06> { [      U0A6C  	 	]	};
-      key <AE07> { [      U0A6D 		]	};
-      key <AE08> { [      U0A6e  	 	]	};
-      key <AE09> { [      U0A6F, parenleft 	]	};
-      key <AE10> { [      U0A66, parenright ]	};
-      key <AE11> { [      gur_visarga 	 	]	};
-      key <AE12> { [      equal,	plus 	]	};
-
-// Mainly long vowels
-
-      key <AD01> { [      U0A4C, U0A14  ]	};
-      key <AD02> { [      U0A48, U0A10  ]	};
-      key <AD03> { [      U0A3E, U0A06  ]	};
-      key <AD04> { [      U0A40, U0A08  ]	};
-      key <AD05> { [      U0A42, U0A0A  ]	};
-
-// Mainly voiced consonants
-
-      key <AD06> { [      U0A2C, U0A2D 	]	};
-      key <AD07> { [      U0A39, U0A19 	]	};
-      key <AD08> { [      U0A17, U0A18 	]	};
-      key <AD09> { [      U0A26, U0A27 	]	};
-      key <AD10> { [      U0A1C, U0A1D 	]	};
-      key <AD11> { [      U0A21, U0A22 	]	};
-      key <AD12> { [      U0A3C, U0A1E 	]	};
-
-// Mainly short vowels
-      key <AC01> { [      U0A4B, U0A13  ]	};
-      key <AC02> { [      U0A47, U0A0F  ]	};
-      key <AC03> { [      U0A4D, U0A05  ]	};
-      key <AC04> { [      U0A3F, U0A07  ]	};
-      key <AC05> { [      U0A41, U0A09  ]	};
-
-// Mainly unvoiced consonants
-
-      key <AC06> { [      U0A2A, U0A2B 	]	};
-      key <AC07> { [      U0A30, U0A5C 	]	};
-      key <AC08> { [      U0A15, U0A16 	]	};
-      key <AC09> { [      U0A24, U0A25 	]	};
-      key <AC10> { [      U0A1A, U0A1B 	]	};
-      key <AC11> { [      U0A1F, U0A20 	]	};
-      key <BKSL> { [      U005C, U007C	]	};
-
-      key <AB01> { [      z, 	 U0A01	]       };
-      key <AB02> { [      U0A02, U0A70, U0A71  ]       };
-      key <AB03> { [      U0A2E, U0A23  ]       };
-      key <AB04> { [      U0A28, U0A28  ]       };
-      key <AB05> { [      U0A35, U0A35  ]       };
-      key <AB06> { [      U0A32, U0A33  ]       };
-      key <AB07> { [      U0A38, U0A36  ]       };
-      key <AB08> { [      comma,     less       ]       };
-      key <AB09> { [      period,    U0964  ]       };
-      key <AB10> { [      U0A2F, question   ]       };
-};
-
-//Name		:	Jhelum (Refind Inscript)
-//Description	:	A Jhelum keyboard layout for Gurmukhi (Punjabi)
-//			http://www.satluj.org/Jhelum.html
-//Modified for Inscript to make
-//Original Author :	Amanpreet Singh Alam <apreet.alam@gmail.com
- 
-partial alphanumeric_keys
-xkb_symbols "jhelum" {
-      name[Group1] = "India - Gurmukhi Jhelum";
-          key.type="FOUR_LEVEL";
-     //Top Alphanumeric row
-     // Roman digits
-     key <TLDE>  { [  apostrophe, asciitilde, U0A02,U0A01 ] }; // apostrophe: anusvara, candrabindu
-     key <AE01>  { [   1,exclam,	U0A67,	exclam	   ] };
-     key <AE02>  { [   2,at,	U0A68,	at	   ] };
-     key <AE03>  { [   3,numbersign, U0A69,	numbersign ] };
-     key <AE04>  { [   4,dollar,	U0A6A,	dollar     ] };
-     key <AE05>  { [   5,percent,U0A6B,	percent    ] };
-     key <AE06>  { [   6,asciicircum, U0A6C,asciicircum ] };
-     key <AE07>  { [   7,ampersand,U0A6D,ampersand  ] };
-     key <AE08>  { [   8,asterisk,U0A6E,	asterisk   ] };
-     key <AE09>  { [   9,parenleft,U0A6F,parenleft  ] };
-     key <AE10>  { [   0,parenright,U0A66,parenright ] };
-     key <AE11>	{ [   minus,underscore] };
-     key <AE12>	{ [   equal,plus] };
-     key <BKSL>  { [   U0964,U0965,U007C,U005C] }; //pipe : danda, double danda
- 
-     //Q Row	
-     key <AD01>   { [   U0A4C, 	U0A14   ] };  // Q: oo, ooh
-     key <AD02>   { [   U0A48,  	U0A10	] };  // W: ee, ae
-     key <AD03>   { [   U0A3E,   U0A06  ] };  // E: a, aa
-     key <AD04>   { [   U0A40,	U0A08  	] };  // R: ee, ai
-     key <AD05>   { [   U0A42,   U0A0A   ] };  // T: u, uu
-     key <AD06>   { [   U0A30,	U0A5C   ] };  // Y: ra, raa
-     key <AD07>   { [   U0A26,   U0A27   ] };  // U: tha, thha
-     key <AD08>   { [   U0A17,   U0A18   ] };  // I:ga, gha
-     key <AD09>   { [   U0A24,   U0A1F   ] };  // O: ta, tha
-     key <AD10>   { [   U0A2A,   U0A5E   ] };  // P: pa, pha
-     key <AD11>   { [   U0A21,   U0A22,   bracketleft,   braceleft   ] };  
-     key <AD12>	 { [   U0A19,   U0A1E,   bracketright, braceright   ] };
-     
-     //A Row
-     key <AC01>   { [   U0A4B,	 U0A13  ] };   // A: o, oo
-     key <AC02>   { [   U0A40,    U0A0F   ] };  // S: e, ee
-     key <AC03>   { [   U0A4D,    U0A05   ] };  // D: halant, aa
-     key <AC04>   { [   U0A3F,    U0A07   ] };  // F: i, aa
-     key <AC05>   { [   U0A41,    U0A09   ] };  // G: u, uh
-     key <AC06>   { [   U0A39,    U0A20   ] };  // H: ha, thha
-     key <AC07>   { [   U0A1C,    U0A1D   ] };  // J: ja, jha
-     key <AC08>   { [   U0A15,    U0A16   ] };  // K: ka, kha
-     key <AC09>   { [   U0A32,	 U0A25   ] };  // L: la, tha
-     key <AC10>   { [   U0A38,   semicolon, colon  ] }; //; sa
-     key <AC11>   { [apostrophe, quotedbl ] };
- 
-     //Z Row
-     key <AB01>   { [   U0A71,	 U0A3C 	 ] };  // Z: addak, par bindi
-     key <AB02>   { [   U0A02,    U0A70	 ] };  // X: bindi, tippi
-     key <AB03>   { [   U0A1A,    U0A1B   ] };  // C: ca, cha
-     key <AB04>   { [   U0A35,    U0A2F   ] };  // V: va, ya
-     key <AB05>   { [   U0A2C,    U0A2D   ] };  // B: ba, bha
-     key <AB06>   { [   U0A28,    U0A23   ] };  // N: na, nha
-     key <AB07>   { [   U0A2E, U0A2E       ] };  // M: ma
-     key <AB08>   { [   comma,    U262C	 ] };// comma: comma, dev abbreviation sign
-     key <AB09>   { [   period,   U0A74 	 ] };  // period: period, nukta
-     key <AB10>	 { [   slash,   question ] };
- 
-// begin modifier mappings
-//    modifier_map Shift  { Shift_L };
-//    modifier_map Lock   { Caps_Lock };
-//    modifier_map Control{ Control_L };
-//    modifier_map Mod3   { Mode_switch };
-    include "level3(ralt_switch)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "olpc" {
-
-// Contact: Walter Bender <walter@laptop.org>
-
-  include "in(deva)"
-  key <TLDE> { [	U094A,	U0912 ] }; // DEVANAGARI VOWEL SIGN SHORT O; DEVANAGARI LETTER SHORT O
-  key <AE01> { [	U0967,	U090D ] }; // DEVANAGARI DIGIT ONE; DEVANAGARI LETTER CANDRA E
-  key <AE02> { [	U0968,	U0945 ] }; // DEVANAGARI DIGIT TWO; DEVANAGARI VOWEL SIGN CANDRA E
-  key <AE03> { [	U0969	 ] }; // DEVANAGARI DIGIT THREE; 
-  key <AE04> { [	U096A	 ] }; // DEVANAGARI DIGIT FOUR; 
-  key <AE05> { [	U096B	 ] }; // DEVANAGARI DIGIT FIVE; 
-  key <AE06> { [	U096C	 ] }; // DEVANAGARI DIGIT SIX; 
-  key <AE07> { [	U096D	 ] }; // DEVANAGARI DIGIT SEVEN; 
-  key <AE08> { [	U096E	 ] }; // DEVANAGARI DIGIT EIGHT; 
-  key <AE09> { [	U096F,	parenleft ] }; // DEVANAGARI DIGIT NINE; 
-  key <AE10> { [	U0966,	parenright ] }; // DEVANAGARI DIGIT ZERO; 
-  key <AE11> { [	minus,		U0903 ] }; // DEVANAGARI SIGN VISARGA; 
-  key <AE12> { [	U0943,	U090B ] }; // DEVANAGARI VOWEL SIGN VOCALIC R; DEVANAGARI LETTER VOCALIC R
-
-  key <AD01> { [	U094C,	U0914 ] }; // DEVANAGARI VOWEL SIGN AU; DEVANAGARI LETTER AU
-  key <AD02> { [	U0948,	U0910 ] }; // DEVANAGARI VOWEL SIGN AI; DEVANAGARI LETTER AI
-  key <AD03> { [	U093E,	U0906 ] }; // DEVANAGARI VOWEL SIGN AA; DEVANAGARI LETTER AA
-  key <AD04> { [	U0940,	U0908 ] }; // DEVANAGARI VOWEL SIGN II; DEVANAGARI LETTER II
-  key <AD05> { [	U0942,	U090A ] }; // DEVANAGARI VOWEL SIGN UU; DEVANAGARI LETTER UU
-  key <AD06> { [	U092C,	U092D ] }; // DEVANAGARI LETTER BA; DEVANAGARI LETTER BHA
-  key <AD07> { [	U0939,	U0919 ] }; // DEVANAGARI LETTER HA; DEVANAGARI LETTER NGA
-  key <AD08> { [	U0917,	U0918 ] }; // DEVANAGARI LETTER GA; DEVANAGARI LETTER GHA
-  key <AD09> { [	U0926,	U0927 ] }; // DEVANAGARI LETTER DA; DEVANAGARI LETTER DHA
-  key <AD10> { [	U091C,	U091D ] }; // DEVANAGARI LETTER JA; DEVANAGARI LETTER JHA
-  key <AD11> { [	U0921,	U0922 ] }; // DEVANAGARI LETTER DDA; DEVANAGARI LETTER DDHA
-  key <AD12> { [	U093C,	U091E ] }; // DEVANAGARI SIGN NUKTA; DEVANAGARI LETTER NYA
-
-  key <BKSL> { [	U0949,	U0911 ] }; // DEVANAGARI VOWEL SIGN CANDRA O; DEVANAGARI LETTER CANDRA O
-
-  key <AC01> { [	U094B,	U0913 ] }; // DEVANAGARI VOWEL SIGN O; DEVANAGARI LETTER O
-  key <AC02> { [	U0947,	U090F ] }; // DEVANAGARI VOWEL SIGN E; DEVANAGARI LETTER E
-  key <AC03> { [	U094D,	U0905 ] }; // DEVANAGARI SIGN VIRAMA; DEVANAGARI LETTER A
-  key <AC04> { [	U093F,	U0907 ] }; // DEVANAGARI VOWEL SIGN I; DEVANAGARI LETTER I
-  key <AC05> { [	U0941,	U0909 ] }; // DEVANAGARI VOWEL SIGN U; DEVANAGARI LETTER U
-  key <AC06> { [	U092A,	U092B ] }; // DEVANAGARI LETTER PA; DEVANAGARI LETTER PHA
-  key <AC07> { [	U0930,	U0931 ] }; // DEVANAGARI LETTER RA; DEVANAGARI LETTER RRA
-  key <AC08> { [	U0915,	U0916 ] }; // DEVANAGARI LETTER KA; DEVANAGARI LETTER KHA
-  key <AC09> { [	U0924,	U0925 ] }; // DEVANAGARI LETTER TA; DEVANAGARI LETTER THA
-  key <AC10> { [	U091A,	U091B ] }; // DEVANAGARI LETTER CA; DEVANAGARI LETTER CHA
-  key <AC11> { [	U091F,	U0920 ] }; // DEVANAGARI LETTER TTA; DEVANAGARI LETTER TTHA
-
-  key <AB01> { [	U0946,	U090E ] }; // DEVANAGARI VOWEL SIGN SHORT E; DEVANAGARI LETTER SHORT E
-  key <AB02> { [	U0902,	U0901 ] }; // DEVANAGARI SIGN ANUSVARA; DEVANAGARI SIGN CANDRABINDU
-  key <AB03> { [	U092E,	U0923 ] }; // DEVANAGARI LETTER MA; DEVANAGARI LETTER NNA
-  key <AB04> { [	U0928,	U0929 ] }; // DEVANAGARI LETTER NA; DEVANAGARI LETTER NNNA
-  key <AB05> { [	U0935,	U0934 ] }; // DEVANAGARI LETTER VA; DEVANAGARI LETTER LLLA
-  key <AB06> { [	U0932,	U0933 ] }; // DEVANAGARI LETTER LA; DEVANAGARI LETTER LLA
-  key <AB07> { [	U0938,	U0936 ] }; // DEVANAGARI LETTER SA; DEVANAGARI LETTER SHA
-  key <AB08> { [	comma,		U0937 ] }; // DEVANAGARI LETTER SSA
-  key <AB09> { [	period,		U0964 ] }; // DEVANAGARI DANDA
-  key <AB10> { [	U092F,	U095F ] }; // DEVANAGARI LETTER YA; DEVANAGARI LETTER YYA
-
-  key <SPCE> { [	space,		space,	U200C,	U200D ] }; // ZERO-WIDTH-NON-JOINER (ZWNJ); ZERO-WIDTH-JOINER (ZWJ)
-
-  include "group(olpc)"
-};
-
-partial alphanumeric_keys 
-xkb_symbols "hin-wx" {
-
-    name[Group1]= "India - Hindi Wx";
-
-      key <TLDE> {	 [     grave, asciitilde, 2, 3    ]	};
-
-      key <AE01> {	 [      0x1000967, exclam 		]	};
-      key <AE02> {	 [      0x1000968, at 		]	};
-      key <AE03> {	 [      0x1000969 , numbersign	 		]	};
-      key <AE04> {	 [      0x100096A , dollar		]	};
-      key <AE05> {	 [      0x100096B , percent 	 		]	};
-      key <AE06> {	 [      0x100096C , asciicircum	 		]	};
-      key <AE07> {	 [      0x100096D , ampersand                       ]	};
-      key <AE08> {	 [      0x100096e , asterisk 	 		]	};
-      key <AE09> {	 [      0x100096F, parenleft 		]	};
-      key <AE10> {	 [      0x1000966, parenright 		]	};
-      key <AE11> {	 [      minus, underscore 	 		]	};
-      key <AE12> {	 [      equal, plus 		]	};
-
-
-      key <AD01> {	 [      0x1000943,  0x1000944, 0x100090B, 0x1000960]	};
-      key <AD02> {	 [      0x1000924,  0x1000925       	]	};
-      key <AD03> {	 [      0x1000947,  0x1000948, 0x100090F, 0x1000910]	};
-      key <AD04> {	 [      0x1000930,  0x1000937       	]	};
-      key <AD05> {	 [      0x100091F,  0x1000920       	]	};
-
-
-      key <AD06> {	 [      0x100092F 		]	};
-      key <AD07> {	 [      0x1000941,  0x1000942, 0x1000909, 0x100090A ]	};
-      key <AD08> {	 [      0x100093F,  0x1000940, 0x1000907, 0x1000908 ]	};
-      key <AD09> {	 [      0x100094B,  0x100094C, 0x1000913, 0x1000914]	};
-      key <AD10> {	 [      0x100092A,  0x100092B 		]	};
-      key <AD11> {	 [      bracketleft, braceleft  		]	};
-      key <AD12> {	 [      bracketright, braceright  		]	};
-      key <BKSL> {       [      backslash, bar, 0x1000964, 0x1000965 ] };
-
-      key <AC01> {	 [      0x100094D,  0x100093E, 0x1000905,0x1000906 ] 	};
-      key <AC02> {	 [      0x1000938,  0x1000936       	]	};
-      key <AC03> {	 [      0x1000921,  0x1000922       	]	};
-      key <AC04> {	 [      0x1000919,  0x100091E       	]	};
-      key <AC05> {	 [      0x1000917,  0x1000918       	]	};
-
-
-      key <AC06> {	 [      0x1000939,  0x1000903 		]	};
-      key <AC07> {	 [      0x100091C,  0x100091D 		]	};
-      key <AC08> {	 [      0x1000915,  0x1000916 		]	};
-      key <AC09> {	 [      0x1000932,  0x1000962, 0x1000933, 0x100090C]	};
-      key <AC10> {	 [      semicolon, colon  		]	};
-      key <AC11> {	 [      quoteright, quotedbl 		]	};
-      key <BKSL> {	 [      backslash,         bar  		]	};
-
-      key <AB01> {	 [      0x1000901,   0x100093C, 0x100093D, 0x1000950]   };
-      key <AB02> {       [      0x1000926,   0x1000927      ]       };
-      key <AB03> {       [      0x100091A,   0x100091B         ]       };
-      key <AB04> {       [      0x1000935,   dead_V        ]       };
-      key <AB05> {       [      0x100092C,   0x100092D        ]       };
-      key <AB06> {       [      0x1000928,   0x1000923         ]       };
-      key <AB07> {       [      0x100092E,   0x1000902         ]       };
-      key <AB08> {       [      comma,       less         ]       };
-      key <AB09> {       [      period,      greater       ]       };
-      key <AB10> {       [      slash,      question        ]       };
-
-    include "level3(ralt_switch)"
-};
-
+// $XKeyboardConfig$

+

+// This layout includes all Indian layouts, including:

+//     - Bengali

+//     - Gujarati 

+//     - Kannada 

+//     - Malayalam

+//     - Oriya 

+//     - Tamil

+//     - Telugu

+//     - Urdu

+

+// Links:

+// - Indic INSCRIPT keyboard layout diagrams:

+//     http://java.sun.com/products/jfc/tsc/articles/InputMethod/indiclayout.html

+// - Ekusheyr Shadhinota (Bengali layouts):

+//     http://ekushey.org/projects/shadhinota/index.html

+// - Microsoft Windows XP SP2: Indic Language Standards - an Introduction:

+//     http://www.bhashaindia.com/MSProducts/XpSp2/Articles/IndicLanguageStandards.aspx

+

+// based on a keyboard map from an 'xkb/symbols/dev' file

+

+// Devangari is the default. Kill me if I am wrong:)

+default partial alphanumeric_keys

+xkb_symbols "deva" {

+	// March 2004 -- David Holl <smyrph+dev_xkb@ece.wpi.edu>

+	name[Group1]="India";

+

+	key.type="FOUR_LEVEL";

+

+	key <TLDE> { [ U094a, U0912,   grave, asciitilde  ] };

+	key <AE01> { [ U0967, U090d,       1, exclam      ] };

+	key <AE02> { [ U0968, U0945,       2, at          ] };

+	// Shift+AE0[3-8] really need to return a macro of keys defined by

+	// INSCRIPT in place of the symbols that are here for now.  But this

+	// requires XKB to map 1 key into two to three other key presses.

+	key <AE03> { [ U0969, numbersign,  3, numbersign  ] };

+	key <AE04> { [ U096a, dollar,      4, dollar      ] };

+	key <AE05> { [ U096b, percent,     5, percent     ] };

+	key <AE06> { [ U096c, asciicircum, 6, asciicircum ] };

+	key <AE07> { [ U096d, ampersand,   7, ampersand   ] };

+	key <AE08> { [ U096e, asterisk,    8, asterisk    ] };

+	key <AE09> { [ U096f, parenleft,   9, parenleft   ] };

+	key <AE10> { [ U0966, parenright,  0, parenright  ] };

+	key <AE11> { [ minus, U0903, minus, underscore    ] };

+	key <AE12> { [ U0943, U090b, U0944, U0960 ] };

+

+	key <AD01> { [ U094c, U0914 ] };

+	key <AD02> { [ U0948, U0910 ] };

+	key <AD03> { [ U093e, U0906 ] };

+	key <AD04> { [ U0940, U0908, U0963, U0961 ] };

+	key <AD05> { [ U0942, U090a ] };

+	key <AD06> { [ U092c, U092d ] };

+	key <AD07> { [ U0939, U0919 ] };

+	key <AD08> { [ U0917, U0918, U095a ] };

+	key <AD09> { [ U0926, U0927 ] };

+	key <AD10> { [ U091c, U091d, U095b ] };

+	key <AD11> { [ U0921, U0922, U095c, U095d ] };

+	key <AD12> { [ U093c, U091e ] };

+	// I added \ / ? | for shell-convenience (file names and piping)

+	key <BKSL> { [ U0949, U0911, U005C, U007C ] };

+

+	key <AC01> { [ U094b, U0913 ] };

+	key <AC02> { [ U0947, U090f ] };

+	key <AC03> { [ U094d, U0905 ] };

+	key <AC04> { [ U093f, U0907, U0962, U090c ] };

+	key <AC05> { [ U0941, U0909 ] };

+	key <AC06> { [ U092a, U092b, NoSymbol, U095e ] };

+	key <AC07> { [ U0930, U0931 ] };

+	key <AC08> { [ U0915, U0916, U0958, U0959 ] };

+	key <AC09> { [ U0924, U0925 ] };

+	key <AC10> { [ U091a, U091b, U0952 ] };

+	key <AC11> { [ U091f, U0920, NoSymbol, U0951 ] };

+

+	key <AB01> { [ U0946, U090e, U0953 ] };

+	key <AB02> { [ U0902, U0901, NoSymbol, U0950 ] };

+	key <AB03> { [ U092e, U0923, U0954 ] };

+	key <AB04> { [ U0928, U0929 ] };

+	key <AB05> { [ U0935, U0934 ] };

+	key <AB06> { [ U0932, U0933 ] };

+	key <AB07> { [ U0938, U0936 ] };

+	key <AB08> { [ comma, U0937, U0970 ] };

+	key <AB09> { [ period, U0964, U0965, U093d ] };

+	// I added \ / ? | for shell-convenience (file names and piping)

+	key <AB10> { [ U092f, U095f, slash, question ] };

+

+	// space, space, Zero-Width-Non-Joiner (ZWNJ), Zero-Width-Joiner (ZWJ):

+	include "nbsp(zwnj3zwj4)";

+};

+

+//Name		:	Bolnagri (Combined)

+//Description	:	A phonetic keyboard layout for Devnagari(Hindi)

+//			http://www.indlinux.org/wiki/index.php/BolNagri

+//NOTE		: 	This is a combined map of bolnagri_matras and bolnagri_vowels.

+//Inspired by "devrom" keymap by Steve Smith for the windows tool "keyman"

+//Original Author :	Noah Levitt<nlevitt at columbia.edu>

+//Past Authors  : Pramod.R <pramodr at gmail.com> and Ravikant <ravikant at sarai.net>

+// Current Main.: G Karunakar <karunakar@sarai.net>

+

+partial alphanumeric_keys

+xkb_symbols "bolnagri" {

+     name[Group1] = "India - Hindi Bolnagri";

+     key.type="FOUR_LEVEL";

+    //Top Alphanumeric row

+    // Roman digits

+    key <TLDE>  { [   U0902,	U0901,		apostrophe, 	asciitilde ] }; // apostrophe: anusvara, candrabindu

+    key <AE01>  { [   1,	exclam,		U0967,		exclam	   ] };

+    key <AE02>  { [   2,	at,		U0968,		at	   ] };

+    key <AE03>  { [   3,    	numbersign, 	U0969,		numbersign ] };

+    key <AE04>  { [   4,	dollar,		U096A,		dollar     ] };

+    key <AE05>  { [   5,	percent,	U096B,		percent    ] };

+    key <AE06>  { [   6,	asciicircum,	U096C,		asciicircum ] };

+    key <AE07>  { [   7,	ampersand,	U096D,		ampersand  ] };

+    key <AE08>  { [   8,	asterisk,	U096E,		asterisk   ] };

+    key <AE09>  { [   9,	parenleft,	U096F,		parenleft  ] };

+    key <AE10>  { [   0,	parenright,	U0966,		parenright ] };

+    key <AE11>	{ [   minus,	underscore	     ] };

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

+    key <BKSL>  { [   U0964,	U0965,		U007C,		U005C   ] }; //pipe : danda, double danda

+

+    //Q Row	

+    key <AD01>   { [   U200C, 	U200D   ] };  // Q: ZWNJ, ZWJ

+    key <AD02>   { [   U0935,  	U950	] };  // W: wa, OM

+    key <AD03>   { [   U0947,   U0948,	U090F,	U0910   ] };  // E: e, ai matras

+    key <AD04>   { [   U0930,	U0943  	] };  // R: ra, vocalic Ri

+    key <AD05>   { [   U0924,   U0925   ] };  // T: ta, tha

+    key <AD06>   { [   U092f,	U091E   ] };  // Y: ya, nya

+    key <AD07>   { [   U0941,   U0942,	U0909,	U090A   ] };  // U: u, uu matras

+    key <AD08>   { [   U093F,   U0940,	U0907,	U0908   ] };  // I: i, ii matras

+    key <AD09>   { [   U094B,   U094C,	U0913,	U0914   ] };  // O: o, au matras

+    key <AD10>   { [   U092A,   U092B   ] };  // P: pa, pha

+    key <AD11>   { [   bracketleft,   braceleft   ] };  

+    key <AD12>	 { [   bracketright, braceright   ] };

+    

+    //A Row

+    key <AC01>   { [   U093E,	 U0906,	U0905,	U0906  ] };   // A: aa

+    key <AC02>   { [   U0938,    U0937   ] };  // S: sa, ssa

+    key <AC03>   { [   U0926,    U0927   ] };  // D: da, dha

+    key <AC04>   { [   U091F,    U0920   ] };  // F: TA, THA

+    key <AC05>   { [   U0917,    U0918   ] };  // G: ga, gha

+    key <AC06>   { [   U0939,    U0903   ] };  // H: ha, visarg 

+    key <AC07>   { [   U091C,    U091D   ] };  // J: ja, jha

+    key <AC08>   { [   U0915,    U0916   ] };  // K: ka, kha

+    key <AC09>   { [   U0932,	 U0962   ] };  // L: la, vocalic L or lru matra`

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

+    key <AC11>   { [apostrophe, quotedbl ] };

+

+    //Z Row

+    key <AB01>   { [   U0936,	 U0945 	 ] };  // Z: sha, akaar candra

+    key <AB02>   { [   U094D,    U0949	 ] };  // X: halant, aakaar candra

+    key <AB03>   { [   U091A,    U091B   ] };  // C: ca, cha

+    key <AB04>   { [   U0921,    U0922   ] };  // V: da, dha

+    key <AB05>   { [   U092C,    U092D   ] };  // B: ba, bha

+    key <AB06>   { [   U0928,    U0923   ] };  // N: na, nha

+    key <AB07>   { [   U092E,    U093D,	U092E,	U093D   ] };  // M: ma, avagraha

+    key <AB08>   { [   comma,    U0970	 ] };// comma: comma, dev abbreviation sign

+    key <AB09>   { [   period,   U093C 	 ] };  // period: period, nukta

+    key <AB10>	 { [   slash,   question ] };

+

+   // begin modifier mappings

+//    modifier_map Shift  { Shift_L };

+//    modifier_map Lock   { Caps_Lock };

+//    modifier_map Control{ Control_L };

+//    modifier_map Mod3   { Mode_switch };

+    include "level3(ralt_switch)"

+};

+

+// based on a keyboard map from an 'xkb/symbols/ben' file

+//

+// $XFree86: xc/programs/xkbcomp/symbols/ben,v 1.2 2002/11/22 04:03:28 dawes Exp $

+

+partial alphanumeric_keys

+xkb_symbols "ben" {

+    name[Group1]= "India - Bengali";

+

+      // Mainly numbers.

+      key <AE01> { [      U09E7 		]	};

+      key <AE02> { [      U09E8 		]	};

+      key <AE03> { [      U09E9 		]	};

+      key <AE04> { [      U09EA 		]	};

+      key <AE05> { [      U09EB		]	};

+      key <AE06> { [      U09EC 		]	};

+      key <AE07> { [      U09ED	        ]	};

+      key <AE08> { [      U09EE 		]	};

+      key <AE09> { [      U09EF, parenleft	]	};

+      key <AE10> { [      U09E6, parenright	]	};

+      key <AE11> { [      minus, U0983 	]	};

+      key <AE12> { [      U098B, U09C3	]	};

+

+// Mainly long vowels

+

+      key <AD01> { [      U09CC,  U0994	]	};

+      key <AD02> { [      U09C8,  U0990	]	};

+      key <AD03> { [      U09BE,  U0986	]	};

+      key <AD04> { [      U09C0,  U0988	]	};

+      key <AD05> { [      U09C2,  U098A	]	};

+

+// Mainly voiced consonants

+

+      key <AD06> { [      U09AC,  U09AD	]	};

+      key <AD07> { [      U09B9,  U0999 ]	};

+      key <AD08> { [      U0997,  U0998 ]	};

+      key <AD09> { [      U09A6,  U09A7 ]	};

+      key <AD10> { [      U099C,  U099D ]	};

+      key <AD11> { [      U09A1, U09A2 	]	};

+      key <AD12> { [      U09BC, U099E 	]	};

+

+// Mainly short vowels

+      key <AC01> { [      U09CB,  U0993 ]	};

+      key <AC02> { [      U09C7,  U098F ]	};

+      key <AC03> { [      U09CD,  U0985 ]	};

+      key <AC04> { [      U09BF,  U0987 ]	};

+      key <AC05> { [      U09C1,  U0989 ]	};

+

+

+// Mainly unvoiced consonants

+

+      key <AC06> { [      U09AA,  U09AB ]	};

+      key <AC07> { [      U09B0,  U09DD ]	};

+      key <AC08> { [      U0995,  U0996 ]	};

+      key <AC09> { [      U09A4,  U09A5 ]	};

+      key <AC10> { [      U099A,  U099B ]	};

+      key <AC11> { [      U099F, U09A0 	]	};

+      key <BKSL> { [      U005C, U007C 	]	};

+

+      key <AB01> { [      z, Z  		]       };

+      key <AB02> { [      U0982,  U0981 ]       };

+      key <AB03> { [      U09AE,  U09A3 ]       };

+      key <AB04> { [      U09A8,  U09A8 ]       };

+      key <AB05> { [      U09AC,  U09AC ]       };

+      key <AB06> { [      U09B2,  U09B2 ]       };

+      key <AB07> { [      U09B8,  U09B6 ]       };

+      key <AB08> { [      comma,      U09B7 ]       };

+      key <AB09> { [      period,     U0964 ]       };

+      key <AB10> { [      U09DF,  U09AF	]       };

+};

+

+xkb_symbols "ben_probhat" {

+ name[Group1]= "India - Bengali Probhat";

+   key <ESC>  { [ Escape ] };

+

+// numbers

+   key <TLDE> { [ U200D, asciitilde   ] };

+   key <AE01> { [ U09E7, exclam       ] };

+   key <AE02> { [ U09E8, at           ] };

+   key <AE03> { [ U09E9, numbersign   ] };

+   key <AE04> { [ U09EA, U09F3    ] };

+   key <AE05> { [ U09EB, percent      ] };

+   key <AE06> { [ U09EC, asciicircum  ] };

+   key <AE07> { [ U09ED, U099E    ] };

+   key <AE08> { [ U09EE, U09CE    ] };

+   key <AE09> { [ U09EF, parenleft    ] };

+   key <AE10> { [ U09E6, parenright   ] };

+   key <AE11> { [ minus,     underscore   ] };

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

+   key <BKSP> { [ BackSpace               ] };

+

+// tab, q to ] 

+   key <TAB>  { [   Tab,  ISO_Left_Tab     ] };

+   key <AD01> { [   U09A6,  U09A7  ] };

+   key <AD02> { [   U09C2,  U098A  ] };

+   key <AD03> { [   U09C0,  U0988  ] };

+   key <AD04> { [   U09B0,  U09DC  ] };

+   key <AD05> { [   U099F,  U09A0  ] };

+   key <AD06> { [   U098F,  U0990  ] };

+   key <AD07> { [   U09C1,  U0989  ] };

+   key <AD08> { [   U09BF,  U0987  ] };

+   key <AD09> { [   U0993,  U0994  ] };

+   key <AD10> { [   U09AA,  U09AB  ] };

+   key <AD11> { [   U09C7,  U09C8  ] };

+   key <AD12> { [   U09CB,  U09CC  ] };

+   key <RTRN> { [   Return                 ] };

+

+// caps, a to ' 

+//   key <CAPS> { [   Caps_Lock              ] };

+   key <AC01> { [   U09BE,  U0985  ] };

+   key <AC02> { [   U09B8,  U09B7  ] };

+   key <AC03> { [   U09A1,  U09A2  ] };

+   key <AC04> { [   U09A4,  U09A5  ] };

+   key <AC05> { [   U0997,  U0998  ] };

+   key <AC06> { [   U09B9,  U0983  ] };

+   key <AC07> { [   U099C,  U099D  ] };

+   key <AC08> { [   U0995,  U0996  ] };

+   key <AC09> { [   U09B2,  U0982  ] };

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

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

+

+// shift, z to /

+//   key <LFSH> { [   Shift_L                ] };

+   key <AB01> { [   U09DF,  U09AF  ] };

+   key <AB02> { [   U09B6,  U09DD  ] };

+   key <AB03> { [   U099A,  U099B  ] };

+   key <AB04> { [   U0986,  U098B  ] };

+   key <AB05> { [   U09AC,  U09AD  ] };

+   key <AB06> { [   U09A8,  U09A3  ] };

+   key <AB07> { [   U09AE,  U0999  ] };

+   key <AB08> { [   comma,      U09C3  ] };

+   key <AB09> { [   U0964,  U0981  ] };

+   key <AB10> { [   U09CD,  question   ] };

+   key <BKSL> { [   U200C,  U0965  ] };

+

+//   key <LCTL> { [   Control_L              ] };

+//   key <SPCE> { [   space                  ] };

+

+//   modifier_map Shift  { Shift_L };

+//   modifier_map Lock   { Caps_Lock };

+//   modifier_map Control{ Control_L };

+

+};

+

+partial alphanumeric_keys 

+xkb_symbols "guj" {

+      name[Group1]= "India - Gujarati";

+

+      // Mainly numbers.

+      key <AE01> { [      U0AE7, U0A8D 	]	};

+      key <AE02> { [      U0AE8, U0AC5 	]	};

+      key <AE03> { [      U0AE9 	 	]	};

+      key <AE04> { [      U0AEA  	 	]	};

+      key <AE05> { [      U0AEB  	 	]	};

+      key <AE06> { [      U0AEC  	 	]	};

+      key <AE07> { [      U0AED 		]	};

+      key <AE08> { [      U0AEE  	 	]	};

+      key <AE09> { [      U0AEF, parenleft 	]	};

+      key <AE10> { [      U0AE6, parenright ]	};

+      key <AE11> { [      minus,     U0A83  ]	};

+      key <AE12> { [      U0A8B, U0AC3 	]	};

+

+// Mainly long vowels

+

+      key <AD01> { [      U0ACC, U0A94  ]	};

+      key <AD02> { [      U0AC8, U0A90  ]	};

+      key <AD03> { [      U0ABE, U0A86  ]	};

+      key <AD04> { [      U0AC0, U0A88  ]	};

+      key <AD05> { [      U0AC2, U0A8A  ]	};

+

+// Mainly voiced consonants

+

+      key <AD06> { [      U0AAC, U0AAD 	]	};

+      key <AD07> { [      U0AB9, U0A99 	]	};

+      key <AD08> { [      U0A97, U0A98 	]	};

+      key <AD09> { [      U0AA6, U0AA7 	]	};

+      key <AD10> { [      U0A9C, U0A9D 	]	};

+      key <AD11> { [      U0AA1, U0AA2 	]	};

+      key <AD12> { [      U0ABC, U0A9E 	]	};

+

+// Mainly short vowels

+      key <AC01> { [      U0ACB, U0A93	]	};

+      key <AC02> { [      U0AC7, U0A8F	]	};

+      key <AC03> { [      U0ACD, U0A85  ]	};

+      key <AC04> { [      U0ABF, U0A87  ]	};

+      key <AC05> { [      U0AC1, U0A89  ]	};

+

+// Mainly unvoiced consonants

+

+      key <AC06> { [      U0AAA, U0AAB 	]	};

+      key <AC07> { [      U0AB0, U0AB0 	]	};

+      key <AC08> { [      U0A95, U0A96 	]	};

+      key <AC09> { [      U0AA4, U0AA5 	]	};

+      key <AC10> { [      U0A9A, U0A9B 	]	};

+      key <AC11> { [      U0A9F, U0AA0 	]	};

+      key <BKSL> { [      U0AC9, U0A91 	]	};

+

+      key <AB01> { [      z        , Z		]       };

+      key <AB02> { [      U0A82, U0A81	]       };

+      key <AB03> { [      U0AAE, U0AA3  ]       };

+      key <AB04> { [      U0AA8, U0AA8   ]       };

+      key <AB05> { [      U0AB5, U0AB5   ]       };

+      key <AB06> { [      U0AB2, U0AB3  ]       };

+      key <AB07> { [      U0AB8, U0AB6  ]       };

+      key <AB08> { [      comma,     U0AB7  ]       };

+      key <AB09> { [      period,    U0964  ]       };

+      key <AB10> { [      U0AAF, question   ]       };

+};

+

+partial alphanumeric_keys 

+xkb_symbols "kan" {

+

+    // Inscript layout for Kannada  

+    // Author : G Karunakar <karunakar@freedomink.org>

+    // Date   : Wed Nov 13 17:22:58 IST 2002

+    // Kannada digits mapped in basic only

+

+    name[Group1]= "India - Kannada";

+

+    key <TLDE> { [  U0cca, U0c92	] };

+    key <AE01> { [  U0ce7			] };

+    key <AE02> { [  U0ce8			] };

+    key <AE03> { [  U0ce9			] };

+    key <AE04> { [  U0cea			] };

+    key <AE05> { [  U0ceb			] };

+    key <AE06> { [  U0cec			] };

+    key <AE07> { [  U0ced			] };

+    key <AE08> { [  U0cee			] };

+    key <AE09> { [  U0cef			] };

+    key <AE10> { [  U0ce6			] };

+    key <AE11> { [  U0c83			] };

+    key <AE12> { [  U0cc3, U0c8b	] };

+

+    key <AD01> { [  U0ccc, U0c94	] };

+    key <AD02> { [  U0cc8, U0c90	] };

+    key <AD03> { [  U0cbe, U0c86	] };

+    key <AD04> { [  U0cc0, U0c88	] };

+    key <AD05> { [  U0cc2, U0c8a	] };

+    key <AD06> { [  U0cac, U0cad	] };

+    key <AD07> { [  U0cb9, U0c99	] };

+    key <AD08> { [  U0c97, U0c98	] };

+    key <AD09> { [  U0ca6, U0ca7	] };

+    key <AD10> { [  U0c9c, U0c9d	] };

+    key <AD11> { [  U0ca1, U0ca2	] };

+    key <AD12> { [  U0cbc, U0c9e	] };

+ 

+    key <AC01> { [  U0ccb, U0c93	] };

+    key <AC02> { [  U0cc7, U0c8f	] };

+    key <AC03> { [  U0ccd, U0c85	] };

+    key <AC04> { [  U0cbf, U0c87	] };

+    key <AC05> { [  U0cc1, U0c89	] };

+    key <AC06> { [  U0caa, U0cab	] };

+    key <AC07> { [  U0cb0, U0cb1	] };

+    key <AC08> { [  U0c95, U0c96	] };

+    key <AC09> { [  U0ca4, U0ca5	] };

+    key <AC10> { [  U0c9a, U0c9b	] };

+    key <AC11> { [  U0c9f, U0ca0	] };

+

+    key <AB01> { [  U0cc6, U0c8e	] };

+    key <AB02> { [  U0c82			] };

+    key <AB03> { [  U0cae, U0ca3	] };

+    key <AB04> { [  U0ca8			] };

+    key <AB05> { [  U0cb5, U0cb4	] };

+    key <AB06> { [  U0cb2, U0cb3	] };

+    key <AB07> { [  U0cb8, U0cb6	] };

+    key <AB08> { [  comma     , U0cb7	] };

+    key <AB09> { [  period    				] };

+    key <AB10> { [  U0caf, U0040	] };

+

+    key <RALT> {

+	symbols[Group1] = [ Mode_switch, Multi_key ],

+	virtualMods = AltGr

+    };

+

+};

+

+// Description : A keymap for Malayalam

+// Encoding    : Unicode (http://www.unicode.org)

+// Author      : Baiju M <baiju@freeshell.org>

+// Date        : Sat Aug  17 21:10:48 IST 2002

+// Mapping:

+

+partial alphanumeric_keys 

+xkb_symbols "mal" {

+

+    name[Group1] = "India - Malayalam";

+

+    //From grave to backslash (\)

+    

+    key <TLDE> { [ U0d4a , U0d12           ] };

+

+// svu: 

+// These lines were in former "mal" variant - 

+// but the digits are replaced with the ones from 'mal_plusnum' -

+// for the integrity of all Indian layouts

+//

+//    key <AE01> { [1           ,     exclam           ] }; 

+//    key <AE02> { [2           ,         at           ] };

+//    key <AE03> { [3           , numbersign           ] };

+//    key <AE04> { [4           ,     dollar           ] };

+//    key <AE05> { [5           ,    percent           ] };

+//    key <AE06> { [6           ,asciicircum           ] };

+//    key <AE07> { [7           ,  ampersand           ] };

+//    key <AE08> { [8           , asterisk           ] };

+//    key <AE09> { [9           ,  parenleft           ] };

+//    key <AE10> { [0           , parenright           ] };

+

+      key <AE01> { [ U0d67 ,      exclam ] };

+      key <AE02> { [ U0d68 ,          at ] };

+      key <AE03> { [ U0d69 ,  numbersign ] };

+      key <AE04> { [ U0d6a ,      dollar ] };

+      key <AE05> { [ U0d6b ,     percent ] };

+      key <AE06> { [ U0d6c , asciicircum ] };

+      key <AE07> { [ U0d6d ,   ampersand ] };

+      key <AE08> { [ U0d6e ,  asterisk ] };

+      key <AE09> { [ U0d6f ,   parenleft ] };

+      key <AE10> { [ U0d66 ,  parenright ] };

+

+    key <AE11> { [ minus      , U0d03           ] };

+    key <AE12> { [ U0d43 , U0d0b           ] };

+    key <BKSL>  { [U0200c, U05C ]};//bksl: ZWNJ 

+

+  

+    // From 'q' to right bracket (])

+    

+    key <AD01> { [ U0d4c , U0d14 ] };

+    key <AD02> { [ U0d48 , U0d10 ] };

+    key <AD03> { [ U0d3e , U0d06 ] };

+    key <AD04> { [ U0d40 , U0d08 ] };

+    key <AD05> { [ U0d42 , U0d0a ] };

+    key <AD06> { [ U0d2c , U0d2d ] };

+    key <AD07> { [ U0d39 , U0d19 ] };

+    key <AD08> { [ U0d17 , U0d18 ] };

+    key <AD09> { [ U0d26 , U0d27 ] };

+    key <AD10> { [ U0d1c , U0d1d ] };

+    key <AD11> { [ U0d21 , U0d22 ] };

+    key <AD12> { [ U0200d , U0d1e ] };

+

+    // From 'a' to apostrophe (')

+    

+    key <AC01> { [ U0d4b , U0d13 ] };

+    key <AC02> { [ U0d47 , U0d0f ] };

+    key <AC03> { [ U0d4d , U0d05 ] };

+    key <AC04> { [ U0d3f , U0d07 ] };

+    key <AC05> { [ U0d41 , U0d09 ] };

+    key <AC06> { [ U0d2a , U0d2b ] };

+    key <AC07> { [ U0d30 , U0d31 ] };

+    key <AC08> { [ U0d15 , U0d16 ] };

+    key <AC09> { [ U0d24 , U0d25 ] };

+    key <AC10> { [ U0d1a , U0d1b ] };

+    key <AC11> { [ U0d1f , U0d20 ] };

+    

+    // From 'z' to slash (/)

+    

+    key <AB01> { [ U0d46 , U0d0e ] };

+    key <AB02> { [ U0d02 , U200b ] };//X:ZWSP

+    key <AB03> { [ U0d2e , U0d23 ] };

+    key <AB04> { [ U0d28 ] };

+    key <AB05> { [ U0d35 , U0d34 ] };

+    key <AB06> { [ U0d32 , U0d33 ] };

+    key <AB07> { [ U0d38 , U0d36 ] };

+    key <AB08> { [ comma      , U0d37 ] };

+    key <AB09> { [ period     , U0200d ] };

+    key <AB10> { [ U0d2f , question   ] };

+

+};

+

+//Name		:	Lalitha

+//Description	:	A transliteration keyboard layout for Malayalam

+//Original Author :	Noah Levitt<nlevitt at columbia.edu>

+//Current Main  : 	Jinesh K.J<jinesh.k@gmail.com>, Swathantra Malayalam Computing (SMC)<smc-discuss@googlegroups.com>

+

+partial alphanumeric_keys

+xkb_symbols "mal_lalitha" {

+     name[Group1] = "India - Malayalam Lalitha";

+     key.type="FOUR_LEVEL";

+    //Top Alphanumeric row

+    // Roman digits

+    key <TLDE>  { [   U0D4D,	U0D02,		apostrophe, 	asciitilde ] }; // apostrophe: virama(chandrakala),anusvara

+    key <AE01>  { [   1,	exclam,	U0D67,		exclam	   ] };

+    key <AE02>  { [   2,	at,		U0D68,		at	   ] };

+    key <AE03>  { [   3,    	numbersign, 	U0D69,		numbersign ] };

+    key <AE04>  { [   4,	dollar,		U0D6A,		dollar     ] };

+    key <AE05>  { [   5,	percent,	U0D6B,		percent    ] };

+    key <AE06>  { [   6,	asciicircum,	U0D6C,		asciicircum ] };

+    key <AE07>  { [   7,	ampersand,	U0D6D,		ampersand  ] };

+    key <AE08>  { [   8,	asterisk,	U0D6E,		asterisk   ] };

+    key <AE09>  { [   9,	parenleft,	U0D6F,		parenleft  ] };

+    key <AE10>  { [   0,	parenright,	U0D66,		parenright ] };

+    key <AE11>	{ [   minus,	underscore	     ] };

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

+    key <BKSL>  { [   U005C,	U007C,		U200C	] };//backslash:pipe,backslash,ZWNJ 

+

+    //Q Row	

+    key <AD01>   { [   U0D48,	U0D4C,	U0D10,	U0D14  ] }; // Q: ai and au matras 

+    key <AD02>   { [   U0D35	] };  // W: wa, OM

+    key <AD03>   { [   U0D46,   U0D47,	U0D0E,	U0D0F   ] };  // E: e,ee matras

+    key <AD04>   { [   U0D30,	U0D31,	U0D43,	U0D0B  	] };  // R: ra,rra, vocalic Ri

+    key <AD05>   { [   U0D24,   U0D25,	U0D1F,	U0D20   ] };  // T: tha, ttha,ta,tta

+    key <AD06>   { [   U0D2f    ] };  // Y: ya

+    key <AD07>   { [   U0D41,   U0D42,	U0D09,	U0D0A   ] };  // U: u, uu matras

+    key <AD08>   { [   U0D3F,   U0D40,	U0D07,	U0D08   ] };  // I: i, ii matras

+    key <AD09>   { [   U0D4A,   U0D4B,	U0D12,	U0D13   ] };  // O: o, oo matras

+    key <AD10>   { [   U0D2A   ] };  // P: pa

+    key <AD11>   { [   bracketleft,   braceleft   ] };//braceleft:   

+    key <AD12>	 { [   bracketright, braceright   ] };//braceright:

+    

+    //A Row

+    key <AC01>   { [   U0D3E,	 U0D05,	U0D06,	U0D05  ] };   // A: a,aa

+    key <AC02>   { [   U0D38,    U0D37   ] };  // S: sa, ssa

+    key <AC03>   { [   U0D26,    U0D27,	U0D21,	U0D22   ] };  // D: soft da,soft dda,hard da,hard dda,

+    key <AC04>   { [   U0D2B     ] };  // F: pha

+    key <AC05>   { [   U0D17,    U0D18   ] };  // G: ga, gha

+    key <AC06>   { [   U0D39,    U0D03   ] };  // H: ha, visarg 

+    key <AC07>   { [   U0D1C,    U0D1D   ] };  // J: ja, jha

+    key <AC08>   { [   U0D15,    U0D16   ] };  // K: ka, kha

+    key <AC09>   { [   U0D32,	 U0D33   ] };  // L: la, vocalic L or lru matra`

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

+    key <AC11>   { [apostrophe, quotedbl ] };

+

+    //Z Row

+    key <AB01>   { [   U0D34,	 U0D36 	 ] };  // Z: sha,zha

+    key <AB02>   { [   U0D4D,	 U200B  ] };  // X: chandrakala,ZWSP

+    key <AB03>   { [   U0D1A,    U0D1B   ] };  // C: ca, cha

+    key <AB04>   { [   U0D35,	 U200D  ] };  // V: va,ZWJ

+    key <AB05>   { [   U0D2C,    U0D2D   ] };  // B: ba, bha

+    key <AB06>   { [   U0D28,    U0D23,	U0D19,	U0D1E   ] };  // N: na, hard na,nga,nha

+    key <AB07>   { [   U0D2E,	 U0D02  ] };  // M: ma

+    key <AB08>   { [   comma,    U003C ] };// comma: comma

+    key <AB09>   { [   period, 	 U003E ] };  // period: period

+    key <AB10>	 { [   slash,   question ] };

+

+   // begin modifier mappings

+//    modifier_map Shift  { Shift_L };

+//    modifier_map Lock   { Caps_Lock };

+//    modifier_map Control{ Control_L };

+//    modifier_map Mod3   { Mode_switch };

+    include "level3(ralt_switch)"

+};

+

+

+partial alphanumeric_keys 

+xkb_symbols "ori" {

+    // Inscript layout for Oriya  

+    // Author: G Karunakar <karunakar@freedomink.org>

+    // Date: Wed Nov 13 18:16:19 IST 2002

+

+    name[Group1]= "India - Oriya";

+    

+    key <AE01> { [  U0b67			] };

+    key <AE02> { [  U0b68			] };

+    key <AE03> { [  U0b69			] };

+    key <AE04> { [  U0b6a			] };

+    key <AE05> { [  U0b6b			] };

+    key <AE06> { [  U0b6c			] };

+    key <AE07> { [  U0b6d			] };

+    key <AE08> { [  U0b6e			] };

+    key <AE09> { [  U0b6f			] };

+    key <AE10> { [  U0b66			] };

+    key <AE11> { [  U0b03			] };

+    key <AE12> { [  U0b43, U0b0b	] };

+

+    key <AD01> { [  U0b4c, U0b14	] };

+    key <AD02> { [  U0b48, U0b10	] };

+    key <AD03> { [  U0b3e, U0b06	] };

+    key <AD04> { [  U0b40, U0b08	] };

+    key <AD05> { [  U0b42, U0b0a	] };

+    key <AD06> { [  U0b2c, U0b2d	] };

+    key <AD07> { [  U0b39, U0b19	] };

+    key <AD08> { [  U0b17, U0b18	] };

+    key <AD09> { [  U0b26, U0b27	] };

+    key <AD10> { [  U0b1c, U0b1d	] };

+    key <AD11> { [  U0b21, U0b22	] };

+    key <AD12> { [  U0b3c, U0b1e	] };

+ 

+    key <AC01> { [  U0b4b, U0b13	] };

+    key <AC02> { [  U0b47, U0b0f	] };

+    key <AC03> { [  U0b4d, U0b05	] };

+    key <AC04> { [  U0b3f, U0b07	] };

+    key <AC05> { [  U0b41, U0b09	] };

+    key <AC06> { [  U0b2a, U0b2b	] };

+    key <AC07> { [  U0b30			] };

+    key <AC08> { [  U0b15, U0b16	] };

+    key <AC09> { [  U0b24, U0b25	] };

+    key <AC10> { [  U0b1a, U0b1b	] };

+    key <AC11> { [  U0b1f, U0b20	] };

+ 

+    key <AB02> { [  U0b02, U0b01	] };

+    key <AB03> { [  U0b2e, U0b23	] };

+    key <AB04> { [  U0b28			] };

+    key <AB05> { [  U0b35			] };

+    key <AB06> { [  U0b32, U0b33	] };

+    key <AB07> { [  U0b38, U0b36	] };

+    key <AB08> { [  comma     , U0b37	] };

+    key <AB09> { [  period    				] };

+    key <AB10> { [  U0b2f, U0040	] };

+

+    key <RALT> {

+	symbols[Group1] = [ Mode_switch, Multi_key ],

+	virtualMods = AltGr

+    };

+};

+

+// based on a keyboard map from an 'xkb/symbols/tml' file

+//

+// $XFree86: xc/programs/xkbcomp/symbols/tml,v 1.2 2002/11/22 04:03:28 dawes Exp $

+// INSCRIPT

+partial alphanumeric_keys 

+xkb_symbols "tam" {

+      name[Group1]= "India - Tamil";

+

+      key <TLDE> { [      U0BCA, U0B92	]	};

+

+      // Mainly numbers.

+      key <AE01> { [      U0BE7 		]	};

+      key <AE02> { [      U0BE8 		]	};

+      key <AE03> { [      U0BE9 		]	};

+      key <AE04> { [      U0BEA 		]	};

+      key <AE05> { [      U0BEB 		]	};

+      key <AE06> { [      U0BEC 		]	};

+      key <AE07> { [      U0BED        	]	};

+      key <AE08> { [      U0BEE 		]	};

+      key <AE09> { [      U0BEF, parenleft	]	};

+      key <AE10> { [      U0BF0, parenright	]	};

+      key <AE11> { [      U0BF1, U0B83  ]	};

+      key <AE12> { [      U0BF2, plus	] 	};

+

+// Mainly long vowels

+

+      key <AD01> { [      U0BCC,  U0B94 ]	};

+      key <AD02> { [      U0BC8,  U0B90 ]	};

+      key <AD03> { [      U0BBE,  U0B86 ]	};

+      key <AD04> { [      U0BC0,  U0B88 ]	};

+      key <AD05> { [      U0BC2,  U0B8A ]	};

+

+// Mainly voiced consonants

+

+      key <AD07> { [      U0BB9, U0B99	]	};

+      key <AD10> { [      U0B9c 	]	}; 

+      key <AD12> { [      U0B9E				]	};

+

+// Mainly short vowels

+      key <AC01> { [      U0BCB,  U0B93 ]	};

+      key <AC02> { [      U0BC7,  U0B8F ]	};

+      key <AC03> { [      U0BCD,  U0B85 ]	};

+      key <AC04> { [      U0BBF,  U0B87 ]	};

+      key <AC05> { [      U0BC1,  U0B89 ]	};

+

+// Mainly unvoiced consonants

+

+      key <AC06> { [      U0BAA 		]	};

+      key <AC07> { [      U0BB0,  U0BB1 ]	};

+      key <AC08> { [      U0B95 		]	};

+      key <AC09> { [      U0BA4 		]	};

+      key <AC10> { [      U0B9A 		]	};

+      key <AC11> { [      U0B9F 		]	};

+      key <BKSL> { [      U005C, U007C	]	};//backslash-bar  - Changed to Unicode

+

+      key <AB01> { [      U0BC6,  U0B8E	]	};

+      key <AB02> { [      U0B82   		]       };

+      key <AB03> { [      U0BAE,  U0BA3 ]       };

+      key <AB04> { [      U0BA8,  U0BA9 ]       };

+      key <AB05> { [      U0BB5,  U0BB4 ]       };

+      key <AB06> { [      U0BB2,  U0BB3 ]       };

+      key <AB07> { [      U0BB8,  U0BB6	]       };

+      key <AB08> { [      comma,      U0BB7 ]       };

+      key <AB09> { [      period,     U0964 ]       };

+      key <AB10> { [      U0BAF,  question  ]       };

+};

+

+partial alphanumeric_keys 

+xkb_symbols "tam_unicode" {

+

+// Description: A keymap based on the TamilNet'99 typewriter keyboard 

+// Encoding: Unicode (http://www.unicode.org)

+// Author: Thuraiappah Vaseeharan <vasee@ieee.org>

+// Modifed by: Malathi S <malathiramya@gmail.com>

+// Secondary contact: Sri Ramadoss M <amachu@au-kbc.org>

+// Date  : Fri Sep 4 11:32:00 CST 2009

+// Mapping:

+  

+    name[Group1]= "India - Tamil Unicode";

+

+    // granthas

+    key <TLDE> {  [ apostrophe, asciitilde ] };

+    key <AE01> {  [ U0031, exclam ] } ;

+    key <AE02> {  [ U0032, at ] } ;

+    key <AE03> {  [ U0033, numbersign ] } ;

+    key <AE04> {  [ U0034, U0BF9 ] } ;

+    key <AE05> {  [ U0035, percent ] } ;

+    key <AE06> {  [ U0036, asciicircum ] } ;

+    key <AE07> {  [ U0037, ampersand ] } ;

+    key <AE08> {  [ U0038, asterisk ] } ;

+    key <AE09> {  [ U0039, parenleft ] } ;

+    key <AE10> {  [ U0030, parenright ] } ;

+    key <AE11> {  [ minus, underscore ] };

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

+

+

+    // Qrow

+    key <AD01> {  [ U0B9E, U0BB6 ] };

+    key <AD02> {  [ U0BB1, U0BB7 ] };

+    key <AD03> {  [ U0BA8, U0BB8 ] };

+    key <AD04> {  [ U0B9A, U0BB9 ] };

+    key <AD05> {  [ U0BB5, U0B9C ] };

+    key <AD06> {  [ U0BB2 ] };

+    key <AD07> {  [ U0BB0 ] };

+    key <AD08> {  [ U0BC8, U0B90 ] };

+    key <AD09> {  [ U0BCA, U0BCB ] };

+    key <AD10> {  [ U0BBF, U0BC0 ] };

+    key <AD11> {  [ U0BC1, U0BC2 ] };

+

+    // Arow

+    key <AC01> { [ U0BAF ] };

+    key <AC02> { [ U0BB3 ] };

+    key <AC03> { [ U0BA9 ] };

+    key <AC04> { [ U0B95 ] };

+    key <AC05> { [ U0BAA ] };

+    key <AC06> { [ U0BBE, U0BB4 ] };

+    key <AC07> { [ U0BA4 ] };

+    key <AC08> { [ U0BAE ] };

+    key <AC09> { [ U0B9F ] };

+    key <AC10> { [ U0BCD, U0B83 ] };

+    key <AC11> { [ U0B99 ] };

+    

+    // Zrow

+    key <AB01> { [ U0BA3 ]  };

+    key <AB02> { [ U0B92, U0B93 ]  };

+    key <AB03> { [ U0B89, U0B8A ]  };

+    key <AB04> { [ U0B8E, U0B8F ]  };

+    key <AB05> { [ U0BC6, U0BC7 ]  };

+    key <AB06> { [ U0B94, U0BCC ]  };

+    key <AB07> { [ U0B85, U0B86 ]  };

+    key <AB08> { [ U0B87, U0B88 ]  };

+};

+

+partial alphanumeric_keys

+xkb_symbols "tam_keyboard_with_numerals" {

+

+// Description: A keymap based on the TamilNet'99 typewriter keyboard 

+// Encoding: Unicode (http://www.unicode.org)

+// Author: Malathi S <malathiramya@gmail.com>

+// Secondary contact: Sri Ramadoss M <amachu@au-kbc.org>

+// Date  : Fri Sep 4 11:33:00 CST 2009

+// Mapping:

+

+      name[Group1]= "India - Tamil Keyboard with Numerals";

+

+      // Mainly numbers.

+      key <TLDE> { [ apostrophe, asciitilde ] };

+      key <AE01> { [ U0BE7, exclam ] };

+      key <AE02> { [ U0BE8, at ] };

+      key <AE03> { [ U0BE9, numbersign ] };

+      key <AE04> { [ U0BEA, U0BF9 ] };

+      key <AE05> { [ U0BEB, percent ] };

+      key <AE06> { [ U0BEC, asciicircum ] };

+      key <AE07> { [ U0BED, ampersand ] };

+      key <AE08> { [ U0BEE, asterisk ] };

+      key <AE09> { [ U0BEF, parenleft ] };

+      key <AE10> { [ U0BE6, parenright ] };

+      key <AE11> { [ minus, underscore ] };

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

+

+

+    // Qrow

+    key <AD01> {  [ U0B9E, U0BB6 ] };

+    key <AD02> {  [ U0BB1, U0BB7 ] };

+    key <AD03> {  [ U0BA8, U0BB8 ] };

+    key <AD04> {  [ U0B9a, U0BB9 ] };

+    key <AD05> {  [ U0BB5, U0B9c ] };

+    key <AD06> {  [ U0BB2 ] };

+    key <AD07> {  [ U0BB0 ] };

+    key <AD08> {  [ U0BC8, U0B90 ] };

+    key <AD09> {  [ U0BCA, U0BCB ] };

+    key <AD10> {  [ U0BBF, U0BC0 ] };

+    key <AD11> {  [ U0BC1, U0BC2 ] };

+

+    // Arow

+    key <AC01> { [ U0BAF ] };

+    key <AC02> { [ U0BB3 ] };

+    key <AC03> { [ U0BA9 ] };

+    key <AC04> { [ U0B95 ] };

+    key <AC05> { [ U0BAA ] };

+    key <AC06> { [ U0BBE, U0BB4 ] };

+    key <AC07> { [ U0BA4 ] };

+    key <AC08> { [ U0BAE ] };

+    key <AC09> { [ U0B9F ] };

+    key <AC10> { [ U0BCD, U0B83 ] };

+    key <AC11> { [ U0B99 ] };

+

+    // Zrow

+    key <AB01> { [ U0BA3 ]  };

+    key <AB02> { [ U0B92, U0B93 ]  };

+    key <AB03> { [ U0B89, U0B8A ]  };

+    key <AB04> { [ U0B8E, U0B8F ]  };

+    key <AB05> { [ U0BC6, U0BC7 ]  };

+    key <AB06> { [ U0B94, U0BCC ]  };

+    key <AB07> { [ U0B85, U0B86 ]  };

+    key <AB08> { [ U0B87, U0B88 ]  };

+};

+

+partial alphanumeric_keys 

+xkb_symbols "tam_TSCII" {

+

+// Description	: A Tamil typewrite-style keymap 

+//		  loosely based on TamilNet'99 reommendations 

+// Encoding	: TSCII (http://www.tscii.org)

+// Author	: Thuraiappah Vaseeharan <vasee@ieee.org>

+// Last Modified: Sat Jan  5 17:11:26 CST 2002

+

+    name[Group1]= "India - Tamil TSCII Typewriter";

+

+    key <AE01> {  [ 0x10000b7, 0x10000a4 ] }; // aytham

+    key <AE02> {  [ 0x1000082, 0x10000a5 ] }; // shri

+    key <AE03> {  [ 0x1000083, 0x1000088 ] }; // ja

+    key <AE04> {  [ 0x1000084, 0x1000089 ] }; // sha

+    key <AE05> {  [ 0x1000085, 0x100008a ] }; // sa

+    key <AE06> {  [ 0x1000086, 0x100008b ] }; // ha

+    key <AE07> {  [ 0x1000087, 0x100008c ] }; // ksha

+	

+    // Qrow

+    key <AD01> {  [ 0x10000bb, 0x100009a ] }; // nja

+    key <AD02> {  [ 0x10000c8, 0x10000da ] }; // Ra

+    key <AD03> {  [ 0x10000bf, 0x10000d1 ] }; // NNa

+    key <AD04> {  [ 0x10000ba, 0x10000cd ] }; // ca

+    key <AD05> {  [ 0x10000c5, 0x10000d7 ] }; // va

+    key <AD06> {  [ 0x10000c4, 0x10000d6 ] }; // la

+    key <AD07> {  [ 0x10000c3, 0x10000d5 ] }; // ra

+    key <AD08> {  [ 0x10000a8, 0x10000b3 ] }; // sangili, ai

+    key <AD09> {  [ 0x10000ca, 0x10000cb ] }; // di, dI

+    key <AD10> {  [ 0x10000a2, 0x10000a3 ] }; // visiri

+    key <AD11> {  [ dead_acute, 0x10000a3 ] }; // Ukaaram

+

+    // Arow

+    key <AC01> { [ 0x10000c2, 0x10000d4 ] }; // ya

+    key <AC02> { [ 0x10000c7, 0x10000d9 ] }; // La

+    key <AC03> { [ 0x10000c9, 0x10000db ] }; // na

+    key <AC04> { [ 0x10000b8, 0x10000cc ] }; // ka

+    key <AC05> { [ 0x10000c0, 0x10000d2 ] }; // pa

+    key <AC06> { [ dead_grave,0x10000a1 ] }; // pulli,aravu

+    key <AC07> { [ 0x10000be, 0x10000d0 ] }; // tha

+    key <AC08> { [ 0x10000c1, 0x10000d3 ] }; // ma

+    key <AC09> { [ 0x10000bc, 0x10000ce ] }; // da

+    key <AC10> { [ 0x10000c6, 0x10000d8 ] }; // zha

+    key <AC11> { [ 0x10000b9, 0x1000099 ] }; // nga

+    

+    // Zrow

+    key <AB01> { [ 0x10000bd, 0x10000cf ] }; // Na

+    key <AB02> { [ 0x10000b4, 0x10000b5 ] }; // o, O

+    key <AB03> { [ 0x10000af, 0x10000b0 ] }; // u, U

+    key <AB04> { [ 0x10000b1, 0x10000b2 ] }; // e, E

+    key <AB05> { [ 0x10000a6, 0x10000a7 ] }; // kombus

+    key <AB06> { [ 0x10000b6, 0x10000aa ] }; // au

+    key <AB07> { [ 0x10000ab, 0x10000ac ] }; // a, A

+    key <AB08> { [ 0x10000fe, 0x10000ae ] }; // i, I

+

+};

+

+partial alphanumeric_keys 

+xkb_symbols "tam_TAB" {

+

+// Description: A keymap based on the TamilNet'99 typewriter keyboard 

+// Encoding: TAB (http://www.tamilnet99.org)

+// Author: Thuraiappah Vaseeharan <t_vasee@yahoo.com>

+// Date  : Sun Aug 12 02:23:00 CDT 2001

+

+    name[Group1]= "India - Tamil TAB Typewriter";

+

+    // numeral row

+    key <AE01> {  [ 0x10000e7, 0x10000a7 ] } ;

+    key <AE02> {  [ 0x10000fa, 0x10000a8 ] } ;

+    key <AE03> {  [ 0x10000fb ] } ;

+    key <AE04> {  [ 0x10000fc ] } ;

+    key <AE05> {  [ 0x10000fd ] } ;

+    key <AE06> {  [ 0x10000fe ] } ;

+    key <AE07> {  [ 0x10000ff ] } ;

+	

+    // q-row

+    key <AD01> {  [ 0x10000eb, 0x10000b3 ] };

+    key <AD02> {  [ 0x10000f8, 0x10000c1 ] };

+    key <AD03> {  [ 0x10000ef, 0x10000b8 ] };

+    key <AD04> {  [ 0x10000ea, 0x10000b2 ] };

+    key <AD05> {  [ 0x10000f5, 0x10000be ] };

+    key <AD06> {  [ 0x10000f4, 0x10000bd ] };

+    key <AD07> {  [ 0x10000f3, 0x10000bc ] };

+    key <AD08> {  [ 0x10000ac, 0x10000e4 ] };

+    key <AD09> {  [ 0x10000ae, 0x10000af ] };

+    key <AD10> {  [ 0x10000a4, 0x10000a6 ] };

+    key <AD11> {  [ dead_circumflex, 0x10000a6 ] }; // Ukaaram

+

+    // a-row

+    key <AC01> {  [ 0x10000f2, 0x10000bb ] };

+    key <AC02> {  [ 0x10000f7, 0x10000c0 ] };

+    key <AC03> {  [ 0x10000f9, 0x10000c2 ] };

+    key <AC04> {  [ 0x10000e8, 0x10000b0 ] };

+    key <AC05> {  [ 0x10000f0, 0x10000b9 ] };

+    key <AC06> {  [ 0x10000a2, 0x10000a3 ] };

+    key <AC07> {  [ 0x10000ee, 0x10000b6 ] };

+    key <AC08> {  [ 0x10000f1, 0x10000ba ] };

+    key <AC09> {  [ 0x10000ec, 0x10000b4 ] };

+    key <AC10> {  [ 0x10000f6, 0x10000bf ] };

+    key <AC11> {  [ 0x10000e9, 0x10000b1 ] };

+    

+    // z-row

+    key <AB01> {  [ 0x10000ed, 0x10000b5 ] };

+    key <AB02> {  [ 0x10000e5, 0x10000e6 ] };

+    key <AB03> {  [ 0x10000e0, 0x10000e1 ] };

+    key <AB04> {  [ 0x10000e2, 0x10000e3 ] };

+    key <AB05> {  [ 0x10000aa, 0x10000ab ] };

+    key <AB06> {  [ 0x10000ac, 0x10000a3 ] };

+    key <AB07> {  [ 0x10000dc, 0x10000dd ] };

+    key <AB08> {  [ 0x10000de, 0x10000df ] };

+};

+

+partial alphanumeric_keys 

+xkb_symbols "tel" {

+

+    // Inscript layout for Telugu using Unicode 

+    // Author: G Karunakar <karunakar@freedomink.org>

+    // Date:

+    // See layout at http://www.indlinux.org/keymap/telugu.php

+

+    name[Group1]= "India - Telugu";

+

+    key <TLDE> { [  U0c4a, U0c12	] };

+    key <AE01> { [  U0c67			] };

+    key <AE02> { [  U0c68			] };

+    key <AE03> { [  U0c69, numbersign	] };

+    key <AE04> { [  U0c6a, dollar		] };

+    key <AE05> { [  U0c6b, percent		] };

+    key <AE06> { [  U0c6c, asciicircum	] };

+    key <AE07> { [  U0c6d, ampersand	] };

+    key <AE08> { [  U0c6e, asterisk	] };

+    key <AE09> { [  U0c6f, parenleft	] };

+    key <AE10> { [  U0c66, parenright	] };

+    key <AE11> { [  U0c03, underscore	] };

+    key <AE12> { [  U0c43, U0c0b	] };

+    key <BKSP> { [  BackSpace			] };    

+ 

+    key <AD01> { [  U0c4c, U0c14	] };

+    key <AD02> { [  U0c48, U0c10	] };

+    key <AD03> { [  U0c3e, U0c06	] };

+    key <AD04> { [  U0c40, U0c08	] };

+    key <AD05> { [  U0c42, U0c0a	] };

+    key <AD06> { [  U0c2c, U0c2d	] };

+    key <AD07> { [  U0c39, U0c19	] };

+    key <AD08> { [  U0c17, U0c18	] };

+    key <AD09> { [  U0c26, U0c27	] };

+    key <AD10> { [  U0c1c, U0c1d	] };

+    key <AD11> { [  U0c21, U0c22	] };

+    key <AD12> { [  U0c1e			] };

+  

+    key <AC01> { [  U0c4b, U0c13	] };

+    key <AC02> { [  U0c47, U0c0f	] };

+    key <AC03> { [  U0c4d, U0c05	] };

+    key <AC04> { [  U0c3f, U0c07	] };

+    key <AC05> { [  U0c41, U0c09	] };

+    key <AC06> { [  U0c2a, U0c2b	] };

+    key <AC07> { [  U0c30, U0c31	] };

+    key <AC08> { [  U0c15, U0c16	] };

+    key <AC09> { [  U0c24, U0c25	] };

+    key <AC10> { [  U0c1a, U0c1b	] };

+    key <AC11> { [  U0c1f, U0c20	] };

+ 

+    key <AB01> { [  U0c46, U0c0e	] };

+    key <AB02> { [  U0c02, U0c01	] };

+    key <AB03> { [  U0c2e, U0c23	] };

+    key <AB04> { [  U0c28			] };

+    key <AB05> { [  U0c35			] };

+    key <AB06> { [  U0c32, U0c33	] };

+    key <AB07> { [  U0c38, U0c36	] };

+    key <AB08> { [  comma     , U0c37	] };

+    key <AB09> { [  period    				] };

+    key <AB10> { [  U0c2f, U0040	] };

+

+    key <RALT> {        

+        symbols[Group1] = [ Mode_switch, Multi_key ],

+        virtualMods = AltGr

+    };

+};

+

+partial alphanumeric_keys 

+xkb_symbols "urd-phonetic" {

+    include "pk(urd-phonetic)"

+    name[Group1]= "India - Urdu, Phonetic";

+};

+

+partial alphanumeric_keys 

+xkb_symbols "urd-phonetic3" {

+    include "pk(urd-crulp)"

+    name[Group1]= "India - Urdu, Alternative phonetic";

+};

+

+partial alphanumeric_keys 

+xkb_symbols "urd-winkeys" {

+    include "pk(urd-nla)"

+    name[Group1]= "India - Urdu, Winkeys";

+};

+

+// based on a keyboard map from an 'xkb/symbols/gur' file

+

+partial alphanumeric_keys

+xkb_symbols "guru" {

+      name[Group1]= "India - Gurmukhi";

+

+      // Mainly numbers.

+      key <AE01> { [      U0A67 		]	};

+      key <AE02> { [      U0A68		]	};

+      key <AE03> { [      U0A69, U0A71	]	};

+      key <AE04> { [      U0A6A, U0A74	 	]	};

+      key <AE05> { [      U0A6B, U262C		]	};

+      key <AE06> { [      U0A6C  	 	]	};

+      key <AE07> { [      U0A6D 		]	};

+      key <AE08> { [      U0A6e  	 	]	};

+      key <AE09> { [      U0A6F, parenleft 	]	};

+      key <AE10> { [      U0A66, parenright ]	};

+      key <AE11> { [      gur_visarga 	 	]	};

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

+

+// Mainly long vowels

+

+      key <AD01> { [      U0A4C, U0A14  ]	};

+      key <AD02> { [      U0A48, U0A10  ]	};

+      key <AD03> { [      U0A3E, U0A06  ]	};

+      key <AD04> { [      U0A40, U0A08  ]	};

+      key <AD05> { [      U0A42, U0A0A  ]	};

+

+// Mainly voiced consonants

+

+      key <AD06> { [      U0A2C, U0A2D 	]	};

+      key <AD07> { [      U0A39, U0A19 	]	};

+      key <AD08> { [      U0A17, U0A18 	]	};

+      key <AD09> { [      U0A26, U0A27 	]	};

+      key <AD10> { [      U0A1C, U0A1D 	]	};

+      key <AD11> { [      U0A21, U0A22 	]	};

+      key <AD12> { [      U0A3C, U0A1E 	]	};

+

+// Mainly short vowels

+      key <AC01> { [      U0A4B, U0A13  ]	};

+      key <AC02> { [      U0A47, U0A0F  ]	};

+      key <AC03> { [      U0A4D, U0A05  ]	};

+      key <AC04> { [      U0A3F, U0A07  ]	};

+      key <AC05> { [      U0A41, U0A09  ]	};

+

+// Mainly unvoiced consonants

+

+      key <AC06> { [      U0A2A, U0A2B 	]	};

+      key <AC07> { [      U0A30, U0A5C 	]	};

+      key <AC08> { [      U0A15, U0A16 	]	};

+      key <AC09> { [      U0A24, U0A25 	]	};

+      key <AC10> { [      U0A1A, U0A1B 	]	};

+      key <AC11> { [      U0A1F, U0A20 	]	};

+      key <BKSL> { [      U005C, U007C	]	};

+

+      key <AB01> { [      z, 	 U0A01	]       };

+      key <AB02> { [      U0A02, U0A70, U0A71  ]       };

+      key <AB03> { [      U0A2E, U0A23  ]       };

+      key <AB04> { [      U0A28, U0A28  ]       };

+      key <AB05> { [      U0A35, U0A35  ]       };

+      key <AB06> { [      U0A32, U0A33  ]       };

+      key <AB07> { [      U0A38, U0A36  ]       };

+      key <AB08> { [      comma,     less       ]       };

+      key <AB09> { [      period,    U0964  ]       };

+      key <AB10> { [      U0A2F, question   ]       };

+};

+

+//Name		:	Jhelum (Refind Inscript)

+//Description	:	A Jhelum keyboard layout for Gurmukhi (Punjabi)

+//			http://www.satluj.org/Jhelum.html

+//Modified for Inscript to make

+//Original Author :	Amanpreet Singh Alam <apreet.alam@gmail.com

+ 

+partial alphanumeric_keys

+xkb_symbols "jhelum" {

+      name[Group1] = "India - Gurmukhi Jhelum";

+          key.type="FOUR_LEVEL";

+     //Top Alphanumeric row

+     // Roman digits

+     key <TLDE>  { [  apostrophe, asciitilde, U0A02,U0A01 ] }; // apostrophe: anusvara, candrabindu

+     key <AE01>  { [   1,exclam,	U0A67,	exclam	   ] };

+     key <AE02>  { [   2,at,	U0A68,	at	   ] };

+     key <AE03>  { [   3,numbersign, U0A69,	numbersign ] };

+     key <AE04>  { [   4,dollar,	U0A6A,	dollar     ] };

+     key <AE05>  { [   5,percent,U0A6B,	percent    ] };

+     key <AE06>  { [   6,asciicircum, U0A6C,asciicircum ] };

+     key <AE07>  { [   7,ampersand,U0A6D,ampersand  ] };

+     key <AE08>  { [   8,asterisk,U0A6E,	asterisk   ] };

+     key <AE09>  { [   9,parenleft,U0A6F,parenleft  ] };

+     key <AE10>  { [   0,parenright,U0A66,parenright ] };

+     key <AE11>	{ [   minus,underscore] };

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

+     key <BKSL>  { [   U0964,U0965,U007C,U005C] }; //pipe : danda, double danda

+ 

+     //Q Row	

+     key <AD01>   { [   U0A4C, 	U0A14   ] };  // Q: oo, ooh

+     key <AD02>   { [   U0A48,  	U0A10	] };  // W: ee, ae

+     key <AD03>   { [   U0A3E,   U0A06  ] };  // E: a, aa

+     key <AD04>   { [   U0A40,	U0A08  	] };  // R: ee, ai

+     key <AD05>   { [   U0A42,   U0A0A   ] };  // T: u, uu

+     key <AD06>   { [   U0A30,	U0A5C   ] };  // Y: ra, raa

+     key <AD07>   { [   U0A26,   U0A27   ] };  // U: tha, thha

+     key <AD08>   { [   U0A17,   U0A18   ] };  // I:ga, gha

+     key <AD09>   { [   U0A24,   U0A1F   ] };  // O: ta, tha

+     key <AD10>   { [   U0A2A,   U0A5E   ] };  // P: pa, pha

+     key <AD11>   { [   U0A21,   U0A22,   bracketleft,   braceleft   ] };  

+     key <AD12>	 { [   U0A19,   U0A1E,   bracketright, braceright   ] };

+     

+     //A Row

+     key <AC01>   { [   U0A4B,	 U0A13  ] };   // A: o, oo

+     key <AC02>   { [   U0A40,    U0A0F   ] };  // S: e, ee

+     key <AC03>   { [   U0A4D,    U0A05   ] };  // D: halant, aa

+     key <AC04>   { [   U0A3F,    U0A07   ] };  // F: i, aa

+     key <AC05>   { [   U0A41,    U0A09   ] };  // G: u, uh

+     key <AC06>   { [   U0A39,    U0A20   ] };  // H: ha, thha

+     key <AC07>   { [   U0A1C,    U0A1D   ] };  // J: ja, jha

+     key <AC08>   { [   U0A15,    U0A16   ] };  // K: ka, kha

+     key <AC09>   { [   U0A32,	 U0A25   ] };  // L: la, tha

+     key <AC10>   { [   U0A38,   semicolon, colon  ] }; //; sa

+     key <AC11>   { [apostrophe, quotedbl ] };

+ 

+     //Z Row

+     key <AB01>   { [   U0A71,	 U0A3C 	 ] };  // Z: addak, par bindi

+     key <AB02>   { [   U0A02,    U0A70	 ] };  // X: bindi, tippi

+     key <AB03>   { [   U0A1A,    U0A1B   ] };  // C: ca, cha

+     key <AB04>   { [   U0A35,    U0A2F   ] };  // V: va, ya

+     key <AB05>   { [   U0A2C,    U0A2D   ] };  // B: ba, bha

+     key <AB06>   { [   U0A28,    U0A23   ] };  // N: na, nha

+     key <AB07>   { [   U0A2E, U0A2E       ] };  // M: ma

+     key <AB08>   { [   comma,    U262C	 ] };// comma: comma, dev abbreviation sign

+     key <AB09>   { [   period,   U0A74 	 ] };  // period: period, nukta

+     key <AB10>	 { [   slash,   question ] };

+ 

+// begin modifier mappings

+//    modifier_map Shift  { Shift_L };

+//    modifier_map Lock   { Caps_Lock };

+//    modifier_map Control{ Control_L };

+//    modifier_map Mod3   { Mode_switch };

+    include "level3(ralt_switch)"

+};

+

+partial alphanumeric_keys

+xkb_symbols "olpc" {

+

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

+

+  include "in(deva)"

+  key <TLDE> { [	U094A,	U0912 ] }; // DEVANAGARI VOWEL SIGN SHORT O; DEVANAGARI LETTER SHORT O

+  key <AE01> { [	U0967,	U090D ] }; // DEVANAGARI DIGIT ONE; DEVANAGARI LETTER CANDRA E

+  key <AE02> { [	U0968,	U0945 ] }; // DEVANAGARI DIGIT TWO; DEVANAGARI VOWEL SIGN CANDRA E

+  key <AE03> { [	U0969	 ] }; // DEVANAGARI DIGIT THREE; 

+  key <AE04> { [	U096A	 ] }; // DEVANAGARI DIGIT FOUR; 

+  key <AE05> { [	U096B	 ] }; // DEVANAGARI DIGIT FIVE; 

+  key <AE06> { [	U096C	 ] }; // DEVANAGARI DIGIT SIX; 

+  key <AE07> { [	U096D	 ] }; // DEVANAGARI DIGIT SEVEN; 

+  key <AE08> { [	U096E	 ] }; // DEVANAGARI DIGIT EIGHT; 

+  key <AE09> { [	U096F,	parenleft ] }; // DEVANAGARI DIGIT NINE; 

+  key <AE10> { [	U0966,	parenright ] }; // DEVANAGARI DIGIT ZERO; 

+  key <AE11> { [	minus,		U0903 ] }; // DEVANAGARI SIGN VISARGA; 

+  key <AE12> { [	U0943,	U090B ] }; // DEVANAGARI VOWEL SIGN VOCALIC R; DEVANAGARI LETTER VOCALIC R

+

+  key <AD01> { [	U094C,	U0914 ] }; // DEVANAGARI VOWEL SIGN AU; DEVANAGARI LETTER AU

+  key <AD02> { [	U0948,	U0910 ] }; // DEVANAGARI VOWEL SIGN AI; DEVANAGARI LETTER AI

+  key <AD03> { [	U093E,	U0906 ] }; // DEVANAGARI VOWEL SIGN AA; DEVANAGARI LETTER AA

+  key <AD04> { [	U0940,	U0908 ] }; // DEVANAGARI VOWEL SIGN II; DEVANAGARI LETTER II

+  key <AD05> { [	U0942,	U090A ] }; // DEVANAGARI VOWEL SIGN UU; DEVANAGARI LETTER UU

+  key <AD06> { [	U092C,	U092D ] }; // DEVANAGARI LETTER BA; DEVANAGARI LETTER BHA

+  key <AD07> { [	U0939,	U0919 ] }; // DEVANAGARI LETTER HA; DEVANAGARI LETTER NGA

+  key <AD08> { [	U0917,	U0918 ] }; // DEVANAGARI LETTER GA; DEVANAGARI LETTER GHA

+  key <AD09> { [	U0926,	U0927 ] }; // DEVANAGARI LETTER DA; DEVANAGARI LETTER DHA

+  key <AD10> { [	U091C,	U091D ] }; // DEVANAGARI LETTER JA; DEVANAGARI LETTER JHA

+  key <AD11> { [	U0921,	U0922 ] }; // DEVANAGARI LETTER DDA; DEVANAGARI LETTER DDHA

+  key <AD12> { [	U093C,	U091E ] }; // DEVANAGARI SIGN NUKTA; DEVANAGARI LETTER NYA

+

+  key <BKSL> { [	U0949,	U0911 ] }; // DEVANAGARI VOWEL SIGN CANDRA O; DEVANAGARI LETTER CANDRA O

+

+  key <AC01> { [	U094B,	U0913 ] }; // DEVANAGARI VOWEL SIGN O; DEVANAGARI LETTER O

+  key <AC02> { [	U0947,	U090F ] }; // DEVANAGARI VOWEL SIGN E; DEVANAGARI LETTER E

+  key <AC03> { [	U094D,	U0905 ] }; // DEVANAGARI SIGN VIRAMA; DEVANAGARI LETTER A

+  key <AC04> { [	U093F,	U0907 ] }; // DEVANAGARI VOWEL SIGN I; DEVANAGARI LETTER I

+  key <AC05> { [	U0941,	U0909 ] }; // DEVANAGARI VOWEL SIGN U; DEVANAGARI LETTER U

+  key <AC06> { [	U092A,	U092B ] }; // DEVANAGARI LETTER PA; DEVANAGARI LETTER PHA

+  key <AC07> { [	U0930,	U0931 ] }; // DEVANAGARI LETTER RA; DEVANAGARI LETTER RRA

+  key <AC08> { [	U0915,	U0916 ] }; // DEVANAGARI LETTER KA; DEVANAGARI LETTER KHA

+  key <AC09> { [	U0924,	U0925 ] }; // DEVANAGARI LETTER TA; DEVANAGARI LETTER THA

+  key <AC10> { [	U091A,	U091B ] }; // DEVANAGARI LETTER CA; DEVANAGARI LETTER CHA

+  key <AC11> { [	U091F,	U0920 ] }; // DEVANAGARI LETTER TTA; DEVANAGARI LETTER TTHA

+

+  key <AB01> { [	U0946,	U090E ] }; // DEVANAGARI VOWEL SIGN SHORT E; DEVANAGARI LETTER SHORT E

+  key <AB02> { [	U0902,	U0901 ] }; // DEVANAGARI SIGN ANUSVARA; DEVANAGARI SIGN CANDRABINDU

+  key <AB03> { [	U092E,	U0923 ] }; // DEVANAGARI LETTER MA; DEVANAGARI LETTER NNA

+  key <AB04> { [	U0928,	U0929 ] }; // DEVANAGARI LETTER NA; DEVANAGARI LETTER NNNA

+  key <AB05> { [	U0935,	U0934 ] }; // DEVANAGARI LETTER VA; DEVANAGARI LETTER LLLA

+  key <AB06> { [	U0932,	U0933 ] }; // DEVANAGARI LETTER LA; DEVANAGARI LETTER LLA

+  key <AB07> { [	U0938,	U0936 ] }; // DEVANAGARI LETTER SA; DEVANAGARI LETTER SHA

+  key <AB08> { [	comma,		U0937 ] }; // DEVANAGARI LETTER SSA

+  key <AB09> { [	period,		U0964 ] }; // DEVANAGARI DANDA

+  key <AB10> { [	U092F,	U095F ] }; // DEVANAGARI LETTER YA; DEVANAGARI LETTER YYA

+

+  // space, space, Zero-Width-Non-Joiner (ZWNJ), Zero-Width-Joiner (ZWJ):

+  include "nbsp(zwnj3zwj4)";

+

+  include "group(olpc)"

+};

+

+partial alphanumeric_keys 

+xkb_symbols "hin-wx" {

+

+    name[Group1]= "India - Hindi Wx";

+

+      key <TLDE> {	 [     grave, asciitilde, 2, 3    ]	};

+

+      key <AE01> {	 [      0x1000967, exclam 		]	};

+      key <AE02> {	 [      0x1000968, at 		]	};

+      key <AE03> {	 [      0x1000969 , numbersign	 		]	};

+      key <AE04> {	 [      0x100096A , dollar		]	};

+      key <AE05> {	 [      0x100096B , percent 	 		]	};

+      key <AE06> {	 [      0x100096C , asciicircum	 		]	};

+      key <AE07> {	 [      0x100096D , ampersand                       ]	};

+      key <AE08> {	 [      0x100096e , asterisk 	 		]	};

+      key <AE09> {	 [      0x100096F, parenleft 		]	};

+      key <AE10> {	 [      0x1000966, parenright 		]	};

+      key <AE11> {	 [      minus, underscore 	 		]	};

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

+

+

+      key <AD01> {	 [      0x1000943,  0x1000944, 0x100090B, 0x1000960]	};

+      key <AD02> {	 [      0x1000924,  0x1000925       	]	};

+      key <AD03> {	 [      0x1000947,  0x1000948, 0x100090F, 0x1000910]	};

+      key <AD04> {	 [      0x1000930,  0x1000937       	]	};

+      key <AD05> {	 [      0x100091F,  0x1000920       	]	};

+

+

+      key <AD06> {	 [      0x100092F 		]	};

+      key <AD07> {	 [      0x1000941,  0x1000942, 0x1000909, 0x100090A ]	};

+      key <AD08> {	 [      0x100093F,  0x1000940, 0x1000907, 0x1000908 ]	};

+      key <AD09> {	 [      0x100094B,  0x100094C, 0x1000913, 0x1000914]	};

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

+      key <AD11> {	 [      bracketleft, braceleft  		]	};

+      key <AD12> {	 [      bracketright, braceright  		]	};

+      key <BKSL> {       [      backslash, bar, 0x1000964, 0x1000965 ] };

+

+      key <AC01> {	 [      0x100094D,  0x100093E, 0x1000905,0x1000906 ] 	};

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

+      key <AC03> {	 [      0x1000921,  0x1000922       	]	};

+      key <AC04> {	 [      0x1000919,  0x100091E       	]	};

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

+

+

+      key <AC06> {	 [      0x1000939,  0x1000903 		]	};

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

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

+      key <AC09> {	 [      0x1000932,  0x1000962, 0x1000933, 0x100090C]	};

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

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

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

+

+      key <AB01> {	 [      0x1000901,   0x100093C, 0x100093D, 0x1000950]   };

+      key <AB02> {       [      0x1000926,   0x1000927      ]       };

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

+      key <AB04> {       [      0x1000935,   dead_V        ]       };

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

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

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

+      key <AB08> {       [      comma,       less         ]       };

+      key <AB09> {       [      period,      greater       ]       };

+      key <AB10> {       [      slash,      question        ]       };

+

+    include "level3(ralt_switch)"

+};

+

diff --git a/xorg-server/xkbdata.src/symbols/ir b/xorg-server/xkbdata.src/symbols/ir
index 85f18b144..2559e7f14 100644
--- a/xorg-server/xkbdata.src/symbols/ir
+++ b/xorg-server/xkbdata.src/symbols/ir
@@ -1,241 +1,241 @@
-// $XKeyboardConfig$
-
-// Iranian keyboard layout
-
-////////////////////////////////////////
-// Persian layout,
-// based on
-// Information Technology – Layout of Persian Letters and Symbols on Computer Keyboards
-// ISIRI 9147 – 1st Edition
-// Institute of Standards and Industrial Research of Iran
-// http://www.isiri.org/UserStd/DownloadStd.aspx?id=9147
-// http://behnam.esfahbod.info/standards/isiri-keyboard-9147.pdf
-//
-// Author: Behnam Esfahbod <behnam@esfahbod.info>
-//
-
-partial default alphanumeric_keys
-xkb_symbols "pes" {
-    include "ir(pes_part_basic)"
-    include "ir(pes_part_ext)"
-
-    name[Group1]= "Iran";
-};
-
-
-partial alphanumeric_keys
-xkb_symbols "pes_keypad" {
-    include "ir(pes_part_basic)"
-    include "ir(pes_part_keypad)"
-
-    name[Group1]= "Iran - Persian, with Persian Keypad";
-};
-
-partial hidden alphanumeric_keys
-xkb_symbols "pes_part_basic" {
-
-    // Persian digits
-    key <AE01> { [ 0x10006f1,	exclam,		quoteleft		] };
-    key <AE02> { [ 0x10006f2,	0x100066c,	at			] };
-    key <AE03> { [ 0x10006f3,	0x100066b,	numbersign		] };
-    key <AE04> { [ 0x10006f4,	0x100fdfc,	dollar			] };
-    key <AE05> { [ 0x10006f5,	0x100066a,	percent			] };
-    key <AE06> { [ 0x10006f6,	multiply,	asciicircum		] };
-    key <AE07> { [ 0x10006f7,	Arabic_comma,	ampersand		] };
-    key <AE08> { [ 0x10006f8,	asterisk,	enfilledcircbullet	] };
-    key <AE09> { [ 0x10006f9,	parenright,	0x100200e		] };
-    key <AE10> { [ 0x10006f0,	parenleft,	0x100200f		] };
-
-    // Persian letters and symbols
-    key <AD01> { [ Arabic_dad,		Arabic_sukun,		degree		] };
-    key <AD02> { [ Arabic_sad,		Arabic_dammatan,	VoidSymbol	] };
-    key <AD03> { [ Arabic_theh,		Arabic_kasratan,	0x13a4		] };
-    key <AD04> { [ Arabic_qaf,		Arabic_fathatan,	VoidSymbol	] };
-    key <AD05> { [ Arabic_feh,		Arabic_damma,		VoidSymbol	] };
-    key <AD06> { [ Arabic_ghain,	Arabic_kasra,		VoidSymbol	] };
-    key <AD07> { [ Arabic_ain,		Arabic_fatha,		VoidSymbol	] };
-    key <AD08> { [ Arabic_heh,		Arabic_shadda,		0x100202d	] };
-    key <AD09> { [ Arabic_khah,		bracketright,		0x100202e	] };
-    key <AD10> { [ Arabic_hah,		bracketleft,		0x100202c	] };
-    key <AD11> { [ Arabic_jeem,		braceright,		0x100202a	] };
-    key <AD12> { [ 0x1000686,		braceleft,		0x100202b	] };
-
-    key <AC01> { [ Arabic_sheen,	Arabic_hamzaonwaw,	VoidSymbol	] };
-    key <AC02> { [ Arabic_seen,		Arabic_hamzaonyeh,	VoidSymbol	] };
-    key <AC03> { [ 0x10006cc,		Arabic_yeh,		Arabic_alefmaksura ] };
-    key <AC04> { [ Arabic_beh,		Arabic_hamzaunderalef,	VoidSymbol	] };
-    key <AC05> { [ Arabic_lam,		Arabic_hamzaonalef,	VoidSymbol	] };
-    key <AC06> { [ Arabic_alef,		Arabic_maddaonalef,	0x1000671	] };
-    key <AC07> { [ Arabic_teh,		Arabic_tehmarbuta,	VoidSymbol	] };
-    key <AC08> { [ Arabic_noon,		guillemotright,		0x100fd3e	] };
-    key <AC09> { [ Arabic_meem,		guillemotleft,		0x100fd3f	] };
-    key <AC10> { [ 0x10006a9,		colon,			semicolon	] };
-    key <AC11> { [ 0x10006af,		Arabic_semicolon,	quotedbl	] };
-
-    key <AB01> { [ Arabic_zah,		Arabic_kaf,		VoidSymbol	] };
-    key <AB02> { [ Arabic_tah,		0x1000653,		VoidSymbol	] };
-    key <AB03> { [ Arabic_zain,		0x1000698,		VoidSymbol	] };
-    key <AB04> { [ Arabic_ra,		0x1000670,		0x1000656	] };
-    key <AB05> { [ Arabic_thal,		0x100200c,		0x100200d	] };
-    key <AB06> { [ Arabic_dal,		0x1000654,		0x1000655	] };
-    key <AB07> { [ 0x100067e,		Arabic_hamza,		ellipsis	] };
-    key <AB08> { [ Arabic_waw,		greater,		comma		] };
-    key <AB09> { [ period,		less,			apostrophe	] };
-    key <AB10> { [ slash,		Arabic_question_mark,	question	] };
-
-    key <TLDE> { [ 0x100200d,		division,		asciitilde	] };
-    key <AE11> { [ minus,		Arabic_tatweel,		underscore	] };
-    key <AE12> { [ equal,		plus,			0x1002212	] };
-    key <BKSL> { [ backslash,		bar,			0x1002010	] };
-
-    key <SPCE> { [ space,		0x100200c,		nobreakspace	] };
-
-    include "level3(ralt_switch)"
-};
-
-partial hidden alphanumeric_keys
-xkb_symbols "pes_part_ext" {
-
-    // Persian and ASCII digits
-    key <AE01> { [ 0x10006f1,	exclam,		quoteleft,		1	] };
-    key <AE02> { [ 0x10006f2,	0x100066c,	at,			2	] };
-    key <AE03> { [ 0x10006f3,	0x100066b,	numbersign,		3	] };
-    key <AE04> { [ 0x10006f4,	0x100fdfc,	dollar,			4	] };
-    key <AE05> { [ 0x10006f5,	0x100066a,	percent,		5	] };
-    key <AE06> { [ 0x10006f6,	multiply,	asciicircum,		6	] };
-    key <AE07> { [ 0x10006f7,	Arabic_comma,	ampersand,		7	] };
-    key <AE08> { [ 0x10006f8,	asterisk,	enfilledcircbullet,	8	] };
-    key <AE09> { [ 0x10006f9,	parenright,	0x100200e,		9	] };
-    key <AE10> { [ 0x10006f0,	parenleft,	0x100200f,		0	] };
-
-    key <SPCE> { [ space,	0x100200c,	nobreakspace,	0x100202F	] };
-};
-
-partial hidden alphanumeric_keys
-xkb_symbols "pes_part_keypad" {
-
-    // Persian digits and Mathematical operators
-    key <KPDV> { [ division,	XF86_Ungrab	] };
-    key <KPMU> { [ multiply,	XF86_ClearGrab	] };
-    key <KPSU> { [ 0x1002212,	XF86_Prev_VMode	] };
-    key <KPAD> { [ plus,	XF86_Next_VMode	] };
-
-    key <KPEN> { [ KP_Enter	] };
-    key <KPEQ> { [ equal	] };
-
-    key <KP7>  { [ KP_Home,	0x10006f7	] };
-    key <KP8>  { [ KP_Up,	0x10006f8	] };
-    key <KP9>  { [ KP_Prior,	0x10006f9	] };
-
-    key <KP4>  { [ KP_Left,	0x10006f4	] };
-    key <KP5>  { [ KP_Begin,	0x10006f5	] };
-    key <KP6>  { [ KP_Right,	0x10006f6	] };
-
-    key <KP1>  { [ KP_End,	0x10006f1	] };
-    key <KP2>  { [ KP_Down,	0x10006f2	] };
-    key <KP3>  { [ KP_Next,	0x10006f3	] };
-
-    key <KP0>  { [ KP_Insert,	0x10006f0	] };
-    key <KPDL> { [ KP_Delete,	0x100066b	] };
-};
-
-
-////////////////////////////////////////
-// Kurdish Layout
-
-partial alphanumeric_keys
-xkb_symbols "ku" {
-    include "tr(ku)"
-    name[Group1]= "Iran - Kurdish, Latin Q";
-};
-
-partial alphanumeric_keys
-xkb_symbols "ku_f" {
-    include "tr(ku_f)"
-    name[Group1]= "Iran - Kurdish, (F)";
-};
-
-partial alphanumeric_keys
-xkb_symbols "ku_alt" {
-    include "tr(ku_alt)"
-    name[Group1]= "Iran - Kurdish, Latin Alt-Q";
-};
-
-////////////////////////////////////////
-// Kurdish Soranî Bahdînî (Arabic) keyboard layout,
-// based on the Kurdî Soranî Bahdînî keyboard from KurdITGroup
-// which is based on National Iranian Keyboard Standard (ISIRI 2901:1994),
-// with additions.
-//
-// Copyright (C) 2006 Erdal Ronahî, published under the GPL v2
-//
-// Special copyright note: author explicitly permitted to license this 
-// layout under MIT/X11 license, for details see
-// https://bugs.freedesktop.org/show_bug.cgi?id=9541
-//
-// Author: Erdal Ronahî  <erdal.ronahi@gmail.com>
-//
-// Kurdish Arabic-Latin Layout for Soranî
-
-partial alphanumeric_keys
-xkb_symbols "ku_ara" {
-    name[Group1]= "Iran - Kurdish, Arabic-Latin";
-
-    // Other 3-Level symbols
-    key <TLDE> { [ 0x100200d,		division,		asciitilde	] };
-    key <BKSL> { [ backslash,		bar,			ccedilla, Ccedilla	] };
-    key <SPCE> { [ space,		0x100200c,		nobreakspace	] };
-
-    // Digits
-    key <AE01> { [ 1,	exclam,		0x10006f1,	quoteleft	] };
-    key <AE02> { [ 2,	at, 		0x10006f2,	at		] };
-    key <AE03> { [ 3,	numbersign,	0x10006f3,	0x100066b	] };
-    key <AE04> { [ 4,	dollar,		0x10006f4, 	0x100fdfc	] };
-    key <AE05> { [ 5,	percent,	0x10006f5,	0x100066a	] };
-    key <AE06> { [ 6,	asciicircum,	0x10006f6,	multiply	] };
-    key <AE07> { [ 7,	ampersand,	0x10006f7, 	Arabic_comma	] };
-    key <AE08> { [ 8,	asterisk,	0x10006f8,	enfilledcircbullet	] };
-    key <AE09> { [ 9,	parenright,	0x10006f9,	0x100200e	] };
-    key <AE10> { [ 0,	parenleft,	0x10006f0,	0x100200f	] };
-    key <AE11> { [ minus,		Arabic_tatweel,		underscore	] };
-    key <AE12> { [ equal,		plus,			0x1002212	] };
-
-    key <AD01> { [         Arabic_qaf,            X,  q,  Q ] };
-    key <AD02> { [         Arabic_waw,            X,  w,  W ] };
-    key <AD03> { [          0x10006d5,   Arabic_heh,  e,  E ] };
-    key <AD04> { [         Arabic_ra ,    0x1000695,  r,  R ] };
-    key <AD05> { [         Arabic_teh,   Arabic_tah,  t,  T ] };
-    key <AD06> { [          0x10006cc,    0x10006ce,  y,  Y ] };
-    key <AD07> { [  Arabic_hamzaonyeh, Arabic_hamza,  u,  U ] };
-    key <AD08> { [         Arabic_hah,   Arabic_ain,  i,  I ] };
-    key <AD09> { [          0x10006c6, Arabic_hamzaonwaw,  o,  O ] };
-    key <AD10> { [          0x100067e,  Arabic_theh,  p,  P ] };
-    key <AD11> { [ bracketright,	braceright,	ucircumflex, Ucircumflex	] };
-    key <AD12> { [ bracketleft,		braceleft,	scedilla, Scedilla	] };
-
-    key <AC01> { [ Arabic_alef,	Arabic_maddaonalef,	a, A	] };
-    key <AC02> { [ Arabic_seen,		Arabic_sheen,	s, S	] };
-    key <AC03> { [  Arabic_dal,		Arabic_thal,	d, D	] };
-    key <AC04> { [  Arabic_feh,	Arabic_hamzaunderalef,	f, F	] };
-    key <AC05> { [   0x10006af,		Arabic_ghain,	g, G	] };
-    key <AC06> { [  Arabic_heh,		0x100200c,	h, H	] };
-    key <AC07> { [   0x1000698,	Arabic_hamzaonalef,	j, J	] };
-    key <AC08> { [   0x10006a9,		Arabic_kaf,	k, K	] };
-    key <AC09> { [  Arabic_lam,		0x10006b5,	l, L	] };
-    key <AC10> { [  Arabic_semicolon, 	colon,		ecircumflex, Ecircumflex	] };
-    key <AC11> { [  apostrophe, 	quotedbl,	icircumflex, Icircumflex	] };
-
-    key <AB01> { [ Arabic_zain,		Arabic_dad,	z, Z	] };
-    key <AB02> { [ Arabic_khah,		Arabic_sad,	x, X	] };
-    key <AB03> { [ Arabic_jeem,		0x1000686,	c, C	] };
-    key <AB04> { [   0x10006a4,		Arabic_zah,	v, V	] };
-    key <AB05> { [ Arabic_beh,		0x1000649,	b, B	] };
-    key <AB06> { [ Arabic_noon,	Arabic_tehmarbuta,	n, N	] };
-    key <AB07> { [ Arabic_meem,	Arabic_tatweel,		m, M	] };
-    key <AB08> { [ Arabic_comma,	greater,	comma		] };
-    key <AB09> { [ period,		less,		apostrophe	] };
-    key <AB10> { [ slash,		Arabic_question_mark, 	question	] };
-
-    include "level3(ralt_switch)"
-};
-
+// $XKeyboardConfig$

+

+// Iranian keyboard layout

+

+////////////////////////////////////////

+// Persian layout,

+// based on

+// Information Technology – Layout of Persian Letters and Symbols on Computer Keyboards

+// ISIRI 9147 – 1st Edition

+// Institute of Standards and Industrial Research of Iran

+// http://www.isiri.org/UserStd/DownloadStd.aspx?id=9147

+// http://behnam.esfahbod.info/standards/isiri-keyboard-9147.pdf

+//

+// Author: Behnam Esfahbod <behnam@esfahbod.info>

+//

+

+partial default alphanumeric_keys

+xkb_symbols "pes" {

+    name[Group1]= "Iran";

+

+    include "ir(pes_part_basic)";

+    include "ir(pes_part_ext)";

+

+    include "nbsp(zwnj2nb3nnb4)";

+    include "level3(ralt_switch)";

+};

+

+

+partial alphanumeric_keys

+xkb_symbols "pes_keypad" {

+    name[Group1]= "Iran - Persian, with Persian Keypad";

+

+    include "ir(pes_part_basic)";

+    include "ir(pes_part_keypad)";

+

+    include "nbsp(zwnj2nb3nnb4)";

+    include "level3(ralt_switch)";

+};

+

+partial hidden alphanumeric_keys

+xkb_symbols "pes_part_basic" {

+

+    // Persian digits

+    key <AE01> { [ 0x10006f1,	exclam,		quoteleft		] };

+    key <AE02> { [ 0x10006f2,	0x100066c,	at			] };

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

+    key <AE04> { [ 0x10006f4,	0x100fdfc,	dollar			] };

+    key <AE05> { [ 0x10006f5,	0x100066a,	percent			] };

+    key <AE06> { [ 0x10006f6,	multiply,	asciicircum		] };

+    key <AE07> { [ 0x10006f7,	Arabic_comma,	ampersand		] };

+    key <AE08> { [ 0x10006f8,	asterisk,	enfilledcircbullet	] };

+    key <AE09> { [ 0x10006f9,	parenright,	0x100200e		] };

+    key <AE10> { [ 0x10006f0,	parenleft,	0x100200f		] };

+

+    // Persian letters and symbols

+    key <AD01> { [ Arabic_dad,		Arabic_sukun,		degree		] };

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

+    key <AD03> { [ Arabic_theh,		Arabic_kasratan,	0x13a4		] };

+    key <AD04> { [ Arabic_qaf,		Arabic_fathatan,	VoidSymbol	] };

+    key <AD05> { [ Arabic_feh,		Arabic_damma,		VoidSymbol	] };

+    key <AD06> { [ Arabic_ghain,	Arabic_kasra,		VoidSymbol	] };

+    key <AD07> { [ Arabic_ain,		Arabic_fatha,		VoidSymbol	] };

+    key <AD08> { [ Arabic_heh,		Arabic_shadda,		0x100202d	] };

+    key <AD09> { [ Arabic_khah,		bracketright,		0x100202e	] };

+    key <AD10> { [ Arabic_hah,		bracketleft,		0x100202c	] };

+    key <AD11> { [ Arabic_jeem,		braceright,		0x100202a	] };

+    key <AD12> { [ 0x1000686,		braceleft,		0x100202b	] };

+

+    key <AC01> { [ Arabic_sheen,	Arabic_hamzaonwaw,	VoidSymbol	] };

+    key <AC02> { [ Arabic_seen,		Arabic_hamzaonyeh,	VoidSymbol	] };

+    key <AC03> { [ 0x10006cc,		Arabic_yeh,		Arabic_alefmaksura ] };

+    key <AC04> { [ Arabic_beh,		Arabic_hamzaunderalef,	VoidSymbol	] };

+    key <AC05> { [ Arabic_lam,		Arabic_hamzaonalef,	VoidSymbol	] };

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

+    key <AC07> { [ Arabic_teh,		Arabic_tehmarbuta,	VoidSymbol	] };

+    key <AC08> { [ Arabic_noon,		guillemotright,		0x100fd3e	] };

+    key <AC09> { [ Arabic_meem,		guillemotleft,		0x100fd3f	] };

+    key <AC10> { [ 0x10006a9,		colon,			semicolon	] };

+    key <AC11> { [ 0x10006af,		Arabic_semicolon,	quotedbl	] };

+

+    key <AB01> { [ Arabic_zah,		Arabic_kaf,		VoidSymbol	] };

+    key <AB02> { [ Arabic_tah,		0x1000653,		VoidSymbol	] };

+    key <AB03> { [ Arabic_zain,		0x1000698,		VoidSymbol	] };

+    key <AB04> { [ Arabic_ra,		0x1000670,		0x1000656	] };

+    key <AB05> { [ Arabic_thal,		0x100200c,		0x100200d	] };

+    key <AB06> { [ Arabic_dal,		0x1000654,		0x1000655	] };

+    key <AB07> { [ 0x100067e,		Arabic_hamza,		ellipsis	] };

+    key <AB08> { [ Arabic_waw,		greater,		comma		] };

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

+    key <AB10> { [ slash,		Arabic_question_mark,	question	] };

+

+    key <TLDE> { [ 0x100200d,		division,		asciitilde	] };

+    key <AE11> { [ minus,		Arabic_tatweel,		underscore	] };

+    key <AE12> { [ equal,		plus,			0x1002212	] };

+    key <BKSL> { [ backslash,		bar,			0x1002010	] };

+};

+

+partial hidden alphanumeric_keys

+xkb_symbols "pes_part_ext" {

+

+    // Persian and ASCII digits

+    key <AE01> { [ 0x10006f1,	exclam,		quoteleft,		1	] };

+    key <AE02> { [ 0x10006f2,	0x100066c,	at,			2	] };

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

+    key <AE04> { [ 0x10006f4,	0x100fdfc,	dollar,			4	] };

+    key <AE05> { [ 0x10006f5,	0x100066a,	percent,		5	] };

+    key <AE06> { [ 0x10006f6,	multiply,	asciicircum,		6	] };

+    key <AE07> { [ 0x10006f7,	Arabic_comma,	ampersand,		7	] };

+    key <AE08> { [ 0x10006f8,	asterisk,	enfilledcircbullet,	8	] };

+    key <AE09> { [ 0x10006f9,	parenright,	0x100200e,		9	] };

+    key <AE10> { [ 0x10006f0,	parenleft,	0x100200f,		0	] };

+};

+

+partial hidden alphanumeric_keys

+xkb_symbols "pes_part_keypad" {

+

+    // Persian digits and Mathematical operators

+    key <KPDV> { [ division,	XF86_Ungrab	] };

+    key <KPMU> { [ multiply,	XF86_ClearGrab	] };

+    key <KPSU> { [ 0x1002212,	XF86_Prev_VMode	] };

+    key <KPAD> { [ plus,	XF86_Next_VMode	] };

+

+    key <KPEN> { [ KP_Enter	] };

+    key <KPEQ> { [ equal	] };

+

+    key <KP7>  { [ KP_Home,	0x10006f7	] };

+    key <KP8>  { [ KP_Up,	0x10006f8	] };

+    key <KP9>  { [ KP_Prior,	0x10006f9	] };

+

+    key <KP4>  { [ KP_Left,	0x10006f4	] };

+    key <KP5>  { [ KP_Begin,	0x10006f5	] };

+    key <KP6>  { [ KP_Right,	0x10006f6	] };

+

+    key <KP1>  { [ KP_End,	0x10006f1	] };

+    key <KP2>  { [ KP_Down,	0x10006f2	] };

+    key <KP3>  { [ KP_Next,	0x10006f3	] };

+

+    key <KP0>  { [ KP_Insert,	0x10006f0	] };

+    key <KPDL> { [ KP_Delete,	0x100066b	] };

+};

+

+

+////////////////////////////////////////

+// Kurdish Layout

+

+partial alphanumeric_keys

+xkb_symbols "ku" {

+    include "tr(ku)"

+    name[Group1]= "Iran - Kurdish, Latin Q";

+};

+

+partial alphanumeric_keys

+xkb_symbols "ku_f" {

+    include "tr(ku_f)"

+    name[Group1]= "Iran - Kurdish, (F)";

+};

+

+partial alphanumeric_keys

+xkb_symbols "ku_alt" {

+    include "tr(ku_alt)"

+    name[Group1]= "Iran - Kurdish, Latin Alt-Q";

+};

+

+////////////////////////////////////////

+// Kurdish Soranî Bahdînî (Arabic) keyboard layout,

+// based on the Kurdî Soranî Bahdînî keyboard from KurdITGroup

+// which is based on National Iranian Keyboard Standard (ISIRI 2901:1994),

+// with additions.

+//

+// Copyright (C) 2006 Erdal Ronahî, published under the GPL v2

+//

+// Special copyright note: author explicitly permitted to license this 

+// layout under MIT/X11 license, for details see

+// https://bugs.freedesktop.org/show_bug.cgi?id=9541

+//

+// Author: Erdal Ronahî  <erdal.ronahi@gmail.com>

+//

+// Kurdish Arabic-Latin Layout for Soranî

+

+partial alphanumeric_keys

+xkb_symbols "ku_ara" {

+    name[Group1]= "Iran - Kurdish, Arabic-Latin";

+

+    // Other 3-Level symbols

+    key <TLDE> { [ 0x100200d,		division,		asciitilde	] };

+    key <BKSL> { [ backslash,		bar,			ccedilla, Ccedilla	] };

+

+    // Digits

+    key <AE01> { [ 1,	exclam,		0x10006f1,	quoteleft	] };

+    key <AE02> { [ 2,	at, 		0x10006f2,	at		] };

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

+    key <AE04> { [ 4,	dollar,		0x10006f4, 	0x100fdfc	] };

+    key <AE05> { [ 5,	percent,	0x10006f5,	0x100066a	] };

+    key <AE06> { [ 6,	asciicircum,	0x10006f6,	multiply	] };

+    key <AE07> { [ 7,	ampersand,	0x10006f7, 	Arabic_comma	] };

+    key <AE08> { [ 8,	asterisk,	0x10006f8,	enfilledcircbullet	] };

+    key <AE09> { [ 9,	parenright,	0x10006f9,	0x100200e	] };

+    key <AE10> { [ 0,	parenleft,	0x10006f0,	0x100200f	] };

+    key <AE11> { [ minus,		Arabic_tatweel,		underscore	] };

+    key <AE12> { [ equal,		plus,			0x1002212	] };

+

+    key <AD01> { [         Arabic_qaf,            X,  q,  Q ] };

+    key <AD02> { [         Arabic_waw,            X,  w,  W ] };

+    key <AD03> { [          0x10006d5,   Arabic_heh,  e,  E ] };

+    key <AD04> { [         Arabic_ra ,    0x1000695,  r,  R ] };

+    key <AD05> { [         Arabic_teh,   Arabic_tah,  t,  T ] };

+    key <AD06> { [          0x10006cc,    0x10006ce,  y,  Y ] };

+    key <AD07> { [  Arabic_hamzaonyeh, Arabic_hamza,  u,  U ] };

+    key <AD08> { [         Arabic_hah,   Arabic_ain,  i,  I ] };

+    key <AD09> { [          0x10006c6, Arabic_hamzaonwaw,  o,  O ] };

+    key <AD10> { [          0x100067e,  Arabic_theh,  p,  P ] };

+    key <AD11> { [ bracketright,	braceright,	ucircumflex, Ucircumflex	] };

+    key <AD12> { [ bracketleft,		braceleft,	scedilla, Scedilla	] };

+

+    key <AC01> { [ Arabic_alef,	Arabic_maddaonalef,	a, A	] };

+    key <AC02> { [ Arabic_seen,		Arabic_sheen,	s, S	] };

+    key <AC03> { [  Arabic_dal,		Arabic_thal,	d, D	] };

+    key <AC04> { [  Arabic_feh,	Arabic_hamzaunderalef,	f, F	] };

+    key <AC05> { [   0x10006af,		Arabic_ghain,	g, G	] };

+    key <AC06> { [  Arabic_heh,		0x100200c,	h, H	] };

+    key <AC07> { [   0x1000698,	Arabic_hamzaonalef,	j, J	] };

+    key <AC08> { [   0x10006a9,		Arabic_kaf,	k, K	] };

+    key <AC09> { [  Arabic_lam,		0x10006b5,	l, L	] };

+    key <AC10> { [  Arabic_semicolon, 	colon,		ecircumflex, Ecircumflex	] };

+    key <AC11> { [  apostrophe, 	quotedbl,	icircumflex, Icircumflex	] };

+

+    key <AB01> { [ Arabic_zain,		Arabic_dad,	z, Z	] };

+    key <AB02> { [ Arabic_khah,		Arabic_sad,	x, X	] };

+    key <AB03> { [ Arabic_jeem,		0x1000686,	c, C	] };

+    key <AB04> { [   0x10006a4,		Arabic_zah,	v, V	] };

+    key <AB05> { [ Arabic_beh,		0x1000649,	b, B	] };

+    key <AB06> { [ Arabic_noon,	Arabic_tehmarbuta,	n, N	] };

+    key <AB07> { [ Arabic_meem,	Arabic_tatweel,		m, M	] };

+    key <AB08> { [ Arabic_comma,	greater,	comma		] };

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

+    key <AB10> { [ slash,		Arabic_question_mark, 	question	] };

+

+    include "nbsp(zwnj2nb3)"

+    include "level3(ralt_switch)"

+};

+

diff --git a/xorg-server/xkbdata.src/symbols/is b/xorg-server/xkbdata.src/symbols/is
index fcf199bb4..7debc94d5 100644
--- a/xorg-server/xkbdata.src/symbols/is
+++ b/xorg-server/xkbdata.src/symbols/is
@@ -1,199 +1,199 @@
-// $XKeyboardConfig$
-
-// based on
-// XKB keyboard by Hrafnkell Eiriksson - hkelle@rhi.hi.is
-//     fixes by Olafur Osvaldsson - oli@isnic.is
-//
-// $XFree86: xc/programs/xkbcomp/symbols/is,v 1.3 2002/11/26 01:57:25 dawes Exp $
-
-default partial alphanumeric_keys
-xkb_symbols "basic" {
-
-    include "latin(type4)"
-
-    name[Group1]="Iceland";
-
-    key <AE02>	{ [         2,   quotedbl,  twosuperior,    oneeighth ]	};
-    key <AE04>	{ [         4,     dollar,   onequarter,     currency ]	};
-    key <AE11>	{ [odiaeresis, Odiaeresis,    backslash, questiondown ]	};
-    key <AE12>	{ [     minus, underscore,     ccedilla,  dead_ogonek ]	};
-
-    key <AD11>	{ [       eth,        ETH, dead_diaeresis, dead_abovering ] };
-    key <AD12>	{ [apostrophe,   question,   asciitilde,  dead_macron ]	};
-
-    key <AC10>	{ [        ae,         AE,  asciicircum, dead_doubleacute ] };
-    key <AC11>	{ [dead_acute, dead_circumflex, dead_circumflex ] };
-    key <TLDE>	{ [    degree,  diaeresis,      notsign,      notsign ]	};
-
-    key <BKSL>	{ [      plus,   asterisk,        grave,   dead_breve ]	};
-    key <AB10>	{ [     thorn,      THORN, dead_belowdot, dead_abovedot ] };
-
-    include "level3(ralt_switch)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "Sundeadkeys" {
-
-    // modify the basic Icelandic layout to use Sun dead keys
-
-    include "is(basic)"
-
-    name[Group1]="Iceland - Sun dead keys";
-
-    key <TLDE>	{ [SunFA_Circum,     degree,      notsign,    notsign ]	};
-    key <AE12>	{ [SunFA_Acute, SunFA_Grave, SunFA_Cedilla, SunFA_Cedilla ] };
-    key <AD11>	{ [udiaeresis, Udiaeresis, SunFA_Diaeresis, SunFA_Diaeresis ] };
-    key <AD12>	{ [      plus,   asterisk,  SunFA_Tilde,  dead_macron ]	};
-    key <AC10>	{ [odiaeresis, Odiaeresis,  SunFA_Acute,  SunFA_Acute ]	};
-    key <AC11>	{ [adiaeresis, Adiaeresis, SunFA_Circum, SunFA_Circum ]	};
-    key <BKSL>	{ [numbersign,      acute,  SunFA_Grave,  SunFA_Grave ]	};
-};
-
-partial alphanumeric_keys
-xkb_symbols "nodeadkeys" {
-
-    // modify the basic Icelandic layout to not have any dead keys
-
-    include "is(basic)"
-
-    name[Group1]="Iceland - Eliminate dead keys";
-
-    key <TLDE>	{ [asciicircum,    degree,      notsign,      notsign ]	};
-    key <AE12>	{ [apostrophe,      grave,      cedilla,      cedilla ]	};
-    key <AD11>	{ [udiaeresis, Udiaeresis,    diaeresis,    diaeresis ]	};
-    key <AD12>	{ [      plus,   asterisk,   asciitilde,       macron ]	};
-    key <AC10>	{ [odiaeresis, Odiaeresis,        acute,        acute ]	};
-    key <AC11>	{ [adiaeresis, Adiaeresis,  asciicircum,  asciicircum ]	};
-    key <BKSL>	{ [numbersign,      acute,        grave,        grave ]	};
-    key <AB10>	{ [     thorn,      THORN, dead_belowdot,    abovedot ]	};
-};
-
-// Copyright (C) 2004, 2006 Ævar Arnfjörð Bjarmason <avarab@gmail.com>
-//
-// = HISTORY
-// * 2004-09-28:
-//   Initial cleanroom writing of the keymap, I just booted Mac OS X, opened
-//   TextEdit.app and wrote down what the value produced by each key was when I
-//   pressed it, a for a, A for shift + a, å for lalt + a etc and made the
-//   keymap from that information
-//
-// * 2006-01-14:
-//   Revised the comments in the file
-//
-// = NOTES
-// * 20 characters in this keymap have no named character defined in
-//   include/keysymdef.h and as a result their Unicode code points in
-//   hexadecimal are listed here, these can be generated with the following
-//   perl command:
-//     $ perl -CA -e 'printf "U%x\n", ord shift' Æ
-//   and converted back like:
-//     $ perl -CO -le '$_=shift;s/[^a-f0-9]//ig;print chr hex' Uc6
-// * The Apple logo appears twice on this keymap like the Mac OS and Mac OS X
-//   keymaps. In the MacRoman encoding it has the code point 0xF0 (240) but it
-//   has no assigned code point in Unicode, the code point Apple uses for it is
-//   U+F8FF (63743) which is in the BMP's Private Use Area (U+E000–U+F8FF)
-// * This keymap has only been tested on a PowerBook6,5 (iBook G4) but it
-//   should work on other Apple laptop models which use the same keyboard
-//   layout. It will probably work on standard sized keyboards with little or
-//   no modification but it might not support them fully, please report if
-//   you're able to get it running with such a keyboard
-
-// Copied from macintosh_vndr/is
-partial alphanumeric_keys
-xkb_symbols "mac" {
-    name[Group1]= "Iceland - Macintosh";
-
-	//-- Row 5 (E) --//
-	key <TLDE> {	[	sterling,	section, 	UF8FF,		apostrophe	]	};
-	key <AE01> {	[	1,		exclam, 	exclamdown,	VoidSymbol	]	};
-	key <AE02> {	[	2,		quotedbl, 	at,		VoidSymbol	]	};
-	key <AE03> {	[	3,		numbersign, 	U2122,		sterling	]	};
-	key <AE04> {	[	4,		dollar, 	U00A2,		EuroSign	]	};
-	key <AE05> {	[	5,		percent, 	U2030,		infinity	]	};
-	key <AE06> {	[	6,		ampersand, 	asciicircum,	U2044		]	};
-	key <AE07> {	[	7,		slash, 	backslash,	U00F7		]	};
-	key <AE08> {	[	8,		parenleft, 	bracketleft,	braceleft	]	};
-	key <AE09> {	[	9,		parenright, 	bracketright,	braceright	]	};
-	key <AE10> {	[	0,		equal, 	U2260,		U2248		]	};
-	key <AE11> {	[	odiaeresis,	Odiaeresis, 	oslash,		Ooblique	]	};
-	key <AE12> {	[	minus,		underscore, 	endash,		emdash		]	};
-
-	
-	//-- Row 4 (D) --//
-	key <AD01> {	[	q,		Q, 	paragraph,	VoidSymbol	]	};
-	key <AD02> {	[	w,		W, 	U2211,		VoidSymbol	]	};
-	key <AD03> {	[	e,		E, 	dead_grave,	VoidSymbol	]	};
-	key <AD04> {	[	r,		R, 	registered,	VoidSymbol	]	};
-	key <AD05> {	[	t,		T, 	degree,		VoidSymbol	]	};
-	key <AD06> {	[	y,		Y, 	yen,		VoidSymbol	]	};
-	key <AD07> {	[	u,		U, 	dead_diaeresis,	VoidSymbol	]	};
-	key <AD08> {	[	i,		I, 	U0131,		U00AA		]	};
-	key <AD09> {	[	o,		O, 	dead_circumflex,U00BA		]	};
-	key <AD10> {	[	p,		P, 	Greek_pi,	Greek_PI	]	};
-	key <AD11> {	[	eth,		Eth, 	U201e,		U201c		]	};
-	key <AD12> {	[	apostrophe,	question, 	questiondown,	U00B7		]	};
-	
-	
-	//-- Row 3 (C) --//
-	key <AC01> {	[	a,		A, 	aring,		Aring		]	};
-	key <AC02> {	[	s,		S, 	ssharp,		abovedot	]	};
-	key <AC03> {	[	d,		D, 	U2202,		U2DA		]	};
-	key <AC04> {	[	f,		F, 	U192,		macron		]	};
-	key <AC05> {	[	g,		G, 	copyright,	breve		]	};
-	key <AC06> {	[	h,		H, 	bar,		VoidSymbol	]	};
-	key <AC07> {	[	j,		J, 	U2206,		U2dd		]	};
-	key <AC08> {	[	k,		K, 	U00AC,		VoidSymbol	]	};
-	key <AC09> {	[	l,		L, 	U2026,		caron		]	};
-	key <AC10> {	[	ae,		AE, 	oe,		OE		]	};
-	key <AC11> {	[	dead_acute,	dead_diaeresis, 	U201A,		U2018		]	};
-	key <BKSL> {	[	plus,		asterisk, 	U2022,		plusminus	]	};
-	
-	
-	//-- Row 2  (B) --//
-	key <LSGT> {	[	less,		greater, 	section,	UF8FF		]	};
-	key <AB01> {	[	z,		Z, 	U3A9,		VoidSymbol	]	};
-	key <AB02> {	[	x,		X, 	asciitilde,	VoidSymbol	]	};
-	key <AB03> {	[	c,		C, 	ccedilla,	Ccedilla	]	};
-	key <AB04> {	[	v,		V, 	U221A,		U25CA		]	};
-	key <AB05> {	[	b,		B, 	U222B,		VoidSymbol	]	};
-	key <AB06> {	[	n,		N, 	dead_tilde,	VoidSymbol	]	};
-	key <AB07> {	[	m,		M, 	U00B5,		VoidSymbol	]	};
-	key <AB08> {	[	comma,		semicolon, 	lessthanequal,	guillemotleft	]	};
-	key <AB09> {	[	period,		colon, 	greaterthanequal,guillemotright	]	};
-	key <AB10> {	[	thorn,		Thorn, 	U2019,		U201d		]	};
-
-    include "level3(ralt_switch)"
-};
-
-// This is a modified version of the English Dvorak layout that allows
-// you to type all Icelandic letters under X. It's not a full attempt at
-// nationalizing the layout as e.g. the Norwegian, Swedish and French
-// layouts which modify the primary keys of the basic Dvorak layout
-// extensively.
-
-// Rather it's a simple modification of 5 keys of the US Dvorak layout,
-// it adds Germanic/Icelandic style quotation marks („“), eth (ðÐ), ae
-// (æÆ), endash and emdash (–—) and thorn (þÞ). These keys aren't used in
-// the US version making this IS version a superset of it.
-
-// Maybe someone else will make a "full" attempt at an Icelandic layout
-// but I was mostly interested in continuing to type English comfortably
-// as a primary function while being able to type the full Icelandic
-// alphabet as a secondary function.
-//     -- Ævar Arnfjörð Bjarmason <avar@cpan.org>
-
-// Icelandic Dvorak
-partial alphanumeric_keys 
-xkb_symbols "dvorak" {
-    name[Group1]= "Iceland - Dvorak";
-
-    include "us(dvorak)"
-
-    key <AD11> { [      slash,  question,    U201e,   U201c   ] };
-    key <AC06> { [       d,     D,           eth,     ETH     ] };
-    key <AC10> { [       s,     S,           ae,      AE      ] };
-    key <AC11> { [   minus,     underscore,  endash,  emdash  ] };
-    key <AB10> { [       z,     Z,           thorn,   Thorn   ] };
-
-    include "level3(ralt_switch)"
-};
+// $XKeyboardConfig$

+

+// based on

+// XKB keyboard by Hrafnkell Eiriksson - hkelle@rhi.hi.is

+//     fixes by Olafur Osvaldsson - oli@isnic.is

+//

+// $XFree86: xc/programs/xkbcomp/symbols/is,v 1.3 2002/11/26 01:57:25 dawes Exp $

+

+default partial alphanumeric_keys

+xkb_symbols "basic" {

+

+    include "latin(type4)"

+

+    name[Group1]="Iceland";

+

+    key <AE02>	{ [         2,   quotedbl,  twosuperior,    oneeighth ]	};

+    key <AE04>	{ [         4,     dollar,   onequarter,     currency ]	};

+    key <AE11>	{ [odiaeresis, Odiaeresis,    backslash, questiondown ]	};

+    key <AE12>	{ [     minus, underscore,     ccedilla,  dead_ogonek ]	};

+

+    key <AD11>	{ [       eth,        ETH, dead_diaeresis, dead_abovering ] };

+    key <AD12>	{ [apostrophe,   question,   asciitilde,  dead_macron ]	};

+

+    key <AC10>	{ [        ae,         AE,  asciicircum, dead_doubleacute ] };

+    key <AC11>	{ [dead_acute, dead_circumflex, dead_circumflex ] };

+    key <TLDE>	{ [    degree,  diaeresis,      notsign,      notsign ]	};

+

+    key <BKSL>	{ [      plus,   asterisk,        grave,   dead_breve ]	};

+    key <AB10>	{ [     thorn,      THORN, dead_belowdot, dead_abovedot ] };

+

+    include "level3(ralt_switch)"

+};

+

+partial alphanumeric_keys

+xkb_symbols "Sundeadkeys" {

+

+    // modify the basic Icelandic layout to use Sun dead keys

+

+    include "is(basic)"

+

+    name[Group1]="Iceland - Sun dead keys";

+

+    key <TLDE>	{ [dead_circumflex,     degree,      notsign,    notsign ]	};

+    key <AE12>	{ [dead_acute, dead_grave, dead_cedilla, dead_cedilla ] };

+    key <AD11>	{ [udiaeresis, Udiaeresis, dead_diaeresis, dead_diaeresis ] };

+    key <AD12>	{ [      plus,   asterisk,  dead_tilde,  dead_macron ]	};

+    key <AC10>	{ [odiaeresis, Odiaeresis,  dead_acute,  dead_acute ]	};

+    key <AC11>	{ [adiaeresis, Adiaeresis, dead_circumflex, dead_circumflex ]	};

+    key <BKSL>	{ [numbersign,      acute,  dead_grave,  dead_grave ]	};

+};

+

+partial alphanumeric_keys

+xkb_symbols "nodeadkeys" {

+

+    // modify the basic Icelandic layout to not have any dead keys

+

+    include "is(basic)"

+

+    name[Group1]="Iceland - Eliminate dead keys";

+

+    key <TLDE>	{ [asciicircum,    degree,      notsign,      notsign ]	};

+    key <AE12>	{ [apostrophe,      grave,      cedilla,      cedilla ]	};

+    key <AD11>	{ [udiaeresis, Udiaeresis,    diaeresis,    diaeresis ]	};

+    key <AD12>	{ [      plus,   asterisk,   asciitilde,       macron ]	};

+    key <AC10>	{ [odiaeresis, Odiaeresis,        acute,        acute ]	};

+    key <AC11>	{ [adiaeresis, Adiaeresis,  asciicircum,  asciicircum ]	};

+    key <BKSL>	{ [numbersign,      acute,        grave,        grave ]	};

+    key <AB10>	{ [     thorn,      THORN, dead_belowdot,    abovedot ]	};

+};

+

+// Copyright (C) 2004, 2006 Ævar Arnfjörð Bjarmason <avarab@gmail.com>

+//

+// = HISTORY

+// * 2004-09-28:

+//   Initial cleanroom writing of the keymap, I just booted Mac OS X, opened

+//   TextEdit.app and wrote down what the value produced by each key was when I

+//   pressed it, a for a, A for shift + a, å for lalt + a etc and made the

+//   keymap from that information

+//

+// * 2006-01-14:

+//   Revised the comments in the file

+//

+// = NOTES

+// * 20 characters in this keymap have no named character defined in

+//   include/keysymdef.h and as a result their Unicode code points in

+//   hexadecimal are listed here, these can be generated with the following

+//   perl command:

+//     $ perl -CA -e 'printf "U%x\n", ord shift' Æ

+//   and converted back like:

+//     $ perl -CO -le '$_=shift;s/[^a-f0-9]//ig;print chr hex' Uc6

+// * The Apple logo appears twice on this keymap like the Mac OS and Mac OS X

+//   keymaps. In the MacRoman encoding it has the code point 0xF0 (240) but it

+//   has no assigned code point in Unicode, the code point Apple uses for it is

+//   U+F8FF (63743) which is in the BMP's Private Use Area (U+E000–U+F8FF)

+// * This keymap has only been tested on a PowerBook6,5 (iBook G4) but it

+//   should work on other Apple laptop models which use the same keyboard

+//   layout. It will probably work on standard sized keyboards with little or

+//   no modification but it might not support them fully, please report if

+//   you're able to get it running with such a keyboard

+

+// Copied from macintosh_vndr/is

+partial alphanumeric_keys

+xkb_symbols "mac" {

+    name[Group1]= "Iceland - Macintosh";

+

+	//-- Row 5 (E) --//

+	key <TLDE> {	[	sterling,	section, 	UF8FF,		apostrophe	]	};

+	key <AE01> {	[	1,		exclam, 	exclamdown,	VoidSymbol	]	};

+	key <AE02> {	[	2,		quotedbl, 	at,		VoidSymbol	]	};

+	key <AE03> {	[	3,		numbersign, 	U2122,		sterling	]	};

+	key <AE04> {	[	4,		dollar, 	U00A2,		EuroSign	]	};

+	key <AE05> {	[	5,		percent, 	U2030,		infinity	]	};

+	key <AE06> {	[	6,		ampersand, 	asciicircum,	U2044		]	};

+	key <AE07> {	[	7,		slash, 	backslash,	U00F7		]	};

+	key <AE08> {	[	8,		parenleft, 	bracketleft,	braceleft	]	};

+	key <AE09> {	[	9,		parenright, 	bracketright,	braceright	]	};

+	key <AE10> {	[	0,		equal, 	U2260,		U2248		]	};

+	key <AE11> {	[	odiaeresis,	Odiaeresis, 	oslash,		Ooblique	]	};

+	key <AE12> {	[	minus,		underscore, 	endash,		emdash		]	};

+

+	

+	//-- Row 4 (D) --//

+	key <AD01> {	[	q,		Q, 	paragraph,	VoidSymbol	]	};

+	key <AD02> {	[	w,		W, 	U2211,		VoidSymbol	]	};

+	key <AD03> {	[	e,		E, 	dead_grave,	VoidSymbol	]	};

+	key <AD04> {	[	r,		R, 	registered,	VoidSymbol	]	};

+	key <AD05> {	[	t,		T, 	degree,		VoidSymbol	]	};

+	key <AD06> {	[	y,		Y, 	yen,		VoidSymbol	]	};

+	key <AD07> {	[	u,		U, 	dead_diaeresis,	VoidSymbol	]	};

+	key <AD08> {	[	i,		I, 	U0131,		U00AA		]	};

+	key <AD09> {	[	o,		O, 	dead_circumflex,U00BA		]	};

+	key <AD10> {	[	p,		P, 	Greek_pi,	Greek_PI	]	};

+	key <AD11> {	[	eth,		Eth, 	U201e,		U201c		]	};

+	key <AD12> {	[	apostrophe,	question, 	questiondown,	U00B7		]	};

+	

+	

+	//-- Row 3 (C) --//

+	key <AC01> {	[	a,		A, 	aring,		Aring		]	};

+	key <AC02> {	[	s,		S, 	ssharp,		abovedot	]	};

+	key <AC03> {	[	d,		D, 	U2202,		U2DA		]	};

+	key <AC04> {	[	f,		F, 	U192,		macron		]	};

+	key <AC05> {	[	g,		G, 	copyright,	breve		]	};

+	key <AC06> {	[	h,		H, 	bar,		VoidSymbol	]	};

+	key <AC07> {	[	j,		J, 	U2206,		U2dd		]	};

+	key <AC08> {	[	k,		K, 	U00AC,		VoidSymbol	]	};

+	key <AC09> {	[	l,		L, 	U2026,		caron		]	};

+	key <AC10> {	[	ae,		AE, 	oe,		OE		]	};

+	key <AC11> {	[	dead_acute,	dead_diaeresis, 	U201A,		U2018		]	};

+	key <BKSL> {	[	plus,		asterisk, 	U2022,		plusminus	]	};

+	

+	

+	//-- Row 2  (B) --//

+	key <LSGT> {	[	less,		greater, 	section,	UF8FF		]	};

+	key <AB01> {	[	z,		Z, 	U3A9,		VoidSymbol	]	};

+	key <AB02> {	[	x,		X, 	asciitilde,	VoidSymbol	]	};

+	key <AB03> {	[	c,		C, 	ccedilla,	Ccedilla	]	};

+	key <AB04> {	[	v,		V, 	U221A,		U25CA		]	};

+	key <AB05> {	[	b,		B, 	U222B,		VoidSymbol	]	};

+	key <AB06> {	[	n,		N, 	dead_tilde,	VoidSymbol	]	};

+	key <AB07> {	[	m,		M, 	U00B5,		VoidSymbol	]	};

+	key <AB08> {	[	comma,		semicolon, 	lessthanequal,	guillemotleft	]	};

+	key <AB09> {	[	period,		colon, 	greaterthanequal,guillemotright	]	};

+	key <AB10> {	[	thorn,		Thorn, 	U2019,		U201d		]	};

+

+    include "level3(ralt_switch)"

+};

+

+// This is a modified version of the English Dvorak layout that allows

+// you to type all Icelandic letters under X. It's not a full attempt at

+// nationalizing the layout as e.g. the Norwegian, Swedish and French

+// layouts which modify the primary keys of the basic Dvorak layout

+// extensively.

+

+// Rather it's a simple modification of 5 keys of the US Dvorak layout,

+// it adds Germanic/Icelandic style quotation marks („“), eth (ðÐ), ae

+// (æÆ), endash and emdash (–—) and thorn (þÞ). These keys aren't used in

+// the US version making this IS version a superset of it.

+

+// Maybe someone else will make a "full" attempt at an Icelandic layout

+// but I was mostly interested in continuing to type English comfortably

+// as a primary function while being able to type the full Icelandic

+// alphabet as a secondary function.

+//     -- Ævar Arnfjörð Bjarmason <avar@cpan.org>

+

+// Icelandic Dvorak

+partial alphanumeric_keys 

+xkb_symbols "dvorak" {

+    name[Group1]= "Iceland - Dvorak";

+

+    include "us(dvorak)"

+

+    key <AD11> { [      slash,  question,    U201e,   U201c   ] };

+    key <AC06> { [       d,     D,           eth,     ETH     ] };

+    key <AC10> { [       s,     S,           ae,      AE      ] };

+    key <AC11> { [   minus,     underscore,  endash,  emdash  ] };

+    key <AB10> { [       z,     Z,           thorn,   Thorn   ] };

+

+    include "level3(ralt_switch)"

+};

diff --git a/xorg-server/xkbdata.src/symbols/latam b/xorg-server/xkbdata.src/symbols/latam
index 29ec743dc..ffd1ca8bc 100644
--- a/xorg-server/xkbdata.src/symbols/latam
+++ b/xorg-server/xkbdata.src/symbols/latam
@@ -1,72 +1,72 @@
-// $XKeyboardConfig$
-
-// based on a keyboard
-// Modified for a real Latin American Keyboard by Fabian Mandelbaum
-//
-// $XFree86: xc/programs/xkbcomp/symbols/la,v 1.2 2002/11/22 04:03:28 dawes Exp $
-
-partial default alphanumeric_keys
-xkb_symbols "basic" {
-
-    include "latin(type4)"
-
-    name[Group1]="Latin American";
-
-    key <AE01>	{ [         1,     exclam,          bar,   exclamdown ]	};
-    key <AE03>	{ [         3, numbersign, periodcentered,   sterling ]	};
-    key <AE04>	{ [         4,     dollar,   asciitilde,       dollar ]	};
-    key <AE06>	{ [         6,  ampersand,      notsign,  fiveeighths ]	};
-    key <AE11>	{ [apostrophe,   question,    backslash, questiondown ]	};
-    key <AE12>	{ [questiondown, exclamdown, dead_cedilla, dead_ogonek]	};
-
-    key <AD11>	{ [dead_acute, dead_diaeresis, dead_diaeresis, dead_abovering ]	};
-    key <AD12>	{ [      plus,   asterisk,   asciitilde,  dead_macron ]	};
-
-    key <AC10>	{ [    ntilde,     Ntilde,   asciitilde, dead_doubleacute ] };
-    key <AC11>	{ [ braceleft, bracketleft, dead_circumflex, braceleft]	};
-    key <TLDE>	{ [       bar,     degree,      notsign,      notsign ]	};
-
-    key <BKSL>	{ [braceright, bracketright, dead_grave,   braceright ]	};
-
-    include "level3(ralt_switch)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "Sundeadkeys" {
-    include "latam(basic)"
-
-    key <AC11>	{ [SunFA_Acute, SunFA_Diaeresis, braceleft, braceleft ]	};
-    key <AD11>	{ [SunFA_Grave, SunFA_Circum, bracketleft, dead_abovering ] };
-};
-
-partial alphanumeric_keys
-xkb_symbols "sundeadkeys" {
-    include "latam(Sundeadkeys)"
-    name[Group1]="Latin American - Sun dead keys";
-};
-
-partial alphanumeric_keys
-xkb_symbols "nodeadkeys" {
-
-    include "latam(basic)"
-
-    name[Group1]="Latin American - Eliminate dead keys";
-
-    key <AE12>	{ [questiondown, exclamdown,    cedilla,       ogonek ]	};
-    key <AD11>	{ [     grave, asciicircum, bracketleft,       degree ]	};
-    key <AD12>	{ [      plus,   asterisk, bracketright,       macron ]	};
-    key <AC10>	{ [    ntilde,     Ntilde,   asciitilde,  doubleacute ]	};
-    key <AC11>	{ [     acute,  diaeresis,    braceleft,    braceleft ]	};
-    key <BKSL>	{ [  ccedilla,   Ccedilla,   braceright,        breve ]	};
-    key <AB10>	{ [     minus, underscore, dead_belowdot,    abovedot ]	};
-};
-
-partial alphanumeric_keys
-xkb_symbols "deadtilde" {
-
-    include "latam(basic)"
-
-    name[Group1]="Latin American - Include dead tilde";
-
-    key <AD12>	{ [      plus,   asterisk,   dead_tilde,  dead_macron ]	};
-};
+// $XKeyboardConfig$

+

+// based on a keyboard

+// Modified for a real Latin American Keyboard by Fabian Mandelbaum

+//

+// $XFree86: xc/programs/xkbcomp/symbols/la,v 1.2 2002/11/22 04:03:28 dawes Exp $

+

+partial default alphanumeric_keys

+xkb_symbols "basic" {

+

+    include "latin(type4)"

+

+    name[Group1]="Latin American";

+

+    key <AE01>	{ [         1,     exclam,          bar,   exclamdown ]	};

+    key <AE03>	{ [         3, numbersign, periodcentered,   sterling ]	};

+    key <AE04>	{ [         4,     dollar,   asciitilde,       dollar ]	};

+    key <AE06>	{ [         6,  ampersand,      notsign,  fiveeighths ]	};

+    key <AE11>	{ [apostrophe,   question,    backslash, questiondown ]	};

+    key <AE12>	{ [questiondown, exclamdown, dead_cedilla, dead_ogonek]	};

+

+    key <AD11>	{ [dead_acute, dead_diaeresis, dead_diaeresis, dead_abovering ]	};

+    key <AD12>	{ [      plus,   asterisk,   asciitilde,  dead_macron ]	};

+

+    key <AC10>	{ [    ntilde,     Ntilde,   asciitilde, dead_doubleacute ] };

+    key <AC11>	{ [ braceleft, bracketleft, dead_circumflex, braceleft]	};

+    key <TLDE>	{ [       bar,     degree,      notsign,      notsign ]	};

+

+    key <BKSL>	{ [braceright, bracketright, dead_grave,   braceright ]	};

+

+    include "level3(ralt_switch)"

+};

+

+partial alphanumeric_keys

+xkb_symbols "Sundeadkeys" {

+    include "latam(basic)"

+

+    key <AC11>	{ [dead_acute, dead_diaeresis, braceleft, braceleft ]	};

+    key <AD11>	{ [dead_grave, dead_circumflex, bracketleft, dead_abovering ] };

+};

+

+partial alphanumeric_keys

+xkb_symbols "sundeadkeys" {

+    include "latam(Sundeadkeys)"

+    name[Group1]="Latin American - Sun dead keys";

+};

+

+partial alphanumeric_keys

+xkb_symbols "nodeadkeys" {

+

+    include "latam(basic)"

+

+    name[Group1]="Latin American - Eliminate dead keys";

+

+    key <AE12>	{ [questiondown, exclamdown,    cedilla,       ogonek ]	};

+    key <AD11>	{ [     grave, asciicircum, bracketleft,       degree ]	};

+    key <AD12>	{ [      plus,   asterisk, bracketright,       macron ]	};

+    key <AC10>	{ [    ntilde,     Ntilde,   asciitilde,  doubleacute ]	};

+    key <AC11>	{ [     acute,  diaeresis,    braceleft,    braceleft ]	};

+    key <BKSL>	{ [  ccedilla,   Ccedilla,   braceright,        breve ]	};

+    key <AB10>	{ [     minus, underscore, dead_belowdot,    abovedot ]	};

+};

+

+partial alphanumeric_keys

+xkb_symbols "deadtilde" {

+

+    include "latam(basic)"

+

+    name[Group1]="Latin American - Include dead tilde";

+

+    key <AD12>	{ [      plus,   asterisk,   dead_tilde,  dead_macron ]	};

+};

diff --git a/xorg-server/xkbdata.src/symbols/latin b/xorg-server/xkbdata.src/symbols/latin
index f630fd98a..1d8ebbeeb 100644
--- a/xorg-server/xkbdata.src/symbols/latin
+++ b/xorg-server/xkbdata.src/symbols/latin
@@ -1,180 +1,180 @@
-// $XKeyboardConfig$
-
-// Common Latin alphabet layout
-//
-// $XFree86: xc/programs/xkbcomp/symbols/latin,v 1.3 2002/12/20 20:18:34 paulo Exp $
-
-default partial
-xkb_symbols "basic" {
-
-    key <AE01>	{ [         1,     exclam,  onesuperior,   exclamdown ]	};
-    key <AE02>	{ [         2,         at,  twosuperior,    oneeighth ]	};
-    key <AE03>	{ [         3, numbersign, threesuperior,    sterling ]	};
-    key <AE04>	{ [         4,     dollar,   onequarter,       dollar ]	};
-    key <AE05>	{ [         5,    percent,      onehalf, threeeighths ]	};
-    key <AE06>	{ [         6, asciicircum, threequarters, fiveeighths ] };
-    key <AE07>	{ [         7,  ampersand,    braceleft, seveneighths ]	};
-    key <AE08>	{ [         8,   asterisk,  bracketleft,    trademark ]	};
-    key <AE09>	{ [         9,  parenleft, bracketright,    plusminus ]	};
-    key <AE10>	{ [         0, parenright,   braceright,       degree ]	};
-    key <AE11>	{ [     minus, underscore,    backslash, questiondown ]	};
-    key <AE12>	{ [     equal,       plus, dead_cedilla,  dead_ogonek ]	};
-
-    key <AD01>	{ [         q,          Q,           at,  Greek_OMEGA ]	};
-    key <AD02>	{ [         w,          W,      lstroke,      Lstroke ]	};
-    key <AD03>	{ [         e,          E ]	};
-    key <AD04>	{ [         r,          R,    paragraph,   registered ]	};
-    key <AD05>	{ [         t,          T,       tslash,       Tslash ]	};
-    key <AD06>	{ [         y,          Y,    leftarrow,          yen ]	};
-    key <AD07>	{ [         u,          U,    downarrow,      uparrow ]	};
-    key <AD08>	{ [         i,          I,   rightarrow,     idotless ]	};
-    key <AD09>	{ [         o,          O,       oslash,     Ooblique ]	};
-    key <AD10>	{ [         p,          P,        thorn,        THORN ]	};
-    key <AD11>	{ [bracketleft,  braceleft, dead_diaeresis, dead_abovering ] };
-    key <AD12>	{ [bracketright, braceright, dead_tilde,  dead_macron ]	};
-
-    key <AC01>	{ [         a,          A,           ae,           AE ]	};
-    key <AC02>	{ [         s,          S,       ssharp,      section ]	};
-    key <AC03>	{ [         d,          D,          eth,          ETH ]	};
-    key <AC04>	{ [         f,          F,      dstroke,  ordfeminine ]	};
-    key <AC05>	{ [         g,          G,          eng,          ENG ]	};
-    key <AC06>	{ [         h,          H,      hstroke,      Hstroke ]	};
-    key <AC07>	{ [         j,          J ]	};
-    key <AC08>	{ [         k,          K,          kra,    ampersand ]	};
-    key <AC09>	{ [         l,          L,      lstroke,      Lstroke ]	};
-    key <AC10>	{ [ semicolon,    colon, dead_acute, dead_doubleacute ]	};
-    key <AC11>	{ [apostrophe, quotedbl, dead_circumflex,  dead_caron ]	};
-    key <TLDE>	{ [     grave, asciitilde,      notsign,      notsign ]	};
-
-    key <BKSL>	{ [ backslash,        bar,   dead_grave,   dead_breve ]	};
-    key <AB01>	{ [         z,          Z, guillemotleft,        less ]	};
-    key <AB02>	{ [         x,          X, guillemotright,    greater ]	};
-    key <AB03>	{ [         c,          C,         cent,    copyright ]	};
-    key <AB04>	{ [         v,          V, leftdoublequotemark, leftsinglequotemark ]	};
-    key <AB05>	{ [         b,          B, rightdoublequotemark, rightsinglequotemark ] };
-    key <AB06>	{ [         n,          N ]	};
-    key <AB07>	{ [         m,          M,           mu,    masculine ]	};
-    key <AB08>	{ [     comma,       less, horizconnector,   multiply ]	};
-    key <AB09>	{ [    period,    greater, periodcentered,   division ]	};
-    key <AB10>	{ [     slash,   question, dead_belowdot, dead_abovedot ] };
-
-};
-
-// Northern Europe ( Danish, Finnish, Norwegian, Swedish) common layout
-
-partial
-xkb_symbols "type2" {
-
-    include "latin"
-
-    key <AE01>	{ [         1,     exclam,   exclamdown,  onesuperior ]	};
-    key <AE02>	{ [         2,   quotedbl,           at,  twosuperior ]	};
-    key <AE03>	{ [         3, numbersign,     sterling, threesuperior]	};
-    key <AE04>	{ [         4,   currency,       dollar,   onequarter ]	};
-    key <AE05>	{ [         5,    percent,      onehalf,         cent ]	};
-    key <AE06>	{ [         6,  ampersand,          yen,  fiveeighths ]	};
-    key <AE07>	{ [         7,      slash,    braceleft,     division ]	};
-    key <AE08>	{ [         8,  parenleft,  bracketleft, guillemotleft]	};
-    key <AE09>	{ [         9, parenright, bracketright, guillemotright] };
-    key <AE10>	{ [         0,      equal,   braceright,       degree ]	};
-
-    key <AD03>	{ [         e,          E,     EuroSign,         cent ]	};
-    key <AD04>	{ [         r,          R,   registered,   registered ]	};
-    key <AD05>	{ [         t,          T,        thorn,        THORN ]	};
-    key <AD09>	{ [         o,          O,           oe,           OE ]	};
-    key <AD11>	{ [     aring,  Aring, dead_diaeresis, dead_abovering ]	};
-    key <AD12>	{ [dead_diaeresis, dead_circumflex, dead_tilde, dead_caron ] };
-
-    key <AC01>	{ [         a,          A,  ordfeminine,    masculine ]	};
-
-    key <AB03>	{ [         c,          C,    copyright,    copyright ]	};
-    key <AB08>	{ [     comma,  semicolon, dead_cedilla,  dead_ogonek ]	};
-    key <AB09>	{ [    period,   colon, periodcentered, dead_abovedot ]	};
-    key <AB10>	{ [     minus, underscore, dead_belowdot, dead_abovedot ] };
-};
-
-// Slavic Latin ( Albanian, Croatian, Polish, Slovene, Yugoslav)
-// common layout
-
-partial
-xkb_symbols "type3" {
-
-    include "latin"
-
-    key <AD01>	{ [         q,          Q,    backslash,  Greek_OMEGA ]	};
-    key <AD02>	{ [         w,          W,          bar,      Lstroke ]	};
-    key <AD06>	{ [         z,          Z,    leftarrow,          yen ]	};
-
-    key <AC04>	{ [         f,          F,  bracketleft,  ordfeminine ]	};
-    key <AC05>	{ [         g,          G, bracketright,          ENG ]	};
-    key <AC08>	{ [         k,          K,      lstroke,    ampersand ]	};
-
-    key <AB01>	{ [         y,          Y, guillemotleft,         less ]	};
-    key <AB04>	{ [         v,          V,           at,        grave ]	};
-    key <AB05>	{ [         b,          B,    braceleft,   apostrophe ]	};
-    key <AB06>	{ [         n,          N,   braceright,   braceright ]	};
-    key <AB07>	{ [         m,          M,      section,    masculine ]	};
-    key <AB08>	{ [     comma,  semicolon,         less,     multiply ]	};
-    key <AB09>	{ [    period,      colon,      greater,     division ]	};
-};
-
-// Another one Latin common layout
-// (German, Estonian, Spanish, Icelandic, Italian, Latin American, Portuguese)
- 
-partial
-xkb_symbols "type4" {
-
-    include "latin"
-
-    key <AE02>	{ [         2,   quotedbl,           at,    oneeighth ]	};
-    key <AE06>	{ [         6,  ampersand,      notsign,  fiveeighths ]	};
-    key <AE07>	{ [         7,      slash,    braceleft, seveneighths ]	};
-    key <AE08>	{ [         8,  parenleft,  bracketleft,    trademark ]	};
-    key <AE09>	{ [         9, parenright, bracketright,    plusminus ]	};
-    key <AE10>	{ [         0,      equal,   braceright,       degree ]	};
-
-    key <AD03>	{ [         e,          E,     EuroSign,         cent ]	};
-
-    key <AB08>	{ [   comma,  semicolon, horizconnector,     multiply ]	};
-    key <AB09>	{ [  period,      colon, periodcentered,     division ]	};
-    key <AB10>	{ [   minus, underscore, dead_belowdot, dead_abovedot ]	};
-};
-
-partial
-xkb_symbols "nodeadkeys" {
-
-    key <AE12>	{ [     equal,       plus,     cedilla,        ogonek ]	};
-    key <AD11>	{ [bracketleft,  braceleft,  diaeresis,        degree ]	};
-    key <AD12>	{ [bracketright, braceright, asciitilde,       macron ]	};
-    key <AC10>	{ [ semicolon,      colon,       acute,   doubleacute ]	};
-    key <AC11>	{ [apostrophe,   quotedbl, asciicircum,         caron ]	};
-    key <BKSL>	{ [ backslash,        bar,       grave,         breve ]	};
-    key <AB10>	{ [     slash,   question, dead_belowdot,    abovedot ]	};
-};
-
-partial
-xkb_symbols "type2_nodeadkeys" {
- 
-    include "latin(nodeadkeys)"
-
-    key <AD11>	{ [     aring,      Aring,   diaeresis,        degree ]	};
-    key <AD12>	{ [ diaeresis, asciicircum, asciitilde,         caron ]	};
-    key <AB08>	{ [     comma,  semicolon,     cedilla,        ogonek ]	};
-    key <AB09>	{ [    period,   colon, periodcentered,      abovedot ]	};
-    key <AB10>	{ [   minus, underscore, dead_belowdot,      abovedot ]	};
-};
-
-partial
-xkb_symbols "type3_nodeadkeys" {
- 
-    include "latin(nodeadkeys)"
-};
-
-partial
-xkb_symbols "type4_nodeadkeys" {
- 
-    include "latin(nodeadkeys)"
-
-    key <AB10>	{ [   minus, underscore, dead_belowdot,      abovedot ]	};
-};
-
+// $XKeyboardConfig$

+

+// Common Latin alphabet layout

+//

+// $XFree86: xc/programs/xkbcomp/symbols/latin,v 1.3 2002/12/20 20:18:34 paulo Exp $

+

+default partial

+xkb_symbols "basic" {

+

+    key <AE01>	{ [         1,     exclam,  onesuperior,   exclamdown ]	};

+    key <AE02>	{ [         2,         at,  twosuperior,    oneeighth ]	};

+    key <AE03>	{ [         3, numbersign, threesuperior,    sterling ]	};

+    key <AE04>	{ [         4,     dollar,   onequarter,       dollar ]	};

+    key <AE05>	{ [         5,    percent,      onehalf, threeeighths ]	};

+    key <AE06>	{ [         6, asciicircum, threequarters, fiveeighths ] };

+    key <AE07>	{ [         7,  ampersand,    braceleft, seveneighths ]	};

+    key <AE08>	{ [         8,   asterisk,  bracketleft,    trademark ]	};

+    key <AE09>	{ [         9,  parenleft, bracketright,    plusminus ]	};

+    key <AE10>	{ [         0, parenright,   braceright,       degree ]	};

+    key <AE11>	{ [     minus, underscore,    backslash, questiondown ]	};

+    key <AE12>	{ [     equal,       plus, dead_cedilla,  dead_ogonek ]	};

+

+    key <AD01>	{ [         q,          Q,           at,  Greek_OMEGA ]	};

+    key <AD02>	{ [         w,          W,      lstroke,      Lstroke ]	};

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

+    key <AD04>	{ [         r,          R,    paragraph,   registered ]	};

+    key <AD05>	{ [         t,          T,       tslash,       Tslash ]	};

+    key <AD06>	{ [         y,          Y,    leftarrow,          yen ]	};

+    key <AD07>	{ [         u,          U,    downarrow,      uparrow ]	};

+    key <AD08>	{ [         i,          I,   rightarrow,     idotless ]	};

+    key <AD09>	{ [         o,          O,       oslash,     Ooblique ]	};

+    key <AD10>	{ [         p,          P,        thorn,        THORN ]	};

+    key <AD11>	{ [bracketleft,  braceleft, dead_diaeresis, dead_abovering ] };

+    key <AD12>	{ [bracketright, braceright, dead_tilde,  dead_macron ]	};

+

+    key <AC01>	{ [         a,          A,           ae,           AE ]	};

+    key <AC02>	{ [         s,          S,       ssharp,      section ]	};

+    key <AC03>	{ [         d,          D,          eth,          ETH ]	};

+    key <AC04>	{ [         f,          F,      dstroke,  ordfeminine ]	};

+    key <AC05>	{ [         g,          G,          eng,          ENG ]	};

+    key <AC06>	{ [         h,          H,      hstroke,      Hstroke ]	};

+    key <AC07>	{ [         j,          J,            j,            J ]	};

+    key <AC08>	{ [         k,          K,          kra,    ampersand ]	};

+    key <AC09>	{ [         l,          L,      lstroke,      Lstroke ]	};

+    key <AC10>	{ [ semicolon,    colon, dead_acute, dead_doubleacute ]	};

+    key <AC11>	{ [apostrophe, quotedbl, dead_circumflex,  dead_caron ]	};

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

+

+    key <BKSL>	{ [ backslash,        bar,   dead_grave,   dead_breve ]	};

+    key <AB01>	{ [         z,          Z, guillemotleft,        less ]	};

+    key <AB02>	{ [         x,          X, guillemotright,    greater ]	};

+    key <AB03>	{ [         c,          C,         cent,    copyright ]	};

+    key <AB04>	{ [         v,          V, leftdoublequotemark, leftsinglequotemark ]	};

+    key <AB05>	{ [         b,          B, rightdoublequotemark, rightsinglequotemark ] };

+    key <AB06>	{ [         n,          N,            n,            N ]	};

+    key <AB07>	{ [         m,          M,           mu,    masculine ]	};

+    key <AB08>	{ [     comma,       less, horizconnector,   multiply ]	};

+    key <AB09>	{ [    period,    greater, periodcentered,   division ]	};

+    key <AB10>	{ [     slash,   question, dead_belowdot, dead_abovedot ] };

+

+};

+

+// Northern Europe ( Danish, Finnish, Norwegian, Swedish) common layout

+

+partial

+xkb_symbols "type2" {

+

+    include "latin"

+

+    key <AE01>	{ [         1,     exclam,   exclamdown,  onesuperior ]	};

+    key <AE02>	{ [         2,   quotedbl,           at,  twosuperior ]	};

+    key <AE03>	{ [         3, numbersign,     sterling, threesuperior]	};

+    key <AE04>	{ [         4,   currency,       dollar,   onequarter ]	};

+    key <AE05>	{ [         5,    percent,      onehalf,         cent ]	};

+    key <AE06>	{ [         6,  ampersand,          yen,  fiveeighths ]	};

+    key <AE07>	{ [         7,      slash,    braceleft,     division ]	};

+    key <AE08>	{ [         8,  parenleft,  bracketleft, guillemotleft]	};

+    key <AE09>	{ [         9, parenright, bracketright, guillemotright] };

+    key <AE10>	{ [         0,      equal,   braceright,       degree ]	};

+

+    key <AD03>	{ [         e,          E,     EuroSign,         cent ]	};

+    key <AD04>	{ [         r,          R,   registered,   registered ]	};

+    key <AD05>	{ [         t,          T,        thorn,        THORN ]	};

+    key <AD09>	{ [         o,          O,           oe,           OE ]	};

+    key <AD11>	{ [     aring,  Aring, dead_diaeresis, dead_abovering ]	};

+    key <AD12>	{ [dead_diaeresis, dead_circumflex, dead_tilde, dead_caron ] };

+

+    key <AC01>	{ [         a,          A,  ordfeminine,    masculine ]	};

+

+    key <AB03>	{ [         c,          C,    copyright,    copyright ]	};

+    key <AB08>	{ [     comma,  semicolon, dead_cedilla,  dead_ogonek ]	};

+    key <AB09>	{ [    period,   colon, periodcentered, dead_abovedot ]	};

+    key <AB10>	{ [     minus, underscore, dead_belowdot, dead_abovedot ] };

+};

+

+// Slavic Latin ( Albanian, Croatian, Polish, Slovene, Yugoslav)

+// common layout

+

+partial

+xkb_symbols "type3" {

+

+    include "latin"

+

+    key <AD01>	{ [         q,          Q,    backslash,  Greek_OMEGA ]	};

+    key <AD02>	{ [         w,          W,          bar,      Lstroke ]	};

+    key <AD06>	{ [         z,          Z,    leftarrow,          yen ]	};

+

+    key <AC04>	{ [         f,          F,  bracketleft,  ordfeminine ]	};

+    key <AC05>	{ [         g,          G, bracketright,          ENG ]	};

+    key <AC08>	{ [         k,          K,      lstroke,    ampersand ]	};

+

+    key <AB01>	{ [         y,          Y, guillemotleft,         less ]	};

+    key <AB04>	{ [         v,          V,           at,        grave ]	};

+    key <AB05>	{ [         b,          B,    braceleft,   apostrophe ]	};

+    key <AB06>	{ [         n,          N,   braceright,   braceright ]	};

+    key <AB07>	{ [         m,          M,      section,    masculine ]	};

+    key <AB08>	{ [     comma,  semicolon,         less,     multiply ]	};

+    key <AB09>	{ [    period,      colon,      greater,     division ]	};

+};

+

+// Another one Latin common layout

+// (German, Estonian, Spanish, Icelandic, Italian, Latin American, Portuguese)

+ 

+partial

+xkb_symbols "type4" {

+

+    include "latin"

+

+    key <AE02>	{ [         2,   quotedbl,           at,    oneeighth ]	};

+    key <AE06>	{ [         6,  ampersand,      notsign,  fiveeighths ]	};

+    key <AE07>	{ [         7,      slash,    braceleft, seveneighths ]	};

+    key <AE08>	{ [         8,  parenleft,  bracketleft,    trademark ]	};

+    key <AE09>	{ [         9, parenright, bracketright,    plusminus ]	};

+    key <AE10>	{ [         0,      equal,   braceright,       degree ]	};

+

+    key <AD03>	{ [         e,          E,     EuroSign,         cent ]	};

+

+    key <AB08>	{ [   comma,  semicolon, horizconnector,     multiply ]	};

+    key <AB09>	{ [  period,      colon, periodcentered,     division ]	};

+    key <AB10>	{ [   minus, underscore, dead_belowdot, dead_abovedot ]	};

+};

+

+partial

+xkb_symbols "nodeadkeys" {

+

+    key <AE12>	{ [     equal,       plus,     cedilla,        ogonek ]	};

+    key <AD11>	{ [bracketleft,  braceleft,  diaeresis,        degree ]	};

+    key <AD12>	{ [bracketright, braceright, asciitilde,       macron ]	};

+    key <AC10>	{ [ semicolon,      colon,       acute,   doubleacute ]	};

+    key <AC11>	{ [apostrophe,   quotedbl, asciicircum,         caron ]	};

+    key <BKSL>	{ [ backslash,        bar,       grave,         breve ]	};

+    key <AB10>	{ [     slash,   question, dead_belowdot,    abovedot ]	};

+};

+

+partial

+xkb_symbols "type2_nodeadkeys" {

+ 

+    include "latin(nodeadkeys)"

+

+    key <AD11>	{ [     aring,      Aring,   diaeresis,        degree ]	};

+    key <AD12>	{ [ diaeresis, asciicircum, asciitilde,         caron ]	};

+    key <AB08>	{ [     comma,  semicolon,     cedilla,        ogonek ]	};

+    key <AB09>	{ [    period,   colon, periodcentered,      abovedot ]	};

+    key <AB10>	{ [   minus, underscore, dead_belowdot,      abovedot ]	};

+};

+

+partial

+xkb_symbols "type3_nodeadkeys" {

+ 

+    include "latin(nodeadkeys)"

+};

+

+partial

+xkb_symbols "type4_nodeadkeys" {

+ 

+    include "latin(nodeadkeys)"

+

+    key <AB10>	{ [   minus, underscore, dead_belowdot,      abovedot ]	};

+};

+

diff --git a/xorg-server/xkbdata.src/symbols/lk b/xorg-server/xkbdata.src/symbols/lk
index 161518673..8ed480db2 100644
--- a/xorg-server/xkbdata.src/symbols/lk
+++ b/xorg-server/xkbdata.src/symbols/lk
@@ -1,93 +1,93 @@
-// $XKeyboardConfig$
-
-// X Keyboard Extension file for Sinhala (Sri Lanka) (2004-04-22)
-// Maintainer  : Harshula Jayasuriya <harshula@gmail.com>
-// Last Updated: 2007-06-29
-// This is a static phonetic mapping for a standard US-English keyboard
-// (qwerty)
-// http://www.nongnu.org/sinhala/doc/keymaps/sinhala-keyboard_3.html
-
-// Repaya, Rakaransaya and Yansaya aren't inserted with A-r, R and Y,
-// respectively. The problem lies with the XKB infrastructure which
-// only allows a one-to-one mapping of keycodes to Unicode codepoints.
-// Unfortunately, the 3 mentioned glyphs actually consists of 3
-// Unicode codepoints each. The result is that the user must
-// manually construct the glyph by typing each of the 3 codepoints.
-// ALT-, represents the 'JOIN' key, it requires
-// two codepoints, hence it also has to be manually constructed.
-// Similarly, ALT-/ representing the 'TOUCH' key requires
-// two codepoints.
-
-// Repaya = rayanna,AL,ZWJ
-// Rakaransaya = AL,ZWJ,rayanna
-// Yansaya = AL,ZWJ,yayanna
-// JOIN = AL,ZWJ
-// TOUCH = ZWJ,AL
-
-// Where,
-// AL = Al Lakuna = ALT-a
-// ZWJ = Zero Width Joiner = ALT-/
-// rayanna = r
-// yayanna = y
-
-partial default alphanumeric_keys
-xkb_symbols "sin_phonetic" {
-
-  include "us"
-// it is default - no details in the name
-  name[Group1] = "Sri Lanka";
-  key.type[Group1] = "FOUR_LEVEL";
-
-  // q - p
-  key <AD01> { [ 0x01000d8d, 0x01000d8e, 0x01000dd8, 0x01000df2 ] };
-  key <AD02> { [ 0x01000d87, 0x01000d88, 0x01000dd0, 0x01000dd1 ] };
-  key <AD03> { [ 0x01000d91, 0x01000d92, 0x01000dd9, 0x01000dda ] };
-  key <AD04> { [ 0x01000dbb, 0x01000dca, 0x01000dbb, NoSymbol ] };
-  key <AD05> { [ 0x01000dad, 0x01000dae, 0x01000da7, 0x01000da8 ] };
-  key <AD06> { [ 0x01000dba, 0x01000dca, NoSymbol, NoSymbol ] };
-  key <AD07> { [ 0x01000d8b, 0x01000d8c, 0x01000dd4, 0x01000dd6 ] };
-  key <AD08> { [ 0x01000d89, 0x01000d8a, 0x01000dd2, 0x01000dd3 ] };
-  key <AD09> { [ 0x01000d94, 0x01000d95, 0x01000ddc, 0x01000ddd ] };
-  key <AD10> { [ 0x01000db4, 0x01000db5, NoSymbol, NoSymbol ] };
-
-  // a - l
-  key <AC01> { [ 0x01000d85, 0x01000d86, 0x01000dca, 0x01000dcf ] };
-  key <AC02> { [ 0x01000dc3, 0x01000dc1, 0x01000dc2, NoSymbol ] };
-  key <AC03> { [ 0x01000daf, 0x01000db0, 0x01000da9, 0x01000daa ] };
-  key <AC04> { [ 0x01000dc6, NoSymbol, 0x01000ddb, 0x01000d93 ] };
-  key <AC05> { [ 0x01000d9c, 0x01000d9d, 0x01000d9f, NoSymbol ] };
-  key <AC06> { [ 0x01000dc4, 0x01000d83, 0x01000dde, 0x01000d96 ] };
-  key <AC07> { [ 0x01000da2, 0x01000da3, 0x01000da6, NoSymbol ] };
-  key <AC08> { [ 0x01000d9a, 0x01000d9b, 0x01000d8f, 0x01000d90 ] };
-  key <AC09> { [ 0x01000dbd, 0x01000dc5, 0x01000ddf, 0x01000df3 ] };
-
-  // z - ?
-  key <AB01> { [ 0x01000da4, 0x01000da5, NoSymbol, NoSymbol ] };
-  key <AB02> { [ 0x01000db3, 0x01000dac, NoSymbol, NoSymbol ] };
-  key <AB03> { [ 0x01000da0, 0x01000da1, NoSymbol, NoSymbol ] };
-  key <AB04> { [ 0x01000dc0, NoSymbol, NoSymbol, NoSymbol ] };
-  key <AB05> { [ 0x01000db6, 0x01000db7, NoSymbol, NoSymbol ] };
-  key <AB06> { [ 0x01000db1, 0x01000dab, 0x01000d82, 0x01000d9e ] };
-  key <AB07> { [ 0x01000db8, 0x01000db9, NoSymbol, NoSymbol ] };
-  key <AB08> { [ any, any, 0x01000dca, NoSymbol ] };
-  key <AB09> { [ any, any, 0x01000df4, NoSymbol ] };
-  key <AB10> { [ any, any, 0x0100200d, NoSymbol ] };
-
-  // Space
-  key <SPCE> { [ space, nobreakspace, 0x0100200c, NoSymbol ] };
-
-  include "level3(ralt_switch)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "tam_unicode" {
-    include "in(tam_unicode)"
-    name[Group1]= "Sri Lanka - Tamil Unicode";
-};
-
-partial alphanumeric_keys
-xkb_symbols "tam_TAB" {
-    include "in(tam_TAB)"
-    name[Group1]= "Sri Lanka - Tamil TAB Typewriter";
-};
-
+// $XKeyboardConfig$

+

+// X Keyboard Extension file for Sinhala (Sri Lanka) (2004-04-22)

+// Maintainer  : Harshula Jayasuriya <harshula@gmail.com>

+// Last Updated: 2007-06-29

+// This is a static phonetic mapping for a standard US-English keyboard

+// (qwerty)

+// http://www.nongnu.org/sinhala/doc/keymaps/sinhala-keyboard_3.html

+

+// Repaya, Rakaransaya and Yansaya aren't inserted with A-r, R and Y,

+// respectively. The problem lies with the XKB infrastructure which

+// only allows a one-to-one mapping of keycodes to Unicode codepoints.

+// Unfortunately, the 3 mentioned glyphs actually consists of 3

+// Unicode codepoints each. The result is that the user must

+// manually construct the glyph by typing each of the 3 codepoints.

+// ALT-, represents the 'JOIN' key, it requires

+// two codepoints, hence it also has to be manually constructed.

+// Similarly, ALT-/ representing the 'TOUCH' key requires

+// two codepoints.

+

+// Repaya = rayanna,AL,ZWJ

+// Rakaransaya = AL,ZWJ,rayanna

+// Yansaya = AL,ZWJ,yayanna

+// JOIN = AL,ZWJ

+// TOUCH = ZWJ,AL

+

+// Where,

+// AL = Al Lakuna = ALT-a

+// ZWJ = Zero Width Joiner = ALT-/

+// rayanna = r

+// yayanna = y

+

+partial default alphanumeric_keys

+xkb_symbols "sin_phonetic" {

+

+  include "us"

+// it is default - no details in the name

+  name[Group1] = "Sri Lanka";

+  key.type[Group1] = "FOUR_LEVEL";

+

+  // q - p

+  key <AD01> { [ 0x01000d8d, 0x01000d8e, 0x01000dd8, 0x01000df2 ] };

+  key <AD02> { [ 0x01000d87, 0x01000d88, 0x01000dd0, 0x01000dd1 ] };

+  key <AD03> { [ 0x01000d91, 0x01000d92, 0x01000dd9, 0x01000dda ] };

+  key <AD04> { [ 0x01000dbb, 0x01000dca, 0x01000dbb, NoSymbol ] };

+  key <AD05> { [ 0x01000dad, 0x01000dae, 0x01000da7, 0x01000da8 ] };

+  key <AD06> { [ 0x01000dba, 0x01000dca, NoSymbol, NoSymbol ] };

+  key <AD07> { [ 0x01000d8b, 0x01000d8c, 0x01000dd4, 0x01000dd6 ] };

+  key <AD08> { [ 0x01000d89, 0x01000d8a, 0x01000dd2, 0x01000dd3 ] };

+  key <AD09> { [ 0x01000d94, 0x01000d95, 0x01000ddc, 0x01000ddd ] };

+  key <AD10> { [ 0x01000db4, 0x01000db5, NoSymbol, NoSymbol ] };

+

+  // a - l

+  key <AC01> { [ 0x01000d85, 0x01000d86, 0x01000dca, 0x01000dcf ] };

+  key <AC02> { [ 0x01000dc3, 0x01000dc1, 0x01000dc2, NoSymbol ] };

+  key <AC03> { [ 0x01000daf, 0x01000db0, 0x01000da9, 0x01000daa ] };

+  key <AC04> { [ 0x01000dc6, NoSymbol, 0x01000ddb, 0x01000d93 ] };

+  key <AC05> { [ 0x01000d9c, 0x01000d9d, 0x01000d9f, NoSymbol ] };

+  key <AC06> { [ 0x01000dc4, 0x01000d83, 0x01000dde, 0x01000d96 ] };

+  key <AC07> { [ 0x01000da2, 0x01000da3, 0x01000da6, NoSymbol ] };

+  key <AC08> { [ 0x01000d9a, 0x01000d9b, 0x01000d8f, 0x01000d90 ] };

+  key <AC09> { [ 0x01000dbd, 0x01000dc5, 0x01000ddf, 0x01000df3 ] };

+

+  // z - ?

+  key <AB01> { [ 0x01000da4, 0x01000da5, NoSymbol, NoSymbol ] };

+  key <AB02> { [ 0x01000db3, 0x01000dac, NoSymbol, NoSymbol ] };

+  key <AB03> { [ 0x01000da0, 0x01000da1, NoSymbol, NoSymbol ] };

+  key <AB04> { [ 0x01000dc0, NoSymbol, NoSymbol, NoSymbol ] };

+  key <AB05> { [ 0x01000db6, 0x01000db7, NoSymbol, NoSymbol ] };

+  key <AB06> { [ 0x01000db1, 0x01000dab, 0x01000d82, 0x01000d9e ] };

+  key <AB07> { [ 0x01000db8, 0x01000db9, NoSymbol, NoSymbol ] };

+  key <AB08> { [ any, any, 0x01000dca, NoSymbol ] };

+  key <AB09> { [ any, any, 0x01000df4, NoSymbol ] };

+  key <AB10> { [ any, any, 0x0100200d, NoSymbol ] };

+

+  // Space

+  include "nbsp(zwnj2nb3s)";

+

+  include "level3(ralt_switch)"

+};

+

+partial alphanumeric_keys

+xkb_symbols "tam_unicode" {

+    include "in(tam_unicode)"

+    name[Group1]= "Sri Lanka - Tamil Unicode";

+};

+

+partial alphanumeric_keys

+xkb_symbols "tam_TAB" {

+    include "in(tam_TAB)"

+    name[Group1]= "Sri Lanka - Tamil TAB Typewriter";

+};

+

diff --git a/xorg-server/xkbdata.src/symbols/ml b/xorg-server/xkbdata.src/symbols/ml
new file mode 100644
index 000000000..1cac28c41
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/ml
@@ -0,0 +1,85 @@
+// $XKeyboardConfig$

+

+partial default alphanumeric_keys

+xkb_symbols "basic" {

+

+    include "fr(basic)"

+

+    name[Group1]="Mali";

+

+    key <AB06>	{ [         n,          N,         U0272,       U019D ]	}; // n N ɲ Ɲ

+    key <AC02>	{ [         s,          S,         U0161,       U0160 ]	}; // s S š Š

+    key <AC05>	{ [         g,          G,         U0254,       U0186 ]	}; // g G ɔ Ɔ

+    key <AC10>	{ [         m,          M,         U014B,       U014A ]	}; // m M ŋ Ŋ

+    key <AD02>	{ [         z,          Z,         U017E,       U017d ]	}; // z Z ž Ž

+    key <AD03>	{ [         e,          E,         U025B,       U0190 ]	}; // e E ɛ Ɛ

+

+};

+

+partial alphanumeric_keys

+xkb_symbols "fr-oss" {

+

+    include "fr(oss)"

+

+    name[Group1]="Mali - Français (France Alternative)";

+

+    // š Š on d replaces ë Ë

+    // ɲ Ɲ on j replaces ü Ü

+    // ŋ Ŋ on m replaces ö Ö

+    // ž Ž on z replaces â Â

+    // ɛ Ɛ on r replaces ê Ê

+    // ɔ Ɔ on p replaces ô Ô

+

+    key <AC03>	{ [                d,                D,                U0161,                 U0160 ] }; // d D š Š

+    key <AC07>	{ [                j,                J,                U0272,                 U019D ] }; // j J ɲ Ɲ

+    key <AC10>	{ [                m,                M,                U014B,                 U014A ] }; // m M ŋ Ŋ

+    key <AD02>	{ [                z,                Z,                U017E,                 U017d ] }; // z Z ž Ž

+    key <AD04>	{ [                r,                R,                U025B,                 U0190 ] }; // r R ɛ Ɛ

+    key <AD10>	{ [                p,                P,                U0254,                 U0186 ] }; // p P ɔ Ɔ

+};

+

+partial alphanumeric_keys

+xkb_symbols "us-mac" {

+

+    include "us(mac)"

+

+    name[Group1]="Mali - English (USA Macintosh)";

+

+    // ž Ž on z replaces Ω ¸

+    // ɛ Ɛ on a replaces å Å

+    // š Š on s replaces ß  

+    // ɲ Ɲ on j replaces ∆ ½

+    // ŋ Ŋ on k replaces ° 

+    // ɔ Ɔ on o replaces ø Ø

+

+    key <AB01> { [	   z,          Z,         U017E,            U017d ] }; // z Z ž Ž

+    key <AC01> { [	   a,          A,         U025B,            U0190 ]	}; // a A ɛ Ɛ

+    key <AC02> { [	   s,          S,         U0161,            U0160 ] }; // s S š Š

+    key <AC07> { [	   j,          J,         U0272,            U019D ] }; // j J ɲ Ɲ

+    key <AC08> { [	   k,          K,         U014B,            U014A ] }; // k K ŋ Ŋ

+    key <AD09> { [	   o,          O,         U0254,            U0186 ] }; // o O ɔ Ɔ

+

+};

+

+partial alphanumeric_keys

+xkb_symbols "us-intl" {

+

+    include "us(intl)"

+

+    name[Group1]="Mali - English (USA International)";

+

+    // ž Ž on x replaces

+    // š Š on s replaces ß §

+    // ɲ Ɲ on h replaces

+    // ŋ Ŋ on j replaces

+    // ɛ Ɛ on w replaces å Å

+    // ɔ Ɔ on o replaces ó Ó

+

+    key <AB02> { [	   x,          X,         U017E,            U017d ] }; // x X ž Ž

+    key <AC02> { [	   s,          S,         U0161,            U0160 ] }; // s S š Š

+    key <AC06> { [	   h,	       H,         U0272,            U019D ]	}; // h H ɲ Ɲ

+    key <AC07> { [	   j,	       J,		  U014B,            U014A ]	}; // j J ŋ Ŋ

+    key <AD02> { [	   w,          W,         U025B,            U0190 ] }; // w W ɛ Ɛ

+    key <AD09> { [	   o,          O,         U0254,            U0186 ] }; // o O ɔ Ɔ

+

+};

diff --git a/xorg-server/xkbdata.src/symbols/nbsp b/xorg-server/xkbdata.src/symbols/nbsp
index 10334708a..b3bc6a218 100644
--- a/xorg-server/xkbdata.src/symbols/nbsp
+++ b/xorg-server/xkbdata.src/symbols/nbsp
@@ -1,83 +1,197 @@
-// $XKeyboardConfig$
-//
-
-// Let space provide nobreakspace for the desired level.
-
-partial
-xkb_symbols "none" {
-  key <SPCE> {
-    type[Group1]="ONE_LEVEL",
-    symbols[Group1]= [ space ]
-  };
-};
-
-partial
-xkb_symbols "level2" {
-  key <SPCE> {
-    type[Group1]="TWO_LEVEL",
-    symbols[Group1]= [ space, nobreakspace ]
-  };
-};
-
-
-// level3 & level3ns provide no-breaking spaces starting from level3
-// This is good for typographers but experience shows many users accidently
-// type no-breaking spaces on the CLI (resulting in errors)
-// Used by fr(latin9)
-partial
-xkb_symbols "level3" {
-  key <SPCE> {
-    type[Group1]="FOUR_LEVEL",
-    symbols[Group1]= [ space, space, nobreakspace ]
-  };
-};
-
-// level3s kills fourth level
-// Used by ca(multix)
-partial
-xkb_symbols "level3s" {
-  key <SPCE> {
-    type[Group1]="FOUR_LEVEL",
-    symbols[Group1]= [ space, space, nobreakspace, NoSymbol ]
-  };
-};
-
-// level3n provides narrow no-breaking space in addition to the normal one
-partial
-xkb_symbols "level3n" {
-  key <SPCE> {
-    type[Group1]="FOUR_LEVEL",
-    symbols[Group1]= [ space, space, nobreakspace, 0x100202F ]
-  };
-};
-
-
-// for this reason pushing no-breaking spaces to level4 is the safe default nowadays
-partial
-xkb_symbols "level4" {
-  key <SPCE> {
-    type[Group1]="FOUR_LEVEL",
-    symbols[Group1]= [ space, space, space, nobreakspace ]
-  };
-};
-
-// level4n provides narrow no-breaking space in addition to the normal one
-partial
-xkb_symbols "level4n" {
- key <SPCE> {
-   type[Group1]="EIGHT_LEVEL",
-   symbols[Group1]= [ space, space, space, nobreakspace, space, 0x100202F, NoSymbol, NoSymbol ]
- };
-};
-
-// level4nl provides narrow no-breaking space in addition to the normal one
-// without forcing the use of level5 for mostly four-level layouts
-// Used by fr(oss), be(oss)…
-partial
-xkb_symbols "level4nl" {
- key <SPCE> {
-   type[Group1]="LOCAL_EIGHT_LEVEL",
-   symbols[Group1]= [ space, space, space, nobreakspace, space, 0x100202F, NoSymbol, NoSymbol ]
- };
-};
-
+// $XKeyboardConfig$

+

+// Let Space key provide No-Break Space (NBSP), Narrow No-Break Space (NNBSP),

+// Zero-Width Non-Joiner (ZWNJ), and Zero-Width Joiner (ZWJ) for the desired

+// levels.

+

+

+////////////////////////////////////////

+// Only Space

+

+partial

+xkb_symbols "none" {

+  key <SPCE> {

+    type[Group1]="ONE_LEVEL",

+    symbols[Group1]= [ space ]

+  };

+};

+

+

+////////////////////////////////////////

+// No-Break Space

+

+partial

+xkb_symbols "level2" {

+  key <SPCE> {

+    type[Group1]="TWO_LEVEL",

+    symbols[Group1]= [ space, nobreakspace ]

+  };

+};

+

+

+// level3 & level3ns provide no-breaking spaces starting from level3

+// This is good for typographers but experience shows many users accidently

+// type no-breaking spaces on the CLI (resulting in errors)

+// Used by fr(latin9)

+partial

+xkb_symbols "level3" {

+  key <SPCE> {

+    type[Group1]="FOUR_LEVEL",

+    symbols[Group1]= [ space, space, nobreakspace ]

+  };

+};

+

+// level3s kills fourth level

+// Used by ca(multix)

+partial

+xkb_symbols "level3s" {

+  key <SPCE> {

+    type[Group1]="FOUR_LEVEL",

+    symbols[Group1]= [ space, space, nobreakspace, NoSymbol ]

+  };

+};

+

+// for this reason pushing no-breaking spaces to level4 is the safe default nowadays

+partial

+xkb_symbols "level4" {

+  key <SPCE> {

+    type[Group1]="FOUR_LEVEL",

+    symbols[Group1]= [ space, space, space, nobreakspace ]

+  };

+};

+

+

+////////////////////////////////////////

+// Narrow No-Break Space

+

+// level3n provides narrow no-breaking space in addition to the normal one

+partial

+xkb_symbols "level3n" {

+  key <SPCE> {

+    type[Group1]="FOUR_LEVEL",

+    symbols[Group1]= [ space, space, nobreakspace, 0x100202F ]

+  };

+};

+

+// level4n provides narrow no-breaking space in addition to the normal one

+partial

+xkb_symbols "level4n" {

+ key <SPCE> {

+   type[Group1]="EIGHT_LEVEL",

+   symbols[Group1]= [ space, space, space, nobreakspace, space, 0x100202F, NoSymbol, NoSymbol ]

+ };

+};

+

+// level4nl provides narrow no-breaking space in addition to the normal one

+// without forcing the use of level5 for mostly four-level layouts

+// Used by fr(oss), be(oss)…

+partial

+xkb_symbols "level4nl" {

+ key <SPCE> {

+   type[Group1]="LOCAL_EIGHT_LEVEL",

+   symbols[Group1]= [ space, space, space, nobreakspace, space, 0x100202F, NoSymbol, NoSymbol ]

+ };

+};

+

+

+////////////////////////////////////////

+// Zero-Width Non-Joiner & Zero-Width Joiner

+// Author: Behnam Esfahbod <behnam@esfahbod.info>

+

+// ZWNJ and ZWJ are widely used in Persian, Kurdinsh, Pashto, Uzbek and other

+// languages that use PersoArabic script.

+

+

+// ZWNJ on level 2

+partial

+xkb_symbols "zwnj2" {

+  key <SPCE> {

+    type[Group1]="TWO_LEVEL",

+    symbols[Group1]= [ space, 0x100200c ]

+  };

+};

+

+

+// ZWNJ on level 2

+// ZWJ on level 3

+partial

+xkb_symbols "zwnj2zwj3" {

+  key <SPCE> {

+    type[Group1]="FOUR_LEVEL",

+    symbols[Group1]= [ space, 0x100200c, 0x100200d ]

+  };

+};

+

+

+// ZWNJ on level 2

+// ZWJ on level 3

+// NBSP on level 4

+partial

+xkb_symbols "zwnj2zwj3nb4" {

+  key <SPCE> {

+    type[Group1]="FOUR_LEVEL",

+    symbols[Group1]= [ space, 0x100200c, 0x100200d, nobreakspace ]

+  };

+};

+

+// ZWNJ on level 2

+// NBSP on level 3

+// Used by ir(ku_ara), af(basic), af(ps), af(uz), af(olpc-fa), af(olpc-ps), af(olpc-uz)

+partial

+xkb_symbols "zwnj2nb3" {

+  key <SPCE> {

+    type[Group1]="FOUR_LEVEL",

+    symbols[Group1]= [ space, 0x100200c, nobreakspace ]

+  };

+};

+

+

+// ZWNJ on level 2

+// ZWJ on level 3

+// NBSP on level 4

+// Used by lk(sin_phonetic)

+partial

+xkb_symbols "zwnj2nb3s" {

+  key <SPCE> {

+    type[Group1]="FOUR_LEVEL",

+    symbols[Group1]= [ space, 0x100200c, nobreakspace, NoSymbol ]

+  };

+};

+

+

+// ZWNJ on level 2

+// NBSP on level 3

+// ZWJ on level 4

+partial

+xkb_symbols "zwnj2nb3zwj4" {

+  key <SPCE> {

+    type[Group1]="FOUR_LEVEL",

+    symbols[Group1]= [ space, 0x100200c, nobreakspace, 0x100200d ]

+  };

+};

+

+

+// ZWNJ on level 2

+// NBSP on level 3

+// NNBSP on level 4

+// Used by ir(pes)

+partial

+xkb_symbols "zwnj2nb3nnb4" {

+  key <SPCE> {

+    type[Group1]="FOUR_LEVEL",

+    symbols[Group1]= [ space, 0x100200c, nobreakspace, 0x100202F ]

+  };

+};

+

+

+// ZWNJ on level 3

+// ZWJ on level 4

+// Used by in(deva), in(olpc)

+partial

+xkb_symbols "zwnj3zwj4" {

+  key <SPCE> {

+    type[Group1]="FOUR_LEVEL",

+    symbols[Group1]= [ space, space, 0x100200c, 0x100200d ]

+  };

+};

+

diff --git a/xorg-server/xkbdata.src/symbols/pt b/xorg-server/xkbdata.src/symbols/pt
index ba141b3c0..509db14ea 100644
--- a/xorg-server/xkbdata.src/symbols/pt
+++ b/xorg-server/xkbdata.src/symbols/pt
@@ -1,224 +1,224 @@
-// $XKeyboardConfig$
-
-// based on a keyboard map from an 'xkb/symbols/pt' file
-//
-// $XFree86: xc/programs/xkbcomp/symbols/pt,v 1.2 2002/11/22 04:03:28 dawes Exp $
-
-partial default alphanumeric_keys
-xkb_symbols "basic" {
-
-    include "latin(type4)"
-
-    name[Group1]="Portugal";
-
-    key <LSGT>  { [      less,    greater ] };
-    key <AE03>	{ [         3, numbersign,     sterling,     sterling ]	};
-    key <AE04>	{ [         4,     dollar,      section,       dollar ]	};
-    key <AE11>	{ [apostrophe,   question,    backslash, questiondown ]	};
-    key <AE12>	{ [guillemotleft, guillemotright, dead_cedilla, dead_ogonek ] };
-
-    key <AD11>	{ [      plus,   asterisk, dead_diaeresis, dead_abovering ] };
-    key <AD12>	{ [dead_acute, dead_grave,   dead_tilde,  dead_macron ]	};
-
-    key <AC10>	{ [  ccedilla,   Ccedilla,   dead_acute, dead_doubleacute ] };
-    key <AC11>	{ [ masculine, ordfeminine, dead_circumflex,   dead_caron ] };
-    key <TLDE>	{ [ backslash,        bar,      notsign,      notsign ]	};
-
-    key <BKSL>	{ [dead_tilde, dead_circumflex, dead_grave, dead_breve]	};
-
-    include "level3(ralt_switch)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "Sundeadkeys" {
-
-    include "pt(basic)" // for consistent naming
-
-    key <AD11>	{ [plus,   asterisk, SunFA_Diaeresis, SunFA_Diaeresis ]	};
-    key <BKSL>	{ [SunFA_Tilde, SunFA_Circum ]	};
-    key <AD12>	{ [SunFA_Acute, SunFA_Grave ]	};
-};
-
-partial alphanumeric_keys
-xkb_symbols "sundeadkeys" {
-    include "pt(Sundeadkeys)" // for consistent naming
-
-    name[Group1]="Portugal - Sun dead keys";
-};
-
-partial alphanumeric_keys
-xkb_symbols "nodeadkeys" {
-
-    include "pt(basic)" // for consistent naming
-
-    name[Group1]="Portugal - Eliminate dead keys";
-
-    key <AE12>	{ [guillemotleft, guillemotright, cedilla,     ogonek ]	};
-    key <AD11>	{ [      plus,   asterisk,     quotedbl,     quotedbl ]	};
-    key <AD12>	{ [     acute,      grave ]	};
-    key <AC10>	{ [  ccedilla,   Ccedilla,        acute,  doubleacute ]	};
-    key <AC11>	{ [ masculine, ordfeminine, asciicircum,        caron ]	};
-    key <BKSL>	{ [asciitilde, asciicircum ]	};
-    key <AB10>	{ [     minus, underscore, dead_belowdot,    abovedot ]	};
-};
-
-// mac version from Ricardo Cabral <bfe00991@mail.telepac.pt>
-// Copied from macintosh_vndr/pt
-partial alphanumeric_keys 
-xkb_symbols "mac" {
-
-    // Describes the differences between a very simple en_US
-    // keyboard and a very simple Portuguese keybaord
-
-    include "pt"
-    name[Group1]= "Portugal - Macintosh";
-
-    key <AE06>	{ [         6,  ampersand, threequarters, fiveeighths ]	};
-    key <AE08>	{ [         8,  parenleft,  bracketleft,    braceleft ]	};
-    key <AE09>	{ [         9, parenright, bracketright,   braceright ]	};
-    key <AE12>	{ [      plus,   asterisk, dead_diaeresis     ]	};
-    key <AC11>	{ [ dead_tilde, dead_circumflex       ]	};
-    key <AD11>	{ [ masculine, ordfeminine            ]	};
-    key <BKSL>	{ [ backslash,        bar,   dead_grave,   dead_breve ]	};
-    key <TLDE>	{ [     grave, asciitilde,      notsign,      notsign ]	};
-};
-
-partial alphanumeric_keys 
-xkb_symbols "mac_sundeadkeys" {
-    include "pt(mac)"
-    name[Group1]= "Portugal - Macintosh, Sun dead keys";
-    
-    key <AE12> {	[	     plus,        asterisk,  SunFA_Diaeresis, SunFA_Diaeresis      ]	};
-    key <AC11> {	[     SunFA_Tilde,    SunFA_Circum	]	};
-    key <AD12> {	[     SunFA_Acute,     SunFA_Grave 	]	};
-};
-
-partial alphanumeric_keys 
-xkb_symbols "mac_nodeadkeys" {
-    include "pt(mac)"
-    name[Group1]= "Portugal - Macintosh, eliminate dead keys";
-
-    key <AE12> {	[	     plus,        asterisk, 	 quotedbl,        quotedbl      ]	};
-    key <AC11> {	[      asciitilde,     asciicircum	]	};
-    key <AD12> {	[	    acute,           grave 	]	};
-};
-
-
-//
-// Teclado Nativo Portugues                                2005-07-19
-// Portuguese Nativo Keyboard
-//      This is a Dvorak-based layout, designed for the Portuguese language
-//
-// Ari Caldeira     ari@tecladobrasileiro.com.br
-//
-partial alphanumeric_keys
-xkb_symbols "nativo" {
-
-    name[Group1]="Portugal - Nativo";
-
-// Numeric row
-    key <TLDE> { [         plus,        asterisk,       dead_diaeresis,        plusminus ] };
-    key <AE01> { [            1,          exclam,          onesuperior,       exclamdown ] };
-    key <AE02> { [            2,        quotedbl,                   at,      twosuperior ] };
-    key <AE03> { [            3,      numbersign,             sterling,    threesuperior ] };
-    key <AE04> { [            4,          dollar,              section,       onequarter ] };
-    key <AE05> { [            5,         percent,                 cent,       0x01002030 ] };
-    key <AE06> { [            6,       ampersand,              notsign,        diaeresis ] };
-    key <AE07> { [            7,           slash,            braceleft,       0x0100032D ] };
-    key <AE08> { [            8,       parenleft,          bracketleft,       0x01000331 ] };
-    key <AE09> { [            9,      parenright,         bracketright,        dead_horn ] };
-    key <AE10> { [            0,           equal,           braceright,        dead_hook ] };
-    key <AE11> { [    masculine,     ordfeminine,          dead_ogonek,       0x01000326 ] };
-    key <AE12> { [         less,         greater,         dead_cedilla,   dead_abovering ] };
-
-// Upper row
-    key <AD01> { [   apostrophe,        question,               degree,     questiondown ] };
-    key <AD02> { [        comma,       semicolon,           0x01000329,       0x01000315 ] };
-    key <AD03> { [       period,           colon,           0x01002022,   periodcentered ] };
-    key <AD04> { [            h,               H,            paragraph,        paragraph ] };
-    key <AD05> { [            x,               X,             multiply,         division ] };
-    key <AD06> { [            w,               W,               ubreve,           Ubreve ] };
-    key <AD07> { [            l,               L,              lstroke,          Lstroke ] };
-    key <AD08> { [            t,               T,            trademark,        trademark ] };
-    key <AD09> { [            c,               C,            copyright,        copyright ] };
-    key <AD10> { [            p,               P,                thorn,            THORN ] };
-    key <AD11> { [   dead_tilde, dead_circumflex,           dead_caron, dead_doubleacute ] };
-    key <AD12> { [        minus,      underscore,           0x01002015,       0x01000336 ] };
-
-// Central row
-    key <AC01> { [            i,               I,             idotless,        Iabovedot ] };
-    key <AC02> { [            e,               E,             EuroSign,         EuroSign ] };
-    key <AC03> { [            a,               A,                   ae,               AE ] };
-    key <AC04> { [            o,               O,                   oe,               OE ] };
-    key <AC05> { [            u,               U,               oslash,         Ooblique ] };
-    key <AC06> { [            m,               M,                   mu,               mu ] };
-    key <AC07> { [            d,               D,                  eth,              ETH ] };
-    key <AC08> { [            s,               S,               ssharp,           ssharp ] };
-    key <AC09> { [            r,               R,           registered,       registered ] };
-    key <AC10> { [            n,               N,                  eng,              ENG ] };
-    key <AC11> { [   dead_acute,      dead_grave,          dead_macron,       dead_breve ] };
-    key <BKSL> { [    backslash,             bar,        dead_belowdot,    dead_abovedot ] };
-
-// Lower row
-    key <LSGT> { [ guillemotleft, guillemotright,           0x01002039,       0x0100203A ] };
-    key <AB01> { [            y,               Y,                  yen,              yen ] };
-    key <AB02> { [     ccedilla,        Ccedilla                                         ] };
-    key <AB03> { [            j,               J,           0x01000292,       0x010001B7 ] };
-    key <AB04> { [            b,               B,           apostrophe,         quotedbl ] };
-    key <AB05> { [            k,               K,             currency,        brokenbar ] };
-    key <AB06> { [            q,               Q,           0x01000259,       0x0100018F ] };
-    key <AB07> { [            v,               V,   doublelowquotemark, singlelowquotemark ] };
-    key <AB08> { [            g,               G,  leftdoublequotemark, leftsinglequotemark ] };
-    key <AB09> { [            f,               F, rightdoublequotemark, rightsinglequotemark ] };
-    key <AB10> { [            z,               Z,           0x0100201F,       0x0100201B ] };
-
-    key <SPCE> { [        space,           space,         nobreakspace,     nobreakspace ] };
-
-// Configures the use of the AltGr key
-    include "level3(ralt_switch)"
-
-};
-
-
-//
-// Teclado Nativo Portugues para o teclado estadunidense   2005-07-19
-// Portuguese Nativo Keyboard for USA keyboards
-//
-// Ari Caldeira     ari@tecladobrasileiro.com.br
-//
-partial alphanumeric_keys
-xkb_symbols "nativo-us" {
-    include "pt(nativo)"
-
-    name[Group1]="Portugal - Nativo for USA keyboards";
-
-// Lower row
-    key <AB01> { [            y,               Y,              ccedilla,        Ccedilla ] };
-    key <AB02> { [ guillemotleft, guillemotright,           0x01002039,       0x0100203A ] };
-
-};
-
-
-//
-// Teclado Nativo Portugues para digitacao em Esperanto    2005-07-19
-// Portuguese Nativo Keyboard for typing Esperanto
-//
-// Ari Caldeira     ari@tecladobrasileiro.com.br
-//
-partial alphanumeric_keys
-xkb_symbols "nativo-epo" {
-    include "pt(nativo)"
-
-    name[Group1]="Portugal - Nativo for Esperanto";
-
-// Upper row Esperanto
-    key <AD04> { [            h,               H,          hcircumflex,      Hcircumflex ] };
-    key <AD05> { [  ccircumflex,     Ccircumflex,                    x,                X ] };
-    key <AD06> { [       ubreve,          Ubreve,                    w,                W ] };
-
-// Lower row Esperanto
-    key <AB01> { [  jcircumflex,     Jcircumflex,                    y,                Y ] };
-    key <AB02> { [  scircumflex,     Scircumflex,             ccedilla,         Ccedilla ] };
-    key <AB06> { [  gcircumflex,     Gcircumflex,                    q,                Q ] };
-
+// $XKeyboardConfig$

+

+// based on a keyboard map from an 'xkb/symbols/pt' file

+//

+// $XFree86: xc/programs/xkbcomp/symbols/pt,v 1.2 2002/11/22 04:03:28 dawes Exp $

+

+partial default alphanumeric_keys

+xkb_symbols "basic" {

+

+    include "latin(type4)"

+

+    name[Group1]="Portugal";

+

+    key <LSGT>  { [      less,    greater ] };

+    key <AE03>	{ [         3, numbersign,     sterling,     sterling ]	};

+    key <AE04>	{ [         4,     dollar,      section,       dollar ]	};

+    key <AE11>	{ [apostrophe,   question,    backslash, questiondown ]	};

+    key <AE12>	{ [guillemotleft, guillemotright, dead_cedilla, dead_ogonek ] };

+

+    key <AD11>	{ [      plus,   asterisk, dead_diaeresis, dead_abovering ] };

+    key <AD12>	{ [dead_acute, dead_grave,   dead_tilde,  dead_macron ]	};

+

+    key <AC10>	{ [  ccedilla,   Ccedilla,   dead_acute, dead_doubleacute ] };

+    key <AC11>	{ [ masculine, ordfeminine, dead_circumflex,   dead_caron ] };

+    key <TLDE>	{ [ backslash,        bar,      notsign,      notsign ]	};

+

+    key <BKSL>	{ [dead_tilde, dead_circumflex, dead_grave, dead_breve]	};

+

+    include "level3(ralt_switch)"

+};

+

+partial alphanumeric_keys

+xkb_symbols "Sundeadkeys" {

+

+    include "pt(basic)" // for consistent naming

+

+    key <AD11>	{ [plus,   asterisk, dead_diaeresis, dead_diaeresis ]	};

+    key <BKSL>	{ [dead_tilde, dead_circumflex ]	};

+    key <AD12>	{ [dead_acute, dead_grave ]	};

+};

+

+partial alphanumeric_keys

+xkb_symbols "sundeadkeys" {

+    include "pt(Sundeadkeys)" // for consistent naming

+

+    name[Group1]="Portugal - Sun dead keys";

+};

+

+partial alphanumeric_keys

+xkb_symbols "nodeadkeys" {

+

+    include "pt(basic)" // for consistent naming

+

+    name[Group1]="Portugal - Eliminate dead keys";

+

+    key <AE12>	{ [guillemotleft, guillemotright, cedilla,     ogonek ]	};

+    key <AD11>	{ [      plus,   asterisk,     quotedbl,     quotedbl ]	};

+    key <AD12>	{ [     acute,      grave ]	};

+    key <AC10>	{ [  ccedilla,   Ccedilla,        acute,  doubleacute ]	};

+    key <AC11>	{ [ masculine, ordfeminine, asciicircum,        caron ]	};

+    key <BKSL>	{ [asciitilde, asciicircum ]	};

+    key <AB10>	{ [     minus, underscore, dead_belowdot,    abovedot ]	};

+};

+

+// mac version from Ricardo Cabral <bfe00991@mail.telepac.pt>

+// Copied from macintosh_vndr/pt

+partial alphanumeric_keys 

+xkb_symbols "mac" {

+

+    // Describes the differences between a very simple en_US

+    // keyboard and a very simple Portuguese keybaord

+

+    include "pt"

+    name[Group1]= "Portugal - Macintosh";

+

+    key <AE06>	{ [         6,  ampersand, threequarters, fiveeighths ]	};

+    key <AE08>	{ [         8,  parenleft,  bracketleft,    braceleft ]	};

+    key <AE09>	{ [         9, parenright, bracketright,   braceright ]	};

+    key <AE12>	{ [      plus,   asterisk, dead_diaeresis     ]	};

+    key <AC11>	{ [ dead_tilde, dead_circumflex       ]	};

+    key <AD11>	{ [ masculine, ordfeminine            ]	};

+    key <BKSL>	{ [ backslash,        bar,   dead_grave,   dead_breve ]	};

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

+};

+

+partial alphanumeric_keys 

+xkb_symbols "mac_sundeadkeys" {

+    include "pt(mac)"

+    name[Group1]= "Portugal - Macintosh, Sun dead keys";

+    

+    key <AE12> {	[	     plus,        asterisk,  dead_diaeresis, dead_diaeresis      ]	};

+    key <AC11> {	[     dead_tilde,    dead_circumflex	]	};

+    key <AD12> {	[     dead_acute,     dead_grave 	]	};

+};

+

+partial alphanumeric_keys 

+xkb_symbols "mac_nodeadkeys" {

+    include "pt(mac)"

+    name[Group1]= "Portugal - Macintosh, eliminate dead keys";

+

+    key <AE12> {	[	     plus,        asterisk, 	 quotedbl,        quotedbl      ]	};

+    key <AC11> {	[      asciitilde,     asciicircum	]	};

+    key <AD12> {	[	    acute,           grave 	]	};

+};

+

+

+//

+// Teclado Nativo Portugues                                2005-07-19

+// Portuguese Nativo Keyboard

+//      This is a Dvorak-based layout, designed for the Portuguese language

+//

+// Ari Caldeira     ari@tecladobrasileiro.com.br

+//

+partial alphanumeric_keys

+xkb_symbols "nativo" {

+

+    name[Group1]="Portugal - Nativo";

+

+// Numeric row

+    key <TLDE> { [         plus,        asterisk,       dead_diaeresis,        plusminus ] };

+    key <AE01> { [            1,          exclam,          onesuperior,       exclamdown ] };

+    key <AE02> { [            2,        quotedbl,                   at,      twosuperior ] };

+    key <AE03> { [            3,      numbersign,             sterling,    threesuperior ] };

+    key <AE04> { [            4,          dollar,              section,       onequarter ] };

+    key <AE05> { [            5,         percent,                 cent,       0x01002030 ] };

+    key <AE06> { [            6,       ampersand,              notsign,        diaeresis ] };

+    key <AE07> { [            7,           slash,            braceleft,       0x0100032D ] };

+    key <AE08> { [            8,       parenleft,          bracketleft,       0x01000331 ] };

+    key <AE09> { [            9,      parenright,         bracketright,        dead_horn ] };

+    key <AE10> { [            0,           equal,           braceright,        dead_hook ] };

+    key <AE11> { [    masculine,     ordfeminine,          dead_ogonek,       0x01000326 ] };

+    key <AE12> { [         less,         greater,         dead_cedilla,   dead_abovering ] };

+

+// Upper row

+    key <AD01> { [   apostrophe,        question,               degree,     questiondown ] };

+    key <AD02> { [        comma,       semicolon,           0x01000329,       0x01000315 ] };

+    key <AD03> { [       period,           colon,           0x01002022,   periodcentered ] };

+    key <AD04> { [            h,               H,            paragraph,        paragraph ] };

+    key <AD05> { [            x,               X,             multiply,         division ] };

+    key <AD06> { [            w,               W,               ubreve,           Ubreve ] };

+    key <AD07> { [            l,               L,              lstroke,          Lstroke ] };

+    key <AD08> { [            t,               T,            trademark,        trademark ] };

+    key <AD09> { [            c,               C,            copyright,        copyright ] };

+    key <AD10> { [            p,               P,                thorn,            THORN ] };

+    key <AD11> { [   dead_tilde, dead_circumflex,           dead_caron, dead_doubleacute ] };

+    key <AD12> { [        minus,      underscore,           0x01002015,       0x01000336 ] };

+

+// Central row

+    key <AC01> { [            i,               I,             idotless,        Iabovedot ] };

+    key <AC02> { [            e,               E,             EuroSign,         EuroSign ] };

+    key <AC03> { [            a,               A,                   ae,               AE ] };

+    key <AC04> { [            o,               O,                   oe,               OE ] };

+    key <AC05> { [            u,               U,               oslash,         Ooblique ] };

+    key <AC06> { [            m,               M,                   mu,               mu ] };

+    key <AC07> { [            d,               D,                  eth,              ETH ] };

+    key <AC08> { [            s,               S,               ssharp,           ssharp ] };

+    key <AC09> { [            r,               R,           registered,       registered ] };

+    key <AC10> { [            n,               N,                  eng,              ENG ] };

+    key <AC11> { [   dead_acute,      dead_grave,          dead_macron,       dead_breve ] };

+    key <BKSL> { [    backslash,             bar,        dead_belowdot,    dead_abovedot ] };

+

+// Lower row

+    key <LSGT> { [ guillemotleft, guillemotright,           0x01002039,       0x0100203A ] };

+    key <AB01> { [            y,               Y,                  yen,              yen ] };

+    key <AB02> { [     ccedilla,        Ccedilla                                         ] };

+    key <AB03> { [            j,               J,           0x01000292,       0x010001B7 ] };

+    key <AB04> { [            b,               B,           apostrophe,         quotedbl ] };

+    key <AB05> { [            k,               K,             currency,        brokenbar ] };

+    key <AB06> { [            q,               Q,           0x01000259,       0x0100018F ] };

+    key <AB07> { [            v,               V,   doublelowquotemark, singlelowquotemark ] };

+    key <AB08> { [            g,               G,  leftdoublequotemark, leftsinglequotemark ] };

+    key <AB09> { [            f,               F, rightdoublequotemark, rightsinglequotemark ] };

+    key <AB10> { [            z,               Z,           0x0100201F,       0x0100201B ] };

+

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

+

+// Configures the use of the AltGr key

+    include "level3(ralt_switch)"

+

+};

+

+

+//

+// Teclado Nativo Portugues para o teclado estadunidense   2005-07-19

+// Portuguese Nativo Keyboard for USA keyboards

+//

+// Ari Caldeira     ari@tecladobrasileiro.com.br

+//

+partial alphanumeric_keys

+xkb_symbols "nativo-us" {

+    include "pt(nativo)"

+

+    name[Group1]="Portugal - Nativo for USA keyboards";

+

+// Lower row

+    key <AB01> { [            y,               Y,              ccedilla,        Ccedilla ] };

+    key <AB02> { [ guillemotleft, guillemotright,           0x01002039,       0x0100203A ] };

+

+};

+

+

+//

+// Teclado Nativo Portugues para digitacao em Esperanto    2005-07-19

+// Portuguese Nativo Keyboard for typing Esperanto

+//

+// Ari Caldeira     ari@tecladobrasileiro.com.br

+//

+partial alphanumeric_keys

+xkb_symbols "nativo-epo" {

+    include "pt(nativo)"

+

+    name[Group1]="Portugal - Nativo for Esperanto";

+

+// Upper row Esperanto

+    key <AD04> { [            h,               H,          hcircumflex,      Hcircumflex ] };

+    key <AD05> { [  ccircumflex,     Ccircumflex,                    x,                X ] };

+    key <AD06> { [       ubreve,          Ubreve,                    w,                W ] };

+

+// Lower row Esperanto

+    key <AB01> { [  jcircumflex,     Jcircumflex,                    y,                Y ] };

+    key <AB02> { [  scircumflex,     Scircumflex,             ccedilla,         Ccedilla ] };

+    key <AB06> { [  gcircumflex,     Gcircumflex,                    q,                Q ] };

+

 };
\ No newline at end of file
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/Makefile.am b/xorg-server/xkbdata.src/symbols/sun_vndr/Makefile.am
index db036de67..00692e334 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/Makefile.am
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/Makefile.am
@@ -1,9 +1,10 @@
-symbolsdir = $(xkb_base)/symbols/sun_vndr
-
-dist_symbols_DATA = \
- cs cz de dk es \
- fi fr gb gr hu \
- it jp ko lt lv \
- nl no pl pt ru \
- se solaris sw tr tuv \
- tw us usb
+symbolsdir = $(xkb_base)/symbols/sun_vndr

+

+dist_symbols_DATA = \

+ ara be br ca ch \

+ cz de dk ee es \

+ fi fr gb gr it \

+ jp kr lt lv nl \

+ no pl pt ro ru \

+ se sk solaris tr tuv \

+ tw ua us

diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/ara b/xorg-server/xkbdata.src/symbols/sun_vndr/ara
new file mode 100644
index 000000000..ea54207b8
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/ara
@@ -0,0 +1,117 @@
+//

+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.

+//

+// Permission is hereby granted, free of charge, to any person obtaining a

+// copy of this software and associated documentation files (the

+// "Software"), to deal in the Software without restriction, including

+// without limitation the rights to use, copy, modify, merge, publish,

+// distribute, and/or sell copies of the Software, and to permit persons

+// to whom the Software is furnished to do so, provided that the above

+// copyright notice(s) and this permission notice appear in all copies of

+// the Software and that both the above copyright notice(s) and this

+// permission notice appear in supporting documentation.

+// 

+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

+// 

+// Except as contained in this notice, the name of a copyright holder

+// shall not be used in advertising or otherwise to promote the sale, use

+// or other dealings in this Software without prior written authorization

+// of the copyright holder.

+//

+

+//

+// CDDL HEADER START

+//

+// The contents of this file are subject to the terms of the

+// Common Development and Distribution License (the "License").

+// You may not use this file except in compliance with the License.

+//

+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE

+// or http://www.opensolaris.org/os/licensing.

+// See the License for the specific language governing permissions

+// and limitations under the License.

+//

+// When distributing Covered Code, include this CDDL HEADER in each

+// file and include the License file at src/OPENSOLARIS.LICENSE.

+// If applicable, add the following below this CDDL HEADER, with the

+// fields enclosed by brackets "[]" replaced with your own identifying

+// information: Portions Copyright [yyyy] [name of copyright owner]

+//

+// CDDL HEADER END

+//

+

+partial default alphanumeric_keys 

+xkb_symbols "type6" {

+

+    name[Group1]= "Arabic";

+

+    key <TLDE> {  [   Arabic_thal,      Arabic_shadda, grave,    asciitilde   ]	};

+    key <AE01> {  [               1,          exclam, 1,          exclam      ] };

+    key <AE02> {  [               2,              at, 2,              at      ] };

+    key <AE03> {  [               3,      numbersign, 3,      numbersign      ] };

+    key <AE04> {  [               4,          dollar, 4,          dollar      ] };

+    key <AE05> {  [               5,         percent, 5,         percent      ] };

+    key <AE06> {  [               6,     asciicircum, 6,     asciicircum      ] };

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

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

+    key <AE09> {  [               9,      parenright, 9,      parenright      ] };

+    key <AE10> {  [               0,       parenleft, 0,       parenleft      ] };

+    key <AE11> {  [       minus,      underscore, minus,      underscore      ] };

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

+						

+    key <AD01> {  [      Arabic_dad,     Arabic_fatha, q,    Q     ]     };

+    key <AD02> {  [      Arabic_sad,     Arabic_fathatan, w,    W  ]     };

+    key <AD03> {  [     Arabic_theh,     Arabic_damma, e,    E     ]     };

+    key <AD04> {  [      Arabic_qaf,     Arabic_dammatan, r,    R  ]     };

+    key <AD05> {  [      Arabic_feh,     0x100fef9, t,    T        ]     };

+    key <AD06> {  [   Arabic_ghain, Arabic_hamzaunderalef, y,    Y ]     };

+    key <AD07> {  [      Arabic_ain,         grave, u,    U        ]     };

+    key <AD08> {  [       Arabic_ha,        division, i,    I      ]     };

+    key <AD09> {  [     Arabic_khah,       multiply, o,    O       ]     };

+    key <AD10> {  [      Arabic_hah,   Arabic_semicolon, p,    P  ]     };

+    key <AD11> {  [     Arabic_jeem,        greater, bracketleft,  braceleft       ]     };

+    key <AD12> {  [      Arabic_dal,        less,    bracketright, braceright      ]     };

+

+    key <AC01> {  [    Arabic_sheen,   Arabic_kasra, a,    A       ]     };

+    key <AC02> {  [     Arabic_seen,   Arabic_kasratan, s,    S    ]     };

+    key <AC03> {  [      Arabic_yeh,       bracketright, d,    D   ]     };

+    key <AC04> {  [      Arabic_beh,       bracketleft, f,    F    ]     };

+    key <AC05> {  [      Arabic_lam,       0x100fef7, g,    G      ]     };

+    key <AC06> {  [     Arabic_alef,   Arabic_hamzaonalef, h,    H ]     };

+    key <AC07> {  [      Arabic_teh,      Arabic_tatweel, j,    J  ]     };

+    key <AC08> {  [     Arabic_noon,      Arabic_comma, k,    K    ]     };

+    key <AC09> {  [     Arabic_meem,         slash, l,    L        ]     };

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

+    key <AC11> {  [      Arabic_tah,        quotedbl, apostrophe,   quotedbl      ]     };

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

+

+    key <LSGT> {  [             bar,      brokenbar, bar,      brokenbar	  ]     };

+    key <AB01> {  [Arabic_hamzaonyeh,    asciitilde, z,    Z       ]     };

+    key <AB02> {  [    Arabic_hamza,      Arabic_sukun, x,    X    ]     };

+    key <AB03> {  [Arabic_hamzaonwaw,      braceright, c,    C     ]     };

+    key <AB04> {  [       Arabic_ra,       braceleft, v,    V      ]     };

+    key <AB05> {  [       0x100fefb,       0x100fef5, b,    B      ]     };

+    key <AB06> {  [Arabic_alefmaksura, Arabic_maddaonalef, n,    N ]     };

+    key <AB07> {  [Arabic_tehmarbuta,    apostrophe, m,    M       ]     };

+    key <AB08> {  [      Arabic_waw,         comma,  comma,    less        ]     };

+    key <AB09> {  [     Arabic_zain,         period, period,    greater       ]     };

+    key <AB10> {  [      Arabic_zah, Arabic_question_mark, slash,    question ]     };

+

+	include "level3(ralt_switch)"

+

+};

+

+

+partial alphanumeric_keys

+	xkb_symbols "basic" {

+	include "sun_vndr/ara(type6)"

+};

+

diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/be b/xorg-server/xkbdata.src/symbols/sun_vndr/be
new file mode 100644
index 000000000..d6ce057d4
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/be
@@ -0,0 +1,99 @@
+//

+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.

+//

+// Permission is hereby granted, free of charge, to any person obtaining a

+// copy of this software and associated documentation files (the

+// "Software"), to deal in the Software without restriction, including

+// without limitation the rights to use, copy, modify, merge, publish,

+// distribute, and/or sell copies of the Software, and to permit persons

+// to whom the Software is furnished to do so, provided that the above

+// copyright notice(s) and this permission notice appear in all copies of

+// the Software and that both the above copyright notice(s) and this

+// permission notice appear in supporting documentation.

+// 

+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

+// 

+// Except as contained in this notice, the name of a copyright holder

+// shall not be used in advertising or otherwise to promote the sale, use

+// or other dealings in this Software without prior written authorization

+// of the copyright holder.

+//

+

+//

+// CDDL HEADER START

+//

+// The contents of this file are subject to the terms of the

+// Common Development and Distribution License (the "License").

+// You may not use this file except in compliance with the License.

+//

+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE

+// or http://www.opensolaris.org/os/licensing.

+// See the License for the specific language governing permissions

+// and limitations under the License.

+//

+// When distributing Covered Code, include this CDDL HEADER in each

+// file and include the License file at src/OPENSOLARIS.LICENSE.

+// If applicable, add the following below this CDDL HEADER, with the

+// fields enclosed by brackets "[]" replaced with your own identifying

+// information: Portions Copyright [yyyy] [name of copyright owner]

+//

+// CDDL HEADER END

+//

+

+

+partial default alphanumeric_keys

+xkb_symbols "type6" {

+

+    name[Group1]="Belgium";

+

+    key <TLDE>  { [twosuperior, threesuperior                         ] };

+    key <AE01>  { [ ampersand,          1,          bar               ] };

+    key <AE02>  { [    eacute,          2,           at               ] };

+    key <AE03>  { [  quotedbl,          3,   numbersign               ] };

+    key <AE04>  { [apostrophe,          4                             ] };

+    key <AE05>  { [ parenleft,          5                             ] };

+    key <AE06>  { [   section,          6,  asciicircum               ] };

+    key <AE07>  { [    egrave,          7                             ] };

+    key <AE08>  { [    exclam,          8                             ] };

+    key <AE09>  { [  ccedilla,          9,    braceleft               ] };

+    key <AE10>  { [    agrave,          0,   braceright               ] };

+    key <AE11>  { [parenright,     degree                             ] };

+    key <AE12>  { [     minus, underscore                             ] };

+

+    key <AD01>  { [         a,          A                             ] };

+    key <AD02>  { [         z,          Z                             ] };

+    key <AD03>  { [         e,          E,     EuroSign               ] };

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

+    key <AD11>  { [dead_circumflex, dead_diaeresis,  bracketleft      ] };

+    key <AD12>  { [    dollar,   asterisk, bracketright               ] };

+

+    key <AC01>  { [         q,          Q                             ] };

+    key <AC10>  { [         m,          M                             ] };

+    key <AC11>  { [    ugrave,    percent,   dead_acute               ] };

+    key <BKSL>  { [        mu,   sterling,   dead_grave               ] };

+

+    key <LSGT>  { [      less,    greater,    backslash               ] };

+    key <AB01>  { [         w,          W                             ] };

+    key <AB07>  { [     comma,   question                             ] };

+    key <AB08>  { [ semicolon,     period                             ] };

+    key <AB09>  { [     colon,      slash                             ] };

+    key <AB10>  { [     equal,       plus,   dead_tilde               ] };

+

+	include "level3(ralt_switch)"

+

+};

+

+

+partial alphanumeric_keys

+	xkb_symbols "basic" {

+	include "sun_vndr/be(type6)"

+};

+

diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/br b/xorg-server/xkbdata.src/symbols/sun_vndr/br
new file mode 100644
index 000000000..4d966f551
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/br
@@ -0,0 +1,102 @@
+//

+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.

+//

+// Permission is hereby granted, free of charge, to any person obtaining a

+// copy of this software and associated documentation files (the

+// "Software"), to deal in the Software without restriction, including

+// without limitation the rights to use, copy, modify, merge, publish,

+// distribute, and/or sell copies of the Software, and to permit persons

+// to whom the Software is furnished to do so, provided that the above

+// copyright notice(s) and this permission notice appear in all copies of

+// the Software and that both the above copyright notice(s) and this

+// permission notice appear in supporting documentation.

+// 

+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

+// 

+// Except as contained in this notice, the name of a copyright holder

+// shall not be used in advertising or otherwise to promote the sale, use

+// or other dealings in this Software without prior written authorization

+// of the copyright holder.

+//

+

+//

+// CDDL HEADER START

+//

+// The contents of this file are subject to the terms of the

+// Common Development and Distribution License (the "License").

+// You may not use this file except in compliance with the License.

+//

+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE

+// or http://www.opensolaris.org/os/licensing.

+// See the License for the specific language governing permissions

+// and limitations under the License.

+//

+// When distributing Covered Code, include this CDDL HEADER in each

+// file and include the License file at src/OPENSOLARIS.LICENSE.

+// If applicable, add the following below this CDDL HEADER, with the

+// fields enclosed by brackets "[]" replaced with your own identifying

+// information: Portions Copyright [yyyy] [name of copyright owner]

+//

+// CDDL HEADER END

+//

+

+partial default alphanumeric_keys

+xkb_symbols "type6" {

+

+    name[Group1]="Brazil";

+

+    key <TLDE> { [      apostrophe,        quotedbl,	notsign		               ] };

+    key <AE01> { [               1,          exclam,	onesuperior,        exclamdown ] };

+    key <AE02> { [               2,              at,	twosuperior,           onehalf ] };

+    key <AE03> { [               3,      numbersign,	threesuperior,   threequarters ] };

+    key <AE04> { [               4,          dollar,	sterling,           onequarter ] };

+    key <AE05> { [               5,         percent,	cent                           ] };

+    key <AE06> { [               6,  dead_diaeresis,	notsign,             diaeresis ] };

+    key <AE07> { [               7,       ampersand,	braceleft                      ] };

+    key <AE08> { [               8,        asterisk,	bracketleft                    ] };

+    key <AE09> { [               9,       parenleft,	bracketright                   ] };

+    key <AE10> { [               0,      parenright,	braceright                     ] };

+    key <AE11> { [           minus,      underscore,	backslash                      ] };

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

+

+    key <AD03> { [               e,               E,	EuroSign                       ] };

+    key <AD04> { [               r,               R,	registered                     ] };

+    key <AD11> { [      dead_acute,      dead_grave,	acute,                   grave ] };

+    key <AD12> { [     bracketleft,       braceleft,	ordfeminine                    ] };

+

+    key <AC10> { [        ccedilla,        Ccedilla,	exclamdown		       ] };

+    key <AC11> { [      dead_tilde, dead_circumflex,	asciitilde,        asciicircum ] };

+    key <AC12> { [    bracketright,      braceright,	masculine                      ] };

+    key <BKSL> { [   bracketright,       braceright,    masculine                      ] };

+

+    key <LSGT> { [          slash,              bar,    degree                         ] };

+    key <AB01> { [               z,               Z,	guillemotleft 		       ] };

+    key <AB02> { [               x,               X,	guillemotright                 ] };

+    key <AB03> { [               c,               C,	copyright                      ] };

+    key <AB07> { [               m,               M,	mu                             ] };

+    key <AB08> { [           comma,            less,	question                       ] };

+    key <AB09> { [          period,         greater,	questiondown                   ] };

+    key <AB10> { [       semicolon,           colon                                    ] };

+    key <AB11> { [           slash,        question,	degree,           questiondown ] };

+

+    key <KPPT> { [      KP_Decimal                                                     ] };

+    key <KPDL> { [       KP_Delete,           comma                                    ] };

+

+	include "level3(ralt_switch)"

+

+};

+

+

+partial alphanumeric_keys

+	xkb_symbols "basic" {

+	include "sun_vndr/br(type6)"

+};

+

diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/ca b/xorg-server/xkbdata.src/symbols/sun_vndr/ca
new file mode 100644
index 000000000..0f0aa2923
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/ca
@@ -0,0 +1,98 @@
+//

+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.

+//

+// Permission is hereby granted, free of charge, to any person obtaining a

+// copy of this software and associated documentation files (the

+// "Software"), to deal in the Software without restriction, including

+// without limitation the rights to use, copy, modify, merge, publish,

+// distribute, and/or sell copies of the Software, and to permit persons

+// to whom the Software is furnished to do so, provided that the above

+// copyright notice(s) and this permission notice appear in all copies of

+// the Software and that both the above copyright notice(s) and this

+// permission notice appear in supporting documentation.

+// 

+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

+// 

+// Except as contained in this notice, the name of a copyright holder

+// shall not be used in advertising or otherwise to promote the sale, use

+// or other dealings in this Software without prior written authorization

+// of the copyright holder.

+//

+

+//

+// CDDL HEADER START

+//

+// The contents of this file are subject to the terms of the

+// Common Development and Distribution License (the "License").

+// You may not use this file except in compliance with the License.

+//

+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE

+// or http://www.opensolaris.org/os/licensing.

+// See the License for the specific language governing permissions

+// and limitations under the License.

+//

+// When distributing Covered Code, include this CDDL HEADER in each

+// file and include the License file at src/OPENSOLARIS.LICENSE.

+// If applicable, add the following below this CDDL HEADER, with the

+// fields enclosed by brackets "[]" replaced with your own identifying

+// information: Portions Copyright [yyyy] [name of copyright owner]

+//

+// CDDL HEADER END

+//

+

+

+partial default alphanumeric_keys

+xkb_symbols "type6" {

+

+   name[Group1]="Canada Bilingual";

+

+   key <TLDE> { [           slash, bar,             backslash                  ]};

+   key <AE01> { [               1, exclam,          plusminus                  ]};

+   key <AE02> { [               2, at                                          ]};

+   key <AE03> { [               3, numbersign,      sterling                   ]};

+   key <AE04> { [               4, dollar,          cent                       ]};

+   key <AE05> { [               5, percent,         currency                   ]};

+   key <AE06> { [               6, question,        notsign	               ]};

+   key <AE07> { [               7, ampersand,       braceleft                  ]};

+   key <AE08> { [               8, asterisk,        braceright                 ]};

+   key <AE09> { [               9, parenleft,       bracketleft                ]};

+   key <AE10> { [               0, parenright,      bracketright               ]};

+   key <AE11> { [           minus, underscore,      onehalf	               ]};

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

+  

+   key <AD03> { [               e, E,               EuroSign		       ]};

+   key <AD09> { [               o, O,               section		       ]};

+   key <AD10> { [               p, P,               paragraph                  ]};

+   key <AD11> { [ dead_circumflex, dead_diaeresis,  dead_grave                 ]};

+   key <AD12> { [        ccedilla, Ccedilla,        asciitilde                 ]};

+

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

+   key <AC11> { [          egrave, Egrave,          braceleft                  ]};

+   key <AC12> { [          agrave, Agrave,          braceright                 ]};

+   key <BKSL> { [          agrave, Agrave,          braceright                 ]};

+

+   key <LSGT> { [          uacute, Uacute                                      ]};

+   key <AB01> { [               z, Z,               guillemotleft              ]};

+   key <AB02> { [               x, X,               guillemotright             ]};

+   key <AB07> { [               m, M,               mu                         ]};

+   key <AB08> { [           comma, quoteright,      less                       ]};

+   key <AB09> { [          period, quotedbl,        greater                    ]};

+   key <AB10> { [          eacute, Eacute,          quoteleft                  ]};

+   

+	include "level3(ralt_switch)"

+

+};

+

+partial alphanumeric_keys

+	xkb_symbols "basic" {

+	include "sun_vndr/ca(type6)"

+};

+

diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/ch b/xorg-server/xkbdata.src/symbols/sun_vndr/ch
new file mode 100644
index 000000000..c952fc559
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/ch
@@ -0,0 +1,134 @@
+//

+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.

+//

+// Permission is hereby granted, free of charge, to any person obtaining a

+// copy of this software and associated documentation files (the

+// "Software"), to deal in the Software without restriction, including

+// without limitation the rights to use, copy, modify, merge, publish,

+// distribute, and/or sell copies of the Software, and to permit persons

+// to whom the Software is furnished to do so, provided that the above

+// copyright notice(s) and this permission notice appear in all copies of

+// the Software and that both the above copyright notice(s) and this

+// permission notice appear in supporting documentation.

+// 

+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

+// 

+// Except as contained in this notice, the name of a copyright holder

+// shall not be used in advertising or otherwise to promote the sale, use

+// or other dealings in this Software without prior written authorization

+// of the copyright holder.

+//

+

+//

+// CDDL HEADER START

+//

+// The contents of this file are subject to the terms of the

+// Common Development and Distribution License (the "License").

+// You may not use this file except in compliance with the License.

+//

+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE

+// or http://www.opensolaris.org/os/licensing.

+// See the License for the specific language governing permissions

+// and limitations under the License.

+//

+// When distributing Covered Code, include this CDDL HEADER in each

+// file and include the License file at src/OPENSOLARIS.LICENSE.

+// If applicable, add the following below this CDDL HEADER, with the

+// fields enclosed by brackets "[]" replaced with your own identifying

+// information: Portions Copyright [yyyy] [name of copyright owner]

+//

+// CDDL HEADER END

+//

+

+partial default alphanumeric_keys 

+xkb_symbols "de_type6" {

+

+    name[Group1]= "Switzerland - German";

+

+    key <TLDE> { [    section,     degree                           ] };

+    key <AE01> { [          1,       plus,          bar             ] };

+    key <AE02> { [          2,   quotedbl,           at             ] };

+    key <AE03> { [          3,   asterisk,   numbersign             ] };

+    key <AE04> { [          4,   ccedilla,  asciicircum             ] };

+    key <AE05> { [          5,    percent,   asciitilde             ] };

+    key <AE06> { [          6,  ampersand,      notsign             ] };

+    key <AE07> { [          7,      slash,    brokenbar             ] };

+    key <AE08> { [          8,  parenleft,         cent             ] };

+    key <AE09> { [          9, parenright                           ] };

+    key <AE10> { [          0,      equal,    quoteleft             ] };

+    key <AE11> { [ quoteright,   question,   dead_acute             ] };

+    key <AE12> { [ dead_circumflex, dead_grave, dead_tilde          ] };

+

+    key <AD03> { [          e,          E,     EuroSign             ] };

+    key <AD06> { [          z,          Z                           ] };

+    key <AD11> { [ udiaeresis,     egrave,  bracketleft             ] };

+    key <AD12> { [ dead_diaeresis, exclam, bracketright             ] };

+

+    key <AC10> { [ odiaeresis,     eacute                           ] };

+    key <AC11> { [ adiaeresis,     agrave,    braceleft             ] };

+    key <BKSL> { [     dollar,   sterling,   braceright             ] };

+

+    key <LSGT> { [       less,    greater,    backslash             ] };

+    key <AB01> { [          y,          Y                           ] };

+    key <AB08> { [      comma,  semicolon                           ] };

+    key <AB09> { [     period,      colon                           ] };

+    key <AB10> { [      minus, underscore                           ] };

+

+	include "level3(ralt_switch)"

+

+};

+

+

+

+partial alphanumeric_keys 

+xkb_symbols "fr_type6" {

+

+    name[Group1]= "Switzerland - French, Sun type 6";

+

+    key <TLDE> { [    section,     degree                           ] };

+    key <AE01> { [          1,       plus,          bar             ] };

+    key <AE02> { [          2,   quotedbl,           at             ] };

+    key <AE03> { [          3,   asterisk,   numbersign             ] };

+    key <AE04> { [          4,   ccedilla,  asciicircum             ] };

+    key <AE05> { [          5,    percent,   asciitilde             ] };

+    key <AE06> { [          6,  ampersand,      notsign             ] };

+    key <AE07> { [          7,      slash,    brokenbar             ] };

+    key <AE08> { [          8,  parenleft,         cent             ] };

+    key <AE09> { [          9, parenright                           ] };

+    key <AE10> { [          0,      equal,    quoteleft             ] };

+    key <AE11> { [ quoteright,   question,   dead_acute             ] };

+    key <AE12> { [ dead_circumflex, dead_grave, dead_tilde          ] };

+

+    key <AD03> { [          e,          E,     EuroSign             ] };

+    key <AD06> { [          z,          Z                           ] };

+    key <AD11> { [     egrave, udiaeresis,  bracketleft             ] };

+    key <AD12> { [ dead_diaeresis, exclam, bracketright             ] };

+

+    key <AC10> { [     eacute, odiaeresis                           ] };

+    key <AC11> { [     agrave, adiaeresis,    braceleft             ] };

+    key <BKSL> { [     dollar,   sterling,   braceright             ] };

+

+    key <LSGT> { [       less,    greater,    backslash             ] };

+    key <AB01> { [          y,          Y                           ] };

+    key <AB08> { [      comma,  semicolon                           ] };

+    key <AB09> { [     period,      colon                           ] };

+    key <AB10> { [      minus, underscore                           ] };

+	

+	include "level3(ralt_switch)"

+

+};

+

+

+partial alphanumeric_keys

+	xkb_symbols "basic" {

+	include "sun_vndr/ch(de_type6)"

+};

+

diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/cz b/xorg-server/xkbdata.src/symbols/sun_vndr/cz
index ed46dcf7c..6f6b198c5 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/cz
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/cz
@@ -1,53 +1,106 @@
-// $XdotOrg: $
-//
-// Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice (including the next
-// paragraph) shall be included in all copies or substantial portions of the
-// Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-xkb_symbols "type5" {
-    include "sun_vndr/us(type5)"
-    include "cz"
-
-    // A few keys are different
-    
-
-    key <TLDE> { [ quoteleft, asciitilde	]			};
-//     key <AE02> { [ ecaron, 2		], [ at 		]	};
-//     key <AE03> { [ scaron, 3		], [ numbersign		]	};
-//     key <AE04> { [ ccaron, 4		], [ dollar		]	};
-//     key <AE05> { [ rcaron, 5		], [ percent		]	};
-//     key <AE06> { [ zcaron, 6		], [ asciicircum	]	};
-//     key <AE07> { [ yacute, 7		], [ ampersand		]	};
-//     key <AE08> { [ aacute, 8		], [ asterisk		]	};
-    key <AE09> { [ iacute, 9		], [ braceleft		]	};
-    key <AE10> { [ eacute, 0		], [ braceright		]	};
-
-    key <AD03> { [ e, E		        ]                               };
-    key <AD11> { [ uacute, slash        ], [ bracketleft		] };
-    key <AD12> { [ parenright, parenleft], [ bracketright		] };
-    
-    key <AC02> { [ s, S			], [ ssharp, ssharp		] };
-    key <BKSL> { [ SunFA_Diaeresis, backslash	]			  };
-
-    key <LSGT> { [ backslash, bar		]			};
-    
-};
-
+//

+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.

+//

+// Permission is hereby granted, free of charge, to any person obtaining a

+// copy of this software and associated documentation files (the

+// "Software"), to deal in the Software without restriction, including

+// without limitation the rights to use, copy, modify, merge, publish,

+// distribute, and/or sell copies of the Software, and to permit persons

+// to whom the Software is furnished to do so, provided that the above

+// copyright notice(s) and this permission notice appear in all copies of

+// the Software and that both the above copyright notice(s) and this

+// permission notice appear in supporting documentation.

+// 

+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

+// 

+// Except as contained in this notice, the name of a copyright holder

+// shall not be used in advertising or otherwise to promote the sale, use

+// or other dealings in this Software without prior written authorization

+// of the copyright holder.

+//

+

+//

+// CDDL HEADER START

+//

+// The contents of this file are subject to the terms of the

+// Common Development and Distribution License (the "License").

+// You may not use this file except in compliance with the License.

+//

+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE

+// or http://www.opensolaris.org/os/licensing.

+// See the License for the specific language governing permissions

+// and limitations under the License.

+//

+// When distributing Covered Code, include this CDDL HEADER in each

+// file and include the License file at src/OPENSOLARIS.LICENSE.

+// If applicable, add the following below this CDDL HEADER, with the

+// fields enclosed by brackets "[]" replaced with your own identifying

+// information: Portions Copyright [yyyy] [name of copyright owner]

+//

+// CDDL HEADER END

+//

+

+

+partial default alphanumeric_keys

+xkb_symbols "type6" {

+

+    name[Group1]="Czech";

+

+    key <TLDE>	{ [ semicolon, dead_abovering,	quoteleft,     asciitilde 	]	};

+    key <AE01>	{ [      plus,          1,	exclam,     asciitilde	 	]	};

+    key <AE02>	{ [    ecaron,          2,	at,     dead_caron 		]	};

+    key <AE03>	{ [    scaron,          3,	numbersign,  dead_circumflex 	] 	};

+    key <AE04>	{ [    ccaron,          4,	dollar,     dead_breve 		]	};

+    key <AE05>	{ [    rcaron,          5,	percent, dead_abovering 	] 	};

+    key <AE06>	{ [    zcaron,          6,	asciicircum,  dead_ogonek 	]	};

+    key <AE07>	{ [    yacute,          7,	ampersand,          grave 	]	};

+    key <AE08>	{ [    aacute,          8,	asterisk,  dead_abovedot	]	};

+    key <AE09>	{ [    iacute,          9,	parenleft,    dead_acute    	]	};

+    key <AE10>	{ [    eacute,          0,	parenright, dead_doubleacute	]	};

+    key <AE11>	{ [     equal,    percent,	dead_diaeresis, backslash 	]	};

+    key <AE12>	{ [ dead_acute, dead_caron,	dead_cedilla, minus 		]	};

+

+    key <AD01>	{ [         q,          Q,	backslash 		]	};

+    key <AD02>	{ [         w,          W,	bar 			]	};

+    key <AD03>	{ [         e,          E,	EuroSign 		]	};

+    key <AD06>	{ [         z,          Z 				]	};

+    key <AD11>	{ [    uacute,      slash,	division 		]	};

+    key <AD12>	{ [parenright,  parenleft,	multiply 		]	};

+

+    key <AC02>	{ [         s,          S,	dstroke			]	};

+    key <AC03>	{ [         d,          D,	Dstroke 		]	};

+    key <AC04>	{ [         f,          F,	bracketleft 		]	};

+    key <AC05>	{ [         g,          G,	bracketright 		]	};

+    key <AC08>	{ [         k,          K,	lstroke 		]	};

+    key <AC09>	{ [         l,          L,	Lstroke 		]	};              

+    key <AC10>	{ [      uring,       quotedbl,	dollar 			]	};

+    key <AC11>	{ [    section,         exclam,	ssharp,       currency	]	};

+    key <BKSL>	{ [ dead_diaeresis, apostrophe,	backslash,         bar	]	};

+

+    key <LSGT>	{ [  backslash,       asterisk,	slash,	     brokenbar	]	};

+    key <AB01>	{ [          y,          Y,	less	 		]	};

+    key <AB02>	{ [          x,          X,	greater,    numbersign  ]	};

+    key <AB04>	{ [          v,          V,	at 			]	};

+    key <AB05>	{ [          b,          B,	braceleft 		]	};

+    key <AB06>	{ [          n,          N,	braceright	 	]	};

+    key <AB08>	{ [      comma,       question,	less			]	};

+    key <AB09>	{ [     period,          colon,	greater			]	};

+    key <AB10>	{ [      minus,     underscore                   	]	};

+

+	include "level3(ralt_switch)"

+

+};

+

+partial alphanumeric_keys

+	xkb_symbols "basic" {

+	include "sun_vndr/cz(type6)"

+};

+

diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/de b/xorg-server/xkbdata.src/symbols/sun_vndr/de
index 230e0ca29..3b1301687 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/de
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/de
@@ -1,65 +1,141 @@
-// $XdotOrg: $
-//
-// Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice (including the next
-// paragraph) shall be included in all copies or substantial portions of the
-// Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-
-
-xkb_symbols "type4" {
-    include "sun_vndr/us(type4basic)"
-    // A few keys are different
-    key <BKSL> { [ less, braceleft      ]                       };
-
-    key <BRCR> { [ greater, braceright  ]                       };
-    key <DELE> { [ Delete               ]                       };
-
-    key <AE01> { [ 1, plus              ], [exclam      ]       };
-    key <AE02> { [ 2, quotedbl          ], [at          ]       };
-    key <AE03> { [ 3, asterisk          ], [numbersign  ]       };
-    key <AE04> { [ 4, ccedilla          ], [cent        ]       };
-    key <AE05> { [ 5, percent           ], [asciitilde  ]       };
-    key <AE06> { [ 6, ampersand         ], [section     ]       };
-    key <AE07> { [ 7, slash             ], [bar         ]       };
-    key <AE08> { [ 8, parenleft         ], [degree      ]       };
-    key <AE09> { [ 9, parenright        ], [backslash   ]       };
-    key <AE10> { [ 0, equal             ], [asciicircum ]       };
-    Key <AE11> { [ quoteright, question ], [quoteleft   ]       };
-    key <AE12> { [ SunFA_Circum, SunFA_Grave    ]               };
-    key <AD03> { [ e, E                 ], [EuroSign    ]       };
-    key <AD06> { [ Z                    ]                       };
-    key <AD11> { [ udiaeresis, egrave   ]                       };
-    key <AD12> { [ SunFA_Diaeresis, SunFA_Acute ]               };
-    key <AC10> { [ odiaeresis, eacute   ]                       };
-    key <AC11> { [ adiaeresis, agrave   ]                       };
-    key <TLDE> { [ dollar, SunFA_Tilde  ], [sterling    ]       };
-    key <LSGT> { [ bracketright, bracketleft   ], [ backslash ] };
-    key <AB01> { [ Y                    ]                       };
-    key <AB07> { [ M, NoSymbol          ], [mu  ]               };
-    key <AB08> { [ comma, semicolon     ]                       };
-    key <AB09> { [ period, colon        ]                       };
-    key <AB10> { [ minus, underscore    ]                       };
-    key <COMP> { [ SunAltGraph          ]                       };
-    key <ALGR> { [ SunCompose           ]                       };
-
-
-
-};
+//

+//

+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.

+//

+// Permission is hereby granted, free of charge, to any person obtaining a

+// copy of this software and associated documentation files (the

+// "Software"), to deal in the Software without restriction, including

+// without limitation the rights to use, copy, modify, merge, publish,

+// distribute, and/or sell copies of the Software, and to permit persons

+// to whom the Software is furnished to do so, provided that the above

+// copyright notice(s) and this permission notice appear in all copies of

+// the Software and that both the above copyright notice(s) and this

+// permission notice appear in supporting documentation.

+// 

+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

+// 

+// Except as contained in this notice, the name of a copyright holder

+// shall not be used in advertising or otherwise to promote the sale, use

+// or other dealings in this Software without prior written authorization

+// of the copyright holder.

+//

+

+//

+// CDDL HEADER START

+//

+// The contents of this file are subject to the terms of the

+// Common Development and Distribution License (the "License").

+// You may not use this file except in compliance with the License.

+//

+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE

+// or http://www.opensolaris.org/os/licensing.

+// See the License for the specific language governing permissions

+// and limitations under the License.

+//

+// When distributing Covered Code, include this CDDL HEADER in each

+// file and include the License file at src/OPENSOLARIS.LICENSE.

+// If applicable, add the following below this CDDL HEADER, with the

+// fields enclosed by brackets "[]" replaced with your own identifying

+// information: Portions Copyright [yyyy] [name of copyright owner]

+//

+// CDDL HEADER END

+//

+

+partial default alphanumeric_keys

+xkb_symbols "type6" {

+

+    name[Group1]="Germany";

+

+    key <TLDE> { [     asciicircum,           degree                   ] };

+    key <AE02> { [               2,         quotedbl,     twosuperior  ] }; 

+    key <AE03> { [               3,          section,   threesuperior  ] };

+    key <AE04> { [               4,           dollar                   ] };

+    key <AE06> { [               6,        ampersand,         section  ] };

+    key <AE07> { [               7,            slash,       braceleft  ] };

+    key <AE08> { [               8,        parenleft,     bracketleft  ] };

+    key <AE09> { [               9,       parenright,    bracketright  ] };

+    key <AE10> { [               0,            equal,      braceright  ] };

+    key <AE11> { [          ssharp,         question,       backslash  ] };

+    key <AE12> { [      dead_acute,       dead_grave                   ] };

+    key <AD01> { [               q,                Q,              at  ] };

+    key <AD03> { [               e,                E,        EuroSign  ] };

+    key <AD06> { [               z,                Z                   ] };

+    key <AD11> { [      udiaeresis,       Udiaeresis                   ] };

+    key <AD12> { [            plus,         asterisk,      asciitilde  ] };

+    key <AC10> { [      odiaeresis,       Odiaeresis                   ] };

+    key <AC11> { [      adiaeresis,       Adiaeresis                   ] };

+    key <AB01> { [               y,                Y                   ] };

+    key <AB07> { [               m,                M,              mu  ] };

+    key <AB08> { [           comma,        semicolon                   ] };

+    key <AB09> { [          period,            colon                   ] };

+    key <AB10> { [           minus,       underscore                   ] };

+    key <BKSL> { [      numbersign,       apostrophe,           grave  ] };

+    key <LSGT> { [            less,          greater,             bar  ] };

+

+        include "level3(ralt_switch)"

+        include "kpdl(comma)"

+

+};

+

+partial alphanumeric_keys

+xkb_symbols "type4" {

+

+    name[Group1]="Germany - Sun type 4";

+

+    key <BKSL>  { [           less,     braceleft     					      ] };

+    key <BRCR>  { [        greater,    braceright     					      ] };

+    key <DELE>  { [         Delete                                                            ] };

+

+    key <AE01> { [               1,          plus,               exclam                       ] };

+    key <AE02> { [               2,      quotedbl,                   at,            oneeighth ]	};

+    key <AE03> { [               3,      asterisk,           numbersign,             sterling ]	};

+    key <AE04> { [               4,      ccedilla,                 cent                       ]	};

+    key <AE05> { [               5,       percent,           asciitilde                       ] };

+    key <AE06> { [               6,     ampersand,              section                       ] };

+    key <AE07> { [               7,         slash,                  bar                       ] };

+    key <AE08> { [               8,     parenleft,               degree                       ] };

+    key <AE09> { [               9,    parenright,            backslash                       ] };

+    key <AE10> { [               0,         equal,          asciicircum                       ] };

+    Key <AE11> { [      quoteright,      question,            quoteleft                       ] };

+    key <AE12> { [ dead_circumflex,    dead_grave                                             ] };

+

+    key <AD03>	{ [              e,             E,             EuroSign,             EuroSign ]	};

+    key <AD06>	{ [              z,             Z,            leftarrow,                  yen ]	};

+    key <AD11>	{ [     udiaeresis,        egrave,       dead_diaeresis,       dead_abovering ] };

+    key <AD12>	{ [ dead_diaeresis,    dead_acute                                             ] };

+

+    key <AC02>  { [              s,             S                                             ] };

+    key <AC07>  { [              j,             J,        dead_belowdot,        dead_abovedot ] };

+    key <AC10>	{ [     odiaeresis,        eacute,     dead_doubleacute,        dead_belowdot ] };

+    key <AC11>	{ [     adiaeresis,        agrave,      dead_circumflex,           dead_caron ] };

+    key <TLDE>	{ [         dollar,    dead_tilde,             sterling                       ] };

+

+    key <AB01>	{ [              y,             Y,       guillemotright                       ] };

+    key <AB02>	{ [              x,             X,        guillemotleft 	              ] };

+    key <AB04>	{ [              v,             V,   doublelowquotemark,   singlelowquotemark ]	};

+    key <AB05>	{ [              b,             B,  leftdoublequotemark,  leftsinglequotemark ] };

+    key <AB06>	{ [              n,             N, rightdoublequotemark, rightsinglequotemark ]	};    

+    key <AB07>  { [              m,             M,                   mu                       ] };

+    key <AB08>  { [          comma,     semicolon,       periodcentered,             multiply ] };

+    key <AB09>	{ [         period,         colon                                             ] };

+    key <AB10>	{ [          minus,    underscore                                             ] };

+

+	include "level3(ralt_switch)"

+	include "kpdl(comma)"

+

+};

+

+

+partial alphanumeric_keys

+	xkb_symbols "basic" {

+	include "sun_vndr/de(type6)"

+};

+

diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/dk b/xorg-server/xkbdata.src/symbols/sun_vndr/dk
index 87c099781..4f43112ab 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/dk
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/dk
@@ -1,71 +1,148 @@
-// $XdotOrg: $
-//
-// Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice (including the next
-// paragraph) shall be included in all copies or substantial portions of the
-// Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-xkb_symbols "type4" {
-    include "sun_vndr/us(type4basic)"
-    // A few keys are different
-   key <BKSL> { [ onehalf, section	]                       };
-   key <BRCR> { [ asciitilde, asciicircum	 ] 		};
-   key <AE02> { [ 2, quotedbl		], [ at		]	};
-   key <AE03> { [ 3, numbersign		], [ sterling	]	};
-   key <AE04> { [ 4, currency		], [ dollar	]	};
-   key <AE06> { [ 6, ampersand		] 			};
-   key <AE07> { [ 7, slash		], [ braceleft	]	};
-   key <AE08> { [ 8, parenleft		], [ bracketleft]	};
-   key <AE09> { [ 9, parenright		], [ bracketright] 	};
-   key <AE10> { [ 0, equal		], [ braceright	]	};
-   key <AE11> { [ plus, question	]			};
-   key <AE12> { [ SunFA_Acute, SunFA_Grave], [ bar	]	};
-   key <AD03> { [ e, E			], [ EuroSign	]	};
-   key <AD11> { [ Aring			]			};
-   key <AD12> { [ SunFA_Diaeresis, SunFA_Circum], [SunFA_Tilde] };
-   key <LCTL> { [ Caps_Lock		]			};
-   key <AC10> { [ AE			]			};
-   key <AC11> { [ Ooblique		]			};
-   key <TLDE> { [ quoteright, asterisk	], [ quoteleft	]	};
-   key <LSGT> { [ less, greater		], [ backslash  ]	};
-   key <AB08> { [ comma, semicolon	]			};
-   key <AB09> { [ period, colon		]			};
-   key <AB10> { [ minus, underscore	]			};
-   key <CAPS> { [ Control_L		]			};
-   key <COMP> { [ SunAltGraph		]			};
-   key <ALGR> { [ SunCompose		]			};
-
-
-
-
-};
-
-xkb_symbols "type5" {
-   include "dk"
-
-    key <AE05> { [ 5, percent		], [asciitilde			]};
-    key <AE06> { [ 6, ampersand		], [asciicircum			]};
-    key <AE07> { [ 7, slash		], [ braceleft			]};
-    key <AE08> { [ 8, parenleft		], [ bracketleft		]};
-    key <AE09> { [ 9, parenright	], [ bracketright		]};
-    key <AE10> { [ 0, equal		], [ braceright			]};
-    key <BKSL> { [ quoteright, asterisk	], [ quoteleft			]};
-  
-};
+//

+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.

+//

+// Permission is hereby granted, free of charge, to any person obtaining a

+// copy of this software and associated documentation files (the

+// "Software"), to deal in the Software without restriction, including

+// without limitation the rights to use, copy, modify, merge, publish,

+// distribute, and/or sell copies of the Software, and to permit persons

+// to whom the Software is furnished to do so, provided that the above

+// copyright notice(s) and this permission notice appear in all copies of

+// the Software and that both the above copyright notice(s) and this

+// permission notice appear in supporting documentation.

+// 

+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

+// 

+// Except as contained in this notice, the name of a copyright holder

+// shall not be used in advertising or otherwise to promote the sale, use

+// or other dealings in this Software without prior written authorization

+// of the copyright holder.

+//

+

+//

+// CDDL HEADER START

+//

+// The contents of this file are subject to the terms of the

+// Common Development and Distribution License (the "License").

+// You may not use this file except in compliance with the License.

+//

+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE

+// or http://www.opensolaris.org/os/licensing.

+// See the License for the specific language governing permissions

+// and limitations under the License.

+//

+// When distributing Covered Code, include this CDDL HEADER in each

+// file and include the License file at src/OPENSOLARIS.LICENSE.

+// If applicable, add the following below this CDDL HEADER, with the

+// fields enclosed by brackets "[]" replaced with your own identifying

+// information: Portions Copyright [yyyy] [name of copyright owner]

+//

+// CDDL HEADER END

+//

+

+partial default alphanumeric_keys

+xkb_symbols "type6" {

+

+    name[Group1]="Denmark";

+

+    key <TLDE> { [         onehalf,         section                ] };

+    key <AE02> { [               2,        quotedbl,            at ] };

+    key <AE03> { [               3,      numbersign,      sterling ] };

+    key <AE04> { [               4,        currency,        dollar ] };

+    key <AE05> { [               5,         percent,    asciitilde ] };

+    key <AE06> { [               6,       ampersand,   asciicircum ] };

+    key <AE07> { [               7,           slash,     braceleft ] };

+    key <AE08> { [               8,       parenleft,   bracketleft ] };

+    key <AE09> { [               9,      parenright,  bracketright ] };

+    key <AE10> { [               0,           equal,    braceright ] };

+    key <AE11> { [            plus,        question                ] };

+    key <AE12> { [      dead_acute,      dead_grave,           bar ] }; 

+    key <AD03> { [               e,               E,      EuroSign ] }; 

+    key <AD11> { [           aring,           Aring                ] };

+    key <AD12> { [  dead_diaeresis, dead_circumflex,    dead_tilde ] };

+    key <BKSL> { [      apostrophe,        asterisk,         grave ] };

+    key <AC10> { [              ae,              AE                ] };

+    key <AC11> { [          oslash,        Ooblique                ] };

+    key <AB08> { [           comma,       semicolon                ] };

+    key <AB09> { [          period,           colon                ] };

+    key <AB10> { [           minus,      underscore                ] };

+    key <LSGT> { [            less,         greater,     backslash ] };

+

+        include "level3(ralt_switch)"

+        include "kpdl(comma)"

+

+};

+

+

+partial alphanumeric_keys

+xkb_symbols "type4" {

+

+   name[Group1]="Denmark - Sun type 4";

+

+   key <BKSL> { [ onehalf,        section                        ] };

+   key <BRCR> { [ asciitilde,     asciicircum                    ] };

+   key <AE02> { [ 2,              quotedbl,       at             ] };

+   key <AE03> { [ 3,              numbersign,     sterling       ] };

+   key <AE04> { [ 4,              currency,       dollar         ] };

+   key <AE06> { [ 6,              ampersand                      ] };

+   key <AE07> { [ 7,              slash,          braceleft      ] };

+   key <AE08> { [ 8,              parenleft,      bracketleft    ] };

+   key <AE09> { [ 9,              parenright,     bracketright   ] };

+   key <AE10> { [ 0,              equal,          braceright     ] };

+   key <AE11> { [ plus,           question                       ] };

+   key <AE12> { [ dead_acute,     dead_grave,     bar            ] };

+   key <AD03> { [ e,              E,              EuroSign       ] };

+   key <AD11> { [ aring,          Aring                          ] };

+   key <AD12> { [ dead_diaeresis, dead_circumflex, dead_tilde    ] };

+   key <LCTL> { [ Caps_Lock                                      ] };

+   key <AC10> { [ ae,             AE                             ] };

+   key <AC11> { [ ooblique,       Ooblique                       ] };

+   key <TLDE> { [ quoteright,     asterisk,       quoteleft      ] };

+   key <LSGT> { [ less,           greater,         backslash     ] };

+   key <AB08> { [ comma,          semicolon                      ] };

+   key <AB09> { [ period,         colon                          ] };

+   key <AB10> { [ minus,          underscore                     ] };

+   key <CAPS> { [ Control_L                                      ] };

+   key <COMP> { [ SunAltGraph                                    ] };

+   key <ALGR> { [ SunCompose                                     ] };

+

+	include "level3(ralt_switch)"

+	include "kpdl(comma)"

+

+};

+

+

+partial alphanumeric_keys

+xkb_symbols "type5" {

+

+   include "sun_vndr/dk(type4)"

+

+    name[Group1]="Denmark - Sun type 5";

+

+    key <AE05> { [ 5,           percent,     asciitilde                 ] };

+    key <AE06> { [ 6,           ampersand,   asciicircum                ] };

+    key <AE07> { [ 7,           slash,       braceleft                  ] };

+    key <AE08> { [ 8,           parenleft,   bracketleft                ] };

+    key <AE09> { [ 9,           parenright,  bracketright               ] };

+    key <AE10> { [ 0,           equal,       braceright                 ] };

+    key <BKSL> { [ quoteright,  asterisk,    quoteleft                  ] };

+    

+	include "level3(ralt_switch)"

+	include "kpdl(comma)"

+

+};

+

+

+partial alphanumeric_keys

+	xkb_symbols "basic" {

+	include "sun_vndr/dk(type6)"

+};

+

diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/ee b/xorg-server/xkbdata.src/symbols/sun_vndr/ee
new file mode 100644
index 000000000..1070719a5
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/ee
@@ -0,0 +1,118 @@
+//

+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.

+//

+// Permission is hereby granted, free of charge, to any person obtaining a

+// copy of this software and associated documentation files (the

+// "Software"), to deal in the Software without restriction, including

+// without limitation the rights to use, copy, modify, merge, publish,

+// distribute, and/or sell copies of the Software, and to permit persons

+// to whom the Software is furnished to do so, provided that the above

+// copyright notice(s) and this permission notice appear in all copies of

+// the Software and that both the above copyright notice(s) and this

+// permission notice appear in supporting documentation.

+// 

+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

+// 

+// Except as contained in this notice, the name of a copyright holder

+// shall not be used in advertising or otherwise to promote the sale, use

+// or other dealings in this Software without prior written authorization

+// of the copyright holder.

+//

+

+//

+// CDDL HEADER START

+//

+// The contents of this file are subject to the terms of the

+// Common Development and Distribution License (the "License").

+// You may not use this file except in compliance with the License.

+//

+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE

+// or http://www.opensolaris.org/os/licensing.

+// See the License for the specific language governing permissions

+// and limitations under the License.

+//

+// When distributing Covered Code, include this CDDL HEADER in each

+// file and include the License file at src/OPENSOLARIS.LICENSE.

+// If applicable, add the following below this CDDL HEADER, with the

+// fields enclosed by brackets "[]" replaced with your own identifying

+// information: Portions Copyright [yyyy] [name of copyright owner]

+//

+// CDDL HEADER END

+//

+

+

+partial default alphanumeric_keys

+xkb_symbols "type6" {

+

+    name[Group1]="Estonia";

+

+

+   key <TLDE> { [     dead_caron,    dead_tilde,	notsign,       notsign ] };

+   key <AE01> { [              1,        exclam,	onesuperior,    exclamdown ] };

+   key <AE02> { [              2,      quotedbl,	at,     oneeighth ] };

+   key <AE03> { [              3,    numbersign,	sterling,      sterling ] };

+   key <AE04> { [              4,      currency,	dollar,        dollar ] };

+   key <AE05> { [              5,       percent,	onehalf,  threeeighths ] };

+   key <AE06> { [              6,     ampersand,	notsign,   fiveeighths ] };

+   key <AE07> { [              7,         slash,	braceleft,  seveneighths ] };

+   key <AE08> { [              8,     parenleft,	bracketleft,     trademark ] };

+   key <AE09> { [              9,    parenright,	bracketright,     plusminus ] };

+   key <AE10> { [              0,         equal,	braceright,        degree ] };

+   key <AE11> { [           plus,      question,	backslash,  questiondown ] };

+   key <AE12> { [     dead_acute,    dead_grave,	grave,    apostrophe ] };

+

+   key <AD01> { [              q,             Q,	at,   Greek_OMEGA ] };

+   key <AD02> { [              w,             W,	lstroke,       Lstroke ] };

+   key <AD03> { [              e,             E,	EuroSign,          cent ] };

+   key <AD04> { [              r,             R,	paragraph,    registered ] };

+   key <AD05> { [              t,             T,	tslash,        Tslash ] };

+   key <AD06> { [              y,             Y,	leftarrow,           yen ] };

+   key <AD07> { [              u,             U,	downarrow,       uparrow ] };

+   key <AD08> { [              i,             I,	rightarrow,      idotless ] };

+   key <AD09> { [              o,             O,	oslash,      Ooblique ] };

+   key <AD10> { [              p,             P,	thorn,         THORN ] };

+   key <AD11> { [     udiaeresis,    Udiaeresis,	dead_diaeresis,dead_abovering ] };

+   key <AD12> { [         otilde,        Otilde,	section,   dead_macron ] };

+

+   key <AC01> { [              a,             A,	ae,            AE ] };

+   key <AC02> { [              s,             S,	ssharp,       section ] };

+   key <AC03> { [              d,             D,	eth,           ETH ] };

+   key <AC04> { [              f,             F,	dstroke,   ordfeminine ] };

+   key <AC05> { [              g,             G,	eng,           ENG ] };

+   key <AC06> { [              h,             H,	hstroke,       Hstroke ] };

+   key <AC07> { [              j,             J,	j,             J ] };

+   key <AC08> { [              k,             K,	kra,     ampersand ] };

+   key <AC09> { [              l,             L,	lstroke,       Lstroke ] };

+   key <AC10> { [     odiaeresis,    Odiaeresis,	dead_acute, dead_doubleacute ] };

+   key <AC11> { [     adiaeresis,    Adiaeresis,	asciicircum,    dead_caron ] };

+   key <LSGT> { [      backslash,           bar,	degree,     brokenbar ] };

+

+   key <BKSL> { [     apostrophe,      asterisk,	onehalf,    dead_breve ] };

+   key <AB01> { [              z,             Z,	zcaron,        Zcaron ] };

+   key <AB02> { [              x,             X,	guillemotright,       greater ] };

+   key <AB03> { [              c,             C,	cent,     copyright ] };

+   key <AB04> { [              v,             V,	leftdoublequotemark, leftsinglequotemark ] };

+   key <AB05> { [              b,             B,	rightdoublequotemark, rightsinglequotemark ] };

+   key <AB06> { [              n,             N,	ncedilla,      Ncedilla ] };

+   key <AB07> { [              m,             M,	mu,     masculine ] };

+   key <AB08> { [          comma,     semicolon,	less,      multiply ] };

+   key <AB09> { [         period,         colon,	greater,      division ] };

+   key <AB10> { [          minus,    underscore,	dead_belowdot, dead_abovedot ] };

+

+	include "level3(ralt_switch)"

+

+};

+

+partial alphanumeric_keys

+	xkb_symbols "basic" {

+	include "sun_vndr/ee(type6)"

+};

+

diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/es b/xorg-server/xkbdata.src/symbols/sun_vndr/es
index fc2b4420b..789df5519 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/es
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/es
@@ -1,85 +1,146 @@
-// $XdotOrg: $
-//
-// Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice (including the next
-// paragraph) shall be included in all copies or substantial portions of the
-// Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-partial
-xkb_symbols "type4" {
-    key <BKSL> { [ bracketleft, braceleft ], [ guillemotleft	] };
-    key <BRCR> { [ bracketright, braceright ], [ guillemotright ] };
-    key <AE02> { [ 2, quotedbl		], [ at			] };
-    key <AE03> { [ 3, periodcentered    ], [ numbersign       ] };
-    key <AE05> { [ 5, percent           ], [ degree           ] };
-    key <AE06> { [ 6, ampersand         ], [ notsign          ] };
-    key <AE07> { [ 7, slash             ]                       };
-    key <AE08> { [ 8, parenleft         ] 			};
-    key <AE09> { [ 9, parenright        ], [ backslash        ] };
-    key <AE10> { [ 0, equal             ], [ bar              ] };
-    key <AE11> { [ quoteright, question ], [ quoteleft        ] };
-    key <AE12> { [ exclamdown, questiondown ] };
-    key <AD03> { [ e, E                 ], [ EuroSign         ] };
-    key <AD09> { [ o, O                 ], [ masculine        ] };
-    key <AD11> { [ SunFA_Grave, SunFA_Circum ], [ asciicircum ] };
-    key <AD12> { [ plus, asterisk       ], [ asciitilde       ] };
-    key <AC01> { [ a, A			], [ ordfeminine      ] };
-    key <AC10> { [ Ntilde		]			};
-    key <AC11> { [ SunFA_Acute, SunFA_Diaeresis ]			};
-    key <TLDE> { [ Ccedilla		]			};
-    key <RALT> { [ Alt_R                ]                       };
-    key <LCTL> { [ Caps_Lock ] };
-    key <CAPS> { [ Control_L ] };
-    key <LSGT> { [ less, greater	]			};
-    key <AB08> { [ comma, semicolon	]			};
-    key <AB09> { [ period, colon	]			};
-    key <AB10> { [ minus, underscore	]			};
-};
-
-partial
-xkb_symbols "type5" {
-    include "es"
-
-    key <AE03> { [ 3, periodcentered	], [ numbersign			] };
-    key <AE04> { [ 4, dollar		], [ asciicircum		] };
-    key <AE05> { [ 5, percent		], [ asciitilde			] };
-    key <AE07> { [ 7, slash		], [ braceleft			]};
-    key <AE08> { [ 8, parenleft		], [ bracketleft		]};
-    key <AE09> { [ 9, parenright	], [ bracketright		]};
-    key <AE10> { [ 0, equal		], [ braceright			]};
-    key <AE11> { [ quoteright, question	], [ quoteleft			] };
-
-    key <AD11> { [ SunFA_Grave, SunFA_Circum ], [ bracketleft		] };
-
-    key <AC11> { [ SunFA_Acute, SunFA_Diaeresis ], [ braceleft		] };
-};
-
-partial 
-xkb_symbols "type6" {
-    include "es(Sundeadkeys)"
-
-    key <AE04> { [ 4, dollar		], [ asciicircum		] };
-    key <AE05> { [ 5, percent		], [ asciitilde			] };
-    key <AE07> { [ 7, slash		], [ braceleft			]};
-    key <AE08> { [ 8, parenleft		], [ bracketleft		]};
-    key <AE09> { [ 9, parenright	], [ bracketright		]};
-    key <AE10> { [ 0, equal		], [ braceright			]};
-    key <AE11> { [ quoteright, question	], [ quoteleft			] };
-};
+//

+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.

+//

+// Permission is hereby granted, free of charge, to any person obtaining a

+// copy of this software and associated documentation files (the

+// "Software"), to deal in the Software without restriction, including

+// without limitation the rights to use, copy, modify, merge, publish,

+// distribute, and/or sell copies of the Software, and to permit persons

+// to whom the Software is furnished to do so, provided that the above

+// copyright notice(s) and this permission notice appear in all copies of

+// the Software and that both the above copyright notice(s) and this

+// permission notice appear in supporting documentation.

+//

+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

+//

+// Except as contained in this notice, the name of a copyright holder

+// shall not be used in advertising or otherwise to promote the sale, use

+// or other dealings in this Software without prior written authorization

+// of the copyright holder.

+//

+ 

+//

+// CDDL HEADER START

+//

+// The contents of this file are subject to the terms of the

+// Common Development and Distribution License (the "License").

+// You may not use this file except in compliance with the License.

+//

+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE

+// or http://www.opensolaris.org/os/licensing.

+// See the License for the specific language governing permissions

+// and limitations under the License.

+//

+// When distributing Covered Code, include this CDDL HEADER in each

+// file and include the License file at src/OPENSOLARIS.LICENSE.

+// If applicable, add the following below this CDDL HEADER, with the

+// fields enclosed by brackets "[]" replaced with your own identifying

+// information: Portions Copyright [yyyy] [name of copyright owner]

+//

+// CDDL HEADER END

+//

+

+partial default alphanumeric_keys

+xkb_symbols "type6" {

+

+    name[Group1]="Spain";

+

+    key <TLDE> { [       masculine,     ordfeminine,     backslash ] };

+    key <LSGT> { [            less,         greater                ] };

+    key <AE01> { [               1,          exclam,           bar ] };

+    key <AE02> { [               2,        quotedbl,            at ] };

+    key <AE03> { [               3,  periodcentered,    numbersign ] };

+    key <AE04> { [               4,          dollar,   asciicircum ] };

+    key <AE05> { [               5,         percent,    asciitilde ] };

+    key <AE06> { [               6,       ampersand,       notsign ] };

+    key <AE07> { [               7,           slash                ] };

+    key <AE08> { [               8,       parenleft                ] };

+    key <AE09> { [               9,      parenright                ] }; 

+    key <AE10> { [               0,           equal                ] };

+    key <AE11> { [      apostrophe,        question,         grave ] };

+    key <AE12> { [      exclamdown,    questiondown                ] };

+    key <AD03> { [               e,               E,      EuroSign ] };

+    key <AD11> { [      dead_grave, dead_circumflex,   bracketleft ] };

+    key <AD12> { [            plus,        asterisk,  bracketright ] };

+    key <AC10> { [          ntilde,          Ntilde                ] };

+    key <AC11> { [      dead_acute,  dead_diaeresis,     braceleft ] };

+    key <BKSL> { [        ccedilla,        Ccedilla,    braceright ] };

+    key <AB08> { [           comma,       semicolon                ] };

+    key <AB09> { [          period,           colon                ] };

+    key <AB10> { [           minus,      underscore                ] };

+   

+        include "level3(ralt_switch)"

+

+};

+

+

+partial alphanumeric_keys

+xkb_symbols "type4" {

+    

+    name[Group1]="Spain - Sun type 4";

+

+    key <BKSL> { [ bracketleft, braceleft,  guillemotleft    ] };

+    key <BRCR> { [ bracketright, braceright,  guillemotright ] };

+    key <AE02> { [ 2, quotedbl,  at                 ] };

+    key <AE03> { [ 3, periodcentered,  numbersign       ] };

+    key <AE05> { [ 5, percent,  degree           ] };

+    key <AE06> { [ 6, ampersand,  notsign          ] };

+    key <AE07> { [ 7, slash             ]                       };

+    key <AE08> { [ 8, parenleft         ]                       };

+    key <AE09> { [ 9, parenright, backslash        ] };

+    key <AE10> { [ 0, equal,  bar              ] };

+    key <AE11> { [ quoteright, question,  quoteleft        ] };

+    key <AE12> { [ exclamdown, questiondown ] };

+    key <AD03> { [ e, E,  EuroSign         ] };

+    key <AD09> { [ o, O,  masculine        ] };

+    key <AD11> { [ dead_grave, dead_circumflex,  asciicircum ] };

+    key <AD12> { [ plus, asterisk,  asciitilde       ] };

+    key <AC01> { [ a, A,  ordfeminine      ] };

+    key <AC10> { [ ntilde, Ntilde               ]                       };

+    key <AC11> { [ dead_acute, dead_diaeresis ]                       };

+    key <TLDE> { [ ccedilla, Ccedilla             ]                       };

+    key <RALT> { [ Alt_R                ]                       };

+    key <LCTL> { [ Caps_Lock ] };

+    key <CAPS> { [ Control_L ] };

+    key <LSGT> { [ less, greater        ]                       };

+    key <AB08> { [ comma, semicolon     ]                       };

+    key <AB09> { [ period, colon        ]                       };

+    key <AB10> { [ minus, underscore    ]                       };

+    

+};

+ 

+

+partial alphanumeric_keys

+xkb_symbols "type5" {

+    include "sun_vndr/es(type4)"

+

+    name[Group1]="Spain - Sun type 5";

+ 

+    key <AE03> { [ 3, periodcentered,  numbersign                 ] };

+    key <AE04> { [ 4, dollar,  asciicircum                ] };

+    key <AE05> { [ 5, percent,  asciitilde                 ] };

+    key <AE07> { [ 7, slash,  braceleft                  ]};

+    key <AE08> { [ 8, parenleft,  bracketleft                ]};

+    key <AE09> { [ 9, parenright,  bracketright               ]};

+    key <AE10> { [ 0, equal,  braceright                 ]};

+    key <AE11> { [ quoteright, question,  quoteleft                  ] };

+    key <AD11> { [ dead_grave, dead_circumflex,  bracketleft ] };

+    key <AD12> { [ dead_acute, dead_diaeresis, braceleft      ] };

+ 

+	include "level3(ralt_switch)"

+};

+

+

+partial alphanumeric_keys

+	xkb_symbols "basic" {

+	include "sun_vndr/es(type6)"

+};

+

diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/fi b/xorg-server/xkbdata.src/symbols/sun_vndr/fi
index 84756d4a1..817423968 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/fi
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/fi
@@ -1,36 +1,90 @@
-// $XdotOrg: $
-//
-// Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice (including the next
-// paragraph) shall be included in all copies or substantial portions of the
-// Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-xkb_symbols "basic" {
-    include "fi"
-    // A few keys are different
-    key <AE11> {	[            plus,        question      ],
-			[	backslash			]	};
-    key <AD12> {	[       diaeresis,     asciicircum     	],
-			[      asciitilde			]	};
-    key <BKSL> {	[      apostrophe,        asterisk	],
-			[	quoteleft			]	};
-
-};
-
+//

+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.

+//

+// Permission is hereby granted, free of charge, to any person obtaining a

+// copy of this software and associated documentation files (the

+// "Software"), to deal in the Software without restriction, including

+// without limitation the rights to use, copy, modify, merge, publish,

+// distribute, and/or sell copies of the Software, and to permit persons

+// to whom the Software is furnished to do so, provided that the above

+// copyright notice(s) and this permission notice appear in all copies of

+// the Software and that both the above copyright notice(s) and this

+// permission notice appear in supporting documentation.

+//

+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

+//

+// Except as contained in this notice, the name of a copyright holder

+// shall not be used in advertising or otherwise to promote the sale, use

+// or other dealings in this Software without prior written authorization

+// of the copyright holder.

+//

+ 

+//

+// CDDL HEADER START

+//

+// The contents of this file are subject to the terms of the

+// Common Development and Distribution License (the "License").

+// You may not use this file except in compliance with the License.

+//

+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE

+// or http://www.opensolaris.org/os/licensing.

+// See the License for the specific language governing permissions

+// and limitations under the License.

+//

+// When distributing Covered Code, include this CDDL HEADER in each

+// file and include the License file at src/OPENSOLARIS.LICENSE.

+// If applicable, add the following below this CDDL HEADER, with the

+// fields enclosed by brackets "[]" replaced with your own identifying

+// information: Portions Copyright [yyyy] [name of copyright owner]

+//

+// CDDL HEADER END

+//

+

+partial default alphanumeric_keys

+xkb_symbols "type6" {

+

+    name[Group1]="Finland";

+

+    key <TLDE> { [  section,         onehalf                                  ] };

+    key <AE01> { [  1,               exclam                                   ] };

+    key <AE02> { [  2,               quotedbl,         at                     ] };

+    key <AE03> { [  3,               numbersign,       sterling               ] };

+    key <AE04> { [  4,               currency,         dollar                 ] };

+    key <AE05> { [  5,               percent                                  ] };

+    key <AE06> { [  6,               ampersand                                ] };

+    key <AE07> { [  7,               slash,            braceleft              ] };

+    key <AE08> { [  8,               parenleft,        bracketleft            ] };

+    key <AE09> { [  9,               parenright,       bracketright           ] };

+    key <AE10> { [  0,               equal,            braceright             ] };

+    key <AE11> { [  plus,            question,         backslash              ] };

+    key <AE12> { [  dead_acute,      dead_grave                               ] };

+    key <AD03> { [  e,               E,                EuroSign               ] };

+    key <AD11> { [  aring,           Aring                                    ] };

+    key <AD12> { [  dead_diaeresis,  asciicircum,      asciitilde             ] };

+    key <AC10> { [  odiaeresis,      Odiaeresis                               ] };

+    key <AC11> { [  adiaeresis,      Adiaeresis                               ] };

+    key <BKSL> { [  apostrophe,      asterisk,         quoteleft              ] };

+    key <LSGT> { [  less,            greater,          bar                    ] };

+    key <AB08> { [  comma,           semicolon                                ] };

+    key <AB09> { [  period,          colon                                    ] };

+    key <AB10> { [  minus,           underscore                               ] };

+

+	include "level3(ralt_switch)"

+	include "kpdl(comma)"

+

+};

+

+

+partial alphanumeric_keys

+	xkb_symbols "basic" {

+	include "sun_vndr/fi(type6)"

+};

+

diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/fr b/xorg-server/xkbdata.src/symbols/sun_vndr/fr
index 7aa23a71b..f52d1956b 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/fr
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/fr
@@ -1,86 +1,97 @@
-// $XdotOrg: $
-//
-// Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice (including the next
-// paragraph) shall be included in all copies or substantial portions of the
-// Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-// NOTE:
-// These are the French keyboard symbols
-// French Swiss symbols are in sw
-
-xkb_symbols "type4" {
-    include "sun_vndr/us(type4basic)"
-
-    key <BKSL> { [ bracketleft, braceleft ]			};
-    key <BRCR> { [ bracketright, braceright ]			};
-    key <DELE> { [ Delete               ]                       };
-
-    key <AE01> { [ ampersand, 1		], [			]	};
-    key <AE02> { [ eacute, 2		], [ twosuperior	]	};
-    key <AE03> { [ quotedbl, 3		], [ threesuperior	]	};
-    key <AE04> { [ quoteright, 4	]				};
-    key <AE05> { [ parenleft, 5		]				};
-    key <AE06> { [ section, 6		], [ asciicircum	]	};
-    key <AE07> { [ egrave, 7		]				};
-    key <AE08> { [ exclam, 8		], [ sterling		]	};
-    key <AE09> { [ ccedilla, 9		], [ backslash		]	};
-    key <AE10> { [ agrave, 0		] 				};
-    Key <AE11> { [ parenright, degree	], [ asciitilde		]	};
-    key <AE12> { [ minus, underscore 	], [ numbersign		]  	};
-
-    key <AD01> { [ a, A			]				};
-    key <AD02> { [ z, Z			] 				};
-    key <AD03> { [ e, E			], [EuroSign	]		};
-    key <AD11> { [ SunFA_Circum, SunFA_Diaeresis	]		};
-    key <AD12> { [ quoteleft, dollar	], [ at		]		};
- 
-    key <AC01> { [ q, Q			]				};
-    key <AC10> { [ m, M			], [ mu		]		};
-    key <AC11> { [ ugrave, percent	]				};
-    key <TLDE> { [ asterisk, bar	], [ currency	]		};
-
-    key <LSGT> { [ less, greater	]				};
-    key <AB01> { [ w, W			]			};
-
-    key <AB07> { [ comma, question	]			};
-    key <AB08> { [ semicolon, period	]			};
-    key <AB09> { [ colon, slash		]			};
-    key <AB10> { [ equal, plus		]			};
-
-    key <CAPS> { [ SunAltGraph		]			};
-    key <ALGR> { [ Caps_Lock		]			}; 
-
-
-
-};
-
-xkb_symbols "type5" {
-    include "fr"
-
-    key <LSGT> { [ less, greater	]				};
-};
-
-xkb_symbols "type6" {
-    include "sun_vndr/us(type6)"
-    include "fr"
-
-    key <LSGT> { [ less, greater	]				};
-};
-
+//

+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.

+//

+// Permission is hereby granted, free of charge, to any person obtaining a

+// copy of this software and associated documentation files (the

+// "Software"), to deal in the Software without restriction, including

+// without limitation the rights to use, copy, modify, merge, publish,

+// distribute, and/or sell copies of the Software, and to permit persons

+// to whom the Software is furnished to do so, provided that the above

+// copyright notice(s) and this permission notice appear in all copies of

+// the Software and that both the above copyright notice(s) and this

+// permission notice appear in supporting documentation.

+// 

+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

+// 

+// Except as contained in this notice, the name of a copyright holder

+// shall not be used in advertising or otherwise to promote the sale, use

+// or other dealings in this Software without prior written authorization

+// of the copyright holder.

+//

+

+//

+// CDDL HEADER START

+//

+// The contents of this file are subject to the terms of the

+// Common Development and Distribution License (the "License").

+// You may not use this file except in compliance with the License.

+//

+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE

+// or http://www.opensolaris.org/os/licensing.

+// See the License for the specific language governing permissions

+// and limitations under the License.

+//

+// When distributing Covered Code, include this CDDL HEADER in each

+// file and include the License file at src/OPENSOLARIS.LICENSE.

+// If applicable, add the following below this CDDL HEADER, with the

+// fields enclosed by brackets "[]" replaced with your own identifying

+// information: Portions Copyright [yyyy] [name of copyright owner]

+//

+// CDDL HEADER END

+//

+

+partial default alphanumeric_keys

+xkb_symbols "type6" {

+

+    name[Group1]="France";

+

+    key <TLDE>  { [     twosuperior                              ] };

+    key <AE01>	{ [       ampersand,          1                  ] };

+    key <AE02>	{ [          eacute,          2,   asciitilde    ] };

+    key <AE03>	{ [        quotedbl,          3,   numbersign    ] };

+    key <AE04>	{ [      apostrophe,          4,    braceleft    ] };

+    key <AE05>	{ [       parenleft,          5,  bracketleft    ] };

+    key <AE06>	{ [           minus,          6,          bar    ] };

+    key <AE07>	{ [          egrave,          7,        grave    ] };

+    key <AE08>	{ [      underscore,          8,    backslash    ] };

+    key <AE09>	{ [        ccedilla,          9,  asciicircum    ] };

+    key <AE10>	{ [          agrave,          0,           at    ] };

+    key <AE11>	{ [      parenright,     degree, bracketright    ] };

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

+

+    key <AD01>	{ [               a,          A                  ] };

+    key <AD02>	{ [               z,          Z                  ] };

+    key <AD03>	{ [               e,          E,     EuroSign    ] };

+    key <AD11>	{ [ dead_circumflex, dead_diaeresis              ] };

+    key <AD12>	{ [          dollar,   sterling,     currency    ] };

+

+    key <AC01>	{ [               q,          Q                  ] };

+    key <AC10>	{ [               m,          M                  ] };

+    key <AC11>	{ [          ugrave,    percent                  ] };

+    key <BKSL>	{ [        asterisk,         mu                  ] };

+

+    key <LSGT>  { [            less,    greater                  ] };

+    key <AB01>	{ [               w,          W                  ] };

+    key <AB07>	{ [           comma,   question                  ] };

+    key <AB08>	{ [       semicolon,     period                  ] };

+    key <AB09>	{ [           colon,      slash                  ] };

+    key <AB10>	{ [          exclam,    section                  ] };

+

+	include "level3(ralt_switch)"

+

+};

+

+

+partial alphanumeric_keys

+	xkb_symbols "basic" {

+	include "sun_vndr/fr(type6)"

+};

+

diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/gb b/xorg-server/xkbdata.src/symbols/sun_vndr/gb
index 3cb25fc1d..d21a116cf 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/gb
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/gb
@@ -1,47 +1,103 @@
-// $XdotOrg: $
-//
-// Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice (including the next
-// paragraph) shall be included in all copies or substantial portions of the
-// Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-xkb_symbols "type4" {
-    include "sun_vndr/us(type4basic)"
-    // A few keys are different
-    key <AE01> { [ 1, exclam		], [brokenbar	]	};
-    key <AE03> { [ 3, sterling		], [numbersign	]	};
-    key <AE04> { [ 4, dollar		], [EuroSign	]	};
-    key <AE11> { [ minus, underscore	], [notsign	]	};
-    key <AD03> { [ e, E			], [EuroSign	]	};
-
-
-};
-
-partial
-xkb_symbols "type5" {
-    include "gb(Sundeadkeys)"
-
-    key <TLDE> { [ quoteleft, notsign	], [ brokenbar	]	};
-    key <AD03> { [ e, E			], [ EuroSign	]	};
-};
-
-partial
-xkb_symbols "type6" {
-  include "sun_vndr/gb(type5)"
-};
+//

+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.

+//

+// Permission is hereby granted, free of charge, to any person obtaining a

+// copy of this software and associated documentation files (the

+// "Software"), to deal in the Software without restriction, including

+// without limitation the rights to use, copy, modify, merge, publish,

+// distribute, and/or sell copies of the Software, and to permit persons

+// to whom the Software is furnished to do so, provided that the above

+// copyright notice(s) and this permission notice appear in all copies of

+// the Software and that both the above copyright notice(s) and this

+// permission notice appear in supporting documentation.

+// 

+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

+// 

+// Except as contained in this notice, the name of a copyright holder

+// shall not be used in advertising or otherwise to promote the sale, use

+// or other dealings in this Software without prior written authorization

+// of the copyright holder.

+//

+

+//

+// CDDL HEADER START

+//

+// The contents of this file are subject to the terms of the

+// Common Development and Distribution License (the "License").

+// You may not use this file except in compliance with the License.

+//

+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE

+// or http://www.opensolaris.org/os/licensing.

+// See the License for the specific language governing permissions

+// and limitations under the License.

+//

+// When distributing Covered Code, include this CDDL HEADER in each

+// file and include the License file at src/OPENSOLARIS.LICENSE.

+// If applicable, add the following below this CDDL HEADER, with the

+// fields enclosed by brackets "[]" replaced with your own identifying

+// information: Portions Copyright [yyyy] [name of copyright owner]

+//

+// CDDL HEADER END

+//

+

+partial default alphanumeric_keys

+xkb_symbols "type6" {

+

+    name[Group1]="United Kingdom";

+

+    key <TLDE> { [  quoteleft,    notsign,  brokenbar ] };

+

+    key <AE02> { [          2,   quotedbl             ] };

+    key <AE03> { [          3,   sterling             ] };

+    key <AE04> { [          4,     dollar,   EuroSign ] };

+    key <BKSL> { [ numbersign, asciitilde             ] };

+    key <AC11> { [ apostrophe,         at             ] };

+    key <LSGT> { [  backslash,        bar             ] };

+

+	include "level3(ralt_switch)"

+

+};

+

+

+partial alphanumeric_keys

+xkb_symbols "type5" {

+

+    name[Group1]="United Kingdom - Sun type 5";

+

+    key <TLDE> {        [       quoteleft,      notsign,    brokenbar         ] };

+    key <AD03> {        [               e,      E,          EuroSign          ] };

+

+	include "level3(ralt_switch)"

+

+};

+

+

+partial alphanumeric_keys

+xkb_symbols "type4" {

+

+    name[Group1]="United Kingdom - Sun type 4";

+

+    key <AE01> { [      1,     exclam,   brokenbar ] };

+    key <AE03> { [      3,   sterling,  numbersign ] };

+    key <AE04> { [      4,     dollar,    EuroSign ] };

+    key <AE11> { [  minus, underscore,     notsign ] };

+    key <AD03> { [      e,          E,    EuroSign ] };

+

+	include "level3(ralt_switch)"

+

+};

+

+

+partial alphanumeric_keys

+	xkb_symbols "basic" {

+	include "sun_vndr/gb(type6)"

+};

+

diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/gr b/xorg-server/xkbdata.src/symbols/sun_vndr/gr
index ba781752b..aa5fecbfa 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/gr
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/gr
@@ -1,33 +1,118 @@
-// $XdotOrg: $
-//
-// Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice (including the next
-// paragraph) shall be included in all copies or substantial portions of the
-// Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-xkb_symbols "type5" {
-    include "sun_vndr/us(type5basic)"
-    // A few keys are different
-    key <AE04> { [ 4, dollar ], [ EuroSign ] };
-    key <AD03> { [ e, E], [ EuroSign ] };
-    key <AC10> { [ dead_acute, dead_diaeresis ]			};
-    key <LSGT> { [ backslash, bar	]			};
-};
-
+//

+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.

+//

+// Permission is hereby granted, free of charge, to any person obtaining a

+// copy of this software and associated documentation files (the

+// "Software"), to deal in the Software without restriction, including

+// without limitation the rights to use, copy, modify, merge, publish,

+// distribute, and/or sell copies of the Software, and to permit persons

+// to whom the Software is furnished to do so, provided that the above

+// copyright notice(s) and this permission notice appear in all copies of

+// the Software and that both the above copyright notice(s) and this

+// permission notice appear in supporting documentation.

+// 

+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

+// 

+// Except as contained in this notice, the name of a copyright holder

+// shall not be used in advertising or otherwise to promote the sale, use

+// or other dealings in this Software without prior written authorization

+// of the copyright holder.

+//

+

+//

+// CDDL HEADER START

+//

+// The contents of this file are subject to the terms of the

+// Common Development and Distribution License (the "License").

+// You may not use this file except in compliance with the License.

+//

+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE

+// or http://www.opensolaris.org/os/licensing.

+// See the License for the specific language governing permissions

+// and limitations under the License.

+//

+// When distributing Covered Code, include this CDDL HEADER in each

+// file and include the License file at src/OPENSOLARIS.LICENSE.

+// If applicable, add the following below this CDDL HEADER, with the

+// fields enclosed by brackets "[]" replaced with your own identifying

+// information: Portions Copyright [yyyy] [name of copyright owner]

+//

+// CDDL HEADER END

+//

+

+

+partial default alphanumeric_keys

+xkb_symbols "type6" {

+

+    name[Group1]="Greece";

+

+

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

+	key <AE01> { [                     1,         exclam ] };

+	key <AE02> { [                     2,             at ] };

+	key <AE03> { [                     3,     numbersign,	sterling ] };

+	key <AE04> { [                     4,         dollar,	EuroSign ] };

+	key <AE05> { [                     5,        percent,	EuroSign ] };

+	key <AE06> { [                     6,    asciicircum,	notsign ] };

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

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

+	key <AE09> { [                     9,      parenleft ] };

+	key <AE10> { [                     0,     parenright,	degree ] };

+	key <AE11> { [                 minus,     underscore,	plusminus ] };

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

+

+	key <AD01> { [             semicolon,          colon,	periodcentered ] };

+	key <AD02> { [ Greek_finalsmallsigma, periodcentered,	Greek_SIGMA ] };

+	key <AD03> { [         Greek_epsilon,  Greek_EPSILON,	EuroSign ] };

+	key <AD04> { [             Greek_rho,      Greek_RHO,	registered ] };

+	key <AD05> { [             Greek_tau,      Greek_TAU ] };

+	key <AD06> { [         Greek_upsilon,  Greek_UPSILON ] };

+	key <AD07> { [           Greek_theta,    Greek_THETA ] };

+	key <AD08> { [            Greek_iota,     Greek_IOTA ] };

+	key <AD09> { [         Greek_omicron,  Greek_OMICRON ] };

+	key <AD10> { [              Greek_pi,       Greek_PI ] };

+	key <AD11> { [           bracketleft,      braceleft,	guillemotleft ] };

+	key <AD12> { [          bracketright,     braceright,	guillemotright ] };

+

+	key <AC01> { [           Greek_alpha,    Greek_ALPHA ] };

+	key <AC02> { [           Greek_sigma,    Greek_SIGMA ] };

+	key <AC03> { [           Greek_delta,    Greek_DELTA ] };

+	key <AC04> { [             Greek_phi,      Greek_PHI ] };

+	key <AC05> { [           Greek_gamma,    Greek_GAMMA ] };

+	key <AC06> { [             Greek_eta,      Greek_ETA ] };

+	key <AC07> { [              Greek_xi,       Greek_XI ] };

+	key <AC08> { [           Greek_kappa,    Greek_KAPPA ] };

+	key <AC09> { [           Greek_lamda,    Greek_LAMDA ] };

+	key <AC10> { [            dead_acute, dead_diaeresis ] };

+	key <AC11> { [            apostrophe,       quotedbl ] };

+	key <BKSL> { [             backslash,            bar,	brokenbar ] };

+

+	key <LSGT> { [         guillemotleft, guillemotright,	brokenbar ] };

+        key <AB01> { [            Greek_zeta,     Greek_ZETA ] };

+        key <AB02> { [             Greek_chi,      Greek_CHI ] };

+        key <AB03> { [             Greek_psi,      Greek_PSI,	copyright ] };

+        key <AB04> { [           Greek_omega,    Greek_OMEGA ] };

+        key <AB05> { [            Greek_beta,     Greek_BETA ] };

+        key <AB06> { [              Greek_nu,       Greek_NU ] };

+        key <AB07> { [              Greek_mu,       Greek_MU ] };

+	key <AB08> { [                 comma,           less,	guillemotleft ] };

+	key <AB09> { [                period,        greater,	guillemotright ] };

+	key <AB10> { [                 slash,       question ] };

+

+	include "level3(ralt_switch)"

+

+};

+

+partial alphanumeric_keys

+	xkb_symbols "basic" {

+	include "sun_vndr/gr(type6)"

+};

+

diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/it b/xorg-server/xkbdata.src/symbols/sun_vndr/it
index 9be87ced9..960bcfc32 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/it
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/it
@@ -1,71 +1,141 @@
-// $XdotOrg: $
-//
-// Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice (including the next
-// paragraph) shall be included in all copies or substantial portions of the
-// Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-xkb_symbols "type4" {
-
-    key <BKSL> { [ bracketleft, braceleft ], [ guillemotleft	]	 };
-    key <BRCR> { [ bracketright, braceright ], [ guillemotright ] 	};
-    key <AE02> { [ 2, quotedbl		], [ twosuperior	] 	};
-    key <AE03> { [ 3, sterling		], [ threesuperior	] 	};
-    key <AE06> { [ 6, ampersand		], [ notsign		] 	};
-    key <AE06> { [ 7, slash		]				};
-    key <AE06> { [ 8, parenleft		]				};
-    key <AE09> { [ 9, parenright        ], [ backslash		] 	};
-    key <AE10> { [ 0, equal             ], [ bar		] 	};
-    key <AE11> { [ quoteright, question ], [ quoteleft		] 	};
-    key <AE12> { [ igrave, asciicircum	] };
-
-    key <AD11> { [ egrave, eacute       ]				};
-    key <AD12> { [ plus, asterisk       ], [ asciitilde   	]	};
-
-    key <AC10> { [ ograve, ccedilla 	], [ at			]	};
-    key <AC11> { [ agrave, degree	], [ numbersign		]	};
-    key <TLDE> { [ ugrave, section	]				};
-
-    key <LSGT> { [ less, greater	]				};
-    key <AB08> { [ comma, semicolon	]				};
-    key <AB09> { [ period, colon	]				};
-    key <AB10> { [ minus, underscore	]				};
-    
-
-    key <LALT> { [ Alt_L	       	]              	       		};
-    key <COMP> { [ SunCompose       	]				};
-    key <RALT> { [ SunAltGraph		]				};
-    key <LCTL> { [ Caps_Lock 		] 				};
-    key <CAPS> { [ Control_L 		] 				};
-
-};
-
-xkb_symbols "type5" {
-    include "it"
-
-    key <AE08> { [ 8, parenleft		], [ braceleft			] };
-    key <AE09> { [ 9, parenright	], [ braceright			] };
-
-    key <BKSL> { [ ugrave, section	], [ asciitilde			] };
-};
-
-partial 
-xkb_symbols "type6" {
-    include "sun_vndr/it(type5)"
-};
+//

+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.

+//

+// Permission is hereby granted, free of charge, to any person obtaining a

+// copy of this software and associated documentation files (the

+// "Software"), to deal in the Software without restriction, including

+// without limitation the rights to use, copy, modify, merge, publish,

+// distribute, and/or sell copies of the Software, and to permit persons

+// to whom the Software is furnished to do so, provided that the above

+// copyright notice(s) and this permission notice appear in all copies of

+// the Software and that both the above copyright notice(s) and this

+// permission notice appear in supporting documentation.

+// 

+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

+// 

+// Except as contained in this notice, the name of a copyright holder

+// shall not be used in advertising or otherwise to promote the sale, use

+// or other dealings in this Software without prior written authorization

+// of the copyright holder.

+//

+

+//

+// CDDL HEADER START

+//

+// The contents of this file are subject to the terms of the

+// Common Development and Distribution License (the "License").

+// You may not use this file except in compliance with the License.

+//

+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE

+// or http://www.opensolaris.org/os/licensing.

+// See the License for the specific language governing permissions

+// and limitations under the License.

+//

+// When distributing Covered Code, include this CDDL HEADER in each

+// file and include the License file at src/OPENSOLARIS.LICENSE.

+// If applicable, add the following below this CDDL HEADER, with the

+// fields enclosed by brackets "[]" replaced with your own identifying

+// information: Portions Copyright [yyyy] [name of copyright owner]

+//

+// CDDL HEADER END

+//

+

+partial default alphanumeric_keys

+xkb_symbols "type6" {

+

+    name[Group1]="Italy";

+

+    key <LSGT> { [            less,         greater                                ] };

+    key <TLDE> { [       backslash,             bar                                ] };

+    key <AE02> { [               2,        quotedbl                                ] };

+    key <AE03> { [               3,        sterling                                ] };

+    key <AE06> { [               6,       ampersand                                ] };

+    key <AE07> { [               7,           slash                                ] };

+    key <AE08> { [               8,       parenleft,    braceleft                  ] };     

+    key <AE09> { [               9,      parenright,   braceright                  ] };     

+    key <AE10> { [               0,           equal                                ] };

+    key <AE11> { [      apostrophe,        question,        grave                  ] };     

+    key <AE12> { [          igrave,     asciicircum                                ] };

+    key <AD03> { [               e,               E,     EuroSign                  ] };

+    key <AD11> { [          egrave,          eacute,  bracketleft,  dead_abovering ] };

+    key <AD12> { [            plus,        asterisk, bracketright                  ] };      

+    key <BKSL> { [          ugrave,         section,   asciitilde                  ] };

+    key <AC10> { [          ograve,        ccedilla,           at                  ] };      

+    key <AC11> { [          agrave,          degree,   numbersign                  ] };

+    key <AB08> { [           comma,       semicolon                                ] };

+    key <AB09> { [          period,           colon                                ] };

+    key <AB10> { [           minus,      underscore                                ] };

+

+        include "level3(ralt_switch)"

+

+};

+

+

+partial alphanumeric_keys

+xkb_symbols "type4" {

+

+    name[Group1]="Italy - Sun type 4";

+ 

+    key <BKSL> { [ bracketleft,  braceleft,    guillemotleft    ] };

+    key <BRCR> { [ bracketright, braceright,   guillemotright   ] };

+    key <AE02> { [ 2,            quotedbl,     twosuperior      ] };

+    key <AE03> { [ 3,            sterling,     threesuperior    ] };

+    key <AE06> { [ 6,            ampersand,    notsign          ] };

+    key <AE06> { [ 7,            slash                          ] };

+    key <AE06> { [ 8,            parenleft                      ] };

+    key <AE09> { [ 9,            parenright,   backslash        ] };

+    key <AE10> { [ 0,            equal,        bar              ] };

+    key <AE11> { [ quoteright,   question,     quoteleft        ] };

+    key <AE12> { [ igrave,       asciicircum                    ] };

+ 

+    key <AD11> { [ egrave,       eacute                         ] };

+    key <AD12> { [ plus,         asterisk,     asciitilde       ] };

+ 

+    key <AC10> { [ ograve,       ccedilla,     at               ] };

+    key <AC11> { [ agrave,       degree,       numbersign       ] };

+    key <TLDE> { [ ugrave,       section                        ] };

+ 

+    key <LSGT> { [ less, greater        ] };

+    key <AB08> { [ comma, semicolon     ] };

+    key <AB09> { [ period, colon        ] };

+    key <AB10> { [ minus, underscore    ] };

+     

+ 

+    key <LALT> { [ Alt_L                ] };

+    key <COMP> { [ SunCompose           ] };

+    key <RALT> { [ SunAltGraph          ] };

+    key <LCTL> { [ Caps_Lock            ] };

+    key <CAPS> { [ Control_L            ] };

+ 

+	include "level3(ralt_switch)"

+

+};

+

+ 

+partial alphanumeric_keys

+xkb_symbols "type5" {

+

+    name[Group1]="Italy - Sun type 5";

+

+    key <AE08> { [ 8,      parenleft,   braceleft                  ] };

+    key <AE09> { [ 9,      parenright,  braceright                 ] };

+    key <BKSL> { [ ugrave, section,     asciitilde                 ] };

+

+	include "level3(ralt_switch)"

+

+};

+ 

+

+partial alphanumeric_keys

+	xkb_symbols "basic" {

+	include "sun_vndr/it(type6)"

+};

+

diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/jp b/xorg-server/xkbdata.src/symbols/sun_vndr/jp
index b3a6859bf..5be8647d2 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/jp
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/jp
@@ -1,792 +1,819 @@
-// $XdotOrg: $
-//
-// Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice (including the next
-// paragraph) shall be included in all copies or substantial portions of the
-// Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-// $TOG: us /main/5 1998/02/10 13:45:06 kaleb $
-//
-//Copyright 1996, 1998  The Open Group
-//
-//All Rights Reserved.
-//
-//The above copyright notice and this permission notice shall be
-//included in all copies or substantial portions of the Software.
-//
-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-//OTHER DEALINGS IN THE SOFTWARE.
-//
-//Except as contained in this notice, the name of The Open Group shall
-//not be used in advertising or otherwise to promote the sale, use or
-//other dealings in this Software without prior written authorization
-//from The Open Group.
-//
-// US/ASCII layout for a Type 4 Sun keyboard
-
-xkb_symbols "basic" {
-    // Alphanumeric section
-    key <AE01> { [ 1, exclam 		], [ kana_NU		]	};
-    key <AE02> { [ 2, quotedbl		], [ kana_FU		]	};
-    key <AE03> { [ 3, numbersign	], [ kana_A, kana_a	]	};
-    key <AE04> { [ 4, dollar		], [ kana_U, kana_u	]	};
-    key <AE05> { [ 5, percent		], [ kana_E, kana_e	]	};
-    key <AE06> { [ 6, ampersand		], [ kana_O, kana_o	]	};
-    key <AE07> { [ 7, apostrophe	], [ kana_YA, kana_ya	]	};
-    key <AE08> { [ 8, parenleft		], [ kana_YU, kana_yu	]	};
-    key <AE09> { [ 9, parenright	], [ kana_YO, kana_yo	]	};
-    key <AE10> { [ 0			], [ kana_WA, kana_WO	]	};
-    key <AE11> { [ minus, equal		], [ kana_HO		]	};
-    key <AE12> { [ asciicircum,	asciitilde], [ kana_HE		]	};
-    key <BKSP> { [ BackSpace		]	};
-
-    key  <TAB> { [ Tab,	ISO_Left_Tab	]	};
-    key <AD01> { [ q, Q 		], [ kana_TA		]	};
-    key <AD02> { [ w, W			], [ kana_TE		]	};
-    key <AD03> { [ e, E			], [ kana_I, kana_i	]	};
-    key <AD04> { [ r, R			], [ kana_SU		]	};
-    key <AD05> { [ t, T			], [ kana_KA		]	};
-    key <AD06> { [ y, Y			], [ kana_N		]	};
-    key <AD07> { [ u, U			], [ kana_NA		]	};
-    key <AD08> { [ i, I			], [ kana_NI		]	};
-    key <AD09> { [ o, O			], [ kana_RA		]	};
-    key <AD10> { [ p, P			], [ kana_SE		]	};
-    key <AD11> { [ at, quoteleft	], [ voicedsound	]	};
-    key <AD12> { [ bracketleft,	braceleft ], [ semivoicedsound, kana_openingbracket ] };
-    key <RTRN> { [ Return		]	};
-
-    key <CAPS> { [ Caps_Lock		]	};
-    key <AC01> { [ a, A 		], [ kana_CHI		]	};
-    key <AC02> { [ s, S			], [ kana_TO		]	};
-    key <AC03> { [ d, D			], [ kana_SHI		]	};
-    key <AC04> { [ f, F			], [ kana_HA		]	};
-    key <AC05> { [ g, G			], [ kana_KI		]	};
-    key <AC06> { [ h, H			], [ kana_KU		]	};
-    key <AC07> { [ j, J			], [ kana_MA		]	};
-    key <AC08> { [ k, K			], [ kana_NO		]	};
-    key <AC09> { [ l, L			], [ kana_RI		]	};
-    key <AC10> { [ semicolon, plus	], [ kana_RE		]	};
-    key <AC11> { [ colon, asterisk	], [ kana_KE		]	};
-    key <TLDE> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };
-
-    key <AB01> { [ z, Z 		], [ kana_TSU, kana_tsu	]	};
-    key <AB02> { [ x, X			], [ kana_SA		]	};
-    key <AB03> { [ c, C			], [ kana_SO		]	};
-    key <AB04> { [ v, V			], [ kana_HI		]	};
-    key <AB05> { [ b, B			], [ kana_KO		]	};
-    key <AB06> { [ n, N			], [ kana_MI		]	};
-    key <AB07> { [ m, M			], [ kana_MO		]	};
-    key <AB08> { [ comma, less		], [ kana_NE, kana_comma ]	};
-    key <AB09> { [ period, greater	], [ kana_RU, kana_fullstop ]	};
-    key <AB10> { [ slash, question	], [ kana_ME, kana_conjunctive ]};
-    key <UNDR> { [ backslash, underscore], [ kana_RO		]	};
-
-    key <SPCE> { [ space		]			};
-    key <KANJ> { [ Kanji		]			};
-    key <HENK> { [ Henkan_Mode		]			};
-//    key <LNFD> { [ backslash, underscore], [ kana_RO		]};
-    // End alphanumeric section
-
-    // Begin "Function" section
-    key <ESC>  { [ Escape		]			};
-    key <FK01> { [ F1			]			};
-    key <FK02> { [ F2			]			};
-    key <FK03> { [ F3			]			};
-    key <FK04> { [ F4			]			};
-    key <FK05> { [ F5			]			};
-    key <FK06> { [ F6			]			};
-    key <FK07> { [ F7			]			};
-    key <FK08> { [ F8			]			};
-    key <FK09> { [ F9			]			};
-    key <FK10> { [ F10			]			};
-    key <FK11> { [ SunF36		]			};
-    key <FK12> { [ SunF37		]			};
-    key <BKSL> { [ backslash, bar	], [ prolongedsound 	] };
-//    key <BRCR> { [ Linefeed		]			};
-    key <EXEC> { [ Execute		]			};
-};
-xkb_symbols "type4" {
-
-    // Alphanumeric section
-    key <AE01> { [ 1, exclam 		], [ kana_NU		]	};
-    key <AE02> { [ 2, quotedbl		], [ kana_FU		]	};
-    key <AE03> { [ 3, numbersign	], [ kana_A, kana_a	]	};
-    key <AE04> { [ 4, dollar		], [ kana_U, kana_u	]	};
-    key <AE05> { [ 5, percent		], [ kana_E, kana_e	]	};
-    key <AE06> { [ 6, ampersand		], [ kana_O, kana_o	]	};
-    key <AE07> { [ 7, apostrophe	], [ kana_YA, kana_ya	]	};
-    key <AE08> { [ 8, parenleft		], [ kana_YU, kana_yu	]	};
-    key <AE09> { [ 9, parenright	], [ kana_YO, kana_yo	]	};
-    key <AE10> { [ 0			], [ kana_WA, kana_WO	]	};
-    key <AE11> { [ minus, equal		], [ kana_HO		]	};
-    key <AE12> { [ asciicircum,	asciitilde], [ kana_HE		]	};
-    key <BKSP> { [ BackSpace		]	};
-
-    key  <TAB> { [ Tab,	ISO_Left_Tab	]	};
-    key <AD01> { [ q, Q 		], [ kana_TA		]	};
-    key <AD02> { [ w, W			], [ kana_TE		]	};
-    key <AD03> { [ e, E			], [ kana_I, kana_i	]	};
-    key <AD04> { [ r, R			], [ kana_SU		]	};
-    key <AD05> { [ t, T			], [ kana_KA		]	};
-    key <AD06> { [ y, Y			], [ kana_N		]	};
-    key <AD07> { [ u, U			], [ kana_NA		]	};
-    key <AD08> { [ i, I			], [ kana_NI		]	};
-    key <AD09> { [ o, O			], [ kana_RA		]	};
-    key <AD10> { [ p, P			], [ kana_SE		]	};
-    key <AD11> { [ at, quoteleft	], [ voicedsound	]	};
-    key <AD12> { [ bracketleft,	braceleft ], [ semivoicedsound, kana_openingbracket ] };
-    key <RTRN> { [ Return		]	};
-
-    key <CAPS> { [ Caps_Lock		]	};
-    key <AC01> { [ a, A 		], [ kana_CHI		]	};
-    key <AC02> { [ s, S			], [ kana_TO		]	};
-    key <AC03> { [ d, D			], [ kana_SHI		]	};
-    key <AC04> { [ f, F			], [ kana_HA		]	};
-    key <AC05> { [ g, G			], [ kana_KI		]	};
-    key <AC06> { [ h, H			], [ kana_KU		]	};
-    key <AC07> { [ j, J			], [ kana_MA		]	};
-    key <AC08> { [ k, K			], [ kana_NO		]	};
-    key <AC09> { [ l, L			], [ kana_RI		]	};
-    key <AC10> { [ semicolon, plus	], [ kana_RE		]	};
-    key <AC11> { [ colon, asterisk	], [ kana_KE		]	};
-    key <TLDE> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };
-
-    key <LFSH> { [ Shift_L		]	};
-    key <AB01> { [ z, Z 		], [ kana_TSU, kana_tsu	]	};
-    key <AB02> { [ x, X			], [ kana_SA		]	};
-    key <AB03> { [ c, C			], [ kana_SO		]	};
-    key <AB04> { [ v, V			], [ kana_HI		]	};
-    key <AB05> { [ b, B			], [ kana_KO		]	};
-    key <AB06> { [ n, N			], [ kana_MI		]	};
-    key <AB07> { [ m, M			], [ kana_MO		]	};
-    key <AB08> { [ comma, less		], [ kana_NE, kana_comma ]	};
-    key <AB09> { [ period, greater	], [ kana_RU, kana_fullstop ]	};
-    key <AB10> { [ slash, question	], [ kana_ME, kana_conjunctive ]};
-    key <UNDR> { [ backslash, underscore], [ kana_RO		]	};
-    key <RTSH> { [ Shift_R		]	};
-
-    key <LCTL> { [ Control_L		]			};
-    key <SPCE> { [ space		]			};
-    key <KANJ> { [ Kanji		]			};
-    key <HENK> { [ Henkan_Mode		]			};
-    key <LALT> { [ Alt_L		]			};
-    key <ALGR> { [ Mode_switch		]			};
-    key <LMTA> { [ Meta_L		]			};
-    key <RMTA> { [ Meta_R		]			};
-    key <LNFD> { [ backslash, underscore], [ kana_RO		]};
-    key <COMP> { [ Multi_key		]			};
-    key <EXEC> { [ Execute		]			};
-//    key <TLFD> { [ Linefeed		]			};
-    // End alphanumeric section
-
-    // Begin "Function" section
-    key <ESC>  { [ Escape		]			};
-    key <FK01> { [ F1			]			};
-    key <FK02> { [ F2			]			};
-    key <FK03> { [ F3			]			};
-    key <FK04> { [ F4			]			};
-    key <FK05> { [ F5			]			};
-    key <FK06> { [ F6			]			};
-    key <FK07> { [ F7			]			};
-    key <FK08> { [ F8			]			};
-    key <FK09> { [ F9			]			};
-    key <FK10> { [ F10			]			};
-    key <FK11> { [ SunF36		]			};
-    key <FK12> { [ SunF37		]			};
-    key <BKSL> { [ backslash, bar	], [ prolongedsound 	] };
-    key <BRCR> { [ Linefeed		]			};
-
-    key <STOP> { [ L1,	L1		], [ SunStop	]	};
-    key <AGAI> { [ L2,	L2		], [ SunAgain	]	};
-    key <PROP> { [ L3,	L3		], [ SunProps	]	};
-    key <UNDO> { [ L4,	L4		], [ SunUndo	]	};
-    key <FRNT> { [ L5,	L5		], [ SunFront	]	};
-    key <COPY> { [ L6,	L6		], [ SunCopy	]	};
-    key <OPEN> { [ L7,	L7		], [ SunOpen	]	};
-    key <PAST> { [ L8,	L8		], [ SunPaste	]	};
-    key <FIND> { [ L9,	L9		], [ SunFind	]	};
-    key <CUT>  { [ L10,	L10		], [ SunCut	]	};
-    // End "Function" section
-
-    // Begin "Editing" section
-    key <PRSC> { [ R2,	R2		], [ Print		] };
-    key <SCLK> { [ R3,	R3		], [ Scroll_Lock, Break	] };
-    key <PAUS> { [ R1,	R1		], [ Pause		] };
-    key <DELE> { [ Delete		]			};
-    key <HELP> { [ Help			]			};
-
-    // End "Editing" section, begin "Keypad"
-    key <NMLK> { [ Num_Lock 		]			};
-    key <KPEQ> { [ R4,	R4 		], [ KP_Equal		] };
-    key <KPDV> { [ R5,	R5		], [ KP_Divide		] };
-    key <KPMU> { [ R6,	R6		], [ KP_Multiply	] };
-    key <KPSU> { [ KP_Subtract		]			};
-
-    key  <KP7> { [ R7,	R7		], [ KP_7, Home		] };
-    key  <KP8> { [ Up,	R8		], [ KP_8		] };
-    key  <KP9> { [ R9,	R9		], [ KP_9, Prior	] };
-    key <KPAD> { [ KP_Add		]			};
-
-    key  <KP4> { [ Left, R10		], [ KP_4		] };
-    key  <KP5> { [ R11,	R11		], [ KP_5		] };
-    key  <KP6> { [ Right, R12		], [ KP_6		] };
-
-    key  <KP1> { [ R13,	R13		], [ KP_1,	End	] };
-    key  <KP2> { [ Down, R14		], [ KP_2		] };
-    key  <KP3> { [ R15,	R15		], [ KP_3,	Next	] };
-    key <KPEN> { [ KP_Enter		]			}; 
-    key  <KP0> { [ KP_Insert, KP_Insert], [ KP_0		]	};
-    key <KPDL> { [ Delete, Delete	], [ KP_Decimal ]	};
-    // End "Keypad" section
-
-
-    // begin modifier mappings
-    modifier_map Shift  	{ Shift_R, Shift_L };
-    modifier_map Mod1   	{ Meta_L, Meta_R };
-    modifier_map Mod2   	{ Mode_switch };
-    modifier_map Mod3   	{ Num_Lock };
-    modifier_map Mod4		{ Alt_L };
-};
-
-// US/ASCII layout for a Type 5 Sun keyboard
-xkb_symbols "type5" {
-
-    // Alphanumeric section
-    key <TLDE> { [ backslash, bar	], [ prolongedsound	]	};
-    key <AE01> { [ 1, exclam 		], [ kana_NU		]	};
-    key <AE02> { [ 2, quotedbl		], [ kana_FU		]	};
-    key <AE03> { [ 3, numbersign	], [ kana_A, kana_a	]	};
-    key <AE04> { [ 4, dollar		], [ kana_U, kana_u	]	};
-    key <AE05> { [ 5, percent		], [ kana_E, kana_e	]	};
-    key <AE06> { [ 6, ampersand		], [ kana_O, kana_o	]	};
-    key <AE07> { [ 7, apostrophe	], [ kana_YA, kana_ya	]	};
-    key <AE08> { [ 8, parenleft		], [ kana_YU, kana_yu	]	};
-    key <AE09> { [ 9, parenright	], [ kana_YO, kana_yo	]	};
-    key <AE10> { [ 0			], [ kana_WA, kana_WO	]	};
-    key <AE11> { [ minus, equal		], [ kana_HO		]	};
-    key <AE12> { [ asciicircum,	asciitilde], [ kana_HE		]	};
-    key <BKSP> { [ BackSpace		]	};
-
-    key  <TAB> { [ Tab,	ISO_Left_Tab	]	};
-    key <AD01> { [ q, Q 		], [ kana_TA		]	};
-    key <AD02> { [ w, W			], [ kana_TE		]	};
-    key <AD03> { [ e, E			], [ kana_I, kana_i	]	};
-    key <AD04> { [ r, R			], [ kana_SU		]	};
-    key <AD05> { [ t, T			], [ kana_KA		]	};
-    key <AD06> { [ y, Y			], [ kana_N		]	};
-    key <AD07> { [ u, U			], [ kana_NA		]	};
-    key <AD08> { [ i, I			], [ kana_NI		]	};
-    key <AD09> { [ o, O			], [ kana_RA		]	};
-    key <AD10> { [ p, P			], [ kana_SE		]	};
-    key <AD11> { [ at, quoteleft	], [ voicedsound	]	};
-    key <AD12> { [ bracketleft,	braceleft ], [ semivoicedsound, kana_openingbracket ] };
-    key <RTRN> { [ Return		]	};
-
-    key <CAPS> { [ Caps_Lock		]	};
-    key <AC01> { [ a, A 		], [ kana_CHI		]	};
-    key <AC02> { [ s, S			], [ kana_TO		]	};
-    key <AC03> { [ d, D			], [ kana_SHI		]	};
-    key <AC04> { [ f, F			], [ kana_HA		]	};
-    key <AC05> { [ g, G			], [ kana_KI		]	};
-    key <AC06> { [ h, H			], [ kana_KU		]	};
-    key <AC07> { [ j, J			], [ kana_MA		]	};
-    key <AC08> { [ k, K			], [ kana_NO		]	};
-    key <AC09> { [ l, L			], [ kana_RI		]	};
-    key <AC10> { [ semicolon, plus	], [ kana_RE		]	};
-    key <AC11> { [ colon, asterisk	], [ kana_KE		]	};
-    key <BKSL> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };
-
-    key <LFSH> { [ Shift_L		]	};
-    key <AB01> { [ z, Z 		], [ kana_TSU, kana_tsu	]	};
-    key <AB02> { [ x, X			], [ kana_SA		]	};
-    key <AB03> { [ c, C			], [ kana_SO		]	};
-    key <AB04> { [ v, V			], [ kana_HI		]	};
-    key <AB05> { [ b, B			], [ kana_KO		]	};
-    key <AB06> { [ n, N			], [ kana_MI		]	};
-    key <AB07> { [ m, M			], [ kana_MO		]	};
-    key <AB08> { [ comma, less		], [ kana_NE, kana_comma ]	};
-    key <AB09> { [ period, greater	], [ kana_RU, kana_fullstop ]	};
-    key <AB10> { [ slash, question	], [ kana_ME, kana_conjunctive ]};
-    key <UNDR> { [ backslash, underscore], [ kana_RO		]	};
-    key <RTSH> { [ Shift_R		]	};
-
-    key <LCTL> { [ Control_L		]			};
-//    key <RCTL> { [ Control_R		]			};
-    key <EXEC> { [ Execute		]			};
-    key <SPCE> { [ space		]			};
-    key <KANJ> { [ Kanji		]			};
-    key <HENK> { [ Henkan_Mode		]			};
-    key <LALT> { [ Alt_L		]	};
-    key <ALGR> { [ Mode_switch		]	};
-    key <LMTA> { [ Meta_L		]	};
-    key <RMTA> { [ Meta_R		]	};
-    key <COMP> { [ Multi_key		]	};
-    // End alphanumeric section
-
-    // Begin "Function" section
-    key <ESC>  { [ Escape		]			};
-    key <FK01> { [ F1			]			};
-    key <FK02> { [ F2			]			};
-    key <FK03> { [ F3			]			};
-    key <FK04> { [ F4			]			};
-    key <FK05> { [ F5			]			};
-    key <FK06> { [ F6			]			};
-    key <FK07> { [ F7			]			};
-    key <FK08> { [ F8			]			};
-    key <FK09> { [ F9			]			};
-    key <FK10> { [ F10			]			};
-    key <FK11> { [ SunF36		]			};
-    key <FK12> { [ SunF37		]			};
-    key <STOP> { [ L1, L1		], [ SunStop	]	};
-    key <AGAI> { [ L2, L2		], [ SunAgain	]	};
-    key <PROP> { [ L3, L3		], [ SunProps	]	};
-    key <UNDO> { [ L4, L4		], [ SunUndo	]	};
-    key <FRNT> { [ L5, L5		], [ SunFront	]	};
-    key <COPY> { [ L6, L6		], [ SunCopy	]	};
-    key <OPEN> { [ L7, L7		], [ SunOpen	]	};
-    key <PAST> { [ L8, L8		], [ SunPaste	]	};
-    key <FIND> { [ L9, L9		], [ SunFind	]	};
-    key <CUT>  { [ L10, L10		], [ SunCut	]	};
-    // End "Function" section
-
-    // Begin "Editing" section
-    key <PRSC> { [ R2, R2 		], [ Print, SunSys_Req	]	};
-    key <SCLK> { [ R3, R3		], [ Scroll_Lock	]	};
-    key <PAUS> { [ R1, R1		], [ Pause, Break	]	};
-    key <LEFT> { [ Left			]			};
-    key <RGHT> { [ Right		]			};
-    key <UP>   { [ Up			]			};
-    key <DOWN> { [ Down			]			};
-
-    key <DELE> { [ Delete		]			};
-    key <INS>  { [ Insert		]			};
-    key <PGUP> { [ Prior		]			};
-    key <PGDN> { [ Next			]			};
-    key <HOME> { [ Home			]			};
-    key <END>  { [ End			]			};
-    key <HELP> { [ Help			]			};
-
-    // End "Editing" section, begin "Keypad"
-    key <NMLK> { [ Num_Lock 		]				};
-    key <KPDV> { [ R5, R5		], [ KP_Divide	]	};
-    key <KPMU> { [ R6, R6		], [ KP_Multiply	]	};
-    key <KPSU> { [ R4, R4		], [ KP_Subtract	]	};
-
-    key  <KP7> { [ R7, R7		], [ KP_7, Home		]	};
-    key  <KP8> { [ Up, R8		], [ KP_8		]	};
-    key  <KP9> { [ R9, R9		], [ KP_9, Prior	]	};
-    key <KPAD> { [ KP_Add		]				};
-
-    key  <KP4> { [ Left, R10		], [ KP_4		]	};
-    key  <KP5> { [ R11,	R11		], [ KP_5		]	};
-    key  <KP6> { [ Right, R12		], [ KP_6		]	};
-
-    key  <KP1> { [ R13,	R13		], [ KP_1, End		]	};
-    key  <KP2> { [ Down, R14		], [ KP_2		]	};
-    key  <KP3> { [ R15,	R15		], [ KP_3		]	};
-    key <KPEN> { [ KP_Enter		]				};
-
-    key  <KP0> { [ KP_Insert, KP_Insert	], [ KP_0		]	};
-    key <KPDL> { [ KP_Delete, KP_Delete ], [ KP_Decimal 	]	};
-    // End "Keypad" section, 
-    // begin "four keys up on the right"
-
-    key <MUTE> { [ SunAudioMute,	SunVideoDegauss		]	};
-    key <VOL-> { [ SunAudioLowerVolume,	SunVideoLowerBrightness ]	};
-    key <VOL+> { [ SunAudioRaiseVolume,	SunVideoRaiseBrightness	]	};
-    key <POWR> { [ SunPowerSwitch,	SunPowerSwitchShift	]	};
-
-    // begin modifier mappings
-    modifier_map Shift  { Shift_R };
-    modifier_map Mod1	{ Meta_L, Meta_R };
-    modifier_map Mod2	{ Alt_R };
-    modifier_map Mod3	{ Num_Lock };
-    modifier_map Mod4	{ Alt_L };
-};
-
-xkb_symbols "type5hobo" {
-
-    // Alphanumeric section
-    key <TLDE> { [ backslash, bar	], [ prolongedsound	]	};
-    key <AE01> { [ 1, exclam 		], [ kana_NU		]	};
-    key <AE02> { [ 2, quotedbl		], [ kana_FU		]	};
-    key <AE03> { [ 3, numbersign	], [ kana_A, kana_a	]	};
-    key <AE04> { [ 4, dollar		], [ kana_U, kana_u	]	};
-    key <AE05> { [ 5, percent		], [ kana_E, kana_e	]	};
-    key <AE06> { [ 6, ampersand		], [ kana_O, kana_o	]	};
-    key <AE07> { [ 7, apostrophe	], [ kana_YA, kana_ya	], [ KP_7 ]};
-    key <AE08> { [ 8, parenleft		], [ kana_YU, kana_yu	], [ KP_8 ]};
-    key <AE09> { [ 9, parenright	], [ kana_YO, kana_yo	], [ KP_9 ]};
-    key <AE10> { [ 0			], [ kana_WA, kana_WO	], [ KP_Multiply]};
-    key <AE11> { [ minus, equal		], [ kana_HO		]	};
-    key <AE12> { [ asciicircum,	asciitilde], [ kana_HE		]	};
-    key <BKSP> { [ BackSpace		]	};
-
-    key  <TAB> { [ Tab,	ISO_Left_Tab	]	};
-    key <AD01> { [ q, Q 		], [ kana_TA		]	};
-    key <AD02> { [ w, W			], [ kana_TE		]	};
-    key <AD03> { [ e, E			], [ kana_I, kana_i	]	};
-    key <AD04> { [ r, R			], [ kana_SU		]	};
-    key <AD05> { [ t, T			], [ kana_KA		]	};
-    key <AD06> { [ y, Y			], [ kana_N		]	};
-    key <AD07> { [ u, U		], [ kana_NA		], [ KP_4 ]	};
-    key <AD08> { [ i, I		], [ kana_NI		], [ KP_5 ]	};
-    key <AD09> { [ o, O		], [ kana_RA		], [ KP_6 ]	};
-    key <AD10> { [ p, P		], [ kana_SE		], [ KP_Subtract]};
-    key <AD11> { [ at, quoteleft	], [ voicedsound	]	};
-    key <AD12> { [ bracketleft,	braceleft ], [ semivoicedsound, kana_openingbracket ] };
-    key <RTRN> { [ Return	], [ NoSymbol, NoSymbol], [ KP_Enter	] };
-
-    key <CAPS> { [ Caps_Lock		]	};
-    key <AC01> { [ a, A 		], [ kana_CHI		]	};
-    key <AC02> { [ s, S			], [ kana_TO		]	};
-    key <AC03> { [ d, D			], [ kana_SHI		]	};
-    key <AC04> { [ f, F			], [ kana_HA		]	};
-    key <AC05> { [ g, G			], [ kana_KI		]	};
-    key <AC06> { [ h, H			], [ kana_KU		]	};
-    key <AC07> { [ j, J		], [ kana_MA		], [ KP_1 ]};
-    key <AC08> { [ k, K		], [ kana_NO		], [ KP_2 ]};
-    key <AC09> { [ l, L		], [ kana_RI		], [ KP_3 ]};
-    key <AC10> { [ semicolon, plus], [ kana_RE		], [ KP_Add ]};
-    key <AC11> { [ colon, asterisk	], [ kana_KE		]	};
-    key <BKSL> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };
-
-    key <LFSH> { [ Shift_L		]	};
-    key <AB01> { [ z, Z 		], [ kana_TSU, kana_tsu	]	};
-    key <AB02> { [ x, X			], [ kana_SA		]	};
-    key <AB03> { [ c, C			], [ kana_SO		]	};
-    key <AB04> { [ v, V			], [ kana_HI		]	};
-    key <AB05> { [ b, B			], [ kana_KO		]	};
-    key <AB06> { [ n, N			], [ kana_MI		]	};
-    key <AB07> { [ m, M			], [ kana_MO		], [ KP_0 ]};
-    key <AB08> { [ comma, less		], [ kana_NE, kana_comma ]	};
-    key <AB09> { [ period, greater	], [ kana_RU, kana_fullstop ], [ KP_Decimal ]	};
-    key <AB10> { [ slash, question	], [ kana_ME, kana_conjunctive ], [ KP_Divide ]};
-    key <UNDR> { [ backslash, underscore], [ kana_RO		]	};
-    key <RTSH> { [ Shift_R		]	};
-
-    key <LCTL> { [ Control_L		]			};
-    key <EXEC> { [ Execute		]			};
-    key <SPCE> { [ space		]			};
-    key <KANJ> { [ Kanji		]			};
-    key <HENK> { [ Henkan_Mode		]			};
-    key <LALT> { [ Alt_L		]	};
-    key <ALGR> { [ Mode_switch		]	};
-    key <LMTA> { [ Meta_L		]	};
-    key <RMTA> { [ Meta_R		]	};
-    key <COMP> { [ Multi_key		]	};
-    // End alphanumeric section
-
-    // Begin "Function" section
-    key <ESC>  { [ Escape		]			};
-    key <FK01> { [ F1			]			};
-    key <FK02> { [ F2			]			};
-    key <FK03> { [ F3			]			};
-    key <FK04> { [ F4			]			};
-    key <FK05> { [ F5			]			};
-    key <FK06> { [ F6			]			};
-    key <FK07> { [ F7			]			};
-    key <FK08> { [ F8			]			};
-    key <FK09> { [ F9			]			};
-    key <FK10> { [ F10			]			};
-    key <FK11> { [ SunF36		]			};
-    key <FK12> { [ SunF37		]			};
-    key <STOP> { [ L1, L1		], [ SunStop	]	};
-    key <AGAI> { [ L2, L2		], [ SunAgain	]	};
-    key <PROP> { [ L3, L3		], [ SunProps	]	};
-    key <UNDO> { [ L4, L4		], [ SunUndo	]	};
-    key <FRNT> { [ L5, L5		], [ SunFront	]	};
-    key <COPY> { [ L6, L6		], [ SunCopy	]	};
-    key <OPEN> { [ L7, L7		], [ SunOpen	]	};
-    key <PAST> { [ L8, L8		], [ SunPaste	]	};
-    key <FIND> { [ L9, L9		], [ SunFind	]	};
-    key <CUT>  { [ L10, L10		], [ SunCut	]	};
-    // End "Function" section
-
-    // Begin "Editing" section
-    key <PRSC> { [ R2, R2 		], [ Print, SunSys_Req	]	};
-    key <SCLK> { [ R3, R3		], [ Scroll_Lock	]	};
-    key <PAUS> { [ R1, R1		], [ Pause, Break	]	};
-    key <LEFT> { [ Left			]			};
-    key <RGHT> { [ Right		]			};
-    key <UP>   { [ Up			]			};
-    key <DOWN> { [ Down			]			};
-
-    key <DELE> { [ Delete		]			};
-    key <INS>  { [ Insert		]			};
-    key <PGUP> { [ Prior		]			};
-    key <PGDN> { [ Next			]			};
-    key <HOME> { [ Home			]			};
-    key <END>  { [ End			]			};
-    key <HELP> { [ Help			]			};
-
-    // End "Editing" section, begin "Keypad"
-     key <NMLK> { [ Num_Lock 		]				};
-//     key <KPDV> { [ R5, R5		], [ KP_Divide	]	};
-//     key <KPMU> { [ R6, R6		], [ KP_Multiply	]	};
-//     key <KPSU> { [ R4, R4		], [ KP_Subtract	]	};
-
-//     key  <KP7> { [ R7, R7		], [ KP_7, Home		]	};
-//     key  <KP8> { [ Up, R8		], [ KP_8		]	};
-//     key  <KP9> { [ R9, R9		], [ KP_9, Prior	]	};
-//     key <KPAD> { [ KP_Add		]				};
-
-//     key  <KP4> { [ Left, R10		], [ KP_4		]	};
-//     key  <KP5> { [ R11,	R11		], [ KP_5		]	};
-//     key  <KP6> { [ Right, R12		], [ KP_6		]	};
-
-//     key  <KP1> { [ R13,	R13		], [ KP_1, End		]	};
-//     key  <KP2> { [ Down, R14		], [ KP_2		]	};
-//     key  <KP3> { [ R15,	R15		], [ KP_3		]	};
-//     key <KPEN> { [ KP_Enter		]				};
-
-//     key  <KP0> { [ KP_Insert, KP_Insert	], [ KP_0		]	};
-//     key <KPDL> { [ KP_Delete, KP_Delete ], [ KP_Decimal 	]	};
-    // End "Keypad" section, 
-    // begin "four keys up on the right"
-
-    key <MUTE> { [ SunAudioMute,	SunVideoDegauss		]	};
-    key <VOL-> { [ SunAudioLowerVolume,	SunVideoLowerBrightness ]	};
-    key <VOL+> { [ SunAudioRaiseVolume,	SunVideoRaiseBrightness	]	};
-    key <POWR> { [ SunPowerSwitch,	SunPowerSwitchShift	]	};
-
-    // begin modifier mappings
-    modifier_map Shift  { Shift_R };
-    modifier_map Mod1	{ Meta_L, Meta_R };
-    modifier_map Mod2	{ Alt_R };
-    modifier_map Mod3	{ Num_Lock };
-    modifier_map Mod4	{ Alt_L };
-};
-
-// layout for a Japanese Type 6 Sun keyboard
-// Just shows differences from Type 6 US layout 
-partial
-xkb_symbols "type6" {
-
-    // Alphanumeric section
-    // Though Yen symbol is engraved on key AE13, JA L10N folks want backslash.
-    key <AE13> { [ backslash, bar       ], [ prolongedsound     ]       };
-    key <AE01> { [ 1, exclam 		], [ kana_NU		]	};
-    key <AE02> { [ 2, quotedbl		], [ kana_FU		]	};
-    key <AE03> { [ 3, numbersign	], [ kana_A, kana_a	]	};
-    key <AE04> { [ 4, dollar		], [ kana_U, kana_u	]	};
-    key <AE05> { [ 5, percent		], [ kana_E, kana_e	]	};
-    key <AE06> { [ 6, ampersand		], [ kana_O, kana_o	]	};
-    key <AE07> { [ 7, apostrophe	], [ kana_YA, kana_ya	]	};
-    key <AE08> { [ 8, parenleft		], [ kana_YU, kana_yu	]	};
-    key <AE09> { [ 9, parenright	], [ kana_YO, kana_yo	]	};
-    key <AE10> { [ 0			], [ kana_WA, kana_WO	]	};
-    key <AE11> { [ minus, equal		], [ kana_HO		]	};
-    key <AE12> { [ asciicircum,	asciitilde], [ kana_HE		]	};
-
-    key <AD01> { [ q, Q 		], [ kana_TA		]	};
-    key <AD02> { [ w, W			], [ kana_TE		]	};
-    key <AD03> { [ e, E			], [ kana_I, kana_i	]	};
-    key <AD04> { [ r, R			], [ kana_SU		]	};
-    key <AD05> { [ t, T			], [ kana_KA		]	};
-    key <AD06> { [ y, Y			], [ kana_N		]	};
-    key <AD07> { [ u, U			], [ kana_NA		]	};
-    key <AD08> { [ i, I			], [ kana_NI		]	};
-    key <AD09> { [ o, O			], [ kana_RA		]	};
-    key <AD10> { [ p, P			], [ kana_SE		]	};
-    key <AD11> { [ at, quoteleft	], [ voicedsound	]	};
-    key <AD12> { [ bracketleft,	braceleft ], [ semivoicedsound, kana_openingbracket ] };
-
-    key <AC01> { [ a, A 		], [ kana_CHI		]	};
-    key <AC02> { [ s, S			], [ kana_TO		]	};
-    key <AC03> { [ d, D			], [ kana_SHI		]	};
-    key <AC04> { [ f, F			], [ kana_HA		]	};
-    key <AC05> { [ g, G			], [ kana_KI		]	};
-    key <AC06> { [ h, H			], [ kana_KU		]	};
-    key <AC07> { [ j, J			], [ kana_MA		]	};
-    key <AC08> { [ k, K			], [ kana_NO		]	};
-    key <AC09> { [ l, L			], [ kana_RI		]	};
-    key <AC10> { [ semicolon, plus	], [ kana_RE		]	};
-    key <AC11> { [ colon, asterisk	], [ kana_KE		]	};
-    key <BKSL> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };
-
-    key <AB01> { [ z, Z 		], [ kana_TSU, kana_tsu	]	};
-    key <AB02> { [ x, X			], [ kana_SA		]	};
-    key <AB03> { [ c, C			], [ kana_SO		]	};
-    key <AB04> { [ v, V			], [ kana_HI		]	};
-    key <AB05> { [ b, B			], [ kana_KO		]	};
-    key <AB06> { [ n, N			], [ kana_MI		]	};
-    key <AB07> { [ m, M			], [ kana_MO		]	};
-    key <AB08> { [ comma, less		], [ kana_NE, kana_comma ]	};
-    key <AB09> { [ period, greater	], [ kana_RU, kana_fullstop ]	};
-    key <AB10> { [ slash, question	], [ kana_ME, kana_conjunctive ]};
-    key <AB11> { [ backslash, underscore], [ kana_RO		]	};
-    key <UNDR> { [ backslash, underscore], [ kana_RO		]	};
-
-    key <EXEC> { [ Execute		]			};
-    key <KANJ> { [ Kanji		]			};
-    key <HENK> { [ Henkan_Mode		]			};
-    key <ALGR> { [ Kana_Lock, Mode_switch ]	};
-    // End alphanumeric section
-};
-
-xkb_symbols "x86" {
-    include "sun_vndr/us(pc101)"
-    include "sun_vndr/jp(basic)"
-    key <TLDE> { [ Henkan_Mode, Henkan_Mode ], [ Henkan_Mode ] };
-
-    key <AE10> { [ 0, asciitilde	    ], [ kana_WA, kana_WO	]};
-    key <AE13> { [ backslash, bar	    ], [ prolongedsound		]};
-
-    
-    key <AC12> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket	]};
-
-    key <ALGR> { [ Mode_switch ]	       };
-    key <RALT> { [ Alt_R ]	       };
-
-};
-
-xkb_symbols "J3100" {
-    include "sun_vndr/us(pc101)"
-
-    // Alphanumeric section
-    key <AE01> { [ 1, exclam 		], [ kana_NU		]	};
-    key <AE02> { [ 2, quotedbl		], [ kana_FU		]	};
-    key <AE03> { [ 3, numbersign	], [ kana_A, kana_a	]	};
-    key <AE04> { [ 4, dollar		], [ kana_U, kana_u	]	};
-    key <AE05> { [ 5, percent		], [ kana_E, kana_e	]	};
-    key <AE06> { [ 6, ampersand		], [ kana_O, kana_o	]	};
-    key <AE07> { [ 7, apostrophe	], [ kana_YA, kana_ya	]	};
-    key <AE08> { [ 8, parenleft		], [ kana_YU, kana_yu	]	};
-    key <AE09> { [ 9, parenright	], [ kana_YO, kana_yo	]	};
-    key <AE10> { [ 0			], [ kana_WA, kana_WO	]	};
-    key <AE11> { [ minus, equal		], [ kana_HO		]	};
-    key <AE12> { [ asciicircum,	asciitilde], [ kana_HE		]	};
-    key <BKSP> { [ BackSpace		]	};
-
-    key  <TAB> { [ Tab,	ISO_Left_Tab	]	};
-    key <AD01> { [ q, Q 		], [ kana_TA		]	};
-    key <AD02> { [ w, W			], [ kana_TE		]	};
-    key <AD03> { [ e, E			], [ kana_I, kana_i	]	};
-    key <AD04> { [ r, R			], [ kana_SU		]	};
-    key <AD05> { [ t, T			], [ kana_KA		]	};
-    key <AD06> { [ y, Y			], [ kana_N		]	};
-    key <AD07> { [ u, U			], [ kana_NA		]	};
-    key <AD08> { [ i, I			], [ kana_NI		]	};
-    key <AD09> { [ o, O			], [ kana_RA		]	};
-    key <AD10> { [ p, P			], [ kana_SE		]	};
-    key <AD11> { [ at, quoteleft	], [ voicedsound	]	};
-    key <AD12> { [ bracketleft,	braceleft ], [ semivoicedsound, kana_openingbracket ] };
-    key <RTRN> { [ Return		]	};
-
-    key <CAPS> { [ Caps_Lock		]	};
-    key <AC01> { [ a, A 		], [ kana_CHI		]	};
-    key <AC02> { [ s, S			], [ kana_TO		]	};
-    key <AC03> { [ d, D			], [ kana_SHI		]	};
-    key <AC04> { [ f, F			], [ kana_HA		]	};
-    key <AC05> { [ g, G			], [ kana_KI		]	};
-    key <AC06> { [ h, H			], [ kana_KU		]	};
-    key <AC07> { [ j, J			], [ kana_MA		]	};
-    key <AC08> { [ k, K			], [ kana_NO		]	};
-    key <AC09> { [ l, L			], [ kana_RI		]	};
-    key <AC10> { [ semicolon, plus	], [ kana_RE		]	};
-    key <AC11> { [ colon, asterisk	], [ kana_KE		]	};
-    key <TLDE> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };
-
-    key <AB01> { [ z, Z 		], [ kana_TSU, kana_tsu	]	};
-    key <AB02> { [ x, X			], [ kana_SA		]	};
-    key <AB03> { [ c, C			], [ kana_SO		]	};
-    key <AB04> { [ v, V			], [ kana_HI		]	};
-    key <AB05> { [ b, B			], [ kana_KO		]	};
-    key <AB06> { [ n, N			], [ kana_MI		]	};
-    key <AB07> { [ m, M			], [ kana_MO		]	};
-    key <AB08> { [ comma, less		], [ kana_NE, kana_comma ]	};
-    key <AB09> { [ period, greater	], [ kana_RU, kana_fullstop ]	};
-    key <AB10> { [ slash, question	], [ kana_ME, kana_conjunctive ]};
-//    key <UNDR> { [ backslash, underscore], [ kana_RO		]	};
-
-    key <SPCE> { [ space		]			};
-//    key <KANJ> { [ Kanji		]			};
-//    key <HENK> { [ Henkan_Mode		]			};
-//    key <LNFD> { [ backslash, underscore], [ kana_RO		]};
-    // End alphanumeric section
-
-    // Begin "Function" section
-    key <ESC>  { [ Escape		]			};
-    key <FK01> { [ F1			]			};
-    key <FK02> { [ F2			]			};
-    key <FK03> { [ F3			]			};
-    key <FK04> { [ F4			]			};
-    key <FK05> { [ F5			]			};
-    key <FK06> { [ F6			]			};
-    key <FK07> { [ F7			]			};
-    key <FK08> { [ F8			]			};
-    key <FK09> { [ F9			]			};
-    key <FK10> { [ F10			]			};
-    key <FK11> { [ SunF36		]			};
-    key <FK12> { [ SunF37		]			};
-    key <BKSL> { [ backslash, bar	], [ prolongedsound 	] };
-//    key <BRCR> { [ Linefeed		]			};
-//    key <EXEC> { [ Execute		]			};
-
-    key <ESC>  { [ Escape, 3 ] };
-
-    key <AE02> { [ 2, at		], [ kana_FU			]};
-    key <AE06> { [ 6, asciicircum	], [ kana_O, kana_o		]};
-    key <AE07> { [ 7, ampersand		], [ kana_YA, kana_ya		]};
-    key <AE08> { [ 8, asterisk		], [ kana_YU, kana_yu		]};
-    key <AE09> { [ 9, parenleft		], [ kana_YO, kana_yo		]};
-    key <AE10> { [ 0, parenright	], [ kana_WA, kana_WO		]};
-    key <AE11> { [ minus, underscore	], [ kana_HO			]};
-    key <AE12> { [ equal, plus		], [ kana_HE			]};
-
-    key <BKSL> { [ backslash, bar	    ], [ prolongedsound		]};
-    key <AE12> { [ equal, plus		], [ kana_HE			]};
-
-    key <AD11> { [ bracketleft, braceleft  ], [ voicedsound		]};    
-    key <AD12> { [ bracketright, braceright  ], [ semivoicedsound, kana_openingbracket	]};    
-
-    key <AC10> { [ semicolon, colon	     ], [ kana_RE		]};    
-    key <AC11> { [ quoteright, quotedbl	     ], [ kana_KE		]};    
-
-    key <TLDE> { [ quoteleft, asciitilde ], [ kana_MU, kana_closingbracket	]};
-    key <LSGT> { [ backslash, bar	 ], [ kana_RO			]};
-//    key <ALGR> { [ Mode_switch ]	       };
-    key <RALT> { [ Henkan_Mode ]	       };
-    key <RCTL> { [ Mode_switch ]	       };
-
-};
-
-xkb_symbols "Muhenkan_x86" {
-    include "sun_vndr/jp(x86)"
-
-    key <EXEC> { [ Muhenkan ] };
-};
-
-
-
-partial
-xkb_symbols "type7" {
-    include "sun_vndr/jp(type6)"
-    key <AE10> { [ 0, asciitilde       ], [ kana_WA, kana_WO   ]       };
-    key <HZTG> { [ Henkan_Mode ] };
-    key <HENK> { [ Kana_Lock, Mode_switch ] };
-    key <ALGR> { [ Alt_R ] };
-};
-
+// $XdotOrg: $

+//

+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.

+//

+// Permission is hereby granted, free of charge, to any person obtaining a

+// copy of this software and associated documentation files (the

+// "Software"), to deal in the Software without restriction, including

+// without limitation the rights to use, copy, modify, merge, publish,

+// distribute, and/or sell copies of the Software, and to permit persons

+// to whom the Software is furnished to do so, provided that the above

+// copyright notice(s) and this permission notice appear in all copies of

+// the Software and that both the above copyright notice(s) and this

+// permission notice appear in supporting documentation.

+// 

+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

+// 

+// Except as contained in this notice, the name of a copyright holder

+// shall not be used in advertising or otherwise to promote the sale, use

+// or other dealings in this Software without prior written authorization

+// of the copyright holder.

+//

+// $TOG: us /main/5 1998/02/10 13:45:06 kaleb $

+//

+//Copyright 1996, 1998  The Open Group

+//

+//All Rights Reserved.

+//

+//The above copyright notice and this permission notice shall be

+//included in all copies or substantial portions of the Software.

+//

+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

+//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR

+//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

+//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

+//OTHER DEALINGS IN THE SOFTWARE.

+//

+//Except as contained in this notice, the name of The Open Group shall

+//not be used in advertising or otherwise to promote the sale, use or

+//other dealings in this Software without prior written authorization

+//from The Open Group.

+//

+// US/ASCII layout for a Type 4 Sun keyboard

+

+//

+// CDDL HEADER START

+//

+// The contents of this file are subject to the terms of the

+// Common Development and Distribution License (the "License").

+// You may not use this file except in compliance with the License.

+//

+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE

+// or http://www.opensolaris.org/os/licensing.

+// See the License for the specific language governing permissions

+// and limitations under the License.

+//

+// When distributing Covered Code, include this CDDL HEADER in each

+// file and include the License file at src/OPENSOLARIS.LICENSE.

+// If applicable, add the following below this CDDL HEADER, with the

+// fields enclosed by brackets "[]" replaced with your own identifying

+// information: Portions Copyright [yyyy] [name of copyright owner]

+//

+// CDDL HEADER END

+//

+

+xkb_symbols "basic" {

+    // Alphanumeric section

+    key <AE01> { [ 1, exclam 		], [ kana_NU		]	};

+    key <AE02> { [ 2, quotedbl		], [ kana_FU		]	};

+    key <AE03> { [ 3, numbersign	], [ kana_A, kana_a	]	};

+    key <AE04> { [ 4, dollar		], [ kana_U, kana_u	]	};

+    key <AE05> { [ 5, percent		], [ kana_E, kana_e	]	};

+    key <AE06> { [ 6, ampersand		], [ kana_O, kana_o	]	};

+    key <AE07> { [ 7, apostrophe	], [ kana_YA, kana_ya	]	};

+    key <AE08> { [ 8, parenleft		], [ kana_YU, kana_yu	]	};

+    key <AE09> { [ 9, parenright	], [ kana_YO, kana_yo	]	};

+    key <AE10> { [ 0			], [ kana_WA, kana_WO	]	};

+    key <AE11> { [ minus, equal		], [ kana_HO		]	};

+    key <AE12> { [ asciicircum,	asciitilde], [ kana_HE		]	};

+    key <BKSP> { [ BackSpace		]	};

+

+    key  <TAB> { [ Tab,	ISO_Left_Tab	]	};

+    key <AD01> { [ q, Q 		], [ kana_TA		]	};

+    key <AD02> { [ w, W			], [ kana_TE		]	};

+    key <AD03> { [ e, E			], [ kana_I, kana_i	]	};

+    key <AD04> { [ r, R			], [ kana_SU		]	};

+    key <AD05> { [ t, T			], [ kana_KA		]	};

+    key <AD06> { [ y, Y			], [ kana_N		]	};

+    key <AD07> { [ u, U			], [ kana_NA		]	};

+    key <AD08> { [ i, I			], [ kana_NI		]	};

+    key <AD09> { [ o, O			], [ kana_RA		]	};

+    key <AD10> { [ p, P			], [ kana_SE		]	};

+    key <AD11> { [ at, quoteleft	], [ voicedsound	]	};

+    key <AD12> { [ bracketleft,	braceleft ], [ semivoicedsound, kana_openingbracket ] };

+    key <RTRN> { [ Return		]	};

+

+    key <CAPS> { [ Caps_Lock		]	};

+    key <AC01> { [ a, A 		], [ kana_CHI		]	};

+    key <AC02> { [ s, S			], [ kana_TO		]	};

+    key <AC03> { [ d, D			], [ kana_SHI		]	};

+    key <AC04> { [ f, F			], [ kana_HA		]	};

+    key <AC05> { [ g, G			], [ kana_KI		]	};

+    key <AC06> { [ h, H			], [ kana_KU		]	};

+    key <AC07> { [ j, J			], [ kana_MA		]	};

+    key <AC08> { [ k, K			], [ kana_NO		]	};

+    key <AC09> { [ l, L			], [ kana_RI		]	};

+    key <AC10> { [ semicolon, plus	], [ kana_RE		]	};

+    key <AC11> { [ colon, asterisk	], [ kana_KE		]	};

+    key <TLDE> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };

+

+    key <AB01> { [ z, Z 		], [ kana_TSU, kana_tsu	]	};

+    key <AB02> { [ x, X			], [ kana_SA		]	};

+    key <AB03> { [ c, C			], [ kana_SO		]	};

+    key <AB04> { [ v, V			], [ kana_HI		]	};

+    key <AB05> { [ b, B			], [ kana_KO		]	};

+    key <AB06> { [ n, N			], [ kana_MI		]	};

+    key <AB07> { [ m, M			], [ kana_MO		]	};

+    key <AB08> { [ comma, less		], [ kana_NE, kana_comma ]	};

+    key <AB09> { [ period, greater	], [ kana_RU, kana_fullstop ]	};

+    key <AB10> { [ slash, question	], [ kana_ME, kana_conjunctive ]};

+    key <UNDR> { [ backslash, underscore], [ kana_RO		]	};

+

+    key <SPCE> { [ space		]			};

+    key <KANJ> { [ Kanji		]			};

+    key <HENK> { [ Henkan_Mode		]			};

+//    key <LNFD> { [ backslash, underscore], [ kana_RO		]};

+    // End alphanumeric section

+

+    // Begin "Function" section

+    key <ESC>  { [ Escape		]			};

+    key <FK01> { [ F1			]			};

+    key <FK02> { [ F2			]			};

+    key <FK03> { [ F3			]			};

+    key <FK04> { [ F4			]			};

+    key <FK05> { [ F5			]			};

+    key <FK06> { [ F6			]			};

+    key <FK07> { [ F7			]			};

+    key <FK08> { [ F8			]			};

+    key <FK09> { [ F9			]			};

+    key <FK10> { [ F10			]			};

+    key <FK11> { [ SunF36		]			};

+    key <FK12> { [ SunF37		]			};

+    key <BKSL> { [ backslash, bar	], [ prolongedsound 	] };

+//    key <BRCR> { [ Linefeed		]			};

+    key <EXEC> { [ Execute		]			};

+};

+xkb_symbols "type4" {

+

+    // Alphanumeric section

+    key <AE01> { [ 1, exclam 		], [ kana_NU		]	};

+    key <AE02> { [ 2, quotedbl		], [ kana_FU		]	};

+    key <AE03> { [ 3, numbersign	], [ kana_A, kana_a	]	};

+    key <AE04> { [ 4, dollar		], [ kana_U, kana_u	]	};

+    key <AE05> { [ 5, percent		], [ kana_E, kana_e	]	};

+    key <AE06> { [ 6, ampersand		], [ kana_O, kana_o	]	};

+    key <AE07> { [ 7, apostrophe	], [ kana_YA, kana_ya	]	};

+    key <AE08> { [ 8, parenleft		], [ kana_YU, kana_yu	]	};

+    key <AE09> { [ 9, parenright	], [ kana_YO, kana_yo	]	};

+    key <AE10> { [ 0			], [ kana_WA, kana_WO	]	};

+    key <AE11> { [ minus, equal		], [ kana_HO		]	};

+    key <AE12> { [ asciicircum,	asciitilde], [ kana_HE		]	};

+    key <BKSP> { [ BackSpace		]	};

+

+    key  <TAB> { [ Tab,	ISO_Left_Tab	]	};

+    key <AD01> { [ q, Q 		], [ kana_TA		]	};

+    key <AD02> { [ w, W			], [ kana_TE		]	};

+    key <AD03> { [ e, E			], [ kana_I, kana_i	]	};

+    key <AD04> { [ r, R			], [ kana_SU		]	};

+    key <AD05> { [ t, T			], [ kana_KA		]	};

+    key <AD06> { [ y, Y			], [ kana_N		]	};

+    key <AD07> { [ u, U			], [ kana_NA		]	};

+    key <AD08> { [ i, I			], [ kana_NI		]	};

+    key <AD09> { [ o, O			], [ kana_RA		]	};

+    key <AD10> { [ p, P			], [ kana_SE		]	};

+    key <AD11> { [ at, quoteleft	], [ voicedsound	]	};

+    key <AD12> { [ bracketleft,	braceleft ], [ semivoicedsound, kana_openingbracket ] };

+    key <RTRN> { [ Return		]	};

+

+    key <CAPS> { [ Caps_Lock		]	};

+    key <AC01> { [ a, A 		], [ kana_CHI		]	};

+    key <AC02> { [ s, S			], [ kana_TO		]	};

+    key <AC03> { [ d, D			], [ kana_SHI		]	};

+    key <AC04> { [ f, F			], [ kana_HA		]	};

+    key <AC05> { [ g, G			], [ kana_KI		]	};

+    key <AC06> { [ h, H			], [ kana_KU		]	};

+    key <AC07> { [ j, J			], [ kana_MA		]	};

+    key <AC08> { [ k, K			], [ kana_NO		]	};

+    key <AC09> { [ l, L			], [ kana_RI		]	};

+    key <AC10> { [ semicolon, plus	], [ kana_RE		]	};

+    key <AC11> { [ colon, asterisk	], [ kana_KE		]	};

+    key <TLDE> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };

+

+    key <LFSH> { [ Shift_L		]	};

+    key <AB01> { [ z, Z 		], [ kana_TSU, kana_tsu	]	};

+    key <AB02> { [ x, X			], [ kana_SA		]	};

+    key <AB03> { [ c, C			], [ kana_SO		]	};

+    key <AB04> { [ v, V			], [ kana_HI		]	};

+    key <AB05> { [ b, B			], [ kana_KO		]	};

+    key <AB06> { [ n, N			], [ kana_MI		]	};

+    key <AB07> { [ m, M			], [ kana_MO		]	};

+    key <AB08> { [ comma, less		], [ kana_NE, kana_comma ]	};

+    key <AB09> { [ period, greater	], [ kana_RU, kana_fullstop ]	};

+    key <AB10> { [ slash, question	], [ kana_ME, kana_conjunctive ]};

+    key <UNDR> { [ backslash, underscore], [ kana_RO		]	};

+    key <RTSH> { [ Shift_R		]	};

+

+    key <LCTL> { [ Control_L		]			};

+    key <SPCE> { [ space		]			};

+    key <KANJ> { [ Kanji		]			};

+    key <HENK> { [ Henkan_Mode		]			};

+    key <LALT> { [ Alt_L		]			};

+    key <ALGR> { [ Mode_switch		]			};

+    key <LMTA> { [ Meta_L		]			};

+    key <RMTA> { [ Meta_R		]			};

+    key <LNFD> { [ backslash, underscore], [ kana_RO		]};

+    key <COMP> { [ Multi_key		]			};

+    key <EXEC> { [ Execute		]			};

+//    key <TLFD> { [ Linefeed		]			};

+    // End alphanumeric section

+

+    // Begin "Function" section

+    key <ESC>  { [ Escape		]			};

+    key <FK01> { [ F1			]			};

+    key <FK02> { [ F2			]			};

+    key <FK03> { [ F3			]			};

+    key <FK04> { [ F4			]			};

+    key <FK05> { [ F5			]			};

+    key <FK06> { [ F6			]			};

+    key <FK07> { [ F7			]			};

+    key <FK08> { [ F8			]			};

+    key <FK09> { [ F9			]			};

+    key <FK10> { [ F10			]			};

+    key <FK11> { [ SunF36		]			};

+    key <FK12> { [ SunF37		]			};

+    key <BKSL> { [ backslash, bar	], [ prolongedsound 	] };

+    key <BRCR> { [ Linefeed		]			};

+

+    key <STOP> { [ L1,	L1		], [ SunStop	]	};

+    key <AGAI> { [ L2,	L2		], [ SunAgain	]	};

+    key <PROP> { [ L3,	L3		], [ SunProps	]	};

+    key <UNDO> { [ L4,	L4		], [ SunUndo	]	};

+    key <FRNT> { [ L5,	L5		], [ SunFront	]	};

+    key <COPY> { [ L6,	L6		], [ SunCopy	]	};

+    key <OPEN> { [ L7,	L7		], [ SunOpen	]	};

+    key <PAST> { [ L8,	L8		], [ SunPaste	]	};

+    key <FIND> { [ L9,	L9		], [ SunFind	]	};

+    key <CUT>  { [ L10,	L10		], [ SunCut	]	};

+    // End "Function" section

+

+    // Begin "Editing" section

+    key <PRSC> { [ R2,	R2		], [ Print		] };

+    key <SCLK> { [ R3,	R3		], [ Scroll_Lock, Break	] };

+    key <PAUS> { [ R1,	R1		], [ Pause		] };

+    key <DELE> { [ Delete		]			};

+    key <HELP> { [ Help			]			};

+

+    // End "Editing" section, begin "Keypad"

+    key <NMLK> { [ Num_Lock 		]			};

+    key <KPEQ> { [ R4,	R4 		], [ KP_Equal		] };

+    key <KPDV> { [ R5,	R5		], [ KP_Divide		] };

+    key <KPMU> { [ R6,	R6		], [ KP_Multiply	] };

+    key <KPSU> { [ KP_Subtract		]			};

+

+    key  <KP7> { [ R7,	R7		], [ KP_7, Home		] };

+    key  <KP8> { [ Up,	R8		], [ KP_8		] };

+    key  <KP9> { [ R9,	R9		], [ KP_9, Prior	] };

+    key <KPAD> { [ KP_Add		]			};

+

+    key  <KP4> { [ Left, R10		], [ KP_4		] };

+    key  <KP5> { [ R11,	R11		], [ KP_5		] };

+    key  <KP6> { [ Right, R12		], [ KP_6		] };

+

+    key  <KP1> { [ R13,	R13		], [ KP_1,	End	] };

+    key  <KP2> { [ Down, R14		], [ KP_2		] };

+    key  <KP3> { [ R15,	R15		], [ KP_3,	Next	] };

+    key <KPEN> { [ KP_Enter		]			}; 

+    key  <KP0> { [ KP_Insert, KP_Insert], [ KP_0		]	};

+    key <KPDL> { [ Delete, Delete	], [ KP_Decimal ]	};

+    // End "Keypad" section

+

+

+    // begin modifier mappings

+    modifier_map Shift  	{ Shift_R, Shift_L };

+    modifier_map Mod1   	{ Meta_L, Meta_R };

+    modifier_map Mod2   	{ Mode_switch };

+    modifier_map Mod3   	{ Num_Lock };

+    modifier_map Mod4		{ Alt_L };

+};

+

+// US/ASCII layout for a Type 5 Sun keyboard

+xkb_symbols "type5" {

+

+    // Alphanumeric section

+    key <TLDE> { [ backslash, bar	], [ prolongedsound	]	};

+    key <AE01> { [ 1, exclam 		], [ kana_NU		]	};

+    key <AE02> { [ 2, quotedbl		], [ kana_FU		]	};

+    key <AE03> { [ 3, numbersign	], [ kana_A, kana_a	]	};

+    key <AE04> { [ 4, dollar		], [ kana_U, kana_u	]	};

+    key <AE05> { [ 5, percent		], [ kana_E, kana_e	]	};

+    key <AE06> { [ 6, ampersand		], [ kana_O, kana_o	]	};

+    key <AE07> { [ 7, apostrophe	], [ kana_YA, kana_ya	]	};

+    key <AE08> { [ 8, parenleft		], [ kana_YU, kana_yu	]	};

+    key <AE09> { [ 9, parenright	], [ kana_YO, kana_yo	]	};

+    key <AE10> { [ 0			], [ kana_WA, kana_WO	]	};

+    key <AE11> { [ minus, equal		], [ kana_HO		]	};

+    key <AE12> { [ asciicircum,	asciitilde], [ kana_HE		]	};

+    key <BKSP> { [ BackSpace		]	};

+

+    key  <TAB> { [ Tab,	ISO_Left_Tab	]	};

+    key <AD01> { [ q, Q 		], [ kana_TA		]	};

+    key <AD02> { [ w, W			], [ kana_TE		]	};

+    key <AD03> { [ e, E			], [ kana_I, kana_i	]	};

+    key <AD04> { [ r, R			], [ kana_SU		]	};

+    key <AD05> { [ t, T			], [ kana_KA		]	};

+    key <AD06> { [ y, Y			], [ kana_N		]	};

+    key <AD07> { [ u, U			], [ kana_NA		]	};

+    key <AD08> { [ i, I			], [ kana_NI		]	};

+    key <AD09> { [ o, O			], [ kana_RA		]	};

+    key <AD10> { [ p, P			], [ kana_SE		]	};

+    key <AD11> { [ at, quoteleft	], [ voicedsound	]	};

+    key <AD12> { [ bracketleft,	braceleft ], [ semivoicedsound, kana_openingbracket ] };

+    key <RTRN> { [ Return		]	};

+

+    key <CAPS> { [ Caps_Lock		]	};

+    key <AC01> { [ a, A 		], [ kana_CHI		]	};

+    key <AC02> { [ s, S			], [ kana_TO		]	};

+    key <AC03> { [ d, D			], [ kana_SHI		]	};

+    key <AC04> { [ f, F			], [ kana_HA		]	};

+    key <AC05> { [ g, G			], [ kana_KI		]	};

+    key <AC06> { [ h, H			], [ kana_KU		]	};

+    key <AC07> { [ j, J			], [ kana_MA		]	};

+    key <AC08> { [ k, K			], [ kana_NO		]	};

+    key <AC09> { [ l, L			], [ kana_RI		]	};

+    key <AC10> { [ semicolon, plus	], [ kana_RE		]	};

+    key <AC11> { [ colon, asterisk	], [ kana_KE		]	};

+    key <BKSL> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };

+

+    key <LFSH> { [ Shift_L		]	};

+    key <AB01> { [ z, Z 		], [ kana_TSU, kana_tsu	]	};

+    key <AB02> { [ x, X			], [ kana_SA		]	};

+    key <AB03> { [ c, C			], [ kana_SO		]	};

+    key <AB04> { [ v, V			], [ kana_HI		]	};

+    key <AB05> { [ b, B			], [ kana_KO		]	};

+    key <AB06> { [ n, N			], [ kana_MI		]	};

+    key <AB07> { [ m, M			], [ kana_MO		]	};

+    key <AB08> { [ comma, less		], [ kana_NE, kana_comma ]	};

+    key <AB09> { [ period, greater	], [ kana_RU, kana_fullstop ]	};

+    key <AB10> { [ slash, question	], [ kana_ME, kana_conjunctive ]};

+    key <UNDR> { [ backslash, underscore], [ kana_RO		]	};

+    key <RTSH> { [ Shift_R		]	};

+

+    key <LCTL> { [ Control_L		]			};

+//    key <RCTL> { [ Control_R		]			};

+    key <EXEC> { [ Execute		]			};

+    key <SPCE> { [ space		]			};

+    key <KANJ> { [ Kanji		]			};

+    key <HENK> { [ Henkan_Mode		]			};

+    key <LALT> { [ Alt_L		]	};

+    key <ALGR> { [ Mode_switch		]	};

+    key <LMTA> { [ Meta_L		]	};

+    key <RMTA> { [ Meta_R		]	};

+    key <COMP> { [ Multi_key		]	};

+    // End alphanumeric section

+

+    // Begin "Function" section

+    key <ESC>  { [ Escape		]			};

+    key <FK01> { [ F1			]			};

+    key <FK02> { [ F2			]			};

+    key <FK03> { [ F3			]			};

+    key <FK04> { [ F4			]			};

+    key <FK05> { [ F5			]			};

+    key <FK06> { [ F6			]			};

+    key <FK07> { [ F7			]			};

+    key <FK08> { [ F8			]			};

+    key <FK09> { [ F9			]			};

+    key <FK10> { [ F10			]			};

+    key <FK11> { [ SunF36		]			};

+    key <FK12> { [ SunF37		]			};

+    key <STOP> { [ L1, L1		], [ SunStop	]	};

+    key <AGAI> { [ L2, L2		], [ SunAgain	]	};

+    key <PROP> { [ L3, L3		], [ SunProps	]	};

+    key <UNDO> { [ L4, L4		], [ SunUndo	]	};

+    key <FRNT> { [ L5, L5		], [ SunFront	]	};

+    key <COPY> { [ L6, L6		], [ SunCopy	]	};

+    key <OPEN> { [ L7, L7		], [ SunOpen	]	};

+    key <PAST> { [ L8, L8		], [ SunPaste	]	};

+    key <FIND> { [ L9, L9		], [ SunFind	]	};

+    key <CUT>  { [ L10, L10		], [ SunCut	]	};

+    // End "Function" section

+

+    // Begin "Editing" section

+    key <PRSC> { [ R2, R2 		], [ Print, SunSys_Req	]	};

+    key <SCLK> { [ R3, R3		], [ Scroll_Lock	]	};

+    key <PAUS> { [ R1, R1		], [ Pause, Break	]	};

+    key <LEFT> { [ Left			]			};

+    key <RGHT> { [ Right		]			};

+    key <UP>   { [ Up			]			};

+    key <DOWN> { [ Down			]			};

+

+    key <DELE> { [ Delete		]			};

+    key <INS>  { [ Insert		]			};

+    key <PGUP> { [ Prior		]			};

+    key <PGDN> { [ Next			]			};

+    key <HOME> { [ Home			]			};

+    key <END>  { [ End			]			};

+    key <HELP> { [ Help			]			};

+

+    // End "Editing" section, begin "Keypad"

+    key <NMLK> { [ Num_Lock 		]				};

+    key <KPDV> { [ R5, R5		], [ KP_Divide	]	};

+    key <KPMU> { [ R6, R6		], [ KP_Multiply	]	};

+    key <KPSU> { [ R4, R4		], [ KP_Subtract	]	};

+

+    key  <KP7> { [ R7, R7		], [ KP_7, Home		]	};

+    key  <KP8> { [ Up, R8		], [ KP_8		]	};

+    key  <KP9> { [ R9, R9		], [ KP_9, Prior	]	};

+    key <KPAD> { [ KP_Add		]				};

+

+    key  <KP4> { [ Left, R10		], [ KP_4		]	};

+    key  <KP5> { [ R11,	R11		], [ KP_5		]	};

+    key  <KP6> { [ Right, R12		], [ KP_6		]	};

+

+    key  <KP1> { [ R13,	R13		], [ KP_1, End		]	};

+    key  <KP2> { [ Down, R14		], [ KP_2		]	};

+    key  <KP3> { [ R15,	R15		], [ KP_3		]	};

+    key <KPEN> { [ KP_Enter		]				};

+

+    key  <KP0> { [ KP_Insert, KP_Insert	], [ KP_0		]	};

+    key <KPDL> { [ KP_Delete, KP_Delete ], [ KP_Decimal 	]	};

+    // End "Keypad" section, 

+    // begin "four keys up on the right"

+

+    key <MUTE> { [ SunAudioMute,	SunVideoDegauss		]	};

+    key <VOL-> { [ SunAudioLowerVolume,	SunVideoLowerBrightness ]	};

+    key <VOL+> { [ SunAudioRaiseVolume,	SunVideoRaiseBrightness	]	};

+    key <POWR> { [ SunPowerSwitch,	SunPowerSwitchShift	]	};

+

+    // begin modifier mappings

+    modifier_map Shift  { Shift_R };

+    modifier_map Mod1	{ Meta_L, Meta_R };

+    modifier_map Mod2	{ Alt_R };

+    modifier_map Mod3	{ Num_Lock };

+    modifier_map Mod4	{ Alt_L };

+};

+

+xkb_symbols "type5hobo" {

+

+    // Alphanumeric section

+    key <TLDE> { [ backslash, bar	], [ prolongedsound	]	};

+    key <AE01> { [ 1, exclam 		], [ kana_NU		]	};

+    key <AE02> { [ 2, quotedbl		], [ kana_FU		]	};

+    key <AE03> { [ 3, numbersign	], [ kana_A, kana_a	]	};

+    key <AE04> { [ 4, dollar		], [ kana_U, kana_u	]	};

+    key <AE05> { [ 5, percent		], [ kana_E, kana_e	]	};

+    key <AE06> { [ 6, ampersand		], [ kana_O, kana_o	]	};

+    key <AE07> { [ 7, apostrophe	], [ kana_YA, kana_ya	], [ KP_7 ]};

+    key <AE08> { [ 8, parenleft		], [ kana_YU, kana_yu	], [ KP_8 ]};

+    key <AE09> { [ 9, parenright	], [ kana_YO, kana_yo	], [ KP_9 ]};

+    key <AE10> { [ 0			], [ kana_WA, kana_WO	], [ KP_Multiply]};

+    key <AE11> { [ minus, equal		], [ kana_HO		]	};

+    key <AE12> { [ asciicircum,	asciitilde], [ kana_HE		]	};

+    key <BKSP> { [ BackSpace		]	};

+

+    key  <TAB> { [ Tab,	ISO_Left_Tab	]	};

+    key <AD01> { [ q, Q 		], [ kana_TA		]	};

+    key <AD02> { [ w, W			], [ kana_TE		]	};

+    key <AD03> { [ e, E			], [ kana_I, kana_i	]	};

+    key <AD04> { [ r, R			], [ kana_SU		]	};

+    key <AD05> { [ t, T			], [ kana_KA		]	};

+    key <AD06> { [ y, Y			], [ kana_N		]	};

+    key <AD07> { [ u, U		], [ kana_NA		], [ KP_4 ]	};

+    key <AD08> { [ i, I		], [ kana_NI		], [ KP_5 ]	};

+    key <AD09> { [ o, O		], [ kana_RA		], [ KP_6 ]	};

+    key <AD10> { [ p, P		], [ kana_SE		], [ KP_Subtract]};

+    key <AD11> { [ at, quoteleft	], [ voicedsound	]	};

+    key <AD12> { [ bracketleft,	braceleft ], [ semivoicedsound, kana_openingbracket ] };

+    key <RTRN> { [ Return	], [ NoSymbol, NoSymbol], [ KP_Enter	] };

+

+    key <CAPS> { [ Caps_Lock		]	};

+    key <AC01> { [ a, A 		], [ kana_CHI		]	};

+    key <AC02> { [ s, S			], [ kana_TO		]	};

+    key <AC03> { [ d, D			], [ kana_SHI		]	};

+    key <AC04> { [ f, F			], [ kana_HA		]	};

+    key <AC05> { [ g, G			], [ kana_KI		]	};

+    key <AC06> { [ h, H			], [ kana_KU		]	};

+    key <AC07> { [ j, J		], [ kana_MA		], [ KP_1 ]};

+    key <AC08> { [ k, K		], [ kana_NO		], [ KP_2 ]};

+    key <AC09> { [ l, L		], [ kana_RI		], [ KP_3 ]};

+    key <AC10> { [ semicolon, plus], [ kana_RE		], [ KP_Add ]};

+    key <AC11> { [ colon, asterisk	], [ kana_KE		]	};

+    key <BKSL> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };

+

+    key <LFSH> { [ Shift_L		]	};

+    key <AB01> { [ z, Z 		], [ kana_TSU, kana_tsu	]	};

+    key <AB02> { [ x, X			], [ kana_SA		]	};

+    key <AB03> { [ c, C			], [ kana_SO		]	};

+    key <AB04> { [ v, V			], [ kana_HI		]	};

+    key <AB05> { [ b, B			], [ kana_KO		]	};

+    key <AB06> { [ n, N			], [ kana_MI		]	};

+    key <AB07> { [ m, M			], [ kana_MO		], [ KP_0 ]};

+    key <AB08> { [ comma, less		], [ kana_NE, kana_comma ]	};

+    key <AB09> { [ period, greater	], [ kana_RU, kana_fullstop ], [ KP_Decimal ]	};

+    key <AB10> { [ slash, question	], [ kana_ME, kana_conjunctive ], [ KP_Divide ]};

+    key <UNDR> { [ backslash, underscore], [ kana_RO		]	};

+    key <RTSH> { [ Shift_R		]	};

+

+    key <LCTL> { [ Control_L		]			};

+    key <EXEC> { [ Execute		]			};

+    key <SPCE> { [ space		]			};

+    key <KANJ> { [ Kanji		]			};

+    key <HENK> { [ Henkan_Mode		]			};

+    key <LALT> { [ Alt_L		]	};

+    key <ALGR> { [ Mode_switch		]	};

+    key <LMTA> { [ Meta_L		]	};

+    key <RMTA> { [ Meta_R		]	};

+    key <COMP> { [ Multi_key		]	};

+    // End alphanumeric section

+

+    // Begin "Function" section

+    key <ESC>  { [ Escape		]			};

+    key <FK01> { [ F1			]			};

+    key <FK02> { [ F2			]			};

+    key <FK03> { [ F3			]			};

+    key <FK04> { [ F4			]			};

+    key <FK05> { [ F5			]			};

+    key <FK06> { [ F6			]			};

+    key <FK07> { [ F7			]			};

+    key <FK08> { [ F8			]			};

+    key <FK09> { [ F9			]			};

+    key <FK10> { [ F10			]			};

+    key <FK11> { [ SunF36		]			};

+    key <FK12> { [ SunF37		]			};

+    key <STOP> { [ L1, L1		], [ SunStop	]	};

+    key <AGAI> { [ L2, L2		], [ SunAgain	]	};

+    key <PROP> { [ L3, L3		], [ SunProps	]	};

+    key <UNDO> { [ L4, L4		], [ SunUndo	]	};

+    key <FRNT> { [ L5, L5		], [ SunFront	]	};

+    key <COPY> { [ L6, L6		], [ SunCopy	]	};

+    key <OPEN> { [ L7, L7		], [ SunOpen	]	};

+    key <PAST> { [ L8, L8		], [ SunPaste	]	};

+    key <FIND> { [ L9, L9		], [ SunFind	]	};

+    key <CUT>  { [ L10, L10		], [ SunCut	]	};

+    // End "Function" section

+

+    // Begin "Editing" section

+    key <PRSC> { [ R2, R2 		], [ Print, SunSys_Req	]	};

+    key <SCLK> { [ R3, R3		], [ Scroll_Lock	]	};

+    key <PAUS> { [ R1, R1		], [ Pause, Break	]	};

+    key <LEFT> { [ Left			]			};

+    key <RGHT> { [ Right		]			};

+    key <UP>   { [ Up			]			};

+    key <DOWN> { [ Down			]			};

+

+    key <DELE> { [ Delete		]			};

+    key <INS>  { [ Insert		]			};

+    key <PGUP> { [ Prior		]			};

+    key <PGDN> { [ Next			]			};

+    key <HOME> { [ Home			]			};

+    key <END>  { [ End			]			};

+    key <HELP> { [ Help			]			};

+

+    // End "Editing" section, begin "Keypad"

+     key <NMLK> { [ Num_Lock 		]				};

+//     key <KPDV> { [ R5, R5		], [ KP_Divide	]	};

+//     key <KPMU> { [ R6, R6		], [ KP_Multiply	]	};

+//     key <KPSU> { [ R4, R4		], [ KP_Subtract	]	};

+

+//     key  <KP7> { [ R7, R7		], [ KP_7, Home		]	};

+//     key  <KP8> { [ Up, R8		], [ KP_8		]	};

+//     key  <KP9> { [ R9, R9		], [ KP_9, Prior	]	};

+//     key <KPAD> { [ KP_Add		]				};

+

+//     key  <KP4> { [ Left, R10		], [ KP_4		]	};

+//     key  <KP5> { [ R11,	R11		], [ KP_5		]	};

+//     key  <KP6> { [ Right, R12		], [ KP_6		]	};

+

+//     key  <KP1> { [ R13,	R13		], [ KP_1, End		]	};

+//     key  <KP2> { [ Down, R14		], [ KP_2		]	};

+//     key  <KP3> { [ R15,	R15		], [ KP_3		]	};

+//     key <KPEN> { [ KP_Enter		]				};

+

+//     key  <KP0> { [ KP_Insert, KP_Insert	], [ KP_0		]	};

+//     key <KPDL> { [ KP_Delete, KP_Delete ], [ KP_Decimal 	]	};

+    // End "Keypad" section, 

+    // begin "four keys up on the right"

+

+    key <MUTE> { [ SunAudioMute,	SunVideoDegauss		]	};

+    key <VOL-> { [ SunAudioLowerVolume,	SunVideoLowerBrightness ]	};

+    key <VOL+> { [ SunAudioRaiseVolume,	SunVideoRaiseBrightness	]	};

+    key <POWR> { [ SunPowerSwitch,	SunPowerSwitchShift	]	};

+

+    // begin modifier mappings

+    modifier_map Shift  { Shift_R };

+    modifier_map Mod1	{ Meta_L, Meta_R };

+    modifier_map Mod2	{ Alt_R };

+    modifier_map Mod3	{ Num_Lock };

+    modifier_map Mod4	{ Alt_L };

+};

+

+// layout for a Japanese Type 6 Sun keyboard

+// Just shows differences from Type 6 US layout 

+partial

+xkb_symbols "type6" {

+

+    // Alphanumeric section

+    // Though Yen symbol is engraved on key AE13, JA L10N folks want backslash.

+    key <AE13> { [ backslash, bar       ], [ prolongedsound     ]       };

+    key <AE01> { [ 1, exclam 		], [ kana_NU		]	};

+    key <AE02> { [ 2, quotedbl		], [ kana_FU		]	};

+    key <AE03> { [ 3, numbersign	], [ kana_A, kana_a	]	};

+    key <AE04> { [ 4, dollar		], [ kana_U, kana_u	]	};

+    key <AE05> { [ 5, percent		], [ kana_E, kana_e	]	};

+    key <AE06> { [ 6, ampersand		], [ kana_O, kana_o	]	};

+    key <AE07> { [ 7, apostrophe	], [ kana_YA, kana_ya	]	};

+    key <AE08> { [ 8, parenleft		], [ kana_YU, kana_yu	]	};

+    key <AE09> { [ 9, parenright	], [ kana_YO, kana_yo	]	};

+    key <AE10> { [ 0			], [ kana_WA, kana_WO	]	};

+    key <AE11> { [ minus, equal		], [ kana_HO		]	};

+    key <AE12> { [ asciicircum,	asciitilde], [ kana_HE		]	};

+

+    key <AD01> { [ q, Q 		], [ kana_TA		]	};

+    key <AD02> { [ w, W			], [ kana_TE		]	};

+    key <AD03> { [ e, E			], [ kana_I, kana_i	]	};

+    key <AD04> { [ r, R			], [ kana_SU		]	};

+    key <AD05> { [ t, T			], [ kana_KA		]	};

+    key <AD06> { [ y, Y			], [ kana_N		]	};

+    key <AD07> { [ u, U			], [ kana_NA		]	};

+    key <AD08> { [ i, I			], [ kana_NI		]	};

+    key <AD09> { [ o, O			], [ kana_RA		]	};

+    key <AD10> { [ p, P			], [ kana_SE		]	};

+    key <AD11> { [ at, quoteleft	], [ voicedsound	]	};

+    key <AD12> { [ bracketleft,	braceleft ], [ semivoicedsound, kana_openingbracket ] };

+

+    key <AC01> { [ a, A 		], [ kana_CHI		]	};

+    key <AC02> { [ s, S			], [ kana_TO		]	};

+    key <AC03> { [ d, D			], [ kana_SHI		]	};

+    key <AC04> { [ f, F			], [ kana_HA		]	};

+    key <AC05> { [ g, G			], [ kana_KI		]	};

+    key <AC06> { [ h, H			], [ kana_KU		]	};

+    key <AC07> { [ j, J			], [ kana_MA		]	};

+    key <AC08> { [ k, K			], [ kana_NO		]	};

+    key <AC09> { [ l, L			], [ kana_RI		]	};

+    key <AC10> { [ semicolon, plus	], [ kana_RE		]	};

+    key <AC11> { [ colon, asterisk	], [ kana_KE		]	};

+    key <BKSL> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };

+

+    key <AB01> { [ z, Z 		], [ kana_TSU, kana_tsu	]	};

+    key <AB02> { [ x, X			], [ kana_SA		]	};

+    key <AB03> { [ c, C			], [ kana_SO		]	};

+    key <AB04> { [ v, V			], [ kana_HI		]	};

+    key <AB05> { [ b, B			], [ kana_KO		]	};

+    key <AB06> { [ n, N			], [ kana_MI		]	};

+    key <AB07> { [ m, M			], [ kana_MO		]	};

+    key <AB08> { [ comma, less		], [ kana_NE, kana_comma ]	};

+    key <AB09> { [ period, greater	], [ kana_RU, kana_fullstop ]	};

+    key <AB10> { [ slash, question	], [ kana_ME, kana_conjunctive ]};

+    key <AB11> { [ backslash, underscore], [ kana_RO		]	};

+    key <UNDR> { [ backslash, underscore], [ kana_RO		]	};

+

+    key <EXEC> { [ Execute		]			};

+    key <KANJ> { [ Kanji		]			};

+    key <HENK> { [ Henkan_Mode		]			};

+    key <ALGR> { [ Kana_Lock, Mode_switch ]	};

+    // End alphanumeric section

+};

+

+xkb_symbols "x86" {

+    include "sun_vndr/us(pc101)"

+    include "sun_vndr/jp(basic)"

+    key <TLDE> { [ Henkan_Mode, Henkan_Mode ], [ Henkan_Mode ] };

+

+    key <AE10> { [ 0, asciitilde	    ], [ kana_WA, kana_WO	]};

+    key <AE13> { [ backslash, bar	    ], [ prolongedsound		]};

+

+    

+    key <AC12> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket	]};

+

+    key <ALGR> { [ Mode_switch ]	       };

+    key <RALT> { [ Alt_R ]	       };

+

+};

+

+xkb_symbols "J3100" {

+    include "sun_vndr/us(pc101)"

+

+    // Alphanumeric section

+    key <AE01> { [ 1, exclam 		], [ kana_NU		]	};

+    key <AE02> { [ 2, quotedbl		], [ kana_FU		]	};

+    key <AE03> { [ 3, numbersign	], [ kana_A, kana_a	]	};

+    key <AE04> { [ 4, dollar		], [ kana_U, kana_u	]	};

+    key <AE05> { [ 5, percent		], [ kana_E, kana_e	]	};

+    key <AE06> { [ 6, ampersand		], [ kana_O, kana_o	]	};

+    key <AE07> { [ 7, apostrophe	], [ kana_YA, kana_ya	]	};

+    key <AE08> { [ 8, parenleft		], [ kana_YU, kana_yu	]	};

+    key <AE09> { [ 9, parenright	], [ kana_YO, kana_yo	]	};

+    key <AE10> { [ 0			], [ kana_WA, kana_WO	]	};

+    key <AE11> { [ minus, equal		], [ kana_HO		]	};

+    key <AE12> { [ asciicircum,	asciitilde], [ kana_HE		]	};

+    key <BKSP> { [ BackSpace		]	};

+

+    key  <TAB> { [ Tab,	ISO_Left_Tab	]	};

+    key <AD01> { [ q, Q 		], [ kana_TA		]	};

+    key <AD02> { [ w, W			], [ kana_TE		]	};

+    key <AD03> { [ e, E			], [ kana_I, kana_i	]	};

+    key <AD04> { [ r, R			], [ kana_SU		]	};

+    key <AD05> { [ t, T			], [ kana_KA		]	};

+    key <AD06> { [ y, Y			], [ kana_N		]	};

+    key <AD07> { [ u, U			], [ kana_NA		]	};

+    key <AD08> { [ i, I			], [ kana_NI		]	};

+    key <AD09> { [ o, O			], [ kana_RA		]	};

+    key <AD10> { [ p, P			], [ kana_SE		]	};

+    key <AD11> { [ at, quoteleft	], [ voicedsound	]	};

+    key <AD12> { [ bracketleft,	braceleft ], [ semivoicedsound, kana_openingbracket ] };

+    key <RTRN> { [ Return		]	};

+

+    key <CAPS> { [ Caps_Lock		]	};

+    key <AC01> { [ a, A 		], [ kana_CHI		]	};

+    key <AC02> { [ s, S			], [ kana_TO		]	};

+    key <AC03> { [ d, D			], [ kana_SHI		]	};

+    key <AC04> { [ f, F			], [ kana_HA		]	};

+    key <AC05> { [ g, G			], [ kana_KI		]	};

+    key <AC06> { [ h, H			], [ kana_KU		]	};

+    key <AC07> { [ j, J			], [ kana_MA		]	};

+    key <AC08> { [ k, K			], [ kana_NO		]	};

+    key <AC09> { [ l, L			], [ kana_RI		]	};

+    key <AC10> { [ semicolon, plus	], [ kana_RE		]	};

+    key <AC11> { [ colon, asterisk	], [ kana_KE		]	};

+    key <TLDE> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };

+

+    key <AB01> { [ z, Z 		], [ kana_TSU, kana_tsu	]	};

+    key <AB02> { [ x, X			], [ kana_SA		]	};

+    key <AB03> { [ c, C			], [ kana_SO		]	};

+    key <AB04> { [ v, V			], [ kana_HI		]	};

+    key <AB05> { [ b, B			], [ kana_KO		]	};

+    key <AB06> { [ n, N			], [ kana_MI		]	};

+    key <AB07> { [ m, M			], [ kana_MO		]	};

+    key <AB08> { [ comma, less		], [ kana_NE, kana_comma ]	};

+    key <AB09> { [ period, greater	], [ kana_RU, kana_fullstop ]	};

+    key <AB10> { [ slash, question	], [ kana_ME, kana_conjunctive ]};

+//    key <UNDR> { [ backslash, underscore], [ kana_RO		]	};

+

+    key <SPCE> { [ space		]			};

+//    key <KANJ> { [ Kanji		]			};

+//    key <HENK> { [ Henkan_Mode		]			};

+//    key <LNFD> { [ backslash, underscore], [ kana_RO		]};

+    // End alphanumeric section

+

+    // Begin "Function" section

+    key <ESC>  { [ Escape		]			};

+    key <FK01> { [ F1			]			};

+    key <FK02> { [ F2			]			};

+    key <FK03> { [ F3			]			};

+    key <FK04> { [ F4			]			};

+    key <FK05> { [ F5			]			};

+    key <FK06> { [ F6			]			};

+    key <FK07> { [ F7			]			};

+    key <FK08> { [ F8			]			};

+    key <FK09> { [ F9			]			};

+    key <FK10> { [ F10			]			};

+    key <FK11> { [ SunF36		]			};

+    key <FK12> { [ SunF37		]			};

+    key <BKSL> { [ backslash, bar	], [ prolongedsound 	] };

+//    key <BRCR> { [ Linefeed		]			};

+//    key <EXEC> { [ Execute		]			};

+

+    key <ESC>  { [ Escape, 3 ] };

+

+    key <AE02> { [ 2, at		], [ kana_FU			]};

+    key <AE06> { [ 6, asciicircum	], [ kana_O, kana_o		]};

+    key <AE07> { [ 7, ampersand		], [ kana_YA, kana_ya		]};

+    key <AE08> { [ 8, asterisk		], [ kana_YU, kana_yu		]};

+    key <AE09> { [ 9, parenleft		], [ kana_YO, kana_yo		]};

+    key <AE10> { [ 0, parenright	], [ kana_WA, kana_WO		]};

+    key <AE11> { [ minus, underscore	], [ kana_HO			]};

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

+

+    key <BKSL> { [ backslash, bar	    ], [ prolongedsound		]};

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

+

+    key <AD11> { [ bracketleft, braceleft  ], [ voicedsound		]};    

+    key <AD12> { [ bracketright, braceright  ], [ semivoicedsound, kana_openingbracket	]};    

+

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

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

+

+    key <TLDE> { [ quoteleft, asciitilde ], [ kana_MU, kana_closingbracket	]};

+    key <LSGT> { [ backslash, bar	 ], [ kana_RO			]};

+//    key <ALGR> { [ Mode_switch ]	       };

+    key <RALT> { [ Henkan_Mode ]	       };

+    key <RCTL> { [ Mode_switch ]	       };

+

+};

+

+xkb_symbols "Muhenkan_x86" {

+    include "sun_vndr/jp(x86)"

+

+    key <EXEC> { [ Muhenkan ] };

+};

+

+

+

+partial

+xkb_symbols "type7" {

+    include "sun_vndr/jp(type6)"

+    key <AE10> { [ 0, asciitilde       ], [ kana_WA, kana_WO   ]       };

+    key <TLDE> { [ Henkan_Mode ] };

+    key <HENK> { [ Kana_Lock, Mode_switch ] };

+    key <ALGR> { [ Alt_R, Alt_R ] };

+};

+

diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/kr b/xorg-server/xkbdata.src/symbols/sun_vndr/kr
new file mode 100644
index 000000000..51959b23f
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/kr
@@ -0,0 +1,98 @@
+//

+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.

+//

+// Permission is hereby granted, free of charge, to any person obtaining a

+// copy of this software and associated documentation files (the

+// "Software"), to deal in the Software without restriction, including

+// without limitation the rights to use, copy, modify, merge, publish,

+// distribute, and/or sell copies of the Software, and to permit persons

+// to whom the Software is furnished to do so, provided that the above

+// copyright notice(s) and this permission notice appear in all copies of

+// the Software and that both the above copyright notice(s) and this

+// permission notice appear in supporting documentation.

+// 

+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

+// 

+// Except as contained in this notice, the name of a copyright holder

+// shall not be used in advertising or otherwise to promote the sale, use

+// or other dealings in this Software without prior written authorization

+// of the copyright holder.

+//

+//

+

+//

+// CDDL HEADER START

+//

+// The contents of this file are subject to the terms of the

+// Common Development and Distribution License (the "License").

+// You may not use this file except in compliance with the License.

+//

+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE

+// or http://www.opensolaris.org/os/licensing.

+// See the License for the specific language governing permissions

+// and limitations under the License.

+//

+// When distributing Covered Code, include this CDDL HEADER in each

+// file and include the License file at src/OPENSOLARIS.LICENSE.

+// If applicable, add the following below this CDDL HEADER, with the

+// fields enclosed by brackets "[]" replaced with your own identifying

+// information: Portions Copyright [yyyy] [name of copyright owner]

+//

+// CDDL HEADER END

+//

+

+// Korean layout for a Type 6 Sun keyboard

+partial

+xkb_symbols "type6" {

+

+    // A few keys are different

+    key <ALGR> { [ Hangul                       ]       };

+    key <COMP> { [ Hangul_Hanja                 ]       };

+    key <KANA> { [ Hangul                       ]       };

+    key <EISU> { [ Hangul_Hanja                 ]       };

+    key <BKSL> { [ backslash, bar,  brokenbar   ]       };

+

+        include "level3(ralt_switch)"

+

+};

+

+

+// Korean layout for a Type 4 Sun keyboard

+xkb_symbols "type4" {

+

+    key <BKSL> { [ backslash, bar,  brokenbar	]		};

+

+    key <LNFD> { [ Hangul		]			};

+    key <RALT> { [ Linefeed		]			};

+    key <COMP> { [ Hangul_Hanja		]			};

+

+	include "level3(ralt_switch)"

+

+};

+

+// Korean layout for a Type 5 Sun keyboard

+xkb_symbols "type5" {

+

+    // A few keys are different

+    key <ALGR> { [ Hangul		]				  };

+    key <COMP> { [ Hangul_Hanja		]				  };

+    key <BKSL> { [ backslash, bar,  brokenbar			] };

+

+	include "level3(ralt_switch)"

+

+};

+

+

+partial default alphanumeric_keys

+	xkb_symbols "basic" {

+	include "sun_vndr/kr(type6)"

+};

+

diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/lt b/xorg-server/xkbdata.src/symbols/sun_vndr/lt
index 8a8d54a64..6e51cb342 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/lt
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/lt
@@ -1,75 +1,119 @@
-// $XdotOrg: $
-//
-// Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice (including the next
-// paragraph) shall be included in all copies or substantial portions of the
-// Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-// $TOG: hu /main/2 1997/06/13 06:25:05 kaleb $
-default partial alphanumeric_keys 
-xkb_symbols "type5" {
-
-    // Describes the differences between a very simple US/ASCII
-    // keyboard and a very simple Hungarian keyboard.
-
-    // Alphanumeric section
-
-    name[group1]="Lithuanian";
-
-    key <TLDE> {	[	quoteright,	asciitilde	],
-			[	quoteleft,	caron		]	};
-    key <AE02> {	[	2,		quotedbl	],
-			[	at				]	};
-    key <AE03> {	[	3,		slash		],
-			[	numbersign			]	};
-    key <AE04> {	[	4,		semicolon	],
-			[	dollar				]	};
-    key <AE05> {	[	5,		colon		],
-			[	percent				]	};
-    key <AE06> {	[	6,		comma		],
-			[	asciicircum			]	};
-    key <AE07> {	[	7,		period		],
-			[	ampersand			]	};
-    key <AE08> {	[	8,		question	],
-			[	asterisk			]	};
-    key <AE09> {	[	9,		parenleft	],
-			[	bracketleft,	braceleft	]	};
-    key <AE10> {	[	0,		parenright	],
-			[	bracketright,	braceright 	]	};
-    key <AD01> {	[	aogonek,	Aogonek		],
-			[	q,		Q		]	};
-    key <AD02> {	[	zcaron,		Zcaron		],
-			[	w,		W		]	};
-    key <AD11> {	[	iogonek,	Iogonek		]	};
-    key <AD12> {	[	ogonek				]	};
-    key <AC10> {	[	uogonek,	Uogonek		]	};
-    key <AC11> {	[	eabovedot,	Eabovedot	]	};
-    key <BKSL> {	[	asciicircum,	quoteright	]	};
-    key <LSGT> {	[	backslash,	bar		]	};
-    key <AB02> {	[	umacron,	Umacron		],
-			[	x,		X		]	};
-    key <AB08> {	[	ccaron,		Ccaron		],
-			[	less				]	};
-    key <AB09> {	[	scaron,		Scaron		],
-			[	greater				]	};
-    key <AB10> {	[	eogonek,	Eogonek		]	};
-
-    // End alphanumeric section
-};
-
+//

+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.

+//

+// Permission is hereby granted, free of charge, to any person obtaining a

+// copy of this software and associated documentation files (the

+// "Software"), to deal in the Software without restriction, including

+// without limitation the rights to use, copy, modify, merge, publish,

+// distribute, and/or sell copies of the Software, and to permit persons

+// to whom the Software is furnished to do so, provided that the above

+// copyright notice(s) and this permission notice appear in all copies of

+// the Software and that both the above copyright notice(s) and this

+// permission notice appear in supporting documentation.

+// 

+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

+// 

+// Except as contained in this notice, the name of a copyright holder

+// shall not be used in advertising or otherwise to promote the sale, use

+// or other dealings in this Software without prior written authorization

+// of the copyright holder.

+//

+

+//

+// CDDL HEADER START

+//

+// The contents of this file are subject to the terms of the

+// Common Development and Distribution License (the "License").

+// You may not use this file except in compliance with the License.

+//

+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE

+// or http://www.opensolaris.org/os/licensing.

+// See the License for the specific language governing permissions

+// and limitations under the License.

+//

+// When distributing Covered Code, include this CDDL HEADER in each

+// file and include the License file at src/OPENSOLARIS.LICENSE.

+// If applicable, add the following below this CDDL HEADER, with the

+// fields enclosed by brackets "[]" replaced with your own identifying

+// information: Portions Copyright [yyyy] [name of copyright owner]

+//

+// CDDL HEADER END

+//

+

+

+partial default alphanumeric_keys

+xkb_symbols "type6" {

+

+    name[Group1]="Lithuania";

+

+

+

+    key <TLDE>  { [ quoteleft,   asciitilde,	notsign,   brokenbar ]    };

+    key <AE01>  { [   aogonek,      Aogonek,	1,      exclam ]    };

+    key <AE02>  { [    ccaron,       Ccaron,	2,          at ]    };

+    key <AE03>  { [   eogonek,      Eogonek,	3,  numbersign ]    };

+    key <AE04>  { [ eabovedot,    Eabovedot,	4,      dollar ]    };

+    key <AE05>  { [   iogonek,      Iogonek,	5,     percent ]    };

+    key <AE06>  { [    scaron,       Scaron,	6, asciicircum ]    };

+    key <AE07>  { [   uogonek,      Uogonek,	7,   ampersand ]    };

+    key <AE08>  { [   umacron,      Umacron,	8,    asterisk ]    };

+    key <AE09>  { [  doublelowquotemark,  parenleft,	9,  parenleft ]    };

+    key <AE10>  { [ leftdoublequotemark, parenright,	0, parenright ]    };

+    key <AE11>  { [     minus,   underscore,	backslash, questiondown ]  };

+    key <AE12>  { [    zcaron,       Zcaron,	equal,         plus ]  };

+

+    key <AD01>  { [         q,          Q,	at,  Greek_OMEGA ] };

+    key <AD02>  { [         w,          W,	lstroke,      Lstroke ] };

+    key <AD03>  { [         e,          E,	EuroSign               ] };

+    key <AD04>  { [         r,          R,	paragraph,   registered ] };

+    key <AD05>  { [         t,          T,	tslash,       Tslash ] };

+    key <AD06>  { [         y,          Y,	leftarrow,          yen ] };

+    key <AD07>  { [         u,          U,	downarrow,      uparrow ] };

+    key <AD08>  { [         i,          I,	rightarrow,     idotless ] };

+    key <AD09>  { [         o,          O,	oslash,     Ooblique ] };

+    key <AD10>  { [         p,          P,	thorn,        THORN ] };

+    key <AD11>  { [  bracketleft,  braceleft,	dead_diaeresis, dead_abovering ] };

+    key <AD12>  { [ bracketright, braceright,	dead_tilde,    dead_macron ] };

+

+    key <AC01>  { [         a,          A,	ae,           AE ] };

+    key <AC02>  { [         s,          S,	ssharp,      section ] };

+    key <AC03>  { [         d,          D,	eth,          ETH ] };

+    key <AC04>  { [         f,          F,	dstroke,  ordfeminine ] };

+    key <AC05>  { [         g,          G,	eng,          ENG ] };

+    key <AC06>  { [         h,          H,	hstroke,      Hstroke ] };

+    key <AC07>  { [         j,          J ] 				    };

+    key <AC08>  { [         k,          K,	kra,    ampersand ] };

+    key <AC09>  { [         l,          L,	lstroke,      Lstroke ] };

+    key <AC10>  { [  semicolon,     colon,	dead_acute, dead_doubleacute ] };

+    key <AC11>  { [ apostrophe,  quotedbl,	dead_circumflex,  dead_caron ] };

+    key <LSGT>  { [  backslash,       bar,	dead_grave,   dead_breve ] };

+

+    key <BKSL>  { [ backslash,        bar,	dead_grave,   dead_breve ] };

+    key <AB01>  { [         z,          Z,	guillemotleft,        less ] };

+    key <AB02>  { [         x,          X,	guillemotright,    greater ] };

+    key <AB03>  { [         c,          C,	cent,    copyright ] };

+    key <AB04>  { [         v,          V,	leftdoublequotemark, leftsinglequotemark ]   };

+    key <AB05>  { [         b,          B,	rightdoublequotemark, rightsinglequotemark ] };

+    key <AB06>  { [         n,          N ]     };

+    key <AB07>  { [         m,          M,	mu,    masculine ] };

+    key <AB08>  { [     comma,       less,	ampersand,     multiply ] };

+    key <AB09>  { [    period,    greater,	periodcentered,   division ] };

+    key <AB10>  { [     slash,   question,	dead_belowdot, dead_abovedot ] };

+

+	include "level3(ralt_switch)"

+

+};

+

+partial alphanumeric_keys

+	xkb_symbols "basic" {

+	include "sun_vndr/lt(type6)"

+};

+

diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/lv b/xorg-server/xkbdata.src/symbols/sun_vndr/lv
index cb5f97c6f..6661afddf 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/lv
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/lv
@@ -1,69 +1,118 @@
-// $XdotOrg: $
-//
-// Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice (including the next
-// paragraph) shall be included in all copies or substantial portions of the
-// Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-default partial alphanumeric_keys 
-xkb_symbols "type5" {
-
-    // Describes the differences between a very simple US/ASCII
-    // keyboard and a very simple Latvian keyboard.
-
-    // Alphanumeric section
-
-    name[group1]="Latvian";
-
-    key <AE04> {	[	4,		dollar		],
-			[	section				]	};
-    key <AE08> {	[	8,		asterisk	],
-			[	multiply			]	};
-    key <AD03> {        [       e,              E               ],
-			[	emacron,	Emacron		]	};
-    key <AD04> {        [       r,              R               ],
-			[	rcedilla,	Rcedilla	]	};
-    key <AD07> {        [       u,              U               ],
-			[	umacron,	Umacron		]	};
-    key <AD08> {        [       i,              I               ],
-			[	imacron,	Imacron		]	};
-    key <AD09> {        [       o,              O               ],
-			[	omacron,	Omacron		]	};
-    key <AC01> {	[	a,		A		],
-			[	amacron,	Amacron		]	};
-    key <AC02> {	[	s,		S		],
-			[	scaron,		Scaron		]	};
-    key <AC05> {	[	g,		G		],
-			[	gcedilla,	Gcedilla	]	};
-    key <AC08> {	[	k,		K		],
-			[	kcedilla,	Kcedilla	]	};
-    key <AC09> {	[	l,		L		],
-			[	lcedilla,	Lcedilla	]	};
-    key <BKSL> {	[	degree,		bar		]	};
-    key <LSGT> {	[	backslash,	bar		]	};
-    key <AB01> {	[	z,		Z		],
-			[	zcaron,		Zcaron		]	};
-    key <AB03> {	[	c,		C		],
-			[	ccaron,		ccaron		]	};
-    key <AB06> {	[	n,		N		],
-			[	ncedilla,	Ncedilla	]	};
-    // End alphanumeric section
-};
-
+//

+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.

+//

+// Permission is hereby granted, free of charge, to any person obtaining a

+// copy of this software and associated documentation files (the

+// "Software"), to deal in the Software without restriction, including

+// without limitation the rights to use, copy, modify, merge, publish,

+// distribute, and/or sell copies of the Software, and to permit persons

+// to whom the Software is furnished to do so, provided that the above

+// copyright notice(s) and this permission notice appear in all copies of

+// the Software and that both the above copyright notice(s) and this

+// permission notice appear in supporting documentation.

+// 

+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

+// 

+// Except as contained in this notice, the name of a copyright holder

+// shall not be used in advertising or otherwise to promote the sale, use

+// or other dealings in this Software without prior written authorization

+// of the copyright holder.

+//

+

+//

+// CDDL HEADER START

+//

+// The contents of this file are subject to the terms of the

+// Common Development and Distribution License (the "License").

+// You may not use this file except in compliance with the License.

+//

+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE

+// or http://www.opensolaris.org/os/licensing.

+// See the License for the specific language governing permissions

+// and limitations under the License.

+//

+// When distributing Covered Code, include this CDDL HEADER in each

+// file and include the License file at src/OPENSOLARIS.LICENSE.

+// If applicable, add the following below this CDDL HEADER, with the

+// fields enclosed by brackets "[]" replaced with your own identifying

+// information: Portions Copyright [yyyy] [name of copyright owner]

+//

+// CDDL HEADER END

+//

+

+

+partial default alphanumeric_keys

+xkb_symbols "type6" {

+

+    name[Group1]="Latvia";

+

+

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

+   key <AE01> { [              1,        exclam,	onesuperior,    exclamdown ] };

+   key <AE02> { [              2,            at,	twosuperior,     oneeighth ] };

+   key <AE03> { [              3,    numbersign,	threesuperior,      sterling ] };

+   key <AE04> { [              4,        dollar,	EuroSign,          cent ] };

+   key <AE05> { [              5,       percent,	onehalf,  threeeighths ] };

+   key <AE06> { [              6,   asciicircum,	threequarters,   fiveeighths ] };

+   key <AE07> { [              7,     ampersand,	braceleft,  seveneighths ] };

+   key <AE08> { [              8,      asterisk,	bracketleft,     trademark ] };

+   key <AE09> { [              9,     parenleft,	bracketright,     plusminus ] };

+   key <AE10> { [              0,    parenright,	braceright,        degree ] };

+   key <AE11> { [          minus,    underscore,	backslash,  questiondown ] };

+   key <AE12> { [          equal,          plus,	endash,        emdash ] };

+

+   key <AD01> { [              q,             Q,	q,             Q ] };

+   key <AD02> { [              w,             W,	w,             W ] };

+   key <AD03> { [              e,             E,	emacron,       Emacron ] };

+   key <AD04> { [              r,             R,	rcedilla,      Rcedilla ] };

+   key <AD05> { [              t,             T,	t,             T ] };

+   key <AD06> { [              y,             Y,	y,             Y ] };

+   key <AD07> { [              u,             U,	umacron,       Umacron ] };

+   key <AD08> { [              i,             I,	imacron,       Imacron ] };

+   key <AD09> { [              o,             O,	omacron,       Omacron ] };

+   key <AD10> { [              p,             P,	p,             P ] };

+   key <AD11> { [    bracketleft,     braceleft,	guillemotleft, leftdoublequotemark ] };

+   key <AD12> { [   bracketright,    braceright,	guillemotright, rightdoublequotemark ] };

+

+   key <AC01> { [              a,             A,	amacron,       Amacron ] };

+   key <AC02> { [              s,             S,	scaron,        Scaron ] };

+   key <AC03> { [              d,             D,	d,             D ] };

+   key <AC04> { [              f,             F,	f,             F ] };

+   key <AC05> { [              g,             G,	gcedilla,      Gcedilla ] };

+   key <AC06> { [              h,             H,	h,             H ] };

+   key <AC07> { [              j,             J,	j,             J ] };

+   key <AC08> { [              k,             K,	kcedilla,      Kcedilla ] };

+   key <AC09> { [              l,             L,	lcedilla,      Lcedilla ] };

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

+   key <AC11> { [     apostrophe,      quotedbl,	leftdoublequotemark, doublelowquotemark ] };

+   key <LSGT> { [      backslash,           bar,	degree,     brokenbar ] };

+

+   key <BKSL> { [      backslash,           bar,	grave,         breve ] };

+   key <AB01> { [              z,             Z,	zcaron,        Zcaron ] };

+   key <AB02> { [              x,             X,	x,             X ] };

+   key <AB03> { [              c,             C,	ccaron,        Ccaron ] };

+   key <AB04> { [              v,             V,	v,             V ] };

+   key <AB05> { [              b,             B,	b,             B ] };

+   key <AB06> { [              n,             N,	ncedilla,      Ncedilla ] };

+   key <AB07> { [              m,             M,	m,             M ] };

+   key <AB08> { [          comma,          less,	horizconnector,      multiply ] };

+   key <AB09> { [         period,       greater,	periodcentered,      division ] };

+   key <AB10> { [          slash,      question,	slash,      abovedot ] };

+

+	include "level3(ralt_switch)"

+

+};

+

+partial alphanumeric_keys

+	xkb_symbols "basic" {

+	include "sun_vndr/lv(type6)"

+};

+

diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/nl b/xorg-server/xkbdata.src/symbols/sun_vndr/nl
index f6564d132..703614277 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/nl
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/nl
@@ -1,62 +1,149 @@
-// $XdotOrg: $
-//
-// Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice (including the next
-// paragraph) shall be included in all copies or substantial portions of the
-// Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-xkb_symbols "type4" {
-    include "sun_vndr/us(type4basic)"
-    // A few keys are different
-
-    key <BKSL> { [ at, section		], [notsign ]		};
-    key <BRCR> { [ backslash, bar	]			};
-    key <AE01> { [ 1, exclam		], [onesuperior	]	};
-    key <AE02> { [ 2, quotedbl		], [twosuperior	]	};
-    key <AE03> { [ 3, numbersign	], [threesuperior]	};
-    key <AE04> { [ 4, dollar		], [onequarter	]	};
-    key <AE05> { [ 5, percent		], [onehalf	]	};
-    key <AE06> { [ 6, ampersand		], [threequarters]	};
-    key <AE07> { [ 7, underscore	], [sterling	]	};
-    key <AE08> { [ 8, parenleft		], [braceleft	]	};
-    key <AE09> { [ 9, parenright	], [braceright	]	};
-    key <AE10> { [ 0, quoteright	], [quoteleft	]	};
-    key <AE11> { [ slash, question	]			};
-    key <AE12> { [ degree, SunFA_Tilde	], [SunFA_Cedilla]	};
-    key <AD03> { [ e, E			], [EuroSign	]	};
-    key <AD11> { [ SunFA_Diaeresis, asciicircum], [SunFA_Circum]};
-    key <AD12> { [ asterisk, brokenbar	], [asciitilde	]	};
-    key <AC02> { [ S, NoSymbol		], [ssharp	]	};
-    key <AC10> { [ plus, plusminus	]			};
-    key <AC11> { [ SunFA_Acute, SunFA_Grave]			};
-    key <TLDE> { [ less, greater	]			};
-    key <LSGT> { [ bracketright, bracketleft]			};
-    key <AB01> { [ Z, NoSymbol		], [guillemotleft]	};
-    key <AB02> { [ X, NoSymbol		], [guillemotright]	};
-    key <AB03> { [ C, NoSymbol		], [cent	]	};
-    key <AB07> { [ M, NoSymbol		], [mu		]	};
-    key <AB08> { [ comma, semicolon	] 			};
-    key <AB09> { [ period, colon	]			};
-    key <AB10> { [ minus, equal		]			};
-    key <CAPS> { [ SunAltGraph		]			};
-//    key <COMP> { [ SunCompose		]			};
-    key <ALGR> { [ Caps_Lock		]			};
- 
-};
-
+//

+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.

+//

+// Permission is hereby granted, free of charge, to any person obtaining a

+// copy of this software and associated documentation files (the

+// "Software"), to deal in the Software without restriction, including

+// without limitation the rights to use, copy, modify, merge, publish,

+// distribute, and/or sell copies of the Software, and to permit persons

+// to whom the Software is furnished to do so, provided that the above

+// copyright notice(s) and this permission notice appear in all copies of

+// the Software and that both the above copyright notice(s) and this

+// permission notice appear in supporting documentation.

+// 

+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

+// 

+// Except as contained in this notice, the name of a copyright holder

+// shall not be used in advertising or otherwise to promote the sale, use

+// or other dealings in this Software without prior written authorization

+// of the copyright holder.

+//

+

+//

+// CDDL HEADER START

+//

+// The contents of this file are subject to the terms of the

+// Common Development and Distribution License (the "License").

+// You may not use this file except in compliance with the License.

+//

+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE

+// or http://www.opensolaris.org/os/licensing.

+// See the License for the specific language governing permissions

+// and limitations under the License.

+//

+// When distributing Covered Code, include this CDDL HEADER in each

+// file and include the License file at src/OPENSOLARIS.LICENSE.

+// If applicable, add the following below this CDDL HEADER, with the

+// fields enclosed by brackets "[]" replaced with your own identifying

+// information: Portions Copyright [yyyy] [name of copyright owner]

+//

+// CDDL HEADER END

+//

+

+default partial alphanumeric_keys

+xkb_symbols "type6" {

+

+    name[Group1]="Netherlands";

+

+    key <TLDE>  { [        at,    section,      notsign ] };

+    key <AE01>  { [         1,     exclam,  onesuperior ] };

+    key <AE02>  { [         2,   quotedbl,  twosuperior ] };

+    key <AE03>  { [         3,    numbersign, threesuperior ] };

+    key <AE04>  { [         4,    dollar,  onequarter ] };

+    key <AE05>  { [         5,    percent,   onehalf ] };

+    key <AE06>  { [         6,  ampersand, threequarters ] };

+    key <AE07>  { [         7, underscore,     sterling ] };

+    key <AE08>  { [         8,  parenleft,    braceleft ] };

+    key <AE09>  { [         9, parenright,   braceright ] };

+    key <AE10>  { [         0, quoteright,   quoteleft ] };

+    key <AE11>  { [     slash,   question,    backslash ] };

+    key <AE12>  { [    degree, dead_tilde, dead_cedilla ] };

+

+    key <AD03>  { [         e,          E,     EuroSign ] };

+    key <AD05>  { [         t,          T ] };

+    key <AD06>  { [         y,          Y ] };

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

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

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

+    key <AD10>  { [         p,          P ] };

+    key <AD11>  { [dead_diaeresis, dead_circumflex ]    };

+    key <AD12>  { [  asterisk,        bar,  asciitilde ] };

+

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

+    key <AC02>  { [         s,    S, ssharp ] };

+    key <AC04>  { [         f,          F ] };

+    key <AC10>  { [      plus,  plusminus ] };

+    key <AC11>  { [dead_acute, dead_grave ] };

+    key <BKSL>  { [      less,    greater,   asciicircum ] };

+

+    key <LSGT>  { [bracketright, bracketleft,       brokenbar ] };

+    key <AB01>  { [         z,    Z, guillemotleft ] };

+    key <AB02>  { [         x,    X, guillemotright ] };

+    key <AB03>  { [         c,    C, cent                     ] };

+    key <AB06>  { [         n,          N ] };

+    key <AB07>  { [         m,          M,     mu ] };

+    key <AB08>  { [     comma,  semicolon ] };

+    key <AB09>  { [    period,      colon ] };

+    key <AB10>  { [     minus,      equal ] };

+

+        include "level3(ralt_switch)"

+

+};

+

+

+partial alphanumeric_keys

+xkb_symbols "type4" {

+

+    name[Group1]="Netherlands - Sun type 4";

+

+    key <BKSL> { [ at, section, notsign ]           };

+    key <BRCR> { [ backslash, bar       ]                       };

+    key <AE01> { [ 1, exclam, onesuperior ]       };

+    key <AE02> { [ 2, quotedbl, twosuperior ]       };

+    key <AE03> { [ 3, numbersign, threesuperior]      };

+    key <AE04> { [ 4, dollar, onequarter  ]       };

+    key <AE05> { [ 5, percent, onehalf     ]       };

+    key <AE06> { [ 6, ampersand, threequarters]      };

+    key <AE07> { [ 7, underscore, sterling    ]       };

+    key <AE08> { [ 8, parenleft, braceleft   ]       };

+    key <AE09> { [ 9, parenright, braceright  ]       };

+    key <AE10> { [ 0, quoteright, quoteleft   ]       };

+    key <AE11> { [ slash, question, backslash  ]        };

+    key <AE12> { [ degree, dead_tilde, dead_cedilla]      };

+    key <AD03> { [ e, E, EuroSign, Eacute    ]};

+    key <AD11> { [ dead_diaeresis, dead_circumflex, asciitilde, asciicircum]};

+    key <AD12> { [ asterisk, bar, asciitilde  ]       };

+    key <AC02> { [ S, S, ssharp      ]               };

+    key <AC10> { [ plus, plusminus      ]                       };

+    key <AC11> { [ dead_acute, dead_grave ]                    };

+    key <TLDE> { [ less, greater, asciicircum ]       };

+    key <LSGT> { [ bracketleft, bracketright, brokenbar ]     };

+    key <AB01> { [ z, Z, guillemotleft]      };

+    key <AB02> { [ x, X, guillemotright]     };

+    key <AB03> { [ c, C, cent        ]       };

+    key <AB07> { [ m, M, Greek_mu, masculine ]       };

+    key <AB08> { [ comma, semicolon, cedilla, guillemotleft]     };

+    key <AB09> { [ period, colon, periodcentered, guillemotright ] };

+    key <AB10> { [ minus, equal, hyphen ]            };

+    key <CAPS> { [ SunAltGraph          ]                       };

+//    key <COMP> { [ SunCompose         ]                       };

+    key <ALGR> { [ Caps_Lock            ]                       }; 

+

+	include "level3(ralt_switch)"

+

+};

+

+

+partial alphanumeric_keys

+	xkb_symbols "basic" {

+	include "sun_vndr/nl(type6)"

+};

+

diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/no b/xorg-server/xkbdata.src/symbols/sun_vndr/no
index aad44cc20..1d1d43449 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/no
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/no
@@ -1,71 +1,145 @@
-// $XdotOrg: $
-//
-// Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice (including the next
-// paragraph) shall be included in all copies or substantial portions of the
-// Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-xkb_symbols "type4" {
-    include "sun_vndr/us(type4basic)"
-    // A few keys are different
-
-    key <BKSL> { [ bar, section		]			};
-    key <BRCR> { [ asciitilde, asciicircum]			};
-    key <AE02> { [ 2, quotedbl		], [at		]	};
-    key <AE03> { [ 3, numbersign	], [sterling	]	};
-    key <AE04> { [ 4, currency		], [dollar	]	};
-    key <AE06> { [ 6, ampersand		]			};
-    key <AE07> { [ 7, slash		], [braceleft	]	};
-    key <AE08> { [ 8, parenleft		], [bracketleft	]	};
-    key <AE09> { [ 9, parenright	], [bracketright]	};
-    key <AE10> { [ 0, equal		], [braceright	]	};
-    key <AE11> { [ plus, question	]			};
-    key <AE12> { [ backslash, SunFA_Grave], [SunFA_Acute]	};
-    key <AD03> { [ e, E			], [EuroSign	]	};
-    key <AD11> { [ Aring		]			};
-    key <AD12> { [ SunFA_Diaeresis, SunFA_Circum],[SunFA_Tilde] };
-    key <LCTL> { [ Caps_Lock		]			};
-    key <AC10> { [ Ooblique		]			};
-    key <AC11> { [ AE			]			};
-    key <TLDE> { [ quoteright, asterisk ], [quoteleft	]	};
-    key <LSGT> { [ less, greater	]			};
-    key <AB08> { [ comma, semicolon	]			};
-    key <AB09> { [ period, colon	]			};
-    key <AB10> { [ minus, underscore	]			};
-    key <CAPS> { [ Control_L		]			};
-
-};
-
-xkb_symbols "type5" {
-    include "no"
-
-    key <AE05> { [ 5, percent		], [asciitilde			]};
-    key <AE06> { [ 6, ampersand		], [asciicircum			]};
-    key <AE07> { [ 7, slash		], [ braceleft			]};
-    key <AE08> { [ 8, parenleft		], [ bracketright		]};
-    key <AE09> { [ 9, parenright	], [ bracketright		]};
-    key <AE10> { [ 0, equal		], [ braceright			]};
-
-    key <BKSL> { [ quoteright, asterisk	], [ quoteleft			]};
-    key <LSGT> { [ less, greater	]				};
-};
-
-
-
+//

+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.

+//

+// Permission is hereby granted, free of charge, to any person obtaining a

+// copy of this software and associated documentation files (the

+// "Software"), to deal in the Software without restriction, including

+// without limitation the rights to use, copy, modify, merge, publish,

+// distribute, and/or sell copies of the Software, and to permit persons

+// to whom the Software is furnished to do so, provided that the above

+// copyright notice(s) and this permission notice appear in all copies of

+// the Software and that both the above copyright notice(s) and this

+// permission notice appear in supporting documentation.

+// 

+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

+// 

+// Except as contained in this notice, the name of a copyright holder

+// shall not be used in advertising or otherwise to promote the sale, use

+// or other dealings in this Software without prior written authorization

+// of the copyright holder.

+//

+

+//

+// CDDL HEADER START

+//

+// The contents of this file are subject to the terms of the

+// Common Development and Distribution License (the "License").

+// You may not use this file except in compliance with the License.

+//

+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE

+// or http://www.opensolaris.org/os/licensing.

+// See the License for the specific language governing permissions

+// and limitations under the License.

+//

+// When distributing Covered Code, include this CDDL HEADER in each

+// file and include the License file at src/OPENSOLARIS.LICENSE.

+// If applicable, add the following below this CDDL HEADER, with the

+// fields enclosed by brackets "[]" replaced with your own identifying

+// information: Portions Copyright [yyyy] [name of copyright owner]

+//

+// CDDL HEADER END

+//

+

+partial alphanumeric_keys

+xkb_symbols "type6" {

+

+    name[Group1]="Norway";

+

+    key <TLDE> { [             bar,         section                ] };

+    key <LSGT> { [            less,         greater                ] };

+    key <BKSL> { [      apostrophe,        asterisk,  grave        ] };

+    key <AE02> { [               2,        quotedbl,  at           ] };

+    key <AE03> { [               3,      numbersign,  sterling     ] };

+    key <AE04> { [               4,        currency,  dollar       ] };

+    key <AE05> { [               5,         percent,  asciitilde   ] };

+    key <AE06> { [               6,       ampersand,  asciicircum  ] };

+    key <AE07> { [               7,           slash,  braceleft    ] };

+    key <AE08> { [               8,       parenleft,  bracketleft  ] };

+    key <AE09> { [               9,      parenright,  bracketright ] };

+    key <AE10> { [               0,           equal,  braceright   ] };

+    key <AE11> { [            plus,        question                ] };

+    key <AE12> { [       backslash,      dead_grave,  dead_acute   ] };

+    key <AD03> { [               e,               E,  EuroSign     ] };

+    key <AD11> { [           aring,           Aring                ] };

+    key <AD12> { [  dead_diaeresis, dead_circumflex,  dead_tilde   ] };

+    key <AC10> { [          oslash,          Oslash                ] }; 

+    key <AC11> { [              ae,              AE                ] };

+    key <AB08> { [           comma,       semicolon                ] };

+    key <AB09> { [          period,           colon                ] };

+    key <AB10> { [           minus,      underscore                ] };

+

+        include "level3(ralt_switch)"

+        include "kpdl(comma)"

+

+};

+

+partial alphanumeric_keys

+xkb_symbols "type4" {

+

+     name[Group1]="Norway - Sun type 4";

+

+    key <BKSL> { [ bar, section         ]                       };

+    key <BRCR> { [ asciitilde, asciicircum]                     };

+    key <AE02> { [ 2, quotedbl, at          ]       };

+    key <AE03> { [ 3, numbersign, sterling    ]       };

+    key <AE04> { [ 4, currency, dollar      ]       };

+    key <AE06> { [ 6, ampersand         ]                       };

+    key <AE07> { [ 7, slash, braceleft   ]       };

+    key <AE08> { [ 8, parenleft, bracketleft ]       };

+    key <AE09> { [ 9, parenright, bracketright]       };

+    key <AE10> { [ 0, equal, braceright  ]       };

+    key <AE11> { [ plus, question       ]                       };

+    key <AE12> { [ backslash, dead_grave,  dead_acute ]       };

+    key <AD03> { [ e, E, EuroSign    ]       };

+    key <AD11> { [ aring, Aring                ]                       };

+    key <AD12> { [ dead_diaeresis, dead_circumflex,  dead_tilde ] };

+    key <LCTL> { [ Caps_Lock            ]                       };

+    key <AC10> { [ Ooblique             ]                       };

+    key <AC11> { [ ae, AE                   ]                       };

+    key <TLDE> { [ quoteright, asterisk, quoteleft   ]       };

+    key <LSGT> { [ less, greater        ]                       };

+    key <AB08> { [ comma, semicolon     ]                       };

+    key <AB09> { [ period, colon        ]                       };

+    key <AB10> { [ minus, underscore    ]                       };

+    key <CAPS> { [ Control_L            ]                       };

+

+	include "level3(ralt_switch)"

+	include "kpdl(comma)"

+

+};

+

+

+partial alphanumeric_keys

+xkb_symbols "type5" {

+    

+    name[Group1]="Norway - Sun type 5";

+

+    key <AE05> { [ 5, percent, asciitilde               ] };

+    key <AE06> { [ 6, ampersand, asciicircum            ] };

+    key <AE07> { [ 7, slash,  braceleft                 ] };

+    key <AE08> { [ 8, parenleft,  bracketright          ] };

+    key <AE09> { [ 9, parenright,  bracketright         ] };

+    key <AE10> { [ 0, equal,  braceright                ] };

+

+    key <BKSL> { [ quoteright, asterisk,  quoteleft     ] };

+    key <LSGT> { [ less, greater                        ] };

+

+	include "level3(ralt_switch)"

+	include "kpdl(comma)"

+

+};

+

+

+partial default alphanumeric_keys

+	xkb_symbols "basic" {

+	include "sun_vndr/no(type6)"

+};

+

diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/pl b/xorg-server/xkbdata.src/symbols/sun_vndr/pl
index deb58190d..684b54911 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/pl
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/pl
@@ -1,51 +1,102 @@
-// $XdotOrg: $
-//
-// Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice (including the next
-// paragraph) shall be included in all copies or substantial portions of the
-// Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-xkb_symbols "type5" {
-    include "sun_vndr/us(type5basic)"
-    // A few keys are different
-    key <TLDE> { [ quoteleft, asciitilde], [ degree, degree ]	};
-    key <AE02> { [ 2, quotedbl		], [ at		]	};
-    key <AE03> { [ 3, colon		], [ numbersign	]	};
-    key <AE04> { [ 4, question		], [ dollar	]	};
-    key <AE06> { [ 6, plus		], [ asciicircum ]	};
-    key <AE07> { [ 7, underscore	], [ ampersand	]	};
-    key <AE08> { [ 8, parenleft		], [ asterisk	]	};
-    key <AE09> { [ 9, parenright	]			};
-    key <AE10> { [ 0, equal		]			};
-    key <AE11> { [ zabovedot, Zabovedot	]			};
-    key <AE12> { [ dead_ogonek, Aacute ]			};
-    key <AD11> { [ oacute, zacute	], [ bracketleft, braceleft ] };
-    key <AD12> { [ slash, section	], [ bracketright, braceright ] };
-    key <AC02> { [ s, S			], [ ssharp	]	};
-    key <AC08> { [ k, K			], [ ampersand	]	};
-    key <AC10> { [ lstroke, Lstroke	]			};
-    key <AC11> { [ aogonek, eogonek	], [ quoteright	]	};
-    key <BKSL> { [ backslash, semicolon	], [ currency, bar ]	};
-    key <LSGT> { [ less, greater	]			};
-    key <AB08> { [ comma, sacute	], [ less	]	};
-    key <AB09> { [ period, nacute	], [ greater	]	};
-    key <AB10> { [ minus, cacute	]			};
-};
-
+//

+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.

+//

+// Permission is hereby granted, free of charge, to any person obtaining a

+// copy of this software and associated documentation files (the

+// "Software"), to deal in the Software without restriction, including

+// without limitation the rights to use, copy, modify, merge, publish,

+// distribute, and/or sell copies of the Software, and to permit persons

+// to whom the Software is furnished to do so, provided that the above

+// copyright notice(s) and this permission notice appear in all copies of

+// the Software and that both the above copyright notice(s) and this

+// permission notice appear in supporting documentation.

+// 

+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

+// 

+// Except as contained in this notice, the name of a copyright holder

+// shall not be used in advertising or otherwise to promote the sale, use

+// or other dealings in this Software without prior written authorization

+// of the copyright holder.

+//

+

+//

+// CDDL HEADER START

+//

+// The contents of this file are subject to the terms of the

+// Common Development and Distribution License (the "License").

+// You may not use this file except in compliance with the License.

+//

+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE

+// or http://www.opensolaris.org/os/licensing.

+// See the License for the specific language governing permissions

+// and limitations under the License.

+//

+// When distributing Covered Code, include this CDDL HEADER in each

+// file and include the License file at src/OPENSOLARIS.LICENSE.

+// If applicable, add the following below this CDDL HEADER, with the

+// fields enclosed by brackets "[]" replaced with your own identifying

+// information: Portions Copyright [yyyy] [name of copyright owner]

+//

+// CDDL HEADER END

+//

+

+

+partial default alphanumeric_keys

+xkb_symbols "type6" {

+

+    name[Group1]="Polish Developers";

+

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

+    key <AE01> { [ 1,		 exclam						] };

+    key <AE02> { [ 2,		 at						] };

+    key <AE03> { [ 3,		 numbersign 					] };

+    key <AE04> { [ 4,		 dollar	 					] };

+    key <AE05> { [ 5,		 percent 					] };

+    key <AE06> { [ 6,		 asciicirum					] };

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

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

+    key <AE09> { [ 9,		 parenleft					] };

+    key <AE10> { [ 0,		 parenright					] };

+    key <AE11> { [ minus,	 underscore 					] };

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

+

+    key <AD03> { [ e,		 E,		eogonek,	Eogonek		] };       

+    key <AD07> { [ u,		 U,		EuroSign			] };

+    key <AD09> { [ o,		 O,		oacute,		Oacute		] };

+    key <AD11> { [ bracketleft,  braceleft					] };

+    key <AD12> { [ bracketright, braceright					] };

+

+    key <AC01> { [ a,		 A,		aogonek,	Aogonek		] };

+    key <AC02> { [ s,		 S,		sacute,		Sacute		] };

+    key <AC09> { [ l,		 L,		lstroke,        Lstroke		] };

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

+    key <AC11> { [ apostrophe,	 quotedbl 					] };

+    key <BKSL> { [ backslash,	 bar,		brokenbar			] };

+

+    key <LSGT> { [ less,         greater,       bar,            brokenbar	] };

+    key <AB01> { [ z, 		 Z,		zabovedot,	Zabovedot	] };

+    key <AB02> { [ x,		 X,		zacute,		Zacute		] };

+    key <AB03> { [ c,		 C,		cacute,		Cacute		] };

+    key <AB06> { [ n,		 N,		nacute,		Nacute		] };

+    key <AB08> { [ comma,	 less 						] };

+    key <AB09> { [ period,	 greater				 	] };

+    key <AB10> { [ slash,	 question					] };

+

+	include "level3(ralt_switch)"

+

+};

+

+

+partial alphanumeric_keys

+	xkb_symbols "basic" {

+	include "sun_vndr/pl(type6)"

+};

+

diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/pt b/xorg-server/xkbdata.src/symbols/sun_vndr/pt
index a88c68270..561abb594 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/pt
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/pt
@@ -1,82 +1,143 @@
-// $XdotOrg: $
-//
-// Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice (including the next
-// paragraph) shall be included in all copies or substantial portions of the
-// Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-xkb_symbols "type4" {
-    //this is a Portugal4 keyboard
-
-    key <BKSL> { [ bracketleft, braceleft], [guillemotleft]	};
-    key <BRCR> { [ bracketright, braceright], [guillemotright]	};
-    key <AE02> { [ 2, quotedbl		], [at		]	};
-    key <AE03> { [ 3, numbersign	], [sterling	]	};
-    key <AE04> { [ 4, dollar		], [section	]	};
-    key <AE06> { [ 6, ampersand		], [notsign	]	};
-    key <AE07> { [ 7, slash		]			};
-    key <AE08> { [ 8, parenleft		]			};
-    key <AE09> { [ 9, parenright	], [backslash	]	};
-    key <AE10> { [ 0, equal		], [bar		]	};
-    key <AE11> { [ quoteright, question	], [quoteleft	]	};
-    key <AE12> { [ exclamdown, questiondown]			};
-    key <AD03> { [ e, E			], [EuroSign	]	};
-    key <AD11> { [ SunFA_Diaeresis, asterisk], [plus	]	};
-    key <AD12> { [ SunFA_Acute, SunFA_Grave], [asciitilde]	};
-    key <LCTL> { [ Caps_Lock		]			};
-    key <AC10> { [ Ccedilla		]			};
-    key <AC11> { [ masculine, ordfeminine]			};
-    key <TLDE> { [ SunFA_Tilde, SunFA_Circum], [asciicircum]	};
-    key <LSGT> { [ less, greater	]			};
-    key <AB08> { [ comma, semicolon	]			};
-    key <AB09> { [ period, colon	]			};
-    key <AB10> { [ minus, underscore	]			};
-    key <CAPS> { [ Control_L		]			};
-
-};
-
-xkb_symbols "type5" {
-    include "pt"
-
-    key <TLDE> { [ backslash, bar	]				};
-    key <AE05> { [ 5, percent		], [asciitilde			]};
-    key <AE06> { [ 6, ampersand		], [asciicircum			]};
-    key <AE07> { [ 7, slash		], [ braceleft			]};
-    key <AE08> { [ 8, parenleft		], [ bracketleft		]};
-    key <AE09> { [ 9, parenright	], [ bracketright		]};
-    key <AE10> { [ 0, equal		], [ braceright			]};
-    key <AE11> { [ quoteright, question	], [quoteleft			]};
-
-    key <AD11> { [ plus, asterisk	], [SunFA_Diaeresis		]};
-
-};
-
-partial 
-xkb_symbols "type6" {
-    include "pt(sundeadkeys)"
-
-    key <AE05> { [ 5, percent		], [asciitilde			]};
-    key <AE06> { [ 6, ampersand		], [asciicircum			]};
-    key <AE07> { [ 7, slash		], [ braceleft			]};
-    key <AE08> { [ 8, parenleft		], [ bracketleft		]};
-    key <AE09> { [ 9, parenright	], [ bracketright		]};
-    key <AE10> { [ 0, equal		], [ braceright			]};
-    key <AE11> { [ quoteright, question	], [quoteleft			]};
-
-};
+//

+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.

+//

+// Permission is hereby granted, free of charge, to any person obtaining a

+// copy of this software and associated documentation files (the

+// "Software"), to deal in the Software without restriction, including

+// without limitation the rights to use, copy, modify, merge, publish,

+// distribute, and/or sell copies of the Software, and to permit persons

+// to whom the Software is furnished to do so, provided that the above

+// copyright notice(s) and this permission notice appear in all copies of

+// the Software and that both the above copyright notice(s) and this

+// permission notice appear in supporting documentation.

+// 

+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

+// 

+// Except as contained in this notice, the name of a copyright holder

+// shall not be used in advertising or otherwise to promote the sale, use

+// or other dealings in this Software without prior written authorization

+// of the copyright holder.

+//

+

+//

+// CDDL HEADER START

+//

+// The contents of this file are subject to the terms of the

+// Common Development and Distribution License (the "License").

+// You may not use this file except in compliance with the License.

+//

+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE

+// or http://www.opensolaris.org/os/licensing.

+// See the License for the specific language governing permissions

+// and limitations under the License.

+//

+// When distributing Covered Code, include this CDDL HEADER in each

+// file and include the License file at src/OPENSOLARIS.LICENSE.

+// If applicable, add the following below this CDDL HEADER, with the

+// fields enclosed by brackets "[]" replaced with your own identifying

+// information: Portions Copyright [yyyy] [name of copyright owner]

+//

+// CDDL HEADER END

+//

+

+partial alphanumeric_keys

+xkb_symbols "type6" {

+

+    name[Group1]="Portugal";

+

+    key <LSGT> { [            less,          greater                  ] };

+    key <TLDE> { [       backslash,              bar                  ] };

+    key <AE02> { [               2,         quotedbl,              at ] };

+    key <AE03> { [               3,       numbersign,        sterling ] };

+    key <AE04> { [               4,           dollar,         section ] };

+    key <AE05> { [               5,          percent,      asciitilde ] };

+    key <AE06> { [               6,        ampersand,     asciicircum ] };

+    key <AE07> { [               7,            slash,       braceleft ] };

+    key <AE08> { [               8,        parenleft,     bracketleft ] };

+    key <AE09> { [               9,       parenright,    bracketright ] };

+    key <AE10> { [               0,            equal,      braceright ] };

+    key <AE11> { [      quoteright,         question,       quoteleft ] };

+    key <AE12> { [   guillemotleft,   guillemotright                  ] };

+    key <AD03> { [               e,                E,        EuroSign ] };

+    key <AD11> { [            plus,         asterisk,  dead_diaeresis ] }; 

+    key <AD12> { [      dead_acute,       dead_grave                  ] };

+    key <BKSL> { [      dead_tilde,  dead_circumflex                  ] };

+    key <AC10> { [        ccedilla,         Ccedilla                  ] };

+    key <AC11> { [       masculine,      ordfeminine                  ] };

+    key <AB08> { [           comma,        semicolon                  ] };

+    key <AB09> { [          period,            colon                  ] };

+    key <AB10> { [           minus,       underscore                  ] };

+

+        include "level3(ralt_switch)"

+

+};

+

+partial alphanumeric_keys

+xkb_symbols "type4" {

+

+     name[Group1]="Portugal - Sun type 4";

+

+    key <BKSL> { [ bracketleft, braceleft, guillemotleft]     };

+    key <BRCR> { [ bracketright, braceright, guillemotright]  };

+    key <AE02> { [ 2, quotedbl, at          ]       };

+    key <AE03> { [ 3, numbersign, sterling    ]       };

+    key <AE04> { [ 4, dollar, section     ]       };

+    key <AE06> { [ 6, ampersand, notsign     ]       };

+    key <AE07> { [ 7, slash             ]                       };

+    key <AE08> { [ 8, parenleft         ]                       };

+    key <AE09> { [ 9, parenright, backslash   ]       };

+    key <AE10> { [ 0, equal, bar         ]       };

+    key <AE11> { [ quoteright, question, quoteleft   ]       };

+    key <AE12> { [ exclamdown, questiondown ]                    };

+    key <AD03> { [ e, E, EuroSign    ]       };

+    key <AD11> { [ dead_diaeresis, asterisk, plus    ]       };

+    key <AD12> { [ dead_acute, dead_grave, asciitilde ]      };

+    key <LCTL> { [ Caps_Lock            ]                       };

+    key <AC10> { [ ccedilla, Ccedilla             ]                       };

+    key <AC11> { [ masculine, ordfeminine]                      };

+    key <TLDE> { [ dead_tilde, dead_circumflex, asciicircum ]    };

+    key <LSGT> { [ less, greater        ]                       };

+    key <AB08> { [ comma, semicolon     ]                       };

+    key <AB09> { [ period, colon        ]                       };

+    key <AB10> { [ minus, underscore    ]                       };

+    key <CAPS> { [ Control_L            ]                       };

+

+	include "level3(ralt_switch)"

+

+};

+

+

+partial alphanumeric_keys

+xkb_symbols "type5" {

+    

+    name[Group1]="Portugal - Sun type 5";

+

+    key <TLDE> { [ backslash, bar       ]                               };

+    key <AE05> { [ 5, percent, asciitilde                  ]};

+    key <AE06> { [ 6, ampersand, asciicircum                 ]};

+    key <AE07> { [ 7, slash,  braceleft                  ]};

+    key <AE08> { [ 8, parenleft,  bracketleft                ]};

+    key <AE09> { [ 9, parenright,  bracketright               ]};

+    key <AE10> { [ 0, equal,  braceright                 ]};

+    key <AE11> { [ quoteright, question, quoteleft                   ]};

+

+    key <AD11> { [ plus, asterisk, dead_diaeresis         ]};

+

+	include "level3(ralt_switch)"

+

+};

+

+

+partial default alphanumeric_keys

+	xkb_symbols "basic" {

+	include "sun_vndr/pt(type6)"

+};

+

diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/ro b/xorg-server/xkbdata.src/symbols/sun_vndr/ro
new file mode 100644
index 000000000..df87262ed
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/ro
@@ -0,0 +1,118 @@
+//

+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.

+//

+// Permission is hereby granted, free of charge, to any person obtaining a

+// copy of this software and associated documentation files (the

+// "Software"), to deal in the Software without restriction, including

+// without limitation the rights to use, copy, modify, merge, publish,

+// distribute, and/or sell copies of the Software, and to permit persons

+// to whom the Software is furnished to do so, provided that the above

+// copyright notice(s) and this permission notice appear in all copies of

+// the Software and that both the above copyright notice(s) and this

+// permission notice appear in supporting documentation.

+// 

+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

+// 

+// Except as contained in this notice, the name of a copyright holder

+// shall not be used in advertising or otherwise to promote the sale, use

+// or other dealings in this Software without prior written authorization

+// of the copyright holder.

+//

+

+//

+// CDDL HEADER START

+//

+// The contents of this file are subject to the terms of the

+// Common Development and Distribution License (the "License").

+// You may not use this file except in compliance with the License.

+//

+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE

+// or http://www.opensolaris.org/os/licensing.

+// See the License for the specific language governing permissions

+// and limitations under the License.

+//

+// When distributing Covered Code, include this CDDL HEADER in each

+// file and include the License file at src/OPENSOLARIS.LICENSE.

+// If applicable, add the following below this CDDL HEADER, with the

+// fields enclosed by brackets "[]" replaced with your own identifying

+// information: Portions Copyright [yyyy] [name of copyright owner]

+//

+// CDDL HEADER END

+//

+

+

+partial default alphanumeric_keys

+xkb_symbols "type6" {

+

+    name[Group1]="Romania";

+

+

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

+   key <AE01> { [              1,        exclam,	dead_tilde                ] };

+   key <AE02> { [              2,            at,	dead_caron                ] };

+   key <AE03> { [              3,    numbersign,	dead_circumflex                ] };

+   key <AE04> { [              4,        dollar,	dead_breve                ] };

+   key <AE05> { [              5,       percent,	dead_abovering                ] };

+   key <AE06> { [              6,   asciicircum,	dead_ogonek                ] };

+   key <AE07> { [              7,     ampersand,	dead_grave                ] };

+   key <AE08> { [              8,      asterisk,	dead_abovedot                ] };

+   key <AE09> { [              9,     parenleft,	dead_acute                ] };

+   key <AE10> { [              0,    parenright,	dead_doubleacute                ] };

+   key <AE11> { [          minus,    underscore,	dead_diaeresis,        endash ] };

+   key <AE12> { [          equal,          plus,	dead_cedilla,     plusminus ] };

+

+   key <AD01> { [              q,             Q,	acircumflex,   Acircumflex ] };

+   key <AD02> { [              w,             W,	ssharp                ] };

+   key <AD03> { [              e,             E,	EuroSign                ] };

+   key <AD04> { [              r,             R,	r,             R ] };

+   key <AD05> { [              t,             T,	0x100021b,     0x100021a ] };

+   key <AD06> { [              y,             Y,	y,             Y ] };

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

+   key <AD08> { [              i,             I,	icircumflex,   Icircumflex ] };

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

+   key <AD10> { [              p,             P,	section                ] };

+   key <AD11> { [    bracketleft,     braceleft,	doublelowquotemark              ] };

+   key <AD12> { [   bracketright,    braceright,	rightdoublequotemark            ] };

+

+   key <AC01> { [              a,             A,	abreve,        Abreve ] };

+   key <AC02> { [              s,             S,	0x1000219,     0x1000218 ] };

+   key <AC03> { [              d,             D,	dstroke,       Dstroke ] };

+   key <AC04> { [              f,             F,	f,             F ] };

+   key <AC05> { [              g,             G,	g,             G ] };

+   key <AC06> { [              h,             H,	h,             H ] };

+   key <AC07> { [              j,             J,	j,             J ] };

+   key <AC08> { [              k,             K,	k,             K ] };

+   key <AC09> { [              l,             L,	lstroke,       Lstroke ] };

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

+   key <AC11> { [     apostrophe,      quotedbl,	apostrophe,      quotedbl ] };

+   key <LSGT> { [      backslash,           bar,	backslash,     brokenbar ] };

+

+   key <BKSL> { [      backslash,           bar,	backslash,     brokenbar ] };

+   key <AB01> { [              z,             Z,	z,             Z ] };

+   key <AB02> { [              x,             X,	x,             X ] };

+   key <AB03> { [              c,             C,	copyright                ] };

+   key <AB04> { [              v,             V,	v,             V ] };

+   key <AB05> { [              b,             B,	b,             B ] };

+   key <AB06> { [              n,             N,	n,             N ] };

+   key <AB07> { [              m,             M,	m,             M ] };

+   key <AB08> { [          comma,          less,	guillemotleft,      multiply ] };

+   key <AB09> { [         period,       greater,	guillemotright,      division ] };

+   key <AB10> { [          slash,      question,	slash,      question ] };

+

+	include "level3(ralt_switch)"

+

+};

+

+partial alphanumeric_keys

+	xkb_symbols "basic" {

+	include "sun_vndr/ro(type6)"

+};

+

diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/ru b/xorg-server/xkbdata.src/symbols/sun_vndr/ru
index 101cad72d..833576dcc 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/ru
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/ru
@@ -1,46 +1,112 @@
-// $XdotOrg: $
-//
-// Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice (including the next
-// paragraph) shall be included in all copies or substantial portions of the
-// Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-
-xkb_symbols "basic" {
-    include "ru"
-    // A few keys are different
-    key	<BKSL> {	[	backslash,	       bar	],
-			[	slash,           question	]	};
-   key	<AB10> {	[	    slash,	  question	],
-			[	  ediaeresis,	Ediaeresis	]	};
-
-};
-
-// layout for a Sun Type 6 Russian keyboard
-partial
-xkb_symbols "type6" {
-    include "sun_vndr/ru(basic)"
-
-    key <AE03> {        [               3,      numbersign      ],
-                        [               3,      numerosign      ]       };
-    key	<AE04> {	[		4,	dollar		],
-			[		4,	percent		]	};
-
-    key	<LSGT> {	[	backslash,	       bar	] };
-};
+//

+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.

+//

+// Permission is hereby granted, free of charge, to any person obtaining a

+// copy of this software and associated documentation files (the

+// "Software"), to deal in the Software without restriction, including

+// without limitation the rights to use, copy, modify, merge, publish,

+// distribute, and/or sell copies of the Software, and to permit persons

+// to whom the Software is furnished to do so, provided that the above

+// copyright notice(s) and this permission notice appear in all copies of

+// the Software and that both the above copyright notice(s) and this

+// permission notice appear in supporting documentation.

+// 

+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

+// 

+// Except as contained in this notice, the name of a copyright holder

+// shall not be used in advertising or otherwise to promote the sale, use

+// or other dealings in this Software without prior written authorization

+// of the copyright holder.

+//

+

+//

+// CDDL HEADER START

+//

+// The contents of this file are subject to the terms of the

+// Common Development and Distribution License (the "License").

+// You may not use this file except in compliance with the License.

+//

+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE

+// or http://www.opensolaris.org/os/licensing.

+// See the License for the specific language governing permissions

+// and limitations under the License.

+//

+// When distributing Covered Code, include this CDDL HEADER in each

+// file and include the License file at src/OPENSOLARIS.LICENSE.

+// If applicable, add the following below this CDDL HEADER, with the

+// fields enclosed by brackets "[]" replaced with your own identifying

+// information: Portions Copyright [yyyy] [name of copyright owner]

+//

+// CDDL HEADER END

+//

+

+partial alphanumeric_keys

+xkb_symbols "type6" {

+

+     name[Group1]= "Russia";

+

+     key.type[group1]="FOUR_LEVEL";

+

+

+    key	<AE01> { [		1,	    exclam 	] };

+    key	<AE02> { [		2,        quotedbl, 2, at	] };

+    key	<AE03> { [		3,      numerosign, 3,  numbersign	] };

+    key	<AE04> { [		4,       percent, 4,      dollar 	] };

+    key	<AE05> { [		5,	     colon, 5, percent	] };

+    key	<AE07> { [		7,	    period, 7, ampersand	] };

+    key	<AE08> { [		8,	 semicolon, 8, asterisk 	] };

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

+    key	<AB10> { [      ediaeresis,      Ediaeresis,	    slash,	  question 	] };

+    key <LSGT> { [       backslash,             bar      ] };

+

+    key	<AD01> { [ Cyrillic_shorti, Cyrillic_SHORTI, q, Q	] };

+    key	<AD02> { [    Cyrillic_tse,    Cyrillic_TSE, w, W	] };

+    key	<AD03> { [      Cyrillic_u,	Cyrillic_U, e, E	] };

+    key	<AD04> { [     Cyrillic_ka,     Cyrillic_KA, r, R	] };

+    key	<AD05> { [     Cyrillic_ie,     Cyrillic_IE, t, T	] };

+    key	<AD06> { [     Cyrillic_en,     Cyrillic_EN, y, Y	] };

+    key	<AD07> { [    Cyrillic_ghe,    Cyrillic_GHE, u, U	] };

+    key	<AD08> { [    Cyrillic_sha,    Cyrillic_SHA, i, I	] };

+    key	<AD09> { [  Cyrillic_shcha,  Cyrillic_SHCHA, o, O	] };

+    key	<AD10> { [     Cyrillic_ze,     Cyrillic_ZE, p, P	] };

+    key	<AD11> { [     Cyrillic_ha,     Cyrillic_HA, bracketleft,       braceleft	] };

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

+    key	<AC01> { [     Cyrillic_ef,     Cyrillic_EF, a, A	] };

+    key	<AC02> { [   Cyrillic_yeru,   Cyrillic_YERU, s, S	] };

+    key	<AC03> { [     Cyrillic_ve,     Cyrillic_VE, d, D	] };

+    key	<AC04> { [      Cyrillic_a,	Cyrillic_A, f, F	] };

+    key	<AC05> { [     Cyrillic_pe,     Cyrillic_PE, g, G	] };

+    key	<AC06> { [     Cyrillic_er,     Cyrillic_ER, h, H	] };

+    key	<AC07> { [      Cyrillic_o,	Cyrillic_O, j, J	] };

+    key	<AC08> { [     Cyrillic_el,     Cyrillic_EL, k, K	] };

+    key	<AC09> { [     Cyrillic_de,     Cyrillic_DE, l, L	] };

+    key	<AC10> { [    Cyrillic_zhe,    Cyrillic_ZHE, semicolon,           colon	] };

+    key	<AC11> { [      Cyrillic_e,	Cyrillic_E, apostrophe,        quotedbl	] };

+    key	<AB01> { [     Cyrillic_ya,     Cyrillic_YA, z, Z	] };

+    key	<AB02> { [    Cyrillic_che,    Cyrillic_CHE, x, X	] };

+    key	<AB03> { [     Cyrillic_es,     Cyrillic_ES, c, C	] };

+    key	<AB04> { [     Cyrillic_em,     Cyrillic_EM, v, V	] };

+    key	<AB05> { [      Cyrillic_i,	Cyrillic_I, b, B	] };

+    key	<AB06> { [     Cyrillic_te,     Cyrillic_TE, n, N	] };

+    key	<AB07> { [Cyrillic_softsign,Cyrillic_SOFTSIGN, m, M	] };

+    key	<AB08> { [     Cyrillic_be,     Cyrillic_BE, comma,            less	] };

+    key	<AB09> { [     Cyrillic_yu,     Cyrillic_YU, period,         greater	] };

+

+    include "level3(ralt_switch)"

+

+};

+

+

+partial default alphanumeric_keys

+	xkb_symbols "basic" {

+	include "sun_vndr/ru(type6)"

+};

+

diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/se b/xorg-server/xkbdata.src/symbols/sun_vndr/se
index 3daf12525..ec41629cb 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/se
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/se
@@ -1,75 +1,280 @@
-// $XdotOrg: $
-//
-// Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice (including the next
-// paragraph) shall be included in all copies or substantial portions of the
-// Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-xkb_symbols "type4" {
-    key <BKSL> { [ section, onehalf	]			};
-    key <BRCR> { [ asciitilde, asciicircum ]			};
-    key <AE02> { [ 2, quotedbl		], [ at			] };
-    key <AE03> { [ 3, numbersign	], [ sterling		] };
-    key <AE04> { [ 4, currency		], [ dollar		] };
-    key <AE05> { [ 5, percent           ], [ degree           	] };
-    key <AE06> { [ 6, ampersand         ], [ notsign          	] };
-    key <AE07> { [ 7, slash             ], [ braceleft		] };
-    key <AE08> { [ 8, parenleft         ], [ bracketleft 	]};
-    key <AE09> { [ 9, parenright        ], [ bracketright     	] };
-    key <AE10> { [ 0, equal             ], [ braceright        	] };
-    key <AE11> { [ plus, question 	], [ backslash       	] };
-    key <AE12> { [ SunFA_Acute, SunFA_Grave ]			  };
-
-    key <AD03> { [ e, E                 ], [ EuroSign         ] };
-    key <AD11> { [ Aring ]					};
-    key <AD12> { [ SunFA_Diaeresis, SunFA_Circum ], [ SunFA_Tilde ] };
-
-    key <AC10> { [ Odiaeresis		]			};
-    key <AC11> { [ Adiaeresis		]			};
-    key <TLDE> { [ quoteright, asterisk	], [ quoteleft 		]};
-
-    key <LCTL> { [ Caps_Lock ] };
-    key <CAPS> { [ Control_L ] };
-    key <LSGT> { [ less, greater	]			};
-    key <AB08> { [ comma, semicolon	]			};
-    key <AB09> { [ period, colon	]			};
-    key <AB10> { [ minus, underscore	]			};
-};
-
-
-xkb_symbols "type5" {
-    include "se"
-
-    key <TLDE> { [ section, onehalf	]			};
-    key <AE07> { [ 7, slash             ], [ braceleft		] };
-    key <AE08> { [ 8, parenleft         ], [ bracketleft 	]};
-    key <AE09> { [ 9, parenright        ], [ bracketright     	] };
-    key <AE10> { [ 0, equal             ], [ braceright        	] };
-    key <AE11> { [ plus, question 	], [ backslash       	] };
-
-    key <AD12> { [ SunFA_Diaeresis, asciicircum ], [ asciitilde ] };
-    key <BKSL> { [ quoteright, asterisk	], [ quoteleft 		]};
-};
-  
-partial 
-xkb_symbols "type6" {
-    include "se(Sundeadkeys)"
-
-    key <AD12> { [ SunFA_Diaeresis, asciicircum ], [ asciitilde, caron ] };
-};
+//

+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.

+//

+// Permission is hereby granted, free of charge, to any person obtaining a

+// copy of this software and associated documentation files (the

+// "Software"), to deal in the Software without restriction, including

+// without limitation the rights to use, copy, modify, merge, publish,

+// distribute, and/or sell copies of the Software, and to permit persons

+// to whom the Software is furnished to do so, provided that the above

+// copyright notice(s) and this permission notice appear in all copies of

+// the Software and that both the above copyright notice(s) and this

+// permission notice appear in supporting documentation.

+// 

+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

+// 

+// Except as contained in this notice, the name of a copyright holder

+// shall not be used in advertising or otherwise to promote the sale, use

+// or other dealings in this Software without prior written authorization

+// of the copyright holder.

+//

+

+//

+// CDDL HEADER START

+//

+// The contents of this file are subject to the terms of the

+// Common Development and Distribution License (the "License").

+// You may not use this file except in compliance with the License.

+//

+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE

+// or http://www.opensolaris.org/os/licensing.

+// See the License for the specific language governing permissions

+// and limitations under the License.

+//

+// When distributing Covered Code, include this CDDL HEADER in each

+// file and include the License file at src/OPENSOLARIS.LICENSE.

+// If applicable, add the following below this CDDL HEADER, with the

+// fields enclosed by brackets "[]" replaced with your own identifying

+// information: Portions Copyright [yyyy] [name of copyright owner]

+//

+// CDDL HEADER END

+//

+

+partial alphanumeric_keys

+xkb_symbols "type6" {

+

+    name[Group1]="Sweden";

+

+    key <TLDE> { [         section,         onehalf                ] };

+    key <LSGT> { [            less,         greater,           bar ] };

+    key <AE02> { [               2,        quotedbl,            at ] };

+    key <AE03> { [               3,      numbersign,      sterling ] };

+    key <AE04> { [               4,        currency,        dollar ] };

+    key <AE06> { [               6,       ampersand                ] };

+    key <AE07> { [               7,           slash,     braceleft ] };

+    key <AE08> { [               8,       parenleft,   bracketleft ] };

+    key <AE09> { [               9,      parenright,  bracketright ] };

+    key <AE10> { [               0,           equal,    braceright ] };

+    key <AE11> { [            plus,        question,     backslash ] };

+    key <AE12> { [      dead_acute,      dead_grave                ] };

+    key <AD03> { [               e,               E,      EuroSign ] };

+    key <AD11> { [           aring,           Aring                ] };

+    key <AD12> { [  dead_diaeresis,     asciicircum,    asciitilde ] };

+    key <AC10> { [      odiaeresis,      Odiaeresis                ] };

+    key <AC11> { [      adiaeresis,      Adiaeresis                ] };

+    key <BKSL> { [      apostrophe,        asterisk,         grave ] };

+    key <AB08> { [           comma,       semicolon                ] };

+    key <AB09> { [          period,           colon                ] };

+    key <AB10> { [           minus,      underscore                ] };

+

+        include "level3(ralt_switch)"

+        include "kpdl(comma)"

+

+};

+

+// Swedish layout for a Type 5/5c Sun keyboard

+xkb_symbols "type5" {

+    include "sun_vndr/us(type5)+se(basic)"

+

+    // Begin alphanumeric section

+    // These two are not supposed to be dead.

+    // A few others supposedly ARE dead, but don't care for now.

+    key <AC12> { [ apostrophe, asterisk ],      [       grave ] };

+    key <AD12> { [                      ],      [  asciitilde ] };

+

+    key <RTSH> { [      Shift_R         ]       };

+

+    key <LALT> { [      Alt_L           ]       };

+    key <ALGR> { [      Mode_switch     ]       };

+    key <LMTA> { [      Meta_L          ]       };

+    key <RMTA> { [      Meta_R          ]       };

+    key <COMP> { [      Multi_key       ]       };

+    // End alphanumeric section

+

+    // Begin "Function" section

+    key <FK01> { [ F1           ]                       };

+    key <FK02> { [ F2           ]                       };

+    key <FK03> { [ F3           ]                       };

+    key <FK04> { [ F4           ]                       };

+    key <FK05> { [ F5           ]                       };

+    key <FK06> { [ F6           ]                       };

+    key <FK07> { [ F7           ]                       };

+    key <FK08> { [ F8           ]                       };

+    key <FK09> { [ F9           ]                       };

+    key <FK10> { [ F10          ]                       };

+    key <FK11> { [ F11          ],      [ SunF36]       };

+    key <FK12> { [ F12          ],      [ SunF37]       };

+    key <STOP> { [ Cancel       ],      [ F11   ]       };

+    key <AGAI> { [ Redo         ],      [ F12   ]       };

+    key <PROP> { [ SunProps     ],      [ F13   ]       };

+    key <UNDO> { [ Undo         ],      [ F14   ]       };

+    key <FRNT> { [ SunFront     ],      [ F15   ]       };

+    key <COPY> { [ SunCopy      ],      [ F16   ]       };

+    key <OPEN> { [ SunOpen      ],      [ F17   ]       };

+    key <PAST> { [ SunPaste     ],      [ F18   ]       };

+    key <FIND> { [ Find         ],      [ F19   ]       };

+    key <CUT>  { [ SunCut       ],      [ F20   ]       };

+    // End "Function" section

+

+    // Begin "Editing" section

+    key <PRSC> { [ Print        ],      [ Sys_Req, SunSys_Req ] };

+    key <SCLK> { [ Scroll_Lock  ]                       };

+    key <PAUS> { [ Pause        ],      [ Break ]       };

+    key <LEFT> { [ Left         ]                       };

+    key <RGHT> { [ Right        ]                       };

+    key <UP>   { [ Up           ]                       };

+    key <DOWN> { [ Down         ]                       };

+

+    key <DELE> { [ Delete       ]                       };

+    key <INS>  { [ Insert       ]                       };

+    key <PGUP> { [ Prior        ]                       };

+    key <PGDN> { [ Next         ]                       };

+    key <HOME> { [ Home         ]                       };

+    key <END>  { [ End          ]                       };

+    key <HELP> { [ Help         ]                       };

+    // End "Editing" section

+    

+    // Begin "Keypad" section

+    key <NMLK> { [ Num_Lock             ]                               };

+    key <KPDV> { [ KP_Divide            ],      [       F25     ]       };

+    key <KPMU> { [ KP_Multiply          ],      [       F26     ]       };

+    key <KPSU> { [ KP_Subtract          ]                               };

+

+    key  <KP7> { [  KP_Home,    KP_7    ],      [       F27     ]       };

+    key  <KP8> { [  KP_Up,      KP_8    ],      [       F28     ]       };

+    key  <KP9> { [  KP_Prior,   KP_9    ],      [       F29     ]       };

+    key <KPAD> { [      KP_Add          ]                               };

+

+    key  <KP4> { [  KP_Left,    KP_4    ],      [       F30     ]       };

+    key  <KP5> { [  KP_Begin,   KP_5    ],      [       F31     ]       };

+    key  <KP6> { [  KP_Right,   KP_6    ],      [       F32     ]       };

+

+    key  <KP1> { [  KP_End,     KP_1    ],      [       F33     ]       };

+    key  <KP2> { [  KP_Down,    KP_2    ],      [       F34     ]       };

+    key  <KP3> { [  KP_Next,    KP_3    ],      [       F35     ]       };

+    key <KPEN> { [      KP_Enter        ]                               };

+

+    key  <KP0> { [  KP_Insert,  KP_0    ]                               };

+    key <KPDL> { [  KP_Delete,  KP_Decimal ]                            };

+    // End "Keypad" section, 

+

+    // Begin "four keys up on the right"

+    key <MUTE> { [  SunAudioMute,       SunVideoDegauss         ]       };

+    key <VOL-> { [  SunAudioLowerVolume,SunVideoLowerBrightness ]       };

+    key <VOL+> { [  SunAudioRaiseVolume,SunVideoRaiseBrightness ]       };

+    key <POWR> { [  SunPowerSwitch,     SunPowerSwitchShift     ]       };

+    // End "four keys up on the right"

+

+    // Begin modifier mappings

+    modifier_map Shift  { Shift_R };

+    modifier_map Mod1   { Meta_L, Meta_R };

+    modifier_map Mod2   { Num_Lock };

+    modifier_map Mod3   { Mode_switch };

+    modifier_map Mod4   { Alt_L };

+    // End modifier mappings

+};

+

+// Swedish layout for a Type 4 Sun keyboard

+xkb_symbols "type4" {

+    include "sun_vndr/us(type4basic)+se(basic)"

+

+    // Begin alphanumeric section

+    // These two are not supposed to be dead.

+    // A few others supposedly ARE dead, but don't care for now.

+    key <AC12> { [ apostrophe, asterisk ],      [       grave ] };

+    key <AD12> { [                      ],      [  asciitilde ] };

+

+    key <AF14> { [      asciitilde,     asciicircum     ] };

+

+    key <RTSH> { [      Shift_R         ]       };

+

+    key <LALT> { [      Alt_L           ]       };

+    key <ALGR> { [      Mode_switch     ]       };

+    key <LMTA> { [      Meta_L          ]       };

+    key <RMTA> { [      Meta_R          ]       };

+    key <COMP> { [      Multi_key       ]       };

+    // End alphanumeric section

+

+    // Begin "Function" section

+    key <FK01> { [ F1           ]                       };

+    key <FK02> { [ F2           ]                       };

+    key <FK03> { [ F3           ]                       };

+    key <FK04> { [ F4           ]                       };

+    key <FK05> { [ F5           ]                       };

+    key <FK06> { [ F6           ]                       };

+    key <FK07> { [ F7           ]                       };

+    key <FK08> { [ F8           ]                       };

+    key <FK09> { [ F9           ]                       };

+    key <FK10> { [ F10          ]                       };

+    key <FK11> { [ F11          ],      [ SunF36]       };

+    key <FK12> { [ F12          ],      [ SunF37]       };

+    key <STOP> { [ Cancel       ],      [ F11   ]       };

+    key <AGAI> { [ Redo         ],      [ F12   ]       };

+    key <PROP> { [ SunProps     ],      [ F13   ]       };

+    key <UNDO> { [ Undo         ],      [ F14   ]       };

+    key <FRNT> { [ SunFront     ],      [ F15   ]       };

+    key <COPY> { [ SunCopy      ],      [ F16   ]       };

+    key <OPEN> { [ SunOpen      ],      [ F17   ]       };

+    key <PAST> { [ SunPaste     ],      [ F18   ]       };

+    key <FIND> { [ Find         ],      [ F19   ]       };

+    key <CUT>  { [ SunCut       ],      [ F20   ]       };

+    // End "Function" section

+

+    // Begin "Editing" section

+    key <LNFD> { [ Linefeed     ]       };

+    key <DELE> { [ Delete       ]                       };

+    key <PRSC> { [ Print        ],      [ Sys_Req, SunSys_Req ] };

+    key <SCLK> { [ Scroll_Lock  ]                       };

+    key <PAUS> { [ Pause        ],      [ Break ]       };

+    key <HELP> { [ Help         ]                       };

+    // End "Editing" section

+    

+   // Begin "Keypad" section

+    key <NMLK> { [ Num_Lock             ]                               };

+    key <KPEQ> { [ KP_Equal             ]                               };

+    key <KPDV> { [ KP_Divide            ],      [       F25     ]       };

+    key <KPMU> { [ KP_Multiply          ],      [       F26     ]       };

+    key <KPSU> { [ KP_Subtract          ]                               };

+

+    key  <KP7> { [  KP_Home,    KP_7    ],      [       F27     ]       };

+    key  <KP8> { [  KP_Up,      KP_8    ],      [       F28     ]       };

+    key  <KP9> { [  KP_Prior,   KP_9    ],      [       F29     ]       };

+    key <KPAD> { [      KP_Add          ]                               };

+

+    key  <KP4> { [  KP_Left,    KP_4    ],      [       F30     ]       };

+    key  <KP5> { [  KP_Begin,   KP_5    ],      [       F31     ]       };

+    key  <KP6> { [  KP_Right,   KP_6    ],      [       F32     ]       };

+

+    key  <KP1> { [  KP_End,     KP_1    ],      [       F33     ]       };

+    key  <KP2> { [  KP_Down,    KP_2    ],      [       F34     ]       };

+    key  <KP3> { [  KP_Next,    KP_3    ],      [       F35     ]       };

+    key <KPEN> { [      KP_Enter        ]                               };

+

+    key  <KP0> { [  KP_Insert,  KP_0    ]                               };

+    key <KPDL> { [  KP_Delete,  KP_Decimal ]                            };

+    // End "Keypad" section, 

+

+    // Begin modifier mappings

+    modifier_map Shift  { Shift_R };

+    modifier_map Mod1   { Alt_L };

+    modifier_map Mod2   { Num_Lock };

+    modifier_map Mod3   { Mode_switch };

+    modifier_map Mod4   { Meta_L };

+    modifier_map Mod5   { Meta_R };

+    // End modifier mappings

+};

+

+

+partial default alphanumeric_keys

+	xkb_symbols "basic" {

+	include "sun_vndr/se(type6)"

+};

+

diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/sk b/xorg-server/xkbdata.src/symbols/sun_vndr/sk
new file mode 100644
index 000000000..f27726013
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/sk
@@ -0,0 +1,110 @@
+//

+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.

+//

+// Permission is hereby granted, free of charge, to any person obtaining a

+// copy of this software and associated documentation files (the

+// "Software"), to deal in the Software without restriction, including

+// without limitation the rights to use, copy, modify, merge, publish,

+// distribute, and/or sell copies of the Software, and to permit persons

+// to whom the Software is furnished to do so, provided that the above

+// copyright notice(s) and this permission notice appear in all copies of

+// the Software and that both the above copyright notice(s) and this

+// permission notice appear in supporting documentation.

+// 

+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

+// 

+// Except as contained in this notice, the name of a copyright holder

+// shall not be used in advertising or otherwise to promote the sale, use

+// or other dealings in this Software without prior written authorization

+// of the copyright holder.

+//

+

+//

+// CDDL HEADER START

+//

+// The contents of this file are subject to the terms of the

+// Common Development and Distribution License (the "License").

+// You may not use this file except in compliance with the License.

+//

+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE

+// or http://www.opensolaris.org/os/licensing.

+// See the License for the specific language governing permissions

+// and limitations under the License.

+//

+// When distributing Covered Code, include this CDDL HEADER in each

+// file and include the License file at src/OPENSOLARIS.LICENSE.

+// If applicable, add the following below this CDDL HEADER, with the

+// fields enclosed by brackets "[]" replaced with your own identifying

+// information: Portions Copyright [yyyy] [name of copyright owner]

+//

+// CDDL HEADER END

+//

+

+

+partial default alphanumeric_keys

+xkb_symbols "type6" {

+

+    name[Group1]="Slovakia";

+

+

+    key <TLDE>  { 	[       semicolon, dead_abovering, quoteleft,         asciitilde  ]	};

+    key <AE01>  { 	[	     plus,         1,	exclam,               asciitilde  ]	};

+    key <AE02>  {	[	   lcaron,         2,	at,                   dead_caron  ]	};

+    key <AE03>  {	[	   scaron,         3,	numbersign,      dead_circumflex  ]	};

+    key <AE04>  {	[          ccaron,         4,	dollar,               dead_breve  ]	};

+    key <AE05>  {	[	   tcaron,         5,	percent,          dead_abovering  ]	};

+    key <AE06>  {	[	   zcaron,         6,	asciicircum,         dead_ogonek  ]	};

+    key <AE07>  {	[	   yacute,         7,	ampersand,                 grave  ]	};

+    key <AE08>  {	[	   aacute,         8,	asterisk,          dead_abovedot  ]	};

+    key <AE09>  {	[	   iacute,         9,	parenleft,            apostrophe  ]	};

+    key <AE10>  {	[	   eacute,         0,	parenright,     dead_doubleacute  ]	};

+    key <AE11>  {	[	    equal,   percent,	dead_diaeresis,        backslash  ]	};

+    key <AE12>  {	[      dead_acute, dead_caron,	dead_cedilla,              minus  ]	};

+

+    key <AD01>  {	[ 		q,         Q,	backslash		          ]	};

+    key <AD02>  {	[	        w,         W,	bar	                          ]	};

+    key <AD03>  {	[	        e,         E,	EuroSign 		          ]	};

+    key <AD06>  {       [               z,         Z                                      ]     };

+    key <AD10>  {       [               p,         P,	apostrophe   		          ]	};

+    key <AD11>  {	[	   uacute,     slash,	division		          ]	};

+    key <AD12>  {	[      adiaeresis, parenleft,	multiply      		          ]	};

+

+    key <AC02>  {	[	        s,         S,	dstroke		       		  ]	};

+    key <AC03>  {	[	        d,         D,	Dstroke			          ]	};

+    key <AC04>  {	[	        f,         F,	bracketleft		          ]	};

+    key <AC05>  {	[	        g,         G,	bracketright		          ]	};

+    key <AC08>  {	[		k,         K,	lstroke 		       	  ]	};

+    key <AC09>  {	[	        l,         L,	Lstroke		                  ]	};

+    key <AC10>  {	[     ocircumflex,  quotedbl,	dollar		                  ]	};

+    key <AC11>  {	[         section,    exclam,	ssharp   		          ]	};

+    key <AC12>  {	[          ncaron, parenright,	currency,               currency  ]	};

+    key <BKSL>  {	[          ncaron, parenright,	backslash,                   bar  ]	};

+

+    key <LSGT>  { 	[       backslash,       bar,	slash,                 brokenbar  ]     };

+    key <AB01>  {       [               y,        Y,	less  	                          ]	};

+    key <AB02>  {	[	        x,        X,	greater,              numbersign  ]	};

+    key <AB03>  {	[		c,        C,	ampersand	 	          ]	};

+    key <AB04>  {	[	        v,        V,	at 		                  ]	};

+    key <AB05>  {	[	        b,        B,	braceleft              	          ]	};

+    key <AB06>  {	[        	n,        N,	braceright              	  ]	};

+    key <AB08>  {	[  	    comma, question,	less 		                  ]	};

+    key <AB09>  {	[	   period,    colon,	greater		                  ]	};

+    key <AB10>  {	[ 	    minus, underscore,	asterisk 			  ]	};

+

+	include "level3(ralt_switch)"

+

+};

+

+partial alphanumeric_keys

+	xkb_symbols "basic" {

+	include "sun_vndr/sk(type6)"

+};

+

diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/solaris b/xorg-server/xkbdata.src/symbols/sun_vndr/solaris
index c99f04f3e..d07b150d1 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/solaris
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/solaris
@@ -1,173 +1,213 @@
-//-------------------------------------------------------------------------
-//
-// Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice (including the next
-// paragraph) shall be included in all copies or substantial portions of the
-// Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-//-------------------------------------------------------------------------
-//
-// ident "@(#)solaris 1.7     05/11/08 SMI"
-//
-
-// Default map provides backwards compatibility with Sun keyboards from
-// long ago and the key mappings still used in Solaris Xsun today
-
-partial default
-xkb_symbols "defaults" {
-
-    // Left side keys were labeled L1-L10 on Sun Type 2 & Type 3 keyboards
-    // and the names have stuck (you can spot a longtime Sun admin when you
-    // hear them say to hit "L1-A" to enter the OpenBoot PROM)
-    // These names get mapped to the keysyms F11-F20
-    key <STOP> { [ L1,  L1              ], [ SunStop    ]       };
-    key <AGAI> { [ L2,  L2              ], [ SunAgain   ]       };
-    key <PROP> { [ L3,  L3              ], [ SunProps   ]       };
-    key <UNDO> { [ L4,  L4              ], [ SunUndo    ]       };
-    key <FRNT> { [ L5,  L5              ], [ SunFront   ]       };
-    key <COPY> { [ L6,  L6              ], [ SunCopy    ]       };
-    key <OPEN> { [ L7,  L7              ], [ SunOpen    ]       };
-    key <PAST> { [ L8,  L8              ], [ SunPaste   ]       };
-    key <FIND> { [ L9,  L9              ], [ SunFind    ]       };
-    key <CUT>  { [ L10, L10             ], [ SunCut     ]       };
-
-    // And on the right side, the function keys were labeled R1-R15,
-    // which get mapped to the keysyms F21-F35
-    // This includes the keys that became the numeric keypad
-    key <PAUS> { [ R1,  R1              ], [ Pause              ] };
-    key <PRSC> { [ R2,  R2              ], [ Print              ] };
-    key <SCLK> { [ R3,  R3              ], [ Scroll_Lock, Break ] };
-
-    key <KPEQ> { [ KP_Equal             ], [ R4, KP_Equal       ] };
-    key <KPDV> { [ KP_Divide            ], [ R5, KP_Divide      ] };
-    key <KPMU> { [ KP_Multiply          ], [ R6, KP_Multiply    ] };
-
-    key  <KP7> { [ KP_Home,  KP_7, R7   ], [ R7, KP_7, Home     ] };
-    key  <KP8> { [ KP_Up,    KP_8, R8   ], [ R8, KP_8, Up       ] };
-    key  <KP9> { [ KP_Prior, KP_9, R9   ], [ R9, KP_9, Prior    ] };
-
-    key  <KP4> { [ KP_Left,  KP_4, R10  ], [ R10, KP_4, Left    ] };
-    key  <KP5> { [ KP_Begin, KP_5, R11  ], [ R11, KP_5          ] };
-    key  <KP6> { [ KP_Right, KP_6, R12  ], [ R12, KP_6, Right   ] };
-
-    key  <KP1> { [ KP_End,   KP_1, R13  ], [ R13, KP_1, End     ] };
-    key  <KP2> { [ KP_Down,  KP_2, R14  ], [ R14, KP_2, Down    ] };
-    key  <KP3> { [ KP_Next,  KP_3, R15  ], [ R15, KP_3, Next    ] };
-
-    // F11 & F12 are mapped to SunF36 and SunF37 since they were added
-    // after F11-F35 were already assigned on Sun keyboards
-    key <FK11> { [ SunF36               ], [ F11                ] };
-    key <FK12> { [ SunF37               ], [ F12                ] };
-
-    // These were added to the keyboard much later and simply got mapped
-    // to their logical names
-    key <HELP> { [ Help                 ]                       };
-    key <MUTE> { [  SunAudioMute,	SunVideoDegauss		]	};
-    key <VOL-> { [  SunAudioLowerVolume,SunVideoLowerBrightness ]	};
-    key <VOL+> { [  SunAudioRaiseVolume,SunVideoRaiseBrightness	]	};
-    key <POWR> { [  SunPowerSwitch,	SunPowerSwitchShift	]	};
-
-    key <LALT> { [ Alt_L                ]                       };
-    // key <RALT> { [ Mode_switch          ]                       };
-    // key <ALGR> { [ Mode_switch          ]                       };
-    key <LMTA> { [ Meta_L               ]                       };
-    key <RMTA> { [ Meta_R               ]                       };
-    key <COMP> { [ Multi_key            ]                       };
-
-    // begin modifier mappings
-    modifier_map Shift          { Shift_R, Shift_L };
-    modifier_map Mod1           { Alt_L };
-    modifier_map Mod2           { Alt_R, Mode_switch };
-    modifier_map Mod3           { Num_Lock };
-    modifier_map Mod4           { Meta_L, Meta_R };
-
-};
-
-// Map the keys to the actual key names instead of the ancient Sun function
-// keys
-partial
-xkb_symbols "keynames" {
-    key <FK11> { [ F11          ],      [ SunF36   ]    };
-    key <FK12> { [ F12          ],      [ SunF37   ]    };
-
-    key <STOP> { [ Cancel	],	[ F11	]	};
-    key <AGAI> { [ Redo		],	[ F12	]	};
-    key <PROP> { [ SunProps	],	[ F13	]	};
-    key <UNDO> { [ Undo		],	[ F14	]	};
-    key <FRNT> { [ SunFront	],	[ F15	]	};
-    key <COPY> { [ SunCopy	],	[ F16	]	};
-    key <OPEN> { [ SunOpen	],	[ F17	]	};
-    key <PAST> { [ SunPaste	],	[ F18	]	};
-    key <FIND> { [ Find		],	[ F19	]	};
-    key <CUT>  { [ SunCut	],	[ F20	]	};
-
-    key <HELP> { [ Help		]	                };
-
-    key <PAUS> {  [  Pause                      ]       };
-    key <PRSC> {  [  Print                      ]       };
-    key <SCLK> {  [  Scroll_Lock, Break         ]       };
-
-    key  <KP7> {        [  KP_Home,     KP_7    ]       };
-    key  <KP8> {        [  KP_Up,       KP_8    ]       };
-    key  <KP9> {        [  KP_Prior,    KP_9    ]       };
-
-    key  <KP4> {        [  KP_Left,     KP_4    ]       };
-    key  <KP5> {        [  KP_Begin,    KP_5    ]       };
-    key  <KP6> {        [  KP_Right,    KP_6    ]       };
-
-    key  <KP1> {        [  KP_End,      KP_1    ]       };
-    key  <KP2> {        [  KP_Down,     KP_2    ]       };
-    key  <KP3> {        [  KP_Next,     KP_3    ]       };
-
-    key <KPEN> {        [       KP_Enter        ]       };
-    key <KPEQ> {        [       KP_Equal        ]       };
-
-    key <MUTE> { [ SunAudioMute,	SunVideoDegauss		]	};
-    key <VOL-> { [ SunAudioLowerVolume, SunVideoLowerBrightness ]	};
-    key <VOL+> { [ SunAudioRaiseVolume, SunVideoRaiseBrightness	]	};
-    key <POWR> { [ SunPowerSwitch,	SunPowerSwitchShift	]	};
-
-    key <LALT> { [ Alt_L                ]                       };
-    key <RALT> { [ Mode_switch          ]                       };
-    key <ALGR> { [ Mode_switch          ]                       };
-    key <LMTA> { [ Meta_L               ]                       };
-    key <RMTA> { [ Meta_R               ]                       };
-    key <COMP> { [ Multi_key            ]                       };
-
-};
-
-// Map the keys to the XFree86 key names instead of the Sun key names
-partial
-xkb_symbols "xf86keynames" {
-    key <STOP> { [ XF86Stop	],	[ F11	]	};
-    key <AGAI> { [ Redo		],	[ F12	]	};
-    key <PROP> { [ SunProps	],	[ F13	]	};
-    key <UNDO> { [ Undo		],	[ F14	]	};
-    key <FRNT> { [ SunFront	],	[ F15	]	};
-    key <COPY> { [ XF86Copy	],	[ F16	]	};
-    key <OPEN> { [ XF86Open	],	[ F17	]	};
-    key <PAST> { [ XF86Paste	],	[ F18	]	};
-    key <FIND> { [ Find		],	[ F19	]	};
-    key <CUT>  { [ XF86Cut	],	[ F20	]	};
-
-    key <MUTE> { [ XF86AudioMute,	SunVideoDegauss		]	};
-    key <VOL-> { [ XF86AudioLowerVolume,SunVideoLowerBrightness ]	};
-    key <VOL+> { [ XF86AudioRaiseVolume,SunVideoRaiseBrightness	]	};
-    key <POWR> { [ XF86Sleep,		XF86PowerDown	]	};
-};
+//-------------------------------------------------------------------------

+//

+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.

+//

+// Permission is hereby granted, free of charge, to any person obtaining a

+// copy of this software and associated documentation files (the

+// "Software"), to deal in the Software without restriction, including

+// without limitation the rights to use, copy, modify, merge, publish,

+// distribute, and/or sell copies of the Software, and to permit persons

+// to whom the Software is furnished to do so, provided that the above

+// copyright notice(s) and this permission notice appear in all copies of

+// the Software and that both the above copyright notice(s) and this

+// permission notice appear in supporting documentation.

+//

+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

+//

+// Except as contained in this notice, the name of a copyright holder

+// shall not be used in advertising or otherwise to promote the sale, use

+// or other dealings in this Software without prior written authorization

+// of the copyright holder.

+//

+//-------------------------------------------------------------------------

+//

+

+//

+// CDDL HEADER START

+//

+// The contents of this file are subject to the terms of the

+// Common Development and Distribution License (the "License").

+// You may not use this file except in compliance with the License.

+//

+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE

+// or http://www.opensolaris.org/os/licensing.

+// See the License for the specific language governing permissions

+// and limitations under the License.

+//

+// When distributing Covered Code, include this CDDL HEADER in each

+// file and include the License file at src/OPENSOLARIS.LICENSE.

+// If applicable, add the following below this CDDL HEADER, with the

+// fields enclosed by brackets "[]" replaced with your own identifying

+// information: Portions Copyright [yyyy] [name of copyright owner]

+//

+// CDDL HEADER END

+//

+

+// Default map provides backwards compatibility with Sun keyboards from

+// long ago and the key mappings still used in Solaris Xsun today

+

+partial default

+xkb_symbols "defaults_common" {

+

+    // Left side keys were labeled L1-L10 on Sun Type 2 & Type 3 keyboards

+    // and the names have stuck (you can spot a longtime Sun admin when you

+    // hear them say to hit "L1-A" to enter the OpenBoot PROM)

+    // These names get mapped to the keysyms F11-F20

+    key <STOP> { [ L1,  L1              ], [ SunStop    ]       };

+    key <AGAI> { [ L2,  L2              ], [ SunAgain   ]       };

+    key <PROP> { [ L3,  L3              ], [ SunProps   ]       };

+    key <UNDO> { [ L4,  L4              ], [ SunUndo    ]       };

+    key <FRNT> { [ L5,  L5              ], [ SunFront   ]       };

+    key <COPY> { [ L6,  L6              ], [ SunCopy    ]       };

+    key <OPEN> { [ L7,  L7              ], [ SunOpen    ]       };

+    key <PAST> { [ L8,  L8              ], [ SunPaste   ]       };

+    key <FIND> { [ L9,  L9              ], [ SunFind    ]       };

+    key <CUT>  { [ L10, L10             ], [ SunCut     ]       };

+

+    // And on the right side, the function keys were labeled R1-R15,

+    // which get mapped to the keysyms F21-F35

+    // This includes the keys that became the numeric keypad

+    key <PAUS> { [ R1,  R1              ], [ Pause              ] };

+    key <PRSC> { [ R2,  R2              ], [ Print              ] };

+    key <SCLK> { [ R3,  R3              ], [ Scroll_Lock, Break ] };

+

+    key <KPEQ> { [ KP_Equal             ], [ R4, KP_Equal       ] };

+    key <KPDV> { [ KP_Divide            ], [ R5, KP_Divide      ] };

+    key <KPMU> { [ KP_Multiply          ], [ R6, KP_Multiply    ] };

+

+    key  <KP7> { [ KP_Home,  KP_7, R7   ], [ R7, KP_7, Home     ] };

+    key  <KP8> { [ KP_Up,    KP_8, R8   ], [ R8, KP_8, Up       ] };

+    key  <KP9> { [ KP_Prior, KP_9, R9   ], [ R9, KP_9, Prior    ] };

+

+    key  <KP4> { [ KP_Left,  KP_4, R10  ], [ R10, KP_4, Left    ] };

+    key  <KP5> { [ KP_Begin, KP_5, R11  ], [ R11, KP_5          ] };

+    key  <KP6> { [ KP_Right, KP_6, R12  ], [ R12, KP_6, Right   ] };

+

+    key  <KP1> { [ KP_End,   KP_1, R13  ], [ R13, KP_1, End     ] };

+    key  <KP2> { [ KP_Down,  KP_2, R14  ], [ R14, KP_2, Down    ] };

+    key  <KP3> { [ KP_Next,  KP_3, R15  ], [ R15, KP_3, Next    ] };

+

+    // F11 & F12 are mapped to SunF36 and SunF37 since they were added

+    // after F11-F35 were already assigned on Sun keyboards

+    key <FK11> { [ SunF36               ], [ F11                ] };

+    key <FK12> { [ SunF37               ], [ F12                ] };

+

+    // These were added to the keyboard much later and simply got mapped

+    // to their logical names

+    key <HELP> { [ Help                 ]                       };

+    key <MUTE> { [  SunAudioMute,	SunVideoDegauss		]	};

+    key <VOL-> { [  SunAudioLowerVolume,SunVideoLowerBrightness ]	};

+    key <VOL+> { [  SunAudioRaiseVolume,SunVideoRaiseBrightness	]	};

+    key <POWR> { [  XF86Sleep,		XF86Hibernate		]	};

+

+//    key <LALT> { [ Alt_L                ]                       };

+//    key <LMTA> { [ Meta_L               ]                       };

+//    key <RMTA> { [ Meta_R               ]                       };

+//    key <COMP> { [ Multi_key            ]                       };

+};

+

+partial default

+xkb_symbols "defaults" {

+    include "sun_vndr/solaris(defaults_common)"

+//    key <RALT> { [ Mode_switch          ]                       };

+//    key <ALGR> { [ Mode_switch          ]                       };

+

+    // begin modifier mappings

+//    modifier_map Shift          { Shift_R, Shift_L };

+//    modifier_map Mod1           { Alt_L };

+//    modifier_map Mod2           { Num_Lock };

+//    modifier_map Mod3           { Alt_R, Mode_switch };

+//    modifier_map Mod4           { Meta_L, Meta_R };

+};

+

+partial default

+xkb_symbols "defaults_type7jp" {

+    include "sun_vndr/solaris(defaults_common)"

+    // begin modifier mappings

+    modifier_map Shift          { Shift_R, Shift_L };

+    modifier_map Mod1           { Alt_L , Alt_R};

+    modifier_map Mod2           { Num_Lock };

+    modifier_map Mod3           { Mode_switch };

+    modifier_map Mod4           { Meta_L, Meta_R };

+};

+

+// Map the keys to the actual key names instead of the ancient Sun function

+// keys

+partial

+xkb_symbols "keynames" {

+    key <FK11> { [ F11          ],      [ SunF36   ]    };

+    key <FK12> { [ F12          ],      [ SunF37   ]    };

+

+    key <STOP> { [ Cancel	],	[ F11	]	};

+    key <AGAI> { [ Redo		],	[ F12	]	};

+    key <PROP> { [ SunProps	],	[ F13	]	};

+    key <UNDO> { [ Undo		],	[ F14	]	};

+    key <FRNT> { [ SunFront	],	[ F15	]	};

+    key <COPY> { [ SunCopy	],	[ F16	]	};

+    key <OPEN> { [ SunOpen	],	[ F17	]	};

+    key <PAST> { [ SunPaste	],	[ F18	]	};

+    key <FIND> { [ Find		],	[ F19	]	};

+    key <CUT>  { [ SunCut	],	[ F20	]	};

+

+    key <HELP> { [ Help		]	                };

+

+    key <PAUS> {  [  Pause                      ]       };

+    key <PRSC> {  [  Print                      ]       };

+    key <SCLK> {  [  Scroll_Lock, Break         ]       };

+

+    key  <KP7> {        [  KP_Home,     KP_7    ]       };

+    key  <KP8> {        [  KP_Up,       KP_8    ]       };

+    key  <KP9> {        [  KP_Prior,    KP_9    ]       };

+

+    key  <KP4> {        [  KP_Left,     KP_4    ]       };

+    key  <KP5> {        [  KP_Begin,    KP_5    ]       };

+    key  <KP6> {        [  KP_Right,    KP_6    ]       };

+

+    key  <KP1> {        [  KP_End,      KP_1    ]       };

+    key  <KP2> {        [  KP_Down,     KP_2    ]       };

+    key  <KP3> {        [  KP_Next,     KP_3    ]       };

+

+    key <KPEN> {        [       KP_Enter        ]       };

+    key <KPEQ> {        [       KP_Equal        ]       };

+

+    key <MUTE> { [ SunAudioMute,	SunVideoDegauss		]	};

+    key <VOL-> { [ SunAudioLowerVolume, SunVideoLowerBrightness ]	};

+    key <VOL+> { [ SunAudioRaiseVolume, SunVideoRaiseBrightness	]	};

+    key <POWR> { [ SunPowerSwitch,	SunPowerSwitchShift	]	};

+

+    key <LALT> { [ Alt_L                ]                       };

+    key <RALT> { [ Mode_switch          ]                       };

+    key <ALGR> { [ Mode_switch          ]                       };

+    key <LMTA> { [ Meta_L               ]                       };

+    key <RMTA> { [ Meta_R               ]                       };

+    key <COMP> { [ Multi_key            ]                       };

+

+};

+

+// Map the keys to the XFree86 key names instead of the Sun key names

+partial

+xkb_symbols "xf86keynames" {

+    key <STOP> { [ XF86Stop	],	[ F11	]	};

+    key <AGAI> { [ Redo		],	[ F12	]	};

+    key <PROP> { [ SunProps	],	[ F13	]	};

+    key <UNDO> { [ Undo		],	[ F14	]	};

+    key <FRNT> { [ SunFront	],	[ F15	]	};

+    key <COPY> { [ XF86Copy	],	[ F16	]	};

+    key <OPEN> { [ XF86Open	],	[ F17	]	};

+    key <PAST> { [ XF86Paste	],	[ F18	]	};

+    key <FIND> { [ Find		],	[ F19	]	};

+    key <CUT>  { [ XF86Cut	],	[ F20	]	};

+

+    key <MUTE> { [ XF86AudioMute,	SunVideoDegauss		]	};

+    key <VOL-> { [ XF86AudioLowerVolume,SunVideoLowerBrightness ]	};

+    key <VOL+> { [ XF86AudioRaiseVolume,SunVideoRaiseBrightness	]	};

+    key <POWR> { [ XF86Sleep,		XF86PowerDown	]	};

+};

diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/tr b/xorg-server/xkbdata.src/symbols/sun_vndr/tr
index 7e6d4bf74..3c95110a1 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/tr
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/tr
@@ -1,113 +1,93 @@
-// $XdotOrg: $
-//
-// Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice (including the next
-// paragraph) shall be included in all copies or substantial portions of the
-// Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-xkb_symbols "basic" {
-   include "sun_vndr/tr(type6Q)"
-};
-
-xkb_symbols "type6Q" {
-
-   key <TLDE> { [ quotedbl, eacute	], [ asciitilde			]};
-   key <AE02> { [ 2, quoteright		]				};
-   key <AE03> { [ 3, asciicircum	], [ numbersign			]};
-   key <AE04> { [ 4, plus		], [ dollar			]};
-   key <AE06> { [ 6, ampersand		]				};
-   key <AE07> { [ 7, slash		], [ braceleft			]};
-   key <AE08> { [ 8, parenleft		], [ bracketright		]};
-   key <AE09> { [ 9, parenright		], [ bracketright		]};
-   key <AE10> { [ 0, equal		], [ braceright			]};
-   key <AE11> { [ asterisk, question	], [ backslash			]};
-   key <AE12> { [ minus, underscore	]				};
-
-   key <AD01> { [ q, Q			], [ at				]};
-   key <AD11> { [ gbreve, Gbreve	], [ gbreve, Gbreve		]};
-   key <AD12> { [ udiaeresis, Udiaeresis], [ asciitilde, Udiaeresis	]};
-
-   key <AC10> { [ scedilla, Scedilla	], [ comma			]};
-   key <AC11> { [ Iabovedot, Iabovedot	], [ Iabovedot, Iabovedot	]};
-   key <BKSL> { [ comma, semicolon	], [ quoteleft			]};
-
-   key <LSGT> { [ less, greater		], [ bar			]};
-   key <AB08> { [ odiaeresis, Odiaeresis], [ odiaeresis, Odiaeresis	]};
-   key <AB09> { [ ccedilla, Ccedilla	], [ ccedilla, Ccedilla		]};
-   key <AB10> { [ period, colon		], [ quotedbl			]};
-   
-};
-
-xkb_symbols "type6F" {
-
-
-   key	<TLDE> { [ plus     ,asterisk		],  [plusminus     ]};
-   key	<AE01> { [ 1	    ,exclam		],  [onesuperior   ]};
-   key	<AE02> { [ 2	    ,quotedbl		],  [twosuperior   ]};
-   key	<AE03> { [ 3	    ,asciicircum  	],  [numbersign    ]};
-   key	<AE04> { [ 4	    ,dollar		],  [onequarter    ]};
-   key	<AE05> { [ 5	    ,percent		],  [onehalf       ]};
-   key	<AE06> { [ 6	    ,ampersand		],  [threequarters ]};
-   key	<AE07> { [ 7	    ,quoteright   	],  [braceleft     ]};
-   key	<AE08> { [ 8	    ,parenleft		],  [bracketleft   ]};
-   key	<AE09> { [ 9	    ,parenright		],  [bracketright  ]};
-   key	<AE10> { [ 0	    ,equal		],  [braceright    ]};
-   key	<AE11> { [ slash    ,question    	],  [backslash     ]};
-   key	<AE12> { [ minus    ,underscore   	],  [bar           ]};
-
-   key  <AD01> { [ f         ,F            ],  [at		]};
-   key  <AD02> { [ g         ,G            ]};
-   key  <AD03> { [ gbreve    ,Gbreve       ],  [gbreve, Gbreve	]};
-   key  <AD04> { [ idotless  ,I            ],  [paragraph	]};
-   key  <AD05> { [ o         ,O            ]};
-   key  <AD06> { [ d         ,D            ],  [yen		]};
-   key  <AD07> { [ r         ,R            ]};
-   key  <AD08> { [ n         ,N            ]};
-   key  <AD09> { [ h         ,H            ],  [degree		]};
-   key  <AD10> { [ p         ,P            ],  [sterling	]};
-   key  <AD11> { [ q         ,Q            ],  [diaeresis	]};
-   key  <AD12> { [ w         ,W            ],  [asciitilde	]};
-   key  <BKSL> { [ x         ,X            ],  [quoteleft	]};
-
-   key  <AC01> { [ u         ,U        	],	[AE			]};
-   key  <AC02> { [ i	     ,Iabovedot	],	[ssharp			]};
-   key  <AC03> { [ e	     ,E  	]};
-   key  <AC04> { [ a	     ,A  	]};
-   key  <AC05> { [ udiaeresis,Udiaeresis]}; 
-   key  <AC06> { [ t	     ,T  	]};
-   key  <AC07> { [ k	     ,K  	]};
-   key  <AC08> { [ m	     ,M  	]};
-   key  <AC10> { [ y         ,Y		],	[quoteright		]};
-   key  <AC11> { [ scedilla  ,Scedilla	],	[numbersign,   Scedilla	]};
-
-   key  <LSGT> { [ less, greater           ],  [bar		]};
-   key  <AB01> { [ j           ,J          ],  [less		]};
-   key  <AB02> { [ odiaeresis  ,Odiaeresis ],  [greater		]};
-   key  <AB03> { [ v           ,V          ],  [cent		]};
-   key  <AB04> { [ c	       ,C          ]};
-   key  <AB05> { [ ccedilla    ,Ccedilla   ],  [ccedilla, Ccedilla	]};
-   key  <AB06> { [ z	       ,Z          ]};
-   key  <AB07> { [ s           ,S          ],  [mu		]};
-   key  <AB08> { [ b           ,B          ],  [multiply	]};
-   key  <AB09> { [ period      ,colon      ],  [division	]};
-   key  <AB10> { [ comma       ,semicolon  ]};
-
-
-};
-
+//

+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.

+//

+// Permission is hereby granted, free of charge, to any person obtaining a

+// copy of this software and associated documentation files (the

+// "Software"), to deal in the Software without restriction, including

+// without limitation the rights to use, copy, modify, merge, publish,

+// distribute, and/or sell copies of the Software, and to permit persons

+// to whom the Software is furnished to do so, provided that the above

+// copyright notice(s) and this permission notice appear in all copies of

+// the Software and that both the above copyright notice(s) and this

+// permission notice appear in supporting documentation.

+// 

+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

+// 

+// Except as contained in this notice, the name of a copyright holder

+// shall not be used in advertising or otherwise to promote the sale, use

+// or other dealings in this Software without prior written authorization

+// of the copyright holder.

+//

+

+//

+// CDDL HEADER START

+//

+// The contents of this file are subject to the terms of the

+// Common Development and Distribution License (the "License").

+// You may not use this file except in compliance with the License.

+//

+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE

+// or http://www.opensolaris.org/os/licensing.

+// See the License for the specific language governing permissions

+// and limitations under the License.

+//

+// When distributing Covered Code, include this CDDL HEADER in each

+// file and include the License file at src/OPENSOLARIS.LICENSE.

+// If applicable, add the following below this CDDL HEADER, with the

+// fields enclosed by brackets "[]" replaced with your own identifying

+// information: Portions Copyright [yyyy] [name of copyright owner]

+//

+// CDDL HEADER END

+//

+

+

+partial alphanumeric_keys

+xkb_symbols "type6" {

+

+    name[Group1]="Turkey - (Q)";

+

+    key <TLDE>  { [  quotedbl,     eacute                ] };

+    key <AE01>	{ [         1,     exclam                ] };

+    key <AE02>	{ [         2, apostrophe                ] };

+    key <AE03>	{ [        3, asciicircum,    numbersign ] };

+    key <AE04>	{ [         4,       plus,        dollar ] };

+    key <AE06>	{ [         6,  ampersand                ] };

+    key <AE07>	{ [         7,      slash,     braceleft ] };

+    key <AE08>	{ [         8,  parenleft,   bracketleft ] };

+    key <AE09>	{ [         9, parenright,  bracketright ] };

+    key <AE10>	{ [         0,      equal,    braceright ] };

+    key <AE11>	{ [  asterisk,   question,     backslash ] };

+    key <AE12>	{ [     minus, underscore                ] };

+

+    key <AD01>  { [         q,          Q,           at ] };

+    key <AD03>	{ [         e,          E,     EuroSign ] };

+    key <AD08>	{ [  idotless,          I               ] };

+    key <AD11>	{ [    gbreve,     Gbreve               ] };

+    key <AD12>	{ [udiaeresis, Udiaeresis,   asciitilde ] };

+

+    key <AC10>	{ [  scedilla,   Scedilla,        acute ] };

+    key <AC11>	{ [         i,  Iabovedot               ] }; 

+    key <BKSL>	{ [     comma,  semicolon,        grave ] };

+

+    key <LSGT>	{ [      less,    greater,          bar ] };

+    key <AB08>	{ [odiaeresis, Odiaeresis               ] };

+    key <AB09>	{ [  ccedilla,   Ccedilla               ] };

+    key <AB10>	{ [    period,      colon               ] };

+

+	include "level3(ralt_switch)"

+

+};

+

+partial default alphanumeric_keys

+        xkb_symbols "basic" {

+        include "sun_vndr/tr(type6)"

+};

+

diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/tuv b/xorg-server/xkbdata.src/symbols/sun_vndr/tuv
index d047f33b8..0eda715d8 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/tuv
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/tuv
@@ -1,235 +1,264 @@
-// $XdotOrg: $
-//
-// Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice (including the next
-// paragraph) shall be included in all copies or substantial portions of the
-// Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-// $TOG: us /main/5 1998/02/10 13:45:06 kaleb $
-//
-//Copyright 1996, 1998  The Open Group
-//
-//All Rights Reserved.
-//
-//The above copyright notice and this permission notice shall be
-//included in all copies or substantial portions of the Software.
-//
-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-//OTHER DEALINGS IN THE SOFTWARE.
-//
-//Except as contained in this notice, the name of The Open Group shall
-//not be used in advertising or otherwise to promote the sale, use or
-//other dealings in this Software without prior written authorization
-//from The Open Group.
-//
-// US/ASCII layout for a Type 4 Sun keyboard
-xkb_symbols "type4basic" {
-    include "us(basic)"
-
-    key <RTSH> { [ Shift_R		]			};
-    key <LALT> { [ Alt_L		]			};
-    key <ALGR> { [ Mode_switch		]			};
-    key <LMTA> { [ Meta_L		]			};
-    key <RMTA> { [ Meta_R		]			};
-    key <LNFD> { [ Linefeed		]			};
-    key <COMP> { [ Multi_key		]			};
-    // End alphanumeric section
-
-    // Begin "Function" section
-    key <FK01> { [ F1			]			};
-    key <FK02> { [ F2			]			};
-    key <FK03> { [ F3			]			};
-    key <FK04> { [ F4			]			};
-    key <FK05> { [ F5			]			};
-    key <FK06> { [ F6			]			};
-    key <FK07> { [ F7			]			};
-    key <FK08> { [ F8			]			};
-    key <FK09> { [ F9			]			};
-    key <FK10> { [ F10			]			};
-    key <FK11> { [ SunF36		]			};
-    key <FK12> { [ SunF37		]			};
-    key <STOP> { [ L1,	L1		], [ SunStop	]	};
-    key <AGAI> { [ L2,	L2		], [ SunAgain	]	};
-    key <PROP> { [ L3,	L3		], [ SunProps	]	};
-    key <UNDO> { [ L4,	L4		], [ SunUndo	]	};
-    key <FRNT> { [ L5,	L5		], [ SunFront	]	};
-    key <COPY> { [ L6,	L6		], [ SunCopy	]	};
-    key <OPEN> { [ L7,	L7		], [ SunOpen	]	};
-    key <PAST> { [ L8,	L8		], [ SunPaste	]	};
-    key <FIND> { [ L9,	L9		], [ SunFind	]	};
-    key <CUT>  { [ L10,	L10		], [ SunCut	]	};
-    // End "Function" section
-
-    // Begin "Editing" section
-    key <PRSC> { [ R2,	R2		], [ Print		] };
-    key <SCLK> { [ R3,	R3		], [ Scroll_Lock, Break	] };
-    key <PAUS> { [ R1,	R1		], [ Pause		] };
-    key <DELE> { [ Delete		]			};
-    key <HELP> { [ Help			]			};
-
-    // End "Editing" section, begin "Keypad"
-    key <NMLK> { [ Num_Lock 		]			};
-    key <KPEQ> { [ R4,	R4 		], [ KP_Equal		] };
-    key <KPDV> { [ R5,	R5		], [ KP_Divide		] };
-    key <KPMU> { [ R6,	R6		], [ KP_Multiply	] };
-    key <KPSU> { [ KP_Subtract		]			};
-
-    key  <KP7> { [ R7,	R7		], [ KP_7, Home		] };
-    key  <KP8> { [ Up, R8               ], [ KP_8               ] };
-//    key  <KP8> { [ R8,	R8		], [ KP_8		] };
-    key  <KP9> { [ R9,	R9		], [ KP_9, Prior	] };
-    key <KPAD> { [ KP_Add		]			};
-
-    key  <KP4> { [ Left, R10		], [ KP_4		] };
-    key  <KP5> { [ R11,	R11		], [ KP_5		] };
-    key  <KP6> { [ Right, R12		], [ KP_6		] };
-
-    key  <KP1> { [ R13,	R13		], [ KP_1,	End	] };
-    key  <KP2> { [ Down, R14		], [ KP_2		] };
-    key  <KP3> { [ R15,	R15		], [ KP_3,	Next	] };
-    key <KPEN> { [ KP_Enter		]			}; 
-    key  <KP0> { [ KP_Insert, KP_Insert], [ KP_0		]	};
-    key <KPDL> { [ Delete, Delete	], [ KP_Decimal ]	};
-    // End "Keypad" section
-
-
-    // begin modifier mappings
-    modifier_map Shift  	{ Shift_R, Shift_L };
-    modifier_map Mod1   	{ Meta_L, Meta_R };
-    modifier_map Mod2   	{ Mode_switch };
-    modifier_map Mod3   	{ Num_Lock };
-    modifier_map Mod4		{ Alt_L };
-};
-
-xkb_symbols "type4" {
-    include "sun_vndr/us(type4basic)"
-
-    // A few alphanumeric keys are different
-    key <AE04> { [ 4, dollar		], [ EuroSign	]	};
-    key <AE05> { [ 5, percent		], [ EuroSign	]	};
-    key <AD03> { [ e, E			], [ EuroSign	]	};
-};
-
-// US/ASCII layout for a Type 5 Sun keyboard
-xkb_symbols "type5basic" {
-    include "us(basic)"
-
-    key <RTSH> { [ Shift_R		]	};
-    key <LALT> { [ Alt_L		]	};
-    key <ALGR> { [ Mode_switch		]	};
-    key <LMTA> { [ Meta_L		]	};
-    key <RMTA> { [ Meta_R		]	};
-    key <COMP> { [ Multi_key		]	};
-    // End alphanumeric section
-
-    // Begin "Function" section
-    key <FK01> { [ F1			]			};
-    key <FK02> { [ F2			]			};
-    key <FK03> { [ F3			]			};
-    key <FK04> { [ F4			]			};
-    key <FK05> { [ F5			]			};
-    key <FK06> { [ F6			]			};
-    key <FK07> { [ F7			]			};
-    key <FK08> { [ F8			]			};
-    key <FK09> { [ F9			]			};
-    key <FK10> { [ F10			]			};
-    key <FK11> { [ SunF36		]			};
-    key <FK12> { [ SunF37		]			};
-    key <STOP> { [ L1, L1		], [ SunStop	]	};
-    key <AGAI> { [ L2, L2		], [ SunAgain	]	};
-    key <PROP> { [ L3, L3		], [ SunProps	]	};
-    key <UNDO> { [ L4, L4		], [ SunUndo	]	};
-    key <FRNT> { [ L5, L5		], [ SunFront	]	};
-    key <COPY> { [ L6, L6		], [ SunCopy	]	};
-    key <OPEN> { [ L7, L7		], [ SunOpen	]	};
-    key <PAST> { [ L8, L8		], [ SunPaste	]	};
-    key <FIND> { [ L9, L9		], [ SunFind	]	};
-    key <CUT>  { [ L10, L10		], [ SunCut	]	};
-    // End "Function" section
-
-    // Begin "Editing" section
-    key <PRSC> { [ R2, R2 		], [ Print, SunSys_Req	]	};
-    key <SCLK> { [ R3, R3		], [ Scroll_Lock	]	};
-    key <PAUS> { [ R1, R1		], [ Pause, Break	]	};
-    key <LEFT> { [ Left			]			};
-    key <RGHT> { [ Right		]			};
-    key <UP>   { [ Up			]			};
-    key <DOWN> { [ Down			]			};
-
-    key <DELE> { [ Delete		]			};
-    key <INS>  { [ Insert		]			};
-    key <PGUP> { [ Prior		]			};
-    key <PGDN> { [ Next			]			};
-    key <HOME> { [ Home			]			};
-    key <END>  { [ End			]			};
-    key <HELP> { [ Help			]			};
-
-    // End "Editing" section, begin "Keypad"
-    key <NMLK> { [ Num_Lock 		]				};
-    key <KPDV> { [ R5, R5		], [ KP_Divide	]	};
-    key <KPMU> { [ R6, R6		], [ KP_Multiply	]	};
-    key <KPSU> { [ R4, R4		], [ KP_Subtract	]	};
-
-    key  <KP7> { [ R7, R7		], [ KP_7, Home		]	};
-    key  <KP8> { [ Up, R8		], [ KP_8		]	};
-    key  <KP9> { [ R9, R9		], [ KP_9, Prior	]	};
-    key <KPAD> { [ KP_Add		]				};
-
-    key  <KP4> { [ Left, R10		], [ KP_4		]	};
-    key  <KP5> { [ R11,	R11		], [ KP_5		]	};
-    key  <KP6> { [ Right, R12		], [ KP_6		]	};
-
-    key  <KP1> { [ R13,	R13		], [ KP_1, End		]	};
-    key  <KP2> { [ Down, R14		], [ KP_2		]	};
-    key  <KP3> { [ R15,	R15		], [ KP_3		]	};
-    key <KPEN> { [ KP_Enter		]				};
-
-    key  <KP0> { [ KP_Insert, KP_Insert	], [ KP_0		]	};
-    key <KPDL> { [ KP_Delete, KP_Delete ], [ KP_Decimal 	]	};
-    // End "Keypad" section, 
-    // begin "four keys up on the right"
-
-    key <MUTE> { [ SunAudioMute,	SunVideoDegauss		]	};
-    key <VOL-> { [ SunAudioLowerVolume,	SunVideoLowerBrightness ]	};
-    key <VOL+> { [ SunAudioRaiseVolume,	SunVideoRaiseBrightness	]	};
-    key <POWR> { [ SunPowerSwitch,	SunPowerSwitchShift	]	};
-
-    // begin modifier mappings
-    modifier_map Shift  { Shift_R };
-    modifier_map Mod1	{ Meta_L, Meta_R };
-    modifier_map Mod2	{ Alt_R };
-    modifier_map Mod3	{ Num_Lock };
-    modifier_map Mod4	{ Alt_L };
-};
-
-xkb_symbols "type5" {
-    include "sun_vndr/us(type5basic)"
-
-    // A few alphanumeric keys are different
-    key <AE04> { [ 4, dollar		], [ EuroSign	]	};
-    key <AE05> { [ 5, percent		], [ EuroSign	]	};
-    key <AD03> { [ e, E			], [ EuroSign	]	};
-    key <BKSL> { [ backslash, bar	], [ brokenbar	]	};
-};
-
+// $XdotOrg: $

+//

+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.

+//

+// Permission is hereby granted, free of charge, to any person obtaining a

+// copy of this software and associated documentation files (the

+// "Software"), to deal in the Software without restriction, including

+// without limitation the rights to use, copy, modify, merge, publish,

+// distribute, and/or sell copies of the Software, and to permit persons

+// to whom the Software is furnished to do so, provided that the above

+// copyright notice(s) and this permission notice appear in all copies of

+// the Software and that both the above copyright notice(s) and this

+// permission notice appear in supporting documentation.

+// 

+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

+// 

+// Except as contained in this notice, the name of a copyright holder

+// shall not be used in advertising or otherwise to promote the sale, use

+// or other dealings in this Software without prior written authorization

+// of the copyright holder.

+//

+// $TOG: us /main/5 1998/02/10 13:45:06 kaleb $

+//

+//Copyright 1996, 1998  The Open Group

+//

+//All Rights Reserved.

+//

+//The above copyright notice and this permission notice shall be

+//included in all copies or substantial portions of the Software.

+//

+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

+//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR

+//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

+//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

+//OTHER DEALINGS IN THE SOFTWARE.

+//

+//Except as contained in this notice, the name of The Open Group shall

+//not be used in advertising or otherwise to promote the sale, use or

+//other dealings in this Software without prior written authorization

+//from The Open Group.

+//

+// US/ASCII layout for a Type 4 Sun keyboard

+

+//

+// CDDL HEADER START

+//

+// The contents of this file are subject to the terms of the

+// Common Development and Distribution License (the "License").

+// You may not use this file except in compliance with the License.

+//

+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE

+// or http://www.opensolaris.org/os/licensing.

+// See the License for the specific language governing permissions

+// and limitations under the License.

+//

+// When distributing Covered Code, include this CDDL HEADER in each

+// file and include the License file at src/OPENSOLARIS.LICENSE.

+// If applicable, add the following below this CDDL HEADER, with the

+// fields enclosed by brackets "[]" replaced with your own identifying

+// information: Portions Copyright [yyyy] [name of copyright owner]

+//

+// CDDL HEADER END

+//

+

+

+xkb_symbols "type4basic" {

+    include "us(basic)"

+

+    key <RTSH> { [ Shift_R		]			};

+    key <LALT> { [ Alt_L		]			};

+    key <ALGR> { [ Mode_switch		]			};

+    key <LMTA> { [ Meta_L		]			};

+    key <RMTA> { [ Meta_R		]			};

+    key <LNFD> { [ Linefeed		]			};

+    key <COMP> { [ Multi_key		]			};

+    // End alphanumeric section

+

+    // Begin "Function" section

+    key <FK01> { [ F1			]			};

+    key <FK02> { [ F2			]			};

+    key <FK03> { [ F3			]			};

+    key <FK04> { [ F4			]			};

+    key <FK05> { [ F5			]			};

+    key <FK06> { [ F6			]			};

+    key <FK07> { [ F7			]			};

+    key <FK08> { [ F8			]			};

+    key <FK09> { [ F9			]			};

+    key <FK10> { [ F10			]			};

+    key <FK11> { [ SunF36		]			};

+    key <FK12> { [ SunF37		]			};

+    key <STOP> { [ L1,	L1		], [ SunStop	]	};

+    key <AGAI> { [ L2,	L2		], [ SunAgain	]	};

+    key <PROP> { [ L3,	L3		], [ SunProps	]	};

+    key <UNDO> { [ L4,	L4		], [ SunUndo	]	};

+    key <FRNT> { [ L5,	L5		], [ SunFront	]	};

+    key <COPY> { [ L6,	L6		], [ SunCopy	]	};

+    key <OPEN> { [ L7,	L7		], [ SunOpen	]	};

+    key <PAST> { [ L8,	L8		], [ SunPaste	]	};

+    key <FIND> { [ L9,	L9		], [ SunFind	]	};

+    key <CUT>  { [ L10,	L10		], [ SunCut	]	};

+    // End "Function" section

+

+    // Begin "Editing" section

+    key <PRSC> { [ R2,	R2		], [ Print		] };

+    key <SCLK> { [ R3,	R3		], [ Scroll_Lock, Break	] };

+    key <PAUS> { [ R1,	R1		], [ Pause		] };

+    key <DELE> { [ Delete		]			};

+    key <HELP> { [ Help			]			};

+

+    // End "Editing" section, begin "Keypad"

+    key <NMLK> { [ Num_Lock 		]			};

+    key <KPEQ> { [ R4,	R4 		], [ KP_Equal		] };

+    key <KPDV> { [ R5,	R5		], [ KP_Divide		] };

+    key <KPMU> { [ R6,	R6		], [ KP_Multiply	] };

+    key <KPSU> { [ KP_Subtract		]			};

+

+    key  <KP7> { [ R7,	R7		], [ KP_7, Home		] };

+    key  <KP8> { [ Up, R8               ], [ KP_8               ] };

+//    key  <KP8> { [ R8,	R8		], [ KP_8		] };

+    key  <KP9> { [ R9,	R9		], [ KP_9, Prior	] };

+    key <KPAD> { [ KP_Add		]			};

+

+    key  <KP4> { [ Left, R10		], [ KP_4		] };

+    key  <KP5> { [ R11,	R11		], [ KP_5		] };

+    key  <KP6> { [ Right, R12		], [ KP_6		] };

+

+    key  <KP1> { [ R13,	R13		], [ KP_1,	End	] };

+    key  <KP2> { [ Down, R14		], [ KP_2		] };

+    key  <KP3> { [ R15,	R15		], [ KP_3,	Next	] };

+    key <KPEN> { [ KP_Enter		]			}; 

+    key  <KP0> { [ KP_Insert, KP_Insert], [ KP_0		]	};

+    key <KPDL> { [ Delete, Delete	], [ KP_Decimal ]	};

+    // End "Keypad" section

+

+

+    // begin modifier mappings

+    modifier_map Shift  	{ Shift_R, Shift_L };

+    modifier_map Mod1   	{ Meta_L, Meta_R };

+    modifier_map Mod2           { Num_Lock };

+    modifier_map Mod3   	{ Mode_switch };

+    modifier_map Mod4		{ Alt_L };

+};

+

+xkb_symbols "type4" {

+    include "sun_vndr/us(type4basic)"

+

+    // A few alphanumeric keys are different

+    key <AE04> { [ 4, dollar		], [ EuroSign	]	};

+    key <AE05> { [ 5, percent		], [ EuroSign	]	};

+    key <AD03> { [ e, E			], [ EuroSign	]	};

+};

+

+// US/ASCII layout for a Type 5 Sun keyboard

+xkb_symbols "type5basic" {

+    include "us(basic)"

+

+    key <RTSH> { [ Shift_R		]	};

+    key <LALT> { [ Alt_L		]	};

+    key <ALGR> { [ Mode_switch		]	};

+    key <LMTA> { [ Meta_L		]	};

+    key <RMTA> { [ Meta_R		]	};

+    key <COMP> { [ Multi_key		]	};

+    // End alphanumeric section

+

+    // Begin "Function" section

+    key <FK01> { [ F1			]			};

+    key <FK02> { [ F2			]			};

+    key <FK03> { [ F3			]			};

+    key <FK04> { [ F4			]			};

+    key <FK05> { [ F5			]			};

+    key <FK06> { [ F6			]			};

+    key <FK07> { [ F7			]			};

+    key <FK08> { [ F8			]			};

+    key <FK09> { [ F9			]			};

+    key <FK10> { [ F10			]			};

+    key <FK11> { [ SunF36		]			};

+    key <FK12> { [ SunF37		]			};

+    key <STOP> { [ L1, L1		], [ SunStop	]	};

+    key <AGAI> { [ L2, L2		], [ SunAgain	]	};

+    key <PROP> { [ L3, L3		], [ SunProps	]	};

+    key <UNDO> { [ L4, L4		], [ SunUndo	]	};

+    key <FRNT> { [ L5, L5		], [ SunFront	]	};

+    key <COPY> { [ L6, L6		], [ SunCopy	]	};

+    key <OPEN> { [ L7, L7		], [ SunOpen	]	};

+    key <PAST> { [ L8, L8		], [ SunPaste	]	};

+    key <FIND> { [ L9, L9		], [ SunFind	]	};

+    key <CUT>  { [ L10, L10		], [ SunCut	]	};

+    // End "Function" section

+

+    // Begin "Editing" section

+    key <PRSC> { [ R2, R2 		], [ Print, SunSys_Req	]	};

+    key <SCLK> { [ R3, R3		], [ Scroll_Lock	]	};

+    key <PAUS> { [ R1, R1		], [ Pause, Break	]	};

+    key <LEFT> { [ Left			]			};

+    key <RGHT> { [ Right		]			};

+    key <UP>   { [ Up			]			};

+    key <DOWN> { [ Down			]			};

+

+    key <DELE> { [ Delete		]			};

+    key <INS>  { [ Insert		]			};

+    key <PGUP> { [ Prior		]			};

+    key <PGDN> { [ Next			]			};

+    key <HOME> { [ Home			]			};

+    key <END>  { [ End			]			};

+    key <HELP> { [ Help			]			};

+

+    // End "Editing" section, begin "Keypad"

+    key <NMLK> { [ Num_Lock 		]				};

+    key <KPDV> { [ R5, R5		], [ KP_Divide	]	};

+    key <KPMU> { [ R6, R6		], [ KP_Multiply	]	};

+    key <KPSU> { [ R4, R4		], [ KP_Subtract	]	};

+

+    key  <KP7> { [ R7, R7		], [ KP_7, Home		]	};

+    key  <KP8> { [ Up, R8		], [ KP_8		]	};

+    key  <KP9> { [ R9, R9		], [ KP_9, Prior	]	};

+    key <KPAD> { [ KP_Add		]				};

+

+    key  <KP4> { [ Left, R10		], [ KP_4		]	};

+    key  <KP5> { [ R11,	R11		], [ KP_5		]	};

+    key  <KP6> { [ Right, R12		], [ KP_6		]	};

+

+    key  <KP1> { [ R13,	R13		], [ KP_1, End		]	};

+    key  <KP2> { [ Down, R14		], [ KP_2		]	};

+    key  <KP3> { [ R15,	R15		], [ KP_3		]	};

+    key <KPEN> { [ KP_Enter		]				};

+

+    key  <KP0> { [ KP_Insert, KP_Insert	], [ KP_0		]	};

+    key <KPDL> { [ KP_Delete, KP_Delete ], [ KP_Decimal 	]	};

+    // End "Keypad" section, 

+    // begin "four keys up on the right"

+

+    key <MUTE> { [ SunAudioMute,	SunVideoDegauss		]	};

+    key <VOL-> { [ SunAudioLowerVolume,	SunVideoLowerBrightness ]	};

+    key <VOL+> { [ SunAudioRaiseVolume,	SunVideoRaiseBrightness	]	};

+    key <POWR> { [ SunPowerSwitch,	SunPowerSwitchShift	]	};

+

+    // begin modifier mappings

+    modifier_map Shift  { Shift_R };

+    modifier_map Mod1	{ Meta_L, Meta_R };

+    modifier_map Mod2   { Num_Lock };

+    modifier_map Mod3	{ Alt_R };

+    modifier_map Mod4	{ Alt_L };

+};

+

+xkb_symbols "type5" {

+    include "sun_vndr/us(type5basic)"

+

+    // A few alphanumeric keys are different

+    key <AE04> { [ 4, dollar		], [ EuroSign	]	};

+    key <AE05> { [ 5, percent		], [ EuroSign	]	};

+    key <AD03> { [ e, E			], [ EuroSign	]	};

+    key <BKSL> { [ backslash, bar	], [ brokenbar	]	};

+};

+

diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/tw b/xorg-server/xkbdata.src/symbols/sun_vndr/tw
index 736c242eb..a4c011d45 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/tw
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/tw
@@ -1,53 +1,79 @@
-// $XdotOrg: $
-//
-// Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice (including the next
-// paragraph) shall be included in all copies or substantial portions of the
-// Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-//
-// Taiwanese layout for a Type 4 Sun keyboard
-xkb_symbols "type4" {
-    include "sun_vndr/us(type4basic)"
-
-    key <BKSL> { [ backslash, bar	], [ brokenbar	]		};
-
-//    key <LNFD> { [ Hangul		]			};
-//    key <RALT> { [ Linefeed		]			};
-    key <COMP> { [ Henkan_Mode		]			};
-
-};
-
-// Taiwanese layout for a Type 5 Sun keyboard
-xkb_symbols "type5" {
-
-    // A few keys are different
-    key <ALGR> { [ Henkan_Mode		]			};
-    key <BKSL> { [ backslash, bar	], [ brokenbar	]		};
-
-};
-
-// Taiwanese layout for a Type 6 Sun keyboard
-partial
-xkb_symbols "type6" {
-    // A few keys are different from US layout - only those are shown here
-    key <ALGR> { [ Henkan_Mode		]			};
-    key <BKSL> { [ backslash, bar	], [ brokenbar	]		};
-};
-
+//

+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.

+//

+// Permission is hereby granted, free of charge, to any person obtaining a

+// copy of this software and associated documentation files (the

+// "Software"), to deal in the Software without restriction, including

+// without limitation the rights to use, copy, modify, merge, publish,

+// distribute, and/or sell copies of the Software, and to permit persons

+// to whom the Software is furnished to do so, provided that the above

+// copyright notice(s) and this permission notice appear in all copies of

+// the Software and that both the above copyright notice(s) and this

+// permission notice appear in supporting documentation.

+// 

+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

+// 

+// Except as contained in this notice, the name of a copyright holder

+// shall not be used in advertising or otherwise to promote the sale, use

+// or other dealings in this Software without prior written authorization

+// of the copyright holder.

+//

+

+//

+// CDDL HEADER START

+//

+// The contents of this file are subject to the terms of the

+// Common Development and Distribution License (the "License").

+// You may not use this file except in compliance with the License.

+//

+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE

+// or http://www.opensolaris.org/os/licensing.

+// See the License for the specific language governing permissions

+// and limitations under the License.

+//

+// When distributing Covered Code, include this CDDL HEADER in each

+// file and include the License file at src/OPENSOLARIS.LICENSE.

+// If applicable, add the following below this CDDL HEADER, with the

+// fields enclosed by brackets "[]" replaced with your own identifying

+// information: Portions Copyright [yyyy] [name of copyright owner]

+//

+// CDDL HEADER END

+//

+

+// Taiwanese layout for a Type 6 Sun keyboard

+partial

+xkb_symbols "type6" {

+    // A few keys are different from US layout - only those are shown here

+    key <ALGR> { [ Henkan_Mode          ]                       };

+    key <BKSL> { [ backslash, bar,  brokenbar   ]               };

+

+};

+

+

+// Taiwanese layout for a Type 4 Sun keyboard

+

+xkb_symbols "type4" {

+

+    key <BKSL> { [ backslash, bar,  brokenbar	]		};

+

+    key <COMP> { [ Henkan_Mode		]			};

+

+};

+

+// Taiwanese layout for a Type 5 Sun keyboard

+xkb_symbols "type5" {

+

+    // A few keys are different

+    key <ALGR> { [ Henkan_Mode		]			};

+    key <BKSL> { [ backslash, bar,  brokenbar	]		};

+

+};

+

diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/ua b/xorg-server/xkbdata.src/symbols/sun_vndr/ua
new file mode 100644
index 000000000..c49b21bce
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/ua
@@ -0,0 +1,118 @@
+//

+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.

+//

+// Permission is hereby granted, free of charge, to any person obtaining a

+// copy of this software and associated documentation files (the

+// "Software"), to deal in the Software without restriction, including

+// without limitation the rights to use, copy, modify, merge, publish,

+// distribute, and/or sell copies of the Software, and to permit persons

+// to whom the Software is furnished to do so, provided that the above

+// copyright notice(s) and this permission notice appear in all copies of

+// the Software and that both the above copyright notice(s) and this

+// permission notice appear in supporting documentation.

+// 

+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

+// 

+// Except as contained in this notice, the name of a copyright holder

+// shall not be used in advertising or otherwise to promote the sale, use

+// or other dealings in this Software without prior written authorization

+// of the copyright holder.

+//

+

+//

+// CDDL HEADER START

+//

+// The contents of this file are subject to the terms of the

+// Common Development and Distribution License (the "License").

+// You may not use this file except in compliance with the License.

+//

+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE

+// or http://www.opensolaris.org/os/licensing.

+// See the License for the specific language governing permissions

+// and limitations under the License.

+//

+// When distributing Covered Code, include this CDDL HEADER in each

+// file and include the License file at src/OPENSOLARIS.LICENSE.

+// If applicable, add the following below this CDDL HEADER, with the

+// fields enclosed by brackets "[]" replaced with your own identifying

+// information: Portions Copyright [yyyy] [name of copyright owner]

+//

+// CDDL HEADER END

+//

+

+

+partial default alphanumeric_keys

+xkb_symbols "type6" {

+

+    name[Group1]="Ukraine";

+

+

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

+    key	<AE01> {	[		1,	    exclam,	1,	    exclam 	]	};

+    key	<AE02> {	[		2,		at,	2,        quotedbl	]	};

+    key	<AE03> {	[		3,	numbersign,	3,      numbersign	]	};

+    key	<AE04> {	[		4,	    dollar,	4,        asterisk	]	};

+    key	<AE05> {	[		5,	   percent,	5,	     colon	]	};

+    key	<AE06> {	[		6,     asciicircum,	6,	     comma	]	};

+    key	<AE07> {	[		7,	 ampersand,	7,	    period	]	};

+    key	<AE08> {	[		8,	  asterisk,	8,	 semicolon	]	};

+    key	<AE09> {	[		9,	 parenleft,	9,	 parenleft	]	};

+    key	<AE10> {	[		0,	parenright,	0,	parenright	]	};

+    key	<AE11> {	[	    minus,	underscore,	minus,	underscore	]	};

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

+

+    key	<AD01> {	[		q,		 Q,	Cyrillic_shorti, Cyrillic_SHORTI	]	};

+    key	<AD02> {	[		w,		 W,	Cyrillic_tse,    Cyrillic_TSE	]	};

+    key	<AD03> {	[		e,		 E,	Cyrillic_u,	Cyrillic_U	]	};

+    key	<AD04> {	[		r,		 R,	Cyrillic_ka,     Cyrillic_KA	]	};

+    key	<AD05> {	[		t,		 T,	Cyrillic_ie,     Cyrillic_IE	]	};

+    key	<AD06> {	[		y,		 Y,	Cyrillic_en,     Cyrillic_EN	]	};

+    key	<AD07> {	[		u,		 U,	Cyrillic_ghe,    Cyrillic_GHE	]	};

+    key	<AD08> {	[		i,		 I,	Cyrillic_sha,    Cyrillic_SHA	]	};

+    key	<AD09> {	[		o,		 O,	Cyrillic_shcha,  Cyrillic_SHCHA	]	};

+    key	<AD10> {	[		p,		 P,	Cyrillic_ze,     Cyrillic_ZE	]	};

+    key	<AD11> {	[     bracketleft,	 braceleft,	Cyrillic_ha,     Cyrillic_HA	]	};

+    key	<AD12> {	[    bracketright,	braceright,	Ukrainian_yi,    Ukrainian_YI	]	};

+

+    key	<AC01> {	[		a,		 A,	Cyrillic_ef,     Cyrillic_EF	]	};

+    key	<AC02> {	[		s,		 S,	Ukrainian_i,     Ukrainian_I	]	};

+    key	<AC03> {	[		d,		 D,	Cyrillic_ve,     Cyrillic_VE	]	};

+    key	<AC04> {	[		f,		 F,	Cyrillic_a,	Cyrillic_A	]	};

+    key	<AC05> {	[		g,		 G,	Cyrillic_pe,     Cyrillic_PE	]	};

+    key	<AC06> {	[		h,		 H,	Cyrillic_er,     Cyrillic_ER	]	};

+    key	<AC07> {	[		j,		 J,	Cyrillic_o,	Cyrillic_O	]	};

+    key	<AC08> {	[		k,		 K,	Cyrillic_el,     Cyrillic_EL	]	};

+    key	<AC09> {	[		l,		 L,	Cyrillic_de,     Cyrillic_DE	]	};

+    key	<AC10> {	[	semicolon,	     colon,	Cyrillic_zhe,    Cyrillic_ZHE	]	};

+    key	<AC11> {	[      apostrophe,	  quotedbl,	Ukrainian_ie,    Ukrainian_IE	]	};

+    key <BKSL> {        [       backslash,             bar,     Ukrainian_ghe_with_upturn, Ukrainian_GHE_WITH_UPTURN ] };

+

+    key <LSGT> {        [            less,         greater,     slash,           bar            ]       };

+    key	<AB01> {	[		z,		 Z,	Cyrillic_ya,     Cyrillic_YA	]	};

+    key	<AB02> {	[		x,		 X,	Cyrillic_che,    Cyrillic_CHE	]	};

+    key	<AB03> {	[		c,		 C,	Cyrillic_es,     Cyrillic_ES	]	};

+    key	<AB04> {	[		v,		 V,	Cyrillic_em,     Cyrillic_EM	]	};

+    key	<AB06> {	[		n,		 N,	Cyrillic_te,     Cyrillic_TE	]	};

+    key	<AB05> {	[		b,		 B,	Cyrillic_i,	Cyrillic_I	]	};

+    key	<AB07> {	[		m,		 M,	Cyrillic_softsign,Cyrillic_SOFTSIGN	]	};

+    key	<AB08> {	[	    comma,	      less,	Cyrillic_be,     Cyrillic_BE	]	};

+    key	<AB09> {	[	   period,	   greater,	Cyrillic_yu,     Cyrillic_YU	]	};

+    key	<AB10> {	[	    slash,	  question,	slash,	  question	        ]	};

+

+	include "level3(ralt_switch)"

+

+};

+

+partial alphanumeric_keys

+	xkb_symbols "basic" {

+	include "sun_vndr/ua(type6)"

+};

+

diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/us b/xorg-server/xkbdata.src/symbols/sun_vndr/us
index f85cec950..8a857a5ab 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/us
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/us
@@ -1,328 +1,401 @@
-// $XdotOrg: $
-//
-// Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice (including the next
-// paragraph) shall be included in all copies or substantial portions of the
-// Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-// $TOG: us /main/5 1998/02/10 13:45:06 kaleb $
-// Sun: @(#)us	1.5	03/04/21 SMI
-//
-//Copyright 1996, 1998  The Open Group
-//
-//All Rights Reserved.
-//
-//The above copyright notice and this permission notice shall be
-//included in all copies or substantial portions of the Software.
-//
-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-//OTHER DEALINGS IN THE SOFTWARE.
-//
-//Except as contained in this notice, the name of The Open Group shall
-//not be used in advertising or otherwise to promote the sale, use or
-//other dealings in this Software without prior written authorization
-//from The Open Group.
-//
-
-// Symbols shared by all Sun Keyboard layouts
-hidden
-xkb_symbols "sunbasic" {
-    include "srvr_ctrl(xfree86)"
-
-    // Needed for left function keys and volume keys
-    // Need to include this before us(basic) otherwise tilde is mapped to 
-    // a jp key
-    include "inet(evdev)"
-
-    include "us(basic)"
-    include "pc(function)"
-    include "pc(editing)"
-    include "keypad(x11)"
-
-    include "sun_vndr/us(left_funkeys)"
-
-    include "capslock(capslock)"
-    //include "capslock(shiftlock)"
-
-    key <LFSH> { [ Shift_L		]			};
-    key <RTSH> { [ Shift_R		]			};
-    key <LALT> { [ Alt_L		]			};
-    key <ALGR> { [ Mode_switch		]			};
-    key <LMTA> { [ Meta_L		]			};
-    key <RMTA> { [ Meta_R		]			};
-    key <LCTL> { [ Control_L		]			};
-    key <RCTL> { [ Control_R		]			};
-    key <COMP> { [ Multi_key		]			};
-
-    key  <TAB> { [ Tab,  ISO_Left_Tab	]			};
-    key <RTRN> { [ Return		]			};
-
-    key <ESC>  { [ Escape		]			}; 
-
-    key <NMLK> { [ Num_Lock, Pointer_EnableKeys	] };
-    key <SPCE> { [ space                        ] };
-
-    key <BKSP> {         [       BackSpace ] };
-
-    // By default, we use the same symbols as other XKB implementations
-    // for greater compatibility & AccessX MouseKeys support, but it is 
-    // different than the traditional Sun key mappings that date back to the
-    // Sun Type 2 keyboard, in which the right side numpad were "R" function
-    // keys.  To restore the original behavior, uncomment the section below 
-    // that lists the R key mappings.
-//    key  <KP7> { [ R7,	R7		], [ KP_7, Home		] };
-//    key  <KP8> { [ Up, R8               ], [ KP_8               ] };
-//    key  <KP9> { [ R9,	R9		], [ KP_9, Prior	] };
-//    key <KPAD> { [ KP_Add		]			};
-//
-//    key  <KP4> { [ Left, R10		], [ KP_4		] };
-//    key  <KP5> { [ R11,	R11		], [ KP_5		] };
-//    key  <KP6> { [ Right, R12		], [ KP_6		] };
-//
-//    key  <KP1> { [ R13,	R13		], [ KP_1,	End	] };
-//    key  <KP2> { [ Down, R14		], [ KP_2		] };
-//    key  <KP3> { [ R15,	R15		], [ KP_3,	Next	] };
-//    key <KPEN> { [ KP_Enter		]			}; 
-//    key  <KP0> { [ KP_Insert, KP_Insert], [ KP_0		]	};
-//    key <KPDL> { [ Delete, Delete	], [ KP_Decimal ]	};
-
-      // End "Keypad" section
-
-    modifier_map Control { Control_L, Control_R };
-    modifier_map Shift   { Shift_R, Shift_L };
-    modifier_map Mod1    { Meta_L, Meta_R };
-    modifier_map Mod2    { Mode_switch };
-    modifier_map Mod3    { Num_Lock };
-    modifier_map Mod4    { Alt_L };
-};
-
-hidden
-xkb_symbols "left_funkeys" {
-    // Suppliment to inet(evdev) for added functionality of left-funkeys
-    key <STOP> { [ NoSymbol ],      [ L1, L1   ]       };
-    key <AGAI> { [ NoSymbol ],      [ L2, L2   ]       };
-    key <PROP> { [ NoSymbol ],      [ L3, L3   ]       };
-    key <UNDO> { [ NoSymbol ],      [ L4, L4   ]       };
-    key <FRNT> { [ NoSymbol ],      [ L5, L5   ]       };
-    key <COPY> { [ NoSymbol ],      [ L6, L6   ]       };
-    key <OPEN> { [ NoSymbol ],      [ L7, L7   ]       };
-    key <PAST> { [ NoSymbol ],      [ L8, L8   ]       };
-    key <FIND> { [ NoSymbol ],      [ L9, L9   ]       };
-    key <CUT>  { [ NoSymbol ],      [ L10, L10 ]       };
-
-    // The above symbols were chosen for better compatibility withother xkb
-    // mappings.  The old mappings are kepy below in case someone needs them
-    //key <STOP> { [ L1,	L1		], [ SunStop	]	};
-    //key <AGAI> { [ L2,	L2		], [ SunAgain	]	};
-    //key <PROP> { [ L3,	L3		], [ SunProps	]	};
-    //key <UNDO> { [ L4,	L4		], [ SunUndo	]	};
-    //key <FRNT> { [ L5,	L5		], [ SunFront	]	};
-    //key <COPY> { [ L6,	L6		], [ SunCopy	]	};
-    //key <OPEN> { [ L7,	L7		], [ SunOpen	]	};
-    //key <PAST> { [ L8,	L8		], [ SunPaste	]	};
-    //key <FIND> { [ L9,	L9		], [ SunFind	]	};
-    //key <CUT>  { [ L10,	L10		], [ SunCut	]	};
-};
-
-hidden
-xkb_symbols "volumekeys" {
-    // Suppliment to inet(evdev) for added functionality of audio keys
-    key <MUTE> { [ NoSymbol,	SunVideoDegauss		]	};
-    key <VOL-> { [ NoSymbol,	XF86MonBrightnessDown   ]	};
-    key <VOL+> { [ NoSymbol,	XF86MonBrightnessUp	]	};
-
-    // The above symbols were chosen for better compatibility withother xkb
-    // mappings.  The old mappings are kepy below in case someone needs them
-    //key <MUTE> { [ SunAudioMute,	SunVideoDegauss		]	};
-    //key <VOL-> { [ SunAudioLowerVolume,	SunVideoLowerBrightness ]	};
-    //key <VOL+> { [ SunAudioRaiseVolume,	SunVideoRaiseBrightness	]	};
-    //key <POWR> { [ SunPowerSwitch,	SunPowerSwitchShift	]	};
-};
-
-// US/ASCII layout for a Type 4 Sun keyboard
-xkb_symbols "type4basic" {
-    include "sun_vndr/us(sunbasic)"
-
-    // A few alphanumeric keys are different
-    key <AE04> { [ 4, dollar		], [ EuroSign	]	};
-    key <AE05> { [ 5, percent		], [ EuroSign	]	};
-    key <AD03> { [ e, E			], [ EuroSign	]	};
-
-    key <LNFD> { [ Linefeed		]			};
-
-    // Begin "Editing" section
-    key <PRSC> { [ R2,	R2		], [ Print		] };
-    key <SCLK> { [ R3,	R3		], [ Scroll_Lock, Break	] };
-    key <PAUS> { [ R1,	R1		], [ Pause		] };
-
-    // End "Editing" section, begin "Keypad"
-    key <KPEQ> { [ R4,	KP_Equal	], [ KP_Equal		] };
-};
-
-xkb_symbols "type4" {
-    include "sun_vndr/us(type4basic)"
-
-    key <BKSL> { [ backslash, bar	], [ brokenbar	]	};
-};
-
-// US/ASCII layout for a Type 5 Sun keyboard
-xkb_symbols "type5basic" {
-    include "sun_vndr/us(sunbasic)"
-    include "sun_vndr/us(volumekeys)"
-
-    // Begin "Editing" section
-    key <PRSC> { [ R2, R2 		], [ Print, SunSys_Req	]	};
-    key <SCLK> { [ R3, R3		], [ Scroll_Lock	]	};
-    key <PAUS> { [ R1, R1		], [ Pause, Break	]	};
-    // End "Editing" section
-};
-
-xkb_symbols "type5" {
-    include "sun_vndr/us(type5basic)"
-
-    // A few alphanumeric keys are different
-    key <AE04> { [ 4, dollar		], [ EuroSign	]	};
-    key <AE05> { [ 5, percent		], [ EuroSign	]	};
-    key <AD03> { [ e, E			], [ EuroSign	]	};
-    key <BKSL> { [ backslash, bar	], [ brokenbar	]	};
-};
-
-// US/ASCII layout for a Type 5 Sun keyboard
-xkb_symbols "type5hobobasic" {
-    include "sun_vndr/us(type5basic)"
-};
-
-xkb_symbols "type5hobo" {
-    include "sun_vndr/us(type5hobobasic)"
-
-    // A few alphanumeric keys are different
-    key <AE04> { [ 4, dollar		], [ EuroSign 	]	};
-    key <AE05> { [ 5, percent		], [ EuroSign	]	};
-    key <AD03> { [ e, E			], [ EuroSign	]	};
-    key <BKSL> { [ backslash, bar	], [ brokenbar	]	};
-
-    // Here is the hobo keypad:
-
-    key <AE07> { [ 7, ampersand	], [ NoSymbol, NoSymbol	], [ KP_7	] };
-    key <AE08> { [ 8, asterisk	], [ NoSymbol, NoSymbol	], [ KP_8	] };
-    key <AE09> { [ 9, parenleft	], [ NoSymbol, NoSymbol	], [ KP_9	] };
-    key <AE10> { [ 0, parenright], [ NoSymbol, NoSymbol	], [ KP_Multiply] };
-
-    key <AD07> { [ u, U		], [ NoSymbol, NoSymbol	], [ KP_4	] };
-    key <AD08> { [ i, I		], [ NoSymbol, NoSymbol	], [ KP_5	] };
-    key <AD09> { [ o, O		], [ NoSymbol, NoSymbol	], [ KP_6	] };
-    key <AD10> { [ p, P		], [ NoSymbol, NoSymbol	], [ KP_Subtract]};
-
-    key <AC07> { [ j, J		], [ NoSymbol, NoSymbol	], [ KP_1	] };
-    key <AC08> { [ k, K		], [ NoSymbol, NoSymbol	], [ KP_2	] };
-    key <AC09> { [ l, L		], [ NoSymbol, NoSymbol	], [ KP_3	] };
-    key <AC10> { [ semicolon, colon], [ NoSymbol, NoSymbol], [ KP_Add	] };
-
-    key <RTRN> { [ Return	], [ NoSymbol, NoSymbol], [ KP_Enter	] };
-
-    key <AB07> { [ m, M		], [ NoSymbol, NoSymbol	], [ KP_0	] };
-
-    key <AB09> { [ period, greater], [ NoSymbol, NoSymbol], [ KP_Decimal] };
-    key <AB10> { [ slash, question], [ NoSymbol, NoSymbol], [ KP_Divide	] };
-};
-
-xkb_symbols "type6" {
-    include "sun_vndr/us(sunbasic)"
-    include "sun_vndr/us(volumekeys)"
-    include "eurosign(4)"
-
-    key <SYRQ> { [ SunSys_Req 			]};
-    key <LSGT> { [ less, greater, bar, brokenbar ] };
-
-};
-
-xkb_symbols "pc101" {
-    include "us(pc101)"
-    key <RALT> { [ Mode_switch, Meta_R	] };
-};
-
-xkb_symbols "pc102" {
-    include "us(pc102)"
-    key <RALT> { [ Mode_switch, Meta_R	] };
-};
-
-xkb_symbols "pc104" {
-    include "us(pc104)"
-};
-
-xkb_symbols "pc101currency" {
-
-    key <AE04> { [ 4, dollar		], [ EuroSign	]	};
-    key <AE05> { [ 5, percent		], [ EuroSign	]	};
-    key <AD03> { [ e, E			], [ EuroSign	]	};
-    key <BKSL> { [ backslash, bar	], [ brokenbar			]};
-};
-
-xkb_symbols "US101A_Sun" {
-
-    key <AE04> { [ 4, dollar		], [ EuroSign	]	};
-    key <AE05> { [ 5, percent		], [ EuroSign	]	};
-    key <AD03> { [ e, E			], [ EuroSign	]	};
-    key <BKSL> { [ backslash, bar	], [ brokenbar			]};
-
-    // Begin "Editing" section
-    key <PRSC> { [ L5, L5		], [ Print, SunSys_Req 		]};
-    key <SCLK> { [ L7, L7		], [  Scroll_Lock		]};
-    key <PAUS> { [ L1, L1		], [ Pause, Break 		]};
-    key  <INS> { [ L8, L8		], [  Insert			]};
-    key <HOME> { [ L6, L6		], [  Home			]};
-    key <PGUP> { [ L3, L3		], [  Prior			]};
-
-
-    key <DELE> { [ L10, L10		], [ Delete			]};
-    key  <END> { [ L9, L9		], [  End			]};
-    key <PGDN> { [ L4, L4		], [  Next			]};
-
-    key   <UP> {	[  Up			]	};
-    key <LEFT> {	[  Left			]	};
-    key <DOWN> {	[  Down			]	};
-    key <RGHT> {	[  Right		]	};
-
-    key <KPDV> { [ R5, R5		], [ KP_Divide	]	};
-    key <KPMU> { [ R6, R6		], [ KP_Multiply	]	};
-
-    key  <KP7> { [ R7, KP_7		], [ KP_7, Home		]	};
-    key  <KP8> { [ KP_Up, KP_8		], [ KP_8		]	};
-    key  <KP9> { [ R9, KP_9		], [ KP_9, Prior	]	};
-    key <KPAD> { [ KP_Add		]				};
-
-    key  <KP4> { [ KP_Left, KP_4	], [ KP_4		]	};
-    key  <KP5> { [ R11,	KP_5		], [ KP_5		]	};
-    key  <KP6> { [ KP_Right, KP_6	], [ KP_6		]	};
-
-    key  <KP1> { [ R13,	KP_1		], [ KP_1, End		]	};
-    key  <KP2> { [ KP_Down, KP_2	], [ KP_2		]	};
-    key  <KP3> { [ R15,	KP_3		], [ KP_3, Next		]	};
-    key <KPEN> { [ KP_Enter		]				};
-
-    key <LALT> { [ Meta_L		]				};
-    key <RALT> { [ Alt_L		]				};
-    key <RCTL> { [ Multi_key		]				};
-};
-
+//

+// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.

+//

+// Permission is hereby granted, free of charge, to any person obtaining a

+// copy of this software and associated documentation files (the

+// "Software"), to deal in the Software without restriction, including

+// without limitation the rights to use, copy, modify, merge, publish,

+// distribute, and/or sell copies of the Software, and to permit persons

+// to whom the Software is furnished to do so, provided that the above

+// copyright notice(s) and this permission notice appear in all copies of

+// the Software and that both the above copyright notice(s) and this

+// permission notice appear in supporting documentation.

+// 

+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

+// 

+// Except as contained in this notice, the name of a copyright holder

+// shall not be used in advertising or otherwise to promote the sale, use

+// or other dealings in this Software without prior written authorization

+// of the copyright holder.

+//

+//

+//Copyright 1996, 1998  The Open Group

+//

+//All Rights Reserved.

+//

+//The above copyright notice and this permission notice shall be

+//included in all copies or substantial portions of the Software.

+//

+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

+//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR

+//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

+//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

+//OTHER DEALINGS IN THE SOFTWARE.

+//

+//Except as contained in this notice, the name of The Open Group shall

+//not be used in advertising or otherwise to promote the sale, use or

+//other dealings in this Software without prior written authorization

+//from The Open Group.

+//

+

+//

+// CDDL HEADER START

+//

+// The contents of this file are subject to the terms of the

+// Common Development and Distribution License (the "License").

+// You may not use this file except in compliance with the License.

+//

+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE

+// or http://www.opensolaris.org/os/licensing.

+// See the License for the specific language governing permissions

+// and limitations under the License.

+//

+// When distributing Covered Code, include this CDDL HEADER in each

+// file and include the License file at src/OPENSOLARIS.LICENSE.

+// If applicable, add the following below this CDDL HEADER, with the

+// fields enclosed by brackets "[]" replaced with your own identifying

+// information: Portions Copyright [yyyy] [name of copyright owner]

+//

+// CDDL HEADER END

+//

+

+// Symbols shared by all Sun Keyboard layouts

+xkb_symbols "sunbasic" {

+    include "srvr_ctrl(xfree86)"

+

+    // Needed for left function keys and volume keys

+    // Need to include this before us(basic) otherwise tilde is mapped to 

+    // a jp key

+    include "inet(evdev)"

+

+    include "us(basic)"

+    include "pc(function)"

+    include "pc(editing)"

+    include "keypad(x11)"

+

+    key <ESC>  { [ Escape               ]                       };

+

+    // the extra key on most European keyboards

+    key <LSGT> { [ less,    greater,      bar,    brokenbar   ] };

+

+    // these keys are common to almost all layouts

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

+    key <SPCE> { [ space                ]                       };

+

+    key <BKSP> { [ BackSpace            ]                       };

+    key  <TAB> { [ Tab,  ISO_Left_Tab   ]                       };

+    key <RTRN> { [ Return               ]                       };

+

+    key <NMLK> { [ Num_Lock, Pointer_EnableKeys               ] };

+

+    key <COMP> { [ Multi_key            ]                       };

+    // End alphanumeric section

+

+    key <LFSH> { [ Shift_L              ]                       };

+    key <LCTL> { [ Control_L            ]                       };

+

+    key <RTSH> { [ Shift_R              ]                       };

+    key <RCTL> { [ Control_R            ]                       };

+

+

+    // begin modifier mappings

+    modifier_map Shift  { Shift_L, Shift_R };

+    modifier_map Lock   { Caps_Lock, ISO_Lock };

+    modifier_map Control{ Control_L, Control_R };

+    modifier_map Mod2   { Num_Lock };

+

+    //  Fake keys for virtual<->real modifiers mapping 

+    key <LVL3> { [ ISO_Level3_Shift      ]                     };

+    key <MDSW> { [ Mode_switch           ]                     };

+    modifier_map Mod5   { <LVL3>, <MDSW> };

+

+    key <ALT>  { [ NoSymbol, Alt_L       ]                     };

+    key <LALT> {        [       Alt_L,  Alt_L           ]       };

+    key <LWIN> {        [       Meta_L                  ]       };

+    key <RWIN> {        [       Meta_R                  ]       };

+    modifier_map Mod1   { Alt_L };

+    modifier_map Mod4   { Meta_L, Meta_R };

+

+//    key <LALT> { [ Alt_L		]			};

+//    key <ALGR> { [ Mode_switch	]			};

+//    key <LMTA> { [ Meta_L		]			};

+//    key <RMTA> { [ Meta_R		]			};

+

+    include "sun_vndr/us(left_funkeys)"

+

+    include "capslock(capslock)"

+    //include "capslock(shiftlock)"

+

+

+// This default section uses the same symbols as other XKB implementations

+// for greater compatibility & AccessX MouseKeys support, but it is

+// different than the traditional Sun key mappings that date back to the

+// Sun Type 2 keyboard, in which the right side numpad were "R" function

+// keys.  To restore the original behavior, comment out this section and

+// uncomment the section below that lists the R key mappings.

+    key <KPDV> {        [  KP_Divide            ]       };

+    key <KPMU> {        [  KP_Multiply          ]       };

+    key <KPSU> {        [  KP_Subtract          ]       };

+

+    key  <KP7> {        [  KP_Home,     KP_7    ]       };

+    key  <KP8> {        [  KP_Up,       KP_8    ]       };

+    key  <KP9> {        [  KP_Prior,    KP_9    ]       };

+    key <KPAD> {        [       KP_Add          ]       };

+

+    key  <KP4> {        [  KP_Left,     KP_4    ]       };

+    key  <KP5> {        [  KP_Begin,    KP_5    ]       };

+    key  <KP6> {        [  KP_Right,    KP_6    ]       };

+

+    key  <KP1> {        [  KP_End,      KP_1    ]       };

+    key  <KP2> {        [  KP_Down,     KP_2    ]       };

+    key  <KP3> {        [  KP_Next,     KP_3    ]       };

+    key <KPEN> {        [       KP_Enter        ]       };

+

+    key  <KP0> {        [  KP_Insert,   KP_0    ]       };

+    key <KPDL> {  	[  KP_Delete, KP_Decimal ]    	};

+

+// End New Keypad section - Begin Sun traditional Keypad section

+

+//    key  <KP7> { [ R7,        R7              ], [ KP_7, Home         ] };

+//    key  <KP8> { [ Up, R8               ], [ KP_8               ] };

+//    key  <KP9> { [ R9,        R9              ], [ KP_9, Prior        ] };

+//    key <KPAD> { [ KP_Add             ]                       };

+//

+//    key  <KP4> { [ Left, R10          ], [ KP_4               ] };

+//    key  <KP5> { [ R11,       R11             ], [ KP_5               ] };

+//    key  <KP6> { [ Right, R12         ], [ KP_6               ] };

+//

+//    key  <KP1> { [ R13,       R13             ], [ KP_1,      End     ] };

+//    key  <KP2> { [ Down, R14          ], [ KP_2               ] };

+//    key  <KP3> { [ R15,       R15             ], [ KP_3,      Next    ] };

+//    key <KPEN> { [ KP_Enter           ]                       };

+//    key  <KP0> { [ KP_Insert, KP_Insert], [ KP_0              ]       };

+//    key <KPDL> { [ Delete, Delete     ], [ KP_Decimal ]       };

+

+// End "Keypad" section

+

+};

+

+

+xkb_symbols "left_funkeys" {

+    // Suppliment to inet(evdev) for added functionality of left-funkeys

+    //key <STOP> { [ NoSymbol ],      [ L1, L1   ]       };

+    //key <AGAI> { [ NoSymbol ],      [ L2, L2   ]       };

+    //key <PROP> { [ NoSymbol ],      [ L3, L3   ]       };

+    //key <UNDO> { [ NoSymbol ],      [ L4, L4   ]       };

+    //key <FRNT> { [ NoSymbol ],      [ L5, L5   ]       };

+    //key <COPY> { [ NoSymbol ],      [ L6, L6   ]       };

+    //key <OPEN> { [ NoSymbol ],      [ L7, L7   ]       };

+    //key <PAST> { [ NoSymbol ],      [ L8, L8   ]       };

+    //key <FIND> { [ NoSymbol ],      [ L9, L9   ]       };

+    //key <CUT>  { [ NoSymbol ],      [ L10, L10 ]       };

+

+    // The above symbols were chosen for better compatibility withother xkb

+    // mappings.  The old mappings are kepy below in case someone needs them

+    key <STOP> { [ L1,        L1,  SunStop    ]       };

+    key <AGAI> { [ L2,        L2,  SunAgain   ]       };

+    key <PROP> { [ L3,        L3,  SunProps   ]       };

+    key <UNDO> { [ L4,        L4,  SunUndo    ]       };

+    key <FRNT> { [ L5,        L5,  SunFront   ]       };

+    key <COPY> { [ L6,        L6,  SunCopy    ]       };

+    key <OPEN> { [ L7,        L7,  SunOpen    ]       };

+    key <PAST> { [ L8,        L8,  SunPaste   ]       };

+    key <FIND> { [ L9,        L9,  SunFind    ]       };

+    key <CUT>  { [ L10,       L10, SunCut     ]       };

+};

+

+hidden

+xkb_symbols "volumekeys" {

+    // Suppliment to inet(evdev) for added functionality of audio keys

+    key <MUTE> { [ NoSymbol,    SunVideoDegauss         ]       };

+    key <VOL-> { [ NoSymbol,    XF86MonBrightnessDown   ]       };

+    key <VOL+> { [ NoSymbol,    XF86MonBrightnessUp     ]       };

+

+    // The above symbols were chosen for better compatibility withother xkb

+    // mappings.  The old mappings are kepy below in case someone needs them

+    //key <MUTE> { [ SunAudioMute,      SunVideoDegauss         ]       };

+    //key <VOL-> { [ SunAudioLowerVolume,       SunVideoLowerBrightness ]       };

+    //key <VOL+> { [ SunAudioRaiseVolume,       SunVideoRaiseBrightness ]       };

+    //key <POWR> { [ SunPowerSwitch,    SunPowerSwitchShift     ]       };

+};

+

+

+// US/ASCII layout for a Type 4 Sun keyboard

+xkb_symbols "type4basic" {

+    include "sun_vndr/us(sunbasic)"

+

+    // A few alphanumeric keys are different

+    key <AE04> { [ 4, dollar,  EuroSign	]	};

+    key <AE05> { [ 5, percent,  EuroSign	]	};

+    key <AD03> { [ e, E,  EuroSign	]	};

+

+    key <LNFD> { [ Linefeed		]			};

+

+    // Begin "Editing" section

+    key <PRSC> { [ R2,	R2,  Print		] };

+    key <SCLK> { [ R3,	R3,  Scroll_Lock, Break	] };

+    key <PAUS> { [ R1,	R1,  Pause		] };

+

+    // End "Editing" section, begin "Keypad"

+    key <KPEQ> { [ R4,	KP_Equal,  KP_Equal		] };

+

+};

+

+xkb_symbols "type4" {

+    include "sun_vndr/us(type4basic)"

+

+    key <BKSL> { [ backslash, bar,  brokenbar	]	};

+};

+

+// US/ASCII layout for a Type 5 Sun keyboard

+xkb_symbols "type5basic" {

+    include "sun_vndr/us(sunbasic)"

+    include "sun_vndr/us(volumekeys)"

+

+    // Begin "Editing" section

+    key <PRSC> { [ R2, R2,  Print, SunSys_Req	]	};

+    key <SCLK> { [ R3, R3,  Scroll_Lock	]	};

+    key <PAUS> { [ R1, R1,  Pause, Break	]	};

+    // End "Editing" section

+};

+

+xkb_symbols "type5" {

+    include "sun_vndr/us(type5basic)"

+

+    // A few alphanumeric keys are different

+    key <AE04> { [ 4, dollar,  EuroSign	]	};

+    key <AE05> { [ 5, percent,  EuroSign	]	};

+    key <AD03> { [ e, E	,  EuroSign	]	};

+    key <BKSL> { [ backslash, bar,  brokenbar	]	};

+};

+

+// US/ASCII layout for a Type 5 Sun keyboard

+xkb_symbols "type5hobobasic" {

+    include "sun_vndr/us(type5basic)"

+};

+

+xkb_symbols "type5hobo" {

+    include "sun_vndr/us(type5hobobasic)"

+

+    // A few alphanumeric keys are different

+    key <AE04> { [ 4, dollar,  EuroSign   ]       };

+    key <AE05> { [ 5, percent,  EuroSign   ]       };

+    key <AD03> { [ e, E,  EuroSign   ]       };

+    key <BKSL> { [ backslash, bar,  brokenbar  ]       };

+

+    // Here is the hobo keypad:

+

+    key <AE07> { [ 7, ampersand, NoSymbol, NoSymbol, KP_7       ] };

+    key <AE08> { [ 8, asterisk,  NoSymbol, NoSymbol, KP_8       ] };

+    key <AE09> { [ 9, parenleft, NoSymbol, NoSymbol, KP_9       ] };

+    key <AE10> { [ 0, parenright, NoSymbol, NoSymbol, KP_Multiply] };

+

+    key <AD07> { [ u, U, NoSymbol, NoSymbol, KP_4       ] };

+    key <AD08> { [ i, I, NoSymbol, NoSymbol, KP_5       ] };

+    key <AD09> { [ o, O, NoSymbol, NoSymbol, KP_6       ] };

+    key <AD10> { [ p, P, NoSymbol, NoSymbol, KP_Subtract] };

+

+    key <AC07> { [ j, J, NoSymbol, NoSymbol, KP_1       ] };

+    key <AC08> { [ k, K, NoSymbol, NoSymbol, KP_2       ] };

+    key <AC09> { [ l, L, NoSymbol, NoSymbol, KP_3       ] };

+    key <AC10> { [ semicolon, colon, NoSymbol, NoSymbol, KP_Add   ] };

+

+    key <RTRN> { [ Return, NoSymbol, NoSymbol, KP_Enter    ] };

+

+    key <AB07> { [ m, M,  NoSymbol, NoSymbol, KP_0       ] };

+

+    key <AB09> { [ period, greater, NoSymbol, NoSymbol, KP_Decimal] };

+    key <AB10> { [ slash, question, NoSymbol, NoSymbol, KP_Divide ] };

+};

+

+

+xkb_symbols "type6" {

+    include "sun_vndr/us(sunbasic)"

+    include "sun_vndr/us(volumekeys)"

+    include "eurosign(4)"

+    include "level3(ralt_switch)"

+

+    key <SYRQ> { [ SunSys_Req                   ]};

+};

+

+

+

+xkb_symbols "pc101" {

+    include "us(pc101)"

+    key <RALT> { [ Mode_switch, Meta_R	] };

+};

+

+xkb_symbols "pc102" {

+    include "us(pc102)"

+    key <RALT> { [ Mode_switch, Meta_R	] };

+};

+

+xkb_symbols "pc104" {

+    include "us(pc104)"

+};

+

+xkb_symbols "pc101currency" {

+

+    key <AE04> { [ 4, dollar		], [ EuroSign	]	};

+    key <AE05> { [ 5, percent		], [ EuroSign	]	};

+    key <AD03> { [ e, E			], [ EuroSign	]	};

+    key <BKSL> { [ backslash, bar	], [ brokenbar			]};

+};

+

+xkb_symbols "US101A_Sun" {

+

+    key <AE04> { [ 4, dollar		], [ EuroSign	]	};

+    key <AE05> { [ 5, percent		], [ EuroSign	]	};

+    key <AD03> { [ e, E			], [ EuroSign	]	};

+    key <BKSL> { [ backslash, bar	], [ brokenbar			]};

+

+    // Begin "Editing" section

+    key <PRSC> { [ L5, L5		], [ Print, SunSys_Req 		]};

+    key <SCLK> { [ L7, L7		], [  Scroll_Lock		]};

+    key <PAUS> { [ L1, L1		], [ Pause, Break 		]};

+    key  <INS> { [ L8, L8		], [  Insert			]};

+    key <HOME> { [ L6, L6		], [  Home			]};

+    key <PGUP> { [ L3, L3		], [  Prior			]};

+

+

+    key <DELE> { [ L10, L10		], [ Delete			]};

+    key  <END> { [ L9, L9		], [  End			]};

+    key <PGDN> { [ L4, L4		], [  Next			]};

+

+    key   <UP> {	[  Up			]	};

+    key <LEFT> {	[  Left			]	};

+    key <DOWN> {	[  Down			]	};

+    key <RGHT> {	[  Right		]	};

+

+    key <KPDV> { [ R5, R5		], [ KP_Divide	]	};

+    key <KPMU> { [ R6, R6		], [ KP_Multiply	]	};

+

+    key  <KP7> { [ R7, KP_7		], [ KP_7, Home		]	};

+    key  <KP8> { [ KP_Up, KP_8		], [ KP_8		]	};

+    key  <KP9> { [ R9, KP_9		], [ KP_9, Prior	]	};

+    key <KPAD> { [ KP_Add		]				};

+

+    key  <KP4> { [ KP_Left, KP_4	], [ KP_4		]	};

+    key  <KP5> { [ R11,	KP_5		], [ KP_5		]	};

+    key  <KP6> { [ KP_Right, KP_6	], [ KP_6		]	};

+

+    key  <KP1> { [ R13,	KP_1		], [ KP_1, End		]	};

+    key  <KP2> { [ KP_Down, KP_2	], [ KP_2		]	};

+    key  <KP3> { [ R15,	KP_3		], [ KP_3, Next		]	};

+    key <KPEN> { [ KP_Enter		]				};

+

+    key <LALT> { [ Meta_L		]				};

+    key <RALT> { [ Alt_L		]				};

+    key <RCTL> { [ Multi_key		]				};

+};

+

diff --git a/xorg-server/xkbdata.src/symbols/sy b/xorg-server/xkbdata.src/symbols/sy
index f9a9f4249..e807f3d3d 100644
--- a/xorg-server/xkbdata.src/symbols/sy
+++ b/xorg-server/xkbdata.src/symbols/sy
@@ -1,171 +1,172 @@
-// $XKeyboardConfig$
-
-//
-// $XFree86: xc/programs/xkbcomp/symbols/syr,v 1.1 2002/11/22 03:06:50 dawes Exp $
-//
-
-partial default alphanumeric_keys
-xkb_symbols "basic" {
-    include "ara(basic)"
-    name[Group1]= "Syria";
-};
-
-partial alphanumeric_keys
-xkb_symbols "syc" {
-    name[Group1]= "Syria - Syriac";
-
-    key <TLDE> {  [	0x100070F,	0x100032E,	Arabic_shadda		]     };
-    key <AE01> {  [  	1,		exclam,		0x1000701		]     };
-    key <AE02> {  [  	2,		0x100030A,	0x1000702		]     };
-    key <AE03> {  [  	3,		0x1000325,	0x1000703		]     };
-    key <AE04> {  [  	4,		0x1000749,	0x1000704		]     };
-    key <AE05> {  [  	5,		0x1002670,      0x1000705		]     };
-    key <AE06> {  [  	6,		0x1002671,    	0x1000708		]     };
-    key <AE07> {  [  	7,		0x100070A,   	0x1000709		]     };
-    key <AE08> {  [  	8,		0x10000BB,	0x100070B		]     };
-    key <AE09> {  [  	9,		parenright,	0x100070C		]     };
-    key <AE10> {  [  	0,		parenleft,	0x100070D		]     };
-    key <AE11> {  [  	minus,		0x10000AB,	0x100250C		]     };
-    key <AE12> {  [  	equal,		plus,		0x1002510		]     };
-						
-    key <AD01> {  [  	0x1000714,	0x1000730,	Arabic_fatha		]     };
-    key <AD02> {  [  	0x1000728,	0x1000733,	Arabic_fathatan		]     };
-    key <AD03> {  [  	0x1000716,	0x1000736,	Arabic_damma		]     };
-    key <AD04> {  [  	0x1000729,	0x100073A,	Arabic_dammatan		]     };
-    key <AD05> {  [  	0x1000726,	0x100073D,	Arabic_madda_above	]     };
-    key <AD06> {  [  	0x100071C,	0x1000740,	Arabic_hamza_above	]     };
-    key <AD07> {  [  	0x1000725,	0x1000741,	0x1000747		]     };
-    key <AD08> {  [  	0x1000717,	0x1000308,	0x1000743		]     };
-    key <AD09> {  [  	0x100071E,      0x1000304,	0x1000745		]     };
-    key <AD10> {  [  	0x100071A,      0x1000307,	0x100032D		]     };
-    key <AD11> {  [ 	0x1000713,      0x1000303				]     };
-    key <AD12> {  [  	0x1000715,	0x100074A				]     };
-    key <BKSL> {  [  	0x1000706,	colon					]     };
-
-    key <AC01> {  [  	0x100072B,	0x1000731,	Arabic_kasra		]     };
-    key <AC02> {  [  	0x1000723,	0x1000734,	Arabic_kasratan		]     };
-    key <AC03> {  [	0x100071D,	0x1000737				]     };
-    key <AC04> {  [  	0x1000712,	0x100073B,	Arabic_hamza		]     };
-    key <AC05> {  [  	0x1000720,	0x100073E,	Arabic_hamza_below	]     };
-    key <AC06> {  [  	0x1000710,      0x1000711, 	Arabic_superscript_alef	]     };
-    key <AC07> {  [  	0x100072C,	Arabic_tatweel,	0x1000748		]     };
-    key <AC08> {  [  	0x1000722,	0x1000324, 	0x1000744		]     };
-    key <AC09> {  [	0x1000721,	0x1000331,	0x1000746		]     };
-    key <AC10> {  [  	0x100071F,      0x1000323				]     };
-    key <AC11> {  [  	0x100071B,	0x1000330				]     };
-
-    key <SPCE> {  [  	space,		0x100200c				]     };
-    key <AB01> {  [  	bracketright,	0x1000732,	Arabic_sukun		]     };
-    key <AB02> {  [  	bracketleft,	0x1000735				]     };
-    key <AB03> {  [  	0x1000724,      0x1000738,	0x100200D		]     };
-    key <AB04> {  [  	0x100072A,	0x100073C, 	0x100200C		]     };
-    key <AB05> {  [  	0x1000727,      0x100073F,      0x100200E		]     };
-    key <AB06> {  [  	0x1000700,	0x1000739,	0x100200F		]     };
-    key <AB07> {  [  	0x100002E,	0x1000742				]     };
-    key <AB08> {  [  	0x1000718,	Arabic_comma				]     };
-    key <AB09> {  [  	0x1000719,	Arabic_semicolon			]     };
-    key <AB10> {  [  	0x1000707,	Arabic_question_mark			]     };
-
-    // End Alphanumeric Section
-
-    
-    // Begin Modifier Mappings
-    
-    modifier_map Shift  { Shift_L, Shift_R };
-    modifier_map Lock   { Caps_Lock, ISO_Lock };
-    modifier_map Control{ Control_L, Control_R };
-    modifier_map Mod1	{ Alt_L, Alt_R };
-    modifier_map Mod2   { Mode_switch };
-
-};
-//
-// $XFree86: xc/programs/xkbcomp/symbols/syr_phonetic,v 1.1 2002/11/22 03:06:50 dawes Exp $
-//
-
-partial alphanumeric_keys
-xkb_symbols "syc_phonetic" {
-    name[Group1]= "Syria - Syriac phonetic";
-
-    key <TLDE> {  [	0x100070F,	0x100032E,	Arabic_shadda		]     };
-    key <AE01> {  [  	1,		exclam,		0x1000701		]     };
-    key <AE02> {  [  	2,		0x100030A,	0x1000702		]     };
-    key <AE03> {  [  	3,		0x1000325,	0x1000703		]     };
-    key <AE04> {  [  	4,		0x1000749,	0x1000704		]     };
-    key <AE05> {  [  	5,		0x1002670,      0x1000705		]     };
-    key <AE06> {  [  	6,		0x1002671,    	0x1000708		]     };
-    key <AE07> {  [  	7,		0x100070A,   	0x1000709		]     };
-    key <AE08> {  [  	8,		0x10000BB,	0x100070B		]     };
-    key <AE09> {  [  	9,		parenright,	0x100070C		]     };
-    key <AE10> {  [  	0,		parenleft,	0x100070D		]     };
-    key <AE11> {  [  	minus,		0x10000AB,	0x100250C		]     };
-    key <AE12> {  [  	equal,		plus,		0x1002510		]     };
-						
-    key <AD01> {  [  	0x1000729,	0x1000730,	Arabic_fatha		]     };
-    key <AD02> {  [  	0x1000718,	0x1000733,	Arabic_fathatan		]     };
-    key <AD03> {  [  	0x1000716,	0x1000736,	Arabic_damma		]     };
-    key <AD04> {  [  	0x100072A,	0x100073A,	Arabic_dammatan		]     };
-    key <AD05> {  [  	0x100072C,	0x100073D,	Arabic_madda_above	]     };
-    key <AD06> {  [  	0x100071D,	0x1000740,	Arabic_hamza_above	]     };
-    key <AD07> {  [  	0x100071C,	0x1000741,	0x1000747		]     };
-    key <AD08> {  [  	0x1000725,	0x1000308,	0x1000743		]     };
-    key <AD09> {  [  	0x1000727,      0x1000304,	0x1000745		]     };
-    key <AD10> {  [  	0x1000726,      0x1000307,	0x100032D		]     };
-    key <AD11> {  [ 	bracketright,   0x1000303				]     };
-    key <AD12> {  [  	bracketleft,	0x100074A				]     };
-    key <BKSL> {  [  	0x1000706,	colon					]     };
-
-    key <AC01> {  [  	0x1000710,	0x1000731,	Arabic_kasra		]     };
-    key <AC02> {  [  	0x1000723,	0x1000734,	Arabic_kasratan		]     };
-    key <AC03> {  [	0x1000715,	0x1000737				]     };
-    key <AC04> {  [  	0x1000714,	0x100073B,	Arabic_hamza		]     };
-    key <AC05> {  [  	0x1000713,	0x100073E,	Arabic_hamza_below	]     };
-    key <AC06> {  [  	0x1000717,      0x1000711, 	Arabic_superscript_alef	]     };
-    key <AC07> {  [  	0x100071B,	Arabic_tatweel,	0x1000748		]     };
-    key <AC08> {  [  	0x100071F,	0x1000324, 	0x1000744		]     };
-    key <AC09> {  [	0x1000720,	0x1000331,	0x1000746		]     };
-    key <AC10> {  [  	0x100071A,      0x1000323				]     };
-    key <AC11> {  [  	0x100071E,	0x1000330				]     };
-
-    key <SPCE> {  [  	space,		0x100200c				]     };
-    key <AB01> {  [  	0x1000719,	0x1000732,	Arabic_sukun		]     };
-    key <AB02> {  [  	0x1000728,	0x1000735				]     };
-    key <AB03> {  [  	0x1000724,      0x1000738,	0x100200D		]     };
-    key <AB04> {  [  	0x100072B,	0x100073C, 	0x100200C		]     };
-    key <AB05> {  [  	0x1000712,      0x100073F,      0x100200E		]     };
-    key <AB06> {  [  	0x1000722,	0x1000739,	0x100200F		]     };
-    key <AB07> {  [  	0x1000721,	0x1000742				]     };
-    key <AB08> {  [  	0x1000700,	Arabic_comma				]     };
-    key <AB09> {  [  	0x100002E,	Arabic_semicolon			]     };
-    key <AB10> {  [  	0x1000707,	Arabic_question_mark			]     };
-
-    // End Alphanumeric Section
-
-    
-    // Begin Modifier Mappings
-    
-    modifier_map Shift  { Shift_L, Shift_R };
-    modifier_map Lock   { Caps_Lock, ISO_Lock };
-    modifier_map Control{ Control_L, Control_R };
-    modifier_map Mod1	{ Alt_L, Alt_R };
-    modifier_map Mod2   { Mode_switch };
-
-};
-
-partial alphanumeric_keys
-xkb_symbols "ku" {
-    include "tr(ku)"
-    name[Group1]= "Syria - Kurdish, Latin Q";
-};
-
-partial alphanumeric_keys
-xkb_symbols "ku_f" {
-    include "tr(ku_f)"
-    name[Group1]= "Syria - Kurdish, (F)";
-};
-
-partial alphanumeric_keys
-xkb_symbols "ku_alt" {
-    include "tr(ku_alt)"
-    name[Group1]= "Syria - Kurdish, Latin Alt-Q";
-};
-
+// $XKeyboardConfig$

+

+//

+// $XFree86: xc/programs/xkbcomp/symbols/syr,v 1.1 2002/11/22 03:06:50 dawes Exp $

+//

+

+partial default alphanumeric_keys

+xkb_symbols "basic" {

+    include "ara(basic)"

+    name[Group1]= "Syria";

+};

+

+partial alphanumeric_keys

+xkb_symbols "syc" {

+    name[Group1]= "Syria - Syriac";

+

+    key <TLDE> {  [	0x100070F,	0x100032E,	Arabic_shadda		]     };

+    key <AE01> {  [  	1,		exclam,		0x1000701		]     };

+    key <AE02> {  [  	2,		0x100030A,	0x1000702		]     };

+    key <AE03> {  [  	3,		0x1000325,	0x1000703		]     };

+    key <AE04> {  [  	4,		0x1000749,	0x1000704		]     };

+    key <AE05> {  [  	5,		0x1002670,      0x1000705		]     };

+    key <AE06> {  [  	6,		0x1002671,    	0x1000708		]     };

+    key <AE07> {  [  	7,		0x100070A,   	0x1000709		]     };

+    key <AE08> {  [  	8,		0x10000BB,	0x100070B		]     };

+    key <AE09> {  [  	9,		parenright,	0x100070C		]     };

+    key <AE10> {  [  	0,		parenleft,	0x100070D		]     };

+    key <AE11> {  [  	minus,		0x10000AB,	0x100250C		]     };

+    key <AE12> {  [  	equal,		plus,		0x1002510		]     };

+						

+    key <AD01> {  [  	0x1000714,	0x1000730,	Arabic_fatha		]     };

+    key <AD02> {  [  	0x1000728,	0x1000733,	Arabic_fathatan		]     };

+    key <AD03> {  [  	0x1000716,	0x1000736,	Arabic_damma		]     };

+    key <AD04> {  [  	0x1000729,	0x100073A,	Arabic_dammatan		]     };

+    key <AD05> {  [  	0x1000726,	0x100073D,	Arabic_madda_above	]     };

+    key <AD06> {  [  	0x100071C,	0x1000740,	Arabic_hamza_above	]     };

+    key <AD07> {  [  	0x1000725,	0x1000741,	0x1000747		]     };

+    key <AD08> {  [  	0x1000717,	0x1000308,	0x1000743		]     };

+    key <AD09> {  [  	0x100071E,      0x1000304,	0x1000745		]     };

+    key <AD10> {  [  	0x100071A,      0x1000307,	0x100032D		]     };

+    key <AD11> {  [ 	0x1000713,      0x1000303				]     };

+    key <AD12> {  [  	0x1000715,	0x100074A				]     };

+    key <BKSL> {  [  	0x1000706,	colon					]     };

+

+    key <AC01> {  [  	0x100072B,	0x1000731,	Arabic_kasra		]     };

+    key <AC02> {  [  	0x1000723,	0x1000734,	Arabic_kasratan		]     };

+    key <AC03> {  [	0x100071D,	0x1000737				]     };

+    key <AC04> {  [  	0x1000712,	0x100073B,	Arabic_hamza		]     };

+    key <AC05> {  [  	0x1000720,	0x100073E,	Arabic_hamza_below	]     };

+    key <AC06> {  [  	0x1000710,      0x1000711, 	Arabic_superscript_alef	]     };

+    key <AC07> {  [  	0x100072C,	Arabic_tatweel,	0x1000748		]     };

+    key <AC08> {  [  	0x1000722,	0x1000324, 	0x1000744		]     };

+    key <AC09> {  [	0x1000721,	0x1000331,	0x1000746		]     };

+    key <AC10> {  [  	0x100071F,      0x1000323				]     };

+    key <AC11> {  [  	0x100071B,	0x1000330				]     };

+

+    key <AB01> {  [  	bracketright,	0x1000732,	Arabic_sukun		]     };

+    key <AB02> {  [  	bracketleft,	0x1000735				]     };

+    key <AB03> {  [  	0x1000724,      0x1000738,	0x100200D		]     };

+    key <AB04> {  [  	0x100072A,	0x100073C, 	0x100200C		]     };

+    key <AB05> {  [  	0x1000727,      0x100073F,      0x100200E		]     };

+    key <AB06> {  [  	0x1000700,	0x1000739,	0x100200F		]     };

+    key <AB07> {  [  	0x100002E,	0x1000742				]     };

+    key <AB08> {  [  	0x1000718,	Arabic_comma				]     };

+    key <AB09> {  [  	0x1000719,	Arabic_semicolon			]     };

+    key <AB10> {  [  	0x1000707,	Arabic_question_mark			]     };

+

+    // End Alphanumeric Section

+

+    // Space

+    include "nbsp(zwnj2)";

+    

+    // Begin Modifier Mappings

+    

+    modifier_map Shift  { Shift_L, Shift_R };

+    modifier_map Lock   { Caps_Lock, ISO_Lock };

+    modifier_map Control{ Control_L, Control_R };

+    modifier_map Mod1	{ Alt_L, Alt_R };

+    modifier_map Mod2   { Mode_switch };

+

+};

+//

+// $XFree86: xc/programs/xkbcomp/symbols/syr_phonetic,v 1.1 2002/11/22 03:06:50 dawes Exp $

+//

+

+partial alphanumeric_keys

+xkb_symbols "syc_phonetic" {

+    name[Group1]= "Syria - Syriac phonetic";

+

+    key <TLDE> {  [	0x100070F,	0x100032E,	Arabic_shadda		]     };

+    key <AE01> {  [  	1,		exclam,		0x1000701		]     };

+    key <AE02> {  [  	2,		0x100030A,	0x1000702		]     };

+    key <AE03> {  [  	3,		0x1000325,	0x1000703		]     };

+    key <AE04> {  [  	4,		0x1000749,	0x1000704		]     };

+    key <AE05> {  [  	5,		0x1002670,      0x1000705		]     };

+    key <AE06> {  [  	6,		0x1002671,    	0x1000708		]     };

+    key <AE07> {  [  	7,		0x100070A,   	0x1000709		]     };

+    key <AE08> {  [  	8,		0x10000BB,	0x100070B		]     };

+    key <AE09> {  [  	9,		parenright,	0x100070C		]     };

+    key <AE10> {  [  	0,		parenleft,	0x100070D		]     };

+    key <AE11> {  [  	minus,		0x10000AB,	0x100250C		]     };

+    key <AE12> {  [  	equal,		plus,		0x1002510		]     };

+						

+    key <AD01> {  [  	0x1000729,	0x1000730,	Arabic_fatha		]     };

+    key <AD02> {  [  	0x1000718,	0x1000733,	Arabic_fathatan		]     };

+    key <AD03> {  [  	0x1000716,	0x1000736,	Arabic_damma		]     };

+    key <AD04> {  [  	0x100072A,	0x100073A,	Arabic_dammatan		]     };

+    key <AD05> {  [  	0x100072C,	0x100073D,	Arabic_madda_above	]     };

+    key <AD06> {  [  	0x100071D,	0x1000740,	Arabic_hamza_above	]     };

+    key <AD07> {  [  	0x100071C,	0x1000741,	0x1000747		]     };

+    key <AD08> {  [  	0x1000725,	0x1000308,	0x1000743		]     };

+    key <AD09> {  [  	0x1000727,      0x1000304,	0x1000745		]     };

+    key <AD10> {  [  	0x1000726,      0x1000307,	0x100032D		]     };

+    key <AD11> {  [ 	bracketright,   0x1000303				]     };

+    key <AD12> {  [  	bracketleft,	0x100074A				]     };

+    key <BKSL> {  [  	0x1000706,	colon					]     };

+

+    key <AC01> {  [  	0x1000710,	0x1000731,	Arabic_kasra		]     };

+    key <AC02> {  [  	0x1000723,	0x1000734,	Arabic_kasratan		]     };

+    key <AC03> {  [	0x1000715,	0x1000737				]     };

+    key <AC04> {  [  	0x1000714,	0x100073B,	Arabic_hamza		]     };

+    key <AC05> {  [  	0x1000713,	0x100073E,	Arabic_hamza_below	]     };

+    key <AC06> {  [  	0x1000717,      0x1000711, 	Arabic_superscript_alef	]     };

+    key <AC07> {  [  	0x100071B,	Arabic_tatweel,	0x1000748		]     };

+    key <AC08> {  [  	0x100071F,	0x1000324, 	0x1000744		]     };

+    key <AC09> {  [	0x1000720,	0x1000331,	0x1000746		]     };

+    key <AC10> {  [  	0x100071A,      0x1000323				]     };

+    key <AC11> {  [  	0x100071E,	0x1000330				]     };

+

+    key <SPCE> {  [  	space,		0x100200c				]     };

+    key <AB01> {  [  	0x1000719,	0x1000732,	Arabic_sukun		]     };

+    key <AB02> {  [  	0x1000728,	0x1000735				]     };

+    key <AB03> {  [  	0x1000724,      0x1000738,	0x100200D		]     };

+    key <AB04> {  [  	0x100072B,	0x100073C, 	0x100200C		]     };

+    key <AB05> {  [  	0x1000712,      0x100073F,      0x100200E		]     };

+    key <AB06> {  [  	0x1000722,	0x1000739,	0x100200F		]     };

+    key <AB07> {  [  	0x1000721,	0x1000742				]     };

+    key <AB08> {  [  	0x1000700,	Arabic_comma				]     };

+    key <AB09> {  [  	0x100002E,	Arabic_semicolon			]     };

+    key <AB10> {  [  	0x1000707,	Arabic_question_mark			]     };

+

+    // End Alphanumeric Section

+

+    

+    // Begin Modifier Mappings

+    

+    modifier_map Shift  { Shift_L, Shift_R };

+    modifier_map Lock   { Caps_Lock, ISO_Lock };

+    modifier_map Control{ Control_L, Control_R };

+    modifier_map Mod1	{ Alt_L, Alt_R };

+    modifier_map Mod2   { Mode_switch };

+

+};

+

+partial alphanumeric_keys

+xkb_symbols "ku" {

+    include "tr(ku)"

+    name[Group1]= "Syria - Kurdish, Latin Q";

+};

+

+partial alphanumeric_keys

+xkb_symbols "ku_f" {

+    include "tr(ku_f)"

+    name[Group1]= "Syria - Kurdish, (F)";

+};

+

+partial alphanumeric_keys

+xkb_symbols "ku_alt" {

+    include "tr(ku_alt)"

+    name[Group1]= "Syria - Kurdish, Latin Alt-Q";

+};

+