along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
-static U32 readUTF8char(U8 ** text)
+U32 readUTF8char(U8 ** text)
{
U32 c = 0;
if (!(*(*text) & 0x80))
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 (id == fid) {
if (jobs & FEDTJ_PRINT) {
int code = f->glyph2ascii[glyph];
- printf("%c", code);
+ printf("%lc", code);
}
if (jobs & FEDTJ_MODIFY)
f->glyph[glyph].advance = adv * 20; //?
static void font_freeglyphnames(SWFFONT*f)
{
- if (f->glyphnames) {
- int t;
- for (t = 0; t < f->numchars; t++) {
- if (f->glyphnames[t])
- rfx_free(f->glyphnames[t]);
+ if (f->glyphnames)
+ {
+ int t;
+ for (t = 0; t < f->numchars; t++)
+ {
+ if (f->glyphnames[t])
+ {
+ rfx_free(f->glyphnames[t]);
+ f->glyphnames[t] = 0;
+ }
+ }
+ rfx_free(f->glyphnames);
+ f->glyphnames = 0;
}
- rfx_free(f->glyphnames);
- f->glyphnames = 0;
- }
-
}
static void font_freeusage(SWFFONT*f)
{
int max_glyph = 0;
if ((!f) || (!f->use) || f->use->is_reduced)
return -1;
+
+ font_freelayout(f);
+ font_freeglyphnames(f);
+ f->use->used_glyphs= 0;
for (i = 0; i < f->numchars; i++) {
if(!f->use->chars[i]) {
- f->glyph2ascii[i] = 0;
+ if(f->glyph2ascii) {
+ 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;
}
+ f->use->used_glyphs++;
} else {
max_glyph = i+1;
}
}
for (i = 0; i < f->maxascii; i++) {
if(!f->use->chars[f->ascii2glyph[i]]) {
- f->ascii2glyph[i] = -1;
+ if(f->ascii2glyph) {
+ f->ascii2glyph[i] = -1;
+ }
} else {
max_unicode = i+1;
}
}
f->maxascii = max_unicode;
f->numchars = max_glyph;
- font_freelayout(f);
- font_freeglyphnames(f);
font_freename(f);
return 0;
}
int swf_FontUse(SWFFONT * f, U8 * s)
{
- if (!f->use)
- swf_FontInitUsage(f);
if( (!s))
return -1;
while (*s) {
if(*s < f->maxascii && f->ascii2glyph[*s]>=0)
- f->use->chars[f->ascii2glyph[*s]] = 1;
+ swf_FontUseGlyph(f, f->ascii2glyph[*s]);
s++;
}
return 0;
swf_FontInitUsage(f);
if(glyph < 0 || glyph >= f->numchars)
return -1;
+ if(!f->use->chars[glyph])
+ f->use->used_glyphs++;
f->use->chars[glyph] = 1;
return 0;
}
/* font code table */
- if (flags & 4) { /* wide codes */
- for (t = 0; t < f->numchars; t++) {
- swf_SetU16(tag, f->glyph2ascii[t]);
+ for (t = 0; t < f->numchars; t++) {
+ if (flags & 4) { /* wide codes */
+ if(f->glyph2ascii[t]) {
+ swf_SetU16(tag, f->glyph2ascii[t]);
+ } else {
+ swf_SetU16(tag, 0);
+ }
+ } else {
+ if(f->glyph2ascii[t]) {
+ swf_SetU8(tag, f->glyph2ascii[t]);
+ } else {
+ swf_SetU8(tag, 0);
+ }
}
- } else {
- for (t = 0; t < f->numchars; t++)
- swf_SetU8(tag, f->glyph2ascii[t]);
}
+
if (f->layout) {
swf_SetU16(tag, f->layout->ascent);
swf_SetU16(tag, f->layout->descent);
for (i = 0; i < f->numchars; i++) {
if (f->glyph[i].shape) {
- int g2a = f->glyph2ascii[i];
+ int g2a = f->glyph2ascii?f->glyph2ascii[i]:0;
wide ? swf_SetU16(t, g2a) : swf_SetU8(t, g2a);
}
}
{
int i;
if (!f)
- return;
+ return;
- if (f->glyph) {
- for (i = 0; i < f->numchars; i++)
- if (f->glyph[i].shape) {
- swf_ShapeFree(f->glyph[i].shape);
- f->glyph[i].shape = NULL;
- }
- rfx_free(f->glyph);
- f->glyph = NULL;
+ if (f->glyph)
+ {
+ for (i = 0; i < f->numchars; i++)
+ if (f->glyph[i].shape)
+ {
+ swf_ShapeFree(f->glyph[i].shape);
+ f->glyph[i].shape = NULL;
+ }
+ rfx_free(f->glyph);
+ f->glyph = NULL;
}
- if (f->ascii2glyph) {
- rfx_free(f->ascii2glyph);
- f->ascii2glyph = NULL;
+ if (f->ascii2glyph)
+ {
+ rfx_free(f->ascii2glyph);
+ f->ascii2glyph = NULL;
}
- if (f->glyph2ascii) {
- rfx_free(f->glyph2ascii);
- f->glyph2ascii = NULL;
+ if (f->glyph2ascii)
+ {
+ rfx_free(f->glyph2ascii);
+ f->glyph2ascii = NULL;
}
font_freename(f);
font_freelayout(f);
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;
}
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) {
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;
+ }
- /* 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);
+ if(next[0] == 13 && next[1] == 10)
+ next++;
+
+ if(next[0] == 13 || next[0] == 10) {
+ *next = 0;
+ next++;
+ }
+
+ /* 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;
+ }
+ free(utext);
swf_SetU8(tag, 0);
return r;
git.asbjorn.biz / swftools.git / blobdiff