X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=pdf2swf%2FSWFOutputDev.cc;h=1af448c4b96e3e9ecde3d008856192a4382ec8e2;hb=a5919d0134bcf5cbd0efee83baf175f002766864;hp=73711af52ae00c54c6fe480e09057e0839d53a4c;hpb=41e2677f86bb98be45f5cf8d82abbb3b95e5f043;p=swftools.git

diff --git a/pdf2swf/SWFOutputDev.cc b/pdf2swf/SWFOutputDev.cc
index 73711af..1af448c 100644
--- a/pdf2swf/SWFOutputDev.cc
+++ b/pdf2swf/SWFOutputDev.cc
@@ -22,7 +22,6 @@
 #include <stddef.h>
 #include <string.h>
 #include <unistd.h>
-#include <math.h>
 //xpdf header files
 #include "gfile.h"
 #include "GString.h"
@@ -49,6 +48,10 @@ extern "C" {
 #include "ttf2pt1.h"
 }
 
+#define logf logarithmf // logf is also used by ../lib/log.h
+#include <math.h>
+#undef logf
+
 static PDFDoc*doc = 0;
 static char* swffilename = 0;
 int numpages;
@@ -575,6 +578,7 @@ void SWFOutputDev::beginString(GfxState *state, GString *s)
 }
 
 int charcounter = 0;
+int ciderror = 0;
 void SWFOutputDev::drawChar(GfxState *state, double x, double y,
 			double dx, double dy,
 			double originX, double originY,
@@ -587,7 +591,9 @@ void SWFOutputDev::drawChar(GfxState *state, double x, double y,
        GfxFont*font = state->getFont();
        Gfx8BitFont*font8;
        if(font->isCIDFont()) {
-	   logf("<error> CID Font");
+	   if(!ciderror)
+	    logf("<error> Not drawing CID Font characters!");
+	   ciderror++;
 	   return;
        }
        if(font->getType() == fontType3) {
@@ -819,6 +825,11 @@ int SWFOutputDev::searchT1Font(char*name)
     int i;
     int mapid=-1;
     char*filename=0;
+    
+    char*name2 = 0;
+    if(name) name2 = strchr(name,'+');
+    if(name2) name2++;
+
     for(i=0;i<sizeof(pdf2t1map)/sizeof(mapping);i++) 
     {
 	if(!strcmp(name, pdf2t1map[i].pdffont))
@@ -847,15 +858,20 @@ int SWFOutputDev::searchT1Font(char*name)
 		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;
+
+	    if(fontname) {
+		if((!strcmp(name, fontname)) || 
+		   (name2 && !strcmp(name2, 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)) {
+	    if(strstr(fontname, name) || (name2 && strstr(fontname,name2))) {
 		logf("<notice> Extra font %s is being used.\n", fontname);
 		return i;
 	    }