From: Mischa POSLAWSKY
Date: Wed, 1 Nov 2023 11:37:50 +0000 (+0100)
Subject: keyboard: move layout data to include
X-Git-Tag: v1.15~14
X-Git-Url: http://git.shiar.net/sheet.git/commitdiff_plain/85197963ca9cdece9448e6549d3759e65168d389
keyboard: move layout data to include
Similar to other keyboard pages.
---
diff --git a/keyboard.eng.inc.pl b/keyboard.eng.inc.pl
new file mode 100644
index 0000000..df1d3f0
--- /dev/null
+++ b/keyboard.eng.inc.pl
@@ -0,0 +1,49 @@
+use utf8;
+use Unicode::Normalize qw( NFKD );
+use Text::Unidecode qw( unidecode );
+
+my @usintrows = (
+ [ 'a' .. 'z'],
+ [qw(à B ¢ à à F G H à J Šà µ à à à à ® § à à V Ã
X Ã Ã)],
+ [qw(á b © ð é f g h à j Šø µ ñ ó ö ä ® à þ ú v å x ü æ)],
+ [qw(Ã
ı à ð ´ Ì Ë Ì£ Ë Â½  à ¾ Ë Ã â Å â° / Ë Â¨ â â Ë Â¼ ¸)],
+ [qw(Ã¥ ⫠ç â Ì Æ Â© Ë Ì â ° ¬ µ Ì Ã¸ Ï Å Â® à â Ì â â â Â¥ Ω)],
+);
+my @usint = (
+ map {
+ my $c = $_;
+ [ map { $usintrows[$_]->[$c] } 0 .. 2 ]
+ } 0 .. $#{ $usintrows[0] }
+);
+
+{
+ def => {
+ '' => {
+ map {
+ 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
+ : 7
+ );
+ $row[0] => "g$class"
+ } @usint
+ },
+ },
+ key => {
+ map {
+ $_->[0] => "$_->[1]
$_->[2]"
+ } @usint
+ },
+ flag => {
+ g1 => ['unaltered', "same results as without modifier"],
+ g2 => ['accented', "decomposes to the original letter with a combining accent"],
+ g4 => ['latin', "a different (accented) latin letter"],
+ g5 => ['similar', "transliterates (mostly) into the unmodified letter"],
+ g7 => ['other', "symbol not directly deducible from key"],
+ g8 => ['combining', "diacritical mark to be combined with a following character"],
+ },
+}
diff --git a/keyboard.plp b/keyboard.plp
index f4ede94..8579524 100644
--- a/keyboard.plp
+++ b/keyboard.plp
@@ -1,5 +1,8 @@
<(common.inc.plp)><:
+my $include = 'keyboard.eng';
+my $info = Data($include);
+
Html({
title => 'keyboard cheat sheet',
version => '1.2',
@@ -9,6 +12,7 @@ Html({
],
stylesheet => [qw( light dark circus mono red )],
keys => 1,
+ data => ["$include.inc.pl"],
});
:>
@@ -20,55 +24,8 @@ for the Windows US international layout.
normal mode (default)
<:
-use Shiar_Sheet::Keyboard 2.07;
-use Unicode::Normalize qw( NFKD );
-use Text::Unidecode qw( unidecode );
-
-my @usintrows = (
- [ 'a' .. 'z'],
- [qw(à B ¢ à à F G H à J Šà µ à à à à ® § à à V Ã
X Ã Ã)],
- [qw(á b © ð é f g h à j Šø µ ñ ó ö ä ® à þ ú v å x ü æ)],
- [qw(Ã
ı à ð ´ Ì Ë Ì£ Ë Â½  à ¾ Ë Ã â Å â° / Ë Â¨ â â Ë Â¼ ¸)],
- [qw(Ã¥ ⫠ç â Ì Æ Â© Ë Ì â ° ¬ µ Ì Ã¸ Ï Å Â® à â Ì â â â Â¥ Ω)],
-);
-my @usint = (
- map {
- my $c = $_;
- [ map { $usintrows[$_]->[$c] } 0 .. 2 ]
- } 0 .. $#{ $usintrows[0] }
-);
-
-my $keys = Shiar_Sheet::Keyboard->new({
- def => {
- '' => {
- map {
- 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
- : 7
- );
- $row[0] => "g$class"
- } @usint
- },
- },
- key => {
- map {
- $_->[0] => "$_->[1]
$_->[2]"
- } @usint
- },
- flag => {
- g1 => ['unaltered', "same results as without modifier"],
- g2 => ['accented', "decomposes to the original letter with a combining accent"],
- g4 => ['latin', "a different (accented) latin letter"],
- g5 => ['similar', "transliterates (mostly) into the unmodified letter"],
- g7 => ['other', "symbol not directly deducible from key"],
- g8 => ['combining', "diacritical mark to be combined with a following character"],
- },
-});
+use Shiar_Sheet::Keyboard 2.08;
+my $keys = Shiar_Sheet::Keyboard->new($info);
$keys->map($get{map}) or undef $get{map};
$keys->print_rows($get{rows}, [0]);
$keys->print_legends(\%get);