diff --git a/ahk/acp-keyboard.ahk b/ahk/acp-keyboard.ahk index 6859f8d..a2f214b 100644 --- a/ahk/acp-keyboard.ahk +++ b/ahk/acp-keyboard.ahk @@ -115,39 +115,39 @@ dead_macron := Map.Call( ; E02 - SC003 -; ‰ ->!SC003::Send "{U+2030}" -<^>!SC003::Send "{U+2030}" -; « ->!+SC003::Send "{U+00AB}" -<^>!+SC003::Send "{U+00AB}" +; © +>!SC003::Send "{U+00A9}" +<^>!SC003::Send "{U+00A9}" +; ² +>!+SC003::Send "{U+00B2}" +<^>!+SC003::Send "{U+00B2}" ; E03 - SC004 ; £ >!SC004::Send "{U+00A3}" <^>!SC004::Send "{U+00A3}" -; » ->!+SC004::Send "{U+00BB}" -<^>!+SC004::Send "{U+00BB}" +; ³ +>!+SC004::Send "{U+00B3}" +<^>!+SC004::Send "{U+00B3}" ; E04 - SC005 ; ¢ >!SC005::Send "{U+00A2}" <^>!SC005::Send "{U+00A2}" -; ‹ ->!+SC005::Send "{U+2039}" -<^>!+SC005::Send "{U+2039}" +; ℅ +>!+SC005::Send "{U+2105}" +<^>!+SC005::Send "{U+2105}" ; E05 - SC006 ; € >!SC006::Send "{U+20AC}" <^>!SC006::Send "{U+20AC}" -; › ->!+SC006::Send "{U+203A}" -<^>!+SC006::Send "{U+203A}" +; ‰ +>!+SC006::Send "{U+2030}" +<^>!+SC006::Send "{U+2030}" ; E06 - SC007 @@ -181,18 +181,18 @@ dead_macron := Map.Call( ; ª >!SC00A::Send "{U+00AA}" <^>!SC00A::Send "{U+00AA}" -; ℅ ->!+SC00A::Send "{U+2105}" -<^>!+SC00A::Send "{U+2105}" +; +>!+SC00A::Send "" +<^>!+SC00A::Send "" ; E10 - SC00B ; º >!SC00B::Send "{U+00BA}" <^>!SC00B::Send "{U+00BA}" -; © ->!+SC00B::Send "{U+00A9}" -<^>!+SC00B::Send "{U+00A9}" +; +>!+SC00B::Send "" +<^>!+SC00B::Send "" ; E11 - SC00C @@ -428,18 +428,18 @@ dead_macron := Map.Call( Send deadac.Input } } -; ->!+SC022::Send "" -<^>!+SC022::Send "" +; « +>!+SC022::Send "{U+00AB}" +<^>!+SC022::Send "{U+00AB}" ; C06 - SC023 ; >!SC023::Send "" <^>!SC023::Send "" -; ->!+SC023::Send "" -<^>!+SC023::Send "" +; » +>!+SC023::Send "{U+00BB}" +<^>!+SC023::Send "{U+00BB}" ; C07 - SC024 @@ -464,9 +464,9 @@ dead_macron := Map.Call( Send deadac.Input } } -; ->!+SC024::Send "" -<^>!+SC024::Send "" +; ‹ +>!+SC024::Send "{U+2039}" +<^>!+SC024::Send "{U+2039}" ; C08 - SC025 @@ -491,9 +491,9 @@ dead_macron := Map.Call( Send deadac.Input } } -; ->!+SC025::Send "" -<^>!+SC025::Send "" +; › +>!+SC025::Send "{U+203A}" +<^>!+SC025::Send "{U+203A}" ; C09 - SC026 diff --git a/spec.html b/spec.html index 36dd285..769d9ac 100644 --- a/spec.html +++ b/spec.html @@ -42,7 +42,7 @@ -

ACP Keyboard v4.4.0

+

ACP Keyboard v4.5.0

  1. Rationale
  2. Images
  3. @@ -154,29 +154,29 @@ 2 @ - - « + © + ² 3 # £ - » + ³ 4 $ ¢ - + 5 % - + @@ -204,14 +204,14 @@ 9 ( ª - + 0 ) º - © + @@ -360,28 +360,28 @@ g G ◌̄ - + « h H - + » j J ◌̀ - + k K ◌̂ - + @@ -608,29 +608,29 @@ 2 @ - - « + © + ² 3 # £ - » + ³ 4 $ ¢ - + 5 % - + @@ -658,14 +658,14 @@ 9 ( ª - + 0 ) º - © + @@ -821,28 +821,28 @@ g G ◌̄ - + « h H - + » j J ◌̀ - + k K ◌̂ - + @@ -1038,8 +1038,8 @@ SC003 U+0032 2 U+0040 @ - U+2030 - U+00AB « + U+00A9 © + U+00B2 ² E03 @@ -1048,7 +1048,7 @@ U+0033 3 U+0023 # U+00A3 £ - U+00BB » + U+00B3 ³ E04 @@ -1057,7 +1057,7 @@ U+0034 4 U+0024 $ U+00A2 ¢ - U+2039 + U+2105 E05 @@ -1066,7 +1066,7 @@ U+0035 5 U+0025 % U+20AC - U+203A + U+2030 E06 @@ -1102,7 +1102,7 @@ U+0039 9 U+0028 ( U+00AA ª - U+2105 + E10 @@ -1111,7 +1111,7 @@ U+0030 0 U+0029 ) U+00BA º - U+00A9 © + E11 @@ -1295,7 +1295,7 @@ U+0067 g U+0047 G DEADMA ◌̄ - + U+00AB « C06 @@ -1304,7 +1304,7 @@ U+0068 h U+0048 H - + U+00BB » C07 @@ -1313,7 +1313,7 @@ U+006A j U+004A J DEADGR ◌̀ - + U+2039 C08 @@ -1322,7 +1322,7 @@ U+006B k U+004B K DEADCI ◌̂ - + U+203A C09 @@ -1969,6 +1969,8 @@
  4. U+00AF MACRON
  5. U+00B0 DEGREE SIGN
  6. U+00B1 PLUS-MINUS SIGN
  7. +
  8. U+00B2 SUPERSCRIPT TWO
  9. +
  10. U+00B3 SUPERSCRIPT THREE
  11. U+00B6 PILCROW SIGN
  12. U+00BA MASCULINE ORDINAL INDICATOR
  13. U+00BB RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
  14. diff --git a/xkb/symbols/acp b/xkb/symbols/acp index e7df178..ada8d3e 100644 --- a/xkb/symbols/acp +++ b/xkb/symbols/acp @@ -5,15 +5,15 @@ xkb_symbols "basic" { key { [ U0060, U007E, U2248, U00B1 ] }; // ` ~ ≈ ± key { [ U0031, U0021, U0021, U00A1 ] }; // 1 ! ! ¡ - key { [ U0032, U0040, U2030, U00AB ] }; // 2 @ ‰ « - key { [ U0033, U0023, U00A3, U00BB ] }; // 3 # £ » - key { [ U0034, U0024, U00A2, U2039 ] }; // 4 $ ¢ ‹ - key { [ U0035, U0025, U20AC, U203A ] }; // 5 % € › + key { [ U0032, U0040, U00A9, U00B2 ] }; // 2 @ © ² + key { [ U0033, U0023, U00A3, U00B3 ] }; // 3 # £ ³ + key { [ U0034, U0024, U00A2, U2105 ] }; // 4 $ ¢ ℅ + key { [ U0035, U0025, U20AC, U2030 ] }; // 5 % € ‰ key { [ U0036, U005E, U221A, U2713 ] }; // 6 ^ √ ✓ key { [ U0037, U0026, U204A, U2717 ] }; // 7 & ⁊ ✗ key { [ U0038, U002A, U00B0, U2022 ] }; // 8 * ° • - key { [ U0039, U0028, U00AA, U2105 ] }; // 9 ( ª ℅ - key { [ U0030, U0029, U00BA, U00A9 ] }; // 0 ) º © + key { [ U0039, U0028, U00AA, NoSymbol ] }; // 9 ( ª + key { [ U0030, U0029, U00BA, NoSymbol ] }; // 0 ) º key { [ U002D, U005F, U2212, U00F7 ] }; // - _ − ÷ key { [ U003D, U002B, U00D7, U2260 ] }; // + = × ≠ @@ -34,10 +34,10 @@ xkb_symbols "basic" { key { [ U0073, U0053, U00DF, U1E9E ] }; // s S ß ẞ key { [ U0064, U0044, dead_diaeresis, U2033 ] }; // d D ¨◌ ″ key { [ U0066, U0046, dead_acute, U2032 ] }; // f F ´◌ ′ - key { [ U0067, U0047, dead_macron, NoSymbol ] }; // g G ¯◌ - key { [ U0068, U0048, NoSymbol, NoSymbol ] }; // h H - key { [ U006A, U004A, dead_grave, NoSymbol ] }; // j J `◌ - key { [ U006B, U004B, dead_circumflex, NoSymbol ] }; // k K ^◌ + key { [ U0067, U0047, dead_macron, U00AB ] }; // g G ¯◌ « + key { [ U0068, U0048, NoSymbol, U00BB ] }; // h H » + key { [ U006A, U004A, dead_grave, U2039 ] }; // j J `◌ ‹ + key { [ U006B, U004B, dead_circumflex, U203A ] }; // k K ^◌ › key { [ U006C, U004C, U00F4, U00D4 ] }; // l L ô Ô key { [ U003B, U003A, U003B, U003A ] }; // ; : ; : key { [ U0027, U0022, U201A, U201E ] }; // ' " ‚ „