X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/fca88ab2c458a7ae367bfede7d2ddce2e0458f97..c4ca0bd3e94a7978772dadaa3b941ecc84741407:/Shiar_Sheet/Keyboard.pm

diff --git a/Shiar_Sheet/Keyboard.pm b/Shiar_Sheet/Keyboard.pm
index 6908ce9..47c1cf0 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 = '3.00';
 
 my @casedesc = (undef, qw/shift ctrl meta/, 'shift meta');
 my @rowdesc = qw(numeric top home bottom);
@@ -56,6 +56,7 @@ sub escapeclass {
 	s/\+/_m/g;
 	s/\[/_sbo/g;
 	s/\]/_sbc/g;
+	s/\\/_b/g;
 	s/^$/_/;
 	return $_;
 }
@@ -79,12 +80,13 @@ sub keyunalias {
 	my $self = shift;
 	my ($key, $ancestry) = @_;
 
-	$key =~ s/(\S*?)(\+?\^?\S)($|\s.*)/$2/;
+	$key =~ s/(\S*?)(\+?\^?\S$)/$2/;
 	my $mode = $1;
 	my $keyinfo = $self->{def}->{$mode}->{$key};
 
 	return unless defined $keyinfo;
-	$keyinfo =~ s/^=// or return $keyinfo;
+	return $keyinfo unless ref $keyinfo eq 'SCALAR';
+	$keyinfo = ${$keyinfo};
 	return '' if $ancestry->{$key}++;  # endless loop failsafe
 	return $self->keyunalias($keyinfo, $ancestry);
 }
@@ -104,20 +106,28 @@ sub print_letter {
 
 sub print_key {
 	my $self = shift;
-	my ($mode, $key, $flags) = @_;
-	my ($desc, $mnem);
+	my ($mode, $key, $def) = @_;
 
-	if (not defined $flags) {
-		$flags = $key eq '^0' ? 'ni' : 'no';
+	if (not defined $def) {
+		$def = [$key eq '^0' ? 'ni' : 'no'];
 	}
-	elsif ($flags =~ s/^=(\S+)\s?//) { # alias
-		my $ref = $1;
-		$desc = $self->{sign}->{alias} . ($ref eq "\e" ? 'esc' : $ref);
-		$flags = join ' ', $self->keyunalias($ref), 'alias', $flags;
+	elsif (ref $def eq 'SCALAR') {
+		$def = [undef, $def];
 	}
-	if (my $txt = $self->{key}->{$mode.$key}) {
-		($desc, $mnem) = split /\n/, $self->escapedesc($txt);
+	if (ref $def ne 'ARRAY') {
+		carp "print_key: invalid definition for $mode$key: $def";
+		return;
 	}
+	my ($flags, $txt) = @{$def};
+	if (ref $txt eq 'SCALAR') {
+		my $ref = ${$txt};
+		$def = $self->keyunalias($ref);
+		$ref = 'esc' if $ref eq "\e";
+		$flags //= $def->[0] if ref $def eq 'ARRAY';
+		$txt = $self->{sign}->{alias} . $ref;
+		$flags .= ' alias';
+	}
+	my ($desc, $mnem) = split /\n/, $self->escapedesc($txt);
 
 	my $keytxt = $self->print_letter($key, $mode);
 	   $keytxt .= "<small>$self->{sign}->{motion}</small>" if $flags =~ s/ ?\bargm\b//;  # motion argument
@@ -149,7 +159,7 @@ sub print_rows {
 	);
 	my @modes = sort keys %{ $self->{def} };
 
-	print '<table id="rows" class="keys">'."\n\n";
+	printf '<table id="rows" class="%s">'."\n\n", $self->{tableclass} // 'keys';
 
 print_row:
 	for (my $row = -1; $row <= $#{ $keyrows{$self->{map}} }; $row++) {
@@ -167,8 +177,8 @@ print_row:
 
 		for my $submode (@moderows ? @moderows : '') {
 			my $mode = $basemode . $submode;
-			my @caserows = $mode =~ s/(\d+)(?:-(\d+))?$//
-				? (map {$_ - 1} split //, $row == 0 && $2 || $1)  # user override
+			my @caserows = $mode =~ s/(\d+)(?:-(\d*))?$//
+				? (map {$_ - 1} split //, $row == 0 ? $2 // $1 : $1)  # user override
 				: @$defrows;  # default
 			my $modekeys = $self->{def}{$mode};
 
@@ -206,44 +216,12 @@ sub print_legend {
 	my ($class, $flags) = @_;
 
 	say qq{\t\t<dl class="legend $class">};
-	printf("\t\t".'<dt class="%s">%s'."\n\t\t\t".'<dd>%s'."\n",
+	printf("\t\t".'<dt class="%s">%s'."\n\t\t\t".'<dd>%s</dd>'."\n",
 		$_, map { $self->escapedesc($_) } @{ $self->{flag}->{$_} || ["($_)", '...'] }
 	) for @$flags;
 	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
@@ -257,13 +235,10 @@ 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', 'description', 'hover comments'],
 			},
 		},
-		key => {
-			'leada' => ['description', 'comments (on hover)'],
-		},
 		mode => {
 			'lead' => 'mode description',
 		},
@@ -274,7 +249,7 @@ Shiar_Sheet::Keyboard - Output HTML for key sheets
 
 =head1 DESCRIPTION
 
-Used by http://sheet.shiar.nl to display keyboard sheets.
+Used by https://sheet.shiar.nl to display keyboard sheets.
 Assumes specific stylesheets and javascript from this site,
 so probably not of much use elsewhere.