From a1318ddc33a916a14e712cf3f3da1d948a907162 Mon Sep 17 00:00:00 2001 From: Akira Kakuto Date: Tue, 1 Mar 2016 13:36:32 +0000 Subject: texk/dvipdfm-x: change the previously introduced option name to --mvorigin, and reverse the default. git-svn-id: svn://tug.org/texlive/trunk@39899 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/dvipdfm-x/ChangeLog | 8 +++----- Build/source/texk/dvipdfm-x/dvipdfmx.c | 12 ++++++------ Build/source/texk/dvipdfm-x/dvipdfmx.h | 2 +- Build/source/texk/dvipdfm-x/mpost.c | 2 +- 4 files changed, 11 insertions(+), 13 deletions(-) (limited to 'Build/source/texk') diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog index 6d609c9d184..166056dbe14 100644 --- a/Build/source/texk/dvipdfm-x/ChangeLog +++ b/Build/source/texk/dvipdfm-x/ChangeLog @@ -1,10 +1,8 @@ 2016-03-01 Akira Kakuto - * dvipdfmx.c, dvipdfmx.h, mpost.c: Introduce a new option --fixorigin, - in order to support direct use of \special{psfile=mpostcreatedps}. - By default, assuming the use of dvipdfmx.def, or xetex.def, the origin - is translated suitably because dvipdfmx.def requires llx = lly = 0. - With the option --fixorigin, the translation of the origin is disabled. + * dvipdfmx.c, dvipdfmx.h, mpost.c: Introduce a new option --mvorigin. + The translation of the origin in MP inclusion by using dvipdfmx.def + or xdvipdfmx.def is enabled only if the option --mvorigin is set. 2016-02-25 Akira Kakuto diff --git a/Build/source/texk/dvipdfm-x/dvipdfmx.c b/Build/source/texk/dvipdfm-x/dvipdfmx.c index 6bac502d709..aa6e9e99c88 100644 --- a/Build/source/texk/dvipdfm-x/dvipdfmx.c +++ b/Build/source/texk/dvipdfm-x/dvipdfmx.c @@ -64,7 +64,7 @@ #include "error.h" int is_xdv = 0; -int not_translate_origin = 0; +int translate_origin = 0; const char *my_name; @@ -179,7 +179,7 @@ show_usage (void) printf (" --dvipdfm\tEnable DVIPDFM emulation mode\n"); printf (" -d number\tSet PDF decimal digits (0-5) [3]\n"); printf (" -f filename\tSet font map file name [pdftex.map]\n"); - printf (" --fixorigin\tDo not translate the origin for MP inclusion\n"); + printf (" --mvorigin\tTtranslate the origin for MP inclusion\n"); printf (" -g dimension\tAnnotation \"grow\" amount [0.0in]\n"); printf (" -h | --help \tShow this help message and exit\n"); printf (" -l \t\tLandscape mode\n"); @@ -395,7 +395,7 @@ static struct option long_options[] = { {"version", 0, 0, 130}, {"showpaper", 0, 0, 131}, {"dvipdfm", 0, 0, 132}, - {"fixorigin", 0, 0, 1000}, + {"mvorigin", 0, 0, 1000}, {"kpathsea-debug", 1, 0, 133}, {0, 0, 0, 0} }; @@ -422,8 +422,8 @@ do_early_args (int argc, char *argv[]) exit(0); break; - case 1000: /* --fixorigin */ - not_translate_origin = 1; + case 1000: /* --mvorigin */ + translate_origin = 1; break; case 'q': @@ -942,7 +942,7 @@ main (int argc, char *argv[]) opterr = 0; - /* Special-case single option --fixorigin, --help, --showpaper, or --version, + /* Special-case single option --mvorigin, --help, --showpaper, or --version, to avoid possible diagnostics about config files, etc. Also handle -q and -v that cannot be set in config file. */ do_early_args(argc, argv); diff --git a/Build/source/texk/dvipdfm-x/dvipdfmx.h b/Build/source/texk/dvipdfm-x/dvipdfmx.h index 29b6816d3c4..85b56410ff1 100644 --- a/Build/source/texk/dvipdfm-x/dvipdfmx.h +++ b/Build/source/texk/dvipdfm-x/dvipdfmx.h @@ -27,7 +27,7 @@ extern int compat_mode; extern int is_xdv; -extern int not_translate_origin; +extern int translate_origin; extern const char *my_name; extern int extractbb(int argc, char *argv[]); diff --git a/Build/source/texk/dvipdfm-x/mpost.c b/Build/source/texk/dvipdfm-x/mpost.c index 4c1be75b647..4be2adb6319 100644 --- a/Build/source/texk/dvipdfm-x/mpost.c +++ b/Build/source/texk/dvipdfm-x/mpost.c @@ -243,7 +243,7 @@ mps_scan_bbox (const char **pp, const char *endptr, pdf_rect *bbox) return -1; } else { /* The new xetex.def and dvipdfmx.def require bbox->llx = bbox->lly = 0. */ - if (not_translate_origin == 0) { + if (translate_origin) { bbox->llx = 0; bbox->lly = 0; bbox->urx = values[2] - values[0]; -- cgit v1.2.3