X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/637b7a6936d2937561bdbcd44595384fc5cc14f3..2bf6ce4daff354b4d7773dd6471dffbe37ca9bc8:/charset.plp

diff --git a/charset.plp b/charset.plp
index eb23d7e..33f02c7 100644
--- a/charset.plp
+++ b/charset.plp
@@ -16,7 +16,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 +79,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 +97,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} || [] };