X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/f7debc650090d344b01da353f44a49dcf029303a..v1.15-2-g497b99dabe:/keyboard.eng.inc.pl diff --git a/keyboard.eng.inc.pl b/keyboard.eng.inc.pl index 0e6a8cb..efbdad1 100644 --- a/keyboard.eng.inc.pl +++ b/keyboard.eng.inc.pl @@ -2,28 +2,24 @@ use Unicode::Normalize qw( NFKD ); use Text::Unidecode qw( unidecode ); { - rows => [0], + rows => [0, 1], def => { '' => { map { - my @row = @{$_}; + my $v = $rows{$_}; 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 + !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 ); - $row[0] => "g$class" - } @rows + $_ => "g$class" + } keys %rows }, }, - key => { - map { - $_->[0] => "$_->[1]
$_->[2]" - } @rows - }, + key => \%rows, flag => { g1 => ['unaltered', "same results as without modifier"], g2 => ['accented', "decomposes to the original letter with a combining accent"],