common: separate javascript include to set styles

[sheet.git] / chars.plp

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