font: grouped character groups

diff --git a/chars.plp b/chars.plp
index c36615db37acc4abe6a11a6035816bf19336f4e7..869366c708b227182a1f3af259005917915ac67c 100644 (file)
--- a/chars.plp
+++ b/chars.plp
@@ -10,17 +10,6 @@ Html({
        data => [qw( unicode-cover.inc.pl ttfsupport unicode-char.inc.pl )],
 });
 
-:>
-<h1>Character support</h1>
-
-<p>
-Selected characters from Unicode <a href="/unicode">preset</a>
-or <a href="/charset">range</a>.
-</p>
-
-<div>
-
-<:
 use 5.010;
 use Shiar_Sheet::FormatChar;
 my $glyphs = Shiar_Sheet::FormatChar->new;
@@ -50,43 +39,65 @@ for my $os (@ossel) {
 
 # parse input
 
-my @chars;
-my @querydesc;
-
-if (my $query = $ENV{PATH_INFO} || $get{q} || 'ipa') {
-       my $groupinfo = do 'unicode-cover.inc.pl' or die $@ || $!;
-       for (split /[\s+]/, $query) {
+my ($title, $parent) = ('Character overview');
+my $query = eval {
+       for ($ENV{PATH_INFO} || ()) {
                s{^/}{};
-               when (qr{^[\d,;\s+-]+$}) {
-                       push @querydesc, "character codepoints $_";
-                       for (map { split /[^\d-]/ } $_) {
-                               my ($charnum, $range) = split /-/, $_;
-                               push @chars, chr $_ for $charnum .. ($range // $charnum);
-                       }
-               }
-               when ($_) {
-                       my $row = $groupinfo->{$_} or do {
-                               warn "group $_ not found";
-                               next;
-                       };
-                       push @querydesc, $row->{-name} // $_;
-                       push @chars, map { chr } @{ $row->{-chars} };
-               }
-               default {
-                       die "unknown parameter: $_\n";
+               return $_ if m{^[0-9 +-]+$};
+
+               my ($cat, $name) = split m{/}, $_, 2 or die "invalid query\n";
+               if (!$name) {
+                       ($cat, $name) = ('table', $cat);
                }
+
+               my $groupinfo = do 'unicode-cover.inc.pl' or die $@ || $!;
+               my $row = $groupinfo->{$cat}->{$name}
+                       or die "unknown character group $cat/$name\n";
+
+               $title = ucfirst EscapeHTML($name).' characters';
+               $parent = $cat;
+               return EscapeHTML($row->{-query});
        }
+} || $get{q};
+
+say "<h1>$title</h1>";
+
+if (!$query) {
+       say "<p>Unicode group not specified: $@</p>";
+       exit;
+};
+
+for ($parent || 'Unicode range') {
+       my %CATDESC = (
+               block    => '<a href="/charset/unicode">Unicode block</a>',
+               script   => 'Unicode script',
+               category => 'Unicode category',
+               table    => '<a href="/unicode">Unicode preset group</a>',
+       );
+       say sprintf('<p>List %s in selected %s.</p>',
+               'characters and <a href="/font">font support</a>',
+               $CATDESC{$parent} || $parent,
+       );
 }
 
+my @chars;
+for (map { split /[^\d-]/ } $query) {
+       my @range = split /-/, $_, 2;
+       m/^[0-9]+$/ or die "Invalid code point $_ in query $query\n" for @range;
+       push @chars, chr $_ for $range[0] .. ($range[1] // $range[0]);
+}
+
+@chars or die "No match for query $query\n";
+
 @chars <= 1500 or die sprintf(
-       'too many matches (%d) for %s'."\n",
-       scalar @chars, join(', ', @querydesc),
+       'Too many matches (%d) for query %s'."\n",
+       scalar @chars, $query,
 );
 
 # output character list
 
+say '<div>';
 print '<table class=mapped>';
-say '<caption>'.EscapeHTML(join ', ', @querydesc).'</caption>';
 print '<col>' x 3;
 print "<colgroup span=$_>" for 2, map { scalar @{$oslist{$_}} } @ossel;
 
@@ -123,6 +134,5 @@ for my $chr (@chars) {
 }
 
 say "</table>\n";
-
-:></div>
+say "</div>\n";
 

diff --git a/font.plp b/font.plp
index 50d8dcb2a96848f21ae17024c2c57e7c53f12cd5..11eba2f5566f2ef26ac6ad110442005166472f3c 100644 (file)
--- a/font.plp
+++ b/font.plp
@@ -57,7 +57,7 @@ for my $group (sort keys %{$cover}) {
 for my $name (sort keys %{ $cover->{$group} }) {
        my $row = $cover->{$group}->{$name};
        print '<tr>';
-       $name = qq{<a href="/chars/$name">$name</a>}
+       $name = sprintf '<a href="%s">%s</a>', EncodeURI("/chars/$group/$name"), EscapeHTML($name)
                if $row->{-count} and $row->{-count} < 1280;
        print '<th>', $name;
        print '<td class=right>', $row->{-count};