X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fpdf%2FGFXOutputDev.cc;h=af891cbf21b07b1ce2e9c5da211b0e333d668d7c;hb=753c672c453d65155923a539472414a26ea4e445;hp=7f11936684cf4e852cb1b2e792f3ef5b9e7deca2;hpb=1c806da0dba560e9da67b85a3645cd1537742ead;p=swftools.git

diff --git a/lib/pdf/GFXOutputDev.cc b/lib/pdf/GFXOutputDev.cc
index 7f11936..af891cb 100644
--- a/lib/pdf/GFXOutputDev.cc
+++ b/lib/pdf/GFXOutputDev.cc
@@ -335,6 +335,19 @@ GFXGlobalParams::~GFXGlobalParams()
 #endif
 }
 #ifdef HAVE_FONTCONFIG
+static char stralphacmp(const char*s1, const char*s2)
+{
+    while(*s1 && *s2) {
+	/* skip over space, minus, comma etc. */
+	while(*s1>=32 && *s1<=63) s1++;
+	while(*s2>=32 && *s2<=63) s2++;
+	if(*s1!=*s2)
+	    break;
+	s1++;s2++;
+    }
+    return *s1 - *s2;
+}
+
 static char fc_ismatch(FcPattern*match, char*family, char*style)
 {
     char*fcfamily=0,*fcstyle=0,*fcfullname=0,*filename=0;
@@ -348,7 +361,7 @@ static char fc_ismatch(FcPattern*match, char*family, char*style)
     if(scalable!=FcTrue || outline!=FcTrue)
 	return 0;
 
-    if (!strcasecmp(fcfamily, family)) {
+    if (!stralphacmp(fcfamily, family)) {
 	msg("<debug> Font %s-%s (%s) is a match for %s%s%s", fcfamily, fcstyle, filename, family, style?"-":"", style?style:"");
 	return 1;
     } else {
@@ -419,6 +432,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 +446,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 +468,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 +526,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 +585,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)
@@ -603,6 +625,7 @@ GFXOutputDev::GFXOutputDev(InfoOutputDev*info, PDFDoc*doc)
     this->config_drawonlyshapes = 0;
     this->config_disable_polygon_conversion = 0;
     this->config_multiply = 1;
+    this->config_linkdatafile = 0;
     this->page2page = 0;
     this->num_pages = 0;
   
@@ -621,6 +644,8 @@ void GFXOutputDev::setParameter(const char*key, const char*value)
         this->config_drawonlyshapes = atoi(value);
     } else if(!strcmp(key,"extrafontdata")) {
         this->config_extrafontdata = atoi(value);
+    } else if(!strcmp(key,"linkdatafile")) {
+        this->config_linkdatafile = strdup(value);
     } else if(!strcmp(key,"convertgradients")) {
         this->config_convertgradients = atoi(value);
     } else if(!strcmp(key,"multiply")) {
@@ -1633,6 +1658,12 @@ void GFXOutputDev::startPage(int pageNum, GfxState *state, double crop_x1, doubl
     states[statepos].dashStart = 0;
     
     this->last_char_gfxfont = 0;
+	
+    if(this->config_linkdatafile) {
+	FILE*fi = fopen(config_linkdatafile, "ab+");
+	fprintf(fi, "[page %d]\n", pageNum);
+	fclose(fi);
+    }
 }
 
 
@@ -1821,8 +1852,13 @@ void GFXOutputDev::processLink(Link *link, Catalog *catalog)
     else if(s)
     {
         device->drawlink(device, points, s);
+	if(this->config_linkdatafile) {
+	    FILE*fi = fopen(config_linkdatafile, "ab+");
+	    fprintf(fi, "%s\n", s);
+	    fclose(fi);
+	}
     }
-
+        
     msg("<verbose> \"%s\" link to \"%s\" (%d)", type, FIXNULL(s), page);
     free(s);s=0;
 }