made font conversion more robust
[swftools.git] / lib / devices / swf.c
index 087433b..4b3d536 100644 (file)
@@ -40,9 +40,9 @@
 #include "../rfxswf.h"
 #include "../gfxdevice.h"
 #include "../gfxtools.h"
-#include "../art/libart.h"
 #include "swf.h"
 #include "../gfxpoly.h"
+#include "../png.h"
 
 #define CHARDATAMAX 8192
 #define CHARMIDX 0
@@ -76,9 +76,12 @@ typedef struct _swfoutput_internal
     double config_dumpfonts;
     double config_ppmsubpixels;
     double config_jpegsubpixels;
+    int config_simpleviewer;
     int config_opennewwindow;
     int config_ignoredraworder;
     int config_drawonlyshapes;
+    int config_frameresets;
+    int config_linknameurl;
     int config_jpegquality;
     int config_storeallcharacters;
     int config_enablezlib;
@@ -113,6 +116,7 @@ typedef struct _swfoutput_internal
 
     TAG *tag;
     int currentswfid;
+    int startids;
     int depth;
     int startdepth;
     int linewidth;
@@ -138,12 +142,14 @@ typedef struct _swfoutput_internal
     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;
@@ -253,6 +259,7 @@ static swfoutput_internal* init_internal_struct()
     i->config_internallinkfunction=0;
     i->config_externallinkfunction=0;
     i->config_reordertags=1;
+    i->config_linknameurl=1;
 
     i->config_linkcolor.r = i->config_linkcolor.g = i->config_linkcolor.b = 255;
     i->config_linkcolor.a = 0x40;
@@ -279,7 +286,7 @@ static U16 getNewID(gfxdevice_t* dev)
 static U16 getNewDepth(gfxdevice_t* dev)
 {
     swfoutput_internal*i = (swfoutput_internal*)dev->internal;
-    if(i->depth == 65535) {
+    if(i->depth == 65520) {
        if(!id_error) {
            msg("<error> Depth Table overflow");
            msg("<error> This file is too complex to render- SWF only supports 65536 shapes at once");
@@ -866,11 +873,98 @@ static void endpage(gfxdevice_t*dev)
     i->pagefinished = 1;
 }
 
+static void addViewer(gfxdevice_t* dev)
+{
+    swfoutput_internal*i = (swfoutput_internal*)dev->internal;
+
+    SHAPE*s;
+    RGBA button_colors[3]= {{0xbf,0x00,0x00,0x80},{0xbf,0x20,0x20,0xc0}, {0xbf,0xc0,0xc0,0xff}};
+    int ids[6];
+    int button_sizex = 20;
+    int button_sizey = 20; 
+    int t;
+    RGBA black = {255,0,0,0};
+    for(t=0;t<6;t++) {
+       i->tag = swf_InsertTag(i->tag,ST_DEFINESHAPE3);
+       swf_ShapeNew(&s);
+       int ls1 = swf_ShapeAddLineStyle(s,40,&black);
+       int fs1 = swf_ShapeAddSolidFillStyle(s,&button_colors[t/2]);
+       int shapeid = ids[t] = getNewID(dev);
+       swf_SetU16(i->tag,shapeid);
+       SRECT r;
+       r.xmin = -20*button_sizex;
+       r.xmax = 20*button_sizex; 
+       r.ymin = 0;
+       r.ymax = 40*button_sizey;
+       swf_SetRect(i->tag,&r);              // set shape bounds
+       swf_SetShapeHeader(i->tag,s);        // write all styles to tag
+       swf_ShapeSetAll(i->tag,s,0*button_sizex,0,ls1,fs1,0);
+       swf_ShapeSetLine(i->tag,s,(1-(t&1)*2)*20*button_sizex,20*button_sizey);
+       swf_ShapeSetLine(i->tag,s,-(1-(t&1)*2)*20*button_sizex,20*button_sizey);
+       swf_ShapeSetLine(i->tag,s,0,-40*button_sizey);
+       swf_ShapeSetEnd(i->tag);   // finish drawing
+       swf_ShapeFree(s);   // clean shape structure (which isn't needed anymore after writing the tag)
+    }
+    ActionTAG*a1=0,*a2=0,*a3=0;
+    a1 = action_NextFrame(a1);
+    a1 = action_Stop(a1);
+    a1 = action_End(a1);
+    
+    a2 = action_PreviousFrame(a2);
+    a2 = action_Stop(a2);
+    a2 = action_End(a2);
+    
+    a3 = action_Stop(a3);
+    a3 = action_End(a3);
+
+    i->tag = swf_InsertTag(i->tag, ST_DOACTION);
+    swf_ActionSet(i->tag,a3);
+
+    i->tag = swf_InsertTag(i->tag,ST_DEFINEBUTTON);
+    int buttonid1 = getNewID(dev);
+    swf_SetU16(i->tag, buttonid1);
+    swf_ButtonSetRecord(i->tag,BS_UP|BS_HIT,ids[0],1,NULL,NULL);
+    swf_ButtonSetRecord(i->tag,BS_OVER,ids[2],1,NULL,NULL);
+    swf_ButtonSetRecord(i->tag,BS_DOWN,ids[4],1,NULL,NULL);
+    swf_SetU8(i->tag,0); // end of button records
+    swf_ActionSet(i->tag,a1);
+    
+    i->tag = swf_InsertTag(i->tag,ST_DEFINEBUTTON);
+    int buttonid2 = getNewID(dev);
+    swf_SetU16(i->tag, buttonid2);
+    swf_ButtonSetRecord(i->tag,BS_UP|BS_HIT,ids[1],1,NULL,NULL);
+    swf_ButtonSetRecord(i->tag,BS_OVER,ids[3],1,NULL,NULL);
+    swf_ButtonSetRecord(i->tag,BS_DOWN,ids[5],1,NULL,NULL);
+    swf_SetU8(i->tag,0); // end of button records
+    swf_ActionSet(i->tag,a2);
+  
+    i->tag = swf_InsertTag(i->tag,ST_PLACEOBJECT2);
+    MATRIX m;
+    swf_GetMatrix(0, &m);
+    m.tx = button_sizex*20+200;
+    swf_ObjectPlace(i->tag, buttonid2, 65534,&m,0,0);
+    i->tag = swf_InsertTag(i->tag,ST_PLACEOBJECT2);
+    m.tx = button_sizex*20+200+200;
+    swf_ObjectPlace(i->tag, buttonid1, 65535,&m,0,0);
+}
+
+
 void swf_startframe(gfxdevice_t*dev, int width, int height)
 {
     swfoutput_internal*i = (swfoutput_internal*)dev->internal;
+    if(i->firstpage) {
+       if(i->config_protect) {
+           i->tag = swf_InsertTag(i->tag, ST_PROTECT);
+           i->config_protect = 0;
+       }
+       if(i->config_simpleviewer) {
+           addViewer(dev);
+       }
+    }
+    
     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);
@@ -921,6 +1015,14 @@ void swf_endframe(gfxdevice_t*dev)
         swf_SetU16(i->tag,i->depth);
     }
     i->depth = i->startdepth;
+
+    if(i->config_frameresets) {
+       for(i->currentswfid;i->currentswfid>i->startids;i->currentswfid--) {
+           i->tag = swf_InsertTag(i->tag,ST_FREECHARACTER);
+           swf_SetU16(i->tag,i->currentswfid);
+       }
+       i->currentswfid = i->startids;
+    }
 }
 
 static void setBackground(gfxdevice_t*dev, int x1, int y1, int x2, int y2)
@@ -962,7 +1064,7 @@ void gfxdevice_swf_init(gfxdevice_t* dev)
     
     dev->name = "swf";
 
-    dev->internal = init_internal_struct();
+    dev->internal = init_internal_struct(); // set config to default values
 
     dev->startpage = swf_startframe;
     dev->endpage = swf_endframe;
@@ -982,15 +1084,13 @@ void gfxdevice_swf_init(gfxdevice_t* dev)
     swfoutput_internal*i = (swfoutput_internal*)dev->internal;
     i->dev = dev;
 
-    RGBA rgb;
-
     msg("<verbose> initializing swf output\n", i->max_x,i->max_y);
 
     i->swffont = 0;
    
     i->swf = (SWF*)rfx_calloc(sizeof(SWF));
-    i->swf->fileVersion    = i->config_flashversion;
-    i->swf->frameRate      = i->config_framerate*0x100;
+    i->swf->fileVersion    = 0;
+    i->swf->frameRate      = 0x80;
     i->swf->movieSize.xmin = 0;
     i->swf->movieSize.ymin = 0;
     i->swf->movieSize.xmax = 0;
@@ -998,14 +1098,13 @@ void gfxdevice_swf_init(gfxdevice_t* dev)
     
     i->swf->firstTag = swf_InsertTag(NULL,ST_SETBACKGROUNDCOLOR);
     i->tag = i->swf->firstTag;
+    RGBA rgb;
     rgb.a = rgb.r = rgb.g = rgb.b = 0xff;
-    rgb.r = 0;
+    //rgb.r = 0;
     swf_SetRGB(i->tag,&rgb);
 
     i->startdepth = i->depth = 0;
-    
-    if(i->config_protect)
-      i->tag = swf_InsertTag(i->tag, ST_PROTECT);
+    i->startids = i->currentswfid = 0;
 }
 
 static void startshape(gfxdevice_t*dev)
@@ -1095,12 +1194,12 @@ void cancelshape(gfxdevice_t*dev)
     /* delete old shape tag */
     TAG*todel = i->tag;
     i->tag = i->tag->prev;
-    swf_DeleteTag(todel);
+    swf_DeleteTag(0, todel);
     if(i->shape) {swf_ShapeFree(i->shape);i->shape=0;}
     i->shapeid = -1;
     i->bboxrectpos = -1;
 
-//    i->currentswfid--; // this was an *exceptionally* bad idea
+//    i->currentswfid--; // doesn't work, for some reason
 }
 
 void fixAreas(gfxdevice_t*dev)
@@ -1220,7 +1319,7 @@ void wipeSWF(SWF*swf)
           tag->id != ST_END &&
           tag->id != ST_DOACTION &&
           tag->id != ST_SHOWFRAME) {
-           swf_DeleteTag(tag);
+           swf_DeleteTag(swf, tag);
        }
        tag = next;
     }
@@ -1233,6 +1332,9 @@ void swfoutput_finalize(gfxdevice_t*dev)
     if(i->tag && i->tag->id == ST_END)
         return; //already done
 
+    i->swf->fileVersion = i->config_flashversion;
+    i->swf->frameRate = i->config_framerate*0x100;
+
     if(i->config_bboxvars) {
        TAG* tag = swf_InsertTag(i->swf->firstTag, ST_DOACTION);
        ActionTAG*a = 0;
@@ -1281,6 +1383,7 @@ void swfoutput_finalize(gfxdevice_t*dev)
 
         iterator = iterator->next;
     }
+       
     i->tag = swf_InsertTag(i->tag,ST_END);
     TAG* tag = i->tag->prev;
 
@@ -1288,7 +1391,7 @@ void swfoutput_finalize(gfxdevice_t*dev)
        and the ST_END- they confuse the flash player  */
     while(tag->id == ST_REMOVEOBJECT2) {
         TAG* prev = tag->prev;
-        swf_DeleteTag(tag);
+        swf_DeleteTag(i->swf, tag);
         tag = prev;
     }
     
@@ -1438,7 +1541,7 @@ static void swfoutput_setlinewidth(gfxdevice_t*dev, double _linewidth)
 }
 
 
-static void drawlink(gfxdevice_t*dev, ActionTAG*,ActionTAG*, gfxline_t*points, char mouseover);
+static void drawlink(gfxdevice_t*dev, ActionTAG*,ActionTAG*, gfxline_t*points, char mouseover, const char*url);
 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, const char*url, gfxline_t*points);
@@ -1499,7 +1602,7 @@ void swfoutput_linktourl(gfxdevice_t*dev, const char*url, gfxline_t*points)
     }
     actions = action_End(actions);
    
-    drawlink(dev, actions, 0, points, 0);
+    drawlink(dev, actions, 0, points, 0, url);
 }
 void swfoutput_linktopage(gfxdevice_t*dev, int page, gfxline_t*points)
 {
@@ -1522,7 +1625,10 @@ void swfoutput_linktopage(gfxdevice_t*dev, int page, gfxline_t*points)
        actions = action_End(actions);
     }
 
-    drawlink(dev, actions, 0, points, 0);
+    char name[80];
+    sprintf(name, "page%d", page);
+
+    drawlink(dev, actions, 0, points, 0, name);
 }
 
 /* Named Links (a.k.a. Acrobatmenu) are used to implement various gadgets
@@ -1572,19 +1678,22 @@ void swfoutput_namedlink(gfxdevice_t*dev, char*name, gfxline_t*points)
        actions2 = action_End(actions2);
     }
 
-    drawlink(dev, actions1, actions2, points, mouseover);
+    drawlink(dev, actions1, actions2, points, mouseover, name);
 
     swf_ActionFree(actions1);
     swf_ActionFree(actions2);
     free(tmp);
 }
 
-static void drawgfxline(gfxdevice_t*dev, gfxline_t*line)
+static void drawgfxline(gfxdevice_t*dev, gfxline_t*line, int fill)
 {
     swfoutput_internal*i = (swfoutput_internal*)dev->internal;
     gfxcoord_t lastx=0,lasty=0,px=0,py=0;
     char lastwasmoveto;
     int lines= 0, splines=0;
+
+    i->fill = fill;
+
     while(1) {
        if(!line)
            break;
@@ -1616,7 +1725,7 @@ static void drawgfxline(gfxdevice_t*dev, gfxline_t*line)
 }
 
 
-static void drawlink(gfxdevice_t*dev, ActionTAG*actions1, ActionTAG*actions2, gfxline_t*points, char mouseover)
+static void drawlink(gfxdevice_t*dev, ActionTAG*actions1, ActionTAG*actions2, gfxline_t*points, char mouseover, const char*url)
 {
     swfoutput_internal*i = (swfoutput_internal*)dev->internal;
     RGBA rgb;
@@ -1648,7 +1757,7 @@ static void drawlink(gfxdevice_t*dev, ActionTAG*actions1, ActionTAG*actions2, gf
     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);
+    drawgfxline(dev, points, 1);
     swf_ShapeSetEnd(i->tag);
 
     /* shape2 */
@@ -1671,7 +1780,7 @@ static void drawlink(gfxdevice_t*dev, ActionTAG*actions1, ActionTAG*actions2, gf
     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);
+    drawgfxline(dev, points, 1);
     swf_ShapeSetEnd(i->tag);
 
     if(!mouseover)
@@ -1709,8 +1818,10 @@ static void drawlink(gfxdevice_t*dev, ActionTAG*actions1, ActionTAG*actions2, gf
             swf_ButtonPostProcess(i->tag, 1);
        }
     }
-    char name[80];
-    sprintf(name, "link%d", buttonid);
+    const char* name = 0;
+    if(i->config_linknameurl) {
+       name = url;
+    }
     
     msg("<trace> Placing link ID %d", buttonid);
     i->tag = swf_InsertTag(i->tag,ST_PLACEOBJECT2);
@@ -1809,6 +1920,8 @@ int swf_setparameter(gfxdevice_t*dev, const char*name, const char*value)
        i->config_enablezlib = atoi(value);
     } else if(!strcmp(name, "bboxvars")) {
        i->config_bboxvars = atoi(value);
+    } else if(!strcmp(name, "frameresets")) {
+       i->config_frameresets = atoi(value);
     } else if(!strcmp(name, "showclipshapes")) {
        i->config_showclipshapes = atoi(value);
     } else if(!strcmp(name, "reordertags")) {
@@ -1839,7 +1952,7 @@ int swf_setparameter(gfxdevice_t*dev, const char*name, const char*value)
            i->swf->fileVersion = i->config_flashversion;
        }
     } else if(!strcmp(name, "framerate")) {
-       i->config_framerate = atoi(value);
+       i->config_framerate = atof(value);
        if(i->swf) {
            i->swf->frameRate = i->config_framerate*0x100;
        }
@@ -1853,6 +1966,8 @@ int swf_setparameter(gfxdevice_t*dev, const char*name, const char*value)
        i->config_dumpfonts = atoi(value);
     } else if(!strcmp(name, "animate")) {
        i->config_animate = atoi(value);
+    } else if(!strcmp(name, "simpleviewer")) {
+       i->config_simpleviewer = atoi(value);
     } else if(!strcmp(name, "next_bitmap_is_jpeg")) {
        i->jpeg = 1;
     } else if(!strcmp(name, "jpegquality")) {
@@ -1882,9 +1997,7 @@ int swf_setparameter(gfxdevice_t*dev, const char*name, const char*value)
        i->config_linkcolor.a = NIBBLE(value[6])<<4 | NIBBLE(value[7]);
     } else if(!strcmp(name, "help")) {
        printf("\nSWF layer options:\n");
-       printf("jpegdpi=<dpi>               resolution adjustment for jpeg images\n");
         printf("jpegsubpixels=<pixels>      resolution adjustment for jpeg images (same as jpegdpi, but in pixels)\n");
-        printf("ppmdpi=<dpi>                resolution adjustment for lossless images\n");
         printf("ppmsubpixels=<pixels        resolution adjustment for  lossless images (same as ppmdpi, but in pixels)\n");
         printf("subpixels=<pixels>          shortcut for setting both jpegsubpixels and ppmsubpixels\n");
         printf("drawonlyshapes              convert everything to shapes (currently broken)\n");
@@ -1892,6 +2005,7 @@ int swf_setparameter(gfxdevice_t*dev, const char*name, const char*value)
         printf("linksopennewwindow          make links open a new browser window\n");
         printf("linktarget                  target window name of new links\n");
         printf("linkcolor=<color)           color of links (format: RRGGBBAA)\n");
+        printf("linknameurl                Link buttons will be named like the URL they refer to (handy for iterating through links with actionscript)\n");
         printf("storeallcharacters          don't reduce the fonts to used characters in the output file\n");
         printf("enablezlib                  switch on zlib compression (also done if flashversion>=7)\n");
         printf("bboxvars                    store the bounding box of the SWF file in actionscript variables\n");
@@ -1903,9 +2017,12 @@ int swf_setparameter(gfxdevice_t*dev, const char*name, const char*value)
         printf("insertstop                  put an ActionScript \"STOP\" tag in every frame\n");
         printf("protect                     add a \"protect\" tag to the file, to prevent loading in the Flash editor\n");
         printf("flashversion=<version>      the SWF fileversion (6)\n");
+        printf("framerate=<fps>                    SWF framerate\n");
         printf("minlinewidth=<width>        convert horizontal/vertical boxes smaller than this width to lines (0.05) \n");
+        printf("simpleviewer                Add next/previous buttons to the SWF\n");
         printf("animate                     insert a showframe tag after each placeobject (animate draw order of PDF files)\n");
         printf("jpegquality=<quality>       set compression quality of jpeg images\n");
+       printf("splinequality=<value>       Set the quality of spline convertion to value (0-100, default: 100).\n");
     } else {
        return 0;
     }
@@ -2017,6 +2134,7 @@ static int add_image(swfoutput_internal*i, gfximage_t*img, int targetwidth, int
 
     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 {
@@ -2090,7 +2208,7 @@ static void swf_fillbitmap(gfxdevice_t*dev, gfxline_t*line, gfximage_t*img, gfxm
     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);
+    drawgfxline(dev, line, 1);
     swf_ShapeSetEnd(i->tag);
     swf_ShapeFree(shape);
 
@@ -2121,7 +2239,7 @@ static void drawoutline(gfxdevice_t*dev, gfxline_t*line)
     swf_ShapeCountBits(shape,NULL,NULL);
     swf_SetShapeBits(i->tag,shape);
     swf_ShapeSetAll(i->tag,shape,UNDEFINED_COORD,UNDEFINED_COORD,lsid,0,0);
-    drawgfxline(dev, line);
+    drawgfxline(dev, line, 1);
     swf_ShapeSetEnd(i->tag);
     swf_ShapeFree(shape);
        
@@ -2167,7 +2285,7 @@ static void swf_startclip(gfxdevice_t*dev, gfxline_t*line)
     swf_ShapeSetAll(i->tag,shape,UNDEFINED_COORD,UNDEFINED_COORD,0,fsid,0);
     i->swflastx = i->swflasty = UNDEFINED_COORD;
     i->shapeisempty = 1;
-    drawgfxline(dev, line);
+    drawgfxline(dev, line, 1);
     if(i->shapeisempty) {
        /* an empty clip shape is equivalent to a shape with no area */
        int x = line?line->x:0;
@@ -2384,7 +2502,7 @@ static void swf_stroke(gfxdevice_t*dev, gfxline_t*line, gfxcoord_t width, gfxcol
     swfoutput_setlinewidth(dev, width);
     startshape(dev);
     stopFill(dev);
-    drawgfxline(dev, line);
+    drawgfxline(dev, line, 0);
 
     if(i->config_normalize_polygon_positions) {
        free(line); //account for _move
@@ -2423,8 +2541,7 @@ static void swf_fill(gfxdevice_t*dev, gfxline_t*line, gfxcolor_t*color)
     swfoutput_setfillcolor(dev, color->r, color->g, color->b, color->a);
     startshape(dev);
     startFill(dev);
-    i->fill=1;
-    drawgfxline(dev, line);
+    drawgfxline(dev, line, 1);
     
     if(i->currentswfid==2 && r.xmin==0 && r.ymin==0 && r.xmax==i->max_x && r.ymax==i->max_y) {
        if(i->config_watermark) {
@@ -2501,7 +2618,7 @@ static void swf_fillgradient(gfxdevice_t*dev, gfxline_t*line, gfxgradient_t*grad
     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);
+    drawgfxline(dev, line, 1);
     swf_ShapeSetEnd(i->tag);
     swf_ShapeFree(shape);
 
@@ -2536,6 +2653,7 @@ static SWFFONT* gfxfont_to_swffont(gfxfont_t*font, const char* id)
     for(t=0;t<font->max_unicode;t++) {
        swffont->ascii2glyph[t] = font->unicode2glyph[t];
     }
+    SRECT max = {0,0,0,0};
     for(t=0;t<font->num_glyphs;t++) {
        drawer_t draw;
        gfxline_t*line;
@@ -2572,13 +2690,11 @@ static SWFFONT* gfxfont_to_swffont(gfxfont_t*font, const char* id)
        }
        draw.finish(&draw);
        swffont->glyph[t].shape = swf_ShapeDrawerToShape(&draw);
-       swffont->layout->bounds[t] = swf_ShapeDrawerGetBBox(&draw);
 
-       int xmax = swffont->layout->bounds[t].xmax / 20;
-       if(xmax>0 && xmax*2 < advance) {
-           printf("fix bad advance value: bbox=%d, advance=%d (%f)\n", xmax, advance, font->glyphs[t].advance);
-           advance = xmax;
-       }
+       SRECT bbox = swf_ShapeDrawerGetBBox(&draw);
+       swf_ExpandRect2(&max, &bbox);
+
+       swffont->layout->bounds[t] = bbox;
            
        if(advance<32768/20) {
            swffont->glyph[t].advance = advance*20;
@@ -2590,6 +2706,23 @@ static SWFFONT* gfxfont_to_swffont(gfxfont_t*font, const char* id)
 
        swf_ExpandRect2(&bounds, &swffont->layout->bounds[t]);
     }
+    for(t=0;t<font->num_glyphs;t++) {
+       SRECT bbox = swffont->layout->bounds[t];
+
+       /* if the glyph doesn't have a bounding box, use the
+          combined bounding box (necessary e.g. for space characters) */
+       if(!(bbox.xmin|bbox.ymin|bbox.xmax|bbox.ymax)) {
+           swffont->layout->bounds[t] = bbox = max;
+       }
+       
+       /* check that the advance value is reasonable, by comparing it
+          with the bounding box */
+       if(bbox.xmax>0 && (bbox.xmax*2 < swffont->glyph[t].advance || !swffont->glyph[t].advance)) {
+           if(swffont->glyph[t].advance)
+               msg("<warning> fix bad advance value: bbox=%.2f, advance=%.2f\n", bbox.xmax/20.0, swffont->glyph[t].advance/20.0);
+           swffont->glyph[t].advance = bbox.xmax;
+       }
+    }
 
 
     /* Flash player will use the advance value from the char, and the ascent/descent values
@@ -2733,6 +2866,9 @@ static void swf_drawchar(gfxdevice_t*dev, gfxfont_t*font, int glyph, gfxcolor_t*
        msg("<verbose> Moving character origin to %f %f\n", matrix->tx, matrix->ty);
        endtext(dev);
        setfontscale(dev, matrix->m00, matrix->m01, matrix->m10, matrix->m11, matrix->tx, matrix->ty, 1);
+        /* since we just moved the char origin to the current char's position, 
+           it now has the relative position (0,0) */
+        x = y = 0;
     }
     
     if(i->shapeid>=0)