no warnings 'uninitialized'; # save some useless checks for more legible code
use Carp;
-our $VERSION = '2.10';
+our $VERSION = '3.00';
my @casedesc = (undef, qw/shift ctrl meta/, 'shift meta');
my @rowdesc = qw(numeric top home bottom);
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/^=(\S+)\s?//) { # alias
- my $ref = $1;
- $desc = $self->{sign}->{alias} . ($ref eq "\e" ? 'esc' : $ref);
- $flags = join ' ', $self->keyunalias($ref), 'alias', $flags;
+ 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 $keytxt = $self->print_letter($key, $mode);
$keytxt .= "<small>$self->{sign}->{motion}</small>" if $flags =~ s/ ?\bargm\b//; # motion argument
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',
},