X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/f1cfafd56c8fc6be24d8691daf40a9fbff767b17..dfb97641f69972c016320553556086d5a66e7606:/keyboard/altgr/index.inc.plp

diff --git a/keyboard/altgr/index.inc.plp b/keyboard/altgr/index.inc.plp
index 9e4d6b5..208cae2 100644
--- a/keyboard/altgr/index.inc.plp
+++ b/keyboard/altgr/index.inc.plp
@@ -3,7 +3,8 @@ use 5.014;
 use warnings;
 use utf8;
 
-my @incs = glob 'keyboard/altgr/*.eng.inc.pl';
+my $dirbase = 'keyboard/altgr';
+my $indexfile = "$dirbase/index";
 
 Html({
 	title => "altgr keyboard cheat sheets",
@@ -16,9 +17,9 @@ Html({
 	keywords => [qw'
 		sheet cheat reference overview keyboard altgr option
 	'],
-	image => 'data/keyboard/thumb/ibm-m.jpg',
+	image => "$dirbase/thumb/ibm-m.jpg",
 	stylesheet => [qw( light dark circus mono red )],
-	data => ['keyboard/altgr/index.inc.plp', @incs],
+	data => ["$dirbase/index.inc.plp", "$indexfile.inc.pl"],
 	raw => <<'.',
 <style>
 .keys.cmp {
@@ -113,6 +114,10 @@ img {
 <p>Overview of available key layouts with AltGr or similar modifier keys.</p>
 
 <:
+my $idx = Data($indexfile);
+my @incs;
+push @incs, @{ $idx->{$_} } for @{ $idx->{default} };
+
 my @sample = split /(?<!\+)/, $get{sample} // 'asSci1!+1';
 require Shiar_Sheet::Keyboard;
 use List::Util qw( uniq max );
@@ -131,14 +136,11 @@ if (@sample) {
 	print "<th>$_" for @sample;
 	say '</tr></thead>';
 }
-my %idx = map {s/\Q.inc.pl\E$//; ($_ => eval{ Data($_) })} @incs;
+my %idx = map {($_ => scalar eval{ Data("$dirbase/$_.eng") })} @incs;
 my $most = max(map { scalar keys %{$_->{def}{''}} } values %idx);
-for my $inc (sort {
-	($idx{$a}{category} // 0) cmp ($idx{$b}{category} // 0)
-	|| $a cmp $b
-} keys %idx) {
+for my $inc (@incs) {
 	print @sample ? '<tr><th>' : '<figure>';
-	printf '<a href="/%s">', $inc =~ s/\.eng$//r;
+	printf '<a href="/%s">', "$dirbase/$inc";
 	my $table = $idx{$inc};
 	my $title = $table && $table->{title} || $inc;