diff options
Diffstat (limited to 'Build')
-rw-r--r-- | Build/source/texk/dvipdfm-x/ChangeLog | 5 | ||||
-rw-r--r-- | Build/source/texk/dvipdfm-x/dpxconf.c | 2 | ||||
-rw-r--r-- | Build/source/texk/dvipdfm-x/dpxconf.h | 2 | ||||
-rw-r--r-- | Build/source/texk/dvipdfm-x/dvipdfmx.c | 10 |
4 files changed, 12 insertions, 7 deletions
diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog index ea2eef4cdf6..d8324a3464e 100644 --- a/Build/source/texk/dvipdfm-x/ChangeLog +++ b/Build/source/texk/dvipdfm-x/ChangeLog @@ -1,3 +1,8 @@ +2014-11-29 Akira Kakuto <kakuto@fuk.kindai.ac.jp> + + * dvipdfmx.c, dpxconf.c, dpxconf.h: Add an option --showpaper which + shows available paper formats and exits. + 2014-11-29 Karl Berry <karl@tug.org> * dvipdfmx.c (show_usage): use [all pages] instead of (-). diff --git a/Build/source/texk/dvipdfm-x/dpxconf.c b/Build/source/texk/dvipdfm-x/dpxconf.c index 6c7a15b0cc3..e42b1e62a45 100644 --- a/Build/source/texk/dvipdfm-x/dpxconf.c +++ b/Build/source/texk/dvipdfm-x/dpxconf.c @@ -92,7 +92,6 @@ paperinfo (const char *ppformat) #endif /* HAVE_LIBPAPER */ -#if 0 void dumppaperinfo (void) { @@ -107,4 +106,3 @@ dumppaperinfo (void) ppinfo = papernext(ppinfo); } } -#endif diff --git a/Build/source/texk/dvipdfm-x/dpxconf.h b/Build/source/texk/dvipdfm-x/dpxconf.h index 73669b35ae6..bc98693d043 100644 --- a/Build/source/texk/dvipdfm-x/dpxconf.h +++ b/Build/source/texk/dvipdfm-x/dpxconf.h @@ -53,8 +53,6 @@ extern const struct paper *paperinfo (const char *ppformat); #define systempapersizefile() NULL #endif /* HAVE_LIBPAPER */ -#if 0 extern void dumppaperinfo (void); -#endif #endif /* _DPXCONF_H_ */ diff --git a/Build/source/texk/dvipdfm-x/dvipdfmx.c b/Build/source/texk/dvipdfm-x/dvipdfmx.c index eca2cfb544d..5ddc1a4fea0 100644 --- a/Build/source/texk/dvipdfm-x/dvipdfmx.c +++ b/Build/source/texk/dvipdfm-x/dvipdfmx.c @@ -171,7 +171,7 @@ show_usage (void) printf ("\nUsage: %s [OPTION]... [DVIFILE[.dvi|.xdv]]\n", my_name); printf (" %s --extractbb|--xbb|--ebb [OPTION]...\tBe \"extractbb\"\n", my_name); - printf (" %s --help|--version\n", my_name); + printf (" %s --help|--showpaper|--version\n", my_name); printf ("Convert DVI or XDV intput to PDF; defaults given below.\n"); printf ("\nOptions:\n"); printf (" -c \t\tIgnore color specials (for B&W printing)\n"); @@ -187,6 +187,7 @@ show_usage (void) printf (" -q \t\tBe quiet\n"); printf (" -r resolution\tSet resolution (in DPI) for raster fonts [600]\n"); printf (" -s pages\tSelect page ranges [all pages]\n"); + printf (" --showpaper\tShow available paper formats and exit\n"); printf (" -t \t\tEmbed thumbnail images of PNG format [DVIFILE.1] \n"); printf (" --version\tOutput version information and exit\n"); printf (" -v \t\tBe verbose\n"); @@ -951,14 +952,17 @@ CDECL main (int argc, char *argv[]) return extractbb (argc, argv); } - /* Special-case single option --help or --version, to avoid possible - diagnostics about config files, etc. */ + /* Special-case single option --help, --showpaper, 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); + } else if (argc == 2 && STREQ (argv[1], "--showpaper")) { + dumppaperinfo(); + exit(0); } if (FILESTRCASEEQ (base, "dvipdfm")) |