From adfbdfdd04261869724ffad70a336044b4c208a0 Mon Sep 17 00:00:00 2001 From: martin_r Date: Fri, 5 Sep 2008 00:42:32 +0000 Subject: ahk: 233/1802 Cokos. git-svn-id: https://svn.neo-layout.org@846 b9310e46-f624-0410-8ea1-cfbb3a30dc96 --- windows/autohotkey/Source/Compose.ahk | 134 ++++++++++++++++++++------------- windows/autohotkey/Source/Keys-Neo.ahk | 15 ++-- 2 files changed, 91 insertions(+), 58 deletions(-) (limited to 'windows/autohotkey/Source') diff --git a/windows/autohotkey/Source/Compose.ahk b/windows/autohotkey/Source/Compose.ahk index 97aae45..649df2b 100644 --- a/windows/autohotkey/Source/Compose.ahk +++ b/windows/autohotkey/Source/Compose.ahk @@ -1,6 +1,6 @@ CheckCompose() { -CheckCompUni("-_h",0x0127) CheckCompUni("-_H",0x0126) +CheckCompUni("-_h",0x0127) CheckCompUni(":_:",0x2025) CheckCompUni(":_(",0x2639) CheckCompUni(":_)",0x263A) @@ -25,10 +25,17 @@ CheckCompUni("{Numpad1}_{NumpadDiv}",0x215F) CheckCompUni("{Numpad2}_?",0x2047) CheckCompUni("{Numpad2}_{!}",0x203C) CheckCompUni("{Numpad2}_{Numpad5}",0x2156) +CheckCompUni("{Numpad2}_0x222B",0x222C) +CheckCompUni("{Numpad2}_0x222E",0x222F) CheckCompUni("{Numpad3}_{Numpad4}",0x00BE) CheckCompUni("{Numpad3}_{Numpad5}",0x2157) CheckCompUni("{Numpad3}_{Numpad8}",0x215C) +CheckCompUni("{Numpad3}_0x221A",0x221B) +CheckCompUni("{Numpad3}_0x222B",0x222D) +CheckCompUni("{Numpad3}_0x222E",0x2230) CheckCompUni("{Numpad4}_{Numpad5}",0x2158) +CheckCompUni("{Numpad4}_0x221A",0x221C) +CheckCompUni("{Numpad4}_0x222B",0x2A0C) CheckCompUni("{Numpad5}_{Numpad3}",0x2154) CheckCompUni("{Numpad5}_{Numpad6}",0x215A) CheckCompUni("{Numpad5}_{Numpad8}",0x215D) @@ -39,6 +46,21 @@ CheckCompUni("0x017F_l",0xE043) CheckCompUni("0x017F_s",0xE045) CheckCompUni("0x017F_t",0xFB05) CheckCompUni("0x2020_0x2020",0x2021) +CheckCompUni("0x221A_{Numpad3}",0x221B) +CheckCompUni("0x221A_{Numpad4}",0x221C) +CheckCompUni("0x221A_3",0x221B) +CheckCompUni("0x221A_4",0x221C) +CheckCompUni("0x222B_{Numpad2}",0x222C) +CheckCompUni("0x222B_{Numpad3}",0x222D) +CheckCompUni("0x222B_{Numpad4}",0x2A0C) +CheckCompUni("0x222B_0x222B",0x222C) +CheckCompUni("0x222B_2",0x222C) +CheckCompUni("0x222B_3",0x222D) +CheckCompUni("0x222B_4",0x2A0C) +CheckCompUni("0x222E_{Numpad2}",0x222F) +CheckCompUni("0x222E_{Numpad3}",0x2230) +CheckCompUni("0x222E_2",0x222F) +CheckCompUni("0x222E_3",0x2230) CheckCompUni("1_`/",0x215F) CheckCompUni("1_¡_¿",0x2E18) CheckCompUni("1_?_{!}",0x203D) @@ -53,10 +75,17 @@ CheckCompUni("1_6",0x2159) CheckCompUni("1_8",0x215B) CheckCompUni("2_?",0x2047) CheckCompUni("2_{!}",0x203C) +CheckCompUni("2_0x222B",0x222C) +CheckCompUni("2_0x222E",0x222F) CheckCompUni("2_5",0x2156) +CheckCompUni("3_0x221A",0x221B) +CheckCompUni("3_0x222B",0x222D) +CheckCompUni("3_0x222E",0x2230) CheckCompUni("3_4",0x00BE) CheckCompUni("3_5",0x2157) CheckCompUni("3_8",0x215C) +CheckCompUni("4_0x221A",0x221C) +CheckCompUni("4_0x222B",0x2A0C) CheckCompUni("4_5",0x2158) CheckCompUni("5_3",0x2154) CheckCompUni("5_6",0x215A) @@ -82,30 +111,30 @@ CheckCompUni("a_6",0x0666) CheckCompUni("a_7",0x0667) CheckCompUni("a_8",0x0668) CheckCompUni("a_9",0x0669) -CheckCompAsc("a_e","æ") CheckCompAsc("A_E","Æ") +CheckCompAsc("a_e","æ") CheckCompUni("c_h",0xE03B) CheckCompUni("c_k",0xE03A) CheckCompUni("c_t",0xE03D) -CheckCompUni("D_z",0x01C4) -CheckCompUni("D_z",0x01C5) CheckCompUni("d_z",0x01C6) +CheckCompUni("D_z",0x01C5) +CheckCompUni("D_z",0x01C4) CheckCompUni("E_E",0x018F) -CheckCompUni("f_b",0xE030) CheckCompUni("F_b",0xE031) +CheckCompUni("f_b",0xE030) CheckCompUni("f_f",0xFB00) -CheckCompUni("F_h",0xE032) CheckCompUni("f_h",0xE036) -CheckCompUni("f_i",0xFB01) +CheckCompUni("F_h",0xE032) CheckCompUni("F_i",0xFB03) -CheckCompUni("F_j",0xE033) +CheckCompUni("f_i",0xFB01) CheckCompUni("f_j",0xE037) -CheckCompUni("F_k",0xE034) +CheckCompUni("F_j",0xE033) CheckCompUni("f_k",0xE038) -CheckCompUni("f_l",0xFB02) +CheckCompUni("F_k",0xE034) CheckCompUni("F_l",0xFB04) -CheckCompUni("F_t",0xE035) +CheckCompUni("f_l",0xFB02) CheckCompUni("f_t",0xE039) +CheckCompUni("F_t",0xE035) CheckCompUni("G_A",0x0391) CheckCompUni("G_B",0x0392) CheckCompUni("G_E",0x0395) @@ -120,84 +149,87 @@ CheckCompUni("G_T",0x03A4) CheckCompUni("G_X",0x039D) CheckCompUni("G_Y",0x03A5) CheckCompUni("G_Z",0x0396) -CheckCompUni("I_J",0x0132) CheckCompUni("i_j",0x0133) -CheckCompUni("L_J",0x01C7) -CheckCompUni("L_j",0x01C8) +CheckCompUni("I_J",0x0132) CheckCompUni("l_j",0x01C9) -CheckCompUni("N_J",0x01CA) -CheckCompUni("N_j",0x01CB) +CheckCompUni("L_j",0x01C8) +CheckCompUni("L_J",0x01C7) +CheckCompUni("l_n",0x33D1) +CheckCompUni("l_o_g",0x33D2) +CheckCompUni("n_g",0x014B) +CheckCompUni("N_G",0x014A) CheckCompUni("n_j",0x01CC) -CheckCompAsc("o_c","©") -CheckCompAsc("o_C","©") -CheckCompAsc("O_C","©") +CheckCompUni("N_j",0x01CB) +CheckCompUni("N_J",0x01CA) CheckCompAsc("O_c","©") -CheckCompAsc("o_e","œ") +CheckCompAsc("O_C","©") +CheckCompAsc("o_C","©") +CheckCompAsc("o_c","©") CheckCompAsc("O_E","Œ") -CheckCompAsc("o_o","®") -CheckCompAsc("O_o","®") -CheckCompAsc("o_O","®") +CheckCompAsc("o_e","œ") CheckCompAsc("O_O","®") -CheckCompAsc("p_{!}","¶") +CheckCompAsc("o_O","®") +CheckCompAsc("O_o","®") +CheckCompAsc("o_o","®") CheckCompAsc("P_{!}","¶") +CheckCompAsc("p_{!}","¶") CheckCompAsc("P_P","¶") CheckCompUni("Q_u",0xE048) -CheckCompUni("R_{Numpad1}_{Numpad0}",0x2169) CheckCompUni("r_{Numpad1}_{Numpad0}",0x2179) -CheckCompUni("R_{Numpad1}_{Numpad1}",0x216A) +CheckCompUni("R_{Numpad1}_{Numpad0}",0x2169) CheckCompUni("r_{Numpad1}_{Numpad1}",0x217A) -CheckCompUni("R_{Numpad1}_{Numpad2}",0x216B) +CheckCompUni("R_{Numpad1}_{Numpad1}",0x216A) CheckCompUni("r_{Numpad1}_{Numpad2}",0x217B) -CheckCompUni("R_{Numpad1}_{Space}",0x2160) +CheckCompUni("R_{Numpad1}_{Numpad2}",0x216B) CheckCompUni("r_{Numpad1}_{Space}",0x2170) -CheckCompUni("R_{Numpad2}",0x2161) +CheckCompUni("R_{Numpad1}_{Space}",0x2160) CheckCompUni("r_{Numpad2}",0x2171) -CheckCompUni("R_{Numpad3}",0x2162) +CheckCompUni("R_{Numpad2}",0x2161) CheckCompUni("r_{Numpad3}",0x2172) -CheckCompUni("R_{Numpad4}",0x2163) +CheckCompUni("R_{Numpad3}",0x2162) CheckCompUni("r_{Numpad4}",0x2173) -CheckCompUni("R_{Numpad5}",0x2164) +CheckCompUni("R_{Numpad4}",0x2163) CheckCompUni("r_{Numpad5}",0x2174) -CheckCompUni("R_{Numpad6}",0x2165) +CheckCompUni("R_{Numpad5}",0x2164) CheckCompUni("r_{Numpad6}",0x2175) -CheckCompUni("R_{Numpad7}",0x2166) +CheckCompUni("R_{Numpad6}",0x2165) CheckCompUni("r_{Numpad7}",0x2176) -CheckCompUni("R_{Numpad8}",0x2167) +CheckCompUni("R_{Numpad7}",0x2166) CheckCompUni("r_{Numpad8}",0x2177) -CheckCompUni("R_{Numpad9}",0x2168) +CheckCompUni("R_{Numpad8}",0x2167) CheckCompUni("r_{Numpad9}",0x2178) -CheckCompUni("R_1_{Space}",0x2160) +CheckCompUni("R_{Numpad9}",0x2168) CheckCompUni("r_1_{Space}",0x2170) -CheckCompUni("R_1_0",0x2169) +CheckCompUni("R_1_{Space}",0x2160) CheckCompUni("r_1_0",0x2179) -CheckCompUni("R_1_1",0x216A) +CheckCompUni("R_1_0",0x2169) CheckCompUni("r_1_1",0x217A) -CheckCompUni("R_1_2",0x216B) +CheckCompUni("R_1_1",0x216A) CheckCompUni("r_1_2",0x217B) -CheckCompUni("R_2",0x2161) +CheckCompUni("R_1_2",0x216B) CheckCompUni("r_2",0x2171) -CheckCompUni("R_3",0x2162) +CheckCompUni("R_2",0x2161) CheckCompUni("r_3",0x2172) -CheckCompUni("R_4",0x2163) +CheckCompUni("R_3",0x2162) CheckCompUni("r_4",0x2173) -CheckCompUni("R_5",0x2164) +CheckCompUni("R_4",0x2163) CheckCompUni("r_5",0x2174) -CheckCompUni("R_6",0x2165) +CheckCompUni("R_5",0x2164) CheckCompUni("r_6",0x2175) -CheckCompUni("R_7",0x2166) +CheckCompUni("R_6",0x2165) CheckCompUni("r_7",0x2176) -CheckCompUni("R_8",0x2167) +CheckCompUni("R_7",0x2166) CheckCompUni("r_8",0x2177) -CheckCompUni("R_9",0x2168) +CheckCompUni("R_8",0x2167) CheckCompUni("r_9",0x2178) +CheckCompUni("R_9",0x2168) CheckCompUni("S_i",0xE044) CheckCompUni("s_m",0x2120) CheckCompUni("s_t",0xFB06) -CheckCompAsc("t_h","þ") -CheckCompAsc("T_H","Þ") CheckCompUni("T_h",0xE049) +CheckCompAsc("T_H","Þ") +CheckCompAsc("t_h","þ") CheckCompUni("t_m",0x2122) CheckCompUni("t_t",0xE03C) CheckCompUni("t_z",0xE04A) - } diff --git a/windows/autohotkey/Source/Keys-Neo.ahk b/windows/autohotkey/Source/Keys-Neo.ahk index 209735d..1c31877 100644 --- a/windows/autohotkey/Source/Keys-Neo.ahk +++ b/windows/autohotkey/Source/Keys-Neo.ahk @@ -403,9 +403,9 @@ neo_sz: else if (Ebene = 3) if LangSTastatur send ß - else { + else SendUnicodeChar(0x017F) ; langes s - } else if (Ebene = 5) + else if (Ebene = 5) SendUnicodeChar(0x03C2) ; varsigma else if (Ebene = 6) SendUnicodeChar(0x2218) ; Verknüpfungsoperator @@ -454,10 +454,7 @@ neo_u: send {blind}\ else if (Ebene = 4) Send {blind}{Home} - else if (Ebene = 5) { ; leer - CompKey := PriorCompKey - DeadKey := PriorDeadKey - } else if (Ebene = 6) + else if (Ebene = 6) SendUnicodeChar(0x222E) ; contour integral return @@ -567,7 +564,11 @@ neo_s: else OutputChar12("s","S") } else if (Ebene = 3) OutputChar("?") - else if (Ebene = 4) + else if Ebene7 { + if LangSTastatur + OutputChar("s") + else SendUnicodeChar(0x017F) + } else if (Ebene = 4) OutputChar("¿") else if (Ebene = 5) SendUnicodeChar(0x03C3) ;sigma -- cgit v1.2.3