font: include version in font name hover

diff --git a/chars.plp b/chars.plp
index 775674ec62e98157571912f885dc5e46132657b6..ebfdc6b816c795287cc48a572a009df200d14b84 100644 (file)
--- a/chars.plp
+++ b/chars.plp
@@ -104,8 +104,10 @@ print '<tr>';
 print '<td colspan=2>unicode';
 print '<td>name';
 print '<td><a href="/digraphs" title="digraph">di</a><td>html';
-printf '<td title="%s">%s', $font{$_}->{-name}, $font{$_}->{-abbr}
-       for @fontlist;
+printf('<td title="%s">%s', map { EscapeHTML($_) }
+       join("\n", $font{$_}->{-name}, $font{$_}->{-description}),
+       $font{$_}->{-abbr},
+) for @fontlist;
 say '</thead>';
 
 for my $chr (@chars) {

diff --git a/font.plp b/font.plp
index 5e81234ecd4f750c578161b6edbbb9e51822ae00..1d6ee4f104dbab6c28eb133e1f0f37d166adf35a 100644 (file)
--- a/font.plp
+++ b/font.plp
@@ -81,8 +81,10 @@ printf '<td colspan=%d>%s fonts', scalar @{ $cover->{os}->{$_} }, $_
 
 print '<tr>';
 print '<th colspan=2>';
-printf '<td title="%s">%s', $_->{name}, $_->{abbr}
-       for @{ $cover->{fonts} }[@fontlist];
+printf('<td title="%s">%s', map { EscapeHTML($_) }
+       join("\n", $_->{name}, $_->{description}),
+       $_->{abbr},
+) for @{ $cover->{fonts} }[@fontlist];
 say '</thead>';
 
 for (@rows) {

diff --git a/tools/mkfontinfo b/tools/mkfontinfo
index e212d94a8aba715362a91c3957b2c2a971229f53..85fa91441c51d3cb468e6b37b37456fecc8d12f2 100755 (executable)
--- a/tools/mkfontinfo
+++ b/tools/mkfontinfo
@@ -18,6 +18,12 @@ for my $fontfile (glob 'ttfsupport/*'.$incsuffix) {
        my ($fontid) = basename($fontfile, $incsuffix);
        my ($fontmeta, @fontrange) = do $fontfile or next;
        $fontmeta->{file} = $fontid;
+       my $year = substr $fontmeta->{date}, 0, 4;
+       $fontmeta->{description} = join(' ',
+               (map { "version $_" } $fontmeta->{version} || ()),
+               $fontmeta->{version} && $fontmeta->{version} =~ /\Q$year/ ? () :
+               (map { "($_)" } $year || ()),
+       );
        push @fontlist, $fontmeta;
        $cover{$fontid} = { map { (chr $_ => 1) } @fontrange };
 }

diff --git a/tools/mkttfinfo b/tools/mkttfinfo
index 916e7f3643bc0854945e61b6effe0abb0af47fc4..c80f5fceb378ab9a75550c422a36b2ab3afbc4de 100755 (executable)
--- a/tools/mkttfinfo
+++ b/tools/mkttfinfo
@@ -40,7 +40,7 @@ for ($outfile || ()) {
                source   => $ttfuri =~ m{(^/usr/.+ | [^/]+) \z}msx,
                name     => $ttfmeta->find_name(4) || $ttfname,
                revision => sprintf('%g', $ttf->{head}->{fontRevision}),
-               version  => $ttfmeta->find_name(5) =~ s/\Aversion //ri,
+               version  => $ttfmeta->find_name(5) =~ s/\Aversion //ri =~ s/\s+\z//r,
                copyright=> scalar $ttfmeta->find_name(0),
                license  => $ttfmeta->find_name(14) || undef,
                date     => (map {