X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/88a70e7b1241885ac6992e2e912808c9468cd0bd..HEAD:/keyboard/altgr/macos-abc.eng.inc.pl

diff --git a/keyboard/altgr/macos-abc.eng.inc.pl b/keyboard/altgr/macos-abc.eng.inc.pl
index a2cdb18..9b61a9c 100644
--- a/keyboard/altgr/macos-abc.eng.inc.pl
+++ b/keyboard/altgr/macos-abc.eng.inc.pl
@@ -1,7 +1,7 @@
 use utf8;
 use strict;
 use warnings;
-do './keyboard/altgr/groups.inc.pl';
+use Shiar_Sheet::KeyboardChars 'kbmodes';
 
 my %rows = (
 	'' => {
@@ -25,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' => 'œ',
@@ -51,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' => 'Â¥',
@@ -86,7 +86,7 @@ my %rows = (
 	'5' => '§',
 	'%' => '†',
 	'6' => "\N{COMBINING CIRCUMFLEX ACCENT}",
-	'^' => "\N{MODIFIER LETTER CIRCUMFLEX ACCENT}", #XXX
+	'^' => "\N{MODIFIER LETTER CIRCUMFLEX ACCENT}",
 	'7' => '¶',
 	'&' => '‡',
 	'8' => '•',
@@ -109,7 +109,7 @@ my %rows = (
 		'%' => 'Ƽ',
 		'5' => 'ƽ',
 		'^' => 'Ƅ',
-		'6' => 'ƅ', #XXX
+		'6' => 'ƅ',
 		'7' => '⁊',
 		'*' => 'È¢',
 		'8' => 'È£',
@@ -118,12 +118,12 @@ my %rows = (
 		'W' => 'Ç·',
 		'w' => 'Æ¿',
 		'E' => 'Ǝ',
-		'e' => 'ǝ', #XXX ə
+		'e' => 'ǝ',
 		'R' => 'Ʀ',
-		'r' => 'ʀ', #XXX
+		'r' => 'ʀ',
 		'k' => 'ĸ',
-		'Y' => 'Ɜ',
-		'y' => 'ɜ',
+		'Y' => 'Ȝ',
+		'y' => 'ȝ',
 		'U' => 'Ʊ',
 		'u' => 'ʊ',
 		'A' => 'Ə',
@@ -134,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' => 'Æ­',
@@ -194,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 <a href="/unicode">selection</a> of <a href="/charset">Unicode</a> characters',
-		"while pressing ⌥ Option (Alt) with Apple's ABC Extended",
+		"while pressing ⌥ Option (Alt) with Apple's",
+		'ABC <em title="distinct from just ABC">Extended</em>',
 		"(formerly US Extended and Extended Roman) layout",
 		'on <abbr title="at least in Ventura 13.2">macOS</abbr>.',
 		'Significant changes from standard',
@@ -208,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',
 }