X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/ba2d5d030915ad97287923e11448032ae22cede5..edd68ec2c70895bd3ee0dcbfb1810716ebef01f8:/tools/convert-ttf.pl

diff --git a/tools/convert-ttf.pl b/tools/convert-ttf.pl
index 95b26a0..97a2026 100755
--- a/tools/convert-ttf.pl
+++ b/tools/convert-ttf.pl
@@ -19,10 +19,12 @@ my %FONTID = (
 	'Times New Roman' => 'times',
 	'DejaVu Sans'     => 'dv ss',
 	'DejaVu Serif'    => 'dv serif',
+	'DejaVu Sans Mono'=> 'dv mono',
 	'Code2000'        => 'c2k',
 	'GNU Unifont'     => 'guf',
 	'Droid Sans'      => 'droid',
 	'Droid Serif'     => 'droid serif',
+	'Droid Sans Mono' => 'droid mono',
 );
 
 {
@@ -30,10 +32,14 @@ my %FONTID = (
 		or die "Cannot open truetype in $ttfuri: $!";
 
 	my $ttfname = ($ttfuri =~ m{([^/.]+) (?:[.]ttf)? \z}msx)[0];
+	my $ttfmeta = $ttf->{name}->read;
 	my %meta = (
-		source   => $ttfuri,
-		name     => $ttf->{name}->read->find_name(4) || $ttfname,
-		version  => $ttf->{head}->{fontRevision},
+		source   => $ttfuri =~ m{(^/usr/.+ | [^/]+) \z}msx,
+		name     => $ttfmeta->find_name(4) || $ttfname,
+		revision => $ttf->{head}->{fontRevision},
+		version  => scalar $ttfmeta->find_name(5),
+		copyright=> scalar $ttfmeta->find_name(0),
+		license  => $ttfmeta->find_name(14) || undef,
 		date     => (map {
 			$_ && eval {
 				require Time::Piece;