texk/kpathsea: [Windows] Allow Unicode file name for upmendex in kpsewhich

git-svn-id: svn://tug.org/texlive/trunk@39880 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 20 insertions, 12 deletions

diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index 82b10a2ba0e..3a08e75ec69 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,8 @@
+2016-02-27  TANAKA Takuji  <ttk@t-lab.opal.ne.jp>
+
+	* kpsewhich.c: Allow Unicode file name for upmendex in kpsewhich.
+	(Windows only)
+
 2016-02-03  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
 
 	* win32lib.[ch], mingw32.[ch]: Define a function
@@ -1328,7 +1333,7 @@
 	* texmf.cnf (shell_escape_commands): turns out fc-list is not
 	needed after all.
 
-2010-05-30  Manuel Pégourié-Gonnard <mpg@elzevir.fr>
+2010-05-30  Manuel Pégourié-Gonnard <mpg@elzevir.fr>
 
 	* texmf.cnf: relax LUAINPUTS not to require and extra "lua"
 	subdirectory for modules in texmfscripts.
@@ -1435,7 +1440,7 @@
 	from 'string *' to 'const_string *', drop kpse_fontmap_lookup.
 	* tex-file.c (target_fontmaps), tex-glyph.c (try_fontmap): Adjust.
 
-2010-04-27  Manuel Pégourié-Gonnard <mpg@elzevir.fr>
+2010-04-27  Manuel Pégourié-Gonnard <mpg@elzevir.fr>
 
 	* texmf.cnf: - s/pdf(lua(la)?tex)/dvi\1/
 	- add luatex before generic (for generic package specific to luatex) and
@@ -1882,11 +1887,11 @@
 
 	* texmf.cnf (shell_escape): doc fixes to discourage shell_escape=p.
 
-2009-10-19  Manuel Pégourié-Gonnard <mpg@elzevir.fr>
+2009-10-19  Manuel Pégourié-Gonnard <mpg@elzevir.fr>
 
 	* texmf.cnf: set shell_escape back to 'f': 'p' is broken on Unix.
 
-2009-10-15  Manuel Pégourié-Gonnard <mpg@elzevir.fr>
+2009-10-15  Manuel Pégourié-Gonnard <mpg@elzevir.fr>
 
 	* texmf.cnf (shell_escape_commands): add repstopdf, a version of
 	epstopdf with restrictions intended to make it safer.
@@ -2470,15 +2475,15 @@
 	autoheader templates ...
 	* acconfig.h: ... removed.
 
-2008-02-24  Martin Schröder <martin@pdftex.org>
+2008-02-24  Martin Schröder <martin@pdftex.org>
 
 	* lib.h: systypes.h instead of c-std.h
 
-2008-02-23  Martin Schröder <martin@pdftex.org>
+2008-02-23  Martin Schröder <martin@pdftex.org>
 
 	* lib.h: include c-std.h to get off_t from stdio.h
 
-2008-02-21  Martin Schröder <martin@pdftex.org>
+2008-02-21  Martin Schröder <martin@pdftex.org>
 
 	* lib.h, xfseek.c, xftell.c: LFS support: use off_t instead of long
 	and fseeko instead of fseek
@@ -2977,7 +2982,7 @@
 	addition to the compiler name.  From Harald Koenig
 	<koenig@science-computing.de>.
 
-	* mktexpk: Add guesses for dpi 360 and 720.  From Frank Küster
+	* mktexpk: Add guesses for dpi 360 and 720.  From Frank Küster
 	<frank@kuesterei.ch> (Debian maintainer).
 
 	* mktexlsr: Write all regular progress messages to stderr, instead
@@ -3767,7 +3772,7 @@
 
 2002-05-28  Olaf Weber  <olaf@infovore.xs4all.nl>
 
-	* mktexdir: Guard $KPSE_DOT with quotes.  From Emmanuel_Thomé
+	* mktexdir: Guard $KPSE_DOT with quotes.  From Emmanuel_Thomé
 	<thome@lix.polytechnique.fr>.
 
 2002-04-01  Olaf Weber  <olaf@infovore.xs4all.nl>
@@ -4177,7 +4182,7 @@
 
 	* Makefile.in: TEXMF_CNF -> VARTEXMF
 
-	* mktexmf: Small fix to a case statement from Berthold Höllmann
+	* mktexmf: Small fix to a case statement from Berthold Höllmann
 	<bhoel@starship.python.net>.
 
 1999-03-15  Olaf Weber  <olaf@infovore.xs4all.nl>
diff --git a/Build/source/texk/kpathsea/kpsewhich.c b/Build/source/texk/kpathsea/kpsewhich.c
index 83fa3541a8d..e46f6d284ed 100644
--- a/Build/source/texk/kpathsea/kpsewhich.c
+++ b/Build/source/texk/kpathsea/kpsewhich.c
@@ -714,9 +714,12 @@ main (int argc,  string *argv)
      || strstr(kpse->program_name,"uptex") || strstr(kpse->program_name,"uplatex")
      || strstr(kpse->program_name,"dvipdfm") || strstr(kpse->program_name,"extractbb")
      || strstr(kpse->program_name,"xbb") || strstr(kpse->program_name,"ebb")
-     || strstr(kpse->program_name,"dvips"))
+     || strstr(kpse->program_name,"dvips") || strstr(kpse->program_name,"upmendex"))
   {
-    enc = kpathsea_var_value (kpse, "command_line_encoding");
+    if (strstr(kpse->program_name,"upmendex"))
+      enc = "utf-8";
+    else
+      enc = kpathsea_var_value (kpse, "command_line_encoding");
     if (get_command_line_args_utf8(enc, &ac, &av)) {
       optind = 0;
       read_command_line (kpse, ac, av);