keyboard/altgr/macos-abc: close emphasis in intro text

[sheet.git] / keyboard / altgr / macos-abc.eng.inc.pl

diff --git a/keyboard/altgr/macos-abc.eng.inc.pl b/keyboard/altgr/macos-abc.eng.inc.pl
index 110008a5912f13c6175ce67e2a0ab3c62fdecf2e..9b61a9c0e19a6621b1945a5b56ce5669569c9fb1 100644 (file)
--- a/keyboard/altgr/macos-abc.eng.inc.pl
+++ b/keyboard/altgr/macos-abc.eng.inc.pl
@@ -1,7 +1,10 @@
 use utf8;
 use strict;
 use warnings;
-our %rows = (
+use Shiar_Sheet::KeyboardChars 'kbmodes';
+
+my %rows = (
+       '' => {
        'A' => "\N{MACRON}",
        'a' => "\N{COMBINING MACRON}",
        'B' => "\N{BREVE}",
@@ -22,17 +25,17 @@ our %rows = (
        'i' => "\N{COMBINING COMMA ABOVE}",
        'J' => "\N{DOUBLE ACUTE ACCENT}",
        'j' => "\N{COMBINING DOUBLE ACUTE ACCENT}",
-       'K' => '°',
+       'K' => "\N{RING ABOVE}",
        'k' => "\N{COMBINING RING ABOVE}",
        'L' => '-',
-       'l' => "\N{COMBINING SHORT STROKE OVERLAY}", #XXX
+       'l' => "\N{COMBINING SHORT STROKE OVERLAY}", # precomposed ŧʉɨɵđǥħłƶƀ
        'M' => "\N{OGONEK}",
        'm' => "\N{COMBINING OGONEK}",
        'N' => "\N{SMALL TILDE}",
        'n' => "\N{COMBINING TILDE}",
        'O' => 'Ø',
        'o' => 'ø',
-       'P' => "\N{SINGLE LOW-9 QUOTATION MARK}", #XXX
+       'P' => ',',
        'p' => "\N{COMBINING COMMA BELOW}",
        'Q' => 'Œ',
        'q' => 'œ',
@@ -48,7 +51,7 @@ our %rows = (
        'v' => "\N{COMBINING CARON}",
        'W' => "\N{DOT ABOVE}",
        'w' => "\N{COMBINING DOT ABOVE}",
-       'X' => "\N{MODIFIER LETTER LOW RING}", #XXX
+       'X' => '.',
        'x' => "\N{COMBINING DOT BELOW}",
        'Y' => "\N{COMBINING DOUBLE GRAVE ACCENT}",
        'y' => '¥',
@@ -83,7 +86,7 @@ our %rows = (
        '5' => '§',
        '%' => '†',
        '6' => "\N{COMBINING CIRCUMFLEX ACCENT}",
-       '^' => "\N{MODIFIER LETTER CIRCUMFLEX ACCENT}", #XXX
+       '^' => "\N{MODIFIER LETTER CIRCUMFLEX ACCENT}",
        '7' => '¶',
        '&' => '‡',
        '8' => '•',
@@ -96,114 +99,108 @@ our %rows = (
        '_' => '—',
        '+' => '±',
        '=' => '≠',
+       },
 
-       '::' => ' ',
-       ':@' => 'Ƨ',
-       ':2' => 'ƨ',
-       ':#' => 'Ɛ',
-       ':3' => 'ɛ',
-       ':%' => 'Ƽ',
-       ':5' => 'ƽ',
-       ':^' => 'Ƅ',
-       ':6' => 'ƅ', #XXX
-       ':7' => '⁊',
-       ':*' => 'Ȣ',
-       ':8' => 'ȣ',
-       ':Q' => 'Ƣ',
-       ':q' => 'ƣ',
-       ':W' => 'Ƿ',
-       ':w' => 'ƿ',
-       ':E' => 'Ǝ',
-       ':e' => 'ǝ', #XXX ə
-       ':R' => 'Ʀ',
-       ':r' => 'ʀ', #XXX
-       ':k' => 'ĸ',
-       ':Y' => 'Ɜ',
-       ':y' => 'ɜ',
-       ':U' => 'Ʊ',
-       ':u' => 'ʊ',
-       ':A' => 'Ə',
-       ':a' => 'ə',
-       ':s' => 'ſ',
-       ':G' => 'Ɣ',
-       ':g' => 'ɣ',
-       ':H' => 'Ƕ',
-       ':h' => 'ƕ',
-       ':J' => 'Ƞ',
-       ':j' => 'ƞ', #XXX ɳ
-       ':K' => 'Ǩ',
-       ':Z' => 'Ʒ',
-       ':z' => 'ʒ',
-       ':C' => 'Ɔ',
-       ':c' => 'ɔ',
-       ':v' => 'ʌ',
-       ':N' => 'Ŋ', #XXX
-       ':n' => 'ŋ',
-       ':M' => 'Ɯ',
-       ':m' => 'ɯ',
-       ':"' => '″', #XXX ʺ
-       ":'" => '′', #XXX ʹ
+       ':' => {
+               '@' => 'Ƨ',
+               '2' => 'ƨ',
+               '#' => 'Ɛ',
+               '3' => 'ɛ',
+               '%' => 'Ƽ',
+               '5' => 'ƽ',
+               '^' => 'Ƅ',
+               '6' => 'ƅ',
+               '7' => '⁊',
+               '*' => 'Ȣ',
+               '8' => 'ȣ',
+               'Q' => 'Ƣ',
+               'q' => 'ƣ',
+               'W' => 'Ƿ',
+               'w' => 'ƿ',
+               'E' => 'Ǝ',
+               'e' => 'ǝ',
+               'R' => 'Ʀ',
+               'r' => 'ʀ',
+               'k' => 'ĸ',
+               'Y' => 'Ȝ',
+               'y' => 'ȝ',
+               'U' => 'Ʊ',
+               'u' => 'ʊ',
+               'A' => 'Ə',
+               'a' => 'ə',
+               's' => 'ſ',
+               'G' => 'Ɣ',
+               'g' => 'ɣ',
+               'H' => 'Ƕ',
+               'h' => 'ƕ',
+               'J' => 'Ƞ',
+               'j' => 'ƞ',
+               'K' => 'Ǩ',
+               'Z' => 'Ʒ',
+               'z' => 'ʒ',
+               'C' => 'Ɔ',
+               'c' => 'ɔ',
+               'v' => 'ʌ',
+               'N' => 'Ŋ',
+               'n' => 'ŋ',
+               'M' => 'Ɯ',
+               'm' => 'ɯ',
+               '"' => 'ʺ',
+               "'" => 'ʹ',
+       },
 
-       '>>' => ' ',
-       '>q' => 'ʠ',
-       '>R' => 'Ʈ', #XXX mirrored?
-       '>r' => 'ʈ',
-       '>T' => 'Ƭ',
-       '>t' => 'ƭ',
-       '>Y' => 'Ƴ',
-       '>y' => 'ƴ',
-       '>U' => 'Ʋ',
-       '>u' => 'ʋ',
-       '>I' => 'Ɩ',
-       '>i' => 'ɩ',
-       '>P' => 'Ƥ',
-       '>p' => 'ƥ',
-       '>S' => 'Ʃ',
-       '>s' => 'ʃ',
-       '>D' => 'Ɗ',
-       '>d' => 'ɗ',
-       '>F' => 'Ƒ',
-       '>f' => 'ƒ',
-       '>G' => 'Ɠ',
-       '>g' => 'ɠ',
-       '>h' => 'ɦ',
-       '>K' => 'Ƙ',
-       '>k' => 'ƙ',
-       '>Z' => 'Ȥ',
-       '>z' => 'ȥ',
-       '>X' => 'Ɖ',
-       '>x' => 'ɖ',
-       '>C' => 'Ƈ',
-       '>c' => 'ƈ',
-       '>N' => 'Ɲ',
-       '>n' => 'ɲ',
-       '>B' => 'Ɓ',
-       '>b' => 'ɓ',
+       '>' => {
+               'q' => 'ʠ',
+               'R' => 'Ʈ', # mirrored preview
+               'r' => 'ʈ',
+               'T' => 'Ƭ',
+               't' => 'ƭ',
+               'Y' => 'Ƴ',
+               'y' => 'ƴ',
+               'U' => 'Ʋ',
+               'u' => 'ʋ',
+               'I' => 'Ɩ',
+               'i' => 'ɩ',
+               'P' => 'Ƥ',
+               'p' => 'ƥ',
+               'S' => 'Ʃ',
+               's' => 'ʃ',
+               'D' => 'Ɗ',
+               'd' => 'ɗ',
+               'F' => 'Ƒ',
+               'f' => 'ƒ',
+               'G' => 'Ɠ',
+               'g' => 'ɠ',
+               'h' => 'ɦ',
+               'K' => 'Ƙ',
+               'k' => 'ƙ',
+               'Z' => 'Ȥ',
+               'z' => 'ȥ',
+               'X' => 'Ɖ',
+               'x' => 'ɖ',
+               'C' => 'Ƈ',
+               'c' => 'ƈ',
+               'N' => 'Ɲ',
+               'n' => 'ɲ',
+               'B' => 'Ɓ',
+               'b' => 'ɓ',
+       },
 );
 
-my $groups = do 'keyboard/altgr/groups.inc.pl';
-$groups->{mode} = {
-       ''  => 'option-shifted ⌥',
-       ':' => '№ number prefix ⌥:',
-       '>' => 'ʔ hook prefix ⌥>',
-};
-for my $m (qw' : > ') {
-       $groups->{def}->{''}->{$m} = "g1 mode$m";
-       $groups->{mode}->{$m} //= "mode $m";
-       $groups->{def}->{$m} = {
-               (map {s/^.//r => 'g0'} grep {/^\Q$m/} keys %rows),
-               $m => 'g1 mode',
-       };
-}
-$groups->{flag}->{g1} = ['mode' => "switch to an alternate set of keys"];
-
 +{
-       %{$groups},
-       version => '1.0',
+       %{ kbmodes(\%rows) },
+       mode => {
+               ''  => 'option-shifted ⌥',
+               ':' => '№ number prefix ⌥:',
+               '>' => 'ʔ hook prefix ⌥>',
+       },
+       version => '1.1',
        title => 'ABC option',
+       category => '2/latin/macos',
        intro => join("\n",
                'Resulting <a href="/unicode">selection</a> of <a href="/charset">Unicode</a> characters',
-               "while pressing ⌥ Option (Alt) with Apple's ABC Extended",
+               "while pressing ⌥ Option (Alt) with Apple's",
+               'ABC <em title="distinct from just ABC">Extended</em>',
                "(formerly US Extended and Extended Roman) layout",
                'on <abbr title="at least in Ventura 13.2">macOS</abbr>.',
                'Significant changes from standard',
@@ -213,4 +210,6 @@ $groups->{flag}->{g1} = ['mode' => "switch to an alternate set of keys"];
                "Apple ABC Extended keyboard layout table",
                "with the Option modifier key.",
        ],
+       image => 'data/keyboard/thumb/macbook-gray.jpg',
+       imagealt => 'Option key on a black MacBook',
 }