From: Mischa POSLAWSKY <perl@shiar.org>
Date: Sun, 18 Jun 2017 11:59:27 +0000 (+0200)
Subject: vi: generic function to print entire help legends
X-Git-Tag: v1.11~29
X-Git-Url: http://git.shiar.nl/sheet.git/commitdiff_plain/8bf4b29ac2bea396e7aafe10713ec3b148a153a8

vi: generic function to print entire help legends

Replace setup of help container consisting of left type legend (ordered .g*)
and right options legend (other flags and provided user options) as it is
identical on all other keyboard pages.
---

diff --git a/Shiar_Sheet/Keyboard.pm b/Shiar_Sheet/Keyboard.pm
index c5fdb09..44ecc4d 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 = 'v2.06';
+our $VERSION = '2.07';
 
 my @casedesc = (undef, qw/shift ctrl meta/, 'shift meta');
 my @rowdesc = qw(numeric top home bottom);
@@ -36,6 +36,9 @@ sub new {
 		\%Shiar_Sheet::KeySigns::sign;
 	};
 
+	$self->{showkeys} = $PLP::Script::showkeys;
+	$self->{style   } = $PLP::Script::style;
+
 	bless $self, $class;
 }
 
@@ -185,11 +188,43 @@ sub print_legend {
 	my $self = shift;
 	my ($class, $flags) = @_;
 
-	print qq{\t\t<dl class="legend $class">\n};
+	say qq{\t\t<dl class="legend $class">};
 	printf("\t\t".'<dt class="%s">%s'."\n\t\t\t".'<dd>%s'."\n",
 		$_, map { $self->escapedesc($_) } @{ $self->{flag}->{$_} || ["($_)", '...'] }
 	) for @$flags;
-	print "\t\t</dl>";
+	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;
diff --git a/vi.eng.inc.pl b/vi.eng.inc.pl
index 77c6acc..823bbfe 100644
--- a/vi.eng.inc.pl
+++ b/vi.eng.inc.pl
@@ -472,8 +472,8 @@ flag => {
 
 	arg => ["key<arg>", "Commands with a dot need a char argument afterwards."],
 	motion => ["key<motion>", "Requires a motion afterwards, operates between cursor and destination."],
-	'ext vim6' => ["vim", "Not in original Vi (assessment incomplete)."],
-	'ext new vim7' => ["vim7", "New in vim version 7.x."],
+	'vim6 ext' => ["vim", "Not in original Vi (assessment incomplete)."],
+	'vim7 ext new' => ["vim7", "New in vim version 7.x."],
 },
 
 def => {
diff --git a/vi.plp b/vi.plp
index 203fdc8..9a11580 100644
--- a/vi.plp
+++ b/vi.plp
@@ -20,36 +20,10 @@ Html({
 <h2>normal mode (default)</h2>
 
 <:
-use Shiar_Sheet::Keyboard 2;
+use Shiar_Sheet::Keyboard 2.07;
 my $info = do 'vi.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 motion', 'ext vim6', 'ext new vim7']);
-:>
-
-		<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);