rules-xml mit Neo-Optionen hinzugefügt

rules auch für evdev hinzugefügt
Optionen für de(neo) werden nun von symbols/de anstatt von rules gehandhabt (Vorschlag von Erik: 141#comment:16 )
Levelnamen in types/level5 zurückgesetzt.

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

2 files changed, 24 insertions, 18 deletions

diff --git a/linux/X/symbols/de b/linux/X/symbols/de
index fd7d9eb..32d57bc 100644
--- a/linux/X/symbols/de
+++ b/linux/X/symbols/de
@@ -227,7 +227,13 @@ xkb_symbols "sundeadkeys" {
 // $Revision$, $Date$
 
 partial alphanumeric_keys modifier_keys keypad_keys
-xkb_symbols "neo_base" {
+xkb_symbols "neo" {
+
+    include "shift(both_capslock)"
+    include "level3(caps_switch)"
+    include "level3(bksl_switch)"
+    include "level5(lsgt_switch_numlock)"
+    include "level5(ralt_switch_numlock)"
 
     name[Group1]= "Germany - Neo 2";
 
@@ -262,7 +268,7 @@ xkb_symbols "neo_base" {
     // --------------------------------------------------------------
     key  <TAB> { 
         symbols[Group1]= [ Tab,             ISO_Left_Tab,            Multi_key,               Num_Lock,                NoSymbol,                NoSymbol,                NoSymbol,                Num_Lock                 ],
-        actions[Group1]= [ NoActions(),     NoActions(),             NoActions(),             LockMods(modifiers=NumLock), NoActions(),         NoActions(),             NoActions(),             LockMods(modifiers=NumLock) ]
+        actions[Group1]= [ NoAction(),      NoAction(),              NoAction(),              LockMods(modifiers=NumLock), NoAction(),          NoAction(),              NoAction(),              LockMods(modifiers=NumLock) ]
     };
     modifier_map Mod2 { <TAB> };
 
diff --git a/linux/X/symbols/level5 b/linux/X/symbols/level5
index 8bda615..35b8186 100644
--- a/linux/X/symbols/level5
+++ b/linux/X/symbols/level5
@@ -23,13 +23,13 @@ xkb_symbols "rctrl_switch" {
 
 partial modifier_keys
 xkb_symbols "lsgt_switch_numlock" {
-  key <LVL3> {
+  key <MDSW> {
     type[Group1] = "ONE_LEVEL",
    	vmods[Group1] = LevelFive,
     symbols[Group1] = [ NoSymbol ],
     actions[Group1] = [ SetMods(modifiers=LevelFive) ]
    };
-  modifier_map Mod3 { <LVL3> };
+  modifier_map Mod3 { <MDSW> };
   key <LSGT> {
     vmods= NumLock,
     key.type[Group1] = "EIGHT_LEVEL",
@@ -41,13 +41,13 @@ xkb_symbols "lsgt_switch_numlock" {
 
 partial modifier_keys
 xkb_symbols "lwin_switch_numlock" {
-  key <LVL3> {
+  key <MDSW> {
     type[Group1] = "ONE_LEVEL",
    	vmods[Group1] = LevelFive,
     symbols[Group1] = [ NoSymbol ],
     actions[Group1] = [ SetMods(modifiers=LevelFive) ]
    };
-  modifier_map Mod3 { <LVL3> };
+  modifier_map Mod3 { <MDSW> };
   key <LWIN> {
     vmods= NumLock,
     key.type[Group1] = "EIGHT_LEVEL",
@@ -59,13 +59,13 @@ xkb_symbols "lwin_switch_numlock" {
 
 partial modifier_keys
 xkb_symbols "ralt_switch_numlock" {
-  key <LVL3> {
+  key <MDSW> {
     type[Group1] = "ONE_LEVEL",
    	vmods[Group1] = LevelFive,
     symbols[Group1] = [ NoSymbol ],
     actions[Group1] = [ SetMods(modifiers=LevelFive) ]
    };
-  modifier_map Mod3 { <LVL3> };
+  modifier_map Mod3 { <MDSW> };
   key <RALT> {
     vmods= NumLock,
     key.type[Group1] = "EIGHT_LEVEL",
@@ -77,13 +77,13 @@ xkb_symbols "ralt_switch_numlock" {
 
 partial modifier_keys
 xkb_symbols "rwin_switch_numlock" {
-  key <LVL3> {
+  key <MDSW> {
     type[Group1] = "ONE_LEVEL",
    	vmods[Group1] = LevelFive,
     symbols[Group1] = [ NoSymbol ],
     actions[Group1] = [ SetMods(modifiers=LevelFive) ]
    };
-  modifier_map Mod3 { <LVL3> };
+  modifier_map Mod3 { <MDSW> };
   key <RWIN> {
     vmods= NumLock,
     key.type[Group1] = "EIGHT_LEVEL",
@@ -95,13 +95,13 @@ xkb_symbols "rwin_switch_numlock" {
 
 partial modifier_keys
 xkb_symbols "lsgt_switch_numlock_cancel" {
-  key <LVL3> {
+  key <MDSW> {
     type[Group1] = "ONE_LEVEL",
    	vmods[Group1] = LevelFive,
     symbols[Group1] = [ NoSymbol ],
     actions[Group1] = [ SetMods(modifiers=LevelFive) ]
    };
-  modifier_map Mod3 { <LVL3> };
+  modifier_map Mod3 { <MDSW> };
   key <LSGT> {
     vmods= NumLock,
     key.type[Group1] = "EIGHT_LEVEL_NEO_LOCKS",
@@ -113,13 +113,13 @@ xkb_symbols "lsgt_switch_numlock_cancel" {
 
 partial modifier_keys
 xkb_symbols "lwin_switch_numlock_cancel" {
-  key <LVL3> {
+  key <MDSW> {
     type[Group1] = "ONE_LEVEL",
    	vmods[Group1] = LevelFive,
     symbols[Group1] = [ NoSymbol ],
     actions[Group1] = [ SetMods(modifiers=LevelFive) ]
    };
-  modifier_map Mod3 { <LVL3> };
+  modifier_map Mod3 { <MDSW> };
   key <LWIN> {
     vmods= NumLock,
     key.type[Group1] = "EIGHT_LEVEL_NEO_LOCKS",
@@ -131,13 +131,13 @@ xkb_symbols "lwin_switch_numlock_cancel" {
 
 partial modifier_keys
 xkb_symbols "ralt_switch_numlock_cancel" {
-  key <LVL3> {
+  key <MDSW> {
     type[Group1] = "ONE_LEVEL",
    	vmods[Group1] = LevelFive,
     symbols[Group1] = [ NoSymbol ],
     actions[Group1] = [ SetMods(modifiers=LevelFive) ]
    };
-  modifier_map Mod3 { <LVL3> };
+  modifier_map Mod3 { <MDSW> };
   key <RALT> {
     vmods= NumLock,
     key.type[Group1] = "EIGHT_LEVEL_NEO_LOCKS",
@@ -149,13 +149,13 @@ xkb_symbols "ralt_switch_numlock_cancel" {
 
 partial modifier_keys
 xkb_symbols "rwin_switch_numlock_cancel" {
-  key <LVL3> {
+  key <MDSW> {
     type[Group1] = "ONE_LEVEL",
    	vmods[Group1] = LevelFive,
     symbols[Group1] = [ NoSymbol ],
     actions[Group1] = [ SetMods(modifiers=LevelFive) ]
    };
-  modifier_map Mod3 { <LVL3> };
+  modifier_map Mod3 { <MDSW> };
   key <RWIN> {
     vmods= NumLock,
     key.type[Group1] = "EIGHT_LEVEL_NEO_LOCKS",