X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=pdf2swf%2FSWFOutputDev.cc;h=1bcd2712c49bee6cd1a3d15f1c83b5e1948cf25f;hb=a1479904a4fa6a6b572e10e7d137249ad8938007;hp=326f98b3e8f0eb7b86985d43a9549898077572e6;hpb=db81982982ba2a80f8c84a96251f726d3ca03dbd;p=swftools.git

diff --git a/pdf2swf/SWFOutputDev.cc b/pdf2swf/SWFOutputDev.cc
index 326f98b..1bcd271 100644
--- a/pdf2swf/SWFOutputDev.cc
+++ b/pdf2swf/SWFOutputDev.cc
@@ -767,8 +767,6 @@ char type3Warning=0;
 int SWFOutputDev::searchT1Font(char*name) 
 {	
     int i;
-    
-    int id=-1;
     int mapid=-1;
     char*filename=0;
     for(i=0;i<sizeof(pdf2t1map)/sizeof(mapping);i++) 
@@ -779,17 +777,41 @@ int SWFOutputDev::searchT1Font(char*name)
 	    mapid = i;
 	}
     }
-    if(filename)
-    for(i=0; i<T1_Get_no_fonts(); i++)
-    {
-	char*fontfilename = T1_GetFontFileName (i);
-	if(strstr(fontfilename, filename))
+    if(filename) {
+	for(i=0; i<T1_Get_no_fonts(); i++)
 	{
-		id = i;
-		pdf2t1map[i].id = mapid;
+	    char*fontfilename = T1_GetFontFileName (i);
+	    if(strstr(fontfilename, filename))
+	    {
+		    pdf2t1map[i].id = mapid;
+		    return i;
+	    }
+	}
+    } else {
+	for(i=0; i<T1_Get_no_fonts(); i++)
+	{
+	    char*fontname = T1_GetFontName (i);
+	    if(!fontname) {
+		T1_LoadFont(i);
+		fontname = T1_GetFontName (i);
+		logf("<verbose> Loading extra font %s from %s\n", FIXNULL(fontname), 
+								  FIXNULL(T1_GetFontFileName(i)));
+	    }
+	    if(fontname && !strcmp(name, fontname)) {
+		logf("<notice> Extra font %s is being used.\n", fontname);
+		return i;
+	    }
+	    fontname = T1_GetFontFileName(i);
+	    if(strrchr(fontname,'/'))
+		    fontname = strrchr(fontname,'/')+1;
+ 
+	    if(strstr(fontname, name)) {
+		logf("<notice> Extra font %s is being used.\n", fontname);
+		return i;
+	    }
 	}
     }
-    return id;
+    return -1;
 }
 
 void SWFOutputDev::updateLineWidth(GfxState *state)