X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;ds=sidebyside;f=pdf2swf%2Fswfoutput.cc;h=2c993453b5d626cfd55979b657b9c0ff3ca57606;hb=9d30f80093cbb972bb288d3b90b7d638fc5e6bc9;hp=2993ffc9b330b4cbe43c7aedfc584bce76994434;hpb=c42167873a57926d413c9ee3c90119fae729cce5;p=swftools.git

diff --git a/pdf2swf/swfoutput.cc b/pdf2swf/swfoutput.cc
index 2993ffc..2c99345 100644
--- a/pdf2swf/swfoutput.cc
+++ b/pdf2swf/swfoutput.cc
@@ -37,7 +37,7 @@ static int flag_protected;
 static SWF swf;
 static TAG *tag;
 static int shapeid = -1;
-static int shapecount = 0;
+static int currentswfid = 0;
 static SHAPE* shape;
 static int fillstyleid;
 static int linestyleid;
@@ -201,23 +201,16 @@ void drawpath(T1_OUTLINE*outline, struct swfmatrix*m, char*namehint)
     //char*charname = T1_GetCharName(t1fontindex, character);
 
 /* process a character. */
-void drawchar(struct swfoutput*obj, SWFFont*font, char character, swfmatrix*m)
+void drawchar(struct swfoutput*obj, SWFFont*font, char*character, swfmatrix*m)
 {
     T1_OUTLINE*outline = font->getOutline(character);
-    char* charname = font->getCharName(character);
+    char* charname = character;
 
-    if(!outline)
-    {
-     /* for newline, we don't print an error. FIXME: We shouldn't get newlines here
-	in the first place
-      */
-     if(character != '\n') {
-	 logf("<error> Char to set is not defined!");
-	 logf("<error> -  font file is %s\n", font->getName());
-	 logf("<error> -  char 0x%02x is named %s\n",character, charname);
-     }
+    if(!outline) {
+     logf("Didn't find %s in current charset", character);
      return;
     }
+    
     swfmatrix m2=*m;    
     m2.m11/=100;
     m2.m21/=100;
@@ -254,38 +247,87 @@ void swfoutput_drawpath(swfoutput*output, T1_OUTLINE*outline, struct swfmatrix*m
     drawpath(outline,m, 0); 
 }
 
-SWFFont::SWFFont(int t1fontindex)
+SWFFont::SWFFont(char*name, int id, char*filename)
 {
-    int t;
-    for(t=0;t<256;t++)
-    {
-	int width = T1_GetCharWidth(t1fontindex, t);
-	BBox bbox = T1_GetCharBBox(t1fontindex, t);
-	T1_OUTLINE*outline = T1_GetCharOutline(t1fontindex,t,100.0,0);
+    if(!T1_GetFontName(id))
+	T1_LoadFont(id);
 
-	char*name;
-	this->outline[t] =  T1_CopyOutline(outline);
+    this->name = strdup(T1_GetFontFileName(id));
+    this->fontid = strdup(name);
+    this->t1id = id;
 
-	name = T1_GetCharName(t1fontindex, t);
-	if(!name || name[0]=='.')
-	{
-	    this->charname[t] = 0;
-	    this->outline[t] = 0;
+    char**a= T1_GetAllCharNames(id);
+    int t=0, outlinepos=0;
+    char*map[256];
+    while(a[t])
+	t++;
+ 
+    this->charnum = t;
+    if(!t) 
+	return;
+    logf("<notice> Font %s(%d): Storing %d outlines.\n", name, id, t);
+    
+    outline = (T1_OUTLINE**)malloc(t*sizeof(T1_OUTLINE*));
+    charname = (char**)malloc(t*sizeof(char*));
+    used = (char*)malloc(t*sizeof(char));
+    memset(used,0,t*sizeof(char));
+
+    /*
+    tag = InsertTag(tag,ST_DEFINEFONT);
+    SetU16(tag, ++currentswfid);
+    this->swfid = currentswfid;
+    */
+    
+    t=0;
+    while(*a)
+    {
+	map[t] = *a;
+	a++;
+	t++;
+	if(t==256 || !*a) {
+	    int s;
+	    for(s=t;s<256;s++)
+		map[s] = ".notdef";
+
+	    int ret = T1_ReencodeFont(id, map);
+	    if(ret) {
+	     T1_DeleteFont(id);
+	     T1_LoadFont(id);
+	     int ret = T1_ReencodeFont(id, map);
+	     if(ret)
+	       fprintf(stderr,"Can't reencode font: (%s) ret:%d\n",filename, ret);
+	    }
+
+	    // parsecharacters
+	    for(s=0;s<t;s++)
+	    {
+		this->outline[outlinepos] = T1_CopyOutline(T1_GetCharOutline(id, s, 100.0, 0));
+		this->charname[outlinepos] = strdup(T1_GetCharName(id, s));
+		outlinepos++;
+	    }
+	    t=0;
 	}
-	else
-	    this->charname[t] = strdup(name);
     }
-    this->name = strdup(T1_GetFontFileName(t1fontindex));
 }
 
-T1_OUTLINE*SWFFont::getOutline(unsigned char nr)
+SWFFont::~SWFFont()
 {
-    return outline[nr];
+    int t,s=0;
+    for(t=0;t<charnum;t++)
+	if(used[t]) s++;
+    logf("<notice> Font %s has %d used characters",fontid, s);
 }
 
-char*SWFFont::getCharName(int t)
+T1_OUTLINE*SWFFont::getOutline(char*name)
 {
-    return this->charname[t];
+    int t;
+    for(t=0;t<this->charnum;t++) {
+	if(!strcmp(this->charname[t],name)) {
+	    used[t] = 1;
+	    return outline[t];
+	}
+    }
+    return 0;
 }
 
 char*SWFFont::getName()
@@ -300,15 +342,15 @@ struct fontlist_t
 } *fontlist = 0;
 
 /* set's the t1 font index of the font to use for swfoutput_drawchar(). */
-void swfoutput_setfont(struct swfoutput*obj, int fontid, int t1id)
+void swfoutput_setfont(struct swfoutput*obj, char*fontid, int t1id, char*filename)
 {
     fontlist_t*last=0,*iterator;
-    if(obj->font && obj->font->id == fontid)
+    if(obj->font && !strcmp(obj->font->fontid,fontid))
 	return;
 
     iterator = fontlist;
     while(iterator) {
-	if(iterator->font->id == fontid)
+	if(!strcmp(iterator->font->fontid,fontid))
 	    break;
 	last = iterator;
 	iterator = iterator->next;
@@ -320,10 +362,10 @@ void swfoutput_setfont(struct swfoutput*obj, int fontid, int t1id)
     }
 
     if(t1id<0) {
-	logf("<error> internal error: t1id:%d, fontid:%d\n", t1id,fontid);
+	logf("<error> internal error: t1id:%d, fontid:%s\n", t1id,fontid);
     }
     
-    SWFFont*font = new SWFFont(t1id);
+    SWFFont*font = new SWFFont(fontid, t1id, filename);
     iterator = new fontlist_t;
     iterator->font = font;
     iterator->next = 0;
@@ -335,11 +377,11 @@ void swfoutput_setfont(struct swfoutput*obj, int fontid, int t1id)
     obj->font = font;
 }
 
-int swfoutput_queryfont(struct swfoutput*obj, int fontid)
+int swfoutput_queryfont(struct swfoutput*obj, char*fontid)
 {
     fontlist_t *iterator = fontlist;
     while(iterator) {
-	if(iterator->font->id == fontid)
+	if(!strcmp(iterator->font->fontid,fontid))
 	    return 1;
 	iterator = iterator->next;
     }
@@ -358,7 +400,7 @@ void swfoutput_setfontmatrix(struct swfoutput*obj,double m11,double m12,
 }
 
 /* draws a character at x,y. */
-void swfoutput_drawchar(struct swfoutput* obj,double x,double y,char character) 
+void swfoutput_drawchar(struct swfoutput* obj,double x,double y,char*character) 
 {
     swfmatrix m;
     m.m11 = obj->fontm11;
@@ -423,7 +465,7 @@ void startshape(struct swfoutput*obj)
   rgb.b = obj->fillrgb.b;
   fillstyleid = ShapeAddSolidFillStyle(shape,&obj->fillrgb);
 
-  shapeid = ++shapecount;
+  shapeid = ++currentswfid;
   SetU16(tag,shapeid);  // ID
 
   r.xmin = 0;
@@ -479,6 +521,12 @@ void swfoutput_newpage(struct swfoutput*obj)
 void swfoutput_destroy(struct swfoutput* obj) 
 {
     endpage(obj);
+    fontlist_t *iterator = fontlist;
+    while(iterator) {
+	delete iterator->font;
+	iterator->font = 0;
+	iterator = iterator->next;
+    }
 
     T1_CloseLib();
     if(!filename) 
@@ -642,7 +690,7 @@ void swfoutput_drawimagefile(struct swfoutput*, char*filename, int sizex,int siz
     if(shape>=0)
      endshape();
 
-    bitid = ++shapecount;
+    bitid = ++currentswfid;
   
     /* bitmap */
     tag = InsertTag(tag,ST_DEFINEBITSJPEG2);
@@ -650,7 +698,7 @@ void swfoutput_drawimagefile(struct swfoutput*, char*filename, int sizex,int siz
     SetJPEGBits(tag, filename, 85);
 
     /* shape */
-    myshapeid = ++shapecount;
+    myshapeid = ++currentswfid;
     tag = InsertTag(tag,ST_DEFINESHAPE);
     NewShape(&shape);
     //lsid = ShapeAddLineStyle(shape,obj->linewidth,&obj->strokergb);