X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/79f8945f7b66f8cf1ba1f1b84567665a051a76ff..a0ba9298856b2426c5c66b6d2f2b284d98cee594:/Shiar_Sheet/Keyboard.pm

diff --git a/Shiar_Sheet/Keyboard.pm b/Shiar_Sheet/Keyboard.pm
index 6ba2a4a..05df107 100644
--- a/Shiar_Sheet/Keyboard.pm
+++ b/Shiar_Sheet/Keyboard.pm
@@ -5,7 +5,7 @@ use warnings;
 no  warnings 'uninitialized';  # save some useless checks for more legible code
 use Carp;
 
-our $VERSION = '1.02';
+our $VERSION = '1.03';
 
 my @casedesc = (undef, qw/shift ctrl meta/, 'shift meta');
 my @rowdesc = qw(numeric top home bottom);
@@ -90,6 +90,7 @@ sub print_key {
 	   $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
+	   $keytxt =~ s{\+(?=.)}{<small>+</small>};  # meta
 	my $onclick = $flags =~ s/ ?\bmode(\S*)// && defined $self->{keys}{$1} && sprintf(
 		' onclick="setmode(%s)"',
 		$1 eq '' ? '' : sprintf(q{'mode%s'}, escapeclass($1))
@@ -97,6 +98,7 @@ sub print_key {
 	$onclick .= sprintf(q{ onclick="document.location='%s'"}, $1)
 		if $flags =~ s/ ?\blink(\S*)//;
 	my $keyhint = defined($mnem) && qq{ title="$mnem"};
+	$flags .= ' chr'.ord(substr $key, -1) if $key ne '^0';
 
 	print qq{\t\t<li class="$flags"$onclick><b$keyhint>$keytxt</b>};
 	print ' ', $desc if defined $desc;
@@ -110,13 +112,12 @@ sub print_rows {
 
 	for (my $row = 0; $row <= $#{ $keyrows{$self->{map}} }; $row++) {
 		my $keyrow = $keyrows{$self->{map}}->[$row];
-		my @caserows = 0 .. $#$keyrow;
 
 		print qq{<li class="row row$row"><ul>\n};
 		for my $modefull (@moderows) {
 			my $mode = $modefull;
 			my @showcase = $mode =~ s/(\d+)(?:-(\d+))?$//
-				? (map {3 - $_} split //, $row == 0 && $2 || $1) : @caserows;
+				? (map {$_ - 1} split //, $row == 0 && $2 || $1) : (2, 1, 0);
 			my $modekeys = $self->{keys}{$mode};
 
 			for my $case (@showcase) {