keyboard/altgr/windows: complete layout and labelled image

Forgot about non-alphabetic keys as seen on the KeyboardCompany model KU2971B
<https://www.keyboardco.com/keyboard/usa-international-keyboard-black-usb.asp>
with printed "USA International" keycaps.

diff --git a/keyboard/altgr/ku2971b-usint.jpg b/keyboard/altgr/ku2971b-usint.jpg
new file mode 100644 (file)
index 0000000..3f1f55f
Binary files /dev/null and b/keyboard/altgr/ku2971b-usint.jpg differ

diff --git a/keyboard/altgr/windows.eng.inc.pl b/keyboard/altgr/windows.eng.inc.pl
index 23353a5fa11ad03f49354a22fe0dbacd7e1b7976..7b63521396d72ea61f6ab4fd0e6047f4d6a36a1c 100644 (file)
--- a/keyboard/altgr/windows.eng.inc.pl
+++ b/keyboard/altgr/windows.eng.inc.pl
@@ -1,20 +1,54 @@
 use utf8;
 use strict;
 use warnings;
+
 my @az = ('A'..'Z', 'a'..'z');
 my @letters = qw(
        Á B ¢ Ð É F G H Í J Œ Ø µ Ñ Ó Ö Ä ® § Þ Ú V Å X Ü Æ
        á b © ð é f g h í j œ ø µ ñ ó ö ä ® ß þ ú v å x ü æ
 );
-our %rows = map {
-       ($az[$_] eq $letters[$_]) ? () :
-       ($az[$_] => $letters[$_])
-} 0 .. $#az;
+our %rows = (
+       '~' => "\N{COMBINING TILDE}",
+       '`' => "\N{COMBINING GRAVE ACCENT}",
+       '!' => '¹',
+       '1' => '¡',
+       '2' => '²',
+       '3' => '³',
+       '$' => '£',
+       '4' => '¤',
+       '5' => '€',
+       '^' => "\N{COMBINING CIRCUMFLEX ACCENT}",
+       '6' => '¼',
+       '7' => '½',
+       '8' => '¾',
+       '9' => '‘',
+       '0' => '’',
+       '-' => '¥',
+       '+' => '÷',
+       '=' => '×',
+       '{' => '“',
+       '}' => '”',
+       '[' => '«',
+       ']' => '»',
+       ':' => '°',
+       ';' => '¶',
+       "'" => "\N{COMBINING ACUTE ACCENT}",
+       '"' => "\N{COMBINING DIAERESIS}",
+       '<' => 'Ç',
+       ',' => 'ç',
+       '/' => '¿',
+       '|' => '¦',
+       '\\'=> '¬',
+       map {
+               ($az[$_] eq $letters[$_]) ? () :
+               ($az[$_] => $letters[$_])
+       } 0 .. $#az
+);
 
 +{
        %{ do 'keyboard/altgr/groups.inc.pl' },
        title => 'Windows AltGr',
-       version => '1.3',
+       version => '1.4',
        intro => join("\n",
                'Resulting <a href="/unicode">selection</a> of <a href="/charset">Unicode</a> characters',
                'while pressing the AltGr modifier',
@@ -25,6 +59,5 @@ our %rows = map {
                "Windows US international keyboard layout table",
                "with the AltGr modifier key.",
        ],
-       image => 'keyboard/altgr/ibm-m.jpg',
-       moderows => '21-',
+       image => 'keyboard/altgr/ku2971b-usint.jpg',
 }