X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fdevices%2Fswf.c;h=f0b047304e08e5a8e9a08d5fb192870d8087c379;hb=9b4370b4285ebe2cf446a07d9f50a3dc197594d6;hp=24b090ad21e1e5a9f4d388c405c3ce86dceb9305;hpb=36dda3dbc6f9fb51d1f9dafa0f06e52a097df9ea;p=swftools.git

diff --git a/lib/devices/swf.c b/lib/devices/swf.c
index 24b090a..f0b0473 100644
--- a/lib/devices/swf.c
+++ b/lib/devices/swf.c
@@ -694,7 +694,7 @@ static int drawchar(gfxdevice_t*dev, SWFFONT *swffont, int charid, float x, floa
     }
 
     if(charid<0 || charid>=swffont->numchars) {
-	msg("<warning> No character %d in font %s ", charid, FIXNULL((char*)swffont->name));
+	msg("<warning> No character %d in font %s (%d chars)", charid, FIXNULL((char*)swffont->name), swffont->numchars);
 	return 0;
     }
     /*if(swffont->glyph[charid].shape->bitlen <= 16) {
@@ -733,7 +733,7 @@ static void endtext(gfxdevice_t*dev)
     if(i->textid<0)
         return;
 
-    i->tag = swf_InsertTag(i->tag,ST_DEFINETEXT);
+    i->tag = swf_InsertTag(i->tag,ST_DEFINETEXT2);
     swf_SetU16(i->tag, i->textid);
 
     SRECT r;
@@ -962,9 +962,8 @@ static void startshape(gfxdevice_t*dev)
 
     if(i->shapeid>=0)
 	return;
-
-    if(i->textid>=0)
-        endtext(dev);
+    //if(i->chardatapos && i->chardata[i->chardatapos-1].color.a)
+    endtext(dev);
 
     i->tag = swf_InsertTag(i->tag,ST_DEFINESHAPE3);
 
@@ -1854,6 +1853,32 @@ int swf_setparameter(gfxdevice_t*dev, const char*name, const char*value)
 	    i->config_linkcolor.b,
 	    i->config_linkcolor.a);
 
+    } 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");
+        printf("ignoredraworder             allow to perform a few optimizations for creating smaller SWFs\n");
+        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("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");
+        printf("reordertags=0/1             (default: 1) perform some tag optimizations\n");
+        printf("internallinkfunction=<name> when the user clicks a internal link (to a different page) in the converted file, this actionscript function is called\n");
+        printf("externallinkfunction=<name> when the user clicks an external link (e.g. http://www.foo.bar/) on the converted file, this actionscript function is called\n");
+        printf("disable_polygon_conversion  never convert strokes to polygons (will remove capstyles and joint styles)\n");
+        printf("caplinewidth=<width>        the minimum thichness a line needs to have so that capstyles become visible (and are converted)\n");
+        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("minlinewidth=<width>        convert horizontal/vertical boxes smaller than this width to lines (0.05) \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");
     } else {
 	return 0;
     }
@@ -2342,7 +2367,9 @@ static void swf_fill(gfxdevice_t*dev, gfxline_t*line, gfxcolor_t*color)
     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);
 
+    //if(i->chardatapos && i->chardata[i->chardatapos-1].color.a) {
     endtext(dev);
+
     if(!i->config_ignoredraworder)
 	endshape(dev);
 
@@ -2437,9 +2464,10 @@ static SWFFONT* gfxfont_to_swffont(gfxfont_t*font, const char* id)
 	swffont->glyph[t].shape = swf_ShapeDrawerToShape(&draw);
 	swffont->layout->bounds[t] = swf_ShapeDrawerGetBBox(&draw);
 
-	if(swffont->layout->bounds[t].xmax && swffont->layout->bounds[t].xmax*2 < advance) {
-	    printf("fix bad advance value: bbox=%d, advance=%d (%f)\n", swffont->layout->bounds[t].xmax, advance, font->glyphs[t].advance);
-	    advance = swffont->layout->bounds[t].xmax;
+	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;
 	}
 	    
 	if(advance<32768) {