keyboard/altgr/macos: describe exceptions in nl language variant

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

diff --git a/keyboard/altgr/macos.eng.inc.pl b/keyboard/altgr/macos.eng.inc.pl
index 9dfab2c72e666b6057e37d4f2acaf5034e3bb122..b62c871462d3014a1bd6cbd7780eab258b6fb37e 100644 (file)
--- a/keyboard/altgr/macos.eng.inc.pl
+++ b/keyboard/altgr/macos.eng.inc.pl
@@ -1,6 +1,8 @@
 use utf8;
 use strict;
 use warnings;
+use Shiar_Sheet::KeyboardChars 'kbchars';
+
 our %rows = (
        'A' => 'Å',
        'a' => 'å',
@@ -23,7 +25,7 @@ our %rows = (
        'J' => 'Ô',
        'j' => '∆',
        'K' => '',
-       'k' => '°',
+       'k' => '˚', # really
        'L' => 'Ò',
        'l' => '¬',
        'M' => 'Â',
@@ -32,8 +34,8 @@ our %rows = (
        'n' => "\N{COMBINING TILDE}",
        'O' => 'Ø',
        'o' => 'ø',
-       'p' => 'π',
        'P' => '∏',
+       'p' => 'π',
        'Q' => 'Œ',
        'q' => 'œ',
        'R' => '‰',
@@ -51,7 +53,7 @@ our %rows = (
        'X' => "\N{OGONEK}",
        'x' => '≈',
        'Y' => 'Á',
-       'y' => '¥',
+       'y' => '¥', # terminal substitutes \
        'Z' => "\N{CEDILLA}",
        'z' => 'Ω',
        '[' => "\N{LEFT DOUBLE QUOTATION MARK}",
@@ -99,18 +101,21 @@ our %rows = (
 );
 
 +{
-       %{ do 'keyboard/altgr/groups.inc.pl' },
-       version => '1.3',
-       title => 'option key',
+       %{ kbchars(\%rows) },
+       version => '1.4',
+       title => 'US option',
+       category => '2/latin/macos',
        intro => join("\n",
-               'Special <a href="/unicode">characters</a>',
-               "when pressing ⌥ Option (Alt) with Apple's US (or US International) layout",
+               'Resulting <a href="/unicode">selection</a> of <a href="/charset">Unicode</a> characters',
+               "while pressing ⌥ Option (Alt) with Apple's US (or US International) layout",
                'on <abbr title="at least in Ventura 13.2">macOS</abbr>.',
-               q{Not to be confused with <a href="/keyboard/altgr/windows">Windows'</a> AltGr keys.},
+               q{An alternative <a href="/keyboard/altgr/macos-abc">ABC Extended</a> is also available.},
+               q{Different from <a href="/keyboard/altgr/windows">AltGr</a> on Windows.},
        ),
        description => [
                "Apple US International keyboard layout table",
                "with the Option modifier key.",
        ],
-       image => 'keyboard/altgr/macoption.jpg',
+       image => 'data/keyboard/thumb/matias-fk302.jpg',
+       imagealt => 'Option key on a Matias Tactile Pro keyboard with USA keycaps',
 }