X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/f1bebae9f4ca77ef3e1b4d3036933f29a0da1ac0..22df5af9280e24267be789edcff52be9c43fd8ca:/Shiar_Sheet/Keyboard.pm?ds=inline
diff --git a/Shiar_Sheet/Keyboard.pm b/Shiar_Sheet/Keyboard.pm
index 3b72576..c7e455b 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 $_;
}
@@ -149,7 +150,7 @@ sub print_rows {
);
my @modes = sort keys %{ $self->{def} };
- print '
'."\n\n";
+ printf ''."\n\n", $self->{tableclass} // 'keys';
print_row:
for (my $row = -1; $row <= $#{ $keyrows{$self->{map}} }; $row++) {
@@ -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
";
@@ -242,7 +243,7 @@ Shiar_Sheet::Keyboard - Output HTML for key sheets
=head1 DESCRIPTION
-Used by http://sheet.shiar.nl to display keyboard sheets.
+Used by https://sheet.shiar.nl to display keyboard sheets.
Assumes specific stylesheets and javascript from this site,
so probably not of much use elsewhere.