common: global Data() to parse perl code includes

[sheet.git] / chars.plp

diff --git a/chars.plp b/chars.plp
index e43099e523229283acb390e666dd2aa05482b3f2..e106eb425862f9807559e3b9f7abf1753a1d93b5 100644 (file)
--- 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}),