diff --git a/ahk/acp-keyboard.ahk b/ahk/acp-keyboard.ahk index f8320b0..17d316e 100644 --- a/ahk/acp-keyboard.ahk +++ b/ahk/acp-keyboard.ahk @@ -315,21 +315,21 @@ dead_macron := Map.Call( ; D11 - SC01A -; ’ ->!SC01A::Send "{U+2019}" -<^>!SC01A::Send "{U+2019}" ; ‘ ->!+SC01A::Send "{U+2018}" -<^>!+SC01A::Send "{U+2018}" +>!SC01A::Send "{U+2018}" +<^>!SC01A::Send "{U+2018}" +; “ +>!+SC01A::Send "{U+201C}" +<^>!+SC01A::Send "{U+201C}" ; D12 - SC01B +; ’ +>!SC01B::Send "{U+2019}" +<^>!SC01B::Send "{U+2019}" ; ” ->!SC01B::Send "{U+201D}" -<^>!SC01B::Send "{U+201D}" -; “ ->!+SC01B::Send "{U+201C}" -<^>!+SC01B::Send "{U+201C}" +>!+SC01B::Send "{U+201D}" +<^>!+SC01B::Send "{U+201D}" diff --git a/spec.html b/spec.html index c632961..668406b 100644 --- a/spec.html +++ b/spec.html @@ -42,7 +42,7 @@ -

ACP Keyboard v3.1.0

+

ACP Keyboard v3.2.0

  1. Rationale
  2. Images
  3. @@ -285,14 +285,14 @@ [ { - - + + ] } - - + + @@ -679,14 +679,14 @@ [ { - - + + ] } - - + + \ @@ -1161,8 +1161,8 @@ U+007B { U+005B [ U+007B { - U+2019 U+2018 + U+201C D12 @@ -1172,8 +1172,8 @@ U+007D } U+005D ] U+007D } + U+2019 U+201D - U+201C diff --git a/xkb/symbols/acp b/xkb/symbols/acp index 842f807..dfb1a99 100644 --- a/xkb/symbols/acp +++ b/xkb/symbols/acp @@ -27,8 +27,8 @@ xkb_symbols "basic" { key { [ U0069, U0049, U00EF, U00CF ] }; // i I ï Ï key { [ U006F, U004F, U00F6, U00D6 ] }; // o O ö Ö key { [ U0070, U0050, U00B6, U00A7 ] }; // p P ¶ § - key { [ U005B, U007B, U2019, U2018 ] }; // [ { ’ ‘ - key { [ U005D, U007D, U201D, U201C ] }; // ] } ” “ + key { [ U005B, U007B, U2018, U201C ] }; // [ { ‘ “ + key { [ U005D, U007D, U2019, U201D ] }; // ] } ’ ” key { [ U0061, U0041, U00E4, U00C4 ] }; // a A ä Ä key { [ U0073, U0053, U00DF, U1E9E ] }; // s S ß ẞ @@ -69,7 +69,7 @@ xkb_symbols "us" { key { [ U0060, U007E, U007C, U00AC ] }; // ` ~ | ± key { [ U0032, U0040, U00A2, U00AB ] }; // 2 @ ¢ « key { [ U0033, U0023, U00A3, U00BB ] }; // 3 # £ » - key { [ U0027, U0022, U2019, U2018 ] }; // ' " ’ ‘ + key { [ U0027, U0022, U201E, U201A ] }; // ' " „ ‚ key { [ U005C, U007C, U005C, NoSymbol ] }; // \ | \ include "level3(ralt_switch)"