keyboard/altgr: ignore partial decomposition as accented flag

[sheet.git] / Shiar_Sheet / KeyboardChars.pm

diff --git a/Shiar_Sheet/KeyboardChars.pm b/Shiar_Sheet/KeyboardChars.pm
index 0c5b5e50ff91c35593d64e22c1c757daea6df722..d0e84c8e082799c31b45428b979b20cf36abe895 100644 (file)
--- a/Shiar_Sheet/KeyboardChars.pm
+++ b/Shiar_Sheet/KeyboardChars.pm
@@ -55,7 +55,7 @@ sub kbmodes ($modes) {
                        my $class = (
                                  !defined $v || $c eq $v ? 'no' # identical
                                : $v =~ /\A\p{Mn}+\z/ ? 'g9' # combining accent
-                               : NFKD($v) =~ /\Q$c/ ? 'g2' # decomposed equivalent
+                               : NFKD($v) =~ /\A\Q$c\E\p{Mn}*\z/ ? '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