common: bump version to 1.11

[sheet.git] / keyboard.plp

diff --git a/keyboard.plp b/keyboard.plp
index 9fd00feef398e11f8763e73ff263635ee2bd1bbe..8060fa605b30cd542b780773a8e2184ce7fbbdbe 100644 (file)
--- a/keyboard.plp
+++ b/keyboard.plp
@@ -2,8 +2,8 @@
 
 Html({
        title => 'keyboard cheat sheet',
-       version => 'v1.0',
-       stylesheet => [qw'light dark circus mono red terse'],
+       version => '1.1',
+       stylesheet => [qw( light dark circus mono red )],
        keys => 1,
 });
 
@@ -12,80 +12,56 @@ 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;
-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 {
-                       my $i = ord($_) - ord('a');
-                       $_ => ["$usint->[1]->[$i]<br>$usint->[2]->[$i]"]
-               } 'a'..'z'
+                       $_->[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]);
-:>
-</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);