X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/dfb97641f69972c016320553556086d5a66e7606..2e8c1e3cc39cc1c6e4b858242d2a3a39481b9640:/keyboard/altgr/index.inc.plp
diff --git a/keyboard/altgr/index.inc.plp b/keyboard/altgr/index.inc.plp
index 208cae2..74c53dd 100644
--- a/keyboard/altgr/index.inc.plp
+++ b/keyboard/altgr/index.inc.plp
@@ -120,7 +120,7 @@ push @incs, @{ $idx->{$_} } for @{ $idx->{default} };
my @sample = split /(? qq{\N{TOP HAT}},
@@ -136,16 +136,15 @@ if (@sample) {
print "
$_" for @sample;
say '';
}
-my %idx = map {($_ => scalar eval{ Data("$dirbase/$_.eng") })} @incs;
-my $most = max(map { scalar keys %{$_->{def}{''}} } values %idx);
+my $most = max(map { sum values %{ $_->{inventory}{''} } } %{$idx}{@incs});
for my $inc (@incs) {
+ my $table = $idx->{$inc};
print @sample ? ' | ' : '';
printf '', "$dirbase/$inc";
- my $table = $idx{$inc};
- my $title = $table && $table->{title} || $inc;
+ my $title = $table->{title} || $inc;
unless (@sample) {
- if ($table and my $img = $table->{image}) {
+ if (my $img = $table->{image}) {
EscapeHTML $name = $table->{imagealt} // $img =~ m{.*/([^/.]*)};
print qq{ };
}
@@ -155,28 +154,29 @@ for my $inc (@incs) {
else {
print $title;
print '', "\n\t";
- my $keys = Shiar_Sheet::Keyboard->new($table);
- for my $mode ($keys->{mode} ? sort keys %{ $keys->{mode} } : '') {
- my %inventory;
- $inventory{$_}++ for grep { /^g[2-9]/ } map { s/ (?!ext).*//r }
- values %{ $keys->{def}{$mode} };
+ for my $mode ($table->{mode} ? sort keys %{ $table->{mode} } : '') {
print '';
- printf '', s/\s.*//r for $keys->{key}{$mode} || ();
- for my $g (sort keys %inventory) {
+ printf '', s/\s.*//r for $table->{key}{$mode} || ();
+ for my $g (sort keys %{ $table->{inventory}{$mode} }) {
printf ' %s',
$g, $_/$most*100, $_,
join(' ', map {
- $keys->{flag}{$_}[0] || 'extra' # legend label of each class
+ $table->{flag}{$_}[0] || 'extra' # legend label of each class
} reverse split / /, $g)
- for $inventory{$g};
+ for $table->{inventory}{$mode}{$g};
}
say '';
}
print "\t";
- print join ' ', map { $caticon{$_} // () } split m{/}, $keys->{category} // '';
+ print join ' ', map { $caticon{$_} // () } split m{/}, $table->{category} // '';
say '';
- $keys->print_key('', $_, ($keys->{def}{''}{$_} // 'ni') =~ s/ mode\S*//r)
- for @sample;
+ if (my $keys = eval {
+ my $keydata = Data("$dirbase/$inc.eng");
+ Shiar_Sheet::Keyboard->new($keydata)
+ }) {
+ $keys->print_key('', $_, ($keys->{def}{''}{$_} // 'ni') =~ s/ mode\S*//r)
+ for @sample;
+ }
say ' | |
';
}
}