font: generate data for apple fonts from OS X

diff --git a/tools/convert-allfonts b/tools/convert-allfonts
index 96101141bdae6cb1d02132b52cf4d2e649d32515..5f0c6aa8cd84de36089c58a52f6ccae540a88af4 100755 (executable)
--- a/tools/convert-allfonts
+++ b/tools/convert-allfonts
@@ -10,7 +10,7 @@ chdir dirname $0;
 
 my $convbin = './mkttfinfo';
 my $outdir = '../ttfsupport';
 
 my $convbin = './mkttfinfo';
 my $outdir = '../ttfsupport';

-my @ttfpath = '~/.fonts';  # local fallbacks
+my @ttfpath = ('~/.fonts', '../data/osx-fonts');  # local fallbacks

 
 if (my $mspath = '/usr/share/fonts/truetype/msttcorefonts') {
        if (my $src = first { -e } map { glob "$_/Verdana.ttf" } $mspath, @ttfpath) {
 
 if (my $mspath = '/usr/share/fonts/truetype/msttcorefonts') {
        if (my $src = first { -e } map { glob "$_/Verdana.ttf" } $mspath, @ttfpath) {


@@ -33,6 +33,15 @@ if (my $mspath = '/usr/share/fonts/truetype/msttcorefonts') {
        }
 }
 
        }
 }
 

+if (my $ampath = '/usr/share/fonts/truetype/macfonts') {
+       if (my $src = first { -e } map { glob "$_/Lucida?Grande.ttf" } $ampath, @ttfpath) {
+               system $convbin, $src, "$outdir/lucida.inc.pl";
+       }
+       if (my $src = first { -e } map { glob "$_/AppleGaramond.ttf" } $ampath, @ttfpath) {
+               system $convbin, $src, "$outdir/garamond.inc.pl";
+       }
+}
+

 if (my $dvpath = '/usr/share/fonts/truetype/ttf-dejavu') {
        if (my $src = first { -e } map { glob "$_/DejaVuSans.ttf" } $dvpath, @ttfpath) {
                system $convbin, $src, "$outdir/dvsans.inc.pl";
 if (my $dvpath = '/usr/share/fonts/truetype/ttf-dejavu') {
        if (my $src = first { -e } map { glob "$_/DejaVuSans.ttf" } $dvpath, @ttfpath) {
                system $convbin, $src, "$outdir/dvsans.inc.pl";