ß auf die 2, AltGr wieder zurück und auf y und y auf das bisherige ß

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

4 files changed, 20 insertions, 25 deletions

diff --git a/grafik/SVG/neo20_alles_farbe.svg b/grafik/SVG/neo20_alles_farbe.svg
index 65699d5..26b3c65 100644
--- a/grafik/SVG/neo20_alles_farbe.svg
+++ b/grafik/SVG/neo20_alles_farbe.svg
@@ -30,9 +30,9 @@
      inkscape:pageshadow="2"
      inkscape:zoom="1.32"
      inkscape:cx="422.71008"
-     inkscape:cy="149.62121"
+     inkscape:cy="150"
      inkscape:document-units="px"
-     inkscape:current-layer="layer6"
+     inkscape:current-layer="layer4"
      width="900px"
      height="300px"
      showgrid="true"
@@ -430,7 +430,7 @@
          sodipodi:role="line"
          id="tspan2575"
          x="629.30273"
-         y="274.80176">Mod5</tspan></text>
+         y="274.80176">AltGr</tspan></text>
     <text
        xml:space="preserve"
        style="font-size:14px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline;font-family:DejaVu LGC Sans"
@@ -546,7 +546,7 @@
          id="tspan3417"
          x="794.37109"
          y="142.80176"
-         style="font-size:14px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;font-family:DejaVu LGC Sans">AltGr</tspan></text>
+         style="font-size:14px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;font-family:DejaVu LGC Sans">Mod5</tspan></text>
     <text
        xml:space="preserve"
        style="font-size:14px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;opacity:1;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline;font-family:DejaVu LGC Sans"
diff --git a/grafik/SVG/neo20_alles_grau.svg b/grafik/SVG/neo20_alles_grau.svg
index 05d20e9..44fc76d 100644
--- a/grafik/SVG/neo20_alles_grau.svg
+++ b/grafik/SVG/neo20_alles_grau.svg
@@ -30,9 +30,9 @@
      inkscape:pageshadow="2"
      inkscape:zoom="1.32"
      inkscape:cx="422.71008"
-     inkscape:cy="149.62121"
+     inkscape:cy="150"
      inkscape:document-units="px"
-     inkscape:current-layer="layer6"
+     inkscape:current-layer="layer4"
      width="900px"
      height="300px"
      showgrid="true"
@@ -430,7 +430,7 @@
          sodipodi:role="line"
          id="tspan2575"
          x="629.30273"
-         y="274.80176">Mod5</tspan></text>
+         y="274.80176">AltGr</tspan></text>
     <text
        xml:space="preserve"
        style="font-size:14px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline;font-family:DejaVu LGC Sans"
@@ -546,7 +546,7 @@
          id="tspan3417"
          x="794.37109"
          y="142.80176"
-         style="font-size:14px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;font-family:DejaVu LGC Sans">AltGr</tspan></text>
+         style="font-size:14px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;font-family:DejaVu LGC Sans">Mod5</tspan></text>
     <text
        xml:space="preserve"
        style="font-size:14px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;opacity:1;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline;font-family:DejaVu LGC Sans"
diff --git a/grafik/neo20.ods b/grafik/neo20.ods
index ad24f4e..08a4f4d 100644
--- a/grafik/neo20.ods
+++ b/grafik/neo20.ods
diff --git a/linux/xmodmap/neo_de_from_ie.xmodmap b/linux/xmodmap/neo_de_from_ie.xmodmap
index 6fe6079..19beb13 100644
--- a/linux/xmodmap/neo_de_from_ie.xmodmap
+++ b/linux/xmodmap/neo_de_from_ie.xmodmap
@@ -16,20 +16,19 @@
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 ! Modifier definition
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-! Make caps lock and the numbersign an additional Alt_Gr (Mode_switch is for 3rd and 4th Level)
+! Make caps lock an additional Alt_Gr (Mode_switch is for 3rd and 4th Level)
 keysym Caps_Lock = Mode_switch Mode_switch Caps_Lock Caps_Lock
-keysym numbersign = Mode_switch Mode_switch Mode_switch Mode_switch Mode_switch Mode_switch 
-! Make the former <>-key to Mod5 (ISO_Level3_Shift)
-keysym backslash  = ISO_Level3_Shift ISO_Level3_Shift ISO_Level3_Shift ISO_Level3_Shift ISO_Level3_Shift ISO_Level3_Shift
-! Make AltGr to Mode_switch
-!keysym ISO_Level3_Shift = Mode_switch Mode_switch 
-!keysym ISO_Level3_Shift = y Y y Greek_upsilon
+
+! Make AltGr and apostrophe to Mode_switch
+keysym ISO_Level3_Shift = Mode_switch Mode_switch 
+keysym apostrophe = Mode_switch Mode_switch thorn THORN thorn THORN
 
 ! If the left win key should modify the 5th and 6th, comment this out
 !keysym Super_L = ISO_Level3_Shift
 ! the right win key modifies the 5th and 6th
 !keysym Multi_key = ISO_Level3_Shift
-
+keysym numbersign = ISO_Level3_Shift ISO_Level3_Shift ISO_Level3_Shift ISO_Level3_Shift ISO_Level3_Shift ISO_Level3_Shift
+keysym backslash  = ISO_Level3_Shift ISO_Level3_Shift ISO_Level3_Shift ISO_Level3_Shift ISO_Level3_Shift ISO_Level3_Shift
 
 ! force to learn the new Escape!
 !keysym Escape =
@@ -40,7 +39,7 @@ keysym backslash  = ISO_Level3_Shift ISO_Level3_Shift ISO_Level3_Shift ISO_Level
 keysym grave = dead_circumflex dead_caron dead_breve paragraph 
 
 keysym 1 = 1 degree notsign onesuperior
-keysym 2 = 2 2 2 twosuperior 
+keysym 2 = 2 ssharp 2 twosuperior 
 keysym 3 = 3 section 3 threesuperior 
 keysym 4 = 4 dollar    yen cent Prior Prior
 keysym 5 = 5 EuroSign  sterling currency
@@ -53,12 +52,11 @@ keysym 0 = 0 rightdoublequotemark rightsinglequotemark U203A minus
 keysym minus = minus U2013 U2014 U2039 
 keysym equal = dead_acute dead_grave dead_cedilla dead_ogonek dead_abovedot dead_abovering
 
-
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 ! The upper row 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 keysym q = x X at Greek_xi Escape Greek_XI
-keysym w = v V underscore underscore BackSpace 
+keysym w = v V underscore Greek_upsilon BackSpace 
 keysym e = l L bracketleft Greek_lambda Up Up
 keysym r = c C bracketright Greek_chi c copyright
 keysym t = w W asciitilde asciitilde Insert
@@ -68,7 +66,7 @@ keysym u = h H less Greek_psi 7 Greek_PSI
 keysym i = g G greater Greek_gamma 8 Greek_GAMMA
 keysym o = f F equal Greek_phi 9 Greek_PHI
 keysym p = j J semicolon semicolon plus
-keysym bracketleft  = ssharp ssharp U0133 U0132 schwa SCHWA 
+keysym bracketleft  = y Y U0133 U0132 schwa SCHWA 
 keysym bracketright = dead_tilde dead_macron dead_diaeresis dead_doubleacute
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -85,15 +83,12 @@ keysym j = n N parenleft Greek_nu    4
 keysym k = r R parenright Greek_rho  5 registered
 keysym l = t T minus Greek_tau 6 trademark
 keysym semicolon  = d D colon Greek_delta comma Greek_DELTA
-keysym apostrophe = y Y y Greek_upsilon thorn THORN
-!comment the next line out, if you want to have a 3rd Level Modifier at the y
-!keysym apostrophe = Mode_switch
-
+!keysym apostrophe = 
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 ! The lower row
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-keysym z = odiaeresis Odiaeresis asciicircum
+keysym z = odiaeresis Odiaeresis asciicircum asciicircum Tab Tab
 keysym x = udiaeresis Udiaeresis dollar Udiaeresis Delete
 keysym c = adiaeresis Adiaeresis bar Greek_eta Next Next
 keysym v = p P numbersign Greek_pi p Greek_PI