korrekturen der linux-treiber und der grafik

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

6 files changed, 50 insertions, 43 deletions

diff --git a/FAQ.txt b/FAQ.txt
index 066ea89..92ccc17 100644
--- a/FAQ.txt
+++ b/FAQ.txt
@@ -342,8 +342,9 @@ Frage).
 
 -------------------------------------------------------------------------------
 
-F: Warum wird statt dem Daraus-folgt-Pfeil (Implikation) »⇒« das komische
-Zeichen »⊢« dargestellt?
+F: Warum wird statt dem Daraus-folgt-Pfeil (Implikation) »⇒« (U+21D2
+RIGHTWARDS DOUBLE ARROW) das komische Zeichen »⊢« (U+22A2 RIGHT TACK)
+dargestellt?
 
 A: Das ist ein Fehler, der nur bei KDE-Anwendungen auftritt (z. B. unter Kile).
 Daher der schmutzige Hack in der unicode.sty-Datei für Latex.
diff --git a/grafik/neo20.txt b/grafik/neo20.txt
index 036d239..b006553 100644
--- a/grafik/neo20.txt
+++ b/grafik/neo20.txt
@@ -136,8 +136,8 @@ Siehe auch http://de.wikipedia.org/wiki/Anf%C3%BChrungszeichen
 │ 1 ≤ │ 2 ∪ │ 3 ≥ │     │

 │ ⇲ ⇋ │ ⇣ ↓ │ ⇟ ⇌ │   ≈ │

 ├─────┴─────┼─────┤     │

-│ 0 %       │,/. ,│   ≠ │

-│ ⎀ ‰       │ ⌦  .│Enter│

+│ 0 ‰       │,/. ,│   ≠ │

+│ ⎀ %       │ ⌦  .│Enter│

 └───────────┴─────┴─────┘

 

 == Tipp ==

diff --git a/linux/X/Weiteres/de b/linux/X/Weiteres/de
index ae96009..3460867 100644
--- a/linux/X/Weiteres/de
+++ b/linux/X/Weiteres/de
@@ -211,13 +211,16 @@ xkb_symbols "neo" {
 
     // 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 <AE01> { [ 1,           degree,                 onesuperior,            U2640,              enfilledcircbullet                  ] };
     key <AE02> { [ 2,           numerosign,             twosuperior,            U26A5,              U2023                               ] };
     key <AE03> { [ 3,           section,                threesuperior,          U2642s,             threeeighth                         ] };
     key <AE04> { [ 4,           guillemotright,         U203A,                  4,                  Prior,          Prior               ] };
-    key <AE05> { [ 5,           guillemotleft,          U2039,                  5,                  fiveeighths,    implies             ] };
+    key <AE05> { [ 5,           guillemotleft,          U2039,                  5,                  5,              implies             ] };
     key <AE06> { [ 6,           dollar,                 sterling,               currency,           6,              ifonlyif            ] };
     key <AE07> { [ 7,           EuroSign,               cent,                   yen,                seveneighths,   notsign             ] };
     key <AE08> { [ 8,           doublelowquotemark,     singlelowquotemark,     8,                  slash,          U2203               ] };
@@ -238,10 +241,10 @@ xkb_symbols "neo" {
     key <AD09> { [ f,           F,                      equal,                  Greek_phi,          9,              Greek_PHI           ] };
     key <AD10> { [ q,           Q,                      ampersand,              U0278,              plus,           partialderivative   ] };
     key <AD11> { [ ssharp,      U1E9E,                  U017F,              Greek_finalsmallsigma,  schwa,          SCHWA               ] };
-    key <AD12> { [ dead_tilde,  dead_macron,            dead_diaeresis,         dead_doubleacute,   dead_belowdot,  dead_belowdot       ] };
+    key <AD12> { [ dead_tilde,  dead_macron,            dead_diaeresis,         dead_doubleacute                                        ] };
 
     // 3rd row
-    key <AC01> { [ u,           U,                      backslash,              backslash,          Home,           Home                ] };
+    key <AC01> { [ u,           U,                      backslash,              u,                  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               ] };
diff --git a/linux/X/Weiteres/neo_de.xmodmap b/linux/X/Weiteres/neo_de.xmodmap
index ada3905..3364390 100644
--- a/linux/X/Weiteres/neo_de.xmodmap
+++ b/linux/X/Weiteres/neo_de.xmodmap
@@ -16,19 +16,19 @@
 !eigentlich sollte die folgende Zeile rein, aber auf älteren Systemen ist der
 !dead_stroke noch nicht definiert
 keycode 49 = dead_circumflex dead_caron dead_breve dead_stroke
-!keycode 49 = dead_circumflex dead_caron dead_breve
+!keycode 49 = dead_circumflex dead_caron dead_breve dead_breve  dead_belowdot dead_belowdot
 
-keycode 10 = 1 degree onesuperior U2640 enfilledcircbullet
-keycode 11 = 2 numerosign twosuperior U26A5 U2023
-keycode 12 = 3 section threesuperior U2642 threeeighths
-keycode 13 = 4 guillemotright U203A  4  Prior Prior
-keycode 14 = 5 guillemotleft U2039 5 fiveeighths implies
-keycode 15 = 6 dollar sterling currency 6 ifonlyif
+keycode 10 = 1 degree         onesuperior   U2640    enfilledcircbullet
+keycode 11 = 2 numerosign     twosuperior   U26A5    U2023
+keycode 12 = 3 section        threesuperior U2642    threeeighths
+keycode 13 = 4 guillemotright U203A         4        Prior              Prior
+keycode 14 = 5 guillemotleft  U2039         5        5                  implies
+keycode 15 = 6 dollar         sterling      currency 6                  ifonlyif
 
-keycode 16 = 7 EuroSign cent yen seveneighths notsign
-keycode 17 = 8 doublelowquotemark singlelowquotemark 8 slash U2203
-keycode 18 = 9 leftdoublequotemark leftsinglequotemark 9 asterisk U2200
-keycode 19 = 0 rightdoublequotemark rightsinglequotemark 0 minus logicalor
+keycode 16 = 7 EuroSign             cent                 yen 7        notsign
+keycode 17 = 8 doublelowquotemark   singlelowquotemark   8   slash    U2203
+keycode 18 = 9 leftdoublequotemark  leftsinglequotemark  9   asterisk U2200
+keycode 19 = 0 rightdoublequotemark rightsinglequotemark 0   minus    logicalor
 
 keycode 20 = minus endash emdash hyphen U2011 logicaland
 keycode 21 = dead_acute dead_grave dead_cedilla dead_ogonek dead_abovedot dead_abovering
@@ -48,16 +48,16 @@ keycode 31 = g G greater Greek_gamma 8 Greek_GAMMA
 keycode 32 = f F equal Greek_phi 9 Greek_PHI
 keycode 33 = q Q ampersand U0278 plus partialderivative
 keycode 34 = ssharp U1E9E U017F Greek_finalsmallsigma schwa SCHWA
-keycode 35 = dead_tilde dead_macron dead_diaeresis dead_doubleacute dead_belowdot dead_belowdot
+keycode 35 = dead_tilde dead_macron dead_diaeresis dead_doubleacute
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 ! The home row (middle row)
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-keycode 38 = u U backslash  backslash     Home Home
-keycode 39 = i I slash      Greek_iota    Left Left
-keycode 40 = a A braceleft  Greek_alpha   Down Down
+keycode 38 = u U backslash  u             Home  Home
+keycode 39 = i I slash      Greek_iota    Left  Left
+keycode 40 = a A braceleft  Greek_alpha   Down  Down
 keycode 41 = e E braceright Greek_epsilon Right Right
-keycode 42 = o O asterisk   Greek_omega   End End
+keycode 42 = o O asterisk   Greek_omega   End   End
 
 keycode 43 = s S question  Greek_sigma questiondown Greek_SIGMA
 keycode 44 = n N parenleft Greek_nu    4 
diff --git a/linux/X/de b/linux/X/de
index 5369ec4..ed08f4f 100644
--- a/linux/X/de
+++ b/linux/X/de
@@ -211,13 +211,16 @@ xkb_symbols "neo" {
 
     // 1st row
 
-    key <TLDE> { [ dead_circumflex,                     dead_caron,             dead_breve                                              ] };
+    // 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 <AE01> { [ 1,           degree,                 onesuperior,            U2640,              enfilledcircbullet                  ] };
     key <AE02> { [ 2,           numerosign,             twosuperior,            U26A5,              U2023                               ] };
     key <AE03> { [ 3,           section,                threesuperior,          U2642s,             threeeighth                         ] };
     key <AE04> { [ 4,           guillemotright,         U203A,                  4,                  Prior,          Prior               ] };
-    key <AE05> { [ 5,           guillemotleft,          U2039,                  5,                  fiveeighths,    implies             ] };
+    key <AE05> { [ 5,           guillemotleft,          U2039,                  5,                  5,              implies             ] };
     key <AE06> { [ 6,           dollar,                 sterling,               currency,           6,              ifonlyif            ] };
     key <AE07> { [ 7,           EuroSign,               cent,                   yen,                seveneighths,   notsign             ] };
     key <AE08> { [ 8,           doublelowquotemark,     singlelowquotemark,     8,                  slash,          U2203               ] };
@@ -238,10 +241,10 @@ xkb_symbols "neo" {
     key <AD09> { [ f,           F,                      equal,                  Greek_phi,          9,              Greek_PHI           ] };
     key <AD10> { [ q,           Q,                      ampersand,              U0278,              plus,           partialderivative   ] };
     key <AD11> { [ ssharp,      U1E9E,                  U017F,              Greek_finalsmallsigma,  schwa,          SCHWA               ] };
-    key <AD12> { [ dead_tilde,  dead_macron,            dead_diaeresis,         dead_doubleacute,   dead_belowdot,  dead_belowdot       ] };
+    key <AD12> { [ dead_tilde,  dead_macron,            dead_diaeresis,         dead_doubleacute                                        ] };
 
     // 3rd row
-    key <AC01> { [ u,           U,                      backslash,              backslash,          Home,           Home                ] };
+    key <AC01> { [ u,           U,                      backslash,              u,                  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               ] };
diff --git a/linux/xmodmap/neo_de.xmodmap b/linux/xmodmap/neo_de.xmodmap
index f86cf19..7ff0b31 100644
--- a/linux/xmodmap/neo_de.xmodmap
+++ b/linux/xmodmap/neo_de.xmodmap
@@ -16,19 +16,19 @@
 !eigentlich sollte die folgende Zeile rein, aber auf älteren Systemen ist der
 !dead_stroke noch nicht definiert
 !keycode 49 = dead_circumflex dead_caron dead_breve dead_stroke
-keycode 49 = dead_circumflex dead_caron dead_breve
+keycode 49 = dead_circumflex dead_caron dead_breve dead_breve  dead_belowdot dead_belowdot
 
-keycode 10 = 1 degree onesuperior U2640 enfilledcircbullet
-keycode 11 = 2 numerosign twosuperior U26A5 U2023
-keycode 12 = 3 section threesuperior U2642 threeeighths
-keycode 13 = 4 guillemotright U203A  4  Prior Prior
-keycode 14 = 5 guillemotleft U2039 5 fiveeighths implies
-keycode 15 = 6 dollar sterling currency 6 ifonlyif
+keycode 10 = 1 degree         onesuperior   U2640    enfilledcircbullet
+keycode 11 = 2 numerosign     twosuperior   U26A5    U2023
+keycode 12 = 3 section        threesuperior U2642    threeeighths
+keycode 13 = 4 guillemotright U203A         4        Prior              Prior
+keycode 14 = 5 guillemotleft  U2039         5        5                  implies
+keycode 15 = 6 dollar         sterling      currency 6                  ifonlyif
 
-keycode 16 = 7 EuroSign cent yen seveneighths notsign
-keycode 17 = 8 doublelowquotemark singlelowquotemark 8 slash U2203
-keycode 18 = 9 leftdoublequotemark leftsinglequotemark 9 asterisk U2200
-keycode 19 = 0 rightdoublequotemark rightsinglequotemark 0 minus logicalor
+keycode 16 = 7 EuroSign             cent                 yen 7        notsign
+keycode 17 = 8 doublelowquotemark   singlelowquotemark   8   slash    U2203
+keycode 18 = 9 leftdoublequotemark  leftsinglequotemark  9   asterisk U2200
+keycode 19 = 0 rightdoublequotemark rightsinglequotemark 0   minus    logicalor
 
 keycode 20 = minus endash emdash hyphen U2011 logicaland
 keycode 21 = dead_acute dead_grave dead_cedilla dead_ogonek dead_abovedot dead_abovering
@@ -48,16 +48,16 @@ keycode 31 = g G greater Greek_gamma 8 Greek_GAMMA
 keycode 32 = f F equal Greek_phi 9 Greek_PHI
 keycode 33 = q Q ampersand U0278 plus partialderivative
 keycode 34 = ssharp U1E9E U017F Greek_finalsmallsigma schwa SCHWA
-keycode 35 = dead_tilde dead_macron dead_diaeresis dead_doubleacute dead_belowdot dead_belowdot
+keycode 35 = dead_tilde dead_macron dead_diaeresis dead_doubleacute
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 ! The home row (middle row)
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-keycode 38 = u U backslash  backslash     Home Home
-keycode 39 = i I slash      Greek_iota    Left Left
-keycode 40 = a A braceleft  Greek_alpha   Down Down
+keycode 38 = u U backslash  u             Home  Home
+keycode 39 = i I slash      Greek_iota    Left  Left
+keycode 40 = a A braceleft  Greek_alpha   Down  Down
 keycode 41 = e E braceright Greek_epsilon Right Right
-keycode 42 = o O asterisk   Greek_omega   End End
+keycode 42 = o O asterisk   Greek_omega   End   End
 
 keycode 43 = s S question  Greek_sigma questiondown Greek_SIGMA
 keycode 44 = n N parenleft Greek_nu    4