X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/2b09a029e9c61ee24caaab28accb6a44e7125ba7..d018b1fcc5e1035c2302b2417480003aca64fa5e:/Shiar_Sheet/Keyboard.pm diff --git a/Shiar_Sheet/Keyboard.pm b/Shiar_Sheet/Keyboard.pm index c5fdb09..846a2a2 100644 --- a/Shiar_Sheet/Keyboard.pm +++ b/Shiar_Sheet/Keyboard.pm @@ -6,7 +6,7 @@ use warnings; no warnings 'uninitialized'; # save some useless checks for more legible code use Carp; -our $VERSION = 'v2.06'; +our $VERSION = '2.07'; my @casedesc = (undef, qw/shift ctrl meta/, 'shift meta'); my @rowdesc = qw(numeric top home bottom); @@ -36,6 +36,9 @@ sub new { \%Shiar_Sheet::KeySigns::sign; }; + $self->{showkeys} = $PLP::Script::showkeys; + $self->{style } = $PLP::Script::style; + bless $self, $class; } @@ -86,6 +89,19 @@ sub keyunalias { return $self->keyunalias($keyinfo, $ancestry); } +sub print_letter { + my $self = shift; + my ($key, $mode) = @_; + + return if $key eq '^0'; + return 'Esc' if $key eq "\e"; +# return $keytrans{$key} if defined $keytrans{$key}; + my $html = $self->{def}{$mode}{lead} . escapehtml($key); + $html =~ s{\^(?=.)}{^}; # element around ctrl-identifier + $html =~ s{\+(?=.)}{+}; # meta + return $html; +} + sub print_key { my $self = shift; my ($mode, $key, $flags) = @_; @@ -103,12 +119,9 @@ sub print_key { ($desc, $mnem) = split /\n/, $self->escapedesc($txt); } -# $key = $keytrans{$key} if defined $keytrans{$key}; - my $keytxt = $key eq "\e" ? 'Esc' : $self->{def}{$mode}{lead} . escapehtml($key) if $key ne '^0'; + my $keytxt = $self->print_letter($key, $mode); $keytxt .= $self->{sign}->{$1} while $flags =~ s/(?:^| )(arg[a-ln-z]?)\b//; # arguments $keytxt .= "$self->{sign}->{motion}" if $flags =~ s/ ?\bargm\b//; # motion argument - $keytxt =~ s{\^(?=.)}{^}; # element around ctrl-identifier - $keytxt =~ s{\+(?=.)}{+}; # meta my $keyhint = defined($mnem) && qq{ title="$mnem"}; $keytxt = "$keytxt"; $keytxt .= ' '.$desc if defined $desc; @@ -185,11 +198,43 @@ sub print_legend { my $self = shift; my ($class, $flags) = @_; - print qq{\t\t