X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/d1bf245dac9f5a1401ac536b5a19fff9aa39b72f..b828085578158fe94874f39369754fcc5e0113a3:/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 eb57814..eb021b7 100644
--- a/keyboard/altgr/windows.eng.inc.pl
+++ b/keyboard/altgr/windows.eng.inc.pl
@@ -1,27 +1,98 @@
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 = map {
- $az[$_] => $letters[$_]
-} 0 .. $#az;
+my %xkb = (
+ '@' => "\N{COMBINING DOUBLE ACUTE ACCENT}",
+ '#' => "\N{COMBINING MACRON}",
+ '&' => "\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}",
+ # 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 = (
+ '~' => "\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),
+ %xkb,
+);
+
+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' },
- title => 'altgr',
- version => '1.2',
+ %{$groups},
+ title => 'Windows AltGr',
+ category => '1/latin/windows/xorg',
+ version => '1.4',
intro => join("\n",
- 'Special characters returned with the AltGr modifier',
- 'for the Windows US international layout.',
- 'Similar to Apple options.',
+ 'Resulting selection of Unicode characters',
+ 'while pressing the AltGr modifier',
+ 'with the Windows US international layout.',
+ 'Macs have option options instead.',
),
description => [
"Windows US international keyboard layout table",
"with the AltGr modifier key.",
],
- moderows => '12-',
+ image => 'data/keyboard/thumb/ku2971b-usint.jpg',
+ imagealt => 'AltGr on a KeyboardCompany KU2971B with USA International keycaps',
}