diff options
author | Takuji Tanaka <KXD02663@nifty.ne.jp> | 2018-06-10 06:12:41 +0000 |
---|---|---|
committer | Takuji Tanaka <KXD02663@nifty.ne.jp> | 2018-06-10 06:12:41 +0000 |
commit | 94f0b880cd88c2f9737d2f1c77cecbc88f195400 (patch) | |
tree | 2fa8c42d5608adf057eb862262f3638b026e75f7 /Build/source/texk/kpathsea | |
parent | b1b0a37f50014a4612d7c4e65cefad1a27ac6eff (diff) |
pdfTeX: Allow non-ascii file names with UTF-8 source files (Windows only)
git-svn-id: svn://tug.org/texlive/trunk@47973 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/kpathsea')
-rw-r--r-- | Build/source/texk/kpathsea/ChangeLog | 6 | ||||
-rw-r--r-- | Build/source/texk/kpathsea/Makefile.am | 4 | ||||
-rw-r--r-- | Build/source/texk/kpathsea/Makefile.in | 4 | ||||
-rw-r--r-- | Build/source/texk/kpathsea/knj.h | 1 | ||||
-rw-r--r-- | Build/source/texk/kpathsea/kpsewhich.c | 1 | ||||
-rw-r--r-- | Build/source/texk/kpathsea/progname.c | 2 | ||||
-rw-r--r-- | Build/source/texk/kpathsea/types.h | 2 |
7 files changed, 14 insertions, 6 deletions
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog index 1a3112a8929..00a5b710094 100644 --- a/Build/source/texk/kpathsea/ChangeLog +++ b/Build/source/texk/kpathsea/ChangeLog @@ -1,3 +1,9 @@ +2018-06-10 TANAKA Takuji <ttk@t-lab.opal.ne.jp> + + * progname.c, types.h, knj.h: Add a variable W32_codepage. + * kpsewhich.c: Allow Unicode file name for pdftex in kpsewhich. + (Windows only) + 2018-05-29 Akira Kakuto <kakuto@fuk.kindai.ac.jp> * kpsewhich.c: Revert. Since "command_line_encoding=utf8" is diff --git a/Build/source/texk/kpathsea/Makefile.am b/Build/source/texk/kpathsea/Makefile.am index 67b4541d425..8179942bbd9 100644 --- a/Build/source/texk/kpathsea/Makefile.am +++ b/Build/source/texk/kpathsea/Makefile.am @@ -283,14 +283,14 @@ uninstall-local: if !WIN32 @for f in $(dist_noinst_SCRIPTS); do \ if grep "original $$f --" "$(DESTDIR)$(bindir)/$$f" >/dev/null 2>&1; then \ - echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ + echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ rm -f "$(DESTDIR)$(bindir)/$$f"; \ else :; fi; \ done endif !WIN32 @for f in $(dist_noinst_DATA); do \ if grep "original $$f --" "$(DESTDIR)$(web2cdir)/$$f" >/dev/null 2>&1; then \ - echo " rm -f '$(DESTDIR)$(web2cdir)/$$f'"; \ + echo " rm -f '$(DESTDIR)$(web2cdir)/$$f'"; \ rm -f "$(DESTDIR)$(web2cdir)/$$f"; \ else :; fi; \ done diff --git a/Build/source/texk/kpathsea/Makefile.in b/Build/source/texk/kpathsea/Makefile.in index 593a35278d5..36beec2bd64 100644 --- a/Build/source/texk/kpathsea/Makefile.in +++ b/Build/source/texk/kpathsea/Makefile.in @@ -2497,13 +2497,13 @@ install-data-local: installdirs-am uninstall-local: @WIN32_FALSE@ @for f in $(dist_noinst_SCRIPTS); do \ @WIN32_FALSE@ if grep "original $$f --" "$(DESTDIR)$(bindir)/$$f" >/dev/null 2>&1; then \ -@WIN32_FALSE@ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ +@WIN32_FALSE@ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ @WIN32_FALSE@ rm -f "$(DESTDIR)$(bindir)/$$f"; \ @WIN32_FALSE@ else :; fi; \ @WIN32_FALSE@ done @for f in $(dist_noinst_DATA); do \ if grep "original $$f --" "$(DESTDIR)$(web2cdir)/$$f" >/dev/null 2>&1; then \ - echo " rm -f '$(DESTDIR)$(web2cdir)/$$f'"; \ + echo " rm -f '$(DESTDIR)$(web2cdir)/$$f'"; \ rm -f "$(DESTDIR)$(web2cdir)/$$f"; \ else :; fi; \ done diff --git a/Build/source/texk/kpathsea/knj.h b/Build/source/texk/kpathsea/knj.h index 5387533de1a..d373a55408d 100644 --- a/Build/source/texk/kpathsea/knj.h +++ b/Build/source/texk/kpathsea/knj.h @@ -46,6 +46,7 @@ extern KPSEDLL wchar_t *kpathsea_get_wstring_from_fsyscp(kpathsea kpse, const ch #if defined (KPSE_COMPAT_API) #define is_cp932_system kpse_def->Is_cp932_system #define file_system_codepage kpse_def->File_system_codepage +#define win32_codepage kpse_def->Win32_codepage extern KPSEDLL int isknj(int c); extern KPSEDLL int isknj2(int c); diff --git a/Build/source/texk/kpathsea/kpsewhich.c b/Build/source/texk/kpathsea/kpsewhich.c index 0cacaba5d96..40acd31e904 100644 --- a/Build/source/texk/kpathsea/kpsewhich.c +++ b/Build/source/texk/kpathsea/kpsewhich.c @@ -773,6 +773,7 @@ main (int argc, string *argv) #ifdef WIN32 if(strstr(kpse->program_name,"xetex") || strstr(kpse->program_name,"xelatex") || strstr(kpse->program_name,"uptex") || strstr(kpse->program_name,"uplatex") + || strstr(kpse->program_name,"pdftex") || strstr(kpse->program_name,"pdflatex") || 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,"upmendex")) diff --git a/Build/source/texk/kpathsea/progname.c b/Build/source/texk/kpathsea/progname.c index 564aab1113a..54563f136ba 100644 --- a/Build/source/texk/kpathsea/progname.c +++ b/Build/source/texk/kpathsea/progname.c @@ -496,7 +496,7 @@ kpathsea_set_program_name (kpathsea kpse, const_string argv0, #if defined(WIN32) if (!kpse->File_system_codepage) kpse->File_system_codepage = AreFileApisANSI() ? GetACP() : GetOEMCP(); - cp = kpse->File_system_codepage; + cp = kpse->Win32_codepage = kpse->File_system_codepage; if (cp == 932 || cp == 936 || cp == 950) { kpse->Is_cp932_system = cp; } diff --git a/Build/source/texk/kpathsea/types.h b/Build/source/texk/kpathsea/types.h index 081202a2f63..b2c15a1fdd1 100644 --- a/Build/source/texk/kpathsea/types.h +++ b/Build/source/texk/kpathsea/types.h @@ -294,7 +294,7 @@ typedef struct kpathsea_instance { #endif /* WIN32 && !__MINGW32__ */ #if defined(WIN32) int Is_cp932_system; - int File_system_codepage; + int File_system_codepage, Win32_codepage; int getc_len; int getc_buff[4]; wchar_t wcbuf; |