From 48ff97e3647133e77ac4f87c17d1849e79b00381 Mon Sep 17 00:00:00 2001 From: martin_r Date: Tue, 7 Oct 2008 14:56:16 +0000 Subject: 6-Ebenen-Ziffernblock eingepflegt git-svn-id: https://svn.neo-layout.org@953 b9310e46-f624-0410-8ea1-cfbb3a30dc96 --- windows/autohotkey/Changelog-and-Todo.txt | 4 +- windows/autohotkey/Source/Keys-Neo.ahk | 122 +++++++++++++++++++++++------- windows/autohotkey/neo20.ahk | 122 +++++++++++++++++++++++------- windows/autohotkey/neo20.exe | Bin 439881 -> 440165 bytes 4 files changed, 189 insertions(+), 59 deletions(-) diff --git a/windows/autohotkey/Changelog-and-Todo.txt b/windows/autohotkey/Changelog-and-Todo.txt index 8cf1345..b652fee 100644 --- a/windows/autohotkey/Changelog-and-Todo.txt +++ b/windows/autohotkey/Changelog-and-Todo.txt @@ -23,12 +23,14 @@ Matthias Wächter === Änderungshistorie === +Revision 953 (von Martin Roppelt) +- 6-Ebenen-Ziffernblock eingepflegt. Revision 929 (von Martin Roppelt) - Compose.ahk aktualisiert. - mod4+y sendet jetzt »KP+.« statt wie bisher ein einfaches ».«. - mod4+return sendet jetzt »KP+return« (aka »enter«) statt wie bisher ein einfaches »return«. Revision 899 (von Dennis Heidsiek) -- Build-Skript überarbeitet, so dass die Pfade zentral geändert werden können. +- Build-Skript überarbeitet, sodass die Pfade zentral geändert werden können. Revision 897 (von Dennis Heidsiek) - Skript kompiliert wieder (alle .ahk-Dateien enden jetzt mit mindestens zwei Leezeilen) - Ein Ãœberbleibsel aus dem Build-Skript entfernt (bezog sich noch auf den Compose-Playground). diff --git a/windows/autohotkey/Source/Keys-Neo.ahk b/windows/autohotkey/Source/Keys-Neo.ahk index 49cf50f..0abf17b 100644 --- a/windows/autohotkey/Source/Keys-Neo.ahk +++ b/windows/autohotkey/Source/Keys-Neo.ahk @@ -829,22 +829,28 @@ return neo_NumLock: EbeneAktualisieren() - if (Ebene = 1) ;… + if Ebene12 + OutputChar("{Tab}", "Tab") + else if (Ebene = 3) OutputChar("`=", "equal") - if (Ebene = 3) - SendUnicodeChar(0x2248, "U2248") ; Fast gleich - if (Ebene = 2) - SendUnicodeChar(0x2260, "U2260") ; Ungleich zu + else if (Ebene = 4) + SendUnicodeChar(0x2260, "notequal") ; Ungleich zu + else if (Ebene = 5) + SendUnicodeChar(0x2248, "approxeq") ; Fast gleich return neo_NumpadDiv: EbeneAktualisieren() if Ebene12 OutputChar("{NumpadDiv}", "KP_Divide") - else if (Ebene = 4) - SendUnicodeChar(0x2215, "division") ; Slash else if (Ebene = 3) - OutputChar("÷", "U2044") + OutputChar("÷", "division") + else if (Ebene = 4) + SendUnicodeChar(0x2300, "U2300") ; diameter + else if (Ebene = 5) + SendUnicodeChar(0x2223, "U2223") ; divides + else if (Ebene = 6) + SendUnicodeChar(0x2044, "U2044") ; fraction slash return neo_NumpadMult: @@ -852,9 +858,13 @@ neo_NumpadMult: if Ebene12 send {blind}{NumpadMult} else if (Ebene = 3) - SendUnicodeChar(0x22C5, "multiply") ; Cdot + SendUnicodeChar(0x22C5, "U22C5") ; multiplication dot else if (Ebene = 4) - OutputChar("×", "U2219") + SendUnicodeChar(0x2299, "U2299") ; circled dot + else if (Ebene = 5) + OutputChar("×", "multiply") + else if (Ebene = 6) + SendUnicodeChar(0x2297, "U2297") ; circled times return neo_NumpadSub: @@ -862,8 +872,14 @@ neo_NumpadSub: if (Ebene12 and !(CheckDeadUni("c1",0x207B) or CheckDeadUni("t4",0x208B))) send {blind}{NumpadSub} - else if (Ebene = 3) or (Ebene = 4) + else if (Ebene = 3) SendUnicodeChar(0x2212, "U2212") ; Echtes Minus + else if (Ebene = 4) + SendUnicodeChar(0x2296, "U2296") ; circled minus + else if (Ebene = 5) + SendUnicodeChar(0x2216, "U2216") ; set minus + else if (Ebene = 6) + SendUnicodeChar(0x2238, "U2238") ; dot minus return neo_NumpadAdd: @@ -874,7 +890,11 @@ neo_NumpadAdd: else if (Ebene = 3) OutputChar("±", "plusminus") else if (Ebene = 4) - SendUnicodeChar(0x2213, "U2213") ; Inverses ± + SendUnicodeChar(0x2295, "U2295") ; circled plus + else if (Ebene = 5) + SendUnicodeChar(0x2213, "U2213") ; minus-plus + else if (Ebene = 6) + SendUnicodeChar(0x2214, "U2214") ; dot plus return neo_NumpadEnter: @@ -886,11 +906,15 @@ neo_Numpad7: if (Ebene = 1) OutputChar("{Numpad7}", "KP_7") else if (Ebene = 2) - SendUnicodeChar(0x2020, "dagger") ; Kreuz + SendUnicodeChar(0x2714, "U2714") ; check mark else if (Ebene = 3) SendUnicodeChar(0x2195, "U2195") ; Hoch-Runter-Pfeil else if (Ebene = 4) send {blind}{NumpadHome} + else if (Ebene = 5) + SendUnicodeChar(0x230A, "downstile") ;linke Untergrenze + else if (Ebene = 6) + SendUnicodeChar(0x2308, "upstile") ; linke Obergrenze return neo_Numpad8: @@ -898,11 +922,15 @@ neo_Numpad8: if (Ebene = 1) OutputChar("{Numpad8}", "KP_8") else if (Ebene = 2) - SendUnicodeChar(0x2229, "intersection") ; Durchschnitt + SendUnicodeChar(0x2718, "U2718") ; ballot x else if (Ebene = 3) SendUnicodeChar(0x2191, "uparrow") ; Hochpfeil else if (Ebene = 4) send {blind}{NumpadUp} + else if (Ebene = 5) + SendUnicodeChar(0x2229, "intersection") ; Durchschnitt + else if (Ebene = 6) + SendUnicodeChar(0x22C2, "U22C2") ; n-ary intersection return neo_Numpad9: @@ -910,11 +938,15 @@ neo_Numpad9: if (Ebene = 1) OutputChar("{Numpad9}", "KP_9") else if (Ebene = 2) - SendUnicodeChar(0x2297, "U2297") ; Tensorprodukt / Vektor in die Ebene zeigend + SendUnicodeChar(0x2020, "dagger") ; Kreuz else if (Ebene = 3) - SendUnicodeChar(0x220D, "U220D") ; Kleines umgekehrtes Elementzeichen + SendUnicodeChar(0x20D7, "U20D7") ; Vektor else if (Ebene = 4) send {blind}{NumpadPgUp} + else if (Ebene = 5) + SendUnicodeChar(0x230B, "U230B") ; rechte Untergrenze + else if (Ebene = 6) + SendUnicodeChar(0x2309, "U2309") ; rechte Obergrenze return neo_Numpad4: @@ -922,11 +954,15 @@ neo_Numpad4: if (Ebene = 1) OutputChar("{Numpad4}", "KP_4") else if (Ebene = 2) - SendUnicodeChar(0x2282, "includein") ; Teilmenge + SendUnicodeChar(0x2663, "club") ; schwarzes Kreuz else if (Ebene = 3) SendUnicodeChar(0x2190, "leftarrow") ; Linkspfeil else if (Ebene = 4) send {blind}{NumpadLeft} + else if (Ebene = 5) + SendUnicodeChar(0x2282, "includein") ; Teilmenge + else if (Ebene = 6) + SendUnicodeChar(0x2286, "U2286") ; Teilmenge-gleich return neo_Numpad5: @@ -937,20 +973,28 @@ neo_Numpad5: SendUnicodeChar(0x20AC, "EuroSign") ; Euro else if (Ebene = 3) SendUnicodeChar(0x221E, "infinity") ; Unendlich - else if (Ebene = 4) ; Beg - send {blind}{NumPadClear} + else if (Ebene = 4) + send {blind}{NumPadClear} ; begin + else if (Ebene = 5) + SendUnicodeChar(0x22B6, "U22B6") ; original of + else if (Ebene = 6) + SendUnicodeChar(0x22B7, "U22B7") ; image of return neo_Numpad6: EbeneAktualisieren() if (Ebene = 1) OutputChar("{Numpad6}", "KP_6") - else if (Ebene = 2) - SendUnicodeChar(0x2283, "includes") ; Obermenge + if (Ebene = 2) + OutputChar("¦", "brokenbar") else if (Ebene = 3) SendUnicodeChar(0x2192, "rightarrow") ; Rechtspfeil else if (Ebene = 4) send {blind}{NumpadRight} + else if (Ebene = 5) + SendUnicodeChar(0x2283, "includes") ; Obermenge + else if (Ebene = 6) + SendUnicodeChar(0x2287, "U2287") ; Obermenge-gleich return neo_Numpad1: @@ -958,11 +1002,15 @@ neo_Numpad1: if (Ebene = 1) OutputChar("{Numpad1}", "KP_1") else if (Ebene = 2) - SendUnicodeChar(0x2714, "U2714") ; Häkchen + SendUnicodeChar(0x2666, "diamond") ; Karo else if (Ebene = 3) SendUnicodeChar(0x2194, "U2194") ; Links-Rechts-Pfeil else if (Ebene = 4) send {blind}{NumpadEnd} + else if (Ebene = 5) + SendUnicodeChar(0x226A, "U226A") ; much less + else if (Ebene = 6) + SendUnicodeChar(0x2264, "lessthanequal") return neo_Numpad2: @@ -970,11 +1018,15 @@ neo_Numpad2: if (Ebene = 1) OutputChar("{Numpad2}", "KP_2") else if (Ebene = 2) - SendUnicodeChar(0x222A, "union") ; Vereinigung + SendUnicodeChar(0x2265, "heart") else if (Ebene = 3) - SendUnicodeChar(0x2192, "downarrow") ; Untenpfeil + SendUnicodeChar(0x2192, "downarrow") else if (Ebene = 4) send {blind}{NumpadDown} + else if (Ebene = 5) + SendUnicodeChar(0x222A, "union") ; Vereinigung + else if (Ebene = 6) + SendUnicodeChar(0x22C3, "U22C3") ; n-ary union return neo_Numpad3: @@ -982,11 +1034,15 @@ neo_Numpad3: if (Ebene = 1) OutputChar("{Numpad3}", "KP_3") else if (Ebene = 2) - SendUnicodeChar(0x2718, "U2718") ; Kreuzchen + SendUnicodeChar(0x2660, "U2660") ; Pik else if (Ebene = 3) SendUnicodeChar(0x21CC, "U21CC") ; Harpune else if (Ebene = 4) send {blind}{NumpadPgDn} + else if (Ebene = 5) + SendUnicodeChar(0x226B, "U226B") ; much greater + else if (Ebene = 6) + SendUnicodeChar(0x2265, "greaterthanequal") return neo_Numpad0: @@ -994,11 +1050,15 @@ neo_Numpad0: if (Ebene = 1) OutputChar("{Numpad0}", "KP_0") else if (Ebene = 2) - SendUnicodeChar(0x0025, "percent") ; Prozent + SendUnicodeChar(0x2423, "U2423") ; space sign else if (Ebene = 3) - SendUnicodeChar(0x2030, "U2030") ; Promille + SendUnicodeChar(0x0025, "percent") ; Prozent else if (Ebene = 4) send {blind}{NumpadIns} + else if (Ebene = 5) + SendUnicodeChar(0x2030, "U2030") ; Promille + else if (Ebene = 6) + SendUnicodeChar(0x25A1, "U25A1") ; white square return neo_NumpadDot: @@ -1006,11 +1066,15 @@ neo_NumpadDot: if (Ebene = 1) send {blind}{NumpadDot} else if (Ebene = 2) - send `, - else if (Ebene = 3) send {blind}. + else if (Ebene = 3) + send `, else if (Ebene = 4) send {blind}{NumpadDel} + else if (Ebene = 5) + SendUnicodeChar(0x2032, "minutes") + else if (Ebene = 6) + SendUnicodeChar(0x2033, "seconds") return /* diff --git a/windows/autohotkey/neo20.ahk b/windows/autohotkey/neo20.ahk index 169e59a..2185c4b 100644 --- a/windows/autohotkey/neo20.ahk +++ b/windows/autohotkey/neo20.ahk @@ -1585,22 +1585,28 @@ return neo_NumLock: EbeneAktualisieren() - if (Ebene = 1) ;… + if Ebene12 + OutputChar("{Tab}", "Tab") + else if (Ebene = 3) OutputChar("`=", "equal") - if (Ebene = 3) - SendUnicodeChar(0x2248, "U2248") ; Fast gleich - if (Ebene = 2) - SendUnicodeChar(0x2260, "U2260") ; Ungleich zu + else if (Ebene = 4) + SendUnicodeChar(0x2260, "notequal") ; Ungleich zu + else if (Ebene = 5) + SendUnicodeChar(0x2248, "approxeq") ; Fast gleich return neo_NumpadDiv: EbeneAktualisieren() if Ebene12 OutputChar("{NumpadDiv}", "KP_Divide") - else if (Ebene = 4) - SendUnicodeChar(0x2215, "division") ; Slash else if (Ebene = 3) - OutputChar("÷", "U2044") + OutputChar("÷", "division") + else if (Ebene = 4) + SendUnicodeChar(0x2300, "U2300") ; diameter + else if (Ebene = 5) + SendUnicodeChar(0x2223, "U2223") ; divides + else if (Ebene = 6) + SendUnicodeChar(0x2044, "U2044") ; fraction slash return neo_NumpadMult: @@ -1608,9 +1614,13 @@ neo_NumpadMult: if Ebene12 send {blind}{NumpadMult} else if (Ebene = 3) - SendUnicodeChar(0x22C5, "multiply") ; Cdot + SendUnicodeChar(0x22C5, "U22C5") ; multiplication dot else if (Ebene = 4) - OutputChar("×", "U2219") + SendUnicodeChar(0x2299, "U2299") ; circled dot + else if (Ebene = 5) + OutputChar("×", "multiply") + else if (Ebene = 6) + SendUnicodeChar(0x2297, "U2297") ; circled times return neo_NumpadSub: @@ -1618,8 +1628,14 @@ neo_NumpadSub: if (Ebene12 and !(CheckDeadUni("c1",0x207B) or CheckDeadUni("t4",0x208B))) send {blind}{NumpadSub} - else if (Ebene = 3) or (Ebene = 4) + else if (Ebene = 3) SendUnicodeChar(0x2212, "U2212") ; Echtes Minus + else if (Ebene = 4) + SendUnicodeChar(0x2296, "U2296") ; circled minus + else if (Ebene = 5) + SendUnicodeChar(0x2216, "U2216") ; set minus + else if (Ebene = 6) + SendUnicodeChar(0x2238, "U2238") ; dot minus return neo_NumpadAdd: @@ -1630,7 +1646,11 @@ neo_NumpadAdd: else if (Ebene = 3) OutputChar("±", "plusminus") else if (Ebene = 4) - SendUnicodeChar(0x2213, "U2213") ; Inverses ± + SendUnicodeChar(0x2295, "U2295") ; circled plus + else if (Ebene = 5) + SendUnicodeChar(0x2213, "U2213") ; minus-plus + else if (Ebene = 6) + SendUnicodeChar(0x2214, "U2214") ; dot plus return neo_NumpadEnter: @@ -1642,11 +1662,15 @@ neo_Numpad7: if (Ebene = 1) OutputChar("{Numpad7}", "KP_7") else if (Ebene = 2) - SendUnicodeChar(0x2020, "dagger") ; Kreuz + SendUnicodeChar(0x2714, "U2714") ; check mark else if (Ebene = 3) SendUnicodeChar(0x2195, "U2195") ; Hoch-Runter-Pfeil else if (Ebene = 4) send {blind}{NumpadHome} + else if (Ebene = 5) + SendUnicodeChar(0x230A, "downstile") ;linke Untergrenze + else if (Ebene = 6) + SendUnicodeChar(0x2308, "upstile") ; linke Obergrenze return neo_Numpad8: @@ -1654,11 +1678,15 @@ neo_Numpad8: if (Ebene = 1) OutputChar("{Numpad8}", "KP_8") else if (Ebene = 2) - SendUnicodeChar(0x2229, "intersection") ; Durchschnitt + SendUnicodeChar(0x2718, "U2718") ; ballot x else if (Ebene = 3) SendUnicodeChar(0x2191, "uparrow") ; Hochpfeil else if (Ebene = 4) send {blind}{NumpadUp} + else if (Ebene = 5) + SendUnicodeChar(0x2229, "intersection") ; Durchschnitt + else if (Ebene = 6) + SendUnicodeChar(0x22C2, "U22C2") ; n-ary intersection return neo_Numpad9: @@ -1666,11 +1694,15 @@ neo_Numpad9: if (Ebene = 1) OutputChar("{Numpad9}", "KP_9") else if (Ebene = 2) - SendUnicodeChar(0x2297, "U2297") ; Tensorprodukt / Vektor in die Ebene zeigend + SendUnicodeChar(0x2020, "dagger") ; Kreuz else if (Ebene = 3) - SendUnicodeChar(0x220D, "U220D") ; Kleines umgekehrtes Elementzeichen + SendUnicodeChar(0x20D7, "U20D7") ; Vektor else if (Ebene = 4) send {blind}{NumpadPgUp} + else if (Ebene = 5) + SendUnicodeChar(0x230B, "U230B") ; rechte Untergrenze + else if (Ebene = 6) + SendUnicodeChar(0x2309, "U2309") ; rechte Obergrenze return neo_Numpad4: @@ -1678,11 +1710,15 @@ neo_Numpad4: if (Ebene = 1) OutputChar("{Numpad4}", "KP_4") else if (Ebene = 2) - SendUnicodeChar(0x2282, "includein") ; Teilmenge + SendUnicodeChar(0x2663, "club") ; schwarzes Kreuz else if (Ebene = 3) SendUnicodeChar(0x2190, "leftarrow") ; Linkspfeil else if (Ebene = 4) send {blind}{NumpadLeft} + else if (Ebene = 5) + SendUnicodeChar(0x2282, "includein") ; Teilmenge + else if (Ebene = 6) + SendUnicodeChar(0x2286, "U2286") ; Teilmenge-gleich return neo_Numpad5: @@ -1693,20 +1729,28 @@ neo_Numpad5: SendUnicodeChar(0x20AC, "EuroSign") ; Euro else if (Ebene = 3) SendUnicodeChar(0x221E, "infinity") ; Unendlich - else if (Ebene = 4) ; Beg - send {blind}{NumPadClear} + else if (Ebene = 4) + send {blind}{NumPadClear} ; begin + else if (Ebene = 5) + SendUnicodeChar(0x22B6, "U22B6") ; original of + else if (Ebene = 6) + SendUnicodeChar(0x22B7, "U22B7") ; image of return neo_Numpad6: EbeneAktualisieren() if (Ebene = 1) OutputChar("{Numpad6}", "KP_6") - else if (Ebene = 2) - SendUnicodeChar(0x2283, "includes") ; Obermenge + if (Ebene = 2) + OutputChar("¦", "brokenbar") else if (Ebene = 3) SendUnicodeChar(0x2192, "rightarrow") ; Rechtspfeil else if (Ebene = 4) send {blind}{NumpadRight} + else if (Ebene = 5) + SendUnicodeChar(0x2283, "includes") ; Obermenge + else if (Ebene = 6) + SendUnicodeChar(0x2287, "U2287") ; Obermenge-gleich return neo_Numpad1: @@ -1714,11 +1758,15 @@ neo_Numpad1: if (Ebene = 1) OutputChar("{Numpad1}", "KP_1") else if (Ebene = 2) - SendUnicodeChar(0x2714, "U2714") ; Häkchen + SendUnicodeChar(0x2666, "diamond") ; Karo else if (Ebene = 3) SendUnicodeChar(0x2194, "U2194") ; Links-Rechts-Pfeil else if (Ebene = 4) send {blind}{NumpadEnd} + else if (Ebene = 5) + SendUnicodeChar(0x226A, "U226A") ; much less + else if (Ebene = 6) + SendUnicodeChar(0x2264, "lessthanequal") return neo_Numpad2: @@ -1726,11 +1774,15 @@ neo_Numpad2: if (Ebene = 1) OutputChar("{Numpad2}", "KP_2") else if (Ebene = 2) - SendUnicodeChar(0x222A, "union") ; Vereinigung + SendUnicodeChar(0x2265, "heart") else if (Ebene = 3) - SendUnicodeChar(0x2192, "downarrow") ; Untenpfeil + SendUnicodeChar(0x2192, "downarrow") else if (Ebene = 4) send {blind}{NumpadDown} + else if (Ebene = 5) + SendUnicodeChar(0x222A, "union") ; Vereinigung + else if (Ebene = 6) + SendUnicodeChar(0x22C3, "U22C3") ; n-ary union return neo_Numpad3: @@ -1738,11 +1790,15 @@ neo_Numpad3: if (Ebene = 1) OutputChar("{Numpad3}", "KP_3") else if (Ebene = 2) - SendUnicodeChar(0x2718, "U2718") ; Kreuzchen + SendUnicodeChar(0x2660, "U2660") ; Pik else if (Ebene = 3) SendUnicodeChar(0x21CC, "U21CC") ; Harpune else if (Ebene = 4) send {blind}{NumpadPgDn} + else if (Ebene = 5) + SendUnicodeChar(0x226B, "U226B") ; much greater + else if (Ebene = 6) + SendUnicodeChar(0x2265, "greaterthanequal") return neo_Numpad0: @@ -1750,11 +1806,15 @@ neo_Numpad0: if (Ebene = 1) OutputChar("{Numpad0}", "KP_0") else if (Ebene = 2) - SendUnicodeChar(0x0025, "percent") ; Prozent + SendUnicodeChar(0x2423, "U2423") ; space sign else if (Ebene = 3) - SendUnicodeChar(0x2030, "U2030") ; Promille + SendUnicodeChar(0x0025, "percent") ; Prozent else if (Ebene = 4) send {blind}{NumpadIns} + else if (Ebene = 5) + SendUnicodeChar(0x2030, "U2030") ; Promille + else if (Ebene = 6) + SendUnicodeChar(0x25A1, "U25A1") ; white square return neo_NumpadDot: @@ -1762,11 +1822,15 @@ neo_NumpadDot: if (Ebene = 1) send {blind}{NumpadDot} else if (Ebene = 2) - send `, - else if (Ebene = 3) send {blind}. + else if (Ebene = 3) + send `, else if (Ebene = 4) send {blind}{NumpadDel} + else if (Ebene = 5) + SendUnicodeChar(0x2032, "minutes") + else if (Ebene = 6) + SendUnicodeChar(0x2033, "seconds") return /* diff --git a/windows/autohotkey/neo20.exe b/windows/autohotkey/neo20.exe index b4e47ca..4323102 100644 Binary files a/windows/autohotkey/neo20.exe and b/windows/autohotkey/neo20.exe differ -- cgit v1.2.3