X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/16c246b59170bdbf5805e837840c0abac6f01559..f1cfafd56c8fc6be24d8691daf40a9fbff767b17:/keyboard/altgr/macos.eng.inc.pl?ds=inline
diff --git a/keyboard/altgr/macos.eng.inc.pl b/keyboard/altgr/macos.eng.inc.pl
index da0c85e..2eab950 100644
--- 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' => 'ı',
@@ -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",
'Resulting selection of Unicode characters',
"while pressing ⥠Option (Alt) with Apple's US (or US International) layout",
'on macOS.',
+ q{An alternative ABC Extended is also available.},
q{Different from AltGr 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',
}