font: determine source os to better explain distribution

diff --git a/font.plp b/font.plp
index a93835cf4a96c2ee1695fb314187098ad2e2114a..65b9685394c16d653b30b6d4f0250084a35c53aa 100644 (file)
--- a/font.plp
+++ b/font.plp
@@ -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") x ($_ eq 'Windows 95'),
+                       (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;
@@ -167,8 +180,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>';

diff --git a/tools/mkttfinfo b/tools/mkttfinfo
index 988fcdccdf51adfd8aa33e3daf77eed864985299..a452389280037aa882dc0e66aa0b6094278cdb21 100755 (executable)
--- a/tools/mkttfinfo
+++ b/tools/mkttfinfo
@@ -61,6 +61,17 @@ for ($outfile || ()) {
        $meta{abbr} = lc join '', $meta{name} =~ s/ MS$//r =~ m{
                (?!Sans) (?<! [0-9]) ([[:upper:]0-9])
        }gx;
+       $meta{os} = $_ for "@ttfext[0 .. $#ttfext-1]" || (
+               $meta{copyright} =~ /\bGoogle\b/ ? "Android" :
+               $ttfname eq 'arialuni' ? 'win95' :
+               ()
+       );
+       $meta{oscorp} = (
+               s/^mac10/OS X 10./ ? 'Apple' :
+               s/^win/Windows / ? 'Microsoft' :
+               m/^Android/ ? 'Google' :
+               undef
+       ) for $meta{os} || ();
 
        say "# automatically generated by $0";
        say '+', pp(\%meta), ',';