DenysMedvid/pdf2htmlEX
1
0
Fork 0
mirror of https://github.com/pdf2htmlEX/pdf2htmlEX.git synced 2024-07-05 09:38:40 +00:00
Code

working

Browse Source
This commit is contained in:
Lu Wang 2012-08-07 04:21:01 +08:00
parent c9085c5ad4
commit c43f3ec81a
2 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/BackgroundRenderer.cc
View File

@ -14,7 +14,7 @@ void BackgroundRenderer::drawChar(GfxState *state, double x, double y,
CharCode code, int nBytes, Unicode *u, int uLen) CharCode code, int nBytes, Unicode *u, int uLen)
{ {
auto font = state->getFont(); auto font = state->getFont();
if((font->getType() == fontType3) || (font->getWMode())) // if((font->getType() == fontType3) || (font->getWMode()))
{ {
SplashOutputDev::drawChar(state, x, y, dx, dy, originX, originY, code, nBytes, u, uLen); SplashOutputDev::drawChar(state, x, y, dx, dy, originX, originY, code, nBytes, u, uLen);
} }

25
src/HTMLRenderer.cc
View File

@ -370,6 +370,7 @@ void HTMLRenderer::beginString(GfxState *state, GooString *s) {
void HTMLRenderer::endString(GfxState *state) { void HTMLRenderer::endString(GfxState *state) {
if (cur_string->getSize() == 0) { if (cur_string->getSize() == 0) {
delete cur_string ; delete cur_string ;
cur_string = nullptr;
return; return;
} }
@ -378,9 +379,10 @@ void HTMLRenderer::endString(GfxState *state) {
{ {
if(at_same_line(cur_line, cur_string)) if(at_same_line(cur_line, cur_string))
{ {
// TODO: this is not correct
double x1 = cur_line->getX() + cur_line->getWidth(); double x1 = cur_line->getX() + cur_line->getWidth();
double x2 = cur_string->getX(); double x2 = cur_string->getX();
double target = (x2-x1-cur_line_x_offset) * draw_scale; double target = (x2-x1-cur_line_x_offset);
if(target > -param->h_eps) if(target > -param->h_eps)
{ {
@ -437,7 +439,7 @@ void HTMLRenderer::endString(GfxState *state) {
html_fout << "\""; html_fout << "\"";
double x,y; double x,y;
cur_state->transform(cur_state->getCurX(), cur_state->getCurY(), &x, &y); cur_state->transform(cur_state->getCurX(), cur_state->getCurY(), &x, &y);
html_fout << boost::format(" data-x=\"%1%\" data-y=\"%2%\" hs=\"%3%")%x%y%(cur_state->getHorizScaling()); html_fout << boost::format(" data-scale=\"%4%\" data-x=\"%1%\" data-y=\"%2%\" data-hs=\"%3%")%x%y%(cur_state->getHorizScaling())%draw_scale;
} }
html_fout << "\">"; html_fout << "\">";
@ -462,17 +464,6 @@ void HTMLRenderer::drawChar(GfxState *state, double x, double y,
cur_string->addUnicodes(state, x, y, dx, dy, u, uLen); cur_string->addUnicodes(state, x, y, dx, dy, u, uLen);
else else
{ {
if(nBytes > 0)
{
std::cerr << "Cannot map to Unicode!" << std::endl;
std::cerr << cur_fn_id << std::endl;
std::cerr << "*";
for(int i = 0; i < nBytes; ++i)
{
std::cerr << (int)(((char*)&code)[i]);
}
std::cerr << std::endl;
}
cur_string->addChars(state, x, y, dx, dy, code, nBytes); cur_string->addChars(state, x, y, dx, dy, code, nBytes);
} }
} }
@ -997,7 +988,6 @@ void HTMLRenderer::check_state_change(GfxState * state)
close_cur_line(); close_cur_line();
cur_line_y = state->getLineY(); cur_line_y = state->getLineY();
} }
} }
if(color_changed) if(color_changed)
@ -1012,7 +1002,7 @@ void HTMLRenderer::check_state_change(GfxState * state)
} }
} }
bool need_rescale_font = true; bool need_rescale_font = false;
if(font_changed) if(font_changed)
{ {
long long new_fn_id = install_font(state->getFont()); long long new_fn_id = install_font(state->getFont());
@ -1022,6 +1012,7 @@ void HTMLRenderer::check_state_change(GfxState * state)
close_cur_line(); close_cur_line();
cur_fn_id = new_fn_id; cur_fn_id = new_fn_id;
} }
if(!_equal(cur_font_size, state->getFontSize())) if(!_equal(cur_font_size, state->getFontSize()))
{ {
cur_font_size = state->getFontSize(); cur_font_size = state->getFontSize();
@ -1043,7 +1034,9 @@ void HTMLRenderer::check_state_change(GfxState * state)
new_ctm[3] = m1[1] * m2[2] + m1[3] * m2[3]; new_ctm[3] = m1[1] * m2[2] + m1[3] * m2[3];
new_ctm[4] = new_ctm[5] = 0; new_ctm[4] = new_ctm[5] = 0;
if(!_tm_equal(new_ctm, draw_ctm, 4)) // TODO: this is not correct
// what to check?
if(!_tm_equal(new_ctm, draw_ctm, 4)) { }
{ {
need_rescale_font = true; need_rescale_font = true;
} }