Add ² and ³, move some keys around

This commit is contained in:
Anthony Rose 2024-07-20 21:59:10 +01:00
parent f06a5c14c3
commit 045a2e91c7
3 changed files with 79 additions and 77 deletions

View file

@ -115,39 +115,39 @@ dead_macron := Map.Call(
; E02 - SC003
;
>!SC003::Send "{U+2030}"
<^>!SC003::Send "{U+2030}"
; «
>!+SC003::Send "{U+00AB}"
<^>!+SC003::Send "{U+00AB}"
; ©
>!SC003::Send "{U+00A9}"
<^>!SC003::Send "{U+00A9}"
; ²
>!+SC003::Send "{U+00B2}"
<^>!+SC003::Send "{U+00B2}"
; E03 - SC004
; £
>!SC004::Send "{U+00A3}"
<^>!SC004::Send "{U+00A3}"
; »
>!+SC004::Send "{U+00BB}"
<^>!+SC004::Send "{U+00BB}"
; ³
>!+SC004::Send "{U+00B3}"
<^>!+SC004::Send "{U+00B3}"
; E04 - SC005
; ¢
>!SC005::Send "{U+00A2}"
<^>!SC005::Send "{U+00A2}"
;
>!+SC005::Send "{U+2039}"
<^>!+SC005::Send "{U+2039}"
;
>!+SC005::Send "{U+2105}"
<^>!+SC005::Send "{U+2105}"
; E05 - SC006
; €
>!SC006::Send "{U+20AC}"
<^>!SC006::Send "{U+20AC}"
;
>!+SC006::Send "{U+203A}"
<^>!+SC006::Send "{U+203A}"
;
>!+SC006::Send "{U+2030}"
<^>!+SC006::Send "{U+2030}"
; E06 - SC007
@ -181,18 +181,18 @@ dead_macron := Map.Call(
; ª
>!SC00A::Send "{U+00AA}"
<^>!SC00A::Send "{U+00AA}"
;
>!+SC00A::Send "{U+2105}"
<^>!+SC00A::Send "{U+2105}"
;
>!+SC00A::Send ""
<^>!+SC00A::Send ""
; E10 - SC00B
; º
>!SC00B::Send "{U+00BA}"
<^>!SC00B::Send "{U+00BA}"
; ©
>!+SC00B::Send "{U+00A9}"
<^>!+SC00B::Send "{U+00A9}"
;
>!+SC00B::Send ""
<^>!+SC00B::Send ""
; E11 - SC00C
@ -428,18 +428,18 @@ dead_macron := Map.Call(
Send deadac.Input
}
}
;
>!+SC022::Send ""
<^>!+SC022::Send ""
; «
>!+SC022::Send "{U+00AB}"
<^>!+SC022::Send "{U+00AB}"
; C06 - SC023
;
>!SC023::Send ""
<^>!SC023::Send ""
;
>!+SC023::Send ""
<^>!+SC023::Send ""
; »
>!+SC023::Send "{U+00BB}"
<^>!+SC023::Send "{U+00BB}"
; C07 - SC024
@ -464,9 +464,9 @@ dead_macron := Map.Call(
Send deadac.Input
}
}
;
>!+SC024::Send ""
<^>!+SC024::Send ""
;
>!+SC024::Send "{U+2039}"
<^>!+SC024::Send "{U+2039}"
; C08 - SC025
@ -491,9 +491,9 @@ dead_macron := Map.Call(
Send deadac.Input
}
}
;
>!+SC025::Send ""
<^>!+SC025::Send ""
;
>!+SC025::Send "{U+203A}"
<^>!+SC025::Send "{U+203A}"
; C09 - SC026

View file

@ -42,7 +42,7 @@
</style>
</head>
<body>
<h1>ACP Keyboard v4.4.0</h1>
<h1>ACP Keyboard v4.5.0</h1>
<ol>
<li><a href="#rationale">Rationale</a></li>
<li><a href="#images">Images</a></li>
@ -154,29 +154,29 @@
<rect x="160" y="0" width="80" height="80" />
<text x="170" y="70" class="layer1">&#x0032;</text>
<text x="170" y="10" class="layer2">&#x0040;</text>
<text x="230" y="70" class="layer3">&#x2030;</text>
<text x="230" y="10" class="layer4">&#x00ab;</text>
<text x="230" y="70" class="layer3">&#x00a9;</text>
<text x="230" y="10" class="layer4">&#x00b2;</text>
<!-- E03 -->
<rect x="240" y="0" width="80" height="80" />
<text x="250" y="70" class="layer1">&#x0033;</text>
<text x="250" y="10" class="layer2">&#x0023;</text>
<text x="310" y="70" class="layer3">&#x00a3;</text>
<text x="310" y="10" class="layer4">&#x00bb;</text>
<text x="310" y="10" class="layer4">&#x00b3;</text>
<!-- E04 -->
<rect x="320" y="0" width="80" height="80" />
<text x="330" y="70" class="layer1">&#x0034;</text>
<text x="330" y="10" class="layer2">&#x0024;</text>
<text x="390" y="70" class="layer3">&#x00a2;</text>
<text x="390" y="10" class="layer4">&#x2039;</text>
<text x="390" y="10" class="layer4">&#x2105;</text>
<!-- E05 -->
<rect x="400" y="0" width="80" height="80" />
<text x="410" y="70" class="layer1">&#x0035;</text>
<text x="410" y="10" class="layer2">&#x0025;</text>
<text x="470" y="70" class="layer3">&#x20ac;</text>
<text x="470" y="10" class="layer4">&#x203a;</text>
<text x="470" y="10" class="layer4">&#x2030;</text>
<!-- E06 -->
<rect x="480" y="0" width="80" height="80" />
@ -204,14 +204,14 @@
<text x="730" y="70" class="layer1">&#x0039;</text>
<text x="730" y="10" class="layer2">&#x0028;</text>
<text x="790" y="70" class="layer3">&#x00aa;</text>
<text x="790" y="10" class="layer4">&#x2105;</text>
<text x="790" y="10" class="layer4"></text>
<!-- E10 -->
<rect x="800" y="0" width="80" height="80" />
<text x="810" y="70" class="layer1">&#x0030;</text>
<text x="810" y="10" class="layer2">&#x0029;</text>
<text x="870" y="70" class="layer3">&#x00ba;</text>
<text x="870" y="10" class="layer4">&#x00a9;</text>
<text x="870" y="10" class="layer4"></text>
<!-- E11 -->
<rect x="880" y="0" width="80" height="80" />
@ -360,28 +360,28 @@
<text x="470" y="230" class="layer1">&#x0067;</text>
<text x="470" y="170" class="layer2">&#x0047;</text>
<text x="530" y="230" class="layer3 deadkey">&#x25cc;&#x0304;</text>
<text x="530" y="170" class="layer4"></text>
<text x="530" y="170" class="layer4">&#x00ab;</text>
<!-- C06 -->
<rect x="540" y="160" width="80" height="80" />
<text x="550" y="230" class="layer1">&#x0068;</text>
<text x="550" y="170" class="layer2">&#x0048;</text>
<text x="610" y="230" class="layer3"></text>
<text x="610" y="170" class="layer4"></text>
<text x="610" y="170" class="layer4">&#x00bb;</text>
<!-- C07 -->
<rect x="620" y="160" width="80" height="80" />
<text x="630" y="230" class="layer1">&#x006a;</text>
<text x="630" y="170" class="layer2">&#x004a;</text>
<text x="690" y="230" class="layer3 deadkey">&#x25cc;&#x0300;</text>
<text x="690" y="170" class="layer4"></text>
<text x="690" y="170" class="layer4">&#x2039;</text>
<!-- C08 -->
<rect x="700" y="160" width="80" height="80" />
<text x="710" y="230" class="layer1">&#x006b;</text>
<text x="710" y="170" class="layer2">&#x004b;</text>
<text x="770" y="230" class="layer3 deadkey">&#x25cc;&#x0302;</text>
<text x="770" y="170" class="layer4"></text>
<text x="770" y="170" class="layer4">&#x203a;</text>
<!-- C09 -->
<rect x="780" y="160" width="80" height="80" />
@ -608,29 +608,29 @@
<rect x="160" y="0" width="80" height="80" />
<text x="170" y="70" class="layer1">&#x0032;</text>
<text x="170" y="10" class="layer2">&#x0040;</text>
<text x="230" y="70" class="layer3">&#x2030;</text>
<text x="230" y="10" class="layer4">&#x00ab;</text>
<text x="230" y="70" class="layer3">&#x00a9;</text>
<text x="230" y="10" class="layer4">&#x00b2;</text>
<!-- E03 -->
<rect x="240" y="0" width="80" height="80" />
<text x="250" y="70" class="layer1">&#x0033;</text>
<text x="250" y="10" class="layer2">&#x0023;</text>
<text x="310" y="70" class="layer3">&#x00a3;</text>
<text x="310" y="10" class="layer4">&#x00bb;</text>
<text x="310" y="10" class="layer4">&#x00b3;</text>
<!-- E04 -->
<rect x="320" y="0" width="80" height="80" />
<text x="330" y="70" class="layer1">&#x0034;</text>
<text x="330" y="10" class="layer2">&#x0024;</text>
<text x="390" y="70" class="layer3">&#x00a2;</text>
<text x="390" y="10" class="layer4">&#x2039;</text>
<text x="390" y="10" class="layer4">&#x2105;</text>
<!-- E05 -->
<rect x="400" y="0" width="80" height="80" />
<text x="410" y="70" class="layer1">&#x0035;</text>
<text x="410" y="10" class="layer2">&#x0025;</text>
<text x="470" y="70" class="layer3">&#x20ac;</text>
<text x="470" y="10" class="layer4">&#x203a;</text>
<text x="470" y="10" class="layer4">&#x2030;</text>
<!-- E06 -->
<rect x="480" y="0" width="80" height="80" />
@ -658,14 +658,14 @@
<text x="730" y="70" class="layer1">&#x0039;</text>
<text x="730" y="10" class="layer2">&#x0028;</text>
<text x="790" y="70" class="layer3">&#x00aa;</text>
<text x="790" y="10" class="layer4">&#x2105;</text>
<text x="790" y="10" class="layer4"></text>
<!-- E10 -->
<rect x="800" y="0" width="80" height="80" />
<text x="810" y="70" class="layer1">&#x0030;</text>
<text x="810" y="10" class="layer2">&#x0029;</text>
<text x="870" y="70" class="layer3">&#x00ba;</text>
<text x="870" y="10" class="layer4">&#x00a9;</text>
<text x="870" y="10" class="layer4"></text>
<!-- E11 -->
<rect x="880" y="0" width="80" height="80" />
@ -821,28 +821,28 @@
<text x="470" y="230" class="layer1">&#x0067;</text>
<text x="470" y="170" class="layer2">&#x0047;</text>
<text x="530" y="230" class="layer3 deadkey">&#x25cc;&#x0304;</text>
<text x="530" y="170" class="layer4"></text>
<text x="530" y="170" class="layer4">&#x00ab;</text>
<!-- C06 -->
<rect x="540" y="160" width="80" height="80" />
<text x="550" y="230" class="layer1">&#x0068;</text>
<text x="550" y="170" class="layer2">&#x0048;</text>
<text x="610" y="230" class="layer3"></text>
<text x="610" y="170" class="layer4"></text>
<text x="610" y="170" class="layer4">&#x00bb;</text>
<!-- C07 -->
<rect x="620" y="160" width="80" height="80" />
<text x="630" y="230" class="layer1">&#x006a;</text>
<text x="630" y="170" class="layer2">&#x004a;</text>
<text x="690" y="230" class="layer3 deadkey">&#x25cc;&#x0300;</text>
<text x="690" y="170" class="layer4"></text>
<text x="690" y="170" class="layer4">&#x2039;</text>
<!-- C08 -->
<rect x="700" y="160" width="80" height="80" />
<text x="710" y="230" class="layer1">&#x006b;</text>
<text x="710" y="170" class="layer2">&#x004b;</text>
<text x="770" y="230" class="layer3 deadkey">&#x25cc;&#x0302;</text>
<text x="770" y="170" class="layer4"></text>
<text x="770" y="170" class="layer4">&#x203a;</text>
<!-- C09 -->
<rect x="780" y="160" width="80" height="80" />
@ -1038,8 +1038,8 @@
<td>SC003</td>
<td><span class="codepoint">U+0032</span> <span class="key-character">&#x0032;</span></td>
<td><span class="codepoint">U+0040</span> <span class="key-character">&#x0040;</span></td>
<td><span class="codepoint">U+2030</span> <span class="key-character">&#x2030;</span></td>
<td><span class="codepoint">U+00AB</span> <span class="key-character">&#x00ab;</span></td>
<td><span class="codepoint">U+00A9</span> <span class="key-character">&#x00a9;</span></td>
<td><span class="codepoint">U+00B2</span> <span class="key-character">&#x00b2;</span></td>
</tr>
<tr>
<td>E03</td>
@ -1048,7 +1048,7 @@
<td><span class="codepoint">U+0033</span> <span class="key-character">&#x0033;</span></td>
<td><span class="codepoint">U+0023</span> <span class="key-character">&#x0023;</span></td>
<td><span class="codepoint">U+00A3</span> <span class="key-character">&#x00a3;</span></td>
<td><span class="codepoint">U+00BB</span> <span class="key-character">&#x00bb;</span></td>
<td><span class="codepoint">U+00B3</span> <span class="key-character">&#x00b3;</span></td>
</tr>
<tr>
<td>E04</td>
@ -1057,7 +1057,7 @@
<td><span class="codepoint">U+0034</span> <span class="key-character">&#x0034;</span></td>
<td><span class="codepoint">U+0024</span> <span class="key-character">&#x0024;</span></td>
<td><span class="codepoint">U+00A2</span> <span class="key-character">&#x00a2;</span></td>
<td><span class="codepoint">U+2039</span> <span class="key-character">&#x2039;</span></td>
<td><span class="codepoint">U+2105</span> <span class="key-character">&#x2105;</span></td>
</tr>
<tr>
<td>E05</td>
@ -1066,7 +1066,7 @@
<td><span class="codepoint">U+0035</span> <span class="key-character">&#x0035;</span></td>
<td><span class="codepoint">U+0025</span> <span class="key-character">&#x0025;</span></td>
<td><span class="codepoint">U+20AC</span> <span class="key-character">&#x20ac;</span></td>
<td><span class="codepoint">U+203A</span> <span class="key-character">&#x203a;</span></td>
<td><span class="codepoint">U+2030</span> <span class="key-character">&#x2030;</span></td>
</tr>
<tr>
<td>E06</td>
@ -1102,7 +1102,7 @@
<td><span class="codepoint">U+0039</span> <span class="key-character">&#x0039;</span></td>
<td><span class="codepoint">U+0028</span> <span class="key-character">&#x0028;</span></td>
<td><span class="codepoint">U+00AA</span> <span class="key-character">&#x00aa;</span></td>
<td><span class="codepoint">U+2105</span> <span class="key-character">&#x2105;</span></td>
<td></td>
</tr>
<tr>
<td>E10</td>
@ -1111,7 +1111,7 @@
<td><span class="codepoint">U+0030</span> <span class="key-character">&#x0030;</span></td>
<td><span class="codepoint">U+0029</span> <span class="key-character">&#x0029;</span></td>
<td><span class="codepoint">U+00BA</span> <span class="key-character">&#x00ba;</span></td>
<td><span class="codepoint">U+00A9</span> <span class="key-character">&#x00a9;</span></td>
<td></td>
</tr>
<tr>
<td>E11</td>
@ -1295,7 +1295,7 @@
<td><span class="codepoint">U+0067</span> <span class="key-character">&#x0067;</span></td>
<td><span class="codepoint">U+0047</span> <span class="key-character">&#x0047;</span></td>
<td class="deadkey"><span class="codepoint">DEADMA</span> <span class="key-character">&#x25cc;&#x0304;</span></td>
<td></td>
<td><span class="codepoint">U+00AB</span> <span class="key-character">&#x00ab;</span></td>
</tr>
<tr>
<td>C06</td>
@ -1304,7 +1304,7 @@
<td><span class="codepoint">U+0068</span> <span class="key-character">&#x0068;</span></td>
<td><span class="codepoint">U+0048</span> <span class="key-character">&#x0048;</span></td>
<td></td>
<td></td>
<td><span class="codepoint">U+00BB</span> <span class="key-character">&#x00bb;</span></td>
</tr>
<tr>
<td>C07</td>
@ -1313,7 +1313,7 @@
<td><span class="codepoint">U+006A</span> <span class="key-character">&#x006a;</span></td>
<td><span class="codepoint">U+004A</span> <span class="key-character">&#x004a;</span></td>
<td class="deadkey"><span class="codepoint">DEADGR</span> <span class="key-character">&#x25cc;&#x0300;</span></td>
<td></td>
<td><span class="codepoint">U+2039</span> <span class="key-character">&#x2039;</span></td>
</tr>
<tr>
<td>C08</td>
@ -1322,7 +1322,7 @@
<td><span class="codepoint">U+006B</span> <span class="key-character">&#x006b;</span></td>
<td><span class="codepoint">U+004B</span> <span class="key-character">&#x004b;</span></td>
<td class="deadkey"><span class="codepoint">DEADCI</span> <span class="key-character">&#x25cc;&#x0302;</span></td>
<td></td>
<td><span class="codepoint">U+203A</span> <span class="key-character">&#x203a;</span></td>
</tr>
<tr>
<td>C09</td>
@ -1969,6 +1969,8 @@
<li><span class="codepoint">U+00AF</span> MACRON</li>
<li><span class="codepoint">U+00B0</span> DEGREE SIGN</li>
<li><span class="codepoint">U+00B1</span> PLUS-MINUS SIGN</li>
<li><span class="codepoint">U+00B2</span> SUPERSCRIPT TWO</li>
<li><span class="codepoint">U+00B3</span> SUPERSCRIPT THREE</li>
<li><span class="codepoint">U+00B6</span> PILCROW SIGN</li>
<li><span class="codepoint">U+00BA</span> MASCULINE ORDINAL INDICATOR</li>
<li><span class="codepoint">U+00BB</span> RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK</li>

View file

@ -5,15 +5,15 @@ xkb_symbols "basic" {
key <TLDE> { [ U0060, U007E, U2248, U00B1 ] }; // ` ~ ≈ ±
key <AE01> { [ U0031, U0021, U0021, U00A1 ] }; // 1 ! ! ¡
key <AE02> { [ U0032, U0040, U2030, U00AB ] }; // 2 @ ‰ «
key <AE03> { [ U0033, U0023, U00A3, U00BB ] }; // 3 # £ »
key <AE04> { [ U0034, U0024, U00A2, U2039 ] }; // 4 $ ¢
key <AE05> { [ U0035, U0025, U20AC, U203A ] }; // 5 % €
key <AE02> { [ U0032, U0040, U00A9, U00B2 ] }; // 2 @ © ²
key <AE03> { [ U0033, U0023, U00A3, U00B3 ] }; // 3 # £ ³
key <AE04> { [ U0034, U0024, U00A2, U2105 ] }; // 4 $ ¢ ℅
key <AE05> { [ U0035, U0025, U20AC, U2030 ] }; // 5 % € ‰
key <AE06> { [ U0036, U005E, U221A, U2713 ] }; // 6 ^ √ ✓
key <AE07> { [ U0037, U0026, U204A, U2717 ] }; // 7 & ⁊ ✗
key <AE08> { [ U0038, U002A, U00B0, U2022 ] }; // 8 * ° •
key <AE09> { [ U0039, U0028, U00AA, U2105 ] }; // 9 ( ª ℅
key <AE10> { [ U0030, U0029, U00BA, U00A9 ] }; // 0 ) º ©
key <AE09> { [ U0039, U0028, U00AA, NoSymbol ] }; // 9 ( ª
key <AE10> { [ U0030, U0029, U00BA, NoSymbol ] }; // 0 ) º
key <AE11> { [ U002D, U005F, U2212, U00F7 ] }; // - _ ÷
key <AE12> { [ U003D, U002B, U00D7, U2260 ] }; // + = ×
@ -34,10 +34,10 @@ xkb_symbols "basic" {
key <AC02> { [ U0073, U0053, U00DF, U1E9E ] }; // s S ß ẞ
key <AC03> { [ U0064, U0044, dead_diaeresis, U2033 ] }; // d D ¨◌ ″
key <AC04> { [ U0066, U0046, dead_acute, U2032 ] }; // f F ´◌
key <AC05> { [ U0067, U0047, dead_macron, NoSymbol ] }; // g G ¯◌
key <AC06> { [ U0068, U0048, NoSymbol, NoSymbol ] }; // h H
key <AC07> { [ U006A, U004A, dead_grave, NoSymbol ] }; // j J `◌
key <AC08> { [ U006B, U004B, dead_circumflex, NoSymbol ] }; // k K ^◌
key <AC05> { [ U0067, U0047, dead_macron, U00AB ] }; // g G ¯◌ «
key <AC06> { [ U0068, U0048, NoSymbol, U00BB ] }; // h H »
key <AC07> { [ U006A, U004A, dead_grave, U2039 ] }; // j J `◌
key <AC08> { [ U006B, U004B, dead_circumflex, U203A ] }; // k K ^◌
key <AC09> { [ U006C, U004C, U00F4, U00D4 ] }; // l L ô Ô
key <AC10> { [ U003B, U003A, U003B, U003A ] }; // ; : ; :
key <AC11> { [ U0027, U0022, U201A, U201E ] }; // ' "