DenysMedvid/pdf2htmlEX
1
0
Fork 0
mirror of https://github.com/pdf2htmlEX/pdf2htmlEX.git synced 2024-12-22 13:00:08 +00:00
Code

better line merging

Browse Source
This commit is contained in:
Lu Wang 2012-08-19 13:05:14 +02:00
parent 4c05a64513
commit 6ee3d2b949
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
share/tail.html
View File

@ -1,4 +1,4 @@
<!-- tail.hml by WangLu 2012.08.15 --> <!-- tail.html by WangLu 2012.08.15 -->
</div> </div>
</body> </body>
</html> </html>

17
src/HTMLRenderer/state.cc
View File

@ -115,8 +115,8 @@ void HTMLRenderer::check_state_change(GfxState * state)
} }
// backup the current ctm for need_recheck_position // backup the current ctm for need_recheck_position
double previous_ctm[6]; double old_ctm[6];
memcpy(previous_ctm, cur_ctm, sizeof(previous_ctm)); memcpy(old_ctm, cur_ctm, sizeof(old_ctm));
// ctm & text ctm & hori scale // ctm & text ctm & hori scale
if(all_changed || ctm_changed || text_mat_changed || hori_scale_changed) if(all_changed || ctm_changed || text_mat_changed || hori_scale_changed)
@ -143,7 +143,6 @@ void HTMLRenderer::check_state_change(GfxState * state)
} }
} }
// HERE
// draw_ctm, draw_scale // draw_ctm, draw_scale
// depends: font size & ctm & text_ctm & hori scale // depends: font size & ctm & text_ctm & hori scale
if(need_rescale_font) if(need_rescale_font)
@ -171,7 +170,7 @@ void HTMLRenderer::check_state_change(GfxState * state)
draw_font_size = new_draw_font_size; draw_font_size = new_draw_font_size;
cur_fs_id = install_font_size(draw_font_size); cur_fs_id = install_font_size(draw_font_size);
} }
if(!(_tm_equal(new_draw_ctm, draw_ctm))) if(!(_tm_equal(new_draw_ctm, draw_ctm, 4)))
{ {
new_line_status = max(new_line_status, LineStatus::DIV); new_line_status = max(new_line_status, LineStatus::DIV);
memcpy(draw_ctm, new_draw_ctm, sizeof(draw_ctm)); memcpy(draw_ctm, new_draw_ctm, sizeof(draw_ctm));
@ -208,8 +207,8 @@ void HTMLRenderer::check_state_change(GfxState * state)
if(abs(deter) > EPS) if(abs(deter) > EPS)
{ {
//ok, only one solution //ok, only one solution
draw_tx += (d*tdx - b*tdy) / deter; draw_tx += (cur_ctm[3]*tdx - cur_ctm[2]*tdy) / deter;
draw_ty += (-c*tdx + a*tdy) / deter; draw_ty += (-cur_ctm[1]*tdx + cur_ctm[0]*tdy) / deter;
} }
else else
{ {
@ -224,11 +223,15 @@ void HTMLRenderer::check_state_change(GfxState * state)
draw_tx += old_ctm[5] / cur_ctm[1]; draw_tx += old_ctm[5] / cur_ctm[1];
else else
{ {
// ok, just let dx = 0 // wo cur_ctm[0] == cur_ctm[1] == 0
// while the first 4 elements of cur/old_ctm are the same, but the last 2 are not
// so give up
hope = false;
} }
} }
else else
{ {
hope = false;
} }
} }
} }