X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=pdf2swf%2Fswfoutput.cc;h=9abde4311015e70efd1c84f5c7894868659c7607;hb=d13c78984c1007a56e52cdf7fed9d3a8205a2d45;hp=47ec61951b345635808c1327f23258b6ec12995f;hpb=a7f355d5422ffa13494a3fd0cab675828ad14735;p=swftools.git diff --git a/pdf2swf/swfoutput.cc b/pdf2swf/swfoutput.cc index 47ec619..9abde43 100644 --- a/pdf2swf/swfoutput.cc +++ b/pdf2swf/swfoutput.cc @@ -18,19 +18,24 @@ along with swftools; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include +#include #include +#include "../config.h" #include #include +#ifdef HAVE_ASSERT_H +#include +#else +#define assert(a) +#endif +#include #include "swfoutput.h" #include "spline.h" extern "C" { #include "../lib/log.h" #include "../lib/rfxswf.h" } -#define standardEncodingSize 335 -extern char *standardEncodingNames[standardEncodingSize]; - -#define assert(a) int opennewwindow=0; int ignoredraworder=0; @@ -39,9 +44,11 @@ int jpegquality=85; int storeallcharacters=0; int enablezlib=0; int insertstoptag=0; -int flashversion=4; +int flashversion=5; int splinemaxerror=1; int fontsplinemaxerror=1; + +static char storefont = 0; static int flag_protected = 0; typedef unsigned char u8; @@ -60,13 +67,12 @@ 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 int shapeisempty = 1; static char fill = 0; static int sizex; static int sizey; @@ -113,11 +119,18 @@ static int moveto(TAG*tag, plotxy p0) // write a line-to command into the swf static void lineto(TAG*tag, plotxy p0) { - int rx = ((int)(p0.x*20)-swflastx); - int ry = ((int)(p0.y*20)-swflasty); + int px = (int)(p0.x*20); + int py = (int)(p0.y*20); + int rx = (px-swflastx); + int ry = (py-swflasty); /* we can't skip this for rx=0,ry=0, those are plots */ swf_ShapeSetLine (tag, shape, rx,ry); + + //swf_ExpandRect3(boundingBox, px, py, linewidth); + //swf_ExpandRect3(boundingBox, swflastx, swflasty, linewidth); + + shapeisempty = 0; swflastx+=rx; swflasty+=ry; } @@ -135,6 +148,7 @@ static void splineto(TAG*tag, plotxy control,plotxy end) swflasty += ey; if(cx || cy || ex || ey) swf_ShapeSetCurve(tag, shape, cx,cy,ex,ey); + shapeisempty = 0; } /* write a line, given two points and the transformation @@ -189,31 +203,30 @@ static void stopFill() { if(lastwasfill) { - swf_ShapeSetStyle(tag,shape,linestyleid,0x8000,0); - fillstylechanged = 1; - lastwasfill = 0; + swf_ShapeSetStyle(tag,shape,linestyleid,0x8000,0); + fillstylechanged = 1; + lastwasfill = 0; } } static void startFill() { if(!lastwasfill) { - swf_ShapeSetStyle(tag,shape,0x8000,fillstyleid,0); - fillstylechanged = 1; - lastwasfill = 1; + swf_ShapeSetStyle(tag,shape,0x8000,fillstyleid,0); + fillstylechanged = 1; + lastwasfill = 1; } } -/* draw a T1 outline. These are generated by pdf2swf and by t1lib +/* draw an outline. These are generated by pdf2swf and by t1lib (representing characters). */ -void drawpath(TAG*tag, T1_OUTLINE*outline, struct swfmatrix*m, int log) +void drawpath(struct swfoutput*output, SWF_OUTLINE*outline, struct swfmatrix*m, int log) { - if(tag->id != ST_DEFINEFONT && - tag->id != ST_DEFINESHAPE && + if( tag->id != ST_DEFINESHAPE && tag->id != ST_DEFINESHAPE2 && tag->id != ST_DEFINESHAPE3) { - logf(" internal error: drawpath needs a shape tag, not %d\n",tag->id); + msg(" internal error: drawpath needs a shape tag, not %d\n",tag->id); exit(1); } double x=0,y=0; @@ -225,8 +238,19 @@ void drawpath(TAG*tag, T1_OUTLINE*outline, struct swfmatrix*m, int log) { x += (outline->dest.x/(float)0xffff); y += (outline->dest.y/(float)0xffff); - if(outline->type == T1_PATHTYPE_MOVE) + if(outline->type == SWF_PATHTYPE_MOVE) { + if(!init && fill && output->drawmode != DRAWMODE_EOFILL && !ignoredraworder) { + /* drawmode=FILL (not EOFILL) means that + seperate shapes do not cancel each other out. + On SWF side, we need to start a new shape for each + closed polygon, because SWF only knows EOFILL. + */ + endshape(); + startshape(output); + startFill(); + } + if(((int)(lastx*20) != (int)(firstx*20) || (int)(lasty*20) != (int)(firsty*20)) && fill && !init) @@ -244,7 +268,7 @@ void drawpath(TAG*tag, T1_OUTLINE*outline, struct swfmatrix*m, int log) firsty=y; init = 0; } - else if(outline->type == T1_PATHTYPE_LINE) + else if(outline->type == SWF_PATHTYPE_LINE) { plotxy p0; plotxy p1; @@ -255,13 +279,13 @@ void drawpath(TAG*tag, T1_OUTLINE*outline, struct swfmatrix*m, int log) 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) + else if(outline->type == SWF_PATHTYPE_BEZIER) { plotxy p0; plotxy p1; plotxy p2; plotxy p3; - T1_BEZIERSEGMENT*o2 = (T1_BEZIERSEGMENT*)outline; + SWF_BEZIERSEGMENT*o2 = (SWF_BEZIERSEGMENT*)outline; p0.x=x; p0.y=y; p1.x=o2->C.x/(float)0xffff+lastx; @@ -274,7 +298,7 @@ void drawpath(TAG*tag, T1_OUTLINE*outline, struct swfmatrix*m, int log) spline(tag,p0,p1,p2,p3,m); } else { - logf(" drawpath: unknown outline type:%d\n", outline->type); + msg(" drawpath: unknown outline type:%d\n", outline->type); } lastx=x; lasty=y; @@ -295,32 +319,32 @@ void drawpath(TAG*tag, T1_OUTLINE*outline, struct swfmatrix*m, int log) } } -plotxy getPivot(T1_OUTLINE*outline, int dir, double line_width, int end) +plotxy getPivot(SWF_OUTLINE*outline, int dir, double line_width, int end, int trytwo) { - T1_PATHPOINT next, next2; + SWF_PATHPOINT next, next2; double xv=0,yv=0, xv2=0, yv2=0; plotxy p; int two = 0; if(!end) { - if(outline->type == T1_PATHTYPE_LINE) { + if(outline->type == SWF_PATHTYPE_LINE) { next = outline->dest; } else { - next = ((T1_BEZIERSEGMENT*)outline)->B; + next = ((SWF_BEZIERSEGMENT*)outline)->B; if(next.x==0 && next.y==0) { - next = ((T1_BEZIERSEGMENT*)outline)->C; + next = ((SWF_BEZIERSEGMENT*)outline)->C; } if(next.x==0 && next.y==0) { - next = ((T1_BEZIERSEGMENT*)outline)->dest; + next = ((SWF_BEZIERSEGMENT*)outline)->dest; } } next2 = next; - if(outline->last && outline->last->type != T1_PATHTYPE_MOVE) { - if(outline->type == T1_PATHTYPE_LINE) { + if(trytwo && outline->last && outline->last->type != SWF_PATHTYPE_MOVE) { + if(outline->type == SWF_PATHTYPE_LINE) { next2 = outline->last->dest; } else { - T1_PATHPOINT c = ((T1_BEZIERSEGMENT*)(outline->last))->C; - T1_PATHPOINT b = ((T1_BEZIERSEGMENT*)(outline->last))->B; + SWF_PATHPOINT c = ((SWF_BEZIERSEGMENT*)(outline->last))->C; + SWF_PATHPOINT b = ((SWF_BEZIERSEGMENT*)(outline->last))->B; next2.x = outline->last->dest.x - c.x; next2.y = outline->last->dest.y - c.y; if(next2.x==0 && next2.y==0) { @@ -335,11 +359,11 @@ plotxy getPivot(T1_OUTLINE*outline, int dir, double line_width, int end) two = 1; } } else { - if(outline->type == T1_PATHTYPE_LINE) { + if(outline->type == SWF_PATHTYPE_LINE) { next = outline->dest; } else { - T1_PATHPOINT c = ((T1_BEZIERSEGMENT*)outline)->C; - T1_PATHPOINT b = ((T1_BEZIERSEGMENT*)outline)->B; + SWF_PATHPOINT c = ((SWF_BEZIERSEGMENT*)outline)->C; + SWF_PATHPOINT b = ((SWF_BEZIERSEGMENT*)outline)->B; next.x = outline->dest.x - c.x; next.y = outline->dest.y - c.y; if(next.x==0 && next.y==0) { @@ -352,16 +376,16 @@ plotxy getPivot(T1_OUTLINE*outline, int dir, double line_width, int end) } } next2 = next; - if(outline->link && outline->link->type != T1_PATHTYPE_MOVE) { - if(outline->type == T1_PATHTYPE_LINE) { + if(trytwo && outline->link && outline->link->type != SWF_PATHTYPE_MOVE) { + if(outline->type == SWF_PATHTYPE_LINE) { next2 = outline->link->dest; } else { - next2 = ((T1_BEZIERSEGMENT*)(outline->link))->B; + next2 = ((SWF_BEZIERSEGMENT*)(outline->link))->B; if(next2.x==0 && next2.y==0) { - next2 = ((T1_BEZIERSEGMENT*)outline->link)->C; + next2 = ((SWF_BEZIERSEGMENT*)outline->link)->C; } if(next2.x==0 && next2.y==0) { - next2 = ((T1_BEZIERSEGMENT*)outline->link)->dest; + next2 = ((SWF_BEZIERSEGMENT*)outline->link)->dest; } } two = 1; @@ -376,7 +400,7 @@ plotxy getPivot(T1_OUTLINE*outline, int dir, double line_width, int end) yv = next.x/(float)0xffff; } - double r = line_width/sqrt(xv*xv+yv*yv); + double r = (line_width/2)/sqrt(xv*xv+yv*yv); xv*=r; yv*=r; @@ -389,12 +413,12 @@ plotxy getPivot(T1_OUTLINE*outline, int dir, double line_width, int end) yv2 = next2.x/(float)0xffff; } - double r2 = line_width/sqrt(xv2*xv2+yv2*yv2); + double r2 = (line_width/2)/sqrt(xv2*xv2+yv2*yv2); xv2*=r2; yv2*=r2; xv = (xv+xv2)/2; yv = (yv+yv2)/2; - double r3 = line_width/sqrt(xv*xv+yv*yv); + double r3 = (line_width/2)/sqrt(xv*xv+yv*yv); xv *= r3; yv *= r3; } @@ -404,51 +428,91 @@ plotxy getPivot(T1_OUTLINE*outline, int dir, double line_width, int end) return p; } -void drawShortPath(struct swfoutput*output, double x, double y, struct swfmatrix* m, T1_OUTLINE*outline, int num, int line_cap, int line_join, double line_width) +void drawShortPath(struct swfoutput*output, double x, double y, struct swfmatrix* m, SWF_OUTLINE*outline) { double lastx=x, lasty=y; + while (outline && outline->type != SWF_PATHTYPE_MOVE) + { + x += (outline->dest.x/(float)0xffff); + y += (outline->dest.y/(float)0xffff); + + if(outline->type == SWF_PATHTYPE_LINE) + { + plotxy p0, p1; + p0.x=lastx; + p0.y=lasty; + p1.x= x; + p1.y= y; + line(tag, p0, p1, m); + } + else if(outline->type == SWF_PATHTYPE_BEZIER) + { + plotxy p0,p1,p2,p3; + SWF_BEZIERSEGMENT*o2 = (SWF_BEZIERSEGMENT*)outline; + p3.x=lastx; + p3.y=lasty; + 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; + p0.x=x; + p0.y=y; + spline(tag,p0,p1,p2,p3,m); + } + lastx=x; + lasty=y; + outline = outline->link; + } +} + +void drawShortPathWithEnds(struct swfoutput*output, double x, double y, struct swfmatrix* m, SWF_OUTLINE*outline, int num, int line_cap, int line_join, double line_width) +{ plotxy d,d2; int back = 0; if(line_cap == LINE_CAP_BUTT || line_cap == LINE_CAP_SQUARE) { endshape(); startshape(output); - T1_OUTLINE *last, *tmp=outline; + SWF_OUTLINE *last, *tmp=outline; plotxy s,e,p0,p1,p2,p3,m0,m1,m2,m3; double x2 = x; double y2 = y; double lx=x,ly=y; + double ee = 1.0; int nr; - while(tmp && tmp->type != T1_PATHTYPE_MOVE) { + while(tmp && tmp->type != SWF_PATHTYPE_MOVE) { last = tmp; lx += (tmp->dest.x/(float)0xffff); ly += (tmp->dest.y/(float)0xffff); tmp = tmp->link; } - s = getPivot(outline, 0, line_width, 0); - e = getPivot(last, 0, line_width, 1); - - s.x/=2; - s.y/=2; - e.x/=2; - e.y/=2; - - p0.x = x2 + s.x; - p0.y = y2 + s.y; - p1.x = x2 - s.x; - p1.y = y2 - s.y; - p2.x = x2 - s.y - s.x; - p2.y = y2 + s.x - s.y; - p3.x = x2 - s.y + s.x; - p3.y = y2 + s.x + s.y; - m0.x = lx + e.x; - m0.y = ly + e.y; - m1.x = lx - e.x; - m1.y = ly - e.y; - m2.x = lx + e.y - e.x; - m2.y = ly - e.x - e.y; - m3.x = lx + e.y + e.x; - m3.y = ly - e.x + e.y; + s = getPivot(outline, 0, line_width, 0, 0); + e = getPivot(last, 0, line_width, 1, 0); + + if(line_cap == LINE_CAP_BUTT) { + /* make the clipping rectangle slighly bigger + than the line ending, so that it get's clipped + propertly */ + //ee = 1.01; + ee=1.0; + } + + p0.x = x2 + s.x*ee; + p0.y = y2 + s.y*ee; + p1.x = x2 - s.x*ee; + p1.y = y2 - s.y*ee; + p2.x = x2 - s.y - s.x*ee; + p2.y = y2 + s.x - s.y*ee; + p3.x = x2 - s.y + s.x*ee; + p3.y = y2 + s.x + s.y*ee; + m0.x = lx + e.x*ee; + m0.y = ly + e.y*ee; + m1.x = lx - e.x*ee; + m1.y = ly - e.y*ee; + m2.x = lx + e.y - e.x*ee; + m2.y = ly - e.x - e.y*ee; + m3.x = lx + e.y + e.x*ee; + m3.y = ly - e.x + e.y*ee; for(nr=0;nr<2;nr++) { int dir=0; @@ -501,65 +565,142 @@ void drawShortPath(struct swfoutput*output, double x, double y, struct swfmatrix stopFill(); } - while (outline && outline->type != T1_PATHTYPE_MOVE) - { - x += (outline->dest.x/(float)0xffff); - y += (outline->dest.y/(float)0xffff); + drawShortPath(output,x,y,m,outline); - if(outline->type == T1_PATHTYPE_LINE) - { - plotxy p0, p1; - p0.x=lastx; - p0.y=lasty; - p1.x= x; - p1.y= y; - line(tag, p0, p1, m); - } - else if(outline->type == T1_PATHTYPE_BEZIER) - { - plotxy p0,p1,p2,p3; - T1_BEZIERSEGMENT*o2 = (T1_BEZIERSEGMENT*)outline; - p3.x=lastx; - p3.y=lasty; - 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; - p0.x=x; - p0.y=y; - spline(tag,p0,p1,p2,p3,m); - } - lastx=x; - lasty=y; - outline = outline->link; - } if(line_cap == LINE_CAP_BUTT) { endshape(); + startshape(output); } } -void drawpath2poly(struct swfoutput *output, T1_OUTLINE*outline, struct swfmatrix*m, int log, int line_join, int line_cap, double line_width, double miter_limit) +void drawT1toRect(struct swfoutput*output, double x, double y, struct swfmatrix* m, SWF_OUTLINE*outline, int num, int line_cap, int line_join, double line_width) +{ + plotxy d1,d2,p1,p2,p3,p4; + + d1.x = (outline->dest.x/(float)0xffff); + d1.y = (outline->dest.y/(float)0xffff); + d2 = getPivot(outline, 0, line_width, 0, 0); + + assert(line_cap != LINE_CAP_ROUND); + if(line_cap == LINE_CAP_SQUARE) { + x -= +d2.y; + y -= -d2.x; + d1.x += +2*d2.y; + d1.y += -2*d2.x; + } + + p1.x = x + d2.x; + p1.y = y + d2.y; + p2.x = x + d2.x + d1.x; + p2.y = y + d2.y + d1.y; + p3.x = x - d2.x + d1.x; + p3.y = y - d2.y + d1.y; + p4.x = x - d2.x; + p4.y = y - d2.y; + + line(tag, p1,p2, m); + line(tag, p2,p3, m); + line(tag, p3,p4, m); + line(tag, p4,p1, m); +} + +void drawShortPathWithStraightEnds(struct swfoutput*output, double x, double y, struct swfmatrix* m, SWF_OUTLINE*outline, int num, int line_cap, int line_join, double line_width) { - if(tag->id != ST_DEFINEFONT && - tag->id != ST_DEFINESHAPE && + SWF_OUTLINE*tmp=outline; + double xx=x,yy=y; + int stop=0; + assert(shapeid>=0); + + startFill(); + drawT1toRect(output, x, y, m,outline, num, line_cap, line_join, line_width); + + while(tmp->link && tmp->link->type!=SWF_PATHTYPE_MOVE) { + xx += (tmp->dest.x/(float)0xffff); + yy += (tmp->dest.y/(float)0xffff); + tmp = tmp->link; + } + + assert(tmp->type == SWF_PATHTYPE_LINE); + assert(outline->type == SWF_PATHTYPE_LINE); + + if(tmp!=outline) { + + if(outline->link == tmp) { + /* the two straight line segments (which are everything we + need to draw) are very likely to overlap. To avoid that + they cancel each other out at the end points, start a new + shape for the second one */ + endshape();startshape(output); + startFill(); + } + + drawT1toRect(output, xx, yy, m, tmp, num, line_cap, line_join, line_width); + + if(outline->link != tmp) + { + stopFill();stop=1; + int save= tmp->type; + tmp->type = SWF_PATHTYPE_MOVE; + x += (outline->dest.x/(float)0xffff); + y += (outline->dest.y/(float)0xffff); + outline = outline->link; + drawShortPath(output, x, y, m, outline); + tmp->type = save; + } + } + if(!stop) + stopFill(); +} + +static int t1len(SWF_OUTLINE*line) +{ + int num=0; + while(line && line->type != SWF_PATHTYPE_MOVE) { + num++; + line = line->link; + } + return num; +} + +static float t1linelen(SWF_OUTLINE*line) +{ + float x,y; + x = (line->dest.x/(float)0xffff); + y = (line->dest.y/(float)0xffff); + return sqrt(x*x+y*y); +} + +void drawpath2poly(struct swfoutput *output, SWF_OUTLINE*outline, struct swfmatrix*m, int log, int line_join, int line_cap, double line_width, double miter_limit) +{ + if( tag->id != ST_DEFINESHAPE && tag->id != ST_DEFINESHAPE2 && tag->id != ST_DEFINESHAPE3) { - logf(" internal error: drawpath needs a shape tag, not %d\n",tag->id); + msg(" internal error: drawpath needs a shape tag, not %d\n",tag->id); exit(1); } + assert(shapeid>=0); double x=0,y=0; double lastx=0,lasty=0; int valid = 0; - T1_OUTLINE*tmp = outline, *last = 0; + int lastwasline = 0; + SWF_OUTLINE*tmp = outline, *last = 0; tmp->last = 0; - while(tmp) { - x += (tmp->dest.x/(float)0xffff); - y += (tmp->dest.y/(float)0xffff); - if(tmp->type == T1_PATHTYPE_MOVE) { + while(1) { + if(tmp) { + x += (tmp->dest.x/(float)0xffff); + y += (tmp->dest.y/(float)0xffff); + } + if(!tmp || tmp->type == SWF_PATHTYPE_MOVE) { if(valid && last) { - drawShortPath(output, lastx, lasty, m, last, valid, line_cap, line_join, line_width); + if(last->type == SWF_PATHTYPE_LINE && t1linelen(last)>line_width*2 && + lastwasline && line_cap != LINE_CAP_ROUND) + drawShortPathWithStraightEnds(output, lastx, lasty, m, last, valid, line_cap, line_join, line_width); + else + drawShortPathWithEnds(output, lastx, lasty, m, last, valid, line_cap, line_join, line_width); } + if(!tmp) + break; valid = 0; last = 0; lastx = x; @@ -569,13 +710,16 @@ void drawpath2poly(struct swfoutput *output, T1_OUTLINE*outline, struct swfmatri last = tmp; valid++; } + + if(tmp && tmp->type == SWF_PATHTYPE_LINE && t1linelen(tmp)>line_width*2) + lastwasline = 1; + else + lastwasline = 0; + if(tmp->link) tmp->link->last = tmp; // make sure list is properly linked in both directions tmp = tmp->link; } - if(valid && last) { - drawShortPath(output, lastx, lasty, m, last, valid, line_cap, line_join, line_width); - } } static inline int colorcompare(RGBA*a,RGBA*b) @@ -590,7 +734,7 @@ static inline int colorcompare(RGBA*a,RGBA*b) return 1; } -static const int CHARDATAMAX = 1024; +static const int CHARDATAMAX = 8192; struct chardata { int charid; int fontid; @@ -623,11 +767,11 @@ static void putcharacters(TAG*tag) if(tag->id != ST_DEFINETEXT && tag->id != ST_DEFINETEXT2) { - logf(" internal error: putcharacters needs an text tag, not %d\n",tag->id); + msg(" internal error: putcharacters needs an text tag, not %d\n",tag->id); exit(1); } if(!chardatapos) { - logf(" putcharacters called with zero characters"); + msg(" putcharacters called with zero characters"); } for(pass = 0; pass < 2; pass++) @@ -689,8 +833,12 @@ static void putcharacters(TAG*tag) if(lastx != chardata[t].x || lasty != chardata[t].y) { - newx=chardata[t].x; - newy=chardata[t].y; + newx = chardata[t].x; + newy = chardata[t].y; + if(newx == 0) + newx = SET_TO_ZERO; + if(newy == 0) + newy = SET_TO_ZERO; } if(!colorcompare(&color, &chardata[t].color)) { @@ -738,6 +886,7 @@ static void putcharacter(struct swfoutput*obj, int fontid, int charid, { if(chardatapos == CHARDATAMAX) { + msg(" Character buffer too small. SWF will be slightly bigger"); endtext(); starttext(obj); } @@ -750,9 +899,14 @@ static void putcharacter(struct swfoutput*obj, int fontid, int charid, chardatapos++; } +struct fontlist_t +{ + SWFFONT *swffont; + fontlist_t*next; +} *fontlist = 0; /* process a character. */ -static void drawchar(struct swfoutput*obj, SWFFont*font, char*character, int charnr, swfmatrix*m) +static int drawchar(struct swfoutput*obj, SWFFONT *swffont, char*character, int charnr, int u, swfmatrix*m) { int usefonts=1; if(m->m12!=0 || m->m21!=0) @@ -760,24 +914,50 @@ static void drawchar(struct swfoutput*obj, SWFFont*font, char*character, int cha if(m->m11 != m->m22) usefonts=0; - if(usefonts && ! drawonlyshapes) + if(!swffont) { + msg(" Font is NULL"); + return 0; + } + + if(!usefonts) { + msg(" Non diagonal font matrix: %f %f", m->m11, m->m21); + msg(" | %f %f", m->m12, m->m22); + } + + //if(usefonts && ! drawonlyshapes) + if (1) { - int charid = font->getSWFCharID(character, charnr); + int charid = getCharID(swffont, charnr, character, u); + + if(charid<0) { + msg(" Didn't find character '%s' (c=%d,u=%d) in current charset (%s, %d characters)", + FIXNULL(character),charnr, u, FIXNULL((char*)swffont->name), swffont->numchars); + /*fontlist_t*it = fontlist; + while(it) { + msg(" Font history: %s [%d]", it->swffont->name, getCharID(it->swffont, charnr, character, u)); + it = it->next; + }*/ + return 0; + } + 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? + + putcharacter(obj, swffont->id, charid,(int)(m->m13*20),(int)(m->m23*20), + (int)(m->m11+0.5)); + swf_FontUseGlyph(swffont, charid); + return 1; } - else + /*else { - T1_OUTLINE*outline = font->getOutline(character, charnr); + SWF_OUTLINE*outline = font->getOutline(character, charnr); char* charname = character; if(!outline) { - logf(" Didn't find %s in current charset (%s)", - FIXNULL(character),FIXNULL(font->getName())); + msg(" Didn't find character '%s' (%d) in current charset (%s)", + FIXNULL(character),charnr,FIXNULL(font->getName())); return; } @@ -798,11 +978,11 @@ static void drawchar(struct swfoutput*obj, SWFFont*font, char*character, int cha fill = 1; drawpath(tag, outline, &m2, 0); fill = lf; - } + }*/ } /* draw a curved polygon. */ -void swfoutput_drawpath(swfoutput*output, T1_OUTLINE*outline, +void swfoutput_drawpath(swfoutput*output, SWF_OUTLINE*outline, struct swfmatrix*m) { if(textid>=0) @@ -823,10 +1003,10 @@ void swfoutput_drawpath(swfoutput*output, T1_OUTLINE*outline, else startFill(); - drawpath(tag, outline,m, 0); + drawpath(output, outline,m, 0); } -void swfoutput_drawpath2poly(struct swfoutput*output, T1_OUTLINE*outline, struct swfmatrix*m, int line_join, int line_cap, double line_width, double miter_limit) +void swfoutput_drawpath2poly(struct swfoutput*output, SWF_OUTLINE*outline, struct swfmatrix*m, int line_join, int line_cap, double line_width, double miter_limit) { if(textid>=0) endtext(); @@ -839,315 +1019,124 @@ void swfoutput_drawpath2poly(struct swfoutput*output, T1_OUTLINE*outline, struct drawpath2poly(output, outline, m, 0, line_join, line_cap, line_width, miter_limit); } -/* SWFFont: copy all t1 font outlines to a local - array. */ -SWFFont::SWFFont(char*name, int id, char*filename) +int getCharID(SWFFONT *font, int charnr, char *charname, int u) { - if(!T1_GetFontName(id)) - T1_LoadFont(id); - - this->name = strdup(T1_GetFontFileName(id)); - this->fontid = strdup(name); - this->t1id = id; - - char**a= T1_GetAllCharNames(id); - int t, outlinepos=0; - char*map[256]; - - t=0; - while(a[t]) - t++; - this->charnum = t; - - if(!charnum) - return; - logf(" Font %s(%d): Storing %d outlines.\n", FIXNULL(name), id, charnum); - - this->standardtablesize = 256; - if(this->charnum < this->standardtablesize) - this->standardtablesize = this->charnum; - this->standardtable = (char**)malloc(standardtablesize*sizeof(char*)); - - 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;soutline[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; - } - } -} - -/* free all tables, write out definefont tags */ -SWFFont::~SWFFont() -{ - int t,usednum=0; - int*ptr; - - if(storeallcharacters) - { - int t; - for(t=0;tcharnum;t++) - { - if(this->charname[t]) - getSWFCharID(this->charname[t], -1); - } - } - - ptr = (int*)malloc(swfcharpos*sizeof(int)); - - for(t=0;t 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;tdata[ptr[t]] = - SWAP16(swf_GetTagLen(ftag)-initpos); - - swflastx=0; - swflasty=0; - swf_SetU8(ftag,0x10); //1 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); + int t; + if(charname) { + for(t=0;tnumchars;t++) { + if(font->glyphnames[t] && !strcmp(font->glyphnames[t],charname)) { + return t; + } } - swf_SetU8(ftag, 0); //flags - for(t=0;tcharname[this->swfcharid2char[t]]; - for(s=0;s<256;s++) { - if(standardEncodingNames[s] && - !strcmp(name,standardEncodingNames[s])) - break; + /* if we didn't find the character, maybe + we can find the capitalized version */ + for(t=0;tnumchars;t++) { + if(font->glyphnames[t] && !strcasecmp(font->glyphnames[t],charname)) { + return t; } - swf_SetU8(ftag, (U8)s); } } - free(ptr); - free(outline); - for(t=0;t0) { + /* try to use the unicode id */ + if(u>=0 && umaxascii && font->ascii2glyph[u]>=0) { + return font->ascii2glyph[u]; } - free(standardtable); - free(charname); - free(width); - free(used); - free(swfcharid2char); - free(char2swfcharid); -} - -T1_OUTLINE*SWFFont::getOutline(char*name, int charnr) -{ - int t; - for(t=0;tcharnum;t++) { - if(!strcmp(this->charname[t],name)) { - return outline[t]; - } - } - - /* if we didn't find the character, maybe - we can find the capitalized version */ - for(t=0;tcharnum;t++) { - if(!strcasecmp(this->charname[t],name)) - return outline[t]; } - /* if we didn't find it by name, use the names of the first 256 characters - of the font to try a new name based on charnr */ - if(this->standardtable && charnr>=0 && charnr < this->standardtablesize) { - return getOutline(this->standardtable[charnr], -1); + if(charnr>=0 && charnrnumchars) { + return charnr; } - logf(" Didn't find character '%s' in font '%s'", FIXNULL(name), this->name); - return 0; -} - -int SWFFont::getSWFCharID(char*name, int charnr) -{ - int t; - for(t=0;tcharnum;t++) { - if(!strcmp(this->charname[t],name)) { - if(!used[t]) - { - swfcharid2char[swfcharpos] = t; - char2swfcharid[t] = swfcharpos++; - used[t] = 1; - } - return char2swfcharid[t]; - } - } - - /* if we didn't find the character, maybe - we can find the capitalized version */ - for(t=0;tcharnum;t++) { - if(!strcasecmp(this->charname[t],name)) { - if(!used[t]) - { - swfcharid2char[swfcharpos] = t; - char2swfcharid[t] = swfcharpos++; - used[t] = 1; - } - return char2swfcharid[t]; - } - } + /* the following is technically wrong, and only works if the font encoding + is US-ASCII based. It's needed for fonts which return broken unicode + indices */ +/* if(charnr>=0 && charnrmaxascii && font->ascii2glyph[charnr]>=0) { + return font->ascii2glyph[charnr]; + }*/ - /* if we didn't find it by name, use the names of the first 256 (or so) characters - of the font to try a new name based on charnr */ - if(this->standardtable && charnr>=0 && charnr < this->standardtablesize) { - return getSWFCharID(this->standardtable[charnr], -1); - } - logf(" Didn't find character '%s' in font '%s'", FIXNULL(name), this->name); - return 0; + return -1; } -int SWFFont::getWidth(char*name) -{ - int t; - for(t=0;tcharnum;t++) { - if(!strcmp(this->charname[t],name)) { - return this->width[t]; - } - } - return 0; -} - -char*SWFFont::getName() -{ - return this->name; -} - -struct fontlist_t -{ - SWFFont * font; - fontlist_t*next; -} *fontlist = 0; /* 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) +void swfoutput_setfont(struct swfoutput*obj, char*fontid, char*filename) { fontlist_t*last=0,*iterator; - if(obj->font && !strcmp(obj->font->fontid,fontid)) + if(!fontid) { + msg(" No fontid"); + return; + } + + if(obj->swffont && obj->swffont->name && !strcmp((char*)obj->swffont->name,fontid)) return; iterator = fontlist; while(iterator) { - if(!strcmp(iterator->font->fontid,fontid)) - break; + if(!strcmp((char*)iterator->swffont->name,fontid)) { + obj->swffont = iterator->swffont; + return; + } last = iterator; iterator = iterator->next; } - if(iterator) - { - obj->font = iterator->font; - return ; + + if(!filename) { + msg(" No filename given for font- internal error?"); + return; } - if(t1id<0) { - logf(" internal error: t1id:%d, fontid:%s\n", t1id,FIXNULL(fontid)); + swf_SetLoadFontParameters(0,/*skip unused*/0,/*full unicode*/1); + SWFFONT*swffont = swf_LoadFont(filename); + + if(swffont == 0) { + msg(" Couldn't load font %s (%s)", fontid, filename); + swffont = swf_LoadFont(0); } + + swf_FontSetID(swffont, ++currentswfid); - SWFFont*font = new SWFFont(fontid, t1id, filename); + if(screenloglevel >= LOGLEVEL_DEBUG) { + // print font information + msg(" Font %s (%s)",swffont->name, filename); + msg(" | ID: %d", swffont->id); + msg(" | Version: %d", swffont->version); + msg(" | Name: %s", fontid); + msg(" | Numchars: %d", swffont->numchars); + msg(" | Maxascii: %d", swffont->maxascii); + msg(" | Style: %d", swffont->style); + msg(" | Encoding: %d", swffont->encoding); + for(int iii=0; iiinumchars;iii++) { + msg(" | Glyph %d) name=%s, unicode=%d size=%d bbox=(%.2f,%.2f,%.2f,%.2f)\n", iii, swffont->glyphnames[iii], swffont->glyph2ascii[iii], swffont->glyph[iii].shape->bitlen, + swffont->layout->bounds[iii].xmin/20.0, + swffont->layout->bounds[iii].ymin/20.0, + swffont->layout->bounds[iii].xmax/20.0, + swffont->layout->bounds[iii].ymax/20.0 + ); + } + } + + /* set the font name to the ID we use here */ + if(swffont->name) free(swffont->name); + swffont->name = (U8*)strdup(fontid); + iterator = new fontlist_t; - iterator->font = font; + iterator->swffont = swffont; iterator->next = 0; if(last) last->next = iterator; else fontlist = iterator; - obj->font = font; + + obj->swffont = swffont; } int swfoutput_queryfont(struct swfoutput*obj, char*fontid) { fontlist_t *iterator = fontlist; while(iterator) { - if(!strcmp(iterator->font->fontid,fontid)) + if(!strcmp((char*)iterator->swffont->name,fontid)) return 1; iterator = iterator->next; } @@ -1173,7 +1162,7 @@ void swfoutput_setfontmatrix(struct swfoutput*obj,double m11,double m12, } /* draws a character at x,y. */ -void swfoutput_drawchar(struct swfoutput* obj,double x,double y,char*character, int charnr) +int swfoutput_drawchar(struct swfoutput* obj,double x,double y,char*character, int charnr, int u) { swfmatrix m; m.m11 = obj->fontm11; @@ -1182,40 +1171,72 @@ void swfoutput_drawchar(struct swfoutput* obj,double x,double y,char*character, m.m22 = obj->fontm22; m.m13 = x; m.m23 = y; - drawchar(obj, obj->font, character, charnr, &m); + return drawchar(obj, obj->swffont, character, charnr, u, &m); } /* initialize the swf writer */ -void swfoutput_init(struct swfoutput* obj, char*_filename, int _sizex, int _sizey) +void swfoutput_init(struct swfoutput* obj, char*_filename, int x1, int y1, int x2, int y2) { - GLYPH *glyph; RGBA rgb; SRECT r; memset(obj, 0, sizeof(struct swfoutput)); filename = _filename; - sizex = _sizex; - sizey = _sizey; + sizex = x2; + sizey = y2; - logf(" initializing swf output for size %d*%d\n", sizex,sizey); + msg(" initializing swf output for size %d*%d\n", sizex,sizey); - obj->font = 0; + obj->swffont = 0; + obj->drawmode = -1; memset(&swf,0x00,sizeof(SWF)); swf.fileVersion = flashversion; swf.frameRate = 0x0040; // 1 frame per 4 seconds - swf.movieSize.xmax = 20*sizex; - swf.movieSize.ymax = 20*sizey; + swf.movieSize.xmin = 20*x1; + swf.movieSize.ymin = 20*y1; + swf.movieSize.xmax = 20*x2; + swf.movieSize.ymax = 20*y2; + + depth = 1; swf.firstTag = swf_InsertTag(NULL,ST_SETBACKGROUNDCOLOR); tag = swf.firstTag; - rgb.r = 0xff; - rgb.g = 0xff; - rgb.b = 0xff; + rgb.a = rgb.r = rgb.g = rgb.b = 0xff; swf_SetRGB(tag,&rgb); - if(flag_protected) // good practice! /r + + if(1)/* add white rectangle */ + { + SRECT r; + SHAPE* s; + int ls1=0,fs1=0; + int shapeid = ++currentswfid; + r.xmin = x1*20; + r.ymin = y1*20; + r.xmax = x2*20; + r.ymax = y2*20; + tag = swf_InsertTag(tag, ST_DEFINESHAPE); + swf_ShapeNew(&s); + fs1 = swf_ShapeAddSolidFillStyle(s, &rgb); + swf_SetU16(tag,shapeid); + swf_SetRect(tag,&r); + swf_SetShapeHeader(tag,s); + swf_ShapeSetAll(tag,s,x1*20,y1*20,ls1,fs1,0); + swf_ShapeSetLine(tag,s,20*(x2-x1),0); + swf_ShapeSetLine(tag,s,0,20*(y2-y1)); + swf_ShapeSetLine(tag,s,20*(x1-x2),0); + swf_ShapeSetLine(tag,s,0,20*(y1-y2)); + swf_ShapeSetEnd(tag); + swf_ShapeFree(s); + tag = swf_InsertTag(tag, ST_PLACEOBJECT2); + swf_ObjectPlace(tag,shapeid,depth++,0,0,0); + tag = swf_InsertTag(tag, ST_PLACEOBJECT2); + swf_ObjectPlaceClip(tag,shapeid,depth++,0,0,0,65535); + } + + if(flag_protected) tag = swf_InsertTag(tag, ST_PROTECT); - depth = 1; + startdepth = depth; } @@ -1258,6 +1279,7 @@ static void startshape(struct swfoutput*obj) swf_ShapeSetAll(tag,shape,/*x*/0,/*y*/0,linestyleid,0,0); swflastx=swflasty=0; lastwasfill = 0; + shapeisempty = 1; } static void starttext(struct swfoutput*obj) @@ -1293,8 +1315,17 @@ static void endshape() if(shapeid<0) return; swf_ShapeSetEnd(tag); - tag = swf_InsertTag(tag,ST_PLACEOBJECT2); - swf_ObjectPlace(tag,shapeid,/*depth*/depth++,NULL,NULL,NULL); + + if(shapeisempty) { + // delete the tag again, we didn't do anything + TAG*todel = tag; + tag = tag->prev; + swf_DeleteTag(todel); + } else { + /* TODO: fix bounding box */ + tag = swf_InsertTag(tag,ST_PLACEOBJECT2); + swf_ObjectPlace(tag,shapeid,/*depth*/depth++,NULL,NULL,NULL); + } shapeid = -1; } @@ -1337,25 +1368,29 @@ void swfoutput_newpage(struct swfoutput*obj) swf_SetU16(tag,depth); } - depth = 1; - startdepth = depth; + depth = startdepth; } -/* "destroy" like in (oo-terminology) "destructor". Perform cleaning - up, complete the swf, and write it out. */ +/* Perform cleaning up, complete the swf, and write it out. */ void swfoutput_destroy(struct swfoutput* obj) { endpage(obj); fontlist_t *tmp,*iterator = fontlist; while(iterator) { - delete iterator->font; - iterator->font = 0; + TAG*mtag = swf.firstTag; + if(iterator->swffont) { + mtag = swf_InsertTag(mtag, ST_DEFINEFONT2); + /*if(!storeallcharacters) + swf_FontReduce(iterator->swffont);*/ + swf_FontSetDefine2(mtag, iterator->swffont); + swf_FontFree(iterator->swffont); + } + tmp = iterator; iterator = iterator->next; delete tmp; } - T1_CloseLib(); if(!filename) return; if(filename) @@ -1364,28 +1399,28 @@ void swfoutput_destroy(struct swfoutput* obj) fi = 1; // stdout if(fi<=0) { - logf(" Could not create \"%s\". ", FIXNULL(filename)); + msg(" Could not create \"%s\". ", FIXNULL(filename)); exit(1); } tag = swf_InsertTag(tag,ST_END); - if(enablezlib) { + if(enablezlib || flashversion>=6) { if FAILED(swf_WriteSWC(fi,&swf)) - logf(" WriteSWC() failed.\n"); + msg(" WriteSWC() failed.\n"); } else { if FAILED(swf_WriteSWF(fi,&swf)) - logf(" WriteSWF() failed.\n"); + msg(" WriteSWF() failed.\n"); } if(filename) close(fi); - logf(" SWF written\n"); + msg(" SWF written\n"); } void swfoutput_setdrawmode(swfoutput* obj, int mode) { - drawmode = mode; + obj->drawmode = mode; if(mode == DRAWMODE_FILL) fill = 1; else if(mode == DRAWMODE_EOFILL) @@ -1439,7 +1474,7 @@ void swfoutput_setlinewidth(struct swfoutput*obj, double linewidth) } -void swfoutput_startclip(swfoutput*obj, T1_OUTLINE*outline, struct swfmatrix*m) +void swfoutput_startclip(swfoutput*obj, SWF_OUTLINE*outline, struct swfmatrix*m) { if(textid>=0) endtext(); @@ -1448,12 +1483,12 @@ void swfoutput_startclip(swfoutput*obj, T1_OUTLINE*outline, struct swfmatrix*m) if(clippos >= 127) { - logf(" Too many clip levels."); + msg(" Too many clip levels."); clippos --; } startshape(obj); - int olddrawmode = drawmode; + int olddrawmode = obj->drawmode; swfoutput_setdrawmode(obj, DRAWMODE_CLIP); swfoutput_drawpath(obj, outline, m); swf_ShapeSetEnd(tag); @@ -1475,7 +1510,7 @@ void swfoutput_endclip(swfoutput*obj) endshape(); if(!clippos) { - logf(" Invalid end of clipping region"); + msg(" Invalid end of clipping region"); return; } clippos--;