keyboard: report code errors in altgr includes

[sheet.git] / keyboard.plp

diff --git a/keyboard.plp b/keyboard.plp
index 3a8f35f443481debb3fdd07847100d1a559864f4..a7bdc9144d1813aa27ae06198f1a7f9f42223727 100644 (file)
--- a/keyboard.plp
+++ b/keyboard.plp
@@ -1,58 +1,38 @@
 <(common.inc.plp)><:
 
+my $mode = lc($Request || 'altgr');
+my $include = "$mode.eng";
+
+my $info = eval { Data($include) } || {};
+warn "error in $include: ", @{$@} if ref $@;
+$mode = $info->{title} // $mode;
+
 Html({
-       title => 'keyboard cheat sheet',
-       version => '1.0',
+       title => "\L$mode\E keyboard cheat sheet",
+       version => $info->{version} || '0.1',
+       description => $info->{description} //
+               ["Keyboard cheat sheet for the default controls of $mode."],
+       keywords => [@{ $info->{keywords} // [] }, qw'
+               sheet cheat reference overview keyboard control commands shortkey
+       '],
        stylesheet => [qw( light dark circus mono red )],
        keys => 1,
+       data => ["$include.inc.pl"],
 });
 
-:>
-<h1>keyboard cheat sheet</h1>
-
-<h2>normal mode (default)</h2>
+%{$info} or Abort(
+       "Requested keyboard <q>$mode</q> not available",
+       '404 request not found',
+);
 
-<:
-use Shiar_Sheet::Keyboard 2.07;
-use Unicode::Normalize qw( NFKD );
+say "<h1>$mode cheat sheet</h1>";
+say "<p>$_</p>" for $info->{intro} // ();
+say "<h2>", $info->{mode}->{''}, " (default)</h2>"
+       if $info->{mode} and %{ $info->{mode} } > 1;
 
-my $usint = [
-       [  'a' ..                                            'z'],
-       [qw(Á B ¢ Ð É F G H Í J Œ Ø µ Ñ Ó Ö Ä ® § Þ Ú V Å X Ü Æ)],
-       [qw(á b © ð é f g h í j œ ø µ ñ ó ö ä ® ß þ ú v å x ü æ)],
-       [qw(Å ı Ç ð ´ ̉ ˝ ̣ ˆ ½  Þ ¾ ˜ Ø ∏ Œ ‰ / ˇ ¨ ◊ „ ˛ ¼ ¸)],
-       [qw(å ∫ ç ∂ ´ ƒ © ˙ ^ ∆ ° ¬ µ ~ ø π œ ® ß † ¨ √ ∑ ≈ ¥ Ω)],
-];
-
-my $keys = Shiar_Sheet::Keyboard->new({
-       def => {
-               '' => {
-                       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 # equivalent
-                                       : $row[2] =~ /^\p{Latin}/ ? 3 # latin
-                                       : 4
-                               );
-                               $row[0] => "g$class"
-                       } 0 .. $#{ $usint->[0] }
-               },
-       },
-       key => {
-               map {
-                       $usint->[0]->[$_] => "$usint->[1]->[$_]<br>$usint->[2]->[$_]"
-               } 0 .. $#{ $usint->[0] }
-       },
-       flag => {
-               g1 => ['unaltered'],
-               g2 => ['accented'],
-               g3 => ['latin'],
-               g4 => ['other'],
-       },
-});
+use Shiar_Sheet::Keyboard 2.08;
+my $keys = Shiar_Sheet::Keyboard->new($info);
 $keys->map($get{map}) or undef $get{map};
-$keys->print_rows($get{rows}, [0]);
+$keys->print_rows($get{rows}, $info->{rows});
 $keys->print_legends(\%get);