From 85197963ca9cdece9448e6549d3759e65168d389 Mon Sep 17 00:00:00 2001
From: Mischa POSLAWSKY <perl@shiar.org>
Date: Wed, 1 Nov 2023 12:37:50 +0100
Subject: [PATCH] keyboard: move layout data to include

Similar to other keyboard pages.
---
 keyboard.eng.inc.pl | 49 ++++++++++++++++++++++++++++++++++++++++
 keyboard.plp        | 55 +++++----------------------------------------
 2 files changed, 55 insertions(+), 49 deletions(-)
 create mode 100644 keyboard.eng.inc.pl

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]<br>$_->[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.</p>
 <h2>normal mode (default)</h2>
 
 <:
-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]<br>$_->[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);
-- 
2.30.0