test-Version ist angesichts der wenigen Zeit bis zum xkeyboard-config-freeze (http://wiki.neo-layout.org/roadmap) nicht mehr sinnvoll. alle fehler dort sollten so schnell wie möglich von vielen getestet und behoben werden.

git-svn-id: https://svn.neo-layout.org@1827 b9310e46-f624-0410-8ea1-cfbb3a30dc96

3 files changed, 57 insertions, 588 deletions

diff --git a/linux/X/de b/linux/X/de
index ca205d3..08a823f 100644
--- a/linux/X/de
+++ b/linux/X/de
@@ -216,6 +216,7 @@ xkb_symbols "sundeadkeys" {
 // 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>
@@ -240,66 +241,74 @@ xkb_symbols "neo" {
     // Ebene 6: Mod3 + Mod4
     // Compose (not a level): Mod3 + Tab
     // Feststelltaste (Capslock): Shift + Shift
-    // Mod3-Lock: Mod3 + Mod3
     // Mod4-Lock: Mod4 + Mod4
     //
-    // Levels in Xkbmap jargon to be found here in the definitions. 
-    // These are the levels used, and Xorg's translations with type="EIGHT_LEVEL":
-    // --------------------------------------------------------------
 
-    // Legend
-    // ===============
-    // I don't think we need EIGHT_LEVEL_ALPHABETIC because the Lock gets deactivated
-    // as soon as a Shift-key is pressed.
-    // Therefore there is no need for Lock + Shift.
-    // key.type[Group1] = "EIGHT_LEVEL_ALPHABETIC";
-    key.type[Group1] = "EIGHT_LEVEL";
-
-    // Xorg:       Level1                   Level2                   Level3                   Level4                   Level5                   Level6                   Level7                   Level8                   
-    // Neo:        Ebene1                   Ebene2                   Ebene4                   ???                      Ebene3                   Ebene5                   Ebene6                   ???                      
-    // Keys (Neo): None                     Shift                    Mod4                     Mod4 + Shift             Mod3                     Mod3 + Shift             Mod3 + Mod4              Mod3 + Mod4 + Shift      
+    // NOTE: To get the desired Mod4-Lock the real modifier Mod2 was misused in order to get control over the lock-state!
+    // I wasn't able to get it working with a virtual modifier and I think its not that fatal, because Num-Lock (the original use for Mod2) isn't used in Neo anyways.
 
 
     // Modifier-keys
     // ===============
 
-    // FIXME Force norepeat is not working correctly:
-    // key <BKSL> { repeat = false };
-    // key <LSGT> { repeat = false };
-    // key <RALT> { repeat = false };
-
     // Shift
     // --------------------------------------------------------------
-    // Redefinition of both Shift-keys in order to get the desired "Shift + Shift = Shift_Lock"
-    key <LFSH> { [ Shift_L,                 Shift_Lock,              Shift_L,                 Shift_Lock,              Shift_L,                 Shift_Lock,              Shift_L,                 Shift_Lock               ] };
-    key <RTSH> { [ Shift_R,                 Shift_Lock,              Shift_R,                 Shift_Lock,              Shift_R,                 Shift_Lock,              Shift_R,                 Shift_Lock               ] };
+    // Shift + Shift = Caps_Lock
+    key.type[Group1] = "TWO_LEVEL";
+    key <LFSH> {
+        symbols[Group1] = [ Shift_L,                       Caps_Lock                ],
+        actions[Group1] = [ SetMods(modifiers=Shift),      LockMods(modifiers=Lock) ]
+    };
+    key <RTSH> {
+        symbols[Group1] = [ Shift_R,                       Caps_Lock                ],
+        actions[Group1] = [ SetMods(modifiers=Shift),      LockMods(modifiers=Lock) ]
+    };
 
     // Neo-Mod3
     // --------------------------------------------------------------
-    // Mod3 + Mod3 = Mod3_Lock
-    key <LSGT> { [ ISO_Level3_Shift,        ISO_Level3_Shift,        ISO_Level3_Lock,         ISO_Level3_Lock,         ISO_Level3_Shift,        ISO_Level3_Shift,        ISO_Level3_Lock,         ISO_Level3_Lock          ] };
-    key <RALT> { [ ISO_Level3_Shift,        ISO_Level3_Shift,        ISO_Level3_Lock,         ISO_Level3_Lock,         ISO_Level3_Shift,        ISO_Level3_Shift,        ISO_Level3_Lock,         ISO_Level3_Lock          ] };
-    // The following is also done somewhere else, but I couldn't find where and since the
-    // modifier_map is needed by ISO_Level5 too (see below) I'm adding it here.
-    // Also see how Level-switching is done in "symbols/level3(ralt_switch)"
-    modifier_map Mod5   { ISO_Level3_Shift }; // optional
-    //      This ^^^^ has nothing to do with the "Neo-Mod-Keys"!
+    key.type[Group1] = "ONE_LEVEL";
+    key <CAPS> {
+        vmods = LevelFive,
+        symbols[Group1] = [ ISO_Level3_Shift             ],
+        actions[Group1] = [ SetMods(modifiers=LevelFive) ]
+    };
+    key <BKSL> {
+        vmods = LevelFive,
+        symbols[Group1] = [ ISO_Level3_Shift             ],
+        actions[Group1] = [ SetMods(modifiers=LevelFive) ]
+    };
+    modifier_map Mod3 { <CAPS>, <BKSL> };
 
     // Neo-Mod4
     // --------------------------------------------------------------
+    key.type[Group1] = "THREE_LEVEL";
     // Mod4 + Mod4 = Mod4_Lock
-    // The console-setup package doesn't like ISO_Level5_Shift and ISO_Level5_Lock, see
-    // https://bugs.launchpad.net/ubuntu/+source/console-setup/+bug/363388
-    key <CAPS> { [ ISO_Level5_Shift,        ISO_Level5_Shift,        ISO_Level5_Shift,        ISO_Level5_Shift,        ISO_Level5_Lock,         ISO_Level5_Lock,         ISO_Level5_Lock,         ISO_Level5_Lock          ] };
-    key <BKSL> { [ ISO_Level5_Shift,        ISO_Level5_Shift,        ISO_Level5_Shift,        ISO_Level5_Shift,        ISO_Level5_Lock,         ISO_Level5_Lock,         ISO_Level5_Lock,         ISO_Level5_Lock          ] };
-    // ISO_Level5_Shift alone won't have the desired effect in all applicitions, therefore
-    // adding the following as it is done in "symbols/level5(rctrl_switch)".
-    modifier_map Mod3   { ISO_Level5_Shift }; // mandatory
-    //      This ^^^^ has nothing to do with the "Neo-Mod-Keys"!
+    key <LSGT> {
+    	vmods = NumLock,
+        symbols[Group1] = [ Num_Lock,                      Num_Lock,                      Num_Lock                    ],
+        actions[Group1] = [ SetMods(modifiers=LevelThree), SetMods(modifiers=LevelThree), LockMods(modifiers=NumLock) ]
+    };
+    key <RALT> {
+    	vmods = NumLock,
+        symbols[Group1] = [ Num_Lock,                      Num_Lock,                      Num_Lock                    ],
+        actions[Group1] = [ SetMods(modifiers=LevelThree), SetMods(modifiers=LevelThree), LockMods(modifiers=NumLock) ]
+    };
+    modifier_map Mod2 { <LSGT>, <RALT> };
+
+
+    // 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                   Ebene4                   ???                      Ebene3                   Ebene5                   Ebene6                   ???                      
+    // Keys (Neo): None                     Shift                    Mod4                     Mod4 + Shift             Mod3                     Mod3 + Shift             Mod3 + Mod4              Mod3 + Mod4 + Shift      
 
 
     // Alphanumeric-keys
     // ===============
+    key.type[Group1] = "EIGHT_LEVEL_NEO_LOCKS";
 
     // Tab as Multi_key (Compose)
     // --------------------------------------------------------------
@@ -320,13 +329,14 @@ xkb_symbols "neo" {
     key <AE08> { [ 8,                       doublelowquotemark,      NoSymbol,                NoSymbol,                singlelowquotemark,      U27E8,                   U221E,                   NoSymbol                 ] };
     key <AE09> { [ 9,                       leftdoublequotemark,     KP_Divide,               NoSymbol,                leftsinglequotemark,     U27E9,                   U220B,                   NoSymbol                 ] };
     key <AE10> { [ 0,                       rightdoublequotemark,    KP_Multiply,             NoSymbol,                rightsinglequotemark,    zerosubscript,           emptyset,                NoSymbol                 ] };
-    
+
     key <AE11> { [ minus,                   emdash,                  KP_Subtract,             NoSymbol,                NoSymbol,                U2011,                   hyphen,                  NoSymbol                 ] };
     key <AE12> { [ dead_grave,              NoSymbol,                dead_doublegrave,        NoSymbol,                dead_diaeresis,          dead_dasia,              NoSymbol,                NoSymbol                 ] };
     key <BKSP> { [ BackSpace,               BackSpace,               BackSpace,               BackSpace,               BackSpace,               BackSpace,               BackSpace,               NoSymbol                 ] };
 
     // Top Row
     // --------------------------------------------------------------
+    key.type[Group1] = "EIGHT_LEVEL_NEO_LOCKS_QUATERALPHABETIC";
     key <AD01> { [ x,                       X,                       U22EE,                   NoSymbol,                ellipsis,                Greek_xi,                Greek_XI,                NoSymbol                 ] };
     key <AD02> { [ v,                       V,                       BackSpace,               BackSpace,               underscore,              NoSymbol,                U222E,                   NoSymbol                 ] };
     key <AD03> { [ l,                       L,                       Up,                      Up,                      bracketleft,             Greek_lambda,            Greek_LAMBDA,            NoSymbol                 ] };
@@ -340,10 +350,13 @@ xkb_symbols "neo" {
     key <AD10> { [ q,                       Q,                       KP_Add,                  NoSymbol,                ampersand,               U03D5,                   U211A,                   NoSymbol                 ] };
 
     key <AD11> { [ ssharp,                  U1E9E,                   U2212,                   NoSymbol,                U017F,                   Greek_finalsmallsigma,   jot,                     NoSymbol                 ] };
+
+    key.type[Group1] = "EIGHT_LEVEL_NEO_LOCKS";
     key <AD12> { [ dead_acute,              dead_cedilla,            dead_doubleacute,        NoSymbol,                dead_stroke,             dead_psili,              dead_abovedot,           NoSymbol                 ] };
 
     // Middle Row
     // --------------------------------------------------------------
+    key.type[Group1] = "EIGHT_LEVEL_NEO_LOCKS_QUATERALPHABETIC";
     key <AC01> { [ u,                       U,                       Home,                    Home,                    backslash,               NoSymbol,                mu,                      NoSymbol                 ] };
     key <AC02> { [ i,                       I,                       Left,                    Left,                    slash,                   Greek_iota,              integral,                NoSymbol                 ] };
     key <AC03> { [ a,                       A,                       Down,                    Down,                    braceleft,               Greek_alpha,             U2200,                   NoSymbol                 ] };
@@ -364,13 +377,16 @@ xkb_symbols "neo" {
     key <AB02> { [ odiaeresis,              Odiaeresis,              Tab,                     Tab,                     dollar,                  U03F5,                   U2111,                   NoSymbol                 ] };
     key <AB03> { [ adiaeresis,              Adiaeresis,              Next,                    Next,                    bar,                     Greek_eta,               U2135,                   NoSymbol                 ] };
     key <AB04> { [ p,                       P,                       Return,                  Return,                  asciitilde,              Greek_pi,                Greek_PI,                NoSymbol                 ] };
-    key <AB05> { [ z,                       Z,                       NoSymbol,                NoSymbol,                grave,                   Greek_zeta,              U2124,                   NoSymbol                 ] };
+    key <AB05> { [ z,                       Z,                       Undo,                    NoSymbol,                grave,                   Greek_zeta,              U2124,                   NoSymbol                 ] };
 
     key <AB06> { [ b,                       B,                       colon,                   NoSymbol,                plus,                    Greek_beta,              U21D0,                   NoSymbol                 ] };
     key <AB07> { [ m,                       M,                       KP_1,                    NoSymbol,                percent,                 Greek_mu,                ifonlyif,                NoSymbol                 ] };
+    key.type[Group1] = "EIGHT_LEVEL_NEO_LOCKS";
     key <AB08> { [ comma,                   endash,                  KP_2,                    NoSymbol,                quotedbl,                Greek_rho,               U21D2,                   NoSymbol                 ] };
     key <AB09> { [ period,                  enfilledcircbullet,      KP_3,                    NoSymbol,                apostrophe,              U03D1,                   Greek_THETA,             NoSymbol                 ] };
+    key.type[Group1] = "EIGHT_LEVEL_NEO_LOCKS_QUATERALPHABETIC";
     key <AB10> { [ j,                       J,                       semicolon,               NoSymbol,                semicolon,               Greek_theta,             variation,               NoSymbol                 ] };
+    key.type[Group1] = "EIGHT_LEVEL_NEO_LOCKS";
 
     // Space key
     // --------------------------------------------------------------
@@ -380,9 +396,6 @@ xkb_symbols "neo" {
     // Keypad-keys
     // ===============
 
-    // Num-Lock is no longer used with Neo:
-    //key.type[Group1]="FOUR_LEVEL_MIXED_KEYPAD";
-
     // The former Numlock key:
     key <NMLK> { [ Tab,                     ISO_Left_Tab,            notequal,                NoSymbol,                equal,                   approxeq,                identical,               NoSymbol                 ] };
 
diff --git a/linux/X/de-test b/linux/X/de-test
deleted file mode 100644
index 08a823f..0000000
--- a/linux/X/de-test
+++ /dev/null
@@ -1,544 +0,0 @@
-
-// 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,   dead_grave,   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>	{ [apostrophe,      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 contributers
-//
-//      http://www.neo-layout.org
-//
-// $Revision$, $Date$
-
-partial alphanumeric_keys modifier_keys keypad_keys
-xkb_symbols "neo" {
-
-    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
-    //
-
-    // NOTE: To get the desired Mod4-Lock the real modifier Mod2 was misused in order to get control over the lock-state!
-    // I wasn't able to get it working with a virtual modifier and I think its not that fatal, because Num-Lock (the original use for Mod2) isn't used in Neo anyways.
-
-
-    // Modifier-keys
-    // ===============
-
-    // Shift
-    // --------------------------------------------------------------
-    // Shift + Shift = Caps_Lock
-    key.type[Group1] = "TWO_LEVEL";
-    key <LFSH> {
-        symbols[Group1] = [ Shift_L,                       Caps_Lock                ],
-        actions[Group1] = [ SetMods(modifiers=Shift),      LockMods(modifiers=Lock) ]
-    };
-    key <RTSH> {
-        symbols[Group1] = [ Shift_R,                       Caps_Lock                ],
-        actions[Group1] = [ SetMods(modifiers=Shift),      LockMods(modifiers=Lock) ]
-    };
-
-    // Neo-Mod3
-    // --------------------------------------------------------------
-    key.type[Group1] = "ONE_LEVEL";
-    key <CAPS> {
-        vmods = LevelFive,
-        symbols[Group1] = [ ISO_Level3_Shift             ],
-        actions[Group1] = [ SetMods(modifiers=LevelFive) ]
-    };
-    key <BKSL> {
-        vmods = LevelFive,
-        symbols[Group1] = [ ISO_Level3_Shift             ],
-        actions[Group1] = [ SetMods(modifiers=LevelFive) ]
-    };
-    modifier_map Mod3 { <CAPS>, <BKSL> };
-
-    // Neo-Mod4
-    // --------------------------------------------------------------
-    key.type[Group1] = "THREE_LEVEL";
-    // Mod4 + Mod4 = Mod4_Lock
-    key <LSGT> {
-    	vmods = NumLock,
-        symbols[Group1] = [ Num_Lock,                      Num_Lock,                      Num_Lock                    ],
-        actions[Group1] = [ SetMods(modifiers=LevelThree), SetMods(modifiers=LevelThree), LockMods(modifiers=NumLock) ]
-    };
-    key <RALT> {
-    	vmods = NumLock,
-        symbols[Group1] = [ Num_Lock,                      Num_Lock,                      Num_Lock                    ],
-        actions[Group1] = [ SetMods(modifiers=LevelThree), SetMods(modifiers=LevelThree), LockMods(modifiers=NumLock) ]
-    };
-    modifier_map Mod2 { <LSGT>, <RALT> };
-
-
-    // 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                   Ebene4                   ???                      Ebene3                   Ebene5                   Ebene6                   ???                      
-    // Keys (Neo): None                     Shift                    Mod4                     Mod4 + Shift             Mod3                     Mod3 + Shift             Mod3 + Mod4              Mod3 + Mod4 + Shift      
-
-
-    // Alphanumeric-keys
-    // ===============
-    key.type[Group1] = "EIGHT_LEVEL_NEO_LOCKS";
-
-    // Tab as Multi_key (Compose)
-    // --------------------------------------------------------------
-    key  <TAB> { [ Tab,                     ISO_Left_Tab,            NoSymbol,                NoSymbol,                Multi_key,               NoSymbol,                NoSymbol,                NoSymbol                 ] };
-
-    // Number Row
-    // --------------------------------------------------------------
-    key <TLDE> { [ dead_circumflex,         dead_tilde,              dead_caron,              Pointer_EnableKeys,      dead_abovering,          dead_breve,              dead_macron,             NoSymbol                 ] };
-
-    key <AE01> { [ 1,                       degree,                  ordfeminine,             NoSymbol,                onesuperior,             onesubscript,            notsign,                 NoSymbol                 ] };
-    key <AE02> { [ 2,                       section,                 masculine,               NoSymbol,                twosuperior,             twosubscript,            logicalor,               NoSymbol                 ] };
-    key <AE03> { [ 3,                       U2113,                   numerosign,              NoSymbol,                threesuperior,           threesubscript,          logicaland,              NoSymbol                 ] };
-    key <AE04> { [ 4,                       guillemotright,          Prior,                   Prior,                   U203A,                   femalesymbol,            U22A5,                   NoSymbol                 ] };
-    key <AE05> { [ 5,                       guillemotleft,           periodcentered,          NoSymbol,                U2039,                   malesymbol,              U2221,                   NoSymbol                 ] };
-    key <AE06> { [ 6,                       dollar,                  sterling,                NoSymbol,                cent,                    U26A5,                   U2225,                   NoSymbol                 ] };
-
-    key <AE07> { [ 7,                       EuroSign,                currency,                NoSymbol,                yen,                     Greek_kappa,             rightarrow,              NoSymbol                 ] };
-    key <AE08> { [ 8,                       doublelowquotemark,      NoSymbol,                NoSymbol,                singlelowquotemark,      U27E8,                   U221E,                   NoSymbol                 ] };
-    key <AE09> { [ 9,                       leftdoublequotemark,     KP_Divide,               NoSymbol,                leftsinglequotemark,     U27E9,                   U220B,                   NoSymbol                 ] };
-    key <AE10> { [ 0,                       rightdoublequotemark,    KP_Multiply,             NoSymbol,                rightsinglequotemark,    zerosubscript,           emptyset,                NoSymbol                 ] };
-
-    key <AE11> { [ minus,                   emdash,                  KP_Subtract,             NoSymbol,                NoSymbol,                U2011,                   hyphen,                  NoSymbol                 ] };
-    key <AE12> { [ dead_grave,              NoSymbol,                dead_doublegrave,        NoSymbol,                dead_diaeresis,          dead_dasia,              NoSymbol,                NoSymbol                 ] };
-    key <BKSP> { [ BackSpace,               BackSpace,               BackSpace,               BackSpace,               BackSpace,               BackSpace,               BackSpace,               NoSymbol                 ] };
-
-    // Top Row
-    // --------------------------------------------------------------
-    key.type[Group1] = "EIGHT_LEVEL_NEO_LOCKS_QUATERALPHABETIC";
-    key <AD01> { [ x,                       X,                       U22EE,                   NoSymbol,                ellipsis,                Greek_xi,                Greek_XI,                NoSymbol                 ] };
-    key <AD02> { [ v,                       V,                       BackSpace,               BackSpace,               underscore,              NoSymbol,                U222E,                   NoSymbol                 ] };
-    key <AD03> { [ l,                       L,                       Up,                      Up,                      bracketleft,             Greek_lambda,            Greek_LAMBDA,            NoSymbol                 ] };
-    key <AD04> { [ c,                       C,                       Delete,                  Delete,                  bracketright,            Greek_chi,               U2102,                   NoSymbol                 ] };
-    key <AD05> { [ w,                       W,                       Insert,                  Insert,                  asciicircum,             Greek_omega,             Greek_OMEGA,             NoSymbol                 ] };
-
-    key <AD06> { [ k,                       K,                       exclamdown,              NoSymbol,                exclam,                  U03F0,                   radical,                 NoSymbol                 ] };
-    key <AD07> { [ h,                       H,                       KP_7,                    NoSymbol,                less,                    Greek_psi,               Greek_PSI,               NoSymbol                 ] };
-    key <AD08> { [ g,                       G,                       KP_8,                    NoSymbol,                greater,                 Greek_gamma,             Greek_GAMMA,             NoSymbol                 ] };
-    key <AD09> { [ f,                       F,                       KP_9,                    NoSymbol,                equal,                   Greek_phi,               Greek_PHI,               NoSymbol                 ] };
-    key <AD10> { [ q,                       Q,                       KP_Add,                  NoSymbol,                ampersand,               U03D5,                   U211A,                   NoSymbol                 ] };
-
-    key <AD11> { [ ssharp,                  U1E9E,                   U2212,                   NoSymbol,                U017F,                   Greek_finalsmallsigma,   jot,                     NoSymbol                 ] };
-
-    key.type[Group1] = "EIGHT_LEVEL_NEO_LOCKS";
-    key <AD12> { [ dead_acute,              dead_cedilla,            dead_doubleacute,        NoSymbol,                dead_stroke,             dead_psili,              dead_abovedot,           NoSymbol                 ] };
-
-    // Middle Row
-    // --------------------------------------------------------------
-    key.type[Group1] = "EIGHT_LEVEL_NEO_LOCKS_QUATERALPHABETIC";
-    key <AC01> { [ u,                       U,                       Home,                    Home,                    backslash,               NoSymbol,                mu,                      NoSymbol                 ] };
-    key <AC02> { [ i,                       I,                       Left,                    Left,                    slash,                   Greek_iota,              integral,                NoSymbol                 ] };
-    key <AC03> { [ a,                       A,                       Down,                    Down,                    braceleft,               Greek_alpha,             U2200,                   NoSymbol                 ] };
-    key <AC04> { [ e,                       E,                       Right,                   Right,                   braceright,              Greek_epsilon,           U2203,                   NoSymbol                 ] };
-    key <AC05> { [ o,                       O,                       End,                     End,                     asterisk,                Greek_omicron,           elementof,               NoSymbol                 ] };
-
-    key <AC06> { [ s,                       S,                       questiondown,            NoSymbol,                question,                Greek_sigma,             Greek_SIGMA,             NoSymbol                 ] };
-    key <AC07> { [ n,                       N,                       KP_4,                    NoSymbol,                parenleft,               Greek_nu,                U2115,                   NoSymbol                 ] };
-    key <AC08> { [ r,                       R,                       KP_5,                    NoSymbol,                parenright,              U03F1,                   U211D,                   NoSymbol                 ] };
-    key <AC09> { [ t,                       T,                       KP_6,                    NoSymbol,                minus,                   Greek_tau,               partialderivative,       NoSymbol                 ] };
-    key <AC10> { [ d,                       D,                       KP_Separator,            NoSymbol,                colon,                   Greek_delta,             Greek_DELTA,             NoSymbol                 ] };
-
-    key <AC11> { [ y,                       Y,                       KP_Decimal,              NoSymbol,                at,                      Greek_upsilon,           nabla,                   NoSymbol                 ] };
-
-    // Bottom Row
-    // --------------------------------------------------------------
-    key <AB01> { [ udiaeresis,              Udiaeresis,              Escape,                  Escape,                  numbersign,              NoSymbol,                U211C,                   NoSymbol                 ] };
-    key <AB02> { [ odiaeresis,              Odiaeresis,              Tab,                     Tab,                     dollar,                  U03F5,                   U2111,                   NoSymbol                 ] };
-    key <AB03> { [ adiaeresis,              Adiaeresis,              Next,                    Next,                    bar,                     Greek_eta,               U2135,                   NoSymbol                 ] };
-    key <AB04> { [ p,                       P,                       Return,                  Return,                  asciitilde,              Greek_pi,                Greek_PI,                NoSymbol                 ] };
-    key <AB05> { [ z,                       Z,                       Undo,                    NoSymbol,                grave,                   Greek_zeta,              U2124,                   NoSymbol                 ] };
-
-    key <AB06> { [ b,                       B,                       colon,                   NoSymbol,                plus,                    Greek_beta,              U21D0,                   NoSymbol                 ] };
-    key <AB07> { [ m,                       M,                       KP_1,                    NoSymbol,                percent,                 Greek_mu,                ifonlyif,                NoSymbol                 ] };
-    key.type[Group1] = "EIGHT_LEVEL_NEO_LOCKS";
-    key <AB08> { [ comma,                   endash,                  KP_2,                    NoSymbol,                quotedbl,                Greek_rho,               U21D2,                   NoSymbol                 ] };
-    key <AB09> { [ period,                  enfilledcircbullet,      KP_3,                    NoSymbol,                apostrophe,              U03D1,                   Greek_THETA,             NoSymbol                 ] };
-    key.type[Group1] = "EIGHT_LEVEL_NEO_LOCKS_QUATERALPHABETIC";
-    key <AB10> { [ j,                       J,                       semicolon,               NoSymbol,                semicolon,               Greek_theta,             variation,               NoSymbol                 ] };
-    key.type[Group1] = "EIGHT_LEVEL_NEO_LOCKS";
-
-    // Space key
-    // --------------------------------------------------------------
-    key <SPCE> { [ space,                   space,                   KP_0,                    NoSymbol,                space,                   nobreakspace,            U202F,                   NoSymbol                 ] };
-
-
-    // Keypad-keys
-    // ===============
-
-    // The former Numlock key:
-    key <NMLK> { [ Tab,                     ISO_Left_Tab,            notequal,                NoSymbol,                equal,                   approxeq,                identical,               NoSymbol                 ] };
-
-    // Topmost Row
-    // --------------------------------------------------------------
-    key <KPDV> { [ KP_Divide,               KP_Divide,               U2215,                   NoSymbol,                division,                U2300,                   U2223,                   NoSymbol                 ] };
-    key <KPMU> { [ KP_Multiply,             KP_Multiply,             multiply,                NoSymbol,                U2219,                   U2299,                   U2297,                   NoSymbol                 ] };
-    key <KPSU> { [ KP_Subtract,             KP_Subtract,             U2216,                   NoSymbol,                U2212,                   U2296,                   U2238,                   NoSymbol                 ] };
-
-    // Top Row
-    // --------------------------------------------------------------
-    key  <KP7> { [ KP_7,                    U2714,                   KP_Home,                 KP_Home,                 U2195,                   U226A,                   upstile,                 NoSymbol                 ] };
-    key  <KP8> { [ KP_8,                    U2718,                   KP_Up,                   KP_Up,                   uparrow,                 intersection,            U22C2,                   NoSymbol                 ] };
-    key  <KP9> { [ KP_9,                    dagger,                  KP_Prior,                KP_Prior,                U20D7,                   U226B,                   U2309,                   NoSymbol                 ] };
-    key <KPAD> { [ KP_Add,                  KP_Add,                  U2213,                   NoSymbol,                plusminus,               U2295,                   U2214,                   NoSymbol                 ] };
- 
-    // Middle Row
-    // --------------------------------------------------------------
-    key  <KP4> { [ KP_4,                    club,                    KP_Left,                 KP_Left,                 leftarrow,               includedin,              U2286,                   NoSymbol                 ] };
-    key  <KP5> { [ KP_5,                    EuroSign,                KP_Begin,                KP_Begin,                brokenbar,               U22B6,                   U22B7,                   NoSymbol                 ] };
-    key  <KP6> { [ KP_6,                    U2023,                   KP_Right,                KP_Right,                rightarrow,              includes,                U2287,                   NoSymbol                 ] };
-
-    // Bottom Row
-    // --------------------------------------------------------------
-    key  <KP1> { [ KP_1,                    diamond,                 KP_End,                  KP_End,                  U2194,                   lessthanequal,           downstile,               NoSymbol                 ] };
-    key  <KP2> { [ KP_2,                    heart,                   KP_Down,                 KP_Down,                 downarrow,               union,                   U22C3,                   NoSymbol                 ] };
-    key  <KP3> { [ KP_3,                    U2660,                   KP_Next,                 KP_Next,                 U21CC,                   greaterthanequal,        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,                   KP_Insert,               KP_Insert,               percent,                 U2030,                   U25A1,                   NoSymbol                 ] };
-    key <KPDL> { [ KP_Separator,            KP_Decimal,              KP_Delete,               KP_Delete,               period,                  apostrophe,              quotedbl,                NoSymbol                 ] };
-};
-
-// 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/linux/X/level5-test b/linux/X/level5
index 9a6b22a..9a6b22a 100644
--- a/linux/X/level5-test
+++ b/linux/X/level5