diff options
| author | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2018-05-29 06:52:07 +0000 |
|---|---|---|
| committer | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2018-05-29 06:52:07 +0000 |
| commit | d1c15e7d909eef7147cfa9ac1238d30b4bb9d064 (patch) | |
| tree | 8bee2a6bdb8b3f4fa47abfb5583f31a1d4734de2 /Build/source/texk/web2c/lib/texmfmp.c | |
| parent | 721c39305add22f194a384827da9e57e3370c48c (diff) | |
Discard the changes for pdfTeX on 2018-05-11, since 'command_line_encoding=utf-8' is not so natural for pdfTeX (w32 only).
git-svn-id: svn://tug.org/texlive/trunk@47865 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/lib/texmfmp.c')
| -rw-r--r-- | Build/source/texk/web2c/lib/texmfmp.c | 10 |
1 files changed, 5 insertions, 5 deletions
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 |