renun/koreader
1
0
Fork 0
mirror of https://github.com/koreader/koreader.git synced 2025-08-10 00:52:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

add indentation option in koptconfig

Browse Source 
By default the indentaion detection is enabled in K2pdfopt. This will
sometimes generate very poor reflowed page when there are sidenotes on
the page which would be treated as indentation. Disabling indentaion
detection will rescue the reflowed page from this situation.
This commit is contained in:
chrox
2012-11-02 00:19:23 +08:00
parent bd132ea2ad
commit 19c0d282aa
4 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
djvu.c
View File

@@ -484,13 +484,13 @@ static int reflowPage(lua_State *L) {
int text_wrap = luaL_checkint(L, 10);
int straighten = luaL_checkint(L, 11);
int justification = luaL_checkint(L, 12);
int columns = luaL_checkint(L, 13);
double contrast = luaL_checknumber(L, 14);
int rotation = luaL_checknumber(L, 15);
int detect_indent = luaL_checkint(L, 13);
int columns = luaL_checkint(L, 14);
double contrast = luaL_checknumber(L, 15);
int rotation = luaL_checknumber(L, 16);
k2pdfopt_set_params(width, height, font_size, page_margin, line_spacing, word_spacing, \
text_wrap, straighten, justification, columns, contrast, rotation);
text_wrap, straighten, justification, detect_indent, columns, contrast, rotation);
k2pdfopt_djvu_reflow(page->page_ref, page->doc->context, mode, page->doc->pixelformat);
k2pdfopt_rfbmp_size(&width, &height);
k2pdfopt_rfbmp_zoom(&dc->zoom);

8
k2pdfopt.c
View File

@@ -245,6 +245,7 @@ static int column_fitted = 0;
static double lm_org, bm_org, tm_org, rm_org, dpi_org;
static double contrast_max = 2.0;
static int show_marked_source = 0;
static int preserve_indentation = 1;
static double defect_size_pts = 1.0;
static double max_vertical_gap_inches = 0.25;
static double vertical_multiplier = 1.0;
@@ -494,7 +495,8 @@ static void k2pdfopt_reflow_bmp(MASTERINFO *masterinfo, WILLUSBITMAP *src) {
void k2pdfopt_set_params(int bb_width, int bb_height, \
double font_size, double page_margin, \
double line_space, double word_space, \
int wrapping, int straighten, int justification, \
int wrapping, int straighten, \
int justification, int detect_indent,\
int columns, double contrast, int rotation) {
dst_userwidth = bb_width; // dst_width is adjusted in adjust_params_init
dst_userheight = bb_height;
@@ -503,6 +505,7 @@ void k2pdfopt_set_params(int bb_width, int bb_height, \
word_spacing = word_space;
text_wrap = wrapping;
src_autostraighten = straighten;
preserve_indentation = detect_indent;
max_columns = columns;
gamma_correction = contrast; // contrast is only used by k2pdfopt_mupdf_reflow
src_rot = rotation;
@@ -513,7 +516,7 @@ void k2pdfopt_set_params(int bb_width, int bb_height, \
dst_marbot = -1.0;
dst_marleft = -1.0;
dst_marright = -1.0;
printf("justification:%d", justification);
// justification
if (justification < 0) {
dst_justify = -1;
@@ -3155,6 +3158,7 @@ static void bmpregion_analyze_justification_and_line_spacing(BMPREGION *region,
indent1 = (double) (c1[i - i1] - region->c1) / textheight;
else
indent1 = (double) (region->c2 - c2[i - i1]) / textheight;
if (preserve_indentation == 0) indent1 = 0;
// printf(" row %2d: indent1=%g\n",i-i1,indent1);
if (!breakinfo->centered) {
indented[i - i1] = (indent1 > 0.5 && ilfi < 1.2 && ilf < .25);

3
k2pdfopt.h
View File

@@ -29,7 +29,8 @@
void k2pdfopt_set_params(int bb_width, int bb_height, \
double font_size, double page_margin, \
double line_space, double word_space, \
int wrapping, int straighten, int justification, \
int wrapping, int straighten, \
int justification, int detect_indent, \
int columns, double contrast, int rotation);
void k2pdfopt_mupdf_reflow(fz_document *doc, fz_page *page, fz_context *ctx);
void k2pdfopt_djvu_reflow(ddjvu_page_t *page, ddjvu_context_t *ctx, ddjvu_render_mode_t mode, ddjvu_format_t *fmt);

9
pdf.c
View File

@@ -524,12 +524,13 @@ static int reflowPage(lua_State *L) {
int text_wrap = luaL_checkint(L, 10);
int straighten = luaL_checkint(L, 11);
int justification = luaL_checkint(L, 12);
int columns = luaL_checkint(L, 13);
double contrast = luaL_checknumber(L, 14);
int rotation = luaL_checknumber(L, 15);
int detect_indent = luaL_checkint(L, 13);
int columns = luaL_checkint(L, 14);
double contrast = luaL_checknumber(L, 15);
int rotation = luaL_checknumber(L, 16);
k2pdfopt_set_params(width, height, font_size, page_margin, line_spacing, word_spacing, \
text_wrap, straighten, justification, columns, contrast, rotation);
text_wrap, straighten, justification, detect_indent, columns, contrast, rotation);
k2pdfopt_mupdf_reflow(page->doc->xref, page->page, page->doc->context);
k2pdfopt_rfbmp_size(&width, &height);
k2pdfopt_rfbmp_zoom(&dc->zoom);