added support for get(..,"width"), get(..,"height")
[swftools.git] / pdf2swf / swfoutput.cc
index 52f64ff..569aef0 100644 (file)
    along with swftools; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
+#include <stdlib.h>
+#include <stdio.h>
 #include <string.h>
+#include "../config.h"
 #include <fcntl.h>
 #include <unistd.h>
+#ifdef HAVE_ASSERT_H
+#include <assert.h>
+#else
+#define assert(a)
+#endif
+#include <math.h>
 #include "swfoutput.h"
 #include "spline.h"
 extern "C" {
 #include "../lib/log.h"
 #include "../lib/rfxswf.h"
+#include "../lib/gfxdevice.h"
+#include "../lib/gfxtools.h"
 }
-#define standardEncodingSize 335
-extern char *standardEncodingNames[standardEncodingSize];
-
-int opennewwindow=0;
-int ignoredraworder=0;
-int drawonlyshapes=0;
-int jpegquality=85;
-int storeallcharacters=0;
-int enablezlib=0;
-static int flag_protected = 0;
-
-typedef unsigned char u8;
-typedef unsigned short int u16;
-typedef unsigned long int u32;
-
-static int fi;
-static char* filename = 0;
-static SWF swf;
-static TAG *tag;
-static int currentswfid = 0;
-static int depth = 1;
-static int startdepth = 1;
-
-static SHAPE* shape;
-static int shapeid = -1;
-static int textid = -1;
-
-static int drawmode = -1;
-static char storefont = 0;
-static int fillstyleid;
-static int linestyleid;
-static int swflastx=0;
-static int swflasty=0;
-static int lastwasfill = 0;
-static char fill = 0;
-static int sizex;
-static int sizey;
-TAG* cliptags[128];
-int clipshapes[128];
-u32 clipdepths[128];
-int clippos = 0;
-
-int CHARMIDX = 0;
-int CHARMIDY = 0;
-
-char fillstylechanged = 0;
-
-static void startshape(struct swfoutput* obj);
-static void starttext(struct swfoutput* obj);
-static void endshape();
-static void endtext();
-
-// matrix multiplication. changes p0
-static void transform (plotxy*p0,struct swfmatrix*m)
+#include "../lib/art/libart.h"
+
+#define CHARDATAMAX 8192
+#define CHARMIDX 0
+#define CHARMIDY 0
+
+typedef struct _chardata {
+    int charid;
+    int fontid; /* TODO: use a SWFFONT instead */
+    int x;
+    int y;
+    int size;
+    RGBA color;
+} chardata_t;
+
+struct fontlist_t 
 {
-    double x,y;
-    x = m->m11*p0->x+m->m12*p0->y;
-    y = m->m21*p0->x+m->m22*p0->y;
-    p0->x = x + m->m13;
-    p0->y = y + m->m23;
+    SWFFONT *swffont;
+    fontlist_t*next;
+};
+
+typedef long int twip;
+
+struct swfmatrix {
+    double m11,m12,m21,m22,m31,m32;
+};
+
+typedef struct _swfoutput_internal
+{
+    gfxdevice_t*dev; // the gfxdevice object where this internal struct resides
+
+    double config_dumpfonts;
+    double config_ppmsubpixels;
+    double config_jpegsubpixels;
+    int config_opennewwindow;
+    int config_ignoredraworder;
+    int config_drawonlyshapes;
+    int config_jpegquality;
+    int config_storeallcharacters;
+    int config_generate_fake_tags;
+    int config_enablezlib;
+    int config_insertstoptag;
+    int config_flashversion;
+    int config_splinemaxerror;
+    int config_fontsplinemaxerror;
+    int config_filloverlap;
+    int config_protect;
+    int config_bboxvars;
+    float config_minlinewidth;
+    double config_caplinewidth;
+
+    SWF* swf;
+
+    fontlist_t* fontlist;
+
+    char storefont;
+
+    MATRIX page_matrix;
+
+    TAG *tag;
+    int currentswfid;
+    int depth;
+    int startdepth;
+    int linewidth;
+    
+    SHAPE* shape;
+    int shapeid;
+    int textid;
+    
+    int fillstyleid;
+    int linestyleid;
+    int swflastx;
+    int swflasty;
+    int lastwasfill;
+    int shapeisempty;
+    char fill;
+    int min_x,max_x;
+    int min_y,max_y;
+    TAG* cliptags[128];
+    int clipshapes[128];
+    U32 clipdepths[128];
+    int clippos;
+
+    /* image cache */
+    int pic_xids[1024];
+    int pic_yids[1024];
+    int pic_ids[1024];
+    int pic_width[1024];
+    int pic_height[1024];
+    int picpos;
+
+    int frameno;
+    int lastframeno;
+    
+    char fillstylechanged;
+
+    int jpeg; //next image type
+    
+    int bboxrectpos;
+    SRECT bboxrect;
+
+    chardata_t chardata[CHARDATAMAX];
+    int chardatapos;
+    int firstpage;
+    char pagefinished;
+
+    char overflow;
+
+    MATRIX fontmatrix;
+    double fontm11,fontm12,fontm21,fontm22;
+    SWFFONT *swffont;
+    RGBA strokergb;
+    RGBA fillrgb;
+    int drawmode;
+
+    int shapeposx;
+    int shapeposy;
+
+} swfoutput_internal;
+    
+static void swf_fillbitmap(gfxdevice_t*driver, gfxline_t*line, gfximage_t*img, gfxmatrix_t*move, gfxcxform_t*cxform);
+static int  swf_setparameter(gfxdevice_t*driver, const char*key, const char*value);
+static void swf_drawstroke(gfxdevice_t*dev, gfxline_t*line, gfxcoord_t width, gfxcolor_t*color, gfx_capType cap_style, gfx_joinType joint_style, gfxcoord_t miterLimit);
+static void swf_startclip(gfxdevice_t*dev, gfxline_t*line);
+static void swf_endclip(gfxdevice_t*dev);
+static void swf_stroke(gfxdevice_t*dev, gfxline_t*line, gfxcoord_t width, gfxcolor_t*color, gfx_capType cap_style, gfx_joinType joint_style, gfxcoord_t miterLimit);
+static void swf_fill(gfxdevice_t*dev, gfxline_t*line, gfxcolor_t*color);
+static void swf_fillbitmap(gfxdevice_t*dev, gfxline_t*line, gfximage_t*img, gfxmatrix_t*matrix, gfxcxform_t*cxform);
+static void swf_fillgradient(gfxdevice_t*dev, gfxline_t*line, gfxgradient_t*gradient, gfxgradienttype_t type, gfxmatrix_t*matrix);
+static void swf_drawchar(gfxdevice_t*dev, char*fontid, int glyph, gfxcolor_t*color, gfxmatrix_t*matrix);
+static void swf_addfont(gfxdevice_t*dev, char*fontid, gfxfont_t*font);
+static void swf_drawlink(gfxdevice_t*dev, gfxline_t*line, char*action);
+static void swf_startframe(gfxdevice_t*dev, int width, int height);
+static void swf_endframe(gfxdevice_t*dev);
+static gfxresult_t* swf_finish(gfxdevice_t*driver);
+
+static swfoutput_internal* init_internal_struct()
+{
+    swfoutput_internal*i = (swfoutput_internal*)malloc(sizeof(swfoutput_internal));
+    memset(i, 0, sizeof(swfoutput_internal));
+
+    i->storefont = 0;
+    i->currentswfid = 0;
+    i->depth = 0;
+    i->overflow = 0;
+    i->startdepth = 0;
+    i->linewidth = 0;
+    i->shapeid = -1;
+    i->textid = -1;
+    i->frameno = 0;
+    i->lastframeno = 0;
+
+    i->fillstyleid;
+    i->linestyleid;
+    i->swflastx=0;
+    i->swflasty=0;
+    i->lastwasfill = 0;
+    i->shapeisempty = 1;
+    i->fill = 0;
+    i->clippos = 0;
+
+    i->fillstylechanged = 0;
+
+    i->bboxrectpos = -1;
+    i->chardatapos = 0;
+    i->firstpage = 1;
+    i->pagefinished = 1;
+
+    i->config_dumpfonts=0;
+    i->config_ppmsubpixels=0;
+    i->config_jpegsubpixels=0;
+    i->config_opennewwindow=1;
+    i->config_ignoredraworder=0;
+    i->config_drawonlyshapes=0;
+    i->config_jpegquality=85;
+    i->config_storeallcharacters=0;
+    i->config_enablezlib=0;
+    i->config_generate_fake_tags=0;
+    i->config_insertstoptag=0;
+    i->config_flashversion=6;
+    i->config_splinemaxerror=1;
+    i->config_fontsplinemaxerror=1;
+    i->config_filloverlap=0;
+    i->config_protect=0;
+    i->config_bboxvars=0;
+    i->config_minlinewidth=0.05;
+    i->config_caplinewidth=1;
+
+    return i;
+};
+
+static int id_error = 0;
+
+static U16 getNewID(gfxdevice_t* dev)
+{
+    swfoutput_internal*i = (swfoutput_internal*)dev->internal;
+    if(i->currentswfid == 65535) {
+       if(!id_error)
+           msg("<error> ID Table overflow");
+       id_error=1;
+       i->overflow = 1;
+    }
+    return ++i->currentswfid;
+}
+static U16 getNewDepth(gfxdevice_t* dev)
+{
+    swfoutput_internal*i = (swfoutput_internal*)dev->internal;
+    if(i->depth == 65535) {
+       if(!id_error)
+           msg("<error> Depth Table overflow");
+       id_error=1;
+       i->overflow = 1;
+    }
+    return ++i->depth;
 }
 
+static void startshape(gfxdevice_t* dev);
+static void starttext(gfxdevice_t* dev);
+static void endshape(gfxdevice_t* dev);
+static void endtext(gfxdevice_t* dev);
+
 // write a move-to command into the swf
-static void moveto(TAG*tag, plotxy p0)
+static int moveto(gfxdevice_t*dev, TAG*tag, plotxy p0)
 {
+    swfoutput_internal*i = (swfoutput_internal*)dev->internal;
     int rx = (int)(p0.x*20);
     int ry = (int)(p0.y*20);
-    if(rx!=swflastx || ry!=swflasty || fillstylechanged) {
-      swf_ShapeSetMove (tag, shape, rx,ry);
-      fillstylechanged = 0;
+    if(rx!=i->swflastx || ry!=i->swflasty || i->fillstylechanged) {
+      swf_ShapeSetMove (tag, i->shape, rx,ry);
+      i->fillstylechanged = 0;
+      i->swflastx=rx;
+      i->swflasty=ry;
+      return 1;
     }
-    swflastx=rx;
-    swflasty=ry;
+    return 0;
 }
+static int moveto(gfxdevice_t*dev, TAG*tag, double  x, double y)
+{
+    swfoutput_internal*i = (swfoutput_internal*)dev->internal;
+    plotxy p;
+    p.x = x;
+    p.y = y;
+    return moveto(dev, tag, p);
+}
+static void addPointToBBox(gfxdevice_t*dev, int px, int py) 
+{
+    swfoutput_internal*i = (swfoutput_internal*)dev->internal;
+
+    SPOINT p;
+    p.x = px;
+    p.y = py;
+    if(i->fill) {
+       swf_ExpandRect(&i->bboxrect, p);
+    } else {
+       swf_ExpandRect3(&i->bboxrect, p, i->linewidth*3/2);
+    }
+}
+
+/*static void plot(gfxdevice_t*dev, int x, int y, TAG*tag)
+{
+    swfoutput_internal*i = (swfoutput_internal*)dev->internal;
+    int width = i->linewidth/4;
+    if(width > 5)
+       width = 5;
+    ////square
+    //swf_ShapeSetLine(tag, i->shape,-width,-width);
+    //swf_ShapeSetLine(tag, i->shape,width*2,0);
+    //swf_ShapeSetLine(tag, i->shape,0,width*2);
+    //swf_ShapeSetLine(tag, i->shape,-width*2,0);
+    //swf_ShapeSetLine(tag, i->shape,0,-width*2);
+    //swf_ShapeSetLine(tag, i->shape,width,width);
+   
+    // diamond
+    swf_ShapeSetLine(tag, i->shape,-width,0);
+    swf_ShapeSetLine(tag, i->shape,width,-width);
+    swf_ShapeSetLine(tag, i->shape,width,width);
+    swf_ShapeSetLine(tag, i->shape,-width,width);
+    swf_ShapeSetLine(tag, i->shape,-width,-width);
+    swf_ShapeSetLine(tag, i->shape,width,0);
+
+    addPointToBBox(dev, x-width ,y-width);
+    addPointToBBox(dev, x+width ,y+width);
+}*/
 
 // write a line-to command into the swf
-static void lineto(TAG*tag, plotxy p0)
+static void lineto(gfxdevice_t*dev, TAG*tag, plotxy p0)
 {
-    int rx = ((int)(p0.x*20)-swflastx);
-    int ry = ((int)(p0.y*20)-swflasty);
-    /* we can't skip this for rx=0,ry=0, those
-       are plots */
-    swf_ShapeSetLine (tag, shape, rx,ry);
-    swflastx+=rx;
-    swflasty+=ry;
+    swfoutput_internal*i = (swfoutput_internal*)dev->internal;
+    int px = (int)(p0.x*20);
+    int py = (int)(p0.y*20);
+    int rx = (px-i->swflastx);
+    int ry = (py-i->swflasty);
+    if(rx|ry) {
+       swf_ShapeSetLine (tag, i->shape, rx,ry);
+       addPointToBBox(dev, i->swflastx,i->swflasty);
+       addPointToBBox(dev, px,py);
+    }/* else if(!i->fill) {
+       // treat lines of length 0 as plots, making them
+       // at least 1 twip wide so Flash will display them
+       plot(dev, i->swflastx, i->swflasty, tag);
+    }*/
+
+    i->shapeisempty = 0;
+    i->swflastx+=rx;
+    i->swflasty+=ry;
+}
+static void lineto(gfxdevice_t*dev, TAG*tag, double x, double y)
+{
+    plotxy p;
+    p.x = x;
+    p.y = y;
+    lineto(dev,tag, p);
 }
 
 // write a spline-to command into the swf
-static void splineto(TAG*tag, plotxy control,plotxy end)
+static void splineto(gfxdevice_t*dev, TAG*tag, plotxy control,plotxy end)
 {
-    int cx = ((int)(control.x*20)-swflastx);
-    int cy = ((int)(control.y*20)-swflasty);
-    swflastx += cx;
-    swflasty += cy;
-    int ex = ((int)(end.x*20)-swflastx);
-    int ey = ((int)(end.y*20)-swflasty);
-    swflastx += ex;
-    swflasty += ey;
-    if(cx || cy || ex || ey)
-       swf_ShapeSetCurve(tag, shape, cx,cy,ex,ey);
+    swfoutput_internal*i = (swfoutput_internal*)dev->internal;
+    int lastlastx = i->swflastx;
+    int lastlasty = i->swflasty;
+
+    int cx = ((int)(control.x*20)-i->swflastx);
+    int cy = ((int)(control.y*20)-i->swflasty);
+    i->swflastx += cx;
+    i->swflasty += cy;
+    int ex = ((int)(end.x*20)-i->swflastx);
+    int ey = ((int)(end.y*20)-i->swflasty);
+    i->swflastx += ex;
+    i->swflasty += ey;
+    
+    if(cx || cy || ex || ey) {
+       swf_ShapeSetCurve(tag, i->shape, cx,cy,ex,ey);
+       addPointToBBox(dev, lastlastx   ,lastlasty   );
+       addPointToBBox(dev, lastlastx+cx,lastlasty+cy);
+       addPointToBBox(dev, lastlastx+cx+ex,lastlasty+cy+ey);
+    }/* else if(!i->fill) {
+       // treat splines of length 0 as plots
+       plot(dev, lastlastx, lastlasty, tag);
+    }*/
+    i->shapeisempty = 0;
 }
 
 /* write a line, given two points and the transformation
    matrix. */
-static void line(TAG*tag, plotxy p0, plotxy p1, struct swfmatrix*m)
+/*static void line(gfxdevice_t*dev, TAG*tag, plotxy p0, plotxy p1)
 {
-    transform(&p0,m);
-    transform(&p1,m);
-    moveto(tag, p0);
-    lineto(tag, p1);
-}
-
-/* write a cubic (!) spline. This involves calling the approximate()
-   function out of spline.cc to convert it to a quadratic spline.  */
-static void spline(TAG*tag,plotxy p0,plotxy p1,plotxy p2,plotxy p3,struct swfmatrix*m)
-{
-    double d;
-    struct qspline q[16];
-    int num;
-    int t;
-    transform(&p0,m);
-    transform(&p1,m);
-    transform(&p2,m);
-    transform(&p3,m);
-
-    num = approximate(p0,p1,p2,p3,q);
-    for(t=0;t<num;t++) {
-        moveto(tag,q[t].start);
-        splineto(tag,q[t].control, q[t].end);
-    }
-}
+    moveto(dev, tag, p0);
+    lineto(dev, tag, p1);
+}*/
 
-void resetdrawer()
+void resetdrawer(gfxdevice_t*dev)
 {
-    swflastx = 0;
-    swflasty = 0;
+    swfoutput_internal*i = (swfoutput_internal*)dev->internal;
+    i->swflastx = 0;
+    i->swflasty = 0;
 }
 
-/* draw a T1 outline. These are generated by pdf2swf and by t1lib.
-   (representing characters) */
-void drawpath(TAG*tag, T1_OUTLINE*outline, struct swfmatrix*m, int log)
+static void stopFill(gfxdevice_t*dev)
 {
-    if(tag->id != ST_DEFINEFONT &&
-        tag->id != ST_DEFINESHAPE &&
-        tag->id != ST_DEFINESHAPE2 &&
-        tag->id != ST_DEFINESHAPE3)
-    {
-        logf("<error> internal error: drawpath needs a shape tag, not %d\n",tag->id);
-        exit(1);
-    }
-    double x=0,y=0;
-    double lastx=0,lasty=0;
-    double firstx=0,firsty=0;
-    int init=1;
-
-    while (outline)
+    swfoutput_internal*i = (swfoutput_internal*)dev->internal;
+    if(i->lastwasfill)
     {
-        x += (outline->dest.x/(float)0xffff);
-        y += (outline->dest.y/(float)0xffff);
-        if(outline->type == T1_PATHTYPE_MOVE)
-        {
-            if(((int)(lastx*20) != (int)(firstx*20) ||
-                (int)(lasty*20) != (int)(firsty*20)) &&
-                     fill && !init)
-            {
-                plotxy p0;
-                plotxy p1;
-                p0.x=lastx;
-                p0.y=lasty;
-                p1.x=firstx;
-                p1.y=firsty;
-                if(log) printf("fix: %f,%f -> %f,%f\n",p0.x,p0.y,p1.x,p1.y);
-                line(tag, p0, p1, m);
-            }
-            firstx=x;
-            firsty=y;
-            init = 0;
-        }
-        else if(outline->type == T1_PATHTYPE_LINE) 
-        {
-            plotxy p0;
-            plotxy p1;
-            p0.x=lastx;
-            p0.y=lasty;
-            p1.x=x;
-            p1.y=y;
-            if(log) printf("line: %f,%f -> %f,%f\n",p0.x,p0.y,p1.x,p1.y);
-            line(tag, p0,p1,m);
-        }
-        else if(outline->type == T1_PATHTYPE_BEZIER)
-        {
-            plotxy p0;
-            plotxy p1;
-            plotxy p2;
-            plotxy p3;
-            T1_BEZIERSEGMENT*o2 = (T1_BEZIERSEGMENT*)outline;
-            p0.x=x; 
-            p0.y=y;
-            p1.x=o2->C.x/(float)0xffff+lastx;
-            p1.y=o2->C.y/(float)0xffff+lasty;
-            p2.x=o2->B.x/(float)0xffff+lastx;
-            p2.y=o2->B.y/(float)0xffff+lasty;
-            p3.x=lastx;
-            p3.y=lasty;
-            if(log) printf("spline: %f,%f -> %f,%f\n",p3.x,p3.y,p0.x,p0.y);
-            spline(tag,p0,p1,p2,p3,m);
-        } 
-        else {
-         logf("<error> drawpath: unknown outline type:%d\n", outline->type);
-        }
-        lastx=x;
-        lasty=y;
-        outline = outline->link;
+       swf_ShapeSetStyle(i->tag,i->shape,i->linestyleid,0x8000,0);
+       i->fillstylechanged = 1;
+       i->lastwasfill = 0;
     }
-    if(((int)(lastx*20) != (int)(firstx*20) ||
-        (int)(lasty*20) != (int)(firsty*20)) &&
-             fill)
+}
+static void startFill(gfxdevice_t*dev)
+{
+    swfoutput_internal*i = (swfoutput_internal*)dev->internal;
+    if(!i->lastwasfill)
     {
-        plotxy p0;
-        plotxy p1;
-        p0.x=lastx;
-        p0.y=lasty;
-        p1.x=firstx;
-        p1.y=firsty;
-        if(log) printf("fix: %f,%f -> %f,%f\n",p0.x,p0.y,p1.x,p1.y);
-        line(tag, p0, p1, m);
+       swf_ShapeSetStyle(i->tag,i->shape,0x8000,i->fillstyleid,0);
+       i->fillstylechanged = 1;
+       i->lastwasfill = 1;
     }
 }
 
-static inline int colorcompare(RGBA*a,RGBA*b)
+static inline int colorcompare(gfxdevice_t*dev, RGBA*a,RGBA*b)
 {
 
     if(a->r!=b->r ||
@@ -268,23 +428,74 @@ static inline int colorcompare(RGBA*a,RGBA*b)
     return 1;
 }
 
-static const int CHARDATAMAX = 1024;
-struct chardata {
-    int charid;
-    int fontid;
-    int x;
-    int y;
-    int size;
-    RGBA color;
-} chardata[CHARDATAMAX];
-int chardatapos = 0;
+static SRECT getcharacterbbox(gfxdevice_t*dev, SWFFONT*font, MATRIX* m)
+{
+    swfoutput_internal*i = (swfoutput_internal*)dev->internal;
+    SRECT r;
+    char debug = 0;
+    memset(&r, 0, sizeof(r));
+
+    int t;
+    if(debug) printf("\n");
+    for(t=0;t<i->chardatapos;t++)
+    {
+       if(i->chardata[t].fontid != font->id) {
+           msg("<error> Internal error: fontid %d != fontid %d", i->chardata[t].fontid, font->id);
+           exit(1);
+       }
+       SRECT b = font->layout->bounds[i->chardata[t].charid];
+       b.xmin *= i->chardata[t].size;
+       b.ymin *= i->chardata[t].size;
+       b.xmax *= i->chardata[t].size;
+       b.ymax *= i->chardata[t].size;
+
+       /* divide by 1024, rounding xmax/ymax up */
+       b.xmax += 1023; b.ymax += 1023; b.xmin /= 1024; b.ymin /= 1024; b.xmax /= 1024; b.ymax /= 1024;
+
+       b.xmin += i->chardata[t].x;
+       b.ymin += i->chardata[t].y;
+       b.xmax += i->chardata[t].x;
+       b.ymax += i->chardata[t].y;
+
+       /* until we solve the INTERNAL_SCALING problem (see below)
+          make sure the bounding box is big enough */
+       b.xmin -= 20;
+       b.ymin -= 20;
+       b.xmax += 20;
+       b.ymax += 20;
+
+       b = swf_TurnRect(b, m);
+
+       if(debug) printf("(%f,%f,%f,%f) -> (%f,%f,%f,%f) [font %d/%d, char %d]\n",
+               font->layout->bounds[i->chardata[t].charid].xmin/20.0,
+               font->layout->bounds[i->chardata[t].charid].ymin/20.0,
+               font->layout->bounds[i->chardata[t].charid].xmax/20.0,
+               font->layout->bounds[i->chardata[t].charid].ymax/20.0,
+               b.xmin/20.0,
+               b.ymin/20.0,
+               b.xmax/20.0,
+               b.ymax/20.0,
+               i->chardata[t].fontid,
+               font->id,
+               i->chardata[t].charid
+               );
+       swf_ExpandRect2(&r, &b);
+    }
+    if(debug) printf("-----> (%f,%f,%f,%f)\n",
+           r.xmin/20.0,
+           r.ymin/20.0,
+           r.xmax/20.0,
+           r.ymax/20.0);
+    return r;
+}
 
-static void putcharacters(TAG*tag)
+static void putcharacters(gfxdevice_t*dev, TAG*tag)
 {
+    swfoutput_internal*i = (swfoutput_internal*)dev->internal;
     int t;
     SWFFONT font;
     RGBA color;
-    color.r = chardata[0].color.r^255;
+    color.r = i->chardata[0].color.r^255;
     color.g = 0;
     color.b = 0;
     color.a = 0;
@@ -301,11 +512,11 @@ static void putcharacters(TAG*tag)
 
     if(tag->id != ST_DEFINETEXT &&
         tag->id != ST_DEFINETEXT2) {
-        logf("<error> internal error: putcharacters needs an text tag, not %d\n",tag->id);
+        msg("<error> internal error: putcharacters needs an text tag, not %d\n",tag->id);
         exit(1);
     }
-    if(!chardatapos) {
-        logf("<warning> putcharacters called with zero characters");
+    if(!i->chardatapos) {
+        msg("<warning> putcharacters called with zero characters");
     }
 
     for(pass = 0; pass < 2; pass++)
@@ -323,15 +534,15 @@ static void putcharacters(TAG*tag)
             swf_SetU8(tag, advancebits);
         }
 
-        for(t=0;t<=chardatapos;t++)
+        for(t=0;t<=i->chardatapos;t++)
         {
-            if(lastfontid != chardata[t].fontid || 
-                    lastx!=chardata[t].x ||
-                    lasty!=chardata[t].y ||
-                    !colorcompare(&color, &chardata[t].color) ||
+            if(lastfontid != i->chardata[t].fontid || 
+                    lastx!=i->chardata[t].x ||
+                    lasty!=i->chardata[t].y ||
+                    !colorcompare(dev,&color, &i->chardata[t].color) ||
                     charstorepos==127 ||
-                    lastsize != chardata[t].size ||
-                    t == chardatapos)
+                    lastsize != i->chardata[t].size ||
+                    t == i->chardatapos)
             {
                 if(charstorepos && pass==0)
                 {
@@ -358,842 +569,918 @@ static void putcharacters(TAG*tag)
                 }
                 charstorepos = 0;
 
-                if(pass == 1 && t<chardatapos)
+                if(pass == 1 && t<i->chardatapos)
                 {
                     RGBA*newcolor=0;
                     SWFFONT*newfont=0;
                     int newx = 0;
                     int newy = 0;
-                    if(lastx != chardata[t].x ||
-                       lasty != chardata[t].y)
+                    if(lastx != i->chardata[t].x ||
+                       lasty != i->chardata[t].y)
                     {
-                        newx=chardata[t].x;
-                        newy=chardata[t].y;
+                        newx = i->chardata[t].x;
+                        newy = i->chardata[t].y;
+                       if(newx == 0)
+                           newx = SET_TO_ZERO;
+                       if(newy == 0)
+                           newy = SET_TO_ZERO;
                     }
-                    if(!colorcompare(&color, &chardata[t].color)) 
+                    if(!colorcompare(dev,&color, &i->chardata[t].color)) 
                     {
-                        color = chardata[t].color;
+                        color = i->chardata[t].color;
                         newcolor = &color;
                     }
-                    font.id = chardata[t].fontid;
-                    if(lastfontid != chardata[t].fontid || lastsize != chardata[t].size)
+                    font.id = i->chardata[t].fontid;
+                    if(lastfontid != i->chardata[t].fontid || lastsize != i->chardata[t].size)
                         newfont = &font;
 
                     tag->writeBit = 0; // Q&D
-                    swf_TextSetInfoRecord(tag, newfont, chardata[t].size, newcolor, newx,newy);
+                    swf_TextSetInfoRecord(tag, newfont, i->chardata[t].size, newcolor, newx,newy);
                 }
 
-                lastfontid = chardata[t].fontid;
-                lastx = chardata[t].x;
-                lasty = chardata[t].y;
-                lastsize = chardata[t].size;
+                lastfontid = i->chardata[t].fontid;
+                lastx = i->chardata[t].x;
+                lasty = i->chardata[t].y;
+                lastsize = i->chardata[t].size;
             }
 
-            if(t==chardatapos)
+            if(t==i->chardatapos)
                     break;
 
             int advance;
-            int nextt = t==chardatapos-1?t:t+1;
-            int rel = chardata[nextt].x-chardata[t].x;
+            int nextt = t==i->chardatapos-1?t:t+1;
+            int rel = i->chardata[nextt].x-i->chardata[t].x;
             if(rel>=0 && (rel<(1<<(advancebits-1)) || pass==0)) {
                advance = rel;
-               lastx=chardata[nextt].x;
+               lastx=i->chardata[nextt].x;
             }
             else {
                advance = 0;
-               lastx=chardata[t].x;
+               lastx=i->chardata[t].x;
             }
-            charids[charstorepos] = chardata[t].charid;
+            charids[charstorepos] = i->chardata[t].charid;
             charadvance[charstorepos] = advance;
             charstorepos ++;
         }
     }
-    chardatapos = 0;
+    i->chardatapos = 0;
 }
 
-static void putcharacter(struct swfoutput*obj, int fontid, int charid, 
-                    int x,int y, int size)
+static void putcharacter(gfxdevice_t*dev, int fontid, int charid, int x,int y, int size, RGBA color)
 {
-    if(chardatapos == CHARDATAMAX)
+    swfoutput_internal*i = (swfoutput_internal*)dev->internal;
+    if(i->chardatapos == CHARDATAMAX)
     {
-        endtext();
-        starttext(obj);
+       msg("<warning> Character buffer too small. SWF will be slightly bigger");
+        endtext(dev);
+        starttext(dev);
     }
-    chardata[chardatapos].fontid = fontid;
-    chardata[chardatapos].charid = charid;
-    chardata[chardatapos].x = x;
-    chardata[chardatapos].y = y;
-    chardata[chardatapos].color = obj->fillrgb;
-    chardata[chardatapos].size = size;
-    chardatapos++;
+    i->chardata[i->chardatapos].fontid = fontid;
+    i->chardata[i->chardatapos].charid = charid;
+    i->chardata[i->chardatapos].x = x;
+    i->chardata[i->chardatapos].y = y;
+    i->chardata[i->chardatapos].color = color;
+    i->chardata[i->chardatapos].size = size;
+    i->chardatapos++;
 }
 
+/* Notice: we can only put chars in the range -1639,1638 (-32768/20,32768/20).
+   So if we set this value to high, the char coordinates will overflow.
+   If we set it to low, however, the char positions will be inaccurate */
+#define FONT_INTERNAL_SIZE 4
 
 /* process a character. */
-static void drawchar(struct swfoutput*obj, SWFFont*font, char*character, int charnr, swfmatrix*m)
+static int drawchar(gfxdevice_t*dev, SWFFONT *swffont, int charid, swfmatrix*m, gfxcolor_t*col)
 {
-    int usefonts=1;
-    if(m->m12!=0 || m->m21!=0)
-        usefonts=0;
-    if(m->m11 != m->m22)
-        usefonts=0;
-
-    if(usefonts && ! drawonlyshapes)
-    {
-        int charid = font->getSWFCharID(character, charnr);
-        if(shapeid>=0)
-            endshape();
-        if(textid<0)
-            starttext(obj);
-        putcharacter(obj, font->swfid, charid,(int)(m->m13*20),(int)(m->m23*20),
-                (int)(m->m11*20/2+0.5)); //where does the /2 come from?
+    swfoutput_internal*i = (swfoutput_internal*)dev->internal;
+    if(!swffont) {
+       msg("<warning> Font is NULL");
+       return 0;
     }
-    else
-    {
-        T1_OUTLINE*outline = font->getOutline(character);
-        char* charname = character;
-
-        if(!outline) {
-         logf("<warning> Didn't find %s in current charset (%s)", 
-                 FIXNULL(character),FIXNULL(font->getName()));
-         return;
-        }
-        
-        swfmatrix m2=*m;    
-        m2.m11/=100;
-        m2.m21/=100;
-        m2.m12/=100;
-        m2.m22/=100;
-
-        if(textid>=0)
-            endtext();
-        if(shapeid<0)
-            startshape(obj);
-
-        if(!lastwasfill) {
-         swf_ShapeSetStyle(tag,shape,0x8000,fillstyleid,0);
-        fillstylechanged = 1;
-       }
-        lastwasfill = 1;
 
-        int lf = fill;
-        fill = 1;
-        drawpath(tag, outline, &m2, 0);
-        fill = lf;
+    if(charid<0 || charid>=swffont->numchars) {
+       msg("<warning> No character %d in font %s ", charid, FIXNULL((char*)swffont->name));
+       return 0;
     }
-}
-
-/* draw a curved polygon. */
-void swfoutput_drawpath(swfoutput*output, T1_OUTLINE*outline, 
-                            struct swfmatrix*m)
-{
-    if(textid>=0)
-        endtext();
-
-    /* Multiple polygons in one shape don't overlap correctly, 
-       so we better start a new shape here if the polygon is filled
-     */
-    if(shapeid>=0 && fill && !ignoredraworder) {
-       endshape();
+    /*if(swffont->glyph[charid].shape->bitlen <= 16) {
+       msg("<warning> Glyph %d in current charset (%s, %d characters) is empty", 
+               charid, FIXNULL((char*)swffont->name), swffont->numchars);
+       return 1;
+    }*/
+
+    if(i->shapeid>=0)
+       endshape(dev);
+    if(i->textid<0)
+       starttext(dev);
+
+    float x = m->m31;
+    float y = m->m32;
+    float det = ((m->m11*m->m22)-(m->m21*m->m12));
+    if(fabs(det) < 0.0005) { 
+       /* x direction equals y direction- the text is invisible */
+       return 1;
     }
+    det = 20*FONT_INTERNAL_SIZE / det;
 
-    if(shapeid<0)
-        startshape(output);
+    SPOINT p;
+    p.x = (SCOORD)((  x * m->m22 - y * m->m12)*det);
+    p.y = (SCOORD)((- x * m->m21 + y * m->m11)*det);
 
-    if(lastwasfill && !fill)
-    {
-     swf_ShapeSetStyle(tag,shape,linestyleid,0x8000,0);
-     fillstylechanged = 1;
-     lastwasfill = 0;
-    }
-    if(!lastwasfill && fill)
-    {
-     swf_ShapeSetStyle(tag,shape,0x8000,fillstyleid,0);
-     fillstylechanged = 1;
-     lastwasfill = 1;
-    }
-
-    drawpath(tag, outline,m, 0); 
+    RGBA rgba = *(RGBA*)col;
+    putcharacter(dev, swffont->id, charid,p.x,p.y,FONT_INTERNAL_SIZE, rgba);
+    swf_FontUseGlyph(swffont, charid);
+    return 1;
 }
 
-/* SWFFont: copy all t1 font outlines to a local 
-   array. */
-SWFFont::SWFFont(char*name, int id, char*filename)
+static void endtext(gfxdevice_t*dev)
 {
-    if(!T1_GetFontName(id))
-        T1_LoadFont(id);
+    swfoutput_internal*i = (swfoutput_internal*)dev->internal;
+    if(i->textid<0)
+        return;
+
+    i->tag = swf_InsertTag(i->tag,ST_DEFINETEXT);
+    swf_SetU16(i->tag, i->textid);
 
-    this->name = strdup(T1_GetFontFileName(id));
-    this->fontid = strdup(name);
-    this->t1id = id;
+    SRECT r;
+    r = getcharacterbbox(dev, i->swffont, &i->fontmatrix);
     
-    char**a= T1_GetAllCharNames(id);
-    int t, outlinepos=0;
-    char*map[256];
+    swf_SetRect(i->tag,&r);
 
-    t=0;
-    while(a[t])
-        t++;
-    this->charnum = t;
+    swf_SetMatrix(i->tag,&i->fontmatrix);
 
-    if(!charnum) 
-        return;
-    logf("<verbose> Font %s(%d): Storing %d outlines.\n", FIXNULL(name), id, charnum);
+    msg("<trace> Placing text (%d characters) as ID %d", i->chardatapos, i->textid);
 
-    this->standardtablesize = 256;
-    if(this->charnum < this->standardtablesize)
-       this->standardtablesize = this->charnum;
-    this->standardtable = (char**)malloc(standardtablesize*sizeof(char*));
+    putcharacters(dev, i->tag);
+    swf_SetU8(i->tag,0);
+    i->tag = swf_InsertTag(i->tag,ST_PLACEOBJECT2);
 
-    for(t = 0; t < this->standardtablesize; t++) {
-       char*name = T1_GetCharName(id,t);
-       if(!name)
-           name = "";
-       standardtable[t] = strdup(name);
-    }
-    
-    outline = (T1_OUTLINE**)malloc(charnum*sizeof(T1_OUTLINE*));
-    charname = (char**)malloc(charnum*sizeof(char*));
-    width = (int*)malloc(charnum*sizeof(int));
-    memset(width, 0, charnum*sizeof(int));
-    memset(charname, 0, charnum*sizeof(char*));
-    used = (char*)malloc(charnum*sizeof(char));
-    char2swfcharid = (U16*)malloc(charnum*2);
-    swfcharid2char = (U16*)malloc(charnum*2);
-    swfcharpos = 0;
-
-    memset(used,0,charnum*sizeof(char));
-
-    this->swfid = ++currentswfid;
-    
-    t=0;
-    while(*a)
-    {
-        map[t] = *a;
-        a++;
-        t++;
-        if(t==256 || !*a) {
-            int s;
-            for(s=t;s<256;s++)
-                map[s] = ".notdef";
-
-            int ret = T1_ReencodeFont(id, map);
-            if(ret) {
-             T1_DeleteFont(id);
-             T1_LoadFont(id);
-             int ret = T1_ReencodeFont(id, map);
-             if(ret)
-               fprintf(stderr,"Can't reencode font: (%s) ret:%d\n",filename, ret);
-            }
-
-            // parsecharacters
-            for(s=0;s<t;s++)
-            {
-               char* name = T1_GetCharName(id, s);
-               if(!name) name = "";
-                this->outline[outlinepos] = T1_CopyOutline(T1_GetCharOutline(id, s, 100.0, 0));
-               this->width[outlinepos] = T1_GetCharWidth(id, s);
-                this->charname[outlinepos] = strdup(name);
-                outlinepos++;
-            }
-            t=0;
-        }
-    }
+    swf_ObjectPlace(i->tag,i->textid,getNewDepth(dev),&i->page_matrix,NULL,NULL);
+    i->textid = -1;
 }
 
-/* free all tables, write out definefont tags */
-SWFFont::~SWFFont()
+/* set's the matrix which is to be applied to characters drawn by swfoutput_drawchar() */
+static void swfoutput_setfontmatrix(gfxdevice_t*dev,double m11,double m21,
+                                                  double m12,double m22)
 {
-    int t,usednum=0;
-    int*ptr; 
-
-    if(storeallcharacters)
-    {
-       int t;
-       for(t=0;t<this->charnum;t++) 
-       {
-           if(this->charname[t])
-             getSWFCharID(this->charname[t], -1);
-       }
-    }
+    m11 *= 1024;
+    m12 *= 1024;
+    m21 *= 1024;
+    m22 *= 1024;
+    swfoutput_internal*i = (swfoutput_internal*)dev->internal;
+    if(i->fontm11 == m11 &&
+       i->fontm12 == m12 &&
+       i->fontm21 == m21 &&
+       i->fontm22 == m22)
+        return;
+   if(i->textid>=0)
+       endtext(dev);
+    i->fontm11 = m11;
+    i->fontm12 = m12;
+    i->fontm21 = m21;
+    i->fontm22 = m22;
     
-    ptr = (int*)malloc(swfcharpos*sizeof(int));
-
-    for(t=0;t<charnum;t++)
-        if(used[t]) usednum++;
-
-    if(usednum && !drawonlyshapes)
-    {
-        logf("<verbose> Font %s has %d used characters",FIXNULL(fontid), usednum);
-        TAG*ftag = swf_InsertTag(swf.firstTag,ST_DEFINEFONT);
-        swf_SetU16(ftag, this->swfid);
-        int initpos = swf_GetTagLen(ftag);
-        swfmatrix m;
-        m.m11 = m.m22 = 1;
-        m.m21 = m.m12 = 0;
-        m.m13 = CHARMIDX;
-        m.m23 = CHARMIDY;
-
-        for(t=0;t<swfcharpos;t++) 
-        {
-            ptr[t] = swf_GetTagLen(ftag);
-            swf_SetU16(ftag, 0x1234);
-        }
-        for(t=0;t<swfcharpos;t++)
-        {
-            *(U16*)&ftag->data[ptr[t]] = 
-               SWAP16(swf_GetTagLen(ftag)-initpos);
-
-            swflastx=0;
-            swflasty=0;
-            swf_SetU8(ftag,0x10); //0 fill bits, 0 linestyle bits
-            SHAPE s;
-            s.bits.fill = 1;
-            s.bits.line = 0;
-            swf_ShapeSetStyle(ftag,&s,0,1,0);
-           fillstylechanged = 1;
-            int lastfill = fill;
-            fill = 1;
-            storefont = 1;
-            drawpath(ftag, outline[swfcharid2char[t]],&m, 0);
-            storefont = 0;
-            fill = lastfill;
-            swf_ShapeSetEnd(ftag);
-        }
-        ftag = swf_InsertTag(ftag,ST_DEFINEFONTINFO);
-       swf_SetU16(ftag, this->swfid);
-       if(this->fontid) {
-           swf_SetU8(ftag, strlen(this->fontid));
-           swf_SetBlock(ftag, (U8*)this->fontid, strlen(this->fontid));
-       } else {
-           swf_SetU8(ftag, 0);
-       }
-       swf_SetU8(ftag, 0); //flags
-       for(t=0;t<swfcharpos;t++)
-       {
-           int s;
-           char * name = this->charname[this->swfcharid2char[t]];
-           for(s=0;s<256;s++) {
-               if(standardEncodingNames[s] && 
-                       !strcmp(name,standardEncodingNames[s]))
-                   break;
-           }
-           swf_SetU8(ftag, (U8)s);
-       }
-    }
-
-    free(ptr);
-    free(outline);
-    for(t=0;t<charnum;t++)
-        free(charname[t]);
-    for(t=0;t<standardtablesize;t++)
-       if(standardtable[t]) {
-           free(standardtable[t]);
-       }
-    free(standardtable);
-    free(charname);
-    free(width);
-    free(used);
-    free(swfcharid2char);
-    free(char2swfcharid);
+    MATRIX m;
+    m.sx = (U32)(((i->fontm11)*65536)/FONT_INTERNAL_SIZE); m.r1 = (U32)(((i->fontm12)*65536)/FONT_INTERNAL_SIZE);
+    m.r0 = (U32)(((i->fontm21)*65536)/FONT_INTERNAL_SIZE); m.sy = (U32)(((i->fontm22)*65536)/FONT_INTERNAL_SIZE); 
+    m.tx = 0;
+    m.ty = 0;
+    i->fontmatrix = m;
 }
 
-T1_OUTLINE*SWFFont::getOutline(char*name)
+static void endpage(gfxdevice_t*dev)
 {
-    int t;
-    for(t=0;t<this->charnum;t++) {
-        if(!strcmp(this->charname[t],name)) {
-            if(!used[t])
-            {
-                swfcharid2char[swfcharpos] = t;
-                char2swfcharid[t] = swfcharpos;
-                swfcharpos++;
-                used[t] = 1;
-            }
-            return outline[t];
-        }
-    }
-    return 0;
+    swfoutput_internal*i = (swfoutput_internal*)dev->internal;
+    if(i->shapeid>=0)
+      endshape(dev);
+    if(i->textid>=0)
+      endtext(dev);
+    while(i->clippos)
+        dev->endclip(dev);
+    i->pagefinished = 1;
 }
 
-int SWFFont::getWidth(char*name)
+void swf_startframe(gfxdevice_t*dev, int width, int height)
 {
-    int t;
-    for(t=0;t<this->charnum;t++) {
-        if(!strcmp(this->charname[t],name)) {
-            return this->width[t];
-        }
-    }
-    return 0;
+    swfoutput_internal*i = (swfoutput_internal*)dev->internal;
+    if(!i->firstpage && !i->pagefinished)
+        endpage(dev);
+    msg("<verbose> Starting new SWF page of size %dx%d", width, height);
+
+    swf_GetMatrix(0, &i->page_matrix);
+    i->page_matrix.tx = 0;
+    i->page_matrix.ty = 0;
+    i->min_x = 0;
+    i->min_y = 0;
+    i->max_x = width;
+    i->max_y = height;
+
+    /* set clipping/background rectangle */
+    /* TODO: this should all be done in SWFOutputDev */
+    //setBackground(dev, x1, y1, x2, y2);
+
+    /* increase SWF's bounding box */
+    SRECT r;
+    r.xmin = 0;
+    r.ymin = 0;
+    r.xmax = width*20;
+    r.ymax = height*20;
+    swf_ExpandRect2(&i->swf->movieSize, &r);
+
+    i->lastframeno = i->frameno;
+    i->firstpage = 0;
+    i->pagefinished = 0;
 }
 
-int SWFFont::getSWFCharID(char*name, int charnr)
+void swf_endframe(gfxdevice_t*dev)
 {
-    int t;
-    for(t=0;t<this->charnum;t++) {
-        if(!strcmp(this->charname[t],name)) {
-            if(!used[t])
-            {
-                swfcharid2char[swfcharpos] = t;
-                char2swfcharid[t] = swfcharpos++;
-                used[t] = 1;
-            }
-            return char2swfcharid[t];
-        }
+    swfoutput_internal*i = (swfoutput_internal*)dev->internal;
+    
+    if(!i->pagefinished)
+        endpage(dev);
+
+    if(i->config_insertstoptag) {
+       ActionTAG*atag=0;
+       atag = action_Stop(atag);
+       atag = action_End(atag);
+       i->tag = swf_InsertTag(i->tag,ST_DOACTION);
+       swf_ActionSet(i->tag,atag);
     }
-    if(this->standardtable && charnr>=0 && charnr < this->standardtablesize) {
-       return getSWFCharID(this->standardtable[charnr], -1);
+    i->tag = swf_InsertTag(i->tag,ST_SHOWFRAME);
+    i->frameno ++;
+    
+    for(i->depth;i->depth>i->startdepth;i->depth--) {
+        i->tag = swf_InsertTag(i->tag,ST_REMOVEOBJECT2);
+        swf_SetU16(i->tag,i->depth);
     }
-    logf("<warning> Didn't find character '%s' in font '%s'", FIXNULL(name), this->name);
-    return 0;
+    i->depth = i->startdepth;
 }
 
-char*SWFFont::getName()
+static void setBackground(gfxdevice_t*dev, int x1, int y1, int x2, int y2)
 {
-    return this->name;
+    swfoutput_internal*i = (swfoutput_internal*)dev->internal;
+    RGBA rgb;
+    rgb.a = rgb.r = rgb.g = rgb.b = 0xff;
+    SRECT r;
+    SHAPE* s;
+    int ls1=0,fs1=0;
+    int shapeid = getNewID(dev);
+    r.xmin = x1;
+    r.ymin = y1;
+    r.xmax = x2;
+    r.ymax = y2;
+    i->tag = swf_InsertTag(i->tag, ST_DEFINESHAPE);
+    swf_ShapeNew(&s);
+    fs1 = swf_ShapeAddSolidFillStyle(s, &rgb);
+    swf_SetU16(i->tag,shapeid);
+    swf_SetRect(i->tag,&r);
+    swf_SetShapeHeader(i->tag,s);
+    swf_ShapeSetAll(i->tag,s,x1,y1,ls1,fs1,0);
+    swf_ShapeSetLine(i->tag,s,(x2-x1),0);
+    swf_ShapeSetLine(i->tag,s,0,(y2-y1));
+    swf_ShapeSetLine(i->tag,s,(x1-x2),0);
+    swf_ShapeSetLine(i->tag,s,0,(y1-y2));
+    swf_ShapeSetEnd(i->tag);
+    swf_ShapeFree(s);
+    i->tag = swf_InsertTag(i->tag, ST_PLACEOBJECT2);
+    swf_ObjectPlace(i->tag,shapeid,getNewDepth(dev),0,0,0);
+    i->tag = swf_InsertTag(i->tag, ST_PLACEOBJECT2);
+    swf_ObjectPlaceClip(i->tag,shapeid,getNewDepth(dev),0,0,0,65535);
 }
 
-struct fontlist_t 
+/* initialize the swf writer */
+void gfxdevice_swf_init(gfxdevice_t* dev)
 {
-    SWFFont * font;
-    fontlist_t*next;
-} *fontlist = 0;
+    memset(dev, 0, sizeof(gfxdevice_t));
+    dev->internal = init_internal_struct();
+
+    dev->startpage = swf_startframe;
+    dev->endpage = swf_endframe;
+    dev->finish = swf_finish;
+    dev->fillbitmap = swf_fillbitmap;
+    dev->setparameter = swf_setparameter;
+    dev->stroke = swf_stroke;
+    dev->startclip = swf_startclip;
+    dev->endclip = swf_endclip;
+    dev->fill = swf_fill;
+    dev->fillbitmap = swf_fillbitmap;
+    dev->fillgradient = swf_fillgradient;
+    dev->addfont = swf_addfont;
+    dev->drawchar = swf_drawchar;
+    dev->drawlink = swf_drawlink;
+
+    swfoutput_internal*i = (swfoutput_internal*)dev->internal;
+    i->dev = dev;
 
-/* set's the t1 font index of the font to use for swfoutput_drawchar(). */
-void swfoutput_setfont(struct swfoutput*obj, char*fontid, int t1id, char*filename)
-{
-    fontlist_t*last=0,*iterator;
-    if(obj->font && !strcmp(obj->font->fontid,fontid))
-        return;
+    SRECT r;
+    RGBA rgb;
 
-    iterator = fontlist;
-    while(iterator) {
-        if(!strcmp(iterator->font->fontid,fontid))
-            break;
-        last = iterator;
-        iterator = iterator->next;
-    }
-    if(iterator) 
-    {
-        obj->font = iterator->font;
-        return ;
-    }
+    msg("<verbose> initializing swf output\n", i->max_x,i->max_y);
 
-    if(t1id<0) {
-        logf("<error> internal error: t1id:%d, fontid:%s\n", t1id,FIXNULL(fontid));
-    }
+    i->swffont = 0;
+   
+    i->swf = (SWF*)rfx_calloc(sizeof(SWF));
+    i->swf->fileVersion    = i->config_flashversion;
+    i->swf->frameRate      = 0x0040; // 1 frame per 4 seconds
+    i->swf->movieSize.xmin = 0;
+    i->swf->movieSize.ymin = 0;
+    i->swf->movieSize.xmax = 0;
+    i->swf->movieSize.ymax = 0;
     
-    SWFFont*font = new SWFFont(fontid, t1id, filename);
-    iterator = new fontlist_t;
-    iterator->font = font;
-    iterator->next = 0;
+    i->swf->firstTag = swf_InsertTag(NULL,ST_SETBACKGROUNDCOLOR);
+    i->tag = i->swf->firstTag;
+    rgb.a = rgb.r = rgb.g = rgb.b = 0xff;
+    swf_SetRGB(i->tag,&rgb);
 
-    if(last) 
-        last->next = iterator;
-    else 
-        fontlist = iterator;
-    obj->font = font;
+    i->startdepth = i->depth = 0;
+    
+    if(i->config_protect)
+      i->tag = swf_InsertTag(i->tag, ST_PROTECT);
 }
 
-int swfoutput_queryfont(struct swfoutput*obj, char*fontid)
+static void startshape(gfxdevice_t*dev)
 {
-    fontlist_t *iterator = fontlist;
-    while(iterator) {
-        if(!strcmp(iterator->font->fontid,fontid))
-            return 1;
-        iterator = iterator->next;
-    }
-    return 0;
-}
+    swfoutput_internal*i = (swfoutput_internal*)dev->internal;
+    SRECT r;
 
-/* set's the matrix which is to be applied to characters drawn by
-   swfoutput_drawchar() */
-void swfoutput_setfontmatrix(struct swfoutput*obj,double m11,double m12,
-                                                  double m21,double m22)
-{
-    if(obj->fontm11 == m11 &&
-       obj->fontm12 == m12 &&
-       obj->fontm21 == m21 &&
-       obj->fontm22 == m22)
-        return;
-//    if(textid>=0)
-//      endtext();
-    obj->fontm11 = m11;
-    obj->fontm12 = m12;
-    obj->fontm21 = m21;
-    obj->fontm22 = m22;
-}
+    if(i->shapeid>=0)
+       return;
 
-/* draws a character at x,y. */
-void swfoutput_drawchar(struct swfoutput* obj,double x,double y,char*character, int charnr) 
-{
-    swfmatrix m;
-    m.m11 = obj->fontm11;
-    m.m12 = obj->fontm12;
-    m.m21 = obj->fontm21;
-    m.m22 = obj->fontm22;
-    m.m13 = x;
-    m.m23 = y;
-    drawchar(obj, obj->font, character, charnr, &m);
-}
+    if(i->textid>=0)
+        endtext(dev);
 
-/* initialize the swf writer */
-void swfoutput_init(struct swfoutput* obj, char*_filename, int _sizex, int _sizey) 
-{
-  GLYPH *glyph;
-  RGBA rgb;
-  SRECT r;
-  memset(obj, 0, sizeof(struct swfoutput));
-  filename = _filename;
-  sizex = _sizex;
-  sizey = _sizey;
+    i->tag = swf_InsertTag(i->tag,ST_DEFINESHAPE);
 
-  logf("<verbose> initializing swf output for size %d*%d\n", sizex,sizey);
+    swf_ShapeNew(&i->shape);
+    i->linestyleid = swf_ShapeAddLineStyle(i->shape,i->linewidth,&i->strokergb);
+    i->fillstyleid = swf_ShapeAddSolidFillStyle(i->shape,&i->fillrgb);
 
-  obj->font = 0;
-  
-  memset(&swf,0x00,sizeof(SWF));
+    i->shapeid = getNewID(dev);
+    
+    msg("<debug> Using shape id %d", i->shapeid);
 
-  swf.fileVersion    = 4;
-  swf.frameRate      = 0x0040; // 1 frame per 4 seconds
-  swf.movieSize.xmax = 20*sizex;
-  swf.movieSize.ymax = 20*sizey;
-  
-  swf.firstTag = swf_InsertTag(NULL,ST_SETBACKGROUNDCOLOR);
-  tag = swf.firstTag;
-  rgb.r = 0xff;
-  rgb.g = 0xff;
-  rgb.b = 0xff;
-  swf_SetRGB(tag,&rgb);
-  if(flag_protected)  // good practice! /r
-    tag = swf_InsertTag(tag, ST_PROTECT);
-  depth = 1;
-  startdepth = depth;
-}
+    swf_SetU16(i->tag,i->shapeid);  // ID
 
-void swfoutput_setprotected() //write PROTECT tag
-{
-  flag_protected = 1;
+    i->bboxrectpos = i->tag->len;
+    /* changed later */
+    r.xmin = 0;
+    r.ymin = 0;
+    r.xmax = 20*i->max_x;
+    r.ymax = 20*i->max_y;
+    swf_SetRect(i->tag,&r);
+   
+    memset(&i->bboxrect, 0, sizeof(i->bboxrect));
+
+    swf_SetShapeStyles(i->tag,i->shape);
+    swf_ShapeCountBits(i->shape,NULL,NULL);
+    swf_SetShapeBits(i->tag,i->shape);
+
+    /* TODO: do we really need this? */
+    swf_ShapeSetAll(i->tag,i->shape,/*x*/0,/*y*/0,i->linestyleid,0,0);
+    i->swflastx=i->swflasty=0;
+    i->lastwasfill = 0;
+    i->shapeisempty = 1;
 }
 
-static void startshape(struct swfoutput*obj)
+static void starttext(gfxdevice_t*dev)
 {
-  RGBA rgb;
-  SRECT r;
-
-  if(textid>=0)
-      endtext();
+    swfoutput_internal*i = (swfoutput_internal*)dev->internal;
+    if(i->shapeid>=0)
+        endshape(dev);
+      
+    i->textid = getNewID(dev);
 
-  tag = swf_InsertTag(tag,ST_DEFINESHAPE);
+    i->swflastx=i->swflasty=0;
+}
+           
 
-  swf_ShapeNew(&shape);
-  linestyleid = swf_ShapeAddLineStyle(shape,obj->linewidth,&obj->strokergb);
-  rgb.r = obj->fillrgb.r;
-  rgb.g = obj->fillrgb.g;
-  rgb.b = obj->fillrgb.b;
-  fillstyleid = swf_ShapeAddSolidFillStyle(shape,&obj->fillrgb);
+/* TODO: move to ../lib/rfxswf */
+void changeRect(gfxdevice_t*dev, TAG*tag, int pos, SRECT*newrect)
+{
+    swfoutput_internal*i = (swfoutput_internal*)dev->internal;
+    /* determine length of old rect */
+    tag->pos = pos;
+    tag->readBit = 0;
+    SRECT old;
+    swf_GetRect(tag, &old);
+    swf_ResetReadBits(tag);
+    int pos_end = tag->pos;
+
+    int len = tag->len - pos_end;
+    U8*data = (U8*)malloc(len);
+    memcpy(data, &tag->data[pos_end], len);
+    tag->writeBit = 0;
+    tag->len = pos;
+    swf_SetRect(tag, newrect);
+    swf_SetBlock(tag, data, len);
+    free(data);
+    tag->pos = tag->readBit = 0;
+}
 
-  shapeid = ++currentswfid;
-  swf_SetU16(tag,shapeid);  // ID
+void cancelshape(gfxdevice_t*dev)
+{
+    swfoutput_internal*i = (swfoutput_internal*)dev->internal;
+    /* delete old shape tag */
+    TAG*todel = i->tag;
+    i->tag = i->tag->prev;
+    swf_DeleteTag(todel);
+    if(i->shape) {swf_ShapeFree(i->shape);i->shape=0;}
+    i->shapeid = -1;
+    i->bboxrectpos = -1;
+}
 
-  r.xmin = 0;
-  r.ymin = 0;
-  r.xmax = 20*sizex;
-  r.ymax = 20*sizey;
-  
-  swf_SetRect(tag,&r);
+void fixAreas(gfxdevice_t*dev)
+{
+    swfoutput_internal*i = (swfoutput_internal*)dev->internal;
+    if(!i->shapeisempty && i->fill &&
+       (i->bboxrect.xmin == i->bboxrect.xmax ||
+        i->bboxrect.ymin == i->bboxrect.ymax) &&
+        i->config_minlinewidth >= 0.001
+       ) {
+       msg("<debug> Shape has size 0: width=%.2f height=%.2f",
+               (i->bboxrect.xmax-i->bboxrect.xmin)/20.0,
+               (i->bboxrect.ymax-i->bboxrect.ymin)/20.0
+               );
+    
+       SRECT r = i->bboxrect;
+       
+       if(r.xmin == r.xmax && r.ymin == r.ymax) {
+           /* this thing comes down to a single dot- nothing to fix here */
+           return;
+       }
 
-  swf_SetShapeStyles(tag,shape);
-  swf_ShapeCountBits(shape,NULL,NULL);
-  swf_SetShapeBits(tag,shape);
+       cancelshape(dev);
 
-  swf_ShapeSetAll(tag,shape,/*x*/0,/*y*/0,linestyleid,0,0);
-  swflastx=swflasty=0;
-  lastwasfill = 0;
-}
+       RGBA save_col = i->strokergb;
+       int  save_width = i->linewidth;
 
-static void starttext(struct swfoutput*obj)
-{
-  SRECT r;
-  MATRIX m;
-  if(shapeid>=0)
-      endshape();
-  tag = swf_InsertTag(tag,ST_DEFINETEXT);
-  textid = ++currentswfid;
-  swf_SetU16(tag, textid);
+       i->strokergb = i->fillrgb;
+       i->linewidth = (int)(i->config_minlinewidth*20);
+       if(i->linewidth==0) i->linewidth = 1;
+       
+       startshape(dev);
 
-  r.xmin = 0;
-  r.ymin = 0;
-  r.xmax = 20*sizex;
-  r.ymax = 20*sizey;
-  
-  swf_SetRect(tag,&r);
+       moveto(dev, i->tag, r.xmin/20.0,r.ymin/20.0);
+       lineto(dev, i->tag, r.xmax/20.0,r.ymax/20.0);
 
-  m.sx = 65536;
-  m.sy = 65536;
-  m.r0 = 0;
-  m.r1 = 0;
-  m.tx = 0;
-  m.ty = 0;
-  swf_SetMatrix(tag,&m);
-  swflastx=swflasty=0;
+       i->strokergb = save_col;
+       i->linewidth = save_width;
+    }
+    
 }
 
-static void endshape()
+static void endshape_noput(gfxdevice_t*dev)
 {
-    if(shapeid<0) 
+    swfoutput_internal*i = (swfoutput_internal*)dev->internal;
+    if(i->shapeid<0) 
         return;
-    swf_ShapeSetEnd(tag);
-    tag = swf_InsertTag(tag,ST_PLACEOBJECT2);
-    swf_ObjectPlace(tag,shapeid,/*depth*/depth++,NULL,NULL,NULL);
-    shapeid = -1;
+    //changeRect(dev, i->tag, i->bboxrectpos, &i->bboxrect);
+    i->shapeid = -1;
+    if(i->shape) {
+        swf_ShapeFree(i->shape);
+        i->shape=0;
+    }
+    i->fill=0;
+    i->shapeposx=0;
+    i->shapeposy=0;
 }
 
-static void endtext()
+static void endshape(gfxdevice_t*dev)
 {
-    if(textid<0)
+    swfoutput_internal*i = (swfoutput_internal*)dev->internal;
+    if(i->shapeid<0) 
         return;
-    putcharacters(tag);
-    swf_SetU8(tag,0);
-    tag = swf_InsertTag(tag,ST_PLACEOBJECT2);
-    swf_ObjectPlace(tag,textid,/*depth*/depth++,NULL,NULL,NULL);
-    textid = -1;
+
+    fixAreas(dev);
+       
+    if(i->shapeisempty ||
+       /*bbox empty?*/
+       (i->bboxrect.xmin == i->bboxrect.xmax && 
+        i->bboxrect.ymin == i->bboxrect.ymax))
+    {
+       // delete the shape again, we didn't do anything
+       msg("<debug> cancelling shape: bbox is (%f,%f,%f,%f)",
+               i->bboxrect.xmin /20.0,
+               i->bboxrect.ymin /20.0,
+               i->bboxrect.xmax /20.0,
+               i->bboxrect.ymax /20.0
+               );
+       cancelshape(dev);
+       return;
+    }
+    
+    swf_ShapeSetEnd(i->tag);
+
+    changeRect(dev, i->tag, i->bboxrectpos, &i->bboxrect);
+
+    msg("<trace> Placing shape id %d", i->shapeid);
+
+    i->tag = swf_InsertTag(i->tag,ST_PLACEOBJECT2);
+    MATRIX m = i->page_matrix;
+    m.tx += i->shapeposx;
+    m.ty += i->shapeposy;
+    swf_ObjectPlace(i->tag,i->shapeid,getNewDepth(dev),&m,NULL,NULL);
+
+    swf_ShapeFree(i->shape);
+    i->shape = 0;
+    i->shapeid = -1;
+    i->bboxrectpos = -1;
+
+    i->fill=0;
+    i->shapeposx=0;
+    i->shapeposy=0;
 }
 
-static void endpage(struct swfoutput*obj)
+void wipeSWF(SWF*swf)
 {
-    if(shapeid>=0)
-      endshape();
-    if(textid>=0)
-      endtext();
-    while(clippos)
-        swfoutput_endclip(obj);
-    tag = swf_InsertTag(tag,ST_SHOWFRAME);
+    TAG*tag = swf->firstTag;
+    while(tag) {
+       TAG*next = tag->next;
+       if(tag->id != ST_SETBACKGROUNDCOLOR &&
+          tag->id != ST_END &&
+          tag->id != ST_DOACTION &&
+          tag->id != ST_SHOWFRAME) {
+           swf_DeleteTag(tag);
+       }
+       tag = next;
+    }
 }
 
-void swfoutput_newpage(struct swfoutput*obj)
-{
-    endpage(obj);
 
-    for(depth--;depth>=startdepth;depth--) {
-        tag = swf_InsertTag(tag,ST_REMOVEOBJECT2);
-        swf_SetU16(tag,depth);
+void swfoutput_finalize(gfxdevice_t*dev)
+{
+    swfoutput_internal*i = (swfoutput_internal*)dev->internal;
+
+    if(i->tag && i->tag->id == ST_END)
+        return; //already done
+
+    if(i->config_bboxvars) {
+       TAG* tag = swf_InsertTag(i->swf->firstTag, ST_DOACTION);
+       ActionTAG*a = 0;
+       a = action_PushString(a, "xmin");
+       a = action_PushFloat(a, i->swf->movieSize.xmin / 20.0);
+       a = action_SetVariable(a);
+       a = action_PushString(a, "ymin");
+       a = action_PushFloat(a, i->swf->movieSize.ymin / 20.0);
+       a = action_SetVariable(a);
+       a = action_PushString(a, "xmax");
+       a = action_PushFloat(a, i->swf->movieSize.xmax / 20.0);
+       a = action_SetVariable(a);
+       a = action_PushString(a, "ymax");
+       a = action_PushFloat(a, i->swf->movieSize.ymax / 20.0);
+       a = action_SetVariable(a);
+       a = action_PushString(a, "width");
+       a = action_PushFloat(a, (i->swf->movieSize.xmax - i->swf->movieSize.xmin) / 20.0);
+       a = action_SetVariable(a);
+       a = action_PushString(a, "height");
+       a = action_PushFloat(a, (i->swf->movieSize.ymax - i->swf->movieSize.ymin) / 20.0);
+       a = action_SetVariable(a);
+       a = action_End(a);
+       swf_ActionSet(tag, a);
+       swf_ActionFree(a);
     }
 
-    depth = 1;
-    startdepth = depth;
-}
+    if(i->frameno == i->lastframeno) // fix: add missing pagefeed
+        dev->endpage(dev);
 
-/* "destroy" like in (oo-terminology) "destructor". Perform cleaning
-   up, complete the swf, and write it out. */
-void swfoutput_destroy(struct swfoutput* obj) 
-{
-    endpage(obj);
-    fontlist_t *tmp,*iterator = fontlist;
+    endpage(dev);
+    fontlist_t *tmp,*iterator = i->fontlist;
     while(iterator) {
-        delete iterator->font;
-        iterator->font = 0;
-        tmp = iterator;
+       TAG*mtag = i->swf->firstTag;
+       if(iterator->swffont) {
+           mtag = swf_InsertTag(mtag, ST_DEFINEFONT2);
+           if(!i->config_storeallcharacters) {
+               msg("<debug> Reducing font %s", iterator->swffont->name);
+               swf_FontReduce(iterator->swffont);
+           }
+           swf_FontSetDefine2(mtag, iterator->swffont);
+       }
+
         iterator = iterator->next;
-        delete tmp;
     }
+    i->tag = swf_InsertTag(i->tag,ST_END);
+    TAG* tag = i->tag->prev;
+
+    /* remove the removeobject2 tags between the last ST_SHOWFRAME
+       and the ST_END- they confuse the flash player  */
+    while(tag->id == ST_REMOVEOBJECT2) {
+        TAG* prev = tag->prev;
+        swf_DeleteTag(tag);
+        tag = prev;
+    }
+    
+    if(i->overflow) {
+       wipeSWF(i->swf);
+    }
+    if(i->config_enablezlib || i->config_flashversion>=6) {
+       i->swf->compressed = 1;
+    }
+}
 
-    T1_CloseLib();
-    if(!filename) 
-        return;
+int swfresult_save(gfxresult_t*gfx, char*filename)
+{
+    SWF*swf = (SWF*)gfx->internal;
+    int fi;
     if(filename)
-     fi = open(filename, O_CREAT|O_TRUNC|O_WRONLY, 0777);
+     fi = open(filename, O_BINARY|O_CREAT|O_TRUNC|O_WRONLY, 0777);
     else
      fi = 1; // stdout
     
     if(fi<=0) {
-     logf("<fatal> Could not create \"%s\". ", FIXNULL(filename));
-     exit(1);
+       msg("<fatal> Could not create \"%s\". ", FIXNULL(filename));
+       return -1;
     }
-    tag = swf_InsertTag(tag,ST_END);
-
-    if(enablezlib) {
-      if FAILED(swf_WriteSWC(fi,&swf)) 
-       logf("<error> WriteSWC() failed.\n");
+    
+    if(swf->compressed) {
+       if FAILED(swf_WriteSWC(fi,swf)) 
+           msg("<error> WriteSWC() failed.\n");
     } else {
-      if FAILED(swf_WriteSWF(fi,&swf)) 
-       logf("<error> WriteSWF() failed.\n");
+       if FAILED(swf_WriteSWF(fi,swf)) 
+           msg("<error> WriteSWF() failed.\n");
     }
 
     if(filename)
      close(fi);
-    logf("<notice> SWF written\n");
+    return 0;
+}
+void* swfresult_get(gfxresult_t*gfx, char*name)
+{
+    SWF*swf = (SWF*)gfx->internal;
+    if(!strcmp(name, "swf")) {
+       return (void*)swf_CopySWF(swf);
+    } else if(!strcmp(name, "xmin")) {
+       return (void*)(swf->movieSize.xmin/20);
+    } else if(!strcmp(name, "ymin")) {
+       return (void*)(swf->movieSize.ymin/20);
+    } else if(!strcmp(name, "xmax")) {
+       return (void*)(swf->movieSize.xmax/20);
+    } else if(!strcmp(name, "ymax")) {
+       return (void*)(swf->movieSize.ymax/20);
+    } else if(!strcmp(name, "width")) {
+       return (void*)((swf->movieSize.xmax - swf->movieSize.xmin)/20);
+    } else if(!strcmp(name, "height")) {
+       return (void*)((swf->movieSize.ymax - swf->movieSize.ymin)/20);
+    }
+    return 0;
+}
+void swfresult_destroy(gfxresult_t*gfx)
+{
+    if(gfx->internal) {
+       swf_FreeTags((SWF*)gfx->internal);
+       free(gfx->internal);
+       gfx->internal = 0;
+    }
+    memset(gfx, 0, sizeof(gfxresult_t));
+    free(gfx);
 }
 
-void swfoutput_setdrawmode(swfoutput* obj, int mode)
+static void swfoutput_destroy(gfxdevice_t* dev);
+
+gfxresult_t* swf_finish(gfxdevice_t* dev)
 {
-    drawmode = mode;
-    if(mode == DRAWMODE_FILL)
-     fill = 1;
-    else if(mode == DRAWMODE_EOFILL)
-     fill = 1;
-    else if(mode == DRAWMODE_STROKE)
-     fill = 0;
-    else if(mode == DRAWMODE_CLIP)
-     fill = 1;
-    else if(mode == DRAWMODE_EOCLIP)
-     fill = 1;
+    swfoutput_internal*i = (swfoutput_internal*)dev->internal;
+    gfxresult_t*result;
+
+    swfoutput_finalize(dev);
+    SWF* swf = i->swf;i->swf = 0;
+    swfoutput_destroy(dev);
+
+    result = (gfxresult_t*)rfx_calloc(sizeof(gfxresult_t));
+    result->internal = swf;
+    result->save = swfresult_save;
+    result->write = 0;
+    result->get = swfresult_get;
+    result->destroy = swfresult_destroy;
+    return result;
 }
 
-void swfoutput_setfillcolor(swfoutput* obj, u8 r, u8 g, u8 b, u8 a)
+/* Perform cleaning up */
+static void swfoutput_destroy(gfxdevice_t* dev) 
 {
-    if(obj->fillrgb.r == r &&
-       obj->fillrgb.g == g &&
-       obj->fillrgb.b == b &&
-       obj->fillrgb.a == a) return;
-    if(shapeid>=0)
-     endshape();
+    swfoutput_internal*i = (swfoutput_internal*)dev->internal;
+    if(!i) {
+        /* not initialized yet- nothing to destroy */
+        return;
+    }
+
+    fontlist_t *tmp,*iterator = i->fontlist;
+    while(iterator) {
+       if(iterator->swffont) {
+           swf_FontFree(iterator->swffont);iterator->swffont=0;
+       }
+        tmp = iterator;
+        iterator = iterator->next;
+        delete tmp;
+    }
+    if(i->swf) {swf_FreeTags(i->swf);free(i->swf);i->swf = 0;}
 
-    obj->fillrgb.r = r;
-    obj->fillrgb.g = g;
-    obj->fillrgb.b = b;
-    obj->fillrgb.a = a;
+    free(i);i=0;
+    memset(dev, 0, sizeof(gfxdevice_t));
 }
 
-void swfoutput_setstrokecolor(swfoutput* obj, u8 r, u8 g, u8 b, u8 a)
+static void swfoutput_setfillcolor(gfxdevice_t* dev, U8 r, U8 g, U8 b, U8 a)
 {
-    if(obj->strokergb.r == r &&
-       obj->strokergb.g == g &&
-       obj->strokergb.b == b &&
-       obj->strokergb.a == a) return;
+    swfoutput_internal*i = (swfoutput_internal*)dev->internal;
+    if(i->fillrgb.r == r &&
+       i->fillrgb.g == g &&
+       i->fillrgb.b == b &&
+       i->fillrgb.a == a) return;
+    if(i->shapeid>=0)
+     endshape(dev);
+
+    i->fillrgb.r = r;
+    i->fillrgb.g = g;
+    i->fillrgb.b = b;
+    i->fillrgb.a = a;
+}
 
-    if(shapeid>=0)
-     endshape();
-    obj->strokergb.r = r;
-    obj->strokergb.g = g;
-    obj->strokergb.b = b;
-    obj->strokergb.a = a;
+static void swfoutput_setstrokecolor(gfxdevice_t* dev, U8 r, U8 g, U8 b, U8 a)
+{
+    swfoutput_internal*i = (swfoutput_internal*)dev->internal;
+    if(i->strokergb.r == r &&
+       i->strokergb.g == g &&
+       i->strokergb.b == b &&
+       i->strokergb.a == a) return;
+
+    if(i->shapeid>=0)
+     endshape(dev);
+    i->strokergb.r = r;
+    i->strokergb.g = g;
+    i->strokergb.b = b;
+    i->strokergb.a = a;
 }
 
-void swfoutput_setlinewidth(struct swfoutput*obj, double linewidth)
+static void swfoutput_setlinewidth(gfxdevice_t*dev, double _linewidth)
 {
-    if(obj->linewidth == (u16)(linewidth*20))
+    swfoutput_internal*i = (swfoutput_internal*)dev->internal;
+    if(i->linewidth == (U16)(_linewidth*20+19))
         return;
-
-    if(shapeid>=0)
-     endshape();
-    obj->linewidth = (u16)(linewidth*20);
+    if(i->shapeid>=0)
+       endshape(dev);
+    i->linewidth = (U16)(_linewidth*20+19);
 }
 
 
-void swfoutput_startclip(swfoutput*obj, T1_OUTLINE*outline, struct swfmatrix*m)
+static void drawlink(gfxdevice_t*dev, ActionTAG*,ActionTAG*, gfxline_t*points, char mouseover);
+static void swfoutput_namedlink(gfxdevice_t*dev, char*name, gfxline_t*points);
+static void swfoutput_linktopage(gfxdevice_t*dev, int page, gfxline_t*points);
+static void swfoutput_linktourl(gfxdevice_t*dev, char*url, gfxline_t*points);
+
+void swfoutput_drawlink(gfxdevice_t*dev, char*url, gfxline_t*points)
 {
-    if(textid>=0)
-     endtext();
-    if(shapeid>=0)
-     endshape();
+    swfoutput_internal*i = (swfoutput_internal*)dev->internal;
+    dev->drawlink(dev, points, url);
+}
 
-    if(clippos >= 127)
-    {
-        logf("<warning> Too many clip levels.");
-        clippos --;
-    } 
-    
-    startshape(obj);
-    int olddrawmode = drawmode;
-    swfoutput_setdrawmode(obj, DRAWMODE_CLIP);
-    swfoutput_drawpath(obj, outline, m);
-    swf_ShapeSetEnd(tag);
-    swfoutput_setdrawmode(obj, olddrawmode);
-
-    tag = swf_InsertTag(tag,ST_PLACEOBJECT2);
-    cliptags[clippos] = tag;
-    clipshapes[clippos] = shapeid;
-    clipdepths[clippos] = depth++;
-    clippos++;
-    shapeid = -1;
-}
-
-void swfoutput_endclip(swfoutput*obj)
-{
-    if(textid>=0)
-     endtext();
-    if(shapeid>=0)
-     endshape();
-
-    if(!clippos) {
-        logf("<error> Invalid end of clipping region");
-        return;
+void swf_drawlink(gfxdevice_t*dev, gfxline_t*points, char*url)
+{
+    swfoutput_internal*i = (swfoutput_internal*)dev->internal;
+
+    if(!strncmp("http://pdf2swf:", url, 15)) {
+       char*tmp = strdup(url);
+       int l = strlen(tmp);
+       if(tmp[l-1] == '/')
+          tmp[l-1] = 0;
+       swfoutput_namedlink(dev, tmp+15, points);
+       free(tmp);
+       return;
+    } else if(!strncmp("page", url, 4)) {
+       int t, nodigit=0;
+       for(t=4;url[t];t++)
+           if(url[t]<'0' || url[t]>'9')
+               nodigit = 1;
+       if(!nodigit) {
+           int page = atoi(&url[4]) - 1;
+           if(page<0) page = 0;
+           swfoutput_linktopage(dev, page, points);
+       }
+    } else {
+       swfoutput_linktourl(dev, url, points);
     }
-    clippos--;
-    swf_ObjectPlaceClip(cliptags[clippos],clipshapes[clippos],clipdepths[clippos],NULL,NULL,NULL,depth++);
 }
-
-static void drawlink(struct swfoutput*obj, ActionTAG*,ActionTAG*, swfcoord*points, char mouseover);
-
-void swfoutput_linktourl(struct swfoutput*obj, char*url, swfcoord*points)
+void swfoutput_linktourl(gfxdevice_t*dev, char*url, gfxline_t*points)
 {
     ActionTAG* actions;
+    swfoutput_internal*i = (swfoutput_internal*)dev->internal;
+    if(i->shapeid>=0)
+       endshape(dev);
+    if(i->textid>=0)
+       endtext(dev);
     
-    if(shapeid>=0)
-     endshape();
-    if(textid>=0)
-     endtext();
-    
-    actions = swf_ActionStart();
-    if(opennewwindow)
-      action_GetUrl(url, "_parent");
+    if(!i->config_opennewwindow)
+      actions = action_GetUrl(0, url, "_parent");
     else
-      action_GetUrl(url, "_this");
-      action_End();
-    swf_ActionEnd();
+      actions = action_GetUrl(0, url, "_this");
+    actions = action_End(actions);
     
-    drawlink(obj, actions, 0, points,0);
+    drawlink(dev, actions, 0, points,0);
 }
-void swfoutput_linktopage(struct swfoutput*obj, int page, swfcoord*points)
+void swfoutput_linktopage(gfxdevice_t*dev, int page, gfxline_t*points)
 {
+    swfoutput_internal*i = (swfoutput_internal*)dev->internal;
     ActionTAG* actions;
 
-    if(shapeid>=0)
-     endshape();
-    if(textid>=0)
-     endtext();
+    if(i->shapeid>=0)
+       endshape(dev);
+    if(i->textid>=0)
+       endtext(dev);
    
-    actions = swf_ActionStart();
-      action_GotoFrame(page);
-      action_End();
-    swf_ActionEnd();
+      actions = action_GotoFrame(0, page);
+      actions = action_End(actions);
 
-    drawlink(obj, actions, 0, points,0);
+    drawlink(dev, actions, 0, points,0);
 }
-void swfoutput_namedlink(struct swfoutput*obj, char*name, swfcoord*points)
+
+/* Named Links (a.k.a. Acrobatmenu) are used to implement various gadgets
+   of the viewer objects, like subtitles, index elements etc.
+*/
+void swfoutput_namedlink(gfxdevice_t*dev, char*name, gfxline_t*points)
 {
+    swfoutput_internal*i = (swfoutput_internal*)dev->internal;
     ActionTAG *actions1,*actions2;
+    char*tmp = strdup(name);
+    char mouseover = 1;
 
-    if(shapeid>=0)
-     endshape();
-    if(textid>=0)
-     endtext();
-   
-    actions1 = swf_ActionStart();
-      action_PushString("/:subtitle");
-      action_PushString(name);
-      action_SetVariable();
-      action_End();
-    swf_ActionEnd();
-
-    actions2 = swf_ActionStart();
-      action_PushString("/:subtitle");
-      action_PushString("");
-      action_SetVariable();
-      action_End();
-    swf_ActionEnd();
-
-    drawlink(obj, actions1, actions2, points,1);
+    if(i->shapeid>=0)
+       endshape(dev);
+    if(i->textid>=0)
+       endtext(dev);
+
+    if(!strncmp(tmp, "call:", 5))
+    {
+       char*x = strchr(&tmp[5], ':');
+       if(!x) {
+           actions1 = action_PushInt(0, 0); //number of parameters (0)
+           actions1 = action_PushString(actions1, &tmp[5]); //function name
+           actions1 = action_CallFunction(actions1);
+       } else {
+           *x = 0;
+           actions1 = action_PushString(0, x+1); //parameter
+           actions1 = action_PushInt(actions1, 1); //number of parameters (1)
+           actions1 = action_PushString(actions1, &tmp[5]); //function name
+           actions1 = action_CallFunction(actions1);
+       }
+       actions2 = action_End(0);
+       mouseover = 0;
+    }
+    else
+    {
+       actions1 = action_PushString(0, "/:subtitle");
+       actions1 = action_PushString(actions1, name);
+       actions1 = action_SetVariable(actions1);
+       actions1 = action_End(actions1);
+
+       actions2 = action_PushString(0, "/:subtitle");
+       actions2 = action_PushString(actions2, "");
+       actions2 = action_SetVariable(actions2);
+       actions2 = action_End(actions2);
+    }
+
+    drawlink(dev, actions1, actions2, points,mouseover);
 
     swf_ActionFree(actions1);
     swf_ActionFree(actions2);
+    free(tmp);
 }
 
-static void drawlink(struct swfoutput*obj, ActionTAG*actions1, ActionTAG*actions2, swfcoord*points, char mouseover)
+static void drawgfxline(gfxdevice_t*dev, gfxline_t*line)
 {
+    swfoutput_internal*i = (swfoutput_internal*)dev->internal;
+    gfxcoord_t lastx=0,lasty=0,px=0,py=0;
+    char lastwasmoveto;
+    while(1) {
+       if(!line)
+           break;
+       /* check whether the next segment is zero */
+       if(line->type == gfx_moveTo) {
+           msg("<trace> ======== moveTo %.2f %.2f", line->x, line->y);
+           moveto(dev, i->tag, line->x, line->y);
+           px = lastx = line->x;
+           py = lasty = line->y;
+           lastwasmoveto = 1;
+       } if(line->type == gfx_lineTo) {
+           msg("<trace> ======== lineTo %.2f %.2f", line->x, line->y);
+           lineto(dev, i->tag, line->x, line->y);
+           px = line->x;
+           py = line->y;
+           lastwasmoveto = 0;
+       } else if(line->type == gfx_splineTo) {
+           msg("<trace> ======== splineTo  %.2f %.2f", line->x, line->y);
+           plotxy s,p;
+           s.x = line->sx;p.x = line->x;
+           s.y = line->sy;p.y = line->y;
+           splineto(dev, i->tag, s, p);
+           px = line->x;
+           py = line->y;
+           lastwasmoveto = 0;
+       }
+       line = line->next;
+    }
+}
+
+
+static void drawlink(gfxdevice_t*dev, ActionTAG*actions1, ActionTAG*actions2, gfxline_t*points, char mouseover)
+{
+    swfoutput_internal*i = (swfoutput_internal*)dev->internal;
     RGBA rgb;
     SRECT r;
     int lsid=0;
@@ -1201,343 +1488,942 @@ static void drawlink(struct swfoutput*obj, ActionTAG*actions1, ActionTAG*actions
     struct plotxy p1,p2,p3,p4;
     int myshapeid;
     int myshapeid2;
-    double xmin,ymin;
-    double xmax=xmin=points[0].x,ymax=ymin=points[0].y;
     double posx = 0;
     double posy = 0;
     int t;
-    int buttonid = ++currentswfid;
-    for(t=1;t<4;t++)
-    {
-        if(points[t].x>xmax) xmax=points[t].x;
-        if(points[t].y>ymax) ymax=points[t].y;
-        if(points[t].x<xmin) xmin=points[t].x;
-        if(points[t].y<ymin) ymin=points[t].y;
-    }
-   
-    p1.x=points[0].x; p1.y=points[0].y; p2.x=points[1].x; p2.y=points[1].y; 
-    p3.x=points[2].x; p3.y=points[2].y; p4.x=points[3].x; p4.y=points[3].y;
-   
-    /* the following code subtracts the upper left edge from all coordinates,
-       and set's posx,posy so that ST_PLACEOBJECT is used with a matrix.
-       Necessary for preprocessing with swfcombine. */
-    posx = xmin; posy = ymin;
-    p1.x-=posx;p2.x-=posx;p3.x-=posx;p4.x-=posx;
-    p1.y-=posy;p2.y-=posy;p3.y-=posy;p4.y-=posy;
-    xmin -= posx; ymin -= posy;
-    xmax -= posx; ymax -= posy;
-    
+    int buttonid = getNewID(dev);
+    gfxbbox_t bbox = gfxline_getbbox(points);
+
     /* shape */
-    myshapeid = ++currentswfid;
-    tag = swf_InsertTag(tag,ST_DEFINESHAPE3);
-    swf_ShapeNew(&shape);
+    myshapeid = getNewID(dev);
+    i->tag = swf_InsertTag(i->tag,ST_DEFINESHAPE3);
+    swf_ShapeNew(&i->shape);
     rgb.r = rgb.b = rgb.a = rgb.g = 0; 
-    fsid = swf_ShapeAddSolidFillStyle(shape,&rgb);
-    swf_SetU16(tag, myshapeid);
-    r.xmin = (int)(xmin*20);
-    r.ymin = (int)(ymin*20);
-    r.xmax = (int)(xmax*20);
-    r.ymax = (int)(ymax*20);
-    swf_SetRect(tag,&r);
-    swf_SetShapeStyles(tag,shape);
-    swf_ShapeCountBits(shape,NULL,NULL);
-    swf_SetShapeBits(tag,shape);
-    swf_ShapeSetAll(tag,shape,/*x*/0,/*y*/0,0,fsid,0);
-    swflastx = swflasty = 0;
-    moveto(tag, p1);
-    lineto(tag, p2);
-    lineto(tag, p3);
-    lineto(tag, p4);
-    lineto(tag, p1);
-    swf_ShapeSetEnd(tag);
+    fsid = swf_ShapeAddSolidFillStyle(i->shape,&rgb);
+    swf_SetU16(i->tag, myshapeid);
+    r.xmin = (int)(bbox.xmin*20);
+    r.ymin = (int)(bbox.ymin*20);
+    r.xmax = (int)(bbox.xmax*20);
+    r.ymax = (int)(bbox.ymax*20);
+    swf_SetRect(i->tag,&r);
+    swf_SetShapeStyles(i->tag,i->shape);
+    swf_ShapeCountBits(i->shape,NULL,NULL);
+    swf_SetShapeBits(i->tag,i->shape);
+    swf_ShapeSetAll(i->tag,i->shape,/*x*/0,/*y*/0,0,fsid,0);
+    i->swflastx = i->swflasty = 0;
+    drawgfxline(dev, points);
+    swf_ShapeSetEnd(i->tag);
 
     /* shape2 */
-    myshapeid2 = ++currentswfid;
-    tag = swf_InsertTag(tag,ST_DEFINESHAPE3);
-    swf_ShapeNew(&shape);
+    myshapeid2 = getNewID(dev);
+    i->tag = swf_InsertTag(i->tag,ST_DEFINESHAPE3);
+    swf_ShapeNew(&i->shape);
     rgb.r = rgb.b = rgb.a = rgb.g = 255;
     rgb.a = 40;
-    fsid = swf_ShapeAddSolidFillStyle(shape,&rgb);
-    swf_SetU16(tag, myshapeid2);
-    r.xmin = (int)(xmin*20);
-    r.ymin = (int)(ymin*20);
-    r.xmax = (int)(xmax*20);
-    r.ymax = (int)(ymax*20);
-    swf_SetRect(tag,&r);
-    swf_SetShapeStyles(tag,shape);
-    swf_ShapeCountBits(shape,NULL,NULL);
-    swf_SetShapeBits(tag,shape);
-    swf_ShapeSetAll(tag,shape,/*x*/0,/*y*/0,0,fsid,0);
-    swflastx = swflasty = 0;
-    moveto(tag, p1);
-    lineto(tag, p2);
-    lineto(tag, p3);
-    lineto(tag, p4);
-    lineto(tag, p1);
-    swf_ShapeSetEnd(tag);
+    fsid = swf_ShapeAddSolidFillStyle(i->shape,&rgb);
+    swf_SetU16(i->tag, myshapeid2);
+    r.xmin = (int)(bbox.xmin*20);
+    r.ymin = (int)(bbox.ymin*20);
+    r.xmax = (int)(bbox.xmax*20);
+    r.ymax = (int)(bbox.ymax*20);
+    swf_SetRect(i->tag,&r);
+    swf_SetShapeStyles(i->tag,i->shape);
+    swf_ShapeCountBits(i->shape,NULL,NULL);
+    swf_SetShapeBits(i->tag,i->shape);
+    swf_ShapeSetAll(i->tag,i->shape,/*x*/0,/*y*/0,0,fsid,0);
+    i->swflastx = i->swflasty = 0;
+    drawgfxline(dev, points);
+    swf_ShapeSetEnd(i->tag);
 
     if(!mouseover)
     {
-       tag = swf_InsertTag(tag,ST_DEFINEBUTTON);
-       swf_SetU16(tag,buttonid); //id
-       swf_ButtonSetFlags(tag, 0); //menu=no
-       swf_ButtonSetRecord(tag,0x01,myshapeid,depth,0,0);
-       swf_ButtonSetRecord(tag,0x02,myshapeid2,depth,0,0);
-       swf_ButtonSetRecord(tag,0x04,myshapeid2,depth,0,0);
-       swf_ButtonSetRecord(tag,0x08,myshapeid,depth,0,0);
-       swf_SetU8(tag,0);
-       swf_ActionSet(tag,actions1);
-       swf_SetU8(tag,0);
+       i->tag = swf_InsertTag(i->tag,ST_DEFINEBUTTON);
+       swf_SetU16(i->tag,buttonid); //id
+       swf_ButtonSetFlags(i->tag, 0); //menu=no
+       swf_ButtonSetRecord(i->tag,0x01,myshapeid,i->depth,0,0);
+       swf_ButtonSetRecord(i->tag,0x02,myshapeid2,i->depth,0,0);
+       swf_ButtonSetRecord(i->tag,0x04,myshapeid2,i->depth,0,0);
+       swf_ButtonSetRecord(i->tag,0x08,myshapeid,i->depth,0,0);
+       swf_SetU8(i->tag,0);
+       swf_ActionSet(i->tag,actions1);
+       swf_SetU8(i->tag,0);
     }
     else
     {
-       tag = swf_InsertTag(tag,ST_DEFINEBUTTON2);
-       swf_SetU16(tag,buttonid); //id
-       swf_ButtonSetFlags(tag, 0); //menu=no
-       swf_ButtonSetRecord(tag,0x01,myshapeid,depth,0,0);
-       swf_ButtonSetRecord(tag,0x02,myshapeid2,depth,0,0);
-       swf_ButtonSetRecord(tag,0x04,myshapeid2,depth,0,0);
-       swf_ButtonSetRecord(tag,0x08,myshapeid,depth,0,0);
-       swf_SetU8(tag,0); // end of button records
-        swf_ButtonSetCondition(tag, BC_IDLE_OVERUP);
-       swf_ActionSet(tag,actions1);
+       i->tag = swf_InsertTag(i->tag,ST_DEFINEBUTTON2);
+       swf_SetU16(i->tag,buttonid); //id
+       swf_ButtonSetFlags(i->tag, 0); //menu=no
+       swf_ButtonSetRecord(i->tag,0x01,myshapeid,i->depth,0,0);
+       swf_ButtonSetRecord(i->tag,0x02,myshapeid2,i->depth,0,0);
+       swf_ButtonSetRecord(i->tag,0x04,myshapeid2,i->depth,0,0);
+       swf_ButtonSetRecord(i->tag,0x08,myshapeid,i->depth,0,0);
+       swf_SetU8(i->tag,0); // end of button records
+        swf_ButtonSetCondition(i->tag, BC_IDLE_OVERUP);
+       swf_ActionSet(i->tag,actions1);
        if(actions2) {
-           swf_ButtonSetCondition(tag, BC_OVERUP_IDLE);
-           swf_ActionSet(tag,actions2);
-           swf_SetU8(tag,0);
-           swf_ButtonPostProcess(tag, 2);
+           swf_ButtonSetCondition(i->tag, BC_OVERUP_IDLE);
+           swf_ActionSet(i->tag,actions2);
+           swf_SetU8(i->tag,0);
+           swf_ButtonPostProcess(i->tag, 2);
        } else {
-           swf_SetU8(tag,0);
-            swf_ButtonPostProcess(tag, 1);
+           swf_SetU8(i->tag,0);
+            swf_ButtonPostProcess(i->tag, 1);
        }
     }
     
-    tag = swf_InsertTag(tag,ST_PLACEOBJECT2);
+    i->tag = swf_InsertTag(i->tag,ST_PLACEOBJECT2);
 
     if(posx!=0 || posy!=0) {
+        SPOINT p;
+        p.x = (int)(posx*20);
+        p.y = (int)(posy*20);
+        p = swf_TurnPoint(p, &i->page_matrix);
        MATRIX m;
-       swf_GetMatrix(0,&m);
-       m.tx = (int)(posx*20);
-       m.ty = (int)(posy*20);
-       swf_ObjectPlace(tag, buttonid, depth++,&m,0,0);
+        m = i->page_matrix;
+        m.tx = p.x;
+        m.ty = p.y;
+       swf_ObjectPlace(i->tag, buttonid, getNewDepth(dev),&m,0,0);
+    } else {
+       swf_ObjectPlace(i->tag, buttonid, getNewDepth(dev),&i->page_matrix,0,0);
     }
-    else {
-       swf_ObjectPlace(tag, buttonid, depth++,0,0,0);
+}
+
+      
+///////////
+/*
+for(t=0;t<picpos;t++)
+      {
+         if(pic_xids[t] == xid &&
+            pic_yids[t] == yid) {
+             width = pic_width[t];
+             height = pic_height[t];
+             found = t;break;
+         }
+      }
+         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++;
+           pic[width*y+x] = buf[0];
+           xid+=x*buf[0]+1;
+           yid+=y*buf[0]*3+1;
+      
+           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 xid = 0;
+      int yid = 0;
+         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;
+      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) {
+*/
+///////////
+
+
+int swf_setparameter(gfxdevice_t*dev, const char*name, const char*value)
+{
+    swfoutput_internal*i = (swfoutput_internal*)dev->internal;
+
+    if(!strcmp(name, "jpegsubpixels")) {
+       i->config_jpegsubpixels = atof(value);
+    } else if(!strcmp(name, "ppmsubpixels")) {
+       i->config_ppmsubpixels = atof(value);
+    } else if(!strcmp(name, "drawonlyshapes")) {
+       i->config_drawonlyshapes = atoi(value);
+    } else if(!strcmp(name, "ignoredraworder")) {
+       i->config_ignoredraworder = atoi(value);
+    } else if(!strcmp(name, "filloverlap")) {
+       i->config_filloverlap = atoi(value);
+    } else if(!strcmp(name, "linksopennewwindow")) {
+       i->config_opennewwindow = atoi(value);
+    } else if(!strcmp(name, "opennewwindow")) {
+       i->config_opennewwindow = atoi(value);
+    } else if(!strcmp(name, "storeallcharacters")) {
+       i->config_storeallcharacters = atoi(value);
+    } else if(!strcmp(name, "enablezlib")) {
+       i->config_enablezlib = atoi(value);
+    } else if(!strcmp(name, "bboxvars")) {
+       i->config_bboxvars = atoi(value);
+    } else if(!strcmp(name, "insertstop")) {
+       i->config_insertstoptag = atoi(value);
+    } else if(!strcmp(name, "protect")) {
+       i->config_protect = atoi(value);
+       if(i->config_protect && i->tag) {
+           i->tag = swf_InsertTag(i->tag, ST_PROTECT);
+       }
+    } else if(!strcmp(name, "faketags")) {
+       i->config_generate_fake_tags = atoi(value);
+    } else if(!strcmp(name, "flashversion")) {
+       i->config_flashversion = atoi(value);
+       if(i->swf) {
+           i->swf->fileVersion = i->config_flashversion;
+       }
+    } else if(!strcmp(name, "minlinewidth")) {
+       i->config_minlinewidth = atof(value);
+    } else if(!strcmp(name, "caplinewidth")) {
+       i->config_caplinewidth = atof(value);
+    } else if(!strcmp(name, "dumpfonts")) {
+       i->config_dumpfonts = atoi(value);
+    } else if(!strcmp(name, "next_bitmap_is_jpeg")) {
+       i->jpeg = 1;
+    } else if(!strcmp(name, "jpegquality")) {
+       int val = atoi(value);
+       if(val<0) val=0;
+       if(val>100) val=100;
+       i->config_jpegquality = val;
+    } 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;
+       i->config_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;
+       i->config_fontsplinemaxerror = v;
+    } else {
+       fprintf(stderr, "unknown parameter: %s (=%s)\n", name, value);
+       return 0;
     }
+    return 1;
 }
 
-static void drawimage(struct swfoutput*obj, int bitid, int sizex,int sizey, 
-        double x1,double y1,
-        double x2,double y2,
-        double x3,double y3,
-        double x4,double y4)
+// --------------------------------------------------------------------
+
+static CXFORM gfxcxform_to_cxform(gfxcxform_t* c)
 {
-    RGBA rgb;
-    SRECT r;
-    int lsid=0;
-    int fsid;
-    struct plotxy p1,p2,p3,p4;
-    int myshapeid;
-    double xmax=x1,ymax=y1,xmin=x1,ymin=y1;
-    if(x2>xmax) xmax=x2;
-    if(y2>ymax) ymax=y2;
-    if(x2<xmin) xmin=x2;
-    if(y2<ymin) ymin=y2;
-    if(x3>xmax) xmax=x3;
-    if(y3>ymax) ymax=y3;
-    if(x3<xmin) xmin=x3;
-    if(y3<ymin) ymin=y3;
-    if(x4>xmax) xmax=x4;
-    if(y4>ymax) ymax=y4;
-    if(x4<xmin) xmin=x4;
-    if(y4<ymin) ymin=y4;
-    p1.x=x1;
-    p1.y=y1;
-    p2.x=x2;
-    p2.y=y2;
-    p3.x=x3;
-    p3.y=y3;
-    p4.x=x4;
-    p4.y=y4;
+    CXFORM cx;
+    swf_GetCXForm(0, &cx, 1);
+    if(!c)
+       return cx;
+    if(c->rg!=0 || c->rb!=0 || c->ra!=0 ||
+       c->gr!=0 || c->gb!=0 || c->ga!=0 ||
+       c->br!=0 || c->bg!=0 || c->ba!=0 ||
+       c->ar!=0 || c->ag!=0 || c->ab!=0)
+       msg("<warning> CXForm not SWF-compatible");
+
+    cx.a0 = (S16)(c->aa*256);
+    cx.r0 = (S16)(c->rr*256);
+    cx.g0 = (S16)(c->gg*256);
+    cx.b0 = (S16)(c->bb*256);
+    cx.a1 = c->t.a;
+    cx.r1 = c->t.r;
+    cx.g1 = c->t.g;
+    cx.b1 = c->t.b;
+    return cx;
+}
+
+static ArtVpath* gfxline_to_ArtVpath(gfxline_t*line)
+{
+    ArtVpath *vec = NULL;
+    int pos=0,len=0;
+    gfxline_t*l2;
+    double x=0,y=0;
+
+    /* factor which determines into how many line fragments a spline is converted */
+    double subfraction = 2.4;//0.3
+
+    l2 = line;
+    while(l2) {
+       if(l2->type == gfx_moveTo) {
+           pos ++;
+       } if(l2->type == gfx_lineTo) {
+           pos ++;
+       } if(l2->type == gfx_splineTo) {
+            int parts = (int)(sqrt(fabs(l2->x-2*l2->sx+x) + fabs(l2->y-2*l2->sy+y))*subfraction);
+            if(!parts) parts = 1;
+            pos += parts + 1;
+       }
+       x = l2->x;
+       y = l2->y;
+       l2 = l2->next;
+    }
+    pos++;
+    len = pos;
+
+    vec = art_new (ArtVpath, len);
+
+    pos = 0;
+    l2 = line;
+    while(l2) {
+       if(l2->type == gfx_moveTo) {
+           vec[pos].code = ART_MOVETO;
+           vec[pos].x = l2->x;
+           vec[pos].y = l2->y;
+           pos++; 
+           assert(pos<=len);
+       } else if(l2->type == gfx_lineTo) {
+           vec[pos].code = ART_LINETO;
+           vec[pos].x = l2->x;
+           vec[pos].y = l2->y;
+           pos++; 
+           assert(pos<=len);
+       } else if(l2->type == gfx_splineTo) {
+           int i;
+            int parts = (int)(sqrt(fabs(l2->x-2*l2->sx+x) + fabs(l2->y-2*l2->sy+y))*subfraction);
+            if(!parts) parts = 1;
+           for(i=0;i<=parts;i++) {
+               double t = (double)i/(double)parts;
+               vec[pos].code = ART_LINETO;
+               vec[pos].x = l2->x*t*t + 2*l2->sx*t*(1-t) + x*(1-t)*(1-t);
+               vec[pos].y = l2->y*t*t + 2*l2->sy*t*(1-t) + y*(1-t)*(1-t);
+               pos++;
+               assert(pos<=len);
+           }
+       }
+       x = l2->x;
+       y = l2->y;
+       l2 = l2->next;
+    }
+    vec[pos].code = ART_END;
+
+    return vec;
+}
+
+static ArtSVP* gfxfillToSVP(gfxline_t*line)
+{
+    ArtVpath* vec = gfxline_to_ArtVpath(line);
+    ArtSVP *svp = art_svp_from_vpath(vec);
+    free(vec);
+    return svp;
+}
+
+static ArtSVP* gfxstrokeToSVP(gfxline_t*line, gfxcoord_t width, gfx_capType cap_style, gfx_joinType joint_style, double miterLimit)
+{
+    ArtVpath* vec = gfxline_to_ArtVpath(line);
+    ArtSVP *svp = art_svp_vpath_stroke (vec,
+                       (joint_style==gfx_joinMiter)?ART_PATH_STROKE_JOIN_MITER:
+                       ((joint_style==gfx_joinRound)?ART_PATH_STROKE_JOIN_ROUND:
+                        ((joint_style==gfx_joinBevel)?ART_PATH_STROKE_JOIN_BEVEL:ART_PATH_STROKE_JOIN_BEVEL)),
+                       (cap_style==gfx_capButt)?ART_PATH_STROKE_CAP_BUTT:
+                       ((cap_style==gfx_capRound)?ART_PATH_STROKE_CAP_ROUND:
+                        ((cap_style==gfx_capSquare)?ART_PATH_STROKE_CAP_SQUARE:ART_PATH_STROKE_CAP_SQUARE)),
+                       width, //line_width
+                       miterLimit, //miter_limit
+                       0.05 //flatness
+                       );
+    free(vec);
+    return svp;
+}
+
+static gfxline_t* SVPtogfxline(ArtSVP*svp)
+{
+    int size = 0;
+    int t;
+    int pos = 0;
+    for(t=0;t<svp->n_segs;t++) {
+       size += svp->segs[t].n_points + 1;
+    }
+    gfxline_t* lines = (gfxline_t*)rfx_alloc(sizeof(gfxline_t)*size);
+
+    for(t=0;t<svp->n_segs;t++) {
+       ArtSVPSeg* seg = &svp->segs[t];
+       int p;
+       for(p=0;p<seg->n_points;p++) {
+           lines[pos].type = p==0?gfx_moveTo:gfx_lineTo;
+           ArtPoint* point = &seg->points[p];
+           lines[pos].x = point->x;
+           lines[pos].y = point->y;
+           lines[pos].next = &lines[pos+1];
+           pos++;
+       }
+    }
+    if(pos) {
+       lines[pos-1].next = 0;
+       return lines;
+    } else {
+       return 0;
+    }
+}
+
+/* TODO */
+static int imageInCache(gfxdevice_t*dev, void*data, int width, int height)
+{
+    return -1;
+}
+static void addImageToCache(gfxdevice_t*dev, void*data, int width, int height)
+{
+}
     
-    MATRIX m;
-    m.sx = (int)(65536*20*(x4-x1))/sizex;
-    m.r1 = -(int)(65536*20*(y4-y1))/sizex;
-    m.r0 = (int)(65536*20*(x1-x2))/sizey;
-    m.sy = -(int)(65536*20*(y1-y2))/sizey;
+static int add_image(swfoutput_internal*i, gfximage_t*img, int targetwidth, int targetheight, int* newwidth, int* newheight)
+{
+    gfxdevice_t*dev = i->dev;
+    RGBA*newpic = 0;
+    RGBA*mem = (RGBA*)img->data;
+    
+    int sizex = img->width;
+    int sizey = img->height;
+    int is_jpeg = i->jpeg;
+    i->jpeg = 0;
+
+    int newsizex=sizex, newsizey=sizey;
+
+    /// {
+    if(is_jpeg && i->config_jpegsubpixels) {
+       newsizex = (int)(targetwidth*i->config_jpegsubpixels+0.5);
+       newsizey = (int)(targetheight*i->config_jpegsubpixels+0.5);
+    } else if(!is_jpeg && i->config_ppmsubpixels) {
+       newsizex = (int)(targetwidth*i->config_ppmsubpixels+0.5);
+       newsizey = (int)(targetheight*i->config_ppmsubpixels+0.5);
+    }
+    /// }
+
+    if(sizex<=0 || sizey<=0 || newsizex<=0 || newsizey<=0)
+       return -1;
+
+    /* TODO: cache images */
+    
+    if(newsizex<sizex || newsizey<sizey) {
+       msg("<verbose> Scaling %dx%d image to %dx%d", sizex, sizey, newsizex, newsizey);
+       newpic = swf_ImageScale(mem, sizex, sizey, newsizex, newsizey);
+       *newwidth = sizex = newsizex;
+       *newheight  = sizey = newsizey;
+       mem = newpic;
+    } else {
+       *newwidth = newsizex = sizex;
+       *newheight = newsizey  = sizey;
+    }
+
+    int num_colors = swf_ImageGetNumberOfPaletteEntries(mem,sizex,sizey,0);
+    int has_alpha = swf_ImageHasAlpha(mem,sizex,sizey);
+    
+    msg("<verbose> Drawing %dx%d %s%simage at size %dx%d (%dx%d), %s%d colors",
+           sizex, sizey, 
+           has_alpha?(has_alpha==2?"semi-transparent ":"transparent "):"", 
+           is_jpeg?"jpeg-":"",
+           newsizex, newsizey,
+           targetwidth, targetheight,
+           /*newsizex, newsizey,*/
+           num_colors>256?">":"", num_colors>256?256:num_colors);
+
+    /*RGBA* pal = (RGBA*)rfx_alloc(sizeof(RGBA)*num_colors);
+    swf_ImageGetNumberOfPaletteEntries(mem,sizex,sizey,pal);
+    int t;
+    for(t=0;t<num_colors;t++) {
+       printf("%02x%02x%02x%02x ",
+               pal[t].r, pal[t].g, pal[t].b, pal[t].a);
+       if((t&7)==7)
+           printf("\n");
+    }
+    printf("\n");*/
+
+    int bitid = -1;
+    int cacheid = imageInCache(dev, mem, sizex, sizey);
+
+    if(cacheid<=0) {
+       bitid = getNewID(dev);
+       i->tag = swf_AddImage(i->tag, bitid, mem, sizex, sizey, i->config_jpegquality);
+       addImageToCache(dev, mem, sizex, sizey);
+    } else {
+       bitid = cacheid;
+    }
+
+    if(newpic)
+       free(newpic);
+    return bitid;
+}
+
+static SRECT gfxline_getSWFbbox(gfxline_t*line)
+{
+    gfxbbox_t bbox = gfxline_getbbox(line);
+    SRECT r;
+    r.xmin = (int)(bbox.xmin*20);
+    r.ymin = (int)(bbox.ymin*20);
+    r.xmax = (int)(bbox.xmax*20);
+    r.ymax = (int)(bbox.ymax*20);
+    return r;
+}
+
+static void swf_fillbitmap(gfxdevice_t*dev, gfxline_t*line, gfximage_t*img, gfxmatrix_t*matrix, gfxcxform_t*cxform)
+{
+    swfoutput_internal*i = (swfoutput_internal*)dev->internal;
+
+    endshape(dev);
+    endtext(dev);
+
+    int targetx = (int)(sqrt(matrix->m00*matrix->m00 + matrix->m01*matrix->m01)*img->width);
+    int targety = (int)(sqrt(matrix->m10*matrix->m10 + matrix->m11*matrix->m11)*img->height);
+
+    int newwidth=0,newheight=0;
+    int bitid = add_image(i, img, targetx, targety, &newwidth, &newheight);
+    if(bitid<0)
+       return;
+    double fx = (double)img->width / (double)newwidth;
+    double fy = (double)img->height / (double)newheight;
 
-    m.tx = (int)(x1*20);
-    m.ty = (int)(y1*20);
+    MATRIX m;
+    float m00,m10,tx;
+    float m01,m11,ty;
+    m.sx = (int)(65536*20*matrix->m00*fx); m.r1 = (int)(65536*20*matrix->m10*fy);
+    m.r0 = (int)(65536*20*matrix->m01*fx); m.sy = (int)(65536*20*matrix->m11*fy);
+    m.tx = (int)(matrix->tx*20);
+    m.ty = (int)(matrix->ty*20);
   
     /* shape */
-    myshapeid = ++currentswfid;
-    tag = swf_InsertTag(tag,ST_DEFINESHAPE);
+    int myshapeid = getNewID(dev);
+    i->tag = swf_InsertTag(i->tag,ST_DEFINESHAPE);
+    SHAPE*shape;
     swf_ShapeNew(&shape);
-    //lsid = ShapeAddLineStyle(shape,obj->linewidth,&obj->strokergb);
-    //fsid = ShapeAddSolidFillStyle(shape,&obj->fillrgb);
-    fsid = swf_ShapeAddBitmapFillStyle(shape,&m,bitid,0);
-    swf_SetU16(tag, myshapeid);
-    r.xmin = (int)(xmin*20);
-    r.ymin = (int)(ymin*20);
-    r.xmax = (int)(xmax*20);
-    r.ymax = (int)(ymax*20);
-    swf_SetRect(tag,&r);
-    swf_SetShapeStyles(tag,shape);
+    int fsid = swf_ShapeAddBitmapFillStyle(shape,&m,bitid,1);
+    swf_SetU16(i->tag, myshapeid);
+    SRECT r = gfxline_getSWFbbox(line);
+    swf_SetRect(i->tag,&r);
+    swf_SetShapeStyles(i->tag,shape);
     swf_ShapeCountBits(shape,NULL,NULL);
-    swf_SetShapeBits(tag,shape);
-    swf_ShapeSetAll(tag,shape,/*x*/0,/*y*/0,lsid,fsid,0);
-    swflastx = swflasty = 0;
-    moveto(tag, p1);
-    lineto(tag, p2);
-    lineto(tag, p3);
-    lineto(tag, p4);
-    lineto(tag, p1);
-    /*
-    ShapeMoveTo  (tag, shape, (int)(x1*20),(int)(y1*20));
-    ShapeSetLine (tag, shape, (int)(x1*20);
-    ShapeSetLine (tag, shape, x*20,0);
-    ShapeSetLine (tag, shape, 0,-y*20);
-    ShapeSetLine (tag, shape, -x*20,0);*/
-    swf_ShapeSetEnd(tag);
-
-    /* instance */
-    tag = swf_InsertTag(tag,ST_PLACEOBJECT2);
-    swf_ObjectPlace(tag,myshapeid,/*depth*/depth++,NULL,NULL,NULL);
-}
-
-int swfoutput_drawimagejpeg_old(struct swfoutput*obj, char*filename, int sizex,int sizey, 
-        double x1,double y1,
-        double x2,double y2,
-        double x3,double y3,
-        double x4,double y4)
-{
-    TAG*oldtag;
-    if(shapeid>=0)
-     endshape();
-    if(textid>=0)
-     endtext();
-
-    int bitid = ++currentswfid;
-    oldtag = tag;
-    tag = swf_InsertTag(tag,ST_DEFINEBITSJPEG2);
-    swf_SetU16(tag, bitid);
-    if(swf_SetJPEGBits(tag, filename, jpegquality)<0) {
-       swf_DeleteTag(tag);
-       tag = oldtag;
-       return -1;
+    swf_SetShapeBits(i->tag,shape);
+    swf_ShapeSetAll(i->tag,shape,UNDEFINED_COORD,UNDEFINED_COORD,0,fsid,0);
+    i->swflastx = i->swflasty = UNDEFINED_COORD;
+    drawgfxline(dev, line);
+    swf_ShapeSetEnd(i->tag);
+    swf_ShapeFree(shape);
+
+    i->tag = swf_InsertTag(i->tag,ST_PLACEOBJECT2);
+    CXFORM cxform2 = gfxcxform_to_cxform(cxform);
+    swf_ObjectPlace(i->tag,myshapeid,getNewDepth(dev),&i->page_matrix,&cxform2,NULL);
+}
+
+static void swf_startclip(gfxdevice_t*dev, gfxline_t*line)
+{
+    swfoutput_internal*i = (swfoutput_internal*)dev->internal;
+
+    endtext(dev);
+    endshape(dev);
+
+    if(i->clippos >= 127)
+    {
+        msg("<warning> Too many clip levels.");
+        i->clippos --;
+    } 
+
+    int myshapeid = getNewID(dev);
+    i->tag = swf_InsertTag(i->tag,ST_DEFINESHAPE);
+    RGBA col;
+    memset(&col, 0, sizeof(RGBA));
+    SHAPE*shape;
+    swf_ShapeNew(&shape);
+    int fsid = swf_ShapeAddSolidFillStyle(shape,&col);
+    swf_SetU16(i->tag,myshapeid);
+    SRECT r = gfxline_getSWFbbox(line);
+    swf_SetRect(i->tag,&r);
+    swf_SetShapeStyles(i->tag,shape);
+    swf_ShapeCountBits(shape,NULL,NULL);
+    swf_SetShapeBits(i->tag,shape);
+    swf_ShapeSetAll(i->tag,shape,UNDEFINED_COORD,UNDEFINED_COORD,0,fsid,0);
+    i->swflastx = i->swflasty = UNDEFINED_COORD;
+    drawgfxline(dev, line);
+    swf_ShapeSetEnd(i->tag);
+    swf_ShapeFree(shape);
+
+    /* TODO: remember the bbox, and check all shapes against it */
+    
+    i->tag = swf_InsertTag(i->tag,ST_PLACEOBJECT2);
+    i->cliptags[i->clippos] = i->tag;
+    i->clipshapes[i->clippos] = myshapeid;
+    i->clipdepths[i->clippos] = getNewDepth(dev);
+    i->clippos++;
+}
+
+static void swf_endclip(gfxdevice_t*dev)
+{
+    swfoutput_internal*i = (swfoutput_internal*)dev->internal;
+    if(i->textid>=0)
+       endtext(dev);
+    if(i->shapeid>=0)
+       endshape(dev);
+
+    if(!i->clippos) {
+        msg("<error> Invalid end of clipping region");
+        return;
     }
+    i->clippos--;
+    /*swf_ObjectPlaceClip(i->cliptags[i->clippos],i->clipshapes[i->clippos],i->clipdepths[i->clippos],&i->page_matrix,NULL,NULL,
+           / * clip to depth: * / i->depth <= i->clipdepths[i->clippos]? i->depth : i->depth - 1);
+    i->depth ++;*/
+    swf_ObjectPlaceClip(i->cliptags[i->clippos],i->clipshapes[i->clippos],i->clipdepths[i->clippos],&i->page_matrix,NULL,NULL,i->depth);
+}
+static int gfxline_type(gfxline_t*line)
+{
+    int tmplines=0;
+    int tmpsplines=0;
+    int lines=0;
+    int splines=0;
+    int haszerosegments=0;
+    while(line) {
+       if(line->type == gfx_moveTo) {
+           tmplines=0;
+           tmpsplines=0;
+       } else if(line->type == gfx_lineTo) {
+           tmplines++;
+           if(tmplines>lines)
+               lines=tmplines;
+       } else if(line->type == gfx_splineTo) {
+           tmpsplines++;
+           if(tmpsplines>lines)
+               splines=tmpsplines;
+       }
+       line = line->next;
+    }
+    if(lines==0 && splines==0) return 0;
+    else if(lines==1 && splines==0) return 1;
+    else if(lines==0 && splines==1) return 2;
+    else if(splines==0) return 3;
+    else return 4;
+}
 
-    drawimage(obj, bitid, sizex, sizey, x1,y1,x2,y2,x3,y3,x4,y4);
-    return bitid;
+static int gfxline_has_dots(gfxline_t*line)
+{
+    int tmplines=0;
+    double x,y;
+    double dist = 0;
+    int isline = 0;
+    while(line) {
+       if(line->type == gfx_moveTo) {
+           if(isline && dist < 1) {
+               return 1;
+           }
+           dist = 0;
+           isline = 0;
+       } else if(line->type == gfx_lineTo) {
+           dist += fabs(line->x - x) + fabs(line->y - y);
+           isline = 1;
+       } else if(line->type == gfx_splineTo) {
+           dist += fabs(line->sx - x) + fabs(line->sy - y) + 
+                   fabs(line->x - line->sx) + fabs(line->y - line->sy);
+           isline = 1;
+       }
+       x = line->x;
+       y = line->y;
+       line = line->next;
+    }
+    if(isline && dist < 1) {
+       return 1;
+    }
+    return 0;
+}
+
+static int gfxline_fix_short_edges(gfxline_t*line)
+{
+    double x,y;
+    while(line) {
+       if(line->type == gfx_lineTo) {
+           if(fabs(line->x - x) + fabs(line->y - y) < 0.01) {
+               line->x += 0.01;
+           }
+       } else if(line->type == gfx_splineTo) {
+           if(fabs(line->sx - x) + fabs(line->sy - y) + 
+              fabs(line->x - line->sx) + fabs(line->y - line->sy) < 0.01) {
+               line->x += 0.01;
+           }
+       }
+       x = line->x;
+       y = line->y;
+       line = line->next;
+    }
+    return 0;
 }
 
-int swfoutput_drawimagejpeg(struct swfoutput*obj, RGBA*mem, int sizex,int sizey, 
-        double x1,double y1,
-        double x2,double y2,
-        double x3,double y3,
-        double x4,double y4)
+static char is_inside_page(gfxdevice_t*dev, gfxcoord_t x, gfxcoord_t y)
 {
-    TAG*oldtag;
-    JPEGBITS*jpeg;
+    swfoutput_internal*i = (swfoutput_internal*)dev->internal;
+    if(x<i->min_x || x>i->max_x) return 0;
+    if(y<i->min_y || y>i->max_y) return 0;
+    return 1;
+}
 
-    if(shapeid>=0)
-     endshape();
-    if(textid>=0)
-     endtext();
+static void show_path(ArtSVP*path)
+{
+    int t;
+    printf("Segments: %d\n", path->n_segs);
+    for(t=0;t<path->n_segs;t++) {
+       ArtSVPSeg* seg = &path->segs[t];
+       printf("Segment %d: %d points, %s, BBox: (%f,%f,%f,%f)\n", 
+               t, seg->n_points, seg->dir==0?"UP  ":"DOWN",
+               seg->bbox.x0, seg->bbox.y0, seg->bbox.x1, seg->bbox.y1);
+       int p;
+       for(p=0;p<seg->n_points;p++) {
+           ArtPoint* point = &seg->points[p];
+           printf("        (%f,%f)\n", point->x, point->y);
+       }
+    }
+    printf("\n");
+}
 
-    int bitid = ++currentswfid;
-    oldtag = tag;
-    tag = swf_InsertTag(tag,ST_DEFINEBITSJPEG2);
-    swf_SetU16(tag, bitid);
-    swf_SetJPEGBits2(tag,sizex,sizey,mem,jpegquality);
-    drawimage(obj, bitid, sizex, sizey, x1,y1,x2,y2,x3,y3,x4,y4);
-    return bitid;
+gfxline_t* gfxline_move(gfxline_t*line, double x, double y)
+{
+    gfxline_t*l = line = gfxline_clone(line);
+
+    while(l) {
+       l->x += x;
+       l->y += y;
+       l->sx += x;
+       l->sy += y;
+       l = l->next;
+    }
+    return line;
 }
 
-int swfoutput_drawimagelossless(struct swfoutput*obj, RGBA*mem, int sizex,int sizey, 
-        double x1,double y1,
-        double x2,double y2,
-        double x3,double y3,
-        double x4,double y4)
-{
-    TAG*oldtag;
-    if(shapeid>=0)
-     endshape();
-    if(textid>=0)
-     endtext();
-
-    int bitid = ++currentswfid;
-    oldtag = tag;
-    tag = swf_InsertTag(tag,ST_DEFINEBITSLOSSLESS);
-    swf_SetU16(tag, bitid);
-    if(swf_SetLosslessBits(tag,sizex,sizey,mem, BMF_32BIT)<0) {
-       swf_DeleteTag(tag);
-       tag = oldtag;
-       return -1;
+//#define NORMALIZE_POLYGON_POSITIONS
+
+static void swf_stroke(gfxdevice_t*dev, gfxline_t*line, gfxcoord_t width, gfxcolor_t*color, gfx_capType cap_style, gfx_joinType joint_style, gfxcoord_t miterLimit)
+{
+    swfoutput_internal*i = (swfoutput_internal*)dev->internal;
+    int type = gfxline_type(line);
+    int has_dots = gfxline_has_dots(line);
+    gfxbbox_t r = gfxline_getbbox(line);
+    int is_outside_page = !is_inside_page(dev, r.xmin, r.ymin) || !is_inside_page(dev, r.xmax, r.ymax);
+
+    /* TODO: * split line into segments, and perform this check for all segments */
+
+    if(!has_dots && 
+       (width <= i->config_caplinewidth 
+        || (cap_style == gfx_capRound && joint_style == gfx_joinRound)
+        || (cap_style == gfx_capRound && type<=2))) {} else 
+    {
+       /* convert line to polygon */
+       msg("<trace> draw as polygon, type=%d dots=%d", type, has_dots);
+       if(has_dots)
+           gfxline_fix_short_edges(line);
+       /* we need to convert the line into a polygon */
+       ArtSVP* svp = gfxstrokeToSVP(line, width, cap_style, joint_style, miterLimit);
+       gfxline_t*gfxline = SVPtogfxline(svp);
+       dev->fill(dev, gfxline, color);
+       free(gfxline);
+       art_svp_free(svp);
+       return;
     }
-    
-    drawimage(obj, bitid, sizex, sizey, x1,y1,x2,y2,x3,y3,x4,y4);
-    return bitid;
+
+    msg("<trace> draw as stroke, type=%d dots=%d", type, has_dots);
+    endtext(dev);
+
+#ifdef NORMALIZE_POLYGON_POSITIONS
+    endshape(dev);
+    double startx = 0, starty = 0;
+    if(line && line->type == gfx_moveTo) {
+       startx = line->x;
+       starty = line->y;
+    }
+    line = gfxline_move(line, -startx, -starty);
+    i->shapeposx = (int)(startx*20);
+    i->shapeposy = (int)(starty*20);
+#endif
+
+    swfoutput_setstrokecolor(dev, color->r, color->g, color->b, color->a);
+    swfoutput_setlinewidth(dev, width);
+    startshape(dev);
+    stopFill(dev);
+    drawgfxline(dev, line);
+
+#ifdef NORMALIZE_POLYGON_POSITIONS
+    free(line); //account for _move
+#endif
+
+}
+static void swf_fill(gfxdevice_t*dev, gfxline_t*line, gfxcolor_t*color)
+{
+    swfoutput_internal*i = (swfoutput_internal*)dev->internal;
+    gfxbbox_t r = gfxline_getbbox(line);
+    int is_outside_page = !is_inside_page(dev, r.xmin, r.ymin) || !is_inside_page(dev, r.xmax, r.ymax);
+
+    endtext(dev);
+    if(!i->config_ignoredraworder)
+       endshape(dev);
+
+#ifdef NORMALIZE_POLYGON_POSITIONS
+    endshape(dev);
+    double startx = 0, starty = 0;
+    if(line && line->type == gfx_moveTo) {
+       startx = line->x;
+       starty = line->y;
+    }
+    line = gfxline_move(line, -startx, -starty);
+    i->shapeposx = (int)(startx*20);
+    i->shapeposy = (int)(starty*20);
+#endif
+
+    swfoutput_setfillcolor(dev, color->r, color->g, color->b, color->a);
+    startshape(dev);
+    startFill(dev);
+    i->fill=1;
+    drawgfxline(dev, line);
+    msg("<trace> end of swf_fill (shapeid=%d)", i->shapeid);
+
+#ifdef NORMALIZE_POLYGON_POSITIONS
+    free(line); //account for _move
+#endif
+}
+static void swf_fillgradient(gfxdevice_t*dev, gfxline_t*line, gfxgradient_t*gradient, gfxgradienttype_t type, gfxmatrix_t*matrix)
+{
+    msg("<error> Gradient filling not implemented yet");
 }
 
-int swfoutput_drawimagelossless256(struct swfoutput*obj, U8*mem, RGBA*pal, int sizex,int sizey, 
-        double x1,double y1,
-        double x2,double y2,
-        double x3,double y3,
-        double x4,double y4)
-{
-    TAG*oldtag;
-    U8*mem2 = 0;
-    if(shapeid>=0)
-     endshape();
-    if(textid>=0)
-     endtext();
-
-    if(sizex&3)
-    { 
-       /* SWF expects scanlines to be 4 byte aligned */
-       printf("%d -> %d\n", sizex, BYTES_PER_SCANLINE(sizex));
-       int x,y;
-       U8*ptr;
-       mem2 = (U8*)malloc(BYTES_PER_SCANLINE(sizex)*sizey);
-       ptr = mem2;
-       for(y=0;y<sizey;y++)
-       {
-           for(x=0;x<sizex;x++)
-               *ptr++ = mem[y*sizex+x];
-           ptr+= BYTES_PER_SCANLINE(sizex)-sizex;
+static SWFFONT* gfxfont_to_swffont(gfxfont_t*font, char* id)
+{
+    SWFFONT*swffont = (SWFFONT*)rfx_calloc(sizeof(SWFFONT));
+    int t;
+    swffont->id = -1;
+    swffont->version = 2;
+    swffont->name = (U8*)strdup(id);
+    swffont->layout = (SWFLAYOUT*)rfx_calloc(sizeof(SWFLAYOUT));
+    swffont->layout->ascent = 0; /* ? */
+    swffont->layout->descent = 0;
+    swffont->layout->leading = 0;
+    swffont->layout->bounds = (SRECT*)rfx_calloc(sizeof(SRECT)*font->num_glyphs);
+    swffont->encoding = FONT_ENCODING_UNICODE;
+    swffont->numchars = font->num_glyphs;
+    swffont->maxascii = font->max_unicode;
+    swffont->ascii2glyph = (int*)rfx_calloc(sizeof(int)*swffont->maxascii);
+    swffont->glyph2ascii = (U16*)rfx_calloc(sizeof(U16)*swffont->numchars);
+    swffont->glyph = (SWFGLYPH*)rfx_calloc(sizeof(SWFGLYPH)*swffont->numchars);
+    swffont->glyphnames = (char**)rfx_calloc(sizeof(char*)*swffont->numchars);
+    for(t=0;t<font->max_unicode;t++) {
+       swffont->ascii2glyph[t] = font->unicode2glyph[t];
+    }
+    for(t=0;t<font->num_glyphs;t++) {
+       drawer_t draw;
+       gfxline_t*line;
+       swffont->glyph2ascii[t] = font->glyphs[t].unicode;
+       if(font->glyphs[t].name) {
+           swffont->glyphnames[t] = strdup(font->glyphs[t].name);
+       } else {
+           swffont->glyphnames[t] = 0;
        }
-       mem = mem2;
+       swffont->glyph[t].advance = (int)(font->glyphs[t].advance * 20);
+
+       swf_Shape01DrawerInit(&draw, 0);
+       line = font->glyphs[t].line;
+       while(line) {
+           FPOINT c,to;
+           c.x = line->sx; c.y = line->sy;
+           to.x = line->x; to.y = line->y;
+           if(line->type == gfx_moveTo) {
+               draw.moveTo(&draw, &to);
+           } else if(line->type == gfx_lineTo) {
+               draw.lineTo(&draw, &to);
+           } else if(line->type == gfx_splineTo) {
+               draw.splineTo(&draw, &c, &to);
+           }
+           line = line->next;
+       }
+       draw.finish(&draw);
+       swffont->glyph[t].shape = swf_ShapeDrawerToShape(&draw);
+       swffont->layout->bounds[t] = swf_ShapeDrawerGetBBox(&draw);
+       draw.dealloc(&draw);
     }
+    return swffont;
+}
 
-    int bitid = ++currentswfid;
-    oldtag = tag;
-    tag = swf_InsertTag(tag,ST_DEFINEBITSLOSSLESS2);
-    swf_SetU16(tag, bitid);
-    if(swf_SetLosslessBitsIndexed(tag,sizex,sizey,mem, pal, 256)<0) {
-       swf_DeleteTag(tag);
-       tag = oldtag;
-       return -1;
+static void swf_addfont(gfxdevice_t*dev, char*fontid, gfxfont_t*font)
+{
+    swfoutput_internal*i = (swfoutput_internal*)dev->internal;
+
+    if(i->swffont && i->swffont->name && !strcmp((char*)i->swffont->name,fontid))
+       return; // the requested font is the current font
+    
+    fontlist_t*last=0,*l = i->fontlist;
+    while(l) {
+       last = l;
+       if(!strcmp((char*)l->swffont->name, fontid)) {
+           return; // we already know this font
+       }
+       l = l->next;
+    }
+    l = (fontlist_t*)rfx_calloc(sizeof(fontlist_t));
+    l->swffont = gfxfont_to_swffont(font, fontid);
+    l->next = 0;
+    if(last) {
+       last->next = l;
+    } else {
+       i->fontlist = l;
+    }
+    swf_FontSetID(l->swffont, getNewID(i->dev));
+
+    if(getScreenLogLevel() >= LOGLEVEL_DEBUG)  {
+       // print font information
+       msg("<debug> Font %s",fontid);
+       msg("<debug> |   ID: %d", l->swffont->id);
+       msg("<debug> |   Version: %d", l->swffont->version);
+       msg("<debug> |   Name: %s", l->swffont->name);
+       msg("<debug> |   Numchars: %d", l->swffont->numchars);
+       msg("<debug> |   Maxascii: %d", l->swffont->maxascii);
+       msg("<debug> |   Style: %d", l->swffont->style);
+       msg("<debug> |   Encoding: %d", l->swffont->encoding);
+       for(int iii=0; iii<l->swffont->numchars;iii++) {
+           msg("<debug> |   Glyph %d) name=%s, unicode=%d size=%d bbox=(%.2f,%.2f,%.2f,%.2f)\n", iii, l->swffont->glyphnames?l->swffont->glyphnames[iii]:"<nonames>", l->swffont->glyph2ascii[iii], l->swffont->glyph[iii].shape->bitlen, 
+                   l->swffont->layout->bounds[iii].xmin/20.0,
+                   l->swffont->layout->bounds[iii].ymin/20.0,
+                   l->swffont->layout->bounds[iii].xmax/20.0,
+                   l->swffont->layout->bounds[iii].ymax/20.0
+                   );
+           int t;
+           for(t=0;t<l->swffont->maxascii;t++) {
+               if(l->swffont->ascii2glyph[t] == iii)
+                   msg("<debug> | - maps to %d",t);
+           }
+       }
     }
-    if(mem2)
-       free(mem2);
-  
-    drawimage(obj, bitid, sizex, sizey, x1,y1,x2,y2,x3,y3,x4,y4);
-    return bitid;
 }
 
-void swfoutput_drawimageagain(struct swfoutput*obj, int id, int sizex,int sizey, 
-        double x1,double y1,
-        double x2,double y2,
-        double x3,double y3,
-        double x4,double y4)
+static void swf_switchfont(gfxdevice_t*dev, char*fontid)
 {
-    if(id<0) return;
-    if(shapeid>=0)
-     endshape();
-    if(textid>=0)
-     endtext();
+    swfoutput_internal*i = (swfoutput_internal*)dev->internal;
 
-    drawimage(obj, id, sizex, sizey, x1,y1,x2,y2,x3,y3,x4,y4);
+    if(i->swffont && i->swffont->name && !strcmp((char*)i->swffont->name,fontid))
+       return; // the requested font is the current font
+    
+    fontlist_t*l = i->fontlist;
+    while(l) {
+       if(!strcmp((char*)l->swffont->name, fontid)) {
+           i->swffont = l->swffont;
+           return; //done!
+       }
+       l = l->next;
+    }
+    msg("<error> Unknown font id: %s", fontid);
+    return;
 }
 
+static void swf_drawchar(gfxdevice_t*dev, char*fontid, int glyph, gfxcolor_t*color, gfxmatrix_t*matrix)
+{
+    swfoutput_internal*i = (swfoutput_internal*)dev->internal;
+       
+    if(!i->swffont || !i->swffont->name || strcmp((char*)i->swffont->name,fontid)) // not equal to current font
+    {
+       /* TODO: remove the need for this (enhance getcharacterbbox so that it can cope
+                with multiple fonts */
+       endtext(dev);
+
+       swf_switchfont(dev, fontid); // set the current font
+    }
+    swfoutput_setfontmatrix(dev, matrix->m00, matrix->m01, matrix->m10, matrix->m11);
+   
+    swfmatrix m;
+    m.m11 = i->fontm11;
+    m.m12 = i->fontm12;
+    m.m21 = i->fontm21;
+    m.m22 = i->fontm22;
+    m.m31 = matrix->tx;
+    m.m32 = matrix->ty;
+  
+/*    printf("%f %f\n", m.m31,  m.m32);
+    {
+    static int xpos = 40;
+    static int ypos = 200;
+    m.m31 = xpos;
+    m.m32 = ypos;
+    xpos += 10;
+    }*/
+
+
+    drawchar(dev, i->swffont, glyph, &m, color);
+}