X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/444ce9b79dad42e9f1c8082bcbfdc87f2aeca9b7..d22e7febda8720bc38069f7061adb43b98143c48:/keyboard.plp

diff --git a/keyboard.plp b/keyboard.plp
index cd75090..8060fa6 100644
--- a/keyboard.plp
+++ b/keyboard.plp
@@ -2,7 +2,7 @@
 
 Html({
 	title => 'keyboard cheat sheet',
-	version => '1.0',
+	version => '1.1',
 	stylesheet => [qw( light dark circus mono red )],
 	keys => 1,
 });
@@ -15,43 +15,50 @@ Html({
 <:
 use Shiar_Sheet::Keyboard 2.07;
 use Unicode::Normalize qw( NFKD );
+use Text::Unidecode qw( unidecode );
 
-my $usint = [
+my @usintrows = (
 	[  'a' ..                                            'z'],
 	[qw(Á B ¢ Ð É F G H Í J Œ Ø µ Ñ Ó Ö Ä ® § Þ Ú V Å X Ü Æ)],
 	[qw(á b © ð é f g h í j œ ø µ ñ ó ö ä ® ß þ ú v å x ü æ)],
 	[qw(Å ı Ç ð ´ ̉ ˝ ̣ ˆ ½  Þ ¾ ˜ Ø ∏ Œ ‰ / ˇ ¨ ◊ „ ˛ ¼ ¸)],
 	[qw(å ∫ ç ∂ ́ ƒ © ˙ ̂ ∆ ° ¬ µ ̃ ø π œ ® ß † ̈ √ ∑ ≈ ¥ Ω)],
-];
+);
+my @usint = (
+	map {
+		my $c = $_;
+		[ map { $usintrows[$_]->[$c] } 0 .. 2 ]
+	} 0 .. $#{ $usintrows[0] }
+);
 
 my $keys = Shiar_Sheet::Keyboard->new({
 	def => {
 		'' => {
 			map {
-				my $c = $_;
-				my @row = map { $usint->[$_]->[$c] } 0 .. 2;
+				my @row = @{$_};
 				my $class = (
 					  !defined $row[2] || $row[0] eq $row[2] ? 1 # identical
 					: 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
+					: $row[2] =~ /^\p{Mn}/ ? 8 # combining accent
+					: 7
 				);
 				$row[0] => "g$class"
-			} 0 .. $#{ $usint->[0] }
+			} @usint
 		},
 	},
 	key => {
 		map {
-			$usint->[0]->[$_] => "$usint->[1]->[$_]<br>$usint->[2]->[$_]"
-		} 0 .. $#{ $usint->[0] }
+			$_->[0] => "$_->[1]<br>$_->[2]"
+		} @usint
 	},
 	flag => {
 		g1 => ['unaltered'],
 		g2 => ['accented'],
-		g3 => ['latin'],
-		g4 => ['other'],
-		g5 => ['combining'],
+		g4 => ['latin'],
+		g7 => ['other'],
+		g8 => ['combining'],
 	},
 });
 $keys->map($get{map}) or undef $get{map};