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

diff --git a/chars.plp b/chars.plp
index e43099e..e106eb4 100644
--- a/chars.plp
+++ b/chars.plp
@@ -22,7 +22,7 @@ EOT
 use Shiar_Sheet::FormatChar;
 my $glyphs = Shiar_Sheet::FormatChar->new;
 
-my $groupinfo = do 'data/unicode-cover.inc.pl' or die $@ || $!;
+my $groupinfo = Data('data/unicode-cover');
 
 my @ossel = @{ $groupinfo->{osdefault} };
 my @fontlist = map { $_->{file} }
@@ -30,7 +30,7 @@ my @fontlist = map { $_->{file} }
 
 my %font;
 for my $fontid (@fontlist) {
-		my ($fontmeta, @fontrange) = do "data/font/$fontid.inc.pl";
+		my ($fontmeta, @fontrange) = eval { Data("data/font/$fontid") };
 		$fontmeta or next;
 		$font{$fontid} = {
 			(map { (-$_ => $fontmeta->{$_}) } keys %{$fontmeta}),