From dab75337e2e93865bb367857d06e0a0fbc9e77b5 Mon Sep 17 00:00:00 2001
From: martin_r <martin_r@b9310e46-f624-0410-8ea1-cfbb3a30dc96>
Date: Thu, 2 Oct 2008 22:53:18 +0000
Subject: Ticket #53 eingearbeitet, Compose.ahk aktualisiert

git-svn-id: https://svn.neo-layout.org@929 b9310e46-f624-0410-8ea1-cfbb3a30dc96
---
 windows/autohotkey/Source/Compose.ahk  |   4 ++++
 windows/autohotkey/Source/Keys-Neo.ahk |   9 ++++++---
 windows/autohotkey/neo20.ahk           |  13 ++++++++++---
 windows/autohotkey/neo20.exe           | Bin 439823 -> 439881 bytes
 4 files changed, 20 insertions(+), 6 deletions(-)

(limited to 'windows/autohotkey')

diff --git a/windows/autohotkey/Source/Compose.ahk b/windows/autohotkey/Source/Compose.ahk
index d78de8f..aa846fa 100644
--- a/windows/autohotkey/Source/Compose.ahk
+++ b/windows/autohotkey/Source/Compose.ahk
@@ -30,7 +30,10 @@ CheckCompUni("<f> <h>", 0xE036)
 CheckCompUni("<f> <j>", 0xE037)
 CheckCompUni("<f> <k>", 0xE038)
 CheckCompUni("<f> <t>", 0xE039)
+CheckCompUni("<l> <c> <k>", 0xE03A)
+CheckCompUni("<l> <c> <h>", 0xE03B)
 CheckCompUni("<t> <t>", 0xE03C)
+CheckCompUni("<l> <c> <t>", 0xE03D)
 CheckCompUni("<17F> <i>", 0xE03E)
 CheckCompUni("<17F> <17F>", 0xE03F)
 CheckCompUni("<17F> <l>", 0xE043)
@@ -351,6 +354,7 @@ CheckCompUni("<femalesymbol> <femalesymbol>", 0x26A2)
 CheckCompUni("<malesymbol> <malesymbol>", 0x26A3)
 CheckCompUni("<femalesymbol> <malesymbol>", 0x26A4)
 CheckCompUni("<malesymbol> <femalesymbol>", 0x26A5)
+CheckCompUni("<Tab>", 0x266B)
 CheckCompUni("<underscore> <underscore>", 0x332)
 CheckCompUni("<apostrophe> <space>", 0x27)
 CheckCompUni("<space> <greater>", 0x5E)
diff --git a/windows/autohotkey/Source/Keys-Neo.ahk b/windows/autohotkey/Source/Keys-Neo.ahk
index d7de34a..49cf50f 100644
--- a/windows/autohotkey/Source/Keys-Neo.ahk
+++ b/windows/autohotkey/Source/Keys-Neo.ahk
@@ -636,7 +636,7 @@ neo_d:
    else if (Ebene = 3)
      OutputChar(":", "colon")
    else if (Ebene = 4)
-     OutputChar("`,", "comma")
+     OutputChar("{NumpadDot}", "comma")
    else if (Ebene = 5)
       SendUnicodeChar(0x03B4, "Greek_delta") ; delta
    else if (Ebene = 6)
@@ -1059,8 +1059,11 @@ return
 */
 
 *Enter::
+  EbeneAktualisieren()
   if !lernModus or lernModus_std_Return {
-    send {Blind}{Enter}
+    if (Ebene = 4)
+      send {blind}{NumpadEnter}
+    else send {blind}{Enter}
     DeadKey := ""
     CompKey := ""
   } return
@@ -1091,7 +1094,7 @@ neo_tab:
     DeadKey := "comp"
     CompKey := ""
   } else {
-    send {blind}{Tab}
+    OutputChar("{Tab}","Tab")
     DeadKey := ""
     CompKey := ""
   } return
diff --git a/windows/autohotkey/neo20.ahk b/windows/autohotkey/neo20.ahk
index 51fae35..169e59a 100644
--- a/windows/autohotkey/neo20.ahk
+++ b/windows/autohotkey/neo20.ahk
@@ -1392,7 +1392,7 @@ neo_d:
    else if (Ebene = 3)
      OutputChar(":", "colon")
    else if (Ebene = 4)
-     OutputChar("`,", "comma")
+     OutputChar("{NumpadDot}", "comma")
    else if (Ebene = 5)
       SendUnicodeChar(0x03B4, "Greek_delta") ; delta
    else if (Ebene = 6)
@@ -1815,8 +1815,11 @@ return
 */
 
 *Enter::
+  EbeneAktualisieren()
   if !lernModus or lernModus_std_Return {
-    send {Blind}{Enter}
+    if (Ebene = 4)
+      send {blind}{NumpadEnter}
+    else send {blind}{Enter}
     DeadKey := ""
     CompKey := ""
   } return
@@ -1847,7 +1850,7 @@ neo_tab:
     DeadKey := "comp"
     CompKey := ""
   } else {
-    send {blind}{Tab}
+    OutputChar("{Tab}","Tab")
     DeadKey := ""
     CompKey := ""
   } return
@@ -2193,7 +2196,10 @@ CheckCompUni("<f> <h>", 0xE036)
 CheckCompUni("<f> <j>", 0xE037)
 CheckCompUni("<f> <k>", 0xE038)
 CheckCompUni("<f> <t>", 0xE039)
+CheckCompUni("<l> <c> <k>", 0xE03A)
+CheckCompUni("<l> <c> <h>", 0xE03B)
 CheckCompUni("<t> <t>", 0xE03C)
+CheckCompUni("<l> <c> <t>", 0xE03D)
 CheckCompUni("<17F> <i>", 0xE03E)
 CheckCompUni("<17F> <17F>", 0xE03F)
 CheckCompUni("<17F> <l>", 0xE043)
@@ -2514,6 +2520,7 @@ CheckCompUni("<femalesymbol> <femalesymbol>", 0x26A2)
 CheckCompUni("<malesymbol> <malesymbol>", 0x26A3)
 CheckCompUni("<femalesymbol> <malesymbol>", 0x26A4)
 CheckCompUni("<malesymbol> <femalesymbol>", 0x26A5)
+CheckCompUni("<Tab>", 0x266B)
 CheckCompUni("<underscore> <underscore>", 0x332)
 CheckCompUni("<apostrophe> <space>", 0x27)
 CheckCompUni("<space> <greater>", 0x5E)
diff --git a/windows/autohotkey/neo20.exe b/windows/autohotkey/neo20.exe
index e1e4d45..b4e47ca 100644
Binary files a/windows/autohotkey/neo20.exe and b/windows/autohotkey/neo20.exe differ
-- 
cgit v1.2.3