X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/44d15e0fc5019df2eedf7a46d977ee681ca41675..HEAD:/chars.plp

diff --git a/chars.plp b/chars.plp
index bea56cf..91df3b8 100644
--- a/chars.plp
+++ b/chars.plp
@@ -2,7 +2,7 @@
 
 Html({
 	title => 'character support sheet',
-	version => '1.1',
+	version => '1.2',
 	keywords => [qw'
 		unicode glyph char character reference common ipa symbol sign mark table digraph
 	'],
@@ -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,11 +30,10 @@ my @fontlist = map { $_->{file} }
 
 my %font;
 for my $fontid (@fontlist) {
-		my ($fontmeta, @fontrange) = do "data/font/$fontid.inc.pl";
-		$fontmeta or next;
+		my $fontmeta = eval { Data("data/font/$fontid") } or next;
 		$font{$fontid} = {
 			(map { (-$_ => $fontmeta->{$_}) } keys %{$fontmeta}),
-			map { (chr $_ => 1) } @fontrange
+			map { (chr $_ => 1) } @{ $fontmeta->{cover} }
 		};
 }