keys: store translation arrays as multiline string

[sheet.git] / Shiar_Sheet / Keyboard.pm

diff --git a/Shiar_Sheet/Keyboard.pm b/Shiar_Sheet/Keyboard.pm
index 936b811f08c0e1e66be0c22ff7f32f3133660959..e8e33aa0283f22c88e4c094a3ac3631443210efb 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.02';
+our $VERSION = 'v2.03';
 
 my @casedesc = (undef, qw/shift ctrl meta/, 'shift meta');
 my @rowdesc = qw(numeric top home bottom);
@@ -84,18 +84,17 @@ 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) = split /\n/, $txt;
        }
 
 #      $key = $keytrans{$key} if defined $keytrans{$key};
@@ -114,7 +113,7 @@ 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";
 }
 
@@ -127,12 +126,15 @@ sub print_rows {
        my $defrows = shift || [2, 1, 0];
        my @modes = sort keys %{ $self->{def} };
 
+       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];
 
-               printf qq{<li class="row row%d"><ul>\n}, $row+1;
-               for my $basemode ($row < 0 ? '' : @modes) {
+               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,28 +147,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>', # XXX insert &nbsp; here to fix msie<=6
+                               printf('<th>%s<small>: %s</small></th>', # 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];
-                               print qq{\t\t<ul class="$caseclass">\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 {