diff --git a/ahk/acp-keyboard.ahk b/ahk/acp-keyboard.ahk index 38ba2bb..86943c0 100644 --- a/ahk/acp-keyboard.ahk +++ b/ahk/acp-keyboard.ahk @@ -115,9 +115,9 @@ dead_macron := Map.Call( ; E02 - SC003 -; ¢ ->!SC003::Send "{U+00A2}" -<^>!SC003::Send "{U+00A2}" +; ‰ +>!SC003::Send "{U+2030}" +<^>!SC003::Send "{U+2030}" ; « >!+SC003::Send "{U+00AB}" <^>!+SC003::Send "{U+00AB}" @@ -133,18 +133,18 @@ dead_macron := Map.Call( ; E04 - SC005 -; € ->!SC005::Send "{U+20AC}" -<^>!SC005::Send "{U+20AC}" +; ¢ +>!SC005::Send "{U+00A2}" +<^>!SC005::Send "{U+00A2}" ; ‹ >!+SC005::Send "{U+2039}" <^>!+SC005::Send "{U+2039}" ; E05 - SC006 -; ‰ ->!SC006::Send "{U+2030}" -<^>!SC006::Send "{U+2030}" +; € +>!SC006::Send "{U+20AC}" +<^>!SC006::Send "{U+20AC}" ; › >!+SC006::Send "{U+203A}" <^>!+SC006::Send "{U+203A}" @@ -524,9 +524,9 @@ dead_macron := Map.Call( ; C12 - SC02B -; \ ->!SC02B::Send "{U+005C}" -<^>!SC02B::Send "{U+005C}" +; +>!SC02B::Send "" +<^>!SC02B::Send "" ; >!+SC02B::Send "" <^>!+SC02B::Send "" @@ -535,12 +535,12 @@ dead_macron := Map.Call( ; B00 - SC056 -; ê ->!SC056::Send "{U+00EA}" -<^>!SC056::Send "{U+00EA}" -; Ê ->!+SC056::Send "{U+00CA}" -<^>!+SC056::Send "{U+00CA}" +; +>!SC056::Send "" +<^>!SC056::Send "" +; +>!+SC056::Send "" +<^>!+SC056::Send "" ; B01 - SC02C diff --git a/spec.html b/spec.html index 4e2c0e2..4328bb0 100644 --- a/spec.html +++ b/spec.html @@ -42,13 +42,13 @@ -

ACP Keyboard v3.3.0

+

ACP Keyboard v4.0.0

  1. Rationale
  2. Images
      3. -
    1. UK ISO
      2. -
    2. US ANSI
      3. +
    3. ISO
      4. +
    4. ANSI
  3. Key table
  4. Dead key table
    5. @@ -76,8 +76,8 @@
  5. No more than four levels (normal; Shift; AltGr; and Shift+AltGr).
  6. Keys should be grouped sensibly: the degree sign in °C is preceded by a narrow non-breaking space, so they should be on the same level.
    7. -
  7. The main layout should be based on the UK ISO layout, but it should - also support the US ANSI layout with one key fewer.
    8. +
  8. The main layout should be based on the US ANSI layout, but it should + also support an ISO layout with one key extra.
  9. It should be able to be used without Administrative permissions. This led me to AutoHotKey on Windows, and a $HOME-based XKB layout on Linux.
    10. @@ -91,9 +91,9 @@

Images

-

UK ISO

+

ISO

- UK ISO keyboard layout + ISO keyboard layout -

US ANSI

+

ANSI

- US ANSI keyboard layout + ANSI keyboard layout U+0060 ` - U+00AC ¬ - U+0060 ` U+007E ~ U+007C | U+00B1 ± @@ -915,8 +908,6 @@ SC002 U+0031 1 U+0021 ! - U+0031 1 - U+0021 ! U+0021 ! U+00A1 ¡ @@ -925,10 +916,8 @@ AE02 SC003 U+0032 2 - U+0022 " - U+0032 2 U+0040 @ - U+00A2 ¢ + U+2030 ‰ U+00AB « @@ -936,8 +925,6 @@ AE03 SC004 U+0033 3 - U+00A3 £ - U+0033 3 U+0023 # U+00A3 £ U+00BB » @@ -948,9 +935,7 @@ SC005 U+0034 4 U+0024 $ - U+0034 4 - U+0024 $ - U+20AC € + U+00A2 ¢ U+2039 ‹ @@ -959,9 +944,7 @@ SC006 U+0035 5 U+0025 % - U+0035 5 - U+0025 % - U+2030 ‰ + U+20AC € U+203A › @@ -970,8 +953,6 @@ SC007 U+0036 6 U+005E ^ - U+0036 6 - U+005E ^ U+221A √ U+2713 ✓ @@ -981,8 +962,6 @@ SC008 U+0037 7 U+0026 & - U+0037 7 - U+0026 & U+204A ⁊ U+2717 ✗ @@ -992,8 +971,6 @@ SC009 U+0038 8 U+002A * - U+0038 8 - U+002A * U+00B0 ° U+2022 • @@ -1003,8 +980,6 @@ SC00A U+0039 9 U+0028 ( - U+0039 9 - U+0028 ( U+00AA ª @@ -1014,8 +989,6 @@ SC00B U+0030 0 U+0029 ) - U+0030 0 - U+0029 ) U+00BA º U+00D7 × @@ -1025,8 +998,6 @@ SC00C U+002D - U+005F _ - U+002D - - U+005F _ U+2212 − U+00F7 ÷ @@ -1036,8 +1007,6 @@ SC00D U+003D = U+002B + - U+003D = - U+002B + U+2248 ≈ U+2260 ≠ @@ -1049,8 +1018,6 @@ SC010 U+0071 q U+0051 Q - U+0071 q - U+0051 Q U+00E0 à U+00C0 À @@ -1060,8 +1027,6 @@ SC011 U+0077 w U+0057 W - U+0077 w - U+0057 W U+00E9 é U+00C9 É @@ -1071,8 +1036,6 @@ SC012 U+0065 e U+0045 E - U+0065 e - U+0045 E U+00EB ë U+00CB Ë @@ -1082,8 +1045,6 @@ SC013 U+0072 r U+0052 R - U+0072 r - U+0052 R U+00E8 è U+00C8 È @@ -1093,8 +1054,6 @@ SC014 U+0074 t U+0054 T - U+0074 t - U+0054 T U+00AE ® U+00A9 © @@ -1104,8 +1063,6 @@ SC015 U+0079 y U+0059 Y - U+0079 y - U+0059 Y U+00FB û U+00DB Û @@ -1115,8 +1072,6 @@ SC016 U+0075 u U+0055 U - U+0075 u - U+0055 U U+00FC ü U+00DC Ü @@ -1126,8 +1081,6 @@ SC017 U+0069 i U+0049 I - U+0069 i - U+0049 I U+00EF ï U+00CF Ï @@ -1137,8 +1090,6 @@ SC018 U+006F o U+004F O - U+006F o - U+004F O U+00F6 ö U+00D6 Ö @@ -1148,8 +1099,6 @@ SC019 U+0070 p U+0050 P - U+0070 p - U+0050 P U+00B6 U+00A7 § @@ -1159,8 +1108,6 @@ SC01A U+005B [ U+007B { - U+005B [ - U+007B { U+2018 ‘ U+201C “ @@ -1170,8 +1117,6 @@ SC01B U+005D ] U+007D } - U+005D ] - U+007D } U+2019 ’ U+201D ” @@ -1183,8 +1128,6 @@ SC01E U+0061 a U+0041 A - U+0061 a - U+0041 A U+00E4 ä U+00C4 Ä @@ -1194,8 +1137,6 @@ SC01F U+0073 s U+0053 S - U+0073 s - U+0053 S U+00DF ß U+1E9E ẞ @@ -1205,8 +1146,6 @@ SC020 U+0064 d U+0044 D - U+0064 d - U+0044 D DEADDI ◌̈ U+2033 ″ @@ -1216,8 +1155,6 @@ SC021 U+0066 f U+0046 F - U+0066 f - U+0046 F DEADAC ◌́ U+2032 ′ @@ -1227,8 +1164,6 @@ SC022 U+0067 g U+0047 G - U+0067 g - U+0047 G DEADMA ◌̄ @@ -1238,8 +1173,6 @@ SC023 U+0068 h U+0048 H - U+0068 h - U+0048 H @@ -1249,8 +1182,6 @@ SC024 U+006A j U+004A J - U+006A j - U+004A J DEADGR ◌̀ @@ -1260,8 +1191,6 @@ SC025 U+006B k U+004B K - U+006B k - U+004B K DEADCI ◌̂ @@ -1271,8 +1200,6 @@ SC026 U+006C l U+004C L - U+006C l - U+004C L U+00F4 ô U+00D4 Ô @@ -1284,16 +1211,12 @@ U+003A : U+003B ; U+003A : - U+003B ; - U+003A : C11 AC11 SC028 U+0027 ' - U+0040 @ - U+0027 ' U+0022 " U+201A ‚ U+201E „ @@ -1302,11 +1225,9 @@ C12 BKSL SC02B - U+0023 # - U+007E ~ U+005C \ U+007C | - U+005C \ + @@ -1317,10 +1238,8 @@ SC056 U+005C \ U+007C | - U+005C \ - U+007C | - U+00EA ê - U+00CA Ê + + B01 @@ -1328,8 +1247,6 @@ SC02C U+007A z U+005A Z - U+007A z - U+005A Z U+00E6 æ U+00C6 Æ @@ -1339,8 +1256,6 @@ SC02D U+0078 x U+0058 X - U+0078 x - U+0058 X U+0153 œ U+0152 Œ @@ -1350,8 +1265,6 @@ SC02E U+0063 c U+0043 C - U+0063 c - U+0043 C U+00E7 ç U+00C7 Ç @@ -1361,8 +1274,6 @@ SC02F U+0076 v U+0056 V - U+0076 v - U+0056 V U+2014 — @@ -1372,8 +1283,6 @@ SC030 U+0062 b U+0042 B - U+0062 b - U+0042 B U+2013 – @@ -1383,8 +1292,6 @@ SC031 U+006E n U+004E N - U+006E n - U+004E N U+00F1 ñ U+00D1 Ñ @@ -1394,8 +1301,6 @@ SC032 U+006D m U+004D M - U+006D m - U+004D M U+00B5 µ U+2122 ™ @@ -1405,8 +1310,6 @@ SC033 U+002C , U+003C < - U+002C , - U+003C < U+2026 … U+2264 ≤ @@ -1416,8 +1319,6 @@ SC034 U+002E . U+003E > - U+002E . - U+003E > U+22C5 ⋅ U+2265 ≥ @@ -1427,8 +1328,6 @@ SC035 U+002F / U+003F ? - U+002F / - U+003F ? U+003F ? U+00BF ¿ @@ -1440,8 +1339,6 @@ SC039 U+0020 U+0020 - U+0020 - U+0020 U+202F   U+00A0   diff --git a/xkb/symbols/acp b/xkb/symbols/acp index 2ef1180..a0c7167 100644 --- a/xkb/symbols/acp +++ b/xkb/symbols/acp @@ -3,12 +3,12 @@ xkb_symbols "basic" { name[Group1]= "ACP"; - key { [ U0060, U00AC, U007C, U00B1 ] }; // ` ¬ | ± + key { [ U0060, U007E, U007C, U00AC ] }; // ` ~ | ± key { [ U0031, U0021, U0021, U00A1 ] }; // 1 ! ! ¡ - key { [ U0032, U0022, U00A2, U00AB ] }; // 2 " ¢ « - key { [ U0033, U00A3, U00A3, U00BB ] }; // 3 £ £ » - key { [ U0034, U0024, U20AC, U2039 ] }; // 4 $ € ‹ - key { [ U0035, U0025, U2030, U203A ] }; // 5 % ‰ › + key { [ U0032, U0040, U2030, U00AB ] }; // 2 @ ‰ « + key { [ U0033, U0023, U00A3, U00BB ] }; // 3 # £ » + key { [ U0034, U0024, U20A2, U2039 ] }; // 4 $ ₢ ‹ + key { [ U0035, U0025, U20AC, U203A ] }; // 5 % € › key { [ U0036, U005E, U221A, U2713 ] }; // 6 ^ √ ✓ key { [ U0037, U0026, U204A, U2717 ] }; // 7 & ⁊ ✗ key { [ U0038, U002A, U00B0, U2022 ] }; // 8 * ° • @@ -40,10 +40,10 @@ xkb_symbols "basic" { key { [ U006B, U004B, dead_circumflex, NoSymbol ] }; // k K ^◌ key { [ U006C, U004C, U00F4, U00D4 ] }; // l L ô Ô key { [ U003B, U003A, U003B, U003A ] }; // ; : ; : - key { [ U0027, U0040, U201A, U201E ] }; // ' @ ‚ „ - key { [ U0023, U007E, U005C, NoSymbol ] }; // # ~ \ + key { [ U0027, U0022, U201A, U201E ] }; // ' " ‚ „ + key { [ U005C, U007C, NoSymbol, NoSymbol ] }; // \ | - key { [ U005C, U007C, U00EA, U00CA ] }; // \ | ê Ê + key { [ U005C, U007C, NoSymbol, NoSymbol ] }; // \ | key { [ U007A, U005A, U00E6, U00C6 ] }; // z Z æ Æ key { [ U0078, U0058, U0153, U0152 ] }; // x X œ Œ key { [ U0063, U0043, U00E7, U00C7 ] }; // c C ç Ç @@ -59,18 +59,3 @@ xkb_symbols "basic" { include "level3(ralt_switch)" }; - -default partial alphanumeric_keys modifier_keys -xkb_symbols "us" { - - include "acp(basic)" - name[Group1]= "ACP (US)"; - - key { [ U0060, U007E, U007C, U00AC ] }; // ` ~ | ± - key { [ U0032, U0040, U00A2, U00AB ] }; // 2 @ ¢ « - key { [ U0033, U0023, U00A3, U00BB ] }; // 3 # £ » - key { [ U0027, U0022, U201A, U201E ] }; // ' " ‚ „ - key { [ U005C, U007C, U005C, NoSymbol ] }; // \ | \ - - include "level3(ralt_switch)" -};