keyboard/altgr/windows: xorg extensions added in 2023

[sheet.git] / keyboard / altgr / windows.eng.inc.pl

diff --git a/keyboard/altgr/windows.eng.inc.pl b/keyboard/altgr/windows.eng.inc.pl
index 4d51ff8b249391d432fc5518f53ed130290edfb3..eb021b7148b8e8323594f81c2b3a01ba0108c204 100644 (file)
--- a/keyboard/altgr/windows.eng.inc.pl
+++ b/keyboard/altgr/windows.eng.inc.pl
@@ -1,6 +1,7 @@
 use utf8;
 use strict;
 use warnings;
+use Shiar_Sheet::KeyboardChars 'kbchars';
 
 my @az = ('A'..'Z', 'a'..'z');
 my @letters = qw(
@@ -10,7 +11,6 @@ my @letters = qw(
 my %xkb = (
        '@' => "\N{COMBINING DOUBLE ACUTE ACCENT}",
        '#' => "\N{COMBINING MACRON}",
-       '%' => "\N{COMBINING CEDILLA}",
        '&' => "\N{COMBINING HORN}",
        '*' => "\N{COMBINING OGONEK}",
        '(' => "\N{COMBINING BREVE}",
@@ -19,9 +19,23 @@ my %xkb = (
        '>' => "\N{COMBINING CARON}",
        '.' => "\N{COMBINING DOT ABOVE}",
        '?' => "\N{COMBINING HOOK ABOVE}",
+       # 1.7~39 (2009-06-12)
+       '%' => "\N{COMBINING CEDILLA}",
+       # 2.38~16 (2023-01-13)
+       'R' => '™',
+       # 2.39~101 (2023-03-17)
+       'f' => 'ë',
+       'F' => 'Ë',
+       'j' => 'ï',
+       'J' => 'Ï',
+       # 2.39~96 (2023-03-21)
+       'M' => '±',
+       # 2.40~122 (2023-06-11)
+       'x' => '·',
+       'X' => "\N{COMBINING SHORT SOLIDUS OVERLAY}", # dead_stroke (slash ø, bar ʉ, stroke ł)
 );
 
-our %rows = (
+my %rows = (
        '~' => "\N{COMBINING TILDE}",
        '`' => "\N{COMBINING GRAVE ACCENT}",
        '!' => '¹',
@@ -53,20 +67,21 @@ our %rows = (
        '/' => '¿',
        '|' => '¦',
        '\\'=> '¬',
-       %xkb,
-       map {
+       (map {
                ($az[$_] eq $letters[$_]) ? () :
                ($az[$_] => $letters[$_])
-       } 0 .. $#az
+       } 0 .. $#az),
+       %xkb,
 );
 
-my $groups = do 'keyboard/altgr/groups.inc.pl';
+my $groups = kbchars(\%rows);
 $groups->{def}{''}{$_} .= ' ext' for keys %xkb;
 $groups->{flag}{ext} = ['xkb', 'unofficial extensions added in Linux (Gnome, KDE)'];
 
 +{
        %{$groups},
        title => 'Windows AltGr',
+       category => '1/latin/windows/xorg',
        version => '1.4',
        intro => join("\n",
                'Resulting <a href="/unicode">selection</a> of <a href="/charset">Unicode</a> characters',
@@ -78,5 +93,6 @@ $groups->{flag}{ext} = ['xkb', 'unofficial extensions added in Linux (Gnome, KDE
                "Windows US international keyboard layout table",
                "with the AltGr modifier key.",
        ],
-       image => 'keyboard/altgr/ku2971b-usint.jpg',
+       image => 'data/keyboard/thumb/ku2971b-usint.jpg',
+       imagealt => 'AltGr on a KeyboardCompany KU2971B with USA International keycaps',
 }