keyboard: preliminary altgr subpage ukext with additional classes

[sheet.git] / keyboard.eng.inc.pl

diff --git a/keyboard.eng.inc.pl b/keyboard.eng.inc.pl
index efbdad125c9d5cb7cd07d34ce6fdf7c44bc8eba6..1f372e32c2cf1c8e253e743a3f80dabc1d36247c 100644 (file)
--- a/keyboard.eng.inc.pl
+++ b/keyboard.eng.inc.pl
@@ -9,11 +9,13 @@ use Text::Unidecode qw( unidecode );
                                my $v = $rows{$_};
                                my $class = (
                                          !defined $v || $_ eq $v ? 1 # identical
-                                       : $v =~ /\A\p{Mn}+\z/ ? 8 # combining accent
-                                       : NFKD($v) =~ $_ ? 2 # decomposed equivalent
-                                       : $v =~ /^\p{Latin}/ ? 4 # latin script
-                                       : unidecode($v) =~ /^\W*\Q$_/ ? 5 # transliterated
-                                       : 7
+                                       : $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"
                        } keys %rows
@@ -23,9 +25,11 @@ use Text::Unidecode qw( unidecode );
        flag => {
                g1 => ['unaltered', "same results as without modifier"],
                g2 => ['accented', "decomposes to the original letter with a combining accent"],
-               g4 => ['latin', "a different (accented) latin letter"],
-               g5 => ['similar', "transliterates (mostly) into the unmodified letter"],
-               g7 => ['other', "symbol not directly deducible from key"],
-               g8 => ['combining', "diacritical mark to be combined with a following character"],
+               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"],
+               g8 => ['mark', "modifier letter or mark (spacing diacritic)"],
+               g9 => ['combining', "diacritical mark to be combined with a following character"],
        },
 }