X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/8bf4b29ac2bea396e7aafe10713ec3b148a153a8..d018b1fcc5e1035c2302b2417480003aca64fa5e:/Shiar_Sheet/Keyboard.pm?ds=sidebyside
diff --git a/Shiar_Sheet/Keyboard.pm b/Shiar_Sheet/Keyboard.pm
index 44ecc4d..846a2a2 100644
--- a/Shiar_Sheet/Keyboard.pm
+++ b/Shiar_Sheet/Keyboard.pm
@@ -89,6 +89,19 @@ sub keyunalias {
return $self->keyunalias($keyinfo, $ancestry);
}
+sub print_letter {
+ my $self = shift;
+ my ($key, $mode) = @_;
+
+ return if $key eq '^0';
+ return 'Esc' if $key eq "\e";
+# return $keytrans{$key} if defined $keytrans{$key};
+ my $html = $self->{def}{$mode}{lead} . escapehtml($key);
+ $html =~ s{\^(?=.)}{^}; # element around ctrl-identifier
+ $html =~ s{\+(?=.)}{+}; # meta
+ return $html;
+}
+
sub print_key {
my $self = shift;
my ($mode, $key, $flags) = @_;
@@ -106,12 +119,9 @@ sub print_key {
($desc, $mnem) = split /\n/, $self->escapedesc($txt);
}
-# $key = $keytrans{$key} if defined $keytrans{$key};
- my $keytxt = $key eq "\e" ? 'Esc' : $self->{def}{$mode}{lead} . escapehtml($key) if $key ne '^0';
+ 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 =~ s{\^(?=.)}{^}; # element around ctrl-identifier
- $keytxt =~ s{\+(?=.)}{+}; # meta
my $keyhint = defined($mnem) && qq{ title="$mnem"};
$keytxt = "$keytxt";
$keytxt .= ' '.$desc if defined $desc;