#endif
#include "GfxState.h"
#include "../log.h"
+#include "../types.h"
#include "../q.h"
+#include "../gfxfont.h"
#include <math.h>
#include <assert.h>
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;
{
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);
+ }
+ free(kerning);
+ kerning=0;
+ }
}
static int findSpace(gfxfont_t*font)
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++) {
+ 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;
}
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)