texlive[57439] Build/source/texk/dvipdfm-x: Exit with bad status when

commits+kakuto at tug.org commits+kakuto at tug.org
Sat Jan 16 04:48:04 CET 2021


Revision: 57439
          http://tug.org/svn/texlive?view=revision&revision=57439
Author:   kakuto
Date:     2021-01-16 04:48:03 +0100 (Sat, 16 Jan 2021)
Log Message:
-----------
Exit with bad status when image inclusion fails (S. Hirata)

Modified Paths:
--------------
    trunk/Build/source/texk/dvipdfm-x/ChangeLog
    trunk/Build/source/texk/dvipdfm-x/configure
    trunk/Build/source/texk/dvipdfm-x/configure.ac
    trunk/Build/source/texk/dvipdfm-x/dvi.c
    trunk/Build/source/texk/dvipdfm-x/pdfximage.c

Modified: trunk/Build/source/texk/dvipdfm-x/ChangeLog
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/ChangeLog	2021-01-16 00:54:40 UTC (rev 57438)
+++ trunk/Build/source/texk/dvipdfm-x/ChangeLog	2021-01-16 03:48:03 UTC (rev 57439)
@@ -1,3 +1,11 @@
+2021-01-16  Shunsaku Hirata  <shunsaku.hirata74 at gmail.com>
+
+	* 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  <shunsaku.hirata74 at gmail.com>
 
 	* dvi.c, dvipdfmx.c, pdfdoc.[ch]: Experimental support for

Modified: trunk/Build/source/texk/dvipdfm-x/configure
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/configure	2021-01-16 00:54:40 UTC (rev 57438)
+++ trunk/Build/source/texk/dvipdfm-x/configure	2021-01-16 03:48:03 UTC (rev 57439)
@@ -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 <dvipdfmx at tug.org>.
 #
@@ -590,8 +590,8 @@
 # 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 at tug.org'
 PACKAGE_URL=''
 
@@ -1350,7 +1350,7 @@
   # 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 @@
 
 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 @@
 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 @@
 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 @@
 
 # Define the identity of the package.
  PACKAGE='dvipdfm-x--tex-live-'
- VERSION='20210115'
+ VERSION='20210116'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -14741,7 +14741,7 @@
 Report bugs to <bug-libtool at gnu.org>."
 
 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 @@
 # 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 @@
 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\\"
 

Modified: trunk/Build/source/texk/dvipdfm-x/configure.ac
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/configure.ac	2021-01-16 00:54:40 UTC (rev 57438)
+++ trunk/Build/source/texk/dvipdfm-x/configure.ac	2021-01-16 03:48:03 UTC (rev 57439)
@@ -8,7 +8,7 @@
 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 at tug.org])
+AC_INIT([dvipdfm-x (TeX Live)], [20210116], [dvipdfmx at tug.org])
 AC_PREREQ([2.65])
 AC_CONFIG_SRCDIR([agl.c])
 AC_CONFIG_AUX_DIR([../../build-aux])

Modified: trunk/Build/source/texk/dvipdfm-x/dvi.c
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/dvi.c	2021-01-16 00:54:40 UTC (rev 57438)
+++ trunk/Build/source/texk/dvipdfm-x/dvi.c	2021-01-16 03:48:03 UTC (rev 57439)
@@ -1445,8 +1445,8 @@
     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);

Modified: trunk/Build/source/texk/dvipdfm-x/pdfximage.c
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/pdfximage.c	2021-01-16 00:54:40 UTC (rev 57438)
+++ trunk/Build/source/texk/dvipdfm-x/pdfximage.c	2021-01-16 03:48:03 UTC (rev 57439)
@@ -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 <mwicks at kettering.edu>
@@ -488,8 +488,13 @@
   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;
 }



More information about the tex-live-commits mailing list.