diff --git a/ahk/acp-keyboard.ahk b/ahk/acp-keyboard.ahk index d51145b..631eeb1 100644 --- a/ahk/acp-keyboard.ahk +++ b/ahk/acp-keyboard.ahk @@ -97,12 +97,12 @@ dead_macron := Map.Call( ; E00 - SC029 -; | ->!SC029::Send "{U+007C}" -<^>!SC029::Send "{U+007C}" ; ± ->!+SC029::Send "{U+00B1}" -<^>!+SC029::Send "{U+00B1}" +>!SC029::Send "{U+00B1}" +<^>!SC029::Send "{U+00B1}" +; +>!+SC029::Send "" +<^>!+SC029::Send "" ; E01 - SC002 @@ -535,12 +535,12 @@ dead_macron := Map.Call( ; B00 - SC056 -; ->!SC056::Send "" -<^>!SC056::Send "" -; ->!+SC056::Send "" -<^>!+SC056::Send "" +; ê +>!SC056::Send "{U+00EA}" +<^>!SC056::Send "{U+00EA}" +; Ê +>!+SC056::Send "{U+00CA}" +<^>!+SC056::Send "{U+00CA}" ; B01 - SC02C diff --git a/spec.html b/spec.html index 3b1d3a5..36c3276 100644 --- a/spec.html +++ b/spec.html @@ -42,7 +42,7 @@ -

ACP Keyboard v4.0.1

+

ACP Keyboard v4.1.0

  1. Rationale
  2. Images
  3. @@ -139,8 +139,8 @@ ` ~ - | - ± + ± + 1 @@ -379,8 +379,8 @@ \ | - - + ê + Ê z @@ -533,8 +533,8 @@ ` ~ - | - ± + ± + 1 @@ -899,8 +899,8 @@ SC029 U+0060 ` U+007E ~ - U+007C | U+00B1 ± + E01 @@ -1238,8 +1238,8 @@ SC056 U+005C \ U+007C | - - + U+00EA ê + U+00CA Ê B01 diff --git a/xkb/symbols/acp b/xkb/symbols/acp index 1c3cf46..90478fc 100644 --- a/xkb/symbols/acp +++ b/xkb/symbols/acp @@ -3,7 +3,7 @@ xkb_symbols "basic" { name[Group1]= "ACP"; - key { [ U0060, U007E, U007C, U00B1 ] }; // ` ~ | ± + key { [ U0060, U007E, U00B1, NoSymbol ] }; // ` ~ ± key { [ U0031, U0021, U0021, U00A1 ] }; // 1 ! ! ¡ key { [ U0032, U0040, U2030, U00AB ] }; // 2 @ ‰ « key { [ U0033, U0023, U00A3, U00BB ] }; // 3 # £ » @@ -43,7 +43,7 @@ xkb_symbols "basic" { key { [ U0027, U0022, U201A, U201E ] }; // ' " ‚ „ key { [ U005C, U007C, NoSymbol, NoSymbol ] }; // \ | - key { [ U005C, U007C, NoSymbol, NoSymbol ] }; // \ | + key { [ U005C, U007C, U00EA, U00CA ] }; // \ | ê Ê key { [ U007A, U005A, U00E6, U00C6 ] }; // z Z æ Æ key { [ U0078, U0058, U0153, U0152 ] }; // x X œ Œ key { [ U0063, U0043, U00E7, U00C7 ] }; // c C ç Ç