made pdf2swf -I handle external fonts, too

diff --git a/lib/pdf/GFXOutputDev.cc b/lib/pdf/GFXOutputDev.cc
index 7f11936..441a92b 100644 (file)
--- a/lib/pdf/GFXOutputDev.cc
+++ b/lib/pdf/GFXOutputDev.cc
@@ -419,6 +419,7 @@ char* fontconfig_searchForFont(char*name)
         fontfile_t*fd = global_fonts;
         while(fd) {
             FcConfigAppFontAddFile(config, (FcChar8*)fd->filename);
+            msg("<debug> Adding font %s to fontconfig", fd->filename);
             fd = fd->next;
         }
 
@@ -432,17 +433,21 @@ char* fontconfig_searchForFont(char*name)
 
        if(getLogLevel() >= LOGLEVEL_TRACE) {
            int t;
-           for(t=0;t<set->nfont;t++) {
-               char*fcfamily=0,*fcstyle=0,*filename=0;
-               FcBool scalable=FcFalse, outline=FcFalse;
-               FcPatternGetString(set->fonts[t], "family", 0, (FcChar8**)&fcfamily);
-               FcPatternGetString(set->fonts[t], "style", 0, (FcChar8**)&fcstyle);
-               FcPatternGetString(set->fonts[t], "file", 0, (FcChar8**)&filename);
-               FcPatternGetBool(set->fonts[t], "outline", 0, &outline);
-               FcPatternGetBool(set->fonts[t], "scalable", 0, &scalable);
-               if(scalable && outline) {
-                   msg("<trace> %s-%s -> %s", fcfamily, fcstyle, filename);
+           int p;
+           for(p=0;p<2;p++) {
+               for(t=0;t<set->nfont;t++) {
+                   char*fcfamily=0,*fcstyle=0,*filename=0;
+                   FcBool scalable=FcFalse, outline=FcFalse;
+                   FcPatternGetString(set->fonts[t], "family", 0, (FcChar8**)&fcfamily);
+                   FcPatternGetString(set->fonts[t], "style", 0, (FcChar8**)&fcstyle);
+                   FcPatternGetString(set->fonts[t], "file", 0, (FcChar8**)&filename);
+                   FcPatternGetBool(set->fonts[t], "outline", 0, &outline);
+                   FcPatternGetBool(set->fonts[t], "scalable", 0, &scalable);
+                   if(scalable && outline) {
+                       msg("<trace> %s (%s) -> %s", fcfamily, fcstyle, filename);
+                   }
                }
+               set =  FcConfigGetFonts(config, FcSetApplication);
            }
        }
     }
@@ -450,6 +455,8 @@ char* fontconfig_searchForFont(char*name)
     char*family = strdup(name);
     char*style = 0;
     char*dash = strchr(family, '-');
+    if(!dash) dash = strchr(family, ',');
+
     FcPattern*pattern = 0;
     if(dash) {
        *dash = 0;
@@ -506,7 +513,7 @@ static DisplayFontParamKind detectFontType(const char*filename)
 
 DisplayFontParam *GFXGlobalParams::getDisplayFont(GString *fontName)
 {
-    msg("<verbose> looking for font %s in global params", fontName->getCString());
+    msg("<verbose> looking for font %s", fontName->getCString());
 
     char*name = fontName->getCString();
     
@@ -565,8 +572,10 @@ DisplayFontParam *GFXGlobalParams::getDisplayFont(GString *fontName)
        }
        free(filename);
         return dfp;
+    } else {
+       msg("<verbose> Font %s not found\n", name);
+       return GlobalParams::getDisplayFont(fontName);
     }
-    return GlobalParams::getDisplayFont(fontName);
 }
 
 GFXOutputDev::GFXOutputDev(InfoOutputDev*info, PDFDoc*doc)

diff --git a/src/pdf2swf.c b/src/pdf2swf.c
index f2425c7..4344187 100644 (file)
--- a/src/pdf2swf.c
+++ b/src/pdf2swf.c
@@ -673,16 +673,16 @@ int main(int argn, char *argv[])
     if(pagerange)
        driver->set_parameter(driver, "pages", pagerange);
 
-    if(info_only) {
-       show_info(driver, filename);
-       return 0;
-    }
-
     /* add fonts */
     for(t=0;t<fontpathpos;t++) {
        driver->set_parameter(driver, "fontdir", fontpaths[t]);
     }
 
+    if(info_only) {
+       show_info(driver, filename);
+       return 0;
+    }
+
     char*u = 0;
     if((u = strchr(outputname, '%'))) {
        if(strchr(u+1, '%') ||