X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/1b2d8f7fa043a5fe5887153533c49acdc218c5e3..HEAD:/charset.plp

diff --git a/charset.plp b/charset.plp
index 9ab15f1..bbab1d6 100644
--- a/charset.plp
+++ b/charset.plp
@@ -5,7 +5,8 @@ my @tablist = split m{/+}, $Request || 'default';
 
 Html({
 	title => 'charset cheat sheet',
-	version => '1.2',
+	version => '1.3',
+	canonical => "/charset/$Request" . ($mode && '?compare'),
 	description => [
 		"Reference sheet with all glyphs in common character encoding tables,",
 		"and an overview of Unicode ranges and UTF-8 bytes.",
@@ -16,7 +17,7 @@ Html({
 	'],
 	(stylesheet => [qw'light']) x !$mode,
 	data => [qw(
-		charset-encoding.inc.pl
+		charset.inc.pl charset-encoding.inc.pl
 		charset-unicode.inc.pl charset-ucplanes.inc.pl charset-utf8.inc.pl
 	)],
 });
@@ -79,8 +80,7 @@ use Shiar_Sheet::FormatChar;
 my $glyphs = Shiar_Sheet::FormatChar->new;
 my @request;
 
-my $charsets = do 'charset-encoding.inc.pl'
-	or Alert('Encoding metadata could not be read', $@ || $!);
+my $charsets = Data('charset');
 
 sub tabinput {
 	# generate character table(s)
@@ -98,7 +98,7 @@ sub tabinput {
 
 	state $visible = {'' => 1};  # all present tables
 	my %row = (offset => 0, cols => 16);
-	$row{$_} = $charset->{$_} for qw( note );  # copy metadata
+	$row{$_} = $charset->{$_} for qw( note table );  # copy metadata
 
 	if (not defined $params) {
 		my @parents = @{ $charset->{inherit} || [] };