X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/6ab9c94cde0ca32c221dc3120f0088e1693e71c1..44f2bc2a8a46bec091ba5736bdef455a523aec85:/keyboard.plp?ds=sidebyside
diff --git a/keyboard.plp b/keyboard.plp
index 9a69527..cd75090 100644
--- a/keyboard.plp
+++ b/keyboard.plp
@@ -12,80 +12,49 @@ Html({
normal mode (default)
-
-
--
-
-
-
<:
-our %sign;
-use Shiar_Sheet::Keyboard 2;
+use Shiar_Sheet::Keyboard 2.07;
+use Unicode::Normalize qw( NFKD );
+
my $usint = [
[ 'a' .. 'z'],
[qw(à B ¢ à à F G H à J Šà µ à à à à ® § à à V Ã
X Ã Ã)],
[qw(á b © ð é f g h à j Šø µ ñ ó ö ä ® à þ ú v å x ü æ)],
[qw(Ã
ı à ð ´ Ì Ë Ì£ Ë Â½  à ¾ Ë Ã â Å â° / Ë Â¨ â â Ë Â¼ ¸)],
- [qw(Ã¥ ⫠ç â ´ Æ Â© Ë ^ â ° ¬ µ ~ ø Ï Å Â® à â ¨ â â â Â¥ Ω)],
+ [qw(Ã¥ ⫠ç â Ì Æ Â© Ë Ì â ° ¬ µ Ì Ã¸ Ï Å Â® à â Ì â â â Â¥ Ω)],
];
my $keys = Shiar_Sheet::Keyboard->new({
def => {
'' => {
- map { $_ => [''] } @{ $usint->[0] }
+ map {
+ my $c = $_;
+ my @row = map { $usint->[$_]->[$c] } 0 .. 2;
+ my $class = (
+ !defined $row[2] || $row[0] eq $row[2] ? 1 # identical
+ : NFKD($row[2]) =~ $row[0] ? 2 # decomposed equivalent
+ : $row[2] =~ /^\p{Latin}/ ? 3 # latin script
+ : $row[2] =~ /^\p{Mn}/ ? 5 # combining accent
+ : 4
+ );
+ $row[0] => "g$class"
+ } 0 .. $#{ $usint->[0] }
},
},
key => {
map {
- my $i = ord($_) - ord('a');
- $_ => ["$usint->[1]->[$i]
$usint->[2]->[$i]"]
- } 'a'..'z'
+ $usint->[0]->[$_] => "$usint->[1]->[$_]
$usint->[2]->[$_]"
+ } 0 .. $#{ $usint->[0] }
+ },
+ flag => {
+ g1 => ['unaltered'],
+ g2 => ['accented'],
+ g3 => ['latin'],
+ g4 => ['other'],
+ g5 => ['combining'],
},
});
$keys->map($get{map}) or undef $get{map};
$keys->print_rows($get{rows}, [0]);
-:>
-
-
-
-
-
-
-
- - info
-
- Info command: shows/does something without altering anything.
-
- motion
-
- positioning
-
- Other movement (jumps, window (re)positioning).
-
- command
-
- Direct action command.
-
- ins mode
-
- Enters Insert or Replace mode.
-
- mode
-
- Enters a different mode.
-
- vis mode
-
- Enters Visual or Select mode.
-
- key cmd
-
- Additional key commands (click for overview).
-
-
-
-
-
-
-
-
- - keyboard map is
- <:= $get{map} ? 'set to ' : '' :><:= $keys->{map} :>
-
- keys are
- <:= $showkeys ? 'always shown' : 'hidden if unassigned' :><:=
- !exists $get{keys} && ' by default' :>
-
- default style is
- <:= defined $get{style} && 'set to ' :><:= $style :>
-
-
-
+$keys->print_legends(\%get);