unicode: include harvey balls in symbols

[sheet.git] / Shiar_Sheet / Keyboard.pm

diff --git a/Shiar_Sheet/Keyboard.pm b/Shiar_Sheet/Keyboard.pm
index 760733595c4d7cf2a0351613544d766e23d32b9b..6819236812e00c2e4126d17383766d59481b151c 100644 (file)
--- 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 = 'v2.00';
+our $VERSION = 'v2.02';
 
 my @casedesc = (undef, qw/shift ctrl meta/, 'shift meta');
 my @rowdesc = qw(numeric top home bottom);
@@ -84,22 +84,21 @@ sub print_key {
        my $self = shift;
        my ($mode, $key, $flags) = @_;
 
-       my $txt = $self->{key}->{$mode.$key};
-       my ($desc, $mnem) = defined $txt ? @$txt : ();
-
        if (not defined $flags) {
-               $flags = $key eq '^0' ? 'ni' : 'no';
+               $flags = [$key eq '^0' ? 'ni' : 'no'];
        }
        elsif (not ref $flags) { # alias
-               $desc = $self->{sign}->{alias} . $flags;
-               $flags = $self->keyunalias($flags) . ' alias';
+               my $desc = $self->{sign}->{alias};
+               $desc .= $flags eq "\e" ? 'esc' : $flags;
+               $flags = [$self->keyunalias($flags) . ' alias', $desc];
        }
-       else {
-               $flags = $flags->[0];
+       my ($flags, $desc, $mnem) = @{$flags};
+       if (my $txt = $self->{key}->{$mode.$key}) {
+               ($desc, $mnem) = @{$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
@@ -127,12 +126,15 @@ sub print_rows {
        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 '<ul id="rows">'."\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{<li class="row row%d"><ul>\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 : '') {
@@ -149,10 +151,11 @@ sub print_rows {
                                printf "\t<li%s>", $basemode ne '' && sprintf(
                                        ' class="%s"', 'mode mode' . escapeclass($basemode)
                                );
-                               printf("<h3>%s<small>: %s</small></h3>\n", # XXX insert &nbsp; here to fix msie<=6
+                               printf('<h3>%s<small>: %s</small></h3>', # XXX insert &nbsp; here to fix msie<=6
                                                $self->{mode}->{$mode} || "mode $basemode",
                                                "$rowdesc[$row] row $casedesc[$case]"
-                               );
+                               ) unless $row < 0;
+                               print "\n";
                                my $caseclass = 'keys';
                                   $caseclass .= ' lead' if defined $modekeys->{lead};  # leading command key shown
                                   $caseclass .= " $casedesc[$case]" if defined $casedesc[$case];
@@ -166,6 +169,19 @@ sub print_rows {
                } # basemode
                print qq{\t</ul>\n};
        } # row
+
+       print "</ul>\n";
+}
+
+sub print_legend {
+       my $self = shift;
+       my ($class, $flags) = @_;
+
+       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}->{$_} || ["($_)", '...'] }
+       ) for @$flags;
+       print "\t\t</dl>";
 }
 
 1;