X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/88048e2c00e3e9a9c172e788722354017cd401ec..58725794d72361cc70cb082476a32d08e22d21d0:/font.plp

diff --git a/font.plp b/font.plp
index 30a4234..cb6cd35 100644
--- a/font.plp
+++ b/font.plp
@@ -14,13 +14,13 @@ Html({
 });
 
 if ($font) {
-	my ($fontmeta, @cover) = do "data/font/$font.inc.pl";
-	$fontmeta or Abort("Unknown font $font", '404 font not found');
+	my ($fontmeta, @cover) = eval { Data("data/font/$font") }
+		or Abort("Unknown font $font", '404 font not found', ref $@ && $@->[1]);
 
 	my $map = eval {
 		$get{map} or return;
 
-		my $groupinfo = do 'data/unicode-cover.inc.pl' or die $@ || $!;
+		my $groupinfo = Data('data/unicode-cover');
 
 		my ($cat, $name) = split m{/}, $get{map}, 2 or die "invalid map\n";
 		if (!$name) {
@@ -181,7 +181,7 @@ Character support of Unicode
 
 <:
 
-my $cover = do 'data/unicode-cover.inc.pl' or die $@ || $!;
+my $cover = Data('data/unicode-cover');
 
 my @ossel = @{ $cover->{osdefault} };
 my @fontlist = map { @{ $cover->{os}->{$_} } } @ossel;