X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/4957c4818cb72d008dff650a288e7f3d39179312..46944bb7e93f8d19da8cc22630c42dedf0521670:/keyboard/altgr/windows.eng.inc.pl?ds=inline
diff --git a/keyboard/altgr/windows.eng.inc.pl b/keyboard/altgr/windows.eng.inc.pl
index 7b63521..ccfd75f 100644
--- a/keyboard/altgr/windows.eng.inc.pl
+++ b/keyboard/altgr/windows.eng.inc.pl
@@ -1,13 +1,28 @@
use utf8;
use strict;
use warnings;
+use Shiar_Sheet::KeyboardChars 'kbchars';
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 = (
+my %xkb = (
+ '@' => "\N{COMBINING DOUBLE ACUTE ACCENT}",
+ '#' => "\N{COMBINING MACRON}",
+ '%' => "\N{COMBINING CEDILLA}",
+ '&' => "\N{COMBINING HORN}",
+ '*' => "\N{COMBINING OGONEK}",
+ '(' => "\N{COMBINING BREVE}",
+ ')' => "\N{COMBINING RING ABOVE}",
+ '_' => "\N{COMBINING DOT BELOW}",
+ '>' => "\N{COMBINING CARON}",
+ '.' => "\N{COMBINING DOT ABOVE}",
+ '?' => "\N{COMBINING HOOK ABOVE}",
+);
+
+my %rows = (
'~' => "\N{COMBINING TILDE}",
'`' => "\N{COMBINING GRAVE ACCENT}",
'!' => '¹',
@@ -39,15 +54,21 @@ our %rows = (
'/' => '¿',
'|' => '¦',
'\\'=> '¬',
+ %xkb,
map {
($az[$_] eq $letters[$_]) ? () :
($az[$_] => $letters[$_])
} 0 .. $#az
);
+my $groups = kbchars(\%rows);
+$groups->{def}{''}{$_} .= ' ext' for keys %xkb;
+$groups->{flag}{ext} = ['xkb', 'unofficial extensions added in Linux (Gnome, KDE)'];
+
+{
- %{ do 'keyboard/altgr/groups.inc.pl' },
+ %{$groups},
title => 'Windows AltGr',
+ category => '1/latin/windows/xorg',
version => '1.4',
intro => join("\n",
'Resulting selection of Unicode characters',
@@ -59,5 +80,6 @@ our %rows = (
"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',
}