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 c = 0;
+ if(!(*(*text) & 0x80))
+ return *((*text)++);
+
+ /* 0000 0080-0000 07FF 110xxxxx 10xxxxxx */
+ if(((*text)[0] & 0xe0) == 0xc0 && (*text)[1])
+ {
+ c = ((*text)[0] & 0x1f) << 6 | ((*text)[1] & 0x3f);
+ (*text) += 2;
+ return c;
+ }
+ /* 0000 0800-0000 FFFF 1110xxxx 10xxxxxx 10xxxxxx */
+ if(((*text)[0] & 0xf0) == 0xe0 && (*text)[1] && (*text)[2])
+ {
+ c = ((*text)[0] & 0x0f) << 12 | ((*text)[1] & 0x3f) << 6 | ((*text)[2] & 0x3f);
+ (*text) += 3;
+ return c;
+ }
+ /* 0001 0000-001F FFFF 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx */
+ if(((*text)[0] & 0xf8) == 0xf0 && (*text)[1] && (*text)[2] && (*text)[3] )
+ {
+ c = ((*text)[0] & 0x07) << 18 | ((*text)[1] & 0x3f) << 12 | ((*text)[2] & 0x3f)<<6 | ((*text)[3] & 0x3f);
+ (*text) += 4;
+ return c;
+ }
+ /* 0020 0000-03FF FFFF 111110xx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx */
+ if(((*text)[0] & 0xfc) == 0xf8 && (*text)[1] && (*text)[2] && (*text)[3] && (*text)[4])
+ {
+ c = ((*text)[0] & 0x03) << 24 | ((*text)[1] & 0x3f) << 18 | ((*text)[2] & 0x3f)<<12 | ((*text)[3] & 0x3f) << 6 | ((*text)[4] & 0x3f);
+ (*text) += 5;
+ return c;
+ }
+ /* 0400 0000-7FFF FFFF 1111110x 10xxxxxx ... 10xxxxxx */
+ if(((*text)[0] & 0xfe) == 0xfc && (*text)[1] && (*text)[2] && (*text)[3] && (*text)[4] && (*text)[5])
+ {
+ c = ((*text)[0] & 0x01) << 30 | ((*text)[1] & 0x3f) << 24 | ((*text)[2] & 0x3f)<<18 | ((*text)[3] & 0x3f) << 12 | ((*text)[4] & 0x3f) << 6 | ((*text)[5] & 0x3f) << 6;
+ (*text) += 6;
+ return c;
+ }
+ return *((*text)++);
+}
+
#define TF_TEXTCONTROL 0x80
#define TF_HASFONT 0x08
#define TF_HASCOLOR 0x04
flags |= 4; //wide codecs
if(fontSize(f)>65535)
flags |= 8; //wide offsets
- flags |= 8; //FIXME: the above check doesn't work
+ flags |= 8|4; //FIXME: the above check doesn't work
if(f->encoding & FONT_ENCODING_ANSI)
flags |= 16; // ansi
if(f->glyphnames) {
int t;
for(t=0;t<f->numchars;t++) {
- free(f->glyphnames[t]);
+ if(f->glyphnames[t])
+ free(f->glyphnames[t]);
}
free(f->glyphnames);
}
return 0;
}
-int swf_TextCountBits(SWFFONT * font,U8 * s,int scale,U8 * gbits,U8 * abits)
+static int swf_TextCountBits2(SWFFONT * font,U8 * s,int scale,U8 * gbits,U8 * abits, char*encoding)
{ U16 g,a;
+ char utf8=0;
if ((!s)||(!font)||((!gbits)&&(!abits))||(!font->ascii2glyph)) return -1;
g = a = 0;
- while(s[0])
+ if(!strcmp(encoding, "UTF8")) utf8=1;
+ else if(!strcmp(encoding, "iso-8859-1")) utf8=0;
+ else fprintf(stderr, "Unknown encoding: %s", encoding);
+
+ while(*s)
{
- int glyph = -1;
- if(s[0] < font->maxascii)
- glyph = font->ascii2glyph[s[0]];
+ int glyph = -1,c;
+
+ if(!utf8) c = *s++;
+ else c = readUTF8char(&s);
+
+ if(c < font->maxascii)
+ glyph = font->ascii2glyph[c];
if(glyph>=0) {
g = swf_CountUBits(glyph,g);
a = swf_CountBits(((((U32)font->glyph[glyph].advance)*scale)/20)/100,a);
}
- s++;
}
if (gbits) gbits[0] = (U8)g;
if (abits) abits[0] = (U8)a;
-
return 0;
}
-int swf_TextSetCharRecord(TAG * t,SWFFONT * font,U8 * s,int scale,U8 gbits,U8 abits)
-{ int l=0,i,pos;
+static int swf_TextSetCharRecord2(TAG * t,SWFFONT * font,U8 * s,int scale,U8 gbits,U8 abits, char*encoding)
+{ int l=0,pos;
+ char utf8=0;
if ((!t)||(!font)||(!s)||(!font->ascii2glyph)) return -1;
+
+ if(!strcmp(encoding, "UTF8")) utf8=1;
+ else if(!strcmp(encoding, "iso-8859-1")) utf8=0;
+ else fprintf(stderr, "Unknown encoding: %s", encoding);
pos = t->len;
swf_SetU8(t, l); //placeholder
- for (i=0;s[i];i++)
+ while(*s)
{
- int g = -1;
- if(s[i] < font->maxascii)
- g = font->ascii2glyph[s[i]];
+ int g = -1,c;
+
+ if(!utf8) c = *s++;
+ else c = readUTF8char(&s);
+
+ if(c < font->maxascii)
+ g = font->ascii2glyph[c];
if(g>=0) {
swf_SetBits(t,g,gbits);
swf_SetBits(t,((((U32)font->glyph[g].advance)*scale)/20)/100,abits);
return 0;
}
+int swf_TextCountBits(SWFFONT * font,U8 * s,int scale,U8 * gbits,U8 * abits) {
+ return swf_TextCountBits2(font,s,scale,gbits,abits,"iso-8859-1");
+}
+int swf_TextSetCharRecord(TAG * t,SWFFONT * font,U8 * s,int scale,U8 gbits,U8 abits) {
+ return swf_TextSetCharRecord2(t,font,s,scale,gbits,abits,"iso-8859-1");
+}
+int swf_TextCountBitsUTF8(SWFFONT * font,U8 * s,int scale,U8 * gbits,U8 * abits) {
+ return swf_TextCountBits2(font,s,scale,gbits,abits,"UTF8");
+}
+int swf_TextSetCharRecordUTF8(TAG * t,SWFFONT * font,U8 * s,int scale,U8 gbits,U8 abits) {
+ return swf_TextSetCharRecord2(t,font,s,scale,gbits,abits,"UTF8");
+}
+
U32 swf_TextGetWidth(SWFFONT * font,U8 * s,int scale)
{ U32 res = 0;
return res;
}
+SRECT swf_TextCalculateBBoxUTF8(SWFFONT * font,U8 * s,int scale)
+{
+ int pos=0;
+ SRECT r;
+ swf_GetRect(0, &r);
+ while(*s) {
+ int c = readUTF8char(&s);
+ 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;
+ swf_ExpandRect2(&r, &rn);
+ pos += (font->glyph[g].advance*scale)/20/100;
+ }
+ }
+ c++;
+ }
+ return r;
+}
+
+
SWFFONT* swf_ReadFont(char* filename)
{
int f;
swf_SetU16(t, WRITEFONTID);
swf_SetU16(t, font->numchars);
for(c=0;c<font->numchars;c++) {
- swf_SetString(t, font->glyphnames[c]);
+ if(font->glyphnames[c])
+ swf_SetString(t, font->glyphnames[c]);
+ else
+ swf_SetString(t, "");
}
}
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)/100;
- }
- }
- c++;
- }
+ r = swf_TextCalculateBBoxUTF8(font,text,scale*20);
} else {
+ fprintf(stderr, "No layout information- can't compute text bbox accurately");
/* 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
swf_SetRect(tag,&r);
swf_SetMatrix(tag,NULL);
- swf_TextCountBits(font,text,scale*20,&gbits,&abits);
+ swf_TextCountBitsUTF8(font,text,scale*20,&gbits,&abits);
swf_SetU8(tag,gbits);
swf_SetU8(tag,abits);
/* 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_TextSetCharRecordUTF8(tag,font,text,scale*20,gbits,abits);
swf_SetU8(tag,0);
return r;
}
}
-static U32 readUTF8char(char**text)
-{
- U32 c = 0;
- if(!(*(*text) & 0x80))
- return *((*text)++);
-
- /* 0000 0080-0000 07FF 110xxxxx 10xxxxxx */
- if(((*text)[0] & 0xe0) == 0xc0 && (*text)[1])
- {
- c = ((*text)[0] & 0x1f) << 6 | ((*text)[1] & 0x3f);
- (*text) += 2;
- return c;
- }
- /* 0000 0800-0000 FFFF 1110xxxx 10xxxxxx 10xxxxxx */
- if(((*text)[0] & 0xf0) == 0xe0 && (*text)[1] && (*text)[2])
- {
- c = ((*text)[0] & 0x0f) << 12 | ((*text)[1] & 0x3f) << 6 | ((*text)[2] & 0x3f);
- (*text) += 3;
- return c;
- }
- /* 0001 0000-001F FFFF 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx */
- if(((*text)[0] & 0xf8) == 0xf0 && (*text)[1] && (*text)[2] && (*text)[3] )
- {
- c = ((*text)[0] & 0x07) << 18 | ((*text)[1] & 0x3f) << 12 | ((*text)[2] & 0x3f)<<6 | ((*text)[3] & 0x3f);
- (*text) += 4;
- return c;
- }
- /* 0020 0000-03FF FFFF 111110xx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx */
- if(((*text)[0] & 0xfc) == 0xf8 && (*text)[1] && (*text)[2] && (*text)[3] && (*text)[4])
- {
- c = ((*text)[0] & 0x03) << 24 | ((*text)[1] & 0x3f) << 18 | ((*text)[2] & 0x3f)<<12 | ((*text)[3] & 0x3f) << 6 | ((*text)[4] & 0x3f);
- (*text) += 5;
- return c;
- }
- /* 0400 0000-7FFF FFFF 1111110x 10xxxxxx ... 10xxxxxx */
- if(((*text)[0] & 0xfe) == 0xfc && (*text)[1] && (*text)[2] && (*text)[3] && (*text)[4] && (*text)[5])
- {
- c = ((*text)[0] & 0x01) << 30 | ((*text)[1] & 0x3f) << 24 | ((*text)[2] & 0x3f)<<18 | ((*text)[3] & 0x3f) << 12 | ((*text)[4] & 0x3f) << 6 | ((*text)[5] & 0x3f) << 6;
- (*text) += 6;
- return c;
- }
- return *((*text)++);
-}
-
-void swf_DrawText(drawer_t*draw, SWFFONT*font, char*text)
+void swf_DrawText(drawer_t*draw, SWFFONT*font, int size, char*text)
{
- char*s = text;
+ U8*s = (U8*)text;
int advance = 0;
while(*s) {
SHAPE*shape;
U32 c = readUTF8char(&s);
int g = font->ascii2glyph[c];
shape = font->glyph[g].shape;
+ if(((int)g)<0) {
+ fprintf(stderr, "No char %d in font %s\n", c, font->name?(char*)font->name:"?");
+ continue;
+ }
shape2 = swf_ShapeToShape2(shape);
l = shape2->lines;
while(l) {
if(l->type == moveTo) {
FPOINT to;
- to.x = l->x/20.0+advance;
- to.y = l->y/20.0;
+ to.x = l->x*size/100.0/20.0+advance;
+ to.y = l->y*size/100.0/20.0;
draw->moveTo(draw, &to);
} else if(l->type == lineTo) {
FPOINT to;
- to.x = l->x/20.0+advance;
- to.y = l->y/20.0;
+ to.x = l->x*size/100.0/20.0+advance;
+ to.y = l->y*size/100.0/20.0;
draw->lineTo(draw, &to);
} else if(l->type == splineTo) {
FPOINT mid,to;
- mid.x = l->sx/20.0+advance;
- mid.y = l->sy/20.0;
- to.x = l->x/20.0+advance;
- to.y = l->y/20.0;
+ mid.x = l->sx*size/100.0/20.0+advance;
+ mid.y = l->sy*size/100.0/20.0;
+ to.x = l->x*size/100.0/20.0+advance;
+ to.y = l->y*size/100.0/20.0;
draw->splineTo(draw, &mid, &to);
}
l = l->next;
}
swf_Shape2Free(shape2);
- advance += font->glyph[g].advance/20.0;
+ advance += font->glyph[g].advance*size/100.0/20.0;
}
}
git.asbjorn.biz / swftools.git / blobdiff