diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2012-10-17 08:29:54 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2012-10-17 08:29:54 +0000 |
commit | 2442de62d6f8c96d9f2c4ad3a04e6b7869cb0438 (patch) | |
tree | 995a934a092f0a6149ef1bb43256d741ab16277d /Build/source/texk/dtl/dt2dv.c | |
parent | f966f4f7a16830d004bbd771a2dccdacb96f7e7f (diff) |
dtl: Reduce TL/W32TeX diffs (from Akira)
git-svn-id: svn://tug.org/texlive/trunk@27991 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dtl/dt2dv.c')
-rw-r--r-- | Build/source/texk/dtl/dt2dv.c | 33 |
1 files changed, 21 insertions, 12 deletions
diff --git a/Build/source/texk/dtl/dt2dv.c b/Build/source/texk/dtl/dt2dv.c index 069afb7d397..97045bf77db 100644 --- a/Build/source/texk/dtl/dt2dv.c +++ b/Build/source/texk/dtl/dt2dv.c @@ -37,6 +37,7 @@ #ifdef KPATHSEA #include <kpathsea/c-fopen.h> +#include <kpathsea/progname.h> #endif #include "dtl.h" @@ -46,7 +47,7 @@ int rd_stdin = 0; int wr_stdout = 0; /* maximum number of characters in a DTL input line */ -#define MAXLINE 1024 +#define MAXLINE 8192 /* input line */ typedef struct @@ -346,7 +347,12 @@ main #endif int i; +#ifdef KPATHSEA + kpse_set_program_name(argv[0], "dv2dt"); + progname = kpse_program_name; +#else progname = argv[0]; /* name of this program */ +#endif /* memory violation signal handler */ /* Not supported under Win32 */ @@ -1107,13 +1113,16 @@ read_char dinfo(); status = 0; } - else if ( ! isprint (c) && ! isspace (c)) + else if ( ! isprint (c) && ! isspace (c) +#ifdef WIN32 + && ! isknj (c) && ! isknj2 (c) +#endif + ) { PRINT_PROGNAME; fprintf (stderr, - "(read_char) : character %d %s.\n", - c, - "not printable and not white space"); + "(read_char) : character %d not printable and not white space.\n", + c); dinfo(); status = 0; } @@ -1150,8 +1159,8 @@ read_variety { PRINT_PROGNAME; fprintf (stderr, "(read_variety) : DTL FILE ERROR (%s) : ", dtl_filename); - fprintf (stderr, "DTL signature must begin with \"%s\", not \"%s\".\n", - "variety", token); + fprintf (stderr, "DTL signature must begin with \"variety\", not \"%s\".\n", + token); dexit (1); } @@ -1956,8 +1965,8 @@ check_bmes PRINT_PROGNAME; fprintf (stderr, "(check_bmes) : DTL FILE ERROR (%s) : ", dtl_filename); - fprintf (stderr, "BMES_CHAR (`%c') %s, not `%c' (char %d).\n", - BMES_CHAR, "expected before string", ch, ch); + fprintf (stderr, "BMES_CHAR (`%c') expected before string, not `%c' (char %d).\n", + BMES_CHAR, ch, ch); dexit (1); } @@ -1992,8 +2001,8 @@ check_emes PRINT_PROGNAME; fprintf (stderr, "(check_emes) : DTL FILE ERROR (%s) : ", dtl_filename); - fprintf (stderr, "EMES_CHAR (`%c') %s, not `%c' (char %d).\n", - EMES_CHAR, "expected to follow string", ch, ch); + fprintf (stderr, "EMES_CHAR (`%c') expected to follow string, not `%c' (char %d).\n", + EMES_CHAR, ch, ch); dexit (1); } @@ -2003,7 +2012,7 @@ check_emes /* Size typically used in this program for Lstring variables */ -#define LSIZE 1024 +#define LSIZE 16384 Void |