X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/bac74b5934f22cc3d0e971d26fe0275f7f5db7b3..77ac3d52d89913a79cca834d882c54a58c15a488:/chars.plp diff --git a/chars.plp b/chars.plp index a637eae..04420cd 100644 --- a/chars.plp +++ b/chars.plp @@ -2,18 +2,27 @@ Html({ title => 'character support sheet', - version => '1.0', + version => '1.1', keywords => [qw' unicode glyph char character reference common ipa symbol sign mark table digraph '], stylesheet => [qw'light dark mono circus red'], - data => [qw( unicode-cover.inc.pl ttfsupport unicode-char.inc.pl )], + data => [qw( data/unicode-cover.inc.pl data/font data/unicode-char.inc.pl )], + raw => <<'EOT', + +EOT }); use Shiar_Sheet::FormatChar; my $glyphs = Shiar_Sheet::FormatChar->new; -my $groupinfo = do 'unicode-cover.inc.pl' or die $@ || $!; +my $groupinfo = do 'data/unicode-cover.inc.pl' or die $@ || $!; my @ossel = @{ $groupinfo->{osdefault} }; my @fontlist = map { $_->{file} } @@ -21,7 +30,7 @@ my @fontlist = map { $_->{file} } my %font; for my $fontid (@fontlist) { - my ($fontmeta, @fontrange) = do "ttfsupport/$fontid.inc.pl"; + my ($fontmeta, @fontrange) = do "data/font/$fontid.inc.pl"; $fontmeta or next; $font{$fontid} = { (map { (-$_ => $fontmeta->{$_}) } keys %{$fontmeta}), @@ -33,8 +42,7 @@ for my $fontid (@fontlist) { my ($title, $parent) = ('Character overview'); my $query = eval { - for ($ENV{PATH_INFO} || ()) { - s{^/}{}; + for ($Request || ()) { return $_ if m{^[0-9 +-]+$}; my ($cat, $name) = split m{/}, $_, 2 or die "invalid query\n"; @@ -54,7 +62,7 @@ my $query = eval { say "

$title

"; if (!$query) { - say "

Unicode group not specified: $@

"; + Alert('Unicode group not specified', $@); exit; }; @@ -113,14 +121,14 @@ for my $chr (@chars) { my $codepoint = ord $chr; my $ascii = $codepoint <= 127; - print "$chr\n"; + say '', $chr; my $info = $glyphs->glyph_info($codepoint); - my ($class, $name, $mnem, $html, $string) = @$info; + my ($class, $name, $mnem, $entity, $string) = @$info; print "$_" for sprintf('%X', $codepoint), EscapeHTML($name || '?'); printf '%s', @$_ for ( [$ascii ? 'l0' : defined $mnem ? $class =~ /\bu-di\b/ ? 'l4' : 'l3' : 'l1', EscapeHTML($mnem) // ''], - [$ascii ? 'l0' : defined $html ? 'l4' : 'l1', $html // ''], + [$ascii ? 'l0' : defined $entity ? 'l4' : 'l1', $entity // ''], (map { !defined $font{$_}->{-name} ? [l0 => '?'] : $font{$_}->{$chr} ? [l4 => '✔'] : [l1 => '✘']