From b6d2b9e3689e87c2aeff02f0cb9c40461ac883bb Mon Sep 17 00:00:00 2001 From: Akira Kakuto Date: Sat, 16 Jan 2021 03:48:03 +0000 Subject: Exit with bad status when image inclusion fails (S. Hirata) git-svn-id: svn://tug.org/texlive/trunk@57439 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/dvipdfm-x/ChangeLog | 8 ++++++++ Build/source/texk/dvipdfm-x/configure | 22 +++++++++++----------- Build/source/texk/dvipdfm-x/configure.ac | 2 +- Build/source/texk/dvipdfm-x/dvi.c | 4 ++-- Build/source/texk/dvipdfm-x/pdfximage.c | 11 ++++++++--- 5 files changed, 30 insertions(+), 17 deletions(-) (limited to 'Build/source') diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog index b77a732105c..482c0b3a1e9 100644 --- a/Build/source/texk/dvipdfm-x/ChangeLog +++ b/Build/source/texk/dvipdfm-x/ChangeLog @@ -1,3 +1,11 @@ +2021-01-16 Shunsaku Hirata + + * pdfximage.c: Dvipdfmx behavior changed. Now it stops + processing and exits with non-zero exit status when image + inclusion fails. + * dvi.c: Ignore dvi_set with invalid gid when processing DVI + files created by dvilua[la]tex. + 2021-01-15 Shunsaku Hirata * dvi.c, dvipdfmx.c, pdfdoc.[ch]: Experimental support for diff --git a/Build/source/texk/dvipdfm-x/configure b/Build/source/texk/dvipdfm-x/configure index f726a34e5e1..18aefc9707c 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) 20210115. +# Generated by GNU Autoconf 2.69 for dvipdfm-x (TeX Live) 20210116. # # 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='20210115' -PACKAGE_STRING='dvipdfm-x (TeX Live) 20210115' +PACKAGE_VERSION='20210116' +PACKAGE_STRING='dvipdfm-x (TeX Live) 20210116' PACKAGE_BUGREPORT='dvipdfmx@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) 20210115 to adapt to many kinds of systems. +\`configure' configures dvipdfm-x (TeX Live) 20210116 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) 20210115:";; + short | recursive ) echo "Configuration of dvipdfm-x (TeX Live) 20210116:";; 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 20210115 +dvipdfm-x (TeX Live) configure 20210116 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 20210115, which was +It was created by dvipdfm-x (TeX Live) $as_me 20210116, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -8072,7 +8072,7 @@ fi # Define the identity of the package. PACKAGE='dvipdfm-x--tex-live-' - VERSION='20210115' + VERSION='20210116' cat >>confdefs.h <<_ACEOF @@ -14741,7 +14741,7 @@ Usage: $0 [OPTIONS] Report bugs to ." lt_cl_version="\ -dvipdfm-x (TeX Live) config.lt 20210115 +dvipdfm-x (TeX Live) config.lt 20210116 configured by $0, generated by GNU Autoconf 2.69. Copyright (C) 2011 Free Software Foundation, Inc. @@ -16631,7 +16631,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 20210115, which was +This file was extended by dvipdfm-x (TeX Live) $as_me 20210116, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16701,7 +16701,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 20210115 +dvipdfm-x (TeX Live) config.status 20210116 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 f4b7b607e56..b85bac12fa4 100644 --- a/Build/source/texk/dvipdfm-x/configure.ac +++ b/Build/source/texk/dvipdfm-x/configure.ac @@ -8,7 +8,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)], [20210115], [dvipdfmx@tug.org]) +AC_INIT([dvipdfm-x (TeX Live)], [20210116], [dvipdfmx@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/dvi.c b/Build/source/texk/dvipdfm-x/dvi.c index 61efadffce1..9033d2c2659 100644 --- a/Build/source/texk/dvipdfm-x/dvi.c +++ b/Build/source/texk/dvipdfm-x/dvi.c @@ -1445,8 +1445,8 @@ dvi_set (int32_t ch) if (ch >= 0 && ch < font->num_glyphs) { width = font->gm[ch].advance; } else { - WARN("Invalid char for dvilua font: %04x", ch); - width = 0; + WARN("Invalid char for dvilua font (ignored): %04x", ch); + return; } } else { width = tfm_get_fw_width(font->tfm_id, ch); diff --git a/Build/source/texk/dvipdfm-x/pdfximage.c b/Build/source/texk/dvipdfm-x/pdfximage.c index 0265ef8e5ad..37d4778455d 100644 --- a/Build/source/texk/dvipdfm-x/pdfximage.c +++ b/Build/source/texk/dvipdfm-x/pdfximage.c @@ -1,6 +1,6 @@ /* This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks. - Copyright (C) 2002-2020 by Jin-Hwan Cho and Shunsaku Hirata, + Copyright (C) 2002-2021 by Jin-Hwan Cho and Shunsaku Hirata, the dvipdfmx project team. Copyright (C) 1998, 1999 by Mark A. Wicks @@ -488,8 +488,13 @@ pdf_ximage_load_image (const char *ident, const char *filename, load_options opt if (dpx_conf.verbose_level > 0) MESG(")"); - if (id < 0) - WARN("pdf: image inclusion failed for \"%s\".", filename); + if (id < 0) { + if (dpx_conf.compat_mode == dpx_mode_compat_mode) { + WARN("Image inclusion failed for \"%s\".", filename); + } else { + ERROR("Image inclusion failed for \"%s\".", filename); + } + } return id; } -- cgit v1.2.3