X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/f91fd6d772ee8ea35f833802c9f8cc1db75ca950..4be2c33c0aea256c4170f7cd77f526c812131366:/Shiar_Sheet/Keyboard.pm?ds=sidebyside diff --git a/Shiar_Sheet/Keyboard.pm b/Shiar_Sheet/Keyboard.pm index aecd0bc..30b73bf 100644 --- a/Shiar_Sheet/Keyboard.pm +++ b/Shiar_Sheet/Keyboard.pm @@ -1,11 +1,12 @@ package Shiar_Sheet::Keyboard; +use 5.010; use strict; use warnings; no warnings 'uninitialized'; # save some useless checks for more legible code use Carp; -our $VERSION = 'v2.03'; +our $VERSION = 'v2.04'; my @casedesc = (undef, qw/shift ctrl meta/, 'shift meta'); my @rowdesc = qw(numeric top home bottom); @@ -31,7 +32,7 @@ sub new { $self->{sign} ||= do { require Shiar_Sheet::KeySigns; - Shiar_Sheet::KeySigns->VERSION(1.03); + Shiar_Sheet::KeySigns->VERSION(1.04); \%Shiar_Sheet::KeySigns::sign; }; @@ -64,6 +65,13 @@ sub escapehtml { return $_; } +sub escapedesc { + my $self = shift; + local $_ = shift; + s{ (< ([^>]*) >) }{ $self->{sign}->{$2} // $1 }xeg; + return $_; +} + sub keyunalias { my $self = shift; my ($key, $ancestry) = @_; @@ -92,7 +100,7 @@ sub print_key { } my ($flags, $desc, $mnem) = @{$flags}; if (my $txt = $self->{key}->{$mode.$key}) { - ($desc, $mnem) = split /\n/, $txt; + ($desc, $mnem) = split /\n/, $self->escapedesc($txt); } # $key = $keytrans{$key} if defined $keytrans{$key}; @@ -154,7 +162,7 @@ sub print_rows { ' class="%s"', join ' ', @caseclass ); printf('