From e4a7708a43f1c2929cf219453b584ade72a6ef02 Mon Sep 17 00:00:00 2001 From: Akira Kakuto Date: Sun, 27 Jan 2019 06:55:25 +0000 Subject: suppress wrong warning (H. Hirata) git-svn-id: svn://tug.org/texlive/trunk@49830 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/dvipdfm-x/ChangeLog | 6 +++++ Build/source/texk/dvipdfm-x/configure | 22 +++++++++--------- Build/source/texk/dvipdfm-x/configure.ac | 2 +- Build/source/texk/dvipdfm-x/spc_pdfm.c | 39 +++++++++++++++++++------------- 4 files changed, 41 insertions(+), 28 deletions(-) diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog index fc5bbf1ef31..f8ac949e2fe 100644 --- a/Build/source/texk/dvipdfm-x/ChangeLog +++ b/Build/source/texk/dvipdfm-x/ChangeLog @@ -1,3 +1,9 @@ +2019-01-27 Shunsaku Hirata + + * spc_pdfm.c: Supress warning on tounicode special. + Dvipdfmx had been giving a wrong warning when an optional + argument to tounicode special is not supplied. + 2018-12-27 Clerk Ma * pdfobj.c: Introduce a static variable pdf_output_file_stats diff --git a/Build/source/texk/dvipdfm-x/configure b/Build/source/texk/dvipdfm-x/configure index c2175c16a47..bec095d52ab 100755 --- a/Build/source/texk/dvipdfm-x/configure +++ b/Build/source/texk/dvipdfm-x/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for dvipdfm-x (TeX Live) 20181221. +# Generated by GNU Autoconf 2.69 for dvipdfm-x (TeX Live) 20190127. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='dvipdfm-x (TeX Live)' PACKAGE_TARNAME='dvipdfm-x--tex-live-' -PACKAGE_VERSION='20181221' -PACKAGE_STRING='dvipdfm-x (TeX Live) 20181221' +PACKAGE_VERSION='20190127' +PACKAGE_STRING='dvipdfm-x (TeX Live) 20190127' PACKAGE_BUGREPORT='tex-k@tug.org' PACKAGE_URL='' @@ -1350,7 +1350,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures dvipdfm-x (TeX Live) 20181221 to adapt to many kinds of systems. +\`configure' configures dvipdfm-x (TeX Live) 20190127 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1421,7 +1421,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of dvipdfm-x (TeX Live) 20181221:";; + short | recursive ) echo "Configuration of dvipdfm-x (TeX Live) 20190127:";; esac cat <<\_ACEOF @@ -1551,7 +1551,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -dvipdfm-x (TeX Live) configure 20181221 +dvipdfm-x (TeX Live) configure 20190127 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2390,7 +2390,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by dvipdfm-x (TeX Live) $as_me 20181221, which was +It was created by dvipdfm-x (TeX Live) $as_me 20190127, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -8077,7 +8077,7 @@ fi # Define the identity of the package. PACKAGE='dvipdfm-x--tex-live-' - VERSION='20181221' + VERSION='20190127' cat >>confdefs.h <<_ACEOF @@ -14746,7 +14746,7 @@ Usage: $0 [OPTIONS] Report bugs to ." lt_cl_version="\ -dvipdfm-x (TeX Live) config.lt 20181221 +dvipdfm-x (TeX Live) config.lt 20190127 configured by $0, generated by GNU Autoconf 2.69. Copyright (C) 2011 Free Software Foundation, Inc. @@ -16636,7 +16636,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by dvipdfm-x (TeX Live) $as_me 20181221, which was +This file was extended by dvipdfm-x (TeX Live) $as_me 20190127, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16706,7 +16706,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -dvipdfm-x (TeX Live) config.status 20181221 +dvipdfm-x (TeX Live) config.status 20190127 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/Build/source/texk/dvipdfm-x/configure.ac b/Build/source/texk/dvipdfm-x/configure.ac index a5008f23e77..e79b3dfebb3 100644 --- a/Build/source/texk/dvipdfm-x/configure.ac +++ b/Build/source/texk/dvipdfm-x/configure.ac @@ -7,7 +7,7 @@ dnl This file is free software; the copyright holder dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl -AC_INIT([dvipdfm-x (TeX Live)], [20181221], [tex-k@tug.org]) +AC_INIT([dvipdfm-x (TeX Live)], [20190127], [tex-k@tug.org]) AC_PREREQ([2.65]) AC_CONFIG_SRCDIR([agl.c]) AC_CONFIG_AUX_DIR([../../build-aux]) diff --git a/Build/source/texk/dvipdfm-x/spc_pdfm.c b/Build/source/texk/dvipdfm-x/spc_pdfm.c index 4708e2fc674..71386613a50 100644 --- a/Build/source/texk/dvipdfm-x/spc_pdfm.c +++ b/Build/source/texk/dvipdfm-x/spc_pdfm.c @@ -1,6 +1,6 @@ /* This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks. - Copyright (C) 2007-2018 by Jin-Hwan Cho and Shunsaku Hirata, + Copyright (C) 2007-2019 by Jin-Hwan Cho and Shunsaku Hirata, the dvipdfmx project team. Copyright (C) 1998, 1999 by Mark A. Wicks @@ -1906,25 +1906,32 @@ spc_handler_pdfm_tounicode (struct spc_env *spe, struct spc_arg *args) } RELEASE(cmap_name); - /* Additional "taint key" */ - taint_keys = parse_pdf_object(&args->curptr, args->endptr, NULL); - if (taint_keys) { - if (PDF_OBJ_ARRAYTYPE(taint_keys)) { - int i; - for (i = 0; i < pdf_array_length(taint_keys); i++) { - pdf_obj *key; + /* Additional "taint key" + * An array of PDF name objects can be supplied optionally. + * Dictionary entries specified by this option will be added to the list + * of dictionary keys to be treated as the target of "ToUnicode" conversion. + */ + skip_white(&args->curptr, args->endptr); + if (args->curptr < args->endptr) { + taint_keys = parse_pdf_object(&args->curptr, args->endptr, NULL); + if (taint_keys) { + if (PDF_OBJ_ARRAYTYPE(taint_keys)) { + int i; + for (i = 0; i < pdf_array_length(taint_keys); i++) { + pdf_obj *key; - key = pdf_get_array(taint_keys, i); - if (PDF_OBJ_NAMETYPE(key)) - pdf_add_array(sd->cd.taintkeys, pdf_link_obj(key)); - else { - spc_warn(spe, "Invalid argument specified in pdf:tounicode special."); + key = pdf_get_array(taint_keys, i); + if (PDF_OBJ_NAMETYPE(key)) + pdf_add_array(sd->cd.taintkeys, pdf_link_obj(key)); + else { + spc_warn(spe, "Invalid argument specified in pdf:tounicode special."); + } } + } else { + spc_warn(spe, "Invalid argument specified in pdf:unicode special."); } - } else { - spc_warn(spe, "Invalid argument specified in pdf:unicode special."); + pdf_release_obj(taint_keys); } - pdf_release_obj(taint_keys); } return 0; -- cgit v1.2.3