keyboard/altgr: move code include to project packages

[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 da0c85ec74afde756e1701ea72dfe042014e25ac..884eeb9595e6ab38e07f3f522abb274f47c63eb7 100644 (file)
--- a/keyboard/altgr/macos.eng.inc.pl
+++ b/keyboard/altgr/macos.eng.inc.pl
@@ -1,7 +1,9 @@
 use utf8;
 use strict;
 use warnings;
-our %rows = (
+use Shiar_Sheet::KeyboardChars 'kbchars';
+
+my %rows = (
        'A' => 'Å',
        'a' => 'å',
        'B' => 'ı',
@@ -32,8 +34,8 @@ our %rows = (
        'n' => "\N{COMBINING TILDE}",
        'O' => 'Ø',
        'o' => 'ø',
-       'p' => 'π',
        'P' => '∏',
+       'p' => 'π',
        'Q' => 'Œ',
        'q' => 'œ',
        'R' => '‰',
@@ -99,18 +101,19 @@ our %rows = (
 );
 
 +{
-       %{ do 'keyboard/altgr/groups.inc.pl' },
+       %{ kbchars(\%rows) },
        version => '1.3',
-       title => 'option key',
+       title => 'US option',
        intro => join("\n",
                '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{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 => 'keyboard/altgr/matias-fk302.jpg',
 }