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 ccfd75f083b3ee34048a5ec31ecf6dda8ebb3c98..eb021b7148b8e8323594f81c2b3a01ba0108c204 100644 (file)
--- a/keyboard/altgr/windows.eng.inc.pl
+++ b/keyboard/altgr/windows.eng.inc.pl
@@ -11,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}",
@@ -20,6 +19,20 @@ 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 ł)
 );
 
 my %rows = (
@@ -54,11 +67,11 @@ my %rows = (
        '/' => '¿',
        '|' => '¦',
        '\\'=> '¬',
-       %xkb,
-       map {
+       (map {
                ($az[$_] eq $letters[$_]) ? () :
                ($az[$_] => $letters[$_])
-       } 0 .. $#az
+       } 0 .. $#az),
+       %xkb,
 );
 
 my $groups = kbchars(\%rows);