Update Neo-layout to the final version, released 2010-03-28

18 files changed, 439 insertions, 121 deletions

diff --git a/compat/Makefile.am b/compat/Makefile.am
index 4e56a242..54a659ee 100644
--- a/compat/Makefile.am
+++ b/compat/Makefile.am
@@ -1,7 +1,7 @@
 compatdir = $(xkb_base)/compat
 
 dist_compat_DATA = \
-accessx basic complete \
+accessx basic caps complete \
 default iso9995 \
 japan keypad ledcaps \
 lednum ledscroll level5 \
diff --git a/compat/level5 b/compat/level5
index 6c2da991..47693549 100644
--- a/compat/level5
+++ b/compat/level5
@@ -42,3 +42,15 @@ default partial xkb_compatibility "default"  {
 	action= LockMods(modifiers=LevelFive);
     };
 };
+partial xkb_compatibility "level5_lock"  {
+	// This defines a Level5-Lock using the NumLock real modifier in order to
+	// create arbitrary level-behaviour, which would not be possible with the
+	// virtual modifier.
+	// See also: types/level5 : EIGHT_LEVEL_LEVEL_FIVE_LOCK
+	// See also: symbols/level5(lock)
+    virtual_modifiers NumLock;
+    
+    interpret ISO_Level5_Lock {
+        action = LockMods(modifiers = NumLock);
+    };
+};
diff --git a/compat/misc b/compat/misc
index 9566bc6f..68cda959 100644
--- a/compat/misc
+++ b/compat/misc
@@ -115,3 +115,13 @@ default partial xkb_compatibility "misc"  {
 
     include "ledscroll"
 };
+
+partial xkb_compatibility "assign_shift_left_action"  {
+    // Because of the irrevertable modifier mapping in symbols/pc <LFSH> is 
+    // getting bound to the Lock modifier when using 
+    // symbols/shift(both_capslock), creating unwanted behaviour. 
+    // This is a quirk, to circumvent the problem.
+    interpret Shift_L {
+        action = SetMods(modifiers = Shift);
+    };
+};
diff --git a/rules/HDR b/rules/HDR
index 3f3919d6..769b8fc7 100644
--- a/rules/HDR
+++ b/rules/HDR
@@ -15,6 +15,11 @@
 ! model		layout[3]	variant[3]	=	symbols
 ! model		layout[4]	variant[4]	=	symbols
 ! model		=	symbols
+! layout	variant		=	compat
+! layout[1]	variant[1]	=	compat
+! layout[2]	variant[2]	=	compat
+! layout[3]	variant[3]	=	compat
+! layout[4]	variant[4]	=	compat
 ! model		layout		=	compat
 ! model		layout[1]	=	compat
 ! model		=	types
diff --git a/rules/Makefile.am b/rules/Makefile.am
index 5f39217d..6ca04e7f 100644
--- a/rules/Makefile.am
+++ b/rules/Makefile.am
@@ -41,6 +41,11 @@ HDR compat/base.ml2v2_s.part  extras/base.ml2v2_s.part \
 HDR compat/base.ml3v3_s.part  extras/base.ml3v3_s.part \
 HDR compat/base.ml4v4_s.part  extras/base.ml4v4_s.part \
 HDR base.m_s.part \
+HDR compat/base.lv_c.part   \
+HDR compat/base.l1v1_c.part \
+HDR compat/base.l2v2_c.part \
+HDR compat/base.l3v3_c.part \
+HDR compat/base.l4v4_c.part \
 HDR base.ml_c.part \
 HDR base.ml1_c.part \
 HDR base.m_t.part \
@@ -72,6 +77,11 @@ HDR compat/base.ml2v2_s.part  extras/base.ml2v2_s.part \
 HDR compat/base.ml3v3_s.part  extras/base.ml3v3_s.part \
 HDR compat/base.ml4v4_s.part  extras/base.ml4v4_s.part \
 HDR evdev.m_s.part \
+HDR compat/base.lv_c.part   \
+HDR compat/base.l1v1_c.part \
+HDR compat/base.l2v2_c.part \
+HDR compat/base.l3v3_c.part \
+HDR compat/base.l4v4_c.part \
 HDR base.ml_c.part \
 HDR base.ml1_c.part \
 HDR base.m_t.part \
@@ -104,6 +114,11 @@ HDR extras/base.ml2v2_s.part \
 HDR extras/base.ml3v3_s.part \
 HDR extras/base.ml4v4_s.part \
 HDR base.m_s.part \
+HDR \
+HDR \
+HDR \
+HDR \
+HDR \
 HDR base.ml_c.part \
 HDR base.ml1_c.part \
 HDR base.m_t.part \
@@ -134,6 +149,11 @@ HDR extras/base.ml2v2_s.part \
 HDR extras/base.ml3v3_s.part \
 HDR extras/base.ml4v4_s.part \
 HDR evdev.m_s.part \
+HDR \
+HDR \
+HDR \
+HDR \
+HDR \
 HDR base.ml_c.part \
 HDR base.ml1_c.part \
 HDR base.m_t.part \
diff --git a/rules/base.o_s.part b/rules/base.o_s.part
index 06ee452a..79f61d95 100644
--- a/rules/base.o_s.part
+++ b/rules/base.o_s.part
@@ -110,5 +110,12 @@
   esperanto:dvorak      =	+epo(dvorak)
   terminate:ctrl_alt_bksp =	+terminate(ctrl_alt_bksp)
   apple:alupckeys	=	+macintosh_vndr/apple(alupckeys)
+  shift:both_capslock                =       +shift(both_capslock)
+  shift:lshift_both_capslock         =       +shift(lshift_both_capslock)
+  shift:rshift_both_capslock         =       +shift(rshift_both_capslock)
+  lv3:caps_switch                    =       +level3(caps_switch)
+  lv3:bksl_switch                    =       +level3(bksl_switch)
+  lv5:lsgt_switch_lock            =       +level5(lsgt_switch_lock)
+  lv5:ralt_switch_lock            =       +level5(ralt_switch_lock)
 
 
diff --git a/rules/base.xml.in b/rules/base.xml.in
index 50f69898..08923818 100644
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -4705,6 +4705,18 @@
           <_description>Enter on keypad</_description>
         </configItem>
       </option>
+      <option>
+        <configItem>
+          <name>lv3:caps_switch</name>
+          <description>CapsLock</description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv3:bksl_switch</name>
+          <description>&lt;BKSL&gt;-Key</description>
+        </configItem>
+      </option>
     </group>
     <group allowMultipleSelection="false">
       <!-- Tweaking the position of the "Ctrl" key -->
@@ -5157,6 +5169,12 @@
           <_description>Enable extra typographic characters</_description>
         </configItem>
       </option>
+      <option>
+        <configItem>
+          <name>shift:both_capslock</name>
+          <description>Both Shift-Keys together toggle CapsLock</description>
+        </configItem>
+      </option>
     </group>
     <group allowMultipleSelection="true">
       <!-- Special shortcuts for the Euro character -->
@@ -5189,6 +5207,24 @@
         </configItem>
       </option>
     </group>
+    <group allowMultipleSelection="true">
+      <configItem>
+        <name>lv5</name>
+        <description>5th level options</description>
+      </configItem>
+      <option>
+        <configItem>
+          <name>lv5:lsgt_switch_lock</name>
+          <description>&lt;LSGT&gt;-Key chooses 5th level and toggles level5-Lock when pressed together with another 5th-level-chooser</description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv5:ralt_switch_lock</name>
+          <description>Right Alt chooses 5th level and toggles level5-Lock when pressed together with another 5th-level-chooser</description>
+        </configItem>
+      </option>
+    </group>
     <group allowMultipleSelection="false">
       <!-- Let space output NBSP, NNBSP, ZWNJ, and ZWJ for the desired level -->
       <configItem>
diff --git a/rules/compat/Makefile.am b/rules/compat/Makefile.am
index 1032c411..08726342 100644
--- a/rules/compat/Makefile.am
+++ b/rules/compat/Makefile.am
@@ -1,7 +1,12 @@
 
 transform_files=layoutsMapping.lst variantsMapping.lst
 
-dist_parts=base.o_s.part
+dist_parts=base.o_s.part \
+base.lv_c.part \
+base.l1v1_c.part \
+base.l2v2_c.part \
+base.l3v3_c.part \
+base.l4v4_c.part
 
 scripts_dir=$(srcdir)/../bin
 
diff --git a/rules/compat/base.l1v1_c.part b/rules/compat/base.l1v1_c.part
new file mode 100644
index 00000000..64ff0f2f
--- /dev/null
+++ b/rules/compat/base.l1v1_c.part
@@ -0,0 +1 @@
+  de		neo			=	+caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
diff --git a/rules/compat/base.l2v2_c.part b/rules/compat/base.l2v2_c.part
new file mode 100644
index 00000000..fea61be7
--- /dev/null
+++ b/rules/compat/base.l2v2_c.part
@@ -0,0 +1 @@
+  de		neo			=	+caps(caps_lock):2+misc(assign_shift_left_action):2+level5(level5_lock):2
diff --git a/rules/compat/base.l3v3_c.part b/rules/compat/base.l3v3_c.part
new file mode 100644
index 00000000..5a1fb2f8
--- /dev/null
+++ b/rules/compat/base.l3v3_c.part
@@ -0,0 +1 @@
+  de		neo			=	+caps(caps_lock):3+misc(assign_shift_left_action):3+level5(level5_lock):3
diff --git a/rules/compat/base.l4v4_c.part b/rules/compat/base.l4v4_c.part
new file mode 100644
index 00000000..ac8a9110
--- /dev/null
+++ b/rules/compat/base.l4v4_c.part
@@ -0,0 +1 @@
+  de		neo			=	+caps(caps_lock):4+misc(assign_shift_left_action):4+level5(level5_lock):4
diff --git a/rules/compat/base.lv_c.part b/rules/compat/base.lv_c.part
new file mode 100644
index 00000000..64ff0f2f
--- /dev/null
+++ b/rules/compat/base.lv_c.part
@@ -0,0 +1 @@
+  de		neo			=	+caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
diff --git a/symbols/de b/symbols/de
index b23aaf6c..60b53b54 100644
--- a/symbols/de
+++ b/symbols/de
@@ -212,21 +212,23 @@ xkb_symbols "sundeadkeys" {
 };
 
 
-// German NEO-Layout Version 2.0rc1 (rev: 1331)
+// 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
+//        and many other contributors
 //
 //      http://www.neo-layout.org
-
+//
+// $Revision$, $Date$
 
 partial alphanumeric_keys modifier_keys keypad_keys
-xkb_symbols "neo" {
+xkb_symbols "neo_base" {
 
     name[Group1]= "Germany - Neo 2";
 
@@ -235,154 +237,160 @@ xkb_symbols "neo" {
     // 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
-    //
+    // Ebene 4: Mod4 (for marking something use Shift + Mod4)
+    // Ebene 5: Shift + Mod3
+    // Ebene 6: Mod3 + Mod4
+    // Compose (not a level): Mod3 + Tab
+    // Feststelltaste (Capslock): Shift + Shift
+    // Mod4-Lock: Mod4 + Mod4
+    // Mod4-Lock: Shift + Mod3 + Tab
+
+    // Legend
+    // ===============
     // Levels in Xkbmap jargon to be found here in the definitions. 
-    // These are the levels used, and Xorg's translations 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
+    // These are the levels used, and Xorg's translations:
     // --------------------------------------------------------------
-    // Definition of the so called Neo-Mod3
-    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 ] };
+    // Xorg:       Level1                   Level2                   Level3                   Level4                   Level5                   Level6                   Level7                   Level8                   
+    // Neo:        Ebene1                   Ebene2                   Ebene3                   Ebene5                   Ebene4                   Pseudo-Ebene             Ebene6                   ???                      
+    // Keys (Neo): None                     Shift                    Mod3                     Mod3 + Shift             Mod4                     Mod4 + Shift             Mod3 + Mod4              Mod3 + Mod4 + Shift      
 
-    // 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" ;
+    // Alphanumeric-keys
+    // ===============
+    key.type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK";
 
     // Tab as Multi_key (Compose)
     // --------------------------------------------------------------
-    key  <TAB> { [ Tab, ISO_Left_Tab, Multi_key ] };
+    key  <TAB> { [ Tab,                     ISO_Left_Tab,            Multi_key,               ISO_Level5_Lock,         NoSymbol,                NoSymbol,                NoSymbol,                ISO_Level5_Lock          ] };
 
-    // 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          ] };
+    // Number row
+    // --------------------------------------------------------------
+    key <TLDE> { [ dead_circumflex,         dead_caron,              U21BB,                   U02DE,                   dead_abovedot,           Pointer_EnableKeys,      dead_belowdot,           NoSymbol                 ] };
 
-    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 <AE01> { [ 1,                       degree,                  onesuperior,             onesubscript,            ordfeminine,             NoSymbol,                notsign,                 NoSymbol                 ] };
+    key <AE02> { [ 2,                       section,                 twosuperior,             twosubscript,            masculine,               NoSymbol,                logicalor,               NoSymbol                 ] };
+    key <AE03> { [ 3,                       U2113,                   threesuperior,           threesubscript,          numerosign,              NoSymbol,                logicaland,              NoSymbol                 ] };
+    key <AE04> { [ 4,                       guillemotright,          U203A,                   femalesymbol,            NoSymbol,                NoSymbol,                U22A5,                   NoSymbol                 ] };
+    key <AE05> { [ 5,                       guillemotleft,           U2039,                   malesymbol,              periodcentered,          NoSymbol,                U2221,                   NoSymbol                 ] };
+    key <AE06> { [ 6,                       dollar,                  cent,                    U26A5,                   sterling,                NoSymbol,                U2225,                   NoSymbol                 ] };
 
-    key <AE11> { [ minus,       emdash,                 NoSymbol,               U2011,              minus,          NoSymbol,    hyphen         ] };
-    key <AE12> { [ dead_grave,  NoSymbol,               dead_diaeresis,         dead_dasia,         U030F,          NoSymbol,    NoSymbol       ] };
+    key <AE07> { [ 7,                       EuroSign,                yen,                     U03F0,                   currency,                NoSymbol,                rightarrow,              NoSymbol                 ] };
+    key <AE08> { [ 8,                       doublelowquotemark,      singlelowquotemark,      U27E8,                   Tab,                     ISO_Left_Tab,            U221E,                   NoSymbol                 ] };
+    key <AE09> { [ 9,                       leftdoublequotemark,     leftsinglequotemark,     U27E9,                   KP_Divide,               KP_Divide,               variation,               NoSymbol                 ] };
+    key <AE10> { [ 0,                       rightdoublequotemark,    rightsinglequotemark,    zerosubscript,           KP_Multiply,             KP_Multiply,             emptyset,                NoSymbol                 ] };
 
-    key <BKSP> { [ BackSpace,   BackSpace,              BackSpace,              BackSpace,          BackSpace,      BackSpace,   BackSpace      ] };
+    key <AE11> { [ minus,                   emdash,                  NoSymbol,                U2011,                   KP_Subtract,             KP_Subtract,             hyphen,                  NoSymbol                 ] };
+    key <AE12> { [ dead_grave,              dead_cedilla,            dead_abovering,          dead_dasia,              dead_diaeresis,          NoSymbol,                dead_macron,             NoSymbol                 ] };
 
-    // top row
+    // 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
+    key.type[Group1] = "EIGHT_LEVEL_ALPHABETIC_LEVEL_FIVE_LOCK";
+    key <AD01> { [ x,                       X,                       ellipsis,                Greek_xi,                Prior,                   Prior,                   Greek_XI,                NoSymbol                 ] };
+    key <AD02> { [ v,                       V,                       underscore,              NoSymbol,                BackSpace,               BackSpace,               radical,                 NoSymbol                 ] };
+    key <AD03> { [ l,                       L,                       bracketleft,             Greek_lambda,            Up,                      Up,                      Greek_LAMBDA,            NoSymbol                 ] };
+    key <AD04> { [ c,                       C,                       bracketright,            Greek_chi,               Delete,                  Delete,                  U2102,                   NoSymbol                 ] };
+    key <AD05> { [ w,                       W,                       asciicircum,             Greek_omega,             Next,                    Next,                    Greek_OMEGA,             NoSymbol                 ] };
+
+    key <AD06> { [ k,                       K,                       exclam,                  Greek_kappa,             exclamdown,              NoSymbol,                multiply,                NoSymbol                 ] };
+    key <AD07> { [ h,                       H,                       less,                    Greek_psi,               KP_7,                    KP_7,                    Greek_PSI,               NoSymbol                 ] };
+    key <AD08> { [ g,                       G,                       greater,                 Greek_gamma,             KP_8,                    KP_8,                    Greek_GAMMA,             NoSymbol                 ] };
+    key <AD09> { [ f,                       F,                       equal,                   Greek_phi,               KP_9,                    KP_9,                    Greek_PHI,               NoSymbol                 ] };
+    key <AD10> { [ q,                       Q,                       ampersand,               U03D5,                   KP_Add,                  KP_Add,                  U211A,                   NoSymbol                 ] };
+
+    key <AD11> { [ ssharp,                  U1E9E,                   U017F,                   Greek_finalsmallsigma,   U2212,                   NoSymbol,                jot,                     NoSymbol                 ] };
+
+    key.type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK";
+    key <AD12> { [ dead_acute,              dead_tilde,              dead_stroke,             dead_psili,              dead_doubleacute,        NoSymbol,                dead_breve,              NoSymbol                 ] };
+
+    // Middle row
     // --------------------------------------------------------------
-    // 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
+    key.type[Group1] = "EIGHT_LEVEL_ALPHABETIC_LEVEL_FIVE_LOCK";
+    key <AC01> { [ u,                       U,                       backslash,               NoSymbol,                Home,                    Home,                    includedin,              NoSymbol                 ] };
+    key <AC02> { [ i,                       I,                       slash,                   Greek_iota,              Left,                    Left,                    integral,                NoSymbol                 ] };
+    key <AC03> { [ a,                       A,                       braceleft,               Greek_alpha,             Down,                    Down,                    U2200,                   NoSymbol                 ] };
+    key <AC04> { [ e,                       E,                       braceright,              Greek_epsilon,           Right,                   Right,                   U2203,                   NoSymbol                 ] };
+    key <AC05> { [ o,                       O,                       asterisk,                Greek_omicron,           End,                     End,                     elementof,               NoSymbol                 ] };
+
+    key <AC06> { [ s,                       S,                       question,                Greek_sigma,             questiondown,            NoSymbol,                Greek_SIGMA,             NoSymbol                 ] };
+    key <AC07> { [ n,                       N,                       parenleft,               Greek_nu,                KP_4,                    KP_4,                    U2115,                   NoSymbol                 ] };
+    key <AC08> { [ r,                       R,                       parenright,              Greek_rho,               KP_5,                    KP_5,                    U211D,                   NoSymbol                 ] };
+    key <AC09> { [ t,                       T,                       minus,                   Greek_tau,               KP_6,                    KP_6,                    partialderivative,       NoSymbol                 ] };
+    key <AC10> { [ d,                       D,                       colon,                   Greek_delta,             KP_Separator,            comma,                   Greek_DELTA,             NoSymbol                 ] };
+
+    key <AC11> { [ y,                       Y,                       at,                      Greek_upsilon,           period,                  KP_Decimal,              nabla,                   NoSymbol                 ] };
+
+    // Bottom row
     // --------------------------------------------------------------
-    // üöä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         ] };
+    key <AB01> { [ udiaeresis,              Udiaeresis,              numbersign,              NoSymbol,                Escape,                  Escape,                  union,                   NoSymbol                 ] };
+    key <AB02> { [ odiaeresis,              Odiaeresis,              dollar,                  U03F5,                   Tab,                     Tab,                     intersection,            NoSymbol                 ] };
+    key <AB03> { [ adiaeresis,              Adiaeresis,              bar,                     Greek_eta,               Insert,                  Insert,                  U2135,                   NoSymbol                 ] };
+    key <AB04> { [ p,                       P,                       asciitilde,              Greek_pi,                Return,                  Return,                  Greek_PI,                NoSymbol                 ] };
+    key <AB05> { [ z,                       Z,                       grave,                   Greek_zeta,              Undo,                    Undo,                    U2124,                   NoSymbol                 ] };
+
+    key <AB06> { [ b,                       B,                       plus,                    Greek_beta,              colon,                   NoSymbol,                U21D0,                   NoSymbol                 ] };
+    key <AB07> { [ m,                       M,                       percent,                 Greek_mu,                KP_1,                    KP_1,                    ifonlyif,                NoSymbol                 ] };
+    key.type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK";
+    key <AB08> { [ comma,                   endash,                  quotedbl,                U03F1,                   KP_2,                    KP_2,                    U21D2,                   NoSymbol                 ] };
+    key <AB09> { [ period,                  enfilledcircbullet,      apostrophe,              U03D1,                   KP_3,                    KP_3,                    U21A6,                   NoSymbol                 ] };
+    key.type[Group1] = "EIGHT_LEVEL_ALPHABETIC_LEVEL_FIVE_LOCK";
+    key <AB10> { [ j,                       J,                       semicolon,               Greek_theta,             semicolon,               NoSymbol,                Greek_THETA,             NoSymbol                 ] };
+    key.type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK";
 
     // Space key
     // --------------------------------------------------------------
-    key <SPCE> { [ space,       space,                  space,                  nobreakspace,       0,              NoSymbol,    U202F             ] };
+    key <SPCE> { [ space,                   space,                   space,                   nobreakspace,            KP_0,                    KP_0,                    U202F,                   NoSymbol                 ] };
 
-    // Keypad
-    // ===========
 
-    // Num-Lock is no longer used with Neo:
-    //key.type[Group1]="FOUR_LEVEL_MIXED_KEYPAD";
+    // Keypad-keys
+    // ===============
 
-    // 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,                Pointer_EnableKeys,      identical,               NoSymbol                 ] };
 
-    // topmost row
+    // 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 ] };
+    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,          NoSymbol,       U20D7,        U226B,        KP_Prior,   KP_Prior,   U2309   ] };
-    key <KPAD> { [ KP_Add,        KP_Add,         plusminus,    U2213,        U2295,      NoSymbol,   U2214   ] };
+    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
+    // 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 ] };
+    key  <KP4> { [ KP_4,                    club,                    leftarrow,               includedin,              KP_Left,                 KP_Left,                 U2286,                   NoSymbol                 ] };
+    key  <KP5> { [ KP_5,                    EuroSign,                colon,                   U22B6,                   KP_Begin,                KP_Begin,                U22B7,                   NoSymbol                 ] };
+    key  <KP6> { [ KP_6,                    U2023,                   rightarrow,              includes,                KP_Right,                KP_Right,                U2287,                   NoSymbol                 ] };
 
-    // bottom row
+    // 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_Decimal,   comma,           period,    apostrophe,   KP_Delete,   KP_Delete,   quotedbl ] };
+    key  <KP0> { [ KP_0,                    U2423,                   percent,                 U2030,                   KP_Insert,               KP_Insert,               U25A1,                   NoSymbol                 ] };
+    key <KPDL> { [ KP_Separator,            period,                  comma,                   minutes,                 KP_Delete,               KP_Delete,               seconds,                 NoSymbol                 ] };
+};
+
+partial alphanumeric_keys modifier_keys keypad_keys
+xkb_symbols "neo" {
+
+    include "de(neo_base)"
 
+    include "shift(both_capslock)"
+    include "level3(caps_switch)"
+    include "level3(bksl_switch)"
+    include "level5(lsgt_switch_lock)"
+    include "level5(ralt_switch_lock)"
 };
 
 // Copied from macintosh_vndr/de
diff --git a/symbols/level3 b/symbols/level3
index 79fdcea0..1e58a483 100644
--- a/symbols/level3
+++ b/symbols/level3
@@ -144,3 +144,21 @@ xkb_symbols "enter_switch" {
     };
   modifier_map Mod5   { ISO_Level3_Shift };
 };
+
+partial modifier_keys
+xkb_symbols "caps_switch" {
+  key <CAPS> {
+    type[Group1]="ONE_LEVEL",
+    symbols[Group1] = [ ISO_Level3_Shift ]
+  };
+  modifier_map Mod5   { ISO_Level3_Shift };
+};
+
+partial modifier_keys
+xkb_symbols "bksl_switch" {
+  key <BKSL> {
+    type[Group1]="ONE_LEVEL",
+    symbols[Group1] = [ ISO_Level3_Shift ]
+  };
+  modifier_map Mod5   { ISO_Level3_Shift };
+};
diff --git a/symbols/level5 b/symbols/level5
index 87ecfaa5..921592a7 100644
--- a/symbols/level5
+++ b/symbols/level5
@@ -16,3 +16,51 @@ xkb_symbols "rctrl_switch" {
     };
   modifier_map Mod3   { ISO_Level5_Shift };
 };
+
+// The following modifier keys are used to switch to the third shift and to set a
+// corresponding lock, implemented as NumLock.
+
+partial modifier_keys
+xkb_symbols "lock" {
+  // This adds the definitions needed to create a level5-lock behaviour, using
+  // the real modifier NumLock as a lock indicator.
+  // See also: types/level5 : EIGHT_LEVEL_LEVEL_FIVE_LOCK
+  // See also: compat/level5(level5_lock)
+  key.type[Group1] = "ONE_LEVEL";
+
+  replace key <MDSW> {
+    vmods = LevelFive,
+    symbols[Group1] = [ ISO_Level5_Shift ],
+    actions[Group1] = [ SetMods(modifiers=LevelFive) ]
+  };
+  modifier_map Mod3 { <MDSW> };
+
+  replace key <HYPR> {
+    vmods = NumLock,
+    symbols[Group1] = [ NoSymbol ],
+    actions[Group1] = [ SetMods(modifiers=NumLock) ]
+  };
+  modifier_map Mod2 { <HYPR> };
+};
+
+partial modifier_keys
+xkb_symbols "lsgt_switch_lock" {
+
+  include "level5(lock)"
+
+  key <LSGT> {
+    type[Group1] = "EIGHT_LEVEL",
+    symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ]
+  };
+};
+
+partial modifier_keys
+xkb_symbols "ralt_switch_lock" {
+
+  include "level5(lock)"
+
+  key <RALT> {
+    type[Group1] = "EIGHT_LEVEL",
+    symbols[Group1] = [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ]
+  };
+};
diff --git a/symbols/shift b/symbols/shift
index eb7533f7..4bd1cd62 100644
--- a/symbols/shift
+++ b/symbols/shift
@@ -17,3 +17,25 @@ xkb_symbols "breaks_caps" {
 	]
     };
 };
+
+// When pressed together with another Shift key, set/release Lock.
+partial modifier_keys
+xkb_symbols "lshift_both_capslock" {
+  key <LFSH> {
+    type[Group1]="TWO_LEVEL",
+    symbols[Group1] = [ Shift_L,                       Caps_Lock                ]
+  };
+};
+// When pressed together with another Shift key, set or unset Lock.
+partial modifier_keys
+xkb_symbols "rshift_both_capslock" {
+  key <RTSH> {
+    type[Group1]="TWO_LEVEL",
+    symbols[Group1] = [ Shift_R,                       Caps_Lock                ]
+  };
+};
+partial modifier_keys
+xkb_symbols "both_capslock" {
+  include "shift(lshift_both_capslock)"
+  include "shift(rshift_both_capslock)"
+};
diff --git a/types/level5 b/types/level5
index c8d6f3d9..963a72ba 100644
--- a/types/level5
+++ b/types/level5
@@ -56,6 +56,128 @@ partial default xkb_types "default" {
 	level_name[Level8] = "X Shift Alt";
     };
 
+    type "EIGHT_LEVEL_LEVEL_FIVE_LOCK" {
+    	// Level5-Lock is implemented by using NumLock, because a real modifier
+    	// is required.
+    	
+        modifiers = Shift + Lock + LevelThree + NumLock + LevelFive;
+
+        map[None]                                    = Level1;
+        map[Shift]                                   = Level2;
+        map[LevelThree]                              = Level3;
+        map[LevelThree+Shift]                        = Level4;
+
+        map[LevelFive]                               = Level5;
+        map[LevelFive+Shift]                         = Level6;
+        map[LevelFive+LevelThree]                    = Level7;
+        map[LevelFive+LevelThree+Shift]              = Level8;
+
+        map[NumLock]                                 = Level5;
+        map[NumLock+Shift]                           = Level6;
+        map[NumLock+LevelThree]                      = Level7;
+        map[NumLock+LevelThree+Shift]                = Level8;
+
+        map[NumLock+LevelFive]                       = Level1;
+        map[NumLock+LevelFive+Shift]                 = Level2;
+        map[NumLock+LevelFive+LevelThree]            = Level3;
+        map[NumLock+LevelFive+LevelThree+Shift]      = Level4;
+
+        // Lock has no effect
+        map[Lock]                                    = Level1;
+        map[Lock+Shift]                              = Level2;
+        map[Lock+LevelThree]                         = Level3;
+        map[Lock+LevelThree+Shift]                   = Level4;
+
+        map[Lock+LevelFive]                          = Level5;
+        map[Lock+LevelFive+Shift]                    = Level6;
+        map[Lock+LevelFive+LevelThree]               = Level7;
+        map[Lock+LevelFive+LevelThree+Shift]         = Level8;
+
+        map[Lock+NumLock]                            = Level5;
+        map[Lock+NumLock+Shift]                      = Level6;
+        map[Lock+NumLock+LevelThree]                 = Level7;
+        map[Lock+NumLock+LevelThree+Shift]           = Level8;
+
+        map[Lock+NumLock+LevelFive]                  = Level1;
+        map[Lock+NumLock+LevelFive+Shift]            = Level2;
+        map[Lock+NumLock+LevelFive+LevelThree]       = Level3;
+        map[Lock+NumLock+LevelFive+LevelThree+Shift] = Level4;
+
+        preserve[LevelFive+Shift] = Shift;
+        preserve[NumLock+Shift] = Shift;
+        preserve[Lock+LevelFive+Shift] = Shift;
+        preserve[Lock+NumLock+Shift] = Shift;
+
+        level_name[Level1] = "Base";
+        level_name[Level2] = "Shift";
+        level_name[Level3] = "Alt Base";
+        level_name[Level4] = "Shift Alt";
+        level_name[Level5] = "X";
+        level_name[Level6] = "X Shift";
+        level_name[Level7] = "X Alt Base";
+        level_name[Level8] = "X Shift Alt";
+    };
+
+    type "EIGHT_LEVEL_ALPHABETIC_LEVEL_FIVE_LOCK" {
+    	// Level5-Lock is implemented by using NumLock, because a real modifier
+    	// is required.
+    	
+        modifiers = Shift + Lock + LevelThree + NumLock + LevelFive;
+    
+        map[None]                                    = Level1;
+        map[Shift]                                   = Level2;
+        map[LevelThree]                              = Level3;
+        map[LevelThree+Shift]                        = Level4;
+
+        map[LevelFive]                               = Level5;
+        map[LevelFive+Shift]                         = Level6;
+        map[LevelFive+LevelThree]                    = Level7;
+        map[LevelFive+LevelThree+Shift]              = Level8;
+
+        map[NumLock]                                 = Level5;
+        map[NumLock+Shift]                           = Level6;
+        map[NumLock+LevelThree]                      = Level7;
+        map[NumLock+LevelThree+Shift]                = Level8;
+
+        map[NumLock+LevelFive]                       = Level1;
+        map[NumLock+LevelFive+Shift]                 = Level2;
+        map[NumLock+LevelFive+LevelThree]            = Level3;
+        map[NumLock+LevelFive+LevelThree+Shift]      = Level4;
+
+        // Lock interchanges Level1 and Level2
+        map[Lock]                                    = Level2;
+        map[Lock+Shift]                              = Level1;
+        map[Lock+LevelThree]                         = Level3;
+        map[Lock+LevelThree+Shift]                   = Level4;
+
+        map[Lock+LevelFive]                          = Level5;
+        map[Lock+LevelFive+Shift]                    = Level6;
+        map[Lock+LevelFive+LevelThree]               = Level7;
+        map[Lock+LevelFive+LevelThree+Shift]         = Level8;
+
+        map[Lock+NumLock]                            = Level5;
+        map[Lock+NumLock+Shift]                      = Level6;
+        map[Lock+NumLock+LevelThree]                 = Level7;
+        map[Lock+NumLock+LevelThree+Shift]           = Level8;
+
+        map[Lock+NumLock+LevelFive]                  = Level2;
+        map[Lock+NumLock+LevelFive+Shift]            = Level1;
+        map[Lock+NumLock+LevelFive+LevelThree]       = Level4;
+        map[Lock+NumLock+LevelFive+LevelThree+Shift] = Level3;
+
+        preserve[LevelFive+Shift] = Shift;
+        preserve[NumLock+Shift] = Shift;
+
+        level_name[Level1] = "Base";
+        level_name[Level2] = "Shift";
+        level_name[Level3] = "Alt Base";
+        level_name[Level4] = "Shift Alt";
+        level_name[Level5] = "X";
+        level_name[Level6] = "X Shift";
+        level_name[Level7] = "X Alt Base";
+        level_name[Level8] = "X Shift Alt";
+    };
+
     type "EIGHT_LEVEL_SEMIALPHABETIC" {
 	modifiers = Shift+Lock+LevelThree+LevelFive;
 	map[None] = Level1;