diff options
| author | martin_r <martin_r@b9310e46-f624-0410-8ea1-cfbb3a30dc96> | 2008-09-16 04:16:27 +0000 |
|---|---|---|
| committer | martin_r <martin_r@b9310e46-f624-0410-8ea1-cfbb3a30dc96> | 2008-09-16 04:16:27 +0000 |
| commit | d83f31b812d2fdcee282d92843fea9ffdc1faaea (patch) | |
| tree | c059381254721b8025ff105e2ed9b7d774a3badd /windows | |
| parent | 7e337fbcc4e86e294013326796f0b326b51a30a5 (diff) | |
| download | neo-layout-d83f31b812d2fdcee282d92843fea9ffdc1faaea.tar.gz neo-layout-d83f31b812d2fdcee282d92843fea9ffdc1faaea.tar.bz2 neo-layout-d83f31b812d2fdcee282d92843fea9ffdc1faaea.zip | |
Cokos mit 4 Tasten möglich.
horizontalen Ellipsen-CompKey wiederhergestellt.
git-svn-id: https://svn.neo-layout.org@888 b9310e46-f624-0410-8ea1-cfbb3a30dc96
Diffstat (limited to 'windows')
| -rw-r--r-- | windows/autohotkey/Changelog-and-Todo.txt | 3 | ||||
| -rw-r--r-- | windows/autohotkey/Source/Keys-Neo.ahk | 2 | ||||
| -rw-r--r-- | windows/autohotkey/Source/Methods-Other.ahk | 37 | ||||
| -rw-r--r-- | windows/autohotkey/neo20.ahk | 40 | ||||
| -rw-r--r-- | windows/autohotkey/neo20.exe | bin | 439495 -> 439611 bytes |
5 files changed, 59 insertions, 23 deletions
diff --git a/windows/autohotkey/Changelog-and-Todo.txt b/windows/autohotkey/Changelog-and-Todo.txt index d828052..dec9797 100644 --- a/windows/autohotkey/Changelog-and-Todo.txt +++ b/windows/autohotkey/Changelog-and-Todo.txt @@ -23,6 +23,9 @@ Matthias Wächter <matthias (at) waechter.wiz. a t> === Änderungshistorie ===
+Revision 888 (von Martin Roppelt)
+- Cokos mit 4 Tasten möglich.
+- horizontalen Ellipsen-CompKey wiederhergestellt.
Revision 886 (von Stefan Mayer)
‐ Ellipse (horizontal und vertikal) wiederhergestellt.
Revision 873 (von Martin Roppelt)
diff --git a/windows/autohotkey/Source/Keys-Neo.ahk b/windows/autohotkey/Source/Keys-Neo.ahk index 4083494..baf8db0 100644 --- a/windows/autohotkey/Source/Keys-Neo.ahk +++ b/windows/autohotkey/Source/Keys-Neo.ahk @@ -793,7 +793,7 @@ neo_punkt: if (Ebene = 1)
OutputChar(".", "period")
else if (Ebene = 2)
- SendUnicodeChar("0x2026", "U2026") ; Ellipse
+ SendUnicodeChar("0x2026", "ellipsis") ; Ellipse
else if (Ebene = 3)
OutputChar("'", "apostrophe")
else if ((Ebene = 4) and !(CheckDeadUni("c1",0x00B3)
diff --git a/windows/autohotkey/Source/Methods-Other.ahk b/windows/autohotkey/Source/Methods-Other.ahk index b57ba61..02d742d 100644 --- a/windows/autohotkey/Source/Methods-Other.ahk +++ b/windows/autohotkey/Source/Methods-Other.ahk @@ -102,23 +102,40 @@ OutputChar12(val1,val2,val3,val4) { else send % "{blind}" . c
}
+;Folgende Funktion prft, ob das eben geschriebene Zeichen eine gltige Coko
+;fortsetzen KNNTE falls ja, wird 1 zurckgegeben (die Eingabe soll blind erfolgen),
+;andernfalls wird 0 zurckgegeben (das Zeichen soll ausgegeben werden).
+
CheckComp(d) {
global
- if isFurtherCompkey {
- CompKey := PriorCompKey . " " . "<" . d . ">"
- isFurtherCompkey = 0
+ if (PriorDeadKey = "comp") {
+ CompKey := "<" . d . ">"
+ DeadKey =
+ TryThirdCompKey = 0
+ return 1
+ } else if TryFourthCompKey {
+ TryFourthCompKey = 0
+ CompKey := ThreeCompKeys . " " . "<" . d . ">"
+ ThreeCompKeys =
CheckCompose()
- if (CompKey = "")
+ if !(CompKey) {
+ send {left}{bs}{right}
return 1
- else CompKey =
+ } else CompKey =
+ } else if TryThirdCompKey {
+ TryThirdCompKey = 0
+ CompKey := PriorCompKey . " " . "<" . d . ">"
+ CheckCompose()
+ if CompKey {
+ TryFourthCompKey = 1
+ ThreeCompKeys := CompKey
+ CompKey =
+ } else return 1
} else if PriorCompKey {
CompKey := PriorCompKey . " " . "<" . d . ">"
CheckCompose()
if CompKey
- isFurtherCompKey = 1
- return 1
- } else if (PriorDeadKey = "comp") {
- CompKey := "<" . d . ">"
+ TryThirdCompKey = 1
return 1
}
-}
+}
\ No newline at end of file diff --git a/windows/autohotkey/neo20.ahk b/windows/autohotkey/neo20.ahk index d74c840..0f465d2 100644 --- a/windows/autohotkey/neo20.ahk +++ b/windows/autohotkey/neo20.ahk @@ -1540,7 +1540,7 @@ neo_punkt: if (Ebene = 1)
OutputChar(".", "period")
else if (Ebene = 2)
- SendUnicodeChar("0x2026", "U2026") ; Ellipse
+ SendUnicodeChar("0x2026", "ellipsis") ; Ellipse
else if (Ebene = 3)
OutputChar("'", "apostrophe")
else if ((Ebene = 4) and !(CheckDeadUni("c1",0x00B3)
@@ -2108,27 +2108,43 @@ OutputChar12(val1,val2,val3,val4) { else send % "{blind}" . c
}
+;Folgende Funktion prft, ob das eben geschriebene Zeichen eine gltige Coko
+;fortsetzen KNNTE falls ja, wird 1 zurckgegeben (die Eingabe soll blind erfolgen),
+;andernfalls wird 0 zurckgegeben (das Zeichen soll ausgegeben werden).
+
CheckComp(d) {
global
- if isFurtherCompkey {
- CompKey := PriorCompKey . " " . "<" . d . ">"
- isFurtherCompkey = 0
+ if (PriorDeadKey = "comp") {
+ CompKey := "<" . d . ">"
+ DeadKey =
+ TryThirdCompKey = 0
+ return 1
+ } else if TryFourthCompKey {
+ TryFourthCompKey = 0
+ CompKey := ThreeCompKeys . " " . "<" . d . ">"
+ ThreeCompKeys =
CheckCompose()
- if (CompKey = "")
+ if !(CompKey) {
+ send {left}{bs}{right}
return 1
- else CompKey =
+ } else CompKey =
+ } else if TryThirdCompKey {
+ TryThirdCompKey = 0
+ CompKey := PriorCompKey . " " . "<" . d . ">"
+ CheckCompose()
+ if CompKey {
+ TryFourthCompKey = 1
+ ThreeCompKeys := CompKey
+ CompKey =
+ } else return 1
} else if PriorCompKey {
CompKey := PriorCompKey . " " . "<" . d . ">"
CheckCompose()
if CompKey
- isFurtherCompKey = 1
- return 1
- } else if (PriorDeadKey = "comp") {
- CompKey := "<" . d . ">"
+ TryThirdCompKey = 1
return 1
}
-}
-CheckCompose() {
+}CheckCompose() {
CheckCompUni("<G> <A>", 0x391)
CheckCompUni("<G> <B>", 0x392)
CheckCompUni("<G> <E>", 0x395)
diff --git a/windows/autohotkey/neo20.exe b/windows/autohotkey/neo20.exe Binary files differindex d7198bb..84c34cb 100644 --- a/windows/autohotkey/neo20.exe +++ b/windows/autohotkey/neo20.exe |