X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/44b795fc01b6362156d4be10012d34a22b02bfed..5e2f32d08b77d469b7f190f40dde1e4ca9cd1af3:/tools/mkttfinfo

diff --git a/tools/mkttfinfo b/tools/mkttfinfo
index 370ff97..9102726 100755
--- a/tools/mkttfinfo
+++ b/tools/mkttfinfo
@@ -9,14 +9,14 @@ use Getopt::Long;
 
 our $VERSION = '1.00';
 
-GetOptions(my %opt,
+GetOptions(\my %opt,
 	'verbose|v!',
 );
 
 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";
@@ -39,8 +39,8 @@ for ($outfile || ()) {
 	my %meta = (
 		source   => $ttfuri =~ m{(^/usr/.+ | [^/]+) \z}msx,
 		name     => $ttfmeta->find_name(4) || $ttfname,
-		revision => $ttf->{head}->{fontRevision},
-		version  => scalar $ttfmeta->find_name(5),
+		revision => sprintf('%g', $ttf->{head}->{fontRevision}),
+		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 {