From 98a8228ac6651509dfe58a871594b5cc22cee553 Mon Sep 17 00:00:00 2001 From: Mischa POSLAWSKY Date: Fri, 26 Apr 2024 21:57:35 +0200 Subject: [PATCH 1/1] keyboard/altgr/index: label modes by description character. Replace definition lookup by (assumed) same text in available data. --- keyboard/altgr/index.inc.pl | 7 +++---- keyboard/altgr/index.inc.plp | 4 ++-- keyboard/altgr/weur.eng.inc.pl | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/keyboard/altgr/index.inc.pl b/keyboard/altgr/index.inc.pl index 2308e14..5994d9f 100644 --- a/keyboard/altgr/index.inc.pl +++ b/keyboard/altgr/index.inc.pl @@ -15,17 +15,16 @@ for my $name (map {@{$_}} values %cat) { my %row = %{$keys}{qw( title category flag mode image imagealt )}; $cat{$name} = \%row; - $keys->{mode} //= {'' => undef}; + $row{mode} //= {'' => undef}; if ($keys->{def}{''}{'+a'}) { # move root +meta keys to distinct mode - $keys->{mode}{"\e"} = '+'; + $row{mode}{"\e"} = '+'; /^\+./ and $keys->{def}{"\e"}{$_} = delete $keys->{def}{''}{$_} for keys %{ $keys->{def}{''} }; } - for my $mode (keys %{ $keys->{mode} }) { - $row{def}{''}{$_} = $keys->{def}{''}{$_} for $mode || (); + for my $mode (keys %{ $row{mode} }) { $row{inventory}{$mode}{$_}++ for grep { /^g[2-9]/ } map { s/ (?!ext).*//r } map {$_->[0]} values %{ $keys->{def}{$mode} }; } diff --git a/keyboard/altgr/index.inc.plp b/keyboard/altgr/index.inc.plp index e9179c6..fd36e60 100644 --- a/keyboard/altgr/index.inc.plp +++ b/keyboard/altgr/index.inc.plp @@ -8,7 +8,7 @@ my $indexfile = "$dirbase/index"; Html({ title => "altgr keyboard cheat sheets", - version => '1.2', + version => '1.3', description => [ "Overview of alternate keyboard modes,", "offering extended Unicode characters if a modifier key", @@ -157,7 +157,7 @@ for my $inc (@incs) { print '', "\n\t"; for my $mode ($table->{mode} ? sort keys %{ $table->{mode} } : '') { print ''; - printf '', s/\s.*//r for $table->{def}{''}{$mode}[1] || (); + printf "", m/^(\S*)/ for $mode && $table->{mode}{$mode} || (); for my $g (sort keys %{ $table->{inventory}{$mode} }) { printf ' %s', $g, $_/$most*100, $_, diff --git a/keyboard/altgr/weur.eng.inc.pl b/keyboard/altgr/weur.eng.inc.pl index c3b3516..8d5a390 100644 --- a/keyboard/altgr/weur.eng.inc.pl +++ b/keyboard/altgr/weur.eng.inc.pl @@ -176,7 +176,7 @@ if ($dweur) { %{ kbmodes(\%rows) }, mode => { '' => 'altgr-shifted ⌥', - '*' => 'greek mode ⌥*', + '*' => 'μ greek prefix ⌥*', }, version => '1.0', # upstream v2.0 2021/04/12 title => $dweur ? 'dWEURak' : 'Western European', -- 2.30.2