(at) auf y, white bullet raus

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

4 files changed, 12 insertions, 12 deletions

diff --git a/A-REFERENZ-A/neo20-test.txt b/A-REFERENZ-A/neo20-test.txt
index 76c4ae6..be66570 100644
--- a/A-REFERENZ-A/neo20-test.txt
+++ b/A-REFERENZ-A/neo20-test.txt
@@ -154,14 +154,14 @@ Siehe auch http://de.wikipedia.org/wiki/Anf%C3%BChrungszeichen
 
 == Alle Ebenen – Normale Tastatur ==
 ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────────┐
-│ˇ · .│° • ¬│№ ‣ ∨│§ ◦ ∧│» ⇞ ⊥│«   ∡│€ £ ∥│$ ¤ ∉│„ / ∄│“ * ∦│” - ∅│–   ╌│` ˙ ˚│Backspace│
+│ˇ · .│° • ¬│№ ‣ ∨│§   ∧│» ⇞ ⊥│«   ∡│€ £ ∥│$ ¤ ∉│„ / ∄│“ * ∦│” - ∅│–   ╌│` ˙ ˚│Backspace│
 │^ ˘ -│1 ¹ ♀│2 ² ⚥│3 ³ ♂│4 › ℓ│5 ‹  │6 ¢  │7 ¥ ϰ│8 ‚  │9 ‘  │0 ’  │- — ‑│´ ¸ ˛│    ⌫    │
 ├─────┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──────┤
 │ Tab  ⇤ │X   Ξ│V ⌫ ≙│L ⇡ Λ│C ⌦ ℂ│W   Ω│K ¡ √│H 7 Ψ│G 8 Γ│F 9 Φ│Q + ℚ│ẞ   ∘│ˉ / ˏ│      │
-│    ♫   │x @ ξ│v _  │l [ λ│c ] χ│w ^ ω│k ! κ│h < ψ│g > γ│f = ɸ│q & φ│ß ſ ς│~ ¨ ˝│Enter │
+│    ♫   │x   ξ│v _  │l [ λ│c ] χ│w ^ ω│k ! κ│h < ψ│g > γ│f = ɸ│q & φ│ß ſ ς│~ ¨ ˝│Enter │
 ├────────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┐     │
 │ ↘3 ♫    │U ⇱ ∮│I ⇠ ∫│A ⇣ ∀│E ⇢ ∃│O ⇲ ∈│S ¿ Σ│N 4 ℕ│R 5 ℝ│T 6 ∂│D , Δ│Y   ∇│↘3 ♫ │  ↲  │
-│         │u \  │i / ι│a { α│e } ε│o * o│s ? σ│n ( ν│r ) ρ│t - τ│d : δ│y   υ│     │     │
+│         │u \  │i / ι│a { α│e } ε│o * o│s ? σ│n ( ν│r ) ρ│t - τ│d : δ│y @ υ│     │     │
 ├──────┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴─────┴─────┤
 │Cps_Lk│↙4   │Ü ⌧ ∝│Ö ⇥ ℑ│Ä ⇟ ℜ│P ↲ Π│Z   ℤ│B   ⇒│M 1 ⇔│⋮ 2 ⇐│… 3 Θ│J . ≡│   Caps_Lock  │
 │Shift │4Lock│ü #  │ö $  │ä | η│p ~ π│z ` ζ│b + β│m % µ│, " ϱ│. ' θ│j ; ϑ│   Shift      │
diff --git a/A-REFERENZ-A/neo20.txt b/A-REFERENZ-A/neo20.txt
index 8e42341..b288860 100644
--- a/A-REFERENZ-A/neo20.txt
+++ b/A-REFERENZ-A/neo20.txt
@@ -134,14 +134,14 @@ Siehe auch http://de.wikipedia.org/wiki/Anf%C3%BChrungszeichen
 
 == Alle Ebenen – Normale Tastatur ==
 ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────────┐
-│ˇ · .│° • ¬│№ ‣ ∨│§ ◦ ∧│» ⇞ ⊥│«   ∡│€ £ ∥│$ ¤ ∉│„ / ∄│“ * ∦│” - ∅│–   ╌│` ˙ ˚│Backspace│
+│ˇ · .│° • ¬│№ ‣ ∨│§   ∧│» ⇞ ⊥│«   ∡│€ £ ∥│$ ¤ ∉│„ / ∄│“ * ∦│” - ∅│–   ╌│` ˙ ˚│Backspace│
 │^ ˘ -│1 ¹ ♀│2 ² ⚥│3 ³ ♂│4 › ℓ│5 ‹  │6 ¢  │7 ¥ ϰ│8 ‚  │9 ‘  │0 ’  │- — ‑│´ ¸ ˛│    ⌫    │
 ├─────┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──────┤
 │ Tab  ⇤ │X   Ξ│V ⌫ ≙│L ⇡ Λ│C ⌦ ℂ│W   Ω│K ¡ √│H 7 Ψ│G 8 Γ│F 9 Φ│Q + ℚ│ẞ   ∘│ˉ / ˏ│      │
-│    ♫   │x @ ξ│v _  │l [ λ│c ] χ│w ^ ω│k ! κ│h < ψ│g > γ│f = ɸ│q & φ│ß ſ ς│~ ¨ ˝│Enter │
+│    ♫   │x   ξ│v _  │l [ λ│c ] χ│w ^ ω│k ! κ│h < ψ│g > γ│f = ɸ│q & φ│ß ſ ς│~ ¨ ˝│Enter │
 ├────────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┐     │
 │ ↘3 ♫    │U ⇱ ∮│I ⇠ ∫│A ⇣ ∀│E ⇢ ∃│O ⇲ ∈│S ¿ Σ│N 4 ℕ│R 5 ℝ│T 6 ∂│D , Δ│Y   ∇│↘3 ♫ │  ↲  │
-│         │u \  │i / ι│a { α│e } ε│o * o│s ? σ│n ( ν│r ) ρ│t - τ│d : δ│y   υ│     │     │
+│         │u \  │i / ι│a { α│e } ε│o * o│s ? σ│n ( ν│r ) ρ│t - τ│d : δ│y @ υ│     │     │
 ├──────┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴─────┴─────┤
 │Cps_Lk│↙4   │Ü ⌧ ∝│Ö ⇥ ℑ│Ä ⇟ ℜ│P ↲ Π│Z   ℤ│B   ⇒│M 1 ⇔│⋮ 2 ⇐│… 3 Θ│J . ≡│   Caps_Lock  │
 │Shift │4Lock│ü #  │ö $  │ä | η│p ~ π│z ` ζ│b + β│m % µ│, " ϱ│. ' θ│j ; ϑ│   Shift      │
diff --git a/linux/X/de b/linux/X/de
index 1fbfa0a..4cff19d 100644
--- a/linux/X/de
+++ b/linux/X/de
@@ -236,7 +236,7 @@ xkb_symbols "neo" {
     key <AE12> { [ dead_acute,  dead_grave,             dead_cedilla,           dead_ogonek,        dead_abovedot,  dead_abovering      ] };
 
     // 2nd row
-    key <AD01> { [ x,           X,                      at,                     Greek_xi,           x,              Greek_XI            ] };
+    key <AD01> { [ x,           X,                      x,                      Greek_xi,           x,              Greek_XI            ] };
     key <AD02> { [ v,           V,                      underscore,             v,                  BackSpace,      BackSpace           ] };
     key <AD03> { [ l,           L,                      bracketleft,            Greek_lambda,       Up,             Up                  ] };
     key <AD04> { [ c,           C,                      bracketright,           Greek_chi,          Delete,         Delete              ] };
@@ -260,7 +260,7 @@ xkb_symbols "neo" {
     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,      y,              nabla               ] };
+    key <AC11> { [ y,           Y,                      at,                     Greek_upsilon,      y,              nabla               ] };
 
     // 4th row
     key <AB01> { [ udiaeresis,  Udiaeresis,             numbersign,             udiaeresis,         Escape                              ] };
diff --git a/linux/xmodmap/neo_de.xmodmap b/linux/xmodmap/neo_de.xmodmap
index 3352eb0..102b605 100644
--- a/linux/xmodmap/neo_de.xmodmap
+++ b/linux/xmodmap/neo_de.xmodmap
@@ -7,7 +7,7 @@
 !! created by Benjamin Kellermann <Benjamin dot Kellermann at gmx dot Germany>
 !! and Erik Streb <mail at erikstreb dot de>
 !!
-!! The german NEO Layout Revision 469 from Sa 5. Apr 19:42:53 CEST 2008
+!! The german NEO Layout Revision 469 from Sa 5. Apr 22:28:05 CEST 2008
 !! see http://pebbles.schattenlauf.de/layout.php for details
 !!
 !! To try the layout in this file, simply do xmodmap <file>.
@@ -89,7 +89,7 @@ keycode 49 = dead_circumflex dead_caron dead_breve dead_stroke dead_belowdot dea
 
 keycode 10 = 1 degree         onesuperior   femalesymbol enfilledcircbullet enfilledcircbullet notsign
 keycode 11 = 2 numerosign     twosuperior   U26A5        U2023              U2023              logicalor
-keycode 12 = 3 section        threesuperior malesymbol   U25E6              U25E6              logicaland
+keycode 12 = 3 section        threesuperior malesymbol   3                  U25E6              logicaland
 keycode 13 = 4 guillemotright U203A         U2113        KP_Prior           KP_Prior           downtack
 keycode 14 = 5 guillemotleft  U2039         5            5                  5                  U2221
 keycode 15 = 6 EuroSign       cent          6            sterling           sterling           U2225
@@ -105,7 +105,7 @@ keycode 21 = dead_acute dead_grave dead_cedilla dead_ogonek dead_abovedot dead_a
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 ! The upper row
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-keycode 24 = x X at           Greek_xi     x         x         Greek_XI
+keycode 24 = x X x            Greek_xi     x         x         Greek_XI
 keycode 25 = v V underscore   v            BackSpace BackSpace U2259
 keycode 26 = l L bracketleft  Greek_lambda KP_Up     KP_Up     Greek_LAMDA
 keycode 27 = c C bracketright Greek_chi    KP_Delete KP_Delete U2102
@@ -134,7 +134,7 @@ keycode 44 = n N parenleft  Greek_nu      KP_4         KP_4         U2115
 keycode 45 = r R parenright Greek_rho     KP_5         KP_5         U211D
 keycode 46 = t T minus      Greek_tau     KP_6         KP_6         partialderivative
 keycode 47 = d D colon      Greek_delta   comma        comma        Greek_DELTA
-keycode 48 = y Y y          Greek_upsilon y            y            nabla
+keycode 48 = y Y at         Greek_upsilon y            y            nabla
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 ! The lower row