ant/keyboard
1
0
Fork 0
Code Issues Pull requests Projects Releases 5 Packages Wiki Activity Actions

Move U+00A9 and U+2122; add U+03A9; replace U+00B5 with U+03BC

Browse source
This commit is contained in:
Anthony Rose 2024-06-24 17:42:15 +01:00
parent 89143b9df6
commit 63a50fbf71
3 changed files with 30 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
ahk/acp-keyboard.ahk
View file

@ -190,9 +190,9 @@ dead_macron := Map.Call(
; º ; º
>!SC00B::Send "{U+00BA}" >!SC00B::Send "{U+00BA}"
<^>!SC00B::Send "{U+00BA}" <^>!SC00B::Send "{U+00BA}"
; ; ©
>!+SC00B::Send "" >!+SC00B::Send "{U+00A9}"
<^>!+SC00B::Send "" <^>!+SC00B::Send "{U+00A9}"
; E11 - SC00C ; E11 - SC00C
@ -264,9 +264,9 @@ dead_macron := Map.Call(
; ® ; ®
>!SC014::Send "{U+00AE}" >!SC014::Send "{U+00AE}"
<^>!SC014::Send "{U+00AE}" <^>!SC014::Send "{U+00AE}"
; © ; ™
>!+SC014::Send "{U+00A9}" >!+SC014::Send "{U+2122}"
<^>!+SC014::Send "{U+00A9}" <^>!+SC014::Send "{U+2122}"
; D06 - SC015 ; D06 - SC015
@ -598,12 +598,12 @@ dead_macron := Map.Call(
; B07 - SC032 ; B07 - SC032
; µ ; μ
>!SC032::Send "{U+00B5}" >!SC032::Send "{U+03BC}"
<^>!SC032::Send "{U+00B5}" <^>!SC032::Send "{U+03BC}"
; ™ ; Ω
>!+SC032::Send "{U+2122}" >!+SC032::Send "{U+03A9}"
<^>!+SC032::Send "{U+2122}" <^>!+SC032::Send "{U+03A9}"
; B08 - SC033 ; B08 - SC033

29
spec.html
View file

@ -42,7 +42,7 @@
</style> </style>
</head> </head>
<body> <body>
<h1>ACP Keyboard v4.2.0</h1> <h1>ACP Keyboard v4.3.0</h1>
<ol> <ol>
<li><a href="#rationale">Rationale</a></li> <li><a href="#rationale">Rationale</a></li>
<li><a href="#images">Images</a></li> <li><a href="#images">Images</a></li>
@ -200,7 +200,7 @@
<text x="810" y="70" class="layer1">&#x0030;</text> <text x="810" y="70" class="layer1">&#x0030;</text>
<text x="810" y="10" class="layer2">&#x0029;</text> <text x="810" y="10" class="layer2">&#x0029;</text>
<text x="870" y="70" class="layer3">&#x00ba;</text> <text x="870" y="70" class="layer3">&#x00ba;</text>
<text x="870" y="10" class="layer4"></text> <text x="870" y="10" class="layer4">&#x00a9;</text>
<rect x="880" y="0" width="80" height="80" /> <rect x="880" y="0" width="80" height="80" />
<text x="890" y="70" class="layer1">&#x002d;</text> <text x="890" y="70" class="layer1">&#x002d;</text>
@ -250,7 +250,7 @@
<text x="450" y="150" class="layer1">&#x0074;</text> <text x="450" y="150" class="layer1">&#x0074;</text>
<text x="450" y="90" class="layer2">&#x0054;</text> <text x="450" y="90" class="layer2">&#x0054;</text>
<text x="510" y="150" class="layer3">&#x00ae;</text> <text x="510" y="150" class="layer3">&#x00ae;</text>
<text x="510" y="90" class="layer4">&#x00a9;</text> <text x="510" y="90" class="layer4">&#x2122;</text>
<rect x="520" y="80" width="80" height="80" /> <rect x="520" y="80" width="80" height="80" />
<text x="530" y="150" class="layer1">&#x0079;</text> <text x="530" y="150" class="layer1">&#x0079;</text>
@ -421,8 +421,8 @@
<rect x="660" y="240" width="80" height="80" /> <rect x="660" y="240" width="80" height="80" />
<text x="670" y="310" class="layer1">&#x006d;</text> <text x="670" y="310" class="layer1">&#x006d;</text>
<text x="670" y="250" class="layer2">&#x004d;</text> <text x="670" y="250" class="layer2">&#x004d;</text>
<text x="730" y="310" class="layer3">&#x00b5;</text> <text x="730" y="310" class="layer3">&#x03bc;</text>
<text x="730" y="250" class="layer4">&#x2122;</text> <text x="730" y="250" class="layer4">&#x03a9;</text>
<rect x="740" y="240" width="80" height="80" /> <rect x="740" y="240" width="80" height="80" />
<text x="750" y="310" class="layer1">&#x002c;</text> <text x="750" y="310" class="layer1">&#x002c;</text>
@ -594,7 +594,7 @@
<text x="810" y="70" class="layer1">&#x0030;</text> <text x="810" y="70" class="layer1">&#x0030;</text>
<text x="810" y="10" class="layer2">&#x0029;</text> <text x="810" y="10" class="layer2">&#x0029;</text>
<text x="870" y="70" class="layer3">&#x00ba;</text> <text x="870" y="70" class="layer3">&#x00ba;</text>
<text x="870" y="10" class="layer4"></text> <text x="870" y="10" class="layer4">&#x00a9;</text>
<rect x="880" y="0" width="80" height="80" /> <rect x="880" y="0" width="80" height="80" />
<text x="890" y="70" class="layer1">&#x002d;</text> <text x="890" y="70" class="layer1">&#x002d;</text>
@ -644,7 +644,7 @@
<text x="450" y="150" class="layer1">&#x0074;</text> <text x="450" y="150" class="layer1">&#x0074;</text>
<text x="450" y="90" class="layer2">&#x0054;</text> <text x="450" y="90" class="layer2">&#x0054;</text>
<text x="510" y="150" class="layer3">&#x00ae;</text> <text x="510" y="150" class="layer3">&#x00ae;</text>
<text x="510" y="90" class="layer4">&#x00a9;</text> <text x="510" y="90" class="layer4">&#x2122;</text>
<rect x="520" y="80" width="80" height="80" /> <rect x="520" y="80" width="80" height="80" />
<text x="530" y="150" class="layer1">&#x0079;</text> <text x="530" y="150" class="layer1">&#x0079;</text>
@ -812,8 +812,8 @@
<rect x="660" y="240" width="80" height="80" /> <rect x="660" y="240" width="80" height="80" />
<text x="670" y="310" class="layer1">&#x006d;</text> <text x="670" y="310" class="layer1">&#x006d;</text>
<text x="670" y="250" class="layer2">&#x004d;</text> <text x="670" y="250" class="layer2">&#x004d;</text>
<text x="730" y="310" class="layer3">&#x00b5;</text> <text x="730" y="310" class="layer3">&#x03bc;</text>
<text x="730" y="250" class="layer4">&#x2122;</text> <text x="730" y="250" class="layer4">&#x03a9;</text>
<rect x="740" y="240" width="80" height="80" /> <rect x="740" y="240" width="80" height="80" />
<text x="750" y="310" class="layer1">&#x002c;</text> <text x="750" y="310" class="layer1">&#x002c;</text>
@ -990,7 +990,7 @@
<td><span class="codepoint">U+0030</span> <span class="key-character">&#x0030;</span></td> <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+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+00BA</span> <span class="key-character">&#x00ba;</span></td>
<td></td> <td><span class="codepoint">U+00A9</span> <span class="key-character">&#x00a9;</span></td>
</tr> </tr>
<tr> <tr>
<td>E11</td> <td>E11</td>
@ -1055,7 +1055,7 @@
<td><span class="codepoint">U+0074</span> <span class="key-character">&#x0074;</span></td> <td><span class="codepoint">U+0074</span> <span class="key-character">&#x0074;</span></td>
<td><span class="codepoint">U+0054</span> <span class="key-character">&#x0054;</span></td> <td><span class="codepoint">U+0054</span> <span class="key-character">&#x0054;</span></td>
<td><span class="codepoint">U+00AE</span> <span class="key-character">&#x00ae;</span></td> <td><span class="codepoint">U+00AE</span> <span class="key-character">&#x00ae;</span></td>
<td><span class="codepoint">U+00A9</span> <span class="key-character">&#x00a9;</span></td> <td><span class="codepoint">U+2122</span> <span class="key-character">&#x2122;</span></td>
</tr> </tr>
<tr> <tr>
<td>D06</td> <td>D06</td>
@ -1301,8 +1301,8 @@
<td>SC032</td> <td>SC032</td>
<td><span class="codepoint">U+006D</span> <span class="key-character">&#x006d;</span></td> <td><span class="codepoint">U+006D</span> <span class="key-character">&#x006d;</span></td>
<td><span class="codepoint">U+004D</span> <span class="key-character">&#x004d;</span></td> <td><span class="codepoint">U+004D</span> <span class="key-character">&#x004d;</span></td>
<td><span class="codepoint">U+00B5</span> <span class="key-character">&#x00b5;</span></td> <td><span class="codepoint">U+03BC</span> <span class="key-character">&#x03bc;</span></td>
<td><span class="codepoint">U+2122</span> <span class="key-character">&#x2122;</span></td> <td><span class="codepoint">U+03A9</span> <span class="key-character">&#x03a9;</span></td>
</tr> </tr>
<tr> <tr>
<td>B08</td> <td>B08</td>
@ -1848,7 +1848,6 @@
<li><span class="codepoint">U+00AF</span> MACRON</li> <li><span class="codepoint">U+00AF</span> MACRON</li>
<li><span class="codepoint">U+00B0</span> DEGREE SIGN</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+00B1</span> PLUS-MINUS SIGN</li>
<li><span class="codepoint">U+00B5</span> MICRO SIGN</li>
<li><span class="codepoint">U+00B6</span> PILCROW SIGN</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+00BA</span> MASCULINE ORDINAL INDICATOR</li>
<li><span class="codepoint">U+00BB</span> RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK</li> <li><span class="codepoint">U+00BB</span> RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK</li>
@ -1930,6 +1929,8 @@
<li><span class="codepoint">U+0304</span> COMBINING MACRON</li> <li><span class="codepoint">U+0304</span> COMBINING MACRON</li>
<li><span class="codepoint">U+0308</span> COMBINING DIAERESIS</li> <li><span class="codepoint">U+0308</span> COMBINING DIAERESIS</li>
<li><span class="codepoint">U+0327</span> COMBINING CEDILLA</li> <li><span class="codepoint">U+0327</span> COMBINING CEDILLA</li>
<li><span class="codepoint">U+03A9</span> GREEK CAPITAL LETTER OMEGA</li>
<li><span class="codepoint">U+03BC</span> GREEK SMALL LETTER MU</li>
<li><span class="codepoint">U+1E80</span> LATIN CAPITAL LETTER W WITH GRAVE</li> <li><span class="codepoint">U+1E80</span> LATIN CAPITAL LETTER W WITH GRAVE</li>
<li><span class="codepoint">U+1E81</span> LATIN SMALL LETTER W WITH GRAVE</li> <li><span class="codepoint">U+1E81</span> LATIN SMALL LETTER W WITH GRAVE</li>
<li><span class="codepoint">U+1E82</span> LATIN CAPITAL LETTER W WITH ACUTE</li> <li><span class="codepoint">U+1E82</span> LATIN CAPITAL LETTER W WITH ACUTE</li>

6
xkb/symbols/acp
View file

@ -13,7 +13,7 @@ xkb_symbols "basic" {
key <AE07> { [ U0037, U0026, U204A, U2717 ] }; // 7 & ⁊ ✗ key <AE07> { [ U0037, U0026, U204A, U2717 ] }; // 7 & ⁊ ✗
key <AE08> { [ U0038, U002A, U00B0, U2022 ] }; // 8 * ° • key <AE08> { [ U0038, U002A, U00B0, U2022 ] }; // 8 * ° •
key <AE09> { [ U0039, U0028, U00AA, NoSymbol ] }; // 9 ( ª key <AE09> { [ U0039, U0028, U00AA, NoSymbol ] }; // 9 ( ª
key <AE10> { [ U0030, U0029, U00BA, NoSymbol ] }; // 0 ) º key <AE10> { [ U0030, U0029, U00BA, U00A9 ] }; // 0 ) º ©
key <AE11> { [ U002D, U005F, U2212, U00F7 ] }; // - _ − ÷ key <AE11> { [ U002D, U005F, U2212, U00F7 ] }; // - _ − ÷
key <AE12> { [ U003D, U002B, U00D7, U2260 ] }; // + = × ≠ key <AE12> { [ U003D, U002B, U00D7, U2260 ] }; // + = × ≠
@ -21,7 +21,7 @@ xkb_symbols "basic" {
key <AD02> { [ U0077, U0057, U00E9, U00C9 ] }; // w W é É key <AD02> { [ U0077, U0057, U00E9, U00C9 ] }; // w W é É
key <AD03> { [ U0065, U0045, U00EB, U00CB ] }; // e E ë Ë key <AD03> { [ U0065, U0045, U00EB, U00CB ] }; // e E ë Ë
key <AD04> { [ U0072, U0052, U00E8, U00C8 ] }; // r R è È key <AD04> { [ U0072, U0052, U00E8, U00C8 ] }; // r R è È
key <AD05> { [ U0074, U0054, U00AE, U00A9 ] }; // t T ® © key <AD05> { [ U0074, U0054, U00AE, U2122 ] }; // t T ® ™
key <AD06> { [ U0079, U0059, U00FB, U00DB ] }; // y Y û Û key <AD06> { [ U0079, U0059, U00FB, U00DB ] }; // y Y û Û
key <AD07> { [ U0075, U0055, U00FC, U00DC ] }; // u U ü Ü key <AD07> { [ U0075, U0055, U00FC, U00DC ] }; // u U ü Ü
key <AD08> { [ U0069, U0049, U00EF, U00CF ] }; // i I ï Ï key <AD08> { [ U0069, U0049, U00EF, U00CF ] }; // i I ï Ï
@ -50,7 +50,7 @@ xkb_symbols "basic" {
key <AB04> { [ U0076, U0056, U2014, NoSymbol ] }; // v V — key <AB04> { [ U0076, U0056, U2014, NoSymbol ] }; // v V —
key <AB05> { [ U0062, U0042, U2013, NoSymbol ] }; // b B – key <AB05> { [ U0062, U0042, U2013, NoSymbol ] }; // b B –
key <AB06> { [ U006E, U004E, U00F1, U00D1 ] }; // n N ñ Ñ key <AB06> { [ U006E, U004E, U00F1, U00D1 ] }; // n N ñ Ñ
key <AB07> { [ U006D, U004D, U00B5, U2122 ] }; // m M µ ™ key <AB07> { [ U006D, U004D, U03BC, U03A9 ] }; // m M μ Ω
key <AB08> { [ U002C, U003C, U2026, U2264 ] }; // , < … ≤ key <AB08> { [ U002C, U003C, U2026, U2264 ] }; // , < … ≤
key <AB09> { [ U002E, U003E, U22C5, U2265 ] }; // . > ⋅ ≥ key <AB09> { [ U002E, U003E, U22C5, U2265 ] }; // . > ⋅ ≥
key <AB10> { [ U002F, U003F, U003F, U00BF ] }; // / ? ? ¿ key <AB10> { [ U002F, U003F, U003F, U00BF ] }; // / ? ? ¿