X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/2e8c1e3cc39cc1c6e4b858242d2a3a39481b9640..da56f674f1b9ed64adbcae060113733b023fa5c9:/keyboard/altgr/index.inc.plp

diff --git a/keyboard/altgr/index.inc.plp b/keyboard/altgr/index.inc.plp
index 74c53dd..c6accc7 100644
--- a/keyboard/altgr/index.inc.plp
+++ b/keyboard/altgr/index.inc.plp
@@ -8,7 +8,7 @@ my $indexfile = "$dirbase/index";
 
 Html({
 	title => "altgr keyboard cheat sheets",
-	version => '1.2',
+	version => '1.3',
 	description => [
 		"Overview of alternate keyboard modes,",
 		"offering extended Unicode characters if a modifier key",
@@ -111,7 +111,9 @@ img {
 :>
 <h1>Extended keyboards</h1>
 
-<p>Overview of available key layouts with AltGr or similar modifier keys.</p>
+<p>Overview of available key layouts with AltGr or similar modifier keys.
+Also see <a href="/digraphs">digraphs</a> for compose key combinations.
+</p>
 
 <:
 my $idx = Data($indexfile);
@@ -120,6 +122,7 @@ push @incs, @{ $idx->{$_} } for @{ $idx->{default} };
 
 my @sample = split /(?<!\+)/, $get{sample} // 'asSci1!+1';
 require Shiar_Sheet::Keyboard;
+Shiar_Sheet::Keyboard->VERSION(3.00);
 use List::Util qw( uniq max sum );
 
 my %caticon = (
@@ -136,7 +139,9 @@ if (@sample) {
 	print "<th>$_" for @sample;
 	say '</tr></thead>';
 }
-my $most = max(map { sum values %{ $_->{inventory}{''} } } %{$idx}{@incs});
+my $most = max(
+	map { sum values %{$_} } map { $_->{inventory}{''} } @{$idx}{@incs}
+);
 for my $inc (@incs) {
 	my $table = $idx->{$inc};
 	print @sample ? '<tr><th>' : '<figure>';
@@ -156,7 +161,8 @@ for my $inc (@incs) {
 		print '</a>', "\n\t";
 		for my $mode ($table->{mode} ? sort keys %{ $table->{mode} } : '') {
 			print '<span class=graph>';
-			printf '<label>%s</label>', s/\s.*//r for $table->{key}{$mode} || ();
+			printf "<label>%s</label>", m/^(\S*)/
+				for $mode && $table->{mode}{$mode} || ();
 			for my $g (sort keys %{ $table->{inventory}{$mode} }) {
 				printf '<span class="%s" style="width:%.0f%%" title="%3$d %4$s"> %s</span>',
 					$g, $_/$most*100, $_,
@@ -168,14 +174,19 @@ for my $inc (@incs) {
 			say '</span>';
 		}
 		print "\t<td class=ni>";
-		print join ' ', map { $caticon{$_} // () } split m{/}, $table->{category} // '';
+		print join ' ', map { $caticon{$_} // () }
+			split m{/}, $table->{category} // '';
 		say '';
 		if (my $keys = eval {
 			my $keydata = Data("$dirbase/$inc.eng");
 			Shiar_Sheet::Keyboard->new($keydata)
 		}) {
-			$keys->print_key('', $_, ($keys->{def}{''}{$_} // 'ni') =~ s/ mode\S*//r)
-				for @sample;
+			for my $c (@sample) {
+				my $def = $keys->{def}{''}{$c} // [];
+				$def->[0] //= 'ni';
+				$def->[0] =~ s/ mode\S*//;
+				$keys->print_key('', $c, $def);
+			}
 		}
 		say '</tr>';
 	}