font: more generic rules to parse ttf files

[sheet.git] / tools / mkttfinfo

diff --git a/tools/mkttfinfo b/tools/mkttfinfo
index 916e7f3643bc0854945e61b6effe0abb0af47fc4..ad8530e531e17785cca0c48fc106c6c6cf46e7dd 100755 (executable)
--- a/tools/mkttfinfo
+++ b/tools/mkttfinfo
@@ -16,7 +16,7 @@ GetOptions(my %opt,
 my ($ttfuri, $outfile) = @ARGV;
 $ttfuri or die "usage error\n";
 
-my $fontinc = $ENV{FONTINC} // '~/.fonts,/usr/share/fonts/truetype/*';
+my $fontinc = $ENV{FONTINC} // 'data/font,~/.fonts,/usr/share/fonts/truetype/*';
 if (!-e $ttfuri) {
        my $found = (grep {-e} glob "{$fontinc}/$ttfuri")[0] or do {
                warn "font not found: $ttfuri\n";
@@ -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 {