keyboard/altgr/index: label modes by description character.

Replace definition lookup by (assumed) same text in available data.

diff --git a/keyboard/altgr/index.inc.pl b/keyboard/altgr/index.inc.pl
index 2308e146248a2c61b3b284d6606dc5549b7549f4..5994d9f11812a597a911d6d5d28d7c3bff1cf5f2 100644 (file)
--- 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;
 
        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
 
        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}{''} };
        }
 
                /^\+./ 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} };
        }
                $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 e9179c63d7234055f12890e4817595acbc5388ac..fd36e60d5cf1e3f8ff9c49bc7efdedcb47074dc9 100644 (file)
--- 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",
 
 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",
        description => [
                "Overview of alternate keyboard modes,",
                "offering extended Unicode characters if a modifier key",


@@ -157,7 +157,7 @@ for my $inc (@incs) {
                print '</a>', "\n\t";
                for my $mode ($table->{mode} ? sort keys %{ $table->{mode} } : '') {
                        print '<span class=graph>';
                print '</a>', "\n\t";
                for my $mode ($table->{mode} ? sort keys %{ $table->{mode} } : '') {
                        print '<span class=graph>';

-                       printf '<label>%s</label>', s/\s.*//r for $table->{def}{''}{$mode}[1] || ();
+                       printf "<label>%s</label>", m/^(\S*)/ for $mode && $table->{mode}{$mode} || ();

                        for my $g (sort keys %{ $table->{inventory}{$mode} }) {
                                printf '<span class="%s" style="width:%.0f%%" title="%3$d %4$s"> %s</span>',
                                        $g, $_/$most*100, $_,
                        for my $g (sort keys %{ $table->{inventory}{$mode} }) {
                                printf '<span class="%s" style="width:%.0f%%" title="%3$d %4$s"> %s</span>',
                                        $g, $_/$most*100, $_,

diff --git a/keyboard/altgr/weur.eng.inc.pl b/keyboard/altgr/weur.eng.inc.pl
index c3b35163c90def680611b26df6463e4ca609b951..8d5a390a7ae3de80f7f5204556369441a40a0ef4 100644 (file)
--- 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 ⌥',
        %{ kbmodes(\%rows) },
        mode => {
                ''  => 'altgr-shifted ⌥',

-               '*' => 'greek mode ⌥*',
+               '*' => 'μ greek prefix ⌥*',

        },
        version => '1.0', # upstream v2.0 2021/04/12
        title => $dweur ? 'dWEURak' : 'Western European',
        },
        version => '1.0', # upstream v2.0 2021/04/12
        title => $dweur ? 'dWEURak' : 'Western European',