X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/2c02dbfe7e0bc1ce3619489adcb79aca128142cf..2e8c1e3cc39cc1c6e4b858242d2a3a39481b9640:/Shiar_Sheet/Keyboard.pm?ds=sidebyside
diff --git a/Shiar_Sheet/Keyboard.pm b/Shiar_Sheet/Keyboard.pm
index 0108cf1..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.07';
+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 $_;
}
@@ -110,10 +111,10 @@ sub print_key {
if (not defined $flags) {
$flags = $key eq '^0' ? 'ni' : 'no';
}
- elsif ($flags =~ s/^=//) { # alias
- $desc = $self->{sign}->{alias};
- $desc .= $flags eq "\e" ? 'esc' : $flags;
- $flags = $self->keyunalias($flags) . ' alias';
+ elsif ($flags =~ s/^=(\S+)\s?//) { # alias
+ my $ref = $1;
+ $desc = $self->{sign}->{alias} . ($ref eq "\e" ? 'esc' : $ref);
+ $flags = join ' ', $self->keyunalias($ref), 'alias', $flags;
}
if (my $txt = $self->{key}->{$mode.$key}) {
($desc, $mnem) = split /\n/, $self->escapedesc($txt);
@@ -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,44 +207,12 @@ 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
";
}
-sub print_legends {
- my $self = shift;
- my ($input) = @_;
-
- say "
\n";
- say '';
-
- say "\t", '
';
- my @groups = sort grep {/^g\d/} keys %{ $self->{flag} };
- $self->print_legend('legend-types', \@groups);
- say "\t
\n";
-
- say "\t", '
';
- my @attr = sort grep {!/^g\d/} keys %{ $self->{flag} };
- $self->print_legend('legend-options', \@attr);
- say '';
-
- say "\t\t", '
';
-
- say "\t\t- keyboard map is ",
- ($input->{map} ? 'set to ' : ''), "$self->{map}";
- say "\t\t
- keys are ",
- "", ($self->{showkeys} ? 'always shown' : 'hidden if unassigned'), "",
- (!defined $self->{showkeys} && ' by default');
- say "\t\t
- default style is ",
- (defined $input->{style} && 'set to '), "$self->{style}";
-
- say "\t\t
";
- say "\t
\n";
- say "
\n";
-}
-
1;
=head1 NAME
@@ -274,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.