keys: replace legends by generic function

diff --git a/keyboard.plp b/keyboard.plp
index f1d5634c14952696a9c1c5f97a82e7aa4c5a4ef4..92c2aa292cd05eadfe3233c70de40548568aecb2 100644 (file)
--- a/keyboard.plp
+++ b/keyboard.plp
@@ -13,7 +13,8 @@ Html({
 <h2>normal mode (default)</h2>
 
 <:
-use Shiar_Sheet::Keyboard 2;
+use Shiar_Sheet::Keyboard 2.07;
+
 my $usint = [
        [  'a' ..                                            'z'],
        [qw(Á B ¢ Ð É F G H Í J Œ Ø µ Ñ Ó Ö Ä ® § Þ Ú V Å X Ü Æ)],
@@ -36,20 +37,5 @@ my $keys = Shiar_Sheet::Keyboard->new({
 });
 $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);
 

diff --git a/less.plp b/less.plp
index 582eef4674cf0194d5982df5ffe198c03d57d319..206de5e85a18e649d1d3554f54daab9b2a24df1f 100644 (file)
--- a/less.plp
+++ b/less.plp
@@ -21,32 +21,10 @@ Html({
 <h2>normal pager (default)</h2>
 
 <:
-use Shiar_Sheet::Keyboard 2;
+use Shiar_Sheet::Keyboard 2.07;
 my $info = do 'less.eng.inc.pl' or die $@;
 my $keys = Shiar_Sheet::Keyboard->new($info);
 $keys->map($get{map}) or undef $get{map};
 $keys->print_rows($get{rows}, [1,0]);
-:>
-
-<hr>
-
-<div class="help">
-       <div class="left">
-<: $keys->print_legend('legend-types', ['g1' .. 'g4', 'g7', 'g8']) :>
-       </div>
-
-       <div class="right">
-<: $keys->print_legend('legend-options', [qw( arg more )]) :>
-
-               <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);
 

diff --git a/mplayer.plp b/mplayer.plp
index 110018ef3eab525bbe63fceed47eecd2d7cb6182..5620792af02b449b4b5713bfeab6890df0939d04 100644 (file)
--- a/mplayer.plp
+++ b/mplayer.plp
@@ -25,27 +25,5 @@ my $info = do 'mplayer.eng.inc.pl' or die $@;
 my $keys = Shiar_Sheet::Keyboard->new($info);
 $keys->map($get{map}) or undef $get{map};
 $keys->print_rows($get{rows}, [1,0]);
-:>
-
-<hr>
-
-<div class="help">
-       <div class="left">
-<: $keys->print_legend('legend-types', [qw( g1 g2 g4 g6 g7 g9 )]) :>
-       </div>
-
-       <div class="right">
-<: $keys->print_legend('legend-options', [qw( arg ext )]) :>
-
-               <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);
 

diff --git a/mutt.plp b/mutt.plp
index 3ab95a030eabdaf75811f0f624db2669575a8ad0..bac469f9fd7b42c578794a0b4f35db450beea9ca 100644 (file)
--- a/mutt.plp
+++ b/mutt.plp
@@ -25,27 +25,5 @@ my $info = do 'mutt.eng.inc.pl' or die $@;
 my $keys = Shiar_Sheet::Keyboard->new($info);
 $keys->map($get{map}) or undef $get{map};
 $keys->print_rows($get{rows});
-:>
-
-<hr>
-
-<div class="help">
-       <div class="left">
-<: $keys->print_legend('legend-types', ['g1' .. 'g4', 'g6' .. 'g9']) :>
-       </div>
-
-       <div class="right">
-<: $keys->print_legend('legend-options', [qw( arg )]) :>
-
-               <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);
 

diff --git a/nethack.plp b/nethack.plp
index 9c4c62de6cc6178e439237aeb11854eab452d688..8a49a3d78e30e23748ead2c1835be8cfc84b0d2d 100644 (file)
--- a/nethack.plp
+++ b/nethack.plp
@@ -27,27 +27,5 @@ $_->{"\e"} = ['me mode'] for values %{ $info->{def} };
        # static reset button, even though it's not (officially) in the game
 $keys->map($get{map}) or undef $get{map};
 $keys->print_rows($get{rows} || '4321-421', [3,2,1,0]);
-:>
-
-<hr>
-
-<div class="help">
-       <div class="left">
-<: $keys->print_legend('legend-types', ['g2' .. 'g4', 'g6' .. 'g8']) :>
-       </div>
-
-       <div class="right">
-<: $keys->print_legend('legend-options', [qw( arg argi argm )]) :>
-
-               <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);
 

diff --git a/readline.plp b/readline.plp
index ed5f36661b2fb0d6c0d8463faeace9094c8c8cf9..1c5350a7317923b563e3c4c997473f0f701067b1 100644 (file)
--- a/readline.plp
+++ b/readline.plp
@@ -25,27 +25,5 @@ my $info = do 'readline.eng.inc.pl' or die $@;
 my $keys = Shiar_Sheet::Keyboard->new($info);
 $keys->map($get{map}) or undef $get{map};
 $keys->print_rows($get{rows} || '^x=213', [4,3,2]);
-:>
-
-<hr>
-
-<div class="help">
-       <div class="left">
-<: $keys->print_legend('legend-types', ['g1', 'g2', 'g4', 'g6' .. 'g9']) :>
-       </div>
-
-       <div class="right">
-<: $keys->print_legend('legend-options', [qw( arg new ext )]) :>
-
-               <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);
 

diff --git a/screen.plp b/screen.plp
index c6feb728aebc360a8d41f48b4ebd00e3a30f3505..6f88b0a4ae34bb066401a2f581ac7e2ee2f1910c 100644 (file)
--- a/screen.plp
+++ b/screen.plp
@@ -26,31 +26,5 @@ my $info = do 'screen.eng.inc.pl' or die $@ // $!;
 my $keys = Shiar_Sheet::Keyboard->new($info);
 $keys->map($get{map}) or undef $get{map};
 $keys->print_rows($get{rows});
-:>
-
-<hr>
-
-<div class="help">
-       <div class="left">
-<:
-               $keys->print_legend('legend-types', ['g1' .. 'g7', 'g9']);
-:>
-       </div>
-
-       <div class="right">
-<:
-               $keys->print_legend('legend-options', [qw'arg']);
-:>
-
-               <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><:=
-                               !defined $showkeys && ' by default' :>
-               <li>default <strong>style</strong> is
-                       <:= defined $get{style} && 'set to ' :><em><:= $style :></em>
-               </ul>
-       </div>
-</div>
+$keys->print_legends(\%get);
 

diff --git a/vimperator.plp b/vimperator.plp
index 3fb7ba5cb3e3b9bd0b733a756f83c675ed447a2b..bb4bd9a90f061d6eeae9d3b8f36fd22678f3c95e 100644 (file)
--- a/vimperator.plp
+++ b/vimperator.plp
@@ -21,34 +21,12 @@ Html({
 <h2>normal mode (default)</h2>
 
 <:
-use Shiar_Sheet::Keyboard 2;
+use Shiar_Sheet::Keyboard 2.07;
 my $info = do 'vimperator.eng.inc.pl' or die $@;
 $_->{"\e"} = ['mv mode', "normal mode"] for values %{ $info->{def} };
 delete $info->{def}->{''}->{"\e"};
 my $keys = Shiar_Sheet::Keyboard->new($info);
 $keys->map($get{map}) or undef $get{map};
 $keys->print_rows($get{rows});
-:>
-
-<hr>
-
-<div class="help">
-       <div class="left">
-<: $keys->print_legend('legend-types', ['g1' .. 'g9']) :>
-       </div>
-
-       <div class="right">
-<: $keys->print_legend('legend-options', [qw( arg args )]) :>
-
-               <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);