summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2021-06-04 22:22:36 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2021-06-04 22:22:36 +0000
commit05e56eff56a56c5055bcb8652852e6a101ac02e6 (patch)
tree40faccb561d7ef6d3532186f6b706d98e4431b2a /Build
parented959bb1db76420d8fa3355a822dda795cadf253 (diff)
Improve error messages when PDF/PS inclusion fails (S. Hirata).
git-svn-id: svn://tug.org/texlive/trunk@59467 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/dvipdfm-x/ChangeLog6
-rwxr-xr-xBuild/source/texk/dvipdfm-x/configure22
-rw-r--r--Build/source/texk/dvipdfm-x/configure.ac2
-rw-r--r--Build/source/texk/dvipdfm-x/pdfximage.c22
4 files changed, 33 insertions, 19 deletions
diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog
index 2616cbae93c..d73eb487ebc 100644
--- a/Build/source/texk/dvipdfm-x/ChangeLog
+++ b/Build/source/texk/dvipdfm-x/ChangeLog
@@ -1,3 +1,9 @@
+2021-06-05 Shunsaku Hirata <shunsaku.hirata74@gmail.com>
+
+ * pdfximage.c: Improved error messages when PDF/PS inclusion
+ fails. Output page numbers too.
+ * configure.ac: Version 20210605.
+
2021-06-02 Masamichi HOSODA <trueroad@trueroad.jp>
* pdfencoding.c: Fix a segmentation fault on pdfencoding.
diff --git a/Build/source/texk/dvipdfm-x/configure b/Build/source/texk/dvipdfm-x/configure
index dbc5bff1fc1..44e188f1265 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) 20210318.
+# Generated by GNU Autoconf 2.69 for dvipdfm-x (TeX Live) 20210605.
#
# Report bugs to <dvipdfmx@tug.org>.
#
@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='dvipdfm-x (TeX Live)'
PACKAGE_TARNAME='dvipdfm-x--tex-live-'
-PACKAGE_VERSION='20210318'
-PACKAGE_STRING='dvipdfm-x (TeX Live) 20210318'
+PACKAGE_VERSION='20210605'
+PACKAGE_STRING='dvipdfm-x (TeX Live) 20210605'
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) 20210318 to adapt to many kinds of systems.
+\`configure' configures dvipdfm-x (TeX Live) 20210605 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) 20210318:";;
+ short | recursive ) echo "Configuration of dvipdfm-x (TeX Live) 20210605:";;
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 20210318
+dvipdfm-x (TeX Live) configure 20210605
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 20210318, which was
+It was created by dvipdfm-x (TeX Live) $as_me 20210605, 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='20210318'
+ VERSION='20210605'
cat >>confdefs.h <<_ACEOF
@@ -14741,7 +14741,7 @@ Usage: $0 [OPTIONS]
Report bugs to <bug-libtool@gnu.org>."
lt_cl_version="\
-dvipdfm-x (TeX Live) config.lt 20210318
+dvipdfm-x (TeX Live) config.lt 20210605
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 20210318, which was
+This file was extended by dvipdfm-x (TeX Live) $as_me 20210605, 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 20210318
+dvipdfm-x (TeX Live) config.status 20210605
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 91f4f028983..84414848454 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)], [20210318], [dvipdfmx@tug.org])
+AC_INIT([dvipdfm-x (TeX Live)], [20210605], [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/pdfximage.c b/Build/source/texk/dvipdfm-x/pdfximage.c
index 01aed38913c..bdbd015cfd7 100644
--- a/Build/source/texk/dvipdfm-x/pdfximage.c
+++ b/Build/source/texk/dvipdfm-x/pdfximage.c
@@ -352,8 +352,8 @@ load_image (const char *ident, const char *filename, const char *fullname, int f
I->subtype = PDF_XOBJECT_TYPE_FORM;
break;
/*
- case IMAGE_TYPE_EPS:
-*/
+ * case IMAGE_TYPE_EPS:
+ */
default:
if (dpx_conf.verbose_level > 0)
MESG(format == IMAGE_TYPE_EPS ? "[PS]" : "[UNKNOWN]");
@@ -441,9 +441,9 @@ pdf_ximage_load_image (const char *ident, const char *filename, load_options opt
utf8name_failed = 0;
#endif /* WIN32 */
if (dpx_conf.compat_mode == dpx_mode_compat_mode) {
- WARN("Image inclusion failed for \"%s\".", filename);
+ WARN("Image inclusion failed. Could not find file: %s", filename);
} else {
- ERROR("Image inclusion failed for \"%s\".", filename);
+ ERROR("Image inclusion failed. Could not find file: %s", filename);
}
return -1;
}
@@ -456,7 +456,7 @@ pdf_ximage_load_image (const char *ident, const char *filename, load_options opt
RELEASE(fullname);
} else {
RELEASE(fullname);
- ERROR("Image inclusion failed for \"%s\".", filename);
+ ERROR("Error opening image file \"%s\".", filename);
}
return -1;
}
@@ -500,9 +500,17 @@ pdf_ximage_load_image (const char *ident, const char *filename, load_options opt
if (id < 0) {
if (dpx_conf.compat_mode == dpx_mode_compat_mode) {
- WARN("Image inclusion failed for \"%s\".", filename);
+ if (format == IMAGE_TYPE_PDF || format == IMAGE_TYPE_EPS) {
+ WARN("Image inclusion failed for \"%s\" (page=%d).", filename, options.page_no);
+ } else {
+ WARN("Image inclusion failed for \"%s\"", filename);
+ }
} else {
- ERROR("Image inclusion failed for \"%s\".", filename);
+ if (format == IMAGE_TYPE_PDF || format == IMAGE_TYPE_EPS) {
+ ERROR("Image inclusion failed for \"%s\" (page=%d).", filename, options.page_no);
+ } else {
+ ERROR("Image inclusion failed for \"%s\"", filename);
+ }
}
}