fixed page52.pdf segfault (added null pointer handling to
[swftools.git] / pdf2swf / SWFOutputDev.cc
index 78be919..2728dcb 100644 (file)
 #include <stddef.h>
 #include <string.h>
 #include <unistd.h>
+#include "../config.h"
+#ifdef HAVE_DIRENT_H
+#include <dirent.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
+#ifdef HAVE_FONTCONFIG_H
+#include <fontconfig.h>
+#endif
 //xpdf header files
+#include "config.h"
 #include "gfile.h"
 #include "GString.h"
 #include "gmem.h"
 #include "Catalog.h"
 #include "Page.h"
 #include "PDFDoc.h"
-#include "Params.h"
 #include "Error.h"
-#include "config.h"
 #include "OutputDev.h"
 #include "GfxState.h"
 #include "GfxFont.h"
+#include "CharCodeToUnicode.h"
+#include "NameToUnicodeTable.h"
+#include "GlobalParams.h"
+//#define XPDF_101
+#ifdef XPDF_101
 #include "FontFile.h"
+#else
+#include "FoFiType1C.h"
+#include "FoFiTrueType.h"
+#endif
+#include "SWFOutputDev.h"
+
 //swftools header files
 #include "swfoutput.h"
-extern "C" {
 #include "../lib/log.h"
-#include "ttf2pt1.h"
-}
 
-static PDFDoc*doc = 0;
-static char* swffilename = 0;
-int numpages;
-int currentpage;
+#include <math.h>
+
+typedef struct _fontfile
+{
+    char*filename;
+    int used;
+} fontfile_t;
+
+// for pdfswf_addfont
+static fontfile_t fonts[2048];
+static int fontnum = 0;
+
+static int config_use_fontconfig = 1;
 
 // swf <-> pdf pages
-int*pages = 0;
-int pagebuflen = 0;
-int pagepos = 0;
+// TODO: move into pdf_doc_t
+static int*pages = 0;
+static int pagebuflen = 0;
+static int pagepos = 0;
+
+/* config */
+static double caplinewidth = 3.0;
+static int zoom = 72; /* xpdf: 86 */
+static int forceType0Fonts = 0;
 
 static void printInfoString(Dict *infoDict, char *key, char *fmt);
 static void printInfoDate(Dict *infoDict, char *key, char *fmt);
 
-double fontsizes[] = 
-{
- 0.833,0.833,0.889,0.889,
- 0.788,0.722,0.833,0.778,
- 0.600,0.600,0.600,0.600,
- 0.576,0.576,0.576,0.576,
- 0.733 //?
-};
-char*fontnames[]={
-"Helvetica",             
-"Helvetica-Bold",        
-"Helvetica-BoldOblique", 
-"Helvetica-Oblique",     
-"Times-Roman",           
-"Times-Bold",            
-"Times-BoldItalic",      
-"Times-Italic",          
-"Courier",               
-"Courier-Bold",          
-"Courier-BoldOblique",   
-"Courier-Oblique",       
-"Symbol",                
-"Symbol",                
-"Symbol",                
-"Symbol",
-"ZapfDingBats"
-};
-
 struct mapping {
     char*pdffont;
     char*filename;
-    int id;
 } pdf2t1map[] ={
-{"Times-Roman",           "n021003l.pfb"},
-{"Times-Italic",          "n021023l.pfb"},
-{"Times-Bold",            "n021004l.pfb"},
-{"Times-BoldItalic",      "n021024l.pfb"},
-{"Helvetica",             "n019003l.pfb"},
-{"Helvetica-Oblique",     "n019023l.pfb"},
-{"Helvetica-Bold",        "n019004l.pfb"},
-{"Helvetica-BoldOblique", "n019024l.pfb"},
-{"Courier",               "n022003l.pfb"},
-{"Courier-Oblique",       "n022023l.pfb"},
-{"Courier-Bold",          "n022004l.pfb"},
-{"Courier-BoldOblique",   "n022024l.pfb"},
-{"Symbol",                "s050000l.pfb"},
-{"ZapfDingbats",          "d050000l.pfb"}};
-
-class GfxState;
-class GfxImageColorMap;
+{"Times-Roman",           "n021003l"},
+{"Times-Italic",          "n021023l"},
+{"Times-Bold",            "n021004l"},
+{"Times-BoldItalic",      "n021024l"},
+{"Helvetica",             "n019003l"},
+{"Helvetica-Oblique",     "n019023l"},
+{"Helvetica-Bold",        "n019004l"},
+{"Helvetica-BoldOblique", "n019024l"},
+{"Courier",               "n022003l"},
+{"Courier-Oblique",       "n022023l"},
+{"Courier-Bold",          "n022004l"},
+{"Courier-BoldOblique",   "n022024l"},
+{"Symbol",                "s050000l"},
+{"ZapfDingbats",          "d050000l"}};
 
 class SWFOutputDev:  public OutputDev {
-  struct swfoutput output;
   int outputstarted;
+  struct swfoutput output;
 public:
 
   // Constructor.
@@ -123,6 +123,15 @@ public:
   // Destructor.
   virtual ~SWFOutputDev() ;
 
+  void setMove(int x,int y);
+  void setClip(int x1,int y1,int x2,int y2);
+  
+  int save(char*filename);
+  void  pagefeed();
+  void* getSWF();
+
+  void getDimensions(int*x1,int*y1,int*x2,int*y2);
+
   //----- get info about output device
 
   // Does this device use upside-down coordinates?
@@ -131,11 +140,18 @@ public:
 
   // Does this device use drawChar() or drawString()?
   virtual GBool useDrawChar();
+  
+  // Can this device draw gradients?
+  virtual GBool useGradients();
+  
+  virtual GBool interpretType3Chars() {return gTrue;}
 
   //----- initialization and control
 
+  void setXRef(PDFDoc*doc, 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) ;
@@ -150,6 +166,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) 
   {
@@ -157,6 +175,8 @@ public:
       updateFillColor(state);
       updateStrokeColor(state);
       updateLineWidth(state);
+      updateLineJoin(state);
+      updateLineCap(state);
   };
 
   //----- path painting
@@ -172,9 +192,9 @@ public:
   virtual void beginString(GfxState *state, GString *s) ;
   virtual void endString(GfxState *state) ;
   virtual void drawChar(GfxState *state, double x, double y,
-                       double dx, double dy, Guchar c) ;
-  virtual void drawChar16(GfxState *state, double x, double y,
-                         double dx, double dy, int c) ;
+                       double dx, double dy,
+                       double originX, double originY,
+                       CharCode code, Unicode *u, int uLen);
 
   //----- image drawing
   virtual void drawImageMask(GfxState *state, Object *ref, Stream *str,
@@ -182,7 +202,11 @@ public:
                             GBool inlineImg);
   virtual void drawImage(GfxState *state, Object *ref, Stream *str,
                         int width, int height, GfxImageColorMap *colorMap,
-                        GBool inlineImg);
+                        int *maskColors, GBool inlineImg);
+  
+  virtual GBool beginType3Char(GfxState *state,
+                              CharCode code, Unicode *u, int uLen);
+  virtual void endType3Char(GfxState *state);
 
   private:
   void drawGeneralImage(GfxState *state, Object *ref, Stream *str,
@@ -191,20 +215,179 @@ public:
   int clipping[64];
   int clippos;
 
-  int searchT1Font(char*name);
+  int currentpage;
+
+  PDFDoc*doc;
+  XRef*xref;
+
+  char* searchFont(char*name);
   char* substituteFont(GfxFont*gfxFont, char*oldname);
-  char* writeEmbeddedFontToFile(GfxFont*font);
+  char* writeEmbeddedFontToFile(XRef*ref, GfxFont*font);
   int t1id;
   int jpeginfo; // did we write "File contains jpegs" yet?
   int pbminfo; // did we write "File contains jpegs" yet?
   int linkinfo; // did we write "File contains links" yet?
   int ttfinfo; // did we write "File contains TrueType Fonts" yet?
+  int gradientinfo; // did we write "File contains Gradients yet?
+
+  int type3active; // are we between beginType3()/endType3()?
 
   GfxState *laststate;
+
+  int pic_xids[1024];
+  int pic_yids[1024];
+  int pic_ids[1024];
+  int pic_width[1024];
+  int pic_height[1024];
+  int picpos;
+  int pic_id;
+  char type3Warning;
+
+  char* substitutetarget[256];
+  char* substitutesource[256];
+  int substitutepos;
+
+  int user_movex,user_movey;
+  int user_clipx1,user_clipx2,user_clipy1,user_clipy2;
+};
+
+static char*getFontID(GfxFont*font);
+
+class InfoOutputDev:  public OutputDev 
+{
+  public:
+  int x1,y1,x2,y2;
+  int num_links;
+  int num_images;
+  int num_fonts;
+
+  InfoOutputDev() 
+  {
+      num_links = 0;
+      num_images = 0;
+      num_fonts = 0;
+  }
+  virtual ~InfoOutputDev() 
+  {
+  }
+  virtual GBool upsideDown() {return gTrue;}
+  virtual GBool useDrawChar() {return gTrue;}
+  virtual GBool useGradients() {return gTrue;}
+  virtual GBool interpretType3Chars() {return gTrue;}
+  virtual void startPage(int pageNum, GfxState *state, double crop_x1, double crop_y1, double crop_x2, double crop_y2)
+  {
+      double x1,y1,x2,y2;
+      state->transform(crop_x1,crop_y1,&x1,&y1);
+      state->transform(crop_x2,crop_y2,&x2,&y2);
+      if(x2<x1) {double x3=x1;x1=x2;x2=x3;}
+      if(y2<y1) {double y3=y1;y1=y2;y2=y3;}
+      this->x1 = (int)x1;
+      this->y1 = (int)y1;
+      this->x2 = (int)x2;
+      this->y2 = (int)y2;
+  }
+  virtual void drawLink(Link *link, Catalog *catalog) 
+  {
+      num_links++;
+  }
+  virtual void updateFont(GfxState *state) 
+  {
+      GfxFont*font = state->getFont();
+      if(!font)
+          return;
+      char*id = getFontID(font);
+      /* FIXME*/
+      num_fonts++;
+  }
+  virtual void drawImageMask(GfxState *state, Object *ref, Stream *str,
+                            int width, int height, GBool invert,
+                            GBool inlineImg) 
+  {
+      num_images++;
+  }
+  virtual void drawImage(GfxState *state, Object *ref, Stream *str,
+                        int width, int height, GfxImageColorMap *colorMap,
+                        int *maskColors, GBool inlineImg)
+  {
+      num_images++;
+  }
+};
+
+SWFOutputDev::SWFOutputDev()
+{
+    jpeginfo = 0;
+    ttfinfo = 0;
+    linkinfo = 0;
+    pbminfo = 0;
+    type3active = 0;
+    clippos = 0;
+    clipping[clippos] = 0;
+    outputstarted = 0;
+    xref = 0;
+    picpos = 0;
+    pic_id = 0;
+    substitutepos = 0;
+    type3Warning = 0;
+    user_movex = 0;
+    user_movey = 0;
+    user_clipx1 = 0;
+    user_clipy1 = 0;
+    user_clipx2 = 0;
+    user_clipy2 = 0;
+    memset(&output, 0, sizeof(output));
+//    printf("SWFOutputDev::SWFOutputDev() \n");
 };
+  
+void SWFOutputDev::setMove(int x,int y)
+{
+    this->user_movex = x;
+    this->user_movey = y;
+}
+
+void SWFOutputDev::setClip(int x1,int y1,int x2,int y2)
+{
+    if(x2<x1) {int x3=x1;x1=x2;x2=x3;}
+    if(y2<y1) {int y3=y1;y1=y2;y2=y3;}
+
+    this->user_clipx1 = x1;
+    this->user_clipy1 = y1;
+    this->user_clipx2 = x2;
+    this->user_clipy2 = y2;
+}
+void SWFOutputDev::getDimensions(int*x1,int*y1,int*x2,int*y2)
+{
+    return swfoutput_getdimensions(&output, x1,y1,x2,y2);
+}
+
+static char*getFontID(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);
+    }
+    return strdup(fontname);
+}
+
+static char*getFontName(GfxFont*font)
+{
+    char*fontid = getFontID(font);
+    char*fontname= 0;
+    char* plus = strchr(fontid, '+');
+    if(plus && plus < &fontid[strlen(fontid)-1]) {
+       fontname = strdup(plus+1);
+    } else {
+        fontname = strdup(fontid);
+    }
+    free(fontid);
+    return fontname;
+}
 
-char mybuf[1024];
-char* gfxstate2str(GfxState *state)
+static char mybuf[1024];
+static char* gfxstate2str(GfxState *state)
 {
   char*bufpos = mybuf;
   GfxRGB rgb;
@@ -282,8 +465,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() && getFontID(state->getFont()))
+  bufpos+=sprintf(bufpos,"F\"%s\" ",getFontID(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]);
@@ -310,109 +493,143 @@ char* gfxstate2str(GfxState *state)
   return mybuf;
 }
 
-void dumpFontInfo(char*loglevel, GfxFont*font);
-int lastdumps[1024];
-int lastdumppos = 0;
+static void dumpFontInfo(char*loglevel, GfxFont*font);
+static int lastdumps[1024];
+static int lastdumppos = 0;
 /* nr = 0  unknown
    nr = 1  substituting
    nr = 2  type 3
  */
-void showFontError(GfxFont*font, int nr) 
+static void showFontError(GfxFont*font, int nr) 
 {  
-    Ref r=font->getID();
+    Ref*r=font->getID();
     int t;
     for(t=0;t<lastdumppos;t++)
-       if(lastdumps[t] == r.num)
+       if(lastdumps[t] == r->num)
            break;
     if(t < lastdumppos)
       return;
     if(lastdumppos<sizeof(lastdumps)/sizeof(int))
-    lastdumps[lastdumppos++] = r.num;
+    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> This document contains Type 3 Fonts: (some text may be incorrectly displayed)");
+      msg("<warning> The following Type 3 Font will be rendered as bitmap:");
     dumpFontInfo("<warning>", font);
 }
 
-void dumpFontInfo(char*loglevel, GfxFont*font)
+static void dumpFontInfo(char*loglevel, GfxFont*font)
 {
-  GString *gstr;
-  char*name;
-  gstr = font->getName();
-  Ref r=font->getID();
-  logf("%s=========== %s (ID:%d,%d) ==========\n", loglevel, gstr?gstr->getCString():"(unknown font)", r.num,r.gen);
+  char* name = getFontID(font);
+  Ref* r=font->getID();
+  msg("%s=========== %s (ID:%d,%d) ==========\n", loglevel, getFontName(font), r->num,r->gen);
 
-  gstr  = font->getTag();
-  if(gstr) 
-   logf("%sTag: %s\n", loglevel, gstr->getCString());
-  if(font->is16Bit()) logf("%sis 16 bit\n", loglevel);
+  GString*gstr  = font->getTag();
+   
+  msg("%s| Tag: %s\n", loglevel, name);
+  
+  if(font->isCIDFont()) msg("%s| is CID font\n", loglevel);
 
   GfxFontType type=font->getType();
   switch(type) {
     case fontUnknownType:
-     logf("%sType: unknown\n",loglevel);
-    break;
-    case fontType0:
-     logf("%sType: 0\n",loglevel);
+     msg("%s| Type: unknown\n",loglevel);
     break;
     case fontType1:
-     logf("%sType: 1\n",loglevel);
+     msg("%s| Type: 1\n",loglevel);
     break;
     case fontType1C:
-     logf("%sType: 1C\n",loglevel);
+     msg("%s| Type: 1C\n",loglevel);
     break;
     case fontType3:
-     logf("%sType: 3\n",loglevel);
+     msg("%s| Type: 3\n",loglevel);
     break;
     case fontTrueType:
-     logf("%sType: TrueType\n",loglevel);
+     msg("%s| Type: TrueType\n",loglevel);
+    break;
+    case fontCIDType0:
+     msg("%s| Type: CIDType0\n",loglevel);
+    break;
+    case fontCIDType0C:
+     msg("%s| Type: CIDType0C\n",loglevel);
+    break;
+    case fontCIDType2:
+     msg("%s| Type: CIDType2\n",loglevel);
     break;
   }
   
   Ref embRef;
   GBool embedded = font->getEmbeddedFontID(&embRef);
-  name = font->getEmbeddedFontName();
+  if(font->getEmbeddedFontName())
+    name = font->getEmbeddedFontName()->getCString();
   if(embedded)
-   logf("%sEmbedded name: %s id: %d\n",loglevel, name, embRef.num);
+   msg("%s| Embedded name: %s id: %d\n",loglevel, FIXNULL(name), embRef.num);
 
   gstr = font->getExtFontFile();
   if(gstr)
-   logf("%sExternal Font file: %s\n", loglevel, gstr->getCString());
+   msg("%s| External 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("%s| is fixed width\n", loglevel);
+  if(font->isSerif()) msg("%s| is serif\n", loglevel);
+  if(font->isSymbolic()) msg("%s| is symbolic\n", loglevel);
+  if(font->isItalic()) msg("%s| is italic\n", loglevel);
+  if(font->isBold()) msg("%s| is 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");}
 //void SWFOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, GBool inlineImg) {printf("void SWFOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, GBool inlineImg) \n");}
 
-SWFOutputDev::SWFOutputDev() 
+static void free_outline(SWF_OUTLINE*outline)
 {
-    jpeginfo = 0;
-    ttfinfo = 0;
-    linkinfo = 0;
-    pbminfo = 0;
-    clippos = 0;
-    clipping[clippos] = 0;
-    outputstarted = 0;
-//    printf("SWFOutputDev::SWFOutputDev() \n");
-};
+    while(outline) {
+        SWF_OUTLINE*next = outline->link;
+        free(outline);
+        outline = next;
+    }
+}
 
-T1_OUTLINE* gfxPath_to_T1_OUTLINE(GfxState*state, GfxPath*path)
+static void dump_outline(SWF_OUTLINE*outline)
+{
+    double x=0,y=0;
+    while(outline) {
+        double lastx=x,lasty=y;
+        x += (outline->dest.x/(float)0xffff);
+        y += (outline->dest.y/(float)0xffff);
+        if(outline->type == SWF_PATHTYPE_MOVE) {
+            msg("<trace> | moveto %f,%f", x,y);
+        } else if(outline->type == SWF_PATHTYPE_LINE) {
+            msg("<trace> | lineto: %f,%f\n",x,y);
+        } else if(outline->type == SWF_PATHTYPE_BEZIER) {
+            SWF_BEZIERSEGMENT*o2 = (SWF_BEZIERSEGMENT*)outline;
+            float x1 = o2->C.x/(float)0xffff+lastx;
+            float y1 = o2->C.y/(float)0xffff+lasty;
+            float x2 = o2->B.x/(float)0xffff+lastx;
+            float y2 = o2->B.y/(float)0xffff+lasty;
+            msg("<trace> | spline: %f,%f -> %f,%f -> %f,%f\n",x1,y1,x2,y2,x,y);
+        } 
+        outline = outline->link;
+    }
+}
+
+SWF_OUTLINE* gfxPath_to_SWF_OUTLINE(GfxState*state, GfxPath*path)
 {
     int num = path->getNumSubpaths();
     int s,t;
     bezierpathsegment*start,*last=0;
-    bezierpathsegment*outline = start = new bezierpathsegment();
+    bezierpathsegment*outline = start = (bezierpathsegment*)malloc(sizeof(bezierpathsegment));
     int cpos = 0;
     double lastx=0,lasty=0;
+    if(!num) {
+       msg("<warning> empty path");
+       outline->type = SWF_PATHTYPE_MOVE;
+       outline->dest.x = 0;
+       outline->dest.y = 0;
+       outline->link = 0;
+       return (SWF_OUTLINE*)outline;
+    }
     for(t = 0; t < num; t++) {
        GfxSubpath *subpath = path->getSubpath(t);
        int subnum = subpath->getNumPoints();
@@ -425,10 +642,10 @@ T1_OUTLINE* gfxPath_to_T1_OUTLINE(GfxState*state, GfxPath*path)
           if(s==0) 
           {
                last = outline;
-               outline->type = T1_PATHTYPE_MOVE;
+               outline->type = SWF_PATHTYPE_MOVE;
                outline->dest.x = x;
                outline->dest.y = y;
-               outline->link = (T1_OUTLINE*)new bezierpathsegment();
+               outline->link = (SWF_OUTLINE*)malloc(sizeof(bezierpathsegment));
                outline = (bezierpathsegment*)outline->link;
                cpos = 0;
                lastx = nx;
@@ -451,9 +668,8 @@ T1_OUTLINE* gfxPath_to_T1_OUTLINE(GfxState*state, GfxPath*path)
                last = outline;
                outline->dest.x = x;
                outline->dest.y = y;
-               outline->type = cpos?T1_PATHTYPE_BEZIER:T1_PATHTYPE_LINE;
-               outline->link = 0;
-               outline->link = (T1_OUTLINE*)new bezierpathsegment();
+               outline->type = cpos?SWF_PATHTYPE_BEZIER:SWF_PATHTYPE_LINE;
+               outline->link = (SWF_OUTLINE*)malloc(sizeof(bezierpathsegment));
                outline = (bezierpathsegment*)outline->link;
                cpos = 0;
                lastx = nx;
@@ -461,8 +677,10 @@ T1_OUTLINE* gfxPath_to_T1_OUTLINE(GfxState*state, GfxPath*path)
           }
        }
     }
+    if(last->link) {free(last->link);}
     last->link = 0;
-    return (T1_OUTLINE*)start;
+
+    return (SWF_OUTLINE*)start;
 }
 /*----------------------------------------------------------------------------
  * Primitive Graphic routines
@@ -470,59 +688,130 @@ T1_OUTLINE* gfxPath_to_T1_OUTLINE(GfxState*state, GfxPath*path)
 
 void SWFOutputDev::stroke(GfxState *state) 
 {
-    logf("<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);
+    SWF_OUTLINE*outline = gfxPath_to_SWF_OUTLINE(state, path);
+    
+    if(getLogLevel() >= LOGLEVEL_TRACE)  {
+        msg("<trace> stroke\n");
+        dump_outline(outline);
+    }
+
+    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
+    }
+    free_outline(outline);
 }
 void SWFOutputDev::fill(GfxState *state) 
 {
-    logf("<debug> fill\n");
     GfxPath * path = state->getPath();
     struct swfmatrix m;
     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);
+    SWF_OUTLINE*outline = gfxPath_to_SWF_OUTLINE(state, path);
+
+    if(getLogLevel() >= LOGLEVEL_TRACE)  {
+        msg("<trace> fill\n");
+        dump_outline(outline);
+    }
+
     swfoutput_setdrawmode(&output, DRAWMODE_FILL);
     swfoutput_drawpath(&output, outline, &m);
+    free_outline(outline);
 }
 void SWFOutputDev::eoFill(GfxState *state) 
 {
-    logf("<debug> eofill\n");
     GfxPath * path = state->getPath();
     struct swfmatrix m;
     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);
+    SWF_OUTLINE*outline = gfxPath_to_SWF_OUTLINE(state, path);
+
+    if(getLogLevel() >= LOGLEVEL_TRACE)  {
+        msg("<trace> eofill\n");
+        dump_outline(outline);
+    }
+
     swfoutput_setdrawmode(&output, DRAWMODE_EOFILL);
     swfoutput_drawpath(&output, outline, &m);
+    free_outline(outline);
 }
 void SWFOutputDev::clip(GfxState *state) 
 {
-    logf("<debug> clip\n");
     GfxPath * path = state->getPath();
     struct swfmatrix m;
     m.m11 = 1; m.m22 = 1;
     m.m12 = 0; m.m21 = 0; 
     m.m13 = 0; m.m23 = 0;
-    T1_OUTLINE*outline = gfxPath_to_T1_OUTLINE(state, path);
+    SWF_OUTLINE*outline = gfxPath_to_SWF_OUTLINE(state, path);
+
+    if(getLogLevel() >= LOGLEVEL_TRACE)  {
+        msg("<trace> clip\n");
+        dump_outline(outline);
+    }
+
     swfoutput_startclip(&output, outline, &m);
     clipping[clippos] ++;
+    free_outline(outline);
 }
 void SWFOutputDev::eoClip(GfxState *state) 
 {
-    logf("<debug> eoclip\n");
     GfxPath * path = state->getPath();
     struct swfmatrix m;
     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);
+    SWF_OUTLINE*outline = gfxPath_to_SWF_OUTLINE(state, path);
+
+    if(getLogLevel() >= LOGLEVEL_TRACE)  {
+        msg("<trace> eoclip\n");
+        dump_outline(outline);
+    }
+
     swfoutput_startclip(&output, outline, &m);
     clipping[clippos] ++;
+    free_outline(outline);
+}
+
+/* pass through functions for swf_output */
+int SWFOutputDev::save(char*filename)
+{
+    return swfoutput_save(&output, filename);
+}
+void SWFOutputDev::pagefeed()
+{
+    swfoutput_pagefeed(&output);
+}
+void* SWFOutputDev::getSWF()
+{
+    return (void*)swfoutput_get(&output);
 }
 
 SWFOutputDev::~SWFOutputDev() 
@@ -532,84 +821,170 @@ SWFOutputDev::~SWFOutputDev()
 };
 GBool SWFOutputDev::upsideDown() 
 {
-    logf("<debug> upsidedown?");
+    msg("<debug> upsidedown? yes");
     return gTrue;
 };
 GBool SWFOutputDev::useDrawChar() 
 {
-    logf("<debug> usedrawchar?");
+    return gTrue;
+}
+GBool SWFOutputDev::useGradients()
+{
+    if(!gradientinfo)
+    {
+       msg("<notice> File contains gradients");
+       gradientinfo = 1;
+    }
     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();
     swfoutput_setfontmatrix(&output, m11, -m21, m12, -m22);
 }
 
-int charcounter = 0;
-void SWFOutputDev::drawChar(GfxState *state, double x, double y, double dx, double dy, Guchar c) 
+void SWFOutputDev::drawChar(GfxState *state, double x, double y,
+                       double dx, double dy,
+                       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)
-    {
-       FontEncoding*enc=state->getFont()->getEncoding();
+    if ((state->getRender() & 3) == 3)
+       return;
+    Gushort *CIDToGIDMap = 0;
+    GfxFont*font = state->getFont();
+
+    if(font->getType() == fontType3) {
+       /* type 3 chars are passed as graphics */
+       return;
+    }
+    double x1,y1;
+    x1 = x;
+    y1 = y;
+    state->transform(x, y, &x1, &y1);
+    
+    Unicode u=0;
+    char*name=0;
+
+    if(_u && uLen) {
+       u = *_u;
+       if (u) {
+           int t;
+           /* find out char name from unicode index 
+              TODO: should be precomputed
+            */
+           for(t=0;t<sizeof(nameToUnicodeTab)/sizeof(nameToUnicodeTab[0]);t++) {
+               if(nameToUnicodeTab[t].u == u) {
+                   name = nameToUnicodeTab[t].name;
+                   break;
+               }
+           }
+       }
+    }
 
-       double x1,y1;
-       x1 = x;
-       y1 = y;
-       state->transform(x, y, &x1, &y1);
+    if(font->isCIDFont()) {
+       GfxCIDFont*cfont = (GfxCIDFont*)font;
 
-       if(enc->getCharName(c))
-         swfoutput_drawchar(&output, x1, y1, enc->getCharName(c), c);
-       else
-         logf("<warning> couldn't get name for character %02x from Encoding", c);
+       if(font->getType() == fontCIDType2) {
+           CIDToGIDMap = cfont->getCIDToGID();
+       }
+    } else {
+       Gfx8BitFont*font8;
+       font8 = (Gfx8BitFont*)font;
+       char**enc=font8->getEncoding();
+       if(enc && enc[c])
+          name = enc[c];
+    }
+    if (CIDToGIDMap) {
+       msg("<debug> drawChar(%f, %f, c='%c' (%d), GID=%d, u=%d <%d>) CID=%d name=\"%s\"\n", x, y, (c&127)>=32?c:'?', c, CIDToGIDMap[c], u, uLen, font->isCIDFont(), FIXNULL(name));
+       swfoutput_drawchar(&output, x1, y1, name, CIDToGIDMap[c], u);
+    } else {
+       msg("<debug> drawChar(%f,%f,c='%c' (%d), u=%d <%d>) CID=%d name=\"%s\"\n",x,y,(c&127)>=32?c:'?',c,u, uLen, font->isCIDFont(), FIXNULL(name));
+       swfoutput_drawchar(&output, x1, y1, name, c, u);
     }
 }
 
-void SWFOutputDev::drawChar16(GfxState *state, double x, double y, double dx, double dy, int c) 
+void SWFOutputDev::endString(GfxState *state) { 
+}    
+
+GBool SWFOutputDev::beginType3Char(GfxState *state,
+                              CharCode code, Unicode *u, int uLen)
 {
-    printf("<error> drawChar16(%f,%f,%f,%f,%08x)\n",x,y,dx,dy,c);
-    exit(1);
+    msg("<debug> beginType3Char %d, %08x, %d", code, *u, uLen);
+    type3active = 1;
+    /* the character itself is going to be passed using
+       drawImageMask() */
+    return gFalse; /* gTrue= is_in_cache? */
 }
 
-void SWFOutputDev::endString(GfxState *state) 
-{ 
-    logf("<debug> endstring\n");
-}    
+void SWFOutputDev::endType3Char(GfxState *state)
+{
+    type3active = 0;
+    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);
+    this->currentpage = pageNum;
+    double x1,y1,x2,y2;
+    int rot = doc->getPageRotate(1);
+    laststate = state;
+    msg("<verbose> startPage %d (%f,%f,%f,%f)\n", pageNum, crop_x1, crop_y1, crop_x2, crop_y2);
+    if(rot!=0)
+        msg("<verbose> page is rotated %d degrees\n", rot);
+
+    /* 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;*/
+    state->transform(crop_x1,crop_y1,&x1,&y1);
+    state->transform(crop_x2,crop_y2,&x2,&y2);
+
+    if(x2<x1) {double x3=x1;x1=x2;x2=x3;}
+    if(y2<y1) {double y3=y1;y1=y2;y2=y3;}
+
+    /* apply user clip box */
+    if(user_clipx1|user_clipy1|user_clipx2|user_clipy2) {
+        /*if(user_clipx1 > x1)*/ x1 = user_clipx1;
+        /*if(user_clipx2 < x2)*/ x2 = user_clipx2;
+        /*if(user_clipy1 > y1)*/ y1 = user_clipy1;
+        /*if(user_clipy2 < y2)*/ y2 = user_clipy2;
+    }
 
-  state->transform(state->getX1(),state->getY1(),&x1,&y1);
-  state->transform(state->getX2(),state->getY2(),&x2,&y2);
-  if(!outputstarted) {
-    swfoutput_init(&output, swffilename, abs((int)(x2-x1)),abs((int)(y2-y1)));
-    outputstarted = 1;
-  }
-  else
-    swfoutput_newpage(&output);
+    if(!outputstarted) {
+        msg("<verbose> Bounding box is (%f,%f)-(%f,%f)", x1,y1,x2,y2);
+        swfoutput_init(&output);
+        outputstarted = 1;
+    }
+      
+    swfoutput_newpage(&output, pageNum, user_movex, user_movey, (int)x1, (int)y1, (int)x2, (int)y2);
 }
 
 void SWFOutputDev::drawLink(Link *link, Catalog *catalog) 
 {
-  double x1, y1, x2, y2, w;
-  GfxRGB rgb;
-  swfcoord points[5];
-  int x, y;
-
-  link->getBorder(&x1, &y1, &x2, &y2, &w);
-//  if (w > 0) 
-  {
+    msg("<debug> drawlink\n");
+    double x1, y1, x2, y2, w;
+    GfxRGB rgb;
+    swfcoord points[5];
+    int x, y;
+
+#ifdef XPDF_101
+    link->getBorder(&x1, &y1, &x2, &y2, &w);
+#else
+    link->getRect(&x1, &y1, &x2, &y2);
+#endif
     rgb.r = 0;
     rgb.g = 0;
     rgb.b = 1;
@@ -628,132 +1003,138 @@ void SWFOutputDev::drawLink(Link *link, Catalog *catalog)
 
     LinkAction*action=link->getAction();
     char buf[128];
-    char*s = "-?-";
+    char*s = 0;
     char*type = "-?-";
     char*url = 0;
     char*named = 0;
     int page = -1;
     switch(action->getKind())
     {
-       case actionGoTo: {
-           type = "GoTo";
-           LinkGoTo *ha=(LinkGoTo *)link->getAction();
-           LinkDest *dest=NULL;
-           if (ha->getDest()==NULL) 
-               dest=catalog->findDest(ha->getNamedDest());
-           else dest=ha->getDest();
-           if (dest){ 
-             if (dest->isPageRef()){
-               Ref pageref=dest->getPageRef();
-               page=catalog->findPage(pageref.num,pageref.gen);
-             }
-             else  page=dest->getPageNum();
-             sprintf(buf, "%d", page);
-             s = buf;
-           }
-       }
+        case actionGoTo: {
+            type = "GoTo";
+            LinkGoTo *ha=(LinkGoTo *)link->getAction();
+            LinkDest *dest=NULL;
+            if (ha->getDest()==NULL) 
+                dest=catalog->findDest(ha->getNamedDest());
+            else dest=ha->getDest();
+            if (dest){ 
+              if (dest->isPageRef()){
+                Ref pageref=dest->getPageRef();
+                page=catalog->findPage(pageref.num,pageref.gen);
+              }
+              else  page=dest->getPageNum();
+              sprintf(buf, "%d", page);
+              s = strdup(buf);
+            }
+        }
         break;
-       case actionGoToR: {
-           type = "GoToR";
-           LinkGoToR*l = (LinkGoToR*)action;
-           GString*g = l->getNamedDest();
-           if(g)
-            s = g->getCString();
-       }
+        case actionGoToR: {
+            type = "GoToR";
+            LinkGoToR*l = (LinkGoToR*)action;
+            GString*g = l->getNamedDest();
+            if(g)
+             s = strdup(g->getCString());
+        }
         break;
-       case actionNamed: {
-           type = "Named";
-           LinkNamed*l = (LinkNamed*)action;
-           GString*name = l->getName();
-           if(name) {
-             s = name->lowerCase()->getCString();
-             named = name->getCString();
-             if(strstr(s, "next") || strstr(s, "forward"))
-             {
-                 page = currentpage + 1;
-             }
-             else if(strstr(s, "prev") || strstr(s, "back"))
-             {
-                 page = currentpage - 1;
-             }
-             else if(strstr(s, "last") || strstr(s, "end"))
-             {
-                 page = pages[pagepos-1]; //:)
-             }
-             else if(strstr(s, "first") || strstr(s, "top"))
-             {
-                 page = 1;
-             }
-           }
-       }
+        case actionNamed: {
+            type = "Named";
+            LinkNamed*l = (LinkNamed*)action;
+            GString*name = l->getName();
+            if(name) {
+                s = strdup(name->lowerCase()->getCString());
+                named = name->getCString();
+                if(!strchr(s,':')) 
+                {
+                    if(strstr(s, "next") || strstr(s, "forward"))
+                    {
+                        page = currentpage + 1;
+                    }
+                    else if(strstr(s, "prev") || strstr(s, "back"))
+                    {
+                        page = currentpage - 1;
+                    }
+                    else if(strstr(s, "last") || strstr(s, "end"))
+                    {
+                        page = pagepos>0?pages[pagepos-1]:0;
+                    }
+                    else if(strstr(s, "first") || strstr(s, "top"))
+                    {
+                        page = 1;
+                    }
+                }
+            }
+        }
         break;
-       case actionLaunch: {
-           type = "Launch";
-           LinkLaunch*l = (LinkLaunch*)action;
-           GString * str = new GString(l->getFileName());
-           str->append(l->getParams());
-           s = str->getCString();
-       }
+        case actionLaunch: {
+            type = "Launch";
+            LinkLaunch*l = (LinkLaunch*)action;
+            GString * str = new GString(l->getFileName());
+            str->append(l->getParams());
+            s = strdup(str->getCString());
+            delete str;
+        }
         break;
-       case actionURI: {
-           type = "URI";
-           LinkURI*l = (LinkURI*)action;
-           GString*g = l->getURI();
-           if(g) {
-            url = g->getCString();
-            s = url;
-           }
-       }
+        case actionURI: {
+            type = "URI";
+            LinkURI*l = (LinkURI*)action;
+            GString*g = l->getURI();
+            if(g) {
+             url = g->getCString();
+             s = strdup(url);
+            }
+        }
         break;
-       case actionUnknown: {
-           type = "Unknown";
-           LinkUnknown*l = (LinkUnknown*)action;
-           s = "";
-       }
+        case actionUnknown: {
+            type = "Unknown";
+            LinkUnknown*l = (LinkUnknown*)action;
+            s = strdup("");
+        }
         break;
-       default: {
-           logf("<error> Unknown link type!\n");
-           break;
-       }
+        default: {
+            msg("<error> Unknown link type!\n");
+            break;
+        }
     }
+    if(!s) s = strdup("-?-");
+
     if(!linkinfo && (page || url))
     {
-       logf("<notice> File contains links");
-       linkinfo = 1;
+        msg("<notice> File contains links");
+        linkinfo = 1;
     }
     if(page>0)
     {
-       int t;
-       for(t=0;t<pagepos;t++)
-           if(pages[t]==page)
-               break;
-       if(t!=pagepos)
-       swfoutput_linktopage(&output, t, points);
+        int t;
+        for(t=0;t<pagepos;t++)
+            if(pages[t]==page)
+                break;
+        if(t!=pagepos)
+            swfoutput_linktopage(&output, t, points);
     }
     else if(url)
     {
-       swfoutput_linktourl(&output, url, points);
+        swfoutput_linktourl(&output, url, points);
     }
     else if(named)
     {
-       swfoutput_namedlink(&output, named, points);
+        swfoutput_namedlink(&output, named, points);
     }
-    logf("<verbose> \"%s\" link to \"%s\" (%d)\n", type, s, page);
-  }
+    msg("<verbose> \"%s\" link to \"%s\" (%d)\n", type, FIXNULL(s), page);
+    free(s);s=0;
 }
 
 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);
@@ -762,34 +1143,39 @@ void SWFOutputDev::restoreState(GfxState *state) {
   clippos--;
 }
 
-char type3Warning=0;
-
-int SWFOutputDev::searchT1Font(char*name) 
+char* SWFOutputDev::searchFont(char*name) 
 {      
     int i;
-    
-    int id=-1;
-    int mapid=-1;
     char*filename=0;
+    int is_standard_font = 0;
+       
+    msg("<verbose> SearchFont(%s)", name);
+
+    /* see if it is a pdf standard font */
     for(i=0;i<sizeof(pdf2t1map)/sizeof(mapping);i++) 
     {
        if(!strcmp(name, pdf2t1map[i].pdffont))
        {
-           filename = pdf2t1map[i].filename;
-           mapid = i;
+           name = pdf2t1map[i].filename;
+           is_standard_font = 1;
+           break;
        }
     }
-    if(filename)
-    for(i=0; i<T1_Get_no_fonts(); i++)
+    /* look in all font files */
+    for(i=0;i<fontnum;i++) 
     {
-       char*fontfilename = T1_GetFontFileName (i);
-       if(strstr(fontfilename, filename))
+       if(strstr(fonts[i].filename, name))
        {
-               id = i;
-               pdf2t1map[i].id = mapid;
+           if(!fonts[i].used) {
+
+               fonts[i].used = 1;
+               if(!is_standard_font)
+                   msg("<notice> Using %s for %s", fonts[i].filename, name);
+           }
+           return strdup(fonts[i].filename);
        }
     }
-    return id;
+    return 0;
 }
 
 void SWFOutputDev::updateLineWidth(GfxState *state)
@@ -798,6 +1184,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;
@@ -818,175 +1214,259 @@ void SWFOutputDev::updateStrokeColor(GfxState *state)
                                      (char)(rgb.b*255), (char)(opaq*255));
 }
 
-char*SWFOutputDev::writeEmbeddedFontToFile(GfxFont*font)
+void FoFiWrite(void *stream, char *data, int len)
 {
-      char*tmpFileName = NULL;
-      FILE *f;
-      int c;
-      char *fontBuf;
-      int fontLen;
-      Type1CFontConverter *cvt;
-      Ref embRef;
-      Object refObj, strObj;
-      tmpFileName = "/tmp/tmpfont";
-      font->getEmbeddedFontID(&embRef);
+   fwrite(data, len, 1, (FILE*)stream);
+}
 
-      f = fopen(tmpFileName, "wb");
-      if (!f) {
-       logf("<error> Couldn't create temporary Type 1 font file");
+char*SWFOutputDev::writeEmbeddedFontToFile(XRef*ref, GfxFont*font)
+{
+    char*tmpFileName = NULL;
+    FILE *f;
+    int c;
+    char *fontBuf;
+    int fontLen;
+    Ref embRef;
+    Object refObj, strObj;
+    char namebuf[512];
+    tmpFileName = mktmpname(namebuf);
+    int ret;
+
+    ret = font->getEmbeddedFontID(&embRef);
+    if(!ret) {
+       msg("<verbose> Didn't get embedded font id");
+       /* not embedded- the caller should now search the font
+          directories for this font */
+       return 0;
+    }
+
+    f = fopen(tmpFileName, "wb");
+    if (!f) {
+      msg("<error> Couldn't create temporary Type 1 font file");
+       return 0;
+    }
+
+    /*if(font->isCIDFont()) {
+       GfxCIDFont* cidFont = (GfxCIDFont *)font;
+       GString c = cidFont->getCollection();
+       msg("<notice> Collection: %s", c.getCString());
+    }*/
+
+    if (font->getType() == fontType1C ||
+       font->getType() == fontCIDType0C) {
+      if (!(fontBuf = font->readEmbFontFile(xref, &fontLen))) {
+       fclose(f);
+       msg("<error> Couldn't read embedded font file");
        return 0;
       }
-      if (font->getType() == fontType1C) {
-       if (!(fontBuf = font->readEmbFontFile(&fontLen))) {
-         fclose(f);
-         logf("<error> Couldn't read embedded font file");
-         return 0;
-       }
-       cvt = new Type1CFontConverter(fontBuf, fontLen, f);
-       cvt->convert();
-       delete cvt;
-       gfree(fontBuf);
-      } else {
-       font->getEmbeddedFontID(&embRef);
-       refObj.initRef(embRef.num, embRef.gen);
-       refObj.fetch(&strObj);
-       refObj.free();
-       strObj.streamReset();
-       while ((c = strObj.streamGetChar()) != EOF) {
-         fputc(c, f);
-       }
-       strObj.streamClose();
-       strObj.free();
+#ifdef XPDF_101
+      Type1CFontFile *cvt = new Type1CFontFile(fontBuf, fontLen);
+      if(!cvt) return 0;
+      cvt->convertToType1(f);
+#else
+      FoFiType1C *cvt = FoFiType1C::make(fontBuf, fontLen);
+      if(!cvt) return 0;
+      cvt->convertToType1(NULL, gTrue, FoFiWrite, f);
+#endif
+      //cvt->convertToCIDType0("test", f);
+      //cvt->convertToType0("test", 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;
       }
-      fclose(f);
+#ifdef XPDF_101
+      TrueTypeFontFile *cvt = new TrueTypeFontFile(fontBuf, fontLen);
+      cvt->writeTTF(f);
+#else
+      FoFiTrueType *cvt = FoFiTrueType::make(fontBuf, fontLen);
+      cvt->writeTTF(FoFiWrite, f);
+#endif
+      delete cvt;
+      gfree(fontBuf);
+    } else {
+      font->getEmbeddedFontID(&embRef);
+      refObj.initRef(embRef.num, embRef.gen);
+      refObj.fetch(ref, &strObj);
+      refObj.free();
+      strObj.streamReset();
+      int f4[4];
+      char f4c[4];
+      int t;
+      for(t=0;t<4;t++) {
+         f4[t] = strObj.streamGetChar();
+         f4c[t] = (char)f4[t];
+         if(f4[t] == EOF)
+             break;
+      }
+      if(t==4) {
+         if(!strncmp(f4c, "true", 4)) {
+             /* some weird TTF fonts don't start with 0,1,0,0 but with "true".
+                Change this on the fly */
+             f4[0] = f4[2] = f4[3] = 0;
+             f4[1] = 1;
+         }
+         fputc(f4[0], f);
+         fputc(f4[1], f);
+         fputc(f4[2], f);
+         fputc(f4[3], f);
 
-      if(font->getType() == fontTrueType)
-      {
-         if(!ttfinfo) {
-             logf("<notice> File contains TrueType fonts");
-             ttfinfo = 1;
+         while ((c = strObj.streamGetChar()) != EOF) {
+           fputc(c, f);
          }
-         char name2[80];
-         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);
-         unlink(tmpFileName);
-         sprintf(name2,"%s.pfb",tmp);
-         tmpFileName = strdup(name2);
       }
+      strObj.streamClose();
+      strObj.free();
+    }
+    fclose(f);
 
-      return tmpFileName;
+    return strdup(tmpFileName);
 }
-
-char* gfxFontName(GfxFont* gfxFont)
+    
+char* searchForSuitableFont(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*name = getFontName(gfxFont);
+    char*fontname = 0;
+    char*filename = 0;
+
+    if(!config_use_fontconfig)
+        return 0;
+    
+#ifdef HAVE_FONTCONFIG
+    FcPattern *pattern, *match;
+    FcResult result;
+    FcChar8 *v;
+
+    static int fcinitcalled = false; 
+        
+    msg("<debug> searchForSuitableFont(%s)", name);
+    
+    // call init ony once
+    if (!fcinitcalled) {
+        msg("<debug> Initializing FontConfig...");
+        fcinitcalled = true;
+       if(FcInit()) {
+            msg("<debug> FontConfig Initialization failed. Disabling.");
+            config_use_fontconfig = 0;
+            return 0;
+        }
+        msg("<debug> ...initialized FontConfig");
+    }
+   
+    msg("<debug> FontConfig: Create \"%s\" Family Pattern", name);
+    pattern = FcPatternBuild(NULL, FC_FAMILY, FcTypeString, name, NULL);
+    if (gfxFont->isItalic()) // check for italic
+        msg("<debug> FontConfig: Adding Italic Slant");
+       FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ITALIC);
+    if (gfxFont->isBold()) // check for bold
+        msg("<debug> FontConfig: Adding Bold Weight");
+        FcPatternAddInteger(pattern, FC_WEIGHT, FC_WEIGHT_BOLD);
+
+    msg("<debug> FontConfig: Try to match...");
+    // configure and match using the original font name 
+    FcConfigSubstitute(0, pattern, FcMatchPattern); 
+    FcDefaultSubstitute(pattern);
+    match = FcFontMatch(0, pattern, &result);
+    
+    if (FcPatternGetString(match, "family", 0, &v) == FcResultMatch) {
+        msg("<debug> FontConfig: family=%s", (char*)v);
+        // if we get an exact match
+        if (strcmp((char *)v, name) == 0) {
+           if (FcPatternGetString(match, "file", 0, &v) == FcResultMatch) {
+               filename = strdup((char*)v);
+               char *nfn = strrchr(filename, '/');
+               if(nfn) fontname = strdup(nfn+1);
+               else    fontname = filename;
+            }
+            msg("<debug> FontConfig: Returning \"%s\"", fontname);
+        } else {
+            // initialize patterns
+            FcPatternDestroy(pattern);
+           FcPatternDestroy(match);
+
+            // now match against serif etc.
+           if (gfxFont->isSerif()) {
+                msg("<debug> FontConfig: Create Serif Family Pattern");
+                pattern = FcPatternBuild (NULL, FC_FAMILY, FcTypeString, "serif", NULL);
+            } else if (gfxFont->isFixedWidth()) {
+                msg("<debug> FontConfig: Create Monospace Family Pattern");
+                pattern = FcPatternBuild (NULL, FC_FAMILY, FcTypeString, "monospace", NULL);
+            } else {
+                msg("<debug> FontConfig: Create Sans Family Pattern");
+                pattern = FcPatternBuild (NULL, FC_FAMILY, FcTypeString, "sans", NULL);
+            }
+
+            // check for italic
+            if (gfxFont->isItalic()) {
+                msg("<debug> FontConfig: Adding Italic Slant");
+                int bb = FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ITALIC);
+            }
+            // check for bold
+            if (gfxFont->isBold()) {
+                msg("<debug> FontConfig: Adding Bold Weight");
+                int bb = FcPatternAddInteger(pattern, FC_WEIGHT, FC_WEIGHT_BOLD);
+            }
+
+            msg("<debug> FontConfig: Try to match... (2)");
+            // configure and match using serif etc
+           FcConfigSubstitute (0, pattern, FcMatchPattern);
+            FcDefaultSubstitute (pattern);
+            match = FcFontMatch (0, pattern, &result);
+            
+            if (FcPatternGetString(match, "file", 0, &v) == FcResultMatch) {
+               filename = strdup((char*)v);
+               char *nfn = strrchr(filename, '/');
+               if(nfn) fontname = strdup(nfn+1);
+               else    fontname = filename;
+           }
+            msg("<debug> FontConfig: Returning \"%s\"", fontname);
+        }        
+    }
 
-char* substitutetarget[256];
-char* substitutesource[256];
-int substitutepos = 0;
+    //printf("FONTCONFIG: pattern");
+    //FcPatternPrint(pattern);
+    //printf("FONTCONFIG: match");
+    //FcPatternPrint(match);
+    FcPatternDestroy(pattern);
+    FcPatternDestroy(match);
+
+    pdfswf_addfont(filename);
+    return fontname;
+#else
+    return 0;
+#endif
+}
 
 char* SWFOutputDev::substituteFont(GfxFont*gfxFont, char* oldname)
 {
-      //substitute font
-      char* fontname = 0;
-      double m11, m12, m21, m22;
-      int index;
-      int code;
-      double w,w1,w2;
-      double*fm;
-      double v;
-      if(gfxFont->getName()) {
-       fontname = gfxFont->getName()->getCString();
-      }
+    char*fontname = 0, *filename = 0;
+    msg("<notice> subsituteFont(%s)", oldname);
 
-//       printf("%d %s\n", t, gfxFont->getCharName(t));
-      showFontError(gfxFont, 1);
-      if (!gfxFont->is16Bit()) {
-       if(gfxFont->isSymbolic()) {
-         if(fontname && (strstr(fontname,"ing"))) //Dingbats, Wingdings etc.
-          index = 16;
-         else 
-          index = 12;
-        } else if (gfxFont->isFixedWidth()) {
-         index = 8;
-       } else if (gfxFont->isSerif()) {
-         index = 4;
-       } else {
-         index = 0;
-       }
-       if (gfxFont->isBold() && index!=16)
-         index += 2;
-       if (gfxFont->isItalic() && index!=16)
-         index += 1;
-       fontname = fontnames[index];
-       // get width of 'm' in real font and substituted font
-       if ((code = gfxFont->getCharCode("m")) >= 0)
-         w1 = gfxFont->getWidth(code);
-       else
-         w1 = 0;
-       w2 = fontsizes[index];
-       if (gfxFont->getType() == fontType3) {
-         // This is a hack which makes it possible to substitute for some
-         // Type 3 fonts.  The problem is that it's impossible to know what
-         // the base coordinate system used in the font is without actually
-         // rendering the font.  This code tries to guess by looking at the
-         // width of the character 'm' (which breaks if the font is a
-         // subset that doesn't contain 'm').
-         if (w1 > 0 && (w1 > 1.1 * w2 || w1 < 0.9 * w2)) {
-           w1 /= w2;
-           m11 *= w1;
-           m12 *= w1;
-           m21 *= w1;
-           m22 *= w1;
-         }
-         fm = gfxFont->getFontMatrix();
-         v = (fm[0] == 0) ? 1 : (fm[3] / fm[0]);
-         m21 *= v;
-         m22 *= v;
-       } else if (!gfxFont->isSymbolic()) {
-         // if real font is substantially narrower than substituted
-         // font, reduce the font size accordingly
-         if (w1 > 0.01 && w1 < 0.9 * w2) {
-           w1 /= w2;
-           if (w1 < 0.8) {
-             w1 = 0.8;
-           }
-           m11 *= w1;
-           m12 *= w1;
-           m21 *= w1;
-           m22 *= w1;
-         }
-       }
-      }
-      if(fontname) {
-        this->t1id = searchT1Font(fontname);
-      }
-      if(substitutepos>=sizeof(substitutesource)/sizeof(char*)) {
-         logf("<fatal> Too many fonts in file.");
-         exit(1);
-      }
-      if(oldname) {
-         substitutesource[substitutepos] = oldname;
-         substitutetarget[substitutepos] = fontname;
-         logf("<verbose> substituting %s -> %s", oldname, fontname);
-         substitutepos ++;
-      }
-      return fontname;
+    if(!(fontname = searchForSuitableFont(gfxFont))) {
+       fontname = "Times-Roman";
+    }
+    filename = searchFont(fontname);
+    if(!filename) {
+       msg("<error> Couldn't find font %s- did you install the default fonts?");
+       return 0;
+    }
+
+    if(substitutepos>=sizeof(substitutesource)/sizeof(char*)) {
+       msg("<fatal> Too many fonts in file.");
+       exit(1);
+    }
+    if(oldname) {
+       substitutesource[substitutepos] = oldname;
+       substitutetarget[substitutepos] = fontname;
+       msg("<notice> substituting %s -> %s", FIXNULL(oldname), FIXNULL(fontname));
+       substitutepos ++;
+    }
+    return strdup(filename);
 }
 
 void unlinkfont(char* filename)
@@ -1018,99 +1498,149 @@ void unlinkfont(char* filename)
     }
 }
 
-void SWFOutputDev::updateFont(GfxState *state) 
+void SWFOutputDev::setXRef(PDFDoc*doc, XRef *xref) 
 {
-  GfxFont*gfxFont = state->getFont();
-  char * fileName = 0;
-    
-  if (!gfxFont) {
-    return;
-  }  
-  char * fontname = gfxFontName(gfxFont);
-  int t;
-  for(t=0;t<substitutepos;t++) {
-      if(!strcmp(fontname, substitutesource[t])) {
-         fontname = substitutetarget[t];
-         break;
-      }
-  }
+    this->doc = doc;
+    this->xref = xref;
+}
 
-  if(swfoutput_queryfont(&output, fontname))
-  {
-      swfoutput_setfont(&output, fontname, -1, 0);
-      return;
-  }
 
-  // look for Type 3 font
-  if (!type3Warning && gfxFont->getType() == fontType3) {
-    type3Warning = gTrue;
-    showFontError(gfxFont, 2);
-  }
-  //dumpFontInfo ("<notice>", gfxFont);
+void SWFOutputDev::updateFont(GfxState *state) 
+{
+    GfxFont*gfxFont = state->getFont();
+      
+    if (!gfxFont) {
+       return;
+    }  
+    char * fontid = getFontID(gfxFont);
+    
+    int t;
+    /* first, look if we substituted this font before-
+       this way, we don't initialize the T1 Fonts
+       too often */
+    for(t=0;t<substitutepos;t++) {
+       if(!strcmp(fontid, substitutesource[t])) {
+           fontid = substitutetarget[t];
+           break;
+       }
+    }
 
-  Ref embRef;
-  GBool embedded = gfxFont->getEmbeddedFontID(&embRef);
-  if(embedded) {
-    if (!gfxFont->is16Bit() &&
-       (gfxFont->getType() == fontType1 ||
-        gfxFont->getType() == fontType1C ||
-        gfxFont->getType() == fontTrueType)) {
+    /* second, see if swfoutput already has this font
+       cached- if so, we are done */
+    if(swfoutput_queryfont(&output, fontid))
+    {
+       swfoutput_setfont(&output, fontid, 0);
        
-       fileName = writeEmbeddedFontToFile(gfxFont);
-       if(!fileName) {
-         logf("<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");
-         showFontError(gfxFont,0);
-         unlinkfont(fileName);
-         return ;
+       msg("<debug> updateFont(%s) [cached]", fontid);
+       return;
+    }
+
+    // look for Type 3 font
+    if (gfxFont->getType() == fontType3) {
+       if(!type3Warning) {
+           type3Warning = gTrue;
+           showFontError(gfxFont, 2);
        }
+       return;
     }
-    else {
-       showFontError(gfxFont,0);
-       fontname = substituteFont(gfxFont, fontname);
+
+    /* now either load the font, or find a substitution */
+
+    Ref embRef;
+    GBool embedded = gfxFont->getEmbeddedFontID(&embRef);
+
+    char*fileName = 0;
+    int del = 0;
+    if(embedded &&
+       (gfxFont->getType() == fontType1 ||
+       gfxFont->getType() == fontType1C ||
+       (gfxFont->getType() == fontCIDType0C && forceType0Fonts) ||
+       gfxFont->getType() == fontTrueType ||
+       gfxFont->getType() == fontCIDType2
+       ))
+    {
+      fileName = writeEmbeddedFontToFile(xref, gfxFont);
+      if(!fileName) showFontError(gfxFont,0);
+      else del = 1;
+    } else {
+      char * fontname = getFontName(gfxFont);
+      fileName = searchFont(fontname);
+      if(!fileName) showFontError(gfxFont,0);
     }
-  } else {
-    if(fontname) {
-       int newt1id = searchT1Font(fontname);
-       if(newt1id<0) {
-           fontname = substituteFont(gfxFont, fontname);
-       } else
-           this->t1id = newt1id;
+    if(!fileName) {
+       char * fontname = getFontName(gfxFont);
+       msg("<warning> Font %s %scould not be loaded.", fontname, embedded?"":"(not embedded) ");
+       msg("<warning> Try putting a TTF version of that font (named \"%s.ttf\") into /swftools/fonts", fontname);
+       fileName = substituteFont(gfxFont, fontid);
+       if(fontid) { fontid = substitutetarget[substitutepos-1]; /*ugly hack*/};
+       msg("<notice> Font is now %s (%s)", fontid, fileName);
     }
-    else
-       fontname = substituteFont(gfxFont, fontname);
-  }
-
-  if(t1id<0) {
-      showFontError(gfxFont,0);
-      return;
-  }
-  /* we may have done some substitutions here, so check
-     again if this font is cached. */
-  if(swfoutput_queryfont(&output, fontname))
-  {
-      swfoutput_setfont(&output, fontname, -1, 0);
-      return;
-  }
 
-  logf("<verbose> Creating new SWF font: t1id: %d, filename: %s name:%s", this->t1id, fileName, fontname);
-  swfoutput_setfont(&output, fontname, this->t1id, fileName);
-  if(fileName)
-      unlinkfont(fileName);
+    if(!fileName) {
+       msg("<error> Couldn't set font %s\n", fontid);
+       return;
+    }
+       
+    msg("<verbose> updateFont(%s) -> %s", fontid, fileName);
+    dumpFontInfo("<verbose>", gfxFont);
+
+    swfoutput_setfont(&output, fontid, fileName);
+   
+    if(fileName && del)
+       unlinkfont(fileName);
+    if(fileName)
+        free(fileName);
 }
 
-int pic_xids[1024];
-int pic_yids[1024];
-int pic_ids[1024];
-int picpos = 0;
-int pic_id = 0;
+#define SQR(x) ((x)*(x))
+
+unsigned char* antialize(unsigned char*data, int width, int height, int newwidth, int newheight, int palettesize)
+{
+    if((newwidth<2 || newheight<2) ||
+       (width<=newwidth || height<=newheight))
+       return 0;
+    unsigned char*newdata;
+    int x,y;
+    newdata= (unsigned char*)malloc(newwidth*newheight);
+    int t;
+    double fx = (double)(width)/newwidth;
+    double fy = (double)(height)/newheight;
+    double px = 0;
+    int blocksize = (int)(8192/(fx*fy));
+    int r = 8192*256/palettesize;
+    for(x=0;x<newwidth;x++) {
+       double ex = px + fx;
+       int fromx = (int)px;
+       int tox = (int)ex;
+       int xweight1 = (int)(((fromx+1)-px)*256);
+       int xweight2 = (int)((ex-tox)*256);
+       double py =0;
+       for(y=0;y<newheight;y++) {
+           double ey = py + fy;
+           int fromy = (int)py;
+           int toy = (int)ey;
+           int yweight1 = (int)(((fromy+1)-py)*256);
+           int yweight2 = (int)((ey-toy)*256);
+           int a = 0;
+           int xx,yy;
+           for(xx=fromx;xx<=tox;xx++)
+           for(yy=fromy;yy<=toy;yy++) {
+               int b = 1-data[width*yy+xx];
+               int weight=256;
+               if(xx==fromx) weight = (weight*xweight1)/256;
+               if(xx==tox) weight = (weight*xweight2)/256;
+               if(yy==fromy) weight = (weight*yweight1)/256;
+               if(yy==toy) weight = (weight*yweight2)/256;
+               a+=b*weight;
+           }
+           //if(a) a=(palettesize-1)*r/blocksize;
+           newdata[y*newwidth+x] = (a*blocksize)/r;
+           py = ey;
+       }
+       px = ex;
+    }
+    return newdata;
+}
 
 void SWFOutputDev::drawGeneralImage(GfxState *state, Object *ref, Stream *str,
                                   int width, int height, GfxImageColorMap*colorMap, GBool invert,
@@ -1123,17 +1653,26 @@ void SWFOutputDev::drawGeneralImage(GfxState *state, Object *ref, Stream *str,
   ImageStream *imgStr;
   Guchar pixBuf[4];
   GfxRGB rgb;
+  int ncomps = 1;
+  int bits = 1;
+                                
+  if(colorMap) {
+    ncomps = colorMap->getNumPixelComps();
+    bits = colorMap->getBits();
+  }
+  imgStr = new ImageStream(str, width, ncomps,bits);
+  imgStr->reset();
+
   if(!width || !height || (height<=1 && width<=1))
   {
-      logf("<verbose> Ignoring %d by %d image", width, height);
-      int i,j;
-      if (inlineImg) {
-       j = height * ((width + 7) / 8);
-       str->reset();
-       for (i = 0; i < j; ++i) {
-         str->getChar();
-       }
+      msg("<verbose> Ignoring %d by %d image", width, height);
+      unsigned char buf[8];
+      int x,y;
+      for (y = 0; y < height; ++y)
+      for (x = 0; x < width; ++x) {
+         imgStr->getPixel(buf);
       }
+      delete imgStr;
       return;
   }
   
@@ -1142,206 +1681,215 @@ void SWFOutputDev::drawGeneralImage(GfxState *state, Object *ref, Stream *str,
   state->transform(1, 0, &x3, &y3);
   state->transform(1, 1, &x4, &y4);
 
-  if (str->getKind() == strDCT &&
-      (colorMap->getNumPixelComps() == 3 || !mask) )
-  {
-    sprintf(fileName, "%s.jpg",mktmpname(0));
-    logf("<verbose> Found jpeg. Temporary storage is %s", fileName);
-    if(!jpeginfo)
-    {
-       logf("<notice> file contains jpeg pictures");
-       jpeginfo = 1;
-    }
-    if (!(fi = fopen(fileName, "wb"))) {
-      logf("<error> Couldn't open temporary image file '%s'", fileName);
-      return;
-    }
-    str = ((DCTStream *)str)->getRawStream();
-    str->reset();
-    int xid = 0;
-    int yid = 0;
-    int count = 0;
-    while ((c = str->getChar()) != EOF)
-    {
-      fputc(c, fi);
-      xid += count*c;
-      yid += (~count)*c;
-      count++;
-    }
-    fclose(fi);
-    
-    int t,found = -1;
-    for(t=0;t<picpos;t++)
-    {
-       if(pic_xids[t] == xid &&
-          pic_yids[t] == yid) {
-           found = t;break;
-       }
-    }
-    if(found<0) {
-       pic_ids[picpos] = swfoutput_drawimagejpeg(&output, fileName, width, height, 
-               x1,y1,x2,y2,x3,y3,x4,y4);
-       pic_xids[picpos] = xid;
-       pic_yids[picpos] = yid;
-       if(picpos<1024)
-           picpos++;
-    } else {
-       swfoutput_drawimageagain(&output, pic_ids[found], width, height,
-               x1,y1,x2,y2,x3,y3,x4,y4);
-    }
-    unlink(fileName);
-  } else {
-
-    if(!pbminfo) {
-       logf("<notice> file contains pbm pictures %s",mask?"(masked)":"");
-       if(mask)
-       logf("<verbose> drawing %d by %d masked picture\n", width, height);
-       pbminfo = 1;
-    }
-
-    if(mask) {
-       imgStr = new ImageStream(str, width, 1, 1);
-       imgStr->reset();
-       //return;
-       int yes=0,i,j;
-       unsigned char buf[8];
-       int xid = 0;
-       int yid = 0;
-       int x,y;
-       int width2 = (width+3)&(~3);
-       unsigned char*pic = new unsigned char[width2*height];
-       RGBA pal[256];
-       GfxRGB rgb;
-       state->getFillRGB(&rgb);
-       pal[0].r = (int)(rgb.r*255); pal[0].g = (int)(rgb.g*255); 
-       pal[0].b = (int)(rgb.b*255); pal[0].a = 255;
-       pal[1].r = 0; pal[1].g = 0; pal[1].b = 0; pal[1].a = 0;
-       xid += pal[1].r*3 + pal[1].g*11 + pal[1].b*17;
-       yid += pal[1].r*7 + pal[1].g*5 + pal[1].b*23;
-       for (y = 0; y < height; ++y)
-        for (x = 0; x < width; ++x)
-       {
-             imgStr->getPixel(buf);
-              pic[width*y+x] = buf[0];
-             xid+=x*buf[0]+1;
-             yid+=y*buf[0]+1;
-       }
-       int t,found = -1;
-       for(t=0;t<picpos;t++)
-       {
-           if(pic_xids[t] == xid &&
-              pic_yids[t] == yid) {
-               found = t;break;
-           }
-       }
-       if(found<0) {
-           pic_ids[picpos] = swfoutput_drawimagelossless256(&output, pic, pal, width, height, 
-                   x1,y1,x2,y2,x3,y3,x4,y4);
-           pic_xids[picpos] = xid;
-           pic_yids[picpos] = yid;
-           if(picpos<1024)
-               picpos++;
-       } else {
-           swfoutput_drawimageagain(&output, pic_ids[found], width, height,
-                   x1,y1,x2,y2,x3,y3,x4,y4);
-       }
-       free(pic);
-    } else {
-       int x,y;
-       int width2 = (width+3)&(~3);
-       imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(),
-                                  colorMap->getBits());
-       imgStr->reset();
+  if(!pbminfo && !(str->getKind()==strDCT)) {
+      if(!type3active) {
+         msg("<notice> file contains pbm pictures %s",mask?"(masked)":"");
+         pbminfo = 1;
+      }
+      if(mask)
+      msg("<verbose> drawing %d by %d masked picture\n", width, height);
+  }
+  if(!jpeginfo && (str->getKind()==strDCT)) {
+      msg("<notice> file contains jpeg pictures");
+      jpeginfo = 1;
+  }
 
-       if(colorMap->getNumPixelComps()!=1)
-       {
-           RGBA*pic=new RGBA[width*height];
-           int xid = 0;
-           int yid = 0;
-           for (y = 0; y < height; ++y) {
-             for (x = 0; x < width; ++x) {
-               int r,g,b,a;
-               imgStr->getPixel(pixBuf);
-               colorMap->getRGB(pixBuf, &rgb);
-               pic[width*y+x].r = r = (U8)(rgb.r * 255 + 0.5);
-               pic[width*y+x].g = g = (U8)(rgb.g * 255 + 0.5);
-               pic[width*y+x].b = b = (U8)(rgb.b * 255 + 0.5);
-               pic[width*y+x].a = a = 255;//(U8)(rgb.a * 255 + 0.5);
-               xid += x*r+x*b*3+x*g*7+x*a*11;
-               yid += y*r*3+y*b*17+y*g*19+y*a*11;
+  if(mask) {
+      int yes=0,i,j;
+      unsigned char buf[8];
+      int xid = 0;
+      int yid = 0;
+      int x,y;
+      unsigned char*pic = new unsigned char[width*height];
+      RGBA pal[256];
+      GfxRGB rgb;
+      state->getFillRGB(&rgb);
+      memset(pal,255,sizeof(pal));
+      pal[0].r = (int)(rgb.r*255); pal[0].g = (int)(rgb.g*255); 
+      pal[0].b = (int)(rgb.b*255); pal[0].a = 255;
+      pal[1].r = 0; pal[1].g = 0; pal[1].b = 0; pal[1].a = 0;
+      int numpalette = 2;
+      xid += pal[1].r*3 + pal[1].g*11 + pal[1].b*17;
+      yid += pal[1].r*7 + pal[1].g*5 + pal[1].b*23;
+      int realwidth = (int)sqrt(SQR(x2-x3) + SQR(y2-y3));
+      int realheight = (int)sqrt(SQR(x1-x2) + SQR(y1-y2));
+      for (y = 0; y < height; ++y)
+      for (x = 0; x < width; ++x)
+      {
+           imgStr->getPixel(buf);
+           if(invert) 
+               buf[0]=1-buf[0];
+           pic[width*y+x] = buf[0];
+           xid+=x*buf[0]+1;
+           yid+=y*buf[0]*3+1;
+      }
+      
+      /* the size of the drawn image is added to the identifier
+        as the same image may require different bitmaps if displayed
+        at different sizes (due to antialiasing): */
+      if(type3active) {
+         xid += realwidth;
+         yid += realheight;
+      }
+      int t,found = -1;
+      for(t=0;t<picpos;t++)
+      {
+         if(pic_xids[t] == xid &&
+            pic_yids[t] == yid) {
+             /* if the image was antialiased, the size has changed: */
+             width = pic_width[t];
+             height = pic_height[t];
+             found = t;break;
+         }
+      }
+      if(found<0) {
+         if(type3active) {
+             numpalette = 16;
+             unsigned char*pic2 = 0;
+             
+             pic2 = antialize(pic,width,height,realwidth,realheight, numpalette);
+
+             if(pic2) {
+                 width = realwidth;
+                 height = realheight;
+                 free(pic);
+                 pic = pic2;
+                 /* make a black/white palette */
+                 int t;
+                 GfxRGB rgb2;
+                 rgb2.r = 1 - rgb.r;
+                 rgb2.g = 1 - rgb.g;
+                 rgb2.b = 1 - rgb.b;
+
+                 float r = 255/(numpalette-1);
+                 for(t=0;t<numpalette;t++) {
+                     /*pal[t].r = (U8)(t*r*rgb.r+(numpalette-1-t)*r*rgb2.r);
+                     pal[t].g = (U8)(t*r*rgb.g+(numpalette-1-t)*r*rgb2.g);
+                     pal[t].b = (U8)(t*r*rgb.b+(numpalette-1-t)*r*rgb2.b);
+                     pal[t].a = 255; */
+                     pal[t].r = (U8)(255*rgb.r);
+                     pal[t].g = (U8)(255*rgb.g);
+                     pal[t].b = (U8)(255*rgb.b);
+                     pal[t].a = (U8)(t*r);
+                 }
              }
-           }
-           int t,found = -1;
-           for(t=0;t<picpos;t++)
-           {
-               if(pic_xids[t] == xid &&
-                  pic_yids[t] == yid) {
-                   found = t;break;
-               }
-           }
-           if(found<0) {
-               pic_ids[picpos] = swfoutput_drawimagelossless(&output, pic, width, height, 
-                       x1,y1,x2,y2,x3,y3,x4,y4);
-               pic_xids[picpos] = xid;
-               pic_yids[picpos] = yid;
-               if(picpos<1024)
-                   picpos++;
-           } else {
-               swfoutput_drawimageagain(&output, pic_ids[found], width, height,
-                       x1,y1,x2,y2,x3,y3,x4,y4);
-           }
-           delete pic;
+         }
+         pic_ids[picpos] = swfoutput_drawimagelosslessN(&output, pic, pal, width, height, 
+                 x1,y1,x2,y2,x3,y3,x4,y4, numpalette);
+         pic_xids[picpos] = xid;
+         pic_yids[picpos] = yid;
+         pic_width[picpos] = width;
+         pic_height[picpos] = height;
+         if(picpos<1024)
+             picpos++;
+      } else {
+         swfoutput_drawimageagain(&output, pic_ids[found], width, height,
+                 x1,y1,x2,y2,x3,y3,x4,y4);
+      }
+      free(pic);
+      delete imgStr;
+      return;
+  } 
+
+  int x,y;
+  
+  if(colorMap->getNumPixelComps()!=1 || str->getKind()==strDCT)
+  {
+      RGBA*pic=new RGBA[width*height];
+      int xid = 0;
+      int yid = 0;
+      for (y = 0; y < height; ++y) {
+       for (x = 0; x < width; ++x) {
+         int r,g,b,a;
+         imgStr->getPixel(pixBuf);
+         colorMap->getRGB(pixBuf, &rgb);
+         pic[width*y+x].r = r = (U8)(rgb.r * 255 + 0.5);
+         pic[width*y+x].g = g = (U8)(rgb.g * 255 + 0.5);
+         pic[width*y+x].b = b = (U8)(rgb.b * 255 + 0.5);
+         pic[width*y+x].a = a = 255;//(U8)(rgb.a * 255 + 0.5);
+         xid += x*r+x*b*3+x*g*7+x*a*11;
+         yid += y*r*3+y*b*17+y*g*19+y*a*11;
        }
-       else
-       {
-           U8*pic = new U8[width2*height];
-           RGBA pal[256];
-           int t;
-           int xid=0,yid=0;
-           for(t=0;t<256;t++)
-           {
-               int r,g,b,a;
-               pixBuf[0] = t;
-               colorMap->getRGB(pixBuf, &rgb);
-               pal[t].r = r = (U8)(rgb.r * 255 + 0.5);
-               pal[t].g = g = (U8)(rgb.g * 255 + 0.5);
-               pal[t].b = b = (U8)(rgb.b * 255 + 0.5);
-               pal[t].a = a = 255;//(U8)(rgb.b * 255 + 0.5);
-               xid += t*r+t*b*3+t*g*7+t*a*11;
-               xid += (~t)*r+t*b*3+t*g*7+t*a*11;
-           }
-           for (y = 0; y < height; ++y) {
-             for (x = 0; x < width; ++x) {
-               imgStr->getPixel(pixBuf);
-               pic[width2*y+x] = pixBuf[0];
-               xid += x*pixBuf[0]*7;
-               yid += y*pixBuf[0]*3;
-             }
-           }
-           int found = -1;
-           for(t=0;t<picpos;t++)
-           {
-               if(pic_xids[t] == xid &&
-                  pic_yids[t] == yid) {
-                   found = t;break;
-               }
-           }
-           if(found<0) {
-               pic_ids[picpos] = swfoutput_drawimagelossless256(&output, pic, pal, width, height, 
-                       x1,y1,x2,y2,x3,y3,x4,y4);
-               pic_xids[picpos] = xid;
-               pic_yids[picpos] = yid;
-               if(picpos<1024)
-                   picpos++;
-           } else {
-               swfoutput_drawimageagain(&output, pic_ids[found], width, height,
-                       x1,y1,x2,y2,x3,y3,x4,y4);
-           }
-           delete pic;
+      }
+      int t,found = -1;
+      for(t=0;t<picpos;t++)
+      {
+         if(pic_xids[t] == xid &&
+            pic_yids[t] == yid) {
+             found = t;break;
+         }
+      }
+      if(found<0) {
+         if(str->getKind()==strDCT)
+             pic_ids[picpos] = swfoutput_drawimagejpeg(&output, pic, width, height, 
+                     x1,y1,x2,y2,x3,y3,x4,y4);
+         else
+             pic_ids[picpos] = swfoutput_drawimagelossless(&output, pic, width, height, 
+                     x1,y1,x2,y2,x3,y3,x4,y4);
+         pic_xids[picpos] = xid;
+         pic_yids[picpos] = yid;
+         pic_width[picpos] = width;
+         pic_height[picpos] = height;
+         if(picpos<1024)
+             picpos++;
+      } else {
+         swfoutput_drawimageagain(&output, pic_ids[found], width, height,
+                 x1,y1,x2,y2,x3,y3,x4,y4);
+      }
+      delete pic;
+      delete imgStr;
+      return;
+  }
+  else
+  {
+      U8*pic = new U8[width*height];
+      RGBA pal[256];
+      int t;
+      int xid=0,yid=0;
+      for(t=0;t<256;t++)
+      {
+         int r,g,b,a;
+         pixBuf[0] = t;
+         colorMap->getRGB(pixBuf, &rgb);
+         pal[t].r = r = (U8)(rgb.r * 255 + 0.5);
+         pal[t].g = g = (U8)(rgb.g * 255 + 0.5);
+         pal[t].b = b = (U8)(rgb.b * 255 + 0.5);
+         pal[t].a = a = 255;//(U8)(rgb.b * 255 + 0.5);
+         xid += t*r+t*b*3+t*g*7+t*a*11;
+         xid += (~t)*r+t*b*3+t*g*7+t*a*11;
+      }
+      for (y = 0; y < height; ++y) {
+       for (x = 0; x < width; ++x) {
+         imgStr->getPixel(pixBuf);
+         pic[width*y+x] = pixBuf[0];
+         xid += x*pixBuf[0]*7;
+         yid += y*pixBuf[0]*3;
        }
-       delete imgStr;
-    }
-
+      }
+      int found = -1;
+      for(t=0;t<picpos;t++)
+      {
+         if(pic_xids[t] == xid &&
+            pic_yids[t] == yid) {
+             found = t;break;
+         }
+      }
+      if(found<0) {
+         pic_ids[picpos] = swfoutput_drawimagelosslessN(&output, pic, pal, width, height, 
+                 x1,y1,x2,y2,x3,y3,x4,y4,256);
+         pic_xids[picpos] = xid;
+         pic_yids[picpos] = yid;
+         pic_width[picpos] = width;
+         pic_height[picpos] = height;
+         if(picpos<1024)
+             picpos++;
+      } else {
+         swfoutput_drawimageagain(&output, pic_ids[found], width, height,
+                 x1,y1,x2,y2,x3,y3,x4,y4);
+      }
+      delete pic;
+      delete imgStr;
+      return;
   }
 }
 
@@ -1349,13 +1897,21 @@ void SWFOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str,
                                   int width, int height, GBool invert,
                                   GBool inlineImg) 
 {
+  msg("<verbose> drawImageMask %dx%d, invert=%d inline=%d", width, height, invert, inlineImg);
   drawGeneralImage(state,ref,str,width,height,0,invert,inlineImg,1);
 }
 
 void SWFOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
-                              int width, int height,
-                              GfxImageColorMap *colorMap, GBool inlineImg) 
+                        int width, int height, GfxImageColorMap *colorMap,
+                        int *maskColors, GBool inlineImg)
 {
+  msg("<verbose> drawImage %dx%d, %s %s, inline=%d", width, height, 
+         colorMap?"colorMap":"no colorMap", 
+         maskColors?"maskColors":"no maskColors",
+         inlineImg);
+  if(colorMap)
+      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);
 }
 
@@ -1403,119 +1959,201 @@ static void printInfoDate(Dict *infoDict, char *key, char *fmt) {
   obj.free();
 }
 
-void pdfswf_init(char*filename, char*userPassword) 
+void pdfswf_setparameter(char*name, char*value)
 {
-  GString *fileName = new GString(filename);
-  GString *userPW;
-  Object info;
-  // init error file
-  errorInit();
-
-  // read config file
-  initParams(xpdfConfigFile);
-
-  // open PDF file
-  xref = NULL;
-  if (userPassword && userPassword[0]) {
-    userPW = new GString(userPassword);
-  } else {
-    userPW = NULL;
-  }
-  doc = new PDFDoc(fileName, userPW);
-  if (userPW) {
-    delete userPW;
-  }
-  if (!doc->isOk()) {
-    exit(1);
-  }
-
-  // print doc info
-  doc->getDocInfo(&info);
-  if (info.isDict()) {
-    printInfoString(info.getDict(), "Title",        "Title:        %s\n");
-    printInfoString(info.getDict(), "Subject",      "Subject:      %s\n");
-    printInfoString(info.getDict(), "Keywords",     "Keywords:     %s\n");
-    printInfoString(info.getDict(), "Author",       "Author:       %s\n");
-    printInfoString(info.getDict(), "Creator",      "Creator:      %s\n");
-    printInfoString(info.getDict(), "Producer",     "Producer:     %s\n");
-    printInfoDate(info.getDict(),   "CreationDate", "CreationDate: %s\n");
-    printInfoDate(info.getDict(),   "ModDate",      "ModDate:      %s\n");
-  }
-  info.free();
-
-  // print page count
-  printf("Pages:        %d\n", doc->getNumPages());
-  numpages = doc->getNumPages();
-  
-  // print linearization info
-  printf("Linearized:   %s\n", doc->isLinearized() ? "yes" : "no");
-
-  // print encryption info
-  printf("Encrypted:    ");
-  if (doc->isEncrypted()) {
-    printf("yes (print:%s copy:%s change:%s addNotes:%s)\n",
-          doc->okToPrint() ? "yes" : "no",
-          doc->okToCopy() ? "yes" : "no",
-          doc->okToChange() ? "yes" : "no",
-          doc->okToAddNotes() ? "yes" : "no");
-       /*ERROR: This pdf is encrypted, and disallows copying.
-         Due to the DMCA, paragraph 1201, (2) A-C, circumventing
-         a technological measure that efficively controls access to
-         a protected work is violating American law. 
-         See www.eff.org for more information about DMCA issues.
-        */
-       if(!doc->okToCopy()) {
-           printf("PDF disallows copying. Bailing out.\n");
-           exit(1); //bail out
-       }
-       if(!doc->okToChange() || !doc->okToAddNotes())
-           swfoutput_setprotected();
+    msg("<verbose> setting parameter %s to \"%s\"", name, value);
+    if(!strcmp(name, "caplinewidth")) {
+       caplinewidth = atof(value);
+    } else if(!strcmp(name, "zoom")) {
+       zoom = atoi(value);
+    } else if(!strcmp(name, "forceType0Fonts")) {
+       forceType0Fonts = atoi(value);
+    } else if(!strcmp(name, "fontdir")) {
+        pdfswf_addfontdir(value);
+    } else if(!strcmp(name, "languagedir")) {
+        pdfswf_addlanguagedir(value);
+    } else if(!strcmp(name, "fontconfig")) {
+        config_use_fontconfig = atoi(value);
+    } else {
+       swfoutput_setparameter(name, value);
     }
-  else {
-    printf("no\n");
-  }
-
-
-  output = new SWFOutputDev();
 }
-
-void pdfswf_drawonlyshapes()
+void pdfswf_addfont(char*filename)
 {
-    drawonlyshapes = 1;
+    fontfile_t f;
+    memset(&f, 0, sizeof(fontfile_t));
+    f.filename = filename;
+    if(fontnum < sizeof(fonts)/sizeof(fonts[0])) {
+        fonts[fontnum++] = f;
+    } else {
+        msg("<error> Too many external fonts. Not adding font file \"%s\".", filename);
+    }
 }
 
-void pdfswf_ignoredraworder()
+static char* dirseparator()
 {
-    ignoredraworder = 1;
+#ifdef WIN32
+    return "\\";
+#else
+    return "/";
+#endif
 }
 
-void pdfswf_linksopennewwindow()
+void pdfswf_addlanguagedir(char*dir)
 {
-    opennewwindow = 1;
+    if(!globalParams)
+        globalParams = new GlobalParams("");
+    
+    msg("<notice> Adding %s to language pack directories", dir);
+
+    int l;
+    FILE*fi = 0;
+    char* config_file = (char*)malloc(strlen(dir) + 1 + sizeof("add-to-xpdfrc"));
+    strcpy(config_file, dir);
+    strcat(config_file, dirseparator());
+    strcat(config_file, "add-to-xpdfrc");
+
+    fi = fopen(config_file, "rb");
+    if(!fi) {
+        msg("<error> Could not open %s", config_file);
+        return;
+    }
+    globalParams->parseFile(new GString(config_file), fi);
+    fclose(fi);
 }
 
-void pdfswf_storeallcharacters()
+void pdfswf_addfontdir(char*dirname)
 {
-    storeallcharacters = 1;
+#ifdef HAVE_DIRENT_H
+    msg("<notice> Adding %s to font directories", dirname);
+    DIR*dir = opendir(dirname);
+    if(!dir) {
+       msg("<warning> Couldn't open directory %s\n", dirname);
+       return;
+    }
+    struct dirent*ent;
+    while(1) {
+       ent = readdir (dir);
+       if (!ent) 
+           break;
+       int l;
+       char*name = ent->d_name;
+       char type = 0;
+       if(!name) continue;
+       l=strlen(name);
+       if(l<4)
+           continue;
+       if(!strncasecmp(&name[l-4], ".pfa", 4)) 
+           type=1;
+       if(!strncasecmp(&name[l-4], ".pfb", 4)) 
+           type=3;
+       if(!strncasecmp(&name[l-4], ".ttf", 4)) 
+           type=2;
+       if(type)
+       {
+           char*fontname = (char*)malloc(strlen(dirname)+strlen(name)+2);
+           strcpy(fontname, dirname);
+            strcat(fontname, dirseparator());
+           strcat(fontname, name);
+           msg("<verbose> Adding %s to fonts", fontname);
+           pdfswf_addfont(fontname);
+       }
+    }
+    closedir(dir);
+#else
+    msg("<warning> No dirent.h- unable to add font dir %s", dir);
+#endif
 }
 
-void pdfswf_jpegquality(int val)
+
+typedef struct _pdf_doc_internal
 {
-    if(val<0) val=0;
-    if(val>100) val=100;
-    jpegquality = val;
-}
+    int protect;
+    PDFDoc*doc;
+} pdf_doc_internal_t;
+typedef struct _pdf_page_internal
+{
+} pdf_page_internal_t;
+typedef struct _swf_output_internal
+{
+    SWFOutputDev*outputDev;
+} swf_output_internal_t;
 
-void pdfswf_setoutputfilename(char*_filename)
+pdf_doc_t* pdf_init(char*filename, char*userPassword)
 {
-    swffilename = _filename;
-}
+    pdf_doc_t*pdf_doc = (pdf_doc_t*)malloc(sizeof(pdf_doc_t));
+    memset(pdf_doc, 0, sizeof(pdf_doc_t));
+    pdf_doc_internal_t*i= (pdf_doc_internal_t*)malloc(sizeof(pdf_doc_internal_t));
+    memset(i, 0, sizeof(pdf_doc_internal_t));
+    pdf_doc->internal = i;
+    
+    GString *fileName = new GString(filename);
+    GString *userPW;
+    Object info;
 
+    // read config file
+    if(!globalParams)
+        globalParams = new GlobalParams("");
 
-void pdfswf_convertpage(int page)
+    // open PDF file
+    if (userPassword && userPassword[0]) {
+      userPW = new GString(userPassword);
+    } else {
+      userPW = NULL;
+    }
+    i->doc = new PDFDoc(fileName, userPW);
+    if (userPW) {
+      delete userPW;
+    }
+    if (!i->doc->isOk()) {
+        return 0;
+    }
+
+    // print doc info
+    i->doc->getDocInfo(&info);
+    if (info.isDict() &&
+      (getScreenLogLevel()>=LOGLEVEL_NOTICE)) {
+      printInfoString(info.getDict(), "Title",        "Title:        %s\n");
+      printInfoString(info.getDict(), "Subject",      "Subject:      %s\n");
+      printInfoString(info.getDict(), "Keywords",     "Keywords:     %s\n");
+      printInfoString(info.getDict(), "Author",       "Author:       %s\n");
+      printInfoString(info.getDict(), "Creator",      "Creator:      %s\n");
+      printInfoString(info.getDict(), "Producer",     "Producer:     %s\n");
+      printInfoDate(info.getDict(),   "CreationDate", "CreationDate: %s\n");
+      printInfoDate(info.getDict(),   "ModDate",      "ModDate:      %s\n");
+      printf("Pages:        %d\n", i->doc->getNumPages());
+      printf("Linearized:   %s\n", i->doc->isLinearized() ? "yes" : "no");
+      printf("Encrypted:    ");
+      if (i->doc->isEncrypted()) {
+        printf("yes (print:%s copy:%s change:%s addNotes:%s)\n",
+               i->doc->okToPrint() ? "yes" : "no",
+               i->doc->okToCopy() ? "yes" : "no",
+               i->doc->okToChange() ? "yes" : "no",
+               i->doc->okToAddNotes() ? "yes" : "no");
+      } else {
+        printf("no\n");
+      }
+    }
+    info.free();
+                   
+    pdf_doc->num_pages = i->doc->getNumPages();
+    i->protect = 0;
+    if (i->doc->isEncrypted()) {
+          if(!i->doc->okToCopy()) {
+              printf("PDF disallows copying.\n");
+              return 0;
+          }
+          if(!i->doc->okToChange() || !i->doc->okToAddNotes())
+              i->protect = 1;
+    }
+   
+    return pdf_doc;
+}
+
+void pdfswf_preparepage(int page)
 {
-    if(!pages)
-    {
+    /*FIXME*/
+    if(!pages) {
        pages = (int*)malloc(1024*sizeof(int));
        pagebuflen = 1024;
     } else {
@@ -1528,30 +2166,171 @@ void pdfswf_convertpage(int page)
     pages[pagepos++] = page;
 }
 
-void pdfswf_performconversion()
+class MemCheck
 {
-    int t;
-    for(t=0;t<pagepos;t++)
+    public: ~MemCheck()
     {
-       currentpage = pages[t];
-       doc->displayPage((OutputDev*)output, currentpage, /*zoom*/100, /*rotate*/0, /*doLinks*/(int)1);
+        delete globalParams;globalParams=0;
+        Object::memCheck(stderr);
+        gMemReport(stderr);
     }
+} myMemCheck;
+
+void pdf_destroy(pdf_doc_t*pdf_doc)
+{
+    pdf_doc_internal_t*i= (pdf_doc_internal_t*)pdf_doc->internal;
+
+    msg("<debug> pdfswf.cc: pdfswf_close()");
+    delete i->doc; i->doc=0;
+    
+    free(pages); pages = 0; //FIXME
+
+    free(pdf_doc->internal);pdf_doc->internal=0;
+    free(pdf_doc);pdf_doc=0;
 }
 
-int pdfswf_numpages()
+pdf_page_t* pdf_getpage(pdf_doc_t*pdf_doc, int page)
 {
-  return doc->getNumPages();
+    pdf_doc_internal_t*di= (pdf_doc_internal_t*)pdf_doc->internal;
+
+    if(page < 1 || page > pdf_doc->num_pages)
+        return 0;
+    
+    pdf_page_t* pdf_page = (pdf_page_t*)malloc(sizeof(pdf_page_t));
+    pdf_page_internal_t*pi= (pdf_page_internal_t*)malloc(sizeof(pdf_page_internal_t));
+    memset(pi, 0, sizeof(pdf_page_internal_t));
+    pdf_page->internal = pi;
+
+    pdf_page->parent = pdf_doc;
+    pdf_page->nr = page;
+    return pdf_page;
+}
+
+void pdf_page_destroy(pdf_page_t*pdf_page)
+{
+    pdf_page_internal_t*i= (pdf_page_internal_t*)pdf_page->internal;
+    free(pdf_page->internal);pdf_page->internal = 0;
+    free(pdf_page);pdf_page=0;
+}
+
+swf_output_t* swf_output_init() 
+{
+    swf_output_t*swf_output = (swf_output_t*)malloc(sizeof(swf_output_t));
+    memset(swf_output, 0, sizeof(swf_output_t));
+    swf_output_internal_t*i= (swf_output_internal_t*)malloc(sizeof(swf_output_internal_t));
+    memset(i, 0, sizeof(swf_output_internal_t));
+    swf_output->internal = i;
+
+    i->outputDev = new SWFOutputDev();
+    return swf_output;
 }
 
-int closed=0;
-void pdfswf_close()
+void swf_output_setparameter(swf_output_t*swf_output, char*name, char*value)
 {
-    logf("<debug> pdfswf.cc: pdfswf_close()");
+    /* FIXME */
+    pdfswf_setparameter(name, value);
+}
+
+void swf_output_pagefeed(swf_output_t*swf)
+{
+    swf_output_internal_t*i= (swf_output_internal_t*)swf->internal;
+    i->outputDev->pagefeed();
+    i->outputDev->getDimensions(&swf->x1, &swf->y1, &swf->x2, &swf->y2);
+}
+
+int swf_output_save(swf_output_t*swf, char*filename)
+{
+    swf_output_internal_t*i= (swf_output_internal_t*)swf->internal;
+    int ret = i->outputDev->save(filename);
+    i->outputDev->getDimensions(&swf->x1, &swf->y1, &swf->x2, &swf->y2);
+    return ret;
+}
+
+void* swf_output_get(swf_output_t*swf)
+{
+    swf_output_internal_t*i= (swf_output_internal_t*)swf->internal;
+    void* ret = i->outputDev->getSWF();
+    i->outputDev->getDimensions(&swf->x1, &swf->y1, &swf->x2, &swf->y2);
+    return ret;
+}
+
+void swf_output_destroy(swf_output_t*output)
+{
+    swf_output_internal_t*i = (swf_output_internal_t*)output->internal;
+    delete i->outputDev; i->outputDev=0;
+    free(output->internal);output->internal=0;
+    free(output);
+}
+
+void pdf_page_render2(pdf_page_t*page, swf_output_t*swf)
+{
+    pdf_doc_internal_t*pi = (pdf_doc_internal_t*)page->parent->internal;
+    swf_output_internal_t*si = (swf_output_internal_t*)swf->internal;
+
+    if(pi->protect) {
+        swfoutput_setparameter("protect", "1");
+    }
+    si->outputDev->setXRef(pi->doc, pi->doc->getXRef());
+#ifdef XPDF_101
+    pi->doc->displayPage((OutputDev*)si->outputDev, page->nr, /*zoom*/zoom, /*rotate*/0, /*doLinks*/(int)1);
+#else
+    pi->doc->displayPage((OutputDev*)si->outputDev, page->nr, zoom, zoom, /*rotate*/0, true, /*doLinks*/(int)1);
+#endif
+    si->outputDev->getDimensions(&swf->x1, &swf->y1, &swf->x2, &swf->y2);
+}
+
+void pdf_page_rendersection(pdf_page_t*page, swf_output_t*output, int x, int y, int x1, int y1, int x2, int y2)
+{
+    pdf_doc_internal_t*pi = (pdf_doc_internal_t*)page->parent->internal;
+    swf_output_internal_t*si = (swf_output_internal_t*)output->internal;
+
+    si->outputDev->setMove(x,y);
+    if((x1|y1|x2|y2)==0) x2++;
+    si->outputDev->setClip(x1,y1,x2,y2);
+
+    pdf_page_render2(page, output);
+}
+void pdf_page_render(pdf_page_t*page, swf_output_t*output)
+{
+    pdf_doc_internal_t*pi = (pdf_doc_internal_t*)page->parent->internal;
+    swf_output_internal_t*si = (swf_output_internal_t*)output->internal;
+    
+    si->outputDev->setMove(0,0);
+    si->outputDev->setClip(0,0,0,0);
+    
+    pdf_page_render2(page, output);
+}
+
+
+pdf_page_info_t* pdf_page_getinfo(pdf_page_t*page)
+{
+    pdf_doc_internal_t*pi = (pdf_doc_internal_t*)page->parent->internal;
+    pdf_page_internal_t*i= (pdf_page_internal_t*)page->internal;
+    pdf_page_info_t*info = (pdf_page_info_t*)malloc(sizeof(pdf_page_info_t));
+    memset(info, 0, sizeof(pdf_page_info_t));
+
+    InfoOutputDev*output = new InfoOutputDev;
+    
+#ifdef XPDF_101
+    pi->doc->displayPage((OutputDev*)output, page->nr, /*zoom*/zoom, /*rotate*/0, /*doLinks*/(int)1);
+#else
+    pi->doc->displayPage((OutputDev*)output, page->nr, zoom, zoom, /*rotate*/0, true, /*doLinks*/(int)1);
+#endif
+
+    info->xMin = output->x1;
+    info->yMin = output->y1;
+    info->xMax = output->x2;
+    info->yMax = output->y2;
+    info->number_of_images = output->num_images;
+    info->number_of_links = output->num_links;
+    info->number_of_fonts = output->num_fonts;
+
     delete output;
-    delete doc;
-    freeParams();
-    // check for memory leaks
-    Object::memCheck(stderr);
-    gMemReport(stderr);
+
+    return info;
 }
 
+void pdf_page_info_destroy(pdf_page_info_t*info)
+{
+    free(info);
+}