Stephans Version, siehe Ticket #33

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

3 files changed, 140 insertions, 1109 deletions

diff --git a/linux/X/de b/linux/X/de
index 29362bf..a14e791 100644
--- a/linux/X/de
+++ b/linux/X/de
@@ -216,7 +216,6 @@ xkb_symbols "sundeadkeys" {
 //
 // $Revision$, $Date$
 
-
 partial alphanumeric_keys modifier_keys keypad_keys
 xkb_symbols "neo" {
 
@@ -230,156 +229,180 @@ xkb_symbols "neo" {
     // Ebene 4: Mod4 (for marking something use Shift+Mod4)
     // Ebene 5: Shift+Mod3
     // Ebene 6: Mod3+Mod4 (in this order)
-    // Compose (not a level): Mod3+Tab
-    // Feststelltaste (Capslock): Mod3+Mod3
+    // Compose (not a level): Mod3 + Tab
+    // Feststelltaste (Capslock): Shift + Shift
     //
     // Levels in Xkbmap jargon to be found here in the definitions. 
     // These are the levels used, and Xorg's translations with type="EIGHT_LEVEL":
     // --------------------------------------------------------------
-    //   Modifier:        None    Shift   Mod3    Shift+Mod3  Mod4    Shift+Mod4    Mod3+Mod4
-    //   Xorg calls it:   Level1  Level2  Level3  Level4      Level5  Level6        Level7
-    //   Neo calls it:    Ebene1  Ebene2  Ebene3  Ebene5      Ebene4  Ebene4+Shift  Ebene6
 
-    // Modifier definitions
-    // --------------------------------------------------------------
-    // Definition of the so called Neo-Mod3
-    // (FIXME Nur CAPS+BKSL ist Caps_Lock – Nicht andersherum, siehe Ticket #30)
-    key.type[Group1]="THREE_LEVEL";
-    key <BKSL> { [ ISO_Level3_Shift, ISO_Level3_Shift,  Caps_Lock ] };
-    key <CAPS> { [ ISO_Level3_Shift, ISO_Level3_Shift,  Caps_Lock ] };
-
-    // Definition of the so called Neo-Mod4
-    // FIXME ISO_Level5_Shift was causing problems, though it's defined in
-    // /usr/include/X11/keysymdef.h on Ubuntu 8.10 (ticket #33),
-    // using hexcode 0xfe11 again for now
-    key.type[Group1]="ONE_LEVEL";
-    key <LSGT> { type[Group1]="ONE_LEVEL", [ 0xfe11 ]};
-    key <RALT> { [ 0xfe11 ]};
-    modifier_map Mod3 { <LSGT>, <RALT> };
-    // Attention: ^^^ This is a X server variable, not the Neo-Mod3.
-
-    key.type[Group1]="EIGHT_LEVEL_ALPHABETIC" ;
+    // Legend
+    // ===============
+    // I don't think we need EIGHT_LEVEL_ALPHABETIC because the Lock gets deaktivated 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";
 
-    // Tab as Multi_key (Compose)
+    // Xorg:       Level1                   Level2                   Level3                   Level4                   Level5                   Level6                   Level7                   Level8                   
+    // Neo:        Ebene1                   Ebene2                   Ebene3                   Ebene5                   Ebene4                   ???                      Ebene6                   ???                      
+    // Keys (Neo): None                     Shift                    Mod3                     Mod3 + Shift             Mod4                     Mod4 + Shift             Mod3 + Mod4              Mod3 + Mod4 + Shift      
+
+
+    // Modifier-keys
+    // ===============
+
+    // FIXME Force norepeat is not working correctly:
+    // key <BKSL> { repeat = false };
+    // key <LSGT> { repeat = false };
+    // key <RALT> { repeat = false };
+
+    // Shift
     // --------------------------------------------------------------
-    key  <TAB> { [ Tab, ISO_Left_Tab, Multi_key ] };
+    // 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               ] };
 
-    // number row
+    // Neo-Mod3
+    // --------------------------------------------------------------
+    // Mod3 + Mod3 = Mod3_Lock
+    key <CAPS> { [ 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 <BKSL> { [ 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"!
+
+    // Neo-Mod4
     // --------------------------------------------------------------
-    key <TLDE> { [ dead_circumflex, dead_tilde,         dead_abovering,         dead_breve,         dead_caron, Pointer_EnableKeys, dead_macron ] };
+    // 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 <LSGT> { [ 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 <RALT> { [ 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 <AE01> { [ 1,           degree,                 onesuperior,            onesubscript,       ordfeminine,    NoSymbol,    notsign        ] };
-    key <AE02> { [ 2,           section,                twosuperior,            twosubscript,       masculine,      NoSymbol,    logicalor      ] };
-    key <AE03> { [ 3,           U2113,                  threesuperior,          threesubscript,     numerosign,     NoSymbol,    logicaland     ] };
-    key <AE04> { [ 4,           guillemotright,         U203A,                  femalesymbol,       Prior,          Prior,       U22A5          ] };
-    key <AE05> { [ 5,           guillemotleft,          U2039,                  malesymbol,         periodcentered, NoSymbol,    U2221          ] };
-    key <AE06> { [ 6,           dollar,                 cent,                   U26A5,              sterling,       NoSymbol,    U2225          ] };
 
-    key <AE07> { [ 7,           EuroSign,               yen,                    Greek_kappa,        currency,       NoSymbol,    rightarrow     ] };
-    key <AE08> { [ 8,           doublelowquotemark,     singlelowquotemark,     U27E8,              NoSymbol,       NoSymbol,    U221E          ] };
-    key <AE09> { [ 9,           leftdoublequotemark,    leftsinglequotemark,    U27E9,              KP_Divide,      NoSymbol,    U220B          ] };
-    key <AE10> { [ 0,           rightdoublequotemark,   rightsinglequotemark,   zerosubscript,      KP_Multiply,    NoSymbol,    emptyset       ] };
+    // Alphanumeric-keys
+    // ===============
 
-    key <AE11> { [ minus,       emdash,                 NoSymbol,               U2011,              KP_Subtract,    NoSymbol,    hyphen         ] };
-    key <AE12> { [ dead_grave,  NoSymbol,               dead_diaeresis,         dead_dasia,       dead_doublegrave, NoSymbol,    
-NoSymbol       ] };
+    // Tab as Multi_key (Compose)
+    // --------------------------------------------------------------
+    key  <TAB> { [ Tab,                     ISO_Left_Tab,            Multi_key,               NoSymbol,                NoSymbol,                NoSymbol,                NoSymbol,                NoSymbol                 ] };
 
-    key <BKSP> { [ BackSpace,   BackSpace,              BackSpace,              BackSpace,          BackSpace,      BackSpace,   BackSpace      ] };
+    // Number Row
+    // --------------------------------------------------------------
+    key <TLDE> { [ dead_circumflex,         dead_tilde,              dead_abovering,          dead_breve,              dead_caron,              Pointer_EnableKeys,      dead_macron,             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,            Prior,                   Prior,                   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,                     Greek_kappa,             currency,                NoSymbol,                rightarrow,              NoSymbol                 ] };
+    key <AE08> { [ 8,                       doublelowquotemark,      singlelowquotemark,      U27E8,                   NoSymbol,                NoSymbol,                U221E,                   NoSymbol                 ] };
+    key <AE09> { [ 9,                       leftdoublequotemark,     leftsinglequotemark,     U27E9,                   KP_Divide,               NoSymbol,                U220B,                   NoSymbol                 ] };
+    key <AE10> { [ 0,                       rightdoublequotemark,    rightsinglequotemark,    zerosubscript,           KP_Multiply,             NoSymbol,                emptyset,                NoSymbol                 ] };
+    
+    key <AE11> { [ minus,                   emdash,                  NoSymbol,                U2011,                   KP_Subtract,             NoSymbol,                hyphen,                  NoSymbol                 ] };
+    key <AE12> { [ dead_grave,              NoSymbol,                dead_diaeresis,          dead_dasia,              dead_doublegrave,        NoSymbol,                NoSymbol,                NoSymbol                 ] };
+    key <BKSP> { [ BackSpace,               BackSpace,               BackSpace,               BackSpace,               BackSpace,               BackSpace,               BackSpace,               NoSymbol                 ] };
 
-    // top row
+    // Top Row
     // --------------------------------------------------------------
-    // xvlcwkhgfqß
-    key <AD01> { [ x,           X,                      ellipsis,               Greek_xi,           U22EE,          NoSymbol,    Greek_XI         ] };
-    key <AD02> { [ v,           V,                      underscore,             NoSymbol,           BackSpace,      BackSpace,   U222E            ] };
-    key <AD03> { [ l,           L,                      bracketleft,            Greek_lambda,       Up,             Up,          Greek_LAMBDA     ] };
-    key <AD04> { [ c,           C,                      bracketright,           Greek_chi,          Delete,         Delete,      U2102            ] };
-    key <AD05> { [ w,           W,                      asciicircum,            Greek_omega,        Insert,         Insert,      Greek_OMEGA      ] };
-
-    key <AD06> { [ k,           K,                      exclam,                 U03F0,              exclamdown,     NoSymbol,    radical          ] };
-    key <AD07> { [ h,           H,                      less,                   Greek_psi,          KP_7,           NoSymbol,    Greek_PSI        ] };
-    key <AD08> { [ g,           G,                      greater,                Greek_gamma,        KP_8,           NoSymbol,    Greek_GAMMA      ] };
-    key <AD09> { [ f,           F,                      equal,                  Greek_phi,          KP_9,           NoSymbol,    Greek_PHI        ] };
-    key <AD10> { [ q,           Q,                      ampersand,              U03D5,              KP_Add,         NoSymbol,    U211A            ] };
-    key <AD11> { [ ssharp,      U1E9E,                  U017F,              Greek_finalsmallsigma,  U2212,          NoSymbol,    jot              ] };
-
-    key <AD12> { [ dead_acute,  dead_cedilla,           dead_stroke,            dead_psili,       dead_doubleacute, NoSymbol,    dead_abovedot    ] };
-
-    // middle row
+    key <AD01> { [ x,                       X,                       ellipsis,                Greek_xi,                U22EE,                   NoSymbol,                Greek_XI,                NoSymbol                 ] };
+    key <AD02> { [ v,                       V,                       underscore,              NoSymbol,                BackSpace,               BackSpace,               U222E,                   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,             Insert,                  Insert,                  Greek_OMEGA,             NoSymbol                 ] };
+
+    key <AD06> { [ k,                       K,                       exclam,                  U03F0,                   exclamdown,              NoSymbol,                radical,                 NoSymbol                 ] };
+    key <AD07> { [ h,                       H,                       less,                    Greek_psi,               KP_7,                    NoSymbol,                Greek_PSI,               NoSymbol                 ] };
+    key <AD08> { [ g,                       G,                       greater,                 Greek_gamma,             KP_8,                    NoSymbol,                Greek_GAMMA,             NoSymbol                 ] };
+    key <AD09> { [ f,                       F,                       equal,                   Greek_phi,               KP_9,                    NoSymbol,                Greek_PHI,               NoSymbol                 ] };
+    key <AD10> { [ q,                       Q,                       ampersand,               U03D5,                   KP_Add,                  NoSymbol,                U211A,                   NoSymbol                 ] };
+
+    key <AD11> { [ ssharp,                  U1E9E,                   U017F,                   Greek_finalsmallsigma,   U2212,                   NoSymbol,                jot,                     NoSymbol                 ] };
+    key <AD12> { [ dead_acute,              dead_cedilla,            dead_stroke,             dead_psili,              dead_doubleacute,        NoSymbol,                dead_abovedot,           NoSymbol                 ] };
+
+    // Middle Row
     // --------------------------------------------------------------
-    // uiaeosnrtdy
-    key <AC01> { [ u,           U,                      backslash,              NoSymbol,           Home,           Home,        mu                ] };
-    key <AC02> { [ i,           I,                      slash,                  Greek_iota,         Left,           Left,        integral          ] };
-    key <AC03> { [ a,           A,                      braceleft,              Greek_alpha,        Down,           Down,        U2200             ] };
-    key <AC04> { [ e,           E,                      braceright,             Greek_epsilon,      Right,          Right,       U2203             ] };
-    key <AC05> { [ o,           O,                      asterisk,               Greek_omicron,      End,            End,         elementof         ] };
-
-    key <AC06> { [ s,           S,                      question,               Greek_sigma,        questiondown,   NoSymbol,    Greek_SIGMA       ] };
-    key <AC07> { [ n,           N,                      parenleft,              Greek_nu,           KP_4,           NoSymbol,    U2115             ] };
-    key <AC08> { [ r,           R,                      parenright,             U03F1,              KP_5,           NoSymbol,    U211D             ] };
-    key <AC09> { [ t,           T,                      minus,                  Greek_tau,          KP_6,           NoSymbol,    partialderivative ] };
-    key <AC10> { [ d,           D,                      colon,                  Greek_delta,        KP_Separator,   NoSymbol,    Greek_DELTA       ] };
-    key <AC11> { [ y,           Y,                      at,                     Greek_upsilon,      KP_Decimal,     NoSymbol,    nabla             ] };
-
-    // bottom row
+    key <AC01> { [ u,                       U,                       backslash,               NoSymbol,                Home,                    Home,                    mu,                      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,                    NoSymbol,                U2115,                   NoSymbol                 ] };
+    key <AC08> { [ r,                       R,                       parenright,              U03F1,                   KP_5,                    NoSymbol,                U211D,                   NoSymbol                 ] };
+    key <AC09> { [ t,                       T,                       minus,                   Greek_tau,               KP_6,                    NoSymbol,                partialderivative,       NoSymbol                 ] };
+    key <AC10> { [ d,                       D,                       colon,                   Greek_delta,             KP_Separator,            NoSymbol,                Greek_DELTA,             NoSymbol                 ] };
+
+    key <AC11> { [ y,                       Y,                       at,                      Greek_upsilon,           KP_Decimal,              NoSymbol,                nabla,                   NoSymbol                 ] };
+
+    // Bottom Row
     // --------------------------------------------------------------
-    // üöäpzbm,.j
-    key <AB01> { [ udiaeresis,  Udiaeresis,             numbersign,             NoSymbol,           Escape,         Escape,      U211C             ] };
-    key <AB02> { [ odiaeresis,  Odiaeresis,             dollar,                 U03F5,              Tab,            Tab,         U2111             ] };
-    key <AB03> { [ adiaeresis,  Adiaeresis,             bar,                    Greek_eta,          Next,           Next,        U2135             ] };
-    key <AB04> { [ p,           P,                      asciitilde,             Greek_pi,           Return,         Return,      Greek_PI          ] };
-    key <AB05> { [ z,           Z,                      grave,                  Greek_zeta,         NoSymbol,       NoSymbol,    U2124             ] };
-
-    key <AB06> { [ b,           B,                      plus,                   Greek_beta,         colon,          NoSymbol,    U21D0             ] };
-    key <AB07> { [ m,           M,                      percent,                Greek_mu,           KP_1,           NoSymbol,    ifonlyif          ] };
-    key <AB08> { [ comma,       endash,                 quotedbl,               Greek_rho,          KP_2,           NoSymbol,    U21D2             ] };
-    key <AB09> { [ period,      enfilledcircbullet,     apostrophe,             U03D1,              KP_3,           NoSymbol,    Greek_THETA       ] };
-    key <AB10> { [ j,           J,                      semicolon,              Greek_theta,        semicolon,      NoSymbol,    variation         ] };
+    key <AB01> { [ udiaeresis,              Udiaeresis,              numbersign,              NoSymbol,                Escape,                  Escape,                  U211C,                   NoSymbol                 ] };
+    key <AB02> { [ odiaeresis,              Odiaeresis,              dollar,                  U03F5,                   Tab,                     Tab,                     U2111,                   NoSymbol                 ] };
+    key <AB03> { [ adiaeresis,              Adiaeresis,              bar,                     Greek_eta,               Next,                    Next,                    U2135,                   NoSymbol                 ] };
+    key <AB04> { [ p,                       P,                       asciitilde,              Greek_pi,                Return,                  Return,                  Greek_PI,                NoSymbol                 ] };
+    key <AB05> { [ z,                       Z,                       grave,                   Greek_zeta,              NoSymbol,                NoSymbol,                U2124,                   NoSymbol                 ] };
+
+    key <AB06> { [ b,                       B,                       plus,                    Greek_beta,              colon,                   NoSymbol,                U21D0,                   NoSymbol                 ] };
+    key <AB07> { [ m,                       M,                       percent,                 Greek_mu,                KP_1,                    NoSymbol,                ifonlyif,                NoSymbol                 ] };
+    key <AB08> { [ comma,                   endash,                  quotedbl,                Greek_rho,               KP_2,                    NoSymbol,                U21D2,                   NoSymbol                 ] };
+    key <AB09> { [ period,                  enfilledcircbullet,      apostrophe,              U03D1,                   KP_3,                    NoSymbol,                Greek_THETA,             NoSymbol                 ] };
+    key <AB10> { [ j,                       J,                       semicolon,               Greek_theta,             semicolon,               NoSymbol,                variation,               NoSymbol                 ] };
 
     // Space key
     // --------------------------------------------------------------
-    key <SPCE> { [ space,       space,                  space,                  nobreakspace,      KP_0,            NoSymbol,    U202F             ] };
+    key <SPCE> { [ space,                   space,                   space,                   nobreakspace,            KP_0,                    NoSymbol,                U202F,                   NoSymbol                 ] };
 
-    // Keypad
-    // ===========
+
+    // 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,   equal,        approxeq,     notequal,   NoSymbol,   identical ] };
+    // The former Numlock key:
+    key <NMLK> { [ Tab,                     ISO_Left_Tab,            equal,                   approxeq,                notequal,                NoSymbol,                identical,               NoSymbol                 ] };
 
-    // topmost row
+    // Topmost Row
     // --------------------------------------------------------------
-    key <KPDV> { [ KP_Divide,     KP_Divide,      division,     U2300,        U2215,      NoSymbol,   U2223 ] };
-    key <KPMU> { [ KP_Multiply,   KP_Multiply,    U2219,        U2299,        multiply,   NoSymbol,   U2297 ] };
-    key <KPSU> { [ KP_Subtract,   KP_Subtract,    U2212,        U2296,        U2216,      NoSymbol,   U2238 ] };
+    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
+    // Top Row
     // --------------------------------------------------------------
-    key  <KP7> { [ KP_7,          U2714,          U2195,        U226A,        KP_Home,    KP_Home,    upstile ] };
-    key  <KP8> { [ KP_8,          U2718,          uparrow,      intersection, KP_Up,      KP_Up,      U22C2   ] };
-    key  <KP9> { [ KP_9,          dagger,         U20D7,        U226B,        KP_Prior,   KP_Prior,   U2309   ] };
-    key <KPAD> { [ KP_Add,        KP_Add,         plusminus,    U2295,        U2213,      NoSymbol,   U2214   ] };
-
-    // middle 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 ] };
-    key  <KP5> { [ KP_5,          EuroSign,       brokenbar,    U22B6,        KP_Begin,   KP_Begin,   U22B7 ] };
-    key  <KP6> { [ KP_6,          U2023,          rightarrow,   includes,     KP_Right,   KP_Right,   U2287 ] };
+    key  <KP4> { [ KP_4,                    club,                    leftarrow,               includedin,              KP_Left,                 KP_Left,                 U2286,                   NoSymbol                 ] };
+    key  <KP5> { [ KP_5,                    EuroSign,                brokenbar,               U22B6,                   KP_Begin,                KP_Begin,                U22B7,                   NoSymbol                 ] };
+    key  <KP6> { [ KP_6,                    U2023,                   rightarrow,              includes,                KP_Right,                KP_Right,                U2287,                   NoSymbol                 ] };
 
-    // bottom row
+    // Bottom Row
     // --------------------------------------------------------------
-    key  <KP1> { [ KP_1,          diamond,        U2194,        lessthanequal,KP_End,     KP_End,     downstile ] };
-    key  <KP2> { [ KP_2,          heart,          downarrow,    union,        KP_Down,    KP_Down,    U22C3     ] };
-    key  <KP3> { [ KP_3,          U2660,          U21CC,     greaterthanequal,KP_Next,    KP_Next,    U230B     ] };
-    key <KPEN> { [ KP_Enter,      KP_Enter,       KP_Enter,     KP_Enter,     KP_Enter,   KP_Enter,   KP_Enter  ] };
-    key <KPEQ> { [ KP_Equal ] };
+    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
+    // Bottommost Row
     // --------------------------------------------------------------
-    key  <KP0> { [ KP_0,         U2423,           percent,   U2030,        KP_Insert,   KP_Insert,   U25A1    ] };
-    key <KPDL> { [ KP_Separator, KP_Decimal,      period,    apostrophe,   KP_Delete,   KP_Delete,   quotedbl ] };
-
+    key  <KP0> { [ KP_0,                    U2423,                   percent,                 U2030,                   KP_Insert,               KP_Insert,               U25A1,                   NoSymbol                 ] };
+    key <KPDL> { [ KP_Separator,            KP_Decimal,              period,                  apostrophe,              KP_Delete,               KP_Delete,               quotedbl,                NoSymbol                 ] };
 };
 
 // Copied from macintosh_vndr/de
diff --git a/linux/X/de.DEBUG1 b/linux/X/de.DEBUG1
deleted file mode 100644
index 2013989..0000000
--- a/linux/X/de.DEBUG1
+++ /dev/null
@@ -1,495 +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 <AC10>	{ [odiaeresis, Odiaeresis, dead_doubleacute, dead_doubleacute ] };
-    key <AC11>	{ [adiaeresis, Adiaeresis, dead_circumflex, dead_caron]	};
-    key <TLDE>	{ [dead_circumflex, degree,     notsign,      notsign ]	};
-
-    key <BKSL>	{ [numbersign, apostrophe,   dead_grave,   dead_breve ]	};
-    key <AB01>	{ [         y,          Y, guillemotleft,        less ]	};
-
-    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: 
-//      <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: 1427 $, $Date: 2009-01-11 11:11:34 +0100 (So, 11. Jan 2009) $
-
-
-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 (in this order)
-    // Compose (not a level): Mod3+Tab
-    // Feststelltaste (Capslock): Mod3+Mod3
-    //
-    // Levels in Xkbmap jargon to be found here in the definitions. 
-    // These are the levels used, and Xorg's translations with type="EIGHT_LEVEL":
-    // --------------------------------------------------------------
-    //   Modifier:        None    Shift   Mod3    Shift+Mod3  Mod4    Shift+Mod4    Mod3+Mod4
-    //   Xorg calls it:   Level1  Level2  Level3  Level4      Level5  Level6        Level7
-    //   Neo calls it:    Ebene1  Ebene2  Ebene3  Ebene5      Ebene4  Ebene4+Shift  Ebene6
-
-    // Modifier definitions
-    // --------------------------------------------------------------
-    // Definition of the so called Neo-Mod3
-    // (FIXME Nur CAPS+BKSL ist Caps_Lock – Nicht andersherum, siehe Ticket #30)
-    key.type[Group1]="THREE_LEVEL";
-    key <AE02> { [ 2, b, Caps_Lock ] };
-    key <AE03> { [ 3, c, Caps_Lock ] };
-    key <AE04> { [ 4, d, Caps_Lock ] };
-    key <AE05> { [ 5, e, Caps_Lock ] };
-    key <AE06> { [ 6, f, Caps_Lock ] };
-    key <CAPS> { [ ISO_Level3_Shift, ISO_Level3_Shift,  Caps_Lock ] };
-    key <BKSL> { [ ISO_Level3_Shift, ISO_Level3_Shift,  Caps_Lock ] };
-
-    // Definition of the so called Neo-Mod4
-    key.type[Group1]="ONE_LEVEL";
-    key <LSGT> { [ ISO_Level5_Shift ]};
-    key <RALT> { [ ISO_Level5_Shift ]};
-    modifier_map Mod3 { <LSGT>, <RALT> };
-    // Attention: ^^^ This is a X server variable, not the Neo-Mod3.
-
-    key.type[Group1]="EIGHT_LEVEL_ALPHABETIC" ;
-
-    // Tab as Multi_key (Compose)
-    // --------------------------------------------------------------
-    key  <TAB> { [ Tab, ISO_Left_Tab, Multi_key ] };
-
-    // number row
-    // --------------------------------------------------------------
-    key <TLDE> { [ dead_circumflex, dead_tilde,         dead_abovering,         dead_breve,         dead_caron,     NoSymbol,    dead_macron    ] };
-
-    key <AE01> { [ 1,           degree,                 onesuperior,            onesubscript,       ordfeminine,    NoSymbol,    notsign        ] };
-//    key <AE02> { [ 2,           section,                twosuperior,            twosubscript,       masculine,      NoSymbol,    logicalor      ] };
-//    key <AE03> { [ 3,           U2113,                  threesuperior,          threesubscript,     numerosign,     NoSymbol,    logicaland     ] };
-//    key <AE04> { [ 4,           guillemotright,         U203A,                  dagger,             Prior,          Prior,       U22A5          ] };
-//    key <AE05> { [ 5,           guillemotleft,          U2039,                  femalesymbol,       periodcentered, NoSymbol,    U2221          ] };
-//    key <AE06> { [ 6,           EuroSign,               cent,                   malesymbol,         sterling,       NoSymbol,    U2225          ] };
-
-    key <AE07> { [ 7,           dollar,                 yen,                    Greek_kappa,        currency,       NoSymbol,    rightarrow     ] };
-    key <AE08> { [ 8,           doublelowquotemark,     singlelowquotemark,     leftanglebracket,   NoSymbol,       NoSymbol,    U221E          ] };
-    key <AE09> { [ 9,           leftdoublequotemark,    leftsinglequotemark,    rightanglebracket,  slash,          NoSymbol,    U220B          ] };
-    key <AE10> { [ 0,           rightdoublequotemark,   rightsinglequotemark,   zerosubscript,      asterisk,       NoSymbol,    emptyset       ] };
-
-    key <AE11> { [ minus,       emdash,                 NoSymbol,               U2011,              minus,          NoSymbol,    hyphen         ] };
-    key <AE12> { [ dead_grave,  NoSymbol,               dead_diaeresis,         dead_dasia,       dead_doublegrave, NoSymbol,    NoSymbol       ] };
-
-    key <BKSP> { [ BackSpace,   BackSpace,              BackSpace,              BackSpace,          BackSpace,      BackSpace,   BackSpace      ] };
-
-    // top row
-    // --------------------------------------------------------------
-    // xvlcwkhgfqß
-    key <AD01> { [ x,           X,                      ellipsis,               Greek_xi,           U22EE,          NoSymbol,    Greek_XI         ] };
-    key <AD02> { [ v,           V,                      underscore,             NoSymbol,           BackSpace,      BackSpace,   U2259            ] };
-    key <AD03> { [ l,           L,                      bracketleft,            Greek_lambda,       Up,             Up,          Greek_LAMBDA     ] };
-    key <AD04> { [ c,           C,                      bracketright,           Greek_chi,          Delete,         Delete,      U2102            ] };
-    key <AD05> { [ w,           W,                      asciicircum,            Greek_omega,        Insert,         Insert,      Greek_OMEGA      ] };
-
-    key <AD06> { [ k,           K,                      exclam,                 U03F0,              exclamdown,     NoSymbol,    radical          ] };
-    key <AD07> { [ h,           H,                      less,                   Greek_psi,          7,              NoSymbol,    Greek_PSI        ] };
-    key <AD08> { [ g,           G,                      greater,                Greek_gamma,        8,              NoSymbol,    Greek_GAMMA      ] };
-    key <AD09> { [ f,           F,                      equal,                  Greek_phi,          9,              NoSymbol,    Greek_PHI        ] };
-    key <AD10> { [ q,           Q,                      ampersand,              U03D5,              plus,           NoSymbol,    U211A            ] };
-    key <AD11> { [ ssharp,      U1E9E,                  U017F,              Greek_finalsmallsigma,  NoSymbol,       NoSymbol,    jot              ] };
-
-    key <AD12> { [ dead_acute,  dead_cedilla,           dead_stroke,            dead_psili,       dead_doubleacute, NoSymbol,   dead_abovedot    ] };
-
-    // middle row
-    // --------------------------------------------------------------
-    // uiaeosnrtdy
-    key <AC01> { [ u,           U,                      backslash,              NoSymbol,           Home,           Home,        U222E             ] };
-    key <AC02> { [ i,           I,                      slash,                  Greek_iota,         Left,           Left,        integral          ] };
-    key <AC03> { [ a,           A,                      braceleft,              Greek_alpha,        Down,           Down,        U2200             ] };
-    key <AC04> { [ e,           E,                      braceright,             Greek_epsilon,      Right,          Right,       U2203             ] };
-    key <AC05> { [ o,           O,                      asterisk,               Greek_omicron,      End,            End,         elementof         ] };
-
-    key <AC06> { [ s,           S,                      question,               Greek_sigma,        questiondown,   NoSymbol,    Greek_SIGMA       ] };
-    key <AC07> { [ n,           N,                      parenleft,              Greek_nu,           4,              NoSymbol,    U2115             ] };
-    key <AC08> { [ r,           R,                      parenright,             U03F1,              5,              NoSymbol,    U211D             ] };
-    key <AC09> { [ t,           T,                      minus,                  Greek_tau,          6,              NoSymbol,    partialderivative ] };
-    key <AC10> { [ d,           D,                      colon,                  Greek_delta,        comma,          NoSymbol,    Greek_DELTA       ] };
-    key <AC11> { [ y,           Y,                      at,                     Greek_upsilon,      period,         NoSymbol,    nabla             ] };
-
-    // bottom row
-    // --------------------------------------------------------------
-    // üöäpzbm,.j
-    key <AB01> { [ udiaeresis,  Udiaeresis,             numbersign,             NoSymbol,           Escape,         Escape,      U211C             ] };
-    key <AB02> { [ odiaeresis,  Odiaeresis,             dollar,                 NoSymbol,           Tab,            Tab,         U2111             ] };
-    key <AB03> { [ adiaeresis,  Adiaeresis,             bar,                    Greek_eta,          Next,           Next,        U2135             ] };
-    key <AB04> { [ p,           P,                      asciitilde,             Greek_pi,           Return,         Return,      Greek_PI          ] };
-    key <AB05> { [ z,           Z,                      grave,                  Greek_zeta,         NoSymbol,       NoSymbol,    U2124             ] };
-
-    key <AB06> { [ b,           B,                      plus,                   Greek_beta,         colon,          NoSymbol,    U21D0             ] };
-    key <AB07> { [ m,           M,                      percent,                Greek_mu,           1,              NoSymbol,    ifonlyif          ] };
-    key <AB08> { [ comma,       endash,                 quotedbl,               Greek_rho,          2,              NoSymbol,    U21D2             ] };
-    key <AB09> { [ period,      enfilledcircbullet,     apostrophe,             U03D1,              3,              NoSymbol,    Greek_THETA       ] };
-    key <AB10> { [ j,           J,                      semicolon,              Greek_theta,        semicolon,      NoSymbol,    variation         ] };
-
-    // Space key
-    // --------------------------------------------------------------
-    key <SPCE> { [ space,       space,                  space,                  nobreakspace,       0,              NoSymbol,    U202F             ] };
-
-    // Keypad
-    // ===========
-
-    // 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,   equal,        approxeq,     notequal,   NoSymbol,   identical ] };
-
-    // topmost row
-    // --------------------------------------------------------------
-    key <KPDV> { [ KP_Divide,     KP_Divide,      division,     U2223,        U2300,      NoSymbol,   U2044 ] };
-    key <KPMU> { [ KP_Multiply,   KP_Multiply,    U22C5,        multiply,     U2299,      NoSymbol,   U2297 ] };
-    key <KPSU> { [ KP_Subtract,   KP_Subtract,    U2212,        U2216,        U2296,      NoSymbol,   U2238 ] };
-
-    // top row
-    // --------------------------------------------------------------
-    key  <KP7> { [ KP_7,          U2714,          U2195,        U226A,        KP_Home,    KP_Home,    upstile ] };
-    key  <KP8> { [ KP_8,          U2718,          uparrow,      intersection, KP_Up,      KP_Up,      U22C2   ] };
-    key  <KP9> { [ KP_9,          NoSymbol,       U20D7,        U226B,        KP_Prior,   KP_Prior,   U2309   ] };
-    key <KPAD> { [ KP_Add,        KP_Add,         plusminus,    U2213,        U2295,      NoSymbol,   U2214   ] };
-
-    // middle row
-    // --------------------------------------------------------------
-    key  <KP4> { [ KP_4,          club,           leftarrow,    includedin,   KP_Left,    KP_Left,    U2286 ] };
-    key  <KP5> { [ KP_5,          EuroSign,       brokenbar,    U22B6,        KP_Begin,   KP_Begin,   U22B7 ] };
-    key  <KP6> { [ KP_6,          NoSymbol,       rightarrow,   includes,     KP_Right,   KP_Right,   U2287 ] };
-
-    // bottom row
-    // --------------------------------------------------------------
-    key  <KP1> { [ KP_1,          diamond,        U2194,        lessthanequal,KP_End,     KP_End,     downstile ] };
-    key  <KP2> { [ KP_2,          heart,          downarrow,    union,        KP_Down,    KP_Down,    U22C3     ] };
-    key  <KP3> { [ KP_3,          U2660,          U21CC,     greaterthanequal,KP_Next,    KP_Next,    U230B     ] };
-    key <KPEN> { [ KP_Enter,      KP_Enter,       KP_Enter,     KP_Enter,     KP_Enter,   KP_Enter,   KP_Enter  ] };
-    key <KPEQ> { [ KP_Equal ] };
-
-    // bottommost row
-    // --------------------------------------------------------------
-    key  <KP0> { [ KP_0,         U2423,           percent,   U2030,        KP_Insert,   KP_Insert,   U25A1    ] };
-    key <KPDL> { [ KP_Decimal,   comma,           period,    apostrophe,   KP_Delete,   KP_Delete,   quotedbl ] };
-
-};
-
-// 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/de.DEBUG2 b/linux/X/de.DEBUG2
deleted file mode 100644
index 21543de..0000000
--- a/linux/X/de.DEBUG2
+++ /dev/null
@@ -1,497 +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 <AC10>	{ [odiaeresis, Odiaeresis, dead_doubleacute, dead_doubleacute ] };
-    key <AC11>	{ [adiaeresis, Adiaeresis, dead_circumflex, dead_caron]	};
-    key <TLDE>	{ [dead_circumflex, degree,     notsign,      notsign ]	};
-
-    key <BKSL>	{ [numbersign, apostrophe,   dead_grave,   dead_breve ]	};
-    key <AB01>	{ [         y,          Y, guillemotleft,        less ]	};
-
-    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: 
-//      <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: 1427 $, $Date: 2009-01-11 11:11:34 +0100 (So, 11. Jan 2009) $
-
-
-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 (in this order)
-    // Compose (not a level): Mod3+Tab
-    // Feststelltaste (Capslock): Mod3+Mod3
-    //
-    // Levels in Xkbmap jargon to be found here in the definitions. 
-    // These are the levels used, and Xorg's translations with type="EIGHT_LEVEL":
-    // --------------------------------------------------------------
-    //   Modifier:        None    Shift   Mod3    Shift+Mod3  Mod4    Shift+Mod4    Mod3+Mod4
-    //   Xorg calls it:   Level1  Level2  Level3  Level4      Level5  Level6        Level7
-    //   Neo calls it:    Ebene1  Ebene2  Ebene3  Ebene5      Ebene4  Ebene4+Shift  Ebene6
-
-    // Modifier definitions
-    // --------------------------------------------------------------
-    // Definition of the so called Neo-Mod3
-    // (FIXME Nur CAPS+BKSL ist Caps_Lock – Nicht andersherum, siehe Ticket #30)
-    key.type[Group1]="THREE_LEVEL";
-//    key <AE02> { [ 2, b, Caps_Lock ] };
-//    key <AE03> { [ 3, c, Caps_Lock ] };
-//    key <AE04> { [ 4, d, Caps_Lock ] };
-//    key <AE05> { [ 5, e, Caps_Lock ] };
-//    key <AE06> { [ 6, f, Caps_Lock ] };
-//    key <CAPS> { [ ISO_Level3_Shift, ISO_Level3_Shift,  Caps_Lock ] };
-//    key <BKSL> { [ ISO_Level3_Shift, ISO_Level3_Shift,  Caps_Lock ] };
-      key <AE02> { [ Caps_Lock, 2, b ] };
-      key <AE03> { [ Caps_Lock, 3, c ] };
-
-    // Definition of the so called Neo-Mod4
-    key.type[Group1]="ONE_LEVEL";
-    key <LSGT> { [ ISO_Level5_Shift ]};
-    key <RALT> { [ ISO_Level5_Shift ]};
-    modifier_map Mod3 { <LSGT>, <RALT> };
-    // Attention: ^^^ This is a X server variable, not the Neo-Mod3.
-
-    key.type[Group1]="EIGHT_LEVEL_ALPHABETIC" ;
-
-    // Tab as Multi_key (Compose)
-    // --------------------------------------------------------------
-    key  <TAB> { [ Tab, ISO_Left_Tab, Multi_key ] };
-
-    // number row
-    // --------------------------------------------------------------
-    key <TLDE> { [ dead_circumflex, dead_tilde,         dead_abovering,         dead_breve,         dead_caron,     NoSymbol,    dead_macron    ] };
-
-    key <AE01> { [ 1,           degree,                 onesuperior,            onesubscript,       ordfeminine,    NoSymbol,    notsign        ] };
-//    key <AE02> { [ 2,           section,                twosuperior,            twosubscript,       masculine,      NoSymbol,    logicalor      ] };
-//    key <AE03> { [ 3,           U2113,                  threesuperior,          threesubscript,     numerosign,     NoSymbol,    logicaland     ] };
-//    key <AE04> { [ 4,           guillemotright,         U203A,                  dagger,             Prior,          Prior,       U22A5          ] };
-//    key <AE05> { [ 5,           guillemotleft,          U2039,                  femalesymbol,       periodcentered, NoSymbol,    U2221          ] };
-//    key <AE06> { [ 6,           EuroSign,               cent,                   malesymbol,         sterling,       NoSymbol,    U2225          ] };
-
-    key <AE07> { [ 7,           dollar,                 yen,                    Greek_kappa,        currency,       NoSymbol,    rightarrow     ] };
-    key <AE08> { [ 8,           doublelowquotemark,     singlelowquotemark,     leftanglebracket,   NoSymbol,       NoSymbol,    U221E          ] };
-    key <AE09> { [ 9,           leftdoublequotemark,    leftsinglequotemark,    rightanglebracket,  slash,          NoSymbol,    U220B          ] };
-    key <AE10> { [ 0,           rightdoublequotemark,   rightsinglequotemark,   zerosubscript,      asterisk,       NoSymbol,    emptyset       ] };
-
-    key <AE11> { [ minus,       emdash,                 NoSymbol,               U2011,              minus,          NoSymbol,    hyphen         ] };
-    key <AE12> { [ dead_grave,  NoSymbol,               dead_diaeresis,         dead_dasia,       dead_doublegrave, NoSymbol,    NoSymbol       ] };
-
-    key <BKSP> { [ BackSpace,   BackSpace,              BackSpace,              BackSpace,          BackSpace,      BackSpace,   BackSpace      ] };
-
-    // top row
-    // --------------------------------------------------------------
-    // xvlcwkhgfqß
-    key <AD01> { [ x,           X,                      ellipsis,               Greek_xi,           U22EE,          NoSymbol,    Greek_XI         ] };
-    key <AD02> { [ v,           V,                      underscore,             NoSymbol,           BackSpace,      BackSpace,   U2259            ] };
-    key <AD03> { [ l,           L,                      bracketleft,            Greek_lambda,       Up,             Up,          Greek_LAMBDA     ] };
-    key <AD04> { [ c,           C,                      bracketright,           Greek_chi,          Delete,         Delete,      U2102            ] };
-    key <AD05> { [ w,           W,                      asciicircum,            Greek_omega,        Insert,         Insert,      Greek_OMEGA      ] };
-
-    key <AD06> { [ k,           K,                      exclam,                 U03F0,              exclamdown,     NoSymbol,    radical          ] };
-    key <AD07> { [ h,           H,                      less,                   Greek_psi,          7,              NoSymbol,    Greek_PSI        ] };
-    key <AD08> { [ g,           G,                      greater,                Greek_gamma,        8,              NoSymbol,    Greek_GAMMA      ] };
-    key <AD09> { [ f,           F,                      equal,                  Greek_phi,          9,              NoSymbol,    Greek_PHI        ] };
-    key <AD10> { [ q,           Q,                      ampersand,              U03D5,              plus,           NoSymbol,    U211A            ] };
-    key <AD11> { [ ssharp,      U1E9E,                  U017F,              Greek_finalsmallsigma,  NoSymbol,       NoSymbol,    jot              ] };
-
-    key <AD12> { [ dead_acute,  dead_cedilla,           dead_stroke,            dead_psili,       dead_doubleacute, NoSymbol,   dead_abovedot    ] };
-
-    // middle row
-    // --------------------------------------------------------------
-    // uiaeosnrtdy
-    key <AC01> { [ u,           U,                      backslash,              NoSymbol,           Home,           Home,        U222E             ] };
-    key <AC02> { [ i,           I,                      slash,                  Greek_iota,         Left,           Left,        integral          ] };
-    key <AC03> { [ a,           A,                      braceleft,              Greek_alpha,        Down,           Down,        U2200             ] };
-    key <AC04> { [ e,           E,                      braceright,             Greek_epsilon,      Right,          Right,       U2203             ] };
-    key <AC05> { [ o,           O,                      asterisk,               Greek_omicron,      End,            End,         elementof         ] };
-
-    key <AC06> { [ s,           S,                      question,               Greek_sigma,        questiondown,   NoSymbol,    Greek_SIGMA       ] };
-    key <AC07> { [ n,           N,                      parenleft,              Greek_nu,           4,              NoSymbol,    U2115             ] };
-    key <AC08> { [ r,           R,                      parenright,             U03F1,              5,              NoSymbol,    U211D             ] };
-    key <AC09> { [ t,           T,                      minus,                  Greek_tau,          6,              NoSymbol,    partialderivative ] };
-    key <AC10> { [ d,           D,                      colon,                  Greek_delta,        comma,          NoSymbol,    Greek_DELTA       ] };
-    key <AC11> { [ y,           Y,                      at,                     Greek_upsilon,      period,         NoSymbol,    nabla             ] };
-
-    // bottom row
-    // --------------------------------------------------------------
-    // üöäpzbm,.j
-    key <AB01> { [ udiaeresis,  Udiaeresis,             numbersign,             NoSymbol,           Escape,         Escape,      U211C             ] };
-    key <AB02> { [ odiaeresis,  Odiaeresis,             dollar,                 NoSymbol,           Tab,            Tab,         U2111             ] };
-    key <AB03> { [ adiaeresis,  Adiaeresis,             bar,                    Greek_eta,          Next,           Next,        U2135             ] };
-    key <AB04> { [ p,           P,                      asciitilde,             Greek_pi,           Return,         Return,      Greek_PI          ] };
-    key <AB05> { [ z,           Z,                      grave,                  Greek_zeta,         NoSymbol,       NoSymbol,    U2124             ] };
-
-    key <AB06> { [ b,           B,                      plus,                   Greek_beta,         colon,          NoSymbol,    U21D0             ] };
-    key <AB07> { [ m,           M,                      percent,                Greek_mu,           1,              NoSymbol,    ifonlyif          ] };
-    key <AB08> { [ comma,       endash,                 quotedbl,               Greek_rho,          2,              NoSymbol,    U21D2             ] };
-    key <AB09> { [ period,      enfilledcircbullet,     apostrophe,             U03D1,              3,              NoSymbol,    Greek_THETA       ] };
-    key <AB10> { [ j,           J,                      semicolon,              Greek_theta,        semicolon,      NoSymbol,    variation         ] };
-
-    // Space key
-    // --------------------------------------------------------------
-    key <SPCE> { [ space,       space,                  space,                  nobreakspace,       0,              NoSymbol,    U202F             ] };
-
-    // Keypad
-    // ===========
-
-    // 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,   equal,        approxeq,     notequal,   NoSymbol,   identical ] };
-
-    // topmost row
-    // --------------------------------------------------------------
-    key <KPDV> { [ KP_Divide,     KP_Divide,      division,     U2223,        U2300,      NoSymbol,   U2044 ] };
-    key <KPMU> { [ KP_Multiply,   KP_Multiply,    U22C5,        multiply,     U2299,      NoSymbol,   U2297 ] };
-    key <KPSU> { [ KP_Subtract,   KP_Subtract,    U2212,        U2216,        U2296,      NoSymbol,   U2238 ] };
-
-    // top row
-    // --------------------------------------------------------------
-    key  <KP7> { [ KP_7,          U2714,          U2195,        U226A,        KP_Home,    KP_Home,    upstile ] };
-    key  <KP8> { [ KP_8,          U2718,          uparrow,      intersection, KP_Up,      KP_Up,      U22C2   ] };
-    key  <KP9> { [ KP_9,          NoSymbol,       U20D7,        U226B,        KP_Prior,   KP_Prior,   U2309   ] };
-    key <KPAD> { [ KP_Add,        KP_Add,         plusminus,    U2213,        U2295,      NoSymbol,   U2214   ] };
-
-    // middle row
-    // --------------------------------------------------------------
-    key  <KP4> { [ KP_4,          club,           leftarrow,    includedin,   KP_Left,    KP_Left,    U2286 ] };
-    key  <KP5> { [ KP_5,          EuroSign,       brokenbar,    U22B6,        KP_Begin,   KP_Begin,   U22B7 ] };
-    key  <KP6> { [ KP_6,          NoSymbol,       rightarrow,   includes,     KP_Right,   KP_Right,   U2287 ] };
-
-    // bottom row
-    // --------------------------------------------------------------
-    key  <KP1> { [ KP_1,          diamond,        U2194,        lessthanequal,KP_End,     KP_End,     downstile ] };
-    key  <KP2> { [ KP_2,          heart,          downarrow,    union,        KP_Down,    KP_Down,    U22C3     ] };
-    key  <KP3> { [ KP_3,          U2660,          U21CC,     greaterthanequal,KP_Next,    KP_Next,    U230B     ] };
-    key <KPEN> { [ KP_Enter,      KP_Enter,       KP_Enter,     KP_Enter,     KP_Enter,   KP_Enter,   KP_Enter  ] };
-    key <KPEQ> { [ KP_Equal ] };
-
-    // bottommost row
-    // --------------------------------------------------------------
-    key  <KP0> { [ KP_0,         U2423,           percent,   U2030,        KP_Insert,   KP_Insert,   U25A1    ] };
-    key <KPDL> { [ KP_Decimal,   comma,           period,    apostrophe,   KP_Delete,   KP_Delete,   quotedbl ] };
-
-};
-
-// 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 ]	};
-};