X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/f1bebae9f4ca77ef3e1b4d3036933f29a0da1ac0..8f53b03a6246809e8290984b5e5c386daa26c2a0:/Shiar_Sheet/Keyboard.pm diff --git a/Shiar_Sheet/Keyboard.pm b/Shiar_Sheet/Keyboard.pm index 3b72576..327b20c 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 = '2.09'; +our $VERSION = '2.10'; my @casedesc = (undef, qw/shift ctrl meta/, 'shift meta'); my @rowdesc = qw(numeric top home bottom); @@ -56,6 +56,7 @@ sub escapeclass { s/\+/_m/g; s/\[/_sbo/g; s/\]/_sbc/g; + s/\\/_b/g; s/^$/_/; return $_; } @@ -167,8 +168,8 @@ print_row: for my $submode (@moderows ? @moderows : '') { my $mode = $basemode . $submode; - my @caserows = $mode =~ s/(\d+)(?:-(\d+))?$// - ? (map {$_ - 1} split //, $row == 0 && $2 || $1) # user override + my @caserows = $mode =~ s/(\d+)(?:-(\d*))?$// + ? (map {$_ - 1} split //, $row == 0 ? $2 // $1 : $1) # user override : @$defrows; # default my $modekeys = $self->{def}{$mode}; @@ -206,7 +207,7 @@ sub print_legend { my ($class, $flags) = @_; say qq{\t\t
}; - printf("\t\t".'
%s'."\n\t\t\t".'
%s'."\n", + printf("\t\t".'
%s'."\n\t\t\t".'
%s
'."\n", $_, map { $self->escapedesc($_) } @{ $self->{flag}->{$_} || ["($_)", '...'] } ) for @$flags; say "\t\t
";