From: Mischa POSLAWSKY <perl@shiar.org>
Date: Thu, 5 Mar 2015 04:11:03 +0000 (+0100)
Subject: font: clean up version and revision numbers
X-Git-Tag: v1.7~48
X-Git-Url: http://git.shiar.nl/sheet.git/commitdiff_plain/8bc72cf576806b52fae4b4e34505fcd84b97e2bf

font: clean up version and revision numbers

Some fonts prefix 'Version' to number, some don't.
Revision number is stored as single-precision float (f), so needs to be
rounded to avoid showing erroneous digits.
---

diff --git a/tools/mkttfinfo b/tools/mkttfinfo
index 370ff97..916e7f3 100755
--- a/tools/mkttfinfo
+++ b/tools/mkttfinfo
@@ -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,
 		copyright=> scalar $ttfmeta->find_name(0),
 		license  => $ttfmeta->find_name(14) || undef,
 		date     => (map {