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 c5ab0167c0877b7a6ce20acbadc595c48afb6fe0..6819236812e00c2e4126d17383766d59481b151c 100644 (file)
--- a/Shiar_Sheet/Keyboard.pm
+++ b/Shiar_Sheet/Keyboard.pm
@@ -88,7 +88,9 @@ sub print_key {
                $flags = [$key eq '^0' ? 'ni' : 'no'];
        }
        elsif (not ref $flags) { # alias
-               $flags = [$self->keyunalias($flags) . ' alias', $self->{sign}->{alias} . $flags];
+               my $desc = $self->{sign}->{alias};
+               $desc .= $flags eq "\e" ? 'esc' : $flags;
+               $flags = [$self->keyunalias($flags) . ' alias', $desc];
        }
        my ($flags, $desc, $mnem) = @{$flags};
        if (my $txt = $self->{key}->{$mode.$key}) {
@@ -124,12 +126,15 @@ sub print_rows {
        my $defrows = shift || [2, 1, 0];
        my @modes = sort keys %{ $self->{def} };
 
+       print '<ul id="rows">'."\n\n";
+
        for (my $row = -1; $row <= $#{ $keyrows{$self->{map}} }; $row++) {
                my $keyrow = $row < 0 ? [["\e"]] : $keyrows{$self->{map}}->[$row];
 
                printf qq{<li class="row row%d"><ul>\n}, $row+1;
-               for my $basemode ($row < 0 ? '' : @modes) {
+               for my $basemode (@modes) {
                        my @moderows = split /\s+/,
+                               $row < 0 ? "0" :
                                defined $moderows{$basemode} ? $moderows{$basemode} : $moderows{-DEFAULT};
 
                for my $submode (@moderows ? @moderows : '') {
@@ -164,6 +169,8 @@ sub print_rows {
                } # basemode
                print qq{\t</ul>\n};
        } # row
+
+       print "</ul>\n";
 }
 
 sub print_legend {