From 21381ec16407672114e0c06b5e297e01472d18b0 Mon Sep 17 00:00:00 2001 From: Akira Kakuto Date: Wed, 17 Feb 2016 17:21:05 +0000 Subject: texk/dvipdfm-x: Add further fix for that on 2016-02-13. git-svn-id: svn://tug.org/texlive/trunk@39753 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/dvipdfm-x/ChangeLog | 4 ++++ Build/source/texk/dvipdfm-x/spc_pdfm.c | 10 ++-------- 2 files changed, 6 insertions(+), 8 deletions(-) (limited to 'Build/source/texk') diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog index d50edb733c6..140568f0661 100644 --- a/Build/source/texk/dvipdfm-x/ChangeLog +++ b/Build/source/texk/dvipdfm-x/ChangeLog @@ -1,3 +1,7 @@ +2016-02-17 Akira Kakuto + + * spc_pdfm.c: Remaining fix for that on 2016-02-13. + 2016-02-13 Akira Kakuto * spc_pdfm.c: Remove maybe-redundant code to obtain consistency diff --git a/Build/source/texk/dvipdfm-x/spc_pdfm.c b/Build/source/texk/dvipdfm-x/spc_pdfm.c index 44e5725e34e..6538202d79b 100644 --- a/Build/source/texk/dvipdfm-x/spc_pdfm.c +++ b/Build/source/texk/dvipdfm-x/spc_pdfm.c @@ -513,7 +513,8 @@ modstrings (pdf_obj *kp, pdf_obj *vp, void *dp) * needreencode() is assumed to do a simple check if given string * object is actually a text string. */ - r = maybe_reencode_utf8(vp); + if (needreencode(kp, vp, cd)) + r = maybe_reencode_utf8(vp); } if (r < 0) /* error occured... */ WARN("Failed to convert input string to UTF16..."); @@ -1073,13 +1074,6 @@ spc_handler_pdfm_dest (struct spc_env *spe, struct spc_arg *args) return -1; } -/* - * -- FIX ME -- - * Why reencode here for xdv only? If we disable this reencoding, - * it seems that dvi and xdv become consistent with respect to - * \special{pdf:dest...}, when we use \special{pdf:tounicode UTF8-UTF16} - * in both cases. - */ #if 0 if (is_xdv && maybe_reencode_utf8(name) < 0) WARN("Failed to convert input string to UTF16..."); -- cgit v1.2.3