n = 0;
while (t)
- { if (swf_GetTagID(t)==ST_DEFINEFONTINFO ||
+ { if (swf_GetTagID(t)==ST_DEFINEFONTINFO || swf_GetTagID(t)==ST_DEFINEFONTINFO2 ||
swf_GetTagID(t)==ST_DEFINEFONT2)
{ n++;
if (FontCallback)
int i;
if(f->version>1) {
- // DefineFont2 doesn't have FontInfo fields
- fprintf(stderr, "fixme: FontInfo field for DefineFont2 encountered\n");
- return -1;
+ /* Especially with Flash MX, DefineFont2 may have FontInfo fields,
+ too. However, they only add little information to what's already
+ inside the DefineFont2 tag */
+ return id;
}
- if (l)
- { if (f->name) free(f->name);
- f->name = (U8*)malloc(l+1);
- if (f->name)
- { swf_GetBlock(t,f->name,l);
- f->name[l] = 0;
- }
- else
- { swf_RestoreTagPos(t);
- return -1;
- }
- }
+ if (f->name) free(f->name);
+
+ f->name = (U8*)malloc(l+1);
+ swf_GetBlock(t,f->name,l);
+ f->name[l] = 0;
+
flags = swf_GetU8(t);
if(flags & 2)
f->style |= FONT_STYLE_BOLD;
if(flags & 32)
f->encoding |= FONT_ENCODING_UNICODE;
+ if(t->id == ST_DEFINEFONTINFO2) {
+ f->language = swf_GetU8(t);
+ }
+
f->glyph2ascii = (U16*)malloc(sizeof(U16)*f->numchars);
maxcode = 0;
for(i=0; i < f->numchars; i++) {
font->layout->bounds = malloc(glyphcount*sizeof(SRECT));
for(t=0;t<glyphcount;t++) {
swf_ResetReadBits(tag);
- swf_GetRect(tag, font->layout->bounds);
+ swf_GetRect(tag, &font->layout->bounds[t]);
}
kerningcount = swf_GetU16(tag);
if ((!swf)||(!font)) return -1;
- f = (SWFFONT *)malloc(sizeof(SWFFONT)); font[0] = f;
- if (!f) return -1;
-
+ f = (SWFFONT *)malloc(sizeof(SWFFONT));
memset(f,0x00,sizeof(SWFFONT));
t = swf->firstTag;
break;
case ST_DEFINEFONTINFO:
+ case ST_DEFINEFONTINFO2:
nid = swf_FontExtract_DefineFontInfo(id,f,t);
break;
if (nid>0) id = nid;
t = swf_NextTag(t);
}
+ if(f->id != id) {
+ free(f);
+ f=0;
+ }
+ font[0] = f;
return 0;
}
}
for (i=0;i<j;i++) swf_SetU16(t,ofs[i]+j*2);
+ if(!j) {
+ fprintf(stderr, "rfxswf: warning: Font is empty\n");
+ swf_SetU16(t, 0);
+ }
for (i=0;i<f->numchars;i++)
if (f->glyph[i].shape)
if ((!t)||(!f)) return -1;
swf_ResetWriteBits(t);
swf_SetU16(t,f->id);
- l = strlen(f->name); if (l>255) l = 255;
+ l = f->name?strlen(f->name):0; if (l>255) l = 255;
swf_SetU8(t,l);
- swf_SetBlock(t,f->name,l);
+ if(l)
+ swf_SetBlock(t,f->name,l);
if(f->numchars>=256)
wide=1;
return 0;
}
-int swf_FontExport(int handle,SWFFONT * f)
-{ int l;
- int i;
- if (!f) return 0;
-
- l = sizeof(SWFFONT);
- if (handle>=0)
- if (write(handle,f,sizeof(SWFFONT))!=sizeof(SWFFONT)) return -1;
-
- if (f->name)
- { U16 ln = strlen(f->name);
- l+=2+ln;
- if (handle>=0)
- { if (write(handle,&ln,2)!=2) return -1;
- if (write(handle,f->name,ln)!=ln) return -1;
- }
- }
-
- if (f->layout)
- { l+=sizeof(SWFLAYOUT);
- if (handle>=0)
- if (write(handle,f->layout,sizeof(SWFLAYOUT))!=sizeof(SWFLAYOUT)) return -1;
-/* new kerning struct. hope commenting this out doesn't break things
- if (f->layout->kerning.data)
- { l+=f->layout->kerning.count*4;
- if (handle>=0)
- if (write(handle,f->layout->kerning.data,f->layout->kerning.count*4)!=f->layout->kerning.count*4) return -1;
- }*/
- }
-
- for (i=0;i<f->numchars;i++)
- { if (f->glyph[i].shape)
- { int ll = swf_ShapeExport(handle,f->glyph[i].shape);
- if (ll<0) return -1;
- l+=ll;
- }
- }
-
- return l;
-}
-
-int swf_FontImport(int handle,SWFFONT * * font)
-{ SWFFONT * f;
- int layout;
- int i = 0;
-
- if ((!font)||(handle<0)) return -1;
-
- f = (SWFFONT *)malloc(sizeof(SWFFONT)); font[0] = f;
- if (!f) return -1;
-
- memset(f,0x00,sizeof(SWFFONT));
-
- if (read(handle,f,sizeof(SWFFONT))!=sizeof(SWFFONT)) goto fehler;
-
- layout = (f->layout)?1:0; // avoid illegal free()
- f->layout = NULL;
-
- if (f->name)
- { U16 ln;
- f->name = NULL;
- if (read(handle,&ln,2)!=2) goto fehler;
- f->name = (U8*)malloc(ln+1);
- if (!f->name) goto fehler;
- if (read(handle,f->name,ln)!=ln) goto fehler;
- f->name[ln] = 0;
- }
-
- if (f->layout)
- { f->layout = (SWFLAYOUT *)malloc(sizeof(SWFLAYOUT));
- if (!f->layout) goto fehler;
- if (read(handle,f->layout,sizeof(SWFLAYOUT))!=sizeof(SWFLAYOUT)) goto fehler;
- /* new kerning struct. hope commenting this out doesn't break things
- if (f->layout->kerning.data)
- { int l = f->layout->kerning.count*4;
- f->layout->kerning.data = (U8*)malloc(l);
- if (!f->layout->kerning.data) goto fehler;
- if (read(handle,f->layout->kerning.data,l)!=l) goto fehler;
- } */
- }
-
- for (i=0;i<f->numchars;i++)
- { if (f->glyph[i].shape)
- { if (swf_ShapeImport(handle,&f->glyph[i].shape)<0) goto fehler;
- }
- }
-
- f->id = 0;
-
- return 0;
-
-fehler:
- if (f) for (;i<MAX_CHAR_PER_FONT;i++) f->glyph[i].shape = NULL;
- swf_FontFree(f);
- font[0] = NULL;
- return -1;
-}
-
int swf_TextPrintDefineText(TAG * t,SWFFONT * f)
{ int id = swf_GetTagID(t);
if ((id==ST_DEFINETEXT)||(id==ST_DEFINETEXT2)) swf_FontExtract_DefineText(f->id,f,t,FEDTJ_PRINT);
while(s[0])
{
- int glyph = font->ascii2glyph[s[0]];
+ int glyph = -1;
+ if(s[0] < font->maxascii)
+ glyph = font->ascii2glyph[s[0]];
if(glyph>=0) {
g = swf_CountBits(glyph,g);
a = swf_CountBits((((U32)font->glyph[glyph].advance)*scale)/100,a);
}
int swf_TextSetCharRecord(TAG * t,SWFFONT * font,U8 * s,int scale,U8 gbits,U8 abits)
-{ int l,i;
+{ int l=0,i,pos;
if ((!t)||(!font)||(!s)||(!font->ascii2glyph)) return -1;
- l = strlen(s);
- if (l>0x7f) l = 0x7f;
- swf_SetU8(t,l);
+ pos = t->len;
+ swf_SetU8(t, l); //placeholder
- for (i=0;i<l;i++)
+ for (i=0;s[i];i++)
{
- int g = font->ascii2glyph[s[i]];
+ int g = -1;
+ if(s[i] < font->maxascii)
+ g = font->ascii2glyph[s[i]];
if(g>=0) {
swf_SetBits(t,g,gbits);
swf_SetBits(t,(((U32)font->glyph[g].advance)*scale)/100,abits);
+ l++;
+ if(l==0x7f)
+ break;
}
}
+ PUT8(&t->data[pos], l);
+
swf_ResetWriteBits(t);
return 0;
}
if (font&&s)
{ while (s[0])
{
- int g = font->ascii2glyph[*s];
+ int g = -1;
+ if(*s < font->maxascii)
+ g = font->ascii2glyph[*s];
if(g>=0)
res += font->glyph[g].advance;
s++;
int xmax = 0;
int ymax = textscale * 2 * (font->maxascii/16+1);
U8 gbits,abits;
- char text[MAX_CHAR_PER_FONT+1];
+ U8 text[MAX_CHAR_PER_FONT+1];
int x,y;
text[MAX_CHAR_PER_FONT]=0;
for(s=0;s<font->maxascii;s++)
int g = font->ascii2glyph[s];
text[s] = s;
if(g>=0) {
- if(font->glyph[g].advance*textscale/200 > xmax)
- xmax = font->glyph[g].advance*textscale/200;
+ if(font->glyph[g].advance*textscale/64 > xmax)
+ xmax = font->glyph[g].advance*textscale/64;
}
}
swf.movieSize.xmax = xmax*20;
swf_SetString(tag,text);
}
+SRECT swf_SetDefineText(TAG*tag, SWFFONT*font, RGBA*rgb, char*text, int scale)
+{
+ SRECT r;
+ U8 gbits, abits;
+ U8*c = (U8*)text;
+ int pos = 0;
+ swf_GetRect(0, &r);
+ if(font->layout) {
+ while(*c) {
+ if(*c < font->maxascii) {
+ int g = font->ascii2glyph[*c];
+ if(g>=0) {
+ SRECT rn = font->layout->bounds[g];
+ rn.xmin = (rn.xmin * scale)/100 + pos;
+ rn.xmax = (rn.xmax * scale)/100 + pos;
+ rn.ymin = (rn.ymin * scale)/100;
+ rn.ymax = (rn.ymax * scale)/100;
+ swf_ExpandRect2(&r, &rn);
+ pos += (font->glyph[g].advance*scale*20)/100;
+ }
+ }
+ c++;
+ }
+ } else {
+ /* Hm, without layout information, we can't compute a bounding
+ box. We could call swf_FontCreateLayout to create a layout,
+ but the caller probably doesn't want us to mess up his font
+ structure.
+ */
+ r.xmin = r.ymin = 0;
+ r.xmax = r.ymax = 1024*20;
+ }
+
+ swf_SetRect(tag,&r);
+ swf_SetMatrix(tag,NULL);
+ swf_TextCountBits(font,text,scale*20,&gbits,&abits);
+ swf_SetU8(tag,gbits);
+ swf_SetU8(tag,abits);
+
+ /* now set the text params- notice that a font size of
+ 1024 means that the glyphs will be displayed exactly
+ as they would be in/with a defineshape. (Try to find
+ *that* in the flash specs)
+ */
+ swf_TextSetInfoRecord(tag,font,(scale*1024)/100,rgb,0,0); //scale
+
+ /* set the actual text- notice that we just pass our scale
+ parameter over, as TextSetCharRecord calculates with
+ percent, too */
+ swf_TextSetCharRecord(tag,font,text,scale*20,gbits,abits);
+
+ swf_SetU8(tag,0);
+ return r;
+}
+
+void swf_FontCreateLayout(SWFFONT*f)
+{
+ S16 leading = 0;
+ int t;
+ if(f->layout)
+ return;
+ if(!f->numchars)
+ return;
+
+ f->layout = (SWFLAYOUT*)malloc(sizeof(SWFLAYOUT));
+ memset(f->layout, 0, sizeof(SWFLAYOUT));
+ f->layout->bounds = (SRECT*)malloc(f->numchars*sizeof(SRECT));
+ f->layout->ascent = -32767;
+ f->layout->descent = -32767;
+
+ for(t=0;t<f->numchars;t++) {
+ SHAPE2*shape2;
+ SRECT bbox;
+ int width;
+ shape2 = swf_ShapeToShape2(f->glyph[t].shape);
+ if(!shape2) {
+ fprintf(stderr, "Shape parse error\n");exit(1);
+ }
+ bbox = swf_GetShapeBoundingBox(shape2->lines);
+ swf_Shape2Free(shape2);
+ f->layout->bounds[t] = bbox;
+ /* FIXME */
+ //width = (bbox.xmax - bbox.xmin)/20;
+ width = (bbox.xmax)/20;
+
+ /* The following is a heuristic- it may be that extractfont_DefineText
+ has already found out some widths for individual characters (from the way
+ they are used)- we now have to guess whether that width might be possible,
+ which is the case if it isn't either much too big or much too small */
+ if(width > f->glyph[t].advance*3/2 ||
+ width*2 < f->glyph[t].advance)
+ f->glyph[t].advance = width;
+
+ if(-bbox.ymin > f->layout->ascent)
+ f->layout->ascent = bbox.ymin;
+ if(bbox.ymax > f->layout->descent)
+ f->layout->descent = bbox.ymax;
+ }
+}
+
+
git.asbjorn.biz / swftools.git / blobdiff