linux de und xmodmap aktualisiert, Fehler weg, Leerzeichen am Ende weg, README für X-Version angepasst

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

1 files changed, 19 insertions, 19 deletions

diff --git a/linux/X/de b/linux/X/de
index e35f941..1a25b36 100644
--- a/linux/X/de
+++ b/linux/X/de
@@ -115,11 +115,11 @@ xkb_symbols "ro_nodeadkeys" {
 };
 
 // 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 
+// 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 
+partial alphanumeric_keys
 xkb_symbols "dvorak" {
     include "us(dvorak)"
 
@@ -226,7 +226,7 @@ xkb_symbols "neo" {
     key <AE08> { [ 8,   doublelowquotemark,   singlelowquotemark, guillemotright,        slash, U2203 ] };
     key <AE09> { [ 9,  leftdoublequotemark,  leftsinglequotemark,  guillemotleft,     asterisk, U2200 ] };
     key <AE10> { [ 0, rightdoublequotemark, rightsinglequotemark,          U203A,        minus, notsign ] };
-    key <AE11> { [ minus,           endash,               emdash,          U2039,        minus, U2228 ] };
+    key <AE11> { [ minus,           endash,               emdash,          U2039,        minus, logicalor ] };
     key <AE12> { [ dead_acute,  dead_grave,          dead_cedilla,   dead_ogonek, dead_abovedot, dead_abovering ] };
 
 
@@ -241,7 +241,7 @@ xkb_symbols "neo" {
     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,       U2227 ] };
+    key <AD10> { [ q, Q, ampersand,           q,       plus,       logicaland ] };
     key <AD11> { [ ssharp, ssharp, U133,   U132,      schwa,       SCHWA ] };
     key <AD12> { [ dead_tilde, dead_macron, dead_diaeresis, dead_doubleacute, dead_belowdot, dead_belowdot ] };
 
@@ -259,16 +259,16 @@ xkb_symbols "neo" {
     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,       U222B ] };
+    key <AB02> { [ udiaeresis, Udiaeresis,     dollar, udiaeresis, Delete,       integral ] };
     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_OMEGA ] };
 
-    key <AB06> { [      b,           B,       plus,  Greek_beta, infinity,        U2022 ] };
+    key <AB06> { [      b,           B,       plus,  Greek_beta, infinity,        enfilledcircbullet ] };
     key <AB07> { [      m,           M,    percent,          mu,         1              ] };
     key <AB08> { [  comma,  apostrophe, apostrophe,        U3D1,         2,     radical ] };
     key <AB09> { [ period,    ellipsis,   quotedbl, Greek_theta,         3, Greek_THETA ] };
@@ -280,7 +280,7 @@ xkb_symbols "neo" {
     // Keypad
 
 //    key <NMLK> { [    Num_Lock, Pointer_EnableKeys ] };
-    
+
     key.type[Group1]="FOUR_LEVEL_MIXED_KEYPAD" ;
 
     key <KPDV> { [   KP_Divide,   KP_Divide, division, U2215 ] };
@@ -290,7 +290,7 @@ xkb_symbols "neo" {
     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 <KPAD> { [   KP_Add,    KP_Add, plusminus, U2213 ] };
 
     key  <KP4> { [  KP_Left, KP_4,  leftarrow, U2282 ] };
     key  <KP5> { [ KP_Begin, KP_5,     dagger, U222A ] };
@@ -307,18 +307,18 @@ xkb_symbols "neo" {
 
 
     // die neuen Mods
-    key <CAPS> { 
-			type[Group1]="EIGHT_LEVEL", 
-		  [ ISO_Level3_Shift, ISO_Level3_Shift, Caps_Lock, Caps_Lock, Caps_Lock, Caps_Lock ] 
+    key <CAPS> {
+			type[Group1]="EIGHT_LEVEL",
+		  [ ISO_Level3_Shift, ISO_Level3_Shift, Caps_Lock, Caps_Lock, Caps_Lock, Caps_Lock ]
 		};
-    
+
 		key <BKSL> { [ ISO_Level3_Shift, ISO_Level3_Shift, ISO_Level3_Shift, ISO_Level3_Shift ] };
 
-    
+
 		key <LSGT> { [ 0xfe11,0xfe11,0xfe11,0xfe11 ] };
-    
+
 		key <RALT> { type[Group1]="TWO_LEVEL", symbols[Group1] = [ 0xfe11 ] };
-    
+
 		modifier_map Mod3 { 0xfe11 };
 
 };
@@ -327,7 +327,7 @@ xkb_symbols "neo" {
 // Copied from macintosh_vndr/de
 // olh@suse.de   very close to MacOS map
 
-partial alphanumeric_keys 
+partial alphanumeric_keys
 xkb_symbols "mac" {
 
     include "de"
@@ -345,7 +345,7 @@ xkb_symbols "mac" {
     key <AD07>	{ [         u,          U,    diaeresis,       Aacute ]	};
     key <AD08>	{ [         i,          I,        slash,  Ucircumflex ]	};
     key <AD11>	{ [ udiaeresis, Udiaeresis, periodcentered,    degree ]	};
-    key <AD12>	{ [      plus,   asterisk,   asciitilde       ]	}; 
+    key <AD12>	{ [      plus,   asterisk,   asciitilde       ]	};
     key <AC01>	{ [         a,          A,        aring,        Aring ]	};
     key <AC05>	{ [         g,          G,    copyright       ]	};
     key <AC06>	{ [         h,          H,  ordfeminine       ]	};
@@ -355,7 +355,7 @@ xkb_symbols "mac" {
 
 };
 
-partial alphanumeric_keys 
+partial alphanumeric_keys
 xkb_symbols "mac_nodeadkeys" {
     // modify the standard German mac layout to not have any dead keys
     include "de(mac)"