From 5cbaabf7ce10de01c9ab89629b16affa449c644c Mon Sep 17 00:00:00 2001
From: martin_r <martin_r@b9310e46-f624-0410-8ea1-cfbb3a30dc96>
Date: Tue, 16 Sep 2008 22:33:32 +0000
Subject: »>« vergessen. Skript verbessert. Compose.ahk aktualisiert.
 1er-Compose ermöglicht.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://svn.neo-layout.org@903 b9310e46-f624-0410-8ea1-cfbb3a30dc96
---
 Compose/Compose.neo                         |   6 ++--
 windows/autohotkey/Compose/AutoComp2.bas    |  15 +++++----
 windows/autohotkey/Source/Compose.ahk       |  43 +++++++++++++++++++-------
 windows/autohotkey/Source/Methods-Other.ahk |   3 +-
 windows/autohotkey/neo20.ahk                |  46 ++++++++++++++++++++--------
 windows/autohotkey/neo20.exe                | Bin 440160 -> 439823 bytes
 6 files changed, 78 insertions(+), 35 deletions(-)

diff --git a/Compose/Compose.neo b/Compose/Compose.neo
index 5d33d9a..10e49d3 100644
--- a/Compose/Compose.neo
+++ b/Compose/Compose.neo
@@ -1,4 +1,4 @@
-# Definitions by Neo keyboard layout
+# Definitions by Neo keyboard layout
 
 # letters
 # capital greek letters
@@ -76,8 +76,8 @@
 
 # other letters
 <Multi_key> <E> <E>                      : "Ə"   U018F # LATIN CAPITAL LETTER SCHWA
-<Multi_key> <L> <period                  : "Ŀ"   U013F # LATIN CAPITAL LETTER L WITH MIDDLE DOT
-<Multi_key> <l> <period                  : "ŀ"   U0140 # LATIN SMALL LETTER L WITH MIDDLE DOT
+<Multi_key> <L> <period>                  : "Ŀ"   U013F # LATIN CAPITAL LETTER L WITH MIDDLE DOT
+<Multi_key> <l> <period>                  : "ŀ"   U0140 # LATIN SMALL LETTER L WITH MIDDLE DOT
 
 # interpunctation
 <Multi_key> <2> <exclam>                         : "‼"   U203C # DOUBLE EXCLAMATION MARK
diff --git a/windows/autohotkey/Compose/AutoComp2.bas b/windows/autohotkey/Compose/AutoComp2.bas
index 7f77356..f03ac78 100644
--- a/windows/autohotkey/Compose/AutoComp2.bas
+++ b/windows/autohotkey/Compose/AutoComp2.bas
@@ -5,20 +5,18 @@ REM  *****  BASIC  *****
 
 'Anleitung:
 'Pfade anpassen :-)
-'Alle Tabulatoren durch ein /einzelnes/ Leerzeichen ersetzen.
 'Quelldatei als UTF16-Little-Endian speichern.
+'Alle Tabulatoren durch ein /einzelnes/ Leerzeichen ersetzen.
 'Skript ausf�hren.
 'Korrektur von ein paar ungel�sten Problemen:
 'Letzte Zeile der Ausgabedatei durch "}" ersetzen.
-'Folgende Zeilen ab�ndern:
+'Folgende Zeile ab�ndern:
 'CheckCompUni("<t> <z>", 0xE04A", 0x) ->
-'CheckCompUni("<?> <?>:????) ->
 'CheckCompUni("<t> <z>", 0xE04A)
-'CheckCompUni("<?> <?>", 0x????)
 
 Sub Main
   Open "C:\Users\Martin_2\Programmieren\NEO\ComposeList16.txt" For Binary Lock Write As #1
-  Open "C:\Users\Martin_2\NEO\windows\autohotkey\Source\Composet.ahk" For Output Lock Read Write As #2
+  Open "C:\Users\Martin_2\NEO\windows\autohotkey\Source\Compose.ahk" For Output Lock Read Write As #2
   Print #2, "CheckCompose() {"
   Print #2, "CheckCompUni("; chr(34);
   For Position& = 1 To Lof(1) Step 2
@@ -28,7 +26,7 @@ Sub Main
      Print #2, "CheckCompUni("; chr(34);
     ElseIf a%=asc(":") and Zeichen% <> 1 Then
      Print #2, chr(34); ", 0x";
-     Zeichen% = 1
+     'Zeichen% = 1
     ElseIf a%=asc(" ") Then
     ElseIf a%=asc("<") Then
      Klammer% = Klammer% + 1
@@ -36,11 +34,12 @@ Sub Main
      If Klammer% <> 1 and Kommentar% <> 1 Then Print #2, "<";
     ElseIf a% = 34 Then
      Quotedbl% = Quotedbl% + 1
+     Zeichen% = 1
      If Quotedbl% = 2 Then
        Kommentar% = 1
-       Zeichen = 0
+       Zeichen% = 0
      EndIf
-    ElseIf Klammer% <> 1 and a% < 255 and a% > 0 and Kommentar% <> 1 Then
+    ElseIf Klammer% <> 1 and a% < 255 and a% > 0 and Kommentar% <> 1 and zeichen% <> 1 Then
      Print #2, Chr(a%);
     ElseIf Klammer% <> 1 and Kommentar% <> 1 Then
      If a% <> -257 Then Print #2, Iif(Len(Hex(a%))>4, Right(Hex(a%),4),Hex(a%));
diff --git a/windows/autohotkey/Source/Compose.ahk b/windows/autohotkey/Source/Compose.ahk
index 2a6dca2..d78de8f 100644
--- a/windows/autohotkey/Source/Compose.ahk
+++ b/windows/autohotkey/Source/Compose.ahk
@@ -30,10 +30,7 @@ CheckCompUni("<f> <h>", 0xE036)
 CheckCompUni("<f> <j>", 0xE037)
 CheckCompUni("<f> <k>", 0xE038)
 CheckCompUni("<f> <t>", 0xE039)
-CheckCompUni("<c> <k>", 0xE03A)
-CheckCompUni("<c> <h>", 0xE03B)
 CheckCompUni("<t> <t>", 0xE03C)
-CheckCompUni("<c> <t>", 0xE03D)
 CheckCompUni("<17F> <i>", 0xE03E)
 CheckCompUni("<17F> <17F>", 0xE03F)
 CheckCompUni("<17F> <l>", 0xE043)
@@ -56,6 +53,8 @@ CheckCompUni("<n> <j>", 0x1CC)
 CheckCompUni("<minus> <H>", 0x126)
 CheckCompUni("<minus> <h>", 0x127)
 CheckCompUni("<E> <E>", 0x18F)
+CheckCompUni("<L> <period>", 0x13F)
+CheckCompUni("<l> <period>", 0x140)
 CheckCompUni("<2> <exclam>", 0x203C)
 CheckCompUni("<exclam> <2>", 0x203C)
 CheckCompUni("<KP_2> <exclam>", 0x203C)
@@ -223,14 +222,39 @@ CheckCompUni("<less> <equal>", 0x2264)
 CheckCompUni("<equal> <less>", 0x2264)
 CheckCompUni("<equal> <degree>", 0x2257)
 CheckCompUni("<degree> <equal>", 0x2257)
-CheckCompUni("<slash> <equal>", 0x2260)
-CheckCompUni("<KP_Divide> <KP_equal>", 0x2260)
-CheckCompUni("<notsign> <equal>", 0x2260)
-CheckCompUni("<less> <greater>", 0x2260)
 CheckCompUni("<KP_Add> <KP_Subtract>", 0xB1)
 CheckCompUni("<KP_Subtract> <KP_Add>", 0x2213)
 CheckCompUni("<minus> <plus>", 0x2213)
-CheckCompUni("<rightarrow> <rightarrow>", 0x20D7)
+CheckCompUni("<equal> <slash>", 0x2260)
+CheckCompUni("<equal> <dead_stroke> <dead_stroke>", 0x2260)
+CheckCompUni("<KP_equal> <KP_Divide>", 0x2260)
+CheckCompUni("<KP_equal> <dead_stroke> <dead_stroke>", 0x2260)
+CheckCompUni("<less> <greater>", 0x2260)
+CheckCompUni("<U2203> <slash>", 0x2204)
+CheckCompUni("<U2203> <dead_stroke> <dead_stroke>", 0x2204)
+CheckCompUni("<elementof> <slash>", 0x2209)
+CheckCompUni("<elementof> <dead_stroke> <dead_stroke>", 0x2209)
+CheckCompUni("<containsas> <slash>", 0x220C)
+CheckCompUni("<containsas> <dead_stroke> <dead_stroke>", 0x220C)
+CheckCompUni("<bar> <slash>", 0x2224)
+CheckCompUni("<bar> <dead_stroke> <dead_stroke>", 0x2224)
+CheckCompUni("<U2225> <slash>", 0x2226)
+CheckCompUni("<U2225> <dead_stroke> <dead_stroke>", 0x2226)
+CheckCompUni("<asciitilde> <slash>", 0x2241)
+CheckCompUni("<asciitilde> <dead_stroke> <dead_stroke>", 0x2241)
+CheckCompUni("<less> <slash>", 0x226E)
+CheckCompUni("<less> <dead_stroke> <dead_stroke>", 0x226E)
+CheckCompUni("<greater> <slash>", 0x226F)
+CheckCompUni("<greater> <dead_stroke> <dead_stroke>", 0x226F)
+CheckCompUni("<lessthanequal> <slash>", 0x2270)
+CheckCompUni("<lessthanequal> <dead_stroke> <dead_stroke>", 0x2270)
+CheckCompUni("<greaterthanequal> <slash>", 0x2271)
+CheckCompUni("<greaterthanequal> <dead_stroke> <dead_stroke>", 0x2271)
+CheckCompUni("<includedin> <slash>", 0x2284)
+CheckCompUni("<includedin> <dead_stroke> <dead_stroke>", 0x2284)
+CheckCompUni("<includes> <slash>", 0x2285)
+CheckCompUni("<includes> <dead_stroke> <dead_stroke>", 0x2285)
+CheckCompUni("<rightarrow>", 0x20D7)
 CheckCompUni("<asciicircum> <greater>", 0x20D7)
 CheckCompUni("<asciicircum> <rightarrow>", 0x20D7)
 CheckCompUni("<asciicircum> <minus>", 0x207B)
@@ -299,7 +323,6 @@ CheckCompUni("<k> <g>", 0x338F)
 CheckCompUni("<H> <z>", 0x3390)
 CheckCompUni("<k> <H> <z>", 0x3391)
 CheckCompUni("<M> <H> <z>", 0x3392)
-CheckCompUni("<G> <H> <z>", 0x3393)
 CheckCompUni("<2> <m> <m>", 0x339F)
 CheckCompUni("<2> <c> <m>", 0x33A0)
 CheckCompUni("<2> <m> <space>", 0x33A1)
@@ -2825,5 +2848,3 @@ CheckCompUni("<acute> <z>", 0x17A)
 CheckCompUni("<c> <Z>", 0x17D)
 CheckCompUni("<c> <z>", 0x17E)
 }
-
-
diff --git a/windows/autohotkey/Source/Methods-Other.ahk b/windows/autohotkey/Source/Methods-Other.ahk
index 3e6bae1..c32bdd9 100644
--- a/windows/autohotkey/Source/Methods-Other.ahk
+++ b/windows/autohotkey/Source/Methods-Other.ahk
@@ -110,7 +110,8 @@ CheckComp(d) {
   global
   if (PriorDeadKey = "comp") {
     CompKey := "<" . d . ">"
-    DeadKey =
+    PriorDeadKey := DeadKey =
+    CheckCompose()
     TryThirdCompKey = 0
     return 1
   } else if TryFourthCompKey {
diff --git a/windows/autohotkey/neo20.ahk b/windows/autohotkey/neo20.ahk
index e829142..51fae35 100644
--- a/windows/autohotkey/neo20.ahk
+++ b/windows/autohotkey/neo20.ahk
@@ -2129,7 +2129,8 @@ CheckComp(d) {
   global
   if (PriorDeadKey = "comp") {
     CompKey := "<" . d . ">"
-    DeadKey =
+    PriorDeadKey := DeadKey =
+    CheckCompose()
     TryThirdCompKey = 0
     return 1
   } else if TryFourthCompKey {
@@ -2192,10 +2193,7 @@ CheckCompUni("<f> <h>", 0xE036)
 CheckCompUni("<f> <j>", 0xE037)
 CheckCompUni("<f> <k>", 0xE038)
 CheckCompUni("<f> <t>", 0xE039)
-CheckCompUni("<c> <k>", 0xE03A)
-CheckCompUni("<c> <h>", 0xE03B)
 CheckCompUni("<t> <t>", 0xE03C)
-CheckCompUni("<c> <t>", 0xE03D)
 CheckCompUni("<17F> <i>", 0xE03E)
 CheckCompUni("<17F> <17F>", 0xE03F)
 CheckCompUni("<17F> <l>", 0xE043)
@@ -2218,6 +2216,8 @@ CheckCompUni("<n> <j>", 0x1CC)
 CheckCompUni("<minus> <H>", 0x126)
 CheckCompUni("<minus> <h>", 0x127)
 CheckCompUni("<E> <E>", 0x18F)
+CheckCompUni("<L> <period>", 0x13F)
+CheckCompUni("<l> <period>", 0x140)
 CheckCompUni("<2> <exclam>", 0x203C)
 CheckCompUni("<exclam> <2>", 0x203C)
 CheckCompUni("<KP_2> <exclam>", 0x203C)
@@ -2385,14 +2385,39 @@ CheckCompUni("<less> <equal>", 0x2264)
 CheckCompUni("<equal> <less>", 0x2264)
 CheckCompUni("<equal> <degree>", 0x2257)
 CheckCompUni("<degree> <equal>", 0x2257)
-CheckCompUni("<slash> <equal>", 0x2260)
-CheckCompUni("<KP_Divide> <KP_equal>", 0x2260)
-CheckCompUni("<notsign> <equal>", 0x2260)
-CheckCompUni("<less> <greater>", 0x2260)
 CheckCompUni("<KP_Add> <KP_Subtract>", 0xB1)
 CheckCompUni("<KP_Subtract> <KP_Add>", 0x2213)
 CheckCompUni("<minus> <plus>", 0x2213)
-CheckCompUni("<rightarrow> <rightarrow>", 0x20D7)
+CheckCompUni("<equal> <slash>", 0x2260)
+CheckCompUni("<equal> <dead_stroke> <dead_stroke>", 0x2260)
+CheckCompUni("<KP_equal> <KP_Divide>", 0x2260)
+CheckCompUni("<KP_equal> <dead_stroke> <dead_stroke>", 0x2260)
+CheckCompUni("<less> <greater>", 0x2260)
+CheckCompUni("<U2203> <slash>", 0x2204)
+CheckCompUni("<U2203> <dead_stroke> <dead_stroke>", 0x2204)
+CheckCompUni("<elementof> <slash>", 0x2209)
+CheckCompUni("<elementof> <dead_stroke> <dead_stroke>", 0x2209)
+CheckCompUni("<containsas> <slash>", 0x220C)
+CheckCompUni("<containsas> <dead_stroke> <dead_stroke>", 0x220C)
+CheckCompUni("<bar> <slash>", 0x2224)
+CheckCompUni("<bar> <dead_stroke> <dead_stroke>", 0x2224)
+CheckCompUni("<U2225> <slash>", 0x2226)
+CheckCompUni("<U2225> <dead_stroke> <dead_stroke>", 0x2226)
+CheckCompUni("<asciitilde> <slash>", 0x2241)
+CheckCompUni("<asciitilde> <dead_stroke> <dead_stroke>", 0x2241)
+CheckCompUni("<less> <slash>", 0x226E)
+CheckCompUni("<less> <dead_stroke> <dead_stroke>", 0x226E)
+CheckCompUni("<greater> <slash>", 0x226F)
+CheckCompUni("<greater> <dead_stroke> <dead_stroke>", 0x226F)
+CheckCompUni("<lessthanequal> <slash>", 0x2270)
+CheckCompUni("<lessthanequal> <dead_stroke> <dead_stroke>", 0x2270)
+CheckCompUni("<greaterthanequal> <slash>", 0x2271)
+CheckCompUni("<greaterthanequal> <dead_stroke> <dead_stroke>", 0x2271)
+CheckCompUni("<includedin> <slash>", 0x2284)
+CheckCompUni("<includedin> <dead_stroke> <dead_stroke>", 0x2284)
+CheckCompUni("<includes> <slash>", 0x2285)
+CheckCompUni("<includes> <dead_stroke> <dead_stroke>", 0x2285)
+CheckCompUni("<rightarrow>", 0x20D7)
 CheckCompUni("<asciicircum> <greater>", 0x20D7)
 CheckCompUni("<asciicircum> <rightarrow>", 0x20D7)
 CheckCompUni("<asciicircum> <minus>", 0x207B)
@@ -2461,7 +2486,6 @@ CheckCompUni("<k> <g>", 0x338F)
 CheckCompUni("<H> <z>", 0x3390)
 CheckCompUni("<k> <H> <z>", 0x3391)
 CheckCompUni("<M> <H> <z>", 0x3392)
-CheckCompUni("<G> <H> <z>", 0x3393)
 CheckCompUni("<2> <m> <m>", 0x339F)
 CheckCompUni("<2> <c> <m>", 0x33A0)
 CheckCompUni("<2> <m> <space>", 0x33A1)
@@ -4987,8 +5011,6 @@ CheckCompUni("<acute> <z>", 0x17A)
 CheckCompUni("<c> <Z>", 0x17D)
 CheckCompUni("<c> <z>", 0x17E)
 }
-
-
 /*
    ------------------------------------------------------
    Methoden zum Senden von Unicode-Zeichen
diff --git a/windows/autohotkey/neo20.exe b/windows/autohotkey/neo20.exe
index 73ef87b..e1e4d45 100644
Binary files a/windows/autohotkey/neo20.exe and b/windows/autohotkey/neo20.exe differ
-- 
cgit v1.2.3