#include "SWFOutputDev.h"
//swftools header files
-#include "swfoutput.h"
+#include "../lib/devices/swf.h"
#include "../lib/log.h"
#include "../lib/gfxdevice.h"
#include "../lib/gfxtools.h"
static void printInfoString(Dict *infoDict, char *key, char *fmt);
static void printInfoDate(Dict *infoDict, char *key, char *fmt);
+static char* lastfontdir = 0;
+
struct mapping {
char*pdffont;
char*filename;
double originX, double originY,
CharCode c, Unicode *_u, int uLen)
{
- msg("<debug> drawChar(%f,%f,%d)", x,y,c);
int render = state->getRender();
// check for invisible text -- this is used by Acrobat Capture
if (render == 3) {
Gfx8BitFont*font8;
font8 = (Gfx8BitFont*)font;
char**enc=font8->getEncoding();
- if(enc && enc[c])
+ if(enc && enc[c] && strcasecmp(enc[c], "space")) {
name = enc[c];
+ }
}
if (CIDToGIDMap) {
msg("<debug> drawChar(%f, %f, c='%c' (%d), GID=%d, u=%d <%d>) CID=%d name=\"%s\" render=%d\n", x, y, (c&127)>=32?c:'?', c, CIDToGIDMap[c], u, uLen, font->isCIDFont(), FIXNULL(name), render);
char* SWFOutputDev::substituteFont(GfxFont*gfxFont, char* oldname)
{
char*fontname = 0, *filename = 0;
- msg("<notice> subsituteFont(%s)", oldname);
+ msg("<notice> substituteFont(%s)", oldname);
if(!(fontname = searchForSuitableFont(gfxFont))) {
fontname = "Times-Roman";
if(!fileName) {
char * fontname = getFontName(gfxFont);
msg("<warning> Font %s %scould not be loaded.", fontname, embedded?"":"(not embedded) ");
- msg("<warning> Try putting a TTF version of that font (named \"%s.ttf\") into /swftools/fonts", fontname);
+
+ if(lastfontdir)
+ msg("<warning> Try putting a TTF version of that font (named \"%s.ttf\") into %s/swftools/fonts", fontname, lastfontdir);
+ else
+ msg("<warning> Try specifying one or more font directories");
+
fileName = substituteFont(gfxFont, fontid);
if(fontid) { free(fontid);fontid = strdup(substitutetarget[substitutepos-1]); /*ugly hack*/};
msg("<notice> Font is now %s (%s)", fontid, fileName);
{
#ifdef HAVE_DIRENT_H
msg("<notice> Adding %s to font directories", dirname);
+ lastfontdir = strdup(dirname);
DIR*dir = opendir(dirname);
if(!dir) {
msg("<warning> Couldn't open directory %s\n", dirname);