#endif
#include "GfxState.h"
#include "../log.h"
+#include "../types.h"
+#include "../q.h"
#include <math.h>
+#include <assert.h>
-/* there's not yet a way to set this */
+int config_addspace = 1;
int config_fontquality = 10;
int config_bigchar = 0;
delete id2font;id2font=0;
delete splash;splash=0;
}
+
void FontInfo::grow(int size)
{
if(size >= this->num_glyphs) {
this->glyphs = (GlyphInfo**)realloc(this->glyphs, sizeof(GlyphInfo*)*(size));
+ this->kerning = (dict_t**)realloc(this->kerning, sizeof(dict_t*)*(size));
memset(&this->glyphs[this->num_glyphs], 0, sizeof(SplashPath*)*((size)-this->num_glyphs));
+ memset(&this->kerning[this->num_glyphs], 0, sizeof(dict_t*)*((size)-this->num_glyphs));
this->num_glyphs = size;
}
}
FontInfo::FontInfo(char*id)
{
this->id = strdup(id);
- this->charid2glyph = 0;
this->seen = 0;
this->num_glyphs = 0;
this->glyphs = 0;
+ this->kerning = 0;
this->splash_font = 0;
this->lastchar = -1;
this->lastx = 0;
this->lasty = 0;
this->gfxfont = 0;
+ this->space_char = -1;
}
FontInfo::~FontInfo()
{
if(this->id) {free(this->id);this->id=0;}
this->font = 0;
- if(this->charid2glyph) {
- free(this->charid2glyph);
- this->charid2glyph = 0;
- }
int t;
for(t=0;t<num_glyphs;t++) {
if(glyphs[t]) {
free(glyphs);glyphs=0;
if(this->gfxfont)
gfxfont_free(this->gfxfont);
+
+ if(kerning) {
+ for(t=0;t<num_glyphs;t++) {
+ dict_t* d = kerning[t];
+ if(!d) continue;
+ DICT_ITERATE_ITEMS(d,void*,key,mtf_t*,m) {
+ mtf_destroy(m);
+ }
+ dict_destroy(d);
+ }
+ }
}
-gfxfont_t* createGfxFont(FontInfo*src)
+static int findSpace(gfxfont_t*font)
+{
+ int first_space = -1;
+ int t;
+ 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(font->num_glyphs>32 && GLYPH_IS_SPACE(&font->glyphs[32])) {
+ return 32;
+ }
+ return first_space;
+}
+
+static int addSpace(gfxfont_t*font)
+{
+ 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;
+ if(font->max_unicode > 32)
+ font->unicode2glyph[32] = font->num_glyphs-1;
+#if 0
+ g->line = gfxline_makerectangle(0, -font->ascent, g->advance, font->descent);
+#endif
+ return font->num_glyphs-1;
+}
+
+static gfxfont_t* createGfxFont(FontInfo*src)
{
gfxfont_t*font = (gfxfont_t*)malloc(sizeof(gfxfont_t));
memset(font, 0, sizeof(gfxfont_t));
double scale = 1;
//printf("%d glyphs\n", font->num_glyphs);
font->num_glyphs = 0;
- font->ascent = fabs(src->descender);
- font->descent = fabs(src->ascender);
+ font->ascent = fabs(src->ascender);
+ font->descent = fabs(src->descender);
for(t=0;t<src->num_glyphs;t++) {
if(src->glyphs[t]) {
}
}
+
+ int kerning_size = 0;
+ for(t=0;t<src->num_glyphs;t++) {
+ dict_t* d = src->kerning[t];
+ if(!d) continue;
+ DICT_ITERATE_ITEMS(d,void*,key,mtf_t*,m) {
+ if(m) {
+ kerning_size++;
+ }
+ }
+ }
+ font->kerning_size = kerning_size;
+ font->kerning = (gfxkerning_t*)malloc(sizeof(gfxkerning_t)*kerning_size);
+ int pos = 0;
+ for(t=0;t<src->num_glyphs;t++) {
+ dict_t* d = src->kerning[t];
+ if(!d) continue;
+ DICT_ITERATE_ITEMS(d,void*,key,mtf_t*,m) {
+ if(m) {
+ font->kerning[pos].c1 = src->glyphs[t]->glyphid;
+ font->kerning[pos].c2 = src->glyphs[(int)(ptroff_t)key]->glyphid;
+ font->kerning[pos].advance = (int)(ptroff_t)m->first->key;
+ pos++;
+ }
+ }
+ }
+ //int advance = (int)(ptroff_t)m->first->key;
+
return font;
}
+static float find_average_glyph_advance(gfxfont_t*f)
+{
+ if(!f->num_glyphs)
+ return 0.0;
+
+ float*values = (float*)malloc(sizeof(float)*f->num_glyphs);
+ int t;
+ for(t=0;t<f->num_glyphs;t++) {
+ values[t] = f->glyphs[t].advance;
+ }
+ float m = medianf(values, f->num_glyphs);
+ free(values);
+ return m;
+}
gfxfont_t* FontInfo::getGfxFont()
{
if(!this->gfxfont) {
this->gfxfont = createGfxFont(this);
this->gfxfont->id = strdup(this->id);
+ this->space_char = findSpace(this->gfxfont);
+ this->average_advance = find_average_glyph_advance(this->gfxfont);
+
+ if(this->space_char>=0) {
+ msg("<debug> Font %s has space char %d (unicode=%d)",
+ this->id, this->space_char,
+ 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);
+ }
}
return this->gfxfont;
}
g->advance = currentfont->splash_font->last_advance;
g->unicode = 0;
}
- if(uLen && (u[0]>=32 && u[0]<g->unicode || !g->unicode)) {
+ if(uLen && ((u[0]>=32 && u[0]<g->unicode) || !g->unicode)) {
g->unicode = u[0];
}
if(currentfont->lastchar>=0 && currentfont->lasty == y) {
- double xshift = x - currentfont->lastx;
+ double xshift = (x - currentfont->lastx);
if(xshift>=0 && xshift > g->advance_max) {
g->advance_max = xshift;
}
+ int advance = (int)xshift;
+ if(advance>=0 && advance<g->advance*4 && advance!=currentfont->lastadvance) {
+ int c1 = currentfont->lastchar;
+ int c2 = code;
+ dict_t*d = currentfont->kerning[c1];
+ if(!d) {
+ d = currentfont->kerning[c1] = dict_new2(&int_type);
+ }
+ mtf_t*k = (mtf_t*)dict_lookup(d, (void*)(ptroff_t)c2);
+ if(!k) {
+ k = mtf_new(&int_type);
+ dict_put(d, (void*)(ptroff_t)c2, k);
+ }
+ mtf_increase(k, (void*)(ptroff_t)advance);
+ }
}
currentfont->lastx = x;
currentfont->lasty = y;
currentfont->lastchar = code;
+ currentfont->lastadvance = (int)(g->advance+0.5);
}
GBool InfoOutputDev::beginType3Char(GfxState *state, double x, double y, double dx, double dy, CharCode code, Unicode *u, int uLen)