From: Mischa POSLAWSKY Date: Mon, 16 Mar 2015 19:00:58 +0000 (+0100) Subject: font: determine source os to better explain distribution X-Git-Tag: v1.7~12 X-Git-Url: http://git.shiar.nl/sheet.git/commitdiff_plain/352e92112d4f6e464363f1722e1998247c03d0be font: determine source os to better explain distribution --- diff --git a/font.plp b/font.plp index a93835c..65b9685 100644 --- a/font.plp +++ b/font.plp @@ -31,7 +31,7 @@ if (my $font = $ENV{PATH_INFO} =~ s{^/}{}r) { say "

Font coverage

"; say "

$_

" for EscapeHTML($fontmeta->{name}); - printf("

Version %s released %s contains %d glyphs.

\n", + printf("

Version %s 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 "

%s

\n", join('
', map { $_ ? EscapeHTML($_) : () } - $fontmeta->{copyright}, $fontmeta->{license}, - ); + for ($fontmeta->{os}) { + say '
'; + print ucfirst join(' ', + "distributed", + (map { "by $_" } $fontmeta->{oscorp} || "various sources"), + (map { "with $_" } $_ || ()), + ("and published as freeware") x ($_ eq 'Windows 95'), + (map { "under a $_ license" } + map { $fontmeta->{license} ? qq($_) : $_ } + $_ && $_ ne 'Android' ? 'proprietary' : 'free', + ), + ); + print '.'; + } + say '

'; + say "

$_

" for EscapeHTML($fontmeta->{copyright}) || (); require Shiar_Sheet::FormatChar; my $glyphs = Shiar_Sheet::FormatChar->new; @@ -167,8 +180,11 @@ print "" print ''; print ''; -printf '%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 '%s', scalar @{$osfonts}, $osfont->{os} || '' +} print ''; print ''; diff --git a/tools/mkttfinfo b/tools/mkttfinfo index 988fcdc..a452389 100755 --- a/tools/mkttfinfo +++ b/tools/mkttfinfo @@ -61,6 +61,17 @@ for ($outfile || ()) { $meta{abbr} = lc join '', $meta{name} =~ s/ MS$//r =~ m{ (?!Sans) (?