From 80639d186a7651717e834d117a50658ebef4aa3a Mon Sep 17 00:00:00 2001 From: Akira Kakuto Date: Wed, 16 May 2018 09:21:53 +0000 Subject: revert (windows only) git-svn-id: svn://tug.org/texlive/trunk@47728 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/dvipdfm-x/ChangeLog | 6 ++++++ Build/source/texk/dvipdfm-x/pdfparse.c | 19 ------------------- 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog index f65a7a47f82..a0b54543836 100644 --- a/Build/source/texk/dvipdfm-x/ChangeLog +++ b/Build/source/texk/dvipdfm-x/ChangeLog @@ -1,3 +1,9 @@ +2018-05-16 Akira Kakuto + + * pdfparse.c: Revert. The changes on 2018-05-14 must be + problematic. Again, kanji characters including 0x5c can't be + used as names of image files in (e)-pTeX. + 2018-05-14 Akira Kakuto * pdfparse.c: Allow image file names including 0x5c for diff --git a/Build/source/texk/dvipdfm-x/pdfparse.c b/Build/source/texk/dvipdfm-x/pdfparse.c index 73587e96f5e..050eb988230 100644 --- a/Build/source/texk/dvipdfm-x/pdfparse.c +++ b/Build/source/texk/dvipdfm-x/pdfparse.c @@ -503,13 +503,6 @@ parse_pdf_literal_string (const char **pp, const char *endptr) while (p < endptr) { -#ifdef _WIN32 - int check_kanji; - if (p > *pp && (IS_KANJI(p-1))) - check_kanji = 1; - else - check_kanji = 0; -#endif ch = p[0]; if (ch == ')' && op_count < 1) @@ -539,22 +532,10 @@ parse_pdf_literal_string (const char **pp, const char *endptr) switch (ch) { case '\\': -#ifdef _WIN32 - if (check_kanji == 0) { - ch = ps_getescc(&p, endptr); - if (ch >= 0) - sbuf[len++] = (ch & 0xff); - } else { - sbuf[len++] = ch; - p++; - } - break; -#else ch = ps_getescc(&p, endptr); if (ch >= 0) sbuf[len++] = (ch & 0xff); break; -#endif /* _WIN32 */ case '\r': p++; if (p < endptr && p[0] == '\n') -- cgit v1.2.3