#include "../lib/log.h"
#include "../lib/rfxswf.h"
}
-#define standardEncodingSize 335
-extern char *standardEncodingNames[standardEncodingSize];
int opennewwindow=0;
int ignoredraworder=0;
int flashversion=4;
int splinemaxerror=1;
int fontsplinemaxerror=1;
+
+static char storefont = 0;
static int flag_protected = 0;
typedef unsigned char u8;
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;
/* we can't skip this for rx=0,ry=0, those
are plots */
swf_ShapeSetLine (tag, shape, rx,ry);
+ shapeisempty = 0;
swflastx+=rx;
swflasty+=ry;
}
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
}
}
-/* 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(TAG*tag, SWF_OUTLINE*outline, struct swfmatrix*m, int log)
{
if(tag->id != ST_DEFINEFONT &&
tag->id != ST_DEFINESHAPE &&
{
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(((int)(lastx*20) != (int)(firstx*20) ||
(int)(lasty*20) != (int)(firsty*20)) &&
firsty=y;
init = 0;
}
- else if(outline->type == T1_PATHTYPE_LINE)
+ else if(outline->type == SWF_PATHTYPE_LINE)
{
plotxy p0;
plotxy p1;
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;
}
}
-plotxy getPivot(T1_OUTLINE*outline, int dir, double line_width, int end, int trytwo)
+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(trytwo && 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) {
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) {
}
}
next2 = next;
- if(trytwo && 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;
return p;
}
-void drawShortPath(struct swfoutput*output, double x, double y, struct swfmatrix* m, T1_OUTLINE*outline)
+void drawShortPath(struct swfoutput*output, double x, double y, struct swfmatrix* m, SWF_OUTLINE*outline)
{
double lastx=x, lasty=y;
- while (outline && outline->type != T1_PATHTYPE_MOVE)
+ while (outline && outline->type != SWF_PATHTYPE_MOVE)
{
x += (outline->dest.x/(float)0xffff);
y += (outline->dest.y/(float)0xffff);
- if(outline->type == T1_PATHTYPE_LINE)
+ if(outline->type == SWF_PATHTYPE_LINE)
{
plotxy p0, p1;
p0.x=lastx;
p1.y= y;
line(tag, p0, p1, m);
}
- else if(outline->type == T1_PATHTYPE_BEZIER)
+ else if(outline->type == SWF_PATHTYPE_BEZIER)
{
plotxy p0,p1,p2,p3;
- T1_BEZIERSEGMENT*o2 = (T1_BEZIERSEGMENT*)outline;
+ SWF_BEZIERSEGMENT*o2 = (SWF_BEZIERSEGMENT*)outline;
p3.x=lastx;
p3.y=lasty;
p1.x=o2->C.x/(float)0xffff+lastx;
}
}
-void drawShortPathWithEnds(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 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);
}
}
-void drawT1toRect(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 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;
line(tag, p4,p1, m);
}
-void drawShortPathWithStraightEnds(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 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)
{
- T1_OUTLINE*tmp=outline;
+ 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!=T1_PATHTYPE_MOVE) {
+ 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 == T1_PATHTYPE_LINE);
- assert(outline->type == T1_PATHTYPE_LINE);
+ assert(tmp->type == SWF_PATHTYPE_LINE);
+ assert(outline->type == SWF_PATHTYPE_LINE);
if(tmp!=outline) {
{
stopFill();stop=1;
int save= tmp->type;
- tmp->type = T1_PATHTYPE_MOVE;
+ tmp->type = SWF_PATHTYPE_MOVE;
x += (outline->dest.x/(float)0xffff);
y += (outline->dest.y/(float)0xffff);
outline = outline->link;
stopFill();
}
-static int t1len(T1_OUTLINE*line)
+static int t1len(SWF_OUTLINE*line)
{
int num=0;
- while(line && line->type != T1_PATHTYPE_MOVE) {
+ while(line && line->type != SWF_PATHTYPE_MOVE) {
num++;
line = line->link;
}
return num;
}
-static float t1linelen(T1_OUTLINE*line)
+static float t1linelen(SWF_OUTLINE*line)
{
float x,y;
x = (line->dest.x/(float)0xffff);
return sqrt(x*x+y*y);
}
-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 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 &&
double lastx=0,lasty=0;
int valid = 0;
int lastwasline = 0;
- T1_OUTLINE*tmp = outline, *last = 0;
+ SWF_OUTLINE*tmp = outline, *last = 0;
tmp->last = 0;
while(1) {
x += (tmp->dest.x/(float)0xffff);
y += (tmp->dest.y/(float)0xffff);
}
- if(!tmp || tmp->type == T1_PATHTYPE_MOVE) {
+ if(!tmp || tmp->type == SWF_PATHTYPE_MOVE) {
if(valid && last) {
- if(last->type == T1_PATHTYPE_LINE && t1linelen(last)>line_width*2 &&
+ 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
valid++;
}
- if(tmp && tmp->type == T1_PATHTYPE_LINE && t1linelen(tmp)>line_width*2)
+ if(tmp && tmp->type == SWF_PATHTYPE_LINE && t1linelen(tmp)>line_width*2)
lastwasline = 1;
else
lastwasline = 0;
return 1;
}
-static const int CHARDATAMAX = 1024;
+static const int CHARDATAMAX = 8192;
struct chardata {
int charid;
int fontid;
{
if(chardatapos == CHARDATAMAX)
{
+ msg("<warning> Character buffer too small. SWF will be slightly bigger");
endtext();
starttext(obj);
}
/* 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)
if(m->m11 != m->m22)
usefonts=0;
- if(!font) {
+ if(!swffont) {
msg("<warning> Font is NULL");
}
- if(usefonts && ! drawonlyshapes)
+ //if(usefonts && ! drawonlyshapes)
+ if (1)
{
- int charid = font->getSWFCharID(character, charnr);
+ int charid = getCharID(swffont, charnr, character, u);
+
+ 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);
+ 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));
+ return 1;
}
- else
+ /*else
{
- T1_OUTLINE*outline = font->getOutline(character, charnr);
+ SWF_OUTLINE*outline = font->getOutline(character, charnr);
char* charname = character;
if(!outline) {
- msg("<warning> Didn't find %s in current charset (%s)",
- FIXNULL(character),FIXNULL(font->getName()));
+ msg("<warning> Didn't find character '%s' (%d) in current charset (%s)",
+ FIXNULL(character),charnr,FIXNULL(font->getName()));
return;
}
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)
drawpath(tag, 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();
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)
-{
- 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;
- msg("<verbose> 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;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;
- }
- }
-}
-
-/* free all tables, write out definefont tags */
-SWFFont::~SWFFont()
+int getCharID(SWFFONT *font, int charnr, char *charname, int u)
{
- 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);
- }
- }
-
- ptr = (int*)malloc(swfcharpos*sizeof(int));
-
- for(t=0;t<charnum;t++)
- if(used[t]) usednum++;
-
- if(usednum && !drawonlyshapes)
- {
- msg("<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); //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);
- }
- 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;
+ int t;
+ if(charname) {
+ for(t=0;t<font->numchars;t++) {
+ if(font->glyphnames[t] && !strcmp(font->glyphnames[t],charname)) {
+ return t;
}
- 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]);
+ /* if we didn't find the character, maybe
+ we can find the capitalized version */
+ for(t=0;t<font->numchars;t++) {
+ if(font->glyphnames[t] && !strcasecmp(font->glyphnames[t],charname)) {
+ return t;
+ }
}
- 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;t<this->charnum;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;t<this->charnum;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);
- }
-
- msg("<warning> 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;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];
- }
}
- /* if we didn't find the character, maybe
- we can find the capitalized version */
- for(t=0;t<this->charnum;t++) {
- if(!strcasecmp(this->charname[t],name)) {
- if(!used[t])
- {
- swfcharid2char[swfcharpos] = t;
- char2swfcharid[t] = swfcharpos++;
- used[t] = 1;
- }
- return char2swfcharid[t];
- }
- }
+ if(u>0) {
+ if(u>=font->maxascii)
+ msg("<debug> u=%d, font->maxascii=%d",u,font->maxascii);
+ else
+ msg("<debug> u=%d, font->maxascii=%d ascci2glyph[%d]=%d",u,font->maxascii,u,font->ascii2glyph[u]);
- /* 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);
+ /* try to use the unicode id */
+ if(u>=0 && u<font->maxascii && font->ascii2glyph[u]>=0)
+ return font->ascii2glyph[u];
}
- msg("<warning> Didn't find character '%s' in font '%s'", FIXNULL(name), this->name);
- return 0;
-}
-int SWFFont::getWidth(char*name)
-{
- int t;
- for(t=0;t<this->charnum;t++) {
- if(!strcmp(this->charname[t],name)) {
- return this->width[t];
- }
- }
- return 0;
-}
-
-char*SWFFont::getName()
-{
- return this->name;
+ if(charnr>=0 && charnr<font->numchars)
+ return charnr;
+ return -1;
}
struct fontlist_t
{
- SWFFont * font;
+ 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, 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("<error> 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("<error> No filename given for font- internal error?");
+ return;
}
- if(t1id<0) {
- msg("<error> internal error: t1id:%d, fontid:%s\n", t1id,FIXNULL(fontid));
+ /* TODO: sometimes, scale has to be 64, and sometimes 32.
+ It's probably font format related */
+ swf_SetLoadFontParameters(32, 0);
+
+ SWFFONT *swffont = swf_LoadFont(filename);
+
+ if(!swffont) {
+ msg("<error> Coudln'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("<debug> Font %s (%s)",swffont->name, filename);
+ msg("<debug> | ID: %d", swffont->id);
+ msg("<debug> | Version: %d", swffont->version);
+ msg("<debug> | Name: %s", fontid);
+ msg("<debug> | Numchars: %d", swffont->numchars);
+ msg("<debug> | Maxascii: %d", swffont->maxascii);
+ msg("<debug> | Style: %d", swffont->style);
+ msg("<debug> | Encoding: %d", swffont->encoding);
+ for(int iii=0; iii<swffont->numchars;iii++) {
+ msg("<debug> | Glyph %d) name=%s, unicode=%d\n", iii, swffont->glyphnames[iii], swffont->glyph2ascii[iii]);
+ }
+ }
+
+ /* 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;
}
}
/* 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;
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;
msg("<verbose> initializing swf output for size %d*%d\n", sizex,sizey);
- obj->font = 0;
+ obj->swffont = 0;
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;
}
swf_ShapeSetAll(tag,shape,/*x*/0,/*y*/0,linestyleid,0,0);
swflastx=swflasty=0;
lastwasfill = 0;
+ shapeisempty = 1;
}
static void starttext(struct swfoutput*obj)
if(shapeid<0)
return;
swf_ShapeSetEnd(tag);
+
+ if(shapeisempty) {
+ msg("<warning> empty shape");
+ // TODO: delete tag
+ }
+
tag = swf_InsertTag(tag,ST_PLACEOBJECT2);
swf_ObjectPlace(tag,shapeid,/*depth*/depth++,NULL,NULL,NULL);
shapeid = -1;
swf_SetU16(tag,depth);
}
- depth = 1;
- startdepth = depth;
+ depth = startdepth;
}
/* "destroy" like in (oo-terminology) "destructor". Perform cleaning
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);
+ swf_FontSetDefine2(mtag, iterator->swffont);
+ swf_FontFree(iterator->swffont);
+ }
+
tmp = iterator;
iterator = iterator->next;
delete tmp;
}
- T1_CloseLib();
if(!filename)
return;
if(filename)
}
-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();
git.asbjorn.biz / swftools.git / blobdiff