svn merge -r577:HEAD ^/branches/released .

6 files changed, 720 insertions, 649 deletions

diff --git a/xorg-server/xkbdata.src/symbols/Makefile.am b/xorg-server/xkbdata.src/symbols/Makefile.am
index c9fcd4bb5..fc618a4b9 100644
--- a/xorg-server/xkbdata.src/symbols/Makefile.am
+++ b/xorg-server/xkbdata.src/symbols/Makefile.am
@@ -4,9 +4,9 @@ symbolsdir = $(xkb_base)/symbols
 dist_symbols_DATA = \
 ad af al \
 am ara az \
-be bd \
-bg br ba \
-bt by brai \
+ba bd be \
+bg br brai \
+bt bw by \
 ca cd \
 ch cn cz \
 de dk \
diff --git a/xorg-server/xkbdata.src/symbols/ara b/xorg-server/xkbdata.src/symbols/ara
index 9fa40e981..90a584475 100644
--- a/xorg-server/xkbdata.src/symbols/ara
+++ b/xorg-server/xkbdata.src/symbols/ara
@@ -31,30 +31,30 @@ xkb_symbols "basic" {
     key <AD02> {  [      Arabic_sad,     Arabic_fathatan  ]     };
     key <AD03> {  [     Arabic_theh,     Arabic_damma     ]     };
     key <AD04> {  [      Arabic_qaf,     Arabic_dammatan  ]     };
-    key <AD05> {  [      Arabic_feh,     0x100fef9        ]     };
+    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          ]     };
+    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    ]     };
+    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      ]     };
+    key <AC10> {  [      Arabic_kaf,   colon, 0x10006af   ]     };
     key <AC11> {  [      Arabic_tah,        quotedbl      ]     };
 
     key <LSGT> {  [             bar,      brokenbar	  ]     };
-    key <AB01> {  [Arabic_hamzaonyeh,    asciitilde       ]     };
-    key <AB02> {  [    Arabic_hamza,      Arabic_sukun    ]     };
+    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      ]     };
@@ -64,6 +64,8 @@ xkb_symbols "basic" {
     key <AB09> {  [     Arabic_zain,         period       ]     };
     key <AB10> {  [      Arabic_zah, Arabic_question_mark ]     };
 
+    include "level3(ralt_switch)"
+
     // End alphanumeric section
 };
 
diff --git a/xorg-server/xkbdata.src/symbols/bw b/xorg-server/xkbdata.src/symbols/bw
new file mode 100644
index 000000000..ea5079e5d
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/bw
@@ -0,0 +1,19 @@
+partial default alphanumeric_keys  
+xkb_symbols "tswana" {
+
+    include "us"
+
+    name[Group1]= "Botswana";
+        
+    key <AC10> { [ semicolon,	    colon,  0x01000324,  0x01000324 ] };	//COMBINING DIAERESIS BELOW	
+    key <AC11> { [apostrophe,    quotedbl,  0x01000301,  0x01000308 ] };	//COMBINING ACUTE ACCENT, COMBINING DIAERESIS
+    key <TLDE> { [     grave,  asciitilde,  0x01000300,  0x01000303 ] };	//COMBINING GRAVE ACCENT, COMBINING TILDE
+    key <AE06> { [   	   6, asciicircum,  0x01000302 	       	    ] };	//COMBINING CIRCUMFLEX ACCENT
+    key <AE08> { [	   8,    asterisk,  0x01000307,  0x01000323 ] };	//COMBINING DOT ABOVE, COMBINING DOT BELOW
+    key <AE09> { [	   9,   parenleft,  0x01000306	            ] };	//COMBINING BREVE
+    key <AE10> { [	   0,  parenright,  0x0100030c 	            ] };	//COMBINING CARON
+    key <AE11> { [     minus,  underscore,  0x01000304,  0x01000331 ] };	//COMBINING MACRON,COMBINING MACRON BELOW  
+  	
+    include "level3(ralt_switch)"
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/de b/xorg-server/xkbdata.src/symbols/de
index 60b53b545..c442e00ab 100644
--- a/xorg-server/xkbdata.src/symbols/de
+++ b/xorg-server/xkbdata.src/symbols/de
@@ -1,505 +1,505 @@
-
-// based on a keyboard map from an 'xkb/symbols/de' file
-//
-// $XKeyboardConfig$
-// $XFree86: xc/programs/xkbcomp/symbols/de,v 1.6 2003/09/08 13:12:51 pascal Exp $
-
-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" {
-
-    name[Group1]= "Germany - Neo 2";
-
-    // 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_LEVEL_FIVE_LOCK";
-
-    // 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_ALPHABETIC_LEVEL_FIVE_LOCK";
-    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_LEVEL_FIVE_LOCK";
-    key <AD12> { [ dead_acute,              dead_tilde,              dead_stroke,             dead_psili,              dead_doubleacute,        NoSymbol,                dead_breve,              NoSymbol                 ] };
-
-    // Middle row
-    // --------------------------------------------------------------
-    key.type[Group1] = "EIGHT_LEVEL_ALPHABETIC_LEVEL_FIVE_LOCK";
-    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_LEVEL_FIVE_LOCK";
-    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_ALPHABETIC_LEVEL_FIVE_LOCK";
-    key <AB10> { [ j,                       J,                       semicolon,               Greek_theta,             semicolon,               NoSymbol,                Greek_THETA,             NoSymbol                 ] };
-    key.type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK";
-
-    // 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)"
-
-    include "shift(both_capslock)"
-    include "level3(caps_switch)"
-    include "level3(bksl_switch)"
-    include "level5(lsgt_switch_lock)"
-    include "level5(ralt_switch_lock)"
-};
-
-// 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 ]	};
-};
+

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

+//

+// $XKeyboardConfig$

+// $XFree86: xc/programs/xkbcomp/symbols/de,v 1.6 2003/09/08 13:12:51 pascal Exp $

+

+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" {

+

+    name[Group1]= "Germany - Neo 2";

+

+    // 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_ALPHABETIC";

+    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_ALPHABETIC";

+    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_ALPHABETIC";

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

+

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

+};

diff --git a/xorg-server/xkbdata.src/symbols/ke b/xorg-server/xkbdata.src/symbols/ke
index 71629b0c4..5ec174b7e 100644
--- a/xorg-server/xkbdata.src/symbols/ke
+++ b/xorg-server/xkbdata.src/symbols/ke
@@ -5,9 +5,40 @@
 // Please notify any corrections or omissions to
 // Kevin Donnelly (kevin@dotmon.com)
 
-partial default alphanumeric_keys
+partial default alphanumeric_keys  
 xkb_symbols "swa" {
-  include "tz(swa)"
 
-  name[Group1]= "Kenya";
+    include "us"
+
+    name[Group1]= "Kenya";
+    
+    key <AC10> { [ semicolon,	    colon,  0x01000324,  0x01000324 ] };	//COMBINING DIAERESIS BELOW	
+    key <AC11> { [apostrophe,    quotedbl,  0x01000301,  0x01000308 ] };	//COMBINING ACUTE ACCENT, COMBINING DIAERESIS
+    key <TLDE> { [     grave,  asciitilde,  0x01000300,  0x01000303 ] };	//COMBINING GRAVE ACCENT, COMBINING TILDE
+    key <AE06> { [   	   6, asciicircum,  0x01000302 	       	    ] };	//COMBINING CIRCUMFLEX ACCENT
+    key <AE08> { [	   8,    asterisk,  0x01000307,  0x01000323 ] };	//COMBINING DOT ABOVE, COMBINING DOT BELOW
+    key <AE09> { [	   9,   parenleft,  0x01000306	            ] };	//COMBINING BREVE
+    key <AE10> { [	   0,  parenright,  0x0100030c 	            ] };	//COMBINING CARON
+    key <AE11> { [     minus,  underscore,  0x01000304,  0x01000331 ] };	//COMBINING MACRON,COMBINING MACRON BELOW   
+	
+    include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys  
+xkb_symbols "kik" {
+
+    include "us"
+
+    name[Group1]= "Kenya - Kikuyu";
+    
+    key <AC10> { [ semicolon,	    colon,  0x01000324,  0x01000324 ] };	//COMBINING DIAERESIS BELOW	
+    key <AC11> { [apostrophe,    quotedbl,  0x01000301,  0x01000308 ] };	//COMBINING ACUTE ACCENT, COMBINING DIAERESIS
+    key <TLDE> { [     grave,  asciitilde,  0x01000300,  0x01000303 ] };	//COMBINING GRAVE ACCENT, COMBINING TILDE
+    key <AE06> { [   	   6, asciicircum,  0x01000302 	       	    ] };	//COMBINING CIRCUMFLEX ACCENT
+    key <AE08> { [	   8,    asterisk,  0x01000307,  0x01000323 ] };	//COMBINING DOT ABOVE, COMBINING DOT BELOW
+    key <AE09> { [	   9,   parenleft,  0x01000306	            ] };	//COMBINING BREVE
+    key <AE10> { [	   0,  parenright,  0x0100030c 	            ] };	//COMBINING CARON
+    key <AE11> { [     minus,  underscore,  0x01000304,  0x01000331 ] };	//COMBINING MACRON,COMBINING MACRON BELOW 
+	
+    include "level3(ralt_switch)"
 };
diff --git a/xorg-server/xkbdata.src/symbols/level5 b/xorg-server/xkbdata.src/symbols/level5
index 19db36ccd..99cb4601c 100644
--- a/xorg-server/xkbdata.src/symbols/level5
+++ b/xorg-server/xkbdata.src/symbols/level5
@@ -1,132 +1,151 @@
-// $XKeyboardConfig$
-
-// these variants assign various XKB keycodes to ISO_Level5_Shift so that
-// the third shift level can be reached
-//
-// $XFree86: xc/programs/xkbcomp/symbols/level3,v 1.7 2003/09/08 14:25:32 eich Exp $
-//
-
-// using the level(switch) map, the right Control key temporarily
-// chooses the fifth shift level (until it is released).
-partial modifier_keys
-xkb_symbols "rctrl_switch" {
-  key <RCTL> {
-    type[Group1]="ONE_LEVEL",
-    symbols[Group1] = [ ISO_Level5_Shift ]
-    };
-  modifier_map Mod3   { ISO_Level5_Shift };
-};
-
-// The following modifier keys are used to switch to the third shift and to set a
-// corresponding lock, implemented as NumLock.
-
-partial modifier_keys
-xkb_symbols "lock" {
-  // This adds the definitions needed to create a level5-lock behaviour, using
-  // the real modifier NumLock as a lock indicator.
-  // See also: types/level5 : EIGHT_LEVEL_LEVEL_FIVE_LOCK
-  // See also: compat/level5(level5_lock)
-  key.type[Group1] = "ONE_LEVEL";
-
-  replace key <MDSW> {
-    vmods = LevelFive,
-    symbols[Group1] = [ ISO_Level5_Shift ],
-    actions[Group1] = [ SetMods(modifiers=LevelFive) ]
-  };
-  modifier_map Mod3 { <MDSW> };
-
-  replace key <HYPR> {
-    vmods = NumLock,
-    symbols[Group1] = [ NoSymbol ],
-    actions[Group1] = [ SetMods(modifiers=NumLock) ]
-  };
-  modifier_map Mod2 { <HYPR> };
-};
-
-partial modifier_keys
-xkb_symbols "lsgt_switch_lock" {
-
-  include "level5(lock)"
-
-  key <LSGT> {
-    type[Group1] = "EIGHT_LEVEL",
-    symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ]
-  };
-};
-
-partial modifier_keys
-xkb_symbols "lwin_switch_lock" {
-
-  include "level5(lock)"
-
-  key <LWIN> {
-    type[Group1] = "EIGHT_LEVEL",
-    symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ]
-  };
-};
-
-partial modifier_keys
-xkb_symbols "ralt_switch_lock" {
-
-  include "level5(lock)"
-
-  key <RALT> {
-    type[Group1] = "EIGHT_LEVEL",
-    symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ]
-  };
-};
-
-partial modifier_keys
-xkb_symbols "rwin_switch_lock" {
-
-  include "level5(lock)"
-
-  key <RWIN> {
-    type[Group1] = "EIGHT_LEVEL",
-    symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ]
-  };
-};
-
-partial modifier_keys
-xkb_symbols "lsgt_switch_lock_cancel" {
-
-  include "level5(lock)"
-
-  key <LSGT> {
-    type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK",
-    symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ]
-  };
-};
-
-partial modifier_keys
-xkb_symbols "lwin_switch_lock_cancel" {
-
-  include "level5(lock)"
-
-  key <LWIN> {
-    type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK",
-    symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ]
-  };
-};
-
-partial modifier_keys
-xkb_symbols "ralt_switch_lock_cancel" {
-
-  include "level5(lock)"
-
-  key <RALT> {
-    type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK",
-    symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ]
-  };
-};
-
-partial modifier_keys
-xkb_symbols "rwin_switch_lock_cancel" {
-
-  include "level5(lock)"
-
-  key <RWIN> {
-    type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK",
-    symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ]
-  };
-};
+// $XKeyboardConfig$

+

+// these variants assign various XKB keycodes to ISO_Level5_Shift so that

+// the third shift level can be reached

+//

+// $XFree86: xc/programs/xkbcomp/symbols/level3,v 1.7 2003/09/08 14:25:32 eich Exp $

+//

+

+// using the level(switch) map, the right Control key temporarily

+// chooses the fifth shift level (until it is released).

+partial modifier_keys

+xkb_symbols "rctrl_switch" {

+  key <RCTL> {

+    type[Group1]="ONE_LEVEL",

+    symbols[Group1] = [ ISO_Level5_Shift ]

+    };

+  modifier_map Mod3   { ISO_Level5_Shift };

+};

+

+partial modifier_keys

+xkb_symbols "lsgt_switch" {

+  key <LSGT> {

+    type[Group1]="ONE_LEVEL",

+    symbols[Group1] = [ ISO_Level5_Shift ]

+    };

+  modifier_map Mod3   { ISO_Level5_Shift };

+};

+

+partial modifier_keys

+xkb_symbols "ralt_switch" {

+  key <RALT> {

+    type[Group1]="ONE_LEVEL",

+    symbols[Group1] = [ ISO_Level5_Shift ]

+    };

+  modifier_map Mod3   { ISO_Level5_Shift };

+};

+

+

+// The following modifier keys are used to switch to the third shift and to set a

+// corresponding lock, implemented as NumLock.

+

+partial modifier_keys

+xkb_symbols "lock" {

+  // This adds the definitions needed to create a level5-lock behaviour, using

+  // the real modifier NumLock as a lock indicator.

+  // See also: types/level5 : EIGHT_LEVEL_LEVEL_FIVE_LOCK

+  // See also: compat/level5(level5_lock)

+  key.type[Group1] = "ONE_LEVEL";

+

+  replace key <MDSW> {

+    vmods = LevelFive,

+    symbols[Group1] = [ ISO_Level5_Shift ],

+    actions[Group1] = [ SetMods(modifiers=LevelFive) ]

+  };

+  modifier_map Mod3 { <MDSW> };

+

+  replace key <HYPR> {

+    vmods = NumLock,

+    symbols[Group1] = [ NoSymbol ],

+    actions[Group1] = [ SetMods(modifiers=NumLock) ]

+  };

+  modifier_map Mod2 { <HYPR> };

+};

+

+partial modifier_keys

+xkb_symbols "lsgt_switch_lock" {

+

+  include "level5(lock)"

+

+  key <LSGT> {

+    type[Group1] = "EIGHT_LEVEL",

+    symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ]

+  };

+};

+

+partial modifier_keys

+xkb_symbols "lwin_switch_lock" {

+

+  include "level5(lock)"

+

+  key <LWIN> {

+    type[Group1] = "EIGHT_LEVEL",

+    symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ]

+  };

+};

+

+partial modifier_keys

+xkb_symbols "ralt_switch_lock" {

+

+  include "level5(lock)"

+

+  key <RALT> {

+    type[Group1] = "EIGHT_LEVEL",

+    symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ]

+  };

+};

+

+partial modifier_keys

+xkb_symbols "rwin_switch_lock" {

+

+  include "level5(lock)"

+

+  key <RWIN> {

+    type[Group1] = "EIGHT_LEVEL",

+    symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ]

+  };

+};

+

+partial modifier_keys

+xkb_symbols "lsgt_switch_lock_cancel" {

+

+  include "level5(lock)"

+

+  key <LSGT> {

+    type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK",

+    symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ]

+  };

+};

+

+partial modifier_keys

+xkb_symbols "lwin_switch_lock_cancel" {

+

+  include "level5(lock)"

+

+  key <LWIN> {

+    type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK",

+    symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ]

+  };

+};

+

+partial modifier_keys

+xkb_symbols "ralt_switch_lock_cancel" {

+

+  include "level5(lock)"

+

+  key <RALT> {

+    type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK",

+    symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ]

+  };

+};

+

+partial modifier_keys

+xkb_symbols "rwin_switch_lock_cancel" {

+

+  include "level5(lock)"

+

+  key <RWIN> {

+    type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK",

+    symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ]

+  };

+};