X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/6ab9c94cde0ca32c221dc3120f0088e1693e71c1..85b2e04d887f4d328d8991b4834a52fba3187426:/keyboard.plp

diff --git a/keyboard.plp b/keyboard.plp
index 9a69527..cd75090 100644
--- a/keyboard.plp
+++ b/keyboard.plp
@@ -12,80 +12,49 @@ Html({
 
 <h2>normal mode (default)</h2>
 
-<ul id="rows">
-
-<li class="row">
-	<ul class="keys omni">
-	<li class="mo chr27" onclick="setmode()"><b>Esc</b> normal mode
-		<!-- not as static anymore, but never bothered; just see ^[ -->
-	</ul>
-</li>
-
 <:
-our %sign;
-use Shiar_Sheet::Keyboard 2;
+use Shiar_Sheet::Keyboard 2.07;
+use Unicode::Normalize qw( NFKD );
+
 my $usint = [
 	[  'a' ..                                            'z'],
 	[qw(Á B ¢ Ð É F G H Í J Œ Ø µ Ñ Ó Ö Ä ® § Þ Ú V Å X Ü Æ)],
 	[qw(á b © ð é f g h í j œ ø µ ñ ó ö ä ® ß þ ú v å x ü æ)],
 	[qw(Å ı Ç ð ´ ̉ ˝ ̣ ˆ ½  Þ ¾ ˜ Ø ∏ Œ ‰ / ˇ ¨ ◊ „ ˛ ¼ ¸)],
-	[qw(å ∫ ç ∂ ´ ƒ © ˙ ^ ∆ ° ¬ µ ~ ø π œ ® ß † ¨ √ ∑ ≈ ¥ Ω)],
+	[qw(å ∫ ç ∂ ́ ƒ © ˙ ̂ ∆ ° ¬ µ ̃ ø π œ ® ß † ̈ √ ∑ ≈ ¥ Ω)],
 ];
 
 my $keys = Shiar_Sheet::Keyboard->new({
 	def => {
 		'' => {
-			map { $_ => [''] } @{ $usint->[0] }
+			map {
+				my $c = $_;
+				my @row = map { $usint->[$_]->[$c] } 0 .. 2;
+				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[0] => "g$class"
+			} 0 .. $#{ $usint->[0] }
 		},
 	},
 	key => {
 		map {
-			my $i = ord($_) - ord('a');
-			$_ => ["$usint->[1]->[$i]<br>$usint->[2]->[$i]"]
-		} 'a'..'z'
+			$usint->[0]->[$_] => "$usint->[1]->[$_]<br>$usint->[2]->[$_]"
+		} 0 .. $#{ $usint->[0] }
+	},
+	flag => {
+		g1 => ['unaltered'],
+		g2 => ['accented'],
+		g3 => ['latin'],
+		g4 => ['other'],
+		g5 => ['combining'],
 	},
 });
 $keys->map($get{map}) or undef $get{map};
 $keys->print_rows($get{rows}, [0]);
-:>
-</ul>
-
-<hr>
-
-<div class="help">
-	<div class="left">
-		<dl class="legend legend-types">
-		<dt class="ci">info
-			<dd>Info command: shows/does something without altering anything.
-		<dt class="pm">motion
-		<dt class="po">positioning
-			<dd>Other movement (jumps, window (re)positioning).
-		<dt class="co">command
-			<dd>Direct action command.
-		<dt class="mi">ins mode
-			<dd>Enters Insert or Replace mode.
-		<dt class="mo">mode
-			<dd>Enters a different mode.
-		<dt class="mv">vis mode
-			<dd>Enters Visual or Select mode.
-		<dt class="me">key cmd
-			<dd>Additional key commands (click for overview).
-		</dl>
-	</div>
-
-	<div class="right">
-		<dl class="legend legend-options">
-		</dl>
-
-		<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);