keyboard/altgr: complete macos layout as hash

As far as possible from online screenshots.

diff --git a/altgr-macos.eng.inc.pl b/altgr-macos.eng.inc.pl
index 68a39ad5bd264d95df6c4b96a3b483a873583608..0c1e694b4aeacdcbb2172c80c9f4baac337a3888 100644 (file)
--- a/altgr-macos.eng.inc.pl
+++ b/altgr-macos.eng.inc.pl
@@ -1,14 +1,111 @@
 use utf8;
-my @az = ('A'..'Z', 'a'..'z');
-my @letters = qw(
-       Å ı Ç ð ´ ̉ ˝ ̣ ˆ ½  Þ ¾ ˜ Ø ∏ Œ ‰ / ˇ ¨ ◊ „ ˛ ¼ ¸
-       å ∫ ç ∂ ́ ƒ © ˙ ̂ ∆ ° ¬ µ ̃ ø π œ ® ß † ̈ √ ∑ ≈ ¥ Ω
+our %rows = (
+       'A' => 'Å',
+       'a' => 'å',
+       'B' => 'ı',
+       'b' => '∫',
+       'C' => 'Ç',
+       'c' => 'ç',
+       'D' => 'ð',
+       'd' => '∂',
+       'E' => "\N{ACUTE ACCENT}",
+       'e' => "\N{COMBINING ACUTE ACCENT}",
+       'f' => 'ƒ',
+       'F' => "\N{COMBINING HOOK ABOVE}",
+       'G' => "\N{DOUBLE ACUTE ACCENT}",
+       'g' => '©',
+       'H' => "\N{COMBINING DOT BELOW}",
+       'h' => "\N{DOT ABOVE}",
+       'I' => "\N{MODIFIER LETTER CIRCUMFLEX ACCENT}",
+       'i' => "\N{COMBINING CIRCUMFLEX ACCENT}",
+       'J' => '½',
+       'j' => '∆',
+       'K' => '',
+       'k' => '°',
+       'L' => 'Þ',
+       'l' => '¬',
+       'M' => '¾',
+       'm' => 'µ',
+       'N' => "\N{SMALL TILDE}",
+       'n' => "\N{COMBINING TILDE}",
+       'O' => 'Ø',
+       'o' => 'ø',
+       'p' => 'π',
+       'P' => '∏',
+       'Q' => 'Œ',
+       'q' => 'œ',
+       'R' => '‰',
+       'r' => '®',
+       'S' => '/',
+       's' => 'ß',
+       'T' => "\N{CARON}",
+       't' => '†',
+       'U' => "\N{DIAERESIS}",
+       'u' => "\N{COMBINING DIAERESIS}",
+       'V' => '◊',
+       'v' => '√',
+       'W' => '„',
+       'w' => '∑',
+       'X' => "\N{OGONEK}",
+       'x' => '≈',
+       'Y' => '¼',
+       'y' => '¥',
+       'Z' => "\N{CEDILLA}",
+       'z' => 'Ω',
+       '[' => "\N{RIGHT DOUBLE QUOTATION MARK}",
+       '{' => "\N{LEFT DOUBLE QUOTATION MARK}",
+       ']' => "\N{RIGHT SINGLE QUOTATION MARK}",
+       '}' => "\N{LEFT SINGLE QUOTATION MARK}",
+       ';' => '…',
+       '"' => 'Æ',
+       "'" => 'æ',
+       '|' => '»',
+       '\\'=> '«',
+       '<' => "\N{COMBINING MACRON}",
+       ',' => '≤',
+       '>' => "\N{COMBINING BREVE}",
+       '.' => '≥',
+       '/' => '÷',
+       '?' => '¿',
+       '~' => "\N{GRAVE ACCENT}",
+       '`' => "\N{COMBINING GRAVE ACCENT}",
+       '1' => '¡',
+       '!' => '/',
+       '2' => '€',
+       '@' => '™',
+       '3' => '£',
+       '#' => '‹',
+       '4' => '¢',
+       '$' => '›',
+       '5' => '∞',
+       '%' => 'fi',
+       '6' => '§',
+       '^' => 'fl',
+       '7' => '¶',
+       '&' => '‡',
+       '8' => '•',
+       '*' => '°',
+       '9' => 'ª',
+       '(' => '·',
+       '0' => 'º',
+       ')' => ',',
+       '-' => '−',
+       '_' => '—',
+       '+' => '±',
+       '=' => '≠',
 );
-our %rows = map {
-       $az[$_] => $letters[$_]
-} 0 .. $#az;
 
 +{
        %{ do 'keyboard.eng.inc.pl' },
-       version => '1.2',
+       version => '1.3',
+       title => 'option key',
+       intro => join("\n",
+               'Special <a href="/unicode">characters</a>',
+               "when pressing ⌥ Option (Alt) with Apple's US International layout.",
+               q{Not to be confused with <a href="/keyboard/altgr">Windows'</a> AltGr keys.},
+       ),
+       description => [
+               "Apple US International keyboard layout table",
+               "with the Option modifier key.",
+       ],
 }

diff --git a/altgr.eng.inc.pl b/altgr.eng.inc.pl
index 93887718c6c8ee7427c0d863784bea1f60ee74bf..e98345589677f2725ca414590c086fc7ed7b9405 100644 (file)
--- a/altgr.eng.inc.pl
+++ b/altgr.eng.inc.pl
@@ -12,8 +12,11 @@ our %rows = map {
        %{ do 'keyboard.eng.inc.pl' },
        title => 'altgr',
        version => '1.2',
-       intro => 'Special <a href="/unicode">characters</a> returned with the AltGr modifier
-for the Windows US international layout.',
+       intro => join("\n",
+               'Special <a href="/unicode">characters</a> returned with the AltGr modifier',
+               'for the Windows US international layout.',
+               'Similar to <a href="/keyboard/altgr-macos">Apple</a> options.',
+       ),
        description => [
                "Windows US international keyboard layout table",
                "with the AltGr modifier key.",