int storeallcharacters=0;
int enablezlib=0;
int insertstoptag=0;
-int flashversion=4;
+int flashversion=5;
int splinemaxerror=1;
int fontsplinemaxerror=1;
static int shapeid = -1;
static int textid = -1;
-static int drawmode = -1;
static int fillstyleid;
static int linestyleid;
static int swflastx=0;
{
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 an outline. These are generated by pdf2swf and by t1lib
(representing characters). */
-void drawpath(TAG*tag, SWF_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)
{
y += (outline->dest.y/(float)0xffff);
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)
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_DEFINEFONT &&
- tag->id != ST_DEFINESHAPE &&
+ if( tag->id != ST_DEFINESHAPE &&
tag->id != ST_DEFINESHAPE2 &&
tag->id != ST_DEFINESHAPE3) {
msg("<error> internal error: drawpath needs a shape tag, not %d\n",tag->id);
chardatapos++;
}
+struct fontlist_t
+{
+ SWFFONT *swffont;
+ fontlist_t*next;
+} *fontlist = 0;
/* process a character. */
static int drawchar(struct swfoutput*obj, SWFFONT *swffont, char*character, int charnr, int u, swfmatrix*m)
if(!swffont) {
msg("<warning> Font is NULL");
+ return 0;
+ }
+
+ if(!usefonts) {
+ msg("<verbose> Non diagonal font matrix: %f %f", m->m11, m->m21);
+ msg("<verbose> | %f %f", m->m12, m->m22);
}
//if(usefonts && ! drawonlyshapes)
if(charid<0) {
msg("<warning> 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("<warning> 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, swffont->id, charid,(int)(m->m13*20),(int)(m->m23*20),
(int)(m->m11+0.5));
+ swf_FontUseGlyph(swffont, charid);
return 1;
}
/*else
else
startFill();
- drawpath(tag, outline,m, 0);
+ drawpath(output, outline,m, 0);
}
void swfoutput_drawpath2poly(struct swfoutput*output, SWF_OUTLINE*outline, struct swfmatrix*m, int line_join, int line_cap, double line_width, double miter_limit)
msg("<debug> u=%d, font->maxascii=%d ascci2glyph[%d]=%d",u,font->maxascii,u,font->ascii2glyph[u]);
/* try to use the unicode id */
- if(u>=0 && u<font->maxascii && font->ascii2glyph[u]>=0)
+ if(u>=0 && u<font->maxascii && font->ascii2glyph[u]>=0) {
return font->ascii2glyph[u];
+ }
}
- if(charnr>=0 && charnr<font->numchars)
+ if(charnr>=0 && charnr<font->numchars) {
return charnr;
+ }
+
+ /* 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 && charnr<font->maxascii && font->ascii2glyph[charnr]>=0) {
+ return font->ascii2glyph[charnr];
+ }*/
+
return -1;
}
-struct fontlist_t
-{
- SWFFONT *swffont;
- 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, char*filename)
return;
}
- /* TODO: sometimes, scale has to be 64, and sometimes 32.
- It's probably font format related */
- swf_SetLoadFontParameters(32, 0);
+ swf_SetLoadFontParameters(0,/*skip unused*/0,/*full unicode*/1);
+ SWFFONT*swffont = swf_LoadFont(filename);
+
+ if(swffont == 0) {
+ msg("<warning> Couldn't load font %s (%s)", fontid, filename);
+ swffont = swf_LoadFont(0);
+ }
- SWFFONT *swffont = swf_LoadFont(filename);
swf_FontSetID(swffont, ++currentswfid);
if(screenloglevel >= LOGLEVEL_DEBUG) {
msg("<verbose> initializing swf output for size %d*%d\n", sizex,sizey);
obj->swffont = 0;
+ obj->drawmode = -1;
memset(&swf,0x00,sizeof(SWF));
swf_ShapeSetEnd(tag);
if(shapeisempty) {
- msg("<warning> empty shape");
- // TODO: delete tag
+ // 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);
}
-
- tag = swf_InsertTag(tag,ST_PLACEOBJECT2);
- swf_ObjectPlace(tag,shapeid,/*depth*/depth++,NULL,NULL,NULL);
shapeid = -1;
}
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);
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);
}
tag = swf_InsertTag(tag,ST_END);
- if(enablezlib) {
+ if(enablezlib || flashversion>=6) {
if FAILED(swf_WriteSWC(fi,&swf))
msg("<error> WriteSWC() failed.\n");
} else {
void swfoutput_setdrawmode(swfoutput* obj, int mode)
{
- drawmode = mode;
+ obj->drawmode = mode;
if(mode == DRAWMODE_FILL)
fill = 1;
else if(mode == DRAWMODE_EOFILL)
}
startshape(obj);
- int olddrawmode = drawmode;
+ int olddrawmode = obj->drawmode;
swfoutput_setdrawmode(obj, DRAWMODE_CLIP);
swfoutput_drawpath(obj, outline, m);
swf_ShapeSetEnd(tag);
git.asbjorn.biz / swftools.git / blobdiff