From: Mischa POSLAWSKY <perl@shiar.org>
Date: Tue, 23 Jan 2024 22:44:05 +0000 (+0100)
Subject: keyboard/altgr: order index by subpage categories
X-Git-Url: http://git.shiar.net/sheet.git/commitdiff_plain/d633423013d3cfb34c674454fa402a11561c2eac

keyboard/altgr: order index by subpage categories
---

diff --git a/keyboard/altgr/apl.eng.inc.pl b/keyboard/altgr/apl.eng.inc.pl
index 6675fc4..81dcd0c 100644
--- a/keyboard/altgr/apl.eng.inc.pl
+++ b/keyboard/altgr/apl.eng.inc.pl
@@ -101,6 +101,7 @@ $groups->{flag}{ext} = ['extended', 'optional operators not available in all var
 	%{$groups},
 	version => '1.0',
 	title => 'APL',
+	category => 'specialised',
 	intro => join("\n",
 		'Resulting <a href="/charset">Unicode</a> characters',
 		'of a typical <a href="/apl">APL</a> keyboard layout',
diff --git a/keyboard/altgr/eurkey.eng.inc.pl b/keyboard/altgr/eurkey.eng.inc.pl
index a57a3ae..a0b9ea2 100644
--- a/keyboard/altgr/eurkey.eng.inc.pl
+++ b/keyboard/altgr/eurkey.eng.inc.pl
@@ -279,6 +279,7 @@ my %rows = (
 	},
 	version => '1.0',
 	title => 'EurKEY',
+	category => 'latin',
 	intro => join("\n",
 		'Third-party proposal <a href="https://eurkey.steffen.bruentjen.eu/">EurKEY</a>',
 		'<abbr title="last updated 2017-05-15">v1.3</abbr> by Steffen Brüntjen',
diff --git a/keyboard/altgr/index.inc.plp b/keyboard/altgr/index.inc.plp
index 75c2cc3..e4ed3d8 100644
--- a/keyboard/altgr/index.inc.plp
+++ b/keyboard/altgr/index.inc.plp
@@ -34,11 +34,13 @@ img {
 with AltGr or similar modifier keys.</p>
 
 <section class="gallery"><:
-for my $inc (@incs) {
-	$inc =~ s/\Q.inc.pl\E$//;
+my %idx = map {s/\Q.inc.pl\E$//; ($_ => eval{ Data($_) })} @incs;
+for my $inc (sort {
+	$idx{$a}{category} cmp $idx{$b}{category} || $a cmp $b
+} keys %idx) {
 	print '<figure>';
 	printf '<a href="/%s">', $inc =~ s/\.eng$//r;
-	if (my $table = eval { Data($inc) }) {
+	if ($table = $idx{$inc}) {
 		if (my $img = $table->{image}) {
 			EscapeHTML $name = $table->{imagealt} // $img =~ m{.*/([^/.]*)};
 			print qq{<img src="/$img" alt="$name" />};
diff --git a/keyboard/altgr/ipa.eng.inc.pl b/keyboard/altgr/ipa.eng.inc.pl
index e211335..4fc3cd5 100644
--- a/keyboard/altgr/ipa.eng.inc.pl
+++ b/keyboard/altgr/ipa.eng.inc.pl
@@ -125,6 +125,7 @@ my %rows = (
 	%{ kbmodes(\%rows) },
 	version => '1.0',
 	title => 'UCL phonetic',
+	category => 'specialised',
 	intro => join("\n",
 		'Unicode Phonetic Keyboard',
 		'<abbr title="dated 2009-06-28">v1.10</abbr> by Mark Huckvale',
diff --git a/keyboard/altgr/macos-abc.eng.inc.pl b/keyboard/altgr/macos-abc.eng.inc.pl
index 133f84c..e936009 100644
--- a/keyboard/altgr/macos-abc.eng.inc.pl
+++ b/keyboard/altgr/macos-abc.eng.inc.pl
@@ -196,6 +196,7 @@ my %rows = (
 	},
 	version => '1.0',
 	title => 'ABC option',
+	category => 'latin/macos',
 	intro => join("\n",
 		'Resulting <a href="/unicode">selection</a> of <a href="/charset">Unicode</a> characters',
 		"while pressing ⌥ Option (Alt) with Apple's ABC Extended",
diff --git a/keyboard/altgr/macos.eng.inc.pl b/keyboard/altgr/macos.eng.inc.pl
index 0d0718d..35d4447 100644
--- a/keyboard/altgr/macos.eng.inc.pl
+++ b/keyboard/altgr/macos.eng.inc.pl
@@ -104,6 +104,7 @@ my %rows = (
 	%{ kbchars(\%rows) },
 	version => '1.3',
 	title => 'US option',
+	category => 'latin/windows',
 	intro => join("\n",
 		'Resulting <a href="/unicode">selection</a> of <a href="/charset">Unicode</a> characters',
 		"while pressing ⌥ Option (Alt) with Apple's US (or US International) layout",
diff --git a/keyboard/altgr/msx.eng.inc.pl b/keyboard/altgr/msx.eng.inc.pl
index d52a38d..7bf5296 100644
--- a/keyboard/altgr/msx.eng.inc.pl
+++ b/keyboard/altgr/msx.eng.inc.pl
@@ -98,6 +98,7 @@ $groups->{flag}{ext} = ['anachrone', 'expected uppercase variants if allowed by
 	%{ $groups },
 	version => '1.1',
 	title => 'msx code',
+	category => 'legacy/latin',
 	intro => join("\n",
 		'Resulting <a href="/unicode">selection</a> of equivalent <a href="/charset">Unicode</a> characters',
 		"when the <em>code</em> key is pressed on an MSX home computer",
diff --git a/keyboard/altgr/spacecadet.eng.inc.pl b/keyboard/altgr/spacecadet.eng.inc.pl
index 6805d53..75e2948 100644
--- a/keyboard/altgr/spacecadet.eng.inc.pl
+++ b/keyboard/altgr/spacecadet.eng.inc.pl
@@ -93,6 +93,7 @@ my %rows = (
 	%{ kbchars(\%rows) },
 	version => '1.0',
 	title => 'Space Cadet',
+	category => 'legacy',
 	intro => join("\n",
 		'Apparent <a href="/charset">glyphs</a> available',
 		'on the 1978 Symbolics Space Cadet keyboard',
diff --git a/keyboard/altgr/ukext.eng.inc.pl b/keyboard/altgr/ukext.eng.inc.pl
index 303648c..04181c4 100644
--- a/keyboard/altgr/ukext.eng.inc.pl
+++ b/keyboard/altgr/ukext.eng.inc.pl
@@ -104,6 +104,7 @@ $rows{']'} = $rows{'#'};
 +{
 	%{ kbchars(\%rows) },
 	title => 'UK-extended',
+	category => 'latin',
 	version => '1.0',
 	intro => join("\n",
 		"A Chrome OS extension",
diff --git a/keyboard/altgr/windows.eng.inc.pl b/keyboard/altgr/windows.eng.inc.pl
index fc2f5d7..252884d 100644
--- a/keyboard/altgr/windows.eng.inc.pl
+++ b/keyboard/altgr/windows.eng.inc.pl
@@ -68,6 +68,7 @@ $groups->{flag}{ext} = ['xkb', 'unofficial extensions added in Linux (Gnome, KDE
 +{
 	%{$groups},
 	title => 'Windows AltGr',
+	category => 'latin/windows',
 	version => '1.4',
 	intro => join("\n",
 		'Resulting <a href="/unicode">selection</a> of <a href="/charset">Unicode</a> characters',