DenysMedvid/pdf2htmlEX
1
0
Fork 0
mirror of https://github.com/pdf2htmlEX/pdf2htmlEX.git synced 2024-07-07 18:30:34 +00:00
Code

Fix of "Fix issue in char displacement calculation".

Browse Source
This commit is contained in:
Duan Yao 2014-06-20 09:53:23 +08:00
parent 5fdc4cbb36
commit 4c2fcb4f0d
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/HTMLRenderer/text.cc
View File

@ -14,6 +14,9 @@
#include "util/namespace.h" #include "util/namespace.h"
#include "util/unicode.h" #include "util/unicode.h"
//#define HR_DEBUG(x) (x)
#define HR_DEBUG(x)
namespace pdf2htmlEX { namespace pdf2htmlEX {
using std::all_of; using std::all_of;
@ -61,16 +64,17 @@ void HTMLRenderer::drawString(GfxState * state, GooString * s)
//origin of current char, in glyph space //origin of current char, in glyph space
double ox, oy; double ox, oy;
int nChars = 0;
int nSpaces = 0;
int uLen; int uLen;
CharCode code; CharCode code;
Unicode *u = nullptr; Unicode *u = nullptr;
HR_DEBUG(printf("HTMLRenderer::drawString:len=%d\n", len));
while (len > 0) while (len > 0)
{ {
auto n = font->getNextChar(p, len, &code, &u, &uLen, &ax, &ay, &ox, &oy); auto n = font->getNextChar(p, len, &code, &u, &uLen, &ax, &ay, &ox, &oy);
HR_DEBUG(printf("HTMLRenderer::drawString:unicode=%d\n", u[0]));
if(!(equal(ox, 0) && equal(oy, 0))) if(!(equal(ox, 0) && equal(oy, 0)))
{ {
@ -93,7 +97,7 @@ void HTMLRenderer::drawString(GfxState * state, GooString * s)
* There are always ugly PDF files with no useful info at all. * There are always ugly PDF files with no useful info at all.
*/ */
is_space = true; is_space = true;
++nSpaces; ddx += cur_word_space * cur_horiz_scaling;
} }
if(is_space && (param.space_as_offset)) if(is_space && (param.space_as_offset))
@ -134,16 +138,10 @@ void HTMLRenderer::drawString(GfxState * state, GooString * s)
dx += ddx; dx += ddx;
dy += ddy; dy += ddy;
++nChars;
p += n; p += n;
len -= n; len -= n;
} }
// horiz_scaling is merged into ctm now,
// so the coordinate system is ugly
dx = (dx * cur_font_size + nChars * cur_letter_space + nSpaces * cur_word_space) * cur_horiz_scaling;
dy *= cur_font_size;
cur_tx += dx; cur_tx += dx;
cur_ty += dy; cur_ty += dy;