X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/18606a64db0a6c02e5e289074b62728c93b5231b..c107916780c5d7bf0267ae031a72eb331145d935:/keyboard/altgr/windows.eng.inc.pl
diff --git a/keyboard/altgr/windows.eng.inc.pl b/keyboard/altgr/windows.eng.inc.pl
index 329cb7f..512b6fb 100644
--- a/keyboard/altgr/windows.eng.inc.pl
+++ b/keyboard/altgr/windows.eng.inc.pl
@@ -1,8 +1,7 @@
use utf8;
use strict;
use warnings;
-require './keyboard/altgr/groups.inc.pl';
-Shiar_Sheet::KeyboardChars->import('kbchars');
+use Shiar_Sheet::KeyboardChars 'kbchars';
my @az = ('A'..'Z', 'a'..'z');
my @letters = qw(
@@ -12,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}",
@@ -21,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 = (
@@ -55,20 +67,21 @@ my %rows = (
'/' => '¿',
'|' => '¦',
'\\'=> '¬',
- %xkb,
- map {
+ (map {
($az[$_] eq $letters[$_]) ? () :
($az[$_] => $letters[$_])
- } 0 .. $#az
+ } 0 .. $#az),
+ %xkb,
);
my $groups = kbchars(\%rows);
-$groups->{def}{''}{$_} .= ' ext' for keys %xkb;
+$groups->{def}{''}{$_}[0] .= ' 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 selection of Unicode characters',
@@ -80,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',
}