X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/4e1baf7dd0bd8b9f632a5ca00377b5136c1890c8..26a71f36c68773b18095911e99be7294cbd66f39:/Shiar_Sheet/Keyboard.pm?ds=sidebyside diff --git a/Shiar_Sheet/Keyboard.pm b/Shiar_Sheet/Keyboard.pm index c627d6d..d4f78c8 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.09'; my @casedesc = (undef, qw/shift ctrl meta/, 'shift meta'); my @rowdesc = qw(numeric top home bottom); @@ -110,18 +110,18 @@ 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); } my $keytxt = $self->print_letter($key, $mode); - $keytxt .= $self->{sign}->{$1} while $flags =~ s/(?:^| )(arg[a-ln-z]?)\b//; # arguments $keytxt .= "$self->{sign}->{motion}" 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 = "$keytxt"; $keytxt .= ' '.$desc if defined $desc; @@ -151,9 +151,14 @@ sub print_rows { print '