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

2 files changed, 90 insertions, 85 deletions

diff --git a/linux/X/de b/linux/X/de
index e3e81c4..821b63a 100644
--- a/linux/X/de
+++ b/linux/X/de
@@ -193,7 +193,7 @@ xkb_symbols "sundeadkeys" {
 };
 
 
-// German NEO Eurokeys-Style
+// German NEO Style
 // adopted 2004 by Hanno Behrens <Hanno.Behrens@gmx.de>
 // inspired by Dvorak/de-ergo  http://www.goebel-consult.de/de-ergo/
 // Authors:
@@ -205,128 +205,133 @@ xkb_symbols "sundeadkeys" {
 
 partial alphanumeric_keys 
 xkb_symbols "neo" {
-
-    name[Group1]= "German Neostyle (v.2.0)";
+    
+		name[Group1]= "German Neostyle (v2.0)";
     
     key.type[group1]="EIGHT_LEVEL_SEMIALPHABETIC";
 
     // Zahlenreihe
 // 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                               ] };
-
-    key <AE01> { [	    1,  degree, notsign,    onesuperior	                                 ] };
-    key <AE02> { [	    2,	paragraph,  2,    twosuperior                                            ] };
-    key <AE03> { [	    3,	section,    3,  threesuperior                                    ] };
-    key <AE04> { [	    4,  dollar, yen,    cent,   Prior,  Prior	                         ] };
-    key <AE05> { [	    5,  EuroSign,   sterling,   currency, 5, implies                   ] };
-    key <AE06> { [	    6,  ordfeminine,    ae, AE, 6, ifonlyif                              ] };
-    key <AE07> { [	    7,	masculine,  oe, OE                                               ] };
-    key <AE08> { [	    8,	doublelowquotemark, singlelowquotemark, guillemotright, slash	 ] };
-    key <AE09> { [	    9,	leftdoublequotemark,    leftsinglequotemark,    guillemotleft,  asterisk] };
-    key <AE10> { [	    0,	rightdoublequotemark,   rightsinglequotemark,   U203A,  minus    ] };
-    key <AE11> { [	    minus,  endash,  emdash,  U2039, eth, ETH                              ] };
-    key <AE12> { [	    dead_acute, dead_grave, dead_cedilla,   dead_ogonek,    dead_abovedot,  dead_abovering  ] };
+//    key <TLDE> { [ dead_circumflex, dead_caron, dead_breve, dead_stroke ] };
+    key <TLDE> { [ dead_circumflex, dead_caron, dead_breve ] };
+
+    key <AE01> { [ 1,      degree,        1,    onequarter,    oneeighth           ] };
+    key <AE02> { [ 2,   paragraph,        2,       onehalf                         ] };
+    key <AE03> { [ 3,     section,        3, threequarters, threeeighths           ] };
+    key <AE04> { [ 4,      dollar,      yen,          cent,        Prior, Prior    ] };
+    key <AE05> { [ 5,    EuroSign, sterling,      currency,  fiveeighths, implies  ] };
+    key <AE06> { [ 6, ordfeminine,       ae,            AE,            6, ifonlyif ] };
+
+    key <AE07> { [ 7,            masculine,                   oe,             OE, seveneighths ] };
+    key <AE08> { [ 8,   doublelowquotemark,   singlelowquotemark, guillemotright,        slash ] };
+    key <AE09> { [ 9,  leftdoublequotemark,  leftsinglequotemark,  guillemotleft,     asterisk ] };
+    key <AE10> { [ 0, rightdoublequotemark, rightsinglequotemark,          U203A,        minus ] };
+    key <AE11> { [ minus,           endash,               emdash,          U2039, eth,           ETH ] };
+    key <AE12> { [ dead_acute,  dead_grave,          dead_cedilla,   dead_ogonek, dead_abovedot, dead_abovering ] };
 
 
     // obere Reihe
-    key <AD01> { [ 	    x,  X,  at,             Greek_xi,     x,   Greek_XI             ] };
-    key <AD02> { [	    v,  V,  underscore,     v,            BackSpace, U039B               ] };
-    key <AD03> { [	    l,	L,  bracketleft,    Greek_lambda,   Up,     Up                   ] };
-    key <AD04> { [	    c,	C,  bracketright,   Greek_chi,  Tab, Tab                         ] };
-    key <AD05> { [	    w,	W,  asciicircum,    w,              Insert                       ] };
-    key <AD06> { [	    k,	K,  exclam,         Greek_kappa,    exclamdown, copyright        ] };
-    key <AD07> { [	    h,	H,  less,           Greek_psi,  7,  Greek_PSI                    ] };
-    key <AD08> { [	    g,	G,  greater,        Greek_gamma,    8,  Greek_GAMMA              ] };
-    key <AD09> { [	    f,	F,  equal,          Greek_phi,  9,  Greek_PHI                    ] };
-    key <AD10> { [	    q,  Q,  ampersand,      q,          plus	                         ] };
-    key <AD11> { [      ssharp,  ssharp,        U133,   U132,   schwa,   SCHWA             	 ] };
-    key <AD12> { [      dead_tilde, dead_macron,    dead_diaeresis, dead_doubleacute,   dead_belowdot,  dead_belowdot   ] };
+    key <AD01> { [ x, X,           at,     Greek_xi,         x, Greek_XI ] };
+    key <AD02> { [ v, V,   underscore,            v, BackSpace, U039B    ] };
+    key <AD03> { [ l, L,  bracketleft, Greek_lambda,        Up, Up       ] };
+    key <AD04> { [ c, C, bracketright,    Greek_chi,       Tab, Tab      ] };
+    key <AD05> { [ w, W,  asciicircum,            w,    Insert           ] };
+
+    key <AD06> { [ k, K,    exclam, Greek_kappa, exclamdown,   copyright ] };
+    key <AD07> { [ h, H,      less,   Greek_psi,          7,   Greek_PSI ] };
+    key <AD08> { [ g, G,   greater, Greek_gamma,          8, Greek_GAMMA ] };
+    key <AD09> { [ f, F,     equal,   Greek_phi,          9,   Greek_PHI ] };
+    key <AD10> { [ q, Q, ampersand,           q,       plus              ] };
+    key <AD11> { [ ssharp, ssharp, U133,   U132,      schwa,       SCHWA ] };
+    key <AD12> { [ dead_tilde, dead_macron, dead_diaeresis, dead_doubleacute, dead_belowdot, dead_belowdot ] };
 
 
     // mittlere Reihe
-    key <AC01> { [	    u,	U,  backslash,  backslash,  Home,   Home                         ] };
-    key <AC02> { [	    i,	I,  slash,      Greek_iota, Left,   Left                         ] };
-    key <AC03> { [	    a,	A,  braceleft,  Greek_alpha,    Down,   Down                     ] };
-    key <AC04> { [	    e,	E,  braceright, Greek_epsilon,  Right,  Right                    ] };
-    key <AC05> { [	    o,	O,  asterisk,   Greek_omega,    End,    End                      ] };
-    key <AC06> { [	    s,	S,  question,   Greek_sigma,    questiondown,   Greek_SIGMA      ] };
-    key <AC07> { [	    n,	N,  parenleft,  Greek_nu,   4,  numerosign                       ] };
-    key <AC08> { [	    r,	R,  parenright, Greek_rho,  5,  registered                       ] };
-    key <AC09> { [	    t,	T,  minus,      Greek_tau,  6,  trademark                        ] };
-    key <AC10> { [	    d,	D,  colon,      Greek_delta,    comma,  Greek_DELTA              ] };
-    key <AC11> { [	    y,	Y,  y,          Greek_upsilon,  thorn,  THORN                    ] };
+    key <AC01> { [ u, U,  backslash,     backslash,  Home,   Home ] };
+    key <AC02> { [ i, I,      slash,    Greek_iota,  Left,   Left ] };
+    key <AC03> { [ a, A,  braceleft,   Greek_alpha,  Down,   Down ] };
+    key <AC04> { [ e, E, braceright, Greek_epsilon, Right,  Right ] };
+    key <AC05> { [ o, O,   asterisk,   Greek_omega,   End,    End ] };
+
+    key <AC06> { [ s, S,   question,   Greek_sigma, questiondown, Greek_SIGMA ] };
+    key <AC07> { [ n, N,  parenleft,      Greek_nu,            4,  numerosign ] };
+    key <AC08> { [ r, R, parenright,     Greek_rho,            5,  registered ] };
+    key <AC09> { [ t, T,      minus,     Greek_tau,            6,   trademark ] };
+    key <AC10> { [ d, D,      colon,   Greek_delta,        comma, Greek_DELTA ] };
+    key <AC11> { [ y, Y,          y, Greek_upsilon,        thorn,       THORN ] };
     
 
     // untere Reihe
-    key <AB01> { [      odiaeresis, Odiaeresis, numbersign, odiaeresis, Escape               ] };
-    key <AB02> { [      udiaeresis, Udiaeresis, dollar, Udiaeresis, Delete	               	 ] };
-    key <AB03> { [      adiaeresis, Adiaeresis, bar,    Greek_eta,  Next,   Next             ] };
-    key <AB04> { [	    p,  P,  asciitilde, Greek_pi,   p,  Greek_PI		                     ] };
-    key <AB05> { [	    z,	Z,	grave,  Greek_zeta, z,  Greek_ZETA	                         ] };
-    key <AB06> { [	    b,	B,	plus,   Greek_beta, infinity,  Greek_Beta                    ] };
-    key <AB07> { [	    m,	M,	percent,    mu, 1 	                                         ] };
-    key <AB08> { [	    comma,  apostrophe, apostrophe,  U3D1, 2	                           ] };
-    key <AB09> { [      period, elipsis, quotedbl,   Greek_theta,    3,  Greek_THETA	       ] };
-    key <AB10> { [	    j,  J,  semicolon, j, period, nabla                                  ] };
+    key <AB01> { [ odiaeresis, Odiaeresis, numbersign, odiaeresis, Escape             ] };
+    key <AB02> { [ udiaeresis, Udiaeresis,     dollar, Udiaeresis, Delete             ] };
+    key <AB03> { [ adiaeresis, Adiaeresis,        bar,  Greek_eta,   Next, Next       ] };
+    key <AB04> { [          p,          P, asciitilde,   Greek_pi,      p, Greek_PI   ] };
+    key <AB05> { [          z,          Z,      grave, Greek_zeta,      z, Greek_ZETA ] };
 
-  
+    key <AB06> { [      b,           B,       plus,  Greek_beta, infinity,   Greek_BETA ] };
+    key <AB07> { [      m,           M,    percent,          mu,         1              ] };
+    key <AB08> { [  comma,  apostrophe, apostrophe,        U3D1,         2              ] };
+    key <AB09> { [ period,    ellipsis,   quotedbl, Greek_theta,         3, Greek_THETA ] };
+    key <AB10> { [      j,           J,  semicolon,           j,    period,       nabla ] };
 
-    key <SPCE> { [	 space,	space,  space,  space,  0,  nobreakspace, U202F ] };
-  
+    key <SPCE> { [ space, space, space, space, 0, nobreakspace, U202F ] };
 
 
     // Keypad
 
-    key <NMLK> { [   Num_Lock,  Pointer_EnableKeys	                                         ] };
-    key <KPDV> { [   KP_Divide, KP_Divide,  division,   U2215                                ] };
-    key <KPMU> { [   KP_Multiply,   KP_Multiply,    multiply,   U22C5,  U2217                ] };
-    key <KPSU> { [   KP_Subtract,   KP_Subtract,    U2212                                    ] };
+//    key <NMLK> { [    Num_Lock, Pointer_EnableKeys ] };
+    
+    key.type[Group1]="FOUR_LEVEL_MIXED_KEYPAD" ;
+
+    key <KPDV> { [   KP_Divide,   KP_Divide, division, U2215        ] };
+    key <KPMU> { [ KP_Multiply, KP_Multiply, multiply, U22C5, U2217 ] };
+    key <KPSU> { [ KP_Subtract, KP_Subtract,    U2212               ] };
 
-    key  <KP7> { [   KP_Home,	KP_7, seveneighths, oneeighth	                             ] };
-    key  <KP8> { [  KP_Up,	KP_8, uparrow, fiveeighths	                                     ] };
-    key  <KP9> { [  KP_Prior,	KP_9, threeeighths, threeeighths                             ] };
-    key <KPAD> { [  KP_Add, plusminus,  plusminus,  U2213                                    ] };
+    key  <KP7> { [  KP_Home,      KP_7,      KP_7, U226A ] };
+    key  <KP8> { [    KP_Up,      KP_8,   uparrow, U2229 ] };
+    key  <KP9> { [ KP_Prior,      KP_9,      KP_9, U226B ] };
+    key <KPAD> { [   KP_Add,    KP_Add, plusminus, U2213 ] }; 
 
-    key  <KP4> {	[  KP_Left,	KP_4, leftarrow, onequarter                          		 ] };
-    key  <KP5> {	[  KP_Begin,	KP_5, dagger, onehalf 			                         ] };
-    key  <KP6> {	[  KP_Right,	KP_6, rightarrow, threequarters	                         ] };
+    key  <KP4> { [  KP_Left, KP_4,  leftarrow, U2282 ] };
+    key  <KP5> { [ KP_Begin, KP_5,     dagger, U222A ] };
+    key  <KP6> { [ KP_Right, KP_6, rightarrow, U2283 ] };
 
-    key  <KP1> {	[  KP_End,	KP_1, onesuperior, onesuperior		                         ] };
-    key  <KP2> {	[  KP_Down,	KP_2, downarrow, twosuperior		                         ] };
-    key  <KP3> {	[  KP_Next,	KP_3, threesuperior, threesuperior	                         ] };
-    key <KPEN> {	[  	KP_Enter	                                                         ] };
-    key <KPEQ> {	[  	KP_Equal	                                                         ] };
+    key  <KP1> { [  KP_End,      KP_1,      KP_1, U2264 ] };
+    key  <KP2> { [ KP_Down,      KP_2, downarrow, U222A ] };
+    key  <KP3> { [ KP_Next,      KP_3,      KP_3, U2265 ] };
+    key <KPEN> { [ KP_Enter, KP_Enter,  notequal, U2248 ] };
+    key <KPEQ> { [ KP_Equal ] };
 
-    key  <KP0> {	[  KP_Insert,	KP_0, percent, U2030			                         ] };
-    key <KPDL> {  	[  KP_Delete,	KP_Decimal, period,  comma                               ] };
+    key  <KP0> { [ KP_Insert,       KP_0, percent, U2030 ] };
+    key <KPDL> { [ KP_Delete, KP_Decimal,  period, comma ] };
 
-    
 
     // die neuen Mods
-  key <RALT> {
-    type[Group1]="ONE_LEVEL",
-    symbols[Group1] = [ 0xfe11 ]
+    key <RALT> {
+        type[Group1]="ONE_LEVEL",
+        symbols[Group1] = [ 0xfe11 ]
     };
-  modifier_map Mod3   { 0xfe11 };
+    modifier_map Mod3   { 0xfe11 };
 
-  key <BKSL> {
-    type[Group1]="ONE_LEVEL",
-    symbols[Group1] = [ ISO_Level3_Shift ]
+    key <BKSL> {
+        type[Group1]="ONE_LEVEL",
+        symbols[Group1] = [ ISO_Level3_Shift ]
     };
 
-  key <CAPS> {
-    type[Group1]="EIGHT_LEVEL",
-    symbols[Group1] = [ ISO_Level3_Shift,   ISO_Level3_Shift,   Caps_Lock,  Caps_Lock,  Caps_Lock,  Caps_Lock ]
-  };
+    key <CAPS> {
+        type[Group1]="EIGHT_LEVEL",
+        symbols[Group1] = [ ISO_Level3_Shift,   ISO_Level3_Shift,   Caps_Lock,  Caps_Lock,  Caps_Lock,  Caps_Lock ]
+    };
 
     key <LSGT> {
         type[Group1]="ONE_LEVEL",
         symbols[Group1] = [ 0xfe11 ]
     };
     modifier_map Mod3   { 0xfe11 };
+
 };
 
+
 // Copied from macintosh_vndr/de
 // olh@suse.de   very close to MacOS map
 
diff --git a/linux/xmodmap/neo_de.xmodmap b/linux/xmodmap/neo_de.xmodmap
index 1cb7013..bf576eb 100644
--- a/linux/xmodmap/neo_de.xmodmap
+++ b/linux/xmodmap/neo_de.xmodmap
@@ -128,7 +128,7 @@ keycode 82  = KP_Subtract KP_Subtract U2212
 keycode 79 = KP_Home	KP_7 seveneighths oneeighth		
 keycode 80 = KP_Up KP_8 uparrow fiveeighths 	
 keycode 81 = KP_Prior	KP_9 threeeighths threeeighths 
-keycode 86 = KP_Add plusminus plusminus U2213
+keycode 86 = KP_Add plusminus minusplus U2213 
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 ! The middle row