From 46350c599e49e360b067ff3dea65e539b9266cb2 Mon Sep 17 00:00:00 2001 From: martin_r Date: Fri, 12 Sep 2008 02:36:48 +0000 Subject: ahk: 253 Cokos. Methods-Other.ahk aufgeräumt. 2er-Coko+Coko-Fehler ausgebessert. Compose.neo: Benennung angepasst und Fehler korrigiert. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.neo-layout.org@864 b9310e46-f624-0410-8ea1-cfbb3a30dc96 --- windows/autohotkey/Source/Compose.ahk | 407 +++++++++++++++------------- windows/autohotkey/Source/Keys-Neo.ahk | 12 +- windows/autohotkey/Source/Methods-Other.ahk | 78 +----- 3 files changed, 221 insertions(+), 276 deletions(-) (limited to 'windows/autohotkey/Source') diff --git a/windows/autohotkey/Source/Compose.ahk b/windows/autohotkey/Source/Compose.ahk index 649df2b..6097434 100644 --- a/windows/autohotkey/Source/Compose.ahk +++ b/windows/autohotkey/Source/Compose.ahk @@ -1,235 +1,256 @@ CheckCompose() { +CheckCompAsc("p_{!}","¶") +CheckCompAsc("P_{!}","¶") +CheckCompAsc("P_P","¶") +CheckCompAsc("o_c","©") +CheckCompAsc("o_C","©") +CheckCompAsc("O_C","©") +CheckCompAsc("O_c","©") +CheckCompAsc("o_r","®") +CheckCompAsc("O_r","®") +CheckCompAsc("o_R","®") +CheckCompAsc("O_R","®") +CheckCompAsc("A_T","@") +CheckCompAsc("a_e","æ") +CheckCompAsc("A_E","Æ") +CheckCompAsc("o_e","œ") +CheckCompAsc("O_E","Œ") +CheckCompAsc("t_h","þ") +CheckCompAsc("T_H","Þ") +CheckCompUni("{Numpad1}_{Numpad4}",0x00BC) +CheckCompUni("1_4",0x00BC) +CheckCompUni("{Numpad1}_{Numpad2}",0x00BD) +CheckCompUni("1_2",0x00BD) +CheckCompUni("{Numpad3}_{Numpad4}",0x00BE) +CheckCompUni("3_4",0x00BE) CheckCompUni("-_H",0x0126) CheckCompUni("-_h",0x0127) +CheckCompUni("I_J",0x0132) +CheckCompUni("i_j",0x0133) +CheckCompUni("N_G",0x014A) +CheckCompUni("n_g",0x014B) +CheckCompUni("E_E",0x018F) +CheckCompUni("D_z",0x01C4) +CheckCompUni("D_z",0x01C5) +CheckCompUni("d_z",0x01C6) +CheckCompUni("L_J",0x01C7) +CheckCompUni("L_j",0x01C8) +CheckCompUni("l_j",0x01C9) +CheckCompUni("N_J",0x01CA) +CheckCompUni("N_j",0x01CB) +CheckCompUni("n_j",0x01CC) +CheckCompUni("G_A",0x0391) +CheckCompUni("G_B",0x0392) +CheckCompUni("G_E",0x0395) +CheckCompUni("G_Z",0x0396) +CheckCompUni("G_H",0x0397) +CheckCompUni("G_I",0x0399) +CheckCompUni("G_K",0x039A) +CheckCompUni("G_M",0x039C) +CheckCompUni("G_N",0x039D) +CheckCompUni("G_X",0x039D) +CheckCompUni("G_O",0x039F) +CheckCompUni("G_P",0x03A1) +CheckCompUni("G_T",0x03A4) +CheckCompUni("G_Y",0x03A5) +CheckCompUni("a_{Numpad0}",0x0660) +CheckCompUni("a_0",0x0660) +CheckCompUni("a_{Numpad1}",0x0661) +CheckCompUni("a_1",0x0661) +CheckCompUni("a_{Numpad2}",0x0662) +CheckCompUni("a_2",0x0662) +CheckCompUni("a_{Numpad3}",0x0663) +CheckCompUni("a_3",0x0663) +CheckCompUni("a_{Numpad4}",0x0664) +CheckCompUni("a_4",0x0664) +CheckCompUni("a_{Numpad5}",0x0665) +CheckCompUni("a_5",0x0665) +CheckCompUni("a_{Numpad6}",0x0666) +CheckCompUni("a_6",0x0666) +CheckCompUni("a_{Numpad7}",0x0667) +CheckCompUni("a_7",0x0667) +CheckCompUni("a_{Numpad8}",0x0668) +CheckCompUni("a_8",0x0668) +CheckCompUni("a_{Numpad9}",0x0669) +CheckCompUni("a_9",0x0669) +CheckCompUni("0x2020_0x2020",0x2021) CheckCompUni(":_:",0x2025) -CheckCompUni(":_(",0x2639) -CheckCompUni(":_)",0x263A) -CheckCompUni("?_{!}",0x2048) -CheckCompUni("?_{Numpad2}",0x2047) -CheckCompUni("?_2",0x2047) -CheckCompUni("{!}_?",0x2049) CheckCompUni("{!}_{Numpad2}",0x203C) CheckCompUni("{!}_2",0x203C) -CheckCompUni("{Numpad1}_`/",0x215F) -CheckCompUni("{Numpad1}_¡_¿",0x2E18) +CheckCompUni("{Numpad2}_{!}",0x203C) +CheckCompUni("2_{!}",0x203C) CheckCompUni("{Numpad1}_?_{!}",0x203D) -CheckCompUni("{Numpad1}_¿_¡",0x2E18) CheckCompUni("{Numpad1}_{!}_?",0x203D) -CheckCompUni("{Numpad1}_{Numpad2}",0x00BD) -CheckCompUni("{Numpad1}_{Numpad3}",0x2153) -CheckCompUni("{Numpad1}_{Numpad4}",0x00BC) -CheckCompUni("{Numpad1}_{Numpad5}",0x2155) -CheckCompUni("{Numpad1}_{Numpad6}",0x2159) -CheckCompUni("{Numpad1}_{Numpad8}",0x215B) -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) -CheckCompUni("{Numpad7}_{Numpad8}",0x215E) -CheckCompUni("0x017F_0x017F",0xE03F) -CheckCompUni("0x017F_i",0xE03E) -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) -CheckCompUni("1_¿_¡",0x2E18) CheckCompUni("1_{!}_?",0x203D) -CheckCompUni("1_{NumpadDiv}",0x215F) -CheckCompUni("1_2",0x00BD) +CheckCompUni("?_{Numpad2}",0x2047) +CheckCompUni("?_2",0x2047) +CheckCompUni("{Numpad2}_?",0x2047) +CheckCompUni("2_?",0x2047) +CheckCompUni("?_{!}",0x2048) +CheckCompUni("{!}_?",0x2049) +CheckCompUni("0x2192_0x2192",0x20D7) +CheckCompUni("s_m",0x2120) +CheckCompUni("t_m",0x2122) +CheckCompUni("{Numpad1}_{Numpad3}",0x2153) CheckCompUni("1_3",0x2153) -CheckCompUni("1_4",0x00BC) +CheckCompUni("{Numpad5}_{Numpad3}",0x2154) +CheckCompUni("5_3",0x2154) +CheckCompUni("{Numpad1}_{Numpad5}",0x2155) CheckCompUni("1_5",0x2155) -CheckCompUni("1_6",0x2159) -CheckCompUni("1_8",0x215B) -CheckCompUni("2_?",0x2047) -CheckCompUni("2_{!}",0x203C) -CheckCompUni("2_0x222B",0x222C) -CheckCompUni("2_0x222E",0x222F) +CheckCompUni("{Numpad2}_{Numpad5}",0x2156) CheckCompUni("2_5",0x2156) -CheckCompUni("3_0x221A",0x221B) -CheckCompUni("3_0x222B",0x222D) -CheckCompUni("3_0x222E",0x2230) -CheckCompUni("3_4",0x00BE) +CheckCompUni("{Numpad3}_{Numpad5}",0x2157) CheckCompUni("3_5",0x2157) -CheckCompUni("3_8",0x215C) -CheckCompUni("4_0x221A",0x221C) -CheckCompUni("4_0x222B",0x2A0C) +CheckCompUni("{Numpad4}_{Numpad5}",0x2158) CheckCompUni("4_5",0x2158) -CheckCompUni("5_3",0x2154) +CheckCompUni("{Numpad1}_{Numpad6}",0x2159) +CheckCompUni("1_6",0x2159) +CheckCompUni("{Numpad5}_{Numpad6}",0x215A) CheckCompUni("5_6",0x215A) +CheckCompUni("{Numpad1}_{Numpad8}",0x215B) +CheckCompUni("1_8",0x215B) +CheckCompUni("{Numpad3}_{Numpad8}",0x215C) +CheckCompUni("3_8",0x215C) +CheckCompUni("{Numpad5}_{Numpad8}",0x215D) CheckCompUni("5_8",0x215D) +CheckCompUni("{Numpad7}_{Numpad8}",0x215E) CheckCompUni("7_8",0x215E) -CheckCompUni("a_{Numpad0}",0x0660) -CheckCompUni("a_{Numpad1}",0x0661) -CheckCompUni("a_{Numpad2}",0x0662) -CheckCompUni("a_{Numpad3}",0x0663) -CheckCompUni("a_{Numpad4}",0x0664) -CheckCompUni("a_{Numpad5}",0x0665) -CheckCompUni("a_{Numpad6}",0x0666) -CheckCompUni("a_{Numpad7}",0x0667) -CheckCompUni("a_{Numpad8}",0x0668) -CheckCompUni("a_{Numpad9}",0x0669) -CheckCompUni("a_0",0x0660) -CheckCompUni("a_1",0x0661) -CheckCompUni("a_2",0x0662) -CheckCompUni("a_3",0x0663) -CheckCompUni("a_4",0x0664) -CheckCompUni("a_5",0x0665) -CheckCompUni("a_6",0x0666) -CheckCompUni("a_7",0x0667) -CheckCompUni("a_8",0x0668) -CheckCompUni("a_9",0x0669) -CheckCompAsc("A_E","Æ") -CheckCompAsc("a_e","æ") -CheckCompUni("c_h",0xE03B) -CheckCompUni("c_k",0xE03A) -CheckCompUni("c_t",0xE03D) -CheckCompUni("d_z",0x01C6) -CheckCompUni("D_z",0x01C5) -CheckCompUni("D_z",0x01C4) -CheckCompUni("E_E",0x018F) -CheckCompUni("F_b",0xE031) -CheckCompUni("f_b",0xE030) -CheckCompUni("f_f",0xFB00) -CheckCompUni("f_h",0xE036) -CheckCompUni("F_h",0xE032) -CheckCompUni("F_i",0xFB03) -CheckCompUni("f_i",0xFB01) -CheckCompUni("f_j",0xE037) -CheckCompUni("F_j",0xE033) -CheckCompUni("f_k",0xE038) -CheckCompUni("F_k",0xE034) -CheckCompUni("F_l",0xFB04) -CheckCompUni("f_l",0xFB02) -CheckCompUni("f_t",0xE039) -CheckCompUni("F_t",0xE035) -CheckCompUni("G_A",0x0391) -CheckCompUni("G_B",0x0392) -CheckCompUni("G_E",0x0395) -CheckCompUni("G_H",0x0397) -CheckCompUni("G_I",0x0399) -CheckCompUni("G_K",0x039A) -CheckCompUni("G_M",0x039C) -CheckCompUni("G_N",0x039D) -CheckCompUni("G_O",0x039F) -CheckCompUni("G_P",0x03A1) -CheckCompUni("G_T",0x03A4) -CheckCompUni("G_X",0x039D) -CheckCompUni("G_Y",0x03A5) -CheckCompUni("G_Z",0x0396) -CheckCompUni("i_j",0x0133) -CheckCompUni("I_J",0x0132) -CheckCompUni("l_j",0x01C9) -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) -CheckCompUni("N_j",0x01CB) -CheckCompUni("N_J",0x01CA) -CheckCompAsc("O_c","©") -CheckCompAsc("O_C","©") -CheckCompAsc("o_C","©") -CheckCompAsc("o_c","©") -CheckCompAsc("O_E","Œ") -CheckCompAsc("o_e","œ") -CheckCompAsc("O_O","®") -CheckCompAsc("o_O","®") -CheckCompAsc("O_o","®") -CheckCompAsc("o_o","®") -CheckCompAsc("P_{!}","¶") -CheckCompAsc("p_{!}","¶") -CheckCompAsc("P_P","¶") -CheckCompUni("Q_u",0xE048) -CheckCompUni("r_{Numpad1}_{Numpad0}",0x2179) -CheckCompUni("R_{Numpad1}_{Numpad0}",0x2169) -CheckCompUni("r_{Numpad1}_{Numpad1}",0x217A) -CheckCompUni("R_{Numpad1}_{Numpad1}",0x216A) -CheckCompUni("r_{Numpad1}_{Numpad2}",0x217B) -CheckCompUni("R_{Numpad1}_{Numpad2}",0x216B) -CheckCompUni("r_{Numpad1}_{Space}",0x2170) +CheckCompUni("{Numpad1}_`/",0x215F) +CheckCompUni("{Numpad1}_{NumpadDiv}",0x215F) +CheckCompUni("1_`/",0x215F) +CheckCompUni("1_{NumpadDiv}",0x215F) CheckCompUni("R_{Numpad1}_{Space}",0x2160) -CheckCompUni("r_{Numpad2}",0x2171) +CheckCompUni("R_1_{Space}",0x2160) CheckCompUni("R_{Numpad2}",0x2161) -CheckCompUni("r_{Numpad3}",0x2172) +CheckCompUni("R_2",0x2161) CheckCompUni("R_{Numpad3}",0x2162) -CheckCompUni("r_{Numpad4}",0x2173) +CheckCompUni("R_3",0x2162) CheckCompUni("R_{Numpad4}",0x2163) -CheckCompUni("r_{Numpad5}",0x2174) +CheckCompUni("R_4",0x2163) CheckCompUni("R_{Numpad5}",0x2164) -CheckCompUni("r_{Numpad6}",0x2175) +CheckCompUni("R_5",0x2164) CheckCompUni("R_{Numpad6}",0x2165) -CheckCompUni("r_{Numpad7}",0x2176) +CheckCompUni("R_6",0x2165) CheckCompUni("R_{Numpad7}",0x2166) -CheckCompUni("r_{Numpad8}",0x2177) +CheckCompUni("R_7",0x2166) CheckCompUni("R_{Numpad8}",0x2167) -CheckCompUni("r_{Numpad9}",0x2178) +CheckCompUni("R_8",0x2167) CheckCompUni("R_{Numpad9}",0x2168) -CheckCompUni("r_1_{Space}",0x2170) -CheckCompUni("R_1_{Space}",0x2160) -CheckCompUni("r_1_0",0x2179) +CheckCompUni("R_9",0x2168) +CheckCompUni("R_{Numpad1}_{Numpad0}",0x2169) CheckCompUni("R_1_0",0x2169) -CheckCompUni("r_1_1",0x217A) +CheckCompUni("R_{Numpad1}_{Numpad1}",0x216A) CheckCompUni("R_1_1",0x216A) -CheckCompUni("r_1_2",0x217B) +CheckCompUni("R_{Numpad1}_{Numpad2}",0x216B) CheckCompUni("R_1_2",0x216B) +CheckCompUni("r_{Numpad1}_{Space}",0x2170) +CheckCompUni("r_1_{Space}",0x2170) +CheckCompUni("r_{Numpad2}",0x2171) CheckCompUni("r_2",0x2171) -CheckCompUni("R_2",0x2161) +CheckCompUni("r_{Numpad3}",0x2172) CheckCompUni("r_3",0x2172) -CheckCompUni("R_3",0x2162) +CheckCompUni("r_{Numpad4}",0x2173) CheckCompUni("r_4",0x2173) -CheckCompUni("R_4",0x2163) +CheckCompUni("r_{Numpad5}",0x2174) CheckCompUni("r_5",0x2174) -CheckCompUni("R_5",0x2164) +CheckCompUni("r_{Numpad6}",0x2175) CheckCompUni("r_6",0x2175) -CheckCompUni("R_6",0x2165) +CheckCompUni("r_{Numpad7}",0x2176) CheckCompUni("r_7",0x2176) -CheckCompUni("R_7",0x2166) +CheckCompUni("r_{Numpad8}",0x2177) CheckCompUni("r_8",0x2177) -CheckCompUni("R_8",0x2167) +CheckCompUni("r_{Numpad9}",0x2178) CheckCompUni("r_9",0x2178) -CheckCompUni("R_9",0x2168) +CheckCompUni("r_{Numpad1}_{Numpad0}",0x2179) +CheckCompUni("r_1_0",0x2179) +CheckCompUni("r_{Numpad1}_{Numpad1}",0x217A) +CheckCompUni("r_1_1",0x217A) +CheckCompUni("r_{Numpad1}_{Numpad2}",0x217B) +CheckCompUni("r_1_2",0x217B) +CheckCompUni("{Numpad3}_0x221A",0x221B) +CheckCompUni("0x221A_{Numpad3}",0x221B) +CheckCompUni("0x221A_3",0x221B) +CheckCompUni("3_0x221A",0x221B) +CheckCompUni("{Numpad4}_0x221A",0x221C) +CheckCompUni("0x221A_{Numpad4}",0x221C) +CheckCompUni("0x221A_4",0x221C) +CheckCompUni("4_0x221A",0x221C) +CheckCompUni("{Numpad2}_0x222B",0x222C) +CheckCompUni("0x222B_{Numpad2}",0x222C) +CheckCompUni("0x222B_0x222B",0x222C) +CheckCompUni("0x222B_2",0x222C) +CheckCompUni("2_0x222B",0x222C) +CheckCompUni("{Numpad3}_0x222B",0x222D) +CheckCompUni("0x222B_{Numpad3}",0x222D) +CheckCompUni("0x222B_3",0x222D) +CheckCompUni("3_0x222B",0x222D) +CheckCompUni("{Numpad2}_0x222E",0x222F) +CheckCompUni("0x222E_{Numpad2}",0x222F) +CheckCompUni("0x222E_2",0x222F) +CheckCompUni("2_0x222E",0x222F) +CheckCompUni("{Numpad3}_0x222E",0x2230) +CheckCompUni("0x222E_{Numpad3}",0x2230) +CheckCompUni("0x222E_3",0x2230) +CheckCompUni("3_0x222E",0x2230) +CheckCompUni("0x005E_[",0x2308) +CheckCompUni("0x005E_]",0x2309) +CheckCompUni("__[",0x230A) +CheckCompUni("__]",0x230B) +CheckCompUni(":_(",0x2639) +CheckCompUni(":_)",0x263A) +CheckCompUni("{Numpad4}_0x222B",0x2A0C) +CheckCompUni("0x222B_{Numpad4}",0x2A0C) +CheckCompUni("0x222B_4",0x2A0C) +CheckCompUni("4_0x222B",0x2A0C) +CheckCompUni("{Numpad1}_¡_¿",0x2E18) +CheckCompUni("{Numpad1}_¿_¡",0x2E18) +CheckCompUni("1_¡_¿",0x2E18) +CheckCompUni("1_¿_¡",0x2E18) +CheckCompUni("2_m_m",0x339F) +CheckCompUni("2_c_m",0x33A0) +CheckCompUni("2_m_{Space}",0x33A1) +CheckCompUni("2_k_m",0x33A2) +CheckCompUni("3_m_m",0x33A3) +CheckCompUni("3_c_m",0x33A4) +CheckCompUni("3_m_{Space}",0x33A5) +CheckCompUni("3_k_m",0x33A6) +CheckCompUni("l_n",0x33D1) +CheckCompUni("l_o_g",0x33D2) +CheckCompUni("f_b",0xE030) +CheckCompUni("F_b",0xE031) +CheckCompUni("F_h",0xE032) +CheckCompUni("F_j",0xE033) +CheckCompUni("F_k",0xE034) +CheckCompUni("F_t",0xE035) +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("0x017F_i",0xE03E) +CheckCompUni("0x017F_0x017F",0xE03F) +CheckCompUni("0x017F_l",0xE043) CheckCompUni("S_i",0xE044) -CheckCompUni("s_m",0x2120) -CheckCompUni("s_t",0xFB06) +CheckCompUni("0x017F_s",0xE045) +CheckCompUni("Q_u",0xE048) CheckCompUni("T_h",0xE049) -CheckCompAsc("T_H","Þ") -CheckCompAsc("t_h","þ") -CheckCompUni("t_m",0x2122) -CheckCompUni("t_t",0xE03C) CheckCompUni("t_z",0xE04A) +CheckCompUni("f_f",0xFB00) +CheckCompUni("f_i",0xFB01) +CheckCompUni("f_l",0xFB02) +CheckCompUni("F_i",0xFB03) +CheckCompUni("F_l",0xFB04) +CheckCompUni("0x017F_t",0xFB05) +CheckCompUni("s_t",0xFB06) +CheckCompAsc("'_A","Á") +CheckCompAsc("'_a","á") +CheckCompUni("U_A",0x0102) +CheckCompUni("b_A",0x0102) +CheckCompUni("U_a",0x0103) +CheckCompUni("b_a",0x0103) + } diff --git a/windows/autohotkey/Source/Keys-Neo.ahk b/windows/autohotkey/Source/Keys-Neo.ahk index 85d5876..a23d709 100644 --- a/windows/autohotkey/Source/Keys-Neo.ahk +++ b/windows/autohotkey/Source/Keys-Neo.ahk @@ -244,7 +244,7 @@ neo_v: if (Ebene12 and !(CheckDeadUni12("c6",0x1E7F,0x1E7E))) OutputChar12("v","V") else if (Ebene = 3) - send {blind}_ + OutputChar("_") else if (Ebene = 4) and (!lernModus or lernModus_neo_Backspace) Send {blind}{Backspace} else if (Ebene = 6) @@ -263,7 +263,7 @@ neo_l: or CheckDeadUni12("t4",0x0142,0x0141))) OutputChar12("l","L") else if (Ebene = 3) - send {blind}[ + OutputChar("[") else if (Ebene = 4) Send {Blind}{Up} else if (Ebene = 5) @@ -282,7 +282,7 @@ neo_c: or CheckDeadUni12("c2",0x010D,0x010C))) OutputChar12("c","C") else if (Ebene = 3) - send {blind}] + OutputChar("]") else if (Ebene = 4) and (!lernModus or lernModus_neo_Entf) send {blind}{Del} else if (Ebene = 5) @@ -810,7 +810,7 @@ neo_punkt: else if (Ebene = 2) SendUnicodeChar(0x2026) ; ellipse else if (Ebene = 3) - send {blind}' + OutputChar("'") else if ((Ebene = 4) and !(CheckDeadUni("c1",0x00B3) or CheckDeadUni("c5",0x2083))) OutputChar("{Numpad3}") @@ -1009,9 +1009,9 @@ neo_Numpad0: if (Ebene = 1) OutputChar("{Numpad0}") else if (Ebene = 2) - SendUnicodeChar(0x2030) ; Promille - else if (Ebene = 3) SendUnicodeChar(0x0025) ; Prozent + else if (Ebene = 3) + SendUnicodeChar(0x2030) ; Promille else if (Ebene = 4) send {blind}{NumpadIns} return diff --git a/windows/autohotkey/Source/Methods-Other.ahk b/windows/autohotkey/Source/Methods-Other.ahk index fbbcad5..0ef9d77 100644 --- a/windows/autohotkey/Source/Methods-Other.ahk +++ b/windows/autohotkey/Source/Methods-Other.ahk @@ -75,29 +75,12 @@ CheckCompAsc(d,val) { if !DeadCompose send {bs} send % val + CompKey = 0 isFurtherCompKey = 0 return 1 } } -CheckCompAsc12(d,val1,val2) { - global - if (PriorCompKey == d) - if (Ebene = 1) and (val1 != "") { - if !DeadCompose - send {bs} - send % val1 - isFurtherCompKey = 0 - return 1 - } else if (Ebene = 2) and (val2 != "") { - if !DeadCompose - send {bs} - send % val2 - isFurtherCompKey = 0 - return 1 - } -} - CheckCompUni(d,val) { global if (PriorCompKey == d) { @@ -111,65 +94,6 @@ CheckCompUni(d,val) { } } -CheckCompUni12(d,val1,val2){ - global - if (PriorCompKey == d) { - if (Ebene = 1) and (val1 != "") { - PriorCompKey = - CompKey = - if !DeadCompose - send {bs} - isFurtherCompkey = 0 - SendUnicodeChar(val1) - return 1 - } else if (Ebene = 2) and (val2 != "") { - PriorCompKey = - CompKey = - if !DeadCompose - send {bs} - isFurtherCompkey = 0 - SendUnicodeChar(val2) - return 1 - } - } -} - -CheckComp3Uni(d,val) { - global - if (PriorCompKey == d) { - PriorCompKey = - CompKey = - if !DeadCompose - send {bs}{bs} - isFurtherCompkey = 0 - SendUnicodeChar(val) - return 1 - } -} - -CheckComp3Uni12(d,val1,val2) { - global - if (PriorCompKey == d) { - if (Ebene = 1) and (val1 != "") { - PriorCompKey = - CompKey = - if !DeadCompose - send {bs}{bs} - isFurtherCompkey = 0 - SendUnicodeChar(val1) - return 1 - } else if (Ebene = 2) and (val2 != "") { - PriorCompKey = - CompKey = - if !DeadCompose - send {bs}{bs} - isFurtherCompkey = 0 - SendUnicodeChar(val2) - return 1 - } - } -} - OutputChar(val) { global if !(CheckComp(val) and DeadCompose) -- cgit v1.2.3