summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorTakuji Tanaka <ttk@t-lab.opal.ne.jp>2024-04-08 23:07:48 +0000
committerTakuji Tanaka <ttk@t-lab.opal.ne.jp>2024-04-08 23:07:48 +0000
commitd3a152ae2b028c728e9f7cb0aecd04da03c8519f (patch)
treec5015f56a648c83e156f4b6236cc81decfc45e5d /Build
parent784ef1c0eafdc20939d99ce5a1d8236c80f12d6e (diff)
dvipdfm-x: Add tests for including images multiple times
git-svn-id: svn://tug.org/texlive/trunk@70892 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/dvipdfm-x/ChangeLog7
-rw-r--r--Build/source/texk/dvipdfm-x/Makefile.am8
-rw-r--r--Build/source/texk/dvipdfm-x/Makefile.in10
-rwxr-xr-xBuild/source/texk/dvipdfm-x/dvipdfmx-incl.test37
-rw-r--r--Build/source/texk/dvipdfm-x/tests/multi_incl.dvibin0 -> 946676 bytes
-rw-r--r--Build/source/texk/dvipdfm-x/tests/multi_incl.tex13
-rw-r--r--Build/source/texk/dvipdfm-x/tests/sue-mp.pdfbin0 -> 52604 bytes
7 files changed, 69 insertions, 6 deletions
diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog
index ac6e903e440..ac9e5832a10 100644
--- a/Build/source/texk/dvipdfm-x/ChangeLog
+++ b/Build/source/texk/dvipdfm-x/ChangeLog
@@ -1,3 +1,10 @@
+2024-04-09 TANAKA Takuji <ttk@t-lab.opal.ne.jp>
+
+ * dvipdfmx-incl.test, tests/multi_incl.{tex,dvi},
+ tests/sue-mp.pdf, Makefile.am:
+ Add tests for including images multiple times
+ from Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>.
+
2024-04-07 Yukimasa Morimi <h20y6m@yahoo.co.jp>
* pdfximage.c: fix an issue where the PDF becomes large when
diff --git a/Build/source/texk/dvipdfm-x/Makefile.am b/Build/source/texk/dvipdfm-x/Makefile.am
index 873449773e7..cef7f47bfdb 100644
--- a/Build/source/texk/dvipdfm-x/Makefile.am
+++ b/Build/source/texk/dvipdfm-x/Makefile.am
@@ -249,10 +249,11 @@ DISTCLEANFILES = config.force
TESTS = xdvipdfmx.test xdvipdfm-ann.test xdvipdfm-bad.test xdvipdfm-bb.test
TESTS += xdvipdfm-bkm.test xdvipdfm-psz.test xdvipdfm-ptx.test xdvipdfm-res.test
TESTS += xdvipdfm-rev.test xdvipdfm-ttc.test
-TESTS += dvipdfmx-upjf.test
+TESTS += dvipdfmx-upjf.test dvipdfmx-incl.test
xdvipdfmx.log xdvipdfm-ann.log xdvipdfm-bad.log xdvipdfm-bb.log \
xdvipdfm-bkm.log xdvipdfm-psz.log xdvipdfm-ptx.log xdvipdfm-res.log \
- xdvipdfm-rev.log xdvipdfm-ttc.log: xdvipdfmx$(EXEEXT)
+ xdvipdfm-rev.log xdvipdfm-ttc.log \
+ dvipdfmx-upjf.log dvipdfmx-incl.log: xdvipdfmx$(EXEEXT)
EXTRA_DIST = $(TESTS)
## xdvipdfmx.test
EXTRA_DIST += tests/dvipdfmx.cfg tests/psfonts.map
@@ -307,5 +308,8 @@ EXTRA_DIST += tests/upjf1-r.pl tests/upjf1-r.tfm
EXTRA_DIST += tests/upjf1_full.zvp0 tests/upjf1_full.vf
EXTRA_DIST += tests/upjf1_omit.zvp0 tests/upjf1_omit.vf
DISTCLEANFILES += upjf.vf upjv.vf upjf-*.ofm upjv-*.ofm upjf-*.tfm upjf*.pdf
+## dvipdfmx-incl.test
+EXTRA_DIST += tests/multi_incl.dvi tests/multi_incl.tex tests/sue-mp.pdf
+DISTCLEANFILES += multi_incl.pdf
##
EXTRA_DIST += tests/fullmap.dvi tests/fullmap.tex
diff --git a/Build/source/texk/dvipdfm-x/Makefile.in b/Build/source/texk/dvipdfm-x/Makefile.in
index 64f61ad5146..44bcb99279f 100644
--- a/Build/source/texk/dvipdfm-x/Makefile.in
+++ b/Build/source/texk/dvipdfm-x/Makefile.in
@@ -822,11 +822,11 @@ dist_cmapdata_DATA = data/EUC-UCS2
DISTCLEANFILES = config.force image*.pdf xbmc*.pdf annot*.pdf pic*.* \
bookm*.pdf paper*.pdf ptex*.pdf resrc*.pdf reverse.pdf \
ttc*.pdf upjf.vf upjv.vf upjf-*.ofm upjv-*.ofm upjf-*.tfm \
- upjf*.pdf
+ upjf*.pdf multi_incl.pdf
TESTS = xdvipdfmx.test xdvipdfm-ann.test xdvipdfm-bad.test \
xdvipdfm-bb.test xdvipdfm-bkm.test xdvipdfm-psz.test \
xdvipdfm-ptx.test xdvipdfm-res.test xdvipdfm-rev.test \
- xdvipdfm-ttc.test dvipdfmx-upjf.test
+ xdvipdfm-ttc.test dvipdfmx-upjf.test dvipdfmx-incl.test
EXTRA_DIST = $(TESTS) tests/dvipdfmx.cfg tests/psfonts.map \
tests/cmr10.pfb tests/cmr10.tfm tests/image.dvi \
tests/image.tex tests/xbmc.dvi tests/xbmc.tex \
@@ -852,7 +852,8 @@ EXTRA_DIST = $(TESTS) tests/dvipdfmx.cfg tests/psfonts.map \
tests/upjv-g00.ofm tests/upjf-r00.opl tests/upjf-r00.ofm \
tests/upjv-r00.opl tests/upjv-r00.ofm tests/upjf1-r.pl \
tests/upjf1-r.tfm tests/upjf1_full.zvp0 tests/upjf1_full.vf \
- tests/upjf1_omit.zvp0 tests/upjf1_omit.vf tests/fullmap.dvi \
+ tests/upjf1_omit.zvp0 tests/upjf1_omit.vf tests/multi_incl.dvi \
+ tests/multi_incl.tex tests/sue-mp.pdf tests/fullmap.dvi \
tests/fullmap.tex
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-am
@@ -2024,7 +2025,8 @@ config.force: $(ZLIB_DEPEND) $(LIBPNG_DEPEND) $(KPATHSEA_DEPEND) $(LIBPAPER_DEPE
@LIBPAPER_RULE@
xdvipdfmx.log xdvipdfm-ann.log xdvipdfm-bad.log xdvipdfm-bb.log \
xdvipdfm-bkm.log xdvipdfm-psz.log xdvipdfm-ptx.log xdvipdfm-res.log \
- xdvipdfm-rev.log xdvipdfm-ttc.log: xdvipdfmx$(EXEEXT)
+ xdvipdfm-rev.log xdvipdfm-ttc.log \
+ dvipdfmx-upjf.log dvipdfmx-incl.log: xdvipdfmx$(EXEEXT)
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/Build/source/texk/dvipdfm-x/dvipdfmx-incl.test b/Build/source/texk/dvipdfm-x/dvipdfmx-incl.test
new file mode 100755
index 00000000000..d67827cd130
--- /dev/null
+++ b/Build/source/texk/dvipdfm-x/dvipdfmx-incl.test
@@ -0,0 +1,37 @@
+#! /bin/sh -vx
+# $Id$
+# Copyright 2024 Japanese TeX Development Community <issue@texjp.org>
+# You may freely use, modify and/or distribute this file.
+
+BinDir=${BinDir:-.}
+ExeExt=${ExeExt:-}
+_xdvipdfmx=$BinDir/xdvipdfmx$ExeExt
+
+LC_ALL=C; export LC_ALL; LANGUAGE=C; export LANGUAGE
+TEXMFCNF=$srcdir/../kpathsea
+TFMFONTS=".;$srcdir/tests;$srcdir/data"
+T1FONTS="$srcdir/tests;$srcdir/data"
+TEXPICTS=$srcdir/tests
+SOURCE_DATE_EPOCH=1588474800
+export TEXMFCNF TFMFONTS T1FONTS TEXPICTS SOURCE_DATE_EPOCH
+
+failed=
+
+rm -f multi_incl.pdf
+
+echo "*** dvipdfmx: test for including pdf graphics multiple times"
+
+$_xdvipdfmx --dvipdfmx -vv -o multi_incl.pdf $srcdir/tests/multi_incl.dvi \
+ || failed="$failed multi-incl"
+
+filesize=`ls -l multi_incl.pdf | awk '{print $5}'`
+if [ "$filesize" -gt 85000 ]; then
+ echo "Too large file size :" $filesize
+ failed="$failed multi-incl-size"
+fi
+
+
+test -z "$failed" && exit 0
+echo
+echo "failed tests:$failed"
+exit 1
diff --git a/Build/source/texk/dvipdfm-x/tests/multi_incl.dvi b/Build/source/texk/dvipdfm-x/tests/multi_incl.dvi
new file mode 100644
index 00000000000..6f0eb18e3f5
--- /dev/null
+++ b/Build/source/texk/dvipdfm-x/tests/multi_incl.dvi
Binary files differ
diff --git a/Build/source/texk/dvipdfm-x/tests/multi_incl.tex b/Build/source/texk/dvipdfm-x/tests/multi_incl.tex
new file mode 100644
index 00000000000..910577769ef
--- /dev/null
+++ b/Build/source/texk/dvipdfm-x/tests/multi_incl.tex
@@ -0,0 +1,13 @@
+\documentclass[dvipdfmx]{article}
+\usepackage{graphicx}
+\begin{document}
+\parindent0pt
+\includegraphics[page=1]{sue-mp.pdf}
+
+\makeatletter
+\@tempcnta=0
+\loop\ifnum\@tempcnta<10000
+ \noindent\includegraphics[page=1]{sue-mp.pdf}\hfil
+ \advance\@tempcnta1
+\repeat
+\end{document}
diff --git a/Build/source/texk/dvipdfm-x/tests/sue-mp.pdf b/Build/source/texk/dvipdfm-x/tests/sue-mp.pdf
new file mode 100644
index 00000000000..6276d53a4e5
--- /dev/null
+++ b/Build/source/texk/dvipdfm-x/tests/sue-mp.pdf
Binary files differ