X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/601c737a133afc2884c7e88d293268918d26f315..388747c44481439d1fa4614a804cbaa75441db35:/Shiar_Sheet/Keyboard.pm

diff --git a/Shiar_Sheet/Keyboard.pm b/Shiar_Sheet/Keyboard.pm
index 30b73bf..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.04';
+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;
 }
 
@@ -81,7 +84,7 @@ sub keyunalias {
 	my $keyinfo = $self->{def}->{$mode}->{$key};
 
 	return unless defined $keyinfo;
-	return $keyinfo->[0] if ref $keyinfo;
+	$keyinfo =~ s/^=// or return $keyinfo;
 	return '' if $ancestry->{$key}++;  # endless loop failsafe
 	return $self->keyunalias($keyinfo, $ancestry);
 }
@@ -89,16 +92,16 @@ sub keyunalias {
 sub print_key {
 	my $self = shift;
 	my ($mode, $key, $flags) = @_;
+	my ($desc, $mnem);
 
 	if (not defined $flags) {
-		$flags = [$key eq '^0' ? 'ni' : 'no'];
+		$flags = $key eq '^0' ? 'ni' : 'no';
 	}
-	elsif (not ref $flags) { # alias
-		my $desc = $self->{sign}->{alias};
+	elsif ($flags =~ s/^=//) { # alias
+		$desc = $self->{sign}->{alias};
 		$desc .= $flags eq "\e" ? 'esc' : $flags;
-		$flags = [$self->keyunalias($flags) . ' alias', $desc];
+		$flags = $self->keyunalias($flags) . ' alias';
 	}
-	my ($flags, $desc, $mnem) = @{$flags};
 	if (my $txt = $self->{key}->{$mode.$key}) {
 		($desc, $mnem) = split /\n/, $self->escapedesc($txt);
 	}
@@ -125,11 +128,13 @@ sub print_key {
 
 sub print_rows {
 	my $self = shift;
+	my ($rowsspec, $defrows) = @_;
+	$defrows ||= [2, 1, 0];
 	my %moderows = (
-		-DEFAULT => !@_ ? '' : split(/(?:\s*([^=\s]*)=\s*)/, shift),
+		-DEFAULT => defined $rowsspec && $rowsspec ne '' &&
+			split(/\s* ([^=\s]*) = \s*/x, $rowsspec),
 		# plus specific mode overrides prefixed by '='
 	);
-	my $defrows = shift || [2, 1, 0];
 	my @modes = sort keys %{ $self->{def} };
 
 	print '<table id="rows" class="keys">'."\n\n";
@@ -140,8 +145,8 @@ sub print_rows {
 		printf qq{<tbody class="row row%d">\n}, $row+1;
 		for my $basemode (@modes) {
 			my @moderows = split /\s+/,
-				$row < 0 ? "0" :
-				defined $moderows{$basemode} ? $moderows{$basemode} : $moderows{-DEFAULT};
+				$row < 0 ? '1' : # top row (esc key) always unshifted
+				$moderows{$basemode} // $moderows{-DEFAULT};
 
 		for my $submode (@moderows ? @moderows : '') {
 			my $mode = $basemode . $submode;
@@ -183,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;
@@ -203,8 +240,8 @@ Shiar_Sheet::Keyboard - Output HTML for key sheets
 	my $keys = Shiar_Sheet::Keyboard({
 		def => {
 			'lead' => {
-				'A' => 'a', # alias
-				'a' => ['classes'],
+				'A' => '=a', # alias
+				'a' => 'classes',
 			},
 		},
 		key => {