From e7875fcd16a80d880c33b49c9142bce1d870e9a0 Mon Sep 17 00:00:00 2001 From: Sebastian Rasmussen Date: Mon, 24 Oct 2016 21:41:55 +0800 Subject: Introduce options for structured text. --- source/tools/muconvert.c | 1 + source/tools/murun.c | 12 ++++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) (limited to 'source/tools') diff --git a/source/tools/muconvert.c b/source/tools/muconvert.c index 13afee5d..a62a0dd3 100644 --- a/source/tools/muconvert.c +++ b/source/tools/muconvert.c @@ -44,6 +44,7 @@ static void usage(void) "\n" ); fputs(fz_draw_options_usage, stderr); + fputs(fz_stext_options_usage, stderr); fputs(fz_cbz_write_options_usage, stderr); fputs(fz_png_write_options_usage, stderr); #if FZ_ENABLE_PDF diff --git a/source/tools/murun.c b/source/tools/murun.c index 898ed456..fc887105 100644 --- a/source/tools/murun.c +++ b/source/tools/murun.c @@ -1734,15 +1734,17 @@ static void ffi_Page_toStructuredText(js_State *J) { fz_context *ctx = js_getcontext(J); fz_page *page = ffi_topage(J, 0); - int options = js_tointeger(J, 1); + const char *options = js_iscoercible(J, 1) ? js_tostring(J, 1) : NULL; fz_stext_sheet *sheet = NULL; + fz_stext_options so; fz_stext_page *text; fz_var(sheet); fz_try(ctx) { sheet = fz_new_stext_sheet(ctx); - text = fz_new_stext_page_from_page(ctx, page, sheet, options); + fz_parse_stext_options(ctx, &so, options); + text = fz_new_stext_page_from_page(ctx, page, sheet, &so); } fz_always(ctx) fz_drop_stext_sheet(ctx, sheet); @@ -2573,15 +2575,17 @@ static void ffi_DisplayList_toStructuredText(js_State *J) { fz_context *ctx = js_getcontext(J); fz_display_list *list = js_touserdata(J, 0, "fz_display_list"); - int options = js_tointeger(J, 1); + const char *options = js_iscoercible(J, 1) ? js_tostring(J, 1) : NULL; fz_stext_sheet *sheet = NULL; + fz_stext_options so; fz_stext_page *text; fz_var(sheet); fz_try(ctx) { sheet = fz_new_stext_sheet(ctx); - text = fz_new_stext_page_from_display_list(ctx, list, sheet, options); + fz_parse_stext_options(ctx, &so, options); + text = fz_new_stext_page_from_display_list(ctx, list, sheet, &so); } fz_always(ctx) fz_drop_stext_sheet(ctx, sheet); -- cgit v1.2.3