»>« vergessen.

Skript verbessert.
Compose.ahk aktualisiert.
1er-Compose ermöglicht.

git-svn-id: https://svn.neo-layout.org@903 b9310e46-f624-0410-8ea1-cfbb3a30dc96

2 files changed, 34 insertions, 12 deletions

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 {