diff --git a/ahk/acp-keyboard.ahk b/ahk/acp-keyboard.ahk index 8cf40b8..381d21b 100644 --- a/ahk/acp-keyboard.ahk +++ b/ahk/acp-keyboard.ahk @@ -97,18 +97,18 @@ dead_macron := Map.Call( ; E00 - SC029 +; ⁻ +>!SC029::Send "{U+207B}" +<^>!SC029::Send "{U+207B}" ; ≈ ->!SC029::Send "{U+2248}" -<^>!SC029::Send "{U+2248}" -; ± ->!+SC029::Send "{U+00B1}" -<^>!+SC029::Send "{U+00B1}" +>!+SC029::Send "{U+2248}" +<^>!+SC029::Send "{U+2248}" ; E01 - SC002 -; ! ->!SC002::Send "{U+0021}" -<^>!SC002::Send "{U+0021}" +; ¹ +>!SC002::Send "{U+00B9}" +<^>!SC002::Send "{U+00B9}" ; ¡ >!+SC002::Send "{U+00A1}" <^>!+SC002::Send "{U+00A1}" @@ -625,9 +625,9 @@ dead_macron := Map.Call( ; B10 - SC035 -; ? ->!SC035::Send "{U+003F}" -<^>!SC035::Send "{U+003F}" +; ± +>!SC035::Send "{U+00B1}" +<^>!SC035::Send "{U+00B1}" ; ¿ >!+SC035::Send "{U+00BF}" <^>!+SC035::Send "{U+00BF}" diff --git a/spec.html b/spec.html index 071cd78..bfd4f88 100644 --- a/spec.html +++ b/spec.html @@ -42,7 +42,7 @@ -

ACP Keyboard v4.8.0

+

ACP Keyboard v4.9.0

  1. Rationale
  2. Images
    3. @@ -141,14 +141,14 @@ ` ~ - ≈ - ± + ⁻ + ≈ 1 ! - ! + ¹ ¡ @@ -492,7 +492,7 @@ / ? - ? + ± ¿ @@ -595,14 +595,14 @@ ` ~ - ≈ - ± + ⁻ + ≈ 1 ! - ! + ¹ ¡ @@ -943,7 +943,7 @@ / ? - ? + ± ¿ @@ -1021,8 +1021,8 @@ SC029 U+0060 ` U+007E ~ + U+207B ⁻ U+2248 ≈ - U+00B1 ± E01 @@ -1030,7 +1030,7 @@ SC002 U+0031 1 U+0021 ! - U+0021 ! + U+00B9 ¹ U+00A1 ¡ @@ -1450,7 +1450,7 @@ SC035 U+002F / U+003F ? - U+003F ? + U+00B1 ± U+00BF ¿ @@ -2055,6 +2055,7 @@
  3. U+0327 COMBINING CEDILLA
  4. U+03A9 GREEK CAPITAL LETTER OMEGA
  5. U+03BC GREEK SMALL LETTER MU
    6. +
  6. U+00B9 SUPERSCRIPT ONE
  7. U+1E80 LATIN CAPITAL LETTER W WITH GRAVE
  8. U+1E81 LATIN SMALL LETTER W WITH GRAVE
  9. U+1E82 LATIN CAPITAL LETTER W WITH ACUTE
    10. @@ -2082,6 +2083,7 @@
  10. U+2039 SINGLE LEFT-POINTING ANGLE QUOTATION MARK
  11. U+203A SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
  12. U+204A TIRONIAN SIGN ET
    13. +
  13. U+207B SUPERSCRIPT MINUS
  14. U+20AC EURO SIGN
  15. U+2105 CARE OF
  16. U+2122 TRADE MARK SIGN
    17. diff --git a/xkb/symbols/acp b/xkb/symbols/acp index d16da62..2242797 100644 --- a/xkb/symbols/acp +++ b/xkb/symbols/acp @@ -3,8 +3,8 @@ xkb_symbols "basic" { name[Group1]= "ACP"; - key { [ U0060, U007E, U2248, U00B1 ] }; // ` ~ ≈ ± - key { [ U0031, U0021, U0021, U00A1 ] }; // 1 ! ! ¡ + key { [ U0060, U007E, U207B, U2248 ] }; // ` ~ ⁻ ≈ + key { [ U0031, U0021, U00B9, U00A1 ] }; // 1 ! ¹ ¡ key { [ U0032, U0040, U00B2, U00A9 ] }; // 2 @ ² © key { [ U0033, U0023, U00B3, U00A3 ] }; // 3 # ³ £ key { [ U0034, U0024, U00A2, U2105 ] }; // 4 $ ¢ ℅ @@ -53,7 +53,7 @@ xkb_symbols "basic" { key { [ U006D, U004D, U03BC, U03A9 ] }; // m M μ Ω key { [ U002C, U003C, U2026, U2264 ] }; // , < … ≤ key { [ U002E, U003E, U22C5, U2265 ] }; // . > ⋅ ≥ - key { [ U002F, U003F, U003F, U00BF ] }; // / ? ? ¿ + key { [ U002F, U003F, U00B1, U00BF ] }; // / ? ± ¿ key { [ U0020, U0020, U2009, U00A0 ] }; // [space] [space] [thsp] [nbsp]