From b8514883c1d2edab874e28e0605966376bb35172 Mon Sep 17 00:00:00 2001 From: martin_r Date: Fri, 17 Oct 2008 18:31:29 +0000 Subject: weitere aktualisierung der toten tasten git-svn-id: https://svn.neo-layout.org@1011 b9310e46-f624-0410-8ea1-cfbb3a30dc96 --- windows/autohotkey/Source/Keys-DeadKeys.ahk | 4 ++-- windows/autohotkey/Source/Keys-Neo.ahk | 37 ++++++++++++++++++----------- 2 files changed, 25 insertions(+), 16 deletions(-) diff --git a/windows/autohotkey/Source/Keys-DeadKeys.ahk b/windows/autohotkey/Source/Keys-DeadKeys.ahk index 5622d91..0953c0a 100644 --- a/windows/autohotkey/Source/Keys-DeadKeys.ahk +++ b/windows/autohotkey/Source/Keys-DeadKeys.ahk @@ -23,7 +23,7 @@ neo_tot1: else if (Ebene = 6) and !CheckDeadUni("c6",0x0304) ; Makron, tot - deadUni(0x00AF, "dead_macron", "c6") + deadAsc("¯", "dead_macron", "c6") return neo_tot2: @@ -51,7 +51,7 @@ neo_tot3: EbeneAktualisieren() if (Ebene = 1) and !CheckDeadUni("a1",0x0301) ; Akut, tot - deadUni("{´}{space}", "dead_acute", "a1") + deadAsc("{´}{space}", "dead_acute", "a1") else if (Ebene = 2) and !CheckDeadUni("a2",0x0327) ; Cedille, tot diff --git a/windows/autohotkey/Source/Keys-Neo.ahk b/windows/autohotkey/Source/Keys-Neo.ahk index 75d76da..b5e340f 100644 --- a/windows/autohotkey/Source/Keys-Neo.ahk +++ b/windows/autohotkey/Source/Keys-Neo.ahk @@ -7,16 +7,21 @@ neo_a: or CheckDeadUni12("c5",0x0103,0x0102) or CheckDeadUni12("c6",0x0101,0x0100) or CheckDeadUni12("g1",0x00E0,0x00C0) + or CheckDeadUni12("g2",0x0201,0x0200) or CheckDeadAsc12("g3","ä","Ä") or CheckDeadUni12("g5",0x1F01,0x1F09) or CheckDeadUni12("a1",0x00E1,0x00C1) - or CheckDeadUni12("a2",0x0105,0x0104))) + or CheckDeadUni12("a2",0x0105,0x0104) + or CheckDeadUni12("a3",0x2C65,0x023A) + or CheckDeadUni12("a5",0x1F00,0x1F08) + or CheckDeadUni12("a6",0x0227,0x0226))) OutputChar12("a","A","a","A") else if (Ebene = 3) OutputChar("{{}", "braceleft") else if (Ebene = 4) OutputChar("{Down}", "Down") - else if (Ebene = 5 and !(CheckDeadUni("g5",0x1F01))) + else if (Ebene = 5 and !(CheckDeadUni("g5",0x1F01) + or CheckDeadUni("a5",0x1F00))) SendUnicodeChar(0x03B1, "Greek_alpha") ; alpha else if (Ebene = 6) SendUnicodeChar(0x2200, "U2200") ; für alle @@ -24,11 +29,12 @@ return neo_b: EbeneAktualisieren() - if (Ebene12 and !(CheckDeadUni12("a4",0x1E03,0x1E02))) + if (Ebene12 and !(CheckDeadUni12("c6",0x1E07,0x1E06) + or CheckDeadUni12("a6",0x1E03,0x1E02))) OutputChar12("b","B","b","B") else if (Ebene = 3) if isMod2Locked - OutputChar("{Shift Up}{+}", "plus") + OutputChar("{Shift Up}{+}{Shift down}", "plus") else OutputChar("{blind}{+}", "plus") else if (Ebene = 4) OutputChar(":", "colon") @@ -40,11 +46,11 @@ return neo_c: EbeneAktualisieren() - if (Ebene12 and !(CheckDeadUni12("a1",0x0107,0x0106) - or CheckDeadUni12("a3",0x00E7,0x00E6) - or CheckDeadUni12("a4",0x010B,0x010A) - or CheckDeadUni12("c1",0x0109,0x0108) - or CheckDeadUni12("c2",0x010D,0x010C))) + if (Ebene12 and !(CheckDeadUni12("c1",0x0109,0x0108) + or CheckDeadUni12("c4",0x010D,0x010C) + or CheckDeadUni12("a1",0x0107,0x0106) + or CheckDeadUni12("a2",0x00E7,0x00E6) + or CheckDeadUni12("a6",0x010B,0x010A))) OutputChar12("c","C","c","C") else if (Ebene = 3) OutputChar("]", "bracketright") @@ -58,11 +64,14 @@ return neo_d: EbeneAktualisieren() - if (Ebene12 and !(CheckDeadUni12("a4",0x1E0B,0x1E0A) - or CheckDeadUni12("c2",0x010F,0x010E) - or CheckDeadUni12("t2",0x0111,0x0110) - or CheckDeadUni12("t3",0x1E0D,0x1E0C) - or CheckDeadUni12("t4",0x00F0,0x00D0))) + if (Ebene12 and !(CheckDeadUni12("c1",0x1E13,0x1E12) + or CheckDeadUni("c2",0x1D6D) + or CheckDeadUni12("c4",0x010F,0x010E) + or CheckDeadUni12("g3",0x1E0D,0x1E0C) + or CheckDeadUni12("a1",0x00F0,0x00D0) + or CheckDeadUni12("a2",0x1E11,0x1E10) + or CheckDeadUni12("a3",0x0111,0x0110) + or CheckDeadUni12("a6",0x1E0B,0x1E0A))) OutputChar12("d","D","d","D") else if (Ebene = 3) OutputChar(":", "colon") -- cgit v1.2.3