From 0d1dcea12f68a273faa21a51057c75738dca9428 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Sat, 10 Aug 2013 13:02:06 +0000 Subject: dvipdfm-x: Reduce diffs between dvipdfmx and xdvipdfmx git-svn-id: svn://tug.org/texlive/trunk@31407 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/dvipdfm-x/dvipdfmx.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) (limited to 'Build/source/texk/dvipdfm-x/dvipdfmx.c') diff --git a/Build/source/texk/dvipdfm-x/dvipdfmx.c b/Build/source/texk/dvipdfm-x/dvipdfmx.c index be4dea99a43..80160fc7208 100644 --- a/Build/source/texk/dvipdfm-x/dvipdfmx.c +++ b/Build/source/texk/dvipdfm-x/dvipdfmx.c @@ -66,11 +66,11 @@ #include "error.h" #ifdef XETEX -#define PROGNAME "xdvipdfmx" int is_xetex = 1; +const char *my_name = "xdvipdfmx"; #else -#define PROGNAME "dvipdfmx" int is_xetex = 0; +const char *my_name = "dvipdfmx"; #endif int compat_mode = 0; /* 0 = dvipdfmx, 1 = dvipdfm */ @@ -152,7 +152,8 @@ set_default_pdf_filename(void) static void show_version (void) { - fprintf (stdout, "\nThis is " PROGNAME " Version " VERSION " by %s,\n", + fprintf (stdout, "\nThis is %s Version " VERSION " by %s,\n", + my_name, is_xetex ? "Jonathan Kew and Jin-Hwan Cho" : "the DVIPDFMx project team"); fprintf (stdout, "modified for TeX Live,\n"); @@ -171,10 +172,11 @@ show_version (void) static void show_usage (void) { - fprintf (stdout, "\nUsage: " PROGNAME " [options] %sdvifile[.dvi%s]\n", + fprintf (stdout, "\nUsage: %s [options] %sdvifile[.dvi%s]\n", + my_name, is_xetex ? "[" : "" , is_xetex ? "|.xdv]" : ""); - fprintf (stdout, " " PROGNAME " --extractbb|--xbb|--ebb [options]\tBe \"extractbb\"\n"); - fprintf (stdout, " " PROGNAME " --help|--version\n"); + fprintf (stdout, " %s --extractbb|--xbb|--ebb [options]\tBe \"extractbb\"\n", my_name); + fprintf (stdout, " %s --help|--version\n", my_name); fprintf (stdout, "\nOptions:\n"); fprintf (stdout, " -c \t\tIgnore color specials (for B&W printing)\n"); if (!is_xetex) @@ -185,7 +187,7 @@ show_usage (void) fprintf (stdout, " -h | --help \tShow this help message and exit\n"); fprintf (stdout, " -l \t\tLandscape mode\n"); fprintf (stdout, " -m number\tSet additional magnification\n"); - fprintf (stdout, " -o filename\tSet output file name [dvifile.pdf]\n"); + fprintf (stdout, " -o filename\tSet output file name, \"-\" for stdout [dvifile.pdf]\n"); fprintf (stdout, " -p papersize\tSet papersize [a4]\n"); fprintf (stdout, " -q \t\tBe quiet\n"); fprintf (stdout, " -r resolution\tSet resolution (in DPI) for raster fonts [600]\n"); @@ -227,7 +229,7 @@ show_usage (void) static void usage (void) { - fprintf (stderr, "\nTry \"" PROGNAME " --help\" for more information.\n"); + fprintf (stderr, "\nTry \"%s --help\" for more information.\n", my_name); exit(1); } @@ -941,7 +943,7 @@ main (int argc, char *argv[]) dpx_delete_old_cache(image_cache_life); if (!dvi_filename) { -#ifdef XETEX +#if 1 if (verbose) MESG("No dvi filename specified, reading standard input.\n"); if (!pdf_filename) @@ -953,6 +955,11 @@ main (int argc, char *argv[]) } else if (!pdf_filename) set_default_pdf_filename(); + if (!strcmp(pdf_filename, "-")) { + RELEASE(pdf_filename); + pdf_filename = NULL; + } + MESG("%s -> %s\n", dvi_filename ? dvi_filename : "stdin", pdf_filename ? pdf_filename : "stdout"); -- cgit v1.2.3