caps/nocaps-Option für die Tasten definiert. Langes s (ſ) auf Ebene 7 wieder eingeführt.

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

1 files changed, 74 insertions, 72 deletions

diff --git a/windows/neo-vars/keydefinitions.ahk b/windows/neo-vars/keydefinitions.ahk
index abd000a..0374c51 100644
--- a/windows/neo-vars/keydefinitions.ahk
+++ b/windows/neo-vars/keydefinitions.ahk
@@ -1,83 +1,83 @@
 ;  KeyCode     Ebene1  Ebene2  Ebene3  Ebene4  Ebene5  Ebene6  Ebene7* Ebene8*

 ; Reihe 1

-ED("VKDCSC029","Tcflx","Ttlde","Tobrg","Tcron","Tbrve","Tmcrn") ; circumflex

-ED("VK31SC002","U0031","U00B0","U00B9","U00BA","U2081","U00AC") ; 1

-ED("VK32SC003","U0032","U00A7","U00B2","U00AA","U2082","U2228") ; 2

-ED("VK33SC004","U0033","U2113","U00B3","U2116","U2083","U2227") ; 3

-ED("VK34SC005","U0034","U00BB","U203A","SPgUp","U2020","U22A5") ; 4

-ED("VK35SC006","U0035","U00AB","U2039",""     ,"U2640","U2221") ; 5

-ED("VK36SC007","U0036","U20AC","U00A2","U00A3","U2642","U2225") ; 6

-ED("VK37SC008","U0037","U0024","U00A5","U00A4","U03BA","U2209") ; 7

-ED("VK38SC009","U0038","U201E","U201A","SNDiv","U27E8","U2204") ; 8

-ED("VK39SC00A","U0039","U201C","U2018","SNMul","U27E9","U2226") ; 9

-ED("VK30SC00B","U0030","U201D","U2019","SNSub","U2080","U2205") ; 0

-ED("VKDBSC00C","U002D","U2013","U2014",""     ,"U2011","U00AD") ; -

-ED("VKDDSC00D","Tgrav",""     ,"Tdrss","Tdgrv","U1FFE",""     ) ; grave

+ED("VKDCSC029",0,"Tcflx","Ttlde","Tobrg","Tcron","Tbrve","Tmcrn") ; circumflex

+ED("VK31SC002",0,"U0031","U00B0","U00B9","U00BA","U2081","U00AC") ; 1

+ED("VK32SC003",0,"U0032","U00A7","U00B2","U00AA","U2082","U2228") ; 2

+ED("VK33SC004",0,"U0033","U2113","U00B3","U2116","U2083","U2227") ; 3

+ED("VK34SC005",0,"U0034","U00BB","U203A","SPgUp","U2020","U22A5") ; 4

+ED("VK35SC006",0,"U0035","U00AB","U2039",""     ,"U2640","U2221") ; 5

+ED("VK36SC007",0,"U0036","U20AC","U00A2","U00A3","U2642","U2225") ; 6

+ED("VK37SC008",0,"U0037","U0024","U00A5","U00A4","U03BA","U2209") ; 7

+ED("VK38SC009",0,"U0038","U201E","U201A","SNDiv","U27E8","U2204") ; 8

+ED("VK39SC00A",0,"U0039","U201C","U2018","SNMul","U27E9","U2226") ; 9

+ED("VK30SC00B",0,"U0030","U201D","U2019","SNSub","U2080","U2205") ; 0

+ED("VKDBSC00C",0,"U002D","U2013","U2014",""     ,"U2011","U00AD") ; -

+ED("VKDDSC00D",0,"Tgrav",""     ,"Tdrss","Tdgrv","U1FFE",""     ) ; grave

 ; Reihe 2

-ED("VK51SC010","U0078","U0058","U2026","U22EE","U03BE","U039E") ; x

-ED("VK57SC011","U0076","U0056","U005F","U0008",""     ,"U2259") ; v

-ED("VK45SC012","U006C","U004C","U005B","S__Up","U03BB","U039B") ; l

-ED("VK52SC013","U0063","U0043","U005D","S_Del","U03C7","U2102") ; c

-ED("VK54SC014","U0077","U0057","U005E","S_Ins","U03C9","U03A9") ; w

-ED("VK5ASC015","U006B","U004B","U0021","U00A1","U03F0","U221A") ; k

-ED("VK55SC016","U0068","U0048","U003C","SN__7","U03C8","U03A8") ; h

-ED("VK49SC017","U0067","U0047","U003E","SN__8","U03B3","U0393") ; g

-ED("VK4FSC018","U0066","U0046","U003D","SN__9","U03C6","U03A6") ; f

-ED("VK50SC019","U0071","U0051","U0026","SNAdd","U03D5","U211A") ; q

-ED("VKBASC01A","U00DF","U1E9E","U017F",""     ,"U03C2","U2218") ; ß

-ED("VKBBSC01B","Tacut","Tcedi","Tstrk","Tdbac","U1FBF","Tabdt") ; acute

+ED("VK51SC010",1,"U0078","U0058","U2026","U22EE","U03BE","U039E") ; x

+ED("VK57SC011",1,"U0076","U0056","U005F","U0008",""     ,"U2259") ; v

+ED("VK45SC012",1,"U006C","U004C","U005B","S__Up","U03BB","U039B") ; l

+ED("VK52SC013",1,"U0063","U0043","U005D","S_Del","U03C7","U2102") ; c

+ED("VK54SC014",1,"U0077","U0057","U005E","S_Ins","U03C9","U03A9") ; w

+ED("VK5ASC015",1,"U006B","U004B","U0021","U00A1","U03F0","U221A") ; k

+ED("VK55SC016",1,"U0068","U0048","U003C","SN__7","U03C8","U03A8") ; h

+ED("VK49SC017",1,"U0067","U0047","U003E","SN__8","U03B3","U0393") ; g

+ED("VK4FSC018",1,"U0066","U0046","U003D","SN__9","U03C6","U03A6") ; f

+ED("VK50SC019",1,"U0071","U0051","U0026","SNAdd","U03D5","U211A") ; q

+ED("VKBASC01A",1,"U00DF","U1E9E","U017F",""     ,"U03C2","U2218") ; ß

+ED("VKBBSC01B",0,"Tacut","Tcedi","Tstrk","Tdbac","U1FBF","Tabdt") ; acute

 ; Reihe 3

-ED("VK41SC01E","U0075","U0055","U005C","SHome","P_Uni","U222E") ; u

-ED("VK53SC01F","U0069","U0049","U002F","SLeft","U03B9","U222B") ; i

-ED("VK44SC020","U0061","U0041","U007B","SDown","U03B1","U2200") ; a

-ED("VK46SC021","U0065","U0045","U007D","SRght","U03B5","U2203") ; e

-ED("VK47SC022","U006F","U004F","U002A","S_End","U03BF","U2208") ; o

-ED("VK48SC023","U0073","U0053","U003F","U00BF","U03C3","U03A3") ; s

-ED("VK4ASC024","U006E","U004E","U0028","SN__4","U03BD","U2115") ; n

-ED("VK4BSC025","U0072","U0052","U0029","SN__5","U03F1","U211D") ; r

-ED("VK4CSC026","U0074","U0054","U002D","SN__6","U03C4","U2202") ; t

-ED("VKC0SC027","U0064","U0044","U003A","SNDot","U03B4","U0394") ; d

-ED("VKDESC028","U0079","U0059","U0040","U002E","U03C5","U2207") ; y

+ED("VK41SC01E",1,"U0075","U0055","U005C","SHome","P_Uni","U222E") ; u

+ED("VK53SC01F",1,"U0069","U0049","U002F","SLeft","U03B9","U222B") ; i

+ED("VK44SC020",1,"U0061","U0041","U007B","SDown","U03B1","U2200") ; a

+ED("VK46SC021",1,"U0065","U0045","U007D","SRght","U03B5","U2203") ; e

+ED("VK47SC022",1,"U006F","U004F","U002A","S_End","U03BF","U2208") ; o

+ED("VK48SC023",1,"U0073","U0053","U003F","U00BF","U03C3","U03A3","U017F") ; s

+ED("VK4ASC024",1,"U006E","U004E","U0028","SN__4","U03BD","U2115") ; n

+ED("VK4BSC025",1,"U0072","U0052","U0029","SN__5","U03F1","U211D") ; r

+ED("VK4CSC026",1,"U0074","U0054","U002D","SN__6","U03C4","U2202") ; t

+ED("VKC0SC027",1,"U0064","U0044","U003A","SNDot","U03B4","U0394") ; d

+ED("VKDESC028",1,"U0079","U0059","U0040","U002E","U03C5","U2207") ; y

 ; Reihe 4

-ED("VK59SC02C","U00FC","U00DC","U0023","U001B",""     ,"U221C") ; ü

-ED("VK58SC02D","U00F6","U00D6","U0024","U0009",""     ,"U2111") ; ö

-ED("VK43SC02E","U00E4","U00C4","U007C","SPgDn","U03B7","U2135") ; ä

-ED("VK56SC02F","U0070","U0050","U007E","U000D","U03C0","U03A0") ; p

-ED("VK42SC030","U007A","U005A","U0060",""     ,"U03B6","U2124") ; z

-ED("VK4ESC031","U0062","U0042","U002B","U003A","U03B2","U21D0") ; b

-ED("VK4DSC032","U006D","U004D","U0025","SN__1","U03BC","U21D4") ; m

-ED("VKBCSC033","U002C","U2022","U0022","SN__2","U03C1","U21D2") ; ,

-ED("VKBESC034","U002E","U2023","U0027","SN__3","U03D1","U0398") ; .

-ED("VKBDSC035","U006A","U004A","U003B","U003B","U03B8","U221D") ; j

+ED("VK59SC02C",1,"U00FC","U00DC","U0023","U001B",""     ,"U221C") ; ü

+ED("VK58SC02D",1,"U00F6","U00D6","U0024","U0009",""     ,"U2111") ; ö

+ED("VK43SC02E",1,"U00E4","U00C4","U007C","SPgDn","U03B7","U2135") ; ä

+ED("VK56SC02F",1,"U0070","U0050","U007E","U000D","U03C0","U03A0") ; p

+ED("VK42SC030",1,"U007A","U005A","U0060",""     ,"U03B6","U2124") ; z

+ED("VK4ESC031",1,"U0062","U0042","U002B","U003A","U03B2","U21D0") ; b

+ED("VK4DSC032",1,"U006D","U004D","U0025","SN__1","U03BC","U21D4") ; m

+ED("VKBCSC033",0,"U002C","U2022","U0022","SN__2","U03C1","U21D2") ; ,

+ED("VKBESC034",0,"U002E","U2023","U0027","SN__3","U03D1","U0398") ; .

+ED("VKBDSC035",1,"U006A","U004A","U003B","U003B","U03B8","U221D") ; j

 

 ; Numpad

-ED("VK90SC145","U0009","U0009","U003D","U2260","U2248","U2261") ; NumLock

-ED("VK6FSC135","SNDiv","SNDiv","U00F7","U2300","U2223","U2044") ; NumpadDiv

-ED("VK6ASC037","SNMul","SNMul","U22C5","U00D7","U2299","U2297") ; NumpadMult

-ED("VK6DSC04A","SNSub","SNSub","U2212","U2216","U2296","U2238") ; NumpadSub

-ED("VK6BSC04E","SNAdd","SNAdd","U00B1","U2213","U2295","U2214") ; NumpadAdd

+ED("VK90SC145",0,"U0009","U0009","U003D","U2260","U2248","U2261") ; NumLock

+ED("VK6FSC135",0,"SNDiv","SNDiv","U00F7","U2300","U2223","U2044") ; NumpadDiv

+ED("VK6ASC037",0,"SNMul","SNMul","U22C5","U00D7","U2299","U2297") ; NumpadMult

+ED("VK6DSC04A",0,"SNSub","SNSub","U2212","U2216","U2296","U2238") ; NumpadSub

+ED("VK6BSC04E",0,"SNAdd","SNAdd","U00B1","U2213","U2295","U2214") ; NumpadAdd

 

-EDN("VK67SC047","VK24SC047","SN__7","U2714","U2195","SNHom","U226A","U2308") ; Numpad7, NumpadHome

-EDN("VK68SC048","VK26SC048","SN__8","U2718","U2191","SN_Up","U2229","U22C2") ; Numpad8, NumpadUp

-EDN("VK69SC049","VK21SC049","SN__9",""     ,"U20D7","SNPUp","U226B","U2309") ; Numpad9, NumpadPgUp

+EDN("VK67SC047","VK24SC047",0,"SN__7","U2714","U2195","SNHom","U226A","U2308") ; Numpad7, NumpadHome

+EDN("VK68SC048","VK26SC048",0,"SN__8","U2718","U2191","SN_Up","U2229","U22C2") ; Numpad8, NumpadUp

+EDN("VK69SC049","VK21SC049",0,"SN__9",""     ,"U20D7","SNPUp","U226B","U2309") ; Numpad9, NumpadPgUp

 

-EDN("VK64SC04B","VK25SC04B","SN__4","U2663","U2190","SN_Le","U2282","U2286") ; Numpad4, NumpadLeft

-EDN("VK65SC04C","VK0CSC04C","SN__5","U20AC","U00A6","SNClr","U22B6","U22B7") ; Numpad5, NumpadClear

-EDN("VK66SC04D","VK27SC04D","SN__6",""     ,"U2192","SN_Ri","U2283","U2287") ; Numpad6, NumpadRight

+EDN("VK64SC04B","VK25SC04B",0,"SN__4","U2663","U2190","SN_Le","U2282","U2286") ; Numpad4, NumpadLeft

+EDN("VK65SC04C","VK0CSC04C",0,"SN__5","U20AC","U00A6","SNClr","U22B6","U22B7") ; Numpad5, NumpadClear

+EDN("VK66SC04D","VK27SC04D",0,"SN__6",""     ,"U2192","SN_Ri","U2283","U2287") ; Numpad6, NumpadRight

 

-EDN("VK61SC04F","VK23SC04F","SN__1","U2666","U2194","SNEnd","U2264","U230A") ; Numpad1, NumpadEnd

-EDN("VK62SC050","VK28SC050","SN__2","U2665","U2193","SN_Dn","U222A","U22C3") ; Numpad2, NumpadDown

-EDN("VK63SC051","VK22SC051","SN__3","U2660","U21CC","SNPDn","U2265","U230B") ; Numpad3, NumpadPgDn

+EDN("VK61SC04F","VK23SC04F",0,"SN__1","U2666","U2194","SNEnd","U2264","U230A") ; Numpad1, NumpadEnd

+EDN("VK62SC050","VK28SC050",0,"SN__2","U2665","U2193","SN_Dn","U222A","U22C3") ; Numpad2, NumpadDown

+EDN("VK63SC051","VK22SC051",0,"SN__3","U2660","U21CC","SNPDn","U2265","U230B") ; Numpad3, NumpadPgDn

 

-EDN("VK60SC052","VK2DSC052","SN__0","U2423","U0025","SNIns","U2030","U25A1") ; Numpad0, NumpadIns

-EDN("VK6ESC053","VK2ESC053","SNDot","U002E","U002C","SNDel","U2032","U2033") ; NumpadDot, NumpadDel

+EDN("VK60SC052","VK2DSC052",0,"SN__0","U2423","U0025","SNIns","U2030","U25A1") ; Numpad0, NumpadIns

+EDN("VK6ESC053","VK2ESC053",0,"SNDot","U002E","U002C","SNDel","U2032","U2033") ; NumpadDot, NumpadDel

 

 ; other chars

-ED("space","U0020","U0020","U0020","SN__0","U00A0","U202F")

-ED("esc"  ,"U001B","U001B","U001B","PRlod","U001B","U001B")

-ED("tab"  ,"U0009","U0009","SComp","U0009","U0009","U0009")

-ED("F10"  ,"S_F10","S_F10","S_F10","P_VMt","S_F10","S_F10")

-ED("F11"  ,"S_F11","S_F11","S_F11","PLnSt","S_F11","S_F11")

+ED("space",0,"U0020","U0020","U0020","SN__0","U00A0","U202F")

+ED("esc"  ,0,"U001B","U001B","U001B","PRlod","U001B","U001B")

+ED("tab"  ,0,"U0009","U0009","SComp","U0009","U0009","U0009")

+ED("F10"  ,0,"S_F10","S_F10","S_F10","P_VMt","S_F10","S_F10")

+ED("F11"  ,0,"S_F11","S_F11","S_F11","PLnSt","S_F11","S_F11")

 ED1("enter"    ,"U000D")

 ED1("backspace","U0008")

 ED1("del"      ,"S_Del")

@@ -92,8 +92,10 @@ ED1("left"     ,"SLeft")
 ED1("right"    ,"SRght")

 ED1("numpadenter","SNEnt")

 

-ED(pos,e1,e2,e3,e4,e5,e6,e7="",e8="") {

+ED(pos,caps,e1,e2,e3,e4,e5,e6,e7="",e8="") {

   global

+  if (caps == 0)

+    NOC%pos% := 1

   if (e1 != "") 

     CP1%pos% := e1

   if (e2 != "") 

@@ -112,11 +114,11 @@ ED(pos,e1,e2,e3,e4,e5,e6,e7="",e8="") {
     CP8%pos% := e8

 }

 

-EDN(pos1,pos2,e1,e2,e3,e4,e5,e6) {

-  ED(pos1,e1,e2,e3,e4,e5,e6)

-  ED(pos2,e1,e2,e3,e4,e5,e6)

+EDN(pos1,pos2,caps,e1,e2,e3,e4,e5,e6) {

+  ED(pos1,caps,e1,e2,e3,e4,e5,e6)

+  ED(pos2,caps,e1,e2,e3,e4,e5,e6)

 }

 

 ED1(pos,e1) {

- ED(pos,e1,e1,e1,e1,e1,e1)

+ ED(pos,1,e1,e1,e1,e1,e1,e1)

 }