X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/18606a64db0a6c02e5e289074b62728c93b5231b..c107916780c5d7bf0267ae031a72eb331145d935:/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 069a9b3..d12fa01 100644
--- a/keyboard/altgr/macos-abc.eng.inc.pl
+++ b/keyboard/altgr/macos-abc.eng.inc.pl
@@ -1,8 +1,7 @@
use utf8;
use strict;
use warnings;
-require './keyboard/altgr/groups.inc.pl';
-Shiar_Sheet::KeyboardChars->import('kbmodes');
+use Shiar_Sheet::KeyboardChars 'kbmodes';
my %rows = (
'' => {
@@ -26,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' => 'Å',
@@ -52,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' => 'Â¥',
@@ -87,7 +86,7 @@ my %rows = (
'5' => '§',
'%' => 'â ',
'6' => "\N{COMBINING CIRCUMFLEX ACCENT}",
- '^' => "\N{MODIFIER LETTER CIRCUMFLEX ACCENT}", #XXX
+ '^' => "\N{MODIFIER LETTER CIRCUMFLEX ACCENT}",
'7' => '¶',
'&' => 'â¡',
'8' => 'â¢',
@@ -110,7 +109,7 @@ my %rows = (
'%' => 'Ƽ',
'5' => 'ƽ',
'^' => 'Æ',
- '6' => 'Æ
', #XXX
+ '6' => 'Æ
',
'7' => 'â',
'*' => 'È¢',
'8' => 'È£',
@@ -119,12 +118,12 @@ my %rows = (
'W' => 'Ç·',
'w' => 'Æ¿',
'E' => 'Æ',
- 'e' => 'Ç', #XXX É
+ 'e' => 'Ç',
'R' => 'Ʀ',
- 'r' => 'Ê', #XXX
+ 'r' => 'Ê',
'k' => 'ĸ',
- 'Y' => 'ê«',
- 'y' => 'É',
+ 'Y' => 'È',
+ 'y' => 'È',
'U' => 'Ʊ',
'u' => 'Ê',
'A' => 'Æ',
@@ -135,24 +134,24 @@ my %rows = (
'H' => 'Ƕ',
'h' => 'Æ',
'J' => 'È ',
- 'j' => 'Æ', #XXX ɳ
+ 'j' => 'Æ',
'K' => 'Ǩ',
'Z' => 'Æ·',
'z' => 'Ê',
'C' => 'Æ',
'c' => 'É',
'v' => 'Ê',
- 'N' => 'Å', #XXX
+ 'N' => 'Å',
'n' => 'Å',
'M' => 'Æ',
'm' => 'ɯ',
- '"' => 'â³', #XXX ʺ
- "'" => 'â²', #XXX ʹ
+ '"' => 'ʺ',
+ "'" => 'ʹ',
},
'>' => {
'q' => 'Ê ',
- 'R' => 'Æ®', #XXX mirrored?
+ 'R' => 'Æ®', # mirrored preview
'r' => 'Ê',
'T' => 'Ƭ',
't' => 'Æ',
@@ -195,11 +194,13 @@ my %rows = (
':' => 'â number prefix â¥:',
'>' => 'Ê hook prefix â¥>',
},
- version => '1.0',
+ 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',
@@ -209,5 +210,6 @@ my %rows = (
"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',
}