index: bump version to 1.7

[sheet.git] / font.plp

diff --git a/font.plp b/font.plp
index 75f0198496877cd6ef495c59e9002f2b3f006789..e64e204ca43fada457293caf0680e337e49d2790 100644 (file)
--- a/font.plp
+++ b/font.plp
@@ -3,7 +3,7 @@ use 5.014;
 
 Html({
        title => 'character support sheet',
-       version => 'v1.1',
+       version => 'v1.2',
        keywords => [qw(
                unicode font glyph char character support overview cover coverage
                script block symbol sign mark reference table
@@ -31,7 +31,7 @@ if (my $font = $ENV{PATH_INFO} =~ s{^/}{}r) {
 
        say "<h1>Font coverage</h1>";
        say "<h2>$_</h2>" for EscapeHTML($fontmeta->{name});
-       printf("<p>Version <strong%s>%s</strong> released %s contains %d glyphs.</p>\n",
+       printf("<p>Version <strong%s>%s</strong> released %s contains %d glyphs.",
                !!$_->[2] && qq( title="revision $_->[2]"),
                $_->[1], $_->[0],
                scalar @cover,
@@ -41,9 +41,22 @@ if (my $font = $ENV{PATH_INFO} =~ s{^/}{}r) {
                EscapeHTML($fontmeta->{version}),
                $fontmeta->{revision},
        ];
-       printf "<p>%s</p>\n", join('<br>', map { $_ ? EscapeHTML($_) : () }
-               $fontmeta->{copyright}, $fontmeta->{license},
-       );
+       for ($fontmeta->{os}) {
+               say '<br>';
+               print ucfirst join(' ',
+                       "distributed",
+                       (map { "by $_" } $fontmeta->{oscorp} || "various sources"),
+                       (map { "with <em>$_</em>" } $_ || ()),
+                       ('and published as freeware "Core Web font"') x ($_ eq 'Windows 2000'),
+                       (map { "under a $_ license" }
+                               map { $fontmeta->{license} ? qq(<a href="$fontmeta->{license}">$_</a>) : $_ }
+                               $_ && $_ ne 'Android' ? 'proprietary' : 'free',
+                       ),
+               );
+               print '.';
+       }
+       say '</p>';
+       say "<p>$_</p>" for EscapeHTML($fontmeta->{copyright}) || ();
 
        require Shiar_Sheet::FormatChar;
        my $glyphs = Shiar_Sheet::FormatChar->new;
@@ -56,6 +69,10 @@ if (my $font = $ENV{PATH_INFO} =~ s{^/}{}r) {
        .glyphs tbody th[!colspan] { text-align: right }
        .glyphs tbody td { font-family: "$fontmeta->{name}" }
        .glyphs tbody td:nth-child(18) { border-left-width: 2px }
+       \@font-face {
+               font-family: "$fontmeta->{name}";
+               src: url(/data/font/$font.ttf);
+       }
 </style>
 EOT
        say '<table class="glyphs big">';
@@ -91,11 +108,13 @@ EOT
                my $info = $glyphs->glyph_info($cp);
                my ($class, $name, $mnem, $html, $string) = @{$info};
                my $np = $class =~ /\bC\S\b/;  # noprint if control or invalid
+               # display literal character, with placeholder circle if non-spacing/enclosing
+               my $html = ($class =~ /\bM[ne]\b/ && chr 9676) . EscapeHTML(chr $cp);
                say sprintf '<td class="%s" title="U+%04X%s">%s',
                        !$class ? ('l0', $cp, '', '') :
                        $cover{$cp} ? $np ? 'l2' : 'l5' : $np ? 'Xi' : 'l1',
                        $cp, !!$name && ": $name",
-                       ($cover{$cp} || !$np) && EscapeHTML(chr $cp);
+                       ($cover{$cp} || !$np) && $html;
        }
        say '</table>';
 
@@ -120,6 +139,8 @@ my @ossel = @{ $cover->{osdefault} };
 my @fontlist = map { @{ $cover->{os}->{$_} } } @ossel;
 
 my @rows = (
+       'version/11',
+       'version/63',
        'block/Latin-1 Supplement',
        'block/Latin Extended-A',
        'block/Latin Extended Additional',
@@ -163,8 +184,11 @@ print "<colgroup span=$_>"
 
 print '<thead><tr>';
 print '<th colspan=2>';
-printf '<td colspan=%d>%s fonts', scalar @{ $cover->{os}->{$_} }, $_
-       for @ossel;
+for my $os (@ossel) {
+       my $osfonts = $cover->{os}->{$os};
+       my $osfont = $cover->{fonts}->[ $osfonts->[0] ]; # first font
+       printf '<td colspan=%d>%s', scalar @{$osfonts}, $osfont->{os} || ''
+}
 
 print '<tr>';
 print '<th colspan=2>';
@@ -180,6 +204,7 @@ for (@rows) {
        my $row = $cover->{$group}->{$name};
 
        print '<tr>';
+       $name = sprintf 'Unicode v%.1f', $name / 10 if $group eq 'version';
        $name = sprintf '<a href="%s">%s</a>', EncodeURI("/chars/$group/$name"), EscapeHTML($name)
                if $row->{count} and $row->{count} < 1280;
        print '<th>', $name;