X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=lib%2Fpdf%2FInfoOutputDev.cc;h=a977970deed31c5972a7544789e7df1b20d6509e;hp=a142c772d946f510822cb86a90625658d7eee00c;hb=5244627ce001a4b2c49595fe38042628856be1d3;hpb=5ba24931ec3861ca5befcaae1502dd9105639b44

diff --git a/lib/pdf/InfoOutputDev.cc b/lib/pdf/InfoOutputDev.cc
index a142c77..a977970 100644
--- a/lib/pdf/InfoOutputDev.cc
+++ b/lib/pdf/InfoOutputDev.cc
@@ -15,7 +15,9 @@
 #endif
 #include "GfxState.h"
 #include "../log.h"
+#include "../types.h"
 #include "../q.h"
+#include "../gfxfont.h"
 #include <math.h>
 #include <assert.h>
 
@@ -52,36 +54,37 @@ InfoOutputDev::~InfoOutputDev()
     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;
+    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]) {
@@ -93,6 +96,19 @@ FontInfo::~FontInfo()
     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)
@@ -103,25 +119,25 @@ static int findSpace(gfxfont_t*font)
 	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;
+    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
@@ -132,8 +148,7 @@ static int addSpace(gfxfont_t*font)
 
 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);
@@ -144,8 +159,8 @@ static gfxfont_t* createGfxFont(FontInfo*src)
     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]) {
@@ -155,8 +170,6 @@ static gfxfont_t* createGfxFont(FontInfo*src)
 	    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;
@@ -193,7 +206,6 @@ static gfxfont_t* createGfxFont(FontInfo*src)
 	    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) {
@@ -206,14 +218,34 @@ static gfxfont_t* createGfxFont(FontInfo*src)
 	    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++;
+	    }
+	}
+    }
+    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;
 }
 
@@ -246,8 +278,9 @@ gfxfont_t* FontInfo::getGfxFont()
 		    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;
 }
@@ -407,15 +440,31 @@ void InfoOutputDev::drawChar(GfxState *state, double x, double y,
 	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)
@@ -447,6 +496,7 @@ GBool InfoOutputDev::beginType3Char(GfxState *state, double x, double y, double
 	currentglyph->y1=0;
 	currentglyph->x2=dx;
 	currentglyph->y2=dy;
+	currentglyph->advance=dx;
 	return gFalse;
     } else {
 	return gTrue;
@@ -463,6 +513,11 @@ void InfoOutputDev::type3D0(GfxState *state, double wx, double wy)
 
 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;