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

diff --git a/keyboard/altgr/index.inc.plp b/keyboard/altgr/index.inc.plp
index 208cae2..5491df8 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,7 +122,8 @@ push @incs, @{ $idx->{$_} } for @{ $idx->{default} };
 
 my @sample = split /(?<!\+)/, $get{sample} // 'asSci1!+1';
 require Shiar_Sheet::Keyboard;
-use List::Util qw( uniq max );
+Shiar_Sheet::Keyboard->VERSION(3.00);
+use List::Util qw( uniq max sum );
 
 my %caticon = (
 	legacy  => qq{<span class=icon title="deprecated">\N{TOP HAT}</span>},
@@ -136,16 +139,15 @@ if (@sample) {
 	print "<th>$_" for @sample;
 	say '</tr></thead>';
 }
-my %idx = map {($_ => scalar eval{ Data("$dirbase/$_.eng") })} @incs;
-my $most = max(map { scalar keys %{$_->{def}{''}} } values %idx);
+my $most = max(map { sum values %{ $_->{inventory}{''} } } %{$idx}{@incs});
 for my $inc (@incs) {
+	my $table = $idx->{$inc};
 	print @sample ? '<tr><th>' : '<figure>';
 	printf '<a href="/%s">', "$dirbase/$inc";
-	my $table = $idx{$inc};
-	my $title = $table && $table->{title} || $inc;
+	my $title = $table->{title} || $inc;
 
 	unless (@sample) {
-		if ($table and my $img = $table->{image}) {
+		if (my $img = $table->{image}) {
 			EscapeHTML $name = $table->{imagealt} // $img =~ m{.*/([^/.]*)};
 			print qq{<img src="/$img" alt="$name" />};
 		}
@@ -155,28 +157,35 @@ for my $inc (@incs) {
 	else {
 		print $title;
 		print '</a>', "\n\t";
-		my $keys = Shiar_Sheet::Keyboard->new($table);
-		for my $mode ($keys->{mode} ? sort keys %{ $keys->{mode} } : '') {
-			my %inventory;
-			$inventory{$_}++ for grep { /^g[2-9]/ } map { s/ (?!ext).*//r }
-				values %{ $keys->{def}{$mode} };
+		for my $mode ($table->{mode} ? sort keys %{ $table->{mode} } : '') {
 			print '<span class=graph>';
-			printf '<label>%s</label>', s/\s.*//r for $keys->{key}{$mode} || ();
-			for my $g (sort keys %inventory) {
+			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, $_,
 					join(' ', map {
-						$keys->{flag}{$_}[0] || 'extra'  # legend label of each class
+						$table->{flag}{$_}[0] || 'extra'  # legend label of each class
 					} reverse split / /, $g)
-					for $inventory{$g};
+					for $table->{inventory}{$mode}{$g};
 			}
 			say '</span>';
 		}
 		print "\t<td class=ni>";
-		print join ' ', map { $caticon{$_} // () } split m{/}, $keys->{category} // '';
+		print join ' ', map { $caticon{$_} // () }
+			split m{/}, $table->{category} // '';
 		say '';
-		$keys->print_key('', $_, ($keys->{def}{''}{$_} // 'ni') =~ s/ mode\S*//r)
-			for @sample;
+		if (my $keys = eval {
+			my $keydata = Data("$dirbase/$inc.eng");
+			Shiar_Sheet::Keyboard->new($keydata)
+		}) {
+			for my $c (@sample) {
+				my $def = $keys->{def}{''}{$c} // [];
+				$def->[0] //= 'ni';
+				$def->[0] =~ s/ mode\S*//;
+				$keys->print_key('', $c, $def);
+			}
+		}
 		say '</tr>';
 	}
 }