keyboard/altgr: proper function to convert char maps

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

diff --git a/keyboard/altgr/groups.inc.pl b/keyboard/altgr/groups.inc.pl
index 4b72d088a50f91b615af2bf9c03563c111b38274..2968e4bccda7f62b5a41a71f2454e48bda982b21 100644 (file)
--- a/keyboard/altgr/groups.inc.pl
+++ b/keyboard/altgr/groups.inc.pl
@@ -1,17 +1,21 @@
-use strict;
+use 5.020;
 use warnings;
+use experimental 'signatures';
 use Unicode::Normalize qw( NFKD );
 use Text::Unidecode qw( unidecode );
+use Shiar_Sheet::FormatChar;
 
-our %rows;
-my %g; # present group classes
-{
-       rows => [0, 1],
+my $uc = Shiar_Sheet::FormatChar->new;
+
+sub kbchars ($rows) {
+       my %g; # present group classes
+       return {
+       rows => [1, 0],
        def => {
                '' => {
                        map {
-                               my $v = $rows{$_};
-                               my $class = (
+                               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
@@ -22,21 +26,26 @@ my %g; # present group classes
                                        : 6
                                );
                                $g{$class} = 1;
-                               $_ => "g$class"
-                       } keys %rows
+                               $_ => $class
+                       } keys %{$rows}
                },
        },
-       key => \%rows,
-       flag => {
-               g1 => ['unaltered', "same results as without modifier"],
+       key => {
+               map {
+                       my ($glyph, $title) = $uc->glyph_html($rows->{$_});
+                       $_ => join "\n", $glyph, $title
+               } keys %{$rows}
+       },
+       flag => {%{{
                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"],
                g6 => ['symbol', "other character not directly deducible from key"],
                g7 => ['punctuation', "(punctuation) mark"],
-                       !$g{9} ? () : (
                g8 => ['mark', "modifier letter or mark (spacing diacritic)"],
                g9 => ['combining', "diacritical mark to be combined with a following character"],
-                       ),
-       },
+       }}{keys %g}},
+       };
 }
+
+1;