diff --git a/ahk/acp-keyboard.ahk b/ahk/acp-keyboard.ahk index a2f214b..64c8dfc 100644 --- a/ahk/acp-keyboard.ahk +++ b/ahk/acp-keyboard.ahk @@ -115,21 +115,21 @@ dead_macron := Map.Call( ; E02 - SC003 -; © ->!SC003::Send "{U+00A9}" -<^>!SC003::Send "{U+00A9}" ; ² ->!+SC003::Send "{U+00B2}" -<^>!+SC003::Send "{U+00B2}" +>!SC003::Send "{U+00B2}" +<^>!SC003::Send "{U+00B2}" +; © +>!+SC003::Send "{U+00A9}" +<^>!+SC003::Send "{U+00A9}" ; E03 - SC004 -; £ ->!SC004::Send "{U+00A3}" -<^>!SC004::Send "{U+00A3}" ; ³ ->!+SC004::Send "{U+00B3}" -<^>!+SC004::Send "{U+00B3}" +>!SC004::Send "{U+00B3}" +<^>!SC004::Send "{U+00B3}" +; £ +>!+SC004::Send "{U+00A3}" +<^>!+SC004::Send "{U+00A3}" ; E04 - SC005 diff --git a/spec.html b/spec.html index 769d9ac..f2843e2 100644 --- a/spec.html +++ b/spec.html @@ -42,7 +42,7 @@ -

ACP Keyboard v4.5.0

+

ACP Keyboard v4.6.0

  1. Rationale
  2. Images
  3. @@ -154,15 +154,15 @@ 2 @ - © - ² + ² + © 3 # - £ - ³ + ³ + £ @@ -608,15 +608,15 @@ 2 @ - © - ² + ² + © 3 # - £ - ³ + ³ + £ @@ -1038,8 +1038,8 @@ SC003 U+0032 2 U+0040 @ - U+00A9 © U+00B2 ² + U+00A9 © E03 @@ -1047,8 +1047,8 @@ SC004 U+0033 3 U+0023 # - U+00A3 £ U+00B3 ³ + U+00A3 £ E04 diff --git a/xkb/symbols/acp b/xkb/symbols/acp index ada8d3e..7671cda 100644 --- a/xkb/symbols/acp +++ b/xkb/symbols/acp @@ -5,8 +5,8 @@ xkb_symbols "basic" { key { [ U0060, U007E, U2248, U00B1 ] }; // ` ~ ≈ ± key { [ U0031, U0021, U0021, U00A1 ] }; // 1 ! ! ¡ - key { [ U0032, U0040, U00A9, U00B2 ] }; // 2 @ © ² - key { [ U0033, U0023, U00A3, U00B3 ] }; // 3 # £ ³ + key { [ U0032, U0040, U00B2, U00A9 ] }; // 2 @ ² © + key { [ U0033, U0023, U00B3, U00A3 ] }; // 3 # ³ £ key { [ U0034, U0024, U00A2, U2105 ] }; // 4 $ ¢ ℅ key { [ U0035, U0025, U20AC, U2030 ] }; // 5 % € ‰ key { [ U0036, U005E, U221A, U2713 ] }; // 6 ^ √ ✓