#include "../log.h"
#include "../types.h"
#include "../q.h"
+#include "../gfxfont.h"
#include <math.h>
#include <assert.h>
this->lasty = 0;
this->gfxfont = 0;
this->space_char = -1;
+ this->ascender = 0;
+ this->descender = 0;
}
FontInfo::~FontInfo()
{
}
dict_destroy(d);
}
+ free(kerning);
+ kerning=0;
}
}
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
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) {
font->num_glyphs++;
}
}
- font->unicode2glyph = (int*)malloc(sizeof(int)*font->max_unicode);
- memset(font->unicode2glyph, -1, sizeof(int)*font->max_unicode);
- for(t=0;t<font->num_glyphs;t++) {
- if(font->glyphs[t].unicode>0 && font->glyphs[t].unicode<font->max_unicode) {
- font->unicode2glyph[font->glyphs[t].unicode] = t;
- }
- }
+ gfxfont_fix_unicode(font);
int kerning_size = 0;
for(t=0;t<src->num_glyphs;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);
}
}
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;