keyboard: move legend formatting out of module

Page-specific html, no code to reuse.

diff --git a/Shiar_Sheet/Keyboard.pm b/Shiar_Sheet/Keyboard.pm
index 6908ce9c20b1dbf6d1ebfb550c57833174ade8fd..3b725764bd5e22c1ea6fe515fbbec51d68a7780e 100644 (file)
--- a/Shiar_Sheet/Keyboard.pm
+++ b/Shiar_Sheet/Keyboard.pm
@@ -6,7 +6,7 @@ use warnings;
 no  warnings 'uninitialized';  # save some useless checks for more legible code
 use Carp;
 
-our $VERSION = '2.08';
+our $VERSION = '2.09';
 
 my @casedesc = (undef, qw/shift ctrl meta/, 'shift meta');
 my @rowdesc = qw(numeric top home bottom);
@@ -212,38 +212,6 @@ sub print_legend {
        say "\t\t</dl>";
 }
 
-sub print_legends {
-       my $self = shift;
-       my ($input) = @_;
-
-       say "<hr/>\n";
-       say '<div class="help">';
-
-       say "\t", '<div class="left">';
-       my @groups = sort grep {/^g\d/} keys %{ $self->{flag} };
-       $self->print_legend('legend-types', \@groups);
-       say "\t</div>\n";
-
-       say "\t", '<div class="right">';
-       my @attr = sort grep {!/^g\d/} keys %{ $self->{flag} };
-       $self->print_legend('legend-options', \@attr);
-       say '';
-
-       say "\t\t", '<ul class="legend legend-set">';
-
-       say "\t\t<li>keyboard <strong>map</strong> is ",
-               ($input->{map} ? 'set to ' : ''), "<em>$self->{map}</em>";
-       say "\t\t<li><strong>keys</strong> are ",
-               "<em>", ($self->{showkeys} ? 'always shown' : 'hidden if unassigned'), "</em>",
-               (!defined $self->{showkeys} && ' by default');
-       say "\t\t<li>default <strong>style</strong> is ",
-               (defined $input->{style} && 'set to '), "<em>$self->{style}</em>";
-
-       say "\t\t</ul>";
-       say "\t</div>\n";
-       say "</div>\n";
-}
-
 1;
 
 =head1 NAME

diff --git a/keyboard.plp b/keyboard.plp
index a7bdc9144d1813aa27ae06198f1a7f9f42223727..d40c434f62d833c17ee6f768d2d0943937a7641d 100644 (file)
--- a/keyboard.plp
+++ b/keyboard.plp
@@ -34,5 +34,32 @@ 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}, $info->{rows});
-$keys->print_legends(\%get);
 
+{
+       say "<hr/>\n";
+       say '<div class="help">';
+
+       say "\t", '<div class="left">';
+       my @groups = sort grep {/^g\d/} keys %{ $keys->{flag} };
+       $keys->print_legend('legend-types', \@groups);
+       say "\t</div>\n";
+
+       say "\t", '<div class="right">';
+       my @attr = sort grep {!/^g\d/} keys %{ $keys->{flag} };
+       $keys->print_legend('legend-options', \@attr);
+       say '';
+
+       say "\t\t", '<ul class="legend legend-set">';
+
+       say "\t\t<li>keyboard <strong>map</strong> is ",
+               ($get{map} ? 'set to ' : ''), "<em>$keys->{map}</em>";
+       say "\t\t<li><strong>keys</strong> are ",
+               "<em>", ($showkeys ? 'always shown' : 'hidden if unassigned'), "</em>",
+               (!defined $showkeys && ' by default');
+       say "\t\t<li>default <strong>style</strong> is ",
+               (defined $get{style} && 'set to '), "<em>$style</em>";
+
+       say "\t\t</ul>";
+       say "\t</div>\n";
+       say "</div>\n";
+}