no warnings 'uninitialized'; # save some useless checks for more legible code
use Carp;
-our $VERSION = '2.07';
+our $VERSION = '3.01';
my @casedesc = (undef, qw/shift ctrl meta/, 'shift meta');
my @rowdesc = qw(numeric top home bottom);
s/\+/_m/g;
s/\[/_sbo/g;
s/\]/_sbc/g;
+ s/\\/_b/g;
s/^$/_/;
return $_;
}
my $self = shift;
my ($key, $ancestry) = @_;
- $key =~ s/(\S*?)(\+?\^?\S)($|\s.*)/$2/;
+ $key =~ s/(\S*?)(\+?\^?\S$)/$2/;
my $mode = $1;
my $keyinfo = $self->{def}->{$mode}->{$key};
return unless defined $keyinfo;
- $keyinfo =~ s/^=// or return $keyinfo;
+ return $keyinfo unless ref $keyinfo eq 'SCALAR';
+ $keyinfo = ${$keyinfo};
return '' if $ancestry->{$key}++; # endless loop failsafe
return $self->keyunalias($keyinfo, $ancestry);
}
sub print_key {
my $self = shift;
- my ($mode, $key, $flags) = @_;
- my ($desc, $mnem);
+ my ($mode, $key, $def) = @_;
- if (not defined $flags) {
- $flags = $key eq '^0' ? 'ni' : 'no';
+ if (not defined $def) {
+ $def = [$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 (ref $def eq 'SCALAR') {
+ $def = [undef, $def];
}
- if (my $txt = $self->{key}->{$mode.$key}) {
- ($desc, $mnem) = split /\n/, $self->escapedesc($txt);
+ if (ref $def ne 'ARRAY') {
+ carp "print_key: invalid definition for $mode$key: $def";
+ return;
}
+ my ($flags, $txt) = @{$def};
+ if (ref $txt eq 'SCALAR') {
+ my $ref = ${$txt};
+ $def = $self->keyunalias($ref);
+ $ref = 'esc' if $ref eq "\e";
+ $flags //= $def->[0] if ref $def eq 'ARRAY';
+ $txt = $self->{sign}->{alias} . $ref;
+ $flags .= ' alias';
+ }
+ my ($desc, $mnem) = split /\n/, $self->escapedesc($txt);
+ my $onclick = $flags =~ s/ ?\bmode(\S*)// && defined $self->{def}{$1} && sprintf(
+ ' onclick="setmode(%s)"',
+ $1 eq '' ? '' : sprintf(q{'mode%s'}, escapeclass($1))
+ );
+ my $keyhint = defined($mnem) && qq{ title="$mnem"};
+ if ($self->{tableclass} =~ /\bbig\b/) {
+ $onclick .= $keyhint;
+ $keyhint = '';
+ }
my $keytxt = $self->print_letter($key, $mode);
$keytxt .= "<small>$self->{sign}->{motion}</small>" if $flags =~ s/ ?\bargm\b//; # motion argument
$keytxt .= $self->{sign}->{$1} while $flags =~ s/(?:^| )(arg[a-ln-z]?)\b//; # arguments
- my $keyhint = defined($mnem) && qq{ title="$mnem"};
$keytxt = "<b$keyhint>$keytxt</b>";
$keytxt .= ' '.$desc if defined $desc;
$keytxt = qq{<a href="/$1">$keytxt</a>} if $flags =~ s/ ?\blink(\S*)//;
- my $onclick = $flags =~ s/ ?\bmode(\S*)// && defined $self->{def}{$1} && sprintf(
- ' onclick="setmode(%s)"',
- $1 eq '' ? '' : sprintf(q{'mode%s'}, escapeclass($1))
- );
$flags =~ s/\bx\w+/ext/;
$flags =~ s/\bv\d+/new/;
$flags .= ' chr'.ord(substr $key, -1) if $key ne '^0';
);
my @modes = sort keys %{ $self->{def} };
- print '<table id="rows" class="keys">'."\n\n";
+ printf '<table id="rows" class="%s">'."\n\n", $self->{tableclass} // 'keys';
print_row:
for (my $row = -1; $row <= $#{ $keyrows{$self->{map}} }; $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};
my ($class, $flags) = @_;
say qq{\t\t<dl class="legend $class">};
- printf("\t\t".'<dt class="%s">%s'."\n\t\t\t".'<dd>%s'."\n",
+ printf("\t\t".'<dt class="%s">%s'."\n\t\t\t".'<dd>%s</dd>'."\n",
$_, map { $self->escapedesc($_) } @{ $self->{flag}->{$_} || ["($_)", '...'] }
) for @$flags;
say "\t\t</dl>";
}
-sub print_legends {
- my $self = shift;
- my ($input) = @_;
-
- say "<hr/>\n";
- say '<div class="help">';
-
- say "\t", '<div class="left">';
- my @groups = sort grep {/^g\d/} keys %{ $self->{flag} };
- $self->print_legend('legend-types', \@groups);
- say "\t</div>\n";
-
- say "\t", '<div class="right">';
- my @attr = sort grep {!/^g\d/} keys %{ $self->{flag} };
- $self->print_legend('legend-options', \@attr);
- say '';
-
- say "\t\t", '<ul class="legend legend-set">';
-
- say "\t\t<li>keyboard <strong>map</strong> is ",
- ($input->{map} ? 'set to ' : ''), "<em>$self->{map}</em>";
- say "\t\t<li><strong>keys</strong> are ",
- "<em>", ($self->{showkeys} ? 'always shown' : 'hidden if unassigned'), "</em>",
- (!defined $self->{showkeys} && ' by default');
- say "\t\t<li>default <strong>style</strong> is ",
- (defined $input->{style} && 'set to '), "<em>$self->{style}</em>";
-
- say "\t\t</ul>";
- say "\t</div>\n";
- say "</div>\n";
-}
-
1;
=head1 NAME
my $keys = Shiar_Sheet::Keyboard({
def => {
'lead' => {
- 'A' => '=a', # alias
- 'a' => 'classes',
+ 'A' => \'a', # alias
+ 'a' => ['classes', 'description', 'hover comments'],
},
},
- key => {
- 'leada' => ['description', 'comments (on hover)'],
- },
mode => {
'lead' => 'mode description',
},
=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.
git.shiar.nl / sheet.git / blobdiff