keyboard/altgr/ipa: hide identical keys

[sheet.git] / Shiar_Sheet / KeyboardChars.pm

diff --git a/Shiar_Sheet/KeyboardChars.pm b/Shiar_Sheet/KeyboardChars.pm
index d406459347dd3f656b892f624c27e3547e718bd5..b2ee11d615c7ade7d5bd1ed403e38cc22e56e73e 100644 (file)
--- a/Shiar_Sheet/KeyboardChars.pm
+++ b/Shiar_Sheet/KeyboardChars.pm
@@ -9,7 +9,7 @@ use Unicode::Normalize qw( NFKD );
 use Text::Unidecode ();
 use Shiar_Sheet::FormatChar;
 
-our $VERSION = '1.03';
+our $VERSION = '1.04';
 our @EXPORT = qw( kbchars kbmodes );
 
 my $uc = Shiar_Sheet::FormatChar->new;
@@ -47,22 +47,23 @@ sub kbmodes ($modes) {
                        $info{mode}->{$lead} //= "mode $lead";
                        $info{def}->{$lead}{$lead} = 'g1 mode'; # back
                }
-               while (my ($c, $v) = each %{ $modes->{$lead} }) {
+               while (my ($k, $v) = each %{ $modes->{$lead} }) {
                        my ($glyph, $title) = $uc->glyph_html($v);
-                       $info{key}{$lead.$c} = join "\n", $glyph, $title;
+                       $info{key}{$lead.$k} = join "\n", $glyph, $title;
+                       my $c = $k =~ s/\A[+^](?=.)//r;  # trim modifier indicator
 
-                       my $class = 'g'.(
-                                 !defined $v || $c eq $v ? 1 # identical
-                               : $v =~ /\A\p{Mn}+\z/ ? 9 # combining accent
-                               : NFKD($v) =~ /\Q$c/ ? 2 # decomposed equivalent
-                               : unidecode($v) =~ /\Q$c\E+/i ? 4 # transliterated
-                               : $v =~ /\A[\p{Sk}\p{Lm}]+\z/ ? 8 # modifier symbol
-                               : $v =~ /\A[\pM\pP]+\z/ ? 7 # mark
-                               : $v =~ /^\p{Latin}/ ? 5 # latin script
-                               : 6
+                       my $class = (
+                                 !defined $v || $c eq $v ? 'no' # identical
+                               : $v =~ /\A\p{Mn}+\z/ ? 'g9' # combining accent
+                               : NFKD($v) =~ /\Q$c/ ? 'g2' # decomposed equivalent
+                               : unidecode($v) =~ /\Q$c\E+/i ? 'g4' # transliterated
+                               : $v =~ /\A[\p{Sk}\p{Lm}]+\z/ ? 'g8' # modifier symbol
+                               : $v =~ /\A[\pM\pP]+\z/ ? 'g7' # mark
+                               : $v =~ /^\p{Latin}/ ? 'g5' # latin script
+                               : 'g6'
                        );
-                       $g{$class} = 1;
-                       $info{def}{$lead}{$c} //= $class;
+                       $g{$class} = 1 unless $class eq 'no';
+                       $info{def}{$lead}{$k} //= $class;
                }
        }
        $info{flag} = {%{{