X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/a6462b5d3af5799f73f6475cbe551b35b84c44b2..c358b0330c592cb02a44e8154d7d8e09e040fe84:/keyboard/altgr/ukext.eng.inc.pl?ds=inline
diff --git a/keyboard/altgr/ukext.eng.inc.pl b/keyboard/altgr/ukext.eng.inc.pl
index 3e3a8ce..972c01e 100644
--- a/keyboard/altgr/ukext.eng.inc.pl
+++ b/keyboard/altgr/ukext.eng.inc.pl
@@ -3,56 +3,72 @@ use strict;
use warnings;
use Shiar_Sheet::KeyboardChars 'kbchars';
-my %rows = (
- '~' => '¦',
+my %win = (
+ '`' => '¦',
+ '~' => "\N{COMBINING GRAVE ACCENT}", # uk ¬ originally unshifted
+ '2' => "\N{COMBINING DIAERESIS}",
+ '4' => 'â¬',
+ '6' => "\N{COMBINING CIRCUMFLEX ACCENT}",
+ 'W' => 'áº',
+ 'w' => 'áº',
+ 'E' => 'Ã',
+ 'e' => 'é',
+ 'Y' => 'Ã',
+ 'y' => 'ý',
+ 'U' => 'Ã',
+ 'u' => 'ú',
+ 'I' => 'Ã',
+ 'i' => 'Ã',
+ 'O' => 'Ã',
+ 'o' => 'ó',
+ 'A' => 'Ã',
+ 'a' => 'á',
+ #'"' => '`',
+ "'" => "\N{COMBINING ACUTE ACCENT}",
+ '\\'=> "\N{COMBINING TILDE}", # uk #
+ 'C' => 'Ã',
+ 'c' => 'ç',
+);
+
+my %dup = (
+ # aliases to unmodified keys
+ '7' => '{',
+ '8' => '[',
+ '9' => ']',
+ '0' => '}',
+ '-' => '\\',
+ 'q' => '@',
+ 'K' => '&',
+);
+
+my %rows = (%win, %dup,
'!' => '¡',
'1' => '¹',
'@' => '½', # uk "
- '2' => "\N{COMBINING DIAERESIS}",
'#' => 'â
', # uk £
'3' => '³',
'$' => '¼',
- '4' => 'â¬',
'%' => 'â
',
- '5' => '½',
+ '5' => \'@',
'^' => 'â
',
- '6' => "\N{COMBINING CIRCUMFLEX ACCENT}",
'&' => 'â
',
- '7' => '{',
'*' => 'â¢',
- '8' => '[',
'(' => '±',
- '9' => ']',
')' => '°',
- '0' => '}',
'_' => '¿',
- '-' => '\\',
'+' => "\N{COMBINING OGONEK}",
'=' => "\N{COMBINING CEDILLA}",
'Q' => 'Ω',
- 'q' => '@',
- 'W' => 'áº',
- 'w' => 'áº',
- 'E' => 'Ã',
- 'e' => 'é',
'R' => '®',
'r' => '¶',
'T' => 'Ŧ',
't' => 'ŧ',
- 'Y' => 'Ã',
- 'y' => 'ý',
- 'U' => 'Ã',
- 'u' => 'ú',
- 'I' => 'Ã',
- 'i' => 'Ã',
- 'O' => 'Ã',
- 'o' => 'ó',
'P' => 'Ã',
'p' => 'þ',
'{' => "\N{COMBINING RING ABOVE}",
- '}' => "\N{COMBINING MACRON}",
- 'A' => 'Ã',
- 'a' => 'á',
+ '}' => "\N{COMBINING MACRON}", # originally |
+ '[' => \'2',
+ ']' => \'\\',
'S' => '§',
's' => 'Ã',
'D' => 'Ã',
@@ -65,24 +81,17 @@ my %rows = (
'h' => 'ħ',
'J' => "\N{COMBINING HORN}",
'j' => "\N{COMBINING HOOK ABOVE}",
- 'K' => '&',
'k' => 'ĸ',
'L' => 'Å',
'l' => 'Å',
':' => "\N{COMBINING DOUBLE ACUTE ACCENT}",
- ';' => "\N{COMBINING ACUTE ACCENT}",
+ ';' => \"'",
'"' => "\N{COMBINING CARON}", # uk @
- "'" => "\N{COMBINING ACUTE ACCENT}", # same as ;?
- '|' => "\N{COMBINING TILDE}",
- '\\'=> "\N{COMBINING BREVE}",
- '~' => "\N{COMBINING GRAVE ACCENT}",
- '`' => '¦',
- 'Z' => '<',
+ '|' => "\N{COMBINING BREVE}", # uk ~ originally \
+ 'Z' => 'â¹',
'z' => '«',
- 'X' => '>',
+ 'X' => 'âº',
'x' => '»',
- 'C' => 'Ã',
- 'c' => 'ç',
'V' => 'â',
'v' => 'â',
'B' => 'â',
@@ -98,21 +107,27 @@ my %rows = (
'?' => "\N{COMBINING DOT ABOVE}",
'/' => "\N{COMBINING DOT BELOW}",
);
-$rows{'['} = $rows{'2'};
-$rows{']'} = $rows{'#'};
+
+my $groups = kbchars(\%rows);
+
+$_->[0] .= ' ext' for @{ $groups->{def}{''} }{keys %dup};
+$_->[0] .= ' more' for @{ $groups->{def}{''} }{keys %win};
+$groups->{flag}{more} = ['windows', "only a small subset is present on Microsoft's layout"];
+{
- %{ kbchars(\%rows) },
+ %{$groups},
title => 'UK-extended',
- version => '1.0',
+ category => 'latin/thirdparty',
+ version => '1.1',
intro => join("\n",
- "A Chrome OS extension",
+ "A Chrome OS extension and Xorg option",
"expanding on Windows' UK Extended QWERTY keyboard.",
- 'Similar to the US international variant.',
+ 'Distinct from the US international variant.',
),
description => [
"Google UK-Extended keyboard layout table for Chrome OS",
"with the AltGr modifier key.",
],
image => 'data/keyboard/thumb/chromebook-hp11.jpg',
+ imagealt => 'AltGr key on a HP Chromebook 11 G2',
}