1 files changed, 28 insertions, 62 deletions
diff --git a/windows/autohotkey/Source/Methods-Other.ahk b/windows/autohotkey/Source/Methods-Other.ahk
index cb95c99..1acfccf 100644
--- a/windows/autohotkey/Source/Methods-Other.ahk
+++ b/windows/autohotkey/Source/Methods-Other.ahk
@@ -30,7 +30,7 @@ CheckDeadAsc(d,val) {
   if (PriorDeadKey == d) {
     undeadAsc(val)
     return 1
-  } else return 0
+  }
 }
 
 CheckDeadUni(d,val) {
@@ -38,7 +38,7 @@ CheckDeadUni(d,val) {
   if (PriorDeadKey == d) {
     undeadUni(val)
     return 1
-  } else return 0
+  }
 }
 
 CheckDeadAsc12(d,val1,val2) {
@@ -50,8 +50,8 @@ CheckDeadAsc12(d,val1,val2) {
     } else if (Ebene = 2) and (val2 != "") {
       undeadAsc(val2)
       return 1
-    } else return 0
-  } else return 0
+    }
+  }
 }
 
 CheckDeadUni12(d,val1,val2) {
@@ -63,104 +63,70 @@ CheckDeadUni12(d,val1,val2) {
     } else if (Ebene = 2) and (val2 != "") {
       undeadUni(val2)
       return 1
-    } else return 0
-  } else return 0
-}
-
-compAsc(val) {
-  global
-  if !DeadCompose
-    send % val
-}
-
-compUni(val) {
-  global
-  if !DeadCompose
-    SendUnicodeChar(val)
-}
-
-uncompAsc(val) {
-  global
-  if DeadCompose
-    send % val
-  else send % "{bs}" . val
-}
-
-uncompUni(val) {
-  global
-  if !DeadCompose
-    send {bs}
-  SendUnicodeChar(val)    
-}
-
-uncomp3Uni(val) {
-  global
-  if !DeadCompose
-    send {bs}{bs}
-  SendUnicodeChar(val)    
+    }
+  }
 }
 
 CheckCompAsc(d,val) {
   global
   if (PriorCompKey == d) {
-    uncompAsc(val)
+    send % val
     return 1
-  } else return 0
+  }
 }
 
 CheckCompAsc12(d,val1,val2) {
   global
   if (PriorCompKey == d)
     if (Ebene = 1) and (val1 != "") {
-      uncompAsc(val1)
+      send % val1
       return 1
     } else if (Ebene = 2) and (val2 != "") {
-      uncompAsc(val2)
+      send % val2
       return 1
-    } else return 0
-  else return 0
+    }
 }
 
 CheckCompUni(d,val) {
   global
   if (PriorCompKey == d) {
-    uncompUni(val)
+    SendUnicodeChar(val)
     return 1
-  } else return 0
+  }
 }
 
 CheckCompUni12(d,val1,val2){
   global
   if (PriorCompKey == d) {
     if (Ebene = 1) and (val1 != "") {
-      uncompUni(val1)
+      SendUnicodeChar(val1)
       return 1
     }else if (Ebene = 2) and (val2 != "") {
-      uncompUni(val2)
+      SendUnicodeChar(val2)
       return 1
-    } else return 0
-  } else return 0
+    }
+  }
 }
 
 CheckComp3Uni(d,val) {
   global
   if (PriorCompKey == d) {
-    uncomp3Uni(val)
+    SendUnicodeChar(val)
     return 1
-  } else return 0
+  }
 }
 
 CheckComp3Uni12(d,val1,val2) {
   global
   if (PriorCompKey == d) {
     if (Ebene = 1) and (val1 != "") {
-      uncomp3Uni(val1)
+      SendUnicodeChar(val1)
       return 1
     } else if (Ebene = 2) and (val2 != "") {
-      uncomp3Uni(val2)
+      SendUnicodeChar(val2)
       return 1
-    } else return 0
-  } else return 0
+    }
+  }
 }
 
 outputChar(val1,val2) {
@@ -168,14 +134,14 @@ outputChar(val1,val2) {
   if (Ebene = 1)
     c := val1
   else c := val2
-  if GetKeyState("Shift","P") and isMod2Locked
-    send % "{blind}{Shift Up}" . c . "{Shift Down}"
-  else send % "{blind}" . c
-  if (PriorDeadKey = "comp")
-    CompKey := c
+  if !(CheckComp(c) and DeadCompose or PriorCompKey)
+    if GetKeyState("Shift","P") and isMod2Locked
+      send % "{blind}{Shift Up}" . c . "{Shift Down}"
+    else send % "{blind}" . c
 }
 
 checkComp(d) {
+  global
   if (PriorDeadKey = "comp") {
     CompKey := d
     return 1