';
printf '', $inc =~ s/\.eng$//r;
@@ -135,9 +156,10 @@ for my $inc (sort {
my $keys = Shiar_Sheet::Keyboard->new($table);
for my $mode ($keys->{mode} ? sort keys %{ $keys->{mode} } : '') {
my %inventory;
- $inventory{ s/ (?!ext).*//r }++ for values %{ $keys->{def}{$mode} };
+ $inventory{$_}++ for grep { /^g[2-9]/ } map { s/ (?!ext).*//r }
+ values %{ $keys->{def}{$mode} };
print '';
- print "" for $keys->{key}{$mode} =~ s/\s.*//r || ();
+ printf '', s/\s.*//r for $keys->{key}{$mode} || ();
for my $g (sort keys %inventory) {
printf ' %s',
$g, $_/$most*100, $_,
@@ -148,10 +170,11 @@ for my $inc (sort {
}
say '';
}
- print "\t";
- print join ' ', map { $caticon{$_} // () } split m{/}, $keys->{category};
+ print "\t | ";
+ print join ' ', map { $caticon{$_} // () } split m{/}, $keys->{category} // '';
say '';
- $keys->print_key('', $_, $keys->{def}{''}{$_} // 'ni') for @sample;
+ $keys->print_key('', $_, ($keys->{def}{''}{$_} // 'ni') =~ s/ mode\S*//r)
+ for @sample;
say ' |