X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/23f7b10a8432caad3dc2e5ea875dd76757d2bea4..88a70e7b1241885ac6992e2e912808c9468cd0bd:/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 f4a4a00..a2cdb18 100644
--- a/keyboard/altgr/macos-abc.eng.inc.pl
+++ b/keyboard/altgr/macos-abc.eng.inc.pl
@@ -4,6 +4,7 @@ use warnings;
 do './keyboard/altgr/groups.inc.pl';
 
 my %rows = (
+	'' => {
 	'A' => "\N{MACRON}",
 	'a' => "\N{COMBINING MACRON}",
 	'B' => "\N{BREVE}",
@@ -98,109 +99,101 @@ 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' => 'ƅ', #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 ʹ
+	},
 
-	'>>' => ' ',
-	'>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' => 'Æ®', #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' => 'ɓ',
+	},
 );
 
-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},
+	%{ kbmodes(\%rows) },
+	mode => {
+		''  => 'option-shifted ⌥',
+		':' => '№ number prefix ⌥:',
+		'>' => 'ʔ hook prefix ⌥>',
+	},
 	version => '1.0',
 	title => 'ABC option',
 	intro => join("\n",