no warnings 'uninitialized'; # save some useless checks for more legible code
use Carp;
-our $VERSION = 'v2.04';
+our $VERSION = 'v2.06';
my @casedesc = (undef, qw/shift ctrl meta/, 'shift meta');
my @rowdesc = qw(numeric top home bottom);
my $keyinfo = $self->{def}->{$mode}->{$key};
return unless defined $keyinfo;
- return $keyinfo->[0] if ref $keyinfo;
+ $keyinfo =~ s/^=// or return $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);
if (not defined $flags) {
- $flags = [$key eq '^0' ? 'ni' : 'no'];
+ $flags = $key eq '^0' ? 'ni' : 'no';
}
- elsif (not ref $flags) { # alias
- my $desc = $self->{sign}->{alias};
+ elsif ($flags =~ s/^=//) { # alias
+ $desc = $self->{sign}->{alias};
$desc .= $flags eq "\e" ? 'esc' : $flags;
- $flags = [$self->keyunalias($flags) . ' alias', $desc];
+ $flags = $self->keyunalias($flags) . ' alias';
}
- my ($flags, $desc, $mnem) = @{$flags};
if (my $txt = $self->{key}->{$mode.$key}) {
($desc, $mnem) = split /\n/, $self->escapedesc($txt);
}
sub print_rows {
my $self = shift;
+ my ($rowsspec, $defrows) = @_;
+ $defrows ||= [2, 1, 0];
my %moderows = (
- -DEFAULT => !@_ ? '' : split(/(?:\s*([^=\s]*)=\s*)/, shift),
+ -DEFAULT => defined $rowsspec && $rowsspec ne '' &&
+ split(/\s* ([^=\s]*) = \s*/x, $rowsspec),
# plus specific mode overrides prefixed by '='
);
- my $defrows = shift || [2, 1, 0];
my @modes = sort keys %{ $self->{def} };
print '<table id="rows" class="keys">'."\n\n";
printf qq{<tbody class="row row%d">\n}, $row+1;
for my $basemode (@modes) {
my @moderows = split /\s+/,
- $row < 0 ? "0" :
- defined $moderows{$basemode} ? $moderows{$basemode} : $moderows{-DEFAULT};
+ $row < 0 ? '1' : # top row (esc key) always unshifted
+ $moderows{$basemode} // $moderows{-DEFAULT};
for my $submode (@moderows ? @moderows : '') {
my $mode = $basemode . $submode;
my $keys = Shiar_Sheet::Keyboard({
def => {
'lead' => {
- 'A' => 'a', # alias
- 'a' => ['classes'],
+ 'A' => '=a', # alias
+ 'a' => 'classes',
},
},
key => {