static const int WRITEFONTID = 0x4e46; // font id for WriteFont and ReadFont
-int swf_FontEnumerate(SWF * swf, void (*FontCallback) (U16, U8 *))
+int swf_FontEnumerate(SWF * swf, void (*FontCallback) (void*, U16, U8 *), void*self)
{
int n;
TAG *t;
s[l] = 0;
}
- (FontCallback) (id, s);
+ (FontCallback) (self, id, s);
swf_RestoreTagPos(t);
}
int t, glyphcount;
int maxcode;
int fid;
+ U32 offset_start;
+ U32 *offset;
U8 flags1, flags2, namelen;
swf_SaveTagPos(tag);
swf_SetTagPos(tag, 0);
font->glyph = (SWFGLYPH *) rfx_calloc(sizeof(SWFGLYPH) * glyphcount);
font->glyph2ascii = (U16 *) rfx_calloc(sizeof(U16) * glyphcount);
+ offset = rfx_calloc(sizeof(U32)*(glyphcount+1));
+ offset_start = tag->pos;
+
if (flags1 & 8) { // wide offsets
for (t = 0; t < glyphcount; t++)
- swf_GetU32(tag); //offset[t]
+ offset[t] = swf_GetU32(tag); //offset[t]
if (glyphcount) /* this _if_ is not in the specs */
- swf_GetU32(tag); // fontcodeoffset
+ offset[glyphcount] = swf_GetU32(tag); // fontcodeoffset
+ else
+ offset[glyphcount] = tag->pos;
} else {
for (t = 0; t < glyphcount; t++)
- swf_GetU16(tag); //offset[t]
+ offset[t] = swf_GetU16(tag); //offset[t]
if (glyphcount) /* this _if_ is not in the specs */
- swf_GetU16(tag); // fontcodeoffset
+ offset[glyphcount] = swf_GetU16(tag); // fontcodeoffset
+ else
+ offset[glyphcount] = tag->pos;
}
- /* TODO: we should use the offset positions, not just
- blindly read in shapes */
- for (t = 0; t < glyphcount; t++)
+ for (t = 0; t < glyphcount; t++) {
+ swf_SetTagPos(tag, offset[t]+offset_start);
swf_GetSimpleShape(tag, &(font->glyph[t].shape));
+ }
+
+ swf_SetTagPos(tag, offset[glyphcount]+offset_start);
+
+ free(offset);
maxcode = 0;
for (t = 0; t < glyphcount; t++) {
static int
swf_FontExtract_DefineTextCallback(int id, SWFFONT * f, TAG * t, int jobs,
void (*callback) (void *self,
- int *chars, int *ypos, int nr, int fontid, int fontsize, int xstart, int ystart, RGBA * color), void *self)
+ int *chars, int *xpos, int nr, int fontid, int fontsize, int xstart, int ystart, RGBA * color), void *self)
{
U16 cid;
SRECT r;
color.b = swf_GetU8(t);
if (swf_GetTagID(t) == ST_DEFINETEXT2)
color.a = swf_GetU8(t);
+ else
+ color.a = 255;
}
if (flags & TF_HASXOFFSET)
x = swf_GetS16(t);
if (f->glyphnames) {
int t;
for (t = 0; t < f->numchars; t++) {
- if (f->glyphnames[t])
+ if (f->glyphnames[t]) {
rfx_free(f->glyphnames[t]);
+ f->glyphnames[t] = 0;
+ }
}
rfx_free(f->glyphnames);
f->glyphnames = 0;
}
}
-int swf_FontReduce(SWFFONT * f)
+int swf_FontReduce_old(SWFFONT * f)
{
int i, j;
int max_unicode = 0;
return j;
}
+int swf_FontReduce(SWFFONT * f)
+{
+ int i;
+ int max_unicode = 0;
+ int max_glyph = 0;
+ if ((!f) || (!f->use) || f->use->is_reduced)
+ return -1;
+
+ font_freelayout(f);
+ font_freeglyphnames(f);
+
+ for (i = 0; i < f->numchars; i++) {
+ if(!f->use->chars[i]) {
+ f->glyph2ascii[i] = 0;
+ if(f->glyph[i].shape) {
+ swf_ShapeFree(f->glyph[i].shape);
+ f->glyph[i].shape = 0;
+ f->glyph[i].advance = 0;
+ }
+ } else {
+ max_glyph = i+1;
+ }
+ }
+ for (i = 0; i < f->maxascii; i++) {
+ if(!f->use->chars[f->ascii2glyph[i]]) {
+ f->ascii2glyph[i] = -1;
+ } else {
+ max_unicode = i+1;
+ }
+ }
+ f->maxascii = max_unicode;
+ f->numchars = max_glyph;
+ font_freename(f);
+ return 0;
+}
+
void swf_FontSort(SWFFONT * font)
{
int i, j, k;
{
if (!f->use)
swf_FontInitUsage(f);
- if(glyph < 0 || glyph > f->numchars)
+ if(glyph < 0 || glyph >= f->numchars)
return -1;
f->use->chars[glyph] = 1;
return 0;
swf_SetRGB(t, color);
}
if (dx) {
- if(dx>32767 || dx<-32768)
- fprintf(stderr, "Warning: Horizontal char position overflow: %d\n", dx);
- swf_SetS16(t, dx);
+ if(dx != SET_TO_ZERO) {
+ if(dx>32767 || dx<-32768)
+ fprintf(stderr, "Warning: Horizontal char position overflow: %d\n", dx);
+ swf_SetS16(t, dx);
+ } else {
+ swf_SetS16(t, 0);
+ }
}
if (dy) {
- if(dy>32767 || dy<-32768)
- fprintf(stderr, "Warning: Vertical char position overflow: %d\n", dy);
- swf_SetS16(t, dy);
+ if(dy != SET_TO_ZERO) {
+ if(dy>32767 || dy<-32768)
+ fprintf(stderr, "Warning: Vertical char position overflow: %d\n", dy);
+ swf_SetS16(t, dy);
+ } else {
+ swf_SetS16(t, 0);
+ }
}
if (font)
swf_SetU16(t, size);
swf_SetBits(t, g, gbits);
swf_SetBits(t, ((((U32) font->glyph[g].advance) * scale) / 20) / 100, abits);
l++;
+ /* We split into 127 characters per text field.
+ We could do 255, by the (formerly wrong) flash specification,
+ but some SWF parsing code out there still assumes that char blocks
+ are at max 127 characters, and it would save only a few bits.
+ */
if (l == 0x7f)
break;
}
SRECT swf_TextCalculateBBoxUTF8(SWFFONT * font, U8 * s, int scale)
{
- int pos = 0;
+ int xpos = 0;
+ int ypos = 0;
SRECT r;
swf_GetRect(0, &r);
while (*s) {
int c = readUTF8char(&s);
+ if(c==13 || c==10) {
+ if(s[0] == 10) {
+ s++;
+ }
+ xpos=0;
+ ypos+=font->layout->leading;
+ continue;
+ }
if (c < font->maxascii) {
int g = font->ascii2glyph[c];
if (g >= 0) {
SRECT rn = font->layout->bounds[g];
- rn.xmin = (rn.xmin * scale) / 20 / 100 + pos;
- rn.xmax = (rn.xmax * scale) / 20 / 100 + pos;
- rn.ymin = (rn.ymin * scale) / 20 / 100;
- rn.ymax = (rn.ymax * scale) / 20 / 100;
+ rn.xmin = (rn.xmin * scale) / 20 / 100 + xpos;
+ rn.xmax = (rn.xmax * scale) / 20 / 100 + xpos;
+ rn.ymin = (rn.ymin * scale) / 20 / 100 + ypos;
+ rn.ymax = (rn.ymax * scale) / 20 / 100 + ypos;
swf_ExpandRect2(&r, &rn);
- pos += (font->glyph[g].advance * scale) / 20 / 100;
+ xpos += (font->glyph[g].advance * scale) / 20 / 100;
}
}
- c++;
}
return r;
}
{
SRECT r;
U8 gbits, abits;
- U8 *c = (U8 *) text;
+ U8 *utext = (U8 *) strdup(text);
+ U8 *upos = utext;
+ int x = 0, y = 0;
int pos = 0;
+ int ystep = 0;
if (font->layout) {
r = swf_TextCalculateBBoxUTF8(font, text, scale * 20);
+ ystep = font->layout->leading;
} else {
fprintf(stderr, "No layout information- can't compute text bbox accurately");
/* Hm, without layout information, we can't compute a bounding
*/
r.xmin = r.ymin = 0;
r.xmax = r.ymax = 1024 * 20;
+ ystep = 100;
}
swf_SetRect(tag, &r);
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
+ while(*upos) {
+ U8*next = upos;
+ int count = 0;
+
+ swf_TextSetInfoRecord(tag, font, (scale * 1024) / 100, rgb, x, y); //scale
+ x = 0;
+
+ while(*next && *next!=13 && *next!=10 && count<127) {
+ readUTF8char(&next);
+ count++;
+ }
+ if(next[0] == 13 || next[0] == 10) {
+ x = SET_TO_ZERO;
+ y += ystep;
+ }
+
+ if(next[0] == 13 && next[1] == 10)
+ next++;
+
+ if(next[0] == 13 || next[0] == 10) {
+ *next = 0;
+ next++;
+ }
- /* set the actual text- notice that we just pass our scale
- parameter over, as TextSetCharRecord calculates with
- percent, too */
- swf_TextSetCharRecordUTF8(tag, font, text, scale * 20, gbits, 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)
+ */
+ /* set the actual text- notice that we just pass our scale
+ parameter over, as TextSetCharRecord calculates with
+ percent, too */
+ swf_TextSetCharRecordUTF8(tag, font, upos, scale * 20, gbits, abits);
+
+ upos= next;
+
+ printf("%s\n", upos);
+ }
+ free(utext);
swf_SetU8(tag, 0);
return r;
git.asbjorn.biz / swftools.git / blobdiff