diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2012-09-18 17:32:56 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2012-09-18 17:32:56 +0000 |
commit | 4b3819719b81f03387cf0be7f4241c37d850e7c9 (patch) | |
tree | ba3cdadf58be2419816e2f4e23e248af28bd0b15 /Build/source/texk/detex/detex-2.8-PATCHES | |
parent | 2ad6229bbca0c6599e33345b6359e4a5c6160bd4 (diff) |
detex: Reduce W32TeX vs TL diffs
git-svn-id: svn://tug.org/texlive/trunk@27701 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/detex/detex-2.8-PATCHES')
3 files changed, 87 insertions, 2 deletions
diff --git a/Build/source/texk/detex/detex-2.8-PATCHES/ChangeLog b/Build/source/texk/detex/detex-2.8-PATCHES/ChangeLog index a36f36d7fc7..b979ffb58a3 100644 --- a/Build/source/texk/detex/detex-2.8-PATCHES/ChangeLog +++ b/Build/source/texk/detex/detex-2.8-PATCHES/ChangeLog @@ -1,7 +1,12 @@ +2012-08-24 Peter Breitenlohner <peb@mppmu.mpg.de> + + * patch-08-kpathsea (new): Use kpse_program_name. + * patch-09-binary (new): Use binary mode for output file. + 2012-08-02 Peter Breitenlohner <peb@mppmu.mpg.de> - * patch-07-rename: Rename ERROR -> my_ERROR to avoid a conflict - with WIN32 headers (from W32TeX). + * patch-07-rename (new): Rename ERROR -> my_ERROR to avoid a + conflict with WIN32 headers (from W32TeX). 2012-06-21 Peter Breitenlohner <peb@mppmu.mpg.de> diff --git a/Build/source/texk/detex/detex-2.8-PATCHES/patch-08-kpathsea b/Build/source/texk/detex/detex-2.8-PATCHES/patch-08-kpathsea new file mode 100644 index 00000000000..2eacbf68bcc --- /dev/null +++ b/Build/source/texk/detex/detex-2.8-PATCHES/patch-08-kpathsea @@ -0,0 +1,52 @@ + Clarify that DEFAULTINPUTS and CHPATHSEP are not used with KPATHSEA + +diff -ur detex-2.8.orig/detex.h detex-2.8/detex.h +--- detex-2.8.orig/detex.h 2012-08-02 10:31:17.000000000 +0200 ++++ detex-2.8/detex.h 2012-08-24 10:23:29.000000000 +0200 +@@ -51,6 +51,7 @@ + + #define MAXINCLIST 40 + ++#ifndef KPATHSEA + #ifdef OS2 + #define DEFAULTINPUTS ".;/emtex/texinput" + #define CHPATHSEP ';' +@@ -58,6 +59,8 @@ + #define DEFAULTINPUTS ".:/usr/local/tex/inputs" + #define CHPATHSEP ':' + #endif ++#endif ++ + #define MAXINPUTPATHS 10 + + #define DEFAULTENV "array,eqnarray,equation,figure,mathmatica,picture,table,verbatim" + + With KPATHSEA use kpse_program_name. + Fixed a typo. + +diff -ur detex-2.8.orig/detex.l detex-2.8/detex.l +--- detex-2.8.orig/detex.l 2012-08-02 10:31:20.000000000 +0200 ++++ detex-2.8/detex.l 2012-08-24 10:37:03.000000000 +0200 +@@ -436,10 +436,10 @@ + #endif + _splitpath (rgsbArgs[0], drive, dir, fname, ext); + sbProgName = strlwr(fname); +-#else +-#ifdef KPATHSEA ++#elif defined(KPATHSEA) + kpse_set_program_name (rgsbArgs[0], NULL); +-#endif ++ sbProgName = kpse_program_name; ++#else + if ((sbProgName = rindex(rgsbArgs[0], '/')) != NULL) + sbProgName++; + else +@@ -462,7 +467,7 @@ + break; + case CHENVOPT: + if (++iArgs >= cArgs) { +- ErrorExit("-e option requires and argument"); ++ ErrorExit("-e option requires an argument"); + } + sbEnvList = rgsbArgs[iArgs]; + break; diff --git a/Build/source/texk/detex/detex-2.8-PATCHES/patch-09-binary b/Build/source/texk/detex/detex-2.8-PATCHES/patch-09-binary new file mode 100644 index 00000000000..95d272030ad --- /dev/null +++ b/Build/source/texk/detex/detex-2.8-PATCHES/patch-09-binary @@ -0,0 +1,28 @@ + In TeX Live we use binary mode for all output files. + +diff -ur detex-2.8.orig/detex.l detex-2.8/detex.l +--- detex-2.8.orig/detex.l 2012-08-24 10:37:03.000000000 +0200 ++++ detex-2.8/detex.l 2012-08-24 10:51:12.000000000 +0200 +@@ -83,6 +83,11 @@ + #include <stdlib.h> + #endif + ++#ifdef WIN32 ++#include <fcntl.h> ++#include <io.h> ++#endif ++ + #endif /* KPATHSEA */ + + #undef IGNORE +@@ -494,6 +499,10 @@ + } + SetEnvIgnore(sbEnvList); + ++#ifdef WIN32 ++ _setmode(fileno(stdout), _O_BINARY); ++#endif ++ + /* process input files */ + for (; iArgs < cArgs; iArgs++) { + fSawFile++; |