git.shiar.nl
/
sheet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
keys: move key definitions into translation includes
[sheet.git]
/
Shiar_Sheet
/
Keyboard.pm
diff --git
a/Shiar_Sheet/Keyboard.pm
b/Shiar_Sheet/Keyboard.pm
index adaa3ddab066b8ec67358d7d4bea4a2f47dab02b..c5fdb09fdb7fa37bc28272c8f25ac2c21931195b 100644
(file)
--- a/
Shiar_Sheet/Keyboard.pm
+++ b/
Shiar_Sheet/Keyboard.pm
@@
-1,11
+1,12
@@
package Shiar_Sheet::Keyboard;
package Shiar_Sheet::Keyboard;
+use 5.010;
use strict;
use warnings;
no warnings 'uninitialized'; # save some useless checks for more legible code
use Carp;
use strict;
use warnings;
no warnings 'uninitialized'; # save some useless checks for more legible code
use Carp;
-our $VERSION = 'v2.0
2
';
+our $VERSION = 'v2.0
6
';
my @casedesc = (undef, qw/shift ctrl meta/, 'shift meta');
my @rowdesc = qw(numeric top home bottom);
my @casedesc = (undef, qw/shift ctrl meta/, 'shift meta');
my @rowdesc = qw(numeric top home bottom);
@@
-29,13
+30,11
@@
sub new {
croak 'No key definitions specified' unless ref $self->{def} eq 'HASH';
$self->{map} ||= 'qwerty';
croak 'No key definitions specified' unless ref $self->{def} eq 'HASH';
$self->{map} ||= 'qwerty';
- my $parent = (caller)[0]; # calling module
- my $sign = do {
- no strict 'refs'; # temporarily allow variable references
- \%
{ $parent.'::sign' }; # return %sign from parent
+ $self->{sign} ||= do {
+ require Shiar_Sheet::KeySigns;
+ Shiar_Sheet::KeySigns->VERSION(1.04);
+ \%
Shiar_Sheet::KeySigns::sign;
};
};
- croak "%${parent}::sign not found" unless %$sign;
- $self->{sign} = $sign;
bless $self, $class;
}
bless $self, $class;
}
@@
-66,6
+65,13
@@
sub escapehtml {
return $_;
}
return $_;
}
+sub escapedesc {
+ my $self = shift;
+ local $_ = shift;
+ s{ (< ([^>]*) >) }{ $self->{sign}->{$2} // $1 }xeg;
+ return $_;
+}
+
sub keyunalias {
my $self = shift;
my ($key, $ancestry) = @_;
sub keyunalias {
my $self = shift;
my ($key, $ancestry) = @_;
@@
-75,7
+81,7
@@
sub keyunalias {
my $keyinfo = $self->{def}->{$mode}->{$key};
return unless defined $keyinfo;
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);
}
return '' if $ancestry->{$key}++; # endless loop failsafe
return $self->keyunalias($keyinfo, $ancestry);
}
@@
-83,18
+89,18
@@
sub keyunalias {
sub print_key {
my $self = shift;
my ($mode, $key, $flags) = @_;
sub print_key {
my $self = shift;
my ($mode, $key, $flags) = @_;
+ my ($desc, $mnem);
if (not defined $flags) {
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;
$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}) {
if (my $txt = $self->{key}->{$mode.$key}) {
- ($desc, $mnem) =
@{$txt}
;
+ ($desc, $mnem) =
split /\n/, $self->escapedesc($txt)
;
}
# $key = $keytrans{$key} if defined $keytrans{$key};
}
# $key = $keytrans{$key} if defined $keytrans{$key};
@@
-119,11
+125,13
@@
sub print_key {
sub print_rows {
my $self = shift;
sub print_rows {
my $self = shift;
+ my ($rowsspec, $defrows) = @_;
+ $defrows ||= [2, 1, 0];
my %moderows = (
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 '='
);
# 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";
my @modes = sort keys %{ $self->{def} };
print '<table id="rows" class="keys">'."\n\n";
@@
-134,8
+142,8
@@
sub print_rows {
printf qq{<tbody class="row row%d">\n}, $row+1;
for my $basemode (@modes) {
my @moderows = split /\s+/,
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;
for my $submode (@moderows ? @moderows : '') {
my $mode = $basemode . $submode;
@@
-156,7
+164,7
@@
sub print_rows {
' class="%s"', join ' ', @caseclass
);
printf('<th>%s<small>: %s</small></th>', # XXX insert here to fix msie<=6
' class="%s"', join ' ', @caseclass
);
printf('<th>%s<small>: %s</small></th>', # XXX insert here to fix msie<=6
- $self->
{mode}->{$mode} || "mode $basemode"
,
+ $self->
escapedesc($self->{mode}->{$mode} || "mode $basemode")
,
"$rowdesc[$row] row $casedesc[$case]"
) unless $row < 0;
print "\n";
"$rowdesc[$row] row $casedesc[$case]"
) unless $row < 0;
print "\n";
@@
-179,7
+187,7
@@
sub print_legend {
print qq{\t\t<dl class="legend $class">\n};
printf("\t\t".'<dt class="%s">%s'."\n\t\t\t".'<dd>%s'."\n",
print qq{\t\t<dl class="legend $class">\n};
printf("\t\t".'<dt class="%s">%s'."\n\t\t\t".'<dd>%s'."\n",
- $_, @{ $self->{flag}->{$_} || ["($_)", '...'] }
+ $_,
map { $self->escapedesc($_) }
@{ $self->{flag}->{$_} || ["($_)", '...'] }
) for @$flags;
print "\t\t</dl>";
}
) for @$flags;
print "\t\t</dl>";
}
@@
-197,8
+205,8
@@
Shiar_Sheet::Keyboard - Output HTML for key sheets
my $keys = Shiar_Sheet::Keyboard({
def => {
'lead' => {
my $keys = Shiar_Sheet::Keyboard({
def => {
'lead' => {
- 'A' => 'a', # alias
- 'a' =>
['classes']
,
+ 'A' => '
=
a', # alias
+ 'a' =>
'classes'
,
},
},
key => {
},
},
key => {