keyboard/altgr: classify glyphs within submodes

[sheet.git] / keyboard / altgr / groups.inc.pl

diff --git a/keyboard/altgr/groups.inc.pl b/keyboard/altgr/groups.inc.pl
index 2968e4bccda7f62b5a41a71f2454e48bda982b21..66d12261ae1017ceca8c118b0c78638070d40767 100644 (file)
--- a/keyboard/altgr/groups.inc.pl
+++ b/keyboard/altgr/groups.inc.pl
@@ -8,35 +8,41 @@ use Shiar_Sheet::FormatChar;
 my $uc = Shiar_Sheet::FormatChar->new;
 
 sub kbchars ($rows) {
+       return kbmodes({'' => $rows});
+}
+
+sub kbmodes ($modes) {
        my %g; # present group classes
-       return {
-       rows => [1, 0],
-       def => {
-               '' => {
-                       map {
-                               my $v = $rows->{$_};
-                               my $class = 'g'.(
-                                         !defined $v || $_ eq $v ? 1 # identical
-                                       : $v =~ /\A\p{Mn}+\z/ ? 9 # combining accent
-                                       : $v =~ /\A[\p{Sk}\p{Lm}]+\z/ ? 8 # modifier symbol
-                                       : $v =~ /\A[\pM\pP]+\z/ ? 7 # mark
-                                       : NFKD($v) =~ /\Q$_/ ? 2 # decomposed equivalent
-                                       : unidecode($v) =~ /\Q$_\E+/i ? 4 # transliterated
-                                       : $v =~ /^\p{Latin}/ ? 5 # latin script
-                                       : 6
-                               );
-                               $g{$class} = 1;
-                               $_ => $class
-                       } keys %{$rows}
-               },
-       },
-       key => {
-               map {
-                       my ($glyph, $title) = $uc->glyph_html($rows->{$_});
-                       $_ => join "\n", $glyph, $title
-               } keys %{$rows}
-       },
-       flag => {%{{
+       my %info = (
+               rows => [1, 0],
+       );
+       for my $lead (keys %{$modes}) {
+               if ($lead ne '') {
+                       $info{def}->{''}->{$lead} = "g1 mode$lead";
+                       $g{g1} = 1;
+                       $info{mode}->{$lead} //= "mode $lead";
+                       $info{def}->{$lead}{$lead} = 'g1 mode'; # back
+               }
+               while (my ($c, $v) = each %{ $modes->{$lead} }) {
+                       my ($glyph, $title) = $uc->glyph_html($v);
+                       $info{key}{$lead.$c} = join "\n", $glyph, $title;
+
+                       my $class = 'g'.(
+                                 !defined $v || $c eq $v ? 1 # identical
+                               : $v =~ /\A\p{Mn}+\z/ ? 9 # combining accent
+                               : $v =~ /\A[\p{Sk}\p{Lm}]+\z/ ? 8 # modifier symbol
+                               : $v =~ /\A[\pM\pP]+\z/ ? 7 # mark
+                               : NFKD($v) =~ /\Q$c/ ? 2 # decomposed equivalent
+                               : unidecode($v) =~ /\Q$c\E+/i ? 4 # transliterated
+                               : $v =~ /^\p{Latin}/ ? 5 # latin script
+                               : 6
+                       );
+                       $g{$class} = 1;
+                       $info{def}{$lead}{$c} //= $class;
+               }
+       }
+       $info{flag} = {%{{
+               g1 => ['mode' => "switch to an alternate set of keys"],
                g2 => ['accented', "decomposes to the original letter with a combining accent"],
                g4 => ['similar', "transliterates (mostly) into the unmodified letter"],
                g5 => ['latin', "a different (accented) latin letter"],
@@ -44,8 +50,8 @@ sub kbchars ($rows) {
                g7 => ['punctuation', "(punctuation) mark"],
                g8 => ['mark', "modifier letter or mark (spacing diacritic)"],
                g9 => ['combining', "diacritical mark to be combined with a following character"],
-       }}{keys %g}},
-       };
+       }}{keys %g}};
+       return \%info;
 }
 
 1;