diff options
Diffstat (limited to 'Build/source')
| -rw-r--r-- | Build/source/texk/web2c/lib/ChangeLog | 6 | ||||
| -rw-r--r-- | Build/source/texk/web2c/lib/texmfmp.c | 10 | ||||
| -rw-r--r-- | Build/source/texk/web2c/pdftexdir/ChangeLog | 6 | ||||
| -rw-r--r-- | Build/source/texk/web2c/pdftexdir/ptexlib.h | 7 | ||||
| -rw-r--r-- | Build/source/texk/web2c/synctexdir/ChangeLog | 6 | ||||
| -rw-r--r-- | Build/source/texk/web2c/synctexdir/synctex.c | 2 |
6 files changed, 24 insertions, 13 deletions
diff --git a/Build/source/texk/web2c/lib/ChangeLog b/Build/source/texk/web2c/lib/ChangeLog index 20b52547e52..5afd409639f 100644 --- a/Build/source/texk/web2c/lib/ChangeLog +++ b/Build/source/texk/web2c/lib/ChangeLog @@ -1,3 +1,9 @@ +2018-05-29 Akira Kakuto <kakuto@fuk.kindai.ac.jp> + + * texmfmp.c: Discard the changes for pdfTeX on 2018-05-11, + since 'command_line_encoding=utf-8' is not so natural + for pdfTeX (w32 only). + 2018-05-12 Akira Kakuto <kakuto@fuk.kindai.ac.jp> * texmfmp.c: Allow non-ascii file names for pdfTeX (w32 only). diff --git a/Build/source/texk/web2c/lib/texmfmp.c b/Build/source/texk/web2c/lib/texmfmp.c index 7c8556f1a5e..4f863a5e33a 100644 --- a/Build/source/texk/web2c/lib/texmfmp.c +++ b/Build/source/texk/web2c/lib/texmfmp.c @@ -674,7 +674,7 @@ void maininit (int ac, string *av) { string main_input_file; -#if (IS_upTeX || defined(XeTeX) || defined(pdfTeX)) && defined(WIN32) +#if (IS_upTeX || defined(XeTeX)) && defined(WIN32) string enc; #endif /* Save to pass along to topenin. */ @@ -703,10 +703,10 @@ maininit (int ac, string *av) kpse_set_program_name (argv[0], NULL); initkanji (); #endif -#if (defined(XeTeX) || defined(pdfTeX)) && defined(WIN32) +#if defined(XeTeX) && defined(WIN32) kpse_set_program_name (argv[0], NULL); #endif -#if (IS_upTeX || defined(XeTeX) || defined(pdfTeX)) && defined(WIN32) +#if (IS_upTeX || defined(XeTeX)) && defined(WIN32) enc = kpse_var_value("command_line_encoding"); get_command_line_args_utf8(enc, &argc, &argv); #endif @@ -714,7 +714,7 @@ maininit (int ac, string *av) /* If the user says --help or --version, we need to notice early. And since we want the --ini option, have to do it before getting into the web (which would read the base file, etc.). */ -#if (IS_upTeX || defined(XeTeX) || defined(pdfTeX)) && defined(WIN32) +#if (IS_upTeX || defined(XeTeX)) && defined(WIN32) parse_options (argc, argv); #else parse_options (ac, av); @@ -738,7 +738,7 @@ maininit (int ac, string *av) /* Do this early so we can inspect kpse_invocation_name and kpse_program_name below, and because we have to do this before any path searching. */ -#if IS_pTeX || ((defined(XeTeX) || defined(pdfTeX)) && defined(WIN32)) +#if IS_pTeX || (defined(XeTeX) && defined(WIN32)) if (user_progname) kpse_reset_program_name (user_progname); #else diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog index 819066f815b..e65b1d8a6b9 100644 --- a/Build/source/texk/web2c/pdftexdir/ChangeLog +++ b/Build/source/texk/web2c/pdftexdir/ChangeLog @@ -1,3 +1,9 @@ +2018-05-29 Akira Kakuto <kakuto@fuk.kindai.ac.jp> + + * ptexlib.h: Discard the changes on 2018-05-11, since + 'command_line_encoding=utf-8' is not so natural for + pdfTeX (w32 only). + 2018-05-13 Joseph Wright <joseph.wright@morningstar2.co.uk> * pdftex.web: New primitive \expanded based on original diff --git a/Build/source/texk/web2c/pdftexdir/ptexlib.h b/Build/source/texk/web2c/pdftexdir/ptexlib.h index c43c8728f9b..dc3403f7677 100644 --- a/Build/source/texk/web2c/pdftexdir/ptexlib.h +++ b/Build/source/texk/web2c/pdftexdir/ptexlib.h @@ -20,13 +20,6 @@ with this program. If not, see <http://www.gnu.org/licenses/>. #ifndef PDFTEXLIB # define PDFTEXLIB -#ifdef _WIN32 -#undef fopen -#undef xfopen -#define fopen fsyscp_fopen -#define xfopen fsyscp_xfopen -#endif - /* WEB2C macros and prototypes */ # if !defined(PDFTEXCOERCE) && !defined(PDFETEXCOERCE) # ifdef pdfTeX diff --git a/Build/source/texk/web2c/synctexdir/ChangeLog b/Build/source/texk/web2c/synctexdir/ChangeLog index 5b874831c2f..dc8a2bb219c 100644 --- a/Build/source/texk/web2c/synctexdir/ChangeLog +++ b/Build/source/texk/web2c/synctexdir/ChangeLog @@ -1,3 +1,9 @@ +2018-05-29 Akira Kakuto <kakuto@fuk.kindai.ac.jp> + + * synctex.c: Discard the changes on 2018-05-11, since + 'command_line_encoding=utf-8' is not so natural for + pdfTeX (w32 only). + 2018-05-11 Akira Kakuto <kakuto@fuk.kindai.ac.jp> * synctex.c: Allow non-ascii file names also for pdfTeX diff --git a/Build/source/texk/web2c/synctexdir/synctex.c b/Build/source/texk/web2c/synctexdir/synctex.c index 0c48281a823..66397d164ae 100644 --- a/Build/source/texk/web2c/synctexdir/synctex.c +++ b/Build/source/texk/web2c/synctexdir/synctex.c @@ -292,7 +292,7 @@ mem[NODE+TYPE##_node_size-synchronization_field_size+1].cint # define SYNCTEX_OFFSET_IS_PDF 0 # endif -#if defined(_WIN32) && (defined(pdfTeX) || defined(upTeX) || defined(eupTeX) || defined(XeTeX)) +#if defined(_WIN32) && (defined(upTeX) || defined(eupTeX) || defined(XeTeX)) #define W32UPTEXSYNCTEX 1 #include <wchar.h> static char *chgto_oem(char *src); |