X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/0ecd498b120e427bd58940919ef05cb8c653ad68..2d689f2ba483997f2fad02fddf99b701f88b9f9a:/keyboard.plp

diff --git a/keyboard.plp b/keyboard.plp
index 1ad9324..2ecfa8b 100644
--- a/keyboard.plp
+++ b/keyboard.plp
@@ -2,7 +2,11 @@
 
 Html({
 	title => 'keyboard cheat sheet',
-	version => '1.0',
+	version => '1.1',
+	description => [
+		"Windows US international keyboard layout table",
+		"with the AltGr modifier key.",
+	],
 	stylesheet => [qw( light dark circus mono red )],
 	keys => 1,
 });
@@ -10,11 +14,15 @@ Html({
 :>
 <h1>keyboard cheat sheet</h1>
 
+<p>Special <a href="/unicode">characters</a> returned with the AltGr modifier
+for the Windows US international layout.</p>
+
 <h2>normal mode (default)</h2>
 
 <:
 use Shiar_Sheet::Keyboard 2.07;
 use Unicode::Normalize qw( NFKD );
+use Text::Unidecode qw( unidecode );
 
 my @usintrows = (
 	[  'a' ..                                            'z'],
@@ -37,10 +45,11 @@ my $keys = Shiar_Sheet::Keyboard->new({
 				my @row = @{$_};
 				my $class = (
 					  !defined $row[2] || $row[0] eq $row[2] ? 1 # identical
+					: $row[2] =~ /\A\p{Mn}+\z/ ? 8 # combining accent
 					: NFKD($row[2]) =~ $row[0] ? 2 # decomposed equivalent
-					: $row[2] =~ /^\p{Latin}/ ? 3 # latin script
-					: $row[2] =~ /^\p{Mn}/ ? 5 # combining accent
-					: 4
+					: $row[2] =~ /^\p{Latin}/ ? 4 # latin script
+					: unidecode($row[2]) =~ /^\W*\Q$row[0]/ ? 5 # transliterated
+					: 7
 				);
 				$row[0] => "g$class"
 			} @usint
@@ -54,9 +63,10 @@ my $keys = Shiar_Sheet::Keyboard->new({
 	flag => {
 		g1 => ['unaltered'],
 		g2 => ['accented'],
-		g3 => ['latin'],
-		g4 => ['other'],
-		g5 => ['combining'],
+		g4 => ['latin'],
+		g5 => ['similar'],
+		g7 => ['other'],
+		g8 => ['combining'],
 	},
 });
 $keys->map($get{map}) or undef $get{map};