modtasten von martin

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

2 files changed, 14 insertions, 13 deletions

diff --git a/linux/X/Weiteres/de b/linux/X/Weiteres/de
index 065e407..eaf5fbd 100644
--- a/linux/X/Weiteres/de
+++ b/linux/X/Weiteres/de
@@ -202,19 +202,19 @@ xkb_symbols "sundeadkeys" {
 // Other Questions:
 //   neo_layout (at) yahoogroups (dot) de
 
-partial alphanumeric_keys 
+partial alphanumeric_keys modifier_keys keypad_keys
 xkb_symbols "neo" {
 
     name[Group1]= "German Neostyle";
 
-    key.type[Group1]="EIGHT_LEVEL_ALPHABETIC";
+    key.type[Group1]="EIGHT_LEVEL_SEMIALPHABETIC";
 
     // 1st row
 
     // eigentlich sollte die folgende Zeile rein, aber auf älteren Systemen ist der
     // dead_stroke noch nicht definiert
     key <TLDE> { [ dead_circumflex,                     dead_caron,             dead_breve,         dead_stroke                         ] };
-    //key <TLDE> { [ dead_circumflex,                     dead_caron,             dead_breve          dead_breve, dead_belowdot, dead_belowdot ] };
+    //key <TLDE> { [ dead_circumflex, dead_caron,         dead_breve,               dead_breve,       dead_belowdot,  dead_belowdot       ] };
 
     key <AE01> { [ 1,           degree,                 onesuperior,            U2640,              enfilledcircbullet                  ] };
     key <AE02> { [ 2,           numerosign,             twosuperior,            U26A5,              U2023                               ] };
@@ -271,11 +271,12 @@ xkb_symbols "neo" {
     key <SPCE> { [ space,       space,                  space,                  nobreakspace,       0,              U202F               ] };
     
     // new modkeys   
+    key.type[Group1]="EIGHT_LEVEL" ;
 
-    key <CAPS> { [ ISO_Level3_Shift, ISO_Level3_Shift,  Caps_Lock,              Caps_Lock,          Caps_Lock,      Caps_Lock           ] };
-    key <BKSL> { [ ISO_Level3_Shift, ISO_Level3_Shift,  Multi_key,              Multi_key,          Multi_key,      Multi_key           ] };
-    key <LSGT> { [ 0xfe11,      0xfe11,                 Multi_key,              Multi_key                                               ] };
-    key <RALT> { [ 0xfe11,      0xfe11,                 Multi_key,              Multi_key,          KP_Decimal,     0xfe11              ] };
+    key <CAPS> { [ ISO_Level3_Shift, ISO_Level3_Shift,  Caps_Lock,              Caps_Lock,          Multi_key,      Multi_key           ] };
+    key <BKSL> { [ ISO_Level3_Shift, ISO_Level3_Shift,  Caps_Lock,              Caps_Lock,          Multi_key,      Multi_key           ] };
+    key <LSGT> { [ 0xfe11,      0xfe11,                 Multi_key,              Multi_key           Caps_Lock       Caps_Lock           ] };
+    key <RALT> { [ 0xfe11,      0xfe11,                 Multi_key,              Multi_key,          KP_Decimal,     Caps_Lock           ] };
 
     modifier_map mod5 { <LSGT>, <RALT> };
     // Keypad
diff --git a/linux/X/Weiteres/neo_de.xmodmap b/linux/X/Weiteres/neo_de.xmodmap
index fd175b1..9ffd54e 100644
--- a/linux/X/Weiteres/neo_de.xmodmap
+++ b/linux/X/Weiteres/neo_de.xmodmap
@@ -87,10 +87,10 @@ keycode 61 = j J semicolon U3D1 period nabla
 ! Make CapsLock an additional Alt_Gr (Mode_switch is for 3rd and 4th level)
 remove Lock = Caps_Lock
 remove Mod3 = ISO_Level3_Shift
-keycode 66 = Mode_switch Mode_switch Caps_Lock Caps_Lock Multi_key Multi_key
 
-! Make AltGr and apostrophe to Mode_switch (which is the 3rd and 4th level)
-keycode 113 = ISO_Level3_Shift ISO_Level3_Shift Multi_key Multi_key KP_Decimal
+! Make former CapsLock and qwertz-# to Mode_switch (which is the 3rd and 4th level)
+keycode 66 = Mode_switch Mode_switch Caps_Lock Caps_Lock Multi_key Multi_key
+keycode 51 = Mode_switch Mode_switch Caps_Lock Caps_Lock Multi_key Multi_key
 !keycode 48 = Mode_switch Mode_switch U133 U132 schwa SCHWA
 add Mod5 = Mode_switch
 
@@ -99,9 +99,9 @@ add Mod5 = Mode_switch
 ! the right win key modifies the 5th and 6th
 !keycode 116 = ISO_Level3_Shift
 
-! Make the former qwertz-# and qwertz-< to Mod5 (ISO_Level3_Shift)
-keycode 51 = Mode_switch Mode_switch Caps_Lock Caps_Lock Multi_key Multi_key
-keycode 94  = ISO_Level3_Shift ISO_Level3_Shift Multi_key Multi_key
+! Make the former AltGr and qwertz-< to Mod5 (ISO_Level3_Shift)
+keycode 94  = ISO_Level3_Shift ISO_Level3_Shift Multi_key Multi_key Caps_Lock Caps_Lock
+keycode 113 = ISO_Level3_Shift ISO_Level3_Shift Multi_key Multi_key KP_Decimal Caps_Lock
 add Mod3 = ISO_Level3_Shift
 
 ! force to learn the new Escape!