git.asbjorn.biz
/
swftools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added class members, expression lefthands
[swftools.git]
/
lib
/
pdf
/
InfoOutputDev.cc
diff --git
a/lib/pdf/InfoOutputDev.cc
b/lib/pdf/InfoOutputDev.cc
index
a0a4cac
..
d9336b2
100644
(file)
--- a/
lib/pdf/InfoOutputDev.cc
+++ b/
lib/pdf/InfoOutputDev.cc
@@
-1,9
+1,18
@@
+#include "config.h"
#include "Object.h"
#include "Object.h"
-#include "SplashTypes.h"
+#include "InfoOutputDev.h"
#include "SplashOutputDev.h"
#include "SplashOutputDev.h"
+#ifdef HAVE_POPPLER
+#include <splash/SplashTypes.h>
+#include <splash/SplashPath.h>
+#include <splash/SplashFont.h>
+#include <splash/SplashFontFile.h>
+#else
+#include "SplashTypes.h"
#include "SplashPath.h"
#include "SplashPath.h"
+#include "SplashFont.h"
#include "SplashFontFile.h"
#include "SplashFontFile.h"
-#include "InfoOutputDev.h"
+#endif
#include "GfxState.h"
#include "../log.h"
#include <math.h>
#include "GfxState.h"
#include "../log.h"
#include <math.h>
@@
-50,6
+59,9
@@
FontInfo::FontInfo()
this->num_glyphs = 0;
this->glyphs = 0;
this->splash_font = 0;
this->num_glyphs = 0;
this->glyphs = 0;
this->splash_font = 0;
+ this->lastchar = -1;
+ this->lastx = 0;
+ this->lasty = 0;
}
FontInfo::~FontInfo()
{
}
FontInfo::~FontInfo()
{
@@
-153,6
+165,12
@@
void InfoOutputDev::updateFont(GfxState *state)
state->setFont(font, 1024.0);
splash->doUpdateFont(state);
currentfont->splash_font = splash->getCurrentFont();
state->setFont(font, 1024.0);
splash->doUpdateFont(state);
currentfont->splash_font = splash->getCurrentFont();
+ if(currentfont->splash_font) {
+ currentfont->ascender = currentfont->splash_font->ascender;
+ currentfont->descender = currentfont->splash_font->descender;
+ } else {
+ currentfont->ascender = currentfont->descender = 0;
+ }
free(id);
}
free(id);
}
@@
-193,13
+211,25
@@
void InfoOutputDev::drawChar(GfxState *state, double x, double y,
GlyphInfo*g = currentfont->glyphs[code];
if(!g) {
g = currentfont->glyphs[code] = new GlyphInfo();
GlyphInfo*g = currentfont->glyphs[code];
if(!g) {
g = currentfont->glyphs[code] = new GlyphInfo();
+ g->advance_max = 0;
+ currentfont->splash_font->last_advance = -1;
g->path = currentfont->splash_font->getGlyphPath(code);
g->path = currentfont->splash_font->getGlyphPath(code);
+ g->advance = currentfont->splash_font->last_advance;
g->unicode = 0;
}
if(uLen && (u[0]>=32 && u[0]<g->unicode || !g->unicode)) {
g->unicode = u[0];
}
g->unicode = 0;
}
if(uLen && (u[0]>=32 && u[0]<g->unicode || !g->unicode)) {
g->unicode = u[0];
}
+ if(currentfont->lastchar>=0 && currentfont->lasty == y) {
+ double xshift = x - currentfont->lastx;
+ if(xshift>=0 && xshift > g->advance_max) {
+ g->advance_max = xshift;
+ }
+ }
+ currentfont->lastx = x;
+ currentfont->lasty = y;
+ currentfont->lastchar = code;
}
GBool InfoOutputDev::beginType3Char(GfxState *state, double x, double y, double dx, double dy, CharCode code, Unicode *u, int uLen)
}
GBool InfoOutputDev::beginType3Char(GfxState *state, double x, double y, double dx, double dy, CharCode code, Unicode *u, int uLen)