diff options
| author | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2021-01-15 02:59:25 +0000 |
|---|---|---|
| committer | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2021-01-15 02:59:25 +0000 |
| commit | ae7784dc15ced1fb269db039808b4694191c6e4d (patch) | |
| tree | 374afaeb71d8a46a761c3ec91f33b8ae456cbe85 /Build/source/texk/dvipdfm-x/dvipdfmx.c | |
| parent | 0c94886a690ef7fee60da96291355e7401c01ab0 (diff) | |
Experimental support for dviluatex & separate annot_grow for h/v (S. Hirata)
git-svn-id: svn://tug.org/texlive/trunk@57425 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvipdfm-x/dvipdfmx.c')
| -rw-r--r-- | Build/source/texk/dvipdfm-x/dvipdfmx.c | 37 |
1 files changed, 28 insertions, 9 deletions
diff --git a/Build/source/texk/dvipdfm-x/dvipdfmx.c b/Build/source/texk/dvipdfm-x/dvipdfmx.c index a3d42d72ef5..6da8627afec 100644 --- a/Build/source/texk/dvipdfm-x/dvipdfmx.c +++ b/Build/source/texk/dvipdfm-x/dvipdfmx.c @@ -2,7 +2,7 @@ DVIPDFMx, an eXtended version of DVIPDFM by Mark A. Wicks. - Copyright (C) 2002-2020 by Jin-Hwan Cho, Matthias Franz, and Shunsaku Hirata, + Copyright (C) 2002-2021 by Jin-Hwan Cho, Matthias Franz, and Shunsaku Hirata, the DVIPDFMx project team. Copyright (c) 2006 SIL. (xdvipdfmx extensions for XeTeX support) @@ -89,7 +89,8 @@ static int pdf_version_minor = 5; static int compression_level = 9; /* PDF document navigation feature settings */ -static double annot_grow = 0.0; +static double annot_grow_x = 0.0; +static double annot_grow_y = 0.0; static int bookmark_open = 0; static double mag = 1.0; static int enable_thumbnail = 0; @@ -513,7 +514,7 @@ do_args_first_pass (int argc, char *argv[], const char *source, int unsafe) static void do_args_second_pass (int argc, char *argv[], const char *source, int unsafe) { - int c; + int c, error = 0; char *nextptr; const char *nnextptr; @@ -548,7 +549,24 @@ do_args_second_pass (int argc, char *argv[], const char *source, int unsafe) case 'g': nnextptr = nextptr = optarg; - dpx_util_read_length(&annot_grow, 1.0, &nnextptr, nextptr + strlen(nextptr)); + { + const char *comma; + + comma = strchr(optarg, ','); + if (comma) { + error = dpx_util_read_length(&annot_grow_x, 1.0, &nnextptr, comma); + nnextptr = comma + 1; + if (!error) + error = dpx_util_read_length(&annot_grow_y, 1.0, &nnextptr, nextptr + strlen(nextptr)); + } else { + error = dpx_util_read_length(&annot_grow_x, 1.0, &nnextptr, nextptr + strlen(nextptr)); + if (!error) + annot_grow_y = annot_grow_x; + } + if (error) { + WARN("Error reading argument for \"-g\" option: %s", optarg); + } + } break; case 'x': @@ -1178,11 +1196,12 @@ main (int argc, char *argv[]) if (landscape_mode) { SWAP(paper_width, paper_height); } - settings.media_width = paper_width; - settings.media_height = paper_height; - settings.annot_grow_amount = annot_grow; - settings.outline_open_depth = bookmark_open; - settings.check_gotos = !(opt_flags & OPT_PDFDOC_NO_DEST_REMOVE); + settings.media_width = paper_width; + settings.media_height = paper_height; + settings.annot_grow_amount.x = annot_grow_x; + settings.annot_grow_amount.y = annot_grow_y; + settings.outline_open_depth = bookmark_open; + settings.check_gotos = !(opt_flags & OPT_PDFDOC_NO_DEST_REMOVE); settings.enable_manual_thumb = enable_thumbnail; /* PDF page output settings */ |