this->lasty = 0;
this->gfxfont = 0;
this->space_char = -1;
+ this->ascender = 0;
+ this->descender = 0;
}
FontInfo::~FontInfo()
{
for(t=0;t<font->num_glyphs;t++) {
gfxglyph_t*g = &font->glyphs[t];
if(GLYPH_IS_SPACE(g)) {
- if(g->unicode == 32) return t;
- if(first_space<0)
- first_space = t;
+ if(g->unicode == 32) {
+ /* now that we have found a space char, make sure it's unique */
+ int s;
+ for(s=0;s<font->num_glyphs;s++) {
+ if(s!=t && font->glyphs[s].unicode==32)
+ font->glyphs[s].unicode=0;
+ }
+ return t;
+ }
}
}
- if(font->num_glyphs>32 && GLYPH_IS_SPACE(&font->glyphs[32])) {
- return 32;
- }
- return first_space;
+ return -1;
}
static int addSpace(gfxfont_t*font)
{
+ /* first, make sure the new space char is the only char that'll use unicode 32 */
+ int t;
+ for(t=0;t<font->num_glyphs;t++) {
+ if(font->glyphs[t].unicode==32)
+ font->glyphs[t].unicode=0;
+ }
font->num_glyphs++;
font->glyphs = (gfxglyph_t*)realloc(font->glyphs, sizeof(gfxglyph_t)*font->num_glyphs);
gfxglyph_t*g = &font->glyphs[font->num_glyphs-1];
memset(g, 0, sizeof(*g));
g->unicode = 32;
- //g->advance = font->ascent;
- g->advance = fabs(font->ascent - font->descent)*2 / 3;
+ g->advance = fabs(font->ascent + font->descent)*2 / 3;
if(font->max_unicode > 32)
font->unicode2glyph[32] = font->num_glyphs-1;
#if 0
static gfxfont_t* createGfxFont(FontInfo*src)
{
- gfxfont_t*font = (gfxfont_t*)malloc(sizeof(gfxfont_t));
- memset(font, 0, sizeof(gfxfont_t));
+ gfxfont_t*font = (gfxfont_t*)rfx_calloc(sizeof(gfxfont_t));
font->glyphs = (gfxglyph_t*)malloc(sizeof(gfxglyph_t)*src->num_glyphs);
memset(font->glyphs, 0, sizeof(gfxglyph_t)*src->num_glyphs);
gfxglyph_t*glyph = &font->glyphs[font->num_glyphs];
src->glyphs[t]->glyphid = font->num_glyphs;
glyph->unicode = src->glyphs[t]->unicode;
- if(glyph->unicode >= font->max_unicode)
- font->max_unicode = glyph->unicode+1;
gfxdrawer_t drawer;
gfxdrawer_target_gfxline(&drawer);
int s;
if(src->glyphs[t]->advance>0) {
glyph->advance = src->glyphs[t]->advance;
} else {
- msg("<warning> Approximating advance value for glyph %d", t);
glyph->advance = xmax*scale;
}
if(config_bigchar) {
}
}
- gfxfont_fix_unicode(font);
-
int kerning_size = 0;
for(t=0;t<src->num_glyphs;t++) {
dict_t* d = src->kerning[t];
this->gfxfont->glyphs[this->space_char].unicode);
} else if(config_addspace) {
this->space_char = addSpace(this->gfxfont);
- msg("<debug> Appending space char to font %s, position %d", this->gfxfont->id, this->space_char);
+ msg("<debug> Appending space char to font %s, position %d, width %f", this->gfxfont->id, this->space_char, this->gfxfont->glyphs[this->space_char].advance);
}
+ gfxfont_fix_unicode(this->gfxfont);
}
return this->gfxfont;
}
currentglyph->y1=0;
currentglyph->x2=dx;
currentglyph->y2=dy;
+ currentglyph->advance=dx;
return gFalse;
} else {
return gTrue;
void InfoOutputDev::type3D1(GfxState *state, double wx, double wy, double llx, double lly, double urx, double ury)
{
+ if(-lly>currentfont->descender)
+ currentfont->descender = -lly;
+ if(ury>currentfont->ascender)
+ currentfont->ascender = ury;
+
currentglyph->x1=llx;
currentglyph->y1=lly;
currentglyph->x2=urx;
currentglyph->path->lineTo(x1,y2);
currentglyph->path->close();
}
+
+void InfoOutputDev::saveState(GfxState *state)
+{
+ updateAll(state);
+}
+
+void InfoOutputDev::restoreState(GfxState *state)
+{
+ updateAll(state);
+}
void InfoOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str,
int width, int height, GBool invert,