From 72c3411ee751bd9ebded4aedc6c729f15d930aab Mon Sep 17 00:00:00 2001
From: martin_r <martin_r@b9310e46-f624-0410-8ea1-cfbb3a30dc96>
Date: Sat, 18 Oct 2008 01:56:38 +0000
Subject: weitere ergänzungen
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://svn.neo-layout.org@1018 b9310e46-f624-0410-8ea1-cfbb3a30dc96
---
 windows/autohotkey/Source/Keys-DeadKeys.ahk |  8 ++++----
 windows/autohotkey/Source/Keys-Neo.ahk      | 16 +++++++++-------
 2 files changed, 13 insertions(+), 11 deletions(-)

(limited to 'windows/autohotkey')

diff --git a/windows/autohotkey/Source/Keys-DeadKeys.ahk b/windows/autohotkey/Source/Keys-DeadKeys.ahk
index 0953c0a..e2bc338 100644
--- a/windows/autohotkey/Source/Keys-DeadKeys.ahk
+++ b/windows/autohotkey/Source/Keys-DeadKeys.ahk
@@ -33,14 +33,14 @@ neo_tot2:
 
     deadAsc("``{space}", "dead_grave", "g1")
 
-  if (Ebene = 2) and !CheckDeadUni("g2",0x030F)      ; Doppelgravis, tot
-
-    deadUni(0x02F5, "dead_doublegrave", "g2")
-
   else if (Ebene = 3) and !CheckDeadUni("g3",0x0308) ; Diärese, tot
 
     deadUni(0x00A8, "dead_diaeresis", "g3")
 
+  else if (Ebene = 4) and !CheckDeadUni("g4",0x030F)      ; Doppelgravis, tot
+
+    deadUni(0x02F5, "dead_doublegrave", "g4")
+
   else if (Ebene = 5) and !CheckDeadUni("g5",0x0485) ; Spiritus asper, tot
 
     deadUni(0x1FFE, "U1FFE", "g5")
diff --git a/windows/autohotkey/Source/Keys-Neo.ahk b/windows/autohotkey/Source/Keys-Neo.ahk
index 7b02283..b5d3334 100644
--- a/windows/autohotkey/Source/Keys-Neo.ahk
+++ b/windows/autohotkey/Source/Keys-Neo.ahk
@@ -7,13 +7,11 @@ 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("g4",0x0201,0x0200)
                  or CheckDeadUni12("a1",0x00E1,0x00C1)
                  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)
@@ -96,8 +94,9 @@ neo_e:
                  or CheckDeadUni12("c4",0x011B,0x011A)
                  or CheckDeadUni12("c5",0x0115,0x0114)
                  or CheckDeadUni12("c6",0x0113,0x0112)
-                 or CheckDeadUni12("g2",0x00E8,0x00C8)
+                 or CheckDeadUni12("g1",0x00E8,0x00C8)
                  or CheckDeadAsc12("g3","ë","Ë")
+                 or CheckDeadUni12("g4",0x0205,0x0204)
                  or CheckDeadUni12("a1",0x00E9,0x00C9)
                  or CheckDeadUni12("a2",0x0119,0x0118)
                  or CheckDeadUni12("a6",0x0117,0x0116)))
@@ -176,9 +175,11 @@ neo_i:
                  or CheckDeadUni12("c6",0x012B,0x012A)
                  or CheckDeadUni12("g1",0x00EC,0x00CC)
                  or CheckDeadAsc12("g3","ï","Ï")
+                 or CheckDeadUni12("g4",0x0209,0x0208)
                  or CheckDeadUni12("a1",0x00ED,0x00CD)
-                 or CheckDeadUni12("a2",0x0131,0x0130)
-                 or CheckDeadUni12("a6",0x012F,0x012E)))
+                 or CheckDeadUni12("a2",0x012F,0x012E)
+                 or CheckDeadUni12("a3",0x0268,0x0197)
+                 or CheckDeadUni12("a6",0x0131,0x0130)))
     OutputChar12("i","I","i","I")
   else if (Ebene = 3)
     OutputChar("`/", "slash")
@@ -193,7 +194,8 @@ return
 neo_j:
   EbeneAktualisieren()
   if (Ebene12 and !(CheckDeadUni12("c1",0x0135,0x0134)
-                 or CheckDeadUni(  "c4",0x01F0)))
+                 or CheckDeadUni(  "c4",0x01F0)
+                 or CheckDeadUni12("a3",0x0249,0x0248)))
     OutputChar12("j","J","j","J")
   else if (Ebene = 3)
     OutputChar("`;", "semicolon")
-- 
cgit v1.2.3