Part of the swftools package.
Copyright (c) 2001 Rainer Böhme <rfxswf@reflex-studio.de>
- Copyright (c) 2003,2004 Matthias Kramm
+ Copyright (c) 2003,2004,2005,2006,2007,2008,2009 Matthias Kramm
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
U32 *offset;
U8 flags1, langcode, namelen;
swf_SetTagPos(tag, 0);
- font->version = 2;
+ font->version = tag->id==ST_DEFINEFONT3?3:2;
fid = swf_GetU16(tag);
if (id && id != fid)
return id;
font->name = (U8 *) rfx_alloc(namelen + 1);
font->name[namelen] = 0;
swf_GetBlock(tag, font->name, namelen);
- font->version = 2;
glyphcount = swf_GetU16(tag);
font->numchars = glyphcount;
for (t = 0; t < glyphcount; t++) {
swf_ResetReadBits(tag);
swf_GetRect(tag, &font->layout->bounds[t]);
+ SRECT b = font->layout->bounds[t];
+ if((b.xmin|b.xmax|b.ymin|b.ymax) == 0) {
+ // recalculate bounding box
+ SHAPE2 *shape2 = swf_ShapeToShape2(font->glyph[t].shape);
+ font->layout->bounds[t] = swf_GetShapeBoundingBox(shape2);
+ swf_Shape2Free(shape2);free(shape2);
+ }
}
kerningcount = swf_GetU16(tag);
}
int swf_ParseDefineText(TAG * tag,
- void (*callback) (void *self, int *chars, int *ypos, int nr, int fontid, int fontsize, int xstart, int ystart, RGBA * color), void *self)
+ void (*callback) (void *self, int *chars, int *xpos, int nr, int fontid, int fontsize, int xstart, int ystart, RGBA * color), void *self)
{
return swf_FontExtract_DefineTextCallback(-1, 0, tag, FEDTJ_CALLBACK, callback, self);
}
return swf_FontExtract_DefineTextCallback(id, f, t, jobs, 0, 0);
}
+typedef struct _usagetmp {
+ SWFFONT*font;
+ int lastx,lasty;
+ int last;
+} usagetmp_t;
+static void updateusage(void *self, int *chars, int *xpos, int nr,
+ int fontid, int fontsize, int xstart, int ystart, RGBA * color)
+{
+ usagetmp_t*u = (usagetmp_t*)self;
+ if(!u->font->use) {
+ swf_FontInitUsage(u->font);
+ }
+ if(fontid!=u->font->id)
+ return;
+
+ int t;
+ for(t=0;t<nr;t++) {
+ int x=xpos[t];
+ int y=ystart;
+ int c = chars[t];
+ if(c<0 || c>u->font->numchars)
+ continue;
+ swf_FontUseGlyph(u->font, c, fontsize);
+ if(u->lasty == y && x>=u->lastx-200 && abs(u->lastx-x)<200 &&
+ u->last!=c && !swf_ShapeIsEmpty(u->font->glyph[u->last].shape) &&
+ !swf_ShapeIsEmpty(u->font->glyph[c].shape))
+ {
+ swf_FontUsePair(u->font, u->last, c);
+ }
+ u->lasty = y;
+ /* FIXME: do we still need to divide advance by 20 for definefont3? */
+ u->lastx = x + (u->font->glyph[c].advance*fontsize/20480);
+ u->last = c;
+ }
+}
+
+void swf_FontUpdateUsage(SWFFONT*f, TAG* tag)
+{
+ usagetmp_t u;
+ u.font = f;
+ u.lastx = -0x80000000;
+ u.lasty = -0x80000000;
+ u.last = 0;
+ swf_ParseDefineText(tag, updateusage, &u);
+}
+
int swf_FontExtract(SWF * swf, int id, SWFFONT * *font)
{
TAG *t;
case ST_DEFINETEXT:
case ST_DEFINETEXT2:
- nid = swf_FontExtract_DefineText(id, f, t, f->layout ? 0 : FEDTJ_MODIFY);
+ if(!f->layout) {
+ nid = swf_FontExtract_DefineText(id, f, t, FEDTJ_MODIFY);
+ }
+ if(f->version>=3 && f->layout)
+ swf_FontUpdateUsage(f, t);
break;
case ST_GLYPHNAMES:
return 0;
}
+static SWFFONT* font_to_sort;
+int cmp_chars(const void*a, const void*b)
+{
+ int x = *(const int*)a;
+ int y = *(const int*)b;
+ return 0;
+}
+
void swf_FontSort(SWFFONT * font)
{
int i, j;
for (i = 0; i < font->numchars; i++) {
newplace[i] = i;
}
+ //qsort(newplace, sizeof(newplace[0]), font->numchars, cmp_chars);
+
for (i = 0; i < font->numchars; i++)
for (j = 0; j < i; j++) {
if (font->glyph2ascii[i] < font->glyph2ascii[j]) {
font->ascii2glyph[i] = newpos[font->ascii2glyph[i]];
}
- rfx_free(newpos);
rfx_free(newplace);
+ font->glyph2glyph = newpos;
}
void swf_FontPrepareForEditText(SWFFONT * font)
return 0;
}
-int swf_FontUseUTF8(SWFFONT * f, U8 * s, U16 size)
+int swf_FontUseUTF8(SWFFONT * f, const U8 * s, U16 size)
{
if( (!s))
return -1;
int ascii;
while (*s)
{
- ascii = readUTF8char(&s);
+ ascii = readUTF8char((U8**)&s);
if(ascii < f->maxascii && f->ascii2glyph[ascii]>=0)
swf_FontUseGlyph(f, f->ascii2glyph[ascii], size);
}
}
}
- if(!swf_FontUseGetPair(f, char1, char2)) {
+ int nr = swf_FontUseGetPair(f, char1, char2);
+ if(!nr) {
if(u->num_neighbors == u->neighbors_size) {
u->neighbors_size += 4096;
u->neighbors = rfx_realloc(u->neighbors, sizeof(SWFGLYPHPAIR)*u->neighbors_size);
}
u->neighbors[u->num_neighbors].char1 = char1;
u->neighbors[u->num_neighbors].char2 = char2;
+ u->neighbors[u->num_neighbors].num = 1;
hashadd(u, char1, char2, u->num_neighbors);
u->num_neighbors++;
} else {
- // increase?
+ u->neighbors[nr-1].num++;
}
}
if (f->layout) {
swf_SetU16(tag, f->layout->ascent);
swf_SetU16(tag, f->layout->descent);
- swf_SetU16(tag, f->layout->leading);
+ swf_SetU16(tag, 0); // flash ignores leading
+
for (t = 0; t < f->numchars; t++)
swf_SetU16(tag, f->glyph[t].advance);
for (t = 0; t < f->numchars; t++) {
swf_ResetWriteBits(tag);
- swf_SetRect(tag, &f->layout->bounds[t]);
+ /* not used by flash, so leave this empty */
+ SRECT b = {0,0,0,0};
+ swf_SetRect(tag, &b);
}
swf_SetU16(tag, f->layout->kerningcount);
for (t = 0; t < f->layout->kerningcount; t++) {
return 0;
}
+static void font_freealignzones(SWFFONT * f)
+{
+ if(f->alignzones)
+ free(f->alignzones);
+ f->alignzones = 0;
+}
+
void swf_FontFree(SWFFONT * f)
{
int i;
rfx_free(f->glyph2ascii);
f->glyph2ascii = NULL;
}
+ if (f->glyph2glyph) {
+ rfx_free(f->glyph2glyph);
+ f->glyph2glyph = NULL;
+ }
font_freename(f);
font_freelayout(f);
font_freeglyphnames(f);
font_freeusage(f);
+ font_freealignzones(f);
rfx_free(f);
}
git.asbjorn.biz / swftools.git / blobdiff