}
if(charid<0 || charid>=swffont->numchars) {
- msg("<warning> No character %d in font %s ", charid, FIXNULL((char*)swffont->name));
+ msg("<warning> No character %d in font %s (%d chars)", charid, FIXNULL((char*)swffont->name), swffont->numchars);
return 0;
}
/*if(swffont->glyph[charid].shape->bitlen <= 16) {
if(i->textid<0)
return;
- i->tag = swf_InsertTag(i->tag,ST_DEFINETEXT);
+ i->tag = swf_InsertTag(i->tag,ST_DEFINETEXT2);
swf_SetU16(i->tag, i->textid);
SRECT r;
if(i->shapeid>=0)
return;
-
- if(i->textid>=0)
- endtext(dev);
+ //if(i->chardatapos && i->chardata[i->chardatapos-1].color.a)
+ endtext(dev);
i->tag = swf_InsertTag(i->tag,ST_DEFINESHAPE3);
gfxbbox_t r = gfxline_getbbox(line);
int is_outside_page = !is_inside_page(dev, r.xmin, r.ymin) || !is_inside_page(dev, r.xmax, r.ymax);
+ //if(i->chardatapos && i->chardata[i->chardatapos-1].color.a) {
endtext(dev);
+
if(!i->config_ignoredraworder)
endshape(dev);
swffont->glyph[t].shape = swf_ShapeDrawerToShape(&draw);
swffont->layout->bounds[t] = swf_ShapeDrawerGetBBox(&draw);
- if(swffont->layout->bounds[t].xmax && swffont->layout->bounds[t].xmax*2 < advance) {
- printf("fix bad advance value: bbox=%d, advance=%d (%f)\n", swffont->layout->bounds[t].xmax, advance, font->glyphs[t].advance);
- advance = swffont->layout->bounds[t].xmax;
+ int xmax = swffont->layout->bounds[t].xmax / 20;
+ if(xmax>0 && xmax*2 < advance) {
+ printf("fix bad advance value: bbox=%d, advance=%d (%f)\n", xmax, advance, font->glyphs[t].advance);
+ advance = xmax;
}
if(advance<32768) {