summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/texk/xdvipdfmx/ChangeLog.TL6
-rw-r--r--Build/source/texk/xdvipdfmx/src/spc_pdfm.c5
2 files changed, 10 insertions, 1 deletions
diff --git a/Build/source/texk/xdvipdfmx/ChangeLog.TL b/Build/source/texk/xdvipdfmx/ChangeLog.TL
index 1ad33ef3b6c..5ebc1a22bd0 100644
--- a/Build/source/texk/xdvipdfmx/ChangeLog.TL
+++ b/Build/source/texk/xdvipdfmx/ChangeLog.TL
@@ -1,6 +1,12 @@
ChangeLog.TL: TeX Live (TL) changes for xdvipdfmx
=================================================
+2011-11-05 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
+
+ * spc_pdfm.c: fix a typo in spc_handler_pdfm_dest().
+ disable to reencode pdf string to UTF-16 in modstrings()
+ following Heiko Oberdiek.
+
2011-06-15 Peter Breitenlohner <peb@mppmu.mpg.de>
* configure.ac (AC_TYPE_UINT32_T): Portability fix for AIX.
diff --git a/Build/source/texk/xdvipdfmx/src/spc_pdfm.c b/Build/source/texk/xdvipdfmx/src/spc_pdfm.c
index 2561d3ffcda..c9e8a054322 100644
--- a/Build/source/texk/xdvipdfmx/src/spc_pdfm.c
+++ b/Build/source/texk/xdvipdfmx/src/spc_pdfm.c
@@ -569,9 +569,12 @@ modstrings (pdf_obj *kp, pdf_obj *vp, void *dp)
r = reencodestring(cmap, vp);
}
}
+/* disable to reencode to UTF-16 following Heiko */
+#if 0
else {
r = maybe_reencode_utf8(vp);
}
+#endif
if (r < 0) /* error occured... */
WARN("Failed to convert input string to UTF16...");
}
@@ -1145,7 +1148,7 @@ spc_handler_pdfm_dest (struct spc_env *spe, struct spc_arg *args)
array = parse_pdf_object(&args->curptr, args->endptr, NULL);
if (!array) {
- spc_warn(spe, "No destination not specified for pdf:dest.");
+ spc_warn(spe, "Destination not specified for pdf:dest.");
pdf_release_obj(name);
return -1;
} else if (!PDF_OBJ_ARRAYTYPE(array)) {