X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/637b7a6936d2937561bdbcd44595384fc5cc14f3..d98df9cb4fb14f54acb85c59fcff90800be73e01:/chars.plp

diff --git a/chars.plp b/chars.plp
index e43099e..1723699 100644
--- a/chars.plp
+++ b/chars.plp
@@ -6,7 +6,6 @@ Html({
 	keywords => [qw'
 		unicode glyph char character reference common ipa symbol sign mark table digraph
 	'],
-	stylesheet => [qw'light dark mono circus red'],
 	data => [qw( data/unicode-cover.inc.pl data/font data/unicode-char.inc.pl )],
 	raw => <<'EOT',
 <style>
@@ -22,7 +21,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 +29,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} }
 		};
 }