lang diskutierte Änderungen testweise eingeführt

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

5 files changed, 49 insertions, 49 deletions

diff --git a/grafik/neo20.txt b/grafik/neo20.txt
index 0fdedc4..eb1cbc1 100644
--- a/grafik/neo20.txt
+++ b/grafik/neo20.txt
@@ -107,20 +107,20 @@ Siehe auch http://de.wikipedia.org/wiki/Anf%C3%BChrungszeichen
 

 == Alle Ebenen – Normale Tastatur ==

 ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────────┐

-│ˇ - .│° ♀  │¶ ⚥  │§ ♂  │»   ⇞│«   ⇒│  ¤ ⇔│€   ¬│„   ∃│“   ∀│”   ∨│– ╌ ∧│` ˛ ˚│Backspace│

-│^ ˘ ·│1 ¹  │2 ²  │3 ³  │4 › ⇞│5 ‹  │6    │7    │8 ‚ /│9 ‘ *│0 ’ -│- —  │ˊ ¸ ˙│    ⌫    │

+│ˇ - .│° ♀  │№ ⚥  │§ ♂  │»   ⇞│«   ⇒│$ ¤ ⇔│€ ¥ ¬│„   ∃│“   ∀│”   ∨│– ╌ ∧│` ˛ ˚│Backspace│

+│^ ˘ ·│1 ¹ •│2 ² ‣│3 ³  │4 › ⇞│5 ‹  │6 £  │7 ¢  │8 ‚ /│9 ‘ *│0 ’ -│- —  │ˊ ¸ ˙│    ⌫    │

 ├─────┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──────┤

-│ Tab  ⇤ │X ξ  │V   Λ│L λ ⇡│C χ ⇤│W   ⎀│K κ ©│H ψ Ψ│G γ Γ│F φ Φ│Q   ∂│ẞ   Ə│ˉ ˝ ˏ│      │

+│ Tab  ⇤ │X ξ  │V   Λ│L λ ⇡│C χ ⇤│W   ⎀│K κ  │H ψ Ψ│G γ Γ│F φ Φ│Q ɸ ∂│ẞ ς Ə│ˉ ˝ ˏ│      │

 │      ⇥ │x @  │v _ ⌫│l [ ⇡│c ] ⇥│w ^ ⎀│k ! ¡│h < 7│g > 8│f = 9│q & +│ß   ə│~ ¨ /│Enter │

 ├────────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┐     │

-│ ↘3      │U   ⇱│I ι ⇠│A α ⇣│E ε ⇢│O ω ⇲│S σ Σ│N ν №│R ϱ ®│T τ ™│D δ Δ│Y υ Þ│↘3   │  ↲  │

+│ ↘3      │U   ⇱│I ι ⇠│A α ⇣│E ε ⇢│O ω ⇲│S σ Σ│N ν  │R ρ  │T τ  │D δ Δ│Y υ Þ│↘3   │  ↲  │

 │    ⇬  ♫ │u \ ⇱│i / ⇠│a { ⇣│e } ⇢│o * ⇲│s ? ¿│n ( 4│r ) 5│t - 6│d : ,│y   þ│  ⇬ ♫│     │

 ├──────┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴─────┴─────┤

-│Shift │↙5 ♫ │Ö    │Ü   ⌦│Ä η ⇟│P π Π│Z ζ Ω│B β •│M µ ∫│  ϑ √│… θ Θ│J   ∇│  Shift ⇧     │

-│  ⇧   │     │ö # ⌧│ü $ ⌦│ä | ⇟│p ~ ↲│z `  │b + ∞│m % 1│, ' 2│. " 3│j ; .│              │

+│Shift │↙5 ♫ │Ö    │Ü   ⌦│Ä η ⇟│P π Π│Z ζ Ω│B β ∞│M µ ∫│  ϱ √│… θ Θ│J ϑ ∇│  Shift ⇧     │

+│  ⇧   │     │ö # ⌧│ü $ ⌦│ä | ⇟│p ~ ↲│z `  │b +  │m % 1│, ' 2│. " 3│j ; .│              │

 ├──────┼─────┴┬────┴─┬───┴─────┴─────┴─────┴─────┴─────┴────┬┴─────┼─────┴┬──────┬──────┤

 │ Strg │ Fen- │ Alt  │ Leerz.␣   geschütz.Lz.⍽  schmal.Lz.¦ │↙5 ♫  │ Fen- │ Menu │ Strg │

-│      │ ster │      │ Leerz.␣   Leerz.␣            0       │   ./,│ ster │      │      │

+│      │ ster │      │ Leerz.␣   »␣«          0             │   ./,│ ster │      │      │

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

 

 ┌─────┬─────┬─────┬─────┐

diff --git a/linux/X/Weiteres/de b/linux/X/Weiteres/de
index 4d53a33..6bf9b23 100644
--- a/linux/X/Weiteres/de
+++ b/linux/X/Weiteres/de
@@ -211,10 +211,10 @@ xkb_symbols "neo" {
 
     // 1st row
 
-    key <TLDE> { [ dead_circumflex,                     dead_caron,             dead_breve          dead_stroke                         ] };
+    key <TLDE> { [ dead_circumflex,                     dead_caron,             dead_breve,         dead_stroke                         ] };
 
-    key <AE01> { [ 1,           degree,                 onesuperior,            U2640,              oneeighth                           ] };
-    key <AE02> { [ 2,           paragraph,              twosuperior,            U26A5                                                   ] };
+    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             ] };
@@ -236,8 +236,8 @@ 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,           partialderivative   ] };
-    key <AD11> { [ ssharp,      U1E9E,                  U133,                   U132,               schwa,          SCHWA               ] };
+    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       ] };
 
     // 3rd row
@@ -247,7 +247,7 @@ xkb_symbols "neo" {
     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 <AC07> { [ n,           N,                      parenleft,              Greek_nu,           4                                   ] };
     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         ] };
@@ -259,20 +259,20 @@ xkb_symbols "neo" {
     key <AB03> { [ adiaeresis,  Adiaeresis,             bar,                    Greek_eta,          Next,           Next                ] };
     key <AB04> { [ p,           P,                      asciitilde,             Greek_pi,           Return,         Greek_PI            ] };
     key <AB05> { [ z,           Z,                      grave,                  Greek_zeta,         z,              Greek_OMEGA         ] };
-    key <AB06> { [ b,           B,                      plus,                   Greek_beta,         infinity,       enfilledcircbullet  ] };
+    key <AB06> { [ b,           B,                      plus,                   Greek_beta,         b,              infinity ] };
     key <AB07> { [ m,           M,                      percent,                mu,                 1,              integral            ] };
-    key <AB08> { [ comma,       comma,                  apostrophe,             U3D1,               2,              radical             ] };
+    key <AB08> { [ comma,       comma,                  apostrophe,             U03F1,              2,              radical             ] };
     key <AB09> { [ period,      ellipsis,               quotedbl,               Greek_theta,        3,              Greek_THETA         ] };
-    key <AB10> { [ j,           J,                      semicolon,              j,                  period,         nabla               ] };
+    key <AB10> { [ j,           J,                      semicolon,              U3D1,               period,         nabla               ] };
 
-    key <SPCE> { [ space,       space,                  space,                  nobreakspace,       0,              U202F               ] };
+    key <SPCE> { [ space,       space,                  signifblank,            nobreakspace,       0,              U202F               ] };
     
     // new modkeys   
 
     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,                 0xfe11,                 0xfe11                                                  ] };
-    key <RALT> { [ 0xfe11,      0xfe11,                 0xfe11,                 0xfe11,             KP_Decimal,     0xfe11              ] };
+    key <LSGT> { [ 0xfe11,      0xfe11,                 Multi_key,              Multi_key                                               ] };
+    key <RALT> { [ 0xfe11,      0xfe11,                 Multi_key,              Multi_key,          KP_Decimal,     0xfe11              ] };
 
     modifier_map mod5 { <LSGT>, <RALT> };
     // Keypad
diff --git a/linux/X/Weiteres/neo_de.xmodmap b/linux/X/Weiteres/neo_de.xmodmap
index ab00414..d956541 100644
--- a/linux/X/Weiteres/neo_de.xmodmap
+++ b/linux/X/Weiteres/neo_de.xmodmap
@@ -18,8 +18,8 @@
 keycode 49 = dead_circumflex dead_caron dead_breve dead_stroke
 !keycode 49 = dead_circumflex dead_caron dead_breve
 
-keycode 10 = 1 degree onesuperior U2640 oneeighth
-keycode 11 = 2 paragraph twosuperior U26A5
+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
@@ -46,8 +46,8 @@ keycode 29 = k K exclam Greek_kappa exclamdown copyright
 keycode 30 = h H less Greek_psi 7 Greek_PSI
 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 q plus partialderivative
-keycode 34 = ssharp U1E9E U133 U132 schwa SCHWA
+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
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -60,8 +60,8 @@ keycode 41 = e E braceright Greek_epsilon Right Right
 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 numerosign
-keycode 45 = r R parenright U03F1 5 registered
+keycode 44 = n N parenleft Greek_nu    4 
+keycode 45 = r R parenright Greek_rho 5 registered
 keycode 46 = t T minus Greek_tau 6 trademark
 keycode 47 = d D colon Greek_delta comma Greek_DELTA
 keycode 48 = y Y doublelowquotemark Greek_upsilon thorn THORN
@@ -75,11 +75,11 @@ keycode 54 = adiaeresis Adiaeresis bar Greek_eta Next Next
 keycode 55 = p P asciitilde Greek_pi Return Greek_PI
 keycode 56 = z Z grave Greek_zeta z Greek_OMEGA
 
-keycode 57 = b B plus Greek_beta infinity enfilledcircbullet
+keycode 57 = b B plus Greek_beta b infinity
 keycode 58 = m M percent mu 1 integral
-keycode 59 = comma comma apostrophe U3D1 2 radical
+keycode 59 = comma comma apostrophe U03F1 2 radical
 keycode 60 = period ellipsis quotedbl Greek_theta 3 Greek_THETA
-keycode 61 = j J semicolon j period nabla
+keycode 61 = j J semicolon U3D1 period nabla
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 ! Modifier definition
@@ -107,7 +107,7 @@ add Mod3 = ISO_Level3_Shift
 ! force to learn the new Escape!
 !keycode 9 =
 
-keycode 65 = space space space nobreakspace 0 U202F
+keycode 65 = space space signifblank nobreakspace 0 U202F
 
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
diff --git a/linux/X/de b/linux/X/de
index c17b9cc..3934226 100644
--- a/linux/X/de
+++ b/linux/X/de
@@ -213,8 +213,8 @@ xkb_symbols "neo" {
 
     key <TLDE> { [ dead_circumflex,                     dead_caron,             dead_breve                                              ] };
 
-    key <AE01> { [ 1,           degree,                 onesuperior,            U2640,              oneeighth                           ] };
-    key <AE02> { [ 2,           paragraph,              twosuperior,            U26A5                                                   ] };
+    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             ] };
@@ -236,8 +236,8 @@ 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,           partialderivative   ] };
-    key <AD11> { [ ssharp,      U1E9E,                  U133,                   U132,               schwa,          SCHWA               ] };
+    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       ] };
 
     // 3rd row
@@ -247,8 +247,8 @@ xkb_symbols "neo" {
     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,             U03F1,              5,              registered          ] };
+    key <AC07> { [ n,           N,                      parenleft,              Greek_nu,           4                                   ] };
+    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,                      doublelowquotemark,     Greek_upsilon,      thorn,          THORN               ] };
@@ -259,13 +259,13 @@ xkb_symbols "neo" {
     key <AB03> { [ adiaeresis,  Adiaeresis,             bar,                    Greek_eta,          Next,           Next                ] };
     key <AB04> { [ p,           P,                      asciitilde,             Greek_pi,           Return,         Greek_PI            ] };
     key <AB05> { [ z,           Z,                      grave,                  Greek_zeta,         z,              Greek_OMEGA         ] };
-    key <AB06> { [ b,           B,                      plus,                   Greek_beta,         infinity,       enfilledcircbullet  ] };
+    key <AB06> { [ b,           B,                      plus,                   Greek_beta,         b,              infinity ] };
     key <AB07> { [ m,           M,                      percent,                mu,                 1,              integral            ] };
-    key <AB08> { [ comma,       comma,                  apostrophe,             U3D1,               2,              radical             ] };
+    key <AB08> { [ comma,       comma,                  apostrophe,             U03F1,              2,              radical             ] };
     key <AB09> { [ period,      ellipsis,               quotedbl,               Greek_theta,        3,              Greek_THETA         ] };
-    key <AB10> { [ j,           J,                      semicolon,              j,                  period,         nabla               ] };
+    key <AB10> { [ j,           J,                      semicolon,              U3D1,               period,         nabla               ] };
 
-    key <SPCE> { [ space,       space,                  space,                  nobreakspace,       0,              U202F               ] };
+    key <SPCE> { [ space,       space,                  signifblank,            nobreakspace,       0,              U202F               ] };
     
     // new modkeys   
 
diff --git a/linux/xmodmap/neo_de.xmodmap b/linux/xmodmap/neo_de.xmodmap
index 76ec50d..23e8041 100644
--- a/linux/xmodmap/neo_de.xmodmap
+++ b/linux/xmodmap/neo_de.xmodmap
@@ -18,8 +18,8 @@
 !keycode 49 = dead_circumflex dead_caron dead_breve dead_stroke
 keycode 49 = dead_circumflex dead_caron dead_breve
 
-keycode 10 = 1 degree onesuperior U2640 oneeighth
-keycode 11 = 2 paragraph twosuperior U26A5
+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
@@ -46,8 +46,8 @@ keycode 29 = k K exclam Greek_kappa exclamdown copyright
 keycode 30 = h H less Greek_psi 7 Greek_PSI
 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 q plus partialderivative
-keycode 34 = ssharp U1E9E U133 U132 schwa SCHWA
+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
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -60,8 +60,8 @@ keycode 41 = e E braceright Greek_epsilon Right Right
 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 numerosign
-keycode 45 = r R parenright U03F1 5 registered
+keycode 44 = n N parenleft Greek_nu    4 
+keycode 45 = r R parenright Greek_rho 5 registered
 keycode 46 = t T minus Greek_tau 6 trademark
 keycode 47 = d D colon Greek_delta comma Greek_DELTA
 keycode 48 = y Y doublelowquotemark Greek_upsilon thorn THORN
@@ -75,11 +75,11 @@ keycode 54 = adiaeresis Adiaeresis bar Greek_eta Next Next
 keycode 55 = p P asciitilde Greek_pi Return Greek_PI
 keycode 56 = z Z grave Greek_zeta z Greek_OMEGA
 
-keycode 57 = b B plus Greek_beta infinity enfilledcircbullet
+keycode 57 = b B plus Greek_beta b infinity
 keycode 58 = m M percent mu 1 integral
-keycode 59 = comma comma apostrophe U3D1 2 radical
+keycode 59 = comma comma apostrophe U03F1 2 radical
 keycode 60 = period ellipsis quotedbl Greek_theta 3 Greek_THETA
-keycode 61 = j J semicolon j period nabla
+keycode 61 = j J semicolon U3D1 period nabla
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 ! Modifier definition
@@ -107,7 +107,7 @@ add Mod3 = ISO_Level3_Shift
 ! force to learn the new Escape!
 !keycode 9 =
 
-keycode 65 = space space space nobreakspace 0 U202F
+keycode 65 = space space signifblank nobreakspace 0 U202F
 
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!