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

diff --git a/keyboard.plp b/keyboard.plp
index f1d5634..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,
 });
@@ -13,43 +13,55 @@ Html({
 <h2>normal mode (default)</h2>
 
 <:
-use Shiar_Sheet::Keyboard 2;
-my $usint = [
+use Shiar_Sheet::Keyboard 2.07;
+use Unicode::Normalize qw( NFKD );
+use Text::Unidecode qw( unidecode );
+
+my @usintrows = (
 	[  'a' ..                                            'z'],
 	[qw(Á B ¢ Ð É F G H Í J Œ Ø µ Ñ Ó Ö Ä ® § Þ Ú V Å X Ü Æ)],
 	[qw(á b © ð é f g h í j œ ø µ ñ ó ö ä ® ß þ ú v å x ü æ)],
 	[qw(Å ı Ç ð ´ ̉ ˝ ̣ ˆ ½  Þ ¾ ˜ Ø ∏ Œ ‰ / ˇ ¨ ◊ „ ˛ ¼ ¸)],
-	[qw(å ∫ ç ∂ ´ ƒ © ˙ ^ ∆ ° ¬ µ ~ ø π œ ® ß † ¨ √ ∑ ≈ ¥ Ω)],
-];
+	[qw(å ∫ ç ∂ ́ ƒ © ˙ ̂ ∆ ° ¬ µ ̃ ø π œ ® ß † ̈ √ ∑ ≈ ¥ Ω)],
+);
+my @usint = (
+	map {
+		my $c = $_;
+		[ map { $usintrows[$_]->[$c] } 0 .. 2 ]
+	} 0 .. $#{ $usintrows[0] }
+);
 
 my $keys = Shiar_Sheet::Keyboard->new({
 	def => {
 		'' => {
-			map { $_ => '' } @{ $usint->[0] }
+			map {
+				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}/ ? 4 # latin script
+					: unidecode($row[2]) =~ /^\W*\Q$row[0]/ ? 5 # transliterated
+					: $row[2] =~ /^\p{Mn}/ ? 8 # combining accent
+					: 7
+				);
+				$row[0] => "g$class"
+			} @usint
 		},
 	},
 	key => {
 		map {
-			$usint->[0]->[$_] => "$usint->[1]->[$_]<br>$usint->[2]->[$_]"
-		} 0 .. $#{ $usint->[0] }
+			$_->[0] => "$_->[1]<br>$_->[2]"
+		} @usint
+	},
+	flag => {
+		g1 => ['unaltered'],
+		g2 => ['accented'],
+		g4 => ['latin'],
+		g7 => ['other'],
+		g8 => ['combining'],
 	},
 });
 $keys->map($get{map}) or undef $get{map};
 $keys->print_rows($get{rows}, [0]);
-:>
-<hr>
-
-<div class="help">
-	<div class="right">
-		<ul class="legend legend-set">
-		<li>keyboard <strong>map</strong> is
-			<:= $get{map} ? 'set to ' : '' :><em><:= $keys->{map} :></em>
-		<li><strong>keys</strong> are
-			<em><:= $showkeys ? 'always shown' : 'hidden if unassigned' :></em><:=
-				!exists $get{keys} && ' by default' :>
-		<li>default <strong>style</strong> is
-			<:= defined $get{style} && 'set to ' :><em><:= $style :></em>
-		</ul>
-	</div>
-</div>
+$keys->print_legends(\%get);