keyboard: fix combining accent distinction

Regression in commit v1.10-74-g8626278605 (2018-03-05)
[keyboard: match transliterated letters].

diff --git a/keyboard.plp b/keyboard.plp
index b23e2f2db3e37135bde781948dc28f73c30a8fec..2ecfa8b9fa0c00bfe32091cd7862e03cc3dc221e 100644 (file)
--- a/keyboard.plp
+++ b/keyboard.plp
@@ -45,10 +45,10 @@ my $keys = Shiar_Sheet::Keyboard->new({
                                my @row = @{$_};
                                my $class = (
                                          !defined $row[2] || $row[0] eq $row[2] ? 1 # identical
+                                       : $row[2] =~ /\A\p{Mn}+\z/ ? 8 # combining accent
                                        : NFKD($row[2]) =~ $row[0] ? 2 # decomposed equivalent
                                        : $row[2] =~ /^\p{Latin}/ ? 4 # latin script
                                        : unidecode($row[2]) =~ /^\W*\Q$row[0]/ ? 5 # transliterated
-                                       : $row[2] =~ /^\p{Mn}/ ? 8 # combining accent
                                        : 7
                                );
                                $row[0] => "g$class"
@@ -64,6 +64,7 @@ my $keys = Shiar_Sheet::Keyboard->new({
                g1 => ['unaltered'],
                g2 => ['accented'],
                g4 => ['latin'],
+               g5 => ['similar'],
                g7 => ['other'],
                g8 => ['combining'],
        },