X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fpdf%2FGFXOutputDev.cc;h=881c75a75e8a7067c25f75f093375d703332eb79;hb=62ca2479fa44d1d6c7c8b840f7368fd438fd537b;hp=a8eb7b21a2afb914f745ffd02214d106ae520247;hpb=6ff87df3f198989c39e4adca06e0e92069a29edd;p=swftools.git

diff --git a/lib/pdf/GFXOutputDev.cc b/lib/pdf/GFXOutputDev.cc
index a8eb7b2..881c75a 100644
--- a/lib/pdf/GFXOutputDev.cc
+++ b/lib/pdf/GFXOutputDev.cc
@@ -625,6 +625,7 @@ GFXOutputDev::GFXOutputDev(InfoOutputDev*info, PDFDoc*doc)
     this->config_drawonlyshapes = 0;
     this->config_disable_polygon_conversion = 0;
     this->config_multiply = 1;
+    this->config_linkdatafile = 0;
     this->page2page = 0;
     this->num_pages = 0;
   
@@ -643,6 +644,8 @@ void GFXOutputDev::setParameter(const char*key, const char*value)
         this->config_drawonlyshapes = atoi(value);
     } else if(!strcmp(key,"extrafontdata")) {
         this->config_extrafontdata = atoi(value);
+    } else if(!strcmp(key,"linkdatafile")) {
+        this->config_linkdatafile = strdup(value);
     } else if(!strcmp(key,"convertgradients")) {
         this->config_convertgradients = atoi(value);
     } else if(!strcmp(key,"multiply")) {
@@ -1439,10 +1442,13 @@ void GFXOutputDev::drawChar(GfxState *state, double x, double y,
     gfxmatrix_t m = this->current_font_matrix;
     this->transformXY(state, x-originX, y-originY, &m.tx, &m.ty);
     //m.tx += originX; m.ty += originY;
-
-    msg("<debug> drawChar(%f,%f,c='%c' (%d), u=%d <%d>) CID=%d render=%d glyphid=%d font=%08x",m.tx,m.ty,(charid&127)>=32?charid:'?', charid, u, uLen, font->isCIDFont(), render, glyphid, current_gfxfont);
     
-    if((render == RENDER_FILL && !config_drawonlyshapes) || render == RENDER_INVISIBLE) {
+    msg("<debug> drawChar(%f,%f,c='%c' (%d), u=%d <%d>) CID=%d render=%d glyphid=%d font=%08x",m.tx,m.ty,(charid&127)>=32?charid:'?', charid, u, uLen, font->isCIDFont(), render, glyphid, current_gfxfont);
+
+    if((render == RENDER_FILL && !config_drawonlyshapes) ||
+       (render == RENDER_FILLSTROKE && state->getTransformedLineWidth()<1.0) ||
+       (render == RENDER_INVISIBLE)) {
+
 	int space = this->current_fontinfo->space_char;
 	if(config_extrafontdata && space>=0 && m.m00 && !m.m01) {
 	    /* space char detection */
@@ -1451,10 +1457,11 @@ void GFXOutputDev::drawChar(GfxState *state, double x, double y,
 	       !last_char_was_space) {
 		double expected_x = last_char_x + current_gfxfont->glyphs[last_char].advance*m.m00;
 		int space = this->current_fontinfo->space_char;
-		if(m.tx - expected_x >= m.m00*64) {
-		    msg("<debug> There's a %f (%f) pixel gap between char %d and char %d, I'm inserting a space here", 
+		float width = this->current_fontinfo->average_advance;
+		if(m.tx - expected_x >= m.m00*width*4/10) {
+		    msg("<debug> There's a %f pixel gap between char %d and char %d (expected no more than %f), I'm inserting a space here", 
 			    m.tx-expected_x, 
-			    (m.tx-expected_x)/m.m00,
+			    width*m.m00*4/10,
 			    last_char, glyphid);
 		    gfxmatrix_t m2 = m;
 		    m2.tx = expected_x + (m.tx - expected_x - current_gfxfont->glyphs[space].advance*m.m00)/2;
@@ -1475,6 +1482,7 @@ void GFXOutputDev::drawChar(GfxState *state, double x, double y,
 	    msg("<notice> Some texts will be rendered as shape");
 	    gfxglobals->textmodeinfo = 1;
 	}
+
 	gfxline_t*glyph = current_gfxfont->glyphs[glyphid].line;
 	gfxline_t*tglyph = gfxline_clone(glyph);
 	gfxline_transform(tglyph, &m);
@@ -1558,10 +1566,11 @@ GBool GFXOutputDev::beginType3Char(GfxState *state, double x, double y, double d
 
 	gfxmatrix_t m = this->current_font_matrix;
 	this->transformXY(state, 0, 0, &m.tx, &m.ty);
-	m.m00*=INTERNAL_FONT_SIZE;
+
+	/*m.m00*=INTERNAL_FONT_SIZE;
 	m.m01*=INTERNAL_FONT_SIZE;
 	m.m10*=INTERNAL_FONT_SIZE;
-	m.m11*=INTERNAL_FONT_SIZE;
+	m.m11*=INTERNAL_FONT_SIZE;*/
 
 	if(!current_fontinfo || (unsigned)charid >= current_fontinfo->num_glyphs || !current_fontinfo->glyphs[charid]) {
 	    msg("<error> Invalid charid %d for font", charid);
@@ -1843,8 +1852,13 @@ void GFXOutputDev::processLink(Link *link, Catalog *catalog)
     else if(s)
     {
         device->drawlink(device, points, s);
+	if(this->config_linkdatafile) {
+	    FILE*fi = fopen(config_linkdatafile, "ab+");
+	    fprintf(fi, "%s\n", s);
+	    fclose(fi);
+	}
     }
-
+        
     msg("<verbose> \"%s\" link to \"%s\" (%d)", type, FIXNULL(s), page);
     free(s);s=0;
 }
@@ -2031,6 +2045,8 @@ void GFXOutputDev::updateFont(GfxState *state)
     current_gfxfont = this->current_fontinfo->getGfxFont();
     device->addfont(device, current_gfxfont);
     free(id);
+    
+    device->addfont(device, current_gfxfont);
 
     updateFontMatrix(state);
 }