gfxfont_t*font;
mymatrix_t matrix;
int*used;
- double dx,dy;
+ double dx;
} transformedfont_t;
static transformedfont_t* transformedfont_new(gfxfont_t*orig, mymatrix_t*m)
average_xmax /= count;
fd->dx = -total.xmin;
- fd->dy = 0;
+
+ font->ascent = total.ymax;
+ font->descent = total.ymin;
for(t=0;t<count;t++) {
gfxline_t*line = font->glyphs[t].line;
while(line) {
line->x += fd->dx;
- line->y += fd->dy;
line->sx += fd->dx;
- line->sy += fd->dy;
line = line->next;
}
}
gfxmatrix_t scalematrix;
matrix_convert(matrix, font->id, &m, &scalematrix);
transformedfont_t*d = dict_lookup(i->matrices, &m);
- scalematrix.tx -= d->dx;
- scalematrix.ty -= d->dy;
+ scalematrix.tx -= d->dx*scalematrix.m00;
out->drawchar(out, d->font, d->used[glyphnr], color, &scalematrix);
}
f->pass1.internal = i;
f->pass2.name = "remove font transforms pass 2";
+ f->pass2.addfont = pass2_addfont;
f->pass2.drawchar = pass2_drawchar;
f->pass2.internal = i;