Changeset 1011

Timestamp:

10/17/08 20:31:29 (5 years ago)

Author:

martin_r

Message:

weitere aktualisierung der toten tasten

Location:

windows/autohotkey/Source

Files:

• Keys-DeadKeys.ahk (modified) (2 diffs)
• Keys-Neo.ahk (modified) (5 diffs)

windows/autohotkey/Source/Keys-DeadKeys.ahk

@@ -24 +24 @@
   else if (Ebene = 6) and !CheckDeadUni("c6",0x0304) ; Makron, tot
 
-    deadUni(0x00AF, "dead_macron", "c6")
+    deadAsc("�", "dead_macron", "c6")
 return
 
@@ -52 +52 @@
   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

windows/autohotkey/Source/Keys-Neo.ahk

@@ -8 +8 @@
                  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)
@@ -17 +21 @@
   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)
@@ -25 +30 @@
 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)
@@ -41 +47 @@
 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)
@@ -59 +65 @@
 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)