X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fdevices%2Fswf.c;h=182aa55f8853527aa2017954409ac5a98576e8c6;hb=922f9285d96ff230c5c6a7017ac7246a0cdf6163;hp=a3f57e9add05d376726f8c2eec7a7bab57d96b65;hpb=e633c982297e1728e8373f80d25533776a9b92b0;p=swftools.git

diff --git a/lib/devices/swf.c b/lib/devices/swf.c
index a3f57e9..182aa55 100644
--- a/lib/devices/swf.c
+++ b/lib/devices/swf.c
@@ -114,6 +114,7 @@ typedef struct _swfoutput_internal
     int config_bboxvars;
     int config_disable_polygon_conversion;
     int config_normalize_polygon_positions;
+    int config_alignfonts;
     char config_disablelinks;
     RGBA config_linkcolor;
     float config_minlinewidth;
@@ -738,12 +739,6 @@ static void chararray_writetotag(chararray_t*_chardata, TAG*tag)
 		    lastx = chr->x;
 		    lasty = chr->y;
 		    lastsize = chr->size;
-		} else {
-		    assert(lastchar>=0);
-		    if(pass==1 && lastchar!=chr->charid) {
-			swf_FontUsePair(chr->font, lastchar, chr->charid);
-			swf_FontUsePair(chr->font, chr->charid, lastchar);
-		    }
 		}
 
 		if(islast)
@@ -1476,13 +1471,10 @@ void swfoutput_finalize(gfxdevice_t*dev)
     endpage(dev);
     fontlist_t *iterator = i->fontlist;
     char use_font3 = i->config_flashversion>=8 && !NO_FONT3;
+
     while(iterator) {
 	TAG*mtag = i->swf->firstTag;
 	if(iterator->swffont) {
-	    if(use_font3) {
-		// needs to be done before the reduce
-		swf_FontCreateAlignZones(iterator->swffont);
-	    }
 	    if(!i->config_storeallcharacters) {
 		msg("<debug> Reducing font %s", iterator->swffont->name);
 		swf_FontReduce(iterator->swffont);
@@ -1495,19 +1487,19 @@ void swfoutput_finalize(gfxdevice_t*dev)
 		} else {
 		    mtag = swf_InsertTag(mtag, ST_DEFINEFONT3);
 		    swf_FontSetDefine2(mtag, iterator->swffont);
-		    if(iterator->swffont->alignzones) {
-			mtag = swf_InsertTag(mtag, ST_DEFINEFONTALIGNZONES);
-			swf_FontSetAlignZones(mtag, iterator->swffont);
-		    }
 		}
 	    }
 	}
 
         iterator = iterator->next;
     }
-	
+
     i->tag = swf_InsertTag(i->tag,ST_END);
     TAG* tag = i->tag->prev;
+   
+    if(use_font3 && i->config_storeallcharacters && i->config_alignfonts) {
+	swf_FontPostprocess(i->swf); // generate alignment information
+    }
 
     /* remove the removeobject2 tags between the last ST_SHOWFRAME
        and the ST_END- they confuse the flash player  */
@@ -2821,21 +2813,26 @@ static SWFFONT* gfxfont_to_swffont(gfxfont_t*font, const char* id, int version)
     swffont->glyph2ascii = (U16*)rfx_calloc(sizeof(U16)*swffont->numchars);
     swffont->glyph = (SWFGLYPH*)rfx_calloc(sizeof(SWFGLYPH)*swffont->numchars);
     swffont->glyphnames = (char**)rfx_calloc(sizeof(char*)*swffont->numchars);
-    for(t=0;t<font->max_unicode;t++) {
-	swffont->ascii2glyph[t] = font->unicode2glyph[t];
-    }
+
     SRECT max = {0,0,0,0};
     for(t=0;t<font->num_glyphs;t++) {
 	drawer_t draw;
 	gfxline_t*line;
 	double advance = 0;
-	swffont->glyph2ascii[t] = font->glyphs[t].unicode;
-	if(swffont->glyph2ascii[t] == 0xffff || swffont->glyph2ascii[t] == 0x0000) {
+	int u = font->glyphs[t].unicode;
+	int s;
+	char twice=0;
+	for(s=0;s<font->num_glyphs;s++) {
+	    if(swffont->glyph2ascii[s]==u) 
+		twice=1;
+	}
+	if(u >= 0xe000 || u == 0x0000 || twice) {
 	    /* flash 8 flashtype requires unique unicode IDs for each character.
 	       We use the Unicode private user area to assign characters, hoping that
 	       the font doesn't contain more than 2048 glyphs */
-	    swffont->glyph2ascii[t] = 0xe000 + (t&0x1fff);
+	    u = 0xe000 + (t&0x1fff);
 	}
+	swffont->glyph2ascii[t] = u;
 
 	if(font->glyphs[t].name) {
 	    swffont->glyphnames[t] = strdup(font->glyphs[t].name);
@@ -2853,6 +2850,11 @@ static SWFFONT* gfxfont_to_swffont(gfxfont_t*font, const char* id, int version)
 	    c.x = line->sx * scale; c.y = -line->sy * scale;
 	    //to.x = floor(line->x * scale); to.y = floor(-line->y * scale);
 	    to.x = line->x * scale; to.y = -line->y * scale;
+
+	    /*if(strstr(swffont->name, "BIRNU") && t==90) {
+		to.x += 1;
+	    }*/
+
 	    if(line->type == gfx_moveTo) {
 		draw.moveTo(&draw, &to);
 	    } else if(line->type == gfx_lineTo) {
@@ -2881,6 +2883,7 @@ static SWFFONT* gfxfont_to_swffont(gfxfont_t*font, const char* id, int version)
 
 	swf_ExpandRect2(&bounds, &swffont->layout->bounds[t]);
     }
+
     for(t=0;t<font->num_glyphs;t++) {
 	SRECT bbox = swffont->layout->bounds[t];
 
@@ -2920,6 +2923,7 @@ static SWFFONT* gfxfont_to_swffont(gfxfont_t*font, const char* id, int version)
     if(font->descent*20 > swffont->layout->descent)
 	swffont->layout->descent = font->descent*20;
 
+    swf_FontSort(swffont);
     return swffont;
 }
 
@@ -3074,6 +3078,7 @@ static void swf_drawchar(gfxdevice_t*dev, gfxfont_t*font, int glyph, gfxcolor_t*
 	msg("<warning> No character %d in font %s (%d chars)", glyph, FIXNULL((char*)i->swffont->name), i->swffont->numchars);
 	return;
     }
+    glyph = i->swffont->glyph2glyph[glyph];
     
     setfontscale(dev, matrix->m00, matrix->m01, matrix->m10, matrix->m11, matrix->tx, matrix->ty, 0);