From: Mischa POSLAWSKY <perl@shiar.org>
Date: Sun, 4 Mar 2018 21:32:25 +0000 (+0100)
Subject: keyboard: fix combining accent distinction
X-Git-Tag: v1.12~94
X-Git-Url: http://git.shiar.nl/sheet.git/commitdiff_plain/34657c93e59b0b82ede14bb3f54ce0d4b81c8df5

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 b23e2f2..2ecfa8b 100644
--- 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'],
 	},