Patch von Kai Zimmermann zur mix_qwertz

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

1 files changed, 67 insertions, 64 deletions

diff --git a/linux/xmodmap/neo_de_mix_qwertz.xmodmap b/linux/xmodmap/neo_de_mix_qwertz.xmodmap
index 8049f80..68414cf 100644
--- a/linux/xmodmap/neo_de_mix_qwertz.xmodmap
+++ b/linux/xmodmap/neo_de_mix_qwertz.xmodmap
@@ -1,9 +1,9 @@
 !! ~/.xmodmap
 !!
-!! created by Benjamin Kellermann <Benjamin dot Kellermann at gmx dot Germany> 
+!! created by Benjamin Kellermann <Benjamin dot Kellermann at gmx dot Germany>
 !! and Erik Streb <mail at erikstreb dot de>
 !!
-!! The german NEO Layout Version 1.9.3
+!! The german NEO Layout Version 1.9.6
 !! see http://pebbles.schattenlauf.de/layout.php for details
 !!
 !! To try the layout in this file, simply do xmodmap <file>.
@@ -13,71 +13,74 @@
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 ! The first row (number Row)
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-keycode 49 = dead_circumflex dead_caron dead_breve paragraph 
+!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 dead_breve  dead_belowdot dead_belowdot
 
-keycode 10 = 1 degree notsign onesuperior
-keycode 11 = 2 2 2 twosuperior 
-keycode 12 = 3 section 3 threesuperior 
-keycode 13 = 4 dollar    yen cent Prior Prior
-keycode 14 = 5 EuroSign  sterling currency
-keycode 15 = 6 ordfeminine ae AE
+keycode 10 = 1 degree         onesuperior   U2640    enfilledcircbullet
+keycode 11 = 2 numerosign     twosuperior   U26A5    U2023
+keycode 12 = 3 section        threesuperior U2642
+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 masculine oe OE
-keycode 17 = 8 doublelowquotemark singlelowquotemark guillemotright slash
-keycode 18 = 9 leftdoublequotemark leftsinglequotemark guillemotleft asterisk
-keycode 19 = 0 rightdoublequotemark rightsinglequotemark U203A minus
+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 U2013 U2014 U2039 
-!keycode 20 = ssharp minus U2013 U2039 U2014 
+keycode 20 = minus endash emdash hyphen U2011 logicaland
 keycode 21 = dead_acute dead_grave dead_cedilla dead_ogonek dead_abovedot dead_abovering
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-! The upper row 
+! The upper row
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-keycode 24 = q Q at Greek_xi Escape Greek_XI
-keycode 25 = w W underscore underscore BackSpace 
+keycode 24 = q Q at Greek_xi x Greek_XI
+keycode 25 = w W underscore v BackSpace U039B
 keycode 26 = e E bracketleft Greek_lambda Up Up
-keycode 27 = r R bracketright Greek_chi c copyright
-keycode 28 = t T asciitilde asciitilde Insert
+keycode 27 = r R bracketright Greek_chi Tab Tab
+keycode 28 = t T asciicircum w Insert
 
-keycode 29 = z Z exclam Greek_kappa exclamdown
+keycode 29 = z Z exclam Greek_kappa exclamdown copyright
 keycode 30 = u U less Greek_psi 7 Greek_PSI
 keycode 31 = i I greater Greek_gamma 8 Greek_GAMMA
 keycode 32 = o O equal Greek_phi 9 Greek_PHI
-keycode 33 = p P semicolon semicolon plus
-keycode 34 = udiaeresis Udiaeresis U0133 U0132 schwa SCHWA 
+keycode 33 = p P ampersand U0278 plus partialderivative
+keycode 34 = udiaeresis Udiaeresis ssharp Greek_finalsmallsigma schwa SCHWA
+! war: keycode 34 = ssharp U1E9E U017F Greek_finalsmallsigma schwa SCHWA
 keycode 35 = dead_tilde dead_macron dead_diaeresis dead_doubleacute
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 ! The home row (middle row)
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-keycode 38 = a A backslash  backslash     Home Home
-keycode 39 = s S slash      Greek_iota    Left Left  
-keycode 40 = d D braceleft  Greek_alpha   Down Down
+keycode 38 = a A backslash  u             Home  Home
+keycode 39 = s S slash      Greek_iota    Left  Left
+keycode 40 = d D braceleft  Greek_alpha   Down  Down
 keycode 41 = f F braceright Greek_epsilon Right Right
-keycode 42 = g G asterisk   Greek_omega   End End
+keycode 42 = g G asterisk   Greek_omega   End   End
 
 keycode 43 = h H question  Greek_sigma questiondown Greek_SIGMA
-keycode 44 = j J parenleft Greek_nu    4
-keycode 45 = k K parenright Greek_rho  5 registered
+keycode 44 = j J parenleft Greek_nu    4 
+keycode 45 = k K parenright Greek_rho 5 registered
 keycode 46 = l L minus Greek_tau 6 trademark
 keycode 47 = odiaeresis Odiaeresis colon Greek_delta comma Greek_DELTA
-keycode 48 = adiaeresis Adiaeresis adiaeresis Greek_upsilon thorn THORN
+keycode 48 = adiaeresis Adiaeresis doublelowquotemark Greek_upsilon thorn THORN
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 ! The lower row
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-keycode 52 = y Y asciicircum asciicircum Tab Tab
-keycode 53 = X X dollar Udiaeresis Delete
+keycode 52 = y Y numbersign udiaeresis Escape
+keycode 53 = x X dollar odiaeresis Delete Delete
 keycode 54 = c C bar Greek_eta Next Next
-keycode 55 = v V numbersign Greek_pi p Greek_PI
+keycode 55 = v V asciitilde Greek_pi Return Greek_PI
 keycode 56 = b B grave Greek_zeta z Greek_OMEGA
 
-keycode 57 = n B plus Greek_beta plusminus
-keycode 58 = m M percent mu 1
-keycode 59 = comma semicolon ampersand U03D1 2 
-keycode 60 = period colon quotedbl Greek_theta 3 Greek_THETA
-keycode 61 = minus underscore apostrophe apostrophe period
+keycode 57 = n N plus Greek_beta b infinity
+keycode 58 = m M percent mu 1 integral
+keycode 59 = comma comma apostrophe U03F1 2 radical
+keycode 60 = period ellipsis quotedbl Greek_theta 3 Greek_THETA
+keycode 61 = ssharp U1E9E semicolon U3D1 period nabla
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 ! Modifier definition
@@ -85,11 +88,11 @@ keycode 61 = minus underscore apostrophe apostrophe period
 ! 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
+! Make former CapsLock and qwertz-# to Mode_switch (which is the 3rd and 4th level)
+keycode 66 = Mode_switch Mode_switch Caps_Lock Caps_Lock Multi_key Multi_key
+keycode 51 = Mode_switch Mode_switch Caps_Lock Caps_Lock Multi_key Multi_key
+!keycode 48 = Mode_switch Mode_switch U133 U132 schwa SCHWA
 add Mod5 = Mode_switch
 
 ! If the left win key should modify the 5th and 6th, comment this out
@@ -97,55 +100,55 @@ add Mod5 = Mode_switch
 ! 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
+! Make the former AltGr and qwertz-< to Mod5 (ISO_Level3_Shift)
+keycode 94  = ISO_Level3_Shift ISO_Level3_Shift Multi_key Multi_key Caps_Lock Caps_Lock
+keycode 113 = ISO_Level3_Shift ISO_Level3_Shift Multi_key Multi_key KP_Decimal Caps_Lock
 add Mod3 = ISO_Level3_Shift
 
 ! force to learn the new Escape!
 !keycode 9 =
 
-keycode 65 = space space space space 0 space
+keycode 65 = space space space nobreakspace 0 U202F
 
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-! Keypad  
+! Keypad
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 ! The uppest row
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-!keycode 77 = Num_Lock Pointer_EnableKeys 	
-keycode 112 = KP_Divide KP_Divide division 
-keycode 63  = KP_Multiply KP_Multiply multiply U22C5 U2217 
+!keycode 77 = Num_Lock Pointer_EnableKeys
+keycode 112 = KP_Divide   KP_Divide   division  U2215
+keycode 63  = KP_Multiply KP_Multiply multiply  U22C5
 keycode 82  = KP_Subtract KP_Subtract U2212
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 ! The upper row
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-keycode 79 = KP_Home	KP_7 seveneighths oneeighth		
-keycode 80 = KP_Up KP_8 uparrow fiveeighths 	
-keycode 81 = KP_Prior	KP_9 threeeighths threeeighths 
-keycode 86 = KP_Add plusminus plusminus U2213
+keycode 79 =  KP_Home     KP_7        KP_7       U226A
+keycode 80 =  KP_Up       KP_8        uparrow    U2229
+keycode 81 =  KP_Prior    KP_9        KP_9       U226B
+keycode 86 =  KP_Add      KP_Add      plusminus  U2213
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 ! The middle row
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-keycode 83 = KP_Left  KP_4 leftarrow onequarter			
-keycode 84 = KP_Begin KP_5 dagger onehalf 				
-keycode 85 = KP_Right KP_6 rightarrow threequarters		
+keycode 83 =  KP_Left     KP_4        leftarrow  U2282
+keycode 84 =  EuroSign    KP_5        dagger     U220A
+keycode 85 =  KP_Right    KP_6        rightarrow U2283
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 ! The lower row
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-keycode 87 = KP_End  KP_1 onesuperior onesuperior			
-keycode 88 = KP_Down KP_2 downarrow twosuperior			
-keycode 89 = KP_Next KP_3 threesuperior threesuperior		
-!keycode 77 = KP_Enter		
-!keysym <KPEQ> 	 	KP_Equal		
+keycode 87 =  KP_End      KP_1        U21CB      U2264 
+keycode 88 =  KP_Down     KP_2        downarrow  U222A 
+keycode 89 =  KP_Next     KP_3        U21CC      U2265 
+keycode 108 = KP_Enter    KP_Enter    notequal   U2248
+!keysym <KPEQ> KP_Equal
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 ! The lowest row
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-keycode 90 = KP_Insert	KP_0 percent U2030
-keycode 91 = KP_Delete	KP_Decimal period comma	
+keycode 90 = KP_Insert    KP_0        percent    U2030
+keycode 91 = KP_Delete    KP_Decimal  period     comma