#endif
#include "GfxState.h"
#include "../log.h"
+#include "../types.h"
+#include "../q.h"
+#include "../gfxfont.h"
#include <math.h>
+#include <assert.h>
+
+int config_addspace = 1;
+int config_fontquality = 10;
+int config_bigchar = 0;
InfoOutputDev::InfoOutputDev(XRef*xref)
{
num_links = 0;
num_jpeg_images = 0;
num_ppm_images = 0;
+ num_textfields = 0;
num_fonts = 0;
num_polygons= 0;
- fonts = 0;
currentfont = 0;
currentglyph = 0;
id2font = new GHash(1);
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()
+FontInfo::FontInfo(char*id)
{
- this->charid2glyph = 0;
+ this->id = strdup(id);
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;
+ this->ascender = 0;
+ this->descender = 0;
}
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);
+ }
+ free(kerning);
+ kerning=0;
+ }
}
-GBool InfoOutputDev::upsideDown() {return gTrue;}
-GBool InfoOutputDev::useDrawChar() {return gTrue;}
-GBool InfoOutputDev::interpretType3Chars() {return gTrue;}
-GBool InfoOutputDev::useTilingPatternFill() {return gTrue;}
-void InfoOutputDev::startPage(int pageNum, GfxState *state, double crop_x1, double crop_y1, double crop_x2, double crop_y2)
+static int findSpace(gfxfont_t*font)
{
- double x1,y1,x2,y2;
- state->transform(crop_x1,crop_y1,&x1,&y1);
- state->transform(crop_x2,crop_y2,&x2,&y2);
- if(x2<x1) {double x3=x1;x1=x2;x2=x3;}
- if(y2<y1) {double y3=y1;y1=y2;y2=y3;}
- this->x1 = (int)x1;
- this->y1 = (int)y1;
- this->x2 = (int)x2;
- this->y2 = (int)y2;
- msg("<verbose> Generating info structure for page %d", pageNum);
-}
-void InfoOutputDev::endPage()
-{
-}
-void InfoOutputDev::drawLink(Link *link, Catalog *catalog)
-{
- num_links++;
+ 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;
+ }
+ }
+ return -1;
}
-
-/* there's not yet a way to set this */
-int config_fontquality = 10;
-int config_bigchar = 0;
-/* } else if(!strcmp(key,"fontquality")) {
- this->config_fontquality = atof(value);
- if(this->config_fontquality<=1)
- this->config_fontquality=1;
- } else if(!strcmp(key,"bigchar")) {
- this->config_bigchar = atoi(value);
+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 = 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;
+}
-gfxfont_t* InfoOutputDev::createGfxFont(GfxFont*xpdffont, FontInfo*src)
+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);
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]) {
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) {
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;
- }
+ 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++;
+ }
+ }
}
- //msg("<trace> %d glyphs.", t, font->num_glyphs);
+ 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, width %f", this->gfxfont->id, this->space_char, this->gfxfont->glyphs[this->space_char].advance);
+ }
+ gfxfont_fix_unicode(this->gfxfont);
+ }
+ return this->gfxfont;
+}
+
+GBool InfoOutputDev::upsideDown() {return gTrue;}
+GBool InfoOutputDev::useDrawChar() {return gTrue;}
+GBool InfoOutputDev::interpretType3Chars() {return gTrue;}
+GBool InfoOutputDev::useTilingPatternFill() {return gTrue;}
+
+void InfoOutputDev::startPage(int pageNum, GfxState *state, double crop_x1, double crop_y1, double crop_x2, double crop_y2)
+{
+ double x1,y1,x2,y2;
+ state->transform(crop_x1,crop_y1,&x1,&y1);
+ state->transform(crop_x2,crop_y2,&x2,&y2);
+ if(x2<x1) {double x3=x1;x1=x2;x2=x3;}
+ if(y2<y1) {double y3=y1;y1=y2;y2=y3;}
+ this->x1 = (int)x1;
+ this->y1 = (int)y1;
+ this->x2 = (int)x2;
+ this->y2 = (int)y2;
+ msg("<verbose> Generating info structure for page %d", pageNum);
+}
+void InfoOutputDev::endPage()
+{
+}
+void InfoOutputDev::drawLink(Link *link, Catalog *catalog)
+{
+ num_links++;
+}
+
+/* } else if(!strcmp(key,"fontquality")) {
+ this->config_fontquality = atof(value);
+ if(this->config_fontquality<=1)
+ this->config_fontquality=1;
+ } else if(!strcmp(key,"bigchar")) {
+ this->config_bigchar = atoi(value);
+ }
+ */
+
double InfoOutputDev::getMaximumFontSize(char*id)
{
FontInfo*info = (FontInfo*)id2font->lookup(id);
currentfont = (FontInfo*)id2font->lookup(id);
if(!currentfont) {
- currentfont = new FontInfo;
+ currentfont = new FontInfo(id);
currentfont->font = font;
currentfont->max_size = 0;
GString* idStr = new GString(id);
currentfont->ascender = currentfont->descender = 0;
}
- currentfont->gfxfont = this->createGfxFont(font, currentfont);
- currentfont->gfxfont->id = strdup(id);
- fonts = gfxfontlist_addfont(fonts, currentfont->gfxfont);
-
free(id);
}
if(currentfont && currentfont->max_size < len) {
currentfont->max_size = len;
}
+
+ num_textfields++;
+
currentfont->grow(code+1);
GlyphInfo*g = currentfont->glyphs[code];
if(!g) {
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)
char*id = getFontID(font);
currentfont = (FontInfo*)id2font->lookup(id);
if(!currentfont) {
- currentfont = new FontInfo;
+ currentfont = new FontInfo(id);
currentfont->font = font;
GString* idStr = new GString(id);
id2font->add(idStr, (void*)currentfont);
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;
OutputDev::drawSoftMaskedImage(state,ref,str,width,height,colorMap,maskStr,maskWidth,maskHeight,maskColorMap);
}
+
+void InfoOutputDev::dumpfonts(gfxdevice_t*dev)
+{
+ GHashIter*i;
+ GString*key;
+ FontInfo*font;
+ id2font->startIter(&i);
+ while(id2font->getNext(&i, &key, (void**)&font)) {
+ dev->addfont(dev, font->getGfxFont());
+ }
+}
git.asbjorn.biz / swftools.git / blobdiff