diff options
author | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2014-05-04 00:01:56 +0000 |
---|---|---|
committer | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2014-05-04 00:01:56 +0000 |
commit | 44c939e3d0f7d97c4b8698ae6fbfaaff83a7fc27 (patch) | |
tree | e4c412756144674ac37475e38521231272014789 /Build/source/texk | |
parent | 2475abab22dabae31ad32d51874927a372bf052c (diff) |
Change dvipdfmx.c and xbb.c (from Heiko).
git-svn-id: svn://tug.org/texlive/trunk@33813 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk')
-rw-r--r-- | Build/source/texk/dvipdfm-x/ChangeLog | 7 | ||||
-rw-r--r-- | Build/source/texk/dvipdfm-x/dvipdfmx.c | 22 | ||||
-rw-r--r-- | Build/source/texk/dvipdfm-x/xbb.c | 3 |
3 files changed, 20 insertions, 12 deletions
diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog index 9a28d16338c..6d657e5727c 100644 --- a/Build/source/texk/dvipdfm-x/ChangeLog +++ b/Build/source/texk/dvipdfm-x/ChangeLog @@ -1,3 +1,10 @@ +2014-05-04 Akira Kakuto <kakuto@fuk.kindai.ac.jp> + + * dvipdfmx.c: Move special-case single option --help or --version + after determination of program name (from Heiko). + xbb.c: Move '++flag' from inside 'if()' to 'then' part of the + 'if' statement (from Heiko). + 2014-04-30 Khaled Hosny <khaledhosny@eglug.org> * tt_cmap.c: [XDVIPDFMX] prefere glyph name for glyph with PUA or diff --git a/Build/source/texk/dvipdfm-x/dvipdfmx.c b/Build/source/texk/dvipdfm-x/dvipdfmx.c index e6ae514615c..5a7cd420e9f 100644 --- a/Build/source/texk/dvipdfm-x/dvipdfmx.c +++ b/Build/source/texk/dvipdfm-x/dvipdfmx.c @@ -182,7 +182,7 @@ show_usage (void) 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"); - printf (" -m number\tSet additional magnification\n"); + printf (" -m number\tSet additional magnification [1.0]\n"); printf (" -o filename\tSet output file name, \"-\" for stdout [dvifile.pdf]\n"); printf (" -p papersize\tSet papersize [a4]\n"); printf (" -q \t\tBe quiet\n"); @@ -914,16 +914,6 @@ main (int argc, char *argv[]) #endif #endif - /* Special-case single option --help or --version, to avoid possible - diagnostics about config files, etc. */ - if (argc == 2 && STREQ (argv[1], "--help")) { - show_usage(); - exit(0); - } else if (argc == 2 && STREQ (argv[1], "--version")) { - show_version(); - exit(0); - } - if (argc > 1 && (STREQ (argv[1], "--xbb") || (!is_xetex && STREQ (argv[1], "--dvipdfm")) || @@ -940,6 +930,16 @@ main (int argc, char *argv[]) return extractbb (argc, argv); } + /* Special-case single option --help or --version, to avoid possible + diagnostics about config files, etc. */ + if (argc == 2 && STREQ (argv[1], "--help")) { + show_usage(); + exit(0); + } else if (argc == 2 && STREQ (argv[1], "--version")) { + show_version(); + exit(0); + } + if (!is_xetex && FILESTRCASEEQ (base, "dvipdfm")) compat_mode = 1; else diff --git a/Build/source/texk/dvipdfm-x/xbb.c b/Build/source/texk/dvipdfm-x/xbb.c index b3bf22a1a64..6dc1ada4d46 100644 --- a/Build/source/texk/dvipdfm-x/xbb.c +++ b/Build/source/texk/dvipdfm-x/xbb.c @@ -239,7 +239,8 @@ int extractbb (int argc, char *argv[]) for (flag = argv[0] + 1; *flag != 0; flag++) { switch (*flag) { case '-': - if (flag == argv[0] + 1 && ++flag) { + if (flag == argv[0] + 1) { + ++flag; if (!strcmp(flag, "help")) { show_usage(); exit(0); |