X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/23f7b10a8432caad3dc2e5ea875dd76757d2bea4..f1cfafd56c8fc6be24d8691daf40a9fbff767b17:/keyboard/altgr/macos-abc.eng.inc.pl?ds=inline
diff --git a/keyboard/altgr/macos-abc.eng.inc.pl b/keyboard/altgr/macos-abc.eng.inc.pl
index f4a4a00..d12fa01 100644
--- a/keyboard/altgr/macos-abc.eng.inc.pl
+++ b/keyboard/altgr/macos-abc.eng.inc.pl
@@ -1,9 +1,10 @@
use utf8;
use strict;
use warnings;
-do './keyboard/altgr/groups.inc.pl';
+use Shiar_Sheet::KeyboardChars 'kbmodes';
my %rows = (
+ '' => {
'A' => "\N{MACRON}",
'a' => "\N{COMBINING MACRON}",
'B' => "\N{BREVE}",
@@ -24,17 +25,17 @@ my %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' => 'Å',
@@ -50,7 +51,7 @@ my %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' => 'Â¥',
@@ -85,7 +86,7 @@ my %rows = (
'5' => '§',
'%' => 'â ',
'6' => "\N{COMBINING CIRCUMFLEX ACCENT}",
- '^' => "\N{MODIFIER LETTER CIRCUMFLEX ACCENT}", #XXX
+ '^' => "\N{MODIFIER LETTER CIRCUMFLEX ACCENT}",
'7' => '¶',
'&' => 'â¡',
'8' => 'â¢',
@@ -98,114 +99,108 @@ my %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 = kbchars(\%rows);
-$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 selection of Unicode characters',
- "while pressing ⥠Option (Alt) with Apple's ABC Extended",
+ "while pressing ⥠Option (Alt) with Apple's",
+ 'ABC Extended',
"(formerly US Extended and Extended Roman) layout",
'on macOS.',
'Significant changes from standard',
@@ -215,5 +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 => 'keyboard/altgr/macbook-gray.jpg',
+ image => 'data/keyboard/thumb/macbook-gray.jpg',
+ imagealt => 'Option key on a black MacBook',
}