X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=pdf2swf%2FSWFOutputDev.cc;h=8e93f5de6ae4c45789dd60ebaf43614fdf2302ea;hb=377ede4ea24974fde5de2a44bd060e6d87dd8bd5;hp=0f8b934e2549d54090652a3fd9d5aa082dde63f7;hpb=f4e8637e2dafb71c0a9ca1e4fce9da3fd894ae84;p=swftools.git diff --git a/pdf2swf/SWFOutputDev.cc b/pdf2swf/SWFOutputDev.cc index 0f8b934..8e93f5d 100644 --- a/pdf2swf/SWFOutputDev.cc +++ b/pdf2swf/SWFOutputDev.cc @@ -23,6 +23,9 @@ #include #include #include "../config.h" +#ifdef HAVE_FONTCONFIG_H +#include +#endif //xpdf header files #include "config.h" #include "gfile.h" @@ -42,8 +45,16 @@ #include "GfxFont.h" #include "CharCodeToUnicode.h" #include "NameToUnicodeTable.h" -#include "FontFile.h" #include "GlobalParams.h" +//#define XPDF_101 +#ifdef XPDF_101 +#include "FontFile.h" +#else +#include "FoFiType1C.h" +#include "FoFiTrueType.h" +#endif +#include "SWFOutputDev.h" + //swftools header files #include "swfoutput.h" #include "../lib/log.h" @@ -55,7 +66,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 @@ -64,6 +81,7 @@ static int pagebuflen = 0; static int pagepos = 0; static double caplinewidth = 3.0; +static int zoom = 72; /* xpdf: 86 */ static void printInfoString(Dict *infoDict, char *key, char *fmt); static void printInfoDate(Dict *infoDict, char *key, char *fmt); @@ -226,7 +244,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 +254,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 +345,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,41 +404,41 @@ 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(); - msg("%sTag: %s\n", loglevel, name); + msg("%s| Tag: %s\n", loglevel, name); - if(font->isCIDFont()) msg("%sis CID font\n", loglevel); + if(font->isCIDFont()) msg("%s| is CID font\n", loglevel); GfxFontType type=font->getType(); switch(type) { case fontUnknownType: - msg("%sType: unknown\n",loglevel); + msg("%s| Type: unknown\n",loglevel); break; case fontType1: - msg("%sType: 1\n",loglevel); + msg("%s| Type: 1\n",loglevel); break; case fontType1C: - msg("%sType: 1C\n",loglevel); + msg("%s| Type: 1C\n",loglevel); break; case fontType3: - msg("%sType: 3\n",loglevel); + msg("%s| Type: 3\n",loglevel); break; case fontTrueType: - msg("%sType: TrueType\n",loglevel); + msg("%s| Type: TrueType\n",loglevel); break; case fontCIDType0: - msg("%sType: CIDType0\n",loglevel); + msg("%s| Type: CIDType0\n",loglevel); break; case fontCIDType0C: - msg("%sType: CIDType0C\n",loglevel); + msg("%s| Type: CIDType0C\n",loglevel); break; case fontCIDType2: - msg("%sType: CIDType2\n",loglevel); + msg("%s| Type: CIDType2\n",loglevel); break; } @@ -423,18 +447,18 @@ void dumpFontInfo(char*loglevel, GfxFont*font) if(font->getEmbeddedFontName()) name = font->getEmbeddedFontName()->getCString(); if(embedded) - msg("%sEmbedded name: %s id: %d\n",loglevel, FIXNULL(name), embRef.num); + msg("%s| Embedded name: %s id: %d\n",loglevel, FIXNULL(name), embRef.num); gstr = font->getExtFontFile(); if(gstr) - msg("%sExternal Font file: %s\n", loglevel, FIXNULL(gstr->getCString())); + msg("%s| External Font file: %s\n", loglevel, FIXNULL(gstr->getCString())); // Get font descriptor flags. - if(font->isFixedWidth()) msg("%sis fixed width\n", loglevel); - if(font->isSerif()) msg("%sis serif\n", loglevel); - if(font->isSymbolic()) msg("%sis symbolic\n", loglevel); - if(font->isItalic()) msg("%sis italic\n", loglevel); - if(font->isBold()) msg("%sis bold\n", loglevel); + if(font->isFixedWidth()) msg("%s| is fixed width\n", loglevel); + if(font->isSerif()) msg("%s| is serif\n", loglevel); + if(font->isSymbolic()) msg("%s| is symbolic\n", loglevel); + if(font->isItalic()) msg("%s| is italic\n", loglevel); + if(font->isBold()) msg("%s| is bold\n", loglevel); } //void SWFOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str, int width, int height, GBool invert, GBool inlineImg) {printf("void SWFOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str, int width, int height, GBool invert, GBool inlineImg) \n");} @@ -633,6 +657,9 @@ void SWFOutputDev::beginString(GfxState *state, GString *s) m11 *= state->getHorizScaling(); m21 *= state->getHorizScaling(); swfoutput_setfontmatrix(&output, m11, -m21, m12, -m22); + + msg(" fontmatrix %7.3f %7.3f\n", m11,-m21); + msg(" fontmatrix %7.3f %7.3f\n", m12,-m22); } void SWFOutputDev::drawChar(GfxState *state, double x, double y, @@ -654,7 +681,7 @@ void SWFOutputDev::drawChar(GfxState *state, double x, double y, x1 = x; y1 = y; state->transform(x, y, &x1, &y1); - + Unicode u=0; if(_u) u = *_u; @@ -679,8 +706,11 @@ 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)); + /*x1 = (int)(x1+0.5); + y1 = (int)(y1+0.5);*/ + int ret = swfoutput_drawchar(&output, x1, y1, name, c, u); } @@ -747,7 +777,11 @@ void SWFOutputDev::drawLink(Link *link, Catalog *catalog) swfcoord points[5]; int x, y; +#ifdef XPDF_101 link->getBorder(&x1, &y1, &x2, &y2, &w); +#else + link->getRect(&x1, &y1, &x2, &y2); +#endif // if (w > 0) { rgb.r = 0; @@ -911,8 +945,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; @@ -970,6 +1012,11 @@ void SWFOutputDev::updateStrokeColor(GfxState *state) (char)(rgb.b*255), (char)(opaq*255)); } +void FoFiWrite(void *stream, char *data, int len) +{ + fwrite(data, len, 1, (FILE*)stream); +} + char*SWFOutputDev::writeEmbeddedFontToFile(XRef*ref, GfxFont*font) { char*tmpFileName = NULL; @@ -996,6 +1043,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))) { @@ -1003,8 +1057,15 @@ char*SWFOutputDev::writeEmbeddedFontToFile(XRef*ref, GfxFont*font) msg(" Couldn't read embedded font file"); return 0; } +#ifdef XPDF_101 Type1CFontFile *cvt = new Type1CFontFile(fontBuf, fontLen); cvt->convertToType1(f); +#else + FoFiType1C *cvt = FoFiType1C::make(fontBuf, fontLen); + cvt->convertToType1(NULL, gTrue, FoFiWrite, f); +#endif + //cvt->convertToCIDType0("test", f); + //cvt->convertToType0("test", f); delete cvt; gfree(fontBuf); } else if(font->getType() == fontTrueType) { @@ -1014,8 +1075,13 @@ char*SWFOutputDev::writeEmbeddedFontToFile(XRef*ref, GfxFont*font) msg(" Couldn't read embedded font file"); return 0; } +#ifdef XPDF_101 TrueTypeFontFile *cvt = new TrueTypeFontFile(fontBuf, fontLen); cvt->writeTTF(f); +#else + FoFiTrueType *cvt = FoFiTrueType::make(fontBuf, fontLen); + cvt->writeTTF(FoFiWrite, f); +#endif delete cvt; gfree(fontBuf); } else { @@ -1062,11 +1128,106 @@ char* substitutetarget[256]; char* substitutesource[256]; int substitutepos = 0; +char* searchForSuitableFont(GfxFont*gfxFont) +{ + char*name = getFontName(gfxFont); + char*fontname = 0; + char*filename = 0; + +#ifdef HAVE_FONTCONFIG + FcPattern *pattern, *match; + FcResult result; + FcChar8 *v; + + // call init ony once + static int fcinitcalled = false; + if (!fcinitcalled) { + fcinitcalled = true; + FcInit(); + } + + pattern = FcPatternBuild(NULL, FC_FAMILY, FcTypeString, name, NULL); + if (gfxFont->isItalic()) // check for italic + FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ITALIC); + if (gfxFont->isBold()) // check for bold + FcPatternAddInteger(pattern, FC_WEIGHT, FC_WEIGHT_BOLD); + + // configure and match using the original font name + FcConfigSubstitute(0, pattern, FcMatchPattern); + FcDefaultSubstitute(pattern); + match = FcFontMatch(0, pattern, &result); + + if (FcPatternGetString(match, "family", 0, &v) == FcResultMatch) { + // if we get an exact match + if (strcmp((char *)v, name) == 0) { + if (FcPatternGetString(match, "file", 0, &v) == FcResultMatch) { + filename = strdup((char*)v); + char *nfn = strrchr(filename, '/'); + if(nfn) fontname = strdup(nfn+1); + else fontname = filename; + } + } else { + // initialize patterns + FcPatternDestroy(pattern); + FcPatternDestroy(match); + + // now match against serif etc. + if (gfxFont->isSerif()) { + pattern = FcPatternBuild (NULL, FC_FAMILY, FcTypeString, "serif", NULL); + } else if (gfxFont->isFixedWidth()) { + pattern = FcPatternBuild (NULL, FC_FAMILY, FcTypeString, "monospace", NULL); + } else { + pattern = FcPatternBuild (NULL, FC_FAMILY, FcTypeString, "sans", NULL); + } + + // check for italic + if (gfxFont->isItalic()) { + int bb = FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ITALIC); + } + // check for bold + if (gfxFont->isBold()) { + int bb = FcPatternAddInteger(pattern, FC_WEIGHT, FC_WEIGHT_BOLD); + } + + // configure and match using serif etc + FcConfigSubstitute (0, pattern, FcMatchPattern); + FcDefaultSubstitute (pattern); + match = FcFontMatch (0, pattern, &result); + + if (FcPatternGetString(match, "file", 0, &v) == FcResultMatch) { + filename = strdup((char*)v); + char *nfn = strrchr(filename, '/'); + if(nfn) fontname = strdup(nfn+1); + else fontname = filename; + } + } + } + + //printf("FONTCONFIG: pattern"); + //FcPatternPrint(pattern); + //printf("FONTCONFIG: match"); + //FcPatternPrint(match); + + FcPatternDestroy(pattern); + FcPatternDestroy(match); + + pdfswf_addfont(filename); + return fontname; +#else + return 0; +#endif +} + char* SWFOutputDev::substituteFont(GfxFont*gfxFont, char* oldname) { - char*fontname = "Times-Roman"; - msg(" substituteFont(,%s)", FIXNULL(oldname)); - char*filename = searchFont(fontname); + char*fontname = 0, *filename = 0; + msg(" subsituteFont(%s)", oldname); + + if(!(fontname = searchForSuitableFont(gfxFont))) { + fontname = "Times-Roman"; + } + filename = searchFont(fontname); + if(substitutepos>=sizeof(substitutesource)/sizeof(char*)) { msg(" Too many fonts in file."); exit(1); @@ -1122,33 +1283,36 @@ 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; } // look for Type 3 font - if (!type3Warning && gfxFont->getType() == fontType3) { - type3Warning = gTrue; - showFontError(gfxFont, 2); + if (gfxFont->getType() == fontType3) { + if(!type3Warning) { + type3Warning = gTrue; + showFontError(gfxFont, 2); + } + return; } /* now either load the font, or find a substitution */ @@ -1160,8 +1324,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,20 +1334,28 @@ 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) - fileName = substituteFont(gfxFont, fontname); + if(!fileName) { + char * fontname = getFontName(gfxFont); + msg(" Font %s %scould not be loaded.", fontname, embedded?"":"(not embedded) "); + msg(" Try putting a TTF version of that font (named \"%s.ttf\") into /swftools/fonts", fontname); + fileName = substituteFont(gfxFont, fontid); + if(fontid) { fontid = substitutetarget[substitutepos-1]; /*ugly hack*/}; + msg(" Font is now %s (%s)", fontid, fileName); + } 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); @@ -1630,96 +1802,26 @@ void pdfswf_init(char*filename, char*userPassword) void pdfswf_setparameter(char*name, char*value) { - if(!strcmp(name, "drawonlyshapes")) { - drawonlyshapes = atoi(value); - } else if(!strcmp(name, "ignoredraworder")) { - ignoredraworder = atoi(value); - } else if(!strcmp(name, "linksopennewwindow")) { - opennewwindow = atoi(value); - } else if(!strcmp(name, "storeallcharacters")) { - storeallcharacters = atoi(value); - } else if(!strcmp(name, "enablezlib")) { - enablezlib = atoi(value); - } else if(!strcmp(name, "insertstop")) { - insertstoptag = atoi(value); - } else if(!strcmp(name, "flashversion")) { - flashversion = atoi(value); - } else if(!strcmp(name, "jpegquality")) { - int val = atoi(value); - if(val<0) val=0; - if(val>100) val=100; - jpegquality = val; - } else if(!strcmp(name, "outputfilename")) { + if(!strcmp(name, "outputfilename")) { swffilename = value; } else if(!strcmp(name, "caplinewidth")) { caplinewidth = atof(value); - } else if(!strcmp(name, "splinequality")) { - int v = atoi(value); - v = 500-(v*5); // 100% = 0.25 pixel, 0% = 25 pixel - if(v<1) v = 1; - splinemaxerror = v; - } else if(!strcmp(name, "fontquality")) { - int v = atoi(value); - v = 500-(v*5); // 100% = 0.25 pixel, 0% = 25 pixel - if(v<1) v = 1; - fontsplinemaxerror = v; + } else if(!strcmp(name, "zoom")) { + zoom = atoi(value); } else { - fprintf(stderr, "unknown parameter: %s (=%s)\n", name, value); + swfoutput_setparameter(name, value); } } void pdfswf_addfont(char*filename) { - fonts[fontnum++] = filename; -} - -void pdfswf_drawonlyshapes() -{ - drawonlyshapes = 1; -} - -void pdfswf_ignoredraworder() -{ - ignoredraworder = 1; -} - -void pdfswf_linksopennewwindow() -{ - opennewwindow = 1; -} - -void pdfswf_storeallcharacters() -{ - storeallcharacters = 1; -} - -void pdfswf_enablezlib() -{ - enablezlib = 1; -} - -void pdfswf_jpegquality(int val) -{ - if(val<0) val=0; - if(val>100) val=100; - jpegquality = val; -} - -void pdfswf_setoutputfilename(char*_filename) -{ - swffilename = _filename; -} - -void pdfswf_insertstop() -{ - insertstoptag = 1; -} - -void pdfswf_setversion(int n) -{ - flashversion = n; + fontfile_t f; + memset(&f, 0, sizeof(fontfile_t)); + f.filename = filename; + fonts[fontnum++] = f; } +void pdfswf_setoutputfilename(char*_filename) { swffilename = _filename; } void pdfswf_convertpage(int page) { @@ -1743,10 +1845,13 @@ void pdfswf_performconversion() for(t=0;tdisplayPage((OutputDev*)output, currentpage, /*dpi*/72, /*rotate*/0, /*doLinks*/(int)1); +#ifdef XPDF_101 + doc->displayPage((OutputDev*)output, currentpage, /*zoom*/zoom, /*rotate*/0, /*doLinks*/(int)1); +#else + doc->displayPage((OutputDev*)output, currentpage, zoom, zoom, /*rotate*/0, true, /*doLinks*/(int)1); +#endif } } - int pdfswf_numpages() { return doc->getNumPages();