Weitere Cokos ergänzt: ›Ə‹, ›dž‹, ›Dž‹, ›DŽ‹, glyphengleiche griechische Majuskeln.

Echter Bindestich durch Shift+Mod3+Zirkumflex, Leertaste.

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

1 files changed, 33 insertions, 16 deletions

diff --git a/windows/autohotkey/Source/Keys-Neo.ahk b/windows/autohotkey/Source/Keys-Neo.ahk
index 8ab7509..61b2348 100644
--- a/windows/autohotkey/Source/Keys-Neo.ahk
+++ b/windows/autohotkey/Source/Keys-Neo.ahk
@@ -294,7 +294,7 @@ return
 

 neo_x:

   EbeneAktualisieren()

-  if (Ebene12)

+  if (Ebene12 or CheckCompUni12("G","",0x039D))

     OutputChar("x","X")

   else if (Ebene = 3)

     SendUnicodeChar(0x2026) ; Ellipse horizontal

@@ -380,7 +380,8 @@ return
 neo_k:

   EbeneAktualisieren()

   if (Ebene12 and !(CheckDeadUni12("a3",0x0137,0x0136)

-                 or CheckDeadUni12("c6",0x1E33,0x1E32)))

+                 or CheckDeadUni12("c6",0x1E33,0x1E32)

+                 or CheckCompUni12("G","",0x039A)))

     OutputChar("k","K")

   else if (Ebene = 3)

     send {blind}{!}

@@ -397,7 +398,8 @@ neo_h:
   if (Ebene12 and !(CheckDeadUni12("a4",0x1E23,0x1E22)

                  or CheckDeadUni12("c1",0x0125,0x0124)

                  or CheckDeadUni12("c5",0x0127,0x0126)

-                 or CheckDeadUni12("c6",0x1E25,0x1E24)))

+                 or CheckDeadUni12("c6",0x1E25,0x1E24)

+                 or CheckCompUni12("G","",0x0397)))

     OutputChar("h","H")

   else if ((Ebene = 3) and !(CheckDeadUni("c5",0x2264))) ; kleiner gleich

     send {blind}<

@@ -556,7 +558,8 @@ neo_i:
                  or CheckDeadUni12("t2",0x012B,0x012A)

                  or CheckDeadAsc12("t3","�","�")

                  or CheckCompUni("f",0xFB01)

-                 or CheckCompUni("F",0xFB03)))

+                 or CheckCompUni("F",0xFB03)

+                 or CheckCompUni12("G","",0x0399)))

     OutputChar("i","I")

   else if (Ebene = 3)

     send {blind}`/

@@ -579,7 +582,8 @@ neo_a:
                 or CheckDeadUni12("c3",0x0103,0x0102)

                 or CheckDeadUni12("t1",0x00E3,0x00C3)

                 or CheckDeadUni12("t2",0x0101,0x0100)

-                or CheckDeadAsc12("t3","�","�")))

+                or CheckDeadAsc12("t3","�","�")

+                or CheckCompUni12("G","",0x0391)))

     OutputChar("a","A")

   else if (Ebene = 3)

     send {blind}{{}

@@ -606,7 +610,9 @@ neo_e:
                  or CheckCompAsc12("a","�","�")

                  or CheckCompAsc12("A","�","�")

                  or CheckCompAsc12("o","�","�")

-                 or CheckCompAsc12("O","�","�")))

+                 or CheckCompAsc12("O","�","�")

+                 or CheckCompUni12("G","",0x0395)

+                 or CheckCompUni12("E","",0x018F)))

     OutputChar("e","E")

   else if (Ebene = 3)

     send {blind}{}}

@@ -630,7 +636,8 @@ neo_o:
                  or CheckDeadUni12("t2",0x014D,0x014C)

                  or CheckDeadAsc12("t3","�","�")

                  or CheckDeadUni12("t4",0x00F8,0x00D8)

-                 or CheckDeadUni12("t5",0x0151,0x0150)))

+                 or CheckDeadUni12("t5",0x0151,0x0150)

+                 or CheckCompUni12("G","",0x039F)))

     OutputChar("o","O")

   else if (Ebene = 3)

     send {blind}*

@@ -671,7 +678,8 @@ neo_n:
                  or CheckDeadUni12("a3",0x0146,0x0145)

                  or CheckDeadUni12("a4",0x1E45,0x1E44)

                  or CheckDeadUni12("c2",0x0148,0x0147)

-                 or CheckDeadUni12("t1",0x00F1,0x00D1)))

+                 or CheckDeadUni12("t1",0x00F1,0x00D1)

+                 or CheckCompUni12("G","",0x039D)))

     OutputChar("n","N")

   else if (Ebene = 3)

     send {blind}(

@@ -713,7 +721,8 @@ neo_t:
                  or CheckDeadUni12("c5",0x0167,0x0166)

                  or CheckDeadUni12("c6",0x1E6D,0x1E6C)

                  or CheckCompUni("lang_s",0xFB05)

-                 or CheckCompUni("s",0xFB06)))

+                 or CheckCompUni("s",0xFB06)

+                 or CheckCompUni12("G","",0x03A4)))

     OutputChar("t","T")

   else if (Ebene = 3)

     send {blind}- ; Bisstrich

@@ -748,7 +757,8 @@ neo_y:
   EbeneAktualisieren()

   if (Ebene12 and !(CheckDeadUni12("a1",0x00FD,0x00DD)

                  or CheckDeadUni12("c1",0x0177,0x0176)

-                 or CheckDeadAsc12("t3","�","�")))

+                 or CheckDeadAsc12("t3","�","�")

+                 or CheckCompUni12("G","",0x03A5)))

     OutputChar("y","Y")

   else if (Ebene = 3)

     send {blind}@

@@ -815,7 +825,8 @@ return
 

 neo_p:

   EbeneAktualisieren()

-  if (Ebene12 and !(CheckDeadUni12("a4",0x1E57,0x1E56)))

+  if (Ebene12 and !(CheckDeadUni12("a4",0x1E57,0x1E56)

+                 or CheckCompUni12("G","",0x03A1)))

     OutputChar("p","P")

   else if ((Ebene = 3) and !(CheckDeadUni("t1",0x2248)))

     send {blind}~

@@ -832,7 +843,10 @@ neo_z:
   if (Ebene12 and !(CheckDeadUni12("a1",0x017A,0x0179)

                  or CheckDeadUni12("a4",0x017C,0x017B)

                  or CheckDeadUni12("c2",0x017E,0x017D)

-                 or CheckDeadUni12("c6",0x1E93,0x1E92)))

+                 or CheckDeadUni12("c6",0x1E93,0x1E92)

+                 or CheckCompUni("d",0x01C6)

+                 or CheckCompUni12("D",0x01C5,0x01C4)

+                 or CheckCompUni12("G","",0x0396)))

     OutputChar("z","Z")

   else if (Ebene = 3)

     send ``{space} ; untot

@@ -847,7 +861,8 @@ return
 

 neo_b:

   EbeneAktualisieren()

-  if (Ebene12 and !(CheckDeadUni12("a4",0x1E03,0x1E02)))

+  if (Ebene12 and !(CheckDeadUni12("a4",0x1E03,0x1E02)

+                 or CheckCompUni12("G","",0x0392)))

     OutputChar("b","B")

   else if (Ebene = 3)

     if isMod2Locked

@@ -866,7 +881,8 @@ neo_m:
   if (Ebene12 and !(CheckDeadUni12("a4",0x1E41,0x1E40)

                       or CheckDeadUni12("c6",0x1E43,0x1E42)

                       or CheckCompUni12("t",0x2122,0x2122) ; TM

-                      or CheckCompUni12("s",0x2120,0x2120))) ; SM

+                      or CheckCompUni12("s",0x2120,0x2120) ; SM

+                      or CheckCompUni12("G","",0x039C)))

     OutputChar("m","M")

   else if (Ebene = 3)

     send {blind}`%

@@ -920,10 +936,10 @@ neo_j:
   EbeneAktualisieren()

   if (Ebene12 and !(CheckDeadUni12("c1",0x0135,0x0134)

                  or CheckDeadUni12("c2",0x01F0,"")

+                 or CheckCompUni("I",0x0132) ; IJ

                  or CheckCompUni("i",0x0133) ; ij

                  or CheckCompUni("l",0x01C9) ; lj

                  or CheckCompUni("n",0x01CC) ; nj

-                 or CheckCompUni("I",0x0132) ; IJ

                  or CheckCompUni12("L",0x01C8,0x01C7) ; Lj/LJ

                  or CheckCompUni12("N",0x01CB,0x01CA))) ; Nj/NJ

     OutputChar("j","J")

@@ -1171,7 +1187,8 @@ return
 neo_SpaceUp:

   EbeneAktualisieren()

   if (Ebene = 1) and !(CheckComp3Uni("r_1",0x2170) ; R�misch i

-                    or CheckComp3Uni("R_1",0x2160)) ; R�misch I

+                    or CheckComp3Uni("R_1",0x2160) ; R�misch I

+                    or CheckDeadUni("c5",0x2010))  ; Echter Bindestrich

     Send {blind}{Space}

   else if (Ebene = 2) or (Ebene = 3)

     Send {blind}{Space}