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

diff --git a/Shiar_Sheet/Keyboard.pm b/Shiar_Sheet/Keyboard.pm
index 7713009..2b3cc86 100644
--- a/Shiar_Sheet/Keyboard.pm
+++ b/Shiar_Sheet/Keyboard.pm
@@ -1,11 +1,12 @@
 package Shiar_Sheet::Keyboard;
 
+use 5.010;
 use strict;
 use warnings;
 no  warnings 'uninitialized';  # save some useless checks for more legible code
 use Carp;
 
-our $VERSION = 'v2.01';
+our $VERSION = 'v2.05';
 
 my @casedesc = (undef, qw/shift ctrl meta/, 'shift meta');
 my @rowdesc = qw(numeric top home bottom);
@@ -29,13 +30,11 @@ sub new {
 	croak 'No key definitions specified' unless ref $self->{def} eq 'HASH';
 	$self->{map} ||= 'qwerty';
 
-	my $parent = (caller)[0];  # calling module
-	my $sign = do {
-		no strict 'refs';  # temporarily allow variable references
-		\%{ $parent.'::sign' };  # return %sign from parent
+	$self->{sign} ||= do {
+		require Shiar_Sheet::KeySigns;
+		Shiar_Sheet::KeySigns->VERSION(1.04);
+		\%Shiar_Sheet::KeySigns::sign;
 	};
-	croak "%${parent}::sign not found" unless %$sign;
-	$self->{sign} = $sign;
 
 	bless $self, $class;
 }
@@ -66,6 +65,13 @@ sub escapehtml {
 	return $_;
 }
 
+sub escapedesc {
+	my $self = shift;
+	local $_ = shift;
+	s{ (< ([^>]*) >) }{ $self->{sign}->{$2} // $1 }xeg;
+	return $_;
+}
+
 sub keyunalias {
 	my $self = shift;
 	my ($key, $ancestry) = @_;
@@ -75,7 +81,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);
 }
@@ -83,23 +89,22 @@ sub keyunalias {
 sub print_key {
 	my $self = shift;
 	my ($mode, $key, $flags) = @_;
-
-	my $txt = $self->{key}->{$mode.$key};
-	my ($desc, $mnem) = defined $txt ? @$txt : ();
+	my ($desc, $mnem);
 
 	if (not defined $flags) {
 		$flags = $key eq '^0' ? 'ni' : 'no';
 	}
-	elsif (not ref $flags) { # alias
-		$desc = $self->{sign}->{alias} . $flags;
+	elsif ($flags =~ s/^=//) { # alias
+		$desc = $self->{sign}->{alias};
+		$desc .= $flags eq "\e" ? 'esc' : $flags;
 		$flags = $self->keyunalias($flags) . ' alias';
 	}
-	else {
-		$flags = $flags->[0];
+	if (my $txt = $self->{key}->{$mode.$key}) {
+		($desc, $mnem) = split /\n/, $self->escapedesc($txt);
 	}
 
 #	$key = $keytrans{$key} if defined $keytrans{$key};
-	my $keytxt = $self->{def}{$mode}{lead} . escapehtml($key) if $key ne '^0';
+	my $keytxt = $key eq "\e" ? 'Esc' : $self->{def}{$mode}{lead} . escapehtml($key) if $key ne '^0';
 	   $keytxt .= $self->{sign}->{$1} while $flags =~ s/(?:^| )(arg[a-ln-z]?)\b//;  # arguments
 	   $keytxt .= "<small>$self->{sign}->{motion}</small>" if $flags =~ s/ ?\bargm\b//;  # motion argument
 	   $keytxt =~ s{\^(?=.)}{<small>^</small>};  # element around ctrl-identifier
@@ -114,25 +119,28 @@ sub print_key {
 	);
 	$flags .= ' chr'.ord(substr $key, -1) if $key ne '^0';
 
-	print qq{\t\t<li class="$flags"$onclick>$keytxt};
+	print qq{\t\t<td class="$flags"$onclick>$keytxt};
 	print "\n";
 }
 
 sub print_rows {
 	my $self = shift;
 	my %moderows = (
-		-DEFAULT => !@_ ? '' : split(/(?:\s*([^=\s]*)=\s*)/, shift),
+		-DEFAULT => !!@_ && $_[0] ne '' && split(/(?:\s*([^=\s]*)=\s*)/, shift),
 		# plus specific mode overrides prefixed by '='
 	);
 	my $defrows = shift || [2, 1, 0];
 	my @modes = sort keys %{ $self->{def} };
 
-	for (my $row = 0; $row <= $#{ $keyrows{$self->{map}} }; $row++) {
-		my $keyrow = $keyrows{$self->{map}}->[$row];
+	print '<table id="rows" class="keys">'."\n\n";
+
+	for (my $row = -1; $row <= $#{ $keyrows{$self->{map}} }; $row++) {
+		my $keyrow = $row < 0 ? [["\e"]] : $keyrows{$self->{map}}->[$row];
 
-		print qq{<li class="row row$row"><ul>\n};
+		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};
 
 		for my $submode (@moderows ? @moderows : '') {
@@ -145,27 +153,30 @@ sub print_rows {
 			for my $case (@caserows) {
 				my $keycase = $keyrow->[$case] or next;
 				  @$keycase or next;
+				my @caseclass;
+				push @caseclass, 'mode', 'mode'.escapeclass($basemode) if $basemode ne '';
+				push @caseclass, 'lead' if defined $modekeys->{lead};  # leading command key shown
+				push @caseclass, $casedesc[$case] if defined $casedesc[$case];
 
-				printf "\t<li%s>", $basemode ne '' && sprintf(
-					' class="%s"', 'mode mode' . escapeclass($basemode)
+				printf "\t<tr%s>", @caseclass > 0 && sprintf(
+					' class="%s"', join ' ', @caseclass
 				);
-				printf("<h3>%s<small>: %s</small></h3>\n", # XXX insert &nbsp; here to fix msie<=6
-						$self->{mode}->{$mode} || "mode $basemode",
+				printf('<th>%s<small>: %s</small></th>', # XXX insert &nbsp; here to fix msie<=6
+						$self->escapedesc($self->{mode}->{$mode} || "mode $basemode"),
 						"$rowdesc[$row] row $casedesc[$case]"
-				);
-				my $caseclass = 'keys';
-				   $caseclass .= ' lead' if defined $modekeys->{lead};  # leading command key shown
-				   $caseclass .= " $casedesc[$case]" if defined $casedesc[$case];
-				print qq{\t\t<ul class="$caseclass">\n};
+				) unless $row < 0;
+				print "\n";
 				$self->print_key($mode, $_, $modekeys->{$_}) for @$keycase;
-				print qq{\t\t</ul>\n};
+				print qq{\t\t</tr>\n};
 			} # case
 
 		} # submode
 
 		} # basemode
-		print qq{\t</ul>\n};
+		print qq{\t</tbody>\n};
 	} # row
+
+	print "</table>\n";
 }
 
 sub print_legend {
@@ -174,7 +185,7 @@ sub print_legend {
 
 	print qq{\t\t<dl class="legend $class">\n};
 	printf("\t\t".'<dt class="%s">%s'."\n\t\t\t".'<dd>%s'."\n",
-		$_, @{ $self->{flag}->{$_} || ["($_)", '...'] }
+		$_, map { $self->escapedesc($_) } @{ $self->{flag}->{$_} || ["($_)", '...'] }
 	) for @$flags;
 	print "\t\t</dl>";
 }
@@ -192,8 +203,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 => {