From 63a50fbf71bc8517590c87987e80f2789e2ec163 Mon Sep 17 00:00:00 2001 From: Anthony Perkins Date: Mon, 24 Jun 2024 17:42:15 +0100 Subject: [PATCH] Move U+00A9 and U+2122; add U+03A9; replace U+00B5 with U+03BC --- ahk/acp-keyboard.ahk | 24 ++++++++++++------------ spec.html | 29 +++++++++++++++-------------- xkb/symbols/acp | 6 +++--- 3 files changed, 30 insertions(+), 29 deletions(-) diff --git a/ahk/acp-keyboard.ahk b/ahk/acp-keyboard.ahk index db3af35..f7573bc 100644 --- a/ahk/acp-keyboard.ahk +++ b/ahk/acp-keyboard.ahk @@ -190,9 +190,9 @@ dead_macron := Map.Call( ; º >!SC00B::Send "{U+00BA}" <^>!SC00B::Send "{U+00BA}" -; ->!+SC00B::Send "" -<^>!+SC00B::Send "" +; © +>!+SC00B::Send "{U+00A9}" +<^>!+SC00B::Send "{U+00A9}" ; E11 - SC00C @@ -264,9 +264,9 @@ dead_macron := Map.Call( ; ® >!SC014::Send "{U+00AE}" <^>!SC014::Send "{U+00AE}" -; © ->!+SC014::Send "{U+00A9}" -<^>!+SC014::Send "{U+00A9}" +; ™ +>!+SC014::Send "{U+2122}" +<^>!+SC014::Send "{U+2122}" ; D06 - SC015 @@ -598,12 +598,12 @@ dead_macron := Map.Call( ; B07 - SC032 -; µ ->!SC032::Send "{U+00B5}" -<^>!SC032::Send "{U+00B5}" -; ™ ->!+SC032::Send "{U+2122}" -<^>!+SC032::Send "{U+2122}" +; μ +>!SC032::Send "{U+03BC}" +<^>!SC032::Send "{U+03BC}" +; Ω +>!+SC032::Send "{U+03A9}" +<^>!+SC032::Send "{U+03A9}" ; B08 - SC033 diff --git a/spec.html b/spec.html index 927063f..17ec351 100644 --- a/spec.html +++ b/spec.html @@ -42,7 +42,7 @@ -

ACP Keyboard v4.2.0

+

ACP Keyboard v4.3.0

  1. Rationale
  2. Images
    3. @@ -200,7 +200,7 @@ 0 ) º - + © - @@ -250,7 +250,7 @@ t T ® - © + ™ y @@ -421,8 +421,8 @@ m M - µ - ™ + μ + Ω , @@ -594,7 +594,7 @@ 0 ) º - + © - @@ -644,7 +644,7 @@ t T ® - © + ™ y @@ -812,8 +812,8 @@ m M - µ - ™ + μ + Ω , @@ -990,7 +990,7 @@ U+0030 0 U+0029 ) U+00BA º - + U+00A9 © E11 @@ -1055,7 +1055,7 @@ U+0074 t U+0054 T U+00AE ® - U+00A9 © + U+2122 ™ D06 @@ -1301,8 +1301,8 @@ SC032 U+006D m U+004D M - U+00B5 µ - U+2122 ™ + U+03BC μ + U+03A9 Ω B08 @@ -1848,7 +1848,6 @@
  3. U+00AF MACRON
  4. U+00B0 DEGREE SIGN
  5. U+00B1 PLUS-MINUS SIGN
    6. -
  6. U+00B5 MICRO SIGN
  7. U+00B6 PILCROW SIGN
  8. U+00BA MASCULINE ORDINAL INDICATOR
  9. U+00BB RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
    10. @@ -1930,6 +1929,8 @@
  10. U+0304 COMBINING MACRON
  11. U+0308 COMBINING DIAERESIS
  12. U+0327 COMBINING CEDILLA
    13. +
  13. U+03A9 GREEK CAPITAL LETTER OMEGA
    14. +
  14. U+03BC GREEK SMALL LETTER MU
  15. U+1E80 LATIN CAPITAL LETTER W WITH GRAVE
  16. U+1E81 LATIN SMALL LETTER W WITH GRAVE
  17. U+1E82 LATIN CAPITAL LETTER W WITH ACUTE
    18. diff --git a/xkb/symbols/acp b/xkb/symbols/acp index 2114c8b..f2100fe 100644 --- a/xkb/symbols/acp +++ b/xkb/symbols/acp @@ -13,7 +13,7 @@ xkb_symbols "basic" { key { [ U0037, U0026, U204A, U2717 ] }; // 7 & ⁊ ✗ key { [ U0038, U002A, U00B0, U2022 ] }; // 8 * ° • key { [ U0039, U0028, U00AA, NoSymbol ] }; // 9 ( ª - key { [ U0030, U0029, U00BA, NoSymbol ] }; // 0 ) º + key { [ U0030, U0029, U00BA, U00A9 ] }; // 0 ) º © key { [ U002D, U005F, U2212, U00F7 ] }; // - _ − ÷ key { [ U003D, U002B, U00D7, U2260 ] }; // + = × ≠ @@ -21,7 +21,7 @@ xkb_symbols "basic" { key { [ U0077, U0057, U00E9, U00C9 ] }; // w W é É key { [ U0065, U0045, U00EB, U00CB ] }; // e E ë Ë key { [ U0072, U0052, U00E8, U00C8 ] }; // r R è È - key { [ U0074, U0054, U00AE, U00A9 ] }; // t T ® © + key { [ U0074, U0054, U00AE, U2122 ] }; // t T ® ™ key { [ U0079, U0059, U00FB, U00DB ] }; // y Y û Û key { [ U0075, U0055, U00FC, U00DC ] }; // u U ü Ü key { [ U0069, U0049, U00EF, U00CF ] }; // i I ï Ï @@ -50,7 +50,7 @@ xkb_symbols "basic" { key { [ U0076, U0056, U2014, NoSymbol ] }; // v V — key { [ U0062, U0042, U2013, NoSymbol ] }; // b B – key { [ U006E, U004E, U00F1, U00D1 ] }; // n N ñ Ñ - key { [ U006D, U004D, U00B5, U2122 ] }; // m M µ ™ + key { [ U006D, U004D, U03BC, U03A9 ] }; // m M μ Ω key { [ U002C, U003C, U2026, U2264 ] }; // , < … ≤ key { [ U002E, U003E, U22C5, U2265 ] }; // . > ⋅ ≥ key { [ U002F, U003F, U003F, U00BF ] }; // / ? ? ¿