xserver xkeyboard-config libxcb xkbcomp mesa git update 5 Apr 2011

44 files changed, 8366 insertions, 8430 deletions

diff --git a/xorg-server/xkeyboard-config/symbols/ad b/xorg-server/xkeyboard-config/symbols/ad
index bce6f6140..0b1520175 100644
--- a/xorg-server/xkeyboard-config/symbols/ad
+++ b/xorg-server/xkeyboard-config/symbols/ad
@@ -1,31 +1,31 @@
-//

-// Catalan Keyboard, as manufactured by Large Format Computing, Inc.

-//

-// For layout graphic, see http://www.language-keyboard.com/languages/catalan_layout.htm

-//

-// Contributed by Robert Millan

-

-partial default alphanumeric_keys

-xkb_symbols "basic" {

-    include "us"

-

-    name[Group1]="Andorra";

-

-    key <AE02> { [ 2, at, dead_diaeresis ] };

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

-    key <AE09> { [ 9, parenleft, dead_grave ] };

-    key <AD02> { [ w, W, eacute, Eacute ] };

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

-    key <AD06> { [ y, Y, udiaeresis, Udiaeresis ] };

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

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

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

-    key <AD10> { [ p, P, ograve, Ograve	] };

-    key <AD12> { [ bracketright, braceright, EuroSign ] };

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

-    key <AC08> { [ k, K, idiaeresis, Idiaeresis ] };

-    key <AC09> { [ l, L, periodcentered ] };

-    key <AB03> { [ c, C, ccedilla, Ccedilla ] };

-

-    include "level3(ralt_switch)"

-};

+//
+// Catalan Keyboard, as manufactured by Large Format Computing, Inc.
+//
+// For layout graphic, see http://www.language-keyboard.com/languages/catalan_layout.htm
+//
+// Contributed by Robert Millan
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+    include "us"
+
+    name[Group1]="Catalan";
+
+    key <AE02> { [ 2, at, dead_diaeresis ] };
+    key <AE07> { [ 7, ampersand, dead_acute ] };
+    key <AE09> { [ 9, parenleft, dead_grave ] };
+    key <AD02> { [ w, W, eacute, Eacute ] };
+    key <AD03> { [ e, E, egrave, Egrave ] };
+    key <AD06> { [ y, Y, udiaeresis, Udiaeresis ] };
+    key <AD07> { [ u, U, uacute, Uacute	] };
+    key <AD08> { [ i, I, iacute, Iacute	] };
+    key <AD09> { [ o, O, oacute, Oacute	] };
+    key <AD10> { [ p, P, ograve, Ograve	] };
+    key <AD12> { [ bracketright, braceright, EuroSign ] };
+    key <AC01> { [ a, A, agrave, Agrave ] };
+    key <AC08> { [ k, K, idiaeresis, Idiaeresis ] };
+    key <AC09> { [ l, L, periodcentered ] };
+    key <AB03> { [ c, C, ccedilla, Ccedilla ] };
+
+    include "level3(ralt_switch)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/af b/xorg-server/xkeyboard-config/symbols/af
index d7d866d34..c4355dd4e 100644
--- a/xorg-server/xkeyboard-config/symbols/af
+++ b/xorg-server/xkeyboard-config/symbols/af
@@ -12,8 +12,7 @@
 
 partial default alphanumeric_keys 
 xkb_symbols "basic" {
-   //name[Group1]= "Afghanistan Dari";
-   name[Group1]= "Afghanistan";
+   name[Group1]= "Afghani";
 
    key <TLDE> { [ 0x100200d, 0x10000f7, dead_tilde ] };
    key <AE01> { [ 0x10006f1, exclam, 0x1000060 ] };
@@ -84,7 +83,7 @@ xkb_symbols "basic" {
 
 partial alphanumeric_keys 
 xkb_symbols "ps" {
-   name[Group1]= "Afghanistan - Pashto";
+   name[Group1]= "Pashto";
 
    key <TLDE> { [ 0x100200d, 0x10000f7, dead_tilde ] };
    key <AE01> { [ 0x10006f1, exclam, 0x1000060 ] };
@@ -155,7 +154,7 @@ xkb_symbols "ps" {
 
 partial alphanumeric_keys 
 xkb_symbols "uz" {
-   name[Group1]= "Afghanistan - Southern Uzbek";
+   name[Group1]= "Uzbek (Afghanistan)";
 
    key <TLDE> { [ 0x100200d, 0x10000f7, dead_tilde ] };
    key <AE01> { [ 0x10006f1, exclam, 0x1000060 ] };
@@ -216,7 +215,7 @@ xkb_symbols "uz" {
 partial alphanumeric_keys 
 xkb_symbols "olpc-ps" {
 
-   name[Group1]= "Afghanistan - OLPC Pashto";
+   name[Group1]= "Pashto (Afghanistan, OLPC)";
 
    key <TLDE> { [ 0x100200D, 0x1000654, grave ] }; // zero width joiner, Arabic hamza above
    key <AE01> { [ 0x10006F1, exclam, asciitilde ] }; // Arabic one
@@ -277,7 +276,7 @@ xkb_symbols "olpc-ps" {
 partial alphanumeric_keys 
 xkb_symbols "fa-olpc" {
 
-   name[Group1]= "Afghanistan - OLPC Dari";
+   name[Group1]= "Persian (Afghanistan, Dari OLPC)";
 
    key <TLDE> { [ 0x100200D, division, asciitilde ] }; // zero width joiner
    key <AE01> { [ 0x10006F1, exclam, grave ] }; // Arabic one
@@ -338,7 +337,7 @@ xkb_symbols "fa-olpc" {
 partial alphanumeric_keys 
 xkb_symbols "uz-olpc" {
 
-   name[Group1]= "Afghanistan - OLPC Southern Uzbek";
+   name[Group1]= "Uzbek (Afghanistan, OLPC)";
 
    key <TLDE> { [ 0x100200D, division, asciitilde ] }; // zero width joiner
    key <AE01> { [ 0x10006F1, exclam, grave ] }; // Arabic one
diff --git a/xorg-server/xkeyboard-config/symbols/al b/xorg-server/xkeyboard-config/symbols/al
index 9f006748c..75e7f52de 100644
--- a/xorg-server/xkeyboard-config/symbols/al
+++ b/xorg-server/xkeyboard-config/symbols/al
@@ -1,41 +1,41 @@
-// based on

-// albanian keyboard layout

-// done by Pablo Saratxaga <pablo@mandrakesoft.com>

-//

-

-partial default alphanumeric_keys

-xkb_symbols "basic" {

-

-    include "latin(type3)"

-

-    name[Group1]="Albania";

-

-    key <AE01>	{ [         1,     exclam,   asciitilde,   dead_tilde ]	};

-    key <AE02>	{ [         2,   quotedbl,   dead_caron,    oneeighth ]	};

-    key <AE03>	{ [         3, numbersign, dead_circumflex,  sterling ]	};

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

-    key <AE05>	{ [         5,    percent, dead_abovering, threeeighths] };

-    key <AE06>	{ [         6, asciicircum,  dead_ogonek, fiveeighths ]	};

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

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

-    key <AE09>	{ [         9,  parenleft,   dead_acute,    plusminus ]	};

-    key <AE10>	{ [         0, parenright, dead_doubleacute,   degree ]	};

-    key <AE11>	{ [     minus, underscore, dead_diaeresis, questiondown] };

-

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

-    key <AD11>	{ [  ccedilla,   Ccedilla,     division, dead_abovering ] };

-    key <AD12>	{ [        at, apostrophe,     multiply,  dead_macron ]	};

-

-    key <AC02>	{ [         s,          S,      dstroke,      section ]	};

-    key <AC03>	{ [         d,          D,      Dstroke,          ETH ]	};

-    key <AC10>	{ [ediaeresis, Ediaeresis,   dollar, dead_doubleacute ]	};

-    key <AC11>	{ [bracketleft,  braceleft,      ssharp,   dead_caron ]	};

-    key <TLDE>	{ [ backslash,        bar,      notsign,      notsign ]	};

-

-    key <BKSL>	{ [bracketright, braceright,   currency,   dead_breve ]	};

-    key <AB08>	{ [     comma,  semicolon,         less,     multiply ]	};

-    key <AB09>	{ [    period,      colon,      greater,     division ]	};

-    key <AB10>	{ [     slash,   question, dead_belowdot, dead_abovedot ] };

-

-    include "level3(ralt_switch)"

-};

+// based on
+// albanian keyboard layout
+// done by Pablo Saratxaga <pablo@mandrakesoft.com>
+//
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+
+    include "latin(type3)"
+
+    name[Group1]="Albanian";
+
+    key <AE01>	{ [         1,     exclam,   asciitilde,   dead_tilde ]	};
+    key <AE02>	{ [         2,   quotedbl,   dead_caron,    oneeighth ]	};
+    key <AE03>	{ [         3, numbersign, dead_circumflex,  sterling ]	};
+    key <AE04>	{ [         4,     dollar,   dead_breve,       dollar ]	};
+    key <AE05>	{ [         5,    percent, dead_abovering, threeeighths] };
+    key <AE06>	{ [         6, asciicircum,  dead_ogonek, fiveeighths ]	};
+    key <AE07>	{ [         7,  ampersand,        grave,   dead_grave ]	};
+    key <AE08>	{ [         8,   asterisk, dead_abovedot,   trademark ]	};
+    key <AE09>	{ [         9,  parenleft,   dead_acute,    plusminus ]	};
+    key <AE10>	{ [         0, parenright, dead_doubleacute,   degree ]	};
+    key <AE11>	{ [     minus, underscore, dead_diaeresis, questiondown] };
+
+    key <AD03>	{ [         e,          E,     EuroSign,     EuroSign ]	};
+    key <AD11>	{ [  ccedilla,   Ccedilla,     division, dead_abovering ] };
+    key <AD12>	{ [        at, apostrophe,     multiply,  dead_macron ]	};
+
+    key <AC02>	{ [         s,          S,      dstroke,      section ]	};
+    key <AC03>	{ [         d,          D,      Dstroke,          ETH ]	};
+    key <AC10>	{ [ediaeresis, Ediaeresis,   dollar, dead_doubleacute ]	};
+    key <AC11>	{ [bracketleft,  braceleft,      ssharp,   dead_caron ]	};
+    key <TLDE>	{ [ backslash,        bar,      notsign,      notsign ]	};
+
+    key <BKSL>	{ [bracketright, braceright,   currency,   dead_breve ]	};
+    key <AB08>	{ [     comma,  semicolon,         less,     multiply ]	};
+    key <AB09>	{ [    period,      colon,      greater,     division ]	};
+    key <AB10>	{ [     slash,   question, dead_belowdot, dead_abovedot ] };
+
+    include "level3(ralt_switch)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/am b/xorg-server/xkeyboard-config/symbols/am
index f83548118..29931474f 100644
--- a/xorg-server/xkeyboard-config/symbols/am
+++ b/xorg-server/xkeyboard-config/symbols/am
@@ -1,240 +1,240 @@
-// based on a keyboard map from an 'xkb/symbols/am' file

-

-partial default alphanumeric_keys 

-xkb_symbols "basic" {

-

-    name[Group1]= "Armenia";

-

-    // Alphanumeric section

-    key <TLDE> {	[ 0x100055d, 0x100055c	]	};

-    key	<LSGT> {	[  question,  0x100058a	]	};

-    key <BKSL> {        [ guillemotright, guillemotleft ] };

-

-    key <AE01> {	[ 0x1000586,  0x1000556	]	};

-    key <AE02> {	[ 0x1000571,  0x1000541	]	};

-    key <AE03> {	[ 0x1002013,  0x1002014 ]	};

-    key <AE04> {	[     comma,  dollar	]	};

-    key <AE05> {	[ 0x1000589,  0x1002026	] 	};

-    key <AE06> {	[ 0x100055e,  percent	]	};

-    key <AE07> {	[ 0x1002024,  0x1000587	] 	};

-    key <AE08> {	[ 0x100055b,  0x10002bc	] 	};

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

-    key <AE10> {	[ 0x1000585,  0x1000555	]	};

-    key <AE11> {	[ 0x1000567,  0x1000537	]	};

-    key <AE12> {	[ 0x1000572,  0x1000542	]	};

-

-

-    key <AD01> {	[ 0x1000573, 0x1000543	]       };

-    key <AD02> {	[ 0x1000583, 0x1000553	]	};

-    key <AD03> {	[ 0x1000562, 0x1000532	]       };

-    key <AD04> {	[ 0x100057d, 0x100054d	]	};

-    key <AD05> {	[ 0x1000574, 0x1000544	]       };

-    key <AD06> {	[ 0x1000578, 0x1000548	]       };

-    key <AD07> {	[ 0x1000582, 0x1000552	]       };

-    key <AD08> {	[ 0x100056f, 0x100053f	]       };

-    key <AD09> {	[ 0x1000568, 0x1000538	]       };

-    key <AD10> {	[ 0x1000569, 0x1000539	]       };

-    key <AD11> {	[ 0x100056e, 0x100053e	]       };

-    key <AD12> {	[ 0x1000581, 0x1000551	]       };

-

-    key <AC01> {	[ 0x100057b, 0x100054b	]       };

-    key <AC02> {	[ 0x100057e, 0x100054e	]	};

-    key <AC03> {	[ 0x1000563, 0x1000533	]       };

-    key <AC04> {	[ 0x1000565, 0x1000535	]       };

-    key <AC05> {	[ 0x1000561, 0x1000531	]       };

-    key <AC06> {	[ 0x1000576, 0x1000546	]	};

-    key <AC07> {	[ 0x100056b, 0x100053b	]       };

-    key <AC08> {	[ 0x100057f, 0x100054f	]       };

-    key <AC09> {	[ 0x1000570, 0x1000540	]       };

-    key <AC10> {	[ 0x100057a, 0x100054a	]       };

-    key <AC11> {	[ 0x1000580, 0x1000550	]       };

-

-    key <AB01> {	[ 0x100056a, 0x100053a	]       };

-    key <AB02> {	[ 0x1000564, 0x1000534	]       };

-    key <AB03> {	[ 0x1000579, 0x1000549	]       };

-    key <AB04> {	[ 0x1000575, 0x1000545	]       };

-    key <AB05> {	[ 0x1000566, 0x1000536	]       };

-    key <AB06> {	[ 0x100056c, 0x100053c	]       };

-    key <AB07> {	[ 0x1000584, 0x1000554	]       };

-    key <AB08> {	[ 0x100056d, 0x100053d	]       };

-    key <AB09> {	[ 0x1000577, 0x1000547	]       };

-    key <AB10> {	[ 0x100057c, 0x100054c	]       };

-

-};

-

-partial alphanumeric_keys

-xkb_symbols "olpc" {

-    include "am(basic)"

-    name[Group1]= "Armenia";

-

-    include "group(olpc)"

-};

-

-xkb_symbols "phonetic" {

-    include "am(basic)"

-    name[Group1]= "Armenia - Phonetic";

-	

-    key <BKSL> {	[ 0x1000577,  0x1000547 ]	};

-	

-    key <AE01> {	[ 0x1000567,  0x1000537 ]	};

-    key <AE02> {	[ 0x1000569,  0x1000539 ]	};

-    key <AE03> {	[ 0x1000583,  0x1000553 ]	};

-    key <AE04> {	[ 0x1000571,  0x1000541 ]       };

-    key <AE05> {	[ 0x100057b,  0x100054b ]	};

-    key <AE06> {	[ 0x1000582,  0x1000552 ]	};

-    key <AE07> {	[ 0x1000587,  0x1000587 ]	};

-    key <AE08> {	[ 0x100057c,  0x100054c ]	};

-    key <AE09> {	[ 0x1000579,  0x1000549 ]	};

-    key <AE10> {	[ 0x1000573,  0x1000543 ]	};

-    key <AE11> {	[ 0x100002D,  0x1002015 ]       };

-    key <AE12> {	[ 0x100056a,  0x100053a ]	};

-

-    key <LatQ> {	[ 0x1000584,  0x1000554 ]	};

-    key <LatW> {	[ 0x1000578,  0x1000548 ]	};

-    key <LatE> {	[ 0x1000565,  0x1000535 ]	};

-    key <LatR> {	[ 0x1000580,  0x1000550 ]	};

-    key <LatT> {	[ 0x100057f,  0x100054f ]	};

-    key <LatY> {	[ 0x1000568,  0x1000538 ]	};

-    key <LatU> {	[ 0x1000582,  0x1000552 ]	};

-    key <LatI> {	[ 0x100056b,  0x100053b ]	};

-    key <LatO> {	[ 0x1000585,  0x1000555 ]	};

-    key <LatP> {	[ 0x100057a,  0x100054a ]	};

-    key <AD11> {	[ 0x100056d,  0x100053d ]	};

-    key <AD12> {	[ 0x100056e,  0x100053e ]	};

-

-    key <LatA> {	[ 0x1000561,  0x1000531 ]	};

-    key <LatS> {	[ 0x100057d,  0x100054d ]	};

-    key <LatD> {	[ 0x1000564,  0x1000534 ]	};

-    key <LatF> {	[ 0x1000586,  0x1000556 ]	};

-    key <LatG> {	[ 0x1000563,  0x1000533 ]	};

-    key <LatH> {	[ 0x1000570,  0x1000540 ]	};

-    key <LatJ> {	[ 0x1000575,  0x1000545 ]	};

-    key <LatK> {	[ 0x100056f,  0x100053f ]	};

-    key <LatL> {	[ 0x100056c,  0x100053c ]	};

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

-    key <AC11> {	[ 0x100055b,  0x1000022 ]	};

-

-    key <LatZ> {	[ 0x1000566,  0x1000536 ]	};

-    key <LatX> {	[ 0x1000572,  0x1000542 ]	};

-    key <LatC> {	[ 0x1000581,  0x1000551 ]	};

-    key <LatV> {	[ 0x100057e,  0x100054e ]	};

-    key <LatB> {	[ 0x1000562,  0x1000532 ]	};

-    key <LatN> {	[ 0x1000576,  0x1000546 ]	};

-    key <LatM> {	[ 0x1000574,  0x1000544 ]	};

-    key <AB08> {	[ 0x100002C,  0x10000AB ]       };

-    key <AB09> {	[ 0x1002024,  0x10000BB ]       };

-    key <AB10> {	[ 0x100002F,  0x100055e ]	};

-

-};

-

-partial alphanumeric_keys

-xkb_symbols "phonetic-alt" {

-    include "am(phonetic)"

-    name[Group1]= "Armenia - Alternative Phonetic";

-

-    key <AE08> {	[ 0x1000580,  0x1000550 ]	};

-    key <LatR> {	[ 0x100057c,  0x100054c ]	};

-

-};

-

-partial alphanumeric_keys

-xkb_symbols "eastern" {

-

-    name[Group1]="Armenia - Eastern";

-

-    // This is the closer phonetic transliteration for Eastern Armenian

-    // than the Windows XP layout for Eastern Armenian, which seems

-    // to have contained a bug, with the reversal of 'g' for keh and 'c' for gim

-    // Also, AE01 (the colon) has been replaced with the Armenian_full_stop and

-    // capital AE07 (ken) with the Armenian ligature ew

-

-    key <TLDE> {	[ Armenian_separation_mark,  Armenian_exclam ]	};

-//  key <AE01> {	[ colon,  		KP_1 ]	};

-    key <AE01> {	[ Armenian_full_stop,  	KP_1 ]	};

-    key <AE02> {	[ Armenian_dza,  	Armenian_DZA ]	};

-    key <AE03> {	[ Armenian_hi,  	Armenian_HI ]	};

-    key <AE04> {	[ Armenian_accent,  	KP_3 ]       };

-    key <AE05> {	[ comma,  		KP_4 ]	};

-    key <AE06> {	[ minus,  		KP_9 ]	};

-    key <AE07> {	[ period,  		Armenian_ligature_ew ]	};

-    key <AE08> {	[ guillemotleft,  	parenleft ]	};

-    key <AE09> {	[ guillemotright,  	parenright ]	};

-    key <AE10> {	[ Armenian_o,  		Armenian_O ]	};

-    key <AE11> {	[ Armenian_ra,  	Armenian_RA ]       };

-    key <AE12> {	[ Armenian_zhe,  	Armenian_ZHE ]	};

-

-    key <LatQ> {	[ Armenian_khe,  	Armenian_KHE ]	};

-    key <LatW> {	[ Armenian_vyun,  	Armenian_VYUN ]	};

-    key <LatE> {	[ Armenian_e,  		Armenian_E ]	};

-    key <LatR> {	[ Armenian_re,  	Armenian_RE ]	};

-    key <LatT> {	[ Armenian_tyun,  	Armenian_TYUN ]	};

-    key <LatY> {	[ Armenian_yech,  	Armenian_YECH ]	};

-    key <LatU> {	[ Armenian_at,  	Armenian_AT ]	};

-    key <LatI> {	[ Armenian_ini,  	Armenian_INI ]	};

-    key <LatO> {	[ Armenian_vo,  	Armenian_VO ]	};

-    key <LatP> {	[ Armenian_pe,  	Armenian_PE ]	};

-    key <AD11> {	[ Armenian_cha,  	Armenian_CHA ]	};

-    key <AD12> {	[ Armenian_je,  	Armenian_JE ]	};

-    key <BKSL> {	[ apostrophe,  		Armenian_question ]	};

-

-    key <LatA> {	[ Armenian_ayb,  	Armenian_AYB ]	};

-    key <LatS> {	[ Armenian_se,  	Armenian_SE ]	};

-    key <LatD> {	[ Armenian_da,  	Armenian_DA ]	};

-    key <LatF> {	[ Armenian_fe,  	Armenian_FE ]	};

-    key <LatG> {	[ Armenian_gim,  	Armenian_GIM ]	};

-    key <LatH> {	[ Armenian_ho,  	Armenian_HO ]	};

-    key <LatJ> {	[ Armenian_tche,  	Armenian_TCHE ]	};

-    key <LatK> {	[ Armenian_ken,  	Armenian_KEN ]	};

-    key <LatL> {	[ Armenian_lyun,  	Armenian_LYUN ]	};

-    key <AC10> {	[ Armenian_to,  	Armenian_TO ]	};

-    key <AC11> {	[ Armenian_pyur,  	Armenian_PYUR ]	};

-

-    key <LatZ> {	[ Armenian_za,  	Armenian_ZA ]	};

-    key <LatX> {	[ Armenian_tso,  	Armenian_TSO ]	};

-    key <LatC> {	[ Armenian_ke,  	Armenian_KE ]	};

-    key <LatV> {	[ Armenian_vev,  	Armenian_VEV ]	};

-    key <LatB> {	[ Armenian_ben,  	Armenian_BEN ]	};

-    key <LatN> {	[ Armenian_nu,  	Armenian_NU ]	};

-    key <LatM> {	[ Armenian_men,  	Armenian_MEN ]	};

-    key <AB08> {	[ Armenian_sha,  	Armenian_SHA ]       };

-    key <AB09> {	[ Armenian_ghat,  	Armenian_GHAT ]       };

-    key <AB10> {	[ Armenian_tsa,  	Armenian_TSA ]	};

-

-};

-

-partial alphanumeric_keys

-xkb_symbols "western" {

-    include "am(eastern)"

-    name[Group1]="Armenia - Western";

-

-    // This is exactly the same layout for Western Armenian

-    // as in Windows XP, except:

-    // AE01 (the colon) has been replaced with the Armenian_full_stop and

-    // capital AE07 (ken) with the Armenian ligature ew

-

-    key <LatW> {	[ Armenian_vev,  	Armenian_VEV ]	};

-    key <LatT> {	[ Armenian_da,  	Armenian_DA ]	};

-    key <LatP> {	[ Armenian_ben,  	Armenian_BEN ]	};

-    key <LatD> {	[ Armenian_tyun,  	Armenian_TYUN ]	};

-    key <LatG> {	[ Armenian_ken,  	Armenian_KEN ]	};

-    key <LatK> {	[ Armenian_ke,  	Armenian_KE ]	};

-    key <LatC> {	[ Armenian_gim,  	Armenian_GIM ]	};

-    key <LatV> {	[ Armenian_vyun,  	Armenian_VYUN ]	};

-    key <LatB> {	[ Armenian_pe,  	Armenian_PE ]	};

-

-};

-

-partial alphanumeric_keys

-xkb_symbols "eastern-alt" {

-    include "am(eastern)"

-    name[Group1]="Armenia - Alternative Eastern";

-

-	// This replicates the Windows XP keyboard layout for Eastern

-	// Armenian exactly (including the bug), except:

- 	// AE01 (the colon) has been replaced with the Armenian_full_stop and

-	// capital AE07 (ken) with the Armenian ligature ew

-

-    key <LatG> {	[ Armenian_ke,  	Armenian_KE ]	};

-    key <LatC> {	[ Armenian_gim,  	Armenian_GIM ]	};

-

-};

+// based on a keyboard map from an 'xkb/symbols/am' file
+
+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+
+    name[Group1]= "Armenian";
+
+    // Alphanumeric section
+    key <TLDE> {	[ 0x100055d, 0x100055c	]	};
+    key	<LSGT> {	[  question,  0x100058a	]	};
+    key <BKSL> {        [ guillemotright, guillemotleft ] };
+
+    key <AE01> {	[ 0x1000586,  0x1000556	]	};
+    key <AE02> {	[ 0x1000571,  0x1000541	]	};
+    key <AE03> {	[ 0x1002013,  0x1002014 ]	};
+    key <AE04> {	[     comma,  dollar	]	};
+    key <AE05> {	[ 0x1000589,  0x1002026	] 	};
+    key <AE06> {	[ 0x100055e,  percent	]	};
+    key <AE07> {	[ 0x1002024,  0x1000587	] 	};
+    key <AE08> {	[ 0x100055b,  0x10002bc	] 	};
+    key <AE09> {	[ parenright, parenleft ] 	};
+    key <AE10> {	[ 0x1000585,  0x1000555	]	};
+    key <AE11> {	[ 0x1000567,  0x1000537	]	};
+    key <AE12> {	[ 0x1000572,  0x1000542	]	};
+
+
+    key <AD01> {	[ 0x1000573, 0x1000543	]       };
+    key <AD02> {	[ 0x1000583, 0x1000553	]	};
+    key <AD03> {	[ 0x1000562, 0x1000532	]       };
+    key <AD04> {	[ 0x100057d, 0x100054d	]	};
+    key <AD05> {	[ 0x1000574, 0x1000544	]       };
+    key <AD06> {	[ 0x1000578, 0x1000548	]       };
+    key <AD07> {	[ 0x1000582, 0x1000552	]       };
+    key <AD08> {	[ 0x100056f, 0x100053f	]       };
+    key <AD09> {	[ 0x1000568, 0x1000538	]       };
+    key <AD10> {	[ 0x1000569, 0x1000539	]       };
+    key <AD11> {	[ 0x100056e, 0x100053e	]       };
+    key <AD12> {	[ 0x1000581, 0x1000551	]       };
+
+    key <AC01> {	[ 0x100057b, 0x100054b	]       };
+    key <AC02> {	[ 0x100057e, 0x100054e	]	};
+    key <AC03> {	[ 0x1000563, 0x1000533	]       };
+    key <AC04> {	[ 0x1000565, 0x1000535	]       };
+    key <AC05> {	[ 0x1000561, 0x1000531	]       };
+    key <AC06> {	[ 0x1000576, 0x1000546	]	};
+    key <AC07> {	[ 0x100056b, 0x100053b	]       };
+    key <AC08> {	[ 0x100057f, 0x100054f	]       };
+    key <AC09> {	[ 0x1000570, 0x1000540	]       };
+    key <AC10> {	[ 0x100057a, 0x100054a	]       };
+    key <AC11> {	[ 0x1000580, 0x1000550	]       };
+
+    key <AB01> {	[ 0x100056a, 0x100053a	]       };
+    key <AB02> {	[ 0x1000564, 0x1000534	]       };
+    key <AB03> {	[ 0x1000579, 0x1000549	]       };
+    key <AB04> {	[ 0x1000575, 0x1000545	]       };
+    key <AB05> {	[ 0x1000566, 0x1000536	]       };
+    key <AB06> {	[ 0x100056c, 0x100053c	]       };
+    key <AB07> {	[ 0x1000584, 0x1000554	]       };
+    key <AB08> {	[ 0x100056d, 0x100053d	]       };
+    key <AB09> {	[ 0x1000577, 0x1000547	]       };
+    key <AB10> {	[ 0x100057c, 0x100054c	]       };
+
+};
+
+partial alphanumeric_keys
+xkb_symbols "olpc" {
+    include "am(basic)"
+    name[Group1]= "Armenian";
+
+    include "group(olpc)"
+};
+
+xkb_symbols "phonetic" {
+    include "am(basic)"
+    name[Group1]= "Armenian (phonetic)";
+	
+    key <BKSL> {	[ 0x1000577,  0x1000547 ]	};
+	
+    key <AE01> {	[ 0x1000567,  0x1000537 ]	};
+    key <AE02> {	[ 0x1000569,  0x1000539 ]	};
+    key <AE03> {	[ 0x1000583,  0x1000553 ]	};
+    key <AE04> {	[ 0x1000571,  0x1000541 ]       };
+    key <AE05> {	[ 0x100057b,  0x100054b ]	};
+    key <AE06> {	[ 0x1000582,  0x1000552 ]	};
+    key <AE07> {	[ 0x1000587,  0x1000587 ]	};
+    key <AE08> {	[ 0x100057c,  0x100054c ]	};
+    key <AE09> {	[ 0x1000579,  0x1000549 ]	};
+    key <AE10> {	[ 0x1000573,  0x1000543 ]	};
+    key <AE11> {	[ 0x100002D,  0x1002015 ]       };
+    key <AE12> {	[ 0x100056a,  0x100053a ]	};
+
+    key <LatQ> {	[ 0x1000584,  0x1000554 ]	};
+    key <LatW> {	[ 0x1000578,  0x1000548 ]	};
+    key <LatE> {	[ 0x1000565,  0x1000535 ]	};
+    key <LatR> {	[ 0x1000580,  0x1000550 ]	};
+    key <LatT> {	[ 0x100057f,  0x100054f ]	};
+    key <LatY> {	[ 0x1000568,  0x1000538 ]	};
+    key <LatU> {	[ 0x1000582,  0x1000552 ]	};
+    key <LatI> {	[ 0x100056b,  0x100053b ]	};
+    key <LatO> {	[ 0x1000585,  0x1000555 ]	};
+    key <LatP> {	[ 0x100057a,  0x100054a ]	};
+    key <AD11> {	[ 0x100056d,  0x100053d ]	};
+    key <AD12> {	[ 0x100056e,  0x100053e ]	};
+
+    key <LatA> {	[ 0x1000561,  0x1000531 ]	};
+    key <LatS> {	[ 0x100057d,  0x100054d ]	};
+    key <LatD> {	[ 0x1000564,  0x1000534 ]	};
+    key <LatF> {	[ 0x1000586,  0x1000556 ]	};
+    key <LatG> {	[ 0x1000563,  0x1000533 ]	};
+    key <LatH> {	[ 0x1000570,  0x1000540 ]	};
+    key <LatJ> {	[ 0x1000575,  0x1000545 ]	};
+    key <LatK> {	[ 0x100056f,  0x100053f ]	};
+    key <LatL> {	[ 0x100056c,  0x100053c ]	};
+    key <AC10> {	[ semicolon,  0x1000589 ]	};
+    key <AC11> {	[ 0x100055b,  0x1000022 ]	};
+
+    key <LatZ> {	[ 0x1000566,  0x1000536 ]	};
+    key <LatX> {	[ 0x1000572,  0x1000542 ]	};
+    key <LatC> {	[ 0x1000581,  0x1000551 ]	};
+    key <LatV> {	[ 0x100057e,  0x100054e ]	};
+    key <LatB> {	[ 0x1000562,  0x1000532 ]	};
+    key <LatN> {	[ 0x1000576,  0x1000546 ]	};
+    key <LatM> {	[ 0x1000574,  0x1000544 ]	};
+    key <AB08> {	[ 0x100002C,  0x10000AB ]       };
+    key <AB09> {	[ 0x1002024,  0x10000BB ]       };
+    key <AB10> {	[ 0x100002F,  0x100055e ]	};
+
+};
+
+partial alphanumeric_keys
+xkb_symbols "phonetic-alt" {
+    include "am(phonetic)"
+    name[Group1]= "Armenian (alternative phonetic)";
+
+    key <AE08> {	[ 0x1000580,  0x1000550 ]	};
+    key <LatR> {	[ 0x100057c,  0x100054c ]	};
+
+};
+
+partial alphanumeric_keys
+xkb_symbols "eastern" {
+
+    name[Group1]="Armenian (eastern)";
+
+    // This is the closer phonetic transliteration for Eastern Armenian
+    // than the Windows XP layout for Eastern Armenian, which seems
+    // to have contained a bug, with the reversal of 'g' for keh and 'c' for gim
+    // Also, AE01 (the colon) has been replaced with the Armenian_full_stop and
+    // capital AE07 (ken) with the Armenian ligature ew
+
+    key <TLDE> {	[ Armenian_separation_mark,  Armenian_exclam ]	};
+//  key <AE01> {	[ colon,  		KP_1 ]	};
+    key <AE01> {	[ Armenian_full_stop,  	KP_1 ]	};
+    key <AE02> {	[ Armenian_dza,  	Armenian_DZA ]	};
+    key <AE03> {	[ Armenian_hi,  	Armenian_HI ]	};
+    key <AE04> {	[ Armenian_accent,  	KP_3 ]       };
+    key <AE05> {	[ comma,  		KP_4 ]	};
+    key <AE06> {	[ minus,  		KP_9 ]	};
+    key <AE07> {	[ period,  		Armenian_ligature_ew ]	};
+    key <AE08> {	[ guillemotleft,  	parenleft ]	};
+    key <AE09> {	[ guillemotright,  	parenright ]	};
+    key <AE10> {	[ Armenian_o,  		Armenian_O ]	};
+    key <AE11> {	[ Armenian_ra,  	Armenian_RA ]       };
+    key <AE12> {	[ Armenian_zhe,  	Armenian_ZHE ]	};
+
+    key <LatQ> {	[ Armenian_khe,  	Armenian_KHE ]	};
+    key <LatW> {	[ Armenian_vyun,  	Armenian_VYUN ]	};
+    key <LatE> {	[ Armenian_e,  		Armenian_E ]	};
+    key <LatR> {	[ Armenian_re,  	Armenian_RE ]	};
+    key <LatT> {	[ Armenian_tyun,  	Armenian_TYUN ]	};
+    key <LatY> {	[ Armenian_yech,  	Armenian_YECH ]	};
+    key <LatU> {	[ Armenian_at,  	Armenian_AT ]	};
+    key <LatI> {	[ Armenian_ini,  	Armenian_INI ]	};
+    key <LatO> {	[ Armenian_vo,  	Armenian_VO ]	};
+    key <LatP> {	[ Armenian_pe,  	Armenian_PE ]	};
+    key <AD11> {	[ Armenian_cha,  	Armenian_CHA ]	};
+    key <AD12> {	[ Armenian_je,  	Armenian_JE ]	};
+    key <BKSL> {	[ apostrophe,  		Armenian_question ]	};
+
+    key <LatA> {	[ Armenian_ayb,  	Armenian_AYB ]	};
+    key <LatS> {	[ Armenian_se,  	Armenian_SE ]	};
+    key <LatD> {	[ Armenian_da,  	Armenian_DA ]	};
+    key <LatF> {	[ Armenian_fe,  	Armenian_FE ]	};
+    key <LatG> {	[ Armenian_gim,  	Armenian_GIM ]	};
+    key <LatH> {	[ Armenian_ho,  	Armenian_HO ]	};
+    key <LatJ> {	[ Armenian_tche,  	Armenian_TCHE ]	};
+    key <LatK> {	[ Armenian_ken,  	Armenian_KEN ]	};
+    key <LatL> {	[ Armenian_lyun,  	Armenian_LYUN ]	};
+    key <AC10> {	[ Armenian_to,  	Armenian_TO ]	};
+    key <AC11> {	[ Armenian_pyur,  	Armenian_PYUR ]	};
+
+    key <LatZ> {	[ Armenian_za,  	Armenian_ZA ]	};
+    key <LatX> {	[ Armenian_tso,  	Armenian_TSO ]	};
+    key <LatC> {	[ Armenian_ke,  	Armenian_KE ]	};
+    key <LatV> {	[ Armenian_vev,  	Armenian_VEV ]	};
+    key <LatB> {	[ Armenian_ben,  	Armenian_BEN ]	};
+    key <LatN> {	[ Armenian_nu,  	Armenian_NU ]	};
+    key <LatM> {	[ Armenian_men,  	Armenian_MEN ]	};
+    key <AB08> {	[ Armenian_sha,  	Armenian_SHA ]       };
+    key <AB09> {	[ Armenian_ghat,  	Armenian_GHAT ]       };
+    key <AB10> {	[ Armenian_tsa,  	Armenian_TSA ]	};
+
+};
+
+partial alphanumeric_keys
+xkb_symbols "western" {
+    include "am(eastern)"
+    name[Group1]="Armenian (western)";
+
+    // This is exactly the same layout for Western Armenian
+    // as in Windows XP, except:
+    // AE01 (the colon) has been replaced with the Armenian_full_stop and
+    // capital AE07 (ken) with the Armenian ligature ew
+
+    key <LatW> {	[ Armenian_vev,  	Armenian_VEV ]	};
+    key <LatT> {	[ Armenian_da,  	Armenian_DA ]	};
+    key <LatP> {	[ Armenian_ben,  	Armenian_BEN ]	};
+    key <LatD> {	[ Armenian_tyun,  	Armenian_TYUN ]	};
+    key <LatG> {	[ Armenian_ken,  	Armenian_KEN ]	};
+    key <LatK> {	[ Armenian_ke,  	Armenian_KE ]	};
+    key <LatC> {	[ Armenian_gim,  	Armenian_GIM ]	};
+    key <LatV> {	[ Armenian_vyun,  	Armenian_VYUN ]	};
+    key <LatB> {	[ Armenian_pe,  	Armenian_PE ]	};
+
+};
+
+partial alphanumeric_keys
+xkb_symbols "eastern-alt" {
+    include "am(eastern)"
+    name[Group1]="Armenian (alternative eastern)";
+
+	// This replicates the Windows XP keyboard layout for Eastern
+	// Armenian exactly (including the bug), except:
+ 	// AE01 (the colon) has been replaced with the Armenian_full_stop and
+	// capital AE07 (ken) with the Armenian ligature ew
+
+    key <LatG> {	[ Armenian_ke,  	Armenian_KE ]	};
+    key <LatC> {	[ Armenian_gim,  	Armenian_GIM ]	};
+
+};
diff --git a/xorg-server/xkeyboard-config/symbols/ara b/xorg-server/xkeyboard-config/symbols/ara
index 4606ee719..76e03b1dd 100644
--- a/xorg-server/xkeyboard-config/symbols/ara
+++ b/xorg-server/xkeyboard-config/symbols/ara
@@ -1,276 +1,276 @@
-// based on a keyboard map from an 'xkb/symbols/ar' file

-

-partial default alphanumeric_keys 

-xkb_symbols "basic" {

-    name[Group1]= "Arabic";

-

-// NOTES:

-//

-// there is also combined shadda diacritis in AltGr position of simple

-// diacritics fatha, fathatan, damma, dammatan, kasra and kasratan

-// should a third state be added to Group2 ?

-//

-

-    key <TLDE> {  [     Arabic_thal,      Arabic_shadda   ]	};

-    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,      parenright      ]     };

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

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

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

-						

-    key <AD01> {  [      Arabic_dad,     Arabic_fatha     ]     };

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

-    key <AD03> {  [     Arabic_theh,     Arabic_damma     ]     };

-    key <AD04> {  [      Arabic_qaf,     Arabic_dammatan  ]     };

-    key <AD05> {  [   Arabic_feh,  0x100fef9, 0x10006a4   ]     };

-    key <AD06> {  [   Arabic_ghain, Arabic_hamzaunderalef ]     };

-    key <AD07> {  [      Arabic_ain,         grave        ]     };

-    key <AD08> {  [       Arabic_ha,        division      ]     };

-    key <AD09> {  [     Arabic_khah,       multiply       ]     };

-    key <AD10> {  [      Arabic_hah,    Arabic_semicolon  ]     };

-    key <AD11> {  [     Arabic_jeem,   less, 0x1000686    ]     };

-    key <AD12> {  [      Arabic_dal,        greater       ]     };

-

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

-    key <AC02> {  [     Arabic_seen,   Arabic_kasratan    ]     };

-    key <AC03> {  [      Arabic_yeh,       bracketright   ]     };

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

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

-    key <AC06> {  [     Arabic_alef,   Arabic_hamzaonalef ]     };

-    key <AC07> {  [      Arabic_teh,      Arabic_tatweel  ]     };

-    key <AC08> {  [     Arabic_noon,      Arabic_comma    ]     };

-    key <AC09> {  [     Arabic_meem,         slash        ]     };

-    key <AC10> {  [      Arabic_kaf,   colon, 0x10006af   ]     };

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

-

-    key <LSGT> {  [             bar,      brokenbar	  ]     };

-    key <AB01> {  [Arabic_hamzaonyeh, asciitilde, guillemotright  ]     };

-    key <AB02> {  [    Arabic_hamza,  Arabic_sukun, guillemotleft ]     };

-    key <AB03> {  [Arabic_hamzaonwaw,      braceright     ]     };

-    key <AB04> {  [       Arabic_ra,       braceleft      ]     };

-    key <AB05> {  [       0x100fefb,       0x100fef5      ]     };

-    key <AB06> {  [Arabic_alefmaksura, Arabic_maddaonalef ]     };

-    key <AB07> {  [Arabic_tehmarbuta,    apostrophe       ]     };

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

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

-    key <AB10> {  [      Arabic_zah, Arabic_question_mark ]     };

-

-    include "level3(ralt_switch)"

-

-    // End alphanumeric section

-};

-

-partial alphanumeric_keys

-xkb_symbols "qwerty" {

-    include "ara(basic)"

-    name[Group1]= "Arabic - qwerty";

-};

-

-partial alphanumeric_keys

-xkb_symbols "azerty" {

-    include "ara(basic)"

-    name[Group1]= "Arabic - azerty";

-

-	// the north african arabic keyboard differs from the middle east one

-	// by the numeric row; it follows French keyboard style

-	//

-	// PROBLEM: some chars are inaccessible: ! @ # $ % ^ *

-	// should they go elsewhere? replace " ' that are now in double ?

-	// also, dead_circumflex and dead_diaeresis from French keyboard

-	// as well as ugrave are missing, which questions the utility of the

-	// other accentuated latin letters. Maybe this is useful only with

-	// a French keyboard in Group1 ? Then, shouldn't Group1 be filled ?

-

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

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

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

-    key <AE04> {  [      apostrophe,               4      ]       };

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

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

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

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

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

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

-    key <AE11> {  [      parenright,          degree      ]       };

-};

-

-partial alphanumeric_keys

-xkb_symbols "digits" {

-    include "ara(basic)"

-    name[Group1]= "Arabic - digits";

-

-	// use arabic script digits

-

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

-    key <AE02> {  [       0x1000662,              at      ]       };

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

-    key <AE04> {  [       0x1000664,          dollar      ]       };

-    key <AE05> {  [       0x1000665,  Arabic_percent      ]       };

-    key <AE06> {  [       0x1000666,     asciicircum      ]       };

-    key <AE07> {  [       0x1000667,       ampersand      ]       };

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

-    key <AE09> {  [       0x1000669,      parenright      ]       };

-    key <AE10> {  [       0x1000660,       parenleft      ]       };

-};

-

-partial alphanumeric_keys

-xkb_symbols "qwerty_digits" {

-    include "ara(digits)"

-    name[Group1]= "Arabic - qwerty/digits";

-};

-

-partial alphanumeric_keys

-xkb_symbols "azerty_digits" {

-    include "ara(azerty)"

-    name[Group1]= "Arabic - azerty/digits";

-	

-    key <AE01> {  [       ampersand,       0x1000661      ]       };

-    key <AE02> {  [          eacute,       0x1000662      ]       };

-    key <AE03> {  [        quotedbl,       0x1000663      ]       };

-    key <AE04> {  [      apostrophe,       0x1000664      ]       };

-    key <AE05> {  [       parenleft,       0x1000665      ]       };

-    key <AE06> {  [           minus,       0x1000666      ]       };

-    key <AE07> {  [          egrave,       0x1000667      ]       };

-    key <AE08> {  [      underscore,       0x1000668      ]       };

-    key <AE09> {  [        ccedilla,       0x1000669      ]       };

-    key <AE10> {  [          agrave,       0x1000660      ]       };

-};

-

-// Arabic keyboard using Buckwalter transliteration

-// http://www.qamus.org/transliteration.htm

-// Martin Vidner

-

-// symbol names: see /usr/X11R6/include/X11/keysymdef.h (XFree86-devel.rpm)

-

-partial alphanumeric_keys 

-xkb_symbols "buckwalter" {

-    name[Group1]= "Arabic - Buckwalter";

-

-    // ARABIC LETTER SUPERSCRIPT ALEF

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

-

-    // Arabic_0 .. Arabic_9 do not work in Kate,

-    // Unicode never seems to work worse.

-    key <AE01> {  [       0x1000661,   VoidSymbol         ]       };

-    key <AE02> {  [       0x1000662,   VoidSymbol         ]       };

-    key <AE03> {  [       0x1000663,   VoidSymbol         ]       };

-    key <AE04> {  [       0x1000664,   Arabic_sheen       ]       };

-    key <AE05> {  [       0x1000665,   Arabic_percent     ]       };

-    key <AE06> {  [       0x1000666,   VoidSymbol         ]       };

-    key <AE07> {  [       0x1000667,   Arabic_hamzaonwaw  ]       };

-    key <AE08> {  [       0x1000668,   Arabic_thal        ]       };

-    // ORNATE LEFT PARENTHESIS

-    key <AE09> {  [       0x1000669,   0x100fd3e          ]       };

-    // ORNATE RIGHT PARENTHESIS

-    key <AE10> {  [       0x1000660,   0x100fd3f          ]       };

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

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

-						

-    key <AD01> {  [      Arabic_qaf,   VoidSymbol         ]       };

-    key <AD02> {  [      Arabic_waw,   Arabic_hamzaonwaw  ]       };

-    key <AD03> {  [      VoidSymbol,   Arabic_ain         ]       };

-    key <AD04> {  [      Arabic_ra,    VoidSymbol         ]       };

-    key <AD05> {  [      Arabic_teh,   Arabic_tah         ]       };

-    key <AD06> {  [      Arabic_yeh,   Arabic_alefmaksura ]       };

-    key <AD07> {  [      Arabic_damma, VoidSymbol         ]       };

-    key <AD08> {  [      Arabic_kasra, Arabic_hamzaunderalef ]    };

-    key <AD09> {  [      Arabic_sukun, Arabic_hamzaonalef ]       };

-    key <AD10> {  [      Arabic_tehmarbuta, VoidSymbol    ]       };

-    // ARABIC LETTER ALEF WASLA

-    key <AD11> {  [      VoidSymbol,   0x1000671          ]       };

-    key <AD12> {  [      VoidSymbol,   Arabic_hamzaonyeh  ]       };

-

-    key <AC01> {  [    Arabic_fatha,   Arabic_alef        ]       };

-    key <AC02> {  [    Arabic_seen,    Arabic_sad         ]       };

-    key <AC03> {  [    Arabic_dal,     Arabic_dad         ]       };

-    key <AC04> {  [    Arabic_feh,     Arabic_fathatan    ]       };

-    key <AC05> {  [    Arabic_ghain,   VoidSymbol         ]       };

-    key <AC06> {  [    Arabic_ha,      Arabic_hah         ]       };

-    key <AC07> {  [    Arabic_jeem,    VoidSymbol         ]       };

-    key <AC08> {  [    Arabic_kaf,     Arabic_kasratan    ]       };

-    key <AC09> {  [    Arabic_lam,     VoidSymbol         ]       };

-    key <AC10> {  [    Arabic_semicolon, VoidSymbol       ]       };

-    key <AC11> {  [    Arabic_hamza,   VoidSymbol         ]       };

-

-    key <BKSL> {  [      VoidSymbol,   Arabic_maddaonalef ]     };

-

-//    key <LSGT> {  [             bar,      brokenbar	  ]     };

-

-    key <AB01> {  [    Arabic_zain,    Arabic_zah         ]       };

-    key <AB02> {  [    Arabic_khah,    VoidSymbol         ]       };

-    key <AB03> {  [    VoidSymbol,     VoidSymbol         ]       };

-    key <AB04> {  [    Arabic_theh,    VoidSymbol         ]       };

-    key <AB05> {  [    Arabic_beh,     VoidSymbol         ]       };

-    key <AB06> {  [    Arabic_noon,    Arabic_dammatan    ]       };

-    key <AB07> {  [    Arabic_meem,    VoidSymbol         ]       };

-    key <AB08> {  [    Arabic_comma,   Arabic_hamzaunderalef ]    };

-    // ARABIC FULL STOP (Urdu)

-    key <AB09> {  [    0x10006d4,      Arabic_hamzaonalef ]       };

-    key <AB10> {  [    VoidSymbol,     Arabic_question_mark ]     };

-

-    // End alphanumeric section

-};

-

-partial alphanumeric_keys

-xkb_symbols "olpc" {

-

-    include "ara(basic)"

-

-    // As part of the olpc design some changes were made to the Arabic

-    // keyboard design. Major changes are:

-    //

-    //  * Removed the lam-alef single character. Poeple type as they

-    //    pronounce, and lam-alef is just a visual formatting of the

-    //    sequence and is not often used on the keyboard. It is

-    //    similar to the Allah single character, which is also not on

-    //    the keyboard.

-    //  * Moved the following keys:

-    //     o Thal from TLDE to AB05: Due to space limitation on the

-    //       keybaord, but also accessibility

-    //     o Shadda from TLDE to AD05

-    //  * Placed currency letters on number keys and moved the ^ and &

-    //    characters to lower keys (This change is worth revisiting

-    //    before end of test period)

-

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

-

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

-    key <AE02> {  [       0x1000662,              at  ] };

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

-    key <AE04> {  [       0x1000664,          dollar  ] };

-    key <AE05> {  [       0x1000665,  Arabic_percent  ] };

-    key <AE06> {  [       0x1000666,        sterling  ] };

-    key <AE07> {  [       0x1000667,        EuroSign  ] };

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

-    key <AE09> {  [       0x1000669,      parenright  ] };

-    key <AE10> {  [       0x1000660,       parenleft  ] };

-

-    key <AD05> {  [      Arabic_feh,   Arabic_shadda  ] };

-

-    key <AD08> {  [      Arabic_heh,        division  ] };

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

-    key <AD12> {  [      Arabic_dal,       braceleft  ] };

-

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

-    key <AC02> {  [     Arabic_seen,            less  ] };

-    key <AC05> {  [      Arabic_lam,       ampersand  ] };

-    key <AC10> {  [      Arabic_kaf                   ] };

-    key <AC11> {  [      Arabic_tah                   ] };

-

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

-

-

-    // REH isolated form?

-    key <AB03> {  [ Arabic_hamzaonwaw,   Arabic_kasra ] };

-    key <AB04> {  [       Arabic_ra,  Arabic_kasratan ] };    

-    key <AB05> {  [     Arabic_thal,      asciicircum ] };

-

-    include "group(olpc)"

-};

+// based on a keyboard map from an 'xkb/symbols/ar' file
+
+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+    name[Group1]= "Arabic";
+
+// NOTES:
+//
+// there is also combined shadda diacritis in AltGr position of simple
+// diacritics fatha, fathatan, damma, dammatan, kasra and kasratan
+// should a third state be added to Group2 ?
+//
+
+    key <TLDE> {  [     Arabic_thal,      Arabic_shadda   ]	};
+    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,      parenright      ]     };
+    key <AE10> {  [               0,       parenleft      ]     };
+    key <AE11> {  [           minus,      underscore      ]     };
+    key <AE12> {  [           equal,            plus      ]     };
+						
+    key <AD01> {  [      Arabic_dad,     Arabic_fatha     ]     };
+    key <AD02> {  [      Arabic_sad,     Arabic_fathatan  ]     };
+    key <AD03> {  [     Arabic_theh,     Arabic_damma     ]     };
+    key <AD04> {  [      Arabic_qaf,     Arabic_dammatan  ]     };
+    key <AD05> {  [   Arabic_feh,  0x100fef9, 0x10006a4   ]     };
+    key <AD06> {  [   Arabic_ghain, Arabic_hamzaunderalef ]     };
+    key <AD07> {  [      Arabic_ain,         grave        ]     };
+    key <AD08> {  [       Arabic_ha,        division      ]     };
+    key <AD09> {  [     Arabic_khah,       multiply       ]     };
+    key <AD10> {  [      Arabic_hah,    Arabic_semicolon  ]     };
+    key <AD11> {  [     Arabic_jeem,   less, 0x1000686    ]     };
+    key <AD12> {  [      Arabic_dal,        greater       ]     };
+
+    key <AC01> {  [    Arabic_sheen,   Arabic_kasra       ]     };
+    key <AC02> {  [     Arabic_seen,   Arabic_kasratan    ]     };
+    key <AC03> {  [      Arabic_yeh,       bracketright   ]     };
+    key <AC04> {  [   Arabic_beh, bracketleft, 0x100067e  ]     };
+    key <AC05> {  [      Arabic_lam,       0x100fef7      ]     };
+    key <AC06> {  [     Arabic_alef,   Arabic_hamzaonalef ]     };
+    key <AC07> {  [      Arabic_teh,      Arabic_tatweel  ]     };
+    key <AC08> {  [     Arabic_noon,      Arabic_comma    ]     };
+    key <AC09> {  [     Arabic_meem,         slash        ]     };
+    key <AC10> {  [      Arabic_kaf,   colon, 0x10006af   ]     };
+    key <AC11> {  [      Arabic_tah,        quotedbl      ]     };
+
+    key <LSGT> {  [             bar,      brokenbar	  ]     };
+    key <AB01> {  [Arabic_hamzaonyeh, asciitilde, guillemotright  ]     };
+    key <AB02> {  [    Arabic_hamza,  Arabic_sukun, guillemotleft ]     };
+    key <AB03> {  [Arabic_hamzaonwaw,      braceright     ]     };
+    key <AB04> {  [       Arabic_ra,       braceleft      ]     };
+    key <AB05> {  [       0x100fefb,       0x100fef5      ]     };
+    key <AB06> {  [Arabic_alefmaksura, Arabic_maddaonalef ]     };
+    key <AB07> {  [Arabic_tehmarbuta,    apostrophe       ]     };
+    key <AB08> {  [      Arabic_waw,         comma        ]     };
+    key <AB09> {  [     Arabic_zain,         period       ]     };
+    key <AB10> {  [      Arabic_zah, Arabic_question_mark ]     };
+
+    include "level3(ralt_switch)"
+
+    // End alphanumeric section
+};
+
+partial alphanumeric_keys
+xkb_symbols "qwerty" {
+    include "ara(basic)"
+    name[Group1]= "Arabic (qwerty)";
+};
+
+partial alphanumeric_keys
+xkb_symbols "azerty" {
+    include "ara(basic)"
+    name[Group1]= "Arabic (azerty)";
+
+	// the north african arabic keyboard differs from the middle east one
+	// by the numeric row; it follows French keyboard style
+	//
+	// PROBLEM: some chars are inaccessible: ! @ # $ % ^ *
+	// should they go elsewhere? replace " ' that are now in double ?
+	// also, dead_circumflex and dead_diaeresis from French keyboard
+	// as well as ugrave are missing, which questions the utility of the
+	// other accentuated latin letters. Maybe this is useful only with
+	// a French keyboard in Group1 ? Then, shouldn't Group1 be filled ?
+
+    key <AE01> {  [       ampersand,               1      ]       };
+    key <AE02> {  [          eacute,               2      ]       };
+    key <AE03> {  [        quotedbl,               3      ]       };
+    key <AE04> {  [      apostrophe,               4      ]       };
+    key <AE05> {  [       parenleft,               5      ]       };
+    key <AE06> {  [           minus,               6      ]       };
+    key <AE07> {  [          egrave,               7      ]       };
+    key <AE08> {  [      underscore,               8      ]       };
+    key <AE09> {  [        ccedilla,               9      ]       };
+    key <AE10> {  [          agrave,               0      ]       };
+    key <AE11> {  [      parenright,          degree      ]       };
+};
+
+partial alphanumeric_keys
+xkb_symbols "digits" {
+    include "ara(basic)"
+    name[Group1]= "Arabic (digits)";
+
+	// use arabic script digits
+
+    key <AE01> {  [       0x1000661,          exclam      ]       };
+    key <AE02> {  [       0x1000662,              at      ]       };
+    key <AE03> {  [       0x1000663,      numbersign      ]       };
+    key <AE04> {  [       0x1000664,          dollar      ]       };
+    key <AE05> {  [       0x1000665,  Arabic_percent      ]       };
+    key <AE06> {  [       0x1000666,     asciicircum      ]       };
+    key <AE07> {  [       0x1000667,       ampersand      ]       };
+    key <AE08> {  [       0x1000668,        asterisk      ]       };
+    key <AE09> {  [       0x1000669,      parenright      ]       };
+    key <AE10> {  [       0x1000660,       parenleft      ]       };
+};
+
+partial alphanumeric_keys
+xkb_symbols "qwerty_digits" {
+    include "ara(digits)"
+    name[Group1]= "Arabic (qwerty/digits)";
+};
+
+partial alphanumeric_keys
+xkb_symbols "azerty_digits" {
+    include "ara(azerty)"
+    name[Group1]= "Arabic (azerty/digits)";
+	
+    key <AE01> {  [       ampersand,       0x1000661      ]       };
+    key <AE02> {  [          eacute,       0x1000662      ]       };
+    key <AE03> {  [        quotedbl,       0x1000663      ]       };
+    key <AE04> {  [      apostrophe,       0x1000664      ]       };
+    key <AE05> {  [       parenleft,       0x1000665      ]       };
+    key <AE06> {  [           minus,       0x1000666      ]       };
+    key <AE07> {  [          egrave,       0x1000667      ]       };
+    key <AE08> {  [      underscore,       0x1000668      ]       };
+    key <AE09> {  [        ccedilla,       0x1000669      ]       };
+    key <AE10> {  [          agrave,       0x1000660      ]       };
+};
+
+// Arabic keyboard using Buckwalter transliteration
+// http://www.qamus.org/transliteration.htm
+// Martin Vidner
+
+// symbol names: see /usr/X11R6/include/X11/keysymdef.h (XFree86-devel.rpm)
+
+partial alphanumeric_keys 
+xkb_symbols "buckwalter" {
+    name[Group1]= "Arabic (Buckwalter)";
+
+    // ARABIC LETTER SUPERSCRIPT ALEF
+    key <TLDE> {  [       0x1000670,  Arabic_shadda       ]       };
+
+    // Arabic_0 .. Arabic_9 do not work in Kate,
+    // Unicode never seems to work worse.
+    key <AE01> {  [       0x1000661,   VoidSymbol         ]       };
+    key <AE02> {  [       0x1000662,   VoidSymbol         ]       };
+    key <AE03> {  [       0x1000663,   VoidSymbol         ]       };
+    key <AE04> {  [       0x1000664,   Arabic_sheen       ]       };
+    key <AE05> {  [       0x1000665,   Arabic_percent     ]       };
+    key <AE06> {  [       0x1000666,   VoidSymbol         ]       };
+    key <AE07> {  [       0x1000667,   Arabic_hamzaonwaw  ]       };
+    key <AE08> {  [       0x1000668,   Arabic_thal        ]       };
+    // ORNATE LEFT PARENTHESIS
+    key <AE09> {  [       0x1000669,   0x100fd3e          ]       };
+    // ORNATE RIGHT PARENTHESIS
+    key <AE10> {  [       0x1000660,   0x100fd3f          ]       };
+    key <AE11> {  [       minus,       Arabic_tatweel     ]       };
+    key <AE12> {  [       equal,       plus               ]       };
+						
+    key <AD01> {  [      Arabic_qaf,   VoidSymbol         ]       };
+    key <AD02> {  [      Arabic_waw,   Arabic_hamzaonwaw  ]       };
+    key <AD03> {  [      VoidSymbol,   Arabic_ain         ]       };
+    key <AD04> {  [      Arabic_ra,    VoidSymbol         ]       };
+    key <AD05> {  [      Arabic_teh,   Arabic_tah         ]       };
+    key <AD06> {  [      Arabic_yeh,   Arabic_alefmaksura ]       };
+    key <AD07> {  [      Arabic_damma, VoidSymbol         ]       };
+    key <AD08> {  [      Arabic_kasra, Arabic_hamzaunderalef ]    };
+    key <AD09> {  [      Arabic_sukun, Arabic_hamzaonalef ]       };
+    key <AD10> {  [      Arabic_tehmarbuta, VoidSymbol    ]       };
+    // ARABIC LETTER ALEF WASLA
+    key <AD11> {  [      VoidSymbol,   0x1000671          ]       };
+    key <AD12> {  [      VoidSymbol,   Arabic_hamzaonyeh  ]       };
+
+    key <AC01> {  [    Arabic_fatha,   Arabic_alef        ]       };
+    key <AC02> {  [    Arabic_seen,    Arabic_sad         ]       };
+    key <AC03> {  [    Arabic_dal,     Arabic_dad         ]       };
+    key <AC04> {  [    Arabic_feh,     Arabic_fathatan    ]       };
+    key <AC05> {  [    Arabic_ghain,   VoidSymbol         ]       };
+    key <AC06> {  [    Arabic_ha,      Arabic_hah         ]       };
+    key <AC07> {  [    Arabic_jeem,    VoidSymbol         ]       };
+    key <AC08> {  [    Arabic_kaf,     Arabic_kasratan    ]       };
+    key <AC09> {  [    Arabic_lam,     VoidSymbol         ]       };
+    key <AC10> {  [    Arabic_semicolon, VoidSymbol       ]       };
+    key <AC11> {  [    Arabic_hamza,   VoidSymbol         ]       };
+
+    key <BKSL> {  [      VoidSymbol,   Arabic_maddaonalef ]     };
+
+//    key <LSGT> {  [             bar,      brokenbar	  ]     };
+
+    key <AB01> {  [    Arabic_zain,    Arabic_zah         ]       };
+    key <AB02> {  [    Arabic_khah,    VoidSymbol         ]       };
+    key <AB03> {  [    VoidSymbol,     VoidSymbol         ]       };
+    key <AB04> {  [    Arabic_theh,    VoidSymbol         ]       };
+    key <AB05> {  [    Arabic_beh,     VoidSymbol         ]       };
+    key <AB06> {  [    Arabic_noon,    Arabic_dammatan    ]       };
+    key <AB07> {  [    Arabic_meem,    VoidSymbol         ]       };
+    key <AB08> {  [    Arabic_comma,   Arabic_hamzaunderalef ]    };
+    // ARABIC FULL STOP (Urdu)
+    key <AB09> {  [    0x10006d4,      Arabic_hamzaonalef ]       };
+    key <AB10> {  [    VoidSymbol,     Arabic_question_mark ]     };
+
+    // End alphanumeric section
+};
+
+partial alphanumeric_keys
+xkb_symbols "olpc" {
+
+    include "ara(basic)"
+
+    // As part of the olpc design some changes were made to the Arabic
+    // keyboard design. Major changes are:
+    //
+    //  * Removed the lam-alef single character. Poeple type as they
+    //    pronounce, and lam-alef is just a visual formatting of the
+    //    sequence and is not often used on the keyboard. It is
+    //    similar to the Allah single character, which is also not on
+    //    the keyboard.
+    //  * Moved the following keys:
+    //     o Thal from TLDE to AB05: Due to space limitation on the
+    //       keybaord, but also accessibility
+    //     o Shadda from TLDE to AD05
+    //  * Placed currency letters on number keys and moved the ^ and &
+    //    characters to lower keys (This change is worth revisiting
+    //    before end of test period)
+
+    key <TLDE> {  [           grave,      asciitilde  ] };
+
+    key <AE01> {  [       0x1000661,          exclam  ] };
+    key <AE02> {  [       0x1000662,              at  ] };
+    key <AE03> {  [       0x1000663,      numbersign  ] };
+    key <AE04> {  [       0x1000664,          dollar  ] };
+    key <AE05> {  [       0x1000665,  Arabic_percent  ] };
+    key <AE06> {  [       0x1000666,        sterling  ] };
+    key <AE07> {  [       0x1000667,        EuroSign  ] };
+    key <AE08> {  [       0x1000668,        asterisk  ] };
+    key <AE09> {  [       0x1000669,      parenright  ] };
+    key <AE10> {  [       0x1000660,       parenleft  ] };
+
+    key <AD05> {  [      Arabic_feh,   Arabic_shadda  ] };
+
+    key <AD08> {  [      Arabic_heh,        division  ] };
+    key <AD11> {  [     Arabic_jeem,      braceright  ] };
+    key <AD12> {  [      Arabic_dal,       braceleft  ] };
+
+    key <AC01> {  [    Arabic_sheen,         greater  ] };
+    key <AC02> {  [     Arabic_seen,            less  ] };
+    key <AC05> {  [      Arabic_lam,       ampersand  ] };
+    key <AC10> {  [      Arabic_kaf                   ] };
+    key <AC11> {  [      Arabic_tah                   ] };
+
+    key <BKSL> {  [       backslash,             bar  ] };
+
+
+    // REH isolated form?
+    key <AB03> {  [ Arabic_hamzaonwaw,   Arabic_kasra ] };
+    key <AB04> {  [       Arabic_ra,  Arabic_kasratan ] };    
+    key <AB05> {  [     Arabic_thal,      asciicircum ] };
+
+    include "group(olpc)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/at b/xorg-server/xkeyboard-config/symbols/at
index 52382f9c0..bd4ba988d 100644
--- a/xorg-server/xkeyboard-config/symbols/at
+++ b/xorg-server/xkeyboard-config/symbols/at
@@ -1,34 +1,34 @@
-// based on a keyboard map from an 'xkb/symbols/de' file

-

-default

-xkb_symbols "basic" {

-

-    include "de(basic)"

-

-    name[Group1]="Austria";

-};

-

-partial alphanumeric_keys

-xkb_symbols "nodeadkeys" {

-

-    include "de(nodeadkeys)"

-

-    name[Group1]="Austria - Eliminate dead keys";

-};

-

-partial alphanumeric_keys 

-xkb_symbols "mac" {

-

-    include "de(mac)"

-

-    name[Group1]= "Austria - Macintosh";

-};

-

-partial alphanumeric_keys

-xkb_symbols "sundeadkeys" {

-

-    include "de(Sundeadkeys)"

-

-    name[Group1]="Austria - Sun dead keys";

-};

-

+// based on a keyboard map from an 'xkb/symbols/de' file
+
+default
+xkb_symbols "basic" {
+
+    include "de(basic)"
+
+    name[Group1]="German (Austria)";
+};
+
+partial alphanumeric_keys
+xkb_symbols "nodeadkeys" {
+
+    include "de(nodeadkeys)"
+
+    name[Group1]="German (Austria, eliminate dead keys)";
+};
+
+partial alphanumeric_keys 
+xkb_symbols "mac" {
+
+    include "de(mac)"
+
+    name[Group1]= "German (Austria, Macintosh)";
+};
+
+partial alphanumeric_keys
+xkb_symbols "sundeadkeys" {
+
+    include "de(Sundeadkeys)"
+
+    name[Group1]="German (Austria, Sun dead keys)";
+};
+
diff --git a/xorg-server/xkeyboard-config/symbols/az b/xorg-server/xkeyboard-config/symbols/az
index 4227bc944..3c399cf96 100644
--- a/xorg-server/xkeyboard-config/symbols/az
+++ b/xorg-server/xkeyboard-config/symbols/az
@@ -1,92 +1,92 @@
-// based on:

-// symbols definition for a very simple Azerbaidjani keyboard layout.

-// 2001 - Pablo Saratxaga <pablo@mandrakesoft.com>

-

-partial default alphanumeric_keys

-xkb_symbols "latin" {

-

-  include "us"

-

-  name[Group1]= "Azerbaijan";

-

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

-

-  key <AE03> { [ 3,          numbersign, U2166        ] };

-  key <AE06> { [ 6,          colon,      EuroSign,    periodcentered  ] };

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

-

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

-  key <AE11> { [ minus,      underscore, hyphen,      emdash          ] };

-

-  key <AD02> { [ udiaeresis, Udiaeresis  ] };

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

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

-  key <AD11> { [ odiaeresis, Odiaeresis, bracketleft, braceleft       ] };

-  key <AD12> { [ gbreve,     Gbreve,    bracketright, braceright      ] };

-

-  key <AC10> { [ idotless,   I           ] };

-  key <AC11> { [ schwa,      SCHWA       ] };

-

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

-  key <AB07> { [ m,          M,          periodcentered, currency     ] };

-  key <AB08> { [ ccedilla,   Ccedilla    ] };

-  key <AB09> { [ scedilla,   Scedilla    ] };

-  key <AB10> { [ period,     comma       ] };

-  // End alphanumeric section

-

-    include "level3(ralt_switch)"

-};

-

-partial alphanumeric_keys

-xkb_symbols "cyrillic" {

-

-  name[Group1]= "Azerbaijan - Cyrillic";

-

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

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

-  key <AE04> {[ 4,                 semicolon          ] };

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

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

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

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

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

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

-

-  key <AD01> {[ Cyrillic_je,       Cyrillic_JE        ] };

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

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

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

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

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

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

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

-  key <AD09> {[ Cyrillic_shha,     Cyrillic_SHHA      ] };

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

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

-  key <AD12> {[ Cyrillic_che_vertstroke, Cyrillic_CHE_vertstroke ] };

-

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

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

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

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

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

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

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

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

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

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

-  key <AC11> {[ Cyrillic_ka_vertstroke,Cyrillic_KA_vertstroke ] };

-

-  key <AB01> {[ Cyrillic_schwa,    Cyrillic_SCHWA     ] };

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

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

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

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

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

-  key <AB07> {[ Cyrillic_ghe_bar,  Cyrillic_GHE_bar   ] };

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

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

-  key <AB10> {[ period,            comma              ] };

-

-  // End alphanumeric section

-};

+// based on:
+// symbols definition for a very simple Azerbaidjani keyboard layout.
+// 2001 - Pablo Saratxaga <pablo@mandrakesoft.com>
+
+partial default alphanumeric_keys
+xkb_symbols "latin" {
+
+  include "us"
+
+  name[Group1]= "Azerbaijani";
+
+  key <TLDE> { [ grave,      asciitilde, dead_grave,  dead_tilde      ] };
+
+  key <AE03> { [ 3,          numbersign, U2166        ] };
+  key <AE06> { [ 6,          colon,      EuroSign,    periodcentered  ] };
+  key <AE07> { [ 7,          question    ] };
+
+  key <AE08> { [ 8,          asterisk,   asciicircum, dead_circumflex ] };
+  key <AE11> { [ minus,      underscore, hyphen,      emdash          ] };
+
+  key <AD02> { [ udiaeresis, Udiaeresis  ] };
+  key <AD04> { [ r,          R,          registered   ] };
+  key <AD08> { [ i,          Iabovedot   ] };
+  key <AD11> { [ odiaeresis, Odiaeresis, bracketleft, braceleft       ] };
+  key <AD12> { [ gbreve,     Gbreve,    bracketright, braceright      ] };
+
+  key <AC10> { [ idotless,   I           ] };
+  key <AC11> { [ schwa,      SCHWA       ] };
+
+  key <AB03> { [ c,          C,          copyright,      division     ] };
+  key <AB07> { [ m,          M,          periodcentered, currency     ] };
+  key <AB08> { [ ccedilla,   Ccedilla    ] };
+  key <AB09> { [ scedilla,   Scedilla    ] };
+  key <AB10> { [ period,     comma       ] };
+  // End alphanumeric section
+
+    include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "cyrillic" {
+
+  name[Group1]= "Azerbaijani (Cyrillic)";
+
+  key <AE02> {[ 2,                 quotedbl           ] };
+  key <AE03> {[ 3,                 numbersign         ] };
+  key <AE04> {[ 4,                 semicolon          ] };
+  key <AE06> {[ 6,                 colon              ] };
+  key <AE07> {[ 7,                 question           ] };
+  key <AE08> {[ 8,                 asterisk,   braceleft    ] };
+  key <AE09> {[ 9,                 parenleft,  bracketleft  ] };
+  key <AE10> {[ 0,                 parenright, bracketright ] };
+  key <AE11> {[ minus,             underscore, braceright   ] };
+
+  key <AD01> {[ Cyrillic_je,       Cyrillic_JE        ] };
+  key <AD02> {[ Cyrillic_u_straight, Cyrillic_U_straight ] };
+  key <AD03> {[ Cyrillic_u,        Cyrillic_U         ] };
+  key <AD04> {[ Cyrillic_ka,       Cyrillic_KA        ] };
+  key <AD05> {[ Cyrillic_ie,       Cyrillic_IE        ] };
+  key <AD06> {[ Cyrillic_en,       Cyrillic_EN        ] };
+  key <AD07> {[ Cyrillic_ghe,      Cyrillic_GHE       ] };
+  key <AD08> {[ Cyrillic_sha,      Cyrillic_SHA       ] };
+  key <AD09> {[ Cyrillic_shha,     Cyrillic_SHHA      ] };
+  key <AD10> {[ Cyrillic_ze,       Cyrillic_ZE        ] };
+  key <AD11> {[ Cyrillic_ha,       Cyrillic_HA        ] };
+  key <AD12> {[ Cyrillic_che_vertstroke, Cyrillic_CHE_vertstroke ] };
+
+  key <AC01> {[ Cyrillic_ef,       Cyrillic_EF        ] };
+  key <AC02> {[ Cyrillic_yeru,     Cyrillic_YERU      ] };
+  key <AC03> {[ Cyrillic_ve,       Cyrillic_VE        ] };
+  key <AC04> {[ Cyrillic_a,        Cyrillic_A         ] };
+  key <AC05> {[ Cyrillic_pe,       Cyrillic_PE        ] };
+  key <AC06> {[ Cyrillic_er,       Cyrillic_ER        ] };
+  key <AC07> {[ Cyrillic_o,        Cyrillic_O         ] };
+  key <AC08> {[ Cyrillic_el,       Cyrillic_EL        ] };
+  key <AC09> {[ Cyrillic_de,       Cyrillic_DE        ] };
+  key <AC10> {[ Cyrillic_zhe,      Cyrillic_ZHE       ] };
+  key <AC11> {[ Cyrillic_ka_vertstroke,Cyrillic_KA_vertstroke ] };
+
+  key <AB01> {[ Cyrillic_schwa,    Cyrillic_SCHWA     ] };
+  key <AB02> {[ Cyrillic_che,      Cyrillic_CHE       ] };
+  key <AB03> {[ Cyrillic_es,       Cyrillic_ES        ] };
+  key <AB04> {[ Cyrillic_em,       Cyrillic_EM        ] };
+  key <AB05> {[ Cyrillic_i,        Cyrillic_I         ] };
+  key <AB06> {[ Cyrillic_te,       Cyrillic_TE        ] };
+  key <AB07> {[ Cyrillic_ghe_bar,  Cyrillic_GHE_bar   ] };
+  key <AB08> {[ Cyrillic_be,       Cyrillic_BE        ] };
+  key <AB09> {[ Cyrillic_o_bar,    Cyrillic_O_bar     ] };
+  key <AB10> {[ period,            comma              ] };
+
+  // End alphanumeric section
+};
diff --git a/xorg-server/xkeyboard-config/symbols/ba b/xorg-server/xkeyboard-config/symbols/ba
index 4507d4033..7345cc340 100644
--- a/xorg-server/xkeyboard-config/symbols/ba
+++ b/xorg-server/xkeyboard-config/symbols/ba
@@ -1,40 +1,40 @@
-default partial alphanumeric_keys

-xkb_symbols "basic" {

-

-    name[Group1]="Bosnia and Herzegovina";

-

-    include "rs(latin)"

-};

-

-partial alphanumeric_keys 

-xkb_symbols "us" {

-

-    name[Group1]= "Bosnia and Herzegovina - US keyboard with Bosnian letters";

-

-    include "rs(latinyz)"

-};

-

-

-partial alphanumeric_keys 

-xkb_symbols "alternatequotes" {

-

-    name[Group1]= "Bosnia and Herzegovina - Use guillemets for quotes";

-

-    include "rs(latinalternatequotes)"

-};

-

-partial alphanumeric_keys 

-xkb_symbols "unicode" {

-

-    name[Group1]= "Bosnia and Herzegovina - Use Bosnian digraphs";

-

-    include "rs(latinunicode)"

-};

-

-partial alphanumeric_keys 

-xkb_symbols "unicodeus" {

-

-    name[Group1]= "Bosnia and Herzegovina - US keyboard with Bosnian digraphs";

-

-    include "rs(latinunicodeyz)"

-};

+default partial alphanumeric_keys
+xkb_symbols "basic" {
+
+    name[Group1]="Bosnian";
+
+    include "rs(latin)"
+};
+
+partial alphanumeric_keys 
+xkb_symbols "us" {
+
+    name[Group1]= "Bosnian (US keyboard with Bosnian letters)";
+
+    include "rs(latinyz)"
+};
+
+
+partial alphanumeric_keys 
+xkb_symbols "alternatequotes" {
+
+    name[Group1]= "Bosnian (use guillemets for quotes)";
+
+    include "rs(latinalternatequotes)"
+};
+
+partial alphanumeric_keys 
+xkb_symbols "unicode" {
+
+    name[Group1]= "Bosnian (use Bosnian digraphs)";
+
+    include "rs(latinunicode)"
+};
+
+partial alphanumeric_keys 
+xkb_symbols "unicodeus" {
+
+    name[Group1]= "Bosnian (US keyboard with Bosnian digraphs)";
+
+    include "rs(latinunicodeyz)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/bd b/xorg-server/xkeyboard-config/symbols/bd
index 4146f1c8f..34879eb72 100644
--- a/xorg-server/xkeyboard-config/symbols/bd
+++ b/xorg-server/xkeyboard-config/symbols/bd
@@ -1,97 +1,96 @@
-//

-// XKB symbol :: National Bangla/Bengali Standard Keyboard Layout for Bangladesh

-// Ref: http://www.bcc.net.bd/keyboard/bsti_kb_specification.pdf

-//

-// Author: Jamil Ahmed <jamil at bengalinux.org>

-// Created: 18-12-2005

-// Last Updated: 08-01-2006

-// Version: 6.01.3

-//

-// Issues:

-// <AC08> Khanda-Ta is given U-09CE; But BCC had U-09BA

-// <AC07> U-09BB is added though it is not allocated in Original Unicode

-// <AE06> U-09B3 is added though it is not allocated in Original Unicode

-// 3 Conjunct characters are not included

-//

-

-default partial alphanumeric_keys

-

-xkb_symbols "basic" {

-   name[Group1]= "Bangladesh";

-   key <ESC>  { [ Escape ] };

-

-// numbers

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

-   key <AE01> { [ 0x10009E7,	exclam,		0x10009F4,	voidsymbol ] };

-   key <AE02> { [ 0x10009E8,	at,		0x10009F5,	voidsymbol ] };

-   key <AE03> { [ 0x10009E9,	numbersign,	0x10009F6,	voidsymbol ] };

-   key <AE04> { [ 0x10009EA,	dollar,		0x10009F3,	0x10009F2  ] };

-   key <AE05> { [ 0x10009EB,	percent,	0x10009F7,	voidsymbol ] };

-   key <AE06> { [ 0x10009EC,	asciicircum,	0x10009F8,	0x10009B3  ] };

-   key <AE07> { [ 0x10009ED,	ampersand,	0x1000902,	voidsymbol ] };

-   key <AE08> { [ 0x10009EE,	asterisk,	voidsymbol,	voidsymbol ] };

-   key <AE09> { [ 0x10009EF,	parenleft,	voidsymbol,	voidsymbol ] };

-   key <AE10> { [ 0x10009E6,	parenright,	0x10009F9,	voidsymbol ] };

-   key <AE11> { [ minus,	underscore,	0x100200C,	voidsymbol ] };

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

-   key <BKSP> { [ BackSpace ] };

-

-// tab, q to ] 

-   key <TAB>  { [ Tab,  ISO_Left_Tab ] };

-   key <AD01> { [ 0x1000999,	0x1000982,	0x10009E2,	0x10009E3  ] };

-   key <AD02> { [ 0x10009AF,	0x10009DF,	voidsymbol,	voidsymbol ] };

-   key <AD03> { [ 0x10009A1,	0x10009A2,	0x10009C4,	voidsymbol ] };

-   key <AD04> { [ 0x10009AA,	0x10009AB,	voidsymbol,	voidsymbol ] };

-   key <AD05> { [ 0x100099F,	0x10009A0,	voidsymbol,	voidsymbol ] };

-   key <AD06> { [ 0x100099A,	0x100099B,	voidsymbol,	voidsymbol ] };

-   key <AD07> { [ 0x100099C,	0x100099D,	voidsymbol,	voidsymbol ] };

-   key <AD08> { [ 0x10009B9,	0x100099E,	0x10009BD,	voidsymbol ] };

-   key <AD09> { [ 0x1000997,	0x1000998,	voidsymbol,	voidsymbol ] };

-   key <AD10> { [ 0x10009DC,	0x10009DD,	voidsymbol,	voidsymbol ] };

-   key <AD11> { [ bracketleft,	braceleft,	voidsymbol,	voidsymbol ] };

-   key <AD12> { [ bracketright,	braceright,	voidsymbol,	voidsymbol ] };

-   key <RTRN> { [ Return ] };

-

-// caps, a to ' 

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

-   key <AC01> { [ 0x10009C3,	0x10009D7,	0x100098B,	0x10009E0  ] };

-   key <AC02> { [ 0x10009C1,	0x10009C2,	0x1000989,	0x100098A  ] };

-   key <AC03> { [ 0x10009BF,	0x10009C0,	0x1000987,	0x1000988  ] };

-   key <AC04> { [ 0x10009AC,	0x10009AD,	0x10009F0,	0x10009F1  ] };

-   key <AC05> { [ 0x10009CD,	0x1000964,	0x1000965,	voidsymbol ] };

-   key <AC06> { [ 0x10009BE,	0x1000985,	0x1000986,	voidsymbol ] };

-   key <AC07> { [ 0x1000995,	0x1000996,	0x10009BB,	voidsymbol ] };

-   key <AC08> { [ 0x10009A4,	0x10009A5,	0x10009CE,	voidsymbol ] };

-   key <AC09> { [ 0x10009A6,	0x10009A7,	0x100098C,	0x10009E1  ] };

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

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

-

-// shift, z to /

-// key <LFSH> { [ Shift_L ] };

-   key <AB01> { [ 0x1000981,	0x1000983,	0x10009FA,	voidsymbol ] };

-   key <AB02> { [ 0x10009CB,	0x10009CC,	0x1000993,	0x1000994  ] };

-   key <AB03> { [ 0x10009C7,	0x10009C8,	0x100098F,	0x1000990  ] };

-   key <AB04> { [ 0x10009B0,	0x10009B2,	voidsymbol,	voidsymbol ] };

-   key <AB05> { [ 0x10009A8,	0x10009A3,	voidsymbol,	voidsymbol ] };

-   key <AB06> { [ 0x10009B8,	0x10009B7,	voidsymbol,	voidsymbol ] };

-   key <AB07> { [ 0x10009AE,	0x10009B6,	voidsymbol,	voidsymbol ] };

-   key <AB08> { [ comma,	less,		voidsymbol,	voidsymbol ] };

-   key <AB09> { [ period,	greater,	0x10009BC,	voidsymbol ] };

-   key <AB10> { [ slash,	question,	voidsymbol,	voidsymbol ] };

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

-

-// third level with right-Alt

-    include "level3(ralt_switch)"

-

-};

-

-

-//

-// XKB symbol :: Probhat Bangla/Bengali Keyboard Layout

-// Ref: www.ankurbangla.org/images/probhat_layout.png

-//

-

-xkb_symbols "probhat" {

-    include "in(ben_probhat)"

-    name[Group1]= "Bangladesh - Probhat";

-};

+//
+// XKB symbol :: National Bangla/Bengali Standard Keyboard Layout for Bangladesh
+// Ref: http://www.bcc.net.bd/keyboard/bsti_kb_specification.pdf
+//
+// Author: Jamil Ahmed <jamil at bengalinux.org>
+// Created: 18-12-2005
+// Last Updated: 08-01-2006
+// Version: 6.01.3
+//
+// Issues:
+// <AC08> Khanda-Ta is given U-09CE; But BCC had U-09BA
+// <AC07> U-09BB is added though it is not allocated in Original Unicode
+// <AE06> U-09B3 is added though it is not allocated in Original Unicode
+// 3 Conjunct characters are not included
+//
+
+default partial alphanumeric_keys
+xkb_symbols "basic" {
+   name[Group1]= "Bengali";
+   key <ESC>  { [ Escape ] };
+
+// numbers
+   key <TLDE> { [ quoteleft,	asciitilde,	voidsymbol,	voidsymbol ] };
+   key <AE01> { [ 0x10009E7,	exclam,		0x10009F4,	voidsymbol ] };
+   key <AE02> { [ 0x10009E8,	at,		0x10009F5,	voidsymbol ] };
+   key <AE03> { [ 0x10009E9,	numbersign,	0x10009F6,	voidsymbol ] };
+   key <AE04> { [ 0x10009EA,	dollar,		0x10009F3,	0x10009F2  ] };
+   key <AE05> { [ 0x10009EB,	percent,	0x10009F7,	voidsymbol ] };
+   key <AE06> { [ 0x10009EC,	asciicircum,	0x10009F8,	0x10009B3  ] };
+   key <AE07> { [ 0x10009ED,	ampersand,	0x1000902,	voidsymbol ] };
+   key <AE08> { [ 0x10009EE,	asterisk,	voidsymbol,	voidsymbol ] };
+   key <AE09> { [ 0x10009EF,	parenleft,	voidsymbol,	voidsymbol ] };
+   key <AE10> { [ 0x10009E6,	parenright,	0x10009F9,	voidsymbol ] };
+   key <AE11> { [ minus,	underscore,	0x100200C,	voidsymbol ] };
+   key <AE12> { [ equal,	plus,		0x100200D,	voidsymbol ] };
+   key <BKSP> { [ BackSpace ] };
+
+// tab, q to ] 
+   key <TAB>  { [ Tab,  ISO_Left_Tab ] };
+   key <AD01> { [ 0x1000999,	0x1000982,	0x10009E2,	0x10009E3  ] };
+   key <AD02> { [ 0x10009AF,	0x10009DF,	voidsymbol,	voidsymbol ] };
+   key <AD03> { [ 0x10009A1,	0x10009A2,	0x10009C4,	voidsymbol ] };
+   key <AD04> { [ 0x10009AA,	0x10009AB,	voidsymbol,	voidsymbol ] };
+   key <AD05> { [ 0x100099F,	0x10009A0,	voidsymbol,	voidsymbol ] };
+   key <AD06> { [ 0x100099A,	0x100099B,	voidsymbol,	voidsymbol ] };
+   key <AD07> { [ 0x100099C,	0x100099D,	voidsymbol,	voidsymbol ] };
+   key <AD08> { [ 0x10009B9,	0x100099E,	0x10009BD,	voidsymbol ] };
+   key <AD09> { [ 0x1000997,	0x1000998,	voidsymbol,	voidsymbol ] };
+   key <AD10> { [ 0x10009DC,	0x10009DD,	voidsymbol,	voidsymbol ] };
+   key <AD11> { [ bracketleft,	braceleft,	voidsymbol,	voidsymbol ] };
+   key <AD12> { [ bracketright,	braceright,	voidsymbol,	voidsymbol ] };
+   key <RTRN> { [ Return ] };
+
+// caps, a to ' 
+// key <CAPS> { [ Caps_Lock ] };
+   key <AC01> { [ 0x10009C3,	0x10009D7,	0x100098B,	0x10009E0  ] };
+   key <AC02> { [ 0x10009C1,	0x10009C2,	0x1000989,	0x100098A  ] };
+   key <AC03> { [ 0x10009BF,	0x10009C0,	0x1000987,	0x1000988  ] };
+   key <AC04> { [ 0x10009AC,	0x10009AD,	0x10009F0,	0x10009F1  ] };
+   key <AC05> { [ 0x10009CD,	0x1000964,	0x1000965,	voidsymbol ] };
+   key <AC06> { [ 0x10009BE,	0x1000985,	0x1000986,	voidsymbol ] };
+   key <AC07> { [ 0x1000995,	0x1000996,	0x10009BB,	voidsymbol ] };
+   key <AC08> { [ 0x10009A4,	0x10009A5,	0x10009CE,	voidsymbol ] };
+   key <AC09> { [ 0x10009A6,	0x10009A7,	0x100098C,	0x10009E1  ] };
+   key <AC10> { [ semicolon,	colon,		voidsymbol,	voidsymbol ] };
+   key <AC11> { [ quoteright,	quotedbl,	voidsymbol,	voidsymbol ] };
+
+// shift, z to /
+// key <LFSH> { [ Shift_L ] };
+   key <AB01> { [ 0x1000981,	0x1000983,	0x10009FA,	voidsymbol ] };
+   key <AB02> { [ 0x10009CB,	0x10009CC,	0x1000993,	0x1000994  ] };
+   key <AB03> { [ 0x10009C7,	0x10009C8,	0x100098F,	0x1000990  ] };
+   key <AB04> { [ 0x10009B0,	0x10009B2,	voidsymbol,	voidsymbol ] };
+   key <AB05> { [ 0x10009A8,	0x10009A3,	voidsymbol,	voidsymbol ] };
+   key <AB06> { [ 0x10009B8,	0x10009B7,	voidsymbol,	voidsymbol ] };
+   key <AB07> { [ 0x10009AE,	0x10009B6,	voidsymbol,	voidsymbol ] };
+   key <AB08> { [ comma,	less,		voidsymbol,	voidsymbol ] };
+   key <AB09> { [ period,	greater,	0x10009BC,	voidsymbol ] };
+   key <AB10> { [ slash,	question,	voidsymbol,	voidsymbol ] };
+   key <BKSL> { [ backslash,	bar,		voidsymbol,	voidsymbol ] };
+
+// third level with right-Alt
+    include "level3(ralt_switch)"
+
+};
+
+
+//
+// XKB symbol :: Probhat Bangla/Bengali Keyboard Layout
+// Ref: www.ankurbangla.org/images/probhat_layout.png
+//
+
+xkb_symbols "probhat" {
+    include "in(ben_probhat)"
+    name[Group1]= "Bengali (Probhat)";
+};
diff --git a/xorg-server/xkeyboard-config/symbols/be b/xorg-server/xkeyboard-config/symbols/be
index 8e096e24c..e39fccf9c 100644
--- a/xorg-server/xkeyboard-config/symbols/be
+++ b/xorg-server/xkeyboard-config/symbols/be
@@ -1,232 +1,232 @@
-// based on a keyboard map from an 'xkb/symbols/be' file

-

-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 ] };

-};

+// based on a keyboard map from an 'xkb/symbols/be' file
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+
+    include "latin"
+
+    name[Group1]="Belgian";
+
+    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]="Belgian (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]="Belgian (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]="Belgian (alternative, Sun dead keys)";
+};
+
+
+partial alphanumeric_keys
+xkb_symbols "iso-alternate" {
+    include "be(basic)"
+    name[Group1]="Belgian (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]="Belgian (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]="Belgian (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]="Belgian (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/xkeyboard-config/symbols/bg b/xorg-server/xkeyboard-config/symbols/bg
index d1e6a6356..2bef5eadb 100644
--- a/xorg-server/xkeyboard-config/symbols/bg
+++ b/xorg-server/xkeyboard-config/symbols/bg
@@ -1,361 +1,361 @@
-//////////////////////////////////////////////////////////////////////////

-// Copyright (C) 1999, 2000, 2007, 2009 by Anton Zinoviev <anton@lml.bas.bg>

-//

-// This software may be used, modified, copied, distributed, and sold,

-// both in source and binary form provided that the above copyright

-// notice and these terms are retained. The name of the author may not

-// be used to endorse or promote products derived from this software

-// without prior permission.  THIS SOFTWARE IS PROVIDES "AS IS" AND

-// ANY EXPRESS OR IMPLIED WARRANTIES ARE DISCLAIMED.  IN NO EVENT

-// SHALL THE AUTHOR BE LIABLE FOR ANY DAMAGES ARISING IN ANY WAY OUT

-// OF THE USE OF THIS SOFTWARE.

-//

-////////////////////////////////////////////////////////////////////////// 

-// Version 2.0

-

-// The following variants are defined in this file:

-

-// "bds" - the BDS keyboard layout compliant with the proposed

-//         Bulgarian state standard BDS 5237:2006

-

-// "phonetic" - Bulgarian phonetic layout with traditional position of

-//              the letters.

-

-// "bas_phonetic" - the phonetic keyboard layout compliant with the

-//                  proposed Bulgarian state standard BDS 5237:2006

-

-// "latin" - an extended variant of the QWERTY layout with symbols

-//           Bulgarian users will type while the keyboard is in Latin mode.

-

-// The reasons behind the layout of the symbols in levels 3 and 4 are

-// explained in http://arxiv.org/abs/0905.0484  (in Bulgarian).

-

-// Two notes for the maintainers of xkeyboard-config:

-

-// 1. Please do not use key names such as <LatQ> for the Bulgarian

-// phonetic layouts.  The placement of the symbols must stay always

-// the same regardless of which one of the alias sets in

-// xkb/keycodes/aliases is used.

-

-// 2. The layouts should not include level3(ralt_switch).

-

-////////////////////////////////////////////////////////////////////////// 

-

-// Describes Bulgarian keyboard "BDS" modified according to the

-// the new state standard BDS 5237:2006 and extended with symbols in

-// levels 3 and 4.

-partial default alphanumeric_keys

-xkb_symbols "bds" {

-

-  name[Group1]= "Bulgaria";

-  

-  key <TLDE> {   [ parenleft,         parenright,

-		   bracketleft,       bracketright        ]    };

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

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

-  key <AE03> {   [ 3,                 plus,

-		   dagger,            dagger              ]    };

-  key <AE04> {   [ 4,                 quotedbl            ]    };

-  key <AE05> {   [ 5,                 percent,

-		   U2329,             U232A               ]    };

-  key <AE06> {   [ 6,                 equal,

-		   emdash,            emdash              ]    };

-  key <AE07> {   [ 7,                 colon,

-		   ellipsis,          ellipsis            ]    };

-  key <AE08> {   [ 8,                 slash,

-		   U0300,             U0301               ]    };

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

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

-  key <AE11> {   [ minus,             dollar,

-		   U2011,             EuroSign            ]    };

-  key <AE12> {   [ period,            EuroSign            ]    };

-

-

-  key <AD01> {   [ comma,             Cyrillic_yeru,

-		   rightsinglequotemark, leftsinglequotemark ] };

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

-  key <AD03> {   [ Cyrillic_ie,       Cyrillic_IE,

-		   Cyrillic_e,        Cyrillic_E          ]    };

-  key <AD04> {   [ Cyrillic_i,        Cyrillic_I,

-		   U045D,             U040D               ]    };

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

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

-  key <AD07> {   [ Cyrillic_ka,       Cyrillic_KA,

-		   copyright,         copyright           ]    };

-  key <AD08> {   [ Cyrillic_es,       Cyrillic_ES,

-		   copyright,         copyright           ]    };

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

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

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

-  key <AD12> {   [ semicolon,         section             ]    };

-

-

-  key <AC01> {   [ Cyrillic_softsign, U045D,

-		   Cyrillic_yeru,     Cyrillic_YERU       ]    };

-  key <AC02> {   [ Cyrillic_ya,       Cyrillic_YA,

-		   U0463,             U0462               ]    };

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

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

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

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

-  key <AC07> {   [ Cyrillic_te,       Cyrillic_TE,

-		   trademark,         trademark           ]    };

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

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

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

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

-  key <BKSL> {   [ doublelowquotemark, leftdoublequotemark,

-		   guillemotleft,     guillemotright      ]    };

-

-

-  key <LSGT> {   [ U045D,             U040D               ]    };

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

-  key <AB02> {   [ Cyrillic_shorti,   Cyrillic_SHORTI,

-		   U046D,             U046C               ]    };

-  key <AB03> {   [ Cyrillic_hardsign, Cyrillic_HARDSIGN,

-		   U046B,             U046A               ]    };

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

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

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

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

-  key <AB08> {   [ Cyrillic_er,       Cyrillic_ER,

-		   registered,        registered          ]    };

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

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

-

-

-  key <SPCE> {   [ space,             space,

-		   nobreakspace,      nobreakspace        ]    };

-    

-

-  key <KPDL> {   type[Group1] = "KEYPAD",

-                 [ KP_Delete,         KP_Separator        ]    };

-};

-

-// This is improved variant of the traditional Bulgarian phonetic

-// keyboard.  Some unnecessary symbols in levels 1 and 2 are replaced

-// by more useful (the same way as in "bas_phonetic") and additional

-// symbols in levels 3 and 4 are added.

-partial alphanumeric_keys 

-xkb_symbols "phonetic" {

-  name[Group1]= "Bulgaria - Traditional phonetic";

-  

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

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

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

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

-  key <AE04> {   [ 4,                 dollar,

-		   EuroSign,          EuroSign            ]    };

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

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

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

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

-  key <AE09> {   [ 9,                 parenleft,

-		   bracketleft,       U2329               ]    };

-  key <AE10> {   [ 0,                 parenright,

-		   bracketright,      U232A               ]    };

-  key <AE11> {   [ minus,             endash,

-		   U2011,             U2011               ]    };

-  key <AE12> {   [ equal,             plus,

-		   emdash,            dagger              ]    };

-

-  key <AD01> {   [ Cyrillic_ya,       Cyrillic_YA,

-		   U0463,             U0462               ]    };

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

-  key <AD03> {   [ Cyrillic_ie,       Cyrillic_IE,

-		   Cyrillic_e,        Cyrillic_E          ]    };

-  key <AD04> {   [ Cyrillic_er,       Cyrillic_ER,

-		   registered,        registered          ]    };

-  key <AD05> {   [ Cyrillic_te,       Cyrillic_TE,

-		   trademark,         trademark           ]    };

-  key <AD06> {   [ Cyrillic_hardsign, Cyrillic_HARDSIGN,

-		   U046B,             U046A               ]    };

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

-  key <AD08> {   [ Cyrillic_i,        Cyrillic_I,

-		   U045D,             U040D               ]    };

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

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

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

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

-  

-  

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

-  key <AC02> {   [ Cyrillic_es,       Cyrillic_ES,

-		   copyright,         copyright           ]    };

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

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

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

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

-  key <AC07> {   [ Cyrillic_shorti,   Cyrillic_SHORTI,

-		   U046D,             U046C               ]    };

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

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

-  key <AC10> {   [ semicolon,         colon,

-		   ellipsis,          ellipsis            ]    };

-  key <AC11> {   [ apostrophe,        quotedbl,

-		   rightsinglequotemark, leftsinglequotemark ] };

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

-  

-  

-  key <LSGT> {   [ U045D,             U040D               ]    };

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

-  key <AB02> {   [ Cyrillic_softsign, U045D,

-		   Cyrillic_yeru,     Cyrillic_YERU       ]    };

-  key <AB03> {   [ Cyrillic_tse,      Cyrillic_TSE,

-		   copyright,         copyright           ]    };

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

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

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

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

-  key <AB08> {   [ comma,             doublelowquotemark,

-		   guillemotleft,     guillemotleft       ]    };

-  key <AB09> {   [ period,            leftdoublequotemark,

-		   guillemotright,    guillemotright      ]    };

-  key <AB10> {   [ slash,             question,

-		   U0300,             U0301               ]    };

-

-

-  key <SPCE> {   [ space,             space,

-		   nobreakspace,      nobreakspace        ]    };

-

-

-  key <KPDL> {   type[Group1] = "KEYPAD",

-                 [ KP_Delete,           KP_Separator         ]    };

-

-};

-

-// This is the Bulgarian phonetic keyboard acording to the proposed

-// state standard BDS 5237:2006 with additional symbols in

-// levels 3 and 4.

-partial alphanumeric_keys 

-xkb_symbols "bas_phonetic" {

-  include "bg(phonetic)"

-  name[Group1]= "Bulgaria - New phonetic";

-  

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

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

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

-  key <AD11> {   [ Cyrillic_ya,       Cyrillic_YA,

-		   U0463,             U0462               ]    };

-  key <BKSL> {   [ Cyrillic_softsign, U045D,

-		   Cyrillic_yeru,     Cyrillic_YERU       ]    };

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

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

-};

-

-

-// This is extended variant of the standard Latin QWERTY layout with

-// additional symbols in levels 3 and 4.

-partial hidden alphanumeric_keys 

-xkb_symbols "latin" {

-  

-  key <TLDE> {   [ grave,             asciitilde,

-		   U2248,             U2245               ]    };

-  key <AE01> {   [ 1,                 exclam,

-		   notsign,           notsign             ]    };

-  key <AE02> {   [ 2,                 at,

-		   twosuperior,       enfilledcircbullet  ]    };

-  key <AE03> {   [ 3,                 numbersign,

-		   threesuperior,     notequal            ]    };

-  key <AE04> {   [ 4,                 dollar,

-		   EuroSign,          sterling            ]    };

-  key <AE05> {   [ 5,                 percent,

-		   U2030,             U2030               ]    };

-  key <AE06> {   [ 6,                 asciicircum,

-		   logicaland,        logicalor           ]    };

-  key <AE07> {   [ 7,                 ampersand,

-		   section,           section             ]    };

-  key <AE08> {   [ 8,                 asterisk,

-		   infinity,          multiply            ]    };

-  key <AE09> {   [ 9,                 parenleft,

-		   U2202,             nabla               ]    };

-  key <AE10> {   [ 0,                 parenright,

-		   U2300,             U2300               ]    };

-  key <AE11> {   [ minus,             underscore,

-		   U2011,             endash              ]    };

-  key <AE12> {   [ equal,             plus,

-		   emdash,            plusminus           ]    };

-

-

-  key <AD01> {   [ q,                 Q,

-		   Greek_THETA,       Greek_theta         ]    };

-  key <AD02> {   [ w,                 W,

-		   Greek_OMEGA,       Greek_omega         ]    };

-  key <AD03> {   [ e,                 E,

-		   U2203,             Greek_epsilon       ]    };

-  key <AD04> {   [ r,                 R,

-		   registered,        Greek_rho           ]    };

-  key <AD05> {   [ t,                 T,

-		   trademark,         Greek_tau           ]    };

-  key <AD06> {   [ y,                 Y,

-		   yen,               Greek_upsilon       ]    };

-  key <AD07> {   [ u,                 U,

-		   intersection,      union               ]    };

-  key <AD08> {   [ i,                 I,

-		   integral,          Greek_iota          ]    };

-  key <AD09> {   [ o,                 O,

-		   degree,            U222E               ]    };

-  key <AD10> {   [ p,                 P,

-		   Greek_PI,          Greek_pi            ]    };

-  key <AD11> {   [ bracketleft,       braceleft,

-		   U2286,             includedin          ]    };

-  key <AD12> {   [ bracketright,      braceright,

-		   U2208,             U2209               ]    };

-

-

-  key <AC01> {   [ a,                 A,

-		   U2200,             Greek_alpha         ]    };

-  key <AC02> {   [ s,                 S,

-		   Greek_SIGMA,       Greek_sigma         ]    };

-  key <AC03> {   [ d,                 D,

-		   Greek_DELTA,       Greek_delta         ]    };

-  key <AC04> {   [ f,                 F,

-		   Greek_PHI,         Greek_phi           ]    };

-  key <AC05> {   [ g,                 G,

-		   Greek_GAMMA,       Greek_gamma         ]    };

-  key <AC06> {   [ h,                 H,

-		   U2225,             Greek_eta           ]    };

-  key <AC07> {   [ j,                 J                   ]    };

-  key <AC08> {   [ k,                 K,

-		   U03F0,             Greek_kappa         ]    };

-  key <AC09> {   [ l,                 L,

-		   Greek_LAMBDA,      Greek_lambda        ]    };

-  key <AC10> {   [ semicolon,         colon,

-		   division,          division            ]    };

-  key <AC11> {   [ apostrophe,        quotedbl,

-		   leftdoublequotemark, rightdoublequotemark ] };

-  key <BKSL> {   [ backslash,         bar,

-		   identical,         downtack            ]    };

-

-

-  key <LSGT> {   [ less,              greater,

-		   U2266,             U2267               ]    };

-  key <AB01> {   [ z,                 Z,

-		   U2220,             Greek_zeta          ]    };

-  key <AB02> {   [ x,                 X,

-		   Greek_XI,          Greek_xi            ]    };

-  key <AB03> {   [ c,                 C,

-		   copyright,         Greek_chi           ]    };

-  key <AB04> {   [ v,                 V,

-		   Greek_PSI,         Greek_psi           ]    };

-  key <AB05> {   [ b,                 B,

-		   U03D1,             Greek_beta          ]    };

-  key <AB06> {   [ n,                 N,

-		   U207F,             Greek_nu            ]    };

-  key <AB07> {   [ m,                 M,

-		   Greek_mu,          Greek_mu            ]    };

-  key <AB08> {   [ comma,             less,

-		   U2266,             U21D4               ]    };

-  key <AB09> {   [ period,            greater,

-		   U2267,             U21D2               ]    };

-  key <AB10> {   [ slash,             question,

-		   leftsinglequotemark, rightsinglequotemark ] };

-

-

-  key <SPCE> {   [ space,             space,

-		   nobreakspace,      nobreakspace        ]    };

-

-

-  key <KPDL> {   type[Group1] = "KEYPAD",

-                 [ KP_Delete,           KP_Decimal        ]    };

-};

+//////////////////////////////////////////////////////////////////////////
+// Copyright (C) 1999, 2000, 2007, 2009 by Anton Zinoviev <anton@lml.bas.bg>
+//
+// This software may be used, modified, copied, distributed, and sold,
+// both in source and binary form provided that the above copyright
+// notice and these terms are retained. The name of the author may not
+// be used to endorse or promote products derived from this software
+// without prior permission.  THIS SOFTWARE IS PROVIDES "AS IS" AND
+// ANY EXPRESS OR IMPLIED WARRANTIES ARE DISCLAIMED.  IN NO EVENT
+// SHALL THE AUTHOR BE LIABLE FOR ANY DAMAGES ARISING IN ANY WAY OUT
+// OF THE USE OF THIS SOFTWARE.
+//
+////////////////////////////////////////////////////////////////////////// 
+// Version 2.0
+
+// The following variants are defined in this file:
+
+// "bds" - the BDS keyboard layout compliant with the proposed
+//         Bulgarian state standard BDS 5237:2006
+
+// "phonetic" - Bulgarian phonetic layout with traditional position of
+//              the letters.
+
+// "bas_phonetic" - the phonetic keyboard layout compliant with the
+//                  proposed Bulgarian state standard BDS 5237:2006
+
+// "latin" - an extended variant of the QWERTY layout with symbols
+//           Bulgarian users will type while the keyboard is in Latin mode.
+
+// The reasons behind the layout of the symbols in levels 3 and 4 are
+// explained in http://arxiv.org/abs/0905.0484  (in Bulgarian).
+
+// Two notes for the maintainers of xkeyboard-config:
+
+// 1. Please do not use key names such as <LatQ> for the Bulgarian
+// phonetic layouts.  The placement of the symbols must stay always
+// the same regardless of which one of the alias sets in
+// xkb/keycodes/aliases is used.
+
+// 2. The layouts should not include level3(ralt_switch).
+
+////////////////////////////////////////////////////////////////////////// 
+
+// Describes Bulgarian keyboard "BDS" modified according to the
+// the new state standard BDS 5237:2006 and extended with symbols in
+// levels 3 and 4.
+partial default alphanumeric_keys
+xkb_symbols "bds" {
+
+  name[Group1]= "Bulgarian";
+  
+  key <TLDE> {   [ parenleft,         parenright,
+		   bracketleft,       bracketright        ]    };
+  key <AE01> {   [ 1,                 exclam              ]    };
+  key <AE02> {   [ 2,                 question            ]    };
+  key <AE03> {   [ 3,                 plus,
+		   dagger,            dagger              ]    };
+  key <AE04> {   [ 4,                 quotedbl            ]    };
+  key <AE05> {   [ 5,                 percent,
+		   U2329,             U232A               ]    };
+  key <AE06> {   [ 6,                 equal,
+		   emdash,            emdash              ]    };
+  key <AE07> {   [ 7,                 colon,
+		   ellipsis,          ellipsis            ]    };
+  key <AE08> {   [ 8,                 slash,
+		   U0300,             U0301               ]    };
+  key <AE09> {   [ 9,                 endash              ]    };
+  key <AE10> {   [ 0,                 numerosign          ]    };
+  key <AE11> {   [ minus,             dollar,
+		   U2011,             EuroSign            ]    };
+  key <AE12> {   [ period,            EuroSign            ]    };
+
+
+  key <AD01> {   [ comma,             Cyrillic_yeru,
+		   rightsinglequotemark, leftsinglequotemark ] };
+  key <AD02> {   [ Cyrillic_u,        Cyrillic_U          ]    };
+  key <AD03> {   [ Cyrillic_ie,       Cyrillic_IE,
+		   Cyrillic_e,        Cyrillic_E          ]    };
+  key <AD04> {   [ Cyrillic_i,        Cyrillic_I,
+		   U045D,             U040D               ]    };
+  key <AD05> {   [ Cyrillic_sha,      Cyrillic_SHA        ]    };
+  key <AD06> {   [ Cyrillic_shcha,    Cyrillic_SHCHA      ]    };
+  key <AD07> {   [ Cyrillic_ka,       Cyrillic_KA,
+		   copyright,         copyright           ]    };
+  key <AD08> {   [ Cyrillic_es,       Cyrillic_ES,
+		   copyright,         copyright           ]    };
+  key <AD09> {   [ Cyrillic_de,       Cyrillic_DE         ]    };
+  key <AD10> {   [ Cyrillic_ze,       Cyrillic_ZE         ]    };
+  key <AD11> {   [ Cyrillic_tse,      Cyrillic_TSE        ]    };
+  key <AD12> {   [ semicolon,         section             ]    };
+
+
+  key <AC01> {   [ Cyrillic_softsign, U045D,
+		   Cyrillic_yeru,     Cyrillic_YERU       ]    };
+  key <AC02> {   [ Cyrillic_ya,       Cyrillic_YA,
+		   U0463,             U0462               ]    };
+  key <AC03> {   [ Cyrillic_a,        Cyrillic_A          ]    };
+  key <AC04> {   [ Cyrillic_o,        Cyrillic_O          ]    };
+  key <AC05> {   [ Cyrillic_zhe,      Cyrillic_ZHE        ]    };
+  key <AC06> {   [ Cyrillic_ghe,      Cyrillic_GHE        ]    };
+  key <AC07> {   [ Cyrillic_te,       Cyrillic_TE,
+		   trademark,         trademark           ]    };
+  key <AC08> {   [ Cyrillic_en,       Cyrillic_EN         ]    };
+  key <AC09> {   [ Cyrillic_ve,       Cyrillic_VE         ]    };
+  key <AC10> {   [ Cyrillic_em,       Cyrillic_EM         ]    };
+  key <AC11> {   [ Cyrillic_che,      Cyrillic_CHE        ]    };
+  key <BKSL> {   [ doublelowquotemark, leftdoublequotemark,
+		   guillemotleft,     guillemotright      ]    };
+
+
+  key <LSGT> {   [ U045D,             U040D               ]    };
+  key <AB01> {   [ Cyrillic_yu,       Cyrillic_YU         ]    };
+  key <AB02> {   [ Cyrillic_shorti,   Cyrillic_SHORTI,
+		   U046D,             U046C               ]    };
+  key <AB03> {   [ Cyrillic_hardsign, Cyrillic_HARDSIGN,
+		   U046B,             U046A               ]    };
+  key <AB04> {   [ Cyrillic_e,        Cyrillic_E          ]    };
+  key <AB05> {   [ Cyrillic_ef,       Cyrillic_EF         ]    };
+  key <AB06> {   [ Cyrillic_ha,       Cyrillic_HA         ]    };
+  key <AB07> {   [ Cyrillic_pe,       Cyrillic_PE         ]    };
+  key <AB08> {   [ Cyrillic_er,       Cyrillic_ER,
+		   registered,        registered          ]    };
+  key <AB09> {   [ Cyrillic_el,       Cyrillic_EL         ]    };
+  key <AB10> {   [ Cyrillic_be,       Cyrillic_BE         ]    };
+
+
+  key <SPCE> {   [ space,             space,
+		   nobreakspace,      nobreakspace        ]    };
+    
+
+  key <KPDL> {   type[Group1] = "KEYPAD",
+                 [ KP_Delete,         KP_Separator        ]    };
+};
+
+// This is improved variant of the traditional Bulgarian phonetic
+// keyboard.  Some unnecessary symbols in levels 1 and 2 are replaced
+// by more useful (the same way as in "bas_phonetic") and additional
+// symbols in levels 3 and 4 are added.
+partial alphanumeric_keys 
+xkb_symbols "phonetic" {
+  name[Group1]= "Bulgarian (traditional phonetic)";
+  
+  key <TLDE> {   [ Cyrillic_che,      Cyrillic_CHE        ]    };
+  key <AE01> {   [ 1,                 exclam              ]    };
+  key <AE02> {   [ 2,                 at                  ]    };
+  key <AE03> {   [ 3,                 numerosign          ]    };
+  key <AE04> {   [ 4,                 dollar,
+		   EuroSign,          EuroSign            ]    };
+  key <AE05> {   [ 5,                 percent             ]    };
+  key <AE06> {   [ 6,                 EuroSign            ]    };
+  key <AE07> {   [ 7,                 section             ]    };
+  key <AE08> {   [ 8,                 asterisk            ]    };
+  key <AE09> {   [ 9,                 parenleft,
+		   bracketleft,       U2329               ]    };
+  key <AE10> {   [ 0,                 parenright,
+		   bracketright,      U232A               ]    };
+  key <AE11> {   [ minus,             endash,
+		   U2011,             U2011               ]    };
+  key <AE12> {   [ equal,             plus,
+		   emdash,            dagger              ]    };
+
+  key <AD01> {   [ Cyrillic_ya,       Cyrillic_YA,
+		   U0463,             U0462               ]    };
+  key <AD02> {   [ Cyrillic_ve,       Cyrillic_VE         ]    };
+  key <AD03> {   [ Cyrillic_ie,       Cyrillic_IE,
+		   Cyrillic_e,        Cyrillic_E          ]    };
+  key <AD04> {   [ Cyrillic_er,       Cyrillic_ER,
+		   registered,        registered          ]    };
+  key <AD05> {   [ Cyrillic_te,       Cyrillic_TE,
+		   trademark,         trademark           ]    };
+  key <AD06> {   [ Cyrillic_hardsign, Cyrillic_HARDSIGN,
+		   U046B,             U046A               ]    };
+  key <AD07> {   [ Cyrillic_u,        Cyrillic_U          ]    };
+  key <AD08> {   [ Cyrillic_i,        Cyrillic_I,
+		   U045D,             U040D               ]    };
+  key <AD09> {   [ Cyrillic_o,        Cyrillic_O          ]    };
+  key <AD10> {   [ Cyrillic_pe,       Cyrillic_PE         ]    };
+  key <AD11> {   [ Cyrillic_sha,      Cyrillic_SHA        ]    };
+  key <AD12> {   [ Cyrillic_shcha,    Cyrillic_SHCHA      ]    };
+  
+  
+  key <AC01> {   [ Cyrillic_a,        Cyrillic_A          ]    };
+  key <AC02> {   [ Cyrillic_es,       Cyrillic_ES,
+		   copyright,         copyright           ]    };
+  key <AC03> {   [ Cyrillic_de,       Cyrillic_DE         ]    };
+  key <AC04> {   [ Cyrillic_ef,       Cyrillic_EF         ]    };
+  key <AC05> {   [ Cyrillic_ghe,      Cyrillic_GHE        ]    };
+  key <AC06> {   [ Cyrillic_ha,       Cyrillic_HA         ]    };
+  key <AC07> {   [ Cyrillic_shorti,   Cyrillic_SHORTI,
+		   U046D,             U046C               ]    };
+  key <AC08> {   [ Cyrillic_ka,       Cyrillic_KA         ]    };
+  key <AC09> {   [ Cyrillic_el,       Cyrillic_EL         ]    };
+  key <AC10> {   [ semicolon,         colon,
+		   ellipsis,          ellipsis            ]    };
+  key <AC11> {   [ apostrophe,        quotedbl,
+		   rightsinglequotemark, leftsinglequotemark ] };
+  key <BKSL> {   [ Cyrillic_yu,       Cyrillic_YU         ]    };
+  
+  
+  key <LSGT> {   [ U045D,             U040D               ]    };
+  key <AB01> {   [ Cyrillic_ze,       Cyrillic_ZE         ]    };
+  key <AB02> {   [ Cyrillic_softsign, U045D,
+		   Cyrillic_yeru,     Cyrillic_YERU       ]    };
+  key <AB03> {   [ Cyrillic_tse,      Cyrillic_TSE,
+		   copyright,         copyright           ]    };
+  key <AB04> {   [ Cyrillic_zhe,      Cyrillic_ZHE        ]    };
+  key <AB05> {   [ Cyrillic_be,       Cyrillic_BE         ]    };
+  key <AB06> {   [ Cyrillic_en,       Cyrillic_EN         ]    };
+  key <AB07> {   [ Cyrillic_em,       Cyrillic_EM         ]    };
+  key <AB08> {   [ comma,             doublelowquotemark,
+		   guillemotleft,     guillemotleft       ]    };
+  key <AB09> {   [ period,            leftdoublequotemark,
+		   guillemotright,    guillemotright      ]    };
+  key <AB10> {   [ slash,             question,
+		   U0300,             U0301               ]    };
+
+
+  key <SPCE> {   [ space,             space,
+		   nobreakspace,      nobreakspace        ]    };
+
+
+  key <KPDL> {   type[Group1] = "KEYPAD",
+                 [ KP_Delete,           KP_Separator         ]    };
+
+};
+
+// This is the Bulgarian phonetic keyboard acording to the proposed
+// state standard BDS 5237:2006 with additional symbols in
+// levels 3 and 4.
+partial alphanumeric_keys 
+xkb_symbols "bas_phonetic" {
+  include "bg(phonetic)"
+  name[Group1]= "Bulgarian (new phonetic)";
+  
+  key <TLDE> {   [ Cyrillic_yu,       Cyrillic_YU         ]    };
+  key <AD01> {   [ Cyrillic_che,      Cyrillic_CHE        ]    };
+  key <AD02> {   [ Cyrillic_sha,      Cyrillic_SHA        ]    };
+  key <AD11> {   [ Cyrillic_ya,       Cyrillic_YA,
+		   U0463,             U0462               ]    };
+  key <BKSL> {   [ Cyrillic_softsign, U045D,
+		   Cyrillic_yeru,     Cyrillic_YERU       ]    };
+  key <AB02> {   [ Cyrillic_zhe,      Cyrillic_ZHE        ]    };
+  key <AB04> {   [ Cyrillic_ve,       Cyrillic_VE         ]    };
+};
+
+
+// This is extended variant of the standard Latin QWERTY layout with
+// additional symbols in levels 3 and 4.
+partial hidden alphanumeric_keys 
+xkb_symbols "latin" {
+  
+  key <TLDE> {   [ grave,             asciitilde,
+		   U2248,             U2245               ]    };
+  key <AE01> {   [ 1,                 exclam,
+		   notsign,           notsign             ]    };
+  key <AE02> {   [ 2,                 at,
+		   twosuperior,       enfilledcircbullet  ]    };
+  key <AE03> {   [ 3,                 numbersign,
+		   threesuperior,     notequal            ]    };
+  key <AE04> {   [ 4,                 dollar,
+		   EuroSign,          sterling            ]    };
+  key <AE05> {   [ 5,                 percent,
+		   U2030,             U2030               ]    };
+  key <AE06> {   [ 6,                 asciicircum,
+		   logicaland,        logicalor           ]    };
+  key <AE07> {   [ 7,                 ampersand,
+		   section,           section             ]    };
+  key <AE08> {   [ 8,                 asterisk,
+		   infinity,          multiply            ]    };
+  key <AE09> {   [ 9,                 parenleft,
+		   U2202,             nabla               ]    };
+  key <AE10> {   [ 0,                 parenright,
+		   U2300,             U2300               ]    };
+  key <AE11> {   [ minus,             underscore,
+		   U2011,             endash              ]    };
+  key <AE12> {   [ equal,             plus,
+		   emdash,            plusminus           ]    };
+
+
+  key <AD01> {   [ q,                 Q,
+		   Greek_THETA,       Greek_theta         ]    };
+  key <AD02> {   [ w,                 W,
+		   Greek_OMEGA,       Greek_omega         ]    };
+  key <AD03> {   [ e,                 E,
+		   U2203,             Greek_epsilon       ]    };
+  key <AD04> {   [ r,                 R,
+		   registered,        Greek_rho           ]    };
+  key <AD05> {   [ t,                 T,
+		   trademark,         Greek_tau           ]    };
+  key <AD06> {   [ y,                 Y,
+		   yen,               Greek_upsilon       ]    };
+  key <AD07> {   [ u,                 U,
+		   intersection,      union               ]    };
+  key <AD08> {   [ i,                 I,
+		   integral,          Greek_iota          ]    };
+  key <AD09> {   [ o,                 O,
+		   degree,            U222E               ]    };
+  key <AD10> {   [ p,                 P,
+		   Greek_PI,          Greek_pi            ]    };
+  key <AD11> {   [ bracketleft,       braceleft,
+		   U2286,             includedin          ]    };
+  key <AD12> {   [ bracketright,      braceright,
+		   U2208,             U2209               ]    };
+
+
+  key <AC01> {   [ a,                 A,
+		   U2200,             Greek_alpha         ]    };
+  key <AC02> {   [ s,                 S,
+		   Greek_SIGMA,       Greek_sigma         ]    };
+  key <AC03> {   [ d,                 D,
+		   Greek_DELTA,       Greek_delta         ]    };
+  key <AC04> {   [ f,                 F,
+		   Greek_PHI,         Greek_phi           ]    };
+  key <AC05> {   [ g,                 G,
+		   Greek_GAMMA,       Greek_gamma         ]    };
+  key <AC06> {   [ h,                 H,
+		   U2225,             Greek_eta           ]    };
+  key <AC07> {   [ j,                 J                   ]    };
+  key <AC08> {   [ k,                 K,
+		   U03F0,             Greek_kappa         ]    };
+  key <AC09> {   [ l,                 L,
+		   Greek_LAMBDA,      Greek_lambda        ]    };
+  key <AC10> {   [ semicolon,         colon,
+		   division,          division            ]    };
+  key <AC11> {   [ apostrophe,        quotedbl,
+		   leftdoublequotemark, rightdoublequotemark ] };
+  key <BKSL> {   [ backslash,         bar,
+		   identical,         downtack            ]    };
+
+
+  key <LSGT> {   [ less,              greater,
+		   U2266,             U2267               ]    };
+  key <AB01> {   [ z,                 Z,
+		   U2220,             Greek_zeta          ]    };
+  key <AB02> {   [ x,                 X,
+		   Greek_XI,          Greek_xi            ]    };
+  key <AB03> {   [ c,                 C,
+		   copyright,         Greek_chi           ]    };
+  key <AB04> {   [ v,                 V,
+		   Greek_PSI,         Greek_psi           ]    };
+  key <AB05> {   [ b,                 B,
+		   U03D1,             Greek_beta          ]    };
+  key <AB06> {   [ n,                 N,
+		   U207F,             Greek_nu            ]    };
+  key <AB07> {   [ m,                 M,
+		   Greek_mu,          Greek_mu            ]    };
+  key <AB08> {   [ comma,             less,
+		   U2266,             U21D4               ]    };
+  key <AB09> {   [ period,            greater,
+		   U2267,             U21D2               ]    };
+  key <AB10> {   [ slash,             question,
+		   leftsinglequotemark, rightsinglequotemark ] };
+
+
+  key <SPCE> {   [ space,             space,
+		   nobreakspace,      nobreakspace        ]    };
+
+
+  key <KPDL> {   type[Group1] = "KEYPAD",
+                 [ KP_Delete,           KP_Decimal        ]    };
+};
diff --git a/xorg-server/xkeyboard-config/symbols/br b/xorg-server/xkeyboard-config/symbols/br
index be0cd7cc2..8ead57c26 100644
--- a/xorg-server/xkeyboard-config/symbols/br
+++ b/xorg-server/xkeyboard-config/symbols/br
@@ -1,317 +1,317 @@
-//

-// based on 

-// "a very simple Brasilian ABNT2 keyboard

-// by Ricardo Y. Igarashi (iga@that.com.br)

-// Adds suport for dead-keys in I18N applications

-// by Conectiva  (http://www.conectiva.com.br)"

-//

-

-default

-xkb_symbols "abnt2" {

-

-    include "latin"

-    name[Group1]="Brazil";

-

-    key <AE02>	{ [         2,         at,  twosuperior,      onehalf ]	};

-    key <AE03>	{ [         3, numbersign, threesuperior, threequarters ] };

-    key <AE04>	{ [         4,     dollar,     sterling,   onequarter ]	};

-    key <AE05>	{ [         5,    percent,         cent, threeeighths ]	};

-    key <AE06>	{ [         6, dead_diaeresis,  notsign,    diaeresis ]	};

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

-

-    key <AD01>  { [         q,          Q,        slash,        slash ] };   

-    key <AD02>  { [         w,          W,     question,     question ] };   

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

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

-    key <AD11>	{ [dead_acute, dead_grave,        acute,        grave ]	};

-    key <AD12>	{ [bracketleft,  braceleft, ordfeminine,  dead_macron ]	};

-

-    key <AC10>	{ [  ccedilla,   Ccedilla,  dead_acute, dead_doubleacute] };

-    key <AC11>	{ [dead_tilde, dead_circumflex, asciitilde, asciicircum ] };

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

-

-    key <TLDE>	{ [apostrophe,   quotedbl,      notsign,      notsign ]	};

-

-    key <LSGT>	{ [ backslash,        bar,    masculine,   dead_breve ]	};

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

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

-    key <AB10>	{ [ semicolon,    colon, dead_belowdot, dead_abovedot ]	};

-

-// ABNT-2 keyboard has this special key

-

-    key <AB11>	{ [     slash,   question,       degree, questiondown ]	};

-

-    modifier_map Mod3   { Scroll_Lock };

-

-    include "kpdl(comma)"

-

-    include "level3(ralt_switch)"

-};

-

-partial alphanumeric_keys

-xkb_symbols "nodeadkeys" {

-

-    include "br(abnt2)" // for consistent naming

-    name[Group1]="Brazil - Eliminate dead keys";

-

-    key <AE06>	{ [         6,  diaeresis,      notsign,      notsign ]	};

-    key <AD11>	{ [apostrophe,      grave ]	};

-    key <AC10>	{ [  ccedilla,   Ccedilla,        acute,  doubleacute ]	};

-    key <AC11>	{ [asciitilde, asciicircum ]	};

-    key <AB10>	{ [ semicolon,      colon, dead_belowdot,    abovedot ]	};

-};

-

-

-// ABNT2 Keyboard to IBM/Lenovo Thinkpads 

-// by Piter PUNK <piterpk@terra.com.br>

-//

-partial alphanumeric_keys

-xkb_symbols "thinkpad" {

-

-    include "br(abnt2)" // for consistent naming

-    name[Group1]="Brazil";

-

-    key <RCTL> { [     slash,   question,       degree, questiondown ] };

-};

-

-

-partial alphanumeric_keys

-xkb_symbols "olpc" {

-

-    include "us(basic)"

-    name[Group1]="Brazil";

-

-    key <TLDE> { [   apostrophe,       quotedbl                                ] };

-

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

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

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

-    key <AE04> { [           4,          dollar,      sterling                 ] };

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

-    key <AE06> { [           6,  dead_diaeresis,       notsign                 ] };

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

-

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

-    key <AD11> { [   dead_acute,      dead_grave,        acute,          grave ] };

-    key <AD12> { [  bracketleft,       braceleft,     0x10000AA                 ] };

-

-    key <AC10> { [     ccedilla,       Ccedilla                                ] };

-    key <AC11> { [   dead_tilde, dead_circumflex                               ] };

-    key <BKSL> { [ bracketright,      braceright,     0x10000BA                        ] };

-

-    key <AB01> { [            z,              Z,           bar                 ] };

-    key <AB03> { [            c,              C,     0x10020A2                 ] };

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

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

-

-    key <I219> { [        slash,       question,        degree, ISO_Next_Group ] };

-

-    include "level3(ralt_switch)"

-};

-

-

-//

-// Brazilian Dvorak keyboard                               2005-04-18

-// "Teclado Simplificado Brasileiro" ou "Dvorak Brasileiro"

-//

-// Heitor Moraes    heitor.moraes@gmail.com

-// Luiz Portella    lfpor@lujz.org

-// Nando Florestan  nando2003@mandic.com.br

-// Ari Caldeira     ari@tecladobrasileiro.com.br

-//

-partial alphanumeric_keys

-xkb_symbols "dvorak" {

-

-    name[Group1]="Brazil - Dvorak";

-

-// Numeric row

-    key <TLDE> { [   apostrophe,        quotedbl,           dead_caron, dead_doubleacute ] };

-    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,       0x01002030 ] };

-    key <AE06> { [            6,  dead_diaeresis,              notsign,        diaeresis ] };

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

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

-    key <AE09> { [            9,       parenleft,         dead_cedilla,        dead_hook ] };

-    key <AE10> { [            0,      parenright,          dead_macron,       dead_breve ] };

-    key <AE11> { [  bracketleft,       braceleft,          ordfeminine,       0x01000326 ] };

-    key <AE12> { [ bracketright,      braceright,            masculine,   dead_abovering ] };

-

-

-// Upper row

-    key <AD01> { [        slash,        question,               degree,     questiondown ] };

-    key <AD02> { [        comma,            less,           0x01000329,       0x01000313 ] };

-    key <AD03> { [       period,         greater,           0x01002022,   periodcentered ] };

-    key <AD04> { [            p,               P,                thorn,            THORN ] };

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

-    key <AD06> { [            f,               F,  leftdoublequotemark, leftsinglequotemark ] };

-    key <AD07> { [            g,               G, rightdoublequotemark, rightsinglequotemark ] };

-    key <AD08> { [            c,               C,              uparrow,        copyright ] };

-    key <AD09> { [            r,               R,           registered,       registered ] };

-    key <AD10> { [            l,               L,              lstroke,          Lstroke ] };

-    key <AD11> { [   dead_acute,      dead_grave,                acute,            grave ] };

-    key <AD12> { [        equal,            plus,              section,        plusminus ] };

-

-// Central row

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

-    key <AC02> { [            o,               O,                   oe,               OE ] };

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

-    key <AC04> { [            u,               U,               oslash,         Ooblique ] };

-    key <AC05> { [            i,               I,             idotless,        Iabovedot ] };

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

-    key <AC07> { [            h,               H,            leftarrow,        paragraph ] };

-    key <AC08> { [            t,               T,           rightarrow,        trademark ] };

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

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

-    key <AC11> { [   dead_tilde, dead_circumflex,           asciitilde,      asciicircum ] };

-    key <BKSL> { [        minus,      underscore,           0x01002015,       0x01000336 ] };

-

-// Lower row

-    key <LSGT> { [     ccedilla,        Ccedilla,            backslash,              bar ] };

-    key <AB01> { [    semicolon,           colon,           0x01000331,       0x0100032D ] };

-    key <AB02> { [            q,               Q,           0x01000259,       0x0100018F ] };

-    key <AB03> { [            j,               J,           0x01000292,       0x010001B7 ] };

-    key <AB04> { [            k,               K,        guillemotleft,       0x01002039 ] };

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

-    key <AB06> { [            b,               B,       guillemotright,       0x0100203A ] };

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

-    key <AB08> { [            w,               W,               ubreve,           Ubreve ] };

-    key <AB09> { [            v,               V,   doublelowquotemark, singlelowquotemark ] };

-    key <AB10> { [            z,               Z,           0x0100201F,       0x0100201B ] };

-    key <AB11> { [    backslash,             bar,             currency,        brokenbar ] };

-

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

-

-// Configures the "," for the numeric keypad

-    include "kpdl(comma)"

-

-// Configures the use of the AltGr key

-    include "level3(ralt_switch)"

-

-};

-

-

-//

-// Teclado Nativo Brasileiro                               2005-07-19

-// Brazilian 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]="Brazil - Nativo";

-

-// Numeric row

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

-    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,       0x01002030 ] };

-    key <AE06> { [            6,  dead_diaeresis,              notsign,        diaeresis ] };

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

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

-    key <AE09> { [            9,       parenleft,         dead_cedilla,        dead_hook ] };

-    key <AE10> { [            0,      parenright,          dead_macron,       dead_breve ] };

-    key <AE11> { [  bracketleft,       braceleft,          ordfeminine,       0x01000326 ] };

-    key <AE12> { [ bracketright,      braceright,            masculine,   dead_abovering ] };

-

-// Upper row

-    key <AD01> { [        slash,        question,               degree,     questiondown ] };

-    key <AD02> { [        comma,            less,           0x01000329,       0x01000313 ] };

-    key <AD03> { [       period,         greater,           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,           asciitilde,      asciicircum ] };

-    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,                acute,            grave ] };

-    key <BKSL> { [   apostrophe,        quotedbl,           dead_caron, dead_doubleacute ] };

-

-// Lower row

-    key <LSGT> { [    semicolon,           colon,           0x01000331,       0x0100032D ] };

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

-    key <AB02> { [     ccedilla,        Ccedilla,            backslash,              bar ] };

-    key <AB03> { [            j,               J,           0x01000292,       0x010001B7 ] };

-    key <AB04> { [            b,               B,        guillemotleft,       0x01002039 ] };

-    key <AB05> { [            k,               K,       guillemotright,       0x0100203A ] };

-    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 <AB11> { [    backslash,             bar,             currency,        brokenbar ] };

-

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

-

-// Configures the "," for the numeric keypad

-    include "kpdl(comma)"

-

-// Configures the use of the AltGr key

-    include "level3(ralt_switch)"

-

-};

-

-

-//

-// Teclado Nativo Brasileiro para o teclado estadunidense  2005-07-19

-// Brazilian Nativo Keyboard for USA keyboards

-//

-// Ari Caldeira     ari@tecladobrasileiro.com.br

-//

-partial alphanumeric_keys

-xkb_symbols "nativo-us" {

-    include "br(nativo)"

-

-    name[Group1]="Brazil - Nativo for USA keyboards";

-

-// Lower row

-    key <AB01> { [            y,               Y,              ccedilla,        Ccedilla ] };

-    key <AB02> { [    semicolon,           colon,             backslash,             bar ] };

-

-};

-

-

-//

-// Teclado Nativo Brasileiro para digitacao em Esperanto   2005-07-19

-// Brazilian Nativo Keyboard for typing Esperanto

-//

-// Ari Caldeira     ari@tecladobrasileiro.com.br

-//

-partial alphanumeric_keys

-xkb_symbols "nativo-epo" {

-    include "br(nativo)"

-

-    name[Group1]="Brazil - 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 ] };

-

-};

+//
+// based on 
+// "a very simple Brasilian ABNT2 keyboard
+// by Ricardo Y. Igarashi (iga@that.com.br)
+// Adds suport for dead-keys in I18N applications
+// by Conectiva  (http://www.conectiva.com.br)"
+//
+
+default
+xkb_symbols "abnt2" {
+
+    include "latin"
+    name[Group1]="Portuguese (Brazil)";
+
+    key <AE02>	{ [         2,         at,  twosuperior,      onehalf ]	};
+    key <AE03>	{ [         3, numbersign, threesuperior, threequarters ] };
+    key <AE04>	{ [         4,     dollar,     sterling,   onequarter ]	};
+    key <AE05>	{ [         5,    percent,         cent, threeeighths ]	};
+    key <AE06>	{ [         6, dead_diaeresis,  notsign,    diaeresis ]	};
+    key <AE12>	{ [     equal,       plus,      section,  dead_ogonek ]	};
+
+    key <AD01>  { [         q,          Q,        slash,        slash ] };   
+    key <AD02>  { [         w,          W,     question,     question ] };   
+    key <AD03>	{ [         e,          E,     EuroSign,     EuroSign ]	};
+    key <AD04>	{ [         r,          R,   registered,   registered ]	};
+    key <AD11>	{ [dead_acute, dead_grave,        acute,        grave ]	};
+    key <AD12>	{ [bracketleft,  braceleft, ordfeminine,  dead_macron ]	};
+
+    key <AC10>	{ [  ccedilla,   Ccedilla,  dead_acute, dead_doubleacute] };
+    key <AC11>	{ [dead_tilde, dead_circumflex, asciitilde, asciicircum ] };
+    key <BKSL>  { [bracketright, braceright,  masculine,    masculine   ] };
+
+    key <TLDE>	{ [apostrophe,   quotedbl,      notsign,      notsign ]	};
+
+    key <LSGT>	{ [ backslash,        bar,    masculine,   dead_breve ]	};
+    key <AB03>	{ [         c,          C,    copyright,    copyright ]	};
+    key <AB07>  { [         m,          M,           mu,           mu ] };
+    key <AB10>	{ [ semicolon,    colon, dead_belowdot, dead_abovedot ]	};
+
+// ABNT-2 keyboard has this special key
+
+    key <AB11>	{ [     slash,   question,       degree, questiondown ]	};
+
+    modifier_map Mod3   { Scroll_Lock };
+
+    include "kpdl(comma)"
+
+    include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "nodeadkeys" {
+
+    include "br(abnt2)" // for consistent naming
+    name[Group1]="Portuguese (Brazil, eliminate dead keys)";
+
+    key <AE06>	{ [         6,  diaeresis,      notsign,      notsign ]	};
+    key <AD11>	{ [apostrophe,      grave ]	};
+    key <AC10>	{ [  ccedilla,   Ccedilla,        acute,  doubleacute ]	};
+    key <AC11>	{ [asciitilde, asciicircum ]	};
+    key <AB10>	{ [ semicolon,      colon, dead_belowdot,    abovedot ]	};
+};
+
+
+// ABNT2 Keyboard to IBM/Lenovo Thinkpads 
+// by Piter PUNK <piterpk@terra.com.br>
+//
+partial alphanumeric_keys
+xkb_symbols "thinkpad" {
+
+    include "br(abnt2)" // for consistent naming
+    name[Group1]="Portuguese (Brazil)";
+
+    key <RCTL> { [     slash,   question,       degree, questiondown ] };
+};
+
+
+partial alphanumeric_keys
+xkb_symbols "olpc" {
+
+    include "us(basic)"
+    name[Group1]="Portuguese (Brazil)";
+
+    key <TLDE> { [   apostrophe,       quotedbl                                ] };
+
+    key <AE01> { [           1,          exclam,   onesuperior                 ] };
+    key <AE02> { [           2,              at,   twosuperior                 ] };
+    key <AE03> { [           3,      numbersign, threesuperior                 ] };
+    key <AE04> { [           4,          dollar,      sterling                 ] };
+    key <AE05> { [           5,         percent,          cent                 ] };
+    key <AE06> { [           6,  dead_diaeresis,       notsign                 ] };
+    key <AE12>  { [       equal,           plus,       section                 ] };
+
+    key <AD03> { [            e,              E,      EuroSign                 ] };
+    key <AD11> { [   dead_acute,      dead_grave,        acute,          grave ] };
+    key <AD12> { [  bracketleft,       braceleft,     0x10000AA                 ] };
+
+    key <AC10> { [     ccedilla,       Ccedilla                                ] };
+    key <AC11> { [   dead_tilde, dead_circumflex                               ] };
+    key <BKSL> { [ bracketright,      braceright,     0x10000BA                        ] };
+
+    key <AB01> { [            z,              Z,           bar                 ] };
+    key <AB03> { [            c,              C,     0x10020A2                 ] };
+    key <AB09> { [       period,        greater,     backslash                 ] };
+    key <AB10> { [    semicolon,           colon                                ] };
+
+    key <I219> { [        slash,       question,        degree, ISO_Next_Group ] };
+
+    include "level3(ralt_switch)"
+};
+
+
+//
+// Brazilian Dvorak keyboard                               2005-04-18
+// "Teclado Simplificado Brasileiro" ou "Dvorak Brasileiro"
+//
+// Heitor Moraes    heitor.moraes@gmail.com
+// Luiz Portella    lfpor@lujz.org
+// Nando Florestan  nando2003@mandic.com.br
+// Ari Caldeira     ari@tecladobrasileiro.com.br
+//
+partial alphanumeric_keys
+xkb_symbols "dvorak" {
+
+    name[Group1]="Portuguese (Brazil, Dvorak)";
+
+// Numeric row
+    key <TLDE> { [   apostrophe,        quotedbl,           dead_caron, dead_doubleacute ] };
+    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,       0x01002030 ] };
+    key <AE06> { [            6,  dead_diaeresis,              notsign,        diaeresis ] };
+    key <AE07> { [            7,       ampersand,        dead_belowdot,    dead_abovedot ] };
+    key <AE08> { [            8,        asterisk,          dead_ogonek,        dead_horn ] };
+    key <AE09> { [            9,       parenleft,         dead_cedilla,        dead_hook ] };
+    key <AE10> { [            0,      parenright,          dead_macron,       dead_breve ] };
+    key <AE11> { [  bracketleft,       braceleft,          ordfeminine,       0x01000326 ] };
+    key <AE12> { [ bracketright,      braceright,            masculine,   dead_abovering ] };
+
+
+// Upper row
+    key <AD01> { [        slash,        question,               degree,     questiondown ] };
+    key <AD02> { [        comma,            less,           0x01000329,       0x01000313 ] };
+    key <AD03> { [       period,         greater,           0x01002022,   periodcentered ] };
+    key <AD04> { [            p,               P,                thorn,            THORN ] };
+    key <AD05> { [            y,               Y,                  yen,              yen ] };
+    key <AD06> { [            f,               F,  leftdoublequotemark, leftsinglequotemark ] };
+    key <AD07> { [            g,               G, rightdoublequotemark, rightsinglequotemark ] };
+    key <AD08> { [            c,               C,              uparrow,        copyright ] };
+    key <AD09> { [            r,               R,           registered,       registered ] };
+    key <AD10> { [            l,               L,              lstroke,          Lstroke ] };
+    key <AD11> { [   dead_acute,      dead_grave,                acute,            grave ] };
+    key <AD12> { [        equal,            plus,              section,        plusminus ] };
+
+// Central row
+    key <AC01> { [            a,               A,                   ae,               AE ] };
+    key <AC02> { [            o,               O,                   oe,               OE ] };
+    key <AC03> { [            e,               E,             EuroSign,         EuroSign ] };
+    key <AC04> { [            u,               U,               oslash,         Ooblique ] };
+    key <AC05> { [            i,               I,             idotless,        Iabovedot ] };
+    key <AC06> { [            d,               D,                  eth,              ETH ] };
+    key <AC07> { [            h,               H,            leftarrow,        paragraph ] };
+    key <AC08> { [            t,               T,           rightarrow,        trademark ] };
+    key <AC09> { [            n,               N,                  eng,              ENG ] };
+    key <AC10> { [            s,               S,               ssharp,           ssharp ] };
+    key <AC11> { [   dead_tilde, dead_circumflex,           asciitilde,      asciicircum ] };
+    key <BKSL> { [        minus,      underscore,           0x01002015,       0x01000336 ] };
+
+// Lower row
+    key <LSGT> { [     ccedilla,        Ccedilla,            backslash,              bar ] };
+    key <AB01> { [    semicolon,           colon,           0x01000331,       0x0100032D ] };
+    key <AB02> { [            q,               Q,           0x01000259,       0x0100018F ] };
+    key <AB03> { [            j,               J,           0x01000292,       0x010001B7 ] };
+    key <AB04> { [            k,               K,        guillemotleft,       0x01002039 ] };
+    key <AB05> { [            x,               X,             multiply,         division ] };
+    key <AB06> { [            b,               B,       guillemotright,       0x0100203A ] };
+    key <AB07> { [            m,               M,            downarrow,               mu ] };
+    key <AB08> { [            w,               W,               ubreve,           Ubreve ] };
+    key <AB09> { [            v,               V,   doublelowquotemark, singlelowquotemark ] };
+    key <AB10> { [            z,               Z,           0x0100201F,       0x0100201B ] };
+    key <AB11> { [    backslash,             bar,             currency,        brokenbar ] };
+
+    key <SPCE> { [        space,           space,         nobreakspace,     nobreakspace ] };
+
+// Configures the "," for the numeric keypad
+    include "kpdl(comma)"
+
+// Configures the use of the AltGr key
+    include "level3(ralt_switch)"
+
+};
+
+
+//
+// Teclado Nativo Brasileiro                               2005-07-19
+// Brazilian 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]="Portuguese (Brazil, nativo)";
+
+// Numeric row
+    key <TLDE> { [        equal,            plus,              section,        plusminus ] };
+    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,       0x01002030 ] };
+    key <AE06> { [            6,  dead_diaeresis,              notsign,        diaeresis ] };
+    key <AE07> { [            7,       ampersand,        dead_belowdot,    dead_abovedot ] };
+    key <AE08> { [            8,        asterisk,          dead_ogonek,        dead_horn ] };
+    key <AE09> { [            9,       parenleft,         dead_cedilla,        dead_hook ] };
+    key <AE10> { [            0,      parenright,          dead_macron,       dead_breve ] };
+    key <AE11> { [  bracketleft,       braceleft,          ordfeminine,       0x01000326 ] };
+    key <AE12> { [ bracketright,      braceright,            masculine,   dead_abovering ] };
+
+// Upper row
+    key <AD01> { [        slash,        question,               degree,     questiondown ] };
+    key <AD02> { [        comma,            less,           0x01000329,       0x01000313 ] };
+    key <AD03> { [       period,         greater,           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,           asciitilde,      asciicircum ] };
+    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,                acute,            grave ] };
+    key <BKSL> { [   apostrophe,        quotedbl,           dead_caron, dead_doubleacute ] };
+
+// Lower row
+    key <LSGT> { [    semicolon,           colon,           0x01000331,       0x0100032D ] };
+    key <AB01> { [            y,               Y,                  yen,              yen ] };
+    key <AB02> { [     ccedilla,        Ccedilla,            backslash,              bar ] };
+    key <AB03> { [            j,               J,           0x01000292,       0x010001B7 ] };
+    key <AB04> { [            b,               B,        guillemotleft,       0x01002039 ] };
+    key <AB05> { [            k,               K,       guillemotright,       0x0100203A ] };
+    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 <AB11> { [    backslash,             bar,             currency,        brokenbar ] };
+
+    key <SPCE> { [        space,           space,         nobreakspace,     nobreakspace ] };
+
+// Configures the "," for the numeric keypad
+    include "kpdl(comma)"
+
+// Configures the use of the AltGr key
+    include "level3(ralt_switch)"
+
+};
+
+
+//
+// Teclado Nativo Brasileiro para o teclado estadunidense  2005-07-19
+// Brazilian Nativo Keyboard for USA keyboards
+//
+// Ari Caldeira     ari@tecladobrasileiro.com.br
+//
+partial alphanumeric_keys
+xkb_symbols "nativo-us" {
+    include "br(nativo)"
+
+    name[Group1]="Portuguese (Brazil, nativo for USA keyboards)";
+
+// Lower row
+    key <AB01> { [            y,               Y,              ccedilla,        Ccedilla ] };
+    key <AB02> { [    semicolon,           colon,             backslash,             bar ] };
+
+};
+
+
+//
+// Teclado Nativo Brasileiro para digitacao em Esperanto   2005-07-19
+// Brazilian Nativo Keyboard for typing Esperanto
+//
+// Ari Caldeira     ari@tecladobrasileiro.com.br
+//
+partial alphanumeric_keys
+xkb_symbols "nativo-epo" {
+    include "br(nativo)"
+
+    name[Group1]="Portuguese (Brazil, 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 ] };
+
+};
diff --git a/xorg-server/xkeyboard-config/symbols/bt b/xorg-server/xkeyboard-config/symbols/bt
index b1ac22625..980b5c690 100644
--- a/xorg-server/xkeyboard-config/symbols/bt
+++ b/xorg-server/xkeyboard-config/symbols/bt
@@ -1,87 +1,87 @@
-//

-// Dzongkha / Tibetan layout for Bhutanese keyboard

-//

-/////////////////////////////////////////////////////////////////

-//

-//   Based on the official layout for Dzongkha

-//   approved by the Department of Information Technology &

-//   Dzongkha Development Authority of the Government of Bhutan

-//

-//   Copyright (C) 2004, Gregory Mokhin <mokhin@bog.msu.ru>

-///////////////////////////////////////////////////////////////// 

-//   Version 0.97  2004-01-09  Layout map provided by Chris Fynn

-//   Version 1.0   2004-07-29  Some correction by Pema Geyleg <pema_geyleg@druknet.bt>

-/////////////////////////////////////////////////////////////////

-

-partial default alphanumeric_keys

-xkb_symbols "basic" {

-      name[Group1]= "Bhutan";

-

-      key <TLDE> { [      0x1000F09, 0x1000F0A, 0x1000F6C, 0x1000F6D ]	};

-      

-// numbers e.a.

-      key <AE01> { [      0x1000F21, 0x1000F04, 1, exclam ]	};

-      key <AE02> { [      0x1000F22, 0x1000F05, 2, at     ]	};

-      key <AE03> { [      0x1000F23, 0x1000F06, 3, numbersign ]	};

-      key <AE04> { [      0x1000F24, 0x1000F48, 4, dollar  ]	};

-      key <AE05> { [      0x1000F25, 0x1000F70, 5, percent ]	};

-      key <AE06> { [      0x1000F26, 0x1000F08, 6, 0x1000F01 ]	};

-      key <AE07> { [      0x1000F27, 0x1000F38, 7, ampersand ]	};

-      key <AE08> { [      0x1000F28, 0x1000F34, 8, asterisk ]	};

-      key <AE09> { [      0x1000F29, 0x1000F3C, 9, parenleft ]	};

-      key <AE10> { [      0x1000F20, 0x1000F3D, 0, parenright ]	};

-      key <AE11> { [      0x1000F14, 0x1000F7F, minus, underscore ]	};

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

-

-// consonants ( ka kha ga nga )

-      key <AD01> { [      0x1000F40, 0x1000F90, 0x1000F88, VoidSymbol  ]	};

-      key <AD02> { [      0x1000F41, 0x1000F91, 0x1000F89, VoidSymbol  ]	};

-      key <AD03> { [      0x1000F42, 0x1000F92, 0x1000F6E, 0x1000F6F] 	};

-      key <AD04> { [      0x1000F44, 0x1000F94, 0x1000F83, 0x1000F82  ]	};

-

-// vowels ( i u e o )

-      key <AD05> { [      0x1000F72, 0x1000F80, 0x1000F1A, VoidSymbol  ]	};

-      key <AD06> { [      0x1000F74, 0x1000F84, 0x1000F1B, VoidSymbol  ]	};

-      key <AD07> { [      0x1000F7A, 0x1000F7B, 0x1000F1C, VoidSymbol ]	};

-      key <AD08> { [      0x1000F7C, 0x1000F7D, 0x1000F1D, 0x1000F17  ]	};

-

-// consonants ( ca cha ja nya )

-      key <AD09> { [      0x1000F45, 0x1000F95, 0x1000F1E, 0x1000F18   ]	};

-      key <AD10> { [      0x1000F46, 0x1000F96, 0x1000F1F, 0x1000F19   ]	};

-      key <AD11> { [      0x1000F47, 0x1000F97, bracketleft, 0x1000F3E ]	};

-      key <AD12> { [      0x1000F49, 0x1000F99, bracketright, 0x1000F3F  ]	};

-

-// consonants ( ta tha da na pa pha ba ma tsa tsha dza wa )

-      key <AC01> { [      0x1000F4F, 0x1000F9F, 0x1000F4A, 0x1000F9A ]	};

-      key <AC02> { [      0x1000F50, 0x1000FA0, 0x1000F4B, 0x1000F9B ]	};

-      key <AC03> { [      0x1000F51, 0x1000FA1, 0x1000F4C, 0x1000F9C ]	};

-      key <AC04> { [      0x1000F53, 0x1000FA3, 0x1000F4E, 0x1000F9E ]	};

-      key <AC05> { [      0x1000F54, 0x1000FA4, 0x1002039, guillemotleft ]	};

-      key <AC06> { [      0x1000F55, 0x1000FA5, 0x100203A, guillemotright ]	};

-      key <AC07> { [      0x1000F56, 0x1000FA6, 0x1000F37, 0x1000F35 ]	};

-      key <AC08> { [      0x1000F58, 0x1000FA8, 0x1000F7E, VoidSymbol ]	};

-      key <AC09> { [      0x1000F59, 0x1000FA9, 0x1000F39, VoidSymbol ]	};

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

-      key <AC11> { [      0x1000F5B, 0x1000FAB, apostrophe, quotedbl ]	};

-      

-// TODO: BKSL and LSGT are from gb layout, are there any variants?

-      key <BKSL> { [      0x1000F5D, 0x1000FAD, backslash, 0x1000FBA ]	};

-      key <LSGT> { [      0x1000F0D, 0x1000F11, 0x1000F10, 0x1000F0F ]	};

-

-// consonants ( zha za 'a ya ra la sha sa ha a )

-      key <AB01> { [      0x1000F5E, 0x1000FAE, 0x1000F13, 0x1000F36 ]	};

-      key <AB02> { [      0x1000F5F, 0x1000FAF, 0x1000FBE, 0x1000FBF ]	};

-      key <AB03> { [      0x1000F60, 0x1000F71, 0x1000F03, 0x1000FB0 ]	};

-      key <AB04> { [      0x1000F61, 0x1000FB1, 0x1000F12, 0x1000FBB ]	};

-      key <AB05> { [      0x1000F62, 0x1000FB2, 0x1000F6A, 0x1000FBC ]	};

-      key <AB06> { [      0x1000F63, 0x1000FB3, 0x1000F8A, 0x1000F8B ]	};

-      key <AB07> { [      0x1000F64, 0x1000FB4, 0x1000F65, 0x1000FB5 ]	};

-      key <AB08> { [      0x1000F66, 0x1000FB6, comma, less ]	};

-      key <AB09> { [      0x1000F67, 0x1000FB7, period, greater ]	};

-      key <AB10> { [      0x1000F68, 0x1000FB8, slash, question ]	};

-

-// space

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

-

-    include "level3(ralt_switch)"

-};

+//
+// Dzongkha / Tibetan layout for Bhutanese keyboard
+//
+/////////////////////////////////////////////////////////////////
+//
+//   Based on the official layout for Dzongkha
+//   approved by the Department of Information Technology &
+//   Dzongkha Development Authority of the Government of Bhutan
+//
+//   Copyright (C) 2004, Gregory Mokhin <mokhin@bog.msu.ru>
+///////////////////////////////////////////////////////////////// 
+//   Version 0.97  2004-01-09  Layout map provided by Chris Fynn
+//   Version 1.0   2004-07-29  Some correction by Pema Geyleg <pema_geyleg@druknet.bt>
+/////////////////////////////////////////////////////////////////
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+      name[Group1]= "Dzongkha";
+
+      key <TLDE> { [      0x1000F09, 0x1000F0A, 0x1000F6C, 0x1000F6D ]	};
+      
+// numbers e.a.
+      key <AE01> { [      0x1000F21, 0x1000F04, 1, exclam ]	};
+      key <AE02> { [      0x1000F22, 0x1000F05, 2, at     ]	};
+      key <AE03> { [      0x1000F23, 0x1000F06, 3, numbersign ]	};
+      key <AE04> { [      0x1000F24, 0x1000F48, 4, dollar  ]	};
+      key <AE05> { [      0x1000F25, 0x1000F70, 5, percent ]	};
+      key <AE06> { [      0x1000F26, 0x1000F08, 6, 0x1000F01 ]	};
+      key <AE07> { [      0x1000F27, 0x1000F38, 7, ampersand ]	};
+      key <AE08> { [      0x1000F28, 0x1000F34, 8, asterisk ]	};
+      key <AE09> { [      0x1000F29, 0x1000F3C, 9, parenleft ]	};
+      key <AE10> { [      0x1000F20, 0x1000F3D, 0, parenright ]	};
+      key <AE11> { [      0x1000F14, 0x1000F7F, minus, underscore ]	};
+      key <AE12> { [      0x1000F0D, 0x1000F11, equal, plus ]	};
+
+// consonants ( ka kha ga nga )
+      key <AD01> { [      0x1000F40, 0x1000F90, 0x1000F88, VoidSymbol  ]	};
+      key <AD02> { [      0x1000F41, 0x1000F91, 0x1000F89, VoidSymbol  ]	};
+      key <AD03> { [      0x1000F42, 0x1000F92, 0x1000F6E, 0x1000F6F] 	};
+      key <AD04> { [      0x1000F44, 0x1000F94, 0x1000F83, 0x1000F82  ]	};
+
+// vowels ( i u e o )
+      key <AD05> { [      0x1000F72, 0x1000F80, 0x1000F1A, VoidSymbol  ]	};
+      key <AD06> { [      0x1000F74, 0x1000F84, 0x1000F1B, VoidSymbol  ]	};
+      key <AD07> { [      0x1000F7A, 0x1000F7B, 0x1000F1C, VoidSymbol ]	};
+      key <AD08> { [      0x1000F7C, 0x1000F7D, 0x1000F1D, 0x1000F17  ]	};
+
+// consonants ( ca cha ja nya )
+      key <AD09> { [      0x1000F45, 0x1000F95, 0x1000F1E, 0x1000F18   ]	};
+      key <AD10> { [      0x1000F46, 0x1000F96, 0x1000F1F, 0x1000F19   ]	};
+      key <AD11> { [      0x1000F47, 0x1000F97, bracketleft, 0x1000F3E ]	};
+      key <AD12> { [      0x1000F49, 0x1000F99, bracketright, 0x1000F3F  ]	};
+
+// consonants ( ta tha da na pa pha ba ma tsa tsha dza wa )
+      key <AC01> { [      0x1000F4F, 0x1000F9F, 0x1000F4A, 0x1000F9A ]	};
+      key <AC02> { [      0x1000F50, 0x1000FA0, 0x1000F4B, 0x1000F9B ]	};
+      key <AC03> { [      0x1000F51, 0x1000FA1, 0x1000F4C, 0x1000F9C ]	};
+      key <AC04> { [      0x1000F53, 0x1000FA3, 0x1000F4E, 0x1000F9E ]	};
+      key <AC05> { [      0x1000F54, 0x1000FA4, 0x1002039, guillemotleft ]	};
+      key <AC06> { [      0x1000F55, 0x1000FA5, 0x100203A, guillemotright ]	};
+      key <AC07> { [      0x1000F56, 0x1000FA6, 0x1000F37, 0x1000F35 ]	};
+      key <AC08> { [      0x1000F58, 0x1000FA8, 0x1000F7E, VoidSymbol ]	};
+      key <AC09> { [      0x1000F59, 0x1000FA9, 0x1000F39, VoidSymbol ]	};
+      key <AC10> { [      0x1000F5A, 0x1000FAA, colon, semicolon ]	};
+      key <AC11> { [      0x1000F5B, 0x1000FAB, apostrophe, quotedbl ]	};
+      
+// TODO: BKSL and LSGT are from gb layout, are there any variants?
+      key <BKSL> { [      0x1000F5D, 0x1000FAD, backslash, 0x1000FBA ]	};
+      key <LSGT> { [      0x1000F0D, 0x1000F11, 0x1000F10, 0x1000F0F ]	};
+
+// consonants ( zha za 'a ya ra la sha sa ha a )
+      key <AB01> { [      0x1000F5E, 0x1000FAE, 0x1000F13, 0x1000F36 ]	};
+      key <AB02> { [      0x1000F5F, 0x1000FAF, 0x1000FBE, 0x1000FBF ]	};
+      key <AB03> { [      0x1000F60, 0x1000F71, 0x1000F03, 0x1000FB0 ]	};
+      key <AB04> { [      0x1000F61, 0x1000FB1, 0x1000F12, 0x1000FBB ]	};
+      key <AB05> { [      0x1000F62, 0x1000FB2, 0x1000F6A, 0x1000FBC ]	};
+      key <AB06> { [      0x1000F63, 0x1000FB3, 0x1000F8A, 0x1000F8B ]	};
+      key <AB07> { [      0x1000F64, 0x1000FB4, 0x1000F65, 0x1000FB5 ]	};
+      key <AB08> { [      0x1000F66, 0x1000FB6, comma, less ]	};
+      key <AB09> { [      0x1000F67, 0x1000FB7, period, greater ]	};
+      key <AB10> { [      0x1000F68, 0x1000FB8, slash, question ]	};
+
+// space
+      key <SPCE> { [ 0x1000F0B, space, 0x1000F0C, nobreakspace ] };
+
+    include "level3(ralt_switch)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/by b/xorg-server/xkeyboard-config/symbols/by
index 2c16f9e7a..36994d3e1 100644
--- a/xorg-server/xkeyboard-config/symbols/by
+++ b/xorg-server/xkeyboard-config/symbols/by
@@ -1,51 +1,51 @@
-// based on

-// belarusian standard keyboard 

-// Alexander Mikhailian <mikhailian@altern.org>

-// Reworked to use winkeys by default and russian keymap as base by Paul Lubetsky <vegeek@gmail.com>

-// Added third level with russian symbols

-// See freedesktop.org bug #23604

-

-partial default alphanumeric_keys 

-xkb_symbols "basic" {

-	include "ru(winkeys)"

-	name[Group1]= "Belarus";

-

-	key	<AD09> {	[	Byelorussian_shortu,	Byelorussian_SHORTU	]	};

-	key	<AD12> {	[	apostrophe,	apostrophe	]	};

-	key	<AB05> {	[	Ukrainian_i,	Ukrainian_I	]	};

-};

-

-partial alphanumeric_keys

-xkb_symbols "legacy" {

-	include "by(basic)"

-	name[Group1]= "Belarus - Legacy";

-	

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

-	key <AE04> {        [               4,        asterisk      ]       };

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

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

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

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

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

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

-};

-

-// based on a keyboard map from an 'xkb/symbols/iso3335-3' file

-

-partial alphanumeric_keys

-xkb_symbols "latin" {

-	include "latin"

-	name[Group1]= "Belarus - Latin";

-	

-	key <AD02> {        [    w,    W,    scaron,    Scaron    ]       };

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

-	key <AC02> {        [    s,    S,    sacute,    Sacute    ]       };

-	key <AC09> {        [    l,    L,    lstroke,   Lstroke   ]       };

-	key <AB01> {        [    z,    Z,    zacute,    Zacute    ]       };

-	key <AB02> {        [    x,    X,    zcaron,    Zcaron    ]       };

-	key <AB03> {        [    c,    C,    cacute,    Cacute    ]       };

-	key <AB04> {        [    v,    V,    ccaron,    Ccaron    ]       };

-	key <AB06> {        [    n,    N,    nacute,    Nacute    ]       };

-	

-	include "level3(ralt_switch)"

-};

+// based on
+// belarusian standard keyboard 
+// Alexander Mikhailian <mikhailian@altern.org>
+// Reworked to use winkeys by default and russian keymap as base by Paul Lubetsky <vegeek@gmail.com>
+// Added third level with russian symbols
+// See freedesktop.org bug #23604
+
+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+	include "ru(winkeys)"
+	name[Group1]= "Belarusian";
+
+	key	<AD09> {	[	Byelorussian_shortu,	Byelorussian_SHORTU	]	};
+	key	<AD12> {	[	apostrophe,	apostrophe	]	};
+	key	<AB05> {	[	Ukrainian_i,	Ukrainian_I	]	};
+};
+
+partial alphanumeric_keys
+xkb_symbols "legacy" {
+	include "by(basic)"
+	name[Group1]= "Belarusian (legacy)";
+	
+	key <AE03> {        [               3,      numbersign      ]       };
+	key <AE04> {        [               4,        asterisk      ]       };
+	key <AE05> {        [               5,           colon      ]       };
+	key <AE06> {        [               6,           comma      ]       };
+	key <AE07> {        [               7,          period      ]       };
+	key <AE08> {        [               8,       semicolon      ]       };
+	key <AB10> {        [           slash,        question      ]       };
+	key <BKSL> {        [       backslash,             bar      ]       };
+};
+
+// based on a keyboard map from an 'xkb/symbols/iso3335-3' file
+
+partial alphanumeric_keys
+xkb_symbols "latin" {
+	include "latin"
+	name[Group1]= "Belarusian (Latin)";
+	
+	key <AD02> {        [    w,    W,    scaron,    Scaron    ]       };
+	key <AD07> {        [    u,    U,    ubreve,    Ubreve    ]       };
+	key <AC02> {        [    s,    S,    sacute,    Sacute    ]       };
+	key <AC09> {        [    l,    L,    lstroke,   Lstroke   ]       };
+	key <AB01> {        [    z,    Z,    zacute,    Zacute    ]       };
+	key <AB02> {        [    x,    X,    zcaron,    Zcaron    ]       };
+	key <AB03> {        [    c,    C,    cacute,    Cacute    ]       };
+	key <AB04> {        [    v,    V,    ccaron,    Ccaron    ]       };
+	key <AB06> {        [    n,    N,    nacute,    Nacute    ]       };
+	
+	include "level3(ralt_switch)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/ca b/xorg-server/xkeyboard-config/symbols/ca
index 10427e959..cfb7b25e5 100644
--- a/xorg-server/xkeyboard-config/symbols/ca
+++ b/xorg-server/xkeyboard-config/symbols/ca
@@ -1,527 +1,527 @@
-default partial

-xkb_symbols "fr" {

-    name[Group1] = "Canada";

-

-    key <TLDE>	{ [ numbersign,       bar,     backslash ]	};

-    key <AE01>	{ [         1,     exclam,     plusminus ]	};

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

-    key <AE03>	{ [         3,      slash,      sterling ]	};

-    key <AE04>	{ [         4,     dollar,          cent ]	};

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

-    key <AE06>	{ [         6,   question,       notsign ]	};

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

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

-    key <AE09>	{ [         9,  parenleft, threesuperior ]	};

-    key <AE10>	{ [         0, parenright,    onequarter ]	};

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

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

-

-    key <AD01>	{ [         q,          Q ]	};

-    key <AD02>	{ [         w,          W ]	};

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

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

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

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

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

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

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

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

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

-    key <AD12>	{ [   dead_cedilla,  dead_diaeresis, bracketright ]	};

-

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

-    key <AC02>	{ [         s,          S ]	};

-    key <AC03>	{ [         d,          D ]	};

-    key <AC04>	{ [         f,          F ]	};

-    key <AC05>	{ [         g,          G ]	};

-    key <AC06>	{ [         h,          H ]	};

-    key <AC07>	{ [         j,          J ]	};

-    key <AC08>	{ [         k,          K ]	};

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

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

-    key <AC11>	{ [dead_grave, dead_grave,  braceleft ]	};

-    key <BKSL>	{ [      less,    greater, braceright ]	};

-

-    key <LSGT>	{ [guillemotleft, guillemotright, degree]	};

-    key <AB01>	{ [         z,          Z ]	};

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

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

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

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

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

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

-    key <AB08>	{ [     comma, apostrophe,       macron ]	};

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

-    key <AB10>	{ [    eacute,     Eacute,   dead_acute ]	};

-

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

-

-    include "level3(ralt_switch)"

-};

-

-xkb_symbols "fr-dvorak" {

-    name[Group1] = "Canada - French Dvorak";

-

-    key <TLDE>  { [ numbersign,       bar,     backslash ]  };

-    key <AE01>  { [         1,     exclam,     plusminus ]  };

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

-    key <AE03>  { [         3,      slash,      sterling ]  };

-    key <AE04>  { [         4,     dollar,          cent ]  };

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

-    key <AE06>  { [         6,   question,       notsign ]  };

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

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

-    key <AE09>  { [         9,  parenleft, threesuperior ]  };

-    key <AE10>  { [         0, parenright,    onequarter ]  };

-    key <AE11>  { [dead_circumflex, dead_circumflex, bracketleft  ] };

-    key <AE12>  { [   dead_cedilla,  dead_diaeresis, bracketright ] };

-

-    key <AD01>  { [dead_grave, dead_grave,  braceleft ] };

-    key <AD02>  { [     comma, apostrophe,       macron ]   };

-    key <AD03>  { [    period,     period,       hyphen ]   };

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

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

-    key <AD06>  { [         f,          F ] };

-    key <AD07>  { [         g,          G ] };

-    key <AD08>  { [         c,          C ] };

-    key <AD09>  { [         r,          R ] };

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

-    key <AD11>  { [    eacute,     Eacute,   dead_acute ]   };

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

-

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

-    key <AC02>  { [         o,          O,   section ]  };

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

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

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

-    key <AC06>  { [         d,          D ] };

-    key <AC07>  { [         h,          H ] };

-    key <AC08>  { [         t,          T ] };

-    key <AC09>  { [         n,          N ] };

-    key <AC10>  { [         s,          S ] };

-    key <AC11>  { [     minus, underscore,       onehalf ]  };

-    key <BKSL>  { [      less,    greater, braceright ] };

-

-    key <LSGT>  { [guillemotleft, guillemotright, degree]   };

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

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

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

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

-    key <AB05>  { [         x,          X ] };

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

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

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

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

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

-

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

-

-    include "level3(ralt_switch)"

-};

-

-partial

-xkb_symbols "fr-legacy" {

-

-    name[Group1] = "Canada - French (legacy)";

-

-    include "ca(fr)"

-

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

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

-

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

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

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

-    key <AE06>	{ [         6,   question, threequarters ]	};

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

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

-    key <AE09>	{ [         9,  parenleft,  bracketright,   plusminus ]	};

-    key <AE10>	{ [         0, parenright,    braceright ]	};

-    key <AE11>	{ [     minus, underscore,           bar, questiondown]	};

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

-

-    key <AD04>	{ [         r,          R,     paragraph,  registered ]	};

-    key <AD06>	{ [         y,          Y,           yen ]	};

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

-    key <AD10>	{ [         p,          P,         thorn,       THORN ]	};

-    key <AD11>	{ [dead_circumflex, dead_circumflex,           degree ]	};

-    key <AD12>	{ [  ccedilla,   Ccedilla, dead_tilde, dead_diaeresis ]	};

-

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

-    key <AC02>	{ [         s,          S,        ssharp,     section ]	};

-    key <AC03>	{ [         d,          D,           eth,         ETH ]	};

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

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

-    key <AC11>	{ [    egrave,     Egrave ]	};

-    key <BKSL>	{ [    agrave,     Agrave,    dead_grave ]	};

-

-    key <LSGT>	{ [    ugrave,     Ugrave,     backslash,         bar ]	};

-    key <AB01>	{ [         z,          Z, guillemotleft  ]	};

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

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

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

-    key <AB08>	{ [     comma, apostrophe,         less ]	};

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

-    key <AB10>	{ [    eacute,     Eacute,        slash ]	};

-};

-

-partial

-xkb_symbols "multi" {

-

-    name[Group1] = "Canada - Multilingual, first part";

-

-    include "ca(fr)"

-

-    key <TLDE>	{ [     slash,  backslash,           bar ]	};

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

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

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

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

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

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

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

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

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

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

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

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

-

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

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

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

-    key <AD12>	{ [  ccedilla,   Ccedilla,   asciitilde ]	};

-

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

-    key <AC11>	{ [    egrave,     Egrave ]	};

-    key <BKSL>	{ [    agrave,     Agrave ]	};

-

-    key <LSGT>	{ [    ugrave,     Ugrave ] 	};

-    key <AB01>	{ [         z,          Z, guillemotleft  ]	};

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

-    key <AB08>	{ [     comma, apostrophe,           less ]	};

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

-    key <AB10>	{ [    eacute,     Eacute ]	};

-};

-

-partial

-xkb_symbols "multi-2gr" {

-

-    name[Group1] = "Canada - Multilingual, second part";

-

-    key <TLDE>	{ [    NoSymbol,      hyphen ]	};

-    key <AE01>	{ [   onesuperior,  exclamdown ]	};

-    key <AE02>	{ [   twosuperior,  NoSymbol ]	};

-    key <AE03>	{ [ threesuperior,    sterling ]	};

-    key <AE04>	{ [    onequarter,    currency ]	};

-    key <AE05>	{ [       onehalf,threeeighths ]	};

-    key <AE06>	{ [ threequarters, fiveeighths ]	};

-    key <AE07>	{ [    NoSymbol,seveneighths ]	};

-    key <AE08>	{ [    NoSymbol,   trademark ]	};

-    key <AE09>	{ [    NoSymbol,   plusminus ]	};

-

-    key <AE11>	{ [    NoSymbol, questiondown]	};

-    key <AE12>	{ [  dead_cedilla, dead_ogonek ]	};

-

-    key <AD01>	{ [ NoSymbol,    Greek_OMEGA ]	};

-    key <AD02>	{ [    lstroke,        Lstroke ]	};

-    key <AD03>	{ [         oe,             OE ]	};

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

-    key <AD05>	{ [     tslash,         Tslash ]	};

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

-    key <AD07>	{ [  downarrow,        uparrow ]	};

-    key <AD08>	{ [ rightarrow,       idotless ]	};

-    key <AD09>	{ [     oslash,       Ooblique ]	};

-    key <AD10>	{ [      thorn,          THORN ]	};

-    key <AD11>	{ [ NoSymbol, dead_abovering ]	};

-    key <AD12>	{ [ dead_tilde,    dead_macron ]	};

-

-    key <AC01>	{ [         ae,          AE ]	};

-    key <AC02>	{ [     ssharp,     section ]	};

-    key <AC03>	{ [        eth,         ETH ]	};

-    key <AC04>	{ [ NoSymbol, ordfeminine ]	};

-    key <AC05>	{ [        eng,         ENG ]	};

-    key <AC06>	{ [    hstroke,     Hstroke ]	};

-    key <AC07>	{ [      U0133,       U0132 ]	};

-    key <AC08>	{ [        kra,  NoSymbol ]	};

-    key <AC09>	{ [      U0140,       U013F ]	};

-    key <AC10>	{ [ dead_acute, dead_doubleacute ]	};

-    key <AC11>	{ [ NoSymbol,  dead_caron ]	};

-    key <BKSL>	{ [ NoSymbol,  dead_breve ]	};

-

-

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

-

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

-    key <AB04>	{ [  leftdoublequotemark,  leftsinglequotemark ]	};

-    key <AB05>	{ [ rightdoublequotemark, rightsinglequotemark ]	};

-    key <AB06>	{ [      U0149,       U266A ]	};

-    key <AB07>	{ [         mu,   masculine ]	};

-    key <AB08>	{ [ Greek_horizbar, multiply ]	};

-    key <AB09>	{ [ periodcentered, division ]	};

-    key <AB10>	{ [ NoSymbol, dead_abovedot ]	};

-

-};

-

-// based on

-// Inuktitut keyboard for X11

-// written by Pablo Saratxaga <pablo@mandrakesoft.com>

-

-alphanumeric_keys 

-xkb_symbols "ike" {

-

-    name[Group1]= "Canada - Inuktitut";

-

-    key	<AE01> { [ 0x01001595, 1		]	};

-    key	<AE02> { [ 0x01001449, 2		]	};

-    key	<AE03> { [ 0x01001550, 3		]	};

-    key	<AE04> { [ 0x01001483, 4		]	};

-    key	<AE05> { [ 0x01001466, 5		]	};

-    key	<AE06> { [ 0x01001585, 6		]	};

-    key	<AE07> { [ 0x010014bb, 7		]	};

-    key	<AE08> { [ 0x010014d0, 8		]	};

-    key	<AE09> { [ 0x010014ea, 9		]	};

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

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

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

-

-	key <AD01> { [ 0x0100158f, 0x0100148b	]	};

-	key <AD02> { [ 0x01001403, 0x01001431	]	};

-	key <AD03> { [ 0x0100157f, 0x01001546	]	};

-	key <AD04> { [ 0x0100146d, 0x01001596	]	};

-	key <AD05> { [ 0x0100144e, 0x01001671	]	};

-	key <AD06> { [ 0x010014ef, 0x01001673	]	};

-	key <AD07> { [ 0x010014a5, 0x01001675	]	};

-	key <AD08> { [ 0x010014c2, 0x010015a4	]	};

-	key <AD09> { [ 0x010014d5, 0x010015a0	]	};

-	key <AD10> { [ 0x01001528, 0x010015a6	]	};

-	key <AD11> { [ 0x010014a1, 0x01001505	]	};

-	key <AD12> { [ dead_abovedot, 0x0100141e]	};

-

-	key <AC01> { [ 0x01001591, 0x0100148d	]	};

-	key <AC02> { [ 0x01001405, 0x01001433	]	};

-	key <AC03> { [ 0x01001581, 0x01001548	]	};

-	key <AC04> { [ 0x0100146f, 0x01001555	]	};

-	key <AC05> { [ 0x01001450, parenleft 	]	};

-	key <AC06> { [ 0x010014f1, parenright	]	};

-	key <AC07> { [ 0x010014a7, 0x0100152a	]	};

-	key <AC08> { [ 0x010014c4, 0x01001557	]	};

-	key <AC09> { [ 0x010014d7, 0x010015a2	]	};

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

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

-

-	key <AB01> { [ 0x01001593, 0x01001490	]	};

-	key <AB02> { [ 0x0100140a, 0x01001438	]	};

-	key <AB03> { [ 0x01001583, 0x0100154b	]	};

-	key <AB04> { [ 0x01001472, question  	]	};

-	key <AB05> { [ 0x01001455, 0x0100157c	]	};

-	key <AB06> { [ 0x010014f4, 0x010014c7	]	};

-	key <AB07> { [ 0x010014aa, 0x010014da	]	};

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

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

-	key <AB10> { [ 0x0100152d, 0x01001559	]	};

-

-    key	<TLDE> { [ 0x0100157b, 0x01001575	]	};

-    key	<LSGT> { [ 0x01001579, 0x01001577	]	};

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

-

-// End alphanumeric section

-};

-

-partial

-xkb_symbols "multix" {

-

-    name[Group1] = "Canada - Multilingual";

-

-    key.type[group1]="EIGHT_LEVEL_SEMIALPHABETIC";

-    key <TLDE>	{ [     slash,  backslash,            bar, NoSymbol,

-    		   NoSymbol,     hyphen ]	};

-    key <AE01>	{ [         1,     exclam,      plusminus, NoSymbol,

-    		  onesuperior, exclamdown ]	};

-    key <AE02>	{ [         2,         at,             at, NoSymbol,

-    		  twosuperior, NoSymbol ]	};

-    key <AE03>	{ [         3, numbersign,       sterling, NoSymbol,

-    		threesuperior,   sterling ]	};

-    key <AE04>	{ [         4,     dollar,           cent, NoSymbol,

-    		   onequarter,   currency ]	};

-    key <AE05>	{ [         5,    percent,       currency, NoSymbol,

-    		      onehalf, threeeighths ]	};

-    key <AE06>	{ [         6,   question,        notsign, NoSymbol,

-    		threequarters, fiveeighths ]	};

-    key <AE07>	{ [         7,  ampersand,      braceleft, NoSymbol,

-    		   NoSymbol, seveneighths ]	};

-    key <AE08>	{ [         8,   asterisk,     braceright, NoSymbol,

-    		   NoSymbol,  trademark ]	};

-    key <AE09>	{ [         9,  parenleft,    bracketleft, NoSymbol,

-    		   NoSymbol,  plusminus ]	};

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

-    key <AE11>	{ [     minus, underscore,        onehalf, NoSymbol,

-    		   NoSymbol, questiondown]	};

-    key <AE12>	{ [     equal,       plus,        notsign, NoSymbol,

-    		dead_cedilla, dead_ogonek ]	};

-

-    key.type[group1]="EIGHT_LEVEL_SEMIALPHABETIC";

-    key <AD01>	{ [         q,           Q,     NoSymbol, NoSymbol,

-		   NoSymbol, Greek_OMEGA ]	};

-    key <AD02>	{ [         w,           W,     NoSymbol, NoSymbol,

-   		      lstroke,     Lstroke ]	};

-    key <AD03>	{ [         e,           E,     NoSymbol, NoSymbol,

-    			   oe,          OE ]	};

-    key <AD04>	{ [         r,           R,     NoSymbol, NoSymbol,

-    		    paragraph,  registered ]	};

-    key <AD05>	{ [         t,           T,     NoSymbol, NoSymbol,

-		       tslash,      Tslash ]	};

-    key <AD06>	{ [         y,           Y,     NoSymbol, NoSymbol,

-		    leftarrow,         yen ]	};

-    key <AD07>	{ [         u,           U,     NoSymbol, NoSymbol,

-    		    downarrow,     uparrow ]	};

-    key <AD08>	{ [         i,           I,     NoSymbol, NoSymbol,

-    		   rightarrow,    idotless ]	};

-    key <AD09>	{ [         o,           O,        section, NoSymbol,

-		       oslash,    Ooblique ]	};

-    key <AD10>	{ [         p,           P,      paragraph, NoSymbol,

-		        thorn,       THORN ]	};

-

-    key.type[group1]="EIGHT_LEVEL";

-    key <AD11>	{ [dead_circumflex, dead_diaeresis, dead_grave, NoSymbol,

-    			NoSymbol, dead_abovering ]	};

-

-    key.type[group1]="EIGHT_LEVEL_SEMIALPHABETIC";

-    key <AD12>	{ [  ccedilla,   Ccedilla,     asciitilde, NoSymbol,

-		   dead_tilde,    dead_macron ]	};

-

-    key <AC01>	{ [         a,          A,     NoSymbol, NoSymbol,

-    			   ae,         AE ]	};

-    key <AC02>	{ [         s,          S,     NoSymbol, NoSymbol,

-    		       ssharp,    section ]	};

-    key <AC03>	{ [         d,          D,     NoSymbol, NoSymbol,

-    			  eth,        ETH ]	};

-    key <AC04>	{ [         f,          F,     NoSymbol, NoSymbol,

-    		   NoSymbol, ordfeminine ]	};

-    key <AC05>	{ [         g,          G,     NoSymbol, NoSymbol,

-    			  eng,        ENG ]	};

-    key <AC06>	{ [         h,          H,     NoSymbol, NoSymbol,

-    		      hstroke,    Hstroke ]	};

-    key <AC07>	{ [         j,          J,     NoSymbol, NoSymbol,

-    			U0133,      U0132 ]	};

-    key <AC08>	{ [         k,          K,     NoSymbol, NoSymbol,

-    			  kra, NoSymbol ]	};

-    key <AC09>	{ [         l,          L,     NoSymbol, NoSymbol,

-    			U0140,      U013F ]	};

-

-    key.type[group1]="EIGHT_LEVEL";

-    key <AC10>	{ [ semicolon,          colon,         degree, NoSymbol,

-    		   dead_acute, dead_doubleacute ]	};

-

-    key.type[group1]="EIGHT_LEVEL_SEMIALPHABETIC";

-    key <AC11>	{ [    egrave,         Egrave,      braceleft, NoSymbol,

-    		   NoSymbol,  dead_caron ]	};

-    key <BKSL>	{ [    agrave,         Agrave,     braceright, NoSymbol,

-    		   NoSymbol,  dead_breve ]	};

-

-    key <LSGT>	{ [    ugrave,     Ugrave,         degree, NoSymbol,

-    		   NoSymbol,   brokenbar ]	};

-

-    key.type[group1]="FOUR_LEVEL_SEMIALPHABETIC";

-    key <AB01>	{ [         z,          Z,  guillemotleft, NoSymbol ]	};

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

-

-    key.type[group1]="EIGHT_LEVEL_SEMIALPHABETIC";

-    key <AB03>	{ [         c,          C,     NoSymbol, NoSymbol,

-    			 cent,   copyright ]	};

-    key <AB04>	{ [         v,          V,     NoSymbol, NoSymbol,

-    	  leftdoublequotemark,  leftsinglequotemark ]	};

-    key <AB05>	{ [         b,          B,     NoSymbol, NoSymbol,

-    	 rightdoublequotemark, rightsinglequotemark ]	};

-    key <AB06>	{ [         n,          N,     NoSymbol, NoSymbol,

-    			U0149,       U266A ]	};

-    key <AB07>	{ [         m,          M,             mu, NoSymbol,

-    			   mu,   masculine ]	};

-    key <AB08>	{ [     comma, apostrophe,           less, NoSymbol,

-    	       Greek_horizbar, multiply ]	};

-    key <AB09>	{ [    period,   quotedbl,        greater, NoSymbol,

-    	       periodcentered, division ]	};

-    key <AB10>	{ [    eacute,     Eacute,     dead_acute, NoSymbol,

-    		   NoSymbol, dead_abovedot ]	};

-

-    include "nbsp(level3s)"

-

-    modifier_map Control{ Control_L };

-

-    include "level3(ralt_switch)"

-    include "level5(rctrl_switch)"

-};

-

-// Secwepemctsin keyboard for X11

-// written by Neskie Manuel <neskiem@gmail.com>

-

-partial alphanumeric_keys  

-xkb_symbols "shs" {

-

-    include "us"

-

-    name[Group1]= "Canada - Secwepemctsin";

-

-    //Using Dead key to get COMBINING COMMA ABOVE for ejectives on

-    //q, l, t, s, m, g, k, p, w, y, r

-    //XCompose key is used for the other accute and grave.

-

-    key <AB08>	{ [ comma, less, U0313    ]	};

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

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

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

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

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

-

-    include "level3(ralt_switch)"

-    include "compose(rctrl)"

-};

-

-// OLPC Section

-xkb_symbols "olpc" {

-

-    include "ca(fr)"

-    

-    key <AE02>	{ [          2,    quotedbl,          ograve,        Ograve ] };

-    key <AE03>	{ [          3,    slash,          at,        VoidSymbol ] };

-    

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

-        

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

-    

-    key <I219>  { [  guillemotleft,  guillemotright, degree, VoidSymbol ] };

-};

-

-partial alphanumeric_keys 

-xkb_symbols "kut" {

-

-    //Ejective U0313  and compose accents are from shs layout

-    include "ca(shs)"

-

-    name[Group1]= "Canada - Ktunaxa";

-

-    // Alphanumeric section

-

-    // Alveolar Click

-    key <AD05> {	[ t,	T,U01C2	,U01C2	]	};

-

-    //Cent sign

-    key <AB03> {	[ c,	C,U00A2,U00A2	]	};

-

-    //Mid dot

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

-

-    //Glottal stop

-    key <AB10> {	[ slash,	question, U0294	]	};

-

-    //COMBINING COMMA ABOVE RIGHT

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

-

-    //MODIFIER LETTER RIGHT HALF RING

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

-};

-

-partial alphanumeric_keys 

-xkb_symbols "eng" {

-    name[Group1] = "Canada - English";

-    include "us(basic)"

-};

+default partial
+xkb_symbols "fr" {
+    name[Group1] = "French (Canada)";
+
+    key <TLDE>	{ [ numbersign,       bar,     backslash ]	};
+    key <AE01>	{ [         1,     exclam,     plusminus ]	};
+    key <AE02>	{ [         2,   quotedbl,            at ]	};
+    key <AE03>	{ [         3,      slash,      sterling ]	};
+    key <AE04>	{ [         4,     dollar,          cent ]	};
+    key <AE05>	{ [         5,    percent,      currency ] 	};
+    key <AE06>	{ [         6,   question,       notsign ]	};
+    key <AE07>	{ [         7,  ampersand,     brokenbar ]	};
+    key <AE08>	{ [         8,   asterisk,   twosuperior ]	};
+    key <AE09>	{ [         9,  parenleft, threesuperior ]	};
+    key <AE10>	{ [         0, parenright,    onequarter ]	};
+    key <AE11>	{ [     minus, underscore,       onehalf ]	};
+    key <AE12>	{ [     equal,       plus, threequarters ]	};
+
+    key <AD01>	{ [         q,          Q ]	};
+    key <AD02>	{ [         w,          W ]	};
+    key <AD03>	{ [         e,          E ]	};
+    key <AD04>	{ [         r,          R ]	};
+    key <AD05>	{ [         t,          T ]	};
+    key <AD06>	{ [         y,          Y ]	};
+    key <AD07>	{ [         u,          U ]	};
+    key <AD08>	{ [         i,          I ]	};
+    key <AD09>	{ [         o,          O,   section ]	};
+    key <AD10>	{ [         p,          P, paragraph ]	};
+    key <AD11>	{ [dead_circumflex, dead_circumflex, bracketleft  ]	};
+    key <AD12>	{ [   dead_cedilla,  dead_diaeresis, bracketright ]	};
+
+    key <AC01>	{ [         a,          A ]	};
+    key <AC02>	{ [         s,          S ]	};
+    key <AC03>	{ [         d,          D ]	};
+    key <AC04>	{ [         f,          F ]	};
+    key <AC05>	{ [         g,          G ]	};
+    key <AC06>	{ [         h,          H ]	};
+    key <AC07>	{ [         j,          J ]	};
+    key <AC08>	{ [         k,          K ]	};
+    key <AC09>	{ [         l,          L ]	};
+    key <AC10>	{ [ semicolon,      colon, asciitilde ]	};
+    key <AC11>	{ [dead_grave, dead_grave,  braceleft ]	};
+    key <BKSL>	{ [      less,    greater, braceright ]	};
+
+    key <LSGT>	{ [guillemotleft, guillemotright, degree]	};
+    key <AB01>	{ [         z,          Z ]	};
+    key <AB02>	{ [         x,          X ]	};
+    key <AB03>	{ [         c,          C ]	};
+    key <AB04>	{ [         v,          V ]	};
+    key <AB05>	{ [         b,          B ]	};
+    key <AB06>	{ [         n,          N ]	};
+    key <AB07>	{ [         m,          M,           mu ]	};
+    key <AB08>	{ [     comma, apostrophe,       macron ]	};
+    key <AB09>	{ [    period,     period,       hyphen ]	};
+    key <AB10>	{ [    eacute,     Eacute,   dead_acute ]	};
+
+    key <SPCE>	{ [     space,      space, nobreakspace ]	};
+
+    include "level3(ralt_switch)"
+};
+
+xkb_symbols "fr-dvorak" {
+    name[Group1] = "French (Canada, Dvorak)";
+
+    key <TLDE>  { [ numbersign,       bar,     backslash ]  };
+    key <AE01>  { [         1,     exclam,     plusminus ]  };
+    key <AE02>  { [         2,   quotedbl,            at ]  };
+    key <AE03>  { [         3,      slash,      sterling ]  };
+    key <AE04>  { [         4,     dollar,          cent ]  };
+    key <AE05>  { [         5,    percent,      currency ]  };
+    key <AE06>  { [         6,   question,       notsign ]  };
+    key <AE07>  { [         7,  ampersand,     brokenbar ]  };
+    key <AE08>  { [         8,   asterisk,   twosuperior ]  };
+    key <AE09>  { [         9,  parenleft, threesuperior ]  };
+    key <AE10>  { [         0, parenright,    onequarter ]  };
+    key <AE11>  { [dead_circumflex, dead_circumflex, bracketleft  ] };
+    key <AE12>  { [   dead_cedilla,  dead_diaeresis, bracketright ] };
+
+    key <AD01>  { [dead_grave, dead_grave,  braceleft ] };
+    key <AD02>  { [     comma, apostrophe,       macron ]   };
+    key <AD03>  { [    period,     period,       hyphen ]   };
+    key <AD04>  { [         p,          P, paragraph ]  };
+    key <AD05>  { [         y,          Y ] };
+    key <AD06>  { [         f,          F ] };
+    key <AD07>  { [         g,          G ] };
+    key <AD08>  { [         c,          C ] };
+    key <AD09>  { [         r,          R ] };
+    key <AD10>  { [         l,          L ] };
+    key <AD11>  { [    eacute,     Eacute,   dead_acute ]   };
+    key <AD12>  { [     equal,       plus, threequarters ]  };
+
+    key <AC01>  { [         a,          A ] };
+    key <AC02>  { [         o,          O,   section ]  };
+    key <AC03>  { [         e,          E ] };
+    key <AC04>  { [         u,          U ] };
+    key <AC05>  { [         i,          I ] };
+    key <AC06>  { [         d,          D ] };
+    key <AC07>  { [         h,          H ] };
+    key <AC08>  { [         t,          T ] };
+    key <AC09>  { [         n,          N ] };
+    key <AC10>  { [         s,          S ] };
+    key <AC11>  { [     minus, underscore,       onehalf ]  };
+    key <BKSL>  { [      less,    greater, braceright ] };
+
+    key <LSGT>  { [guillemotleft, guillemotright, degree]   };
+    key <AB01>  { [ semicolon,      colon, asciitilde ] };
+    key <AB02>  { [         q,          Q ] };
+    key <AB03>  { [         j,          J ] };
+    key <AB04>  { [         k,          K ] };
+    key <AB05>  { [         x,          X ] };
+    key <AB06>  { [         b,          B ] };
+    key <AB07>  { [         m,          M,           mu ]   };
+    key <AB08>  { [         w,          W ] };
+    key <AB09>  { [         v,          V ] };
+    key <AB10>  { [         z,          Z ] };
+
+    key <SPCE>  { [     space,      space, nobreakspace ]   };
+
+    include "level3(ralt_switch)"
+};
+
+partial
+xkb_symbols "fr-legacy" {
+
+    name[Group1] = "French (Canada, legacy)";
+
+    include "ca(fr)"
+
+    key <TLDE>	{ [    degree,     degree,       notsign ]	};
+    key <AE01>	{ [         1,     exclam,   onesuperior ]	};
+
+    key <AE03>	{ [         3, numbersign, threesuperior ]	};
+    key <AE04>	{ [         4,     dollar,    onequarter ]	};
+    key <AE05>	{ [         5,    percent,       onehalf ] 	};
+    key <AE06>	{ [         6,   question, threequarters ]	};
+    key <AE07>	{ [         7,  ampersand,     braceleft ]	};
+    key <AE08>	{ [         8,   asterisk,   bracketleft ]	};
+    key <AE09>	{ [         9,  parenleft,  bracketright,   plusminus ]	};
+    key <AE10>	{ [         0, parenright,    braceright ]	};
+    key <AE11>	{ [     minus, underscore,           bar, questiondown]	};
+    key <AE12>	{ [     equal,       plus,  dead_cedilla ]	};
+
+    key <AD04>	{ [         r,          R,     paragraph,  registered ]	};
+    key <AD06>	{ [         y,          Y,           yen ]	};
+    key <AD09>	{ [         o,          O,        oslash,      Ooblique ] };
+    key <AD10>	{ [         p,          P,         thorn,       THORN ]	};
+    key <AD11>	{ [dead_circumflex, dead_circumflex,           degree ]	};
+    key <AD12>	{ [  ccedilla,   Ccedilla, dead_tilde, dead_diaeresis ]	};
+
+    key <AC01>	{ [         a,          A,            ae,          AE ]	};
+    key <AC02>	{ [         s,          S,        ssharp,     section ]	};
+    key <AC03>	{ [         d,          D,           eth,         ETH ]	};
+    key <AC04>	{ [         f,          F,   ordfeminine ]	};
+    key <AC10>	{ [ semicolon,      colon,    dead_acute,  dead_acute ]	};
+    key <AC11>	{ [    egrave,     Egrave ]	};
+    key <BKSL>	{ [    agrave,     Agrave,    dead_grave ]	};
+
+    key <LSGT>	{ [    ugrave,     Ugrave,     backslash,         bar ]	};
+    key <AB01>	{ [         z,          Z, guillemotleft  ]	};
+    key <AB02>	{ [         x,          X, guillemotright ]	};
+    key <AB03>	{ [         c,          C,          cent,   copyright ]	};
+    key <AB07>	{ [         m,          M,            mu,   masculine ]	};
+    key <AB08>	{ [     comma, apostrophe,         less ]	};
+    key <AB09>	{ [    period,     period,      greater ]	};
+    key <AB10>	{ [    eacute,     Eacute,        slash ]	};
+};
+
+partial
+xkb_symbols "multi" {
+
+    name[Group1] = "Canadian Multilingual (first part)";
+
+    include "ca(fr)"
+
+    key <TLDE>	{ [     slash,  backslash,           bar ]	};
+    key <AE01>	{ [         1,     exclam ]	};
+    key <AE02>	{ [         2,         at ]	};
+    key <AE03>	{ [         3, numbersign ]	};
+    key <AE04>	{ [         4,     dollar ]	};
+    key <AE05>	{ [         5,    percent ] 	};
+    key <AE06>	{ [         6,   question ]	};
+    key <AE07>	{ [         7,  ampersand,    braceleft ]	};
+    key <AE08>	{ [         8,   asterisk,   braceright ]	};
+    key <AE09>	{ [         9,  parenleft,  bracketleft ]	};
+    key <AE10>	{ [         0, parenright, bracketright ]	};
+    key <AE11>	{ [     minus, underscore ]	};
+    key <AE12>	{ [     equal,       plus,      notsign ]	};
+
+    key <AD09>	{ [         o,          O ]	};
+    key <AD10>	{ [         p,          P ]	};
+    key <AD11>	{ [dead_circumflex, dead_diaeresis, dead_grave  ]	};
+    key <AD12>	{ [  ccedilla,   Ccedilla,   asciitilde ]	};
+
+    key <AC10>	{ [ semicolon,      colon,     degree ]	};
+    key <AC11>	{ [    egrave,     Egrave ]	};
+    key <BKSL>	{ [    agrave,     Agrave ]	};
+
+    key <LSGT>	{ [    ugrave,     Ugrave ] 	};
+    key <AB01>	{ [         z,          Z, guillemotleft  ]	};
+    key <AB02>	{ [         x,          X, guillemotright ]	};
+    key <AB08>	{ [     comma, apostrophe,           less ]	};
+    key <AB09>	{ [    period,   quotedbl,        greater ]	};
+    key <AB10>	{ [    eacute,     Eacute ]	};
+};
+
+partial
+xkb_symbols "multi-2gr" {
+
+    name[Group1] = "Canadian Multilingual (second part)";
+
+    key <TLDE>	{ [    NoSymbol,      hyphen ]	};
+    key <AE01>	{ [   onesuperior,  exclamdown ]	};
+    key <AE02>	{ [   twosuperior,  NoSymbol ]	};
+    key <AE03>	{ [ threesuperior,    sterling ]	};
+    key <AE04>	{ [    onequarter,    currency ]	};
+    key <AE05>	{ [       onehalf,threeeighths ]	};
+    key <AE06>	{ [ threequarters, fiveeighths ]	};
+    key <AE07>	{ [    NoSymbol,seveneighths ]	};
+    key <AE08>	{ [    NoSymbol,   trademark ]	};
+    key <AE09>	{ [    NoSymbol,   plusminus ]	};
+
+    key <AE11>	{ [    NoSymbol, questiondown]	};
+    key <AE12>	{ [  dead_cedilla, dead_ogonek ]	};
+
+    key <AD01>	{ [ NoSymbol,    Greek_OMEGA ]	};
+    key <AD02>	{ [    lstroke,        Lstroke ]	};
+    key <AD03>	{ [         oe,             OE ]	};
+    key <AD04>	{ [  paragraph,     registered ]	};
+    key <AD05>	{ [     tslash,         Tslash ]	};
+    key <AD06>	{ [  leftarrow,            yen ]	};
+    key <AD07>	{ [  downarrow,        uparrow ]	};
+    key <AD08>	{ [ rightarrow,       idotless ]	};
+    key <AD09>	{ [     oslash,       Ooblique ]	};
+    key <AD10>	{ [      thorn,          THORN ]	};
+    key <AD11>	{ [ NoSymbol, dead_abovering ]	};
+    key <AD12>	{ [ dead_tilde,    dead_macron ]	};
+
+    key <AC01>	{ [         ae,          AE ]	};
+    key <AC02>	{ [     ssharp,     section ]	};
+    key <AC03>	{ [        eth,         ETH ]	};
+    key <AC04>	{ [ NoSymbol, ordfeminine ]	};
+    key <AC05>	{ [        eng,         ENG ]	};
+    key <AC06>	{ [    hstroke,     Hstroke ]	};
+    key <AC07>	{ [      U0133,       U0132 ]	};
+    key <AC08>	{ [        kra,  NoSymbol ]	};
+    key <AC09>	{ [      U0140,       U013F ]	};
+    key <AC10>	{ [ dead_acute, dead_doubleacute ]	};
+    key <AC11>	{ [ NoSymbol,  dead_caron ]	};
+    key <BKSL>	{ [ NoSymbol,  dead_breve ]	};
+
+
+    key <LSGT>	{ [ NoSymbol,   brokenbar ]	};
+
+    key <AB03>	{ [       cent,   copyright ]	};
+    key <AB04>	{ [  leftdoublequotemark,  leftsinglequotemark ]	};
+    key <AB05>	{ [ rightdoublequotemark, rightsinglequotemark ]	};
+    key <AB06>	{ [      U0149,       U266A ]	};
+    key <AB07>	{ [         mu,   masculine ]	};
+    key <AB08>	{ [ Greek_horizbar, multiply ]	};
+    key <AB09>	{ [ periodcentered, division ]	};
+    key <AB10>	{ [ NoSymbol, dead_abovedot ]	};
+
+};
+
+// based on
+// Inuktitut keyboard for X11
+// written by Pablo Saratxaga <pablo@mandrakesoft.com>
+
+alphanumeric_keys 
+xkb_symbols "ike" {
+
+    name[Group1]= "Inuktitut";
+
+    key	<AE01> { [ 0x01001595, 1		]	};
+    key	<AE02> { [ 0x01001449, 2		]	};
+    key	<AE03> { [ 0x01001550, 3		]	};
+    key	<AE04> { [ 0x01001483, 4		]	};
+    key	<AE05> { [ 0x01001466, 5		]	};
+    key	<AE06> { [ 0x01001585, 6		]	};
+    key	<AE07> { [ 0x010014bb, 7		]	};
+    key	<AE08> { [ 0x010014d0, 8		]	};
+    key	<AE09> { [ 0x010014ea, 9		]	};
+    key	<AE10> { [ 0x0100153e, 0		]	};
+    key	<AE11> { [ minus,	  underscore	]	};
+    key	<AE12> { [ 0x0100155d, equal		]	};
+
+	key <AD01> { [ 0x0100158f, 0x0100148b	]	};
+	key <AD02> { [ 0x01001403, 0x01001431	]	};
+	key <AD03> { [ 0x0100157f, 0x01001546	]	};
+	key <AD04> { [ 0x0100146d, 0x01001596	]	};
+	key <AD05> { [ 0x0100144e, 0x01001671	]	};
+	key <AD06> { [ 0x010014ef, 0x01001673	]	};
+	key <AD07> { [ 0x010014a5, 0x01001675	]	};
+	key <AD08> { [ 0x010014c2, 0x010015a4	]	};
+	key <AD09> { [ 0x010014d5, 0x010015a0	]	};
+	key <AD10> { [ 0x01001528, 0x010015a6	]	};
+	key <AD11> { [ 0x010014a1, 0x01001505	]	};
+	key <AD12> { [ dead_abovedot, 0x0100141e]	};
+
+	key <AC01> { [ 0x01001591, 0x0100148d	]	};
+	key <AC02> { [ 0x01001405, 0x01001433	]	};
+	key <AC03> { [ 0x01001581, 0x01001548	]	};
+	key <AC04> { [ 0x0100146f, 0x01001555	]	};
+	key <AC05> { [ 0x01001450, parenleft 	]	};
+	key <AC06> { [ 0x010014f1, parenright	]	};
+	key <AC07> { [ 0x010014a7, 0x0100152a	]	};
+	key <AC08> { [ 0x010014c4, 0x01001557	]	};
+	key <AC09> { [ 0x010014d7, 0x010015a2	]	};
+	key <AC10> { [ semicolon,  colon     	]	};
+	key <AC11> { [ apostrophe, quotedbl     ]	};
+
+	key <AB01> { [ 0x01001593, 0x01001490	]	};
+	key <AB02> { [ 0x0100140a, 0x01001438	]	};
+	key <AB03> { [ 0x01001583, 0x0100154b	]	};
+	key <AB04> { [ 0x01001472, question  	]	};
+	key <AB05> { [ 0x01001455, 0x0100157c	]	};
+	key <AB06> { [ 0x010014f4, 0x010014c7	]	};
+	key <AB07> { [ 0x010014aa, 0x010014da	]	};
+	key <AB08> { [ comma,      less      	]	};
+	key <AB09> { [ period,     greater   	]	};
+	key <AB10> { [ 0x0100152d, 0x01001559	]	};
+
+    key	<TLDE> { [ 0x0100157b, 0x01001575	]	};
+    key	<LSGT> { [ 0x01001579, 0x01001577	]	};
+    key	<BKSL> { [ backslash,  bar		]	};
+
+// End alphanumeric section
+};
+
+partial
+xkb_symbols "multix" {
+
+    name[Group1] = "Canadian Multilingual";
+
+    key.type[group1]="EIGHT_LEVEL_SEMIALPHABETIC";
+    key <TLDE>	{ [     slash,  backslash,            bar, NoSymbol,
+    		   NoSymbol,     hyphen ]	};
+    key <AE01>	{ [         1,     exclam,      plusminus, NoSymbol,
+    		  onesuperior, exclamdown ]	};
+    key <AE02>	{ [         2,         at,             at, NoSymbol,
+    		  twosuperior, NoSymbol ]	};
+    key <AE03>	{ [         3, numbersign,       sterling, NoSymbol,
+    		threesuperior,   sterling ]	};
+    key <AE04>	{ [         4,     dollar,           cent, NoSymbol,
+    		   onequarter,   currency ]	};
+    key <AE05>	{ [         5,    percent,       currency, NoSymbol,
+    		      onehalf, threeeighths ]	};
+    key <AE06>	{ [         6,   question,        notsign, NoSymbol,
+    		threequarters, fiveeighths ]	};
+    key <AE07>	{ [         7,  ampersand,      braceleft, NoSymbol,
+    		   NoSymbol, seveneighths ]	};
+    key <AE08>	{ [         8,   asterisk,     braceright, NoSymbol,
+    		   NoSymbol,  trademark ]	};
+    key <AE09>	{ [         9,  parenleft,    bracketleft, NoSymbol,
+    		   NoSymbol,  plusminus ]	};
+    key <AE10>	{ [         0, parenright,   bracketright, NoSymbol ] };
+    key <AE11>	{ [     minus, underscore,        onehalf, NoSymbol,
+    		   NoSymbol, questiondown]	};
+    key <AE12>	{ [     equal,       plus,        notsign, NoSymbol,
+    		dead_cedilla, dead_ogonek ]	};
+
+    key.type[group1]="EIGHT_LEVEL_SEMIALPHABETIC";
+    key <AD01>	{ [         q,           Q,     NoSymbol, NoSymbol,
+		   NoSymbol, Greek_OMEGA ]	};
+    key <AD02>	{ [         w,           W,     NoSymbol, NoSymbol,
+   		      lstroke,     Lstroke ]	};
+    key <AD03>	{ [         e,           E,     NoSymbol, NoSymbol,
+    			   oe,          OE ]	};
+    key <AD04>	{ [         r,           R,     NoSymbol, NoSymbol,
+    		    paragraph,  registered ]	};
+    key <AD05>	{ [         t,           T,     NoSymbol, NoSymbol,
+		       tslash,      Tslash ]	};
+    key <AD06>	{ [         y,           Y,     NoSymbol, NoSymbol,
+		    leftarrow,         yen ]	};
+    key <AD07>	{ [         u,           U,     NoSymbol, NoSymbol,
+    		    downarrow,     uparrow ]	};
+    key <AD08>	{ [         i,           I,     NoSymbol, NoSymbol,
+    		   rightarrow,    idotless ]	};
+    key <AD09>	{ [         o,           O,        section, NoSymbol,
+		       oslash,    Ooblique ]	};
+    key <AD10>	{ [         p,           P,      paragraph, NoSymbol,
+		        thorn,       THORN ]	};
+
+    key.type[group1]="EIGHT_LEVEL";
+    key <AD11>	{ [dead_circumflex, dead_diaeresis, dead_grave, NoSymbol,
+    			NoSymbol, dead_abovering ]	};
+
+    key.type[group1]="EIGHT_LEVEL_SEMIALPHABETIC";
+    key <AD12>	{ [  ccedilla,   Ccedilla,     asciitilde, NoSymbol,
+		   dead_tilde,    dead_macron ]	};
+
+    key <AC01>	{ [         a,          A,     NoSymbol, NoSymbol,
+    			   ae,         AE ]	};
+    key <AC02>	{ [         s,          S,     NoSymbol, NoSymbol,
+    		       ssharp,    section ]	};
+    key <AC03>	{ [         d,          D,     NoSymbol, NoSymbol,
+    			  eth,        ETH ]	};
+    key <AC04>	{ [         f,          F,     NoSymbol, NoSymbol,
+    		   NoSymbol, ordfeminine ]	};
+    key <AC05>	{ [         g,          G,     NoSymbol, NoSymbol,
+    			  eng,        ENG ]	};
+    key <AC06>	{ [         h,          H,     NoSymbol, NoSymbol,
+    		      hstroke,    Hstroke ]	};
+    key <AC07>	{ [         j,          J,     NoSymbol, NoSymbol,
+    			U0133,      U0132 ]	};
+    key <AC08>	{ [         k,          K,     NoSymbol, NoSymbol,
+    			  kra, NoSymbol ]	};
+    key <AC09>	{ [         l,          L,     NoSymbol, NoSymbol,
+    			U0140,      U013F ]	};
+
+    key.type[group1]="EIGHT_LEVEL";
+    key <AC10>	{ [ semicolon,          colon,         degree, NoSymbol,
+    		   dead_acute, dead_doubleacute ]	};
+
+    key.type[group1]="EIGHT_LEVEL_SEMIALPHABETIC";
+    key <AC11>	{ [    egrave,         Egrave,      braceleft, NoSymbol,
+    		   NoSymbol,  dead_caron ]	};
+    key <BKSL>	{ [    agrave,         Agrave,     braceright, NoSymbol,
+    		   NoSymbol,  dead_breve ]	};
+
+    key <LSGT>	{ [    ugrave,     Ugrave,         degree, NoSymbol,
+    		   NoSymbol,   brokenbar ]	};
+
+    key.type[group1]="FOUR_LEVEL_SEMIALPHABETIC";
+    key <AB01>	{ [         z,          Z,  guillemotleft, NoSymbol ]	};
+    key <AB02>	{ [         x,          X, guillemotright, NoSymbol ]	};
+
+    key.type[group1]="EIGHT_LEVEL_SEMIALPHABETIC";
+    key <AB03>	{ [         c,          C,     NoSymbol, NoSymbol,
+    			 cent,   copyright ]	};
+    key <AB04>	{ [         v,          V,     NoSymbol, NoSymbol,
+    	  leftdoublequotemark,  leftsinglequotemark ]	};
+    key <AB05>	{ [         b,          B,     NoSymbol, NoSymbol,
+    	 rightdoublequotemark, rightsinglequotemark ]	};
+    key <AB06>	{ [         n,          N,     NoSymbol, NoSymbol,
+    			U0149,       U266A ]	};
+    key <AB07>	{ [         m,          M,             mu, NoSymbol,
+    			   mu,   masculine ]	};
+    key <AB08>	{ [     comma, apostrophe,           less, NoSymbol,
+    	       Greek_horizbar, multiply ]	};
+    key <AB09>	{ [    period,   quotedbl,        greater, NoSymbol,
+    	       periodcentered, division ]	};
+    key <AB10>	{ [    eacute,     Eacute,     dead_acute, NoSymbol,
+    		   NoSymbol, dead_abovedot ]	};
+
+    include "nbsp(level3s)"
+
+    modifier_map Control{ Control_L };
+
+    include "level3(ralt_switch)"
+    include "level5(rctrl_switch)"
+};
+
+// Secwepemctsin keyboard for X11
+// written by Neskie Manuel <neskiem@gmail.com>
+
+partial alphanumeric_keys  
+xkb_symbols "shs" {
+
+    include "us"
+
+    name[Group1]= "Secwepemctsin";
+
+    //Using Dead key to get COMBINING COMMA ABOVE for ejectives on
+    //q, l, t, s, m, g, k, p, w, y, r
+    //XCompose key is used for the other accute and grave.
+
+    key <AB08>	{ [ comma, less, U0313    ]	};
+    key <AC01>	{ [ a, A, aacute, Aacute  ]	};
+    key <AD03>	{ [ e, E, eacute, Eacute  ]	};
+    key <AD07>	{ [ u, U, uacute, Uacute  ]	};
+    key <AD08>	{ [ i, I, iacute, Iacute  ]	};
+    key <AD09>	{ [ o, O, oacute, Oacute  ]	};
+
+    include "level3(ralt_switch)"
+    include "compose(rctrl)"
+};
+
+// OLPC Section
+xkb_symbols "olpc" {
+
+    include "ca(fr)"
+    
+    key <AE02>	{ [          2,    quotedbl,          ograve,        Ograve ] };
+    key <AE03>	{ [          3,    slash,          at,        VoidSymbol ] };
+    
+    key <AD03>	{ [          e,    E,          EuroSign, VoidSymbol]	};
+        
+    key <AB09>	{ [  period,         period,         0x1002010 ]	};
+    
+    key <I219>  { [  guillemotleft,  guillemotright, degree, VoidSymbol ] };
+};
+
+partial alphanumeric_keys 
+xkb_symbols "kut" {
+
+    //Ejective U0313  and compose accents are from shs layout
+    include "ca(shs)"
+
+    name[Group1]= "Kutenai";
+
+    // Alphanumeric section
+
+    // Alveolar Click
+    key <AD05> {	[ t,	T,U01C2	,U01C2	]	};
+
+    //Cent sign
+    key <AB03> {	[ c,	C,U00A2,U00A2	]	};
+
+    //Mid dot
+    key <AB09> {	[ period,     greater,U00B7   	]	};
+
+    //Glottal stop
+    key <AB10> {	[ slash,	question, U0294	]	};
+
+    //COMBINING COMMA ABOVE RIGHT
+    key <AC11> {	[ apostrophe,	quotedbl, U0315,U0315	]	};
+
+    //MODIFIER LETTER RIGHT HALF RING
+    key <AC10> {	[ semicolon,	colon,U02BE,U02BE	]	};
+};
+
+partial alphanumeric_keys 
+xkb_symbols "eng" {
+    name[Group1] = "English (Canada)";
+    include "us(basic)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/cd b/xorg-server/xkeyboard-config/symbols/cd
index 5cc09a154..938bf2b69 100644
--- a/xorg-server/xkeyboard-config/symbols/cd
+++ b/xorg-server/xkeyboard-config/symbols/cd
@@ -1,69 +1,69 @@
-// based on us_intl keyboard map file and a Sinhala keyboard map

-// version 0.3

-

-partial default alphanumeric_keys

-xkb_symbols "basic" {

-

-    name[Group1]= "Congo, Democratic Republic of the";

-

-    key.type[Group1] = "FOUR_LEVEL";

-

-    // Alphanumeric section

-    // TILDE, COMBINING TILDE

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

-    key <AE01> { [ ampersand,          1, numbersign                      ] };

-    key <AE02> { [0x01000301,          2, at                              ] };

-    key <AE03> { [0x01000300,          3, guillemotleft                   ] };

-    key <AE04> { [ parenleft,          4, bracketleft                     ] };

-    key <AE05> { [ braceleft,          5, less                            ] };

-    key <AE06> { [ braceright,         6, greater                         ] };

-    key <AE07> { [parenright,          7, bracketright                    ] };

-    key <AE08> { [0x01000302,          8, guillemotright                  ] };

-    key <AE09> { [0x0100030c,          9, 0x0100030D                      ] };

-    key <AE10> { [0x01000308,          0, at                              ] };

-    key <AE11> { [     minus,      underscore,  percent,          degree  ] };

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

-

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

-    key <AD02> { [	   z,          Z                                  ] };

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

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

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

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

-    key <AD07> { [	   u,          U,    0x01000289,       0x01001d7e ] };

-    key <AD08> { [	   i,          I,    0x01000268,       0x01000197 ] };

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

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

-    key <AD11> { [0x0100025B,      0x01000190,     asciicircum ] };

-    key <AD12> { [ asterisk, asciicircum, dollar                ] };

-

-    key <AC01> { [	   q,          Q                                  ] };

-    key <AC02> { [	   s,          S                                  ] };

-    key <AC03> { [	   d,          D                                  ] };

-    key <AC04> { [	   f,          F                                  ] };

-    key <AC05> { [	   g,          G                                  ] };

-    key <AC06> { [	   h,          H                                  ] };

-    key <AC07> { [	   j,          J                                  ] };

-    key <AC08> { [	   k,          K                                  ] };

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

-    key <AC10> { [         m,          M                                  ] };

-    key <AC11> { [0x01000254, 0x01000186                                  ] };

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

-

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

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

-    key <AB03> { [	   c,          C,       ccedilla,       Ccedilla  ] };

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

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

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

-    key <AB07> { [     comma,   question,      0x01000327                 ] };

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

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

-    key <AB10> { [    exclam,   apostrophe,    0x01002019                 ] };

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

-

-    // SPACE, SPACE, SPACE, NO-BREAK SPACE, SPACE

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

-

-    include "level3(ralt_switch)"

-};

+// based on us_intl keyboard map file and a Sinhala keyboard map
+// version 0.3
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+
+    name[Group1]= "French (Democratic Republic of the Congo)";
+
+    key.type[Group1] = "FOUR_LEVEL";
+
+    // Alphanumeric section
+    // TILDE, COMBINING TILDE
+    key <TLDE> { [     grave, asciitilde, 0x01000303] };
+    key <AE01> { [ ampersand,          1, numbersign                      ] };
+    key <AE02> { [0x01000301,          2, at                              ] };
+    key <AE03> { [0x01000300,          3, guillemotleft                   ] };
+    key <AE04> { [ parenleft,          4, bracketleft                     ] };
+    key <AE05> { [ braceleft,          5, less                            ] };
+    key <AE06> { [ braceright,         6, greater                         ] };
+    key <AE07> { [parenright,          7, bracketright                    ] };
+    key <AE08> { [0x01000302,          8, guillemotright                  ] };
+    key <AE09> { [0x0100030c,          9, 0x0100030D                      ] };
+    key <AE10> { [0x01000308,          0, at                              ] };
+    key <AE11> { [     minus,      underscore,  percent,          degree  ] };
+    key <AE12> { [     equal,      plus,       multiply,        division  ] };
+
+    key <AD01> { [         a,          A,            ae,              AE  ] };
+    key <AD02> { [	   z,          Z                                  ] };
+    key <AD03> { [	   e,          E,            oe,              OE  ] };
+    key <AD04> { [         r,          R                                  ] };
+    key <AD05> { [	   t,          T                                  ] };
+    key <AD06> { [	   y,          Y                                  ] };
+    key <AD07> { [	   u,          U,    0x01000289,       0x01001d7e ] };
+    key <AD08> { [	   i,          I,    0x01000268,       0x01000197 ] };
+    key <AD09> { [	   o,          O,        oslash,         Ooblique ] };
+    key <AD10> { [	   p,          P                                  ] };
+    key <AD11> { [0x0100025B,      0x01000190,     asciicircum ] };
+    key <AD12> { [ asterisk, asciicircum, dollar                ] };
+
+    key <AC01> { [	   q,          Q                                  ] };
+    key <AC02> { [	   s,          S                                  ] };
+    key <AC03> { [	   d,          D                                  ] };
+    key <AC04> { [	   f,          F                                  ] };
+    key <AC05> { [	   g,          G                                  ] };
+    key <AC06> { [	   h,          H                                  ] };
+    key <AC07> { [	   j,          J                                  ] };
+    key <AC08> { [	   k,          K                                  ] };
+    key <AC09> { [	   l,          L                                  ] };
+    key <AC10> { [         m,          M                                  ] };
+    key <AC11> { [0x01000254, 0x01000186                                  ] };
+    key <LSGT> { [    backslash,     bar                                  ] };
+
+    key <AB01> { [	   w,          W                                  ] };
+    key <AB02> { [         x,          X                                  ] };
+    key <AB03> { [	   c,          C,       ccedilla,       Ccedilla  ] };
+    key <AB04> { [	   v,          V                                  ] };
+    key <AB05> { [	   b,          B                                  ] };
+    key <AB06> { [	   n,          N                                  ] };
+    key <AB07> { [     comma,   question,      0x01000327                 ] };
+    key <AB08> { [ semicolon,     period                                  ] };
+    key <AB09> { [     colon,      slash                                  ] };
+    key <AB10> { [    exclam,   apostrophe,    0x01002019                 ] };
+    key <BKSL> { [  quotedbl,  backslash,            bar                  ] };
+
+    // SPACE, SPACE, SPACE, NO-BREAK SPACE, SPACE
+    key <SPCE> { [ space,          space,    nobreakspace,     0x0100202F ] };
+
+    include "level3(ralt_switch)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/cn b/xorg-server/xkeyboard-config/symbols/cn
index 0d62ab3d4..cceb64b7d 100644
--- a/xorg-server/xkeyboard-config/symbols/cn
+++ b/xorg-server/xkeyboard-config/symbols/cn
@@ -1,216 +1,216 @@
-//

-// Default Chinese is the same as American

-//

-partial default alphanumeric_keys 

-xkb_symbols "basic" {

-    include "us(basic)"

-

-    name[Group1]= "China";

-};

-

-// Tibetan Standard Keyboard map for XKB/X.org

-//

-// Based on the CNS Tibetan keyboard as supported by Windows Vista

-// using information published by Tashi Tsering:

-// http://www.yalasoo.com/English/docs/yalasoo_en_MStbKb.html

-//

-// XKB version by Rich Felker <dalias@aerifal.cx>.

-//

-// The CNS Tibetan keyboard standard specifies 5 keyboards worth of keys,

-// but apparently makes no requirements about how each is accessed. Only

-// the first 2 are needed for native Tibetan text; the remainder are

-// filled with special symbols and letters for transliterating foreign

-// text. Further, CNS leaves the level of support of keyboards 2-5 as an

-// option to the implementor (despite the fact that #2 is absolutely

-// essential...). Windows Vista maps them as follows:

-//

-// 1. Unshifted

-// 2. "m"-key-prefixed

-// 3. Shift-modified

-// 4. Ctrl+Alt+Shift-modified

-// 5. "M"-key-prefixed

-//

-// I roughly copy the Windows Vista mapping, which was intended by the

-// designer of the keyboard, with the following exceptions:

-//

-// The fifth keyboard is almost empty and contains only precomposed forms

-// of subjoined letter characters whose use is strongly discouraged, and

-// is not implemented at all in this XKB map. The fourth is implemented,

-// but is accessed by an "m"-prefix (or "M"-prefix, for convenience)

-// followed by a Shift-modified key. This avoids stealing the Ctrl and Alt

-// keys, which belong to applications on *nix and not to the keyboard or

-// input method. Aside from enterring rare special symbols and

-// foreign-word-transliteration letters, these differences should not

-// affect users.

-//

-// Implementation notes:

-//

-// A latching ISO Level3 shift is used for the "m"-prefix modifier. In

-// principle moving it to other keys (e.g. AltGr) would be possible

-// according to user preference, but this is not practical for typing

-// Tibetan, since the subjoined consonants, of which Tibetan has 0-2 per

-// syllable, are accessed via this mechanism.

-//

-// One annoyance is that the latching Level3 shift fails to work if the

-// previous key is not yet released when "m" is pressed (the key release

-// event kills the latch). I consider this a bug in X and don't know an

-// easy way to work around it. Complain to the maintainers if it bothers

-// you and maybe they'll find a fix. You won't notice it unless you're

-// fast at typing Tibetan anyway.

-

-partial alphanumeric_keys 

-xkb_symbols "tib" {

-

-    name[Group1]= "China - Tibetan";

-

-    key <TLDE> { [ 0x1000f68, 0x1000f01, 0x1000fb8, 0x1000f00 ] }; # ཨ ༁ ྸ ༀ

-    key <AE01> { [ 0x1000f21, 0x1000f2a, 0x1000f04, 0x1000f76 ] }; # ༡ ༪ ༄ ྲྀ

-    key <AE02> { [ 0x1000f22, 0x1000f2b, 0x1000f05, 0x1000f77 ] }; # ༢ ༫ ༅ ཷ

-    key <AE03> { [ 0x1000f23, 0x1000f2c, 0x1000f7e, 0x1000f78 ] }; # ༣ ༬ ཾ ླྀ

-    key <AE04> { [ 0x1000f24, 0x1000f2d, 0x1000f83, 0x1000f79 ] }; # ༤ ༭ ྃ ཹ

-    key <AE05> { [ 0x1000f25, 0x1000f2e, 0x1000f37, 0x1000f81 ] }; # ༥ ༮ ༷ ཱྀ

-    key <AE06> { [ 0x1000f26, 0x1000f2f, 0x1000f35, 0x1000f09 ] }; # ༦ ༯ ༵ ༉

-    key <AE07> { [ 0x1000f27, 0x1000f30, 0x1000f7f, 0x1000f0a ] }; # ༧ ༰ ཿ ༊

-    key <AE08> { [ 0x1000f28, 0x1000f31, 0x1000f14, 0x1000f0f ] }; # ༨ ༱ ༔ ༏

-    key <AE09> { [ 0x1000f29, 0x1000f32, 0x1000f11, 0x1000f10 ] }; # ༩ ༲ ༑ ༐

-    key <AE10> { [ 0x1000f20, 0x1000f33, 0x1000f08, 0x1000f12 ] }; # ༠ ༳ ༈ ༒

-    key <AE11> { [ 0x1000f67, 0x1000f3c, 0x1000fb7, 0x1000f0c ] }; # ཧ ༼ ྷ ༌

-    key <AE12> { [ 0x1000f5d, 0x1000f3d, 0x1000fba, 0x1000f13 ] }; # ཝ ༽ ྺ ༓

-

-    key <AD01> { [ 0x1000f45, 0x1000f15, 0x1000f95, 0x1000f89 ] }; # ཅ ༕ ྕ ྉ

-    key <AD02> { [ 0x1000f46, 0x1000f16, 0x1000f96, 0x1000f88 ] }; # ཆ ༖ ྖ ྈ

-    key <AD03> { [ 0x1000f7a, 0x1000f17, 0x1000f7b, 0x1000fbe ] }; # ེ ༗ ཻ ྾

-    key <AD04> { [ 0x1000f62, 0x1000fbc, 0x1000fb2, 0x1000f6a ] }; # ར ྼ ྲ ཪ

-    key <AD05> { [ 0x1000f4f, 0x1000f4a, 0x1000f9f, 0x1000f9a ] }; # ཏ ཊ ྟ ྚ

-    key <AD06> { [ 0x1000f61, 0x1000fbb, 0x1000fb1, 0x1000fbf ] }; # ཡ ྻ ྱ ྿

-    key <AD07> { [ 0x1000f74, 0x1000f18, 0x1000fad, 0x1000f75 ] }; # ུ ༘ ྭ ཱུ

-    key <AD08> { [ 0x1000f72, 0x1000f19, 0x1000f80, 0x1000f73 ] }; # ི ༙ ྀ ཱི

-    key <AD09> { [ 0x1000f7c, 0x1000f1a, 0x1000f7d, 0x1000fc0 ] }; # ོ ༚ ཽ ࿀

-    key <AD10> { [ 0x1000f55, 0x1000f1b, 0x1000fa5, 0x1000fc1 ] }; # ཕ ༛ ྥ ࿁

-    key <AD11> { [ 0x1000f59, 0x1000f1c, 0x1000fa9, 0x1000fc2 ] }; # ཙ ༜ ྩ ࿂

-    key <AD12> { [ 0x1000f5a, 0x1000f1d, 0x1000faa, 0x1000fc3 ] }; # ཚ ༝ ྪ ࿃

-    key <BKSL> { [ 0x1000f5b, 0x1000f1e, 0x1000fab, 0x1000f5c ] }; # ཛ ༞ ྫ ཛྷ

-

-    key <AC01> { [ 0x1000f60, 0x1000f71, 0x1000fb0, 0x1000fc4 ] }; # འ ཱ ྰ ࿄

-    key <AC02> { [ 0x1000f66, 0x1000f1f, 0x1000fb6, 0x1000fc5 ] }; # ས ༟ ྶ ࿅

-    key <AC03> { [ 0x1000f51, 0x1000f4c, 0x1000fa1, 0x1000f9c ] }; # ད ཌ ྡ ྜ

-    key <AC04> { [ 0x1000f56, 0x1000f3e, 0x1000fa6, 0x1000f57 ] }; # བ ༾ ྦ བྷ

-    key <AC05> { [ 0x1000f44, 0x1000f3f, 0x1000f94, 0x1000fc6 ] }; # ང ༿ ྔ ࿆

-    key <AC06> { [ 0x1000f58, 0x1000fcf, 0x1000fa8, 0x1000fc7 ] }; # མ ࿏ ྨ ࿇

-    key <AC07> { [ 0x1000f0b, 0x1000f02, 0x1000f84, 0x1000fc8 ] }; # ་ ༂ ྄ ࿈

-    key <AC08> { [ 0x1000f42, 0x1000f03, 0x1000f92, 0x1000f43 ] }; # ག ༃ ྒ གྷ

-    key <AC09> { [ 0x1000f63, 0x1000f06, 0x1000fb3, 0x1000fc9 ] }; # ལ ༆ ླ ࿉

-    key <AC10> { [ 0x1000f5e, 0x1000f07, 0x1000fae, 0x1000fca ] }; # ཞ ༇ ྮ ࿊

-    key <AC11> { [ 0x1000f0d, 0x1000f38, 0x1000f0e, 0x1000fcb ] }; # ། ༸ ༎ ࿋

-

-    key <AB01> { [ 0x1000f5f, 0x1000f34, 0x1000faf, 0x1000fcc ] }; # ཟ ༴ ྯ ࿌

-    key <AB02> { [ 0x1000f64, 0x1000f65, 0x1000fb4, 0x1000fb5 ] }; # ཤ ཥ ྴ ྵ

-    key <AB03> { [ 0x1000f40, 0x1000f69, 0x1000f90, 0x1000fb9 ] }; # ཀ ཀྵ ྐ ྐྵ

-    key <AB04> { [ 0x1000f41, 0x1000f87, 0x1000f91, 0x1000f36 ] }; # ཁ ྇ ྑ ༶

-    key <AB05> { [ 0x1000f54, 0x1000f86, 0x1000fa4, 0x1000f82 ] }; # པ ྆ ྤ ྂ

-    key <AB06> { [ 0x1000f53, 0x1000f4e, 0x1000fa3, 0x1000f9e ] }; # ན ཎ ྣ ྞ

-    key <AB07> { [ ISO_Level3_Latch, ISO_Level3_Latch, 0x1000f85, 0x1000f52 ] }; # -བཏགས་ ྅ དྷ

-    key <AB08> { [ 0x1000f50, 0x1000f4b, 0x1000fa0, 0x1000f9b ] }; # ཐ ཋ ྠ ྛ

-    key <AB09> { [ 0x1000f47, 0x1000f3a, 0x1000f97, 0x1000f8b ] }; # ཇ ༺ ྗ ྋ

-    key <AB10> { [ 0x1000f49, 0x1000f3b, 0x1000f99, 0x1000f8a ] }; # ཉ ༻ ྙ ྊ

- 

-};

-

-// Tibetan Standard Keyboard with ASCII numerals

-//

-// Users may prefer that the numeral keys enter ASCII numerals instead of

-// Tibetan numerals, since the latter are not in modern use in Tibet.

-// This is especially an issue for laptop users who do not have a numeric

-// keypad by which to access the ASCII numerals, and who need to type

-// numbers to be interpreted by applications.

-//

-// In this mapping, the Shift-modified numeral keys generate Tibetan

-// numerals, since it was unclear to me that the standard Latin punctuation

-// keys would be any use without Latin letters. (One can imagine wanting to

-// type an email address using the @ sign, but as of present non-ASCII

-// email addresses are not possible.) This mapping may change in the future

-// if a clearly better use for the shifted numerals is pointed out by users.

-

-partial alphanumeric_keys 

-xkb_symbols "tib_asciinum" {

-    include "cn(tib)"

-

-    name[Group1]= "China - Tibetan (with ASCII numerals)";

-

-    key <AE01> { [ 1, 0x1000f21, 0x1000f04, 0x1000f76 ] }; # 1 ༡ ༄ ྲྀ

-    key <AE02> { [ 2, 0x1000f22, 0x1000f05, 0x1000f77 ] }; # 2 ༢ ༅ ཷ

-    key <AE03> { [ 3, 0x1000f23, 0x1000f7e, 0x1000f78 ] }; # 3 ༣ ཾ ླྀ

-    key <AE04> { [ 4, 0x1000f24, 0x1000f83, 0x1000f79 ] }; # 4 ༤ ྃ ཹ

-    key <AE05> { [ 5, 0x1000f25, 0x1000f37, 0x1000f81 ] }; # 5 ༥ ༷ ཱྀ

-    key <AE06> { [ 6, 0x1000f26, 0x1000f35, 0x1000f09 ] }; # 6 ༦ ༵ ༉

-    key <AE07> { [ 7, 0x1000f27, 0x1000f7f, 0x1000f0a ] }; # 7 ༧ ཿ ༊

-    key <AE08> { [ 8, 0x1000f28, 0x1000f14, 0x1000f0f ] }; # 8 ༨ ༔ ༏

-    key <AE09> { [ 9, 0x1000f29, 0x1000f11, 0x1000f10 ] }; # 9 ༩ ༑ ༐

-    key <AE10> { [ 0, 0x1000f20, 0x1000f08, 0x1000f12 ] }; # 0 ༠ ༈ ༒

-};

-

-// Uyghur Standard Keyboard map for XKB/X.org

-//

-// xkb version originally created by

-// Abdusalam Abdurahman <Abdusalam.Abdurahman@gmail.com>

-// slightly corrected according to feedback and submitted by

-// Ekrem Tomur <ekrem.tomur@gmail.com>

-

-partial alphanumeric_keys 

-xkb_symbols "uig" {

-

-    name[Group1]= "China - Uyghur";

-

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

-

-    key <AE01> { [ 1,                exclam               ] };  // 1 !

-    key <AE02> { [ 2,                at                   ] };  // 2 @

-    key <AE03> { [ 3,                numbersign           ] };  // 3 # 

-    key <AE04> { [ 4,                dollar               ] };  // 4 $

-    key <AE05> { [ 5,                percent              ] };  // 5 %

-    key <AE06> { [ 6,                asciicircum          ] };  // 6 ^

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

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

-    key <AE09> { [ 9,                parenright           ] };  // 9 )

-    key <AE10> { [ 0,                parenleft            ] };  // 0 (

-    key <AE11> { [ minus,            0x1002014            ] };  // - —

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

-

-    key <AD01> { [ 0x1000686,        VoidSymbol           ] };  // چ

-    key <AD02> { [ 0x10006cb,        VoidSymbol           ] };  // ۋ

-    key <AD03> { [ 0x10006d0,        VoidSymbol           ] };  // ې

-    key <AD04> { [ 0x1000631,        VoidSymbol           ] };  // ر

-    key <AD05> { [ 0x100062a,        VoidSymbol           ] };  // ت

-    key <AD06> { [ 0x100064a,        VoidSymbol           ] };  // ي

-    key <AD07> { [ 0x10006c7,        VoidSymbol           ] };  // ۇ

-    key <AD08> { [ 0x10006ad,        VoidSymbol           ] };  // ڭ

-    key <AD09> { [ 0x1000648,        VoidSymbol           ] };  // و

-    key <AD10> { [ 0x100067e,        VoidSymbol           ] };  // پ

-    key <AD11> { [ bracketright,     guillemotright       ] };  // ] »

-    key <AD12> { [ bracketleft,      guillemotleft        ] };  // [ «

-

-    key <AC01> { [ 0x10006be,        VoidSymbol           ] };  // ھ

-    key <AC02> { [ 0x1000633,        VoidSymbol           ] };  // س

-    key <AC03> { [ 0x100062f,        0x1000698            ] };  // د ژ

-    key <AC04> { [ 0x1000627,        0x1000641            ] };  // ا ف

-    key <AC05> { [ 0x10006d5,        0x10006af            ] };  // ە گ

-    key <AC06> { [ 0x1000649,        0x100062e            ] };  // ى خ

-    key <AC07> { [ 0x1000642,        0x100062c            ] };  // ق ج

-    key <AC08> { [ 0x1000643,        0x10006c6            ] };  // ك ۆ

-    key <AC09> { [ 0x1000644,        VoidSymbol           ] };  // ل

-    key <AC10> { [ Arabic_semicolon, colon                ] };  // ؛ :

-    key <AC11> { [ apostrophe,	     quotedbl             ] };  // ' "

-

-    key <AB01> { [ 0x1000632,        VoidSymbol           ] };  // ز

-    key <AB02> { [ 0x1000634,        VoidSymbol           ] };  // ش

-    key <AB03> { [ 0x100063a,        VoidSymbol           ] };  // غ

-    key <AB04> { [ 0x10006c8,        VoidSymbol           ] };  // ۈ

-    key <AB05> { [ 0x1000628,        VoidSymbol           ] };  // ب

-    key <AB06> { [ 0x1000646,        VoidSymbol           ] };  // ن

-    key <AB07> { [ 0x1000645,        VoidSymbol           ] };  // م

-    key <AB08> { [ Arabic_comma,     0x100203a            ] };  // ، ›

-    key <AB09> { [ period,           0x1002039            ] };  // . ‹

-    key <AB10> { [ 0x1000626,        Arabic_question_mark ] };  // ئ ؟

-

-    key <BKSL> { [ backslash,        bar                  ] };  // \ |

-};

+//
+// Default Chinese is the same as American
+//
+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+    include "us(basic)"
+
+    name[Group1]= "Chinese";
+};
+
+// Tibetan Standard Keyboard map for XKB/X.org
+//
+// Based on the CNS Tibetan keyboard as supported by Windows Vista
+// using information published by Tashi Tsering:
+// http://www.yalasoo.com/English/docs/yalasoo_en_MStbKb.html
+//
+// XKB version by Rich Felker <dalias@aerifal.cx>.
+//
+// The CNS Tibetan keyboard standard specifies 5 keyboards worth of keys,
+// but apparently makes no requirements about how each is accessed. Only
+// the first 2 are needed for native Tibetan text; the remainder are
+// filled with special symbols and letters for transliterating foreign
+// text. Further, CNS leaves the level of support of keyboards 2-5 as an
+// option to the implementor (despite the fact that #2 is absolutely
+// essential...). Windows Vista maps them as follows:
+//
+// 1. Unshifted
+// 2. "m"-key-prefixed
+// 3. Shift-modified
+// 4. Ctrl+Alt+Shift-modified
+// 5. "M"-key-prefixed
+//
+// I roughly copy the Windows Vista mapping, which was intended by the
+// designer of the keyboard, with the following exceptions:
+//
+// The fifth keyboard is almost empty and contains only precomposed forms
+// of subjoined letter characters whose use is strongly discouraged, and
+// is not implemented at all in this XKB map. The fourth is implemented,
+// but is accessed by an "m"-prefix (or "M"-prefix, for convenience)
+// followed by a Shift-modified key. This avoids stealing the Ctrl and Alt
+// keys, which belong to applications on *nix and not to the keyboard or
+// input method. Aside from enterring rare special symbols and
+// foreign-word-transliteration letters, these differences should not
+// affect users.
+//
+// Implementation notes:
+//
+// A latching ISO Level3 shift is used for the "m"-prefix modifier. In
+// principle moving it to other keys (e.g. AltGr) would be possible
+// according to user preference, but this is not practical for typing
+// Tibetan, since the subjoined consonants, of which Tibetan has 0-2 per
+// syllable, are accessed via this mechanism.
+//
+// One annoyance is that the latching Level3 shift fails to work if the
+// previous key is not yet released when "m" is pressed (the key release
+// event kills the latch). I consider this a bug in X and don't know an
+// easy way to work around it. Complain to the maintainers if it bothers
+// you and maybe they'll find a fix. You won't notice it unless you're
+// fast at typing Tibetan anyway.
+
+partial alphanumeric_keys 
+xkb_symbols "tib" {
+
+    name[Group1]= "Tibetan";
+
+    key <TLDE> { [ 0x1000f68, 0x1000f01, 0x1000fb8, 0x1000f00 ] }; # ཨ ༁ ྸ ༀ
+    key <AE01> { [ 0x1000f21, 0x1000f2a, 0x1000f04, 0x1000f76 ] }; # ༡ ༪ ༄ ྲྀ
+    key <AE02> { [ 0x1000f22, 0x1000f2b, 0x1000f05, 0x1000f77 ] }; # ༢ ༫ ༅ ཷ
+    key <AE03> { [ 0x1000f23, 0x1000f2c, 0x1000f7e, 0x1000f78 ] }; # ༣ ༬ ཾ ླྀ
+    key <AE04> { [ 0x1000f24, 0x1000f2d, 0x1000f83, 0x1000f79 ] }; # ༤ ༭ ྃ ཹ
+    key <AE05> { [ 0x1000f25, 0x1000f2e, 0x1000f37, 0x1000f81 ] }; # ༥ ༮ ༷ ཱྀ
+    key <AE06> { [ 0x1000f26, 0x1000f2f, 0x1000f35, 0x1000f09 ] }; # ༦ ༯ ༵ ༉
+    key <AE07> { [ 0x1000f27, 0x1000f30, 0x1000f7f, 0x1000f0a ] }; # ༧ ༰ ཿ ༊
+    key <AE08> { [ 0x1000f28, 0x1000f31, 0x1000f14, 0x1000f0f ] }; # ༨ ༱ ༔ ༏
+    key <AE09> { [ 0x1000f29, 0x1000f32, 0x1000f11, 0x1000f10 ] }; # ༩ ༲ ༑ ༐
+    key <AE10> { [ 0x1000f20, 0x1000f33, 0x1000f08, 0x1000f12 ] }; # ༠ ༳ ༈ ༒
+    key <AE11> { [ 0x1000f67, 0x1000f3c, 0x1000fb7, 0x1000f0c ] }; # ཧ ༼ ྷ ༌
+    key <AE12> { [ 0x1000f5d, 0x1000f3d, 0x1000fba, 0x1000f13 ] }; # ཝ ༽ ྺ ༓
+
+    key <AD01> { [ 0x1000f45, 0x1000f15, 0x1000f95, 0x1000f89 ] }; # ཅ ༕ ྕ ྉ
+    key <AD02> { [ 0x1000f46, 0x1000f16, 0x1000f96, 0x1000f88 ] }; # ཆ ༖ ྖ ྈ
+    key <AD03> { [ 0x1000f7a, 0x1000f17, 0x1000f7b, 0x1000fbe ] }; # ེ ༗ ཻ ྾
+    key <AD04> { [ 0x1000f62, 0x1000fbc, 0x1000fb2, 0x1000f6a ] }; # ར ྼ ྲ ཪ
+    key <AD05> { [ 0x1000f4f, 0x1000f4a, 0x1000f9f, 0x1000f9a ] }; # ཏ ཊ ྟ ྚ
+    key <AD06> { [ 0x1000f61, 0x1000fbb, 0x1000fb1, 0x1000fbf ] }; # ཡ ྻ ྱ ྿
+    key <AD07> { [ 0x1000f74, 0x1000f18, 0x1000fad, 0x1000f75 ] }; # ུ ༘ ྭ ཱུ
+    key <AD08> { [ 0x1000f72, 0x1000f19, 0x1000f80, 0x1000f73 ] }; # ི ༙ ྀ ཱི
+    key <AD09> { [ 0x1000f7c, 0x1000f1a, 0x1000f7d, 0x1000fc0 ] }; # ོ ༚ ཽ ࿀
+    key <AD10> { [ 0x1000f55, 0x1000f1b, 0x1000fa5, 0x1000fc1 ] }; # ཕ ༛ ྥ ࿁
+    key <AD11> { [ 0x1000f59, 0x1000f1c, 0x1000fa9, 0x1000fc2 ] }; # ཙ ༜ ྩ ࿂
+    key <AD12> { [ 0x1000f5a, 0x1000f1d, 0x1000faa, 0x1000fc3 ] }; # ཚ ༝ ྪ ࿃
+    key <BKSL> { [ 0x1000f5b, 0x1000f1e, 0x1000fab, 0x1000f5c ] }; # ཛ ༞ ྫ ཛྷ
+
+    key <AC01> { [ 0x1000f60, 0x1000f71, 0x1000fb0, 0x1000fc4 ] }; # འ ཱ ྰ ࿄
+    key <AC02> { [ 0x1000f66, 0x1000f1f, 0x1000fb6, 0x1000fc5 ] }; # ས ༟ ྶ ࿅
+    key <AC03> { [ 0x1000f51, 0x1000f4c, 0x1000fa1, 0x1000f9c ] }; # ད ཌ ྡ ྜ
+    key <AC04> { [ 0x1000f56, 0x1000f3e, 0x1000fa6, 0x1000f57 ] }; # བ ༾ ྦ བྷ
+    key <AC05> { [ 0x1000f44, 0x1000f3f, 0x1000f94, 0x1000fc6 ] }; # ང ༿ ྔ ࿆
+    key <AC06> { [ 0x1000f58, 0x1000fcf, 0x1000fa8, 0x1000fc7 ] }; # མ ࿏ ྨ ࿇
+    key <AC07> { [ 0x1000f0b, 0x1000f02, 0x1000f84, 0x1000fc8 ] }; # ་ ༂ ྄ ࿈
+    key <AC08> { [ 0x1000f42, 0x1000f03, 0x1000f92, 0x1000f43 ] }; # ག ༃ ྒ གྷ
+    key <AC09> { [ 0x1000f63, 0x1000f06, 0x1000fb3, 0x1000fc9 ] }; # ལ ༆ ླ ࿉
+    key <AC10> { [ 0x1000f5e, 0x1000f07, 0x1000fae, 0x1000fca ] }; # ཞ ༇ ྮ ࿊
+    key <AC11> { [ 0x1000f0d, 0x1000f38, 0x1000f0e, 0x1000fcb ] }; # ། ༸ ༎ ࿋
+
+    key <AB01> { [ 0x1000f5f, 0x1000f34, 0x1000faf, 0x1000fcc ] }; # ཟ ༴ ྯ ࿌
+    key <AB02> { [ 0x1000f64, 0x1000f65, 0x1000fb4, 0x1000fb5 ] }; # ཤ ཥ ྴ ྵ
+    key <AB03> { [ 0x1000f40, 0x1000f69, 0x1000f90, 0x1000fb9 ] }; # ཀ ཀྵ ྐ ྐྵ
+    key <AB04> { [ 0x1000f41, 0x1000f87, 0x1000f91, 0x1000f36 ] }; # ཁ ྇ ྑ ༶
+    key <AB05> { [ 0x1000f54, 0x1000f86, 0x1000fa4, 0x1000f82 ] }; # པ ྆ ྤ ྂ
+    key <AB06> { [ 0x1000f53, 0x1000f4e, 0x1000fa3, 0x1000f9e ] }; # ན ཎ ྣ ྞ
+    key <AB07> { [ ISO_Level3_Latch, ISO_Level3_Latch, 0x1000f85, 0x1000f52 ] }; # -བཏགས་ ྅ དྷ
+    key <AB08> { [ 0x1000f50, 0x1000f4b, 0x1000fa0, 0x1000f9b ] }; # ཐ ཋ ྠ ྛ
+    key <AB09> { [ 0x1000f47, 0x1000f3a, 0x1000f97, 0x1000f8b ] }; # ཇ ༺ ྗ ྋ
+    key <AB10> { [ 0x1000f49, 0x1000f3b, 0x1000f99, 0x1000f8a ] }; # ཉ ༻ ྙ ྊ
+ 
+};
+
+// Tibetan Standard Keyboard with ASCII numerals
+//
+// Users may prefer that the numeral keys enter ASCII numerals instead of
+// Tibetan numerals, since the latter are not in modern use in Tibet.
+// This is especially an issue for laptop users who do not have a numeric
+// keypad by which to access the ASCII numerals, and who need to type
+// numbers to be interpreted by applications.
+//
+// In this mapping, the Shift-modified numeral keys generate Tibetan
+// numerals, since it was unclear to me that the standard Latin punctuation
+// keys would be any use without Latin letters. (One can imagine wanting to
+// type an email address using the @ sign, but as of present non-ASCII
+// email addresses are not possible.) This mapping may change in the future
+// if a clearly better use for the shifted numerals is pointed out by users.
+
+partial alphanumeric_keys 
+xkb_symbols "tib_asciinum" {
+    include "cn(tib)"
+
+    name[Group1]= "Tibetan (with ASCII numerals)";
+
+    key <AE01> { [ 1, 0x1000f21, 0x1000f04, 0x1000f76 ] }; # 1 ༡ ༄ ྲྀ
+    key <AE02> { [ 2, 0x1000f22, 0x1000f05, 0x1000f77 ] }; # 2 ༢ ༅ ཷ
+    key <AE03> { [ 3, 0x1000f23, 0x1000f7e, 0x1000f78 ] }; # 3 ༣ ཾ ླྀ
+    key <AE04> { [ 4, 0x1000f24, 0x1000f83, 0x1000f79 ] }; # 4 ༤ ྃ ཹ
+    key <AE05> { [ 5, 0x1000f25, 0x1000f37, 0x1000f81 ] }; # 5 ༥ ༷ ཱྀ
+    key <AE06> { [ 6, 0x1000f26, 0x1000f35, 0x1000f09 ] }; # 6 ༦ ༵ ༉
+    key <AE07> { [ 7, 0x1000f27, 0x1000f7f, 0x1000f0a ] }; # 7 ༧ ཿ ༊
+    key <AE08> { [ 8, 0x1000f28, 0x1000f14, 0x1000f0f ] }; # 8 ༨ ༔ ༏
+    key <AE09> { [ 9, 0x1000f29, 0x1000f11, 0x1000f10 ] }; # 9 ༩ ༑ ༐
+    key <AE10> { [ 0, 0x1000f20, 0x1000f08, 0x1000f12 ] }; # 0 ༠ ༈ ༒
+};
+
+// Uyghur Standard Keyboard map for XKB/X.org
+//
+// xkb version originally created by
+// Abdusalam Abdurahman <Abdusalam.Abdurahman@gmail.com>
+// slightly corrected according to feedback and submitted by
+// Ekrem Tomur <ekrem.tomur@gmail.com>
+
+partial alphanumeric_keys 
+xkb_symbols "uig" {
+
+    name[Group1]= "Uyghur";
+
+    key <TLDE> { [ grave,            asciitilde           ] };
+
+    key <AE01> { [ 1,                exclam               ] };  // 1 !
+    key <AE02> { [ 2,                at                   ] };  // 2 @
+    key <AE03> { [ 3,                numbersign           ] };  // 3 # 
+    key <AE04> { [ 4,                dollar               ] };  // 4 $
+    key <AE05> { [ 5,                percent              ] };  // 5 %
+    key <AE06> { [ 6,                asciicircum          ] };  // 6 ^
+    key <AE07> { [ 7,                ampersand            ] };  // 7 &
+    key <AE08> { [ 8,                asterisk             ] };  // 8 *
+    key <AE09> { [ 9,                parenright           ] };  // 9 )
+    key <AE10> { [ 0,                parenleft            ] };  // 0 (
+    key <AE11> { [ minus,            0x1002014            ] };  // - —
+    key <AE12> { [ equal,            plus                 ] };  // = +
+
+    key <AD01> { [ 0x1000686,        VoidSymbol           ] };  // چ
+    key <AD02> { [ 0x10006cb,        VoidSymbol           ] };  // ۋ
+    key <AD03> { [ 0x10006d0,        VoidSymbol           ] };  // ې
+    key <AD04> { [ 0x1000631,        VoidSymbol           ] };  // ر
+    key <AD05> { [ 0x100062a,        VoidSymbol           ] };  // ت
+    key <AD06> { [ 0x100064a,        VoidSymbol           ] };  // ي
+    key <AD07> { [ 0x10006c7,        VoidSymbol           ] };  // ۇ
+    key <AD08> { [ 0x10006ad,        VoidSymbol           ] };  // ڭ
+    key <AD09> { [ 0x1000648,        VoidSymbol           ] };  // و
+    key <AD10> { [ 0x100067e,        VoidSymbol           ] };  // پ
+    key <AD11> { [ bracketright,     guillemotright       ] };  // ] »
+    key <AD12> { [ bracketleft,      guillemotleft        ] };  // [ «
+
+    key <AC01> { [ 0x10006be,        VoidSymbol           ] };  // ھ
+    key <AC02> { [ 0x1000633,        VoidSymbol           ] };  // س
+    key <AC03> { [ 0x100062f,        0x1000698            ] };  // د ژ
+    key <AC04> { [ 0x1000627,        0x1000641            ] };  // ا ف
+    key <AC05> { [ 0x10006d5,        0x10006af            ] };  // ە گ
+    key <AC06> { [ 0x1000649,        0x100062e            ] };  // ى خ
+    key <AC07> { [ 0x1000642,        0x100062c            ] };  // ق ج
+    key <AC08> { [ 0x1000643,        0x10006c6            ] };  // ك ۆ
+    key <AC09> { [ 0x1000644,        VoidSymbol           ] };  // ل
+    key <AC10> { [ Arabic_semicolon, colon                ] };  // ؛ :
+    key <AC11> { [ apostrophe,	     quotedbl             ] };  // ' "
+
+    key <AB01> { [ 0x1000632,        VoidSymbol           ] };  // ز
+    key <AB02> { [ 0x1000634,        VoidSymbol           ] };  // ش
+    key <AB03> { [ 0x100063a,        VoidSymbol           ] };  // غ
+    key <AB04> { [ 0x10006c8,        VoidSymbol           ] };  // ۈ
+    key <AB05> { [ 0x1000628,        VoidSymbol           ] };  // ب
+    key <AB06> { [ 0x1000646,        VoidSymbol           ] };  // ن
+    key <AB07> { [ 0x1000645,        VoidSymbol           ] };  // م
+    key <AB08> { [ Arabic_comma,     0x100203a            ] };  // ، ›
+    key <AB09> { [ period,           0x1002039            ] };  // . ‹
+    key <AB10> { [ 0x1000626,        Arabic_question_mark ] };  // ئ ؟
+
+    key <BKSL> { [ backslash,        bar                  ] };  // \ |
+};
diff --git a/xorg-server/xkeyboard-config/symbols/cz b/xorg-server/xkeyboard-config/symbols/cz
index d53b8364b..2d8680ca9 100644
--- a/xorg-server/xkeyboard-config/symbols/cz
+++ b/xorg-server/xkeyboard-config/symbols/cz
@@ -1,170 +1,170 @@
-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,        space,       space ]	};

-

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

-};

+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]= "Czech";
+
+    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,        space,       space ]	};
+
+    include "level3(ralt_switch)"
+};
+
+// Use <BKSL> instead of <LSGT> (useful for keyboard without <LSGT> key)
+xkb_symbols "bksl" {
+    include "cz(basic)"
+    name[Group1]= "Czech (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]= "Czech (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]= "Czech (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]= "Czech (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]= "Czech (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/xkeyboard-config/symbols/de b/xorg-server/xkeyboard-config/symbols/de
index cfe803afb..c30cb9f6a 100644
--- a/xorg-server/xkeyboard-config/symbols/de
+++ b/xorg-server/xkeyboard-config/symbols/de
@@ -1,596 +1,596 @@
-// based on a keyboard map from an 'xkb/symbols/de' file

-

-default

-xkb_symbols "basic" {

-

-    include "latin(type4)"

-

-    name[Group1]="Germany";

-

-    key <AE02>	{ [         2,   quotedbl,  twosuperior,    oneeighth ]	};

-    key <AE03>	{ [         3,    section, threesuperior,    sterling ]	};

-    key <AE04>	{ [         4,     dollar,   onequarter,     currency ]	};

-

-    key <AE11> {type[Group1]="FOUR_LEVEL_PLUS_LOCK",  symbols[Group1]=

-                  [ssharp, question, backslash, questiondown, 0x1001E9E ]};

-// The unicode capital letter sharp s U+1E9E is transformed to "SS"

-// to match the rules for capitalizing sharp s in german.

-// If the capital sharp s is needed, delete the line

-// starting with <U1E9C> from /usr/share/X11/locale/iso8859-15/Compose.

-// If both doubled S and capital sharp s are needed, use  0x1001E9E

-// for capital sharp s and some free unicode codepoint like 0x1001E9C

-// for doubled S. Don`t forget to change this in the Compose file, too.

-

-    key <AE12>	{ [dead_acute, dead_grave, dead_cedilla,  dead_ogonek ]	};

-

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

-    key <AD06>	{ [         z,          Z,    leftarrow,          yen ]	};

-    key <AD11>	{ [udiaeresis, Udiaeresis, dead_diaeresis, dead_abovering ] };

-    key <AD12>	{ [      plus,   asterisk,   dead_tilde,  dead_macron ]	};

-

-    key <AC02>  { [         s,          S,                U017F,     U1E9E    ] };

-    key <AC07>  { [         j,          J,        dead_belowdot, dead_abovedot   ] };

-    key <AC10>	{ [odiaeresis, Odiaeresis, dead_doubleacute, dead_belowdot ] };

-    key <AC11>	{ [adiaeresis, Adiaeresis, dead_circumflex, dead_caron ] };

-    key <TLDE>	{ [dead_circumflex, degree,	U2032,    U2033	] };

-

-    key <BKSL>	{ [numbersign, apostrophe, rightsinglequotemark,   dead_breve ]	};

-    key <AB01>	{ [         y,          Y,       guillemotright,    U203A 	] };

-    key <AB02>	{ [         x,          X,        guillemotleft,    U2039 	] };

-    key <AB04>	{ [         v,          V,   doublelowquotemark, singlelowquotemark ]	};

-    key <AB05>	{ [         b,          B,  leftdoublequotemark, leftsinglequotemark ] };

-    key <AB06>	{ [         n,          N, rightdoublequotemark, rightsinglequotemark ]	};    

-    key <AB08>  { [     comma,  semicolon,       periodcentered,     multiply	] };

-    key <AB09>	{ [    period,      colon,                U2026,     division 	] };

-    key <AB10>	{ [     minus, underscore,               endash,     emdash	] };

-

-    include "kpdl(comma)"

-

-    include "level3(ralt_switch)"

-};

-

-partial alphanumeric_keys

-xkb_symbols "nodeadkeys" {

-

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

-

-    include "de(basic)"

-    name[Group1]="Germany - Eliminate dead keys";

-

-    key <TLDE>	{ [asciicircum,    degree,      notsign,      notsign ]	};

-    key <AE12>	{ [     acute,      grave,      cedilla,      cedilla ]	};

-    key <AD11>	{ [udiaeresis, Udiaeresis,    diaeresis,    diaeresis ]	};

-    key <AD12>	{ [      plus,   asterisk,   asciitilde,       macron ]	};

-    key <AC10>	{ [odiaeresis, Odiaeresis,  doubleacute,  doubleacute ]	};

-    key <AC11>	{ [adiaeresis, Adiaeresis,  asciicircum,  asciicircum ]	};

-    key <BKSL>	{ [numbersign, apostrophe,        grave,        grave ]	};

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

-};

-

-partial alphanumeric_keys

-xkb_symbols "deadgraveacute" {

-    // modify the basic German layout to have only acute and grave

-    // as dead keys (tilde and circumflex are needed as spacing characters

-    // in many programming languages)

-

-    include "de(basic)"

-    name[Group1]="Germany - Dead grave acute";

-

-    key <TLDE>	{ [asciicircum,    degree,      notsign,      notsign ]	};

-    key <AD12>	{ [      plus,   asterisk,   asciitilde,  dead_macron ]	};

-    key <BKSL>	{ [numbersign, apostrophe,        grave,        grave ]	};

-};

-

-partial alphanumeric_keys

-xkb_symbols "deadacute" {

-    // modify the basic German layout to have only acute as

-    // dead keys (ASCII grave, tilde and circumflex are needed as

-    // spacing characters in many programming languages and text formatters)

-

-    include "de(deadgraveacute)"

-

-    name[Group1]="Germany - Dead acute";

-

-    key <AE12>	{ [dead_acute,      grave, dead_cedilla,  dead_ogonek ]	};

-    key <BKSL>	{ [numbersign, apostrophe,   dead_grave,   dead_grave ]	};

-};

-

-partial alphanumeric_keys

-xkb_symbols "ro" {

-    // add romanian-specific letters to the basic German layout.

-    // Romanian symbols are accessible with combination of <AltGr> and

-    // 'a', 's', 't', 'i', 'ä (&auml)' (+<Shift> for capital letters).

-    // To view romanian-specific symbols, add "export LC_CTYPE=ro_RO"

-    // or "export LC_CTYPE=de_DE.utf8" to your .profile.

-

-    include "de(basic)"

-

-    name[Group1]="Germany - Romanian keyboard with German letters";

-

-    key <AD05> { [         t,    T,           tcedilla,     Tcedilla    ] };

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

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

-    key <AC02> { [         s,    S,           scedilla,     Scedilla    ] };

-    key <AC11> { [ adiaeresis,   Adiaeresis,    abreve,       Abreve    ] };

-};

-

-partial alphanumeric_keys

-xkb_symbols "ro_nodeadkeys" {

-    // add romanian-specific letters to the German nodeadkeys layout.

-    // Read the comment for de_ro !

-

-    include "de(nodeadkeys)"

-    name[Group1]="Germany - Romanian keyboard with German letters, eliminate dead keys";

-

-    key <AD05> { [         t,    T,           tcedilla,     Tcedilla    ] };

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

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

-    key <AC02> { [         s,    S,           scedilla,     Scedilla    ] };

-    key <AC11> { [ adiaeresis,   Adiaeresis, abreve,       Abreve       ] };

-};

-

-// German Dvorak keymap by Thorsten Staerk (www.staerk.de/thorsten)

-// Have acute and grave as dead keys, tilde and circumflex alive as they are needed 

-// in many programming languages.

-// to use this keymap, use a 105-key-keyboard and the command setxkbmap -model pc105 -layout dvorak -variant de

-// source: http://www-lehre.informatik.uni-osnabrueck.de/~rfreund/dvorak.php

-partial alphanumeric_keys 

-xkb_symbols "dvorak" {

-    include "us(dvorak)"

-

-    name[Group1]="Germany - Dvorak";

-

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

-

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

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

-    key <AE03> { [ 3, section, threesuperior ] };

-    key <AE04> { [ 4, dollar, bar ] };

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

-    key <AE06> { [ 6, ampersand, brokenbar ] };

-    key <AE07> { [ 7, slash, braceleft ] };

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

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

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

-    key <AE11> { [ plus, asterisk, asciitilde ] };

-    key <AE12> { [ less, greater, dead_grave ] };

-

-    key <AD01> { [ udiaeresis, Udiaeresis, at ] };

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

-    key <AD03> { [ period, colon ] };

-    key <AD08> { [ c, C, copyright, Cacute ] };

-    key <AD09> { [ t, T, trademark ] };

-    key <AD10> { [ z, Z, zabovedot, Zabovedot ] };

-    key <AD11> { [ question, ssharp ] };

-    key <AD12> { [ slash, backslash, dead_acute ] };

-

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

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

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

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

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

-    key <AC06> { [ h, H ] };

-    key <AC07> { [ d, D ] };

-    key <AC08> { [ r, R, registered ] };

-    key <AC09> { [ n, N, nacute, Nacute ] };

-    key <AC10> { [ s, S, sacute, Sacute] };

-    key <AC11> { [ l, L, lstroke, Lstroke ] };

-

-    key <AB01> { [ odiaeresis, Odiaeresis ] };

-    key <AB02> { [ q, Q, at ] };

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

-    key <AB10> { [ numbersign, apostrophe ] };

-

-    key <BKSL> { [ minus, underscore, hyphen, diaeresis] };

-

-    key <LSGT> { [ adiaeresis, Adiaeresis, bar ] };

-

-    include "level3(ralt_switch)"

-};

-

-partial alphanumeric_keys

-xkb_symbols "Sundeadkeys" {

-

-    // For naming consistency

-

-    include "de(basic)"

-

-};

-

-partial alphanumeric_keys

-xkb_symbols "sundeadkeys" {

-

-    // For naming consistency

-

-    include "de(Sundeadkeys)"

-

-    name[Group1]="Germany - Sun dead keys";

-};

-

-

-// German Neo-Layout Version 2

-// adopted 2004 by Hanno Behrens <Hanno.Behrens@gmx.de>

-// inspired by Dvorak/de-ergo  http://www.goebel-consult.de/de-ergo/

-//

-// Authors: 

-//      Stephan Hilb <stephan at ehilb dot de>

-//      <lucky at zankt dot net>

-//      Benjamin Kellermann <Benjamin dot Kellermann at gmx dot Germany>

-//      Erik Streb <mail at erikstreb dot de>

-//        and many other contributors

-//

-//      http://www.neo-layout.org

-//

-// $Revision$, $Date$

-

-partial alphanumeric_keys modifier_keys keypad_keys

-xkb_symbols "neo_base" {

-

-    // Levels in Neo jargon

-    // --------------------------------------------------------------

-    // Ebene 1: normal

-    // Ebene 2: Shift

-    // Ebene 3: Mod3

-    // Ebene 4: Mod4 (for marking something use Shift + Mod4)

-    // Ebene 5: Shift + Mod3

-    // Ebene 6: Mod3 + Mod4

-    // Compose (not a level): Mod3 + Tab

-    // Feststelltaste (Capslock): Shift + Shift

-    // Mod4-Lock: Mod4 + Mod4

-    // Mod4-Lock: Shift + Mod3 + Tab

-

-    // Legend

-    // ===============

-    // Levels in Xkbmap jargon to be found here in the definitions. 

-    // These are the levels used, and Xorg's translations:

-    // --------------------------------------------------------------

-    // Xorg:       Level1                   Level2                   Level3                   Level4                   Level5                   Level6                   Level7                   Level8                   

-    // Neo:        Ebene1                   Ebene2                   Ebene3                   Ebene5                   Ebene4                   Pseudo-Ebene             Ebene6                   ???                      

-    // Keys (Neo): None                     Shift                    Mod3                     Mod3 + Shift             Mod4                     Mod4 + Shift             Mod3 + Mod4              Mod3 + Mod4 + Shift      

-

-

-    // Alphanumeric-keys

-    // ===============

-    key.type[Group1] = "EIGHT_LEVEL";

-

-    // Tab as Multi_key (Compose)

-    // --------------------------------------------------------------

-    key  <TAB> { [ Tab,                     ISO_Left_Tab,            Multi_key,               ISO_Level5_Lock,         NoSymbol,                NoSymbol,                NoSymbol,                ISO_Level5_Lock          ] };

-

-

-    // Number row

-    // --------------------------------------------------------------

-    key <TLDE> { [ dead_circumflex,         dead_caron,              U21BB,                   U02DE,                   dead_abovedot,           Pointer_EnableKeys,      dead_belowdot,           NoSymbol                 ] };

-

-    key <AE01> { [ 1,                       degree,                  onesuperior,             onesubscript,            ordfeminine,             NoSymbol,                notsign,                 NoSymbol                 ] };

-    key <AE02> { [ 2,                       section,                 twosuperior,             twosubscript,            masculine,               NoSymbol,                logicalor,               NoSymbol                 ] };

-    key <AE03> { [ 3,                       U2113,                   threesuperior,           threesubscript,          numerosign,              NoSymbol,                logicaland,              NoSymbol                 ] };

-    key <AE04> { [ 4,                       guillemotright,          U203A,                   femalesymbol,            NoSymbol,                NoSymbol,                U22A5,                   NoSymbol                 ] };

-    key <AE05> { [ 5,                       guillemotleft,           U2039,                   malesymbol,              periodcentered,          NoSymbol,                U2221,                   NoSymbol                 ] };

-    key <AE06> { [ 6,                       dollar,                  cent,                    U26A5,                   sterling,                NoSymbol,                U2225,                   NoSymbol                 ] };

-

-    key <AE07> { [ 7,                       EuroSign,                yen,                     U03F0,                   currency,                NoSymbol,                rightarrow,              NoSymbol                 ] };

-    key <AE08> { [ 8,                       doublelowquotemark,      singlelowquotemark,      U27E8,                   Tab,                     ISO_Left_Tab,            U221E,                   NoSymbol                 ] };

-    key <AE09> { [ 9,                       leftdoublequotemark,     leftsinglequotemark,     U27E9,                   KP_Divide,               KP_Divide,               variation,               NoSymbol                 ] };

-    key <AE10> { [ 0,                       rightdoublequotemark,    rightsinglequotemark,    zerosubscript,           KP_Multiply,             KP_Multiply,             emptyset,                NoSymbol                 ] };

-

-    key <AE11> { [ minus,                   emdash,                  NoSymbol,                U2011,                   KP_Subtract,             KP_Subtract,             hyphen,                  NoSymbol                 ] };

-    key <AE12> { [ dead_grave,              dead_cedilla,            dead_abovering,          dead_dasia,              dead_diaeresis,          NoSymbol,                dead_macron,             NoSymbol                 ] };

-

-    // Top row

-    // --------------------------------------------------------------

-    key.type[Group1] = "EIGHT_LEVEL_SEMIALPHABETIC";

-    key <AD01> { [ x,                       X,                       ellipsis,                Greek_xi,                Prior,                   Prior,                   Greek_XI,                NoSymbol                 ] };

-    key <AD02> { [ v,                       V,                       underscore,              NoSymbol,                BackSpace,               BackSpace,               radical,                 NoSymbol                 ] };

-    key <AD03> { [ l,                       L,                       bracketleft,             Greek_lambda,            Up,                      Up,                      Greek_LAMBDA,            NoSymbol                 ] };

-    key <AD04> { [ c,                       C,                       bracketright,            Greek_chi,               Delete,                  Delete,                  U2102,                   NoSymbol                 ] };

-    key <AD05> { [ w,                       W,                       asciicircum,             Greek_omega,             Next,                    Next,                    Greek_OMEGA,             NoSymbol                 ] };

-

-    key <AD06> { [ k,                       K,                       exclam,                  Greek_kappa,             exclamdown,              NoSymbol,                multiply,                NoSymbol                 ] };

-    key <AD07> { [ h,                       H,                       less,                    Greek_psi,               KP_7,                    KP_7,                    Greek_PSI,               NoSymbol                 ] };

-    key <AD08> { [ g,                       G,                       greater,                 Greek_gamma,             KP_8,                    KP_8,                    Greek_GAMMA,             NoSymbol                 ] };

-    key <AD09> { [ f,                       F,                       equal,                   Greek_phi,               KP_9,                    KP_9,                    Greek_PHI,               NoSymbol                 ] };

-    key <AD10> { [ q,                       Q,                       ampersand,               U03D5,                   KP_Add,                  KP_Add,                  U211A,                   NoSymbol                 ] };

-

-    key <AD11> { [ ssharp,                  U1E9E,                   U017F,                   Greek_finalsmallsigma,   U2212,                   NoSymbol,                jot,                     NoSymbol                 ] };

-

-    key.type[Group1] = "EIGHT_LEVEL";

-    key <AD12> { [ dead_acute,              dead_tilde,              dead_stroke,             dead_psili,              dead_doubleacute,        NoSymbol,                dead_breve,              NoSymbol                 ] };

-

-    // Middle row

-    // --------------------------------------------------------------

-    key.type[Group1] = "EIGHT_LEVEL_SEMIALPHABETIC";

-    key <AC01> { [ u,                       U,                       backslash,               NoSymbol,                Home,                    Home,                    includedin,              NoSymbol                 ] };

-    key <AC02> { [ i,                       I,                       slash,                   Greek_iota,              Left,                    Left,                    integral,                NoSymbol                 ] };

-    key <AC03> { [ a,                       A,                       braceleft,               Greek_alpha,             Down,                    Down,                    U2200,                   NoSymbol                 ] };

-    key <AC04> { [ e,                       E,                       braceright,              Greek_epsilon,           Right,                   Right,                   U2203,                   NoSymbol                 ] };

-    key <AC05> { [ o,                       O,                       asterisk,                Greek_omicron,           End,                     End,                     elementof,               NoSymbol                 ] };

-

-    key <AC06> { [ s,                       S,                       question,                Greek_sigma,             questiondown,            NoSymbol,                Greek_SIGMA,             NoSymbol                 ] };

-    key <AC07> { [ n,                       N,                       parenleft,               Greek_nu,                KP_4,                    KP_4,                    U2115,                   NoSymbol                 ] };

-    key <AC08> { [ r,                       R,                       parenright,              Greek_rho,               KP_5,                    KP_5,                    U211D,                   NoSymbol                 ] };

-    key <AC09> { [ t,                       T,                       minus,                   Greek_tau,               KP_6,                    KP_6,                    partialderivative,       NoSymbol                 ] };

-    key <AC10> { [ d,                       D,                       colon,                   Greek_delta,             KP_Separator,            comma,                   Greek_DELTA,             NoSymbol                 ] };

-

-    key <AC11> { [ y,                       Y,                       at,                      Greek_upsilon,           period,                  KP_Decimal,              nabla,                   NoSymbol                 ] };

-

-    // Bottom row

-    // --------------------------------------------------------------

-    key <AB01> { [ udiaeresis,              Udiaeresis,              numbersign,              NoSymbol,                Escape,                  Escape,                  union,                   NoSymbol                 ] };

-    key <AB02> { [ odiaeresis,              Odiaeresis,              dollar,                  U03F5,                   Tab,                     Tab,                     intersection,            NoSymbol                 ] };

-    key <AB03> { [ adiaeresis,              Adiaeresis,              bar,                     Greek_eta,               Insert,                  Insert,                  U2135,                   NoSymbol                 ] };

-    key <AB04> { [ p,                       P,                       asciitilde,              Greek_pi,                Return,                  Return,                  Greek_PI,                NoSymbol                 ] };

-    key <AB05> { [ z,                       Z,                       grave,                   Greek_zeta,              Undo,                    Undo,                    U2124,                   NoSymbol                 ] };

-

-    key <AB06> { [ b,                       B,                       plus,                    Greek_beta,              colon,                   NoSymbol,                U21D0,                   NoSymbol                 ] };

-    key <AB07> { [ m,                       M,                       percent,                 Greek_mu,                KP_1,                    KP_1,                    ifonlyif,                NoSymbol                 ] };

-    key.type[Group1] = "EIGHT_LEVEL";

-    key <AB08> { [ comma,                   endash,                  quotedbl,                U03F1,                   KP_2,                    KP_2,                    U21D2,                   NoSymbol                 ] };

-    key <AB09> { [ period,                  enfilledcircbullet,      apostrophe,              U03D1,                   KP_3,                    KP_3,                    U21A6,                   NoSymbol                 ] };

-    key.type[Group1] = "EIGHT_LEVEL_SEMIALPHABETIC";

-    key <AB10> { [ j,                       J,                       semicolon,               Greek_theta,             semicolon,               NoSymbol,                Greek_THETA,             NoSymbol                 ] };

-    key.type[Group1] = "EIGHT_LEVEL";

-

-    // Space key

-    // --------------------------------------------------------------

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

-

-

-    // Keypad-keys

-    // ===============

-

-    // The former Numlock key:

-    key <NMLK> { [ Tab,                     ISO_Left_Tab,            equal,                   approxeq,                notequal,                Pointer_EnableKeys,      identical,               NoSymbol                 ] };

-

-    // Topmost row

-    // --------------------------------------------------------------

-    key <KPDV> { [ KP_Divide,               KP_Divide,               division,                U2300,                   U2215,                   NoSymbol,                U2223,                   NoSymbol                 ] };

-    key <KPMU> { [ KP_Multiply,             KP_Multiply,             U2219,                   U2299,                   multiply,                NoSymbol,                U2297,                   NoSymbol                 ] };

-    key <KPSU> { [ KP_Subtract,             KP_Subtract,             U2212,                   U2296,                   U2216,                   NoSymbol,                U2238,                   NoSymbol                 ] };

-

-    // Top row

-    // --------------------------------------------------------------

-    key  <KP7> { [ KP_7,                    U2714,                   U2195,                   U226A,                   KP_Home,                 KP_Home,                 upstile,                 NoSymbol                 ] };

-    key  <KP8> { [ KP_8,                    U2718,                   uparrow,                 intersection,            KP_Up,                   KP_Up,                   U22C2,                   NoSymbol                 ] };

-    key  <KP9> { [ KP_9,                    dagger,                  U20D7,                   U226B,                   KP_Prior,                KP_Prior,                U2309,                   NoSymbol                 ] };

-    key <KPAD> { [ KP_Add,                  KP_Add,                  plusminus,               U2295,                   U2213,                   NoSymbol,                U2214,                   NoSymbol                 ] };

-

-    // Middle row

-    // --------------------------------------------------------------

-    key  <KP4> { [ KP_4,                    club,                    leftarrow,               includedin,              KP_Left,                 KP_Left,                 U2286,                   NoSymbol                 ] };

-    key  <KP5> { [ KP_5,                    EuroSign,                colon,                   U22B6,                   KP_Begin,                KP_Begin,                U22B7,                   NoSymbol                 ] };

-    key  <KP6> { [ KP_6,                    U2023,                   rightarrow,              includes,                KP_Right,                KP_Right,                U2287,                   NoSymbol                 ] };

-

-    // Bottom row

-    // --------------------------------------------------------------

-    key  <KP1> { [ KP_1,                    diamond,                 U2194,                   lessthanequal,           KP_End,                  KP_End,                  downstile,               NoSymbol                 ] };

-    key  <KP2> { [ KP_2,                    heart,                   downarrow,               union,                   KP_Down,                 KP_Down,                 U22C3,                   NoSymbol                 ] };

-    key  <KP3> { [ KP_3,                    U2660,                   U21CC,                   greaterthanequal,        KP_Next,                 KP_Next,                 U230B,                   NoSymbol                 ] };

-    key <KPEN> { [ KP_Enter,                KP_Enter,                KP_Enter,                KP_Enter,                KP_Enter,                KP_Enter,                KP_Enter,                NoSymbol                 ] };

-    key <KPEQ> { [ KP_Equal,                NoSymbol,                NoSymbol,                NoSymbol,                NoSymbol,                NoSymbol,                NoSymbol,                NoSymbol                 ] };

-

-    // Bottommost row

-    // --------------------------------------------------------------

-    key  <KP0> { [ KP_0,                    U2423,                   percent,                 U2030,                   KP_Insert,               KP_Insert,               U25A1,                   NoSymbol                 ] };

-    key <KPDL> { [ KP_Separator,            period,                  comma,                   minutes,                 KP_Delete,               KP_Delete,               seconds,                 NoSymbol                 ] };

-};

-

-partial alphanumeric_keys modifier_keys keypad_keys

-xkb_symbols "neo" {

-

-    include "de(neo_base)"

-

-    name[Group1]= "Germany - Neo 2";

-

-    include "shift(both_capslock)"

-    include "level3(caps_switch)"

-    include "level3(bksl_switch)"

-    include "level5(lsgt_switch)"

-    include "level5(ralt_switch)"

-};

-

-// Copied from macintosh_vndr/de

-// olh@suse.de   very close to MacOS map

-

-partial alphanumeric_keys 

-xkb_symbols "mac" {

-

-    include "de"

-    name[Group1]= "Germany - Macintosh";

-

-    // Alphanumeric section

-    key <AE01>	{ [         1,     exclam,   exclamdown,           at ]	};

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

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

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

-    key <AE08>	{ [         8,  parenleft,    braceleft,   asciitilde ]	};

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

-    key <AD01>	{ [         q,          Q, guillemotleft, guillemotright ]	};

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

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

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

-    key <AD11>	{ [ udiaeresis, Udiaeresis, periodcentered,    degree ]	};

-    key <AD12>	{ [      plus,   asterisk,   asciitilde       ]	}; 

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

-    key <AC05>	{ [         g,          G,    copyright       ]	};

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

-    key <AC09>	{ [         l,          L,           at       ]	};

-    key <AC10>	{ [ odiaeresis, Odiaeresis,  dead_acute       ]	};

-    key <AB06>	{ [         n,          N,   asciitilde       ]	};

-

-};

-

-partial alphanumeric_keys 

-xkb_symbols "mac_nodeadkeys" {

-    // modify the standard German mac layout to not have any dead keys

-    include "de(mac)"

-    name[Group1]= "Germany - Macintosh, eliminate dead keys";

-    key <AE04>	{ [         4,     dollar,   onequarter,     currency ]	};

-

-    key <TLDE>	{ [ asciicircum,    degree,     notsign       ]	};

-    key <AE12>	{ [      acute,      grave,     cedilla       ]	};

-    key <AD11>	{ [ udiaeresis, Udiaeresis,   diaeresis       ]	};

-    key <AD12>	{ [       plus,   asterisk,  asciitilde,       macron ]	};

-    key <AC10>	{ [ odiaeresis, Odiaeresis,       acute       ]	};

-    key <AC11>	{ [ adiaeresis, Adiaeresis, asciicircum       ]	};

-

-    key <BKSL>	{ [ numbersign, apostrophe,       grave       ]	};

-};

-

-partial alphanumeric_keys

-xkb_symbols "dsb"

-{

-	name[Group1] = "Germany - Lower Sorbian";

-	include "latin(basic)"

-	include "level3(ralt_switch)"

-	include "kpdl(comma)"

-	key <AB01> { [              z,              Z,         zcaron,         Zcaron ] };

-	key <AB02> { [              x,              X,         zacute,         Zacute ] };

-	key <AB03> { [              c,              C,         cacute,         Cacute ] };

-	key <AB04> { [              v,              V,         ccaron,         Ccaron ] };

-	key <AB06> { [              n,              N,         nacute,         Nacute ] };

-	key <AC02> { [              s,              S,         sacute,         Sacute ] };

-	key <AC03> { [              d,              D,         scaron,         Scaron ] };

-	key <AC04> { [              f,              F                                 ] };

-	key <AD01> { [              q,              Q                                 ] };

-	key <AD02> { [              w,              W                                 ] };

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

-	key <AD04> { [              r,              R,         racute,         Racute ] };

-	key <AD05> { [              t,              T,          U20B5,       EuroSign ] };

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

-};

-

-partial alphanumeric_keys

-xkb_symbols "dsb_qwertz"

-{

-	name[Group1] = "Germany - Lower Sorbian (qwertz)";

-	include "latin(basic)"

-	include "level3(ralt_switch)"

-	include "kpdl(comma)"

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

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

-	key <AB03> { [              c,              C,         cacute,         Cacute ] };

-	key <AB04> { [              v,              V,         ccaron,         Ccaron ] };

-	key <AB06> { [              n,              N,         nacute,         Nacute ] };

-	key <AC02> { [              s,              S,         sacute,         Sacute ] };

-	key <AC03> { [              d,              D,         scaron,         Scaron ] };

-	key <AC04> { [              f,              F                                 ] };

-	key <AD01> { [              q,              Q                                 ] };

-	key <AD02> { [              w,              W                                 ] };

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

-	key <AD04> { [              r,              R,         racute,         Racute ] };

-	key <AD05> { [              t,              T,          U20B5,       EuroSign ] };

-	key <AD06> { [              z,              Z,         zcaron,         Zcaron ] };

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

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

-};

-

-partial alphanumeric_keys 

-xkb_symbols "qwerty" {

- 

-    // This layout should work exactly as a de with the exception 

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

-    // 2008 by Matej Košík <kosik@fiit.stuba.sk>

-    

-    include "de(basic)"

-

-    name[Group1] = "Germany - qwerty";

-

-    key <AB01>	{ [         z,          Z,     leftarrow,         yen ]	};

-    key <AD06>	{ [         y,          Y, guillemotleft,        less ]	};

-};

-

-// layout for Russian letters on an german keyboard

-// based on US-RU layout by Ivan Popov <pin@konvalo.org> 2005-07-17

-// adopted for german layout by Alexey Fisher <bug-track@fisher-privat.net> 2010-08-19

-

-partial alphanumeric_keys

-xkb_symbols "ru" {

-

-    include "de(basic)"

- 

-    name[Group1]= "Germany - Russian phonetic";

-

-key.type[group1]="FOUR_LEVEL_ALPHABETIC";

-

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-    key <AD12> { [    Cyrillic_shcha,    Cyrillic_SHCHA, plus, asterisk ] };

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

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

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

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

-    key <BKSL> { [       Cyrillic_yu,       Cyrillic_YU, numbersign, apostrophe ] };

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

-

-    include "level3(ralt_switch)"

-};

-

-partial alphanumeric_keys

-xkb_symbols "htcdream" {

-        include "inet(htcdream)"

-

-        name[Group1]= "Germany - htcdream";

-

-        //second row

-        key <AD01> { [ q, Q, Tab, Tab ] };

-        key <AD02> { [ w, W, grave, grave ] };

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

-        key <AD04> { [ r, R, underscore, underscore ] };

-        key <AD05> { [ t, T, sterling, sterling] };

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

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

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

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

-        key <AD10> { [ p, P, equal, equal ] };

-

-        //third row

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

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

-        key <AC03> { [ d ,D, backslash, backslash ] };

-        key <AC04> { [ f, F, braceleft, braceleft ] };

-        key <AC05> { [ g, G, braceright, braceright ] };

-        key <AC06> { [ h, H, multiply, multiply ] };

-        key <AC07> { [ j, J, colon, colon ] };

-        key <AC08> { [ k, K, plus, plus ] };

-        key <AC09> { [ l, L, apostrophe, apostrophe ] };

-

-        //forth row

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

-        key <AB02> { [ x, X, bracketleft, bracketleft ] };

-        key <AB03> { [ c, C, bracketright, bracketright ] };

-        key <AB04> { [ v, V, less, less ] };

-        key <AB05> { [ b, B, greater, greater ] };

-        key <AB06> { [ n, N, semicolon, semicolon ] };

-        key <AB07> { [ m, M, quotedbl, quotedbl ] };

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

-

-        //fifth row

-        key <FK15> { [ at, at, asciitilde, asciitilde ] };

-

-        include "level3(alt_switch)"

-};

+// based on a keyboard map from an 'xkb/symbols/de' file
+
+default
+xkb_symbols "basic" {
+
+    include "latin(type4)"
+
+    name[Group1]="German";
+
+    key <AE02>	{ [         2,   quotedbl,  twosuperior,    oneeighth ]	};
+    key <AE03>	{ [         3,    section, threesuperior,    sterling ]	};
+    key <AE04>	{ [         4,     dollar,   onequarter,     currency ]	};
+
+    key <AE11> {type[Group1]="FOUR_LEVEL_PLUS_LOCK",  symbols[Group1]=
+                  [ssharp, question, backslash, questiondown, 0x1001E9E ]};
+// The unicode capital letter sharp s U+1E9E is transformed to "SS"
+// to match the rules for capitalizing sharp s in german.
+// If the capital sharp s is needed, delete the line
+// starting with <U1E9C> from /usr/share/X11/locale/iso8859-15/Compose.
+// If both doubled S and capital sharp s are needed, use  0x1001E9E
+// for capital sharp s and some free unicode codepoint like 0x1001E9C
+// for doubled S. Don`t forget to change this in the Compose file, too.
+
+    key <AE12>	{ [dead_acute, dead_grave, dead_cedilla,  dead_ogonek ]	};
+
+    key <AD03>	{ [         e,          E,     EuroSign,     EuroSign ]	};
+    key <AD06>	{ [         z,          Z,    leftarrow,          yen ]	};
+    key <AD11>	{ [udiaeresis, Udiaeresis, dead_diaeresis, dead_abovering ] };
+    key <AD12>	{ [      plus,   asterisk,   dead_tilde,  dead_macron ]	};
+
+    key <AC02>  { [         s,          S,                U017F,     U1E9E    ] };
+    key <AC07>  { [         j,          J,        dead_belowdot, dead_abovedot   ] };
+    key <AC10>	{ [odiaeresis, Odiaeresis, dead_doubleacute, dead_belowdot ] };
+    key <AC11>	{ [adiaeresis, Adiaeresis, dead_circumflex, dead_caron ] };
+    key <TLDE>	{ [dead_circumflex, degree,	U2032,    U2033	] };
+
+    key <BKSL>	{ [numbersign, apostrophe, rightsinglequotemark,   dead_breve ]	};
+    key <AB01>	{ [         y,          Y,       guillemotright,    U203A 	] };
+    key <AB02>	{ [         x,          X,        guillemotleft,    U2039 	] };
+    key <AB04>	{ [         v,          V,   doublelowquotemark, singlelowquotemark ]	};
+    key <AB05>	{ [         b,          B,  leftdoublequotemark, leftsinglequotemark ] };
+    key <AB06>	{ [         n,          N, rightdoublequotemark, rightsinglequotemark ]	};    
+    key <AB08>  { [     comma,  semicolon,       periodcentered,     multiply	] };
+    key <AB09>	{ [    period,      colon,                U2026,     division 	] };
+    key <AB10>	{ [     minus, underscore,               endash,     emdash	] };
+
+    include "kpdl(comma)"
+
+    include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "nodeadkeys" {
+
+    // modify the basic German layout to not have any dead keys
+
+    include "de(basic)"
+    name[Group1]="German (eliminate dead keys)";
+
+    key <TLDE>	{ [asciicircum,    degree,      notsign,      notsign ]	};
+    key <AE12>	{ [     acute,      grave,      cedilla,      cedilla ]	};
+    key <AD11>	{ [udiaeresis, Udiaeresis,    diaeresis,    diaeresis ]	};
+    key <AD12>	{ [      plus,   asterisk,   asciitilde,       macron ]	};
+    key <AC10>	{ [odiaeresis, Odiaeresis,  doubleacute,  doubleacute ]	};
+    key <AC11>	{ [adiaeresis, Adiaeresis,  asciicircum,  asciicircum ]	};
+    key <BKSL>	{ [numbersign, apostrophe,        grave,        grave ]	};
+    key <AB10>	{ [     minus, underscore, dead_belowdot,    abovedot ]	};
+};
+
+partial alphanumeric_keys
+xkb_symbols "deadgraveacute" {
+    // modify the basic German layout to have only acute and grave
+    // as dead keys (tilde and circumflex are needed as spacing characters
+    // in many programming languages)
+
+    include "de(basic)"
+    name[Group1]="German (dead grave acute)";
+
+    key <TLDE>	{ [asciicircum,    degree,      notsign,      notsign ]	};
+    key <AD12>	{ [      plus,   asterisk,   asciitilde,  dead_macron ]	};
+    key <BKSL>	{ [numbersign, apostrophe,        grave,        grave ]	};
+};
+
+partial alphanumeric_keys
+xkb_symbols "deadacute" {
+    // modify the basic German layout to have only acute as
+    // dead keys (ASCII grave, tilde and circumflex are needed as
+    // spacing characters in many programming languages and text formatters)
+
+    include "de(deadgraveacute)"
+
+    name[Group1]="German (dead acute)";
+
+    key <AE12>	{ [dead_acute,      grave, dead_cedilla,  dead_ogonek ]	};
+    key <BKSL>	{ [numbersign, apostrophe,   dead_grave,   dead_grave ]	};
+};
+
+partial alphanumeric_keys
+xkb_symbols "ro" {
+    // add romanian-specific letters to the basic German layout.
+    // Romanian symbols are accessible with combination of <AltGr> and
+    // 'a', 's', 't', 'i', 'ä (&auml)' (+<Shift> for capital letters).
+    // To view romanian-specific symbols, add "export LC_CTYPE=ro_RO"
+    // or "export LC_CTYPE=de_DE.utf8" to your .profile.
+
+    include "de(basic)"
+
+    name[Group1]="Romanian (Germany)";
+
+    key <AD05> { [         t,    T,           tcedilla,     Tcedilla    ] };
+    key <AD08> { [         i,    I,        icircumflex,  Icircumflex    ] };
+    key <AC01> { [         a,    A,        acircumflex,  Acircumflex    ] };
+    key <AC02> { [         s,    S,           scedilla,     Scedilla    ] };
+    key <AC11> { [ adiaeresis,   Adiaeresis,    abreve,       Abreve    ] };
+};
+
+partial alphanumeric_keys
+xkb_symbols "ro_nodeadkeys" {
+    // add romanian-specific letters to the German nodeadkeys layout.
+    // Read the comment for de_ro !
+
+    include "de(nodeadkeys)"
+    name[Group1]="Romanian (Germany, eliminate dead keys)";
+
+    key <AD05> { [         t,    T,           tcedilla,     Tcedilla    ] };
+    key <AD08> { [         i,    I,        icircumflex,  Icircumflex    ] };
+    key <AC01> { [         a,    A,        acircumflex,  Acircumflex    ] };
+    key <AC02> { [         s,    S,           scedilla,     Scedilla    ] };
+    key <AC11> { [ adiaeresis,   Adiaeresis, abreve,       Abreve       ] };
+};
+
+// German Dvorak keymap by Thorsten Staerk (www.staerk.de/thorsten)
+// Have acute and grave as dead keys, tilde and circumflex alive as they are needed 
+// in many programming languages.
+// to use this keymap, use a 105-key-keyboard and the command setxkbmap -model pc105 -layout dvorak -variant de
+// source: http://www-lehre.informatik.uni-osnabrueck.de/~rfreund/dvorak.php
+partial alphanumeric_keys 
+xkb_symbols "dvorak" {
+    include "us(dvorak)"
+
+    name[Group1]="German (Dvorak)";
+
+    key <TLDE> { [ asciicircum, degree ] };
+
+    key <AE01> { [ 1, exclam, onesuperior ] };
+    key <AE02> { [ 2, quotedbl, twosuperior ] };
+    key <AE03> { [ 3, section, threesuperior ] };
+    key <AE04> { [ 4, dollar, bar ] };
+    key <AE05> { [ 5, percent, bar ] };
+    key <AE06> { [ 6, ampersand, brokenbar ] };
+    key <AE07> { [ 7, slash, braceleft ] };
+    key <AE08> { [ 8, parenleft, bracketleft ] };
+    key <AE09> { [ 9, parenright, bracketright ] };
+    key <AE10> { [ 0, equal, braceright ] };
+    key <AE11> { [ plus, asterisk, asciitilde ] };
+    key <AE12> { [ less, greater, dead_grave ] };
+
+    key <AD01> { [ udiaeresis, Udiaeresis, at ] };
+    key <AD02> { [ comma, semicolon, dead_diaeresis ] };
+    key <AD03> { [ period, colon ] };
+    key <AD08> { [ c, C, copyright, Cacute ] };
+    key <AD09> { [ t, T, trademark ] };
+    key <AD10> { [ z, Z, zabovedot, Zabovedot ] };
+    key <AD11> { [ question, ssharp ] };
+    key <AD12> { [ slash, backslash, dead_acute ] };
+
+    key <AC01> { [ a, A, at, aogonek ] };
+    key <AC02> { [ o, O, oacute, Oacute ] };
+    key <AC03> { [ e, E, EuroSign, eogonek ] };
+    key <AC04> { [ i, I ] };
+    key <AC05> { [ u, U ] };
+    key <AC06> { [ h, H ] };
+    key <AC07> { [ d, D ] };
+    key <AC08> { [ r, R, registered ] };
+    key <AC09> { [ n, N, nacute, Nacute ] };
+    key <AC10> { [ s, S, sacute, Sacute] };
+    key <AC11> { [ l, L, lstroke, Lstroke ] };
+
+    key <AB01> { [ odiaeresis, Odiaeresis ] };
+    key <AB02> { [ q, Q, at ] };
+    key <AB07> { [ m, M, mu ] };
+    key <AB10> { [ numbersign, apostrophe ] };
+
+    key <BKSL> { [ minus, underscore, hyphen, diaeresis] };
+
+    key <LSGT> { [ adiaeresis, Adiaeresis, bar ] };
+
+    include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "Sundeadkeys" {
+
+    // For naming consistency
+
+    include "de(basic)"
+
+};
+
+partial alphanumeric_keys
+xkb_symbols "sundeadkeys" {
+
+    // For naming consistency
+
+    include "de(Sundeadkeys)"
+
+    name[Group1]="German (Sun dead keys)";
+};
+
+
+// German Neo-Layout Version 2
+// adopted 2004 by Hanno Behrens <Hanno.Behrens@gmx.de>
+// inspired by Dvorak/de-ergo  http://www.goebel-consult.de/de-ergo/
+//
+// Authors: 
+//      Stephan Hilb <stephan at ehilb dot de>
+//      <lucky at zankt dot net>
+//      Benjamin Kellermann <Benjamin dot Kellermann at gmx dot Germany>
+//      Erik Streb <mail at erikstreb dot de>
+//        and many other contributors
+//
+//      http://www.neo-layout.org
+//
+// $Revision$, $Date$
+
+partial alphanumeric_keys modifier_keys keypad_keys
+xkb_symbols "neo_base" {
+
+    // Levels in Neo jargon
+    // --------------------------------------------------------------
+    // Ebene 1: normal
+    // Ebene 2: Shift
+    // Ebene 3: Mod3
+    // Ebene 4: Mod4 (for marking something use Shift + Mod4)
+    // Ebene 5: Shift + Mod3
+    // Ebene 6: Mod3 + Mod4
+    // Compose (not a level): Mod3 + Tab
+    // Feststelltaste (Capslock): Shift + Shift
+    // Mod4-Lock: Mod4 + Mod4
+    // Mod4-Lock: Shift + Mod3 + Tab
+
+    // Legend
+    // ===============
+    // Levels in Xkbmap jargon to be found here in the definitions. 
+    // These are the levels used, and Xorg's translations:
+    // --------------------------------------------------------------
+    // Xorg:       Level1                   Level2                   Level3                   Level4                   Level5                   Level6                   Level7                   Level8                   
+    // Neo:        Ebene1                   Ebene2                   Ebene3                   Ebene5                   Ebene4                   Pseudo-Ebene             Ebene6                   ???                      
+    // Keys (Neo): None                     Shift                    Mod3                     Mod3 + Shift             Mod4                     Mod4 + Shift             Mod3 + Mod4              Mod3 + Mod4 + Shift      
+
+
+    // Alphanumeric-keys
+    // ===============
+    key.type[Group1] = "EIGHT_LEVEL";
+
+    // Tab as Multi_key (Compose)
+    // --------------------------------------------------------------
+    key  <TAB> { [ Tab,                     ISO_Left_Tab,            Multi_key,               ISO_Level5_Lock,         NoSymbol,                NoSymbol,                NoSymbol,                ISO_Level5_Lock          ] };
+
+
+    // Number row
+    // --------------------------------------------------------------
+    key <TLDE> { [ dead_circumflex,         dead_caron,              U21BB,                   U02DE,                   dead_abovedot,           Pointer_EnableKeys,      dead_belowdot,           NoSymbol                 ] };
+
+    key <AE01> { [ 1,                       degree,                  onesuperior,             onesubscript,            ordfeminine,             NoSymbol,                notsign,                 NoSymbol                 ] };
+    key <AE02> { [ 2,                       section,                 twosuperior,             twosubscript,            masculine,               NoSymbol,                logicalor,               NoSymbol                 ] };
+    key <AE03> { [ 3,                       U2113,                   threesuperior,           threesubscript,          numerosign,              NoSymbol,                logicaland,              NoSymbol                 ] };
+    key <AE04> { [ 4,                       guillemotright,          U203A,                   femalesymbol,            NoSymbol,                NoSymbol,                U22A5,                   NoSymbol                 ] };
+    key <AE05> { [ 5,                       guillemotleft,           U2039,                   malesymbol,              periodcentered,          NoSymbol,                U2221,                   NoSymbol                 ] };
+    key <AE06> { [ 6,                       dollar,                  cent,                    U26A5,                   sterling,                NoSymbol,                U2225,                   NoSymbol                 ] };
+
+    key <AE07> { [ 7,                       EuroSign,                yen,                     U03F0,                   currency,                NoSymbol,                rightarrow,              NoSymbol                 ] };
+    key <AE08> { [ 8,                       doublelowquotemark,      singlelowquotemark,      U27E8,                   Tab,                     ISO_Left_Tab,            U221E,                   NoSymbol                 ] };
+    key <AE09> { [ 9,                       leftdoublequotemark,     leftsinglequotemark,     U27E9,                   KP_Divide,               KP_Divide,               variation,               NoSymbol                 ] };
+    key <AE10> { [ 0,                       rightdoublequotemark,    rightsinglequotemark,    zerosubscript,           KP_Multiply,             KP_Multiply,             emptyset,                NoSymbol                 ] };
+
+    key <AE11> { [ minus,                   emdash,                  NoSymbol,                U2011,                   KP_Subtract,             KP_Subtract,             hyphen,                  NoSymbol                 ] };
+    key <AE12> { [ dead_grave,              dead_cedilla,            dead_abovering,          dead_dasia,              dead_diaeresis,          NoSymbol,                dead_macron,             NoSymbol                 ] };
+
+    // Top row
+    // --------------------------------------------------------------
+    key.type[Group1] = "EIGHT_LEVEL_SEMIALPHABETIC";
+    key <AD01> { [ x,                       X,                       ellipsis,                Greek_xi,                Prior,                   Prior,                   Greek_XI,                NoSymbol                 ] };
+    key <AD02> { [ v,                       V,                       underscore,              NoSymbol,                BackSpace,               BackSpace,               radical,                 NoSymbol                 ] };
+    key <AD03> { [ l,                       L,                       bracketleft,             Greek_lambda,            Up,                      Up,                      Greek_LAMBDA,            NoSymbol                 ] };
+    key <AD04> { [ c,                       C,                       bracketright,            Greek_chi,               Delete,                  Delete,                  U2102,                   NoSymbol                 ] };
+    key <AD05> { [ w,                       W,                       asciicircum,             Greek_omega,             Next,                    Next,                    Greek_OMEGA,             NoSymbol                 ] };
+
+    key <AD06> { [ k,                       K,                       exclam,                  Greek_kappa,             exclamdown,              NoSymbol,                multiply,                NoSymbol                 ] };
+    key <AD07> { [ h,                       H,                       less,                    Greek_psi,               KP_7,                    KP_7,                    Greek_PSI,               NoSymbol                 ] };
+    key <AD08> { [ g,                       G,                       greater,                 Greek_gamma,             KP_8,                    KP_8,                    Greek_GAMMA,             NoSymbol                 ] };
+    key <AD09> { [ f,                       F,                       equal,                   Greek_phi,               KP_9,                    KP_9,                    Greek_PHI,               NoSymbol                 ] };
+    key <AD10> { [ q,                       Q,                       ampersand,               U03D5,                   KP_Add,                  KP_Add,                  U211A,                   NoSymbol                 ] };
+
+    key <AD11> { [ ssharp,                  U1E9E,                   U017F,                   Greek_finalsmallsigma,   U2212,                   NoSymbol,                jot,                     NoSymbol                 ] };
+
+    key.type[Group1] = "EIGHT_LEVEL";
+    key <AD12> { [ dead_acute,              dead_tilde,              dead_stroke,             dead_psili,              dead_doubleacute,        NoSymbol,                dead_breve,              NoSymbol                 ] };
+
+    // Middle row
+    // --------------------------------------------------------------
+    key.type[Group1] = "EIGHT_LEVEL_SEMIALPHABETIC";
+    key <AC01> { [ u,                       U,                       backslash,               NoSymbol,                Home,                    Home,                    includedin,              NoSymbol                 ] };
+    key <AC02> { [ i,                       I,                       slash,                   Greek_iota,              Left,                    Left,                    integral,                NoSymbol                 ] };
+    key <AC03> { [ a,                       A,                       braceleft,               Greek_alpha,             Down,                    Down,                    U2200,                   NoSymbol                 ] };
+    key <AC04> { [ e,                       E,                       braceright,              Greek_epsilon,           Right,                   Right,                   U2203,                   NoSymbol                 ] };
+    key <AC05> { [ o,                       O,                       asterisk,                Greek_omicron,           End,                     End,                     elementof,               NoSymbol                 ] };
+
+    key <AC06> { [ s,                       S,                       question,                Greek_sigma,             questiondown,            NoSymbol,                Greek_SIGMA,             NoSymbol                 ] };
+    key <AC07> { [ n,                       N,                       parenleft,               Greek_nu,                KP_4,                    KP_4,                    U2115,                   NoSymbol                 ] };
+    key <AC08> { [ r,                       R,                       parenright,              Greek_rho,               KP_5,                    KP_5,                    U211D,                   NoSymbol                 ] };
+    key <AC09> { [ t,                       T,                       minus,                   Greek_tau,               KP_6,                    KP_6,                    partialderivative,       NoSymbol                 ] };
+    key <AC10> { [ d,                       D,                       colon,                   Greek_delta,             KP_Separator,            comma,                   Greek_DELTA,             NoSymbol                 ] };
+
+    key <AC11> { [ y,                       Y,                       at,                      Greek_upsilon,           period,                  KP_Decimal,              nabla,                   NoSymbol                 ] };
+
+    // Bottom row
+    // --------------------------------------------------------------
+    key <AB01> { [ udiaeresis,              Udiaeresis,              numbersign,              NoSymbol,                Escape,                  Escape,                  union,                   NoSymbol                 ] };
+    key <AB02> { [ odiaeresis,              Odiaeresis,              dollar,                  U03F5,                   Tab,                     Tab,                     intersection,            NoSymbol                 ] };
+    key <AB03> { [ adiaeresis,              Adiaeresis,              bar,                     Greek_eta,               Insert,                  Insert,                  U2135,                   NoSymbol                 ] };
+    key <AB04> { [ p,                       P,                       asciitilde,              Greek_pi,                Return,                  Return,                  Greek_PI,                NoSymbol                 ] };
+    key <AB05> { [ z,                       Z,                       grave,                   Greek_zeta,              Undo,                    Undo,                    U2124,                   NoSymbol                 ] };
+
+    key <AB06> { [ b,                       B,                       plus,                    Greek_beta,              colon,                   NoSymbol,                U21D0,                   NoSymbol                 ] };
+    key <AB07> { [ m,                       M,                       percent,                 Greek_mu,                KP_1,                    KP_1,                    ifonlyif,                NoSymbol                 ] };
+    key.type[Group1] = "EIGHT_LEVEL";
+    key <AB08> { [ comma,                   endash,                  quotedbl,                U03F1,                   KP_2,                    KP_2,                    U21D2,                   NoSymbol                 ] };
+    key <AB09> { [ period,                  enfilledcircbullet,      apostrophe,              U03D1,                   KP_3,                    KP_3,                    U21A6,                   NoSymbol                 ] };
+    key.type[Group1] = "EIGHT_LEVEL_SEMIALPHABETIC";
+    key <AB10> { [ j,                       J,                       semicolon,               Greek_theta,             semicolon,               NoSymbol,                Greek_THETA,             NoSymbol                 ] };
+    key.type[Group1] = "EIGHT_LEVEL";
+
+    // Space key
+    // --------------------------------------------------------------
+    key <SPCE> { [ space,                   space,                   space,                   nobreakspace,            KP_0,                    KP_0,                    U202F,                   NoSymbol                 ] };
+
+
+    // Keypad-keys
+    // ===============
+
+    // The former Numlock key:
+    key <NMLK> { [ Tab,                     ISO_Left_Tab,            equal,                   approxeq,                notequal,                Pointer_EnableKeys,      identical,               NoSymbol                 ] };
+
+    // Topmost row
+    // --------------------------------------------------------------
+    key <KPDV> { [ KP_Divide,               KP_Divide,               division,                U2300,                   U2215,                   NoSymbol,                U2223,                   NoSymbol                 ] };
+    key <KPMU> { [ KP_Multiply,             KP_Multiply,             U2219,                   U2299,                   multiply,                NoSymbol,                U2297,                   NoSymbol                 ] };
+    key <KPSU> { [ KP_Subtract,             KP_Subtract,             U2212,                   U2296,                   U2216,                   NoSymbol,                U2238,                   NoSymbol                 ] };
+
+    // Top row
+    // --------------------------------------------------------------
+    key  <KP7> { [ KP_7,                    U2714,                   U2195,                   U226A,                   KP_Home,                 KP_Home,                 upstile,                 NoSymbol                 ] };
+    key  <KP8> { [ KP_8,                    U2718,                   uparrow,                 intersection,            KP_Up,                   KP_Up,                   U22C2,                   NoSymbol                 ] };
+    key  <KP9> { [ KP_9,                    dagger,                  U20D7,                   U226B,                   KP_Prior,                KP_Prior,                U2309,                   NoSymbol                 ] };
+    key <KPAD> { [ KP_Add,                  KP_Add,                  plusminus,               U2295,                   U2213,                   NoSymbol,                U2214,                   NoSymbol                 ] };
+
+    // Middle row
+    // --------------------------------------------------------------
+    key  <KP4> { [ KP_4,                    club,                    leftarrow,               includedin,              KP_Left,                 KP_Left,                 U2286,                   NoSymbol                 ] };
+    key  <KP5> { [ KP_5,                    EuroSign,                colon,                   U22B6,                   KP_Begin,                KP_Begin,                U22B7,                   NoSymbol                 ] };
+    key  <KP6> { [ KP_6,                    U2023,                   rightarrow,              includes,                KP_Right,                KP_Right,                U2287,                   NoSymbol                 ] };
+
+    // Bottom row
+    // --------------------------------------------------------------
+    key  <KP1> { [ KP_1,                    diamond,                 U2194,                   lessthanequal,           KP_End,                  KP_End,                  downstile,               NoSymbol                 ] };
+    key  <KP2> { [ KP_2,                    heart,                   downarrow,               union,                   KP_Down,                 KP_Down,                 U22C3,                   NoSymbol                 ] };
+    key  <KP3> { [ KP_3,                    U2660,                   U21CC,                   greaterthanequal,        KP_Next,                 KP_Next,                 U230B,                   NoSymbol                 ] };
+    key <KPEN> { [ KP_Enter,                KP_Enter,                KP_Enter,                KP_Enter,                KP_Enter,                KP_Enter,                KP_Enter,                NoSymbol                 ] };
+    key <KPEQ> { [ KP_Equal,                NoSymbol,                NoSymbol,                NoSymbol,                NoSymbol,                NoSymbol,                NoSymbol,                NoSymbol                 ] };
+
+    // Bottommost row
+    // --------------------------------------------------------------
+    key  <KP0> { [ KP_0,                    U2423,                   percent,                 U2030,                   KP_Insert,               KP_Insert,               U25A1,                   NoSymbol                 ] };
+    key <KPDL> { [ KP_Separator,            period,                  comma,                   minutes,                 KP_Delete,               KP_Delete,               seconds,                 NoSymbol                 ] };
+};
+
+partial alphanumeric_keys modifier_keys keypad_keys
+xkb_symbols "neo" {
+
+    include "de(neo_base)"
+
+    name[Group1]= "German (Neo 2)";
+
+    include "shift(both_capslock)"
+    include "level3(caps_switch)"
+    include "level3(bksl_switch)"
+    include "level5(lsgt_switch)"
+    include "level5(ralt_switch)"
+};
+
+// Copied from macintosh_vndr/de
+// olh@suse.de   very close to MacOS map
+
+partial alphanumeric_keys 
+xkb_symbols "mac" {
+
+    include "de"
+    name[Group1]= "German (Macintosh)";
+
+    // Alphanumeric section
+    key <AE01>	{ [         1,     exclam,   exclamdown,           at ]	};
+    key <AE05>	{ [         5,    percent,  bracketleft       ]	};
+    key <AE06>	{ [         6,  ampersand, bracketright       ]	};
+    key <AE07>	{ [         7,      slash,          bar,    backslash ]	};
+    key <AE08>	{ [         8,  parenleft,    braceleft,   asciitilde ]	};
+    key <AE09>	{ [         9, parenright,   braceright       ]	};
+    key <AD01>	{ [         q,          Q, guillemotleft, guillemotright ]	};
+    key <AD04>	{ [         r,          R,   registered       ]	};
+    key <AD07>	{ [         u,          U,    diaeresis,       Aacute ]	};
+    key <AD08>	{ [         i,          I,        slash,  Ucircumflex ]	};
+    key <AD11>	{ [ udiaeresis, Udiaeresis, periodcentered,    degree ]	};
+    key <AD12>	{ [      plus,   asterisk,   asciitilde       ]	}; 
+    key <AC01>	{ [         a,          A,        aring,        Aring ]	};
+    key <AC05>	{ [         g,          G,    copyright       ]	};
+    key <AC06>	{ [         h,          H,  ordfeminine       ]	};
+    key <AC09>	{ [         l,          L,           at       ]	};
+    key <AC10>	{ [ odiaeresis, Odiaeresis,  dead_acute       ]	};
+    key <AB06>	{ [         n,          N,   asciitilde       ]	};
+
+};
+
+partial alphanumeric_keys 
+xkb_symbols "mac_nodeadkeys" {
+    // modify the standard German mac layout to not have any dead keys
+    include "de(mac)"
+    name[Group1]= "German (Macintosh, eliminate dead keys)";
+    key <AE04>	{ [         4,     dollar,   onequarter,     currency ]	};
+
+    key <TLDE>	{ [ asciicircum,    degree,     notsign       ]	};
+    key <AE12>	{ [      acute,      grave,     cedilla       ]	};
+    key <AD11>	{ [ udiaeresis, Udiaeresis,   diaeresis       ]	};
+    key <AD12>	{ [       plus,   asterisk,  asciitilde,       macron ]	};
+    key <AC10>	{ [ odiaeresis, Odiaeresis,       acute       ]	};
+    key <AC11>	{ [ adiaeresis, Adiaeresis, asciicircum       ]	};
+
+    key <BKSL>	{ [ numbersign, apostrophe,       grave       ]	};
+};
+
+partial alphanumeric_keys
+xkb_symbols "dsb"
+{
+	name[Group1] = "Lower Sorbian";
+	include "latin(basic)"
+	include "level3(ralt_switch)"
+	include "kpdl(comma)"
+	key <AB01> { [              z,              Z,         zcaron,         Zcaron ] };
+	key <AB02> { [              x,              X,         zacute,         Zacute ] };
+	key <AB03> { [              c,              C,         cacute,         Cacute ] };
+	key <AB04> { [              v,              V,         ccaron,         Ccaron ] };
+	key <AB06> { [              n,              N,         nacute,         Nacute ] };
+	key <AC02> { [              s,              S,         sacute,         Sacute ] };
+	key <AC03> { [              d,              D,         scaron,         Scaron ] };
+	key <AC04> { [              f,              F                                 ] };
+	key <AD01> { [              q,              Q                                 ] };
+	key <AD02> { [              w,              W                                 ] };
+	key <AD03> { [              e,              E,         ecaron,         Ecaron ] };
+	key <AD04> { [              r,              R,         racute,         Racute ] };
+	key <AD05> { [              t,              T,          U20B5,       EuroSign ] };
+	key <AD09> { [              o,              O,         oacute,         Oacute ] };
+};
+
+partial alphanumeric_keys
+xkb_symbols "dsb_qwertz"
+{
+	name[Group1] = "Lower Sorbian (qwertz)";
+	include "latin(basic)"
+	include "level3(ralt_switch)"
+	include "kpdl(comma)"
+	key <AB01> { [              y,              Y                                 ] };
+	key <AB02> { [              x,              X                                 ] };
+	key <AB03> { [              c,              C,         cacute,         Cacute ] };
+	key <AB04> { [              v,              V,         ccaron,         Ccaron ] };
+	key <AB06> { [              n,              N,         nacute,         Nacute ] };
+	key <AC02> { [              s,              S,         sacute,         Sacute ] };
+	key <AC03> { [              d,              D,         scaron,         Scaron ] };
+	key <AC04> { [              f,              F                                 ] };
+	key <AD01> { [              q,              Q                                 ] };
+	key <AD02> { [              w,              W                                 ] };
+	key <AD03> { [              e,              E,         ecaron,         Ecaron ] };
+	key <AD04> { [              r,              R,         racute,         Racute ] };
+	key <AD05> { [              t,              T,          U20B5,       EuroSign ] };
+	key <AD06> { [              z,              Z,         zcaron,         Zcaron ] };
+	key <AD07> { [              u,              U,         zacute,         Zacute ] };
+	key <AD09> { [              o,              O,         oacute,         Oacute ] };
+};
+
+partial alphanumeric_keys 
+xkb_symbols "qwerty" {
+ 
+    // This layout should work exactly as a de with the exception 
+    // of 'Z' and 'Y' keys, which are in the qwerty style (ie. swapped).
+    // 2008 by Matej Košík <kosik@fiit.stuba.sk>
+    
+    include "de(basic)"
+
+    name[Group1] = "German (qwerty)";
+
+    key <AB01>	{ [         z,          Z,     leftarrow,         yen ]	};
+    key <AD06>	{ [         y,          Y, guillemotleft,        less ]	};
+};
+
+// layout for Russian letters on an german keyboard
+// based on US-RU layout by Ivan Popov <pin@konvalo.org> 2005-07-17
+// adopted for german layout by Alexey Fisher <bug-track@fisher-privat.net> 2010-08-19
+
+partial alphanumeric_keys
+xkb_symbols "ru" {
+
+    include "de(basic)"
+ 
+    name[Group1]= "Russian (Germany, phonetic)";
+
+key.type[group1]="FOUR_LEVEL_ALPHABETIC";
+
+    key <LatA> { [        Cyrillic_a,        Cyrillic_A ] };
+    key <LatB> { [       Cyrillic_be,       Cyrillic_BE ] };
+    key <LatW> { [       Cyrillic_ve,       Cyrillic_VE ] };
+    key <LatG> { [      Cyrillic_ghe,      Cyrillic_GHE ] };
+    key <LatD> { [       Cyrillic_de,       Cyrillic_DE ] };
+    key <LatE> { [       Cyrillic_ie,       Cyrillic_IE ] };
+    key <TLDE> { [       Cyrillic_io,       Cyrillic_IO, asciitilde ] };
+    key <LatX> { [      Cyrillic_zhe,      Cyrillic_ZHE ] };
+    key <LatZ> { [       Cyrillic_ze,       Cyrillic_ZE ] };
+    key <LatI> { [        Cyrillic_i,        Cyrillic_I ] };
+    key <LatJ> { [   Cyrillic_shorti,   Cyrillic_SHORTI ] };
+    key <LatK> { [       Cyrillic_ka,       Cyrillic_KA ] };
+    key <LatL> { [       Cyrillic_el,       Cyrillic_EL ] };
+    key <LatM> { [       Cyrillic_em,       Cyrillic_EM ] };
+    key <LatN> { [       Cyrillic_en,       Cyrillic_EN ] };
+    key <LatO> { [        Cyrillic_o,        Cyrillic_O ] };
+    key <LatP> { [       Cyrillic_pe,       Cyrillic_PE ] };
+    key <LatR> { [       Cyrillic_er,       Cyrillic_ER ] };
+    key <LatS> { [       Cyrillic_es,       Cyrillic_ES ] };
+    key <LatT> { [       Cyrillic_te,       Cyrillic_TE ] };
+    key <LatU> { [        Cyrillic_u,        Cyrillic_U ] };
+    key <LatF> { [       Cyrillic_ef,       Cyrillic_EF ] };
+    key <LatH> { [       Cyrillic_ha,       Cyrillic_HA ] };
+    key <LatC> { [      Cyrillic_tse,      Cyrillic_TSE ] };
+    key <AC10> { [      Cyrillic_che,      Cyrillic_CHE ] };
+    key <AD11> { [      Cyrillic_sha,      Cyrillic_SHA ] };
+    key <AD12> { [    Cyrillic_shcha,    Cyrillic_SHCHA, plus, asterisk ] };
+    key <AE12> { [ Cyrillic_hardsign, Cyrillic_HARDSIGN ] };
+    key <LatY> { [     Cyrillic_yeru,     Cyrillic_YERU ] };
+    key <LatV> { [ Cyrillic_softsign, Cyrillic_SOFTSIGN ] };
+    key <AC11> { [        Cyrillic_e,        Cyrillic_E ] };
+    key <BKSL> { [       Cyrillic_yu,       Cyrillic_YU, numbersign, apostrophe ] };
+    key <LatQ> { [       Cyrillic_ya,       Cyrillic_YA ] };
+
+    include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "htcdream" {
+        include "inet(htcdream)"
+
+        name[Group1]= "German";
+
+        //second row
+        key <AD01> { [ q, Q, Tab, Tab ] };
+        key <AD02> { [ w, W, grave, grave ] };
+        key <AD03> { [ e, E, EuroSign, EuroSign ] };
+        key <AD04> { [ r, R, underscore, underscore ] };
+        key <AD05> { [ t, T, sterling, sterling] };
+        key <AD06> { [ z, Z, division, division ] };
+        key <AD07> { [ u, U, udiaeresis, udiaeresis ] };
+        key <AD08> { [ i, I, minus, minus ] };
+        key <AD09> { [ o, O, odiaeresis, odiaeresis ] };
+        key <AD10> { [ p, P, equal, equal ] };
+
+        //third row
+        key <AC01> { [ a, A, adiaeresis, adiaeresis ] };
+        key <AC02> { [ s, S, ssharp, ssharp] };
+        key <AC03> { [ d ,D, backslash, backslash ] };
+        key <AC04> { [ f, F, braceleft, braceleft ] };
+        key <AC05> { [ g, G, braceright, braceright ] };
+        key <AC06> { [ h, H, multiply, multiply ] };
+        key <AC07> { [ j, J, colon, colon ] };
+        key <AC08> { [ k, K, plus, plus ] };
+        key <AC09> { [ l, L, apostrophe, apostrophe ] };
+
+        //forth row
+        key <AB01> { [ y, Y, bar, bar ] };
+        key <AB02> { [ x, X, bracketleft, bracketleft ] };
+        key <AB03> { [ c, C, bracketright, bracketright ] };
+        key <AB04> { [ v, V, less, less ] };
+        key <AB05> { [ b, B, greater, greater ] };
+        key <AB06> { [ n, N, semicolon, semicolon ] };
+        key <AB07> { [ m, M, quotedbl, quotedbl ] };
+        key <AB08> { [ comma, comma, question, question ] };
+
+        //fifth row
+        key <FK15> { [ at, at, asciitilde, asciitilde ] };
+
+        include "level3(alt_switch)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/dk b/xorg-server/xkeyboard-config/symbols/dk
index c652ebbb6..1187a99bd 100644
--- a/xorg-server/xkeyboard-config/symbols/dk
+++ b/xorg-server/xkeyboard-config/symbols/dk
@@ -1,72 +1,72 @@
-// based on a keyboard map from an 'xkb/symbols/dk' file

-

-partial default alphanumeric_keys

-xkb_symbols "basic" {

-

-    include "latin(type2)"

-

-    name[Group1]="Denmark";

-

-    key <AE11>	{ [      plus,   question,    plusminus, questiondown ]	};

-    key <AE12>	{ [dead_acute, dead_grave,          bar,    brokenbar ]	};

-

-

-    key <AC10>	{ [        ae,        AE,   dead_acute, dead_doubleacute ] };

-    key <AC11>	{ [    oslash,  Ooblique, dead_circumflex, dead_caron ]	};

-    key <TLDE>	{ [   onehalf,   section, threequarters,    paragraph ]	};

-

-    key <BKSL>	{ [apostrophe,   asterisk, dead_doubleacute, multiply ]	};

-

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

-

-    include "kpdl(comma)"

-

-    include "level3(ralt_switch)"

-};

-

-partial alphanumeric_keys

-xkb_symbols "nodeadkeys" {

-

-    include "dk(basic)"

-

-    name[Group1]="Denmark - Eliminate dead keys";

-

-    key <AE12>	{ [     acute,      grave,          bar,       ogonek ]	};

-    key <AD11>	{ [     aring,      Aring,    diaeresis,       degree ]	};

-    key <AD12>	{ [ diaeresis, asciicircum,  asciitilde,       macron ]	};

-    key <AC10>	{ [        ae,         AE,        acute,  doubleacute ]	};

-    key <AC11>	{ [    oslash,   Ooblique,  asciicircum,        caron ]	};

-    key <BKSL>	{ [apostrophe,   asterisk,  doubleacute,     multiply ]	};

-    key <AB08>	{ [     comma,  semicolon,      cedilla,       ogonek ]	};

-    key <AB09>	{ [    period,      colon, periodcentered,   abovedot ]	};

-

-};

-

-// Copied from macintosh_vndr/dk

-partial alphanumeric_keys 

-xkb_symbols "mac" {

-

-    include "dk"

-    name[Group1]= "Denmark - Macintosh";

-

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

-    key <AB10>	{ [    minus,  underscore,       hyphen,       macron ]	};

-    include "kpdl(dot)"

-};

-

-

-partial alphanumeric_keys 

-xkb_symbols "mac_nodeadkeys" {

-    include "dk(mac)"

-    name[Group1]= "Denmark - Macintosh, eliminate dead keys";

-

-    key <AE12>	{ [    acute,       grave,          bar,       ogonek ]	};

-    key <AD12>	{ [diaeresis, asciicircum,   asciitilde,  dead_macron ]	};

-};

-

-partial alphanumeric_keys 

-xkb_symbols "dvorak" {

-    include "no(dvorak)"

-

-    name[Group1]= "Denmark - Dvorak";

-};

+// based on a keyboard map from an 'xkb/symbols/dk' file
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+
+    include "latin(type2)"
+
+    name[Group1]="Danish";
+
+    key <AE11>	{ [      plus,   question,    plusminus, questiondown ]	};
+    key <AE12>	{ [dead_acute, dead_grave,          bar,    brokenbar ]	};
+
+
+    key <AC10>	{ [        ae,        AE,   dead_acute, dead_doubleacute ] };
+    key <AC11>	{ [    oslash,  Ooblique, dead_circumflex, dead_caron ]	};
+    key <TLDE>	{ [   onehalf,   section, threequarters,    paragraph ]	};
+
+    key <BKSL>	{ [apostrophe,   asterisk, dead_doubleacute, multiply ]	};
+
+    key <LSGT>	{ [      less,    greater,    backslash,      notsign ]	};
+
+    include "kpdl(comma)"
+
+    include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "nodeadkeys" {
+
+    include "dk(basic)"
+
+    name[Group1]="Danish (eliminate dead keys)";
+
+    key <AE12>	{ [     acute,      grave,          bar,       ogonek ]	};
+    key <AD11>	{ [     aring,      Aring,    diaeresis,       degree ]	};
+    key <AD12>	{ [ diaeresis, asciicircum,  asciitilde,       macron ]	};
+    key <AC10>	{ [        ae,         AE,        acute,  doubleacute ]	};
+    key <AC11>	{ [    oslash,   Ooblique,  asciicircum,        caron ]	};
+    key <BKSL>	{ [apostrophe,   asterisk,  doubleacute,     multiply ]	};
+    key <AB08>	{ [     comma,  semicolon,      cedilla,       ogonek ]	};
+    key <AB09>	{ [    period,      colon, periodcentered,   abovedot ]	};
+
+};
+
+// Copied from macintosh_vndr/dk
+partial alphanumeric_keys 
+xkb_symbols "mac" {
+
+    include "dk"
+    name[Group1]= "Danish (Macintosh)";
+
+    key <SPCE>	{ [    space,       space, nobreakspace, nobreakspace ]	};
+    key <AB10>	{ [    minus,  underscore,       hyphen,       macron ]	};
+    include "kpdl(dot)"
+};
+
+
+partial alphanumeric_keys 
+xkb_symbols "mac_nodeadkeys" {
+    include "dk(mac)"
+    name[Group1]= "Danish (Macintosh, eliminate dead keys)";
+
+    key <AE12>	{ [    acute,       grave,          bar,       ogonek ]	};
+    key <AD12>	{ [diaeresis, asciicircum,   asciitilde,  dead_macron ]	};
+};
+
+partial alphanumeric_keys 
+xkb_symbols "dvorak" {
+    include "no(dvorak)"
+
+    name[Group1]= "Danish (Dvorak)";
+};
diff --git a/xorg-server/xkeyboard-config/symbols/ee b/xorg-server/xkeyboard-config/symbols/ee
index e85037b04..fe1092eab 100644
--- a/xorg-server/xkeyboard-config/symbols/ee
+++ b/xorg-server/xkeyboard-config/symbols/ee
@@ -1,100 +1,100 @@
-// based on

-// Estonian XKB-keymap by Ville Hallik <ville@linux.ee>

-//

-

-partial default alphanumeric_keys

-xkb_symbols "basic" {

-

-    // Describes the differences between a very simple en_US

-    // keyboard and a very simple Estonian keyboard

-    // This layout conforms to both EVS8:1993 and EVS8:2000 standards

-

-    include "latin(type4)"

-

-    name[Group1]="Estonia";

-

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

-    key <AE04>	{ [         4,   currency,       dollar,       dollar ]	};

-    key <AE11>	{ [      plus,   question,    backslash, questiondown ]	};

-    key <AE12>	{ [dead_acute, dead_grave,        grave,   apostrophe ]	};

-

-    key <AD11>	{ [udiaeresis, Udiaeresis, dead_diaeresis, dead_abovering ] };

-    key <AD12>	{ [    otilde,     Otilde,      section,  dead_macron ]	};

-

-    key <AC02>	{ [         s,          S,       scaron,       Scaron ]	};

-    key <AC10>	{ [odiaeresis, Odiaeresis,   dead_acute, dead_doubleacute ] };

-    key <AC11>	{ [adiaeresis, Adiaeresis,  asciicircum,   dead_caron ]	};

-    key <TLDE>	{ [dead_caron, dead_tilde,      notsign,      notsign ]	};

-

-    key <BKSL>	{ [apostrophe,   asterisk,      onehalf,   dead_breve ]	};

-    key <AB01>	{ [         z,          Z,       zcaron,       Zcaron ]	};

-    key <AB08>	{ [     comma,  semicolon,         less,     multiply ]	};

-    key <AB09>	{ [    period,      colon,      greater,     division ]	};

-

-    include "level3(ralt_switch)"

-    include "eurosign(e)"

-};

-

-partial alphanumeric_keys

-xkb_symbols "nodeadkeys" {

-

-    // Modifies the basic Estonian layout to eliminate all dead keys

-

-    include "ee(basic)"

-    name[Group1]="Estonia - Eliminate dead keys";

-

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

-    key <AE12>	{ [apostrophe,      grave ]	};

-    key <AD11>	{ [udiaeresis, Udiaeresis,    diaeresis,       degree ]	};

-    key <AD12>	{ [    otilde,     Otilde,      section,       macron ]	};

-    key <AC10>	{ [odiaeresis, Odiaeresis,        acute,  doubleacute ]	};

-    key <AC11>	{ [adiaeresis, Adiaeresis,  asciicircum,        caron ]	};

-    key <BKSL>	{ [apostrophe,   asterisk,      onehalf,        breve ]	};

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

-};

-

-// Dvorak with Estonian characters

-partial alphanumeric_keys

-xkb_symbols "dvorak" {

-   include "us(dvorak)"

-   name[Group1]= "Estonia - Dvorak";

-   

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

-    key <AE04>	{ [         4,     dollar,    section,   currency ]	};

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

-

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

-    key <AC02>	{ [         o,          O,     otilde,     Otilde ]	};

-    key <AC03>	{ [         e,          E, odiaeresis, Odiaeresis ]	};

-    key <AC04>	{ [         u,          U, udiaeresis, Udiaeresis ]	};

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

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

-

-    include "level3(ralt_switch)"

-    include "kpdl(comma)"

-    include "eurosign(5)"

-};

-

-// Estonian few characters on basic US keymap.

-// by Elan Ruusamäe <glen@delfi.ee>

-partial alphanumeric_keys

-xkb_symbols "us" {

-    include "us(euro)"

-    name[Group1] = "Estonia - US keyboard with Estonian letters";

-

-    // ž, Ž

-    key <AB01>	{ [           z,  Z,          zcaron,     Zcaron     ]	};

-    // ¢

-    key <AB03>	{ [           c,  C,          cent,       cent       ]	};

-    // š, Š

-    key <AC02>	{ [           s,  S,          scaron,     Scaron     ]	};

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

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

-    key <AD11>	{ [ bracketleft,  braceleft,  udiaeresis, Udiaeresis ]	};

-    key <AD12>	{ [ bracketright, braceright, otilde,     Otilde     ]	};

-    // £

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

-

-    include "level3(ralt_switch)"

-    include "eurosign(e)"

-};

+// based on
+// Estonian XKB-keymap by Ville Hallik <ville@linux.ee>
+//
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+
+    // Describes the differences between a very simple en_US
+    // keyboard and a very simple Estonian keyboard
+    // This layout conforms to both EVS8:1993 and EVS8:2000 standards
+
+    include "latin(type4)"
+
+    name[Group1]="Estonian";
+
+    key <AE03>	{ [         3, numbersign,     sterling,     sterling ]	};
+    key <AE04>	{ [         4,   currency,       dollar,       dollar ]	};
+    key <AE11>	{ [      plus,   question,    backslash, questiondown ]	};
+    key <AE12>	{ [dead_acute, dead_grave,        grave,   apostrophe ]	};
+
+    key <AD11>	{ [udiaeresis, Udiaeresis, dead_diaeresis, dead_abovering ] };
+    key <AD12>	{ [    otilde,     Otilde,      section,  dead_macron ]	};
+
+    key <AC02>	{ [         s,          S,       scaron,       Scaron ]	};
+    key <AC10>	{ [odiaeresis, Odiaeresis,   dead_acute, dead_doubleacute ] };
+    key <AC11>	{ [adiaeresis, Adiaeresis,  asciicircum,   dead_caron ]	};
+    key <TLDE>	{ [dead_caron, dead_tilde,      notsign,      notsign ]	};
+
+    key <BKSL>	{ [apostrophe,   asterisk,      onehalf,   dead_breve ]	};
+    key <AB01>	{ [         z,          Z,       zcaron,       Zcaron ]	};
+    key <AB08>	{ [     comma,  semicolon,         less,     multiply ]	};
+    key <AB09>	{ [    period,      colon,      greater,     division ]	};
+
+    include "level3(ralt_switch)"
+    include "eurosign(e)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "nodeadkeys" {
+
+    // Modifies the basic Estonian layout to eliminate all dead keys
+
+    include "ee(basic)"
+    name[Group1]="Estonian (eliminate dead keys)";
+
+    key <TLDE>	{ [asciicircum,asciitilde ]	};
+    key <AE12>	{ [apostrophe,      grave ]	};
+    key <AD11>	{ [udiaeresis, Udiaeresis,    diaeresis,       degree ]	};
+    key <AD12>	{ [    otilde,     Otilde,      section,       macron ]	};
+    key <AC10>	{ [odiaeresis, Odiaeresis,        acute,  doubleacute ]	};
+    key <AC11>	{ [adiaeresis, Adiaeresis,  asciicircum,        caron ]	};
+    key <BKSL>	{ [apostrophe,   asterisk,      onehalf,        breve ]	};
+    key <AB10>	{ [     minus, underscore, dead_belowdot,    abovedot ]	};
+};
+
+// Dvorak with Estonian characters
+partial alphanumeric_keys
+xkb_symbols "dvorak" {
+   include "us(dvorak)"
+   name[Group1]= "Estonian (Dvorak)";
+   
+    key <AE03>	{ [         3, numbersign,   sterling ]	};
+    key <AE04>	{ [         4,     dollar,    section,   currency ]	};
+    key <AE08>	{ [         8,   asterisk,    onehalf ]	};
+
+    key <AC01>	{ [         a,          A, adiaeresis, Adiaeresis ]	};
+    key <AC02>	{ [         o,          O,     otilde,     Otilde ]	};
+    key <AC03>	{ [         e,          E, odiaeresis, Odiaeresis ]	};
+    key <AC04>	{ [         u,          U, udiaeresis, Udiaeresis ]	};
+    key <AC10>	{ [         s,          S,     scaron,     Scaron ]	};   
+    key <AB10>	{ [         z,          Z,     zcaron,     Zcaron ]	};
+
+    include "level3(ralt_switch)"
+    include "kpdl(comma)"
+    include "eurosign(5)"
+};
+
+// Estonian few characters on basic US keymap.
+// by Elan Ruusamäe <glen@delfi.ee>
+partial alphanumeric_keys
+xkb_symbols "us" {
+    include "us(euro)"
+    name[Group1] = "Estonian (US keyboard with Estonian letters)";
+
+    // ž, Ž
+    key <AB01>	{ [           z,  Z,          zcaron,     Zcaron     ]	};
+    // ¢
+    key <AB03>	{ [           c,  C,          cent,       cent       ]	};
+    // š, Š
+    key <AC02>	{ [           s,  S,          scaron,     Scaron     ]	};
+    key <AC10>	{ [ semicolon,    colon,      odiaeresis, Odiaeresis ]	};
+    key <AC11>	{ [ quoteright,   quotedbl,   adiaeresis, Adiaeresis ]	};
+    key <AD11>	{ [ bracketleft,  braceleft,  udiaeresis, Udiaeresis ]	};
+    key <AD12>	{ [ bracketright, braceright, otilde,     Otilde     ]	};
+    // £
+    key <AE03>	{ [           3,  numbersign, sterling,   sterling   ]	};
+
+    include "level3(ralt_switch)"
+    include "eurosign(e)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/fi b/xorg-server/xkeyboard-config/symbols/fi
index 35c9da7a4..ec944e998 100644
--- a/xorg-server/xkeyboard-config/symbols/fi
+++ b/xorg-server/xkeyboard-config/symbols/fi
@@ -1,206 +1,206 @@
-//

-// X keyboard maps for Finland

-//

-// SFS 5966 / Kotoistus keymap created by Troy Korjuslommi

-// Classic keymap based on traditional by Marko Myllynen

-// Eliminate deadkeys alternative sent by Linus Torvalds

-//

-

-//

-// Missing from X11/keysymdef.h as of 2010-05-13

-//

-// U2030 # PER MILLE SIGN

-// U0292 # LATIN SMALL LETTER EZH

-// U01B7 # LATIN CAPITAL LETTER EZH

-//

-

-partial alphanumeric_keys default

-xkb_symbols "kotoistus" {

-

-    // Official keymap for Finland based on SFS 5966 standard

-    //

-    // This keymap implements all the functionality of Annex 1

-    // of the standard and additionally defines the following to

-    // allow entering these characters with keyboars without LSGT.

-    //

-    // AE08+4, U+003C : LESS-THAN SIGN     (less)

-    // AE09+4, U+003E : GREATER-THAN SIGN  (greater)

-    // AD08+4, U+007C : VERTICAL LINE      (bar)

-    //

-    // Annex 3 of the standard is implemented in fi_FI.UTF-8/Compose

-

-    name[Group1]="Finland";

-

-    key <TLDE> { [  section,         onehalf,          dead_stroke,           NoSymbol              ] };

-    key <AE01> { [  1,               exclam,           NoSymbol,              exclamdown            ] };

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

-    key <AE03> { [  3,               numbersign,       sterling,              guillemotright        ] };

-    key <AE04> { [  4,               currency,         dollar,                guillemotleft         ] };

-    key <AE05> { [  5,               percent,          U2030,                 leftdoublequotemark   ] };

-    key <AE06> { [  6,               ampersand,        singlelowquotemark,    doublelowquotemark    ] };

-    key <AE07> { [  7,               slash,            braceleft,             NoSymbol              ] };

-    key <AE08> { [  8,               parenleft,        bracketleft,           less                  ] };

-    key <AE09> { [  9,               parenright,       bracketright,          greater               ] };

-    key <AE10> { [  0,               equal,            braceright,            degree                ] };

-    key <AE11> { [  plus,            question,         backslash,             questiondown          ] };

-    key <AE12> { [  dead_acute,      dead_grave,       dead_cedilla,          dead_ogonek           ] };

-

-    key <AD01> { [  q,               Q,                q,                     Q                     ] };

-    key <AD02> { [  w,               W,                w,                     W                     ] };

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

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

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

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

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

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

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

-    key <AD10> { [  p,               P,                dead_horn,             dead_hook             ] };

-    key <AD11> { [  aring,           Aring,            dead_doubleacute,      dead_abovering        ] };

-    key <AD12> { [  dead_diaeresis,  dead_circumflex,  dead_tilde,            dead_macron           ] };

-

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

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

-    key <AC03> { [  d,               D,                eth,                   ETH                   ] };

-    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,                kra,                   NoSymbol              ] };

-    key <AC09> { [  l,               L,                dead_stroke,           NoSymbol              ] };

-    key <AC10> { [  odiaeresis,      Odiaeresis,       oslash,                Oslash                ] };

-    key <AC11> { [  adiaeresis,      Adiaeresis,       ae,                    AE                    ] };

-    key <BKSL> { [  apostrophe,      asterisk,         dead_caron,            dead_breve            ] };

-

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

-    key <AB01> { [  z,               Z,                U0292,                 U01B7                 ] };

-    key <AB02> { [  x,               X,                multiply,              periodcentered        ] };

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

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

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

-    key <AB06> { [  n,               N,                eng,                   ENG                   ] };

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

-    key <AB08> { [  comma,           semicolon,        rightsinglequotemark,  leftsinglequotemark   ] };

-    key <AB09> { [  period,          colon,            dead_belowdot,         dead_abovedot         ] };

-    key <AB10> { [  minus,           underscore,       endash,                dead_belowcomma       ] };

-

-    include "nbsp(level4)"

-    include "nbsp(level3)"

-    include "kpdl(comma)"

-    include "level3(ralt_switch)"

-    include "compose(rwin)"

-};

-

-partial alphanumeric_keys

-xkb_symbols "classic" {

-

-    include "fi(fi)"

-

-    name[Group1]="Finland - Classic";

-};

-

-partial alphanumeric_keys hidden

-xkb_symbols "fi" {

-

-    // Classic Finnish keyboard layout with dead keys support

-    // and all ISO-8859-1 and ISO-8859-15 characters available

-

-    key <TLDE> { [  section,         onehalf,          onequarter,            threequarters         ] };

-    key <AE01> { [  1,               exclam,           exclamdown,            onesuperior           ] };

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

-    key <AE03> { [  3,               numbersign,       sterling,              threesuperior         ] };

-    key <AE04> { [  4,               currency,         dollar,                cent                  ] };

-    key <AE05> { [  5,               percent,          EuroSign,              masculine             ] };

-    key <AE06> { [  6,               ampersand,        yen,                   ordfeminine           ] };

-    key <AE07> { [  7,               slash,            braceleft,             plusminus             ] };

-    key <AE08> { [  8,               parenleft,        bracketleft,           guillemotleft         ] };

-    key <AE09> { [  9,               parenright,       bracketright,          guillemotright        ] };

-    key <AE10> { [  0,               equal,            braceright,            degree                ] };

-    key <AE11> { [  plus,            question,         backslash,             questiondown          ] };

-    key <AE12> { [  dead_acute,      dead_grave,       dead_cedilla,          dead_ogonek           ] };

-

-    key <AD01> { [  q,               Q,                q,                     Q                     ] };

-    key <AD02> { [  w,               W,                w,                     W                     ] };

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

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

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

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

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

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

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

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

-    key <AD11> { [  aring,           Aring,            oe,                    OE                    ] };

-    key <AD12> { [  dead_diaeresis,  dead_circumflex,  dead_tilde,            dead_caron            ] };

-

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

-    key <AC02> { [  s,               S,                scaron,                Scaron                ] };

-    key <AC03> { [  d,               D,                eth,                   ETH                   ] };

-    key <AC04> { [  f,               F,                f,                     F                     ] };

-    key <AC05> { [  g,               G,                eng,                   ENG                   ] };

-    key <AC06> { [  h,               H,                h,                     H                     ] };

-    key <AC07> { [  j,               J,                j,                     J                     ] };

-    key <AC08> { [  k,               K,                kra,                   NoSymbol              ] };

-    key <AC09> { [  l,               L,                dead_stroke,           NoSymbol              ] };

-    key <AC10> { [  odiaeresis,      Odiaeresis,       oslash,                Oslash                ] };

-    key <AC11> { [  adiaeresis,      Adiaeresis,       ae,                    AE                    ] };

-    key <BKSL> { [  apostrophe,      asterisk,         dead_caron,            dead_breve            ] };

-

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

-    key <AB01> { [  z,               Z,                zcaron,                Zcaron                ] };

-    key <AB02> { [  x,               X,                multiply,              division              ] };

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

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

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

-    key <AB06> { [  n,               N,                ntilde,                Ntilde                ] };

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

-    key <AB08> { [  comma,           semicolon,        dead_cedilla,          dead_ogonek           ] };

-    key <AB09> { [  period,          colon,            periodcentered,        notsign               ] };

-    key <AB10> { [  minus,           underscore,       hyphen,                dead_macron           ] };

-

-    include "nbsp(level4)"

-    include "kpdl(comma)"

-    include "level3(ralt_switch)"

-    include "compose(rwin)"

-};

-

-partial alphanumeric_keys

-xkb_symbols "nodeadkeys" {

-

-    // Classic Finnish keyboard layout without dead keys

-

-    include "fi(fi)"

-

-    name[Group1]="Finland - Classic, eliminate dead keys";

-

-    key <AE12> { [  acute,           grave,            cedilla,               ogonek                ] };

-    key <AD12> { [  diaeresis,       asciicircum,      asciitilde,            caron                 ] };

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

-    key <BKSL> { [  apostrophe,      asterisk,         caron,                 breve                 ] };

-    key <AB08> { [  comma,           semicolon,        cedilla,               ogonek                ] };

-    key <AB10> { [  minus,           underscore,       hyphen,                macron                ] };

-};

-

-partial alphanumeric_keys

-xkb_symbols "smi" {

-

-    // Describes the differences between a Norwegian Northern Sami

-    // (keyboard with dead key support) and a Swedish/Finnish Sami

-    // keyboard according to the specs at:

-    // http://www.hum.uit.no/a/trond/se-lat9-sefi-keys.html

-

-    include "no(smi)"

-

-    name[Group1]="Finland - Northern Saami";

-

-    key <AC10> { [  odiaeresis,      Odiaeresis,       oslash,                Oslash                ] };

-    key <AC11> { [  adiaeresis,      Adiaeresis,       ae,                    AE                    ] };

-};

-

-partial alphanumeric_keys

-xkb_symbols "mac" {

-

-    // Macintosh keyboard for Finland based on Swedish(Macintosh) keyboard

-

-    include "se(mac)"

-

-    name[Group1]="Finland - Macintosh";

-};

+//
+// X keyboard maps for Finland
+//
+// SFS 5966 / Kotoistus keymap created by Troy Korjuslommi
+// Classic keymap based on traditional by Marko Myllynen
+// Eliminate deadkeys alternative sent by Linus Torvalds
+//
+
+//
+// Missing from X11/keysymdef.h as of 2010-05-13
+//
+// U2030 # PER MILLE SIGN
+// U0292 # LATIN SMALL LETTER EZH
+// U01B7 # LATIN CAPITAL LETTER EZH
+//
+
+partial alphanumeric_keys default
+xkb_symbols "kotoistus" {
+
+    // Official keymap for Finland based on SFS 5966 standard
+    //
+    // This keymap implements all the functionality of Annex 1
+    // of the standard and additionally defines the following to
+    // allow entering these characters with keyboars without LSGT.
+    //
+    // AE08+4, U+003C : LESS-THAN SIGN     (less)
+    // AE09+4, U+003E : GREATER-THAN SIGN  (greater)
+    // AD08+4, U+007C : VERTICAL LINE      (bar)
+    //
+    // Annex 3 of the standard is implemented in fi_FI.UTF-8/Compose
+
+    name[Group1]="Finnish";
+
+    key <TLDE> { [  section,         onehalf,          dead_stroke,           NoSymbol              ] };
+    key <AE01> { [  1,               exclam,           NoSymbol,              exclamdown            ] };
+    key <AE02> { [  2,               quotedbl,         at,                    rightdoublequotemark  ] };
+    key <AE03> { [  3,               numbersign,       sterling,              guillemotright        ] };
+    key <AE04> { [  4,               currency,         dollar,                guillemotleft         ] };
+    key <AE05> { [  5,               percent,          U2030,                 leftdoublequotemark   ] };
+    key <AE06> { [  6,               ampersand,        singlelowquotemark,    doublelowquotemark    ] };
+    key <AE07> { [  7,               slash,            braceleft,             NoSymbol              ] };
+    key <AE08> { [  8,               parenleft,        bracketleft,           less                  ] };
+    key <AE09> { [  9,               parenright,       bracketright,          greater               ] };
+    key <AE10> { [  0,               equal,            braceright,            degree                ] };
+    key <AE11> { [  plus,            question,         backslash,             questiondown          ] };
+    key <AE12> { [  dead_acute,      dead_grave,       dead_cedilla,          dead_ogonek           ] };
+
+    key <AD01> { [  q,               Q,                q,                     Q                     ] };
+    key <AD02> { [  w,               W,                w,                     W                     ] };
+    key <AD03> { [  e,               E,                EuroSign,              NoSymbol              ] };
+    key <AD04> { [  r,               R,                r,                     R                     ] };
+    key <AD05> { [  t,               T,                thorn,                 THORN                 ] };
+    key <AD06> { [  y,               Y,                y,                     Y                     ] };
+    key <AD07> { [  u,               U,                u,                     U                     ] };
+    key <AD08> { [  i,               I,                idotless,              bar                   ] };
+    key <AD09> { [  o,               O,                oe,                    OE                    ] };
+    key <AD10> { [  p,               P,                dead_horn,             dead_hook             ] };
+    key <AD11> { [  aring,           Aring,            dead_doubleacute,      dead_abovering        ] };
+    key <AD12> { [  dead_diaeresis,  dead_circumflex,  dead_tilde,            dead_macron           ] };
+
+    key <AC01> { [  a,               A,                schwa,                 SCHWA                 ] };
+    key <AC02> { [  s,               S,                ssharp,                NoSymbol              ] };
+    key <AC03> { [  d,               D,                eth,                   ETH                   ] };
+    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,                kra,                   NoSymbol              ] };
+    key <AC09> { [  l,               L,                dead_stroke,           NoSymbol              ] };
+    key <AC10> { [  odiaeresis,      Odiaeresis,       oslash,                Oslash                ] };
+    key <AC11> { [  adiaeresis,      Adiaeresis,       ae,                    AE                    ] };
+    key <BKSL> { [  apostrophe,      asterisk,         dead_caron,            dead_breve            ] };
+
+    key <LSGT> { [  less,            greater,          bar,                   NoSymbol              ] };
+    key <AB01> { [  z,               Z,                U0292,                 U01B7                 ] };
+    key <AB02> { [  x,               X,                multiply,              periodcentered        ] };
+    key <AB03> { [  c,               C,                c,                     C                     ] };
+    key <AB04> { [  v,               V,                v,                     V                     ] };
+    key <AB05> { [  b,               B,                b,                     B                     ] };
+    key <AB06> { [  n,               N,                eng,                   ENG                   ] };
+    key <AB07> { [  m,               M,                mu,                    emdash                ] };
+    key <AB08> { [  comma,           semicolon,        rightsinglequotemark,  leftsinglequotemark   ] };
+    key <AB09> { [  period,          colon,            dead_belowdot,         dead_abovedot         ] };
+    key <AB10> { [  minus,           underscore,       endash,                dead_belowcomma       ] };
+
+    include "nbsp(level4)"
+    include "nbsp(level3)"
+    include "kpdl(comma)"
+    include "level3(ralt_switch)"
+    include "compose(rwin)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "classic" {
+
+    include "fi(fi)"
+
+    name[Group1]="Finnish (classic)";
+};
+
+partial alphanumeric_keys hidden
+xkb_symbols "fi" {
+
+    // Classic Finnish keyboard layout with dead keys support
+    // and all ISO-8859-1 and ISO-8859-15 characters available
+
+    key <TLDE> { [  section,         onehalf,          onequarter,            threequarters         ] };
+    key <AE01> { [  1,               exclam,           exclamdown,            onesuperior           ] };
+    key <AE02> { [  2,               quotedbl,         at,                    twosuperior           ] };
+    key <AE03> { [  3,               numbersign,       sterling,              threesuperior         ] };
+    key <AE04> { [  4,               currency,         dollar,                cent                  ] };
+    key <AE05> { [  5,               percent,          EuroSign,              masculine             ] };
+    key <AE06> { [  6,               ampersand,        yen,                   ordfeminine           ] };
+    key <AE07> { [  7,               slash,            braceleft,             plusminus             ] };
+    key <AE08> { [  8,               parenleft,        bracketleft,           guillemotleft         ] };
+    key <AE09> { [  9,               parenright,       bracketright,          guillemotright        ] };
+    key <AE10> { [  0,               equal,            braceright,            degree                ] };
+    key <AE11> { [  plus,            question,         backslash,             questiondown          ] };
+    key <AE12> { [  dead_acute,      dead_grave,       dead_cedilla,          dead_ogonek           ] };
+
+    key <AD01> { [  q,               Q,                q,                     Q                     ] };
+    key <AD02> { [  w,               W,                w,                     W                     ] };
+    key <AD03> { [  e,               E,                EuroSign,              cent                  ] };
+    key <AD04> { [  r,               R,                registered,            NoSymbol              ] };
+    key <AD05> { [  t,               T,                thorn,                 THORN                 ] };
+    key <AD06> { [  y,               Y,                y,                     Y                     ] };
+    key <AD07> { [  u,               U,                u,                     U                     ] };
+    key <AD08> { [  i,               I,                idotless,              bar                   ] };
+    key <AD09> { [  o,               O,                o,                     O                     ] };
+    key <AD10> { [  p,               P,                paragraph,             NoSymbol              ] };
+    key <AD11> { [  aring,           Aring,            oe,                    OE                    ] };
+    key <AD12> { [  dead_diaeresis,  dead_circumflex,  dead_tilde,            dead_caron            ] };
+
+    key <AC01> { [  a,               A,                schwa,                 SCHWA                 ] };
+    key <AC02> { [  s,               S,                scaron,                Scaron                ] };
+    key <AC03> { [  d,               D,                eth,                   ETH                   ] };
+    key <AC04> { [  f,               F,                f,                     F                     ] };
+    key <AC05> { [  g,               G,                eng,                   ENG                   ] };
+    key <AC06> { [  h,               H,                h,                     H                     ] };
+    key <AC07> { [  j,               J,                j,                     J                     ] };
+    key <AC08> { [  k,               K,                kra,                   NoSymbol              ] };
+    key <AC09> { [  l,               L,                dead_stroke,           NoSymbol              ] };
+    key <AC10> { [  odiaeresis,      Odiaeresis,       oslash,                Oslash                ] };
+    key <AC11> { [  adiaeresis,      Adiaeresis,       ae,                    AE                    ] };
+    key <BKSL> { [  apostrophe,      asterisk,         dead_caron,            dead_breve            ] };
+
+    key <LSGT> { [  less,            greater,          bar,                   brokenbar             ] };
+    key <AB01> { [  z,               Z,                zcaron,                Zcaron                ] };
+    key <AB02> { [  x,               X,                multiply,              division              ] };
+    key <AB03> { [  c,               C,                copyright,             cent                  ] };
+    key <AB04> { [  v,               V,                v,                     V                     ] };
+    key <AB05> { [  b,               B,                ssharp,                NoSymbol              ] };
+    key <AB06> { [  n,               N,                ntilde,                Ntilde                ] };
+    key <AB07> { [  m,               M,                mu,                    NoSymbol              ] };
+    key <AB08> { [  comma,           semicolon,        dead_cedilla,          dead_ogonek           ] };
+    key <AB09> { [  period,          colon,            periodcentered,        notsign               ] };
+    key <AB10> { [  minus,           underscore,       hyphen,                dead_macron           ] };
+
+    include "nbsp(level4)"
+    include "kpdl(comma)"
+    include "level3(ralt_switch)"
+    include "compose(rwin)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "nodeadkeys" {
+
+    // Classic Finnish keyboard layout without dead keys
+
+    include "fi(fi)"
+
+    name[Group1]="Finnish (classic, eliminate dead keys)";
+
+    key <AE12> { [  acute,           grave,            cedilla,               ogonek                ] };
+    key <AD12> { [  diaeresis,       asciicircum,      asciitilde,            caron                 ] };
+    key <AC09> { [  l,               L,                l,                     L                     ] };
+    key <BKSL> { [  apostrophe,      asterisk,         caron,                 breve                 ] };
+    key <AB08> { [  comma,           semicolon,        cedilla,               ogonek                ] };
+    key <AB10> { [  minus,           underscore,       hyphen,                macron                ] };
+};
+
+partial alphanumeric_keys
+xkb_symbols "smi" {
+
+    // Describes the differences between a Norwegian Northern Sami
+    // (keyboard with dead key support) and a Swedish/Finnish Sami
+    // keyboard according to the specs at:
+    // http://www.hum.uit.no/a/trond/se-lat9-sefi-keys.html
+
+    include "no(smi)"
+
+    name[Group1]="Saami (Finland)";
+
+    key <AC10> { [  odiaeresis,      Odiaeresis,       oslash,                Oslash                ] };
+    key <AC11> { [  adiaeresis,      Adiaeresis,       ae,                    AE                    ] };
+};
+
+partial alphanumeric_keys
+xkb_symbols "mac" {
+
+    // Macintosh keyboard for Finland based on Swedish(Macintosh) keyboard
+
+    include "se(mac)"
+
+    name[Group1]="Finnish (Macintosh)";
+};
diff --git a/xorg-server/xkeyboard-config/symbols/fo b/xorg-server/xkeyboard-config/symbols/fo
index b57c917af..b0b24ce75 100644
--- a/xorg-server/xkeyboard-config/symbols/fo
+++ b/xorg-server/xkeyboard-config/symbols/fo
@@ -1,48 +1,48 @@
-partial default alphanumeric_keys 

-xkb_symbols "basic" {

-

-    include "latin(type2)"

-

-    name[Group1]= "Faroe Islands";

-

-    key <TLDE>	{ [   onehalf,   section, threequarters,    paragraph ]	};

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

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

-

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

-    key <AE06>	{ [         6,  ampersand,          yen,     NoSymbol ] };

-    key <AE11>	{ [      plus,   question,    plusminus, questiondown ] };

-    key <AE12>	{ [dead_acute, dead_grave,          bar,    brokenbar ] };

-

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

-    key <AB10>	{ [     minus, underscore,       hyphen,       macron ] };

-

-    key <AC03>	{ [         d,          D,          eth,          ETH ] };

-    key	<AC10>	{ [        ae,	       AE	] };

-    key <AC11>	{ [    oslash,   Ooblique 	] };

-

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

-    key <AD11>	{ [     aring,      Aring, dead_diaeresis, dead_circumflex ] };

-    key <AD12>	{ [       eth,        ETH,   dead_tilde,   dead_caron ] };

-

-    key <BKSL>	{ [apostrophe,   asterisk, dead_doubleacute, multiply ]	};

-

-    include "level3(ralt_switch)"

-};

-

-partial alphanumeric_keys 

-xkb_symbols "nodeadkeys" {

-

-    include "fo(basic)"

-

-    name[Group1]= "Faroe Islands - Eliminate dead keys";

-

-    key <AE12>	{ [     acute,      grave,          bar,       ogonek ]	};

-    key <AD11>	{ [     aring,      Aring,    diaeresis,       degree ]	};

-    key <AD12>	{ [ diaeresis, asciicircum,  asciitilde,       macron ]	};

-    key <AC10>	{ [        ae,         AE,        acute,  doubleacute ]	};

-    key <AC11>	{ [    oslash,   Ooblique,  asciicircum,        caron ]	};

-    key <BKSL>	{ [apostrophe,   asterisk,  doubleacute,     multiply ]	};

-    key <AB08>	{ [     comma,  semicolon,      cedilla,       ogonek ]	};

-    key <AB09>	{ [    period,      colon, periodcentered,   abovedot ]	};

-};

+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+
+    include "latin(type2)"
+
+    name[Group1]= "Faroese";
+
+    key <TLDE>	{ [   onehalf,   section, threequarters,    paragraph ]	};
+    key <LSGT>	{ [      less,    greater,    backslash,      notsign ]	};
+    key <SPCE>	{ [     space,      space, nobreakspace, nobreakspace ] };
+
+    key <AE05>	{ [         5,    percent,     NoSymbol,         cent ] };
+    key <AE06>	{ [         6,  ampersand,          yen,     NoSymbol ] };
+    key <AE11>	{ [      plus,   question,    plusminus, questiondown ] };
+    key <AE12>	{ [dead_acute, dead_grave,          bar,    brokenbar ] };
+
+    key <AB03>	{ [         c,          C,    copyright,     NoSymbol ] };
+    key <AB10>	{ [     minus, underscore,       hyphen,       macron ] };
+
+    key <AC03>	{ [         d,          D,          eth,          ETH ] };
+    key	<AC10>	{ [        ae,	       AE	] };
+    key <AC11>	{ [    oslash,   Ooblique 	] };
+
+    key <AD08>	{ [         i,          I       ] };
+    key <AD11>	{ [     aring,      Aring, dead_diaeresis, dead_circumflex ] };
+    key <AD12>	{ [       eth,        ETH,   dead_tilde,   dead_caron ] };
+
+    key <BKSL>	{ [apostrophe,   asterisk, dead_doubleacute, multiply ]	};
+
+    include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys 
+xkb_symbols "nodeadkeys" {
+
+    include "fo(basic)"
+
+    name[Group1]= "Faroese (eliminate dead keys)";
+
+    key <AE12>	{ [     acute,      grave,          bar,       ogonek ]	};
+    key <AD11>	{ [     aring,      Aring,    diaeresis,       degree ]	};
+    key <AD12>	{ [ diaeresis, asciicircum,  asciitilde,       macron ]	};
+    key <AC10>	{ [        ae,         AE,        acute,  doubleacute ]	};
+    key <AC11>	{ [    oslash,   Ooblique,  asciicircum,        caron ]	};
+    key <BKSL>	{ [apostrophe,   asterisk,  doubleacute,     multiply ]	};
+    key <AB08>	{ [     comma,  semicolon,      cedilla,       ogonek ]	};
+    key <AB09>	{ [    period,      colon, periodcentered,   abovedot ]	};
+};
diff --git a/xorg-server/xkeyboard-config/symbols/fr b/xorg-server/xkeyboard-config/symbols/fr
index c804eb09e..8bb7213bd 100644
--- a/xorg-server/xkeyboard-config/symbols/fr
+++ b/xorg-server/xkeyboard-config/symbols/fr
@@ -1,1021 +1,1021 @@
-// based on a keyboard map from an 'xkb/symbols/fr' file

-

-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";

-

-    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)

-//

-// 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        ] };

-

-};

+// based on a keyboard map from an 'xkb/symbols/fr' file
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+
+    include "latin"
+
+    name[Group1]="French";
+
+    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]="French";
+
+    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]="French (Sun dead keys)";
+};
+
+partial alphanumeric_keys
+xkb_symbols "nodeadkeys" {
+
+    // Modifies the basic French layout to eliminate all dead keys
+
+    include "fr(basic)"
+
+    name[Group1]="French (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]="French (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]="French (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]="French (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]="French (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)
+//
+// 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]="French (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]="French (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]="French (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]= "French (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]="French (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]="French (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]= "French (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]= "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]= "French (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]= "Georgian (France, 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/xkeyboard-config/symbols/ge b/xorg-server/xkeyboard-config/symbols/ge
index 0746295b5..d188d4822 100644
--- a/xorg-server/xkeyboard-config/symbols/ge
+++ b/xorg-server/xkeyboard-config/symbols/ge
@@ -1,272 +1,272 @@
-// Georgian Keyboard Layouts by Aiet Kolkhi <aietkolkhi@gmail.com>

-// Full layout descriptions available at http://www.gakartuleba.org/layouts/

-//

-// This includes the following keyboard layouts: Georgian QWERTY; Georgian Ergonomic;

-// Georgian MESS; Georgian AZERTY Tskapo; Georgian Russian.

-//

-// Layouts include Georgian Mkhedruli alphabeth; most layouts also include some special

-// and ancient characters (like Fi, Yn, Elifi, Turned Gan and Ain). Layouts do not

-// include Georgian Asomtavruli or Georgian Khutsuri alphabeths which are also present

-// in Unicode.

-//

-// Georgian Typewriter no longer supported, as it is no longer used in Georgia.

-//

-// some layouts based on Georgian keyboard map, in the so called "latin" layout.

-// 1999, Pablo Saratxaga <srtxg@chanae.alphanet.ch>

-//

-

-partial default alphanumeric_keys

-xkb_symbols "basic" {

-

-    name[Group1]= "Georgia";

-

-    key <TLDE> { [ 0x0100201e, 0x0100201c, 0x0100201e, asciitilde ] };

-    key <AE01> { [ 1, exclam, apostrophe ] };

-    key <AE02> { [ 2, at, 0x0100201e ] };

-    key <AE03> { [ 3, numbersign, 0x0100201c ] };

-    key <AE04> { [ 4, dollar, 0x01002116 ] };

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

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

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

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

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

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

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

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

-

-    key <AD01> { [ 0x010010e5,  Q               ]       };

-    key <AD02> { [ 0x010010ec,  0x010010ed      ]       };

-    key <AD03> { [ 0x010010d4,  E, 0x010010f1   ]       };

-    key <AD04> { [ 0x010010e0,  0x010010e6, 0x010000ae ] };

-    key <AD05> { [ 0x010010e2,  0x010010d7 ] };

-    key <AD06> { [ 0x010010e7,  Y, 0x010010f8   ]       };

-    key <AD07> { [ 0x010010e3,  U               ]       };

-    key <AD08> { [ 0x010010d8,  I, 0x010010f2   ]       };

-    key <AD09> { [ 0x010010dd,  O               ]       };

-    key <AD10> { [ 0x010010de,  P               ]       };

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

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

-

-    key <AC01> { [ 0x010010d0,  A, 0x010010fa   ]       };

-    key <AC02> { [ 0x010010e1,  0x010010e8      ]       };

-    key <AC03> { [ 0x010010d3,  D               ]       };

-    key <AC04> { [ 0x010010e4,  F, 0x010010f6   ]       };

-    key <AC05> { [ 0x010010d2,  G, 0x010010f9   ]       };

-    key <AC06> { [ 0x010010f0,  H, 0x010010f5   ]       };

-    key <AC07> { [ 0x010010ef, 0x010010df, 0x010010f7 ] };

-    key <AC08> { [ 0x010010d9,  K               ]       };

-    key <AC09> { [ 0x010010da,  L               ]       };

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

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

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

-

-    key <LSGT> { [ guillemotleft,guillemotright ]       };

-    key <AB01> { [ 0x010010d6,  0x010010eb      ]       };

-    key <AB02> { [ 0x010010ee,  X, 0x010010f4   ]       };

-    key <AB03> { [ 0x010010ea, 0x010010e9, 0x010000a9 ] };

-    key <AB04> { [ 0x010010d5,  V, 0x010010f3   ]       };

-    key <AB05> { [ 0x010010d1,  B               ]       };

-    key <AB06> { [ 0x010010dc,  N, 0x010010fc   ]       };

-    key <AB07> { [ 0x010010db,  M               ]       };

-    key <AB08> { [ comma, less, guillemotleft   ]       };

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

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

-

-    include "level3(ralt_switch)"

-

-};

-

-partial alphanumeric_keys

-xkb_symbols "qwerty" {

-    include "ge(basic)"

-};

-

-partial alphanumeric_keys

-xkb_symbols "ergonomic" {

-    include "ge(basic)"

-

-    name[Group1]= "Georgia - Ergonomic";

-

-    key <TLDE> { [ 0x0100201e, apostrophe, 0x0100201e, asciitilde ] };

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

-    key <AE02> { [ 0x01002116, 2, at      ] };

-    key <AE03> { [ comma, 3, numbersign, section ] };

-    key <AE04> { [ semicolon, 4, dollar   ] };

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

-    key <AE06> { [ colon, 6, asciicircum  ] };

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

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

-    key <AE09> { [ parenleft, 9, parenleft, guillemotleft ] };

-    key <AE10> { [ parenright, 0, parenright, guillemotright ] };

-    key <AE11> { [ minus, plus, 0x01002014, underscore ] };

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

-

-    key <AD01> { [ 0x010010e9, noSymbol      ]       };

-    key <AD02> { [ 0x010010de, noSymbol      ]       };

-    key <AD03> { [ 0x010010e3, noSymbol      ]       };

-    key <AD04> { [ 0x010010eb, noSymbol, noSymbol, 0x010000ae ] };

-    key <AD05> { [ 0x010010ed, noSymbol, noSymbol, 0x010010d7 ] };

-    key <AD06> { [ 0x010010e2, noSymbol, noSymbol, 0x010010f8 ] };

-    key <AD07> { [ 0x010010d7, noSymbol      ]       };

-    key <AD08> { [ 0x010010dc, noSymbol, 0x010010fc, I ] };

-    key <AD09> { [ 0x010010d5, noSymbol, 0x010010f3    ] };

-    key <AD10> { [ 0x010010e8, noSymbol                ] };

-    key <AD11> { [ 0x010010d9, noSymbol, bracketleft, braceleft  ] };

-    key <AD12> { [ 0x010010e5, noSymbol, bracketright,braceright ] };

-

-    key <AC01> { [ 0x010010ee, noSymbol, 0x010010f4    ] };

-    key <AC02> { [ 0x010010d8, noSymbol, 0x010010f2    ] };

-    key <AC03> { [ 0x010010d0, noSymbol, 0x010010fa, D ] };

-    key <AC04> { [ 0x010010d4, noSymbol, 0x010010f1    ] };

-    key <AC05> { [ 0x010010dd, noSymbol     ]       };

-    key <AC06> { [ 0x010010d3, noSymbol     ]       };

-    key <AC07> { [ 0x010010db, noSymbol     ]       };

-    key <AC08> { [ 0x010010e1, noSymbol     ]       };

-    key <AC09> { [ 0x010010e0, noSymbol, L  ]       };

-    key <AC10> { [ 0x010010d1, noSymbol, colon         ] }; 

-    key <AC11> { [ 0x010010d2, noSymbol, 0x010010f9, quotedbl ] };

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

-

-    key <LSGT> { [ guillemotleft,guillemotright   ] };

-    key <AB01> { [ 0x010010ef, noSymbol      ]      };

-    key <AB02> { [ 0x010010f0, noSymbol, 0x010010f5, X ] };

-    key <AB03> { [ 0x010010e7, noSymbol, 0x010010f8, C ] };

-    key <AB04> { [ 0x010010e6, noSymbol, 0x010010f7, V ] };

-    key <AB05> { [ 0x010010df, noSymbol                ] };

-    key <AB06> { [ 0x010010d6, noSymbol                ] };

-    key <AB07> { [ 0x010010ea, noSymbol, noSymbol, M   ] };

-    key <AB08> { [ 0x010010da, noSymbol, guillemotleft, less ] };

-    key <AB09> { [ 0x010010e4, noSymbol, 0x010010f6, guillemotright ] };

-    key <AB10> { [ 0x010010ec, noSymbol, 0x010010fb    ] };

-

-    include "level3(ralt_switch)"

-

-};

-

-partial alphanumeric_keys

-xkb_symbols "mess" {

-    include "ge(basic)"

-

-    name[Group1]= "Georgia - MESS";

-

-    key <TLDE> { [ 0x010010ed, backslash, quoteleft ] };

-    key <AE01> { [ 1, exclam, apostrophe ] };

-    key <AE02> { [ 2, at, asciitilde ] };

-    key <AE03> { [ 3, 0x01002116, numbersign ]	};

-    key <AE04> { [ 4, dollar, EuroSign ] };

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

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

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

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

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

-    key <AE10> { [ 0, parenright, 0x01002014 ] };

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

-    key <AE12> { [ 0x010010df,	plus, bar   ]  };

-    key <AD01> { [ 0x010010e5,	Q ] };

-    key <AD02> { [ 0x010010ec,	W ] };

-    key <AD03> { [ 0x010010d4,	E ] };

-    key <AD04> { [ 0x010010e0,	R ] };

-    key <AD05> { [ 0x010010e2,	T ] };

-    key <AD06> { [ 0x010010e7,	Y ] };

-    key <AD07> { [ 0x010010e3,	U ] };

-    key <AD08> { [ 0x010010d8,	I, 0x010010f2 ] };

-    key <AD09> { [ 0x010010dd,	O ] };

-    key <AD10> { [ 0x010010de,	P ] };

-    key <AD11> { [ 0x010010e8,	bracketleft,  guillemotleft  ] };

-    key <AD12> { [ 0x010010e6,	bracketright, guillemotright ] };

-    key <AC01> { [ 0x010010d0,	A, 0x010010fa ] };

-    key <AC02> { [ 0x010010e1,	S ] };

-    key <AC03> { [ 0x010010d3,	D ] };

-    key <AC04> { [ 0x010010e4,	F, 0x010010f6 ] };

-    key <AC05> { [ 0x010010d2,	G, 0x010010f9 ] };

-    key <AC06> { [ 0x010010f0,	H, 0x010010f1 ]	};

-    key <AC07> { [ 0x010010ef,	J, 0x010010f7 ] };

-    key <AC08> { [ 0x010010d9,	K ] };

-    key <AC09> { [ 0x010010da,	L ] };

-    key <AC10> { [ 0x010010d7,0x0100201e ] };

-    key <AC11> { [ 0x010010e9,0x0100201c ] };

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

-

-    key <LSGT> { [ guillemotleft, guillemotright ] };

-    key <AB01> { [ 0x010010d6, Z, 0x010010f5 ] };

-    key <AB02> { [ 0x010010ee, X, 0x010010f4 ]	};

-    key <AB03> { [ 0x010010ea,	C ] };

-    key <AB04> { [ 0x010010d5,	V, 0x010010f3 ]	};

-    key <AB05> { [ 0x010010d1,	B ] };

-    key <AB06> { [ 0x010010dc,	N, 0x010010fc ] };

-    key <AB07> { [ 0x010010db,	M ] };

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

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

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

-

-    include "level3(ralt_switch)"

-

-};

-

-partial alphanumeric_keys

-xkb_symbols "ru" {

-

-    name[Group1]= "Georgia - Russian";

-

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

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

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

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

-    key <AE04> { [         4,    semicolon      ]       };

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

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

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

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

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

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

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

-    key <AE12> { [ numbersign,   bar            ]       };

-

-    key <AD01> { [ 0x010010e6,  q               ]       };

-    key <AD02> { [ 0x010010ea,  w               ]       };

-    key <AD03> { [ 0x010010e3,  e               ]       };

-    key <AD04> { [ 0x010010d9,  r               ]       };

-    key <AD05> { [ 0x010010d4,  t               ]       };

-    key <AD06> { [ 0x010010dc,  y               ]       };

-    key <AD07> { [ 0x010010d2,  u               ]       };

-    key <AD08> { [ 0x010010e8,  i               ]       };

-    key <AD09> { [ 0x010010ec,  o               ]       };

-    key <AD10> { [ 0x010010d6,  p               ]       };

-    key <AD11> { [ 0x010010ee,  bracketleft     ]       };

-    key <AD12> { [ 0x010010ef,  bracketright    ]       };

-

-    key <AC01> { [ 0x010010e4,  a               ]       };

-    key <AC02> { [ 0x010010d7,  s               ]       };

-    key <AC03> { [ 0x010010d5,  d               ]       };

-    key <AC04> { [ 0x010010d0,  f               ]       };

-    key <AC05> { [ 0x010010de,  g               ]       };

-    key <AC06> { [ 0x010010e0,  h               ]       };

-    key <AC07> { [ 0x010010dd,  j               ]       };

-    key <AC08> { [ 0x010010da,  k               ]       };

-    key <AC09> { [ 0x010010d3,  l               ]       };

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

-    key <AC11> { [ 0x010010eb,  percent         ]       };

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

-

-    key <LSGT> { [ guillemotleft,guillemotright ]       };

-    key <AB01> { [ 0x010010ed,  z               ]       };

-    key <AB02> { [ 0x010010e9,  x               ]       };

-    key <AB03> { [ 0x010010e1,  c               ]       };

-    key <AB04> { [ 0x010010db,  v               ]       };

-    key <AB05> { [ 0x010010d8,  b               ]       };

-    key <AB06> { [ 0x010010e2,  n               ]       };

-    key <AB07> { [ 0x010010e5,  m               ]       };

-    key <AB08> { [ 0x010010d1,  less            ]       };

-    key <AB09> { [ 0x010010e7,  greater         ]       };

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

-

-};

-

-partial alphanumeric_keys

-xkb_symbols "os" {

-

-    include "ru(os_legacy)"

-

-    name[Group1]= "Georgia - Ossetian";

-

-};

+// Georgian Keyboard Layouts by Aiet Kolkhi <aietkolkhi@gmail.com>
+// Full layout descriptions available at http://www.gakartuleba.org/layouts/
+//
+// This includes the following keyboard layouts: Georgian QWERTY; Georgian Ergonomic;
+// Georgian MESS; Georgian AZERTY Tskapo; Georgian Russian.
+//
+// Layouts include Georgian Mkhedruli alphabeth; most layouts also include some special
+// and ancient characters (like Fi, Yn, Elifi, Turned Gan and Ain). Layouts do not
+// include Georgian Asomtavruli or Georgian Khutsuri alphabeths which are also present
+// in Unicode.
+//
+// Georgian Typewriter no longer supported, as it is no longer used in Georgia.
+//
+// some layouts based on Georgian keyboard map, in the so called "latin" layout.
+// 1999, Pablo Saratxaga <srtxg@chanae.alphanet.ch>
+//
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+
+    name[Group1]= "Georgian";
+
+    key <TLDE> { [ 0x0100201e, 0x0100201c, 0x0100201e, asciitilde ] };
+    key <AE01> { [ 1, exclam, apostrophe ] };
+    key <AE02> { [ 2, at, 0x0100201e ] };
+    key <AE03> { [ 3, numbersign, 0x0100201c ] };
+    key <AE04> { [ 4, dollar, 0x01002116 ] };
+    key <AE05> { [ 5, percent, EuroSign ] };
+    key <AE06> { [ 6, asciicircum ] };
+    key <AE07> { [ 7, ampersand, section ] };
+    key <AE08> { [ 8, asterisk,	degree ] };
+    key <AE09> { [ 9, parenleft ] };
+    key <AE10> { [ 0, parenright ] };
+    key <AE11> { [ minus, underscore, 0x01002014 ] };
+    key <AE12> { [ equal, plus, 0x01002013 ] };
+
+    key <AD01> { [ 0x010010e5,  Q               ]       };
+    key <AD02> { [ 0x010010ec,  0x010010ed      ]       };
+    key <AD03> { [ 0x010010d4,  E, 0x010010f1   ]       };
+    key <AD04> { [ 0x010010e0,  0x010010e6, 0x010000ae ] };
+    key <AD05> { [ 0x010010e2,  0x010010d7 ] };
+    key <AD06> { [ 0x010010e7,  Y, 0x010010f8   ]       };
+    key <AD07> { [ 0x010010e3,  U               ]       };
+    key <AD08> { [ 0x010010d8,  I, 0x010010f2   ]       };
+    key <AD09> { [ 0x010010dd,  O               ]       };
+    key <AD10> { [ 0x010010de,  P               ]       };
+    key <AD11> { [ bracketleft, braceleft       ]       };
+    key <AD12> { [ bracketright,braceright      ]       };
+
+    key <AC01> { [ 0x010010d0,  A, 0x010010fa   ]       };
+    key <AC02> { [ 0x010010e1,  0x010010e8      ]       };
+    key <AC03> { [ 0x010010d3,  D               ]       };
+    key <AC04> { [ 0x010010e4,  F, 0x010010f6   ]       };
+    key <AC05> { [ 0x010010d2,  G, 0x010010f9   ]       };
+    key <AC06> { [ 0x010010f0,  H, 0x010010f5   ]       };
+    key <AC07> { [ 0x010010ef, 0x010010df, 0x010010f7 ] };
+    key <AC08> { [ 0x010010d9,  K               ]       };
+    key <AC09> { [ 0x010010da,  L               ]       };
+    key <AC10> { [ semicolon, colon             ]       };
+    key <AC11> { [ apostrophe, quotedbl         ]       };
+    key <BKSL> { [ backslash, bar, asciitilde, asciitilde ]  };
+
+    key <LSGT> { [ guillemotleft,guillemotright ]       };
+    key <AB01> { [ 0x010010d6,  0x010010eb      ]       };
+    key <AB02> { [ 0x010010ee,  X, 0x010010f4   ]       };
+    key <AB03> { [ 0x010010ea, 0x010010e9, 0x010000a9 ] };
+    key <AB04> { [ 0x010010d5,  V, 0x010010f3   ]       };
+    key <AB05> { [ 0x010010d1,  B               ]       };
+    key <AB06> { [ 0x010010dc,  N, 0x010010fc   ]       };
+    key <AB07> { [ 0x010010db,  M               ]       };
+    key <AB08> { [ comma, less, guillemotleft   ]       };
+    key <AB09> { [ period, greater, guillemotright    ] };
+    key <AB10> { [ slash, question, 0x010010fb  ]       };
+
+    include "level3(ralt_switch)"
+
+};
+
+partial alphanumeric_keys
+xkb_symbols "qwerty" {
+    include "ge(basic)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "ergonomic" {
+    include "ge(basic)"
+
+    name[Group1]= "Georgian (ergonomic)";
+
+    key <TLDE> { [ 0x0100201e, apostrophe, 0x0100201e, asciitilde ] };
+    key <AE01> { [ exclam, 1, exclam      ] };
+    key <AE02> { [ 0x01002116, 2, at      ] };
+    key <AE03> { [ comma, 3, numbersign, section ] };
+    key <AE04> { [ semicolon, 4, dollar   ] };
+    key <AE05> { [ percent, 5, EuroSign	 ] };
+    key <AE06> { [ colon, 6, asciicircum  ] };
+    key <AE07> { [ question, 7, ampersand ] };
+    key <AE08> { [ period, 8, asterisk, degree ] };
+    key <AE09> { [ parenleft, 9, parenleft, guillemotleft ] };
+    key <AE10> { [ parenright, 0, parenright, guillemotright ] };
+    key <AE11> { [ minus, plus, 0x01002014, underscore ] };
+    key <AE12> { [ 0x0100201c, equal, equal ] };
+
+    key <AD01> { [ 0x010010e9, noSymbol      ]       };
+    key <AD02> { [ 0x010010de, noSymbol      ]       };
+    key <AD03> { [ 0x010010e3, noSymbol      ]       };
+    key <AD04> { [ 0x010010eb, noSymbol, noSymbol, 0x010000ae ] };
+    key <AD05> { [ 0x010010ed, noSymbol, noSymbol, 0x010010d7 ] };
+    key <AD06> { [ 0x010010e2, noSymbol, noSymbol, 0x010010f8 ] };
+    key <AD07> { [ 0x010010d7, noSymbol      ]       };
+    key <AD08> { [ 0x010010dc, noSymbol, 0x010010fc, I ] };
+    key <AD09> { [ 0x010010d5, noSymbol, 0x010010f3    ] };
+    key <AD10> { [ 0x010010e8, noSymbol                ] };
+    key <AD11> { [ 0x010010d9, noSymbol, bracketleft, braceleft  ] };
+    key <AD12> { [ 0x010010e5, noSymbol, bracketright,braceright ] };
+
+    key <AC01> { [ 0x010010ee, noSymbol, 0x010010f4    ] };
+    key <AC02> { [ 0x010010d8, noSymbol, 0x010010f2    ] };
+    key <AC03> { [ 0x010010d0, noSymbol, 0x010010fa, D ] };
+    key <AC04> { [ 0x010010d4, noSymbol, 0x010010f1    ] };
+    key <AC05> { [ 0x010010dd, noSymbol     ]       };
+    key <AC06> { [ 0x010010d3, noSymbol     ]       };
+    key <AC07> { [ 0x010010db, noSymbol     ]       };
+    key <AC08> { [ 0x010010e1, noSymbol     ]       };
+    key <AC09> { [ 0x010010e0, noSymbol, L  ]       };
+    key <AC10> { [ 0x010010d1, noSymbol, colon         ] }; 
+    key <AC11> { [ 0x010010d2, noSymbol, 0x010010f9, quotedbl ] };
+    key <BKSL> { [ slash, section, backslash, bar ] };
+
+    key <LSGT> { [ guillemotleft,guillemotright   ] };
+    key <AB01> { [ 0x010010ef, noSymbol      ]      };
+    key <AB02> { [ 0x010010f0, noSymbol, 0x010010f5, X ] };
+    key <AB03> { [ 0x010010e7, noSymbol, 0x010010f8, C ] };
+    key <AB04> { [ 0x010010e6, noSymbol, 0x010010f7, V ] };
+    key <AB05> { [ 0x010010df, noSymbol                ] };
+    key <AB06> { [ 0x010010d6, noSymbol                ] };
+    key <AB07> { [ 0x010010ea, noSymbol, noSymbol, M   ] };
+    key <AB08> { [ 0x010010da, noSymbol, guillemotleft, less ] };
+    key <AB09> { [ 0x010010e4, noSymbol, 0x010010f6, guillemotright ] };
+    key <AB10> { [ 0x010010ec, noSymbol, 0x010010fb    ] };
+
+    include "level3(ralt_switch)"
+
+};
+
+partial alphanumeric_keys
+xkb_symbols "mess" {
+    include "ge(basic)"
+
+    name[Group1]= "Georgian (MESS)";
+
+    key <TLDE> { [ 0x010010ed, backslash, quoteleft ] };
+    key <AE01> { [ 1, exclam, apostrophe ] };
+    key <AE02> { [ 2, at, asciitilde ] };
+    key <AE03> { [ 3, 0x01002116, numbersign ]	};
+    key <AE04> { [ 4, dollar, EuroSign ] };
+    key <AE05> { [ 5, percent ]	};
+    key <AE06> { [ 6, asciicircum ] };
+    key <AE07> { [ 7, ampersand, section ] };
+    key <AE08> { [ 8, asterisk, degree ] };
+    key <AE09> { [ 9, parenleft ] };
+    key <AE10> { [ 0, parenright, 0x01002014 ] };
+    key <AE11> { [ minus, underscore, 0x01002013 ] };
+    key <AE12> { [ 0x010010df,	plus, bar   ]  };
+    key <AD01> { [ 0x010010e5,	Q ] };
+    key <AD02> { [ 0x010010ec,	W ] };
+    key <AD03> { [ 0x010010d4,	E ] };
+    key <AD04> { [ 0x010010e0,	R ] };
+    key <AD05> { [ 0x010010e2,	T ] };
+    key <AD06> { [ 0x010010e7,	Y ] };
+    key <AD07> { [ 0x010010e3,	U ] };
+    key <AD08> { [ 0x010010d8,	I, 0x010010f2 ] };
+    key <AD09> { [ 0x010010dd,	O ] };
+    key <AD10> { [ 0x010010de,	P ] };
+    key <AD11> { [ 0x010010e8,	bracketleft,  guillemotleft  ] };
+    key <AD12> { [ 0x010010e6,	bracketright, guillemotright ] };
+    key <AC01> { [ 0x010010d0,	A, 0x010010fa ] };
+    key <AC02> { [ 0x010010e1,	S ] };
+    key <AC03> { [ 0x010010d3,	D ] };
+    key <AC04> { [ 0x010010e4,	F, 0x010010f6 ] };
+    key <AC05> { [ 0x010010d2,	G, 0x010010f9 ] };
+    key <AC06> { [ 0x010010f0,	H, 0x010010f1 ]	};
+    key <AC07> { [ 0x010010ef,	J, 0x010010f7 ] };
+    key <AC08> { [ 0x010010d9,	K ] };
+    key <AC09> { [ 0x010010da,	L ] };
+    key <AC10> { [ 0x010010d7,0x0100201e ] };
+    key <AC11> { [ 0x010010e9,0x0100201c ] };
+    key <BKSL> { [ equal, slash, bar ]	};
+
+    key <LSGT> { [ guillemotleft, guillemotright ] };
+    key <AB01> { [ 0x010010d6, Z, 0x010010f5 ] };
+    key <AB02> { [ 0x010010ee, X, 0x010010f4 ]	};
+    key <AB03> { [ 0x010010ea,	C ] };
+    key <AB04> { [ 0x010010d5,	V, 0x010010f3 ]	};
+    key <AB05> { [ 0x010010d1,	B ] };
+    key <AB06> { [ 0x010010dc,	N, 0x010010fc ] };
+    key <AB07> { [ 0x010010db,	M ] };
+    key <AB08> { [ comma, semicolon, less ] };
+    key <AB09> { [ period, colon, greater ] };
+    key <AB10> { [ 0x010010eb, question, 0x010010fb ] };
+
+    include "level3(ralt_switch)"
+
+};
+
+partial alphanumeric_keys
+xkb_symbols "ru" {
+
+    name[Group1]= "Russian (Georgia)";
+
+    key <TLDE> { [ asciicircum, asciitilde      ]       };
+    key <AE01> { [         1,    exclam         ]       };
+    key <AE02> { [         2,    at             ]       };
+    key <AE03> { [         3,    numbersign     ]       };
+    key <AE04> { [         4,    semicolon      ]       };
+    key <AE05> { [         5,    colon          ]       };
+    key <AE06> { [         6,    comma          ]       };
+    key <AE07> { [         7,    period         ]       };
+    key <AE08> { [         8,    asterisk       ]       };
+    key <AE09> { [         9,    parenleft      ]       };
+    key <AE10> { [         0,    parenright     ]       };
+    key <AE11> { [     minus,    underscore     ]       };
+    key <AE12> { [ numbersign,   bar            ]       };
+
+    key <AD01> { [ 0x010010e6,  q               ]       };
+    key <AD02> { [ 0x010010ea,  w               ]       };
+    key <AD03> { [ 0x010010e3,  e               ]       };
+    key <AD04> { [ 0x010010d9,  r               ]       };
+    key <AD05> { [ 0x010010d4,  t               ]       };
+    key <AD06> { [ 0x010010dc,  y               ]       };
+    key <AD07> { [ 0x010010d2,  u               ]       };
+    key <AD08> { [ 0x010010e8,  i               ]       };
+    key <AD09> { [ 0x010010ec,  o               ]       };
+    key <AD10> { [ 0x010010d6,  p               ]       };
+    key <AD11> { [ 0x010010ee,  bracketleft     ]       };
+    key <AD12> { [ 0x010010ef,  bracketright    ]       };
+
+    key <AC01> { [ 0x010010e4,  a               ]       };
+    key <AC02> { [ 0x010010d7,  s               ]       };
+    key <AC03> { [ 0x010010d5,  d               ]       };
+    key <AC04> { [ 0x010010d0,  f               ]       };
+    key <AC05> { [ 0x010010de,  g               ]       };
+    key <AC06> { [ 0x010010e0,  h               ]       };
+    key <AC07> { [ 0x010010dd,  j               ]       };
+    key <AC08> { [ 0x010010da,  k               ]       };
+    key <AC09> { [ 0x010010d3,  l               ]       };
+    key <AC10> { [ 0x010010df,  semicolon       ]       };
+    key <AC11> { [ 0x010010eb,  percent         ]       };
+    key <BKSL> { [ backslash,    bar            ]       };
+
+    key <LSGT> { [ guillemotleft,guillemotright ]       };
+    key <AB01> { [ 0x010010ed,  z               ]       };
+    key <AB02> { [ 0x010010e9,  x               ]       };
+    key <AB03> { [ 0x010010e1,  c               ]       };
+    key <AB04> { [ 0x010010db,  v               ]       };
+    key <AB05> { [ 0x010010d8,  b               ]       };
+    key <AB06> { [ 0x010010e2,  n               ]       };
+    key <AB07> { [ 0x010010e5,  m               ]       };
+    key <AB08> { [ 0x010010d1,  less            ]       };
+    key <AB09> { [ 0x010010e7,  greater         ]       };
+    key <AB10> { [ 0x010010f0,  question        ]       };
+
+};
+
+partial alphanumeric_keys
+xkb_symbols "os" {
+
+    include "ru(os_legacy)"
+
+    name[Group1]= "Ossetian (Georgia)";
+
+};
diff --git a/xorg-server/xkeyboard-config/symbols/gh b/xorg-server/xkeyboard-config/symbols/gh
index 04c7a8ed4..93015a7ff 100644
--- a/xorg-server/xkeyboard-config/symbols/gh
+++ b/xorg-server/xkeyboard-config/symbols/gh
@@ -1,151 +1,151 @@
-partial default alphanumeric_keys  

-xkb_symbols "basic" {

-

-    include "us"

-

-    name[Group1]= "Ghana";

-

-    key <AE04> { [          4, 0x010020B5,     dollar,       cent ] };

-    include "level3(ralt_switch)"

-};

-

-partial alphanumeric_keys

-xkb_symbols "akan" {

-    include "gh(basic)"

-

-    name[Group1]= "Ghana - Akan";

-

-    key <AD01> { [ 0x0100025B, 0x01000190,          q,          Q ] };

-    key <AB02> { [ 0x01000254, 0x01000186,          x,          X ] }; 

-};

-

-partial alphanumeric_keys

-xkb_symbols "ga" {

-    include "gh(basic)"

-

-    name[Group1]= "Ghana - Ga";

-

-    key <AD01> { [ 0x0100025B, 0x01000190,          q,          Q ] };

-    key <AB02> { [ 0x01000254, 0x01000186,          x,          X ] }; 

-    key <AB03> { [ 0x0100014B, 0x0100014A,          c,          C ] }; 

-};

-

-partial alphanumeric_keys

-xkb_symbols "ewe" {

-    include "gh(basic)"

-

-    name[Group1]= "Ghana - Ewe";

-

-    key <AD01> { [ 0x0100025B, 0x01000190,          q,          Q ] };

-    key <AB03> { [ 0x0100014B, 0x0100014A,          c,          C ] }; 

-    key <AD11> { [ 0x01000254, 0x01000186,  braceleft,  braceleft ] }; 

-    key <AD12> { [ 0x0100028B, 0x010001B2, braceright, braceright ] }; 

-    key <BKSL> { [ 0x01000256, 0x01000189,  backslash,  backslash ] };

-    key <AC07> { [ 0x01000192, 0x01000191,          j,          J ] };

-    key <AC05> { [          g,          G, 0x01000263, 0x01000194 ] };

- 

-};

-

-partial alphanumeric_keys

-xkb_symbols "fula" {

-    include "gh(basic)"

-

-    name[Group1]= "Ghana - Fula";

-

-    key <AD01> { [ 0x01000071, 0x01000051,          q,          Q ] };

-    key <AD02> { [ udiaeresis, Udiaeresis,          w,          W ] };

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

-    key <AD11> { [ 0x010001B4, 0x010001B3,bracketleft,  braceleft ] };

-    key <AD12> { [     gcaron,     Gcaron,bracketright, braceright] };

-    key <AC03> { [ 0x01000257, 0x0100018A,         d,           D ] };

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

-    key <AC11> { [ 0x010001DD, 0x0100018E,apostrophe,    quotedbl ] };

-    key <AB01> { [ 0x01000272, 0x0100019D,         z,           Z ] };

-    key <AB07> { [     ntilde,     Ntilde,         m,           M ] };

-    key <AB09> { [   ccedilla,   Ccedilla,    period,     greater ] };

-    key <AB10> { [   scedilla,   Scedilla,     slash,    question ] };

-

-};

-

-partial alphanumeric_keys

-xkb_symbols "hausa" {

-    include "gh(fula)"

-

-    name[Group1]= "Ghana - Hausa";

-};

-

-partial alphanumeric_keys

-xkb_symbols "generic" {

-    include "gh(basic)"

-

-    name[Group1]= "Ghana - Multilingual";

-

-    key <AD03> { [          e,	        E, 0x0100025b, 0x01000190 ] };

-    key <AB03> { [          c,          C, 0x01000254, 0x01000186 ] };

-    key <AC03> { [          d,          D, 0x01000256, 0x01000189 ] };

-    key <AC04> { [          f,          F, 0x01000192, 0x01000191 ] };

-    key <AC05> { [          g,          G, 0x01000263, 0x01000194 ] };

-    key <AB06> { [          n,          N, 0x0100014b, 0x0100014a ] };

-    key <AB01> { [          z,          Z, 0x010001B6, 0x010001B5 ] };

-    key <AB04> { [          v,          V, 0x0100028B, 0x010001B2 ] };

-	key <AE04> { [          4,     dollar, 0x010020B5,       cent ] };

-    include "level3(ralt_switch)"

-

-};

-

-partial alphanumeric_keys

-xkb_symbols "avn" {

-    include "gh(basic)"

-

-    name[Group1]= "Ghana - Avatime";

-

-    key <TLDE> { [      grave,     asciitilde,   0x01000300,  0x01000303 ] }; // combining grave; combining tilde

-    key <AE04> { [          4,         dollar,         cent,  0x010020B5 ] }; // ¢, ₵

-    key <AE11> { [      minus,     underscore,   0x01000304,  0x01000304 ] }; // combining macron

-    key <AD01> { [ 0x0100028B,      0x010001B2                           ] }; // ʋ, Ʋ

-    key <AD07> { [          u,              U,   0x0100028A,  0x010001B1 ] }; // ʊ, Ʊ

-    key <AD08> { [          i,              I,   0x01000269,  0x01000196 ] }; // ɩ, Ɩ

-    key <AD11> { [ 0x0100025B,      0x01000190, bracketleft,  braceleft  ] }; // ɛ, Ɛ

-    key <AC03> { [          d,              D,   0x01000256,  0x01000189 ] }; // ɖ, Ɖ

-    key <AC04> { [          f,              F,   0x01000192,  0x01000191 ] }; // ƒ, Ƒ

-    key <AC07> { [ 0x0100014B,      0x0100014A                           ] }; // ŋ, Ŋ

-    key <AC11> { [ apostrophe,       quotedbl,   0x01000301,  0x01000301 ] }; // combining acute

-    key <AB03> { [ 0x01000254,      0x01000186                           ] }; // ɔ, Ɔ

-

-    include "level3(ralt_switch)"

- 

-};

-

-// This keyboard layout fully imitates the 'Ghana Unicode' layout which is used in GILLBT on Windows with Keyman.

-// However, in this layout a 3rd level key (R ALT) is used rather than dead keys.

-// Also it has three additional features:

-// 1) combining macron above: <R ALT> + <SHIFT> + <->

-// 2) cent: <R ALT> + <4> or <R ALT> + <SHIFT> + <4>

-// 3) ʊ/Ʊ: <R ALT> + <u>/<U>

-

-partial alphanumeric_keys

-xkb_symbols "gillbt" {

-    include "gh(basic)"

-

-    name[Group1]= "Ghana - GILLBT";

-

-    key <TLDE> { [ grave,      asciitilde,  0x01000300,   0x01000303  ] }; // combining grave; combining tilde

-    key <AE04> { [ 4,          dollar,      cent,         0x010020B5  ] }; // ¢, ₵

-    key <AE06> { [ 6,          asciicircum, 0x01000302,   0x01000302  ] }; // combining circumflex accent

-    key <AE11> { [ minus,      underscore,  0x01000331,   0x01000304  ] }; // combining macron below; combining macron above

-    key <AE12> { [ 0x0100014B, 0x0100014A,  equal,        plus        ] }; // ŋ, Ŋ

-    key <AD01> { [ 0x0100028B, 0x010001B2,  q,            Q           ] }; // ʋ, Ʋ

-    key <AD03> { [ e,          E,           0x010001DD,   0x0100018E  ] }; // ǝ, Ǝ

-    key <AD07> { [ u,          U,           0x0100028A,   0x010001B1  ] }; // ʊ, Ʊ

-    key <AD11> { [ 0x0100025B, 0x01000190,  bracketleft,  braceleft   ] }; // ɛ, Ɛ

-    key <AD12> { [ 0x01000254, 0x01000186,  bracketright, braceright  ] }; // ɔ, Ɔ

-    key <AC03> { [ d,          D,           0x01000256,   0x01000189  ] }; // ɖ, Ɖ

-    key <AC04> { [ f,          F,           0x01000192,   0x01000191  ] }; // ƒ, Ƒ

-    key <AC05> { [ g,          G,           0x01000263,   0x01000194  ] }; // ɣ, Ɣ

-    key <AC11> { [ apostrophe, quotedbl,    0x01000301,   0x01000301  ] }; // combining acute

-    key <AB01> { [ z,          Z,           0x01000292,   0x010001B7  ] }; // ʒ, Ʒ

-    key <AB02> { [ 0x01000269, 0x01000196,  x,            X           ] }; // ɩ, Ɩ

-    key <AB03> { [ c,          C,           0x010000E7,   0x010000C7  ] }; // ç, Ç

-    

-    include "level3(ralt_switch)"

-};

+partial default alphanumeric_keys  
+xkb_symbols "basic" {
+
+    include "us"
+
+    name[Group1]= "English (Ghana)";
+
+    key <AE04> { [          4, 0x010020B5,     dollar,       cent ] };
+    include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "akan" {
+    include "gh(basic)"
+
+    name[Group1]= "Akan";
+
+    key <AD01> { [ 0x0100025B, 0x01000190,          q,          Q ] };
+    key <AB02> { [ 0x01000254, 0x01000186,          x,          X ] }; 
+};
+
+partial alphanumeric_keys
+xkb_symbols "ga" {
+    include "gh(basic)"
+
+    name[Group1]= "Ga";
+
+    key <AD01> { [ 0x0100025B, 0x01000190,          q,          Q ] };
+    key <AB02> { [ 0x01000254, 0x01000186,          x,          X ] }; 
+    key <AB03> { [ 0x0100014B, 0x0100014A,          c,          C ] }; 
+};
+
+partial alphanumeric_keys
+xkb_symbols "ewe" {
+    include "gh(basic)"
+
+    name[Group1]= "Ewe";
+
+    key <AD01> { [ 0x0100025B, 0x01000190,          q,          Q ] };
+    key <AB03> { [ 0x0100014B, 0x0100014A,          c,          C ] }; 
+    key <AD11> { [ 0x01000254, 0x01000186,  braceleft,  braceleft ] }; 
+    key <AD12> { [ 0x0100028B, 0x010001B2, braceright, braceright ] }; 
+    key <BKSL> { [ 0x01000256, 0x01000189,  backslash,  backslash ] };
+    key <AC07> { [ 0x01000192, 0x01000191,          j,          J ] };
+    key <AC05> { [          g,          G, 0x01000263, 0x01000194 ] };
+ 
+};
+
+partial alphanumeric_keys
+xkb_symbols "fula" {
+    include "gh(basic)"
+
+    name[Group1]= "Fula";
+
+    key <AD01> { [ 0x01000071, 0x01000051,          q,          Q ] };
+    key <AD02> { [ udiaeresis, Udiaeresis,          w,          W ] };
+    key <AD03> { [          e,          E,   EuroSign,	     cent ] };
+    key <AD11> { [ 0x010001B4, 0x010001B3,bracketleft,  braceleft ] };
+    key <AD12> { [     gcaron,     Gcaron,bracketright, braceright] };
+    key <AC03> { [ 0x01000257, 0x0100018A,         d,           D ] };
+    key <AC10> { [ 0x01000131, 0x01000130, semicolon,       colon ] };
+    key <AC11> { [ 0x010001DD, 0x0100018E,apostrophe,    quotedbl ] };
+    key <AB01> { [ 0x01000272, 0x0100019D,         z,           Z ] };
+    key <AB07> { [     ntilde,     Ntilde,         m,           M ] };
+    key <AB09> { [   ccedilla,   Ccedilla,    period,     greater ] };
+    key <AB10> { [   scedilla,   Scedilla,     slash,    question ] };
+
+};
+
+partial alphanumeric_keys
+xkb_symbols "hausa" {
+    include "gh(fula)"
+
+    name[Group1]= "Hausa";
+};
+
+partial alphanumeric_keys
+xkb_symbols "generic" {
+    include "gh(basic)"
+
+    name[Group1]= "English (Ghana, multilingual)";
+
+    key <AD03> { [          e,	        E, 0x0100025b, 0x01000190 ] };
+    key <AB03> { [          c,          C, 0x01000254, 0x01000186 ] };
+    key <AC03> { [          d,          D, 0x01000256, 0x01000189 ] };
+    key <AC04> { [          f,          F, 0x01000192, 0x01000191 ] };
+    key <AC05> { [          g,          G, 0x01000263, 0x01000194 ] };
+    key <AB06> { [          n,          N, 0x0100014b, 0x0100014a ] };
+    key <AB01> { [          z,          Z, 0x010001B6, 0x010001B5 ] };
+    key <AB04> { [          v,          V, 0x0100028B, 0x010001B2 ] };
+	key <AE04> { [          4,     dollar, 0x010020B5,       cent ] };
+    include "level3(ralt_switch)"
+
+};
+
+partial alphanumeric_keys
+xkb_symbols "avn" {
+    include "gh(basic)"
+
+    name[Group1]= "Avatime";
+
+    key <TLDE> { [      grave,     asciitilde,   0x01000300,  0x01000303 ] }; // combining grave; combining tilde
+    key <AE04> { [          4,         dollar,         cent,  0x010020B5 ] }; // ¢, ₵
+    key <AE11> { [      minus,     underscore,   0x01000304,  0x01000304 ] }; // combining macron
+    key <AD01> { [ 0x0100028B,      0x010001B2                           ] }; // ʋ, Ʋ
+    key <AD07> { [          u,              U,   0x0100028A,  0x010001B1 ] }; // ʊ, Ʊ
+    key <AD08> { [          i,              I,   0x01000269,  0x01000196 ] }; // ɩ, Ɩ
+    key <AD11> { [ 0x0100025B,      0x01000190, bracketleft,  braceleft  ] }; // ɛ, Ɛ
+    key <AC03> { [          d,              D,   0x01000256,  0x01000189 ] }; // ɖ, Ɖ
+    key <AC04> { [          f,              F,   0x01000192,  0x01000191 ] }; // ƒ, Ƒ
+    key <AC07> { [ 0x0100014B,      0x0100014A                           ] }; // ŋ, Ŋ
+    key <AC11> { [ apostrophe,       quotedbl,   0x01000301,  0x01000301 ] }; // combining acute
+    key <AB03> { [ 0x01000254,      0x01000186                           ] }; // ɔ, Ɔ
+
+    include "level3(ralt_switch)"
+ 
+};
+
+// This keyboard layout fully imitates the 'Ghana Unicode' layout which is used in GILLBT on Windows with Keyman.
+// However, in this layout a 3rd level key (R ALT) is used rather than dead keys.
+// Also it has three additional features:
+// 1) combining macron above: <R ALT> + <SHIFT> + <->
+// 2) cent: <R ALT> + <4> or <R ALT> + <SHIFT> + <4>
+// 3) ʊ/Ʊ: <R ALT> + <u>/<U>
+
+partial alphanumeric_keys
+xkb_symbols "gillbt" {
+    include "gh(basic)"
+
+    name[Group1]= "English (Ghana, GILLBT)";
+
+    key <TLDE> { [ grave,      asciitilde,  0x01000300,   0x01000303  ] }; // combining grave; combining tilde
+    key <AE04> { [ 4,          dollar,      cent,         0x010020B5  ] }; // ¢, ₵
+    key <AE06> { [ 6,          asciicircum, 0x01000302,   0x01000302  ] }; // combining circumflex accent
+    key <AE11> { [ minus,      underscore,  0x01000331,   0x01000304  ] }; // combining macron below; combining macron above
+    key <AE12> { [ 0x0100014B, 0x0100014A,  equal,        plus        ] }; // ŋ, Ŋ
+    key <AD01> { [ 0x0100028B, 0x010001B2,  q,            Q           ] }; // ʋ, Ʋ
+    key <AD03> { [ e,          E,           0x010001DD,   0x0100018E  ] }; // ǝ, Ǝ
+    key <AD07> { [ u,          U,           0x0100028A,   0x010001B1  ] }; // ʊ, Ʊ
+    key <AD11> { [ 0x0100025B, 0x01000190,  bracketleft,  braceleft   ] }; // ɛ, Ɛ
+    key <AD12> { [ 0x01000254, 0x01000186,  bracketright, braceright  ] }; // ɔ, Ɔ
+    key <AC03> { [ d,          D,           0x01000256,   0x01000189  ] }; // ɖ, Ɖ
+    key <AC04> { [ f,          F,           0x01000192,   0x01000191  ] }; // ƒ, Ƒ
+    key <AC05> { [ g,          G,           0x01000263,   0x01000194  ] }; // ɣ, Ɣ
+    key <AC11> { [ apostrophe, quotedbl,    0x01000301,   0x01000301  ] }; // combining acute
+    key <AB01> { [ z,          Z,           0x01000292,   0x010001B7  ] }; // ʒ, Ʒ
+    key <AB02> { [ 0x01000269, 0x01000196,  x,            X           ] }; // ɩ, Ɩ
+    key <AB03> { [ c,          C,           0x010000E7,   0x010000C7  ] }; // ç, Ç
+    
+    include "level3(ralt_switch)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/gn b/xorg-server/xkeyboard-config/symbols/gn
index 3a693afd6..f85e98ec3 100644
--- a/xorg-server/xkeyboard-config/symbols/gn
+++ b/xorg-server/xkeyboard-config/symbols/gn
@@ -1,61 +1,61 @@
-// based on us_intl keyboard map file and a Sinhala keyboard map

-// version 0.3

-

-partial default alphanumeric_keys

-xkb_symbols "basic" {

-

-    name[Group1]="Guinea";

-

-    key <AE01>	{ [0x010007F1, 0x010007C1 ]	};

-    key <AE02>	{ [0x010007EB, 0x010007C2 ]	};

-    key <AE03>	{ [0x010007F5, 0x010007C3,  numbersign,     sterling ]	};

-    key <AE04>	{ [0x010007F4, 0x010007C4,  0x01002E1C,       dollar ]	};

-    key <AE05>	{ [ parenleft, 0x010007C5,  0x01002E1D				 ]	};

-    key <AE06>	{ [     minus, 0x010007C6,         bar				 ]	};

-    key <AE07>	{ [0x010007EC, 0x010007C7,       grave				 ]	};

-    key <AE08>	{ [0x010007FA, 0x010007C8,   backslash				 ]	};

-    key <AE09>	{ [0x010007ED, 0x010007C9, asciicircum,    plusminus ]	};

-    key <AE10>	{ [0x010007EE, 0x010007C0,          at,       degree ]	};

-    key <AE11>	{ [parenright ]	};

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

-

-    key <AD01>	{ [0x010007CA ]	};

-    key <AD02>	{ [0x010007E0, less ]	};

-    key <AD03>	{ [0x010007CD,0x010007CB ]	};

-    key <AD04>	{ [0x010007D9,0x010007DA ]	};

-    key <AD05>	{ [0x010007D5 ]	};

-    key <AD06>	{ [0x010007E6,0x010007E7 ]	};

-    key <AD07>	{ [0x010007CE,0x010007F6 ]	};

-    key <AD08>	{ [0x010007CC ]	};

-    key <AD09>	{ [0x010007D0,0x010007CF ]	};

-    key <AD10>	{ [0x010007D4 ]	};

-    key <AD11>	{ [0x010007F3 ] };

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

-

-    key <AC01>	{ [0x010007EB ]	};

-    key <AC02>	{ [0x010007DB ]	};

-    key <AC03>	{ [0x010007D8 ]	};

-    key <AC04>	{ [0x010007DD ]	};

-    key <AC05>	{ [0x010007DC,0x010007F7 ]	};

-    key <AC06>	{ [0x010007E4 ]	};

-    key <AC07>	{ [0x010007D6,0x010007E8 ]	};

-    key <AC08>	{ [0x010007DE ]	};

-    key <AC09>	{ [0x010007DF,0x010007EA ]	};

-    key <AC10>	{ [0x010007E1 ]	};

-    key <AC11>	{ [0x010007EF, 0x010007F8, percent ]	};

-    key <TLDE>	{ [0x010007EC, asciitilde,     notsign ]	};

-

-    key <BKSL>	{ [0x010007D1, asterisk ]	};

-    key <AB01>	{ [0x010007E5 ]	};

-    key <AB02>	{ [0x0100060C ]	};

-    key <AB03>	{ [0x010007D7,0x010007E9 ]	};

-    key <AB04>	{ [0x010007E2 ]	};

-    key <AB05>	{ [0x010007D3 ] };

-    key <AB06>	{ [0x010007E3,0x010007D2 ]	};

-    key <AB07>	{ [0x010007F8,0x0100061F ] };

-    key <AB08>	{ [0x0100061B ]	};

-    key <AB09>	{ [0x0100060C,      slash ]	};

-    key <AB10>	{ [0x010007F9] };

-

-    include "level3(ralt_switch)"

-};

+// based on us_intl keyboard map file and a Sinhala keyboard map
+// version 0.3
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+
+    name[Group1]="French (Guinea)";
+
+    key <AE01>	{ [0x010007F1, 0x010007C1 ]	};
+    key <AE02>	{ [0x010007EB, 0x010007C2 ]	};
+    key <AE03>	{ [0x010007F5, 0x010007C3,  numbersign,     sterling ]	};
+    key <AE04>	{ [0x010007F4, 0x010007C4,  0x01002E1C,       dollar ]	};
+    key <AE05>	{ [ parenleft, 0x010007C5,  0x01002E1D				 ]	};
+    key <AE06>	{ [     minus, 0x010007C6,         bar				 ]	};
+    key <AE07>	{ [0x010007EC, 0x010007C7,       grave				 ]	};
+    key <AE08>	{ [0x010007FA, 0x010007C8,   backslash				 ]	};
+    key <AE09>	{ [0x010007ED, 0x010007C9, asciicircum,    plusminus ]	};
+    key <AE10>	{ [0x010007EE, 0x010007C0,          at,       degree ]	};
+    key <AE11>	{ [parenright ]	};
+    key <AE12>	{ [     equal,       plus,   braceright ]	};
+
+    key <AD01>	{ [0x010007CA ]	};
+    key <AD02>	{ [0x010007E0, less ]	};
+    key <AD03>	{ [0x010007CD,0x010007CB ]	};
+    key <AD04>	{ [0x010007D9,0x010007DA ]	};
+    key <AD05>	{ [0x010007D5 ]	};
+    key <AD06>	{ [0x010007E6,0x010007E7 ]	};
+    key <AD07>	{ [0x010007CE,0x010007F6 ]	};
+    key <AD08>	{ [0x010007CC ]	};
+    key <AD09>	{ [0x010007D0,0x010007CF ]	};
+    key <AD10>	{ [0x010007D4 ]	};
+    key <AD11>	{ [0x010007F3 ] };
+    key <AD12>	{ [    dollar,   sterling,     currency ]	};
+
+    key <AC01>	{ [0x010007EB ]	};
+    key <AC02>	{ [0x010007DB ]	};
+    key <AC03>	{ [0x010007D8 ]	};
+    key <AC04>	{ [0x010007DD ]	};
+    key <AC05>	{ [0x010007DC,0x010007F7 ]	};
+    key <AC06>	{ [0x010007E4 ]	};
+    key <AC07>	{ [0x010007D6,0x010007E8 ]	};
+    key <AC08>	{ [0x010007DE ]	};
+    key <AC09>	{ [0x010007DF,0x010007EA ]	};
+    key <AC10>	{ [0x010007E1 ]	};
+    key <AC11>	{ [0x010007EF, 0x010007F8, percent ]	};
+    key <TLDE>	{ [0x010007EC, asciitilde,     notsign ]	};
+
+    key <BKSL>	{ [0x010007D1, asterisk ]	};
+    key <AB01>	{ [0x010007E5 ]	};
+    key <AB02>	{ [0x0100060C ]	};
+    key <AB03>	{ [0x010007D7,0x010007E9 ]	};
+    key <AB04>	{ [0x010007E2 ]	};
+    key <AB05>	{ [0x010007D3 ] };
+    key <AB06>	{ [0x010007E3,0x010007D2 ]	};
+    key <AB07>	{ [0x010007F8,0x0100061F ] };
+    key <AB08>	{ [0x0100061B ]	};
+    key <AB09>	{ [0x0100060C,      slash ]	};
+    key <AB10>	{ [0x010007F9] };
+
+    include "level3(ralt_switch)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/gr b/xorg-server/xkeyboard-config/symbols/gr
index 5fe302200..f4364cf89 100644
--- a/xorg-server/xkeyboard-config/symbols/gr
+++ b/xorg-server/xkeyboard-config/symbols/gr
@@ -1,194 +1,194 @@
-// Hellenic keyboard map for X.org

-//

-// Original version:

-//   Kostas Gewrgiou <gewrgiou@imbc.gr>

-// Heavily modified and maintained by:

-//   Vasilis Vasaitis <vvas@hal.csd.auth.gr>

-// Originally converted to single group form by:

-//   Ivan Pascal <pascal@info.tsu.ru>

-

-default partial alphanumeric_keys alternate_group

-xkb_symbols "basic" {

-	include "gr(simple)"

-

-	name[Group1] = "Greece";

-

-	include "eurosign(e)"

-	include "eurosign(5)"

-	include "kpdl(comma)"

-	include "level3(ralt_switch)"

-

-	key <AB01> { [       NoSymbol,       NoSymbol,          U037D,          U03FF ] };

-	key <AB02> { [       NoSymbol,       NoSymbol,     rightarrow,      leftarrow ] };

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

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

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

-	key <AB06> { [       NoSymbol,       NoSymbol,          U0374,          U0375 ] };

-	key <AB07> { [       NoSymbol,       NoSymbol,          U03FB,          U03FA ] };

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

-	key <AB09> { [       NoSymbol,       NoSymbol, guillemotright, periodcentered ] };

-	key <AC03> { [       NoSymbol,       NoSymbol,      downarrow,        uparrow ] };

-	key <AC04> { [       NoSymbol,       NoSymbol,          U03D5                 ] };

-	key <AC05> { [       NoSymbol,       NoSymbol,          U03DD,          U03DC ] };

-	key <AC07> { [       NoSymbol,       NoSymbol,          U037C,          U03FE ] };

-	key <AC08> { [       NoSymbol,       NoSymbol,          U03DF,          U03DE ] };

-	key <AC09> { [       NoSymbol,       NoSymbol,          U03F2,          U03F9 ] };

-	key <AC10> { [       NoSymbol,       NoSymbol,     dead_acute,     dead_psili ] };

-	key <AC11> { [       NoSymbol,       NoSymbol,     dead_grave,     dead_dasia ] };

-	key <AD01> { [       NoSymbol,       NoSymbol, periodcentered                 ] };

-	key <AD02> { [       NoSymbol,       NoSymbol,          U03DB,          U03DA ] };

-	key <AD04> { [       NoSymbol,       NoSymbol,     registered,          U03F1 ] };

-	key <AD07> { [       NoSymbol,       NoSymbol,          U03D1,          U03F4 ] };

-	key <AD08> { [       NoSymbol,       NoSymbol,          U037B,          U03FD ] };

-	key <AD10> { [       NoSymbol,       NoSymbol,          U03E1,          U03E0 ] };

-	key <AD11> { [       NoSymbol,       NoSymbol,     dead_tilde,    dead_macron ] };

-	key <AD12> { [       NoSymbol,       NoSymbol,      dead_iota,     dead_breve ] };

-	key <AE01> { [       NoSymbol,       NoSymbol,       NoSymbol,    onesuperior ] };

-	key <AE02> { [       NoSymbol,       NoSymbol,        onehalf,    twosuperior ] };

-	key <AE03> { [       NoSymbol,       NoSymbol,       sterling,  threesuperior ] };

-	key <AE04> { [       NoSymbol,       NoSymbol,     onequarter,  threequarters ] };

-	key <AE07> { [       NoSymbol,       NoSymbol,          U03F0                 ] };

-	key <AE10> { [       NoSymbol,       NoSymbol,         degree                 ] };

-};

-

-partial alphanumeric_keys alternate_group

-xkb_symbols "simple" {

-

-    include "gr(bare)"

-

-    name[Group1] = "Greece - Simple";

-

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

-    key <AE01> { [            1,      exclam ] }; // 1 !

-    key <AE02> { [            2,          at ] }; // 2 @

-    key <AE03> { [            3,  numbersign ] }; // 3 #

-    key <AE04> { [            4,      dollar ] }; // 4 $

-    key <AE05> { [            5,     percent ] }; // 5 %

-    key <AE06> { [            6, asciicircum ] }; // 6 ^

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

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

-    key <AE09> { [            9,   parenleft ] }; // 9 (

-    key <AE10> { [            0,  parenright ] }; // 0 )

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

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

-

-    key <AD11> { [  bracketleft,   braceleft ] }; // [ {

-    key <AD12> { [ bracketright,  braceright ] }; // [ {

-

-    key <AC11> { [   apostrophe,    quotedbl ] }; // ' "

-

-    key <AB08> { [        comma,        less ] }; // , <

-    key <AB09> { [       period,     greater ] }; // . >

-    key <AB10> { [        slash,    question ] }; // / ?

-    key <BKSL> { [    backslash,         bar ] }; // \ |

-

-    include "kpdl(comma)"

-};

-

-hidden partial alphanumeric_keys alternate_group

-xkb_symbols "bare" {

-

-    key <AD01> { [             semicolon,          colon ] }; // ; :

-    key <AD02> { [ Greek_finalsmallsigma,    Greek_SIGMA ] }; // ς Σ

-    key <AD03> { [         Greek_epsilon,  Greek_EPSILON ] }; // ε Ε

-    key <AD04> { [             Greek_rho,      Greek_RHO ] }; // ρ Ρ

-    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 <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 <AB01> { [            Greek_zeta,     Greek_ZETA ] }; // ζ Ζ

-    key <AB02> { [             Greek_chi,      Greek_CHI ] }; // χ Χ

-    key <AB03> { [             Greek_psi,      Greek_PSI ] }; // ψ Ψ

-    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 <LSGT> { [         guillemotleft, guillemotright ] }; // « »

-};

-

-// ===========================================================================================

-// Greek - Extended                                                                          |

-// ===========================================================================================

-//

-// ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┲━━━━━━━━━━━┓

-// │ ~   │ !   │ @   │ #   │ $   │ %   │ ^   │ &   │ *   │ (   │ )   │ _   │ +   ┃Backspace  ┃

-// │ `   │ 1   │ 2   │ 3 £ │ 4   │ 5 € │ 6   │ 7   │ 8   │ 9   │ 0 ° │ - ± │ =   ┃           ┃

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

-// ┃       ┃ :   │ Σ   │ Ε   │ Ρ   │ Τ   │ Υ   │ Θ   │ Ι   │ Ο   │ Π   │ {   │ }   ┃Enter    ┃

-// ┃Tab    ┃ ; · │ ς   │ ε € │ ρ ® │ τ   │ υ   │ θ   │ ι   │ ο   │ π   │ [   │ ]   ┃         ┃

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

-// ┃Caps    ┃ Α   │ Σ   │ Δ   │ Φ   │ Γ   │ Η   │ Ξ   │ Κ   │ Λ   │ ¨   │ "   │ |   ┃        ┃

-// ┃Lock    ┃ α   │ σ   │ δ   │ φ   │ γ   │ η   │ ξ   │ κ   │ λ   │ ´   │ '   │ \   ┃        ┃

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

-// ┃       ┃ »   │ Ζ   │ Χ   │ Ψ   │ Ω   │ Β   │ Ν   │ Μ   │ <   │ >   │ ?   ┃               ┃

-// ┃Shift  ┃ «   │ ζ   │ χ   │ ψ © │ ω   │ β   │ ν   │ μ   │ , « │ . » │ /   ┃Shift          ┃

-// ┣━━━━━━━╋━━━━━┷━┳━━━┷━━━┱─┴─────┴─────┴─────┴─────┴─────┴──┲━━┷━━━━┳┷━━━━━┻┳━━━━━━━┳━━━━━━┫

-// ┃       ┃       ┃       ┃                                  ┃       ┃       ┃       ┃      ┃

-// ┃Ctrl   ┃Meta   ┃Alt    ┃              Space               ┃AltGr  ┃Meta   ┃Menu   ┃Ctrl  ┃

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

-

-partial alphanumeric_keys alternate_group

-xkb_symbols "extended" {

-

-    include "gr(simple)"

-

-    name[Group1] = "Greece - Extended";

-

-    key.type[Group1] = "THREE_LEVEL";

-

-    key <AE03> { [ NoSymbol, NoSymbol,       sterling ] }; // £

-    key <AE10> { [ NoSymbol, NoSymbol,         degree ] }; // °

-    key <AE11> { [ NoSymbol, NoSymbol,      plusminus ] }; // ±

-

-    key <AD01> { [ NoSymbol, NoSymbol, periodcentered ] }; // ·

-    key <AD04> { [ NoSymbol, NoSymbol,     registered ] }; // ®

-

-    key <AB03> { [ NoSymbol, NoSymbol,      copyright ] }; // ©

-    key <AB08> { [ NoSymbol, NoSymbol,  guillemotleft ] }; // «

-    key <AB09> { [ NoSymbol, NoSymbol, guillemotright ] }; // »

-

-    include "level3(ralt_switch)"

-    include "eurosign(5)"

-    include "eurosign(e)"

-};

-

-partial alphanumeric_keys alternate_group

-xkb_symbols "polytonic" {

-

-    include "gr(extended)"

-

-    name[Group1] = "Greece - Polytonic";

-

-    key.type[Group1] = "THREE_LEVEL";

-

-    key <AD11> { [ dead_tilde, dead_diaeresis, dead_macron ] }; // ~ ¨ ¯

-    key <AD12> { [  dead_iota,     VoidSymbol,  dead_breve ] }; // ͺ   ˘

-

-    key <AC10> { [ dead_acute, dead_psili  ] }; // ´ ̓ 

-    key <AC11> { [ dead_grave, dead_dasia  ] }; // ` ̔

-};

-

-partial alphanumeric_keys alternate_group

-xkb_symbols "nodeadkeys" {

-

-    include "gr(simple)"

-

-    name[Group1] = "Greece - Eliminate dead keys";

-

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

-};

+// Hellenic keyboard map for X.org
+//
+// Original version:
+//   Kostas Gewrgiou <gewrgiou@imbc.gr>
+// Heavily modified and maintained by:
+//   Vasilis Vasaitis <vvas@hal.csd.auth.gr>
+// Originally converted to single group form by:
+//   Ivan Pascal <pascal@info.tsu.ru>
+
+default partial alphanumeric_keys alternate_group
+xkb_symbols "basic" {
+	include "gr(simple)"
+
+	name[Group1] = "Greek";
+
+	include "eurosign(e)"
+	include "eurosign(5)"
+	include "kpdl(comma)"
+	include "level3(ralt_switch)"
+
+	key <AB01> { [       NoSymbol,       NoSymbol,          U037D,          U03FF ] };
+	key <AB02> { [       NoSymbol,       NoSymbol,     rightarrow,      leftarrow ] };
+	key <AB03> { [       NoSymbol,       NoSymbol,      copyright                 ] };
+	key <AB04> { [       NoSymbol,       NoSymbol,          U03D6                 ] };
+	key <AB05> { [       NoSymbol,       NoSymbol,          U03D0                 ] };
+	key <AB06> { [       NoSymbol,       NoSymbol,          U0374,          U0375 ] };
+	key <AB07> { [       NoSymbol,       NoSymbol,          U03FB,          U03FA ] };
+	key <AB08> { [       NoSymbol,       NoSymbol,  guillemotleft                 ] };
+	key <AB09> { [       NoSymbol,       NoSymbol, guillemotright, periodcentered ] };
+	key <AC03> { [       NoSymbol,       NoSymbol,      downarrow,        uparrow ] };
+	key <AC04> { [       NoSymbol,       NoSymbol,          U03D5                 ] };
+	key <AC05> { [       NoSymbol,       NoSymbol,          U03DD,          U03DC ] };
+	key <AC07> { [       NoSymbol,       NoSymbol,          U037C,          U03FE ] };
+	key <AC08> { [       NoSymbol,       NoSymbol,          U03DF,          U03DE ] };
+	key <AC09> { [       NoSymbol,       NoSymbol,          U03F2,          U03F9 ] };
+	key <AC10> { [       NoSymbol,       NoSymbol,     dead_acute,     dead_psili ] };
+	key <AC11> { [       NoSymbol,       NoSymbol,     dead_grave,     dead_dasia ] };
+	key <AD01> { [       NoSymbol,       NoSymbol, periodcentered                 ] };
+	key <AD02> { [       NoSymbol,       NoSymbol,          U03DB,          U03DA ] };
+	key <AD04> { [       NoSymbol,       NoSymbol,     registered,          U03F1 ] };
+	key <AD07> { [       NoSymbol,       NoSymbol,          U03D1,          U03F4 ] };
+	key <AD08> { [       NoSymbol,       NoSymbol,          U037B,          U03FD ] };
+	key <AD10> { [       NoSymbol,       NoSymbol,          U03E1,          U03E0 ] };
+	key <AD11> { [       NoSymbol,       NoSymbol,     dead_tilde,    dead_macron ] };
+	key <AD12> { [       NoSymbol,       NoSymbol,      dead_iota,     dead_breve ] };
+	key <AE01> { [       NoSymbol,       NoSymbol,       NoSymbol,    onesuperior ] };
+	key <AE02> { [       NoSymbol,       NoSymbol,        onehalf,    twosuperior ] };
+	key <AE03> { [       NoSymbol,       NoSymbol,       sterling,  threesuperior ] };
+	key <AE04> { [       NoSymbol,       NoSymbol,     onequarter,  threequarters ] };
+	key <AE07> { [       NoSymbol,       NoSymbol,          U03F0                 ] };
+	key <AE10> { [       NoSymbol,       NoSymbol,         degree                 ] };
+};
+
+partial alphanumeric_keys alternate_group
+xkb_symbols "simple" {
+
+    include "gr(bare)"
+
+    name[Group1] = "Greek (simple)";
+
+    key <TLDE> { [        grave,  asciitilde ] }; // ` ~
+    key <AE01> { [            1,      exclam ] }; // 1 !
+    key <AE02> { [            2,          at ] }; // 2 @
+    key <AE03> { [            3,  numbersign ] }; // 3 #
+    key <AE04> { [            4,      dollar ] }; // 4 $
+    key <AE05> { [            5,     percent ] }; // 5 %
+    key <AE06> { [            6, asciicircum ] }; // 6 ^
+    key <AE07> { [            7,   ampersand ] }; // 7 &
+    key <AE08> { [            8,    asterisk ] }; // 8 *
+    key <AE09> { [            9,   parenleft ] }; // 9 (
+    key <AE10> { [            0,  parenright ] }; // 0 )
+    key <AE11> { [        minus,  underscore ] }; // - _
+    key <AE12> { [        equal,        plus ] }; // = +
+
+    key <AD11> { [  bracketleft,   braceleft ] }; // [ {
+    key <AD12> { [ bracketright,  braceright ] }; // [ {
+
+    key <AC11> { [   apostrophe,    quotedbl ] }; // ' "
+
+    key <AB08> { [        comma,        less ] }; // , <
+    key <AB09> { [       period,     greater ] }; // . >
+    key <AB10> { [        slash,    question ] }; // / ?
+    key <BKSL> { [    backslash,         bar ] }; // \ |
+
+    include "kpdl(comma)"
+};
+
+hidden partial alphanumeric_keys alternate_group
+xkb_symbols "bare" {
+
+    key <AD01> { [             semicolon,          colon ] }; // ; :
+    key <AD02> { [ Greek_finalsmallsigma,    Greek_SIGMA ] }; // ς Σ
+    key <AD03> { [         Greek_epsilon,  Greek_EPSILON ] }; // ε Ε
+    key <AD04> { [             Greek_rho,      Greek_RHO ] }; // ρ Ρ
+    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 <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 <AB01> { [            Greek_zeta,     Greek_ZETA ] }; // ζ Ζ
+    key <AB02> { [             Greek_chi,      Greek_CHI ] }; // χ Χ
+    key <AB03> { [             Greek_psi,      Greek_PSI ] }; // ψ Ψ
+    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 <LSGT> { [         guillemotleft, guillemotright ] }; // « »
+};
+
+// ===========================================================================================
+// Greek - Extended                                                                          |
+// ===========================================================================================
+//
+// ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┲━━━━━━━━━━━┓
+// │ ~   │ !   │ @   │ #   │ $   │ %   │ ^   │ &   │ *   │ (   │ )   │ _   │ +   ┃Backspace  ┃
+// │ `   │ 1   │ 2   │ 3 £ │ 4   │ 5 € │ 6   │ 7   │ 8   │ 9   │ 0 ° │ - ± │ =   ┃           ┃
+// ┢━━━━━┷━┱───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┺━┳━━━━━━━━━┫
+// ┃       ┃ :   │ Σ   │ Ε   │ Ρ   │ Τ   │ Υ   │ Θ   │ Ι   │ Ο   │ Π   │ {   │ }   ┃Enter    ┃
+// ┃Tab    ┃ ; · │ ς   │ ε € │ ρ ® │ τ   │ υ   │ θ   │ ι   │ ο   │ π   │ [   │ ]   ┃         ┃
+// ┣━━━━━━━┻┱────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┺┓        ┃
+// ┃Caps    ┃ Α   │ Σ   │ Δ   │ Φ   │ Γ   │ Η   │ Ξ   │ Κ   │ Λ   │ ¨   │ "   │ |   ┃        ┃
+// ┃Lock    ┃ α   │ σ   │ δ   │ φ   │ γ   │ η   │ ξ   │ κ   │ λ   │ ´   │ '   │ \   ┃        ┃
+// ┣━━━━━━━┳┹────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┲┷━━━━━┻━━━━━━━━┫
+// ┃       ┃ »   │ Ζ   │ Χ   │ Ψ   │ Ω   │ Β   │ Ν   │ Μ   │ <   │ >   │ ?   ┃               ┃
+// ┃Shift  ┃ «   │ ζ   │ χ   │ ψ © │ ω   │ β   │ ν   │ μ   │ , « │ . » │ /   ┃Shift          ┃
+// ┣━━━━━━━╋━━━━━┷━┳━━━┷━━━┱─┴─────┴─────┴─────┴─────┴─────┴──┲━━┷━━━━┳┷━━━━━┻┳━━━━━━━┳━━━━━━┫
+// ┃       ┃       ┃       ┃                                  ┃       ┃       ┃       ┃      ┃
+// ┃Ctrl   ┃Meta   ┃Alt    ┃              Space               ┃AltGr  ┃Meta   ┃Menu   ┃Ctrl  ┃
+// ┗━━━━━━━┻━━━━━━━┻━━━━━━━┹──────────────────────────────────┺━━━━━━━┻━━━━━━━┻━━━━━━━┻━━━━━━┛
+
+partial alphanumeric_keys alternate_group
+xkb_symbols "extended" {
+
+    include "gr(simple)"
+
+    name[Group1] = "Greek (extended)";
+
+    key.type[Group1] = "THREE_LEVEL";
+
+    key <AE03> { [ NoSymbol, NoSymbol,       sterling ] }; // £
+    key <AE10> { [ NoSymbol, NoSymbol,         degree ] }; // °
+    key <AE11> { [ NoSymbol, NoSymbol,      plusminus ] }; // ±
+
+    key <AD01> { [ NoSymbol, NoSymbol, periodcentered ] }; // ·
+    key <AD04> { [ NoSymbol, NoSymbol,     registered ] }; // ®
+
+    key <AB03> { [ NoSymbol, NoSymbol,      copyright ] }; // ©
+    key <AB08> { [ NoSymbol, NoSymbol,  guillemotleft ] }; // «
+    key <AB09> { [ NoSymbol, NoSymbol, guillemotright ] }; // »
+
+    include "level3(ralt_switch)"
+    include "eurosign(5)"
+    include "eurosign(e)"
+};
+
+partial alphanumeric_keys alternate_group
+xkb_symbols "polytonic" {
+
+    include "gr(extended)"
+
+    name[Group1] = "Greek (polytonic)";
+
+    key.type[Group1] = "THREE_LEVEL";
+
+    key <AD11> { [ dead_tilde, dead_diaeresis, dead_macron ] }; // ~ ¨ ¯
+    key <AD12> { [  dead_iota,     VoidSymbol,  dead_breve ] }; // ͺ   ˘
+
+    key <AC10> { [ dead_acute, dead_psili  ] }; // ´ ̓ 
+    key <AC11> { [ dead_grave, dead_dasia  ] }; // ` ̔
+};
+
+partial alphanumeric_keys alternate_group
+xkb_symbols "nodeadkeys" {
+
+    include "gr(simple)"
+
+    name[Group1] = "Greek (eliminate dead keys)";
+
+    key <AC10> { [ semicolon, colon ] }; // ; :
+};
diff --git a/xorg-server/xkeyboard-config/symbols/hr b/xorg-server/xkeyboard-config/symbols/hr
index 71b23b607..8275259c4 100644
--- a/xorg-server/xkeyboard-config/symbols/hr
+++ b/xorg-server/xkeyboard-config/symbols/hr
@@ -1,73 +1,73 @@
-default partial alphanumeric_keys

-xkb_symbols "basic" {

-

-    name[Group1]="Croatia";

-

-    include "rs(latin)"

-

-    // Redefine these keys to match XFree86 Croatian layout

-    key <AE01> { [         1,     exclam,   asciitilde,   dead_tilde ] };

-    key <AE03> { [         3, numbersign,  asciicircum, dead_circumflex ] };

-    key <AE05> { [         5,    percent,       degree, dead_abovering ] };

-    key <AE07> { [         7,      slash,        grave,   dead_grave ] };

-    key <AB10> { [     minus, underscore, dead_belowdot, dead_abovedot ] };

-};

-

-partial alphanumeric_keys 

-xkb_symbols "us" {

-

-    name[Group1]= "Croatia - US keyboard with Croatian letters";

-

-    include "us"

-

-    key <AD01> { [    any,    any,	backslash	        ] };

-    key <AD02> { [    any,    any,	bar      	        ] };

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

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

-    key <AD11> { [    any,    any, 	scaron,		Scaron  ] };

-    key <AD12> { [    any,    any, 	dstroke, 	Dstroke ] };

-    key <AC04> { [    any,    any,	bracketleft             ] };

-    key <AC05> { [    any,    any,	bracketright            ] };

-    key <AC08> { [    any,    any, 	lstroke                 ] };

-    key <AC09> { [    any,    any,	Lstroke                 ] };

-    key <AC10> { [    any,    any,	ccaron,		Ccaron  ] };

-    key <AC11> { [    any,    any, 	cacute,		Cacute  ] };

-    key <LSGT> { [    any,    any, 	bar			] };

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

-    key <AB04> { [    any,    any,	at                      ] };

-    key <AB05> { [    any,    any,	braceleft               ] };

-    key <AB06> { [    any,    any,	braceright              ] };

-    key <AB07> { [    any,    any,	section                 ] };

-    key <AB08> { [    any,    any, 	semicolon               ] };

-    key <AB09> { [    any,    any, 	colon			] };

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

-    key <BKSL> { [    any,    any,	zcaron,	    Zcaron      ] };

-

-    include "level3(ralt_switch)"

-

-};

-

-

-partial alphanumeric_keys 

-xkb_symbols "alternatequotes" {

-

-    name[Group1]= "Croatia - Use guillemets for quotes";

-

-    include "rs(latinalternatequotes)"

-};

-

-partial alphanumeric_keys 

-xkb_symbols "unicode" {

-

-    name[Group1]= "Croatia - Use Croatian digraphs";

-

-    include "rs(latinunicode)"

-};

-

-partial alphanumeric_keys 

-xkb_symbols "unicodeus" {

-

-    name[Group1]= "Croatia - US keyboard with Croatian digraphs";

-

-    include "rs(latinunicodeyz)"

-};

+default partial alphanumeric_keys
+xkb_symbols "basic" {
+
+    name[Group1]="Croatian";
+
+    include "rs(latin)"
+
+    // Redefine these keys to match XFree86 Croatian layout
+    key <AE01> { [         1,     exclam,   asciitilde,   dead_tilde ] };
+    key <AE03> { [         3, numbersign,  asciicircum, dead_circumflex ] };
+    key <AE05> { [         5,    percent,       degree, dead_abovering ] };
+    key <AE07> { [         7,      slash,        grave,   dead_grave ] };
+    key <AB10> { [     minus, underscore, dead_belowdot, dead_abovedot ] };
+};
+
+partial alphanumeric_keys 
+xkb_symbols "us" {
+
+    name[Group1]= "Croatian (US keyboard with Croatian letters)";
+
+    include "us"
+
+    key <AD01> { [    any,    any,	backslash	        ] };
+    key <AD02> { [    any,    any,	bar      	        ] };
+    key <AD03> { [    any,    any, 	EuroSign 	        ] };
+    key <AD06> { [    any,    any,	z,		Z       ] };
+    key <AD11> { [    any,    any, 	scaron,		Scaron  ] };
+    key <AD12> { [    any,    any, 	dstroke, 	Dstroke ] };
+    key <AC04> { [    any,    any,	bracketleft             ] };
+    key <AC05> { [    any,    any,	bracketright            ] };
+    key <AC08> { [    any,    any, 	lstroke                 ] };
+    key <AC09> { [    any,    any,	Lstroke                 ] };
+    key <AC10> { [    any,    any,	ccaron,		Ccaron  ] };
+    key <AC11> { [    any,    any, 	cacute,		Cacute  ] };
+    key <LSGT> { [    any,    any, 	bar			] };
+    key <AB01> { [    any,    any,	y,		Y       ] };
+    key <AB04> { [    any,    any,	at                      ] };
+    key <AB05> { [    any,    any,	braceleft               ] };
+    key <AB06> { [    any,    any,	braceright              ] };
+    key <AB07> { [    any,    any,	section                 ] };
+    key <AB08> { [    any,    any, 	semicolon               ] };
+    key <AB09> { [    any,    any, 	colon			] };
+    key <AB10> { [    any,    any, 	minus,    underscore  	] };
+    key <BKSL> { [    any,    any,	zcaron,	    Zcaron      ] };
+
+    include "level3(ralt_switch)"
+
+};
+
+
+partial alphanumeric_keys 
+xkb_symbols "alternatequotes" {
+
+    name[Group1]= "Croatian (use guillemets for quotes)";
+
+    include "rs(latinalternatequotes)"
+};
+
+partial alphanumeric_keys 
+xkb_symbols "unicode" {
+
+    name[Group1]= "Croatian (use Croatian digraphs)";
+
+    include "rs(latinunicode)"
+};
+
+partial alphanumeric_keys 
+xkb_symbols "unicodeus" {
+
+    name[Group1]= "Croatian (US keyboard with Croatian digraphs)";
+
+    include "rs(latinunicodeyz)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/hu b/xorg-server/xkeyboard-config/symbols/hu
index 4595f1d22..16631b7ad 100644
--- a/xorg-server/xkeyboard-config/symbols/hu
+++ b/xorg-server/xkeyboard-config/symbols/hu
@@ -1,431 +1,431 @@
-// New style XKB layout for some widely used Hungarian keyboard layouts

-//

-// Based on old style 'xkb/symbols/hu"

-//

-// (C) 2002-2004 Soós Péter <sp@osb.hu>

-// (C) 2010 Andras Timar <timar@fsf.hu>

-//

-// Permission is granted to anyone to use, distribute and modify

-// this file in any way, provided that the above copyright notice

-// is left intact and the author of the modification summarizes

-// the changes in this header.

-//

-// This file is distributed without any expressed or implied warranty.

-//

-// Changes:

-//  2004-04-17 - Moved to new style (only Unicode based layouts)

-//             - Added consistent dead key support

-//             - Fixed abovedot

-//             - Added adiaeresis

-//             - Added EuroSign and cent symbol

-//  2010-04-23 - Added doublelowquotemark

-//             - Added rightdoublequotemark

-//             - Added endash

-//  2010-05-13 - Added ellipsis

-

-

-// Default layout

-default partial

-xkb_symbols "basic" {

-    include "hu(102_qwertz_comma_dead)"

-    name[Group1] = "Hungary";

-};

-

-// Standard layout

-partial

-xkb_symbols "standard" {

-    include "hu(102_qwertz_comma_dead)"

-    name[Group1] = "Hungary - Standard";

-};

-

-// Standard layout without dead key support

-partial

-xkb_symbols "nodeadkeys" {

-    include "hu(102_qwertz_comma_nodead)"

-    name[Group1] = "Hungary - Eliminate dead keys";

-};

-

-// Qwerty layout

-partial

-xkb_symbols "qwerty" {

-    include "hu(101_qwerty_comma_dead)"

-    name[Group1] = "Hungary - qwerty";

-};

-

-// Main layouts

-

-// 101_qwertz_comma_dead

-// 101 key qwertz layout

-// with decimal comma on keypad

-// and with dead key support

-partial

-xkb_symbols "101_qwertz_comma_dead" {

-    name[Group1] = "Hungary - 101/qwertz/comma/Dead keys";

-    include "latin"

-    include "hu(def_101)"

-    include "hu(def_qwertz)"

-    include "kpdl(comma)"

-    include "hu(def_dead)"

-    include "hu(def_common)"

-    include "level3(ralt_switch)"

-};

-

-// 101_qwertz_comma_nodead

-// 101 key qwertz layout

-// with decimal comma on keypad

-// and without dead key support

-partial

-xkb_symbols "101_qwertz_comma_nodead" {

-    name[Group1] = "Hungary - 101/qwertz/comma/Eliminate dead keys";

-    include "latin"

-    include "hu(def_101)"

-    include "hu(def_qwertz)"

-    include "kpdl(comma)"

-    include "hu(def_nodead)"

-    include "hu(def_common)"

-    include "level3(ralt_switch)"

-};

-

-// 101_qwertz_dot_dead

-// 101 key qwertz layout

-// with decimal dot on keypad

-// and with dead key support

-partial

-xkb_symbols "101_qwertz_dot_dead" {

-    name[Group1] = "Hungary - 101/qwertz/dot/Dead keys";

-    include "latin"

-    include "hu(def_101)"

-    include "hu(def_qwertz)"

-    include "hu(def_dot)"

-    include "hu(def_dead)"

-    include "hu(def_common)"

-    include "level3(ralt_switch)"

-};

-

-// 101_qwertz_dot_nodead

-// 101 key qwertz layout

-// with decimal dot on keypad

-// and without dead key support

-partial

-xkb_symbols "101_qwertz_dot_nodead" {

-    name[Group1] = "Hungary - 101/qwertz/dot/Eliminate dead keys";

-    include "latin"

-    include "hu(def_101)"

-    include "hu(def_qwertz)"

-    include "hu(def_dot)"

-    include "hu(def_nodead)"

-    include "hu(def_common)"

-    include "level3(ralt_switch)"

-};

-

-// 101_qwerty_comma_dead

-// 101 key qwerty layout

-// with decimal comma on keypad

-// and with dead key support

-partial

-xkb_symbols "101_qwerty_comma_dead" {

-    name[Group1] = "Hungary - 101/qwerty/comma/Dead keys";

-    include "latin"

-    include "hu(def_101)"

-    include "hu(def_qwerty)"

-    include "kpdl(comma)"

-    include "hu(def_dead)"

-    include "hu(def_common)"

-    include "level3(ralt_switch)"

-};

-

-// 101_qwerty_comma_nodead

-// 101 key qwerty layout

-// with decimal comma on keypad

-// and without dead key support

-partial

-xkb_symbols "101_qwerty_comma_nodead" {

-    name[Group1] = "Hungary - 101/qwerty/comma/Eliminate dead keys";

-    include "latin"

-    include "hu(def_101)"

-    include "hu(def_qwerty)"

-    include "kpdl(comma)"

-    include "hu(def_nodead)"

-    include "hu(def_common)"

-    include "level3(ralt_switch)"

-};

-

-// 101_qwerty_dot_dead

-// 101 key qwerty layout

-// with decimal dot on keypad

-// and with dead key support

-partial

-xkb_symbols "101_qwerty_dot_dead" {

-    name[Group1] = "Hungary - 101/qwerty/dot/Dead keys";

-    include "latin"

-    include "hu(def_101)"

-    include "hu(def_qwerty)"

-    include "hu(def_dot)"

-    include "hu(def_dead)"

-    include "hu(def_common)"

-    include "level3(ralt_switch)"

-};

-

-// 101_qwerty_dot_nodead

-// 101 key qwerty layout

-// with decimal dot on keypad

-// and without dead key support

-partial

-xkb_symbols "101_qwerty_dot_nodead" {

-    name[Group1] = "Hungary - 101/qwerty/dot/Eliminate dead keys";

-    include "latin"

-    include "hu(def_101)"

-    include "hu(def_qwerty)"

-    include "hu(def_dot)"

-    include "hu(def_nodead)"

-    include "hu(def_common)"

-    include "level3(ralt_switch)"

-};

-

-// 102_qwertz_comma_dead

-// 102 key qwertz layout

-// with decimal comma on keypad

-// and with dead key support

-partial

-xkb_symbols "102_qwertz_comma_dead" {

-    name[Group1] = "Hungary - 102/qwertz/comma/Dead keys";

-    include "latin"

-    include "hu(def_102)"

-    include "hu(def_qwertz)"

-    include "kpdl(comma)"

-    include "hu(def_dead)"

-    include "hu(def_common)"

-    include "level3(ralt_switch)"

-};

-

-// 102_qwertz_comma_nodead

-// 102 key qwertz layout

-// with decimal comma on keypad

-// and without dead key support

-partial

-xkb_symbols "102_qwertz_comma_nodead" {

-    name[Group1] = "Hungary - 102/qwertz/comma/Eliminate dead keys";

-    include "latin"

-    include "hu(def_102)"

-    include "hu(def_qwertz)"

-    include "kpdl(comma)"

-    include "hu(def_nodead)"

-    include "hu(def_common)"

-    include "level3(ralt_switch)"

-};

-

-// 102_qwertz_dot_dead

-// 102 key qwertz layout

-// with decimal dot on keypad

-// and with dead key support

-partial

-xkb_symbols "102_qwertz_dot_dead" {

-    name[Group1] = "Hungary - 102/qwertz/dot/Dead keys";

-    include "latin"

-    include "hu(def_102)"

-    include "hu(def_qwertz)"

-    include "hu(def_dot)"

-    include "hu(def_dead)"

-    include "hu(def_common)"

-    include "level3(ralt_switch)"

-};

-

-// 102_qwertz_dot_nodead

-// 102 key qwertz layout

-// with decimal dot on keypad

-// and without dead key support

-partial

-xkb_symbols "102_qwertz_dot_nodead" {

-    name[Group1] = "Hungary - 102/qwertz/dot/Eliminate dead keys";

-    include "latin"

-    include "hu(def_102)"

-    include "hu(def_qwertz)"

-    include "hu(def_dot)"

-    include "hu(def_nodead)"

-    include "hu(def_common)"

-    include "level3(ralt_switch)"

-};

-

-// 102_qwerty_comma_dead

-// 102 key qwerty layout

-// with decimal comma on keypad

-// and with dead key support

-partial

-xkb_symbols "102_qwerty_comma_dead" {

-    name[Group1] = "Hungary - 102/qwerty/comma/Dead keys";

-    include "latin"

-    include "hu(def_102)"

-    include "hu(def_qwerty)"

-    include "kpdl(comma)"

-    include "hu(def_dead)"

-    include "hu(def_common)"

-    include "level3(ralt_switch)"

-};

-

-// 102_qwerty_comma_nodead

-// 102 key qwerty layout

-// with decimal comma on keypad

-// and without dead key support

-partial

-xkb_symbols "102_qwerty_comma_nodead" {

-    name[Group1] = "Hungary - 102/qwerty/comma/Eliminate dead keys";

-    include "latin"

-    include "hu(def_102)"

-    include "hu(def_qwerty)"

-    include "kpdl(comma)"

-    include "hu(def_nodead)"

-    include "hu(def_common)"

-    include "level3(ralt_switch)"

-};

-

-// 102_qwerty_dot_dead

-// 102 key qwerty layout

-// with decimal dot on keypad

-// and with dead key support

-partial

-xkb_symbols "102_qwerty_dot_dead" {

-    name[Group1] = "Hungary - 102/qwerty/dot/Dead keys";

-    include "latin"

-    include "hu(def_102)"

-    include "hu(def_qwerty)"

-    include "hu(def_dot)"

-    include "hu(def_dead)"

-    include "hu(def_common)"

-    include "level3(ralt_switch)"

-};

-

-// 102_qwerty_dot_nodead

-// 102 key qwerty layout

-// with decimal dot on keypad

-// and without dead key support

-partial

-xkb_symbols "102_qwerty_dot_nodead" {

-    name[Group1] = "Hungary - 102/qwerty/dot/Eliminate dead keys";

-    include "latin"

-    include "hu(def_102)"

-    include "hu(def_qwerty)"

-    include "hu(def_dot)"

-    include "hu(def_nodead)"

-    include "hu(def_common)"

-    include "level3(ralt_switch)"

-};

-

-// Partial layouts

-

-// def_102:

-// The standard Hungarian 102 key layout

-hidden partial alphanumeric_keys

-xkb_symbols "def_102" {

-    key <TLDE>  { [            0,      section,           notsign                  ] };

-    key <LSGT>  { [       iacute,       Iacute,              less,         greater ] };

-

-};

-

-// def_101:

-// An alternative layout for 101 key keyboards

-hidden partial alphanumeric_keys

-xkb_symbols "def_101" {

-    key <TLDE>  { [       iacute,       Iacute,                 0,         section ] };

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

-};

-

-// def_qwertz:

-// The standard Hungaryan qwertz layout

-hidden partial alphanumeric_keys

-xkb_symbols "def_qwertz" {

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

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

-};

-

-

-// def_qwerty:

-// The qwerty layout for people who familiar with the standard US layout

-hidden partial alphanumeric_keys

-xkb_symbols "def_qwerty" {

-    key <AD06>  { [            y,            Y,           endash                   ] };

-    key <AB01>  { [            z,            Z,           greater                  ] };

-};

-

-// def_dot: 	 

-// The Hungarian standard is the comma on the keypad not decimal dot, 	 

-// but programmers hate it 	 

-hidden partial keypad_keys 	 

-xkb_symbols "def_dot" { 	 

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

-}; 	 

- 

-

-// def_dead:

-// Dead keys support part

-hidden partial alphanumeric_keys

-xkb_symbols "def_dead" {

-    key <AE01>  { [            1,   apostrophe,        asciitilde,      dead_tilde ] };

-    key <AE02>  { [            2,     quotedbl,        dead_caron,           caron ] };

-    key <AE03>  { [            3,         plus,       asciicircum, dead_circumflex ] };

-    key <AE04>  { [            4,       exclam,        dead_breve,           breve ] };

-    key <AE05>  { [            5,      percent,    dead_abovering,          degree ] };

-    key <AE06>  { [            6,        slash,       dead_ogonek,          ogonek ] };

-    key <AE07>  { [            7,        equal,             grave,      dead_grave ] };

-    key <AE08>  { [            8,    parenleft,     dead_abovedot,        abovedot ] };

-    key <AE09>  { [            9,   parenright,        dead_acute,           acute ] };

-    key <AE10>  { [   odiaeresis,   Odiaeresis,  dead_doubleacute,     doubleacute ] };

-    key <AE11>  { [   udiaeresis,   Udiaeresis,    dead_diaeresis,       diaeresis ] };

-    key <AE12>  { [       oacute,       Oacute,      dead_cedilla,         cedilla ] };

-};

-

-// def_nodead:

-// Without dead keys support

-hidden partial alphanumeric_keys

-xkb_symbols "def_nodead" {

-    key <AE01>  { [            1,   apostrophe,        asciitilde                  ] };

-    key <AE02>  { [            2,     quotedbl,             caron                  ] };

-    key <AE03>  { [            3,         plus,       asciicircum                  ] };

-    key <AE04>  { [            4,       exclam,             breve                  ] };

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

-    key <AE06>  { [            6,        slash,            ogonek                  ] };

-    key <AE07>  { [            7,        equal,             grave                  ] };

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

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

-    key <AE10>  { [   odiaeresis,   Odiaeresis,       doubleacute                  ] };

-    key <AE11>  { [   udiaeresis,   Udiaeresis,         diaeresis                  ] };

-    key <AE12>  { [       oacute,       Oacute,           cedilla                  ] };

-};

-

-

-// def_common:

-// The common part of all Hungarian layout above

-hidden partial alphanumeric_keys

-xkb_symbols "def_common" {

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

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

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

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

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

-    key <AD10>	{ [            p,            P,        rightdoublequotemark        ] };

-    key <AD11>  { [ odoubleacute, Odoubleacute,          division                  ] };

-    key <AD12>  { [       uacute,       Uacute,          multiply                  ] };

-

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

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

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

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

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

-    key <AC07>  { [            j,            J,            iacute,          Iacute ] };

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

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

-    key <AC10>  { [       eacute,       Eacute,            dollar,            cent ] };

-    key <AC11>  { [       aacute,       Aacute,            ssharp                  ] };

-

-    key <BKSL>  { [ udoubleacute, Udoubleacute,          currency                  ] };

-

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

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

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

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

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

-    key <AB07>  { [            m,            M,              less                  ] };

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

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

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

-

-};

+// New style XKB layout for some widely used Hungarian keyboard layouts
+//
+// Based on old style 'xkb/symbols/hu"
+//
+// (C) 2002-2004 Soós Péter <sp@osb.hu>
+// (C) 2010 Andras Timar <timar@fsf.hu>
+//
+// Permission is granted to anyone to use, distribute and modify
+// this file in any way, provided that the above copyright notice
+// is left intact and the author of the modification summarizes
+// the changes in this header.
+//
+// This file is distributed without any expressed or implied warranty.
+//
+// Changes:
+//  2004-04-17 - Moved to new style (only Unicode based layouts)
+//             - Added consistent dead key support
+//             - Fixed abovedot
+//             - Added adiaeresis
+//             - Added EuroSign and cent symbol
+//  2010-04-23 - Added doublelowquotemark
+//             - Added rightdoublequotemark
+//             - Added endash
+//  2010-05-13 - Added ellipsis
+
+
+// Default layout
+default partial
+xkb_symbols "basic" {
+    include "hu(102_qwertz_comma_dead)"
+    name[Group1] = "Hungarian";
+};
+
+// Standard layout
+partial
+xkb_symbols "standard" {
+    include "hu(102_qwertz_comma_dead)"
+    name[Group1] = "Hungarian (standard)";
+};
+
+// Standard layout without dead key support
+partial
+xkb_symbols "nodeadkeys" {
+    include "hu(102_qwertz_comma_nodead)"
+    name[Group1] = "Hungarian (eliminate dead keys)";
+};
+
+// Qwerty layout
+partial
+xkb_symbols "qwerty" {
+    include "hu(101_qwerty_comma_dead)"
+    name[Group1] = "Hungarian (qwerty)";
+};
+
+// Main layouts
+
+// 101_qwertz_comma_dead
+// 101 key qwertz layout
+// with decimal comma on keypad
+// and with dead key support
+partial
+xkb_symbols "101_qwertz_comma_dead" {
+    name[Group1] = "Hungarian (101/qwertz/comma/dead keys)";
+    include "latin"
+    include "hu(def_101)"
+    include "hu(def_qwertz)"
+    include "kpdl(comma)"
+    include "hu(def_dead)"
+    include "hu(def_common)"
+    include "level3(ralt_switch)"
+};
+
+// 101_qwertz_comma_nodead
+// 101 key qwertz layout
+// with decimal comma on keypad
+// and without dead key support
+partial
+xkb_symbols "101_qwertz_comma_nodead" {
+    name[Group1] = "Hungarian (101/qwertz/comma/eliminate dead keys)";
+    include "latin"
+    include "hu(def_101)"
+    include "hu(def_qwertz)"
+    include "kpdl(comma)"
+    include "hu(def_nodead)"
+    include "hu(def_common)"
+    include "level3(ralt_switch)"
+};
+
+// 101_qwertz_dot_dead
+// 101 key qwertz layout
+// with decimal dot on keypad
+// and with dead key support
+partial
+xkb_symbols "101_qwertz_dot_dead" {
+    name[Group1] = "Hungarian (101/qwertz/dot/dead keys)";
+    include "latin"
+    include "hu(def_101)"
+    include "hu(def_qwertz)"
+    include "hu(def_dot)"
+    include "hu(def_dead)"
+    include "hu(def_common)"
+    include "level3(ralt_switch)"
+};
+
+// 101_qwertz_dot_nodead
+// 101 key qwertz layout
+// with decimal dot on keypad
+// and without dead key support
+partial
+xkb_symbols "101_qwertz_dot_nodead" {
+    name[Group1] = "Hungarian (101/qwertz/dot/eliminate dead keys)";
+    include "latin"
+    include "hu(def_101)"
+    include "hu(def_qwertz)"
+    include "hu(def_dot)"
+    include "hu(def_nodead)"
+    include "hu(def_common)"
+    include "level3(ralt_switch)"
+};
+
+// 101_qwerty_comma_dead
+// 101 key qwerty layout
+// with decimal comma on keypad
+// and with dead key support
+partial
+xkb_symbols "101_qwerty_comma_dead" {
+    name[Group1] = "Hungarian (101/qwerty/comma/dead keys)";
+    include "latin"
+    include "hu(def_101)"
+    include "hu(def_qwerty)"
+    include "kpdl(comma)"
+    include "hu(def_dead)"
+    include "hu(def_common)"
+    include "level3(ralt_switch)"
+};
+
+// 101_qwerty_comma_nodead
+// 101 key qwerty layout
+// with decimal comma on keypad
+// and without dead key support
+partial
+xkb_symbols "101_qwerty_comma_nodead" {
+    name[Group1] = "Hungarian (101/qwerty/comma/eliminate dead keys)";
+    include "latin"
+    include "hu(def_101)"
+    include "hu(def_qwerty)"
+    include "kpdl(comma)"
+    include "hu(def_nodead)"
+    include "hu(def_common)"
+    include "level3(ralt_switch)"
+};
+
+// 101_qwerty_dot_dead
+// 101 key qwerty layout
+// with decimal dot on keypad
+// and with dead key support
+partial
+xkb_symbols "101_qwerty_dot_dead" {
+    name[Group1] = "Hungarian (101/qwerty/dot/dead keys)";
+    include "latin"
+    include "hu(def_101)"
+    include "hu(def_qwerty)"
+    include "hu(def_dot)"
+    include "hu(def_dead)"
+    include "hu(def_common)"
+    include "level3(ralt_switch)"
+};
+
+// 101_qwerty_dot_nodead
+// 101 key qwerty layout
+// with decimal dot on keypad
+// and without dead key support
+partial
+xkb_symbols "101_qwerty_dot_nodead" {
+    name[Group1] = "Hungarian (101/qwerty/dot/eliminate dead keys)";
+    include "latin"
+    include "hu(def_101)"
+    include "hu(def_qwerty)"
+    include "hu(def_dot)"
+    include "hu(def_nodead)"
+    include "hu(def_common)"
+    include "level3(ralt_switch)"
+};
+
+// 102_qwertz_comma_dead
+// 102 key qwertz layout
+// with decimal comma on keypad
+// and with dead key support
+partial
+xkb_symbols "102_qwertz_comma_dead" {
+    name[Group1] = "Hungarian (102/qwertz/comma/dead keys)";
+    include "latin"
+    include "hu(def_102)"
+    include "hu(def_qwertz)"
+    include "kpdl(comma)"
+    include "hu(def_dead)"
+    include "hu(def_common)"
+    include "level3(ralt_switch)"
+};
+
+// 102_qwertz_comma_nodead
+// 102 key qwertz layout
+// with decimal comma on keypad
+// and without dead key support
+partial
+xkb_symbols "102_qwertz_comma_nodead" {
+    name[Group1] = "Hungarian (102/qwertz/comma/eliminate dead keys)";
+    include "latin"
+    include "hu(def_102)"
+    include "hu(def_qwertz)"
+    include "kpdl(comma)"
+    include "hu(def_nodead)"
+    include "hu(def_common)"
+    include "level3(ralt_switch)"
+};
+
+// 102_qwertz_dot_dead
+// 102 key qwertz layout
+// with decimal dot on keypad
+// and with dead key support
+partial
+xkb_symbols "102_qwertz_dot_dead" {
+    name[Group1] = "Hungarian (102/qwertz/dot/dead keys)";
+    include "latin"
+    include "hu(def_102)"
+    include "hu(def_qwertz)"
+    include "hu(def_dot)"
+    include "hu(def_dead)"
+    include "hu(def_common)"
+    include "level3(ralt_switch)"
+};
+
+// 102_qwertz_dot_nodead
+// 102 key qwertz layout
+// with decimal dot on keypad
+// and without dead key support
+partial
+xkb_symbols "102_qwertz_dot_nodead" {
+    name[Group1] = "Hungarian (102/qwertz/dot/eliminate dead keys)";
+    include "latin"
+    include "hu(def_102)"
+    include "hu(def_qwertz)"
+    include "hu(def_dot)"
+    include "hu(def_nodead)"
+    include "hu(def_common)"
+    include "level3(ralt_switch)"
+};
+
+// 102_qwerty_comma_dead
+// 102 key qwerty layout
+// with decimal comma on keypad
+// and with dead key support
+partial
+xkb_symbols "102_qwerty_comma_dead" {
+    name[Group1] = "Hungarian (102/qwerty/comma/dead keys)";
+    include "latin"
+    include "hu(def_102)"
+    include "hu(def_qwerty)"
+    include "kpdl(comma)"
+    include "hu(def_dead)"
+    include "hu(def_common)"
+    include "level3(ralt_switch)"
+};
+
+// 102_qwerty_comma_nodead
+// 102 key qwerty layout
+// with decimal comma on keypad
+// and without dead key support
+partial
+xkb_symbols "102_qwerty_comma_nodead" {
+    name[Group1] = "Hungarian (102/qwerty/comma/eliminate dead keys)";
+    include "latin"
+    include "hu(def_102)"
+    include "hu(def_qwerty)"
+    include "kpdl(comma)"
+    include "hu(def_nodead)"
+    include "hu(def_common)"
+    include "level3(ralt_switch)"
+};
+
+// 102_qwerty_dot_dead
+// 102 key qwerty layout
+// with decimal dot on keypad
+// and with dead key support
+partial
+xkb_symbols "102_qwerty_dot_dead" {
+    name[Group1] = "Hungarian (102/qwerty/dot/dead keys)";
+    include "latin"
+    include "hu(def_102)"
+    include "hu(def_qwerty)"
+    include "hu(def_dot)"
+    include "hu(def_dead)"
+    include "hu(def_common)"
+    include "level3(ralt_switch)"
+};
+
+// 102_qwerty_dot_nodead
+// 102 key qwerty layout
+// with decimal dot on keypad
+// and without dead key support
+partial
+xkb_symbols "102_qwerty_dot_nodead" {
+    name[Group1] = "Hungarian (102/qwerty/dot/eliminate dead keys)";
+    include "latin"
+    include "hu(def_102)"
+    include "hu(def_qwerty)"
+    include "hu(def_dot)"
+    include "hu(def_nodead)"
+    include "hu(def_common)"
+    include "level3(ralt_switch)"
+};
+
+// Partial layouts
+
+// def_102:
+// The standard Hungarian 102 key layout
+hidden partial alphanumeric_keys
+xkb_symbols "def_102" {
+    key <TLDE>  { [            0,      section,           notsign                  ] };
+    key <LSGT>  { [       iacute,       Iacute,              less,         greater ] };
+
+};
+
+// def_101:
+// An alternative layout for 101 key keyboards
+hidden partial alphanumeric_keys
+xkb_symbols "def_101" {
+    key <TLDE>  { [       iacute,       Iacute,                 0,         section ] };
+    key <LSGT>  { [         less,      greater                                     ] };
+};
+
+// def_qwertz:
+// The standard Hungaryan qwertz layout
+hidden partial alphanumeric_keys
+xkb_symbols "def_qwertz" {
+    key <AD06>  { [            z,            Z,           endash                   ] };
+    key <AB01>  { [            y,            Y,           greater                  ] };
+};
+
+
+// def_qwerty:
+// The qwerty layout for people who familiar with the standard US layout
+hidden partial alphanumeric_keys
+xkb_symbols "def_qwerty" {
+    key <AD06>  { [            y,            Y,           endash                   ] };
+    key <AB01>  { [            z,            Z,           greater                  ] };
+};
+
+// def_dot: 	 
+// The Hungarian standard is the comma on the keypad not decimal dot, 	 
+// but programmers hate it 	 
+hidden partial keypad_keys 	 
+xkb_symbols "def_dot" { 	 
+    key <KPDL>  { [    KP_Delete,   KP_Decimal                                     ] }; 	 
+}; 	 
+ 
+
+// def_dead:
+// Dead keys support part
+hidden partial alphanumeric_keys
+xkb_symbols "def_dead" {
+    key <AE01>  { [            1,   apostrophe,        asciitilde,      dead_tilde ] };
+    key <AE02>  { [            2,     quotedbl,        dead_caron,           caron ] };
+    key <AE03>  { [            3,         plus,       asciicircum, dead_circumflex ] };
+    key <AE04>  { [            4,       exclam,        dead_breve,           breve ] };
+    key <AE05>  { [            5,      percent,    dead_abovering,          degree ] };
+    key <AE06>  { [            6,        slash,       dead_ogonek,          ogonek ] };
+    key <AE07>  { [            7,        equal,             grave,      dead_grave ] };
+    key <AE08>  { [            8,    parenleft,     dead_abovedot,        abovedot ] };
+    key <AE09>  { [            9,   parenright,        dead_acute,           acute ] };
+    key <AE10>  { [   odiaeresis,   Odiaeresis,  dead_doubleacute,     doubleacute ] };
+    key <AE11>  { [   udiaeresis,   Udiaeresis,    dead_diaeresis,       diaeresis ] };
+    key <AE12>  { [       oacute,       Oacute,      dead_cedilla,         cedilla ] };
+};
+
+// def_nodead:
+// Without dead keys support
+hidden partial alphanumeric_keys
+xkb_symbols "def_nodead" {
+    key <AE01>  { [            1,   apostrophe,        asciitilde                  ] };
+    key <AE02>  { [            2,     quotedbl,             caron                  ] };
+    key <AE03>  { [            3,         plus,       asciicircum                  ] };
+    key <AE04>  { [            4,       exclam,             breve                  ] };
+    key <AE05>  { [            5,      percent,            degree                  ] };
+    key <AE06>  { [            6,        slash,            ogonek                  ] };
+    key <AE07>  { [            7,        equal,             grave                  ] };
+    key <AE08>  { [            8,    parenleft,          abovedot                  ] };
+    key <AE09>  { [            9,   parenright,             acute                  ] };
+    key <AE10>  { [   odiaeresis,   Odiaeresis,       doubleacute                  ] };
+    key <AE11>  { [   udiaeresis,   Udiaeresis,         diaeresis                  ] };
+    key <AE12>  { [       oacute,       Oacute,           cedilla                  ] };
+};
+
+
+// def_common:
+// The common part of all Hungarian layout above
+hidden partial alphanumeric_keys
+xkb_symbols "def_common" {
+    key <AD01>  { [            q,            Q,         backslash                  ] };
+    key <AD02>  { [            w,            W,               bar                  ] };
+    key <AD07>  { [            u,            U,          EuroSign                  ] };
+    key <AD08>  { [            i,            I,            Iacute,          iacute ] };
+    key <AD09>	{ [            o,            O,        doublelowquotemark          ] };
+    key <AD10>	{ [            p,            P,        rightdoublequotemark        ] };
+    key <AD11>  { [ odoubleacute, Odoubleacute,          division                  ] };
+    key <AD12>  { [       uacute,       Uacute,          multiply                  ] };
+
+    key <AC01>  { [            a,            A,        adiaeresis,      Adiaeresis ] };
+    key <AC02>  { [            s,            S,           dstroke                  ] };
+    key <AC03>  { [            d,            D,           Dstroke                  ] };
+    key <AC04>  { [            f,            F,       bracketleft                  ] };
+    key <AC05>  { [            g,            G,      bracketright                  ] };
+    key <AC07>  { [            j,            J,            iacute,          Iacute ] };
+    key <AC08>  { [            k,            K,           lstroke                  ] };
+    key <AC09>  { [            l,            L,           Lstroke                  ] };
+    key <AC10>  { [       eacute,       Eacute,            dollar,            cent ] };
+    key <AC11>  { [       aacute,       Aacute,            ssharp                  ] };
+
+    key <BKSL>  { [ udoubleacute, Udoubleacute,          currency                  ] };
+
+    key <AB02>  { [            x,            X,        numbersign                  ] };
+    key <AB03>  { [            c,            C,         ampersand                  ] };
+    key <AB04>  { [            v,            V,                at                  ] };
+    key <AB05>  { [            b,            B,         braceleft                  ] };
+    key <AB06>  { [            n,            N,        braceright                  ] };
+    key <AB07>  { [            m,            M,              less                  ] };
+    key <AB08>  { [        comma,     question,         semicolon                  ] };
+    key <AB09>  { [       period,        colon,          ellipsis                  ] };
+    key <AB10>  { [        minus,   underscore,          asterisk                  ] };
+
+};
diff --git a/xorg-server/xkeyboard-config/symbols/il b/xorg-server/xkeyboard-config/symbols/il
index 1ae574335..8bbeaaa51 100644
--- a/xorg-server/xkeyboard-config/symbols/il
+++ b/xorg-server/xkeyboard-config/symbols/il
@@ -1,251 +1,251 @@
-// based on a keyboard map from an 'xkb/symbols/il' file

-

-// 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 <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 <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

-    key <AD03> { [ hebrew_qoph,	E,	EuroSign	]};

-    key <AC01> { [ hebrew_shin,	A,	0x10020AA	]};

-  

-    // 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    

-

-    include "level3(ralt_switch)"

-};

-

-

-// 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 ] };

-};

+// based on a keyboard map from an 'xkb/symbols/il' file
+
+// 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]= "Hebrew";
+
+    key <AD01> { [ slash,	Q		]	};
+    key <AD02> { [ apostrophe,	W		]	};
+    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 <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
+    key <AD03> { [ hebrew_qoph,	E,	EuroSign	]};
+    key <AC01> { [ hebrew_shin,	A,	0x10020AA	]};
+  
+    // 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    
+
+    include "level3(ralt_switch)"
+};
+
+
+// nikud patter based on Dekel Tsur's Hebrew mapping for LyX
+partial alphanumeric_keys 
+xkb_symbols "lyx" {
+    name[Group1]= "Hebrew (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]= "Hebrew (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]= "Hebrew (Biblical, 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/xkeyboard-config/symbols/in b/xorg-server/xkeyboard-config/symbols/in
index 75447148e..822c12a21 100644
--- a/xorg-server/xkeyboard-config/symbols/in
+++ b/xorg-server/xkeyboard-config/symbols/in
@@ -22,7 +22,7 @@
 default partial alphanumeric_keys
 xkb_symbols "deva" {
 	// March 2004 -- David Holl <smyrph+dev_xkb@ece.wpi.edu>
-	name[Group1]="India";
+	name[Group1]="Indian";
 
 	key.type="FOUR_LEVEL";
 
@@ -97,7 +97,7 @@ xkb_symbols "deva" {
 
 partial alphanumeric_keys
 xkb_symbols "bolnagri" {
-     name[Group1] = "India - Hindi Bolnagri";
+     name[Group1] = "Hindi (Bolnagri)";
      key.type="FOUR_LEVEL";
     //Top Alphanumeric row
     // Roman digits
@@ -167,7 +167,7 @@ xkb_symbols "bolnagri" {
 
 partial alphanumeric_keys
 xkb_symbols "ben" {
-    name[Group1]= "India - Bengali";
+    name[Group1]= "Bengali";
 
       // Mainly numbers.
       key <AE01> { [      U09E7 		]	};
@@ -232,7 +232,7 @@ xkb_symbols "ben" {
 };
 
 xkb_symbols "ben_probhat" {
- name[Group1]= "India - Bengali Probhat";
+ name[Group1]= "Bengali (Probhat)";
    key <ESC>  { [ Escape ] };
 
 // numbers
@@ -306,7 +306,7 @@ xkb_symbols "ben_probhat" {
 
 partial alphanumeric_keys 
 xkb_symbols "guj" {
-      name[Group1]= "India - Gujarati";
+      name[Group1]= "Gujarati";
 
       // Mainly numbers.
       key <AE01> { [      U0AE7, U0A8D 	]	};
@@ -377,7 +377,7 @@ xkb_symbols "kan" {
     // Date   : Wed Nov 13 17:22:58 IST 2002
     // Kannada digits mapped in basic only
 
-    name[Group1]= "India - Kannada";
+    name[Group1]= "Kannada";
 
     key <TLDE> { [  U0cca, U0c92	] };
     key <AE01> { [  U0ce7			] };
@@ -445,7 +445,7 @@ xkb_symbols "kan" {
 partial alphanumeric_keys 
 xkb_symbols "mal" {
 
-    name[Group1] = "India - Malayalam";
+    name[Group1] = "Malayalam";
 
     //From grave to backslash (\)
     
@@ -534,7 +534,7 @@ xkb_symbols "mal" {
 
 partial alphanumeric_keys
 xkb_symbols "mal_lalitha" {
-     name[Group1] = "India - Malayalam Lalitha";
+     name[Group1] = "Malayalam (Lalitha)";
      key.type="FOUR_LEVEL";
     //Top Alphanumeric row
     // Roman digits
@@ -607,7 +607,7 @@ xkb_symbols "ori" {
     // Author: G Karunakar <karunakar@freedomink.org>
     // Date: Wed Nov 13 18:16:19 IST 2002
 
-    name[Group1]= "India - Oriya";
+    name[Group1]= "Oriya";
     
     key <AE01> { [  U0b67			] };
     key <AE02> { [  U0b68			] };
@@ -667,7 +667,7 @@ xkb_symbols "ori" {
 // INSCRIPT
 partial alphanumeric_keys 
 xkb_symbols "tam" {
-      name[Group1]= "India - Tamil";
+      name[Group1]= "Tamil";
 
       key <TLDE> { [      U0BCA, U0B92	]	};
 
@@ -739,7 +739,7 @@ xkb_symbols "tam_unicode" {
 // Date  : Fri Sep 4 11:32:00 CST 2009
 // Mapping:
   
-    name[Group1]= "India - Tamil Unicode";
+    name[Group1]= "Tamil (Unicode)";
 
     // granthas
     key <TLDE> {  [ apostrophe, asciitilde ] };
@@ -804,7 +804,7 @@ xkb_symbols "tam_keyboard_with_numerals" {
 // Date  : Fri Sep 4 11:33:00 CST 2009
 // Mapping:
 
-      name[Group1]= "India - Tamil Keyboard with Numerals";
+      name[Group1]= "Tamil (keyboard with numerals)";
 
       // Mainly numbers.
       key <TLDE> { [ apostrophe, asciitilde ] };
@@ -868,7 +868,7 @@ xkb_symbols "tam_TSCII" {
 // Author	: Thuraiappah Vaseeharan <vasee@ieee.org>
 // Last Modified: Sat Jan  5 17:11:26 CST 2002
 
-    name[Group1]= "India - Tamil TSCII Typewriter";
+    name[Group1]= "Tamil (TSCII typewriter)";
 
     key <AE01> {  [ 0x10000b7, 0x10000a4 ] }; // aytham
     key <AE02> {  [ 0x1000082, 0x10000a5 ] }; // shri
@@ -924,7 +924,7 @@ xkb_symbols "tam_TAB" {
 // Author: Thuraiappah Vaseeharan <t_vasee@yahoo.com>
 // Date  : Sun Aug 12 02:23:00 CDT 2001
 
-    name[Group1]= "India - Tamil TAB Typewriter";
+    name[Group1]= "Tamil (TAB typewriter)";
 
     // numeral row
     key <AE01> {  [ 0x10000e7, 0x10000a7 ] } ;
@@ -980,7 +980,7 @@ xkb_symbols "tel" {
     // Date:
     // See layout at http://www.indlinux.org/keymap/telugu.php
 
-    name[Group1]= "India - Telugu";
+    name[Group1]= "Telugu";
 
     key <TLDE> { [  U0c4a, U0c12	] };
     key <AE01> { [  U0c67			] };
@@ -1042,26 +1042,26 @@ xkb_symbols "tel" {
 partial alphanumeric_keys 
 xkb_symbols "urd-phonetic" {
     include "pk(urd-phonetic)"
-    name[Group1]= "India - Urdu, Phonetic";
+    name[Group1]= "Urdu (phonetic)";
 };
 
 partial alphanumeric_keys 
 xkb_symbols "urd-phonetic3" {
     include "pk(urd-crulp)"
-    name[Group1]= "India - Urdu, Alternative phonetic";
+    name[Group1]= "Urdu (alternative phonetic)";
 };
 
 partial alphanumeric_keys 
 xkb_symbols "urd-winkeys" {
     include "pk(urd-nla)"
-    name[Group1]= "India - Urdu, Winkeys";
+    name[Group1]= "Urdu (WinKeys)";
 };
 
 // based on a keyboard map from an 'xkb/symbols/gur' file
 
 partial alphanumeric_keys
 xkb_symbols "guru" {
-      name[Group1]= "India - Gurmukhi";
+      name[Group1]= "Punjabi (Gurmukhi)";
 
       // Mainly numbers.
       key <AE01> { [      U0A67 		]	};
@@ -1132,7 +1132,7 @@ xkb_symbols "guru" {
  
 partial alphanumeric_keys
 xkb_symbols "jhelum" {
-      name[Group1] = "India - Gurmukhi Jhelum";
+      name[Group1] = "Punjabi (Gurmukhi Jhelum)";
           key.type="FOUR_LEVEL";
      //Top Alphanumeric row
      // Roman digits
@@ -1265,7 +1265,7 @@ xkb_symbols "olpc" {
 partial alphanumeric_keys 
 xkb_symbols "hin-wx" {
 
-    name[Group1]= "India - Hindi Wx";
+    name[Group1]= "Hindi (Wx)";
 
       key <TLDE> {	 [     grave, asciitilde, 2, 3    ]	};
 
@@ -1330,7 +1330,7 @@ xkb_symbols "hin-wx" {
 partial alphanumeric_keys
 xkb_symbols "eng" {
 
-    name[Group1]= "India - English with RupeeSign";
+    name[Group1]= "English (India, with RupeeSign)";
 
     include "us(basic)"
 
@@ -1351,7 +1351,7 @@ xkb_symbols "eng" {
 partial alphanumeric_keys 
 xkb_symbols "mal_enhanced" {
 
-    name[Group1] = "India - Malayalam enhanced Inscript with Rupee Sign";
+    name[Group1] = "Malayalam (enhanced Inscript with Rupee Sign)";
 
    //From grave to backslash (\)
     
diff --git a/xorg-server/xkeyboard-config/symbols/iq b/xorg-server/xkeyboard-config/symbols/iq
index f30332940..5430b53bf 100644
--- a/xorg-server/xkeyboard-config/symbols/iq
+++ b/xorg-server/xkeyboard-config/symbols/iq
@@ -1,33 +1,33 @@
-// Iraque keyboard layout,

-

-// 3-Level layout

-

-partial default alphanumeric_keys

-xkb_symbols "basic" {

-    include "ara(basic)"

-    name[Group1]= "Iraq";

-};

-

-partial alphanumeric_keys

-xkb_symbols "ku" {

-    include "tr(ku)"

-    name[Group1]= "Iraq - Kurdish, Latin Q";

-};

-

-partial alphanumeric_keys

-xkb_symbols "ku_f" {

-    include "tr(ku_f)"

-    name[Group1]= "Iraq - Kurdish, (F)";

-};

-

-partial alphanumeric_keys

-xkb_symbols "ku_alt" {

-    include "tr(ku_alt)"

-    name[Group1]= "Iraq - Kurdish, Latin Alt-Q";

-};

-

-partial alphanumeric_keys

-xkb_symbols "ku_ara" {

-    include "ir(ku_ara)"

-    name[Group1]= "Iraq - Kurdish, Arabic-Latin";

-};

+// Iraque keyboard layout,
+
+// 3-Level layout
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+    include "ara(basic)"
+    name[Group1]= "Iraqi";
+};
+
+partial alphanumeric_keys
+xkb_symbols "ku" {
+    include "tr(ku)"
+    name[Group1]= "Kurdish (Iraq, Latin Q)";
+};
+
+partial alphanumeric_keys
+xkb_symbols "ku_f" {
+    include "tr(ku_f)"
+    name[Group1]= "Kurdish (Iraq, F)";
+};
+
+partial alphanumeric_keys
+xkb_symbols "ku_alt" {
+    include "tr(ku_alt)"
+    name[Group1]= "Kurdish (Iraq, Latin Alt-Q)";
+};
+
+partial alphanumeric_keys
+xkb_symbols "ku_ara" {
+    include "ir(ku_ara)"
+    name[Group1]= "Kurdish (Iraq, Arabic-Latin)";
+};
diff --git a/xorg-server/xkeyboard-config/symbols/ir b/xorg-server/xkeyboard-config/symbols/ir
index 1832e819b..94bdede28 100644
--- a/xorg-server/xkeyboard-config/symbols/ir
+++ b/xorg-server/xkeyboard-config/symbols/ir
@@ -14,7 +14,7 @@
 
 partial default alphanumeric_keys
 xkb_symbols "pes" {
-    name[Group1]= "Iran";
+    name[Group1]= "Persian";
 
     include "ir(pes_part_basic)"
     include "ir(pes_part_ext)"
@@ -26,7 +26,7 @@ xkb_symbols "pes" {
 
 partial alphanumeric_keys
 xkb_symbols "pes_keypad" {
-    name[Group1]= "Iran - Persian, with Persian Keypad";
+    name[Group1]= "Persian (with Persian Keypad)";
 
     include "ir(pes_part_basic)"
     include "ir(pes_part_keypad)"
@@ -146,19 +146,19 @@ xkb_symbols "pes_part_keypad" {
 partial alphanumeric_keys
 xkb_symbols "ku" {
     include "tr(ku)"
-    name[Group1]= "Iran - Kurdish, Latin Q";
+    name[Group1]= "Kurdish (Iran, Latin Q)";
 };
 
 partial alphanumeric_keys
 xkb_symbols "ku_f" {
     include "tr(ku_f)"
-    name[Group1]= "Iran - Kurdish, (F)";
+    name[Group1]= "Kurdish (Iran, F)";
 };
 
 partial alphanumeric_keys
 xkb_symbols "ku_alt" {
     include "tr(ku_alt)"
-    name[Group1]= "Iran - Kurdish, Latin Alt-Q";
+    name[Group1]= "Kurdish (Iran, Latin Alt-Q)";
 };
 
 ////////////////////////////////////////
@@ -179,7 +179,7 @@ xkb_symbols "ku_alt" {
 
 partial alphanumeric_keys
 xkb_symbols "ku_ara" {
-    name[Group1]= "Iran - Kurdish, Arabic-Latin";
+    name[Group1]= "Kurdish (Iran, Arabic-Latin)";
 
     // Other 3-Level symbols
     key <TLDE> { [ 0x100200d,		division,		asciitilde	] };
@@ -254,7 +254,7 @@ xkb_symbols "ku_ara" {
 partial default alphanumeric_keys
 xkb_symbols "ave"
 {
-	name[Group1] = "Iran - Avestan";
+	name[Group1] = "Avestan";
 
 	key <AB01> { [ U10B30,         U10B32 ] }; // 𐬰 𐬲 
 	key <AB02> { [ U10B11,         U10B12 ] }; // 𐬑 𐬒 
diff --git a/xorg-server/xkeyboard-config/symbols/is b/xorg-server/xkeyboard-config/symbols/is
index 2a37f9da1..c40b8a965 100644
--- a/xorg-server/xkeyboard-config/symbols/is
+++ b/xorg-server/xkeyboard-config/symbols/is
@@ -1,199 +1,199 @@
-// based on

-// XKB keyboard by Hrafnkell Eiriksson - hkelle@rhi.hi.is

-//     fixes by Olafur Osvaldsson - oli@isnic.is

-//

-

-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 (–—), thorn (þÞ), EuroSign (€) and the German

-// Sharp S (ßẞ). These keys aren't used in the US version, making the

-// Icelandic 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 <avarab@gmail.com>

-

-// Icelandic Dvorak

-partial alphanumeric_keys 

-xkb_symbols "dvorak" {

-    name[Group1]= "Iceland - Dvorak";

-

-    include "us(dvorak)"

-    include "eurosign(4)"

-

-    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   ] };

-    key <AB06> { [       b,     B,           ssharp,  U1E9E   ] };

-

-    include "level3(ralt_switch)"

-};

+// based on
+// XKB keyboard by Hrafnkell Eiriksson - hkelle@rhi.hi.is
+//     fixes by Olafur Osvaldsson - oli@isnic.is
+//
+
+default partial alphanumeric_keys
+xkb_symbols "basic" {
+
+    include "latin(type4)"
+
+    name[Group1]="Icelandic";
+
+    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]="Icelandic (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]="Icelandic (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]= "Icelandic (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 (–—), thorn (þÞ), EuroSign (€) and the German
+// Sharp S (ßẞ). These keys aren't used in the US version, making the
+// Icelandic 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 <avarab@gmail.com>
+
+// Icelandic Dvorak
+partial alphanumeric_keys 
+xkb_symbols "dvorak" {
+    name[Group1]= "Icelandic (Dvorak)";
+
+    include "us(dvorak)"
+    include "eurosign(4)"
+
+    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   ] };
+    key <AB06> { [       b,     B,           ssharp,  U1E9E   ] };
+
+    include "level3(ralt_switch)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/it b/xorg-server/xkeyboard-config/symbols/it
index 631fae591..90fb7f5c9 100644
--- a/xorg-server/xkeyboard-config/symbols/it
+++ b/xorg-server/xkeyboard-config/symbols/it
@@ -1,257 +1,257 @@
-// based on a keyboard map from an 'xkb/symbols/it' file

-// 17 May 2003 Modified by Sebastiano Vigna (vigna@dsi.unimi.it)

-

-partial default alphanumeric_keys

-xkb_symbols "basic" {

-

-    include "latin(type4)"

-

-    name[Group1]="Italy";

-

-    key <TLDE>	{ [ backslash,        bar,      notsign,    brokenbar ]	};

-

-    key <AE02>	{ [         2,   quotedbl,  twosuperior, dead_doubleacute ] };

-    key <AE03>	{ [         3,   sterling,threesuperior,   dead_tilde ]	};

-    key <AE04>	{ [         4,     dollar,   onequarter,    oneeighth ] };

-

-    key <AE10>	{ [         0,      equal,   braceright,  dead_ogonek ] };

-    key <AE11>	{ [apostrophe,   question,        grave, questiondown ]	};

-    key <AE12>	{ [    igrave, asciicircum,  asciitilde, dead_circumflex ] };

-

-    key <AD11>	{ [    egrave,     eacute,  bracketleft,    braceleft ]	};

-    key <AD12>	{ [      plus,   asterisk, bracketright,   braceright ]	};

-

-    key <AC10>	{ [    ograve,   ccedilla,           at, dead_cedilla ] };

-    key <AC11>	{ [    agrave,     degree,   numbersign, dead_abovering ] };

-

-    key <AB06>	{ [         n,          N,       ntilde,       Ntilde ]	};

-    key <AB08>	{ [     comma,  semicolon,   dead_acute,     multiply ]	};

-    key <AB09>	{ [    period,      colon,periodcentered, dead_diaeresis ] };

-    key <AB10>	{ [     minus, underscore,  dead_macron,     division ] };

-

-    key <BKSL>	{ [    ugrave,    section,   dead_grave,   dead_breve ]	};

-

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

-

-    include "level3(ralt_switch)"

-};

-

-partial alphanumeric_keys

-xkb_symbols "nodeadkeys" {

-

-    // Modifies the basic italian layout to eliminate all dead keys

-

-    include "it(basic)"

-

-    name[Group1]="Italy - Eliminate dead keys";

-

-    key <AE02>	{ [         2,   quotedbl,  twosuperior,  doubleacute ] };

-    key <AE03>	{ [         3,   sterling,threesuperior,   asciitilde ]	};

-

-    key <AE10>	{ [         0,       equal,  braceright,       ogonek ]	};

-    key <AE12>	{ [    igrave, asciicircum,  asciitilde,  asciicircum ] };

-

-    key <AC10>	{ [    ograve,   ccedilla,           at,      cedilla ] };

-    key <AC11>	{ [    agrave,     degree,   numbersign,       degree ] };

-

-    key <AB08>	{ [     comma,  semicolon,        acute,     multiply ]	};

-    key <AB09>	{ [    period,      colon,periodcentered,   diaeresis ] };

-    key <AB10>	{ [     minus, underscore,       macron,     division ] };

-

-    key <BKSL>	{ [    ugrave,    section,        grave,        breve ]	};

-};

-

-// Copied from macintosh_vndr/it

-partial alphanumeric_keys

-xkb_symbols "mac" {

-

-    name[Group1]= "Italy - Macintosh";

-

-    // Alphanumeric section

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

-    key <TLDE> {        [        at,    numbersign,    periodcentered              ]	};

-    key <AE01> {	[   ampersand,    1, guillemotleft,guillemotright	]	};

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

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

-    key <AE04> {	[   parenleft,    4,    braceleft,    bracketleft	]	};

-    key <AE05> {	[    ccedilla,    5,     Ccedilla,    Iacute	]	};

-    key <AE06> {	[      egrave,    6,    paragraph,    periodcentered]	};

-    key <AE07> {	[  parenright,    7,   braceright,	  bracketright	]	};

-    key <AE08> {	[    sterling,    8,   infinity			]	};

-    key <AE09> {	[      agrave,    9,        acute,    Ocircumflex	]	};

-    key <AE10> {	[      eacute,    0,        grave,    Oacute	]	};

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

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

-

-    key <AD01> {	[           q,  Q 		]	};

-    key <AD02> {	[	    z,  Z		]	};

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

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

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

-    key <AD06> {	[	    y,  Y,       Uacute,	ydiaeresis      ] 	};

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

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

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

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

-    key <AD11> {	[      igrave,  asciicircum     ]	};

-    key <AD12> {	[      dollar,	asterisk        ]	};

-    key <BKSL> {	[     section,  degree,           at,  numbersign      ]	};

-

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

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

-    key <AC03> {	[	  d,	D		]	};

-    key <AC04> {	[	  f,	F		]	};

-    key <AC05> {	[	  g,	G		]	};

-    key <AC06> {	[	  h,	H,     Igrave,    Icircumflex     ]	};

-    key <AC07> {	[	  j,	J,  Idiaeresis,   Iacute          ]	};

-    key <AC08> {	[	  k,	K,     Egrave,    Ediaeresis      ]	};

-    key <AC09> {	[	  l,	L,     ssharp,    bar		]	};

-    key <AC10> {	[         m,	M,         mu,    Oacute		]	};

-    key <AC11> {	[    ugrave,	percent,         ae,    AE		]	};

-

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

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

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

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

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

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

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

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

-    key <AB09> {	[     colon,	slash,        bar,    backslash	]	};

-    key <AB10> {	[    ograve,	exclam,     exclamdown			]	};

-

-    // End alphanumeric section

-

-    include "kpdl(dot)"

-    include "level3(ralt_switch)"

-};

-

-// Used by Georgian people in Italy, 

-// contributed by Vladimer Sichinava

-partial alphanumeric_keys

-xkb_symbols "geo" {

-    include "it"

-    include "ge(basic)"

-

-    name[Group1]= "Italy - Georgian";

-    key <TLDE> { [ backslash, bar, notsign, brokenbar ] };

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

-    key <AE02> { [ 2, quotedbl, twosuperior, dead_doubleacute ] };

-    key <AE03> { [ 3, sterling, threesuperior, dead_tilde ] };

-    key <AE04> { [ 4, dollar, onequarter, oneeighth ] };

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

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

-    key <AE07> { [ 7, slash, braceleft ] };

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

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

-    key <AE10> { [ 0, equal, braceright, dead_ogonek ] };

-    key <AE11> { [apostrophe, question, grave, questiondown ] };

-    key <AE12> { [ igrave, asciicircum, asciitilde, dead_circumflex ] };

-

-    key <AD03> { [0x010010d4, E, EuroSign ] };

-    key <AD11> { [ egrave, eacute, bracketleft, braceleft ] };

-    key <AD12> { [ plus, asterisk, bracketright, braceright ] };

-

-    key <AC10> { [ ograve, ccedilla, at, dead_cedilla ] };

-    key <AC11> { [ agrave, degree, numbersign, degree ] };

-    key <BKSL> { [ ugrave, section, dead_grave, dead_breve ] };

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

-

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

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

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

-};

-

-// OLPC Section

-xkb_symbols "olpc" {

-

-    include "it(basic)"

-

-    key <AE12> { [ igrave,  asciicircum,    asciitilde,     dead_tilde ] };

-    key <BKSL> { [ ugrave,      section,        Egrave,     dead_breve ] };

-    key <I219> { [ less,        greater, guillemotleft, guillemotright ] };

-};

-

-partial alphanumeric_keys modifier_keys

-xkb_symbols "us" {

-

-    name[Group1]= "Italy - US keyboard with Italian letters";

-    

-    include "us(euro)"

-    

-    // Alphanumeric section

-

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

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

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

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

-    key <AE06> { [         6,asciicircum,dead_circumflex                  ] };

-    key <AE10> { [         0, parenright,        degree                   ] };

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

-

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

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

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

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

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

-

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

-    key <AC03> { [         d,          D,        eacute,           Eacute ] };

-    key <AC07> { [         j,          J,        uacute,           Uacute ] };

-    key <AC08> { [         k,          K,        iacute,           Iacute ] };

-    key <AC09> { [         l,          L,        oacute,           Oacute ] };

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

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

-

-    key <AB01> { [         z,          Z,        aacute,           Aacute ] };

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

-    key <AB06> { [         n,          N,        ntilde,           Ntilde ] };

-    key <AB08> { [     comma,       less,   guillemotleft                 ] };

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

-

-    include "level3(ralt_switch)"

-};

-

-partial alphanumeric_keys

-xkb_symbols "htcdream" {

-        include "inet(htcdream)"

-        name[Group1]= "Italy - htcdream";

-

-        //second row

-        key <AD01> { [ q, Q, Tab, Tab ] };

-        key <AD02> { [ w, W, grave, grave ] };

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

-        key <AD04> { [ r, R, eacute, eacute ] };

-        key <AD05> { [ t, T, quotedbl, quotedbl ] };

-        key <AD06> { [ y, Y, apostrophe, apostrophe ] };

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

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

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

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

-

-        //third row

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

-        key <AC02> { [ s, S, bar, bar ] };

-        key <AC03> { [ d ,D, EuroSign, EuroSign ] };

-        key <AC04> { [ f, F, sterling, sterling ] };

-        key <AC05> { [ g, G, division, division ] };

-        key <AC06> { [ h, H, multiply, multiply ] };

-        key <AC07> { [ j, J, minus, minus ] };

-        key <AC08> { [ k, K, plus, plus ] };

-        key <AC09> { [ l, L, equal, equal ] };

-

-        //forth row

-        key <AB01> { [ z, Z, underscore, underscore ] };

-        key <AB02> { [ x, X, asciitilde, asciitilde ] };

-        key <AB03> { [ c, C, less, less ] };

-        key <AB04> { [ v, V, greater, greater ] };

-        key <AB05> { [ b, B,  backslash, backslash ] };

-        key <AB06> { [ n, N, colon, colon ] };

-        key <AB07> { [ m, M, semicolon, semicolon ] };

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

-

-        //fifth row

-        key <FK15> { [ at, at, NoSymbol, NoSymbol ] };

-

-        include "level3(alt_switch)"

-};

+// based on a keyboard map from an 'xkb/symbols/it' file
+// 17 May 2003 Modified by Sebastiano Vigna (vigna@dsi.unimi.it)
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+
+    include "latin(type4)"
+
+    name[Group1]="Italian";
+
+    key <TLDE>	{ [ backslash,        bar,      notsign,    brokenbar ]	};
+
+    key <AE02>	{ [         2,   quotedbl,  twosuperior, dead_doubleacute ] };
+    key <AE03>	{ [         3,   sterling,threesuperior,   dead_tilde ]	};
+    key <AE04>	{ [         4,     dollar,   onequarter,    oneeighth ] };
+
+    key <AE10>	{ [         0,      equal,   braceright,  dead_ogonek ] };
+    key <AE11>	{ [apostrophe,   question,        grave, questiondown ]	};
+    key <AE12>	{ [    igrave, asciicircum,  asciitilde, dead_circumflex ] };
+
+    key <AD11>	{ [    egrave,     eacute,  bracketleft,    braceleft ]	};
+    key <AD12>	{ [      plus,   asterisk, bracketright,   braceright ]	};
+
+    key <AC10>	{ [    ograve,   ccedilla,           at, dead_cedilla ] };
+    key <AC11>	{ [    agrave,     degree,   numbersign, dead_abovering ] };
+
+    key <AB06>	{ [         n,          N,       ntilde,       Ntilde ]	};
+    key <AB08>	{ [     comma,  semicolon,   dead_acute,     multiply ]	};
+    key <AB09>	{ [    period,      colon,periodcentered, dead_diaeresis ] };
+    key <AB10>	{ [     minus, underscore,  dead_macron,     division ] };
+
+    key <BKSL>	{ [    ugrave,    section,   dead_grave,   dead_breve ]	};
+
+    key <LSGT>	{ [      less,    greater,guillemotleft,guillemotright] };
+
+    include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "nodeadkeys" {
+
+    // Modifies the basic italian layout to eliminate all dead keys
+
+    include "it(basic)"
+
+    name[Group1]="Italian (eliminate dead keys)";
+
+    key <AE02>	{ [         2,   quotedbl,  twosuperior,  doubleacute ] };
+    key <AE03>	{ [         3,   sterling,threesuperior,   asciitilde ]	};
+
+    key <AE10>	{ [         0,       equal,  braceright,       ogonek ]	};
+    key <AE12>	{ [    igrave, asciicircum,  asciitilde,  asciicircum ] };
+
+    key <AC10>	{ [    ograve,   ccedilla,           at,      cedilla ] };
+    key <AC11>	{ [    agrave,     degree,   numbersign,       degree ] };
+
+    key <AB08>	{ [     comma,  semicolon,        acute,     multiply ]	};
+    key <AB09>	{ [    period,      colon,periodcentered,   diaeresis ] };
+    key <AB10>	{ [     minus, underscore,       macron,     division ] };
+
+    key <BKSL>	{ [    ugrave,    section,        grave,        breve ]	};
+};
+
+// Copied from macintosh_vndr/it
+partial alphanumeric_keys
+xkb_symbols "mac" {
+
+    name[Group1]= "Italian (Macintosh)";
+
+    // Alphanumeric section
+    key <LSGT> {	[        less,  greater   	]	};
+    key <TLDE> {        [        at,    numbersign,    periodcentered              ]	};
+    key <AE01> {	[   ampersand,    1, guillemotleft,guillemotright	]	};
+    key <AE02> {	[    quotedbl,    2 		]	};
+    key <AE03> {	[  apostrophe,    3         	]	};
+    key <AE04> {	[   parenleft,    4,    braceleft,    bracketleft	]	};
+    key <AE05> {	[    ccedilla,    5,     Ccedilla,    Iacute	]	};
+    key <AE06> {	[      egrave,    6,    paragraph,    periodcentered]	};
+    key <AE07> {	[  parenright,    7,   braceright,	  bracketright	]	};
+    key <AE08> {	[    sterling,    8,   infinity			]	};
+    key <AE09> {	[      agrave,    9,        acute,    Ocircumflex	]	};
+    key <AE10> {	[      eacute,    0,        grave,    Oacute	]	};
+    key <AE11> {	[       minus,    underscore	]	};
+    key <AE12> {	[       equal, 	  plus,     notequal,    plusminus	]	};
+
+    key <AD01> {	[           q,  Q 		]	};
+    key <AD02> {	[	    z,  Z		]	};
+    key <AD03> {	[	    e,  E,	EuroSign	]	};
+    key <AD04> {	[	    r,  R,   registered			] 	};
+    key <AD05> {	[	    t,  T		]	};
+    key <AD06> {	[	    y,  Y,       Uacute,	ydiaeresis      ] 	};
+    key <AD07> {	[	    u,  U		]	};
+    key <AD08> {	[	    i,  I,  icircumflex,	idiaeresis      ] 	};
+    key <AD09> {	[	    o,  O		]	};
+    key <AD10> {	[	    p,  P		]	};
+    key <AD11> {	[      igrave,  asciicircum     ]	};
+    key <AD12> {	[      dollar,	asterisk        ]	};
+    key <BKSL> {	[     section,  degree,           at,  numbersign      ]	};
+
+    key <AC01> {	[	  a,	A,      aring,   Aring		] 	};
+    key <AC02> {	[	  s,	S,     ssharp			]	};
+    key <AC03> {	[	  d,	D		]	};
+    key <AC04> {	[	  f,	F		]	};
+    key <AC05> {	[	  g,	G		]	};
+    key <AC06> {	[	  h,	H,     Igrave,    Icircumflex     ]	};
+    key <AC07> {	[	  j,	J,  Idiaeresis,   Iacute          ]	};
+    key <AC08> {	[	  k,	K,     Egrave,    Ediaeresis      ]	};
+    key <AC09> {	[	  l,	L,     ssharp,    bar		]	};
+    key <AC10> {	[         m,	M,         mu,    Oacute		]	};
+    key <AC11> {	[    ugrave,	percent,         ae,    AE		]	};
+
+    key <AB01> {	[	  w,	W 		]	};
+    key <AB02> {	[	  x,	X		]	};
+    key <AB03> {	[	  c,	C,  copyright,    copyright	]	};
+    key <AB04> {	[	  v,	V		]	};
+    key <AB05> {	[	  b,	B		]	};
+    key <AB06> {	[	  n,	N,  dead_tilde                    ]       };
+    key <AB07> {	[     comma,	question,          questiondown		]	};
+    key <AB08> {	[ semicolon,	period          ]	};
+    key <AB09> {	[     colon,	slash,        bar,    backslash	]	};
+    key <AB10> {	[    ograve,	exclam,     exclamdown			]	};
+
+    // End alphanumeric section
+
+    include "kpdl(dot)"
+    include "level3(ralt_switch)"
+};
+
+// Used by Georgian people in Italy, 
+// contributed by Vladimer Sichinava
+partial alphanumeric_keys
+xkb_symbols "geo" {
+    include "it"
+    include "ge(basic)"
+
+    name[Group1]= "Georgian (Italy)";
+    key <TLDE> { [ backslash, bar, notsign, brokenbar ] };
+    key <AE01> { [ 1, exclam, onesuperior ] };
+    key <AE02> { [ 2, quotedbl, twosuperior, dead_doubleacute ] };
+    key <AE03> { [ 3, sterling, threesuperior, dead_tilde ] };
+    key <AE04> { [ 4, dollar, onequarter, oneeighth ] };
+    key <AE05> { [ 5, percent, onehalf ] };
+    key <AE06> { [ 6, ampersand ] };
+    key <AE07> { [ 7, slash, braceleft ] };
+    key <AE08> { [ 8, parenleft, bracketleft ] };
+    key <AE09> { [ 9, parenright ] };
+    key <AE10> { [ 0, equal, braceright, dead_ogonek ] };
+    key <AE11> { [apostrophe, question, grave, questiondown ] };
+    key <AE12> { [ igrave, asciicircum, asciitilde, dead_circumflex ] };
+
+    key <AD03> { [0x010010d4, E, EuroSign ] };
+    key <AD11> { [ egrave, eacute, bracketleft, braceleft ] };
+    key <AD12> { [ plus, asterisk, bracketright, braceright ] };
+
+    key <AC10> { [ ograve, ccedilla, at, dead_cedilla ] };
+    key <AC11> { [ agrave, degree, numbersign, degree ] };
+    key <BKSL> { [ ugrave, section, dead_grave, dead_breve ] };
+    key <LSGT> { [ less, greater ] };
+
+    key <AB08> { [ comma, semicolon ] };
+    key <AB09> { [ period, colon ] };
+    key <AB10> { [ minus, underscore ] };
+};
+
+// OLPC Section
+xkb_symbols "olpc" {
+
+    include "it(basic)"
+
+    key <AE12> { [ igrave,  asciicircum,    asciitilde,     dead_tilde ] };
+    key <BKSL> { [ ugrave,      section,        Egrave,     dead_breve ] };
+    key <I219> { [ less,        greater, guillemotleft, guillemotright ] };
+};
+
+partial alphanumeric_keys modifier_keys
+xkb_symbols "us" {
+
+    name[Group1]= "Italian (US keyboard with Italian letters)";
+    
+    include "us(euro)"
+    
+    // Alphanumeric section
+
+    key <TLDE> { [     grave, asciitilde,    dead_grave,       dead_tilde ] };
+    key <AE01> { [         1,     exclam,   onesuperior                   ] };
+    key <AE02> { [         2,         at,   twosuperior                   ] };
+    key <AE03> { [         3, numbersign, threesuperior                   ] };
+    key <AE06> { [         6,asciicircum,dead_circumflex                  ] };
+    key <AE10> { [         0, parenright,        degree                   ] };
+    key <AE11> { [     minus, underscore,   dead_macron                   ] };
+
+    key <AD03> { [         e,          E,        egrave,           Egrave ] };
+    key <AD04> { [         r,          R,    registered                   ] };
+    key <AD07> { [         u,          U,        ugrave,           Ugrave ] };
+    key <AD08> { [         i,          I,        igrave,           Igrave ] };
+    key <AD09> { [         o,          O,        ograve,           Ograve ] };
+
+    key <AC01> { [         a,          A,        agrave,           Agrave ] };
+    key <AC03> { [         d,          D,        eacute,           Eacute ] };
+    key <AC07> { [         j,          J,        uacute,           Uacute ] };
+    key <AC08> { [         k,          K,        iacute,           Iacute ] };
+    key <AC09> { [         l,          L,        oacute,           Oacute ] };
+    key <AC10> { [ semicolon,      colon,dead_diaeresis,   dead_diaeresis ] };
+    key <AC11> { [apostrophe,   quotedbl,    dead_acute                   ] };
+
+    key <AB01> { [         z,          Z,        aacute,           Aacute ] };
+    key <AB03> { [         c,          C,     copyright                   ] };
+    key <AB06> { [         n,          N,        ntilde,           Ntilde ] };
+    key <AB08> { [     comma,       less,   guillemotleft                 ] };
+    key <AB09> { [    period,    greater,  guillemotright                 ] };
+
+    include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "htcdream" {
+        include "inet(htcdream)"
+        name[Group1]= "Italian";
+
+        //second row
+        key <AD01> { [ q, Q, Tab, Tab ] };
+        key <AD02> { [ w, W, grave, grave ] };
+        key <AD03> { [ e, E, egrave, egrave] };
+        key <AD04> { [ r, R, eacute, eacute ] };
+        key <AD05> { [ t, T, quotedbl, quotedbl ] };
+        key <AD06> { [ y, Y, apostrophe, apostrophe ] };
+        key <AD07> { [ u, U, ugrave, ugrave ] };
+        key <AD08> { [ i, I, igrave, igrave ] };
+        key <AD09> { [ o, O, ograve, ograve ] };
+        key <AD10> { [ p, P, NoSymbol, NoSymbol ] };
+
+        //third row
+        key <AC01> { [ a, A, agrave, agrave ] };
+        key <AC02> { [ s, S, bar, bar ] };
+        key <AC03> { [ d ,D, EuroSign, EuroSign ] };
+        key <AC04> { [ f, F, sterling, sterling ] };
+        key <AC05> { [ g, G, division, division ] };
+        key <AC06> { [ h, H, multiply, multiply ] };
+        key <AC07> { [ j, J, minus, minus ] };
+        key <AC08> { [ k, K, plus, plus ] };
+        key <AC09> { [ l, L, equal, equal ] };
+
+        //forth row
+        key <AB01> { [ z, Z, underscore, underscore ] };
+        key <AB02> { [ x, X, asciitilde, asciitilde ] };
+        key <AB03> { [ c, C, less, less ] };
+        key <AB04> { [ v, V, greater, greater ] };
+        key <AB05> { [ b, B,  backslash, backslash ] };
+        key <AB06> { [ n, N, colon, colon ] };
+        key <AB07> { [ m, M, semicolon, semicolon ] };
+        key <AB08> { [ comma, comma, question, question ] };
+
+        //fifth row
+        key <FK15> { [ at, at, NoSymbol, NoSymbol ] };
+
+        include "level3(alt_switch)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/ma b/xorg-server/xkeyboard-config/symbols/ma
index b49d0c762..f7985ea89 100644
--- a/xorg-server/xkeyboard-config/symbols/ma
+++ b/xorg-server/xkeyboard-config/symbols/ma
@@ -1,324 +1,324 @@
-// Arabic AZERTY with modern Latin digits 

-partial default alphanumeric_keys

-xkb_symbols "arabic" {

-    include "ara(azerty)"

-

-    name[Group1]="Morocco";

-};

-

-// French AZERTY keyboard used when typing French

-partial alphanumeric_keys

-xkb_symbols "french" {

-    include "fr(basic)"

-

-    name[Group1]="Morocco - French";

-};

-

-// Clavier unicode tifinaghe de base réalisé par l'IRCAM (Institut Royal de la Culture Amazighe du Maroc) http://www.ircam.ma/

-// Support des lettres unicode tifinaghe-IRCAM, néotifinaghes & touarègues.

-// Les caractères tifinaghes sont accessibles en SHIFT positions pour le niveau 2, en ALTGR positions pour le niveau 3

-// Polices tifinaghes Unicode à télécharger depuis :

-// http://www.ircam.ma/documents/policesclavierunicode/hapaxber.ttf (licence non libre, libre téléchargement et distribution uniquement)

-// Minihowto ici: http://perso.menara.ma/~kebdani/tamazgha/gnu_amazigh.html

-

-partial alphanumeric_keys

-xkb_symbols "tifinagh" {

-

-    name[Group1]="Morocco - Tifinagh";

-

-    key <TLDE>	{ [ twosuperior, NoAction ]	};

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

-    key <AE02>	{ [ NoAction,          2, asciitilde	]	};

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

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

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

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

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

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

-    key <AE09>	{ [NoAction,         9, asciicircum	]	};

-    key <AE10>	{ [       NoAction ,          0, at		]	};

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

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

-

-    key <AD01>	{ [ 0x1002d30 ]	};

-    key <AD02>	{ [ 0x1002d63, 0x1002d65 ]	};

-    key <AD03>	{ [ 0x1002d3b, NoAction,0x10020ac ]	};

-    key <AD04>	{ [ 0x1002d54, 0x1002d55 ]	};

-    key <AD05>	{ [ 0x1002d5c, 0x1002d5f ]	};

-    key <AD06>	{ [ 0x1002d62 ]	};

-    key <AD07>	{ [ 0x1002d53 ]	};

-    key <AD08>	{ [ 0x1002d49 ]	};

-    key <AD09>	{ [ 0x1002d44 ]	};

-    key <AD10>	{ [ 0x1002d43 ]	};

-    key <AD11>	{ [ 0x1002d6f ]   };

-    key <AD12>	{ [    dollar,   sterling,   0x10000a4]	};

-

-    key <AC01>	{ [ 0x1002d47 ]	};

-    key <AC02>	{ [ 0x1002d59, 0x1002d5a ]	};

-    key <AC03>	{ [ 0x1002d37, 0x1002d39 ]	};

-    key <AC04>	{ [ 0x1002d3c ]	};

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

-    key <AC06>	{ [ 0x1002d40 ]	};

-    key <AC07>	{ [ 0x1002d4a ]	};

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

-    key <AC09>	{ [ 0x1002d4d ]	};

-    key <AC10>	{ [ 0x1002d4e ]	};

-    key <AC11>	{ [    NoAction ,   percent ]	};

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

-

-    key <AB01>	{ [ 0x1002d61 ]	};

-    key <AB02>	{ [ 0x1002d45 ]	};

-    key <AB03>	{ [ 0x1002d5b ]	};

-    key <AB04>	{ [ 0x1002d56 ]	};

-    key <AB05>	{ [ 0x1002d31 ]	};

-    key <AB06>	{ [ 0x1002d4f ]	};

-    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 "tifinagh-phonetic" {

-

-    name[Group1]="Morocco - Tifinagh phonetic";

-    include "ma(tifinagh)"

-

-    key <LatA>	{ [ 0x1002d30 ]	};

-    key <LatZ>	{ [ 0x1002d63, 0x1002d65 ]	};

-    key <LatE>	{ [ 0x1002d3b, NoAction,0x10020ac ]	};

-    key <LatR>	{ [ 0x1002d54, 0x1002d55 ]	};

-    key <LatT>	{ [ 0x1002d5c, 0x1002d5f ]	};

-    key <LatY>	{ [ 0x1002d62 ]	};

-    key <LatU>	{ [ 0x1002d53 ]	};

-    key <LatI>	{ [ 0x1002d49 ]	};

-    key <LatO>	{ [ 0x1002d44 ]	};

-    key <LatP>	{ [ 0x1002d43 ]	};

-

-    key <LatQ>	{ [ 0x1002d47 ]	};

-    key <LatS>	{ [ 0x1002d59, 0x1002d5a ]	};

-    key <LatD>	{ [ 0x1002d37, 0x1002d39 ]	};

-    key <LatF>	{ [ 0x1002d3c ]	};

-    key <LatG>	{ [ 0x1002d33 ]	};

-    key <LatH>	{ [ 0x1002d40 ]	};

-    key <LatJ>	{ [ 0x1002d4a ]	};

-    key <LatK>	{ [ 0x1002d3d ]	};

-    key <LatL>	{ [ 0x1002d4d ]	};

-    key <LatM>	{ [ 0x1002d4e ]	};

-

-    key <LatW>	{ [ 0x1002d61,0x1002d6f ]	};

-    key <LatX>	{ [ 0x1002d45 ]	};

-    key <LatC>	{ [ 0x1002d5b ]	};

-    key <LatV>	{ [ 0x1002d56 ]	};

-    key <LatB>	{ [ 0x1002d31 ]	};

-    key <LatN>	{ [ 0x1002d4f ]	};

-

-    include "level3(ralt_switch)"

-};

-

-// Clavier unicode tifinaghe étendu réalisé par l'IRCAM (Institut Royal de la Culture Amazighe du Maroc) http://www.ircam.ma/

-// Support des lettres unicode tifinaghe-IRCAM, néotifinaghes & touarègues.

-// Les caractères tifinaghes sont accessibles en SHIFT positions pour le niveau 2, en ALTGR positions pour le niveau 3

-// Polices tifinaghes Unicode à télécharger depuis :

-// http://www.ircam.ma/documents/policesclavierunicode/hapaxber.ttf (licence non libre, libre téléchargement et distribution uniquement)

-// Minihowto ici: http://perso.menara.ma/~kebdani/tamazgha/gnu_amazigh.html

-

-partial alphanumeric_keys

-xkb_symbols "tifinagh-extended" {

-

-    name[Group1]="Morocco - Tifinagh extended";

-

-    key <TLDE>	{ [ twosuperior,0x100200C ]	};

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

-    key <AE02>	{ [0x1002d52,          2, asciitilde	]	};

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

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

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

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

-    key <AE07>	{ [ 0x1002d64 ,  7 ]	};

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

-    key <AE09>	{ [ 0x1002014,         9, asciicircum	]	};

-    key <AE10>	{ [ 0x100200d,          0, at	]	};

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

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

-

-    key <AD01>	{ [ 0x1002d30, 0x1002d36 ]	};

-    key <AD02>	{ [ 0x1002d63, 0x1002d65 ]	};

-    key <AD03>	{ [ 0x1002d3b, 0x1002d57, 0x10020ac ]	};

-    key <AD04>	{ [ 0x1002d54, 0x1002d55 ]	};

-    key <AD05>	{ [ 0x1002d5c, 0x1002d5f ]	};

-    key <AD06>	{ [ 0x1002d62, 0x1002d42 ]	};

-    key <AD07>	{ [ 0x1002d53, 0x1002d4c ]	};

-    key <AD08>	{ [ 0x1002d49, 0x1002d58 ]	};

-    key <AD09>	{ [ 0x1002d44, 0x1002d5d ]	};

-    key <AD10>	{ [ 0x1002d43, 0x1002d5e ]	};

-    key <AD11>	{ [ 0x1002d6f, 0x1002d60 ]   };

-    key <AD12>	{ [    dollar,   sterling,   0x10000a4]	};

-

-    key <AC01>	{ [ 0x1002d47, 0x1002d48 ]	};

-    key <AC02>	{ [ 0x1002d59, 0x1002d5a ]	};

-    key <AC03>	{ [ 0x1002d37, 0x1002d39 ]	};

-    key <AC04>	{ [ 0x1002d3c, 0x1002d35 ]	};

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

-    key <AC06>	{ [ 0x1002d40, 0x1002d41 ]	};

-    key <AC07>	{ [ 0x1002d4a, 0x1002d4b ]	};

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

-    key <AC09>	{ [ 0x1002d4d, 0x1002d38 ]	};

-    key <AC10>	{ [ 0x1002d4e, 0x1002d3a ]	};

-    key <AC11>	{ [ 0x1002d51,  percent  ]	};

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

-

-    key <AB01>	{ [ 0x1002d61, 0x1002d3e ]	};

-    key <AB02>	{ [ 0x1002d45, 0x1002d46 ]	};

-    key <AB03>	{ [ 0x1002d5b, 0x1002d3f ]	};

-    key <AB04>	{ [ 0x1002d56, 0x1002d34 ]	};

-    key <AB05>	{ [ 0x1002d31, 0x1002d32 ]	};

-    key <AB06>	{ [ 0x1002d4f, 0x1002d50 ]	};

-    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 "tifinagh-extended-phonetic" {

-    include "ma(tifinagh-extended)"

-

-    name[Group1]="Morocco - Tifinagh extended phonetic";

-

-    key <LatA>	{ [ 0x1002d30 ]	};

-    key <LatZ>	{ [ 0x1002d63, 0x1002d65 ]	};

-    key <LatE>	{ [ 0x1002d3b, NoAction,0x10020ac ]	};

-    key <LatR>	{ [ 0x1002d54, 0x1002d55 ]	};

-    key <LatT>	{ [ 0x1002d5c, 0x1002d5f ]	};

-    key <LatY>	{ [ 0x1002d62 ]	};

-    key <LatU>	{ [ 0x1002d53 ]	};

-    key <LatI>	{ [ 0x1002d49 ]	};

-    key <LatO>	{ [ 0x1002d44 ]	};

-    key <LatP>	{ [ 0x1002d43 ]	};

-

-    key <LatQ>	{ [ 0x1002d47 ]	};

-    key <LatS>	{ [ 0x1002d59, 0x1002d5a ]	};

-    key <LatD>	{ [ 0x1002d37, 0x1002d39 ]	};

-    key <LatF>	{ [ 0x1002d3c ]	};

-    key <LatG>	{ [ 0x1002d33 ]	};

-    key <LatH>	{ [ 0x1002d40 ]	};

-    key <LatJ>	{ [ 0x1002d4a ]	};

-    key <LatK>	{ [ 0x1002d3d ]	};

-    key <LatL>	{ [ 0x1002d4d ]	};

-    key <LatM>	{ [ 0x1002d4e ]	};

-

-    key <LatW>	{ [ 0x1002d61 ]	};

-    key <LatX>	{ [ 0x1002d45 ]	};

-    key <LatC>	{ [ 0x1002d5b ]	};

-    key <LatV>	{ [ 0x1002d56 ]	};

-    key <LatB>	{ [ 0x1002d31 ]	};

-    key <LatN>	{ [ 0x1002d4f ]	};

-

-    include "level3(ralt_switch)"

-};

-

-// Tifinagh keyboard; improved from the IRCAM layout to make all

-// tifinagh chars in unicode accessible (in shift positions for most

-// touareg letters; in altgr position for spirants.

-

-partial alphanumeric_keys

-xkb_symbols "tifinagh-alt" {

-

-    name[Group1]="Morocco - Tifinagh alternative";

-

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

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

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

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

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

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

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

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

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

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

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

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

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

-

-    key <AD01>	{ [ 0x1002d30 ]	};

-    key <AD02>	{ [ 0x1002d63, 0x1002d65, 0x1002d64 ]	};

-    key <AD03>	{ [ 0x1002d3b ]	};

-    key <AD04>	{ [ 0x1002d54, 0x1002d55 ]	};

-    key <AD05>	{ [ 0x1002d5c, 0x1002d5f, 0x1002d5d ]	};

-    key <AD06>	{ [ 0x1002d62 ]	};

-    key <AD07>	{ [ 0x1002d53 ]	};

-    key <AD08>	{ [ 0x1002d49 ]	};

-    key <AD09>	{ [ 0x1002d44 ]	};

-    key <AD10>	{ [ 0x1002d43, 0x1002d52 ]	};

-    key <AD11>	{ [ dead_circumflex ] };

-    key <AD12>	{ [    dollar,   sterling ]	};

-

-    key <AC01>	{ [ 0x1002d47, 0x1002d48 ]	};

-    key <AC02>	{ [ 0x1002d59, 0x1002d5a ]	};

-    key <AC03>	{ [ 0x1002d37, 0x1002d39, 0x1002d38, 0x1002d3a ]	};

-    key <AC04>	{ [ 0x1002d3c ]	};

-    key <AC05>	{ [ 0x1002d33, 0x1002d36, 0x1002d34, 0x1002d35 ]	};

-    key <AC06>	{ [ 0x1002d40, 0x1002d42, 0x1002d41 ]	};

-    key <AC07>	{ [ 0x1002d4a, 0x1002d4c, 0x1002d4b ]	};

-    key <AC08>	{ [ 0x1002d3d, 0x1002d3e, 0x1002d3f ]	};

-    key <AC09>	{ [ 0x1002d4d ]	};

-    key <AC10>	{ [ 0x1002d4e ]	};

-    key <AC11>	{ [ percent ]	};

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

-

-    key <AB01>	{ [ 0x1002d61, 0x1002d6f, 0x1002d60 ]	};

-    key <AB02>	{ [ 0x1002d45, 0x1002d46 ]	};

-    key <AB03>	{ [ 0x1002d5b, 0x1002d5e ]	};

-    key <AB04>	{ [ 0x1002d56, 0x1002d57, 0x1002d58 ]	};

-    key <AB05>	{ [ 0x1002d31, 0x1002d31, 0x1002d32 ]	};

-    key <AB06>	{ [ 0x1002d4f, 0x1002d50, 0x1002d51 ]	};

-    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 "tifinagh-alt-phonetic" {

-    include "ma(tifinagh-alt)"

-

-    name[Group1]="Morocco - Tifinagh alternative phonetic";

-

-    key <LatA>	{ [ 0x1002d30 ]	};

-    key <LatZ>	{ [ 0x1002d63, 0x1002d65, 0x1002d64 ]	};

-    key <LatE>	{ [ 0x1002d3b ]	};

-    key <LatR>	{ [ 0x1002d54, 0x1002d55 ]	};

-    key <LatT>	{ [ 0x1002d5c, 0x1002d5f, 0x1002d5d ]	};

-    key <LatY>	{ [ 0x1002d62 ]	};

-    key <LatU>	{ [ 0x1002d53 ]	};

-    key <LatI>	{ [ 0x1002d49 ]	};

-    key <LatO>	{ [ 0x1002d44 ]	};

-    key <LatP>	{ [ 0x1002d43, 0x1002d52 ]	};

-

-    key <LatQ>	{ [ 0x1002d47, 0x1002d48 ]	};

-    key <LatS>	{ [ 0x1002d59, 0x1002d5a ]	};

-    key <LatD>	{ [ 0x1002d37, 0x1002d39, 0x1002d38, 0x1002d3a ]	};

-    key <LatF>	{ [ 0x1002d3c ]	};

-    key <LatG>	{ [ 0x1002d33, 0x1002d36, 0x1002d34, 0x1002d35 ]	};

-    key <LatH>	{ [ 0x1002d40, 0x1002d42, 0x1002d41 ]	};

-    key <LatJ>	{ [ 0x1002d4a, 0x1002d4c, 0x1002d4b ]	};

-    key <LatK>	{ [ 0x1002d3d, 0x1002d3e, 0x1002d3f ]	};

-    key <LatL>	{ [ 0x1002d4d ]	};

-    key <LatM>	{ [ 0x1002d4e ]	};

-

-    key <LatW>	{ [ 0x1002d61, 0x1002d6f, 0x1002d60 ]	};

-    key <LatX>	{ [ 0x1002d45, 0x1002d46 ]	};

-    key <LatC>	{ [ 0x1002d5b, 0x1002d5e ]	};

-    key <LatV>	{ [ 0x1002d56, 0x1002d57, 0x1002d58 ]	};

-    key <LatB>	{ [ 0x1002d31, 0x1002d31, 0x1002d32 ]	};

-    key <LatN>	{ [ 0x1002d4f, 0x1002d50, 0x1002d51 ]	};

-

-    include "level3(ralt_switch)"

-};

+// Arabic AZERTY with modern Latin digits 
+partial default alphanumeric_keys
+xkb_symbols "arabic" {
+    include "ara(azerty)"
+
+    name[Group1]="Arabic (Morocco)";
+};
+
+// French AZERTY keyboard used when typing French
+partial alphanumeric_keys
+xkb_symbols "french" {
+    include "fr(basic)"
+
+    name[Group1]="French (Morocco)";
+};
+
+// Clavier unicode tifinaghe de base réalisé par l'IRCAM (Institut Royal de la Culture Amazighe du Maroc) http://www.ircam.ma/
+// Support des lettres unicode tifinaghe-IRCAM, néotifinaghes & touarègues.
+// Les caractères tifinaghes sont accessibles en SHIFT positions pour le niveau 2, en ALTGR positions pour le niveau 3
+// Polices tifinaghes Unicode à télécharger depuis :
+// http://www.ircam.ma/documents/policesclavierunicode/hapaxber.ttf (licence non libre, libre téléchargement et distribution uniquement)
+// Minihowto ici: http://perso.menara.ma/~kebdani/tamazgha/gnu_amazigh.html
+
+partial alphanumeric_keys
+xkb_symbols "tifinagh" {
+
+    name[Group1]="Berber (Morocco, Tifinagh)";
+
+    key <TLDE>	{ [ twosuperior, NoAction ]	};
+    key <AE01>	{ [ ampersand,          1 ]	};
+    key <AE02>	{ [ NoAction,          2, asciitilde	]	};
+    key <AE03>	{ [  quotedbl,          3, numbersign	]	};
+    key <AE04>	{ [apostrophe,          4, braceleft	]	};
+    key <AE05>	{ [ parenleft,          5, bracketleft	]	};
+    key <AE06>	{ [     minus,          6, bar	]	};
+    key <AE07>	{ [         NoAction ,  7 ]	};
+    key <AE08>	{ [underscore,          8, backslash	]	};
+    key <AE09>	{ [NoAction,         9, asciicircum	]	};
+    key <AE10>	{ [       NoAction ,          0, at		]	};
+    key <AE11>	{ [parenright,     degree, bracketright	]	};
+    key <AE12>	{ [     equal,       plus, braceright	]	};
+
+    key <AD01>	{ [ 0x1002d30 ]	};
+    key <AD02>	{ [ 0x1002d63, 0x1002d65 ]	};
+    key <AD03>	{ [ 0x1002d3b, NoAction,0x10020ac ]	};
+    key <AD04>	{ [ 0x1002d54, 0x1002d55 ]	};
+    key <AD05>	{ [ 0x1002d5c, 0x1002d5f ]	};
+    key <AD06>	{ [ 0x1002d62 ]	};
+    key <AD07>	{ [ 0x1002d53 ]	};
+    key <AD08>	{ [ 0x1002d49 ]	};
+    key <AD09>	{ [ 0x1002d44 ]	};
+    key <AD10>	{ [ 0x1002d43 ]	};
+    key <AD11>	{ [ 0x1002d6f ]   };
+    key <AD12>	{ [    dollar,   sterling,   0x10000a4]	};
+
+    key <AC01>	{ [ 0x1002d47 ]	};
+    key <AC02>	{ [ 0x1002d59, 0x1002d5a ]	};
+    key <AC03>	{ [ 0x1002d37, 0x1002d39 ]	};
+    key <AC04>	{ [ 0x1002d3c ]	};
+    key <AC05>	{ [ 0x1002d33, 0x1002d33]	};
+    key <AC06>	{ [ 0x1002d40 ]	};
+    key <AC07>	{ [ 0x1002d4a ]	};
+    key <AC08>	{ [ 0x1002d3d,  0x1002d3d  ]	};
+    key <AC09>	{ [ 0x1002d4d ]	};
+    key <AC10>	{ [ 0x1002d4e ]	};
+    key <AC11>	{ [    NoAction ,   percent ]	};
+    key <BKSL>	{ [  asterisk,         mu ]	};
+
+    key <AB01>	{ [ 0x1002d61 ]	};
+    key <AB02>	{ [ 0x1002d45 ]	};
+    key <AB03>	{ [ 0x1002d5b ]	};
+    key <AB04>	{ [ 0x1002d56 ]	};
+    key <AB05>	{ [ 0x1002d31 ]	};
+    key <AB06>	{ [ 0x1002d4f ]	};
+    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 "tifinagh-phonetic" {
+
+    name[Group1]="Berber (Morocco, Tifinagh phonetic)";
+    include "ma(tifinagh)"
+
+    key <LatA>	{ [ 0x1002d30 ]	};
+    key <LatZ>	{ [ 0x1002d63, 0x1002d65 ]	};
+    key <LatE>	{ [ 0x1002d3b, NoAction,0x10020ac ]	};
+    key <LatR>	{ [ 0x1002d54, 0x1002d55 ]	};
+    key <LatT>	{ [ 0x1002d5c, 0x1002d5f ]	};
+    key <LatY>	{ [ 0x1002d62 ]	};
+    key <LatU>	{ [ 0x1002d53 ]	};
+    key <LatI>	{ [ 0x1002d49 ]	};
+    key <LatO>	{ [ 0x1002d44 ]	};
+    key <LatP>	{ [ 0x1002d43 ]	};
+
+    key <LatQ>	{ [ 0x1002d47 ]	};
+    key <LatS>	{ [ 0x1002d59, 0x1002d5a ]	};
+    key <LatD>	{ [ 0x1002d37, 0x1002d39 ]	};
+    key <LatF>	{ [ 0x1002d3c ]	};
+    key <LatG>	{ [ 0x1002d33 ]	};
+    key <LatH>	{ [ 0x1002d40 ]	};
+    key <LatJ>	{ [ 0x1002d4a ]	};
+    key <LatK>	{ [ 0x1002d3d ]	};
+    key <LatL>	{ [ 0x1002d4d ]	};
+    key <LatM>	{ [ 0x1002d4e ]	};
+
+    key <LatW>	{ [ 0x1002d61,0x1002d6f ]	};
+    key <LatX>	{ [ 0x1002d45 ]	};
+    key <LatC>	{ [ 0x1002d5b ]	};
+    key <LatV>	{ [ 0x1002d56 ]	};
+    key <LatB>	{ [ 0x1002d31 ]	};
+    key <LatN>	{ [ 0x1002d4f ]	};
+
+    include "level3(ralt_switch)"
+};
+
+// Clavier unicode tifinaghe étendu réalisé par l'IRCAM (Institut Royal de la Culture Amazighe du Maroc) http://www.ircam.ma/
+// Support des lettres unicode tifinaghe-IRCAM, néotifinaghes & touarègues.
+// Les caractères tifinaghes sont accessibles en SHIFT positions pour le niveau 2, en ALTGR positions pour le niveau 3
+// Polices tifinaghes Unicode à télécharger depuis :
+// http://www.ircam.ma/documents/policesclavierunicode/hapaxber.ttf (licence non libre, libre téléchargement et distribution uniquement)
+// Minihowto ici: http://perso.menara.ma/~kebdani/tamazgha/gnu_amazigh.html
+
+partial alphanumeric_keys
+xkb_symbols "tifinagh-extended" {
+
+    name[Group1]="Berber (Morocco, Tifinagh extended)";
+
+    key <TLDE>	{ [ twosuperior,0x100200C ]	};
+    key <AE01>	{ [ ampersand,          1 ]	};
+    key <AE02>	{ [0x1002d52,          2, asciitilde	]	};
+    key <AE03>	{ [  quotedbl,          3, numbersign	]	};
+    key <AE04>	{ [apostrophe,          4, braceleft	]	};
+    key <AE05>	{ [ parenleft,          5, bracketleft	]	};
+    key <AE06>	{ [ minus,          6, bar		]	};
+    key <AE07>	{ [ 0x1002d64 ,  7 ]	};
+    key <AE08>	{ [underscore,          8, backslash	]	};
+    key <AE09>	{ [ 0x1002014,         9, asciicircum	]	};
+    key <AE10>	{ [ 0x100200d,          0, at	]	};
+    key <AE11>	{ [parenright,   degree, bracketright	]	};
+    key <AE12>	{ [     equal,       plus, braceright	]	};
+
+    key <AD01>	{ [ 0x1002d30, 0x1002d36 ]	};
+    key <AD02>	{ [ 0x1002d63, 0x1002d65 ]	};
+    key <AD03>	{ [ 0x1002d3b, 0x1002d57, 0x10020ac ]	};
+    key <AD04>	{ [ 0x1002d54, 0x1002d55 ]	};
+    key <AD05>	{ [ 0x1002d5c, 0x1002d5f ]	};
+    key <AD06>	{ [ 0x1002d62, 0x1002d42 ]	};
+    key <AD07>	{ [ 0x1002d53, 0x1002d4c ]	};
+    key <AD08>	{ [ 0x1002d49, 0x1002d58 ]	};
+    key <AD09>	{ [ 0x1002d44, 0x1002d5d ]	};
+    key <AD10>	{ [ 0x1002d43, 0x1002d5e ]	};
+    key <AD11>	{ [ 0x1002d6f, 0x1002d60 ]   };
+    key <AD12>	{ [    dollar,   sterling,   0x10000a4]	};
+
+    key <AC01>	{ [ 0x1002d47, 0x1002d48 ]	};
+    key <AC02>	{ [ 0x1002d59, 0x1002d5a ]	};
+    key <AC03>	{ [ 0x1002d37, 0x1002d39 ]	};
+    key <AC04>	{ [ 0x1002d3c, 0x1002d35 ]	};
+    key <AC05>	{ [ 0x1002d33, 0x1002d33 ]	};
+    key <AC06>	{ [ 0x1002d40, 0x1002d41 ]	};
+    key <AC07>	{ [ 0x1002d4a, 0x1002d4b ]	};
+    key <AC08>	{ [ 0x1002d3d, 0x1002d3d ]	};
+    key <AC09>	{ [ 0x1002d4d, 0x1002d38 ]	};
+    key <AC10>	{ [ 0x1002d4e, 0x1002d3a ]	};
+    key <AC11>	{ [ 0x1002d51,  percent  ]	};
+    key <BKSL>	{ [ asterisk,   mu       ]	};
+
+    key <AB01>	{ [ 0x1002d61, 0x1002d3e ]	};
+    key <AB02>	{ [ 0x1002d45, 0x1002d46 ]	};
+    key <AB03>	{ [ 0x1002d5b, 0x1002d3f ]	};
+    key <AB04>	{ [ 0x1002d56, 0x1002d34 ]	};
+    key <AB05>	{ [ 0x1002d31, 0x1002d32 ]	};
+    key <AB06>	{ [ 0x1002d4f, 0x1002d50 ]	};
+    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 "tifinagh-extended-phonetic" {
+    include "ma(tifinagh-extended)"
+
+    name[Group1]="Berber (Morocco, Tifinagh extended phonetic)";
+
+    key <LatA>	{ [ 0x1002d30 ]	};
+    key <LatZ>	{ [ 0x1002d63, 0x1002d65 ]	};
+    key <LatE>	{ [ 0x1002d3b, NoAction,0x10020ac ]	};
+    key <LatR>	{ [ 0x1002d54, 0x1002d55 ]	};
+    key <LatT>	{ [ 0x1002d5c, 0x1002d5f ]	};
+    key <LatY>	{ [ 0x1002d62 ]	};
+    key <LatU>	{ [ 0x1002d53 ]	};
+    key <LatI>	{ [ 0x1002d49 ]	};
+    key <LatO>	{ [ 0x1002d44 ]	};
+    key <LatP>	{ [ 0x1002d43 ]	};
+
+    key <LatQ>	{ [ 0x1002d47 ]	};
+    key <LatS>	{ [ 0x1002d59, 0x1002d5a ]	};
+    key <LatD>	{ [ 0x1002d37, 0x1002d39 ]	};
+    key <LatF>	{ [ 0x1002d3c ]	};
+    key <LatG>	{ [ 0x1002d33 ]	};
+    key <LatH>	{ [ 0x1002d40 ]	};
+    key <LatJ>	{ [ 0x1002d4a ]	};
+    key <LatK>	{ [ 0x1002d3d ]	};
+    key <LatL>	{ [ 0x1002d4d ]	};
+    key <LatM>	{ [ 0x1002d4e ]	};
+
+    key <LatW>	{ [ 0x1002d61 ]	};
+    key <LatX>	{ [ 0x1002d45 ]	};
+    key <LatC>	{ [ 0x1002d5b ]	};
+    key <LatV>	{ [ 0x1002d56 ]	};
+    key <LatB>	{ [ 0x1002d31 ]	};
+    key <LatN>	{ [ 0x1002d4f ]	};
+
+    include "level3(ralt_switch)"
+};
+
+// Tifinagh keyboard; improved from the IRCAM layout to make all
+// tifinagh chars in unicode accessible (in shift positions for most
+// touareg letters; in altgr position for spirants.
+
+partial alphanumeric_keys
+xkb_symbols "tifinagh-alt" {
+
+    name[Group1]="Berber (Morocco, Tifinagh alternative)";
+
+    key <TLDE>	{ [ twosuperior, asciitilde ]	};
+    key <AE01>	{ [ ampersand,          1 ]	};
+    key <AE02>	{ [asciitilde,          2, asciitilde	]	};
+    key <AE03>	{ [  quotedbl,          3, numbersign	]	};
+    key <AE04>	{ [apostrophe,          4, braceleft	]	};
+    key <AE05>	{ [ parenleft,          5, bracketleft	]	};
+    key <AE06>	{ [     minus,          6, bar		]	};
+    key <AE07>	{ [     grave,          7, grave	]	};
+    key <AE08>	{ [underscore,          8, backslash	]	};
+    key <AE09>	{ [asciicircum,         9, asciicircum	]	};
+    key <AE10>	{ [        at,          0, at		]	};
+    key <AE11>	{ [parenright,     degree, bracketright	]	};
+    key <AE12>	{ [     equal,       plus, braceright	]	};
+
+    key <AD01>	{ [ 0x1002d30 ]	};
+    key <AD02>	{ [ 0x1002d63, 0x1002d65, 0x1002d64 ]	};
+    key <AD03>	{ [ 0x1002d3b ]	};
+    key <AD04>	{ [ 0x1002d54, 0x1002d55 ]	};
+    key <AD05>	{ [ 0x1002d5c, 0x1002d5f, 0x1002d5d ]	};
+    key <AD06>	{ [ 0x1002d62 ]	};
+    key <AD07>	{ [ 0x1002d53 ]	};
+    key <AD08>	{ [ 0x1002d49 ]	};
+    key <AD09>	{ [ 0x1002d44 ]	};
+    key <AD10>	{ [ 0x1002d43, 0x1002d52 ]	};
+    key <AD11>	{ [ dead_circumflex ] };
+    key <AD12>	{ [    dollar,   sterling ]	};
+
+    key <AC01>	{ [ 0x1002d47, 0x1002d48 ]	};
+    key <AC02>	{ [ 0x1002d59, 0x1002d5a ]	};
+    key <AC03>	{ [ 0x1002d37, 0x1002d39, 0x1002d38, 0x1002d3a ]	};
+    key <AC04>	{ [ 0x1002d3c ]	};
+    key <AC05>	{ [ 0x1002d33, 0x1002d36, 0x1002d34, 0x1002d35 ]	};
+    key <AC06>	{ [ 0x1002d40, 0x1002d42, 0x1002d41 ]	};
+    key <AC07>	{ [ 0x1002d4a, 0x1002d4c, 0x1002d4b ]	};
+    key <AC08>	{ [ 0x1002d3d, 0x1002d3e, 0x1002d3f ]	};
+    key <AC09>	{ [ 0x1002d4d ]	};
+    key <AC10>	{ [ 0x1002d4e ]	};
+    key <AC11>	{ [ percent ]	};
+    key <BKSL>	{ [  asterisk,         mu ]	};
+
+    key <AB01>	{ [ 0x1002d61, 0x1002d6f, 0x1002d60 ]	};
+    key <AB02>	{ [ 0x1002d45, 0x1002d46 ]	};
+    key <AB03>	{ [ 0x1002d5b, 0x1002d5e ]	};
+    key <AB04>	{ [ 0x1002d56, 0x1002d57, 0x1002d58 ]	};
+    key <AB05>	{ [ 0x1002d31, 0x1002d31, 0x1002d32 ]	};
+    key <AB06>	{ [ 0x1002d4f, 0x1002d50, 0x1002d51 ]	};
+    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 "tifinagh-alt-phonetic" {
+    include "ma(tifinagh-alt)"
+
+    name[Group1]="Berber (Morocco, Tifinagh alternative phonetic)";
+
+    key <LatA>	{ [ 0x1002d30 ]	};
+    key <LatZ>	{ [ 0x1002d63, 0x1002d65, 0x1002d64 ]	};
+    key <LatE>	{ [ 0x1002d3b ]	};
+    key <LatR>	{ [ 0x1002d54, 0x1002d55 ]	};
+    key <LatT>	{ [ 0x1002d5c, 0x1002d5f, 0x1002d5d ]	};
+    key <LatY>	{ [ 0x1002d62 ]	};
+    key <LatU>	{ [ 0x1002d53 ]	};
+    key <LatI>	{ [ 0x1002d49 ]	};
+    key <LatO>	{ [ 0x1002d44 ]	};
+    key <LatP>	{ [ 0x1002d43, 0x1002d52 ]	};
+
+    key <LatQ>	{ [ 0x1002d47, 0x1002d48 ]	};
+    key <LatS>	{ [ 0x1002d59, 0x1002d5a ]	};
+    key <LatD>	{ [ 0x1002d37, 0x1002d39, 0x1002d38, 0x1002d3a ]	};
+    key <LatF>	{ [ 0x1002d3c ]	};
+    key <LatG>	{ [ 0x1002d33, 0x1002d36, 0x1002d34, 0x1002d35 ]	};
+    key <LatH>	{ [ 0x1002d40, 0x1002d42, 0x1002d41 ]	};
+    key <LatJ>	{ [ 0x1002d4a, 0x1002d4c, 0x1002d4b ]	};
+    key <LatK>	{ [ 0x1002d3d, 0x1002d3e, 0x1002d3f ]	};
+    key <LatL>	{ [ 0x1002d4d ]	};
+    key <LatM>	{ [ 0x1002d4e ]	};
+
+    key <LatW>	{ [ 0x1002d61, 0x1002d6f, 0x1002d60 ]	};
+    key <LatX>	{ [ 0x1002d45, 0x1002d46 ]	};
+    key <LatC>	{ [ 0x1002d5b, 0x1002d5e ]	};
+    key <LatV>	{ [ 0x1002d56, 0x1002d57, 0x1002d58 ]	};
+    key <LatB>	{ [ 0x1002d31, 0x1002d31, 0x1002d32 ]	};
+    key <LatN>	{ [ 0x1002d4f, 0x1002d50, 0x1002d51 ]	};
+
+    include "level3(ralt_switch)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/nl b/xorg-server/xkeyboard-config/symbols/nl
index 727410545..4c94a65b2 100644
--- a/xorg-server/xkeyboard-config/symbols/nl
+++ b/xorg-server/xkeyboard-config/symbols/nl
@@ -1,150 +1,150 @@
-// Basic layout based on converted file, from keytable file to xkb/symbols/ file

-// with mk_xkb by root@linux.chanae.stben.be Tue Sep 30 00:53:29 MET DST 1997

-

-// Converted from the nl-latin.map of the Linux kbd package by

-// Pablo Saratxaga <srtxg@f2219.n293.z2.fidonet.org>

-

-// Official layout by Benno Schulenberg <bensberg@justemail.net>, January 2007,

-// based on http://www.xs4all.nl/~koospol/public/Xmodmap-nl-deadkeys.gz

-

-

-default partial alphanumeric_keys

-xkb_symbols "basic" {

-

-    include "latin"

-

-    name[Group1]="Netherlands";

-

-    key <AE02>	{ [         2,   quotedbl,  twosuperior,    oneeighth ]	};

-    key <AE06>	{ [         6,  ampersand, threequarters, fiveeighths ]	};

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

-    key <AE08>	{ [         8,  parenleft,    braceleft,  bracketleft ]	};

-    key <AE09>	{ [         9, parenright,   braceright, bracketright ]	};

-    key <AE10>	{ [         0, apostrophe,       degree,    trademark ]	};

-    key <AE11>	{ [     slash,   question,    backslash, questiondown ]	};

-    key <AE12>	{ [    degree, dead_tilde, dead_cedilla,  dead_ogonek ]	};

-

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

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

-    key <AD06>	{ [         y,          Y,   ydiaeresis,          yen ]	};

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

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

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

-    key <AD10>	{ [         p,          P,    paragraph,        THORN ]	};

-    key <AD11>	{ [dead_diaeresis, dead_circumflex, asciitilde, asciicircum]	};

-    key <AD12>	{ [  asterisk,        bar,   dead_tilde,  dead_macron ]	};

-

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

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

-    key <AC10>	{ [      plus,  plusminus,   dead_acute, dead_doubleacute ] };

-    key <AC11>	{ [dead_acute, dead_grave,   apostrophe,        grave ] };

-    key <TLDE>	{ [        at,    section,      notsign,      notsign ]	};

-

-    key <BKSL>	{ [      less,    greater,   dead_grave,   dead_breve ]	};

-    key <AB06>	{ [         n,          N,       ntilde,       Ntilde ]	};

-    key <AB07>	{ [         m,          M,     Greek_mu,    masculine ]	};

-    key <AB08>	{ [     comma,  semicolon,      cedilla, guillemotleft]	};

-    key <AB09>	{ [    period,      colon, periodcentered, guillemotright ] };

-    key <AB10>	{ [     minus,      equal,       hyphen, dead_abovedot]	};

-

-    key <LSGT>	{ [bracketright, bracketleft,       bar,    brokenbar ]	};

-

-    include "level3(ralt_switch)"

-};

-

-

-partial alphanumeric_keys

-xkb_symbols "std" {

-

-    name[Group1]= "Netherlands - Standard";

-

-    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,     apostrophe                 ] };

-    key <AE11>  { [          slash,       question,      backslash ] };

-    key <AE12>  { [         degree,     dead_tilde,   dead_cedilla ] };

-

-    key <AD01>  { [              q,              Q                 ] };

-    key <AD02>  { [              w,              W                 ] };

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

-    key <AD04>  { [              r,              R,      paragraph ] };

-    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                 ] };

-    key <BKSL>  { [           less,        greater                 ] };

-

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

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

-    key <AC03>  { [              d,              D                 ] };

-    key <AC04>  { [              f,              F                 ] };

-    key <AC05>  { [              g,              G                 ] };

-    key <AC06>  { [              h,              H                 ] };

-    key <AC07>  { [              j,              J                 ] };

-    key <AC08>  { [              k,              K                 ] };

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

-    key <AC10>  { [           plus,      plusminus                 ] };

-    key <AC11>  { [     dead_acute,     dead_grave                 ] };

-

-    key <LSGT>  { [   bracketright,    bracketleft,            bar ] };

-    key <AB01>  { [              z,              Z,  guillemotleft ] };

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

-    key <AB03>  { [              c,              C,           cent ] };

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

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

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

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

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

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

-    key <AB10>  { [          minus,          equal                 ] };

-

-    include "level3(ralt_switch)"

-};

-

-

-partial alphanumeric_keys

-xkb_symbols "Sundeadkeys" {

-

-    // For naming consistency

-

-    include "nl(basic)"

-

-};

-

-partial alphanumeric_keys

-xkb_symbols "sundeadkeys" {

-

-     // For naming consistency

-

-    include "nl(Sundeadkeys)"

-    name[Group1]="Netherlands - Sun dead keys";

-};

-

-// Copied from macintosh_vndr/nl

-partial alphanumeric_keys 

-xkb_symbols "mac" {

-

-    // Describes the differences between a very simple mac_US

-    // keyboard and a very simple netherland keybaord

-

-    include "latin"

-

-    name[Group1]= "Netherlands - Macintosh";

-

-    include "level3(ralt_switch)"

-

-// do just nothing

-

-};

+// Basic layout based on converted file, from keytable file to xkb/symbols/ file
+// with mk_xkb by root@linux.chanae.stben.be Tue Sep 30 00:53:29 MET DST 1997
+
+// Converted from the nl-latin.map of the Linux kbd package by
+// Pablo Saratxaga <srtxg@f2219.n293.z2.fidonet.org>
+
+// Official layout by Benno Schulenberg <bensberg@justemail.net>, January 2007,
+// based on http://www.xs4all.nl/~koospol/public/Xmodmap-nl-deadkeys.gz
+
+
+default partial alphanumeric_keys
+xkb_symbols "basic" {
+
+    include "latin"
+
+    name[Group1]="Dutch";
+
+    key <AE02>	{ [         2,   quotedbl,  twosuperior,    oneeighth ]	};
+    key <AE06>	{ [         6,  ampersand, threequarters, fiveeighths ]	};
+    key <AE07>	{ [         7, underscore,     sterling, seveneighths ]	};
+    key <AE08>	{ [         8,  parenleft,    braceleft,  bracketleft ]	};
+    key <AE09>	{ [         9, parenright,   braceright, bracketright ]	};
+    key <AE10>	{ [         0, apostrophe,       degree,    trademark ]	};
+    key <AE11>	{ [     slash,   question,    backslash, questiondown ]	};
+    key <AE12>	{ [    degree, dead_tilde, dead_cedilla,  dead_ogonek ]	};
+
+    key <AD03>	{ [         e,          E,     EuroSign,         cent ] };
+    key <AD05>	{ [         t,          T,        thorn,        THORN ]	};
+    key <AD06>	{ [         y,          Y,   ydiaeresis,          yen ]	};
+    key <AD07>	{ [         u,          U,   udiaeresis,   Udiaeresis ]	};
+    key <AD08>	{ [         i,          I,   idiaeresis,   Idiaeresis ]	};
+    key <AD09>	{ [         o,          O,       ograve,       Ograve ]	};
+    key <AD10>	{ [         p,          P,    paragraph,        THORN ]	};
+    key <AD11>	{ [dead_diaeresis, dead_circumflex, asciitilde, asciicircum]	};
+    key <AD12>	{ [  asterisk,        bar,   dead_tilde,  dead_macron ]	};
+
+    key <AC01>	{ [         a,          A,       aacute,       Aacute ]	};
+    key <AC04>	{ [         f,          F,  ordfeminine,  ordfeminine ]	};
+    key <AC10>	{ [      plus,  plusminus,   dead_acute, dead_doubleacute ] };
+    key <AC11>	{ [dead_acute, dead_grave,   apostrophe,        grave ] };
+    key <TLDE>	{ [        at,    section,      notsign,      notsign ]	};
+
+    key <BKSL>	{ [      less,    greater,   dead_grave,   dead_breve ]	};
+    key <AB06>	{ [         n,          N,       ntilde,       Ntilde ]	};
+    key <AB07>	{ [         m,          M,     Greek_mu,    masculine ]	};
+    key <AB08>	{ [     comma,  semicolon,      cedilla, guillemotleft]	};
+    key <AB09>	{ [    period,      colon, periodcentered, guillemotright ] };
+    key <AB10>	{ [     minus,      equal,       hyphen, dead_abovedot]	};
+
+    key <LSGT>	{ [bracketright, bracketleft,       bar,    brokenbar ]	};
+
+    include "level3(ralt_switch)"
+};
+
+
+partial alphanumeric_keys
+xkb_symbols "std" {
+
+    name[Group1]= "Dutch (standard)";
+
+    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,     apostrophe                 ] };
+    key <AE11>  { [          slash,       question,      backslash ] };
+    key <AE12>  { [         degree,     dead_tilde,   dead_cedilla ] };
+
+    key <AD01>  { [              q,              Q                 ] };
+    key <AD02>  { [              w,              W                 ] };
+    key <AD03>  { [              e,              E,       EuroSign ] };
+    key <AD04>  { [              r,              R,      paragraph ] };
+    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                 ] };
+    key <BKSL>  { [           less,        greater                 ] };
+
+    key <AC01>  { [              a,              A                 ] };
+    key <AC02>  { [              s,              S,         ssharp ] };
+    key <AC03>  { [              d,              D                 ] };
+    key <AC04>  { [              f,              F                 ] };
+    key <AC05>  { [              g,              G                 ] };
+    key <AC06>  { [              h,              H                 ] };
+    key <AC07>  { [              j,              J                 ] };
+    key <AC08>  { [              k,              K                 ] };
+    key <AC09>  { [              l,              L                 ] };
+    key <AC10>  { [           plus,      plusminus                 ] };
+    key <AC11>  { [     dead_acute,     dead_grave                 ] };
+
+    key <LSGT>  { [   bracketright,    bracketleft,            bar ] };
+    key <AB01>  { [              z,              Z,  guillemotleft ] };
+    key <AB02>  { [              x,              X, guillemotright ] };
+    key <AB03>  { [              c,              C,           cent ] };
+    key <AB04>  { [              v,              V                 ] };
+    key <AB05>  { [              b,              B                 ] };
+    key <AB06>  { [              n,              N                 ] };
+    key <AB07>  { [              m,              M,             mu ] };
+    key <AB08>  { [          comma,      semicolon                 ] };
+    key <AB09>  { [         period,          colon, periodcentered ] };
+    key <AB10>  { [          minus,          equal                 ] };
+
+    include "level3(ralt_switch)"
+};
+
+
+partial alphanumeric_keys
+xkb_symbols "Sundeadkeys" {
+
+    // For naming consistency
+
+    include "nl(basic)"
+
+};
+
+partial alphanumeric_keys
+xkb_symbols "sundeadkeys" {
+
+     // For naming consistency
+
+    include "nl(Sundeadkeys)"
+    name[Group1]="Dutch (Sun dead keys)";
+};
+
+// Copied from macintosh_vndr/nl
+partial alphanumeric_keys 
+xkb_symbols "mac" {
+
+    // Describes the differences between a very simple mac_US
+    // keyboard and a very simple netherland keybaord
+
+    include "latin"
+
+    name[Group1]= "Dutch (Macintosh)";
+
+    include "level3(ralt_switch)"
+
+// do just nothing
+
+};
diff --git a/xorg-server/xkeyboard-config/symbols/pt b/xorg-server/xkeyboard-config/symbols/pt
index 951639603..e4472d1ec 100644
--- a/xorg-server/xkeyboard-config/symbols/pt
+++ b/xorg-server/xkeyboard-config/symbols/pt
@@ -1,220 +1,220 @@
-// based on a keyboard map from an 'xkb/symbols/pt' file

-

-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 ] };

-

-};

+// based on a keyboard map from an 'xkb/symbols/pt' file
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+
+    include "latin(type4)"
+
+    name[Group1]="Portuguese";
+
+    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]="Portuguese (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 ] };
+
+};
diff --git a/xorg-server/xkeyboard-config/symbols/ro b/xorg-server/xkeyboard-config/symbols/ro
index f37a60dac..1d405a76a 100644
--- a/xorg-server/xkeyboard-config/symbols/ro
+++ b/xorg-server/xkeyboard-config/symbols/ro
@@ -192,44 +192,24 @@ xkb_symbols "winkeys" {
 
 };
 
-// Crimean Tatar (Crimean Turkish) layouts.
 partial
-xkb_symbols "crh_f" {
-    include "tr(crh_f)"
+xkb_symbols "crh_dobruja" {
+    // Romania-specific Crimean Tatar (Crimean Turkish) Q layout.
+    // This layout is not yet standard. Common Alt-Q and F layouts are now also 
+    // available right next to this layout in the new language-centric UI.
+    // Reşat SABIQ <tilde.birlik @ gmail . com>, 2009, 2011
+    // Özgür Qarahan <qarahan @ gmail . com>, 2009
 
-    name[Group1]="Romania - Crimean Tatar (Turkish F)";
-};
-
-partial
-xkb_symbols "crh_alt" {
-    include "tr(crh_alt)"
-
-    name[Group1]="Romania - Crimean Tatar (Turkish Alt-Q)";
-};
-
-partial
-xkb_symbols "crh_dobruca1" {
     include "tr(crh)"
 
-    name[Group1]="Romania - Crimean Tatar (Dobruca-1 Q)";
-
-    key <AD05>	{ [         t,          T,       tcedilla,       Tcedilla ]	};
-    key <AD10>	{ [         p,          P,         abreve,         Abreve ]	};
-
-    key <AC04>	{ [         f,          F,         ibreve,         Ibreve ]	};
-    key <AC07>	{ [    iacute,     Iacute,              j,              J ]	};
-
-    key <AB07>	{ [         m,          M,      trademark,      masculine ]	};
-};
-
-partial
-xkb_symbols "crh_dobruca2" {
-    include "ro(crh_dobruca1)"
-
-    name[Group1]="Romania - Crimean Tatar (Dobruca-2 Q)";
+    name[Group1]="Romania - Crimean Tatar (Dobruja Q)";
 
-    key <AC04>	{ [         f,          F,          iacute,          Iacute ]	};
-    key <AC07>	{ [    ibreve,     Ibreve,               j,               J ]	};
+    key <AD02>	{ [         w,          W,         abreve,         Abreve ] };
+    key <AD05>	{ [         t,          T,      0x100021b,      0x100021a ] };
+    key <AD10>	{ [         p,          P,        section 	          ] };
+    key <AC02>	{ [         s,          S,      0x1000219,      0x1000218 ] };
+    key <AC07>	{ [    ibreve,     Ibreve,              j,              J ] };
+    key <AB07>	{ [         m,          M,      trademark,      masculine ] };
 };
 
 // EXTRAS:
diff --git a/xorg-server/xkeyboard-config/symbols/tr b/xorg-server/xkeyboard-config/symbols/tr
index 9e9758c0e..6092ce1c2 100644
--- a/xorg-server/xkeyboard-config/symbols/tr
+++ b/xorg-server/xkeyboard-config/symbols/tr
@@ -1,352 +1,354 @@
-// based on

-// Turkish keyboard symbols for PC and xkb

-// This file distributed without any expressed or implied warranty

-// Nilgün Belma Bugüner <nilgun@belgeler.org>, 2005

-

-//Default Layout (Turkish Q)

-default partial

-xkb_symbols "basic" {

-

-    include "latin"

-

-    name[Group1]="Turkey";

-

-    key <AE01>	{ [         1,    exclam,        greater,    exclamdown ] };

-    key <AE02>	{ [         2, apostrophe,      sterling,   twosuperior ] };

-    key <AE03>	{ [        3, asciicircum,    numbersign, threesuperior ] };

-    key <AE04>	{ [         4,       plus,        dollar,    onequarter ] };

-    key <AE06>	{ [         6,  ampersand, threequarters,    VoidSymbol ] };

-    key <AE07>	{ [         7,      slash,     braceleft,    VoidSymbol ] };

-    key <AE08>	{ [         8,  parenleft,   bracketleft,    VoidSymbol ] };

-    key <AE09>	{ [         9, parenright,  bracketright,     plusminus ] };

-    key <AE10>	{ [         0,      equal,    braceright,        degree ] };

-    key <AE11>	{ [  asterisk,   question,     backslash,  questiondown ] };

-    key <AE12>	{ [     minus, underscore,           bar,    VoidSymbol ] };

-

-    key <AD02>	{ [         w,          W,   VoidSymbol,   VoidSymbol ]	};

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

-    key <AD05>	{ [         t,          T,    trademark,   VoidSymbol ]	};

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

-    key <AD08>	{ type[group1] = "FOUR_LEVEL_ALPHABETIC",

-                  [  idotless,          I,  icircumflex,  Icircumflex ] };

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

-    key <AD10>	{ [         p,          P,   VoidSymbol,   VoidSymbol ]	};

-    key <AD11>	{ [    gbreve,     Gbreve ] };

-    key <AD12>	{ [udiaeresis, Udiaeresis,   asciitilde,  dead_macron ]	};

-

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

-    key <AC02>	{ [         s,          S,      section,   VoidSymbol ]	};

-    key <AC03>	{ [         d,          D,   VoidSymbol,   VoidSymbol ]	};

-    key <AC04>	{ [         f,          F,  ordfeminine,   VoidSymbol ]	};

-    key <AC05>	{ [         g,          G,   VoidSymbol,   VoidSymbol ]	};

-    key <AC06>	{ [         h,          H,   VoidSymbol,   VoidSymbol ]	};

-    key <AC08>	{ [         k,          K,   VoidSymbol,   VoidSymbol ]	};

-    key <AC09>	{ [         l,          L,   VoidSymbol,   VoidSymbol ]	};

-    key <AC10>	{ [  scedilla,   Scedilla,        acute,   dead_acute ]	};

-    key <AC11>	{ type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", 

-                  [ i,  Iabovedot,   apostrophe,   dead_caron ]	};

-    key <TLDE>	{ [  quotedbl,     eacute,         less,       degree ]	};

-

-    key <BKSL>	{ [     comma,  semicolon,        grave,   dead_grave ]	};

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

-    key <AB08>	{ [odiaeresis, Odiaeresis,     multiply,   VoidSymbol ]	};

-    key <AB09>	{ [  ccedilla,   Ccedilla, periodcentered,     division ] };

-    key <AB10>	{ [    period,      colon, dead_abovedot, dead_abovedot ] };

-

-    include "kpdl(comma)"

-    include "level3(ralt_switch)"

-};

-

-

-// Turkish F Layout

-partial

-xkb_symbols "f" {

-

-    include "latin"

-

-    name[Group1]="Turkey - (F)";

-

-    key <AE01>	{ [         1,     exclam,  onesuperior,   exclamdown ]	};

-    key <AE02>	{ [         2,   quotedbl,  twosuperior,   VoidSymbol ]	};

-    key <AE03>	{ [         3, asciicircum, numbersign, threesuperior ] };

-    key <AE04>	{ [         4,     dollar,   onequarter,   VoidSymbol ]	};

-    key <AE06>	{ [         6,  ampersand, threequarters,  VoidSymbol ]	};

-    key <AE07>	{ [         7, apostrophe,    braceleft,   VoidSymbol ]	};

-    key <AE08>	{ [         8,  parenleft,  bracketleft,   VoidSymbol ]	};

-    key <AE09>	{ [         9, parenright, bracketright,    plusminus ]	};

-    key <AE10>	{ [         0,      equal,   braceright,       degree ]	};

-    key <AE11>	{ [     slash,   question,    backslash, questiondown ]	};

-    key <AE12>	{ [     minus, underscore,          bar,   VoidSymbol ]	};

-

-    key <AD01>	{ [         f,          F,           at,   VoidSymbol ]	};

-    key <AD02>	{ [         g,          G,   VoidSymbol,   VoidSymbol ]	};

-    key <AD03>	{ [    gbreve,     Gbreve,   VoidSymbol,   VoidSymbol ]	};

-    key <AD04>	{ type[group1] = "FOUR_LEVEL_SEMIALPHABETIC",

-                  [  idotless,          I,    paragraph,   VoidSymbol ]	};

-    key <AD05>	{ [         o,          O,  ocircumflex,  Ocircumflex ]	};

-    key <AD06>	{ [         d,          D,          yen,   VoidSymbol ]	};

-    key <AD07>	{ [         r,          R,   registered,   VoidSymbol ]	};

-    key <AD08>	{ [         n,          N,   VoidSymbol,   VoidSymbol ]	};

-    key <AD09>	{ [         h,          H,       degree,   VoidSymbol ]	};

-    key <AD10>	{ [         p,          P,     sterling,   VoidSymbol ]	};

-    key <AD11>	{ [         q,          Q, dead_diaeresis, dead_abovering ] };

-    key <AD12>	{ [         w,          W,   asciitilde,   dead_breve ]	};

-

-    key <AC01>	{ [         u,          U,  ucircumflex,  Ucircumflex ]	};

-    key <AC02>	{ type[group1] = "FOUR_LEVEL_ALPHABETIC",

-                  [         i,  Iabovedot,  icircumflex,  Icircumflex ]	};

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

-    key <AC04>	{ [         a,          A,  acircumflex,  Acircumflex ]	};

-    key <AC05>	{ [udiaeresis, Udiaeresis,  ucircumflex,  Ucircumflex ]	};

-    key <AC06>	{ [         t,          T,    trademark,   VoidSymbol ]	};

-    key <AC07>	{ [         k,          K,   VoidSymbol,   VoidSymbol ]	};

-    key <AC08>	{ [         m,          M,           mu,   VoidSymbol ]	};

-    key <AC09>	{ [         l,          L,   VoidSymbol,   VoidSymbol ]	};

-    key <AC10>	{ [         y,          Y,        acute,   dead_acute ]	};

-    key <AC11>	{ [  scedilla,   Scedilla,   numbersign,   dead_caron ]	};

-    key <TLDE>	{ [      plus,   asterisk,      notsign,    plusminus ]	};

-

-    key <BKSL>	{ [         x,          X,        grave,   dead_grave ]	};

-    key <AB01>	{ [         j,          J, guillemotleft,  VoidSymbol ]	};

-    key <AB02>	{ [odiaeresis, Odiaeresis, guillemotright, VoidSymbol ]	};

-    key <AB03>	{ [         v,          V, leftdoublequotemark, VoidSymbol ] };

-    key <AB04>	{ [         c,          C,         cent,    copyright ]	};

-    key <AB05>	{ [  ccedilla,   Ccedilla, rightdoublequotemark, VoidSymbol] };

-    key <AB06>	{ [         z,          Z,   VoidSymbol,   VoidSymbol ]	};

-    key <AB07>	{ [         s,          S,      section,   VoidSymbol ]	};

-    key <AB08>	{ [         b,          B,     multiply, nobreakspace ]	};

-    key <AB09>	{ [    period,      colon,     division, dead_abovedot]	};

-    key <AB10>	{ [     comma,  semicolon, periodcentered, VoidSymbol ]	};

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

-

-    include "kpdl(comma)"

-    include "level3(ralt_switch)"

-};

-

-// Turkish Alt-Q Layout

-partial

-xkb_symbols "alt" {

-

-    include "latin"

-

-    name[Group1]="Turkey - Alt-Q";

-

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

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

-    key <AE09>  { [         9,   parenleft,         rightt,          bott ] };

-    key <AE10>  { [         0,  parenright, lowrightcorner, uprightcorner ] };

-    key <AE11>  { [     minus,  underscore, horizlinescan5,      vertbar  ] };

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

-

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

-//    key <AD05>        { [         t,           T,    trademark,   VoidSymbol >

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

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

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

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

-    key <AC02>  { [         s,           S,     scedilla,     Scedilla ] };

-    key <AC05>  { [         g,           G,       gbreve,       Gbreve ] };

-

-    key <AB03>  { [         c,           C,     ccedilla,     Ccedilla ] };

-

-    include "level3(ralt_switch)"

-};

-

-

-partial alphanumeric_keys

-xkb_symbols "Sundeadkeys" {

-

-    // For naming consistency

-    include "tr(basic)"

-

-};

-

-partial alphanumeric_keys

-xkb_symbols "sundeadkeys" {

-

-    // For naming consistency

-    include "tr(Sundeadkeys)"

-

-    name[Group1]="Turkey - Sun dead keys";

-};

-

-// Kurdish Q Layout

-// Erdal Ronahi <erdal.ronahi@gmail.com>, 2006

-// http://ferheng.org

-// http://www.pckurd.net

-

-partial

-xkb_symbols "ku" {

-

-   include "tr(basic)"

-

-   name[Group1]="Turkey - Kurdish, Latin Q";

-

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

-    key <AD11>	{ [          x,           X,       gbreve,       Gbreve ] };

-    key <AD12>	{ [ucircumflex, Ucircumflex,   asciitilde,   dead_macron] };

-    key <AC11>	{ [icircumflex, Icircumflex,   apostrophe,   dead_caron ] };

-    key <AB08>	{ [ecircumflex, Ecircumflex,   odiaeresis,   Odiaeresis ] };

-};

-

-// Kurdish F Layout

-partial

-xkb_symbols "ku_f" {

-

-    include "tr(f)"

-

-    name[Group1]="Turkey - Kurdish, (F)";

-

-    key <AD03>	{ [         x,          X,       gbreve,        Gbreve]	};

-    key <AD04>	{ [         i,          I,    paragraph,   VoidSymbol ] };

-    key <AD05>	{ [         o,          O,  ocircumflex,  Ocircumflex ] };

-

-    key <AC01>	{ [ ucircumflex,  Ucircumflex, udiaeresis, Udiaeresis ] };

-    key <AC02>	{ [ icircumflex,  Icircumflex,          i,  Iabovedot ] };

-    key <AC05>	{ [         u,          U,   udiaeresis,   Udiaeresis ]	};

-    key <AB02>	{ [ecircumflex, Ecircumflex, odiaeresis,  Odiaeresis  ] };

-

-};

-

-// Kurdish Alt-Q Layout

-partial

-xkb_symbols "ku_alt" {

-

-    include "tr(alt)"

-

-    name[Group1]="Turkey - Kurdish, Latin Alt-Q";

-

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

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

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

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

-};

-

-// Turkish international Q Layout

-// Alexis Pellicier <alexis.pellicier@nds.k12.tr>, 2007

-partial

-xkb_symbols "intl" {

-    include "latin"

-

-    name[Group1]="Turkey - International (with dead keys)";

-

-    key <AE01>	{ type[group1] = "FOUR_LEVEL", [         1,    exclam,    onesuperior,    exclamdown ]	};

-    key <AE02>	{ type[group1] = "FOUR_LEVEL", [         2, apostrophe,   sterling,   twosuperior ]	};

-    key <AE03>	{ type[group1] = "FOUR_LEVEL", [         3, dead_circumflex,    numbersign, threesuperior ]  };

-    key <AE04>	{ type[group1] = "FOUR_LEVEL", [         4,       plus, dollar,    onequarter ]	};

-    key <AE06>	{ type[group1] = "FOUR_LEVEL", [         6,  ampersand, threequarters,    VoidSymbol ]	};

-    key <AE07>	{ type[group1] = "FOUR_LEVEL", [         7,      slash, braceleft,    VoidSymbol ]	};

-    key <AE08>	{ type[group1] = "FOUR_LEVEL", [         8,  parenleft, bracketleft,    VoidSymbol ]	};

-    key <AE09>	{ type[group1] = "FOUR_LEVEL", [         9, parenright, bracketright,     plusminus ]	};

-    key <AE10>	{ type[group1] = "FOUR_LEVEL", [         0,      equal, braceright,        degree ]	};

-    key <AE11>	{ type[group1] = "FOUR_LEVEL", [  asterisk,   question, backslash,  questiondown ]	};

-    key <AE12>	{ type[group1] = "FOUR_LEVEL", [     minus, underscore, division,    VoidSymbol ]	};

-    key <AD02>	{ [         w,          W,   VoidSymbol,   VoidSymbol ]	};

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

-    key <AD05>	{ [         t,          T,    trademark,   VoidSymbol ]	};

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

-    key <AD08>	{ [  idotless,          I,  icircumflex,  Icircumflex ]	};

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

-    key <AD10>	{ [         p,          P,   VoidSymbol,   VoidSymbol ]	};

-    key <AD11>	{ [    gbreve,     Gbreve,   dead_diaeresis           ] };

-    key <AD12>	{ [udiaeresis, Udiaeresis,   dead_tilde,  dead_macron ]	};

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

-    key <AC02>	{ [         s,          S,      section,   VoidSymbol ]	};

-    key <AC03>	{ [         d,          D,   VoidSymbol,   VoidSymbol ]	};

-    key <AC04>	{ [         f,          F,  ordfeminine,   VoidSymbol ]	};

-    key <AC05>	{ [         g,          G,   VoidSymbol,   VoidSymbol ]	};

-    key <AC06>	{ [         h,          H,   VoidSymbol,   VoidSymbol ]	};

-    key <AC08>	{ [         k,          K,   VoidSymbol,   VoidSymbol ]	};

-    key <AC09>	{ [         l,          L,   VoidSymbol,   VoidSymbol ]	};

-    key <AC10>	{ [  scedilla,   Scedilla,  dead_acute,   dead_acute ]	};

-    key <AC11>	{ [         i,  Iabovedot,   apostrophe,   dead_caron ]	};

-    key <TLDE>	{ type[group1] = "FOUR_LEVEL",[  quotedbl,  eacute,    plusminus,      degree ]	};

-    key <BKSL>	{ type[group1] = "FOUR_LEVEL",[     comma,  semicolon,   dead_grave, dead_grave ]	};

-    key <LSGT>	{ type[group1] = "FOUR_LEVEL",[     less,     greater,   bar,    brokenbar ]	};

-    key <AB08>	{ [odiaeresis, Odiaeresis,     multiply,   VoidSymbol ]	};

-    key <AB09>	{ [  ccedilla,   Ccedilla, periodcentered,   division ]	};

-    key <AB10>	{ type[group1] = "FOUR_LEVEL",[    period,      colon, dead_abovedot, dead_abovedot ] };

-

-    include "nbsp(level3)"

-    include "level3(ralt_switch)"

-};

-

-

-partial alphanumeric_keys

-xkb_symbols "olpc" {

-    name[Group1]= "Turkey";

-    include "tr(intl)"

-

-    key <AE01>	{ [         1,    exclam,    VoidSymbol,    VoidSymbol ] };

-    key <AE06>	{ [         6,  ampersand, VoidSymbol,  VoidSymbol ]	};

-    key <AE12>	{ type[group1] = "FOUR_LEVEL", [     minus, underscore, bar,    VoidSymbol ]	};

-

-

-    key <AB03>  { [         c,           C,     leftdoublequotemark,     VoidSymbol ] };

-    key <AB04>  { [         v,           V,     rightdoublequotemark,     VoidSymbol ] };

-    key <AB05>  { [         b,           B,     VoidSymbol,     VoidSymbol ] };

-    key <AB08>	{ [odiaeresis, Odiaeresis,     VoidSymbol,   VoidSymbol ]	};

-

-    key <AB09>	{ [  ccedilla,   Ccedilla, multiply,     VoidSymbol ] };

-    key <AB10>	{ [    period,      colon, division, dead_abovedot ] };

-

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

-

-};

-

-// Crimean Tatar (Crimean Turkish) layouts. 

-// First released: 2009.

-// These layouts are currently experimental. In particular, the mapping of letter 'x', 

-// included for foreign words and shortcuts, might change in the future...

-// Reşat SABIQ <tilde.birlik @ gmail . com>

-// Özgür Qarahan <qarahan @ gmail . com>

-

-// Crimean Tatar (Crimean Turkish) Q Layout

-partial

-xkb_symbols "crh" {

-

-    include "tr(basic)"

-

-    name[Group1]="Turkey - Crimean Tatar (Turkish Q)";

-

-    key <AE11>	{ [         x,          X,          asterisk,      question ]   };

-

-    key <AC04>	{ [         f,          F,          iacute,          Iacute ]	};

-    key <AC07>	{ [         j,          J,          ibreve,          Ibreve ]	};

-    key <TLDE>	{ [  quotedbl,  backslash,            less,          degree ]	};

-

-    key <AB02>	{ [    ntilde,     Ntilde,  guillemotright,         greater ]	};

-};

-

-// Crimean Tatar (Crimean Turkish) F Layout

-partial

-xkb_symbols "crh_f" {

-

-    include "tr(f)"

-

-    name[Group1]="Turkey - Crimean Tatar (Turkish F)";

-

-    key <AE11>	{ [         x,          X,           slash,        question ]	};

-

-    key <AD04>	{ type[group1] = "FOUR_LEVEL_SEMIALPHABETIC",

-                  [  idotless,          I,          iacute,          Iacute ]	};

-

-    key <AC07>	{ [         k,          K,          ibreve,          Ibreve ]	};

-    key <TLDE>	{ [      plus,   asterisk,       backslash,       plusminus ]	};

-

-    key <BKSL>	{ [    ntilde,     Ntilde,           grave,      dead_grave ]	};

-};

-

-// Crimean Tatar (Crimean Turkish) Alt-Q Layout

-partial

-xkb_symbols "crh_alt" {

-

-    include "tr(alt)"

-

-    name[Group1]="Turkey - Crimean Tatar (Turkish Alt-Q)";

-

-    key <AC04>	{ [         f,          F,          iacute,          Iacute ]	};

-    key <AC07>	{ [         j,          J,          ibreve,          Ibreve ]	};

-

-    key <AB06>	{ [         n,          N,          ntilde,          Ntilde ]	};

-};

+// based on
+// Turkish keyboard symbols for PC and xkb
+// This file distributed without any expressed or implied warranty
+// Nilgün Belma Bugüner <nilgun@belgeler.org>, 2005
+
+//Default Layout (Turkish Q)
+default partial
+xkb_symbols "basic" {
+
+    include "latin"
+
+    name[Group1]="Turkey";
+
+    key <AE01>	{ [         1,    exclam,        greater,    exclamdown ] };
+    key <AE02>	{ [         2, apostrophe,      sterling,   twosuperior ] };
+    key <AE03>	{ [        3, asciicircum,    numbersign, threesuperior ] };
+    key <AE04>	{ [         4,       plus,        dollar,    onequarter ] };
+    key <AE06>	{ [         6,  ampersand, threequarters,    VoidSymbol ] };
+    key <AE07>	{ [         7,      slash,     braceleft,    VoidSymbol ] };
+    key <AE08>	{ [         8,  parenleft,   bracketleft,    VoidSymbol ] };
+    key <AE09>	{ [         9, parenright,  bracketright,     plusminus ] };
+    key <AE10>	{ [         0,      equal,    braceright,        degree ] };
+    key <AE11>	{ [  asterisk,   question,     backslash,  questiondown ] };
+    key <AE12>	{ [     minus, underscore,           bar,    VoidSymbol ] };
+
+    key <AD02>	{ [         w,          W,   VoidSymbol,   VoidSymbol ]	};
+    key <AD03>	{ [         e,          E,     EuroSign,   VoidSymbol ]	};
+    key <AD05>	{ [         t,          T,    trademark,   VoidSymbol ]	};
+    key <AD07>	{ [         u,          U,  ucircumflex,  Ucircumflex ]	};
+    key <AD08>	{ type[group1] = "FOUR_LEVEL_ALPHABETIC",
+                  [  idotless,          I,  icircumflex,  Icircumflex ] };
+    key <AD09>	{ [         o,          O,  ocircumflex,  Ocircumflex ]	};
+    key <AD10>	{ [         p,          P,   VoidSymbol,   VoidSymbol ]	};
+    key <AD11>	{ [    gbreve,     Gbreve ] };
+    key <AD12>	{ [udiaeresis, Udiaeresis,   asciitilde,  dead_macron ]	};
+
+    key <AC01>	{ [         a,          A,  acircumflex,  Acircumflex ]	};
+    key <AC02>	{ [         s,          S,      section,   VoidSymbol ]	};
+    key <AC03>	{ [         d,          D,   VoidSymbol,   VoidSymbol ]	};
+    key <AC04>	{ [         f,          F,  ordfeminine,   VoidSymbol ]	};
+    key <AC05>	{ [         g,          G,   VoidSymbol,   VoidSymbol ]	};
+    key <AC06>	{ [         h,          H,   VoidSymbol,   VoidSymbol ]	};
+    key <AC08>	{ [         k,          K,   VoidSymbol,   VoidSymbol ]	};
+    key <AC09>	{ [         l,          L,   VoidSymbol,   VoidSymbol ]	};
+    key <AC10>	{ [  scedilla,   Scedilla,        acute,   dead_acute ]	};
+    key <AC11>	{ type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", 
+                  [ i,  Iabovedot,   apostrophe,   dead_caron ]	};
+    key <TLDE>	{ [  quotedbl,     eacute,         less,       degree ]	};
+
+    key <BKSL>	{ [     comma,  semicolon,        grave,   dead_grave ]	};
+    key <LSGT>	{ [      less,    greater,          bar,    brokenbar ]	};
+    key <AB08>	{ [odiaeresis, Odiaeresis,     multiply,   VoidSymbol ]	};
+    key <AB09>	{ [  ccedilla,   Ccedilla, periodcentered,     division ] };
+    key <AB10>	{ [    period,      colon, dead_abovedot, dead_abovedot ] };
+
+    include "kpdl(comma)"
+    include "level3(ralt_switch)"
+};
+
+
+// Turkish F Layout
+partial
+xkb_symbols "f" {
+
+    include "latin"
+
+    name[Group1]="Turkey - (F)";
+
+    key <AE01>	{ [         1,     exclam,  onesuperior,   exclamdown ]	};
+    key <AE02>	{ [         2,   quotedbl,  twosuperior,   VoidSymbol ]	};
+    key <AE03>	{ [         3, asciicircum, numbersign, threesuperior ] };
+    key <AE04>	{ [         4,     dollar,   onequarter,   VoidSymbol ]	};
+    key <AE06>	{ [         6,  ampersand, threequarters,  VoidSymbol ]	};
+    key <AE07>	{ [         7, apostrophe,    braceleft,   VoidSymbol ]	};
+    key <AE08>	{ [         8,  parenleft,  bracketleft,   VoidSymbol ]	};
+    key <AE09>	{ [         9, parenright, bracketright,    plusminus ]	};
+    key <AE10>	{ [         0,      equal,   braceright,       degree ]	};
+    key <AE11>	{ [     slash,   question,    backslash, questiondown ]	};
+    key <AE12>	{ [     minus, underscore,          bar,   VoidSymbol ]	};
+
+    key <AD01>	{ [         f,          F,           at,   VoidSymbol ]	};
+    key <AD02>	{ [         g,          G,   VoidSymbol,   VoidSymbol ]	};
+    key <AD03>	{ [    gbreve,     Gbreve,   VoidSymbol,   VoidSymbol ]	};
+    key <AD04>	{ type[group1] = "FOUR_LEVEL_SEMIALPHABETIC",
+                  [  idotless,          I,    paragraph,   VoidSymbol ]	};
+    key <AD05>	{ [         o,          O,  ocircumflex,  Ocircumflex ]	};
+    key <AD06>	{ [         d,          D,          yen,   VoidSymbol ]	};
+    key <AD07>	{ [         r,          R,   registered,   VoidSymbol ]	};
+    key <AD08>	{ [         n,          N,   VoidSymbol,   VoidSymbol ]	};
+    key <AD09>	{ [         h,          H,       degree,   VoidSymbol ]	};
+    key <AD10>	{ [         p,          P,     sterling,   VoidSymbol ]	};
+    key <AD11>	{ [         q,          Q, dead_diaeresis, dead_abovering ] };
+    key <AD12>	{ [         w,          W,   asciitilde,   dead_breve ]	};
+
+    key <AC01>	{ [         u,          U,  ucircumflex,  Ucircumflex ]	};
+    key <AC02>	{ type[group1] = "FOUR_LEVEL_ALPHABETIC",
+                  [         i,  Iabovedot,  icircumflex,  Icircumflex ]	};
+    key <AC03>	{ [         e,          E,     EuroSign,   VoidSymbol ]	};
+    key <AC04>	{ [         a,          A,  acircumflex,  Acircumflex ]	};
+    key <AC05>	{ [udiaeresis, Udiaeresis,  ucircumflex,  Ucircumflex ]	};
+    key <AC06>	{ [         t,          T,    trademark,   VoidSymbol ]	};
+    key <AC07>	{ [         k,          K,   VoidSymbol,   VoidSymbol ]	};
+    key <AC08>	{ [         m,          M,           mu,   VoidSymbol ]	};
+    key <AC09>	{ [         l,          L,   VoidSymbol,   VoidSymbol ]	};
+    key <AC10>	{ [         y,          Y,        acute,   dead_acute ]	};
+    key <AC11>	{ [  scedilla,   Scedilla,   numbersign,   dead_caron ]	};
+    key <TLDE>	{ [      plus,   asterisk,      notsign,    plusminus ]	};
+
+    key <BKSL>	{ [         x,          X,        grave,   dead_grave ]	};
+    key <AB01>	{ [         j,          J, guillemotleft,  VoidSymbol ]	};
+    key <AB02>	{ [odiaeresis, Odiaeresis, guillemotright, VoidSymbol ]	};
+    key <AB03>	{ [         v,          V, leftdoublequotemark, VoidSymbol ] };
+    key <AB04>	{ [         c,          C,         cent,    copyright ]	};
+    key <AB05>	{ [  ccedilla,   Ccedilla, rightdoublequotemark, VoidSymbol] };
+    key <AB06>	{ [         z,          Z,   VoidSymbol,   VoidSymbol ]	};
+    key <AB07>	{ [         s,          S,      section,   VoidSymbol ]	};
+    key <AB08>	{ [         b,          B,     multiply, nobreakspace ]	};
+    key <AB09>	{ [    period,      colon,     division, dead_abovedot]	};
+    key <AB10>	{ [     comma,  semicolon, periodcentered, VoidSymbol ]	};
+    key <LSGT>	{ [     less,     greater,          bar,    brokenbar ]	};
+
+    include "kpdl(comma)"
+    include "level3(ralt_switch)"
+};
+
+// Turkish Alt-Q Layout
+partial
+xkb_symbols "alt" {
+
+    include "latin"
+
+    name[Group1]="Turkey - Alt-Q";
+
+    key <AE07>  { [         7,   ampersand,  lowleftcorner,  upleftcorner ] };
+    key <AE08>  { [         8,    asterisk,          leftt,          topt ] };
+    key <AE09>  { [         9,   parenleft,         rightt,          bott ] };
+    key <AE10>  { [         0,  parenright, lowrightcorner, uprightcorner ] };
+    key <AE11>  { [     minus,  underscore, horizlinescan5,      vertbar  ] };
+    key <AE12>  { [     equal,        plus,  crossinglines  ] };
+
+    key <AD03>  { [         e,           E,     EuroSign,   VoidSymbol ] };
+//    key <AD05>        { [         t,           T,    trademark,   VoidSymbol >
+    key <AD07>  { [         u,           U,   udiaeresis,   Udiaeresis ] };
+    key <AD08>  { [         i,           I,     idotless,    Iabovedot ] };
+    key <AD09>  { [         o,           O,   odiaeresis,   Odiaeresis ] };
+    key <AC01>  { [         a,           A,  acircumflex,  Acircumflex ] };
+    key <AC02>  { [         s,           S,     scedilla,     Scedilla ] };
+    key <AC05>  { [         g,           G,       gbreve,       Gbreve ] };
+
+    key <AB03>  { [         c,           C,     ccedilla,     Ccedilla ] };
+
+    include "level3(ralt_switch)"
+};
+
+
+partial alphanumeric_keys
+xkb_symbols "Sundeadkeys" {
+
+    // For naming consistency
+    include "tr(basic)"
+
+};
+
+partial alphanumeric_keys
+xkb_symbols "sundeadkeys" {
+
+    // For naming consistency
+    include "tr(Sundeadkeys)"
+
+    name[Group1]="Turkey - Sun dead keys";
+};
+
+// Kurdish Q Layout
+// Erdal Ronahi <erdal.ronahi@gmail.com>, 2006
+// http://ferheng.org
+// http://www.pckurd.net
+
+partial
+xkb_symbols "ku" {
+
+   include "tr(basic)"
+
+   name[Group1]="Turkey - Kurdish, Latin Q";
+
+    key <AD08>	{ [          i,           I,     idotless,            I ] };
+    key <AD11>	{ [          x,           X,       gbreve,       Gbreve ] };
+    key <AD12>	{ [ucircumflex, Ucircumflex,   asciitilde,   dead_macron] };
+    key <AC11>	{ [icircumflex, Icircumflex,   apostrophe,   dead_caron ] };
+    key <AB08>	{ [ecircumflex, Ecircumflex,   odiaeresis,   Odiaeresis ] };
+};
+
+// Kurdish F Layout
+partial
+xkb_symbols "ku_f" {
+
+    include "tr(f)"
+
+    name[Group1]="Turkey - Kurdish, (F)";
+
+    key <AD03>	{ [         x,          X,       gbreve,        Gbreve]	};
+    key <AD04>	{ [         i,          I,    paragraph,   VoidSymbol ] };
+    key <AD05>	{ [         o,          O,  ocircumflex,  Ocircumflex ] };
+
+    key <AC01>	{ [ ucircumflex,  Ucircumflex, udiaeresis, Udiaeresis ] };
+    key <AC02>	{ [ icircumflex,  Icircumflex,          i,  Iabovedot ] };
+    key <AC05>	{ [         u,          U,   udiaeresis,   Udiaeresis ]	};
+    key <AB02>	{ [ecircumflex, Ecircumflex, odiaeresis,  Odiaeresis  ] };
+
+};
+
+// Kurdish Alt-Q Layout
+partial
+xkb_symbols "ku_alt" {
+
+    include "tr(alt)"
+
+    name[Group1]="Turkey - Kurdish, Latin Alt-Q";
+
+    key <AD03>  { [         e,           E,  ecircumflex,  Ecircumflex ] };
+    key <AD07>  { [         u,           U,  ucircumflex,  Ucircumflex ] };
+    key <AD08>  { [         i,           I,  icircumflex,  Icircumflex ] };
+    key <AD09>  { [         o,           O,   odiaeresis,   Odiaeresis ] };
+};
+
+// Turkish international Q Layout
+// Alexis Pellicier <alexis.pellicier@nds.k12.tr>, 2007
+partial
+xkb_symbols "intl" {
+    include "latin"
+
+    name[Group1]="Turkey - International (with dead keys)";
+
+    key <AE01>	{ type[group1] = "FOUR_LEVEL", [         1,    exclam,    onesuperior,    exclamdown ]	};
+    key <AE02>	{ type[group1] = "FOUR_LEVEL", [         2, apostrophe,   sterling,   twosuperior ]	};
+    key <AE03>	{ type[group1] = "FOUR_LEVEL", [         3, dead_circumflex,    numbersign, threesuperior ]  };
+    key <AE04>	{ type[group1] = "FOUR_LEVEL", [         4,       plus, dollar,    onequarter ]	};
+    key <AE06>	{ type[group1] = "FOUR_LEVEL", [         6,  ampersand, threequarters,    VoidSymbol ]	};
+    key <AE07>	{ type[group1] = "FOUR_LEVEL", [         7,      slash, braceleft,    VoidSymbol ]	};
+    key <AE08>	{ type[group1] = "FOUR_LEVEL", [         8,  parenleft, bracketleft,    VoidSymbol ]	};
+    key <AE09>	{ type[group1] = "FOUR_LEVEL", [         9, parenright, bracketright,     plusminus ]	};
+    key <AE10>	{ type[group1] = "FOUR_LEVEL", [         0,      equal, braceright,        degree ]	};
+    key <AE11>	{ type[group1] = "FOUR_LEVEL", [  asterisk,   question, backslash,  questiondown ]	};
+    key <AE12>	{ type[group1] = "FOUR_LEVEL", [     minus, underscore, division,    VoidSymbol ]	};
+    key <AD02>	{ [         w,          W,   VoidSymbol,   VoidSymbol ]	};
+    key <AD03>	{ [         e,          E,     EuroSign,         cent ]	};
+    key <AD05>	{ [         t,          T,    trademark,   VoidSymbol ]	};
+    key <AD07>	{ [         u,          U,  ucircumflex,  Ucircumflex ]	};
+    key <AD08>	{ [  idotless,          I,  icircumflex,  Icircumflex ]	};
+    key <AD09>	{ [         o,          O,  ocircumflex,  Ocircumflex ]	};
+    key <AD10>	{ [         p,          P,   VoidSymbol,   VoidSymbol ]	};
+    key <AD11>	{ [    gbreve,     Gbreve,   dead_diaeresis           ] };
+    key <AD12>	{ [udiaeresis, Udiaeresis,   dead_tilde,  dead_macron ]	};
+    key <AC01>	{ [         a,          A,  acircumflex,  Acircumflex ]	};
+    key <AC02>	{ [         s,          S,      section,   VoidSymbol ]	};
+    key <AC03>	{ [         d,          D,   VoidSymbol,   VoidSymbol ]	};
+    key <AC04>	{ [         f,          F,  ordfeminine,   VoidSymbol ]	};
+    key <AC05>	{ [         g,          G,   VoidSymbol,   VoidSymbol ]	};
+    key <AC06>	{ [         h,          H,   VoidSymbol,   VoidSymbol ]	};
+    key <AC08>	{ [         k,          K,   VoidSymbol,   VoidSymbol ]	};
+    key <AC09>	{ [         l,          L,   VoidSymbol,   VoidSymbol ]	};
+    key <AC10>	{ [  scedilla,   Scedilla,  dead_acute,   dead_acute ]	};
+    key <AC11>	{ [         i,  Iabovedot,   apostrophe,   dead_caron ]	};
+    key <TLDE>	{ type[group1] = "FOUR_LEVEL",[  quotedbl,  eacute,    plusminus,      degree ]	};
+    key <BKSL>	{ type[group1] = "FOUR_LEVEL",[     comma,  semicolon,   dead_grave, dead_grave ]	};
+    key <LSGT>	{ type[group1] = "FOUR_LEVEL",[     less,     greater,   bar,    brokenbar ]	};
+    key <AB08>	{ [odiaeresis, Odiaeresis,     multiply,   VoidSymbol ]	};
+    key <AB09>	{ [  ccedilla,   Ccedilla, periodcentered,   division ]	};
+    key <AB10>	{ type[group1] = "FOUR_LEVEL",[    period,      colon, dead_abovedot, dead_abovedot ] };
+
+    include "nbsp(level3)"
+    include "level3(ralt_switch)"
+};
+
+
+partial alphanumeric_keys
+xkb_symbols "olpc" {
+    name[Group1]= "Turkey";
+    include "tr(intl)"
+
+    key <AE01>	{ [         1,    exclam,    VoidSymbol,    VoidSymbol ] };
+    key <AE06>	{ [         6,  ampersand, VoidSymbol,  VoidSymbol ]	};
+    key <AE12>	{ type[group1] = "FOUR_LEVEL", [     minus, underscore, bar,    VoidSymbol ]	};
+
+
+    key <AB03>  { [         c,           C,     leftdoublequotemark,     VoidSymbol ] };
+    key <AB04>  { [         v,           V,     rightdoublequotemark,     VoidSymbol ] };
+    key <AB05>  { [         b,           B,     VoidSymbol,     VoidSymbol ] };
+    key <AB08>	{ [odiaeresis, Odiaeresis,     VoidSymbol,   VoidSymbol ]	};
+
+    key <AB09>	{ [  ccedilla,   Ccedilla, multiply,     VoidSymbol ] };
+    key <AB10>	{ [    period,      colon, division, dead_abovedot ] };
+
+    key <I219> { [  less,  greater, VoidSymbol, VoidSymbol ] };
+
+};
+
+// Crimean Tatar (Crimean Turkish) layouts.
+// First released (by Ubuntu): 2009-02-24.
+// These layouts are not yet standard. In particular, the mapping of 
+// letter 'x' might change in the future. This letter is not used in the 
+// current official alphabet, but is included in the layouts for foreign words
+// and shortcuts.
+// Reşat SABIQ <tilde.birlik @ gmail . com>, 2009
+// Özgür Qarahan <qarahan @ gmail . com>, 2009
+
+// Crimean Tatar (Crimean Turkish) Q Layout
+partial
+xkb_symbols "crh" {
+
+    include "tr(basic)"
+
+    name[Group1]="Turkey - Crimean Tatar (Turkish Q)";
+
+    key <AE11>	{ [         x,          X,          asterisk,      question ]   };
+
+    key <AC04>	{ [         f,          F,          iacute,          Iacute ]	};
+    key <AC07>	{ [         j,          J,          ibreve,          Ibreve ]	};
+    key <TLDE>	{ [  quotedbl,  backslash,            less,          degree ]	};
+
+    key <AB02>	{ [    ntilde,     Ntilde,  guillemotright,         greater ]	};
+};
+
+// Crimean Tatar (Crimean Turkish) F Layout
+partial
+xkb_symbols "crh_f" {
+
+    include "tr(f)"
+
+    name[Group1]="Turkey - Crimean Tatar (Turkish F)";
+
+    key <AE11>	{ [         x,          X,           slash,        question ]	};
+
+    key <AD04>	{ type[group1] = "FOUR_LEVEL_SEMIALPHABETIC",
+                  [  idotless,          I,          iacute,          Iacute ]	};
+
+    key <AC07>	{ [         k,          K,          ibreve,          Ibreve ]	};
+    key <TLDE>	{ [      plus,   asterisk,       backslash,       plusminus ]	};
+
+    key <BKSL>	{ [    ntilde,     Ntilde,           grave,      dead_grave ]	};
+};
+
+// Crimean Tatar (Crimean Turkish) Alt-Q Layout
+partial
+xkb_symbols "crh_alt" {
+
+    include "tr(alt)"
+
+    name[Group1]="Turkey - Crimean Tatar (Turkish Alt-Q)";
+
+    key <AC04>	{ [         f,          F,          iacute,          Iacute ]	};
+    key <AC07>	{ [         j,          J,          ibreve,          Ibreve ]	};
+
+    key <AB06>	{ [         n,          N,          ntilde,          Ntilde ]	};
+};
diff --git a/xorg-server/xkeyboard-config/symbols/ua b/xorg-server/xkeyboard-config/symbols/ua
index a585ea2b3..ac8e4a276 100644
--- a/xorg-server/xkeyboard-config/symbols/ua
+++ b/xorg-server/xkeyboard-config/symbols/ua
@@ -1,330 +1,308 @@
-// based on

-// ukrainian standard keyboard 

-// AEN <aen@logic.ru> & Leon Kanter <leon@geon.donetsk.ua>

-// Last Changes 2007/10/03 by Andriy Rysin <arysin@yahoo.com>

-

-// Unicode - 3d level added with some Unicode symbols (typographic quotes, m-dash, n-dash etc), 

-// some often used cyrillics from other slavic languages and some ASCII symbols used often (slash, brackets...)

-partial default alphanumeric_keys

-xkb_symbols "unicode" {

-    include "ua(winkeys)"

- 

-    name[Group1]= "Ukraine";

-

-    key <TLDE> {    [           U2019, 	apostrophe,    U0301,   asciitilde     ]       };	// Apostrophe and Stress symbol

-    key <AE02> {    [               1,      exclam,  onesuperior               ]       };

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

-    key <AE03> {    [               3,  numerosign,	   U00A7,    U20B4     ]       };	// Paragraph and Hryvnia sign

-    key <AE04> {    [               4,   semicolon,	  dollar,    EuroSign  ]       };

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

-    key <AE06> {    [               6,       colon,   less                             ]       };

-    key <AE07> {    [               7,    question,   greater                             ]       };

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

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

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

-    key	<AE11> {    [	    	minus,	underscore,       emdash,    endash    ]       };

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

-

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

-    key	<AD04> {    [     Cyrillic_ka, Cyrillic_KA,	registered	       ]       };						// Registered tm

-    key	<AD05> {    [     Cyrillic_ie, Cyrillic_IE,     Cyrillic_io,     Cyrillic_IO	]	};

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

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

-    key	<AC11> {    [    Ukrainian_ie,Ukrainian_IE,	Cyrillic_e,	Cyrillic_E	]	};

-

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

-

-    key	<AB03> {    [     Cyrillic_es,     Cyrillic_ES,	copyright              ]	};

-    key	<AB06> {    [     Cyrillic_te,     Cyrillic_TE,	trademark              ]	};

-    key	<AB08> {    [     Cyrillic_be,     Cyrillic_BE,	guillemotleft,	doublelowquotemark 	]	};

-    key	<AB09> {    [     Cyrillic_yu,     Cyrillic_YU,	guillemotright, leftdoublequotemark ]	};

-    key <AB10> {    [          period,           comma,	slash,          ellipsis        ]       };

-

-    include "level3(ralt_switch)"

-};

-

-partial alphanumeric_keys 

-xkb_symbols "legacy" {

-

-    name[Group1]= "Ukraine - Legacy";

-

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

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

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

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

-    key	<AE04> {	[		4,        asterisk	]	};

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

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

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

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

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

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

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

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

-

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

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

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

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

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

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

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

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

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

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

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

-    key	<AD12> {	[    Ukrainian_yi,    Ukrainian_YI	]	};

-    key	<BKSL> {	[ Ukrainian_ghe_with_upturn, Ukrainian_GHE_WITH_UPTURN ] };

-

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

-    key	<AC02> {	[     Ukrainian_i,     Ukrainian_I	]	};

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

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

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

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

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

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

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

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

-    key	<AC11> {	[    Ukrainian_ie,    Ukrainian_IE	]	};

-

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

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

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

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

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

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

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

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

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

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

-

-    key <LSGT> {        [           slash,             bar      ]       };

-    // End alphanumeric section

-};

-

-partial alphanumeric_keys

-xkb_symbols "winkeys" {

-    include "ua(legacy)"

- 

-    name[Group1]= "Ukraine - Winkeys";

-

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

-    key <AE04> {        [               4,       semicolon      ]       };

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

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

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

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

-    key <AB10> {        [          period,           comma      ]       };

-};

-

-partial alphanumeric_keys

-xkb_symbols "typewriter" {

-    include "ua(legacy)"

-

-    name[Group1]= "Ukraine - Typewriter";

-

-    key	<TLDE> {	[      apostrophe,	  quotedbl	] 	};

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

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

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

-    key	<AE04> {	[	semicolon,		 4	]	};

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

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

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

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

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

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

-

-    key	<AD12> {	[ Ukrainian_ghe_with_upturn, Ukrainian_GHE_WITH_UPTURN ] };

-

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

-

-    key	<AB05> {	[     Ukrainian_i,     Ukrainian_I	]	};

-

-    key	<AB10> {	[    Ukrainian_yi,    Ukrainian_YI	]	};

-

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

-};

-

-partial alphanumeric_keys

-xkb_symbols "phonetic" {

-  include "ua(legacy)"

-  

-  name[Group1]= "Ukraine - Phonetic";

-

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

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

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

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

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

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

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

-  key <LatI> {   [ Ukrainian_i,       Ukrainian_I         ]    };

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

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

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

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

-

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

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

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

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

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

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

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

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

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

-  key <AC10> {   [ Ukrainian_ghe_with_upturn, Ukrainian_GHE_WITH_UPTURN ] };

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

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

-

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

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

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

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

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

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

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

-  key <AB08> {   [ Ukrainian_yi,      Ukrainian_YI	  ]    };

-  key <AB09> {   [ Ukrainian_ie,      Ukrainian_IE	  ]    };

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

-};

-

-// ukrainian keyboard layout RSTU 2019-91 (Respublikanskij STandart Ukrajiny)

-// Andrew Porokhnyak <aop@porokhnyak.org>

-partial alphanumeric_keys

-xkb_symbols "rstu" {

-    include "ua(legacy)"

-

-    name[Group1]= "Ukraine - Standard RSTU";

-

-    key	<TLDE> {	[      apostrophe,	  question	] 	};

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

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

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

-    key	<AE04> {	[	semicolon,		 4	]	};

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

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

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

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

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

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

-

-    key	<AD12> {	[ Ukrainian_ghe_with_upturn, Ukrainian_GHE_WITH_UPTURN ] };

-

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

-

-    key	<AB05> {	[     Ukrainian_i,     Ukrainian_I	]	};

-

-    key	<AB10> {	[    Ukrainian_yi,    Ukrainian_YI	]	};

-

-    key	<BKSL> {	[	    slash,	   percent	]	};

-};

-

-// russian keyboard layout RSTU 2019-91 (Respublikanskij STandart Ukrajiny)

-// Andrew Porokhnyak <aop@porokhnyak.org>

-partial alphanumeric_keys

-xkb_symbols "rstu_ru" {

-    include "ru(common)"

-    name[Group1]= "Ukraine - Standard RSTU on Russian layout";

-

-    key <TLDE> {        [      apostrophe,        question      ]       };

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

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

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

-    key <AE04> {        [       semicolon,               4      ]       };

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

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

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

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

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

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

-    key <BKSL> {        [           slash,         percent      ]       };

-

-key.type[group1]="ALPHABETIC";

-

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

-};

-

-//Homophonic keyboard layout (Tomas Marko Miljenović)

-//Based on Ukrainian National Transliteration, commonly used phonetic layouts for Mac and Win.

-//Existing layout "phonetic" used as template.

-partial alphanumeric_keys

-xkb_symbols "homophonic" {

-  include "ua(legacy)"

-  name[Group1]= "Ukraine - Homophonic";

-

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

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

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

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

-  key <AE04> {	 [		4,           colon	]	};

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

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

-  key <AE07> {	 [		7,	  quotedbl	]	};

-  key <AE08> {	 [		8,	  asterisk	]	};

-  key <AE09> {	 [		9,	 parenleft	]	};

-  key <AE10> {	 [		0,	parenright	]	};

-  key <AE11> {	 [ Ukrainian_ie,      Ukrainian_IE	  ]    };

-  key <AE12> {	 [ Ukrainian_yi,      Ukrainian_YI        ]    };

-

-  key <LatQ> {   [ Cyrillic_ya,       Cyrillic_YA         ]    };

-  key <LatW> {   [ Cyrillic_sha,      Cyrillic_SHA        ]    };

-  key <LatE> {   [ Cyrillic_ie,       Cyrillic_IE         ]    };

-  key <LatR> {   [ Cyrillic_er,       Cyrillic_ER         ]    };

-  key <LatT> {   [ Cyrillic_te,       Cyrillic_TE         ]    };

-  key <LatY> {   [ Cyrillic_i,        Cyrillic_I          ]    };

-  key <LatU> {   [ Cyrillic_u,        Cyrillic_U          ]    };

-  key <LatI> {   [ Ukrainian_i,       Ukrainian_I         ]    };

-  key <LatO> {   [ Cyrillic_o,        Cyrillic_O          ]    };

-  key <LatP> {   [ Cyrillic_pe,       Cyrillic_PE         ]    };

-  key <AD11> {   [ Cyrillic_yu,       Cyrillic_YU        ]    };

-  key <AD12> {   [ Cyrillic_shcha,    Cyrillic_SHCHA      ]    };

-

-  key <LatA> {   [ Cyrillic_a,        Cyrillic_A          ]    };

-  key <LatS> {   [ Cyrillic_es,       Cyrillic_ES         ]    };

-  key <LatD> {   [ Cyrillic_de,       Cyrillic_DE         ]    };

-  key <LatF> {   [ Cyrillic_ef,       Cyrillic_EF         ]    };

-  key <LatG> {   [ Ukrainian_ghe_with_upturn, Ukrainian_GHE_WITH_UPTURN ]    };

-  key <LatH> {   [ Cyrillic_ghe,      Cyrillic_GHE        ]    };

-  key <LatJ> {   [ Cyrillic_shorti,   Cyrillic_SHORTI     ]    };

-  key <LatK> {   [ Cyrillic_ka,       Cyrillic_KA         ]    };

-  key <LatL> {   [ Cyrillic_el,       Cyrillic_EL         ]    };

-  key <AC10> {   [ Cyrillic_che,      Cyrillic_CHE        ]    };

-  key <AC11> {   [ Cyrillic_zhe,      Cyrillic_ZHE        ]    };

-  key <BKSL> {   [ Cyrillic_softsign, Cyrillic_SOFTSIGN   ]    };

-

-  key <LatZ> {   [ Cyrillic_ze,       Cyrillic_ZE         ]    };

-  key <LatX> {   [ Cyrillic_ha,       Cyrillic_HA         ]    };

-  key <LatC> {   [ Cyrillic_tse,      Cyrillic_TSE        ]    };

-  key <LatV> {   [ Cyrillic_ve,       Cyrillic_VE         ]    };

-  key <LatB> {   [ Cyrillic_be,       Cyrillic_BE         ]    };

-  key <LatN> {   [ Cyrillic_en,       Cyrillic_EN         ]    };

-  key <LatM> {   [ Cyrillic_em,       Cyrillic_EM         ]    };

-  key <AB08> {   [ comma,             less	          ]    };

-  key <AB09> {   [ period,            greater	          ]    };

-  key <AB10> {   [ slash,             question            ]    };

-};

-

-// Crimean Tatar (Crimean Turkish) layouts.

-partial

-xkb_symbols "crh" {

-    include "tr(crh)"

-

-    name[Group1]="Ukraine - Crimean Tatar (Turkish Q)";

-};

-

-partial

-xkb_symbols "crh_f" {

-    include "tr(crh_f)"

-

-    name[Group1]="Ukraine - Crimean Tatar (Turkish F)";

-};

-

-partial

-xkb_symbols "crh_alt" {

-    include "tr(crh_alt)"

-

-    name[Group1]="Ukraine - Crimean Tatar (Turkish Alt-Q)";

-};

+// based on
+// ukrainian standard keyboard 
+// AEN <aen@logic.ru> & Leon Kanter <leon@geon.donetsk.ua>
+// Last Changes 2007/10/03 by Andriy Rysin <arysin@yahoo.com>
+
+// Unicode - 3d level added with some Unicode symbols (typographic quotes, m-dash, n-dash etc), 
+// some often used cyrillics from other slavic languages and some ASCII symbols used often (slash, brackets...)
+partial default alphanumeric_keys
+xkb_symbols "unicode" {
+    include "ua(winkeys)"
+ 
+    name[Group1]= "Ukraine";
+
+    key <TLDE> {    [           U2019, 	apostrophe,    U0301,   asciitilde     ]       };	// Apostrophe and Stress symbol
+    key <AE02> {    [               1,      exclam,  onesuperior               ]       };
+    key <AE02> {    [               2,    quotedbl,  twosuperior               ]       };
+    key <AE03> {    [               3,  numerosign,	   U00A7,    U20B4     ]       };	// Paragraph and Hryvnia sign
+    key <AE04> {    [               4,   semicolon,	  dollar,    EuroSign  ]       };
+    key <AE05> {    [               5,     percent,	  degree               ]       };
+    key <AE06> {    [               6,       colon,   less                             ]       };
+    key <AE07> {    [               7,    question,   greater                             ]       };
+    key <AE08> {    [               8,    asterisk, enfilledcircbullet         ]       };
+    key	<AE09> {    [		    9,	 parenleft,  bracketleft,    braceleft ]       };
+    key	<AE10> {    [		    0,	parenright, bracketright,    braceright]       };
+    key	<AE11> {    [	    	minus,	underscore,       emdash,    endash    ]       };
+    key	<AE12> {    [	    	equal,	      plus, 	notequal,    plusminus ]       };
+
+    key	<AD03> {    [      Cyrillic_u,	Cyrillic_U,  Byelorussian_shortu,  Byelorussian_SHORTU	]};
+    key	<AD04> {    [     Cyrillic_ka, Cyrillic_KA,	registered	       ]       };						// Registered tm
+    key	<AD05> {    [     Cyrillic_ie, Cyrillic_IE,     Cyrillic_io,     Cyrillic_IO	]	};
+    key	<AD12> {    [    Ukrainian_yi,Ukrainian_YI,	Cyrillic_hardsign,	Cyrillic_HARDSIGN	]	};
+    key	<AC02> {    [    Ukrainian_i,  Ukrainian_I, Cyrillic_yeru,   Cyrillic_YERU	]	};
+    key	<AC11> {    [    Ukrainian_ie,Ukrainian_IE,	Cyrillic_e,	Cyrillic_E	]	};
+
+    key	<BKSL> {    [ Ukrainian_ghe_with_upturn, Ukrainian_GHE_WITH_UPTURN, backslash,  bar	]	};
+
+    key	<AB03> {    [     Cyrillic_es,     Cyrillic_ES,	copyright              ]	};
+    key	<AB06> {    [     Cyrillic_te,     Cyrillic_TE,	trademark              ]	};
+    key	<AB08> {    [     Cyrillic_be,     Cyrillic_BE,	guillemotleft,	doublelowquotemark 	]	};
+    key	<AB09> {    [     Cyrillic_yu,     Cyrillic_YU,	guillemotright, leftdoublequotemark ]	};
+    key <AB10> {    [          period,           comma,	slash,          ellipsis        ]       };
+
+    include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys 
+xkb_symbols "legacy" {
+
+    name[Group1]= "Ukraine - Legacy";
+
+    key	<TLDE> {	[      apostrophe,	asciitilde	]	};
+    key	<AE01> {	[		1,	    exclam 	]	};
+    key	<AE02> {	[		2,        quotedbl	]	};
+    key	<AE03> {	[		3,      numbersign	]	};
+    key	<AE04> {	[		4,        asterisk	]	};
+    key	<AE05> {	[		5,	     colon	]	};
+    key	<AE06> {	[		6,	     comma	]	};
+    key	<AE07> {	[		7,	    period	]	};
+    key	<AE08> {	[		8,	 semicolon	]	};
+    key	<AE09> {	[		9,	 parenleft	]	};
+    key	<AE10> {	[		0,	parenright	]	};
+    key	<AE11> {	[	    minus,	underscore	]	};
+    key	<AE12> {	[	    equal,	      plus	]	};
+
+    key	<AD01> {	[ Cyrillic_shorti, Cyrillic_SHORTI	]	};
+    key	<AD02> {	[    Cyrillic_tse,    Cyrillic_TSE	]	};
+    key	<AD03> {	[      Cyrillic_u,	Cyrillic_U	]	};
+    key	<AD04> {	[     Cyrillic_ka,     Cyrillic_KA	]	};
+    key	<AD05> {	[     Cyrillic_ie,     Cyrillic_IE	]	};
+    key	<AD06> {	[     Cyrillic_en,     Cyrillic_EN	]	};
+    key	<AD07> {	[    Cyrillic_ghe,    Cyrillic_GHE	]	};
+    key	<AD08> {	[    Cyrillic_sha,    Cyrillic_SHA	]	};
+    key	<AD09> {	[  Cyrillic_shcha,  Cyrillic_SHCHA	]	};
+    key	<AD10> {	[     Cyrillic_ze,     Cyrillic_ZE	]	};
+    key	<AD11> {	[     Cyrillic_ha,     Cyrillic_HA	]	};
+    key	<AD12> {	[    Ukrainian_yi,    Ukrainian_YI	]	};
+    key	<BKSL> {	[ Ukrainian_ghe_with_upturn, Ukrainian_GHE_WITH_UPTURN ] };
+
+    key	<AC01> {	[     Cyrillic_ef,     Cyrillic_EF	]	};
+    key	<AC02> {	[     Ukrainian_i,     Ukrainian_I	]	};
+    key	<AC03> {	[     Cyrillic_ve,     Cyrillic_VE	]	};
+    key	<AC04> {	[      Cyrillic_a,	Cyrillic_A	]	};
+    key	<AC05> {	[     Cyrillic_pe,     Cyrillic_PE	]	};
+    key	<AC06> {	[     Cyrillic_er,     Cyrillic_ER	]	};
+    key	<AC07> {	[      Cyrillic_o,	Cyrillic_O	]	};
+    key	<AC08> {	[     Cyrillic_el,     Cyrillic_EL	]	};
+    key	<AC09> {	[     Cyrillic_de,     Cyrillic_DE	]	};
+    key	<AC10> {	[    Cyrillic_zhe,    Cyrillic_ZHE	]	};
+    key	<AC11> {	[    Ukrainian_ie,    Ukrainian_IE	]	};
+
+    key	<AB01> {	[     Cyrillic_ya,     Cyrillic_YA	]	};
+    key	<AB02> {	[    Cyrillic_che,    Cyrillic_CHE	]	};
+    key	<AB03> {	[     Cyrillic_es,     Cyrillic_ES	]	};
+    key	<AB04> {	[     Cyrillic_em,     Cyrillic_EM	]	};
+    key	<AB06> {	[     Cyrillic_te,     Cyrillic_TE	]	};
+    key	<AB05> {	[      Cyrillic_i,	Cyrillic_I	]	};
+    key	<AB07> {	[Cyrillic_softsign,Cyrillic_SOFTSIGN	]	};
+    key	<AB08> {	[     Cyrillic_be,     Cyrillic_BE	]	};
+    key	<AB09> {	[     Cyrillic_yu,     Cyrillic_YU	]	};
+    key	<AB10> {	[	    slash,	  question	]	};
+
+    key <LSGT> {        [           slash,             bar      ]       };
+    // End alphanumeric section
+};
+
+partial alphanumeric_keys
+xkb_symbols "winkeys" {
+    include "ua(legacy)"
+ 
+    name[Group1]= "Ukraine - Winkeys";
+
+    key <AE03> {        [               3,      numerosign      ]       };
+    key <AE04> {        [               4,       semicolon      ]       };
+    key <AE05> {        [               5,         percent      ]       };
+    key <AE06> {        [               6,           colon      ]       };
+    key <AE07> {        [               7,        question      ]       };
+    key <AE08> {        [               8,        asterisk      ]       };
+    key <AB10> {        [          period,           comma      ]       };
+};
+
+partial alphanumeric_keys
+xkb_symbols "typewriter" {
+    include "ua(legacy)"
+
+    name[Group1]= "Ukraine - Typewriter";
+
+    key	<TLDE> {	[      apostrophe,	  quotedbl	] 	};
+    key	<AE01> {	[	   exclam,		 1 	]	};
+    key	<AE02> {	[      numerosign,		 2	]	};
+    key	<AE03> {	[	    slash,		 3	]	};
+    key	<AE04> {	[	semicolon,		 4	]	};
+    key	<AE05> {	[	    colon,		 5	]	};
+    key	<AE06> {	[	    comma,		 6	]	};
+    key	<AE07> {	[	   period,		 7	]	};
+    key	<AE08> {	[      underscore,		 8	]	};
+    key	<AE09> {	[	 question,		 9	]	};
+    key	<AE10> {	[	  percent,		 0	]	};
+
+    key	<AD12> {	[ Ukrainian_ghe_with_upturn, Ukrainian_GHE_WITH_UPTURN ] };
+
+    key	<AC02> {	[      Cyrillic_i,	Cyrillic_I	]	};
+
+    key	<AB05> {	[     Ukrainian_i,     Ukrainian_I	]	};
+
+    key	<AB10> {	[    Ukrainian_yi,    Ukrainian_YI	]	};
+
+    key	<BKSL> {	[	parenleft,	parenright	]	};
+};
+
+partial alphanumeric_keys
+xkb_symbols "phonetic" {
+  include "ua(legacy)"
+  
+  name[Group1]= "Ukraine - Phonetic";
+
+  key <LatQ> {   [ Cyrillic_ya,       Cyrillic_YA         ]    };
+  key <LatW> {   [ Cyrillic_ve,       Cyrillic_VE         ]    };
+  key <LatE> {   [ Cyrillic_ie,       Cyrillic_IE         ]    };
+  key <LatR> {   [ Cyrillic_er,       Cyrillic_ER         ]    };
+  key <LatT> {   [ Cyrillic_te,       Cyrillic_TE         ]    };
+  key <LatY> {   [ Cyrillic_i,        Cyrillic_I          ]    };
+  key <LatU> {   [ Cyrillic_u,        Cyrillic_U          ]    };
+  key <LatI> {   [ Ukrainian_i,       Ukrainian_I         ]    };
+  key <LatO> {   [ Cyrillic_o,        Cyrillic_O          ]    };
+  key <LatP> {   [ Cyrillic_pe,       Cyrillic_PE         ]    };
+  key <AD11> {   [ Cyrillic_sha,      Cyrillic_SHA        ]    };
+  key <AD12> {   [ Cyrillic_shcha,    Cyrillic_SHCHA      ]    };
+
+  key <LatA> {   [ Cyrillic_a,        Cyrillic_A          ]    };
+  key <LatS> {   [ Cyrillic_es,       Cyrillic_ES         ]    };
+  key <LatD> {   [ Cyrillic_de,       Cyrillic_DE         ]    };
+  key <LatF> {   [ Cyrillic_ef,       Cyrillic_EF         ]    };
+  key <LatG> {   [ Cyrillic_ghe,      Cyrillic_GHE        ]    };
+  key <LatH> {   [ Cyrillic_ha,       Cyrillic_HA         ]    };
+  key <LatJ> {   [ Cyrillic_shorti,   Cyrillic_SHORTI     ]    };
+  key <LatK> {   [ Cyrillic_ka,       Cyrillic_KA         ]    };
+  key <LatL> {   [ Cyrillic_el,       Cyrillic_EL         ]    };
+  key <AC10> {   [ Ukrainian_ghe_with_upturn, Ukrainian_GHE_WITH_UPTURN ] };
+  key <AC11> {   [ Cyrillic_che,      Cyrillic_CHE        ]    };
+  key <BKSL> {   [ Cyrillic_yu,       Cyrillic_YU         ]    };
+
+  key <LatZ> {   [ Cyrillic_ze,       Cyrillic_ZE         ]    };
+  key <LatX> {   [ Cyrillic_softsign, Cyrillic_SOFTSIGN   ]    };
+  key <LatC> {   [ Cyrillic_tse,      Cyrillic_TSE        ]    };
+  key <LatV> {   [ Cyrillic_zhe,      Cyrillic_ZHE        ]    };
+  key <LatB> {   [ Cyrillic_be,       Cyrillic_BE         ]    };
+  key <LatN> {   [ Cyrillic_en,       Cyrillic_EN         ]    };
+  key <LatM> {   [ Cyrillic_em,       Cyrillic_EM         ]    };
+  key <AB08> {   [ Ukrainian_yi,      Ukrainian_YI	  ]    };
+  key <AB09> {   [ Ukrainian_ie,      Ukrainian_IE	  ]    };
+  key <AB10> {   [ slash,             question            ]    };
+};
+
+// ukrainian keyboard layout RSTU 2019-91 (Respublikanskij STandart Ukrajiny)
+// Andrew Porokhnyak <aop@porokhnyak.org>
+partial alphanumeric_keys
+xkb_symbols "rstu" {
+    include "ua(legacy)"
+
+    name[Group1]= "Ukraine - Standard RSTU";
+
+    key	<TLDE> {	[      apostrophe,	  question	] 	};
+    key	<AE01> {	[	   exclam,		 1 	]	};
+    key	<AE02> {	[        quotedbl,		 2	]	};
+    key	<AE03> {	[      numbersign,		 3	]	};
+    key	<AE04> {	[	semicolon,		 4	]	};
+    key	<AE05> {	[	    colon,		 5	]	};
+    key	<AE06> {	[	    comma,		 6	]	};
+    key	<AE07> {	[	   period,		 7	]	};
+    key	<AE08> {	[        asterisk,		 8	]	};
+    key	<AE09> {	[	parenleft,		 9	]	};
+    key	<AE10> {	[      parenright,		 0	]	};
+
+    key	<AD12> {	[ Ukrainian_ghe_with_upturn, Ukrainian_GHE_WITH_UPTURN ] };
+
+    key	<AC02> {	[      Cyrillic_i,	Cyrillic_I	]	};
+
+    key	<AB05> {	[     Ukrainian_i,     Ukrainian_I	]	};
+
+    key	<AB10> {	[    Ukrainian_yi,    Ukrainian_YI	]	};
+
+    key	<BKSL> {	[	    slash,	   percent	]	};
+};
+
+// russian keyboard layout RSTU 2019-91 (Respublikanskij STandart Ukrajiny)
+// Andrew Porokhnyak <aop@porokhnyak.org>
+partial alphanumeric_keys
+xkb_symbols "rstu_ru" {
+    include "ru(common)"
+    name[Group1]= "Ukraine - Standard RSTU on Russian layout";
+
+    key <TLDE> {        [      apostrophe,        question      ]       };
+    key <AE01> {        [          exclam,               1      ]       };
+    key <AE02> {        [        quotedbl,               2      ]       };
+    key <AE03> {        [      numbersign,               3      ]       };
+    key <AE04> {        [       semicolon,               4      ]       };
+    key <AE05> {        [           colon,               5      ]       };
+    key <AE06> {        [           comma,               6      ]       };
+    key <AE07> {        [          period,               7      ]       };
+    key <AE08> {        [        asterisk,               8      ]       };
+    key <AE09> {        [       parenleft,               9      ]       };
+    key <AE10> {        [      parenright,               0      ]       };
+    key <BKSL> {        [           slash,         percent      ]       };
+
+key.type[group1]="ALPHABETIC";
+
+    key <AB10> {        [     Cyrillic_io,     Cyrillic_IO      ]       };
+};
+
+//Homophonic keyboard layout (Tomas Marko Miljenović)
+//Based on Ukrainian National Transliteration, commonly used phonetic layouts for Mac and Win.
+//Existing layout "phonetic" used as template.
+partial alphanumeric_keys
+xkb_symbols "homophonic" {
+  include "ua(legacy)"
+  name[Group1]= "Ukraine - Homophonic";
+
+  key <TLDE> {	 [          grave,	underscore	]	};
+  key <AE01> {	 [		1,	    exclam 	]	};
+  key <AE02> {	 [		2,              at	]	};
+  key <AE03> {	 [		3,       semicolon	]	};
+  key <AE04> {	 [		4,           colon	]	};
+  key <AE05> {	 [		5,	   percent	]	};
+  key <AE06> {	 [		6,	apostrophe	]	};
+  key <AE07> {	 [		7,	  quotedbl	]	};
+  key <AE08> {	 [		8,	  asterisk	]	};
+  key <AE09> {	 [		9,	 parenleft	]	};
+  key <AE10> {	 [		0,	parenright	]	};
+  key <AE11> {	 [ Ukrainian_ie,      Ukrainian_IE	  ]    };
+  key <AE12> {	 [ Ukrainian_yi,      Ukrainian_YI        ]    };
+
+  key <LatQ> {   [ Cyrillic_ya,       Cyrillic_YA         ]    };
+  key <LatW> {   [ Cyrillic_sha,      Cyrillic_SHA        ]    };
+  key <LatE> {   [ Cyrillic_ie,       Cyrillic_IE         ]    };
+  key <LatR> {   [ Cyrillic_er,       Cyrillic_ER         ]    };
+  key <LatT> {   [ Cyrillic_te,       Cyrillic_TE         ]    };
+  key <LatY> {   [ Cyrillic_i,        Cyrillic_I          ]    };
+  key <LatU> {   [ Cyrillic_u,        Cyrillic_U          ]    };
+  key <LatI> {   [ Ukrainian_i,       Ukrainian_I         ]    };
+  key <LatO> {   [ Cyrillic_o,        Cyrillic_O          ]    };
+  key <LatP> {   [ Cyrillic_pe,       Cyrillic_PE         ]    };
+  key <AD11> {   [ Cyrillic_yu,       Cyrillic_YU        ]    };
+  key <AD12> {   [ Cyrillic_shcha,    Cyrillic_SHCHA      ]    };
+
+  key <LatA> {   [ Cyrillic_a,        Cyrillic_A          ]    };
+  key <LatS> {   [ Cyrillic_es,       Cyrillic_ES         ]    };
+  key <LatD> {   [ Cyrillic_de,       Cyrillic_DE         ]    };
+  key <LatF> {   [ Cyrillic_ef,       Cyrillic_EF         ]    };
+  key <LatG> {   [ Ukrainian_ghe_with_upturn, Ukrainian_GHE_WITH_UPTURN ]    };
+  key <LatH> {   [ Cyrillic_ghe,      Cyrillic_GHE        ]    };
+  key <LatJ> {   [ Cyrillic_shorti,   Cyrillic_SHORTI     ]    };
+  key <LatK> {   [ Cyrillic_ka,       Cyrillic_KA         ]    };
+  key <LatL> {   [ Cyrillic_el,       Cyrillic_EL         ]    };
+  key <AC10> {   [ Cyrillic_che,      Cyrillic_CHE        ]    };
+  key <AC11> {   [ Cyrillic_zhe,      Cyrillic_ZHE        ]    };
+  key <BKSL> {   [ Cyrillic_softsign, Cyrillic_SOFTSIGN   ]    };
+
+  key <LatZ> {   [ Cyrillic_ze,       Cyrillic_ZE         ]    };
+  key <LatX> {   [ Cyrillic_ha,       Cyrillic_HA         ]    };
+  key <LatC> {   [ Cyrillic_tse,      Cyrillic_TSE        ]    };
+  key <LatV> {   [ Cyrillic_ve,       Cyrillic_VE         ]    };
+  key <LatB> {   [ Cyrillic_be,       Cyrillic_BE         ]    };
+  key <LatN> {   [ Cyrillic_en,       Cyrillic_EN         ]    };
+  key <LatM> {   [ Cyrillic_em,       Cyrillic_EM         ]    };
+  key <AB08> {   [ comma,             less	          ]    };
+  key <AB09> {   [ period,            greater	          ]    };
+  key <AB10> {   [ slash,             question            ]    };
+};
diff --git a/xorg-server/xkeyboard-config/symbols/us b/xorg-server/xkeyboard-config/symbols/us
index 871dfbdc6..cb9492287 100644
--- a/xorg-server/xkeyboard-config/symbols/us
+++ b/xorg-server/xkeyboard-config/symbols/us
@@ -2,7 +2,7 @@ default
 partial alphanumeric_keys modifier_keys 
 xkb_symbols "basic" {
 
-    name[Group1]= "USA";
+    name[Group1]= "English (USA)";
 
     // Alphanumeric section
     key <TLDE> {	[     grave,	asciitilde	]	};
@@ -62,7 +62,7 @@ xkb_symbols "basic" {
 partial alphanumeric_keys
 xkb_symbols "euro" {
 
-    name[Group1]= "USA - With EuroSign on 5";
+    name[Group1]= "English (US, with euro on 5)";
 
     include "us(basic)"
 
@@ -75,7 +75,7 @@ xkb_symbols "euro" {
 partial alphanumeric_keys
 xkb_symbols "intl" {
 
-    name[Group1]= "USA - International (with dead keys)";
+    name[Group1]= "English (US, international with dead keys)";
 
     include "us(basic)"
 
@@ -165,7 +165,7 @@ xkb_symbols "intl" {
 partial alphanumeric_keys
 xkb_symbols "alt-intl" {
 
-  name[Group1]= "USA - Alternative international";
+  name[Group1]= "English (US, alternative international)";
 
   include "us"
 
@@ -194,7 +194,7 @@ xkb_symbols "alt-intl" {
 partial alphanumeric_keys
 xkb_symbols "dvorak" {
 
-    name[Group1]= "USA - Dvorak";
+    name[Group1]= "English (Dvorak)";
 
     // Alphanumeric section
 
@@ -259,7 +259,7 @@ xkb_symbols "dvorak" {
 partial alphanumeric_keys
 xkb_symbols "dvorak-intl" {
 
-    name[Group1]= "USA - Dvorak international (with dead keys)";
+    name[Group1]= "English (Dvorak international with dead keys)";
 
     include "us(dvorak)"
 
@@ -338,7 +338,7 @@ xkb_symbols "dvorak-intl" {
 partial alphanumeric_keys
 xkb_symbols "dvorak-alt-intl" {
 
-    name[Group1]= "USA - Dvorak alternative international (no dead keys)";
+    name[Group1]= "English (Dvorak alternative international no dead keys)";
 
     include "us(dvorak)"
 
@@ -373,7 +373,7 @@ partial alphanumeric_keys
 xkb_symbols "dvorak-l" {
 
     include "us(dvorak)"
-    name[Group1]= "USA - Left handed Dvorak";
+    name[Group1]= "English (left handed Dvorak)";
 
     key <AE01> {	[ bracketleft,	braceleft	]	};
     key <AE02> {	[ bracketright,	braceright	]	};
@@ -429,7 +429,7 @@ partial alphanumeric_keys
 xkb_symbols "dvorak-r" {
     
     include "us(dvorak)"
-    name[Group1]= "USA - Right handed Dvorak";
+    name[Group1]= "English (right handed Dvorak)";
 
     key <AE01> {	[	    1,	exclam 		]	};
     key <AE02> {	[	    2,	at		]	};
@@ -488,7 +488,7 @@ xkb_symbols "dvorak-r" {
 partial alphanumeric_keys
 xkb_symbols "dvorak-classic" {
 
-    name[Group1]= "USA - Classic Dvorak";
+    name[Group1]= "English (classic Dvorak)";
 
     // Alphanumeric section
 
@@ -620,7 +620,7 @@ xkb_symbols "dvp" {
 partial alphanumeric_keys
 xkb_symbols "rus" {
 
-    name[Group1]= "USA - Russian phonetic";
+    name[Group1]= "Russian (US, phonetic)";
 
     include "us(basic)"
 
@@ -667,7 +667,7 @@ partial alphanumeric_keys
 xkb_symbols "mac" {
 
     include "us(basic)"
-    name[Group1]= "USA - Macintosh";
+    name[Group1]= "English (Macintosh)";
     key.type[group1]="FOUR_LEVEL";
 
     // Slightly improvised from http://homepage.mac.com/thgewecke/kblayout.jpg
@@ -734,7 +734,7 @@ xkb_symbols "mac" {
 partial alphanumeric_keys
 xkb_symbols "colemak" {
     include "us"
-    name[Group1]= "USA - Colemak";
+    name[Group1]= "English (Colemak)";
 
     // Alphanumeric section
     key <TLDE> { [        grave,   asciitilde,      dead_tilde,       asciitilde ] };
@@ -814,7 +814,7 @@ xkb_symbols "colemak" {
 partial alphanumeric_keys
 xkb_symbols "altgr-intl" {
 
-   name[Group1]= "USA - International (AltGr dead keys)";
+   name[Group1]= "English (international AltGr dead keys)";
 
    include "us(intl)"
 
@@ -1050,7 +1050,7 @@ xkb_symbols "olpc" {
 partial alphanumeric_keys
 xkb_symbols "olpc2" {
    include "us(olpc)"
-   name[Group1]= "USA - Layout toggle on multiply/divide key";
+   name[Group1]= "English (layout toggle on multiply/divide key)";
    include "group(olpc)"
 };
 
@@ -1060,7 +1060,7 @@ xkb_symbols "olpc2" {
 partial alphanumeric_keys modifier_keys
 xkb_symbols "chr" {
 
-    name[Group1]= "USA - Cherokee";
+    name[Group1]= "Cherokee";
     key.type[group1]="ALPHABETIC";
 
     // Alphanumeric section
@@ -1123,7 +1123,7 @@ xkb_symbols "chr" {
 partial alphanumeric_keys
 xkb_symbols "hbs" {
 
-  name[Group1]= "USA - Serbo-Croatian";
+  name[Group1]= "Serbo-Croatian (USA)";
 
   include "us"
 
@@ -1146,7 +1146,7 @@ xkb_symbols "hbs" {
 partial alphanumeric_keys
 xkb_symbols "htcdream" {
         include "inet(htcdream)"
-        name[Group1]= "USA - htcdream";
+        name[Group1]= "English (USA)";
 
         //second row
         key <AD01> { [ q, Q, Tab, Tab ] };
diff --git a/xorg-server/xkeyboard-config/symbols/uz b/xorg-server/xkeyboard-config/symbols/uz
index a6c67e8d1..68862bbc7 100644
--- a/xorg-server/xkeyboard-config/symbols/uz
+++ b/xorg-server/xkeyboard-config/symbols/uz
@@ -1,120 +1,98 @@
-// Uzbek standard keyboard

-//

-// Mashrab Kuvatov <kmashrab@uni-bremen.de>

-//

-// History:

-//

-// Jun 2, 2003. Mashrab Kuvatov <kmashrab@uni-bremen.de>

-//

-// Created based on Russian standard keyboard. AEN <aen@logic.ru> 

-// The following symbols of Russian standard keyboard were replaced:

-// minus (key <AE11>) with Byelorussian_shortu (U045e),

-// equal (key <AE12>) with Cyrillic_ka_descender (U049b)

-// Cyrillic_ha (key <AD11>) with Cyrillic_ghe_bar (U0493)

-// Cyrillic_hardsign (key <AD12>) with Cyrillic_ha_descender (U04b3)

-// The following symbols of Russian standard keyboard were moved:

-// Cyrillic_ze       to key <AC02> (english 's'), 

-// Cyrillic_sha      to key <AD08> (english 'i'),

-// Cyrillic_ha       to key <AD09> (english 'o'),

-// Cyrillic_hardsign to key <AD10> (english 'p'). 

-//

-// Feb 25, 2007. Mashrab Kuvatov <kmashrab@uni-bremen.de>

-//

-// Made cyrillic and latin variants. Default is cyrillic.

-// Cyrillic variant is standard compliant. The standard

-// was accepted by the official body of Uzbekistan. See

-// http://www.uznet.net/index.php?option=com_content&task=view&id=288&Itemid=58

-//

-// Latin variant is somewhat experimental, since there is no

-// official standard for it. It is a copy of "us" layout, where

-// apostrophe is replaced with U02BB.

-// 

-

-partial default alphanumeric_keys 

-xkb_symbols "cyrillic" {

-

-    name[Group1]= "Uzbekistan";

-

-    key	<AE01> {	[		1,	    exclam 	]	};

-    key	<AE02> {	[		2,        quotedbl	]	};

-    key	<AE03> {	[		3,      numerosign	]	};

-    key	<AE04> {	[		4,       semicolon 	]	};

-    key	<AE05> {	[		5,	   percent 	]	};

-    key	<AE06> {	[		6,	     colon	]	};

-    key	<AE07> {	[		7,	  question	]	};

-    key	<AE08> {	[		8,	  asterisk	]	};

-    key	<AE09> {	[		9,	 parenleft	]	};

-    key	<AE10> {	[		0,	parenright	]	};

-    key	<BKSL> {	[	backslash,             bar	]	};

-    key	<AB10> {	[	   period,	     comma	]	};

-    key <LSGT> {        [           slash,             bar      ]       };

-

-key.type[group1]="ALPHABETIC";

-

-    key	<AE11> {	[Cyrillic_ghe_bar, Cyrillic_GHE_bar     ]	};

-    key	<AE12> {	[Cyrillic_ha_descender, Cyrillic_HA_descender ]	};

-    key	<TLDE> {	[     Cyrillic_io,     Cyrillic_IO	]	};

-    key	<AD01> {	[ Cyrillic_shorti, Cyrillic_SHORTI	]	};

-    key	<AD02> {	[    Cyrillic_tse,    Cyrillic_TSE	]	};

-    key	<AD03> {	[      Cyrillic_u,	Cyrillic_U	]	};

-    key	<AD04> {	[     Cyrillic_ka,     Cyrillic_KA	]	};

-    key	<AD05> {	[     Cyrillic_ie,     Cyrillic_IE	]	};

-    key	<AD06> {	[     Cyrillic_en,     Cyrillic_EN	]	};

-    key	<AD07> {	[    Cyrillic_ghe,    Cyrillic_GHE	]	};

-    key	<AD08> {	[    Cyrillic_sha,    Cyrillic_SHA	]	};

-    key	<AD09> {	[ Byelorussian_shortu, Byelorussian_SHORTU ]	};

-    key	<AD10> {	[     Cyrillic_ze,     Cyrillic_ZE      ]	};

-    key	<AD11> {	[     Cyrillic_ha,     Cyrillic_HA      ]	};

-    key	<AD12> {	[Cyrillic_hardsign,Cyrillic_HARDSIGN ]	};

-    key	<AC01> {	[     Cyrillic_ef,     Cyrillic_EF	]	};

-    key	<AC02> {	[Cyrillic_ka_descender, Cyrillic_KA_descender ]	};

-    key	<AC03> {	[     Cyrillic_ve,     Cyrillic_VE	]	};

-    key	<AC04> {	[      Cyrillic_a,	Cyrillic_A	]	};

-    key	<AC05> {	[     Cyrillic_pe,     Cyrillic_PE	]	};

-    key	<AC06> {	[     Cyrillic_er,     Cyrillic_ER	]	};

-    key	<AC07> {	[      Cyrillic_o,	Cyrillic_O	]	};

-    key	<AC08> {	[     Cyrillic_el,     Cyrillic_EL	]	};

-    key	<AC09> {	[     Cyrillic_de,     Cyrillic_DE	]	};

-    key	<AC10> {	[    Cyrillic_zhe,    Cyrillic_ZHE	]	};

-    key	<AC11> {	[      Cyrillic_e,	Cyrillic_E	]	};

-    key	<AB01> {	[     Cyrillic_ya,     Cyrillic_YA	]	};

-    key	<AB02> {	[    Cyrillic_che,    Cyrillic_CHE	]	};

-    key	<AB03> {	[     Cyrillic_es,     Cyrillic_ES	]	};

-    key	<AB04> {	[     Cyrillic_em,     Cyrillic_EM	]	};

-    key	<AB06> {	[     Cyrillic_te,     Cyrillic_TE	]	};

-    key	<AB05> {	[      Cyrillic_i,	Cyrillic_I	]	};

-    key	<AB07> {	[Cyrillic_softsign,Cyrillic_SOFTSIGN	]	};

-    key	<AB08> {	[     Cyrillic_be,     Cyrillic_BE	]	};

-    key	<AB09> {	[     Cyrillic_yu,     Cyrillic_YU	]	};

-

-    // End alphanumeric section

-};

-

-partial alphanumeric_keys

-xkb_symbols "latin" {

-    include "us"

-    name[Group1]= "Uzbekistan - Latin";

-    key <AC11>  { [0x010002BB, quotedbl] };

-};

-

-// Crimean Tatar (Crimean Turkish) layouts.

-partial

-xkb_symbols "crh" {

-    include "tr(crh)"

-

-    name[Group1]="Uzbekistan - Crimean Tatar (Turkish Q)";

-};

-

-partial

-xkb_symbols "crh_f" {

-    include "tr(crh_f)"

-

-    name[Group1]="Uzbekistan - Crimean Tatar (Turkish F)";

-};

-

-partial

-xkb_symbols "crh_alt" {

-    include "tr(crh_alt)"

-

-    name[Group1]="Uzbekistan - Crimean Tatar (Turkish Alt-Q)";

-};

+// Uzbek standard keyboard
+//
+// Mashrab Kuvatov <kmashrab@uni-bremen.de>
+//
+// History:
+//
+// Jun 2, 2003. Mashrab Kuvatov <kmashrab@uni-bremen.de>
+//
+// Created based on Russian standard keyboard. AEN <aen@logic.ru> 
+// The following symbols of Russian standard keyboard were replaced:
+// minus (key <AE11>) with Byelorussian_shortu (U045e),
+// equal (key <AE12>) with Cyrillic_ka_descender (U049b)
+// Cyrillic_ha (key <AD11>) with Cyrillic_ghe_bar (U0493)
+// Cyrillic_hardsign (key <AD12>) with Cyrillic_ha_descender (U04b3)
+// The following symbols of Russian standard keyboard were moved:
+// Cyrillic_ze       to key <AC02> (english 's'), 
+// Cyrillic_sha      to key <AD08> (english 'i'),
+// Cyrillic_ha       to key <AD09> (english 'o'),
+// Cyrillic_hardsign to key <AD10> (english 'p'). 
+//
+// Feb 25, 2007. Mashrab Kuvatov <kmashrab@uni-bremen.de>
+//
+// Made cyrillic and latin variants. Default is cyrillic.
+// Cyrillic variant is standard compliant. The standard
+// was accepted by the official body of Uzbekistan. See
+// http://www.uznet.net/index.php?option=com_content&task=view&id=288&Itemid=58
+//
+// Latin variant is somewhat experimental, since there is no
+// official standard for it. It is a copy of "us" layout, where
+// apostrophe is replaced with U02BB.
+// 
+
+partial default alphanumeric_keys 
+xkb_symbols "cyrillic" {
+
+    name[Group1]= "Uzbekistan";
+
+    key	<AE01> {	[		1,	    exclam 	]	};
+    key	<AE02> {	[		2,        quotedbl	]	};
+    key	<AE03> {	[		3,      numerosign	]	};
+    key	<AE04> {	[		4,       semicolon 	]	};
+    key	<AE05> {	[		5,	   percent 	]	};
+    key	<AE06> {	[		6,	     colon	]	};
+    key	<AE07> {	[		7,	  question	]	};
+    key	<AE08> {	[		8,	  asterisk	]	};
+    key	<AE09> {	[		9,	 parenleft	]	};
+    key	<AE10> {	[		0,	parenright	]	};
+    key	<BKSL> {	[	backslash,             bar	]	};
+    key	<AB10> {	[	   period,	     comma	]	};
+    key <LSGT> {        [           slash,             bar      ]       };
+
+key.type[group1]="ALPHABETIC";
+
+    key	<AE11> {	[Cyrillic_ghe_bar, Cyrillic_GHE_bar     ]	};
+    key	<AE12> {	[Cyrillic_ha_descender, Cyrillic_HA_descender ]	};
+    key	<TLDE> {	[     Cyrillic_io,     Cyrillic_IO	]	};
+    key	<AD01> {	[ Cyrillic_shorti, Cyrillic_SHORTI	]	};
+    key	<AD02> {	[    Cyrillic_tse,    Cyrillic_TSE	]	};
+    key	<AD03> {	[      Cyrillic_u,	Cyrillic_U	]	};
+    key	<AD04> {	[     Cyrillic_ka,     Cyrillic_KA	]	};
+    key	<AD05> {	[     Cyrillic_ie,     Cyrillic_IE	]	};
+    key	<AD06> {	[     Cyrillic_en,     Cyrillic_EN	]	};
+    key	<AD07> {	[    Cyrillic_ghe,    Cyrillic_GHE	]	};
+    key	<AD08> {	[    Cyrillic_sha,    Cyrillic_SHA	]	};
+    key	<AD09> {	[ Byelorussian_shortu, Byelorussian_SHORTU ]	};
+    key	<AD10> {	[     Cyrillic_ze,     Cyrillic_ZE      ]	};
+    key	<AD11> {	[     Cyrillic_ha,     Cyrillic_HA      ]	};
+    key	<AD12> {	[Cyrillic_hardsign,Cyrillic_HARDSIGN ]	};
+    key	<AC01> {	[     Cyrillic_ef,     Cyrillic_EF	]	};
+    key	<AC02> {	[Cyrillic_ka_descender, Cyrillic_KA_descender ]	};
+    key	<AC03> {	[     Cyrillic_ve,     Cyrillic_VE	]	};
+    key	<AC04> {	[      Cyrillic_a,	Cyrillic_A	]	};
+    key	<AC05> {	[     Cyrillic_pe,     Cyrillic_PE	]	};
+    key	<AC06> {	[     Cyrillic_er,     Cyrillic_ER	]	};
+    key	<AC07> {	[      Cyrillic_o,	Cyrillic_O	]	};
+    key	<AC08> {	[     Cyrillic_el,     Cyrillic_EL	]	};
+    key	<AC09> {	[     Cyrillic_de,     Cyrillic_DE	]	};
+    key	<AC10> {	[    Cyrillic_zhe,    Cyrillic_ZHE	]	};
+    key	<AC11> {	[      Cyrillic_e,	Cyrillic_E	]	};
+    key	<AB01> {	[     Cyrillic_ya,     Cyrillic_YA	]	};
+    key	<AB02> {	[    Cyrillic_che,    Cyrillic_CHE	]	};
+    key	<AB03> {	[     Cyrillic_es,     Cyrillic_ES	]	};
+    key	<AB04> {	[     Cyrillic_em,     Cyrillic_EM	]	};
+    key	<AB06> {	[     Cyrillic_te,     Cyrillic_TE	]	};
+    key	<AB05> {	[      Cyrillic_i,	Cyrillic_I	]	};
+    key	<AB07> {	[Cyrillic_softsign,Cyrillic_SOFTSIGN	]	};
+    key	<AB08> {	[     Cyrillic_be,     Cyrillic_BE	]	};
+    key	<AB09> {	[     Cyrillic_yu,     Cyrillic_YU	]	};
+
+    // End alphanumeric section
+};
+
+partial alphanumeric_keys
+xkb_symbols "latin" {
+    include "us"
+    name[Group1]= "Uzbekistan - Latin";
+    key <AC11>  { [0x010002BB, quotedbl] };
+};