X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/e1c15e98e78002475bc637d1a5848b45414b9e41..refs/heads/master:/codec.plp

diff --git a/codec.plp b/codec.plp
index 2349b1d..f13b93a 100644
--- a/codec.plp
+++ b/codec.plp
@@ -4,43 +4,48 @@ my ($page, @feat) = split m{/+}, $Request || 'image';
 $page !~ /\W/ or Html(), Abort('Invalid codec type request', 400);
 @feat or @feat = 'default';
 my $title = "$page codecs";
+my $info = eval { Data("codec-$page") };
+if ($@) {
+	$info = {};
+}
 
 Html({
 	title => "$title cheat sheet",
-	version => '1.0',
-	description => [
-	],
-	keywords => [qw'
-		codec encoder encoding decode file format type mime
-		feature comparison support benchmark compression
-		image audio video
-	'],
+	version => '1.1',
+	description => $info->{intro},
+	keywords => [@{ $info->{keywords} // [] }, qw' feature comparison support benchmark '],
 	stylesheet => [qw'light circus dark red'],
-	data => [qw'codec.inc.pl'],
-	raw => '<style>td,th {width:10%} tbody th {white-space:nowrap}</style>',
+	data => ["codec-$page.inc.pl"],
+	raw => '<style>td,th {width:8%} tbody th {white-space:nowrap}</style>',
 });
 
-my $info = do "codec-$page.inc.pl";
-$info and %{$info} > 1
-	or Abort("Requested codec type <q>$page</q> not available", '404 request not found', $@ // $!);
+%{$info}
+	or Abort("Requested codec type <q>$page</q> not available", '404 request not found');
 
 say "<h1>\u$title</h1>";
+say "<p>$_</p>" for $info->{intro} // ();
 
 my %BOOLSCORE = (y => [5, '✔'], n => [1, '✘'], 0 => [0, 'n/a']);
 :>
 
 <div class="section">
 <table class="mapped">
-	<col><colgroup span=3><colgroup span=2><colgroup span=3>
-<thead><tr><th rowspan=2>feature
 <:
 my @codecs = sort {
 	$info->{codec}->{$a}->{available} <=> $info->{codec}->{$b}->{available}
 } keys $info->{codec}->%*;
+my @codeccols = @{$info->{codec}}{@codecs};
 
-print '<th>', $_->{name} for @{$info->{codec}}{@codecs};
-print "\n<tr>";
-print '<td>', $_->{available} for @{$info->{codec}}{@codecs};
+{
+	print '<col>';
+	my @spans;
+	$spans[ $_->{generation} ]++ for @codeccols;
+	print "<colgroup span=$_>" for @spans;
+}
+say '<thead><tr><th rowspan=2>';
+say "\t", '<th>', $_->{name} for @codeccols;
+print '<tr>';
+print '<td>', $_->{available} for @codeccols;
 say '</thead>';
 
 while (defined (my $feat = shift @feat)) {
@@ -60,7 +65,7 @@ while (defined (my $feat = shift @feat)) {
 			}
 		}
 		printf '<td class="l%d"', $score;
-		printf ' title="%s"', $_ for $title // ();
+		printf ' title="%s"', EscapeHTML($_) for $title // ();
 		print '>', $data;
 	}
 	say '</td>';