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

4 files changed, 54 insertions, 190 deletions

diff --git a/linux/xmodmap/LIESMICH.txt b/linux/xmodmap/LIESMICH.txt
deleted file mode 100644
index c9e19e6..0000000
--- a/linux/xmodmap/LIESMICH.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-== Kleine Anleitung ==
-In der Datei grafik/neo20.ods sieht man das Layout. In neo_de_from_ie.xmodmap
-steckt es drin.
-
-=== Aktivieren ===
-Zu aktivieren mit dem Kommando:
-	setxkbmap ie && xmodmap ~/neo_de_from_ie.xmodmap
-
-(wenn man die xmodmap direkt in seinem Homeverzeichnis hat)
-
-=== Deaktivieren ===
-Zurück zu qwertz geht es mit:
-	setxkbmap de
-
-=== Tipp ===
-Am besten man tippt das Letztere einfach mal so (bevor man auf NEO umschaltet),
-damit es in der Bash-History enthalten ist und man nur »Pfeil nach oben« und
-»Enter« drücken muss, um wieder „normal“ (aber ineffektiv) zu schreiben. Oder
-falls was schief läuft.
diff --git a/linux/xmodmap/README.txt b/linux/xmodmap/README.txt
new file mode 100644
index 0000000..9f564c3
--- /dev/null
+++ b/linux/xmodmap/README.txt
@@ -0,0 +1,19 @@
+== Kleine Anleitung ==
+In der Datei ../grafik/neo20.ods sieht man das Layout. 
+In neo_de.xmodmap steckt es drin.
+
+=== Aktivieren ===
+Zu aktivieren mit dem Kommando:
+	xmodmap neo_de.xmodmap
+
+=== Deaktivieren ===
+Zurück zu qwertz geht es mit:
+	setxkbmap de
+
+=== Tipp ===
+Trägt man folgende Zeilen in die ~/.bashrc, ~/.zshrc oder vergleichbares ein, 
+kann man anschließend mittels abrollen der linken Hand auf der Grundreihe 
+zwischen qwertz und NEO wechseln. 
+alias uiae='setxkbmap de'
+alias asdf='xmodmap ~/neo_de.xmodmap'
+
diff --git a/linux/xmodmap/neo_de.xmodmap b/linux/xmodmap/neo_de.xmodmap
index 69672b2..70e2bf8 100644
--- a/linux/xmodmap/neo_de.xmodmap
+++ b/linux/xmodmap/neo_de.xmodmap
@@ -10,35 +10,8 @@
 !! To load the layout in this file at X startup, simply store it as
 !! ~/.xmodmap (named .xmodmap in your home directory)
 
-
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-! Modifier definition
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-! Make caps lock an additional Alt_Gr (Mode_switch is for 3rd and 4th level)
-remove Lock = Caps_Lock
-remove Mod3 = ISO_Level3_Shift
-keycode 66 = Mode_switch Mode_switch Caps_Lock Caps_Lock
-
-! Make AltGr and apostrophe to Mode_switch (which is the 3rd and 4th level)
-keycode 113 = Mode_switch Mode_switch Mode_switch Mode_switch KP_Decimal
-keycode 48 = Mode_switch Mode_switch U0133 U0132 thorn THORN
-add Mod5 = Mode_switch
-
-! If the left win key should modify the 5th and 6th, comment this out
-!keycode 115 = ISO_Level3_Shift
-! the right win key modifies the 5th and 6th
-!keycode 116 = ISO_Level3_Shift
-
-! Make the former qwertz-# and qwertz-< to Mod5 (ISO_Level3_Shift)
-keycode 51 = ISO_Level3_Shift ISO_Level3_Shift
-keycode 94  = ISO_Level3_Shift ISO_Level3_Shift
-add Mod3 = ISO_Level3_Shift
-
-! force to learn the new Escape!
-!keycode 9 =
-
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-! The first row
+! The first row (number Row)
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 keycode 49 = dead_circumflex dead_caron dead_breve paragraph 
 
@@ -55,6 +28,7 @@ keycode 18 = 9 leftdoublequotemark leftsinglequotemark guillemotleft asterisk
 keycode 19 = 0 rightdoublequotemark rightsinglequotemark U203A minus
 
 keycode 20 = minus U2013 U2014 U2039 
+!keycode 20 = ssharp minus U2013 U2039 U2014 
 keycode 21 = dead_acute dead_grave dead_cedilla dead_ogonek dead_abovedot dead_abovering
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -71,11 +45,12 @@ 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 = j J semicolon semicolon plus
-keycode 34 = y Y y Greek_upsilon schwa SCHWA 
+keycode 34 = ssharp ssharp U0133 U0132 schwa SCHWA 
+!keycode 34 = y Y y Greek_upsilon thorn THORN
 keycode 35 = dead_tilde dead_macron dead_diaeresis dead_doubleacute
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-! The middle row
+! The home row (middle row)
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 keycode 38 = u U backslash  backslash     Home Home
 keycode 39 = i I slash      Greek_iota    Left Left  
@@ -88,6 +63,7 @@ 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 y Greek_upsilon thorn THORN
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 ! The lower row
@@ -100,10 +76,36 @@ keycode 56 = z Z grave Greek_zeta z Greek_OMEGA
 
 keycode 57 = b B plus Greek_beta plusminus
 keycode 58 = m M percent mu 1
-keycode 59 = comma ssharp ampersand U03D1 2 
+keycode 59 = comma semicolon ampersand U03D1 2 
 keycode 60 = period colon quotedbl Greek_theta 3 Greek_THETA
 keycode 61 = q Q apostrophe apostrophe period
 
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+! Modifier definition
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+! Make CapsLock an additional Alt_Gr (Mode_switch is for 3rd and 4th level)
+remove Lock = Caps_Lock
+remove Mod3 = ISO_Level3_Shift
+keycode 66 = Mode_switch Mode_switch Caps_Lock Caps_Lock
+
+! Make AltGr and apostrophe to Mode_switch (which is the 3rd and 4th level)
+keycode 113 = Mode_switch Mode_switch Mode_switch Mode_switch KP_Decimal
+!keycode 48 = Mode_switch Mode_switch U0133 U0132 schwa SCHWA
+add Mod5 = Mode_switch
+
+! If the left win key should modify the 5th and 6th, comment this out
+!keycode 115 = ISO_Level3_Shift
+! the right win key modifies the 5th and 6th
+!keycode 116 = ISO_Level3_Shift
+
+! Make the former qwertz-# and qwertz-< to Mod5 (ISO_Level3_Shift)
+keycode 51 = ISO_Level3_Shift ISO_Level3_Shift
+keycode 94  = ISO_Level3_Shift ISO_Level3_Shift
+add Mod3 = ISO_Level3_Shift
+
+! force to learn the new Escape!
+!keycode 9 =
+
 keycode 65 = space space space space 0 space
 
 
@@ -146,5 +148,5 @@ keycode 89 = KP_Next KP_3 threesuperior threesuperior
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 ! The lowest row
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-keycode 90 = KP_Insert	KP_0 percent	
-keycode 91 = KP_Delete	KP_Decimal period comma 	
+keycode 90 = KP_Insert	KP_0 percent U2030
+keycode 91 = KP_Delete	KP_Decimal period comma	
diff --git a/linux/xmodmap/neo_de_from_ie.xmodmap b/linux/xmodmap/neo_de_from_ie.xmodmap
deleted file mode 100644
index 04ceaac..0000000
--- a/linux/xmodmap/neo_de_from_ie.xmodmap
+++ /dev/null
@@ -1,138 +0,0 @@
-!! ~/.xmodmap
-!!
-!! created by Benjamin Kellermann <Benjamin dot Kellermann at gmx dot Germany> 
-!! and Erik Streb <mail@erikstreb.de>
-!!
-!! The german NEO Layout Version 1.9.3
-!! see http://pebbles.schattenlauf.de/layout.php for details
-!!
-!! this Layout depends on a running Irish Layout
-!! mostly type "setxkbmap ie" to set a Irish Layout 
-!!
-!! To try the layout in this file, simply do xmodmap <file>.
-!! To load the layout in this file at X startup, simply store it as
-!! ~/.xmodmap (named .xmodmap in your home directory)
-
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-! Modifier definition
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-! 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
-
-! Make AltGr and apostrophe to Mode_switch (which is the 3rd and 4th level)
-keysym ISO_Level3_Shift = Mode_switch Mode_switch Mode_switch Mode_switch KP_Decimal
-keysym apostrophe = Mode_switch Mode_switch U0133 U0132 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
-
-! Make the former qwertz-# to Mod5 (ISO_Level3_Shift)
-keysym numbersign = ISO_Level3_Shift ISO_Level3_Shift ISO_Level3_Shift ISO_Level3_Shift ISO_Level3_Shift ISO_Level3_Shift
-! Make the former qwertz-< 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
-
-! force to learn the new Escape!
-!keysym Escape =
-
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-! The first row
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-keysym grave = dead_circumflex dead_caron dead_breve paragraph 
-
-keysym 1 = 1 degree notsign onesuperior
-keysym 2 = 2 2 2 twosuperior 
-keysym 3 = 3 section 3 threesuperior 
-keysym 4 = 4 dollar    yen cent Prior Prior
-keysym 5 = 5 EuroSign  sterling currency
-keysym 6 = 6 ordfeminine ae AE
-
-keysym 7 = 7 masculine oe OE
-keysym 8 = 8 doublelowquotemark singlelowquotemark guillemotright slash
-keysym 9 = 9 leftdoublequotemark leftsinglequotemark guillemotleft asterisk
-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 e = l L bracketleft Greek_lambda Up Up
-keysym r = c C bracketright Greek_chi c copyright
-keysym t = w W asciitilde asciitilde Insert
-
-keysym y = k K exclam Greek_kappa exclamdown
-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  = y Y y Greek_upsilon schwa SCHWA 
-keysym bracketright = dead_tilde dead_macron dead_diaeresis dead_doubleacute
-
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-! The middle row
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-keysym a = u U backslash  backslash     Home Home
-keysym s = i I slash      Greek_iota    Left Left  
-keysym d = a A braceleft  Greek_alpha   Down Down
-keysym f = e E braceright Greek_epsilon Right Right
-keysym g = o O asterisk   Greek_omega   End End
-
-keysym h = s S question  Greek_sigma questiondown Greek_SIGMA
-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
-
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-! The lower row
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-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
-keysym b = z Z grave Greek_zeta z Greek_OMEGA
-
-keysym n      = b      B      plus Greek_beta plusminus
-keysym m      = m      M      percent mu 1
-keysym comma  = comma  ssharp ampersand U03D1 2 
-keysym period = period colon  quotedbl Greek_theta 3 Greek_THETA
-keysym slash  = q      Q      apostrophe apostrophe period
-
-keysym space = space space space space 0 space
-
-! Keypad  
-!keysym <NMLK> 	 Num_Lock Pointer_EnableKeys 	
- ! Ungrab cancels server/keyboard/pointer grabs
-!keysym <KPDV> KP_Divide KP_Divide division 
- ! ClsGrb kills whichever client has a grab in effect
-!keysym <KPMU> KP_Multiply KP_Multiply periodcentered 
- ! -VMode switches to the previous video mode
-!keysym <KPSU> KP_Subtract KP_Subtract notsign 
-
- ! upper row
-!keysym <KP7> 	 KP_Home	KP_7 seveneighths oneeighth		
-!keysym <KP8> 	 KP_Up	KP_8 uparrow fiveeighths 	
-!keysym <KP9> 	 KP_Prior	KP_9 threeeighths threeeighths 
- ! +VMode switches to the next video mode
-!keysym <KPAD> 	 KP_Add KP_Add plusminus 
-
- ! middle row
-!keysym <KP4> 	 KP_Left	KP_4 leftarrow onequarter			
-!keysym <KP5> 	 KP_Begin	KP_5 dagger onehalf 				
-!keysym <KP6> 	 KP_Right	KP_6 rightarrow threequarters		
-
- ! lower row
-!keysym <KP1> 	 KP_End	KP_1 onesuperior onesuperior			
-!keysym <KP2> 	 KP_Down	KP_2 downarrow twosuperior			
-!keysym <KP3> 	 KP_Next	KP_3 threesuperior threesuperior		
-!keysym <KPEN> 	 	KP_Enter		
-!keysym <KPEQ> 	 	KP_Equal		
-
- ! lowest row
-!keysym <KP0> 	 KP_Insert	KP_0 percent degree				
-!keysym <KPDL> 	 KP_Delete	KP_Decimal periodcentered comma