summaryrefslogtreecommitdiff
path: root/Build/source/texk
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2013-07-12 07:30:34 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2013-07-12 07:30:34 +0000
commitc2d4fa6f59f3c566ccd85e3b250f0a27485bbaea (patch)
treeb480c9f0b9419cc558570abfd306292620a22972 /Build/source/texk
parent0d4aee5691195ba8ca2de742ca7abf49551cca5a (diff)
{lua,pdf}TeX: Extend {lua,pdf}image.test with a .pdf image
git-svn-id: svn://tug.org/texlive/trunk@31180 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk')
-rw-r--r--Build/source/texk/web2c/ChangeLog5
-rw-r--r--Build/source/texk/web2c/Makefile.in11
-rw-r--r--Build/source/texk/web2c/luatexdir/ChangeLog4
-rw-r--r--Build/source/texk/web2c/luatexdir/am/luatex.am2
-rw-r--r--Build/source/texk/web2c/luatexdir/tests/luaimage.tex4
-rw-r--r--Build/source/texk/web2c/pdftexdir/ChangeLog4
-rw-r--r--Build/source/texk/web2c/pdftexdir/am/pdftex.am2
-rw-r--r--Build/source/texk/web2c/pdftexdir/tests/pdfimage.tex4
-rw-r--r--Build/source/texk/web2c/tests/B.pdfbin0 -> 2690 bytes
9 files changed, 29 insertions, 7 deletions
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index d006b3f19cd..78d8d6e2aa2 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,3 +1,8 @@
+2013-07-12 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * tests/B.pdf (new):
+ More test data for {lua,pdf}texdir/{lua,pdf}image.test.
+
2013-07-05 Peter Breitenlohner <peb@mppmu.mpg.de>
* Makefile.am, man/Makefile.am, omegafonts/Makefile.am:
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index 39081ed0ec3..d8343eb0dd3 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -1811,9 +1811,10 @@ EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h \
pdftexdir/pdftex.defines pdftexdir/ChangeLog pdftexdir/NEWS \
pdftexdir/README pdftexdir/change-files.txt $(pdftex_tests) \
tests/wprob.tex pdftexdir/tests/pdfimage.tex tests/1-4.jpg \
- tests/basic.tex tests/lily-ledger-broken.png $(pdftosrc_tests) \
- pdftexdir/tests/test-13.pdf pdftexdir/tests/test-13.xref \
- pdftexdir/tests/test-15.pdf pdftexdir/tests/test-15.xref \
+ tests/B.pdf tests/basic.tex tests/lily-ledger-broken.png \
+ $(pdftosrc_tests) pdftexdir/tests/test-13.pdf \
+ pdftexdir/tests/test-13.xref pdftexdir/tests/test-15.pdf \
+ pdftexdir/tests/test-15.xref \
luatexdir/luasocket/src/socket_lua.c \
luatexdir/luasocket/src/ftp_lua.c \
luatexdir/luasocket/src/headers_lua.c \
@@ -1903,8 +1904,8 @@ EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h \
luatexdir/luafontloader/fontforge/VERSION $(libluatex_web) \
luatexdir/ChangeLog luatexdir/NEWS luatexdir/font/subfont.txt \
luatexdir/getluatexsvnversion.sh $(luatex_tests) \
- luatexdir/tests/luaimage.tex tests/1-4.jpg tests/basic.tex \
- tests/lily-ledger-broken.png $(xetex_web_srcs) \
+ luatexdir/tests/luaimage.tex tests/1-4.jpg tests/B.pdf \
+ tests/basic.tex tests/lily-ledger-broken.png $(xetex_web_srcs) \
$(xetex_ch_srcs) xetexdir/xetex.defines \
xetexdir/unicode-char-prep.pl xetexdir/ChangeLog \
$(xetex_tests) xetexdir/COPYING xetexdir/NEWS \
diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog
index a9063570048..67310a70fd5 100644
--- a/Build/source/texk/web2c/luatexdir/ChangeLog
+++ b/Build/source/texk/web2c/luatexdir/ChangeLog
@@ -1,3 +1,7 @@
+2013-07-12 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * am/luatex.am, tests/luaimage.tex: Add a .pdf image.
+
2013-07-05 Peter Breitenlohner <peb@mppmu.mpg.de>
* pdf/pdfgen.w: Use "%"LONGINTEGER_PRI"d" format specifier to
diff --git a/Build/source/texk/web2c/luatexdir/am/luatex.am b/Build/source/texk/web2c/luatexdir/am/luatex.am
index 67b5e6a330d..e276036c5d0 100644
--- a/Build/source/texk/web2c/luatexdir/am/luatex.am
+++ b/Build/source/texk/web2c/luatexdir/am/luatex.am
@@ -70,6 +70,6 @@ endif LUATEX
## luaimage.test
EXTRA_DIST += luatexdir/tests/luaimage.tex \
- tests/1-4.jpg tests/basic.tex tests/lily-ledger-broken.png
+ tests/1-4.jpg tests/B.pdf tests/basic.tex tests/lily-ledger-broken.png
DISTCLEANFILES += luaimage.fmt luaimage.log luaimage.pdf
diff --git a/Build/source/texk/web2c/luatexdir/tests/luaimage.tex b/Build/source/texk/web2c/luatexdir/tests/luaimage.tex
index 05c1f77e68b..8cb487f3308 100644
--- a/Build/source/texk/web2c/luatexdir/tests/luaimage.tex
+++ b/Build/source/texk/web2c/luatexdir/tests/luaimage.tex
@@ -17,6 +17,10 @@
\hbox{\pdfrefximage\pdflastximage}
\eject
+\pdfximage width \hsize height \vsize {B.pdf}
+\hbox{\pdfrefximage\pdflastximage}
+\eject
+
\pdfximage width \hsize height \vsize {lily-ledger-broken.png}
\hbox{\pdfrefximage\pdflastximage}
\eject
diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog
index aa88347ec81..74bf7a85244 100644
--- a/Build/source/texk/web2c/pdftexdir/ChangeLog
+++ b/Build/source/texk/web2c/pdftexdir/ChangeLog
@@ -1,3 +1,7 @@
+2013-07-12 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * am/pdftex.am, tests/pdfimage.tex: Add a .pdf image.
+
2013-07-04 Peter Breitenlohner <peb@mppmu.mpg.de>
* pdfimage.test, tests/pdfimage.tex: New test and data.
diff --git a/Build/source/texk/web2c/pdftexdir/am/pdftex.am b/Build/source/texk/web2c/pdftexdir/am/pdftex.am
index f63aa0c2b96..19fb2f4f30c 100644
--- a/Build/source/texk/web2c/pdftexdir/am/pdftex.am
+++ b/Build/source/texk/web2c/pdftexdir/am/pdftex.am
@@ -100,6 +100,6 @@ DISTCLEANFILES += pwprob.log pwprob.tex
## pdfimage.test
EXTRA_DIST += pdftexdir/tests/pdfimage.tex \
- tests/1-4.jpg tests/basic.tex tests/lily-ledger-broken.png
+ tests/1-4.jpg tests/B.pdf tests/basic.tex tests/lily-ledger-broken.png
DISTCLEANFILES += pdfimage.fmt pdfimage.log pdfimage.pdf
diff --git a/Build/source/texk/web2c/pdftexdir/tests/pdfimage.tex b/Build/source/texk/web2c/pdftexdir/tests/pdfimage.tex
index 014c17bd40c..76bf8758a15 100644
--- a/Build/source/texk/web2c/pdftexdir/tests/pdfimage.tex
+++ b/Build/source/texk/web2c/pdftexdir/tests/pdfimage.tex
@@ -16,6 +16,10 @@
\hbox{\pdfrefximage\pdflastximage}
\eject
+\pdfximage width \hsize height \vsize {B.pdf}
+\hbox{\pdfrefximage\pdflastximage}
+\eject
+
\pdfximage width \hsize height \vsize {lily-ledger-broken.png}
\hbox{\pdfrefximage\pdflastximage}
\eject
diff --git a/Build/source/texk/web2c/tests/B.pdf b/Build/source/texk/web2c/tests/B.pdf
new file mode 100644
index 00000000000..12c4576b56f
--- /dev/null
+++ b/Build/source/texk/web2c/tests/B.pdf
Binary files differ