X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;ds=sidebyside;f=pdf2swf%2FSWFOutputDev.cc;h=5ae25d42f5d6f54f8a972720ddde9db7a6405125;hb=07da8bb8199685355527538f3dce4127c5a770f7;hp=8d564a773ed1e8bb93d30093dd796a9c51175fc4;hpb=a915e34e8320720dc7ea93b39444c918e7eaa36b;p=swftools.git diff --git a/pdf2swf/SWFOutputDev.cc b/pdf2swf/SWFOutputDev.cc index 8d564a7..5ae25d4 100644 --- a/pdf2swf/SWFOutputDev.cc +++ b/pdf2swf/SWFOutputDev.cc @@ -55,7 +55,13 @@ static char* swffilename = 0; static int numpages; static int currentpage; -static char*fonts[2048]; +typedef struct _fontfile +{ + char*filename; + int used; +} fontfile_t; + +static fontfile_t fonts[2048]; static int fontnum = 0; // swf <-> pdf pages @@ -226,7 +232,7 @@ public: GfxState *laststate; }; -char*getFontName(GfxFont*font) +static char*getFontID(GfxFont*font) { GString*gstr = font->getName(); char* fontname = gstr==0?0:gstr->getCString(); @@ -236,6 +242,12 @@ char*getFontName(GfxFont*font) sprintf(buf, "UFONT%d", r->num); return strdup(buf); } + return fontname; +} + +static char*getFontName(GfxFont*font) +{ + char*fontname = getFontID(font); char* plus = strchr(fontname, '+'); if(plus && plus < &fontname[strlen(fontname)-1]) fontname = plus+1; @@ -321,8 +333,8 @@ char* gfxstate2str(GfxState *state) if(state->getLineJoin()!=0) bufpos+=sprintf(bufpos,"ML%d ", state->getMiterLimit()); - if(state->getFont() && getFontName(state->getFont())) - bufpos+=sprintf(bufpos,"F\"%s\" ",getFontName(state->getFont())); + if(state->getFont() && getFontID(state->getFont())) + bufpos+=sprintf(bufpos,"F\"%s\" ",getFontID(state->getFont())); bufpos+=sprintf(bufpos,"FS%.1f ", state->getFontSize()); bufpos+=sprintf(bufpos,"MAT[%.1f/%.1f/%.1f/%.1f/%.1f/%.1f] ", state->getTextMat()[0],state->getTextMat()[1],state->getTextMat()[2], state->getTextMat()[3],state->getTextMat()[4],state->getTextMat()[5]); @@ -380,9 +392,9 @@ void showFontError(GfxFont*font, int nr) void dumpFontInfo(char*loglevel, GfxFont*font) { - char* name = getFontName(font); + char* name = getFontID(font); Ref* r=font->getID(); - msg("%s=========== %s (ID:%d,%d) ==========\n", loglevel, name, r->num,r->gen); + msg("%s=========== %s (ID:%d,%d) ==========\n", loglevel, getFontName(font), r->num,r->gen); GString*gstr = font->getTag(); @@ -679,7 +691,7 @@ void SWFOutputDev::drawChar(GfxState *state, double x, double y, name = enc[c]; } - msg(" drawChar(%f,%f,c='%c' (%d),u=%d <%d>) CID=%d name=\"%s\"\n",x1,y1,(c&127)>=32?c:'?',c,u, uLen, font->isCIDFont(), FIXNULL(name)); + msg(" drawChar(%f,%f,c='%c' (%d),u=%d <%d>) CID=%d name=\"%s\"\n",x,y,(c&127)>=32?c:'?',c,u, uLen, font->isCIDFont(), FIXNULL(name)); int ret = swfoutput_drawchar(&output, x1, y1, name, c, u); } @@ -911,8 +923,9 @@ char* SWFOutputDev::searchFont(char*name) { int i; char*filename=0; + int is_standard_font = 0; - msg(" SearchT1Font(%s)", name); + msg(" SearchFont(%s)", name); /* see if it is a pdf standard font */ for(i=0;i Using %s for %s", fonts[i].filename, name); + } + return fonts[i].filename; } } return 0; @@ -996,6 +1016,13 @@ char*SWFOutputDev::writeEmbeddedFontToFile(XRef*ref, GfxFont*font) msg(" Couldn't create temporary Type 1 font file"); return 0; } + + /*if(font->isCIDFont()) { + GfxCIDFont* cidFont = (GfxCIDFont *)font; + GString c = cidFont->getCollection(); + msg(" Collection: %s", c.getCString()); + }*/ + if (font->getType() == fontType1C || font->getType() == fontCIDType0C) { if (!(fontBuf = font->readEmbFontFile(xref, &fontLen))) { @@ -1005,6 +1032,8 @@ char*SWFOutputDev::writeEmbeddedFontToFile(XRef*ref, GfxFont*font) } Type1CFontFile *cvt = new Type1CFontFile(fontBuf, fontLen); cvt->convertToType1(f); + //cvt->convertToCIDType0("test", f); + //cvt->convertToType0("test", f); delete cvt; gfree(fontBuf); } else if(font->getType() == fontTrueType) { @@ -1122,26 +1151,26 @@ void SWFOutputDev::updateFont(GfxState *state) if (!gfxFont) { return; } - char * fontname = getFontName(gfxFont); + char * fontid = getFontID(gfxFont); int t; /* first, look if we substituted this font before- this way, we don't initialize the T1 Fonts too often */ for(t=0;t updateFont(%s) [cached]", fontname); + msg(" updateFont(%s) [cached]", fontid); return; } @@ -1160,8 +1189,8 @@ void SWFOutputDev::updateFont(GfxState *state) int del = 0; if(embedded && (gfxFont->getType() == fontType1 || - //gfxFont->getType() == fontCIDType0C || gfxFont->getType() == fontType1C || + //gfxFont->getType() == fontCIDType0C || gfxFont->getType() == fontTrueType || gfxFont->getType() == fontCIDType2 )) @@ -1170,24 +1199,26 @@ void SWFOutputDev::updateFont(GfxState *state) if(!fileName) showFontError(gfxFont,0); else del = 1; } else { + char * fontname = getFontName(gfxFont); fileName = searchFont(fontname); if(!fileName) showFontError(gfxFont,0); } if(!fileName) { + char * fontname = getFontName(gfxFont); msg(" Font %s could not be loaded.", fontname); msg(" Try putting a TTF version of that font (named \"%s.ttf\") into /swftools/fonts", fontname); - fileName = substituteFont(gfxFont, fontname); + fileName = substituteFont(gfxFont, fontid); } if(!fileName) { - msg(" Couldn't set font %s\n", fontname); + msg(" Couldn't set font %s\n", fontid); return; } - msg(" updateFont(%s) -> %s", fontname, fileName); + msg(" updateFont(%s) -> %s", fontid, fileName); dumpFontInfo("", gfxFont); - swfoutput_setfont(&output, fontname, fileName); + swfoutput_setfont(&output, fontid, fileName); if(fileName && del) unlinkfont(fileName); @@ -1674,7 +1705,10 @@ void pdfswf_setparameter(char*name, char*value) void pdfswf_addfont(char*filename) { - fonts[fontnum++] = filename; + fontfile_t f; + memset(&f, 0, sizeof(fontfile_t)); + f.filename = filename; + fonts[fontnum++] = f; } void pdfswf_drawonlyshapes()