X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=pdf2swf%2FSWFOutputDev.cc;h=dc5ddad4932391084e25ebf9a31bac7055faaf32;hb=bbcfffddca05b2a29c2beaf0ed48038e5147f0b2;hp=66df8cc10b985317b6b810720421150360d238c1;hpb=bfe6d26dae79728ac4c2bab3358bc0aa7fe9bdf8;p=swftools.git

diff --git a/pdf2swf/SWFOutputDev.cc b/pdf2swf/SWFOutputDev.cc
index 66df8cc..dc5ddad 100644
--- a/pdf2swf/SWFOutputDev.cc
+++ b/pdf2swf/SWFOutputDev.cc
@@ -46,14 +46,10 @@
 #include "GlobalParams.h"
 //swftools header files
 #include "swfoutput.h"
-extern "C" {
 #include "../lib/log.h"
-#include "ttf2pt1.h"
-}
 
-#define logf logarithmf // logf is also used by ../lib/log.h
+#include "ttf2pt1.h"
 #include <math.h>
-#undef logf
 
 static PDFDoc*doc = 0;
 static char* swffilename = 0;
@@ -65,6 +61,8 @@ int*pages = 0;
 int pagebuflen = 0;
 int pagepos = 0;
 
+double caplinewidth = 3.0;
+
 static void printInfoString(Dict *infoDict, char *key, char *fmt);
 static void printInfoDate(Dict *infoDict, char *key, char *fmt);
 
@@ -146,7 +144,7 @@ public:
   void startDoc(XRef *xref);
 
   // Start a page.
-  virtual void startPage(int pageNum, GfxState *state) ;
+  virtual void startPage(int pageNum, GfxState *state, double x1, double y1, double x2, double y2) ;
 
   //----- link borders
   virtual void drawLink(Link *link, Catalog *catalog) ;
@@ -161,6 +159,8 @@ public:
   virtual void updateFillColor(GfxState *state);
   virtual void updateStrokeColor(GfxState *state);
   virtual void updateLineWidth(GfxState *state);
+  virtual void updateLineJoin(GfxState *state);
+  virtual void updateLineCap(GfxState *state);
   
   virtual void updateAll(GfxState *state) 
   {
@@ -168,6 +168,8 @@ public:
       updateFillColor(state);
       updateStrokeColor(state);
       updateLineWidth(state);
+      updateLineJoin(state);
+      updateLineCap(state);
   };
 
   //----- path painting
@@ -222,6 +224,22 @@ public:
   GfxState *laststate;
 };
 
+char*getFontName(GfxFont*font)
+{
+    GString*gstr = font->getName();
+    char* fontname = gstr==0?0:gstr->getCString();
+    if(fontname==0) {
+	char buf[32];
+	Ref*r=font->getID();
+	sprintf(buf, "UFONT%d", r->num);
+	return strdup(buf);
+    }
+    char* plus = strchr(fontname, '+');
+    if(plus && plus < &fontname[strlen(fontname)-1])
+	fontname = plus+1;
+    return fontname;
+}
+
 char mybuf[1024];
 char* gfxstate2str(GfxState *state)
 {
@@ -301,8 +319,8 @@ char* gfxstate2str(GfxState *state)
   if(state->getLineJoin()!=0)
   bufpos+=sprintf(bufpos,"ML%d ", state->getMiterLimit());
 
-  if(state->getFont() && state->getFont()->getName() && state->getFont()->getName()->getCString())
-  bufpos+=sprintf(bufpos,"F\"%s\" ",((state->getFont())->getName())->getCString());
+  if(state->getFont() && getFontName(state->getFont()))
+  bufpos+=sprintf(bufpos,"F\"%s\" ",getFontName(state->getFont()));
   bufpos+=sprintf(bufpos,"FS%.1f ", state->getFontSize());
   bufpos+=sprintf(bufpos,"MAT[%.1f/%.1f/%.1f/%.1f/%.1f/%.1f] ", state->getTextMat()[0],state->getTextMat()[1],state->getTextMat()[2],
 	                           state->getTextMat()[3],state->getTextMat()[4],state->getTextMat()[5]);
@@ -329,6 +347,8 @@ char* gfxstate2str(GfxState *state)
   return mybuf;
 }
 
+
+
 void dumpFontInfo(char*loglevel, GfxFont*font);
 int lastdumps[1024];
 int lastdumppos = 0;
@@ -348,53 +368,51 @@ void showFontError(GfxFont*font, int nr)
     if(lastdumppos<sizeof(lastdumps)/sizeof(int))
     lastdumps[lastdumppos++] = r->num;
     if(nr == 0)
-      logf("<warning> The following font caused problems:");
+      msg("<warning> The following font caused problems:");
     else if(nr == 1)
-      logf("<warning> The following font caused problems (substituting):");
+      msg("<warning> The following font caused problems (substituting):");
     else if(nr == 2)
-      logf("<warning> The following Type 3 Font will be rendered as bitmap:");
+      msg("<warning> The following Type 3 Font will be rendered as bitmap:");
     dumpFontInfo("<warning>", font);
 }
 
 void dumpFontInfo(char*loglevel, GfxFont*font)
 {
-  GString *gstr;
-  char*name = 0;
-  gstr = font->getName();
+  char* name = getFontName(font);
   Ref* r=font->getID();
-  logf("%s=========== %s (ID:%d,%d) ==========\n", loglevel, gstr?FIXNULL(gstr->getCString()):"(unknown font)", r->num,r->gen);
+  msg("%s=========== %s (ID:%d,%d) ==========\n", loglevel, name, r->num,r->gen);
 
-  gstr  = font->getTag();
-  if(gstr) 
-   logf("%sTag: %s\n", loglevel, FIXNULL(gstr->getCString()));
+  GString*gstr  = font->getTag();
+   
+  msg("%sTag: %s\n", loglevel, name);
   
-  if(font->isCIDFont()) logf("%sis CID font\n", loglevel);
+  if(font->isCIDFont()) msg("%sis CID font\n", loglevel);
 
   GfxFontType type=font->getType();
   switch(type) {
     case fontUnknownType:
-     logf("%sType: unknown\n",loglevel);
+     msg("%sType: unknown\n",loglevel);
     break;
     case fontType1:
-     logf("%sType: 1\n",loglevel);
+     msg("%sType: 1\n",loglevel);
     break;
     case fontType1C:
-     logf("%sType: 1C\n",loglevel);
+     msg("%sType: 1C\n",loglevel);
     break;
     case fontType3:
-     logf("%sType: 3\n",loglevel);
+     msg("%sType: 3\n",loglevel);
     break;
     case fontTrueType:
-     logf("%sType: TrueType\n",loglevel);
+     msg("%sType: TrueType\n",loglevel);
     break;
     case fontCIDType0:
-     logf("%sType: CIDType0\n",loglevel);
+     msg("%sType: CIDType0\n",loglevel);
     break;
     case fontCIDType0C:
-     logf("%sType: CIDType0C\n",loglevel);
+     msg("%sType: CIDType0C\n",loglevel);
     break;
     case fontCIDType2:
-     logf("%sType: CIDType2\n",loglevel);
+     msg("%sType: CIDType2\n",loglevel);
     break;
   }
   
@@ -403,18 +421,18 @@ void dumpFontInfo(char*loglevel, GfxFont*font)
   if(font->getEmbeddedFontName())
     name = font->getEmbeddedFontName()->getCString();
   if(embedded)
-   logf("%sEmbedded name: %s id: %d\n",loglevel, FIXNULL(name), embRef.num);
+   msg("%sEmbedded name: %s id: %d\n",loglevel, FIXNULL(name), embRef.num);
 
   gstr = font->getExtFontFile();
   if(gstr)
-   logf("%sExternal Font file: %s\n", loglevel, FIXNULL(gstr->getCString()));
+   msg("%sExternal Font file: %s\n", loglevel, FIXNULL(gstr->getCString()));
 
   // Get font descriptor flags.
-  if(font->isFixedWidth()) logf("%sis fixed width\n", loglevel);
-  if(font->isSerif()) logf("%sis serif\n", loglevel);
-  if(font->isSymbolic()) logf("%sis symbolic\n", loglevel);
-  if(font->isItalic()) logf("%sis italic\n", loglevel);
-  if(font->isBold()) logf("%sis bold\n", loglevel);
+  if(font->isFixedWidth()) msg("%sis fixed width\n", loglevel);
+  if(font->isSerif()) msg("%sis serif\n", loglevel);
+  if(font->isSymbolic()) msg("%sis symbolic\n", loglevel);
+  if(font->isItalic()) msg("%sis italic\n", loglevel);
+  if(font->isBold()) msg("%sis bold\n", loglevel);
 }
 
 //void SWFOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str, int width, int height, GBool invert, GBool inlineImg) {printf("void SWFOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str, int width, int height, GBool invert, GBool inlineImg) \n");}
@@ -442,6 +460,14 @@ T1_OUTLINE* gfxPath_to_T1_OUTLINE(GfxState*state, GfxPath*path)
     bezierpathsegment*outline = start = new bezierpathsegment();
     int cpos = 0;
     double lastx=0,lasty=0;
+    if(!num) {
+	msg("<warning> empty path");
+	outline->type = T1_PATHTYPE_MOVE;
+	outline->dest.x = 0;
+	outline->dest.y = 0;
+	outline->link = 0;
+	return (T1_OUTLINE*)outline;
+    }
     for(t = 0; t < num; t++) {
 	GfxSubpath *subpath = path->getSubpath(t);
 	int subnum = subpath->getNumPoints();
@@ -499,18 +525,46 @@ T1_OUTLINE* gfxPath_to_T1_OUTLINE(GfxState*state, GfxPath*path)
 
 void SWFOutputDev::stroke(GfxState *state) 
 {
-    logf("<debug> stroke\n");
+    msg("<debug> stroke\n");
     GfxPath * path = state->getPath();
+    int lineCap = state->getLineCap(); // 0=butt, 1=round 2=square
+    int lineJoin = state->getLineJoin(); // 0=miter, 1=round 2=bevel
+    double miterLimit = state->getMiterLimit();
+    double width = state->getTransformedLineWidth();
     struct swfmatrix m;
+    GfxRGB rgb;
+    double opaq = state->getStrokeOpacity();
+    state->getStrokeRGB(&rgb);
+
     m.m11 = 1; m.m21 = 0; m.m22 = 1;
     m.m12 = 0; m.m13 = 0; m.m23 = 0;
     T1_OUTLINE*outline = gfxPath_to_T1_OUTLINE(state, path);
-    swfoutput_setdrawmode(&output, DRAWMODE_STROKE);
-    swfoutput_drawpath(&output, outline, &m);
+
+    lineJoin = 1; // other line joins are not yet supported by the swf encoder
+                  // TODO: support bevel joints
+
+    if(((lineCap==1) && (lineJoin==1)) || width<=caplinewidth) {
+	/* FIXME- if the path is smaller than 2 segments, we could ignore
+	   lineJoin */
+	swfoutput_setdrawmode(&output, DRAWMODE_STROKE);
+	swfoutput_drawpath(&output, outline, &m);
+    } else {
+	swfoutput_setfillcolor(&output, (char)(rgb.r*255), (char)(rgb.g*255), 
+					(char)(rgb.b*255), (char)(opaq*255));
+
+	//swfoutput_setlinewidth(&output, 1.0); //only for debugging
+	//swfoutput_setstrokecolor(&output, 0, 255, 0, 255); //likewise, see below
+	//swfoutput_setfillcolor(&output, 255, 0, 0, 255); //likewise, see below
+
+	swfoutput_drawpath2poly(&output, outline, &m, lineJoin, lineCap, width, miterLimit);
+	updateLineWidth(state);  //reset
+	updateStrokeColor(state); //reset
+	updateFillColor(state);  //reset
+    }
 }
 void SWFOutputDev::fill(GfxState *state) 
 {
-    logf("<debug> fill\n");
+    msg("<debug> fill\n");
     GfxPath * path = state->getPath();
     struct swfmatrix m;
     m.m11 = 1; m.m21 = 0; m.m22 = 1;
@@ -521,7 +575,7 @@ void SWFOutputDev::fill(GfxState *state)
 }
 void SWFOutputDev::eoFill(GfxState *state) 
 {
-    logf("<debug> eofill\n");
+    msg("<debug> eofill\n");
     GfxPath * path = state->getPath();
     struct swfmatrix m;
     m.m11 = 1; m.m21 = 0; m.m22 = 1;
@@ -532,7 +586,7 @@ void SWFOutputDev::eoFill(GfxState *state)
 }
 void SWFOutputDev::clip(GfxState *state) 
 {
-    logf("<debug> clip\n");
+    msg("<debug> clip\n");
     GfxPath * path = state->getPath();
     struct swfmatrix m;
     m.m11 = 1; m.m22 = 1;
@@ -544,7 +598,7 @@ void SWFOutputDev::clip(GfxState *state)
 }
 void SWFOutputDev::eoClip(GfxState *state) 
 {
-    logf("<debug> eoclip\n");
+    msg("<debug> eoclip\n");
     GfxPath * path = state->getPath();
     struct swfmatrix m;
     m.m11 = 1; m.m21 = 0; m.m22 = 1;
@@ -561,19 +615,19 @@ SWFOutputDev::~SWFOutputDev()
 };
 GBool SWFOutputDev::upsideDown() 
 {
-    logf("<debug> upsidedown?");
+    msg("<debug> upsidedown?");
     return gTrue;
 };
 GBool SWFOutputDev::useDrawChar() 
 {
-    logf("<debug> usedrawchar?");
+    msg("<debug> usedrawchar?");
     return gTrue;
 }
 
 void SWFOutputDev::beginString(GfxState *state, GString *s) 
 { 
     double m11,m21,m12,m22;
-//    logf("<debug> %s beginstring \"%s\"\n", gfxstate2str(state), s->getCString());
+//    msg("<debug> %s beginstring \"%s\"\n", gfxstate2str(state), s->getCString());
     state->getFontTransMat(&m11, &m12, &m21, &m22);
     m11 *= state->getHorizScaling();
     m21 *= state->getHorizScaling();
@@ -586,8 +640,6 @@ void SWFOutputDev::drawChar(GfxState *state, double x, double y,
 			double originX, double originY,
 			CharCode c, Unicode *_u, int uLen)
 {
-    logf("<debug> drawChar(%f,%f,%f,%f,'%c')\n",x,y,dx,dy,c);
-    
     // check for invisible text -- this is used by Acrobat Capture
     if ((state->getRender() & 3) == 3)
 	return;
@@ -602,13 +654,16 @@ void SWFOutputDev::drawChar(GfxState *state, double x, double y,
     x1 = x;
     y1 = y;
     state->transform(x, y, &x1, &y1);
+	
+    Unicode u=0;
+    if(_u) 
+	u = *_u;
+    
+    msg("<debug> drawChar(%f,%f,%f,%f,'%c',%d) CID=%d\n",x,y,dx,dy,c,u, font->isCIDFont());
 
     if(font->isCIDFont()) {
 	GfxCIDFont*cfont = (GfxCIDFont*)font;
-	Unicode u=0;
 	char*name=0;
-	if(_u) 
-	    u = *_u;
 	if(u) {
 	    int t;
 	    for(t=0;t<sizeof(nameToUnicodeTab)/sizeof(nameToUnicodeTab[0]);t++)
@@ -618,13 +673,13 @@ void SWFOutputDev::drawChar(GfxState *state, double x, double y,
 		    break;
 		}
 	}
-/*	   printf("%02x %04x/%04x-%d \"%s\" %s %d\n", c,u, *_u, uLen, name, cfont->getName()->getCString(),
-		cfont->getType());*/
 
 	if(name)
 	   swfoutput_drawchar(&output, x1, y1, name, c);
-	else
-	   logf("<warning> couldn't get name for CID character %02x from Encoding", c);
+	else {
+	   msg("<warning> couldn't get name for CID character %02x from Encoding", c);
+	   swfoutput_drawchar(&output, x1, y1, "<unknown>", c);
+	}
     } else {
 	Gfx8BitFont*font8;
 	font8 = (Gfx8BitFont*)font;
@@ -633,21 +688,22 @@ void SWFOutputDev::drawChar(GfxState *state, double x, double y,
 	if(enc && enc[c])
 	   swfoutput_drawchar(&output, x1, y1, enc[c], c);
 	else {
-	   logf("<warning> couldn't get name for character %02x from Encoding", c);
+	   msg("<warning> couldn't get name for character %02x from Encoding", c);
+	   swfoutput_drawchar(&output, x1, y1, "<unknown>", c);
 	}
     }
 }
 
 void SWFOutputDev::endString(GfxState *state) 
 { 
-    logf("<debug> endstring\n");
+    msg("<debug> endstring\n");
 }    
 
  
 GBool SWFOutputDev::beginType3Char(GfxState *state,
 			       CharCode code, Unicode *u, int uLen)
 {
-    logf("<debug> beginType3Char %d, %08x, %d", code, *u, uLen);
+    msg("<debug> beginType3Char %d, %08x, %d", code, *u, uLen);
     type3active = 1;
     /* the character itself is going to be passed using
        drawImageMask() */
@@ -657,20 +713,31 @@ GBool SWFOutputDev::beginType3Char(GfxState *state,
 void SWFOutputDev::endType3Char(GfxState *state)
 {
     type3active = 0;
-    logf("<debug> endType3Char");
+    msg("<debug> endType3Char");
 }
 
-void SWFOutputDev::startPage(int pageNum, GfxState *state) 
+void SWFOutputDev::startPage(int pageNum, GfxState *state, double crop_x1, double crop_y1, double crop_x2, double crop_y2) 
 {
   double x1,y1,x2,y2;
   laststate = state;
-  logf("<debug> startPage %d\n", pageNum);
-  logf("<notice> processing page %d", pageNum);
+  msg("<verbose> startPage %d (%f,%f,%f,%f)\n", pageNum, crop_x1, crop_y1, crop_x2, crop_y2);
+  msg("<notice> processing page %d", pageNum);
 
-  state->transform(state->getX1(),state->getY1(),&x1,&y1);
+  /* state->transform(state->getX1(),state->getY1(),&x1,&y1);
   state->transform(state->getX2(),state->getY2(),&x2,&y2);
+  Use CropBox, not MediaBox, as page size
+  */
+  x1 = crop_x1;
+  y1 = crop_y1;
+  x2 = crop_x2;
+  y2 = crop_y2;
+
+  if(x2<x1) {double x3=x1;x1=x2;x2=x3;}
+  if(y2<y1) {double y3=y1;y1=y2;y2=y3;}
+
   if(!outputstarted) {
-    swfoutput_init(&output, swffilename, abs((int)(x2-x1)),abs((int)(y2-y1)));
+    msg("<verbose> Bounding box is (%f,%f)-(%f,%f)", x1,y1,x2,y2);
+    swfoutput_init(&output, swffilename,(int)x1,(int)y1,(int)x2,(int)y2);
     outputstarted = 1;
   }
   else
@@ -679,7 +746,7 @@ void SWFOutputDev::startPage(int pageNum, GfxState *state)
 
 void SWFOutputDev::drawLink(Link *link, Catalog *catalog) 
 {
-  logf("<debug> drawlink\n");
+  msg("<debug> drawlink\n");
   double x1, y1, x2, y2, w;
   GfxRGB rgb;
   swfcoord points[5];
@@ -793,13 +860,13 @@ void SWFOutputDev::drawLink(Link *link, Catalog *catalog)
 	}
         break;
 	default: {
-	    logf("<error> Unknown link type!\n");
+	    msg("<error> Unknown link type!\n");
 	    break;
 	}
     }
     if(!linkinfo && (page || url))
     {
-	logf("<notice> File contains links");
+	msg("<notice> File contains links");
 	linkinfo = 1;
     }
     if(page>0)
@@ -819,22 +886,22 @@ void SWFOutputDev::drawLink(Link *link, Catalog *catalog)
     {
 	swfoutput_namedlink(&output, named, points);
     }
-    logf("<verbose> \"%s\" link to \"%s\" (%d)\n", type, FIXNULL(s), page);
+    msg("<verbose> \"%s\" link to \"%s\" (%d)\n", type, FIXNULL(s), page);
   }
 }
 
 void SWFOutputDev::saveState(GfxState *state) {
-  logf("<debug> saveState\n");
+  msg("<debug> saveState\n");
   updateAll(state);
   if(clippos<64)
     clippos ++;
   else
-    logf("<error> Too many nested states in pdf.");
+    msg("<error> Too many nested states in pdf.");
   clipping[clippos] = 0;
 };
 
 void SWFOutputDev::restoreState(GfxState *state) {
-  logf("<debug> restoreState\n");
+  msg("<debug> restoreState\n");
   updateAll(state);
   while(clipping[clippos]) {
       swfoutput_endclip(&output);
@@ -850,6 +917,8 @@ int SWFOutputDev::searchT1Font(char*name)
     int i;
     int mapid=-1;
     char*filename=0;
+	
+    msg("<verbose> SearchT1Font(%s)", name);
 
     for(i=0;i<sizeof(pdf2t1map)/sizeof(mapping);i++) 
     {
@@ -876,12 +945,12 @@ int SWFOutputDev::searchT1Font(char*name)
 	    if(!fontname) {
 		T1_LoadFont(i);
 		fontname = T1_GetFontName (i);
-		logf("<verbose> Loading extra font %s from %s\n", FIXNULL(fontname), 
+		msg("<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);
+		msg("<notice> Extra font %d, \"%s\" is being used.\n", i, fontname);
 		return i;
 	    }
 	    fontname = T1_GetFontFileName(i);
@@ -889,7 +958,7 @@ int SWFOutputDev::searchT1Font(char*name)
 		    fontname = strrchr(fontname,'/')+1;
  
 	    if(strstr(fontname, name)) {
-		logf("<notice> Extra font %s is being used.\n", fontname);
+		msg("<notice> Extra font %d, \"%s\" is being used.\n", i, fontname);
 		return i;
 	    }
 	}
@@ -903,6 +972,16 @@ void SWFOutputDev::updateLineWidth(GfxState *state)
     swfoutput_setlinewidth(&output, width);
 }
 
+void SWFOutputDev::updateLineCap(GfxState *state)
+{
+    int c = state->getLineCap();
+}
+
+void SWFOutputDev::updateLineJoin(GfxState *state)
+{
+    int j = state->getLineJoin();
+}
+
 void SWFOutputDev::updateFillColor(GfxState *state) 
 {
     GfxRGB rgb;
@@ -930,15 +1009,15 @@ char*SWFOutputDev::writeEmbeddedFontToFile(XRef*ref, GfxFont*font)
       int c;
       char *fontBuf;
       int fontLen;
-      Type1CFontFile *cvt;
       Ref embRef;
       Object refObj, strObj;
-      tmpFileName = "/tmp/tmpfont";
+      char namebuf[512];
+      tmpFileName = mktmpname(namebuf);
       int ret;
 
       ret = font->getEmbeddedFontID(&embRef);
       if(!ret) {
-	  logf("<verbose> Didn't get embedded font id");
+	  msg("<verbose> Didn't get embedded font id");
 	  /* not embedded- the caller should now search the font
 	     directories for this font */
 	  return 0;
@@ -946,19 +1025,31 @@ char*SWFOutputDev::writeEmbeddedFontToFile(XRef*ref, GfxFont*font)
 
       f = fopen(tmpFileName, "wb");
       if (!f) {
-	logf("<error> Couldn't create temporary Type 1 font file");
+	msg("<error> Couldn't create temporary Type 1 font file");
 	  return 0;
       }
-      if (font->getType() == fontType1C) {
+      if (font->getType() == fontType1C ||
+	  font->getType() == fontCIDType0C) {
 	if (!(fontBuf = font->readEmbFontFile(xref, &fontLen))) {
 	  fclose(f);
-	  logf("<error> Couldn't read embedded font file");
+	  msg("<error> Couldn't read embedded font file");
 	  return 0;
 	}
-	cvt = new Type1CFontFile(fontBuf, fontLen);
+	Type1CFontFile *cvt = new Type1CFontFile(fontBuf, fontLen);
 	cvt->convertToType1(f);
 	delete cvt;
 	gfree(fontBuf);
+      } else if(font->getType() == fontTrueType) {
+	msg("<verbose> writing font using TrueTypeFontFile::writeTTF");
+	if (!(fontBuf = font->readEmbFontFile(xref, &fontLen))) {
+	  fclose(f);
+	  msg("<error> Couldn't read embedded font file");
+	  return 0;
+	}
+	TrueTypeFontFile *cvt = new TrueTypeFontFile(fontBuf, fontLen);
+	cvt->writeTTF(f);
+	delete cvt;
+	gfree(fontBuf);
       } else {
 	font->getEmbeddedFontID(&embRef);
 	refObj.initRef(embRef.num, embRef.gen);
@@ -999,38 +1090,30 @@ char*SWFOutputDev::writeEmbeddedFontToFile(XRef*ref, GfxFont*font)
 	 font->getType() == fontCIDType2)
       {
 	  if(!ttfinfo) {
-	      logf("<notice> File contains TrueType fonts");
+	      msg("<notice> File contains TrueType fonts");
 	      ttfinfo = 1;
 	  }
-	  char name2[80];
+	  char name2[512];
 	  char*tmp;
 	  tmp = strdup(mktmpname((char*)name2));
 	  sprintf(name2, "%s", tmp);
-	  char*a[] = {"./ttf2pt1","-pttf","-b", tmpFileName, name2};
-	  logf("<verbose> Invoking ttf2pt1...");
-	  ttf2pt1_main(5,a);
+	  char*a[] = {"./ttf2pt1", "-W", "0",
+#ifndef USE_FREETYPE
+	      "-p", "ttf",
+#else
+	      "-p", "ft",
+#endif
+	      "-b", tmpFileName, name2};
+	  msg("<verbose> Invoking %s %s %s %s %s %s %s %s",a[0],a[1],a[2],a[3],a[4],a[5],a[6],a[7]);
+	  ttf2pt1_main(8,a);
 	  unlink(tmpFileName);
 	  sprintf(name2,"%s.pfb",tmp);
 	  tmpFileName = strdup(name2);
       }
 
-    return tmpFileName;
+    return strdup(tmpFileName);
 }
 
-char* gfxFontName(GfxFont* gfxFont)
-{
-      GString *gstr;
-      gstr = gfxFont->getName();
-      if(gstr) {
-	  return gstr->getCString();
-      }
-      else {
-	  char buf[32];
-	  Ref*r=gfxFont->getID();
-	  sprintf(buf, "UFONT%d", r->num);
-	  return strdup(buf);
-      }
-}
 
 char* substitutetarget[256];
 char* substitutesource[256];
@@ -1041,15 +1124,16 @@ char* SWFOutputDev::substituteFont(GfxFont*gfxFont, char* oldname)
 /* ------------------------------ V1 */
 
     char*fontname = "Times-Roman";
+    msg("<verbose> substituteFont(,%s)", FIXNULL(oldname));
     this->t1id = searchT1Font(fontname);
     if(substitutepos>=sizeof(substitutesource)/sizeof(char*)) {
-	logf("<fatal> Too many fonts in file.");
+	msg("<fatal> Too many fonts in file.");
 	exit(1);
     }
     if(oldname) {
 	substitutesource[substitutepos] = oldname;
 	substitutetarget[substitutepos] = fontname;
-	logf("<verbose> substituting %s -> %s", FIXNULL(oldname), FIXNULL(fontname));
+	msg("<notice> substituting %s -> %s", FIXNULL(oldname), FIXNULL(fontname));
 	substitutepos ++;
     }
     return fontname;
@@ -1131,13 +1215,13 @@ char* SWFOutputDev::substituteFont(GfxFont*gfxFont, char* oldname)
         this->t1id = searchT1Font(fontname);
       }
       if(substitutepos>=sizeof(substitutesource)/sizeof(char*)) {
-	  logf("<fatal> Too many fonts in file.");
+	  msg("<fatal> Too many fonts in file.");
 	  exit(1);
       }
       if(oldname) {
 	  substitutesource[substitutepos] = oldname;
 	  substitutetarget[substitutepos] = fontname;
-	  logf("<verbose> substituting %s -> %s", FIXNULL(oldname), FIXNULL(fontname));
+	  msg("<verbose> substituting %s -> %s", FIXNULL(oldname), FIXNULL(fontname));
 	  substitutepos ++;
       }
       return fontname;*/
@@ -1186,7 +1270,7 @@ void SWFOutputDev::updateFont(GfxState *state)
   if (!gfxFont) {
     return;
   }  
-  char * fontname = gfxFontName(gfxFont);
+  char * fontname = getFontName(gfxFont);
  
   int t;
   /* first, look if we substituted this font before-
@@ -1220,19 +1304,21 @@ void SWFOutputDev::updateFont(GfxState *state)
   GBool embedded = gfxFont->getEmbeddedFontID(&embRef);
   if(embedded) {
     if (gfxFont->getType() == fontType1 ||
+	gfxFont->getType() == fontCIDType0C ||
 	gfxFont->getType() == fontType1C ||
 	gfxFont->getType() == fontTrueType ||
-	gfxFont->getType() == fontCIDType2) 
+	gfxFont->getType() == fontCIDType2
+	)
     {
 	fileName = writeEmbeddedFontToFile(xref, gfxFont);
 	if(!fileName) {
-	  logf("<error> Couldn't write font to file");
+	  msg("<error> Couldn't write font to file");
 	  showFontError(gfxFont,0);
 	  return ;
 	}
 	this->t1id = T1_AddFont(fileName);
 	if(this->t1id<0) {
-	  logf("<error> Couldn't load font from file");
+	  msg("<error> Couldn't load font from file %s", fileName);
 	  showFontError(gfxFont,0);
 	  unlinkfont(fileName);
 	  return ;
@@ -1244,6 +1330,7 @@ void SWFOutputDev::updateFont(GfxState *state)
 	   font directories */
 	int newt1id = searchT1Font(fontname);
 	if(newt1id<0) {
+	    msg("<error> Couldn't find any suitable replacement for %s",fontname);
 	    showFontError(gfxFont,0);
 	    fontname = substituteFont(gfxFont, fontname);
 	} else
@@ -1253,16 +1340,20 @@ void SWFOutputDev::updateFont(GfxState *state)
     if(fontname) {
 	int newt1id = searchT1Font(fontname);
 	if(newt1id<0) {
+	    showFontError(gfxFont,1);
 	    fontname = substituteFont(gfxFont, fontname);
 	} else
 	    this->t1id = newt1id;
     }
-    else
+    else {
+	showFontError(gfxFont,1);
 	fontname = substituteFont(gfxFont, fontname);
+    }
   }
 
   if(t1id<0) {
-      showFontError(gfxFont,0);
+      msg("<error> Current font's t1id is %d", t1id);
+      //showFontError(gfxFont,0);
       return;
   }
  
@@ -1274,7 +1365,7 @@ void SWFOutputDev::updateFont(GfxState *state)
       return;
   }
 
-  logf("<verbose> Creating new SWF font: t1id: %d, filename: %s name:%s", this->t1id, FIXNULL(fileName), FIXNULL(fontname));
+  msg("<verbose> Creating new SWF font: t1id: %d, filename: %s name:%s", this->t1id, FIXNULL(fileName), FIXNULL(fontname));
   swfoutput_setfont(&output, fontname, this->t1id, fileName);
   if(fileName)
       unlinkfont(fileName);
@@ -1361,7 +1452,7 @@ void SWFOutputDev::drawGeneralImage(GfxState *state, Object *ref, Stream *str,
 
   if(!width || !height || (height<=1 && width<=1))
   {
-      logf("<verbose> Ignoring %d by %d image", width, height);
+      msg("<verbose> Ignoring %d by %d image", width, height);
       unsigned char buf[8];
       int x,y;
       for (y = 0; y < height; ++y)
@@ -1379,14 +1470,14 @@ void SWFOutputDev::drawGeneralImage(GfxState *state, Object *ref, Stream *str,
 
   if(!pbminfo && !(str->getKind()==strDCT)) {
       if(!type3active) {
-	  logf("<notice> file contains pbm pictures %s",mask?"(masked)":"");
+	  msg("<notice> file contains pbm pictures %s",mask?"(masked)":"");
 	  pbminfo = 1;
       }
       if(mask)
-      logf("<verbose> drawing %d by %d masked picture\n", width, height);
+      msg("<verbose> drawing %d by %d masked picture\n", width, height);
   }
   if(!jpeginfo && (str->getKind()==strDCT)) {
-      logf("<notice> file contains jpeg pictures");
+      msg("<notice> file contains jpeg pictures");
       jpeginfo = 1;
   }
 
@@ -1593,7 +1684,7 @@ void SWFOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str,
 				   int width, int height, GBool invert,
 				   GBool inlineImg) 
 {
-  logf("<verbose> drawImageMask %dx%d, invert=%d inline=%d", width, height, invert, inlineImg);
+  msg("<verbose> drawImageMask %dx%d, invert=%d inline=%d", width, height, invert, inlineImg);
   drawGeneralImage(state,ref,str,width,height,0,invert,inlineImg,1);
 }
 
@@ -1601,12 +1692,12 @@ void SWFOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
 			 int width, int height, GfxImageColorMap *colorMap,
 			 int *maskColors, GBool inlineImg)
 {
-  logf("<verbose> drawImage %dx%d, %s %s, inline=%d", width, height, 
+  msg("<verbose> drawImage %dx%d, %s %s, inline=%d", width, height, 
 	  colorMap?"colorMap":"no colorMap", 
 	  maskColors?"maskColors":"no maskColors",
 	  inlineImg);
   if(colorMap)
-      logf("<verbose> colorMap pixcomps:%d bits:%d mode:%d\n", colorMap->getNumPixelComps(),
+      msg("<verbose> colorMap pixcomps:%d bits:%d mode:%d\n", colorMap->getNumPixelComps(),
 	      colorMap->getBits(),colorMap->getColorSpace()->getMode());
   drawGeneralImage(state,ref,str,width,height,colorMap,0,inlineImg,0);
 }
@@ -1725,6 +1816,46 @@ void pdfswf_init(char*filename, char*userPassword)
   output->startDoc(doc->getXRef());
 }
 
+void pdfswf_setparameter(char*name, char*value)
+{
+    if(!strcmp(name, "drawonlyshapes")) {
+	drawonlyshapes = atoi(value);
+    } else if(!strcmp(name, "ignoredraworder")) {
+	ignoredraworder = atoi(value);
+    } else if(!strcmp(name, "linksopennewwindow")) {
+	opennewwindow = atoi(value);
+    } else if(!strcmp(name, "storeallcharacters")) {
+	storeallcharacters = atoi(value);
+    } else if(!strcmp(name, "enablezlib")) {
+	enablezlib = atoi(value);
+    } else if(!strcmp(name, "insertstop")) {
+	insertstoptag = atoi(value);
+    } else if(!strcmp(name, "flashversion")) {
+	flashversion = atoi(value);
+    } else if(!strcmp(name, "jpegquality")) {
+	int val = atoi(value);
+	if(val<0) val=0;
+	if(val>100) val=100;
+	jpegquality = val;
+    } else if(!strcmp(name, "outputfilename")) {
+	swffilename = value;
+    } else if(!strcmp(name, "caplinewidth")) {
+	caplinewidth = atof(value);
+    } else if(!strcmp(name, "splinequality")) {
+	int v = atoi(value);
+	v = 500-(v*5); // 100% = 0.25 pixel, 0% = 25 pixel
+	if(v<1) v = 1;
+	splinemaxerror = v;
+    } else if(!strcmp(name, "fontquality")) {
+	int v = atoi(value);
+	v = 500-(v*5); // 100% = 0.25 pixel, 0% = 25 pixel
+	if(v<1) v = 1;
+	fontsplinemaxerror = v;
+    } else {
+	fprintf(stderr, "unknown parameter: %s (=%s)\n", name, value);
+    }
+}
+
 void pdfswf_drawonlyshapes()
 {
     drawonlyshapes = 1;
@@ -1762,6 +1893,16 @@ void pdfswf_setoutputfilename(char*_filename)
     swffilename = _filename;
 }
 
+void pdfswf_insertstop()
+{
+    insertstoptag = 1;
+}
+
+void pdfswf_setversion(int n)
+{
+    flashversion = n;
+}
+
 
 void pdfswf_convertpage(int page)
 {
@@ -1793,21 +1934,10 @@ int pdfswf_numpages()
 {
   return doc->getNumPages();
 }
-
-void pdfswf_insertstop()
-{
-    insertstoptag = 1;
-}
-
-void pdfswf_setversion(int n)
-{
-    flashversion = n;
-}
-
 int closed=0;
 void pdfswf_close()
 {
-    logf("<debug> pdfswf.cc: pdfswf_close()");
+    msg("<debug> pdfswf.cc: pdfswf_close()");
     delete output;
     delete doc;
     //freeParams();