From f1bebae9f4ca77ef3e1b4d3036933f29a0da1ac0 Mon Sep 17 00:00:00 2001
From: Mischa POSLAWSKY <perl@shiar.org>
Date: Fri, 15 Dec 2023 01:49:30 +0100
Subject: [PATCH] keyboard: move legend formatting out of module

Page-specific html, no code to reuse.
---
 Shiar_Sheet/Keyboard.pm | 34 +---------------------------------
 keyboard.plp            | 29 ++++++++++++++++++++++++++++-
 2 files changed, 29 insertions(+), 34 deletions(-)

diff --git a/Shiar_Sheet/Keyboard.pm b/Shiar_Sheet/Keyboard.pm
index 6908ce9..3b72576 100644
--- 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 a7bdc91..d40c434 100644
--- 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";
+}
-- 
2.30.0