X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=lib%2Fpdf%2FInfoOutputDev.cc;h=214814f5dfbb7b8c785519a124478c454c21c87c;hp=ba151a1678fbce24780a4fe77b35a3d99d91e485;hb=2f0ee9b97abeeb1a74722ccdfaa0ffa6b5427cd0;hpb=62f28906ebae10fa325af43bf19315260c344303

diff --git a/lib/pdf/InfoOutputDev.cc b/lib/pdf/InfoOutputDev.cc
index ba151a1..214814f 100644
--- a/lib/pdf/InfoOutputDev.cc
+++ b/lib/pdf/InfoOutputDev.cc
@@ -17,6 +17,7 @@
 #include "../log.h"
 #include "../types.h"
 #include "../q.h"
+#include "../gfxfont.h"
 #include <math.h>
 #include <assert.h>
 
@@ -77,6 +78,8 @@ FontInfo::FontInfo(char*id)
     this->lasty = 0;
     this->gfxfont = 0;
     this->space_char = -1;
+    this->ascender = 0;
+    this->descender = 0;
 }
 FontInfo::~FontInfo()
 {
@@ -103,6 +106,8 @@ FontInfo::~FontInfo()
 	    }
 	    dict_destroy(d);
 	}
+	free(kerning);
+	kerning=0;
     }
 }
 
@@ -126,13 +131,18 @@ static int findSpace(gfxfont_t*font)
 
 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
@@ -204,7 +214,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) {
@@ -217,14 +226,8 @@ 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;
-	}
 
-    }
+    gfxfont_fix_unicode(font);
 
     int kerning_size = 0;
     for(t=0;t<src->num_glyphs;t++) {
@@ -247,10 +250,6 @@ static gfxfont_t* createGfxFont(FontInfo*src)
 		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;
-		printf("kerning[%d] = (%d,%d,%d)\n", pos,
-			font->kerning[pos].c1,
-			font->kerning[pos].c2,
-			font->kerning[pos].advance);
 		pos++;
 	    }
 	}
@@ -289,7 +288,7 @@ 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);
 	}
     }
     return this->gfxfont;
@@ -506,6 +505,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;
@@ -522,6 +522,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;