From 2121b0a25606da19b08fc89c18d02c554a2e995d Mon Sep 17 00:00:00 2001 From: David Carlisle Date: Sat, 13 Apr 2024 23:23:59 +0100 Subject: [PATCH 01/10] always load epsftopdf-base for issue #38 --- README.md | 2 +- luatex.def | 9 +++++---- pdftex.def | 11 ++++++----- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index c159d2e..2fb6a0a 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ LaTeX support for color and graphics ==================================== -Release 2022-09-22 +Release 2024-04-13 This bundle contains the 'engine-dependent' part of support for color and graphics in LaTeX2e (the code here will also function diff --git a/luatex.def b/luatex.def index b32506d..3c83254 100644 --- a/luatex.def +++ b/luatex.def @@ -3,7 +3,7 @@ %% Hans Hagen, Heiko Oberdiek and %% Martin Schr\"oder %% Copyright (C) 2016-2018 LaTeX3 project and Heiko Oberdiek -%% Copyright (C) 2018-2022 LaTeX3 project +%% Copyright (C) 2018-2024 LaTeX3 project %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c @@ -651,7 +651,7 @@ } % Load package epstopdf if % a) LaTeX is running (plain TeX users are on their own), -% b) and shell escape is enabled (possibly restricted), +% XXXb) and shell escape is enabled (possibly restricted), % c) and \DoNotLoadEpstopdf either does not exist or is not \relax, % d) and neither pst-pdf nor pdftricks is loaded (by \begin{document}). % @@ -680,11 +680,12 @@ \@ifpackageloaded{pst-pdf}{}{% \@ifpackageloaded{pdftricks}{}{% \@ifpackageloaded{graphics}{% - \ifnum\directlua{tex.sprint(status.shell_escape)}>0 % +% \ifnum\directlua{tex.sprint(status.shell_escape)}>0 % % only add .eps to file extension list if epstopdf is loaded \edef\Gin@extensions{\Gin@extensions,.eps}% \RequirePackage{epstopdf-base}[2009/07/12]% - \fi}{} +% \fi + }{} }% pdftricks not loaded }% pst-pdf not loaded \fi diff --git a/pdftex.def b/pdftex.def index 35eb376..ff6bedd 100644 --- a/pdftex.def +++ b/pdftex.def @@ -3,7 +3,7 @@ %% Hans Hagen, Heiko Oberdiek and %% Martin Schr\"oder %% Copyright (C) 2016-2018 LaTeX3 project and Heiko Oberdiek -%% Copyright (C) 2018-2022 LaTeX3 project +%% Copyright (C) 2018-2024 LaTeX3 project %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c @@ -20,7 +20,7 @@ %% https://github.com/latex3/graphics-def/issues %% \ProvidesFile{pdftex.def} - [2022/09/22 v1.2b Graphics/color driver for pdftex] + [2024/04/13 v1.2c Graphics/color driver for pdftex] \def\GPT@space{ } \def\c@lor@arg#1{% \dimen@#1\p@ @@ -652,7 +652,7 @@ E \else } % Load package epstopdf if % a) LaTeX is running (plain TeX users are on their own), -% b) and shell escape (\write18) is enabled (possibly restricted), +% XXXb) and shell escape (\write18) is enabled (possibly restricted), % c) and \DoNotLoadEpstopdf either does not exist or is not \relax, % d) and neither pst-pdf nor pdftricks is loaded (by \begin{document}). % @@ -681,11 +681,12 @@ E \else \@ifpackageloaded{pst-pdf}{}{% \@ifpackageloaded{pdftricks}{}{% \@ifpackageloaded{graphics}{% - \ifnum\pdfshellescape>0 % +% \ifnum\pdfshellescape>0 % % only add .eps to file extension list if epstopdf is loaded \edef\Gin@extensions{\Gin@extensions,.eps}% \RequirePackage{epstopdf-base}[2009/07/12]% - \fi}{} +% \fi + }{} }% pdftricks not loaded }% pst-pdf not loaded \fi From 0e766e7cc11bd9d34bdb3e8de3c789a00e65dfca Mon Sep 17 00:00:00 2001 From: David Carlisle Date: Sat, 13 Apr 2024 23:46:37 +0100 Subject: [PATCH 02/10] wider log lines in current l3build --- testfiles-plain/eplain-001.luatex.tlg | 12 +++---- testfiles-plain/eplain-001.tlg | 12 +++---- testfiles-plain/eplain-001.xetex.tlg | 12 +++---- testfiles-xetex/xetex001.tlg | 6 ++-- testfiles/dvipdfmx001.luatex.tlg | 14 ++++---- testfiles/dvipdfmx001.tlg | 14 ++++---- testfiles/dvipdfmx001.xetex.tlg | 14 ++++---- testfiles/dvips001.luatex.tlg | 48 +++++++++------------------ testfiles/dvips001.tlg | 4 +-- testfiles/dvips001.xetex.tlg | 4 +-- testfiles/pagecolor-001.luatex.tlg | 24 +++++--------- testfiles/pagecolor-002.luatex.tlg | 3 +- testfiles/pagecolor-003.luatex.tlg | 6 ++-- testfiles/pdftex001.luatex.tlg | 9 +++-- testfiles/pdftex001.tlg | 3 +- testfiles/zipped-000.xetex.tlg | 3 +- 16 files changed, 76 insertions(+), 112 deletions(-) diff --git a/testfiles-plain/eplain-001.luatex.tlg b/testfiles-plain/eplain-001.luatex.tlg index d118c97..889ced5 100644 --- a/testfiles-plain/eplain-001.luatex.tlg +++ b/testfiles-plain/eplain-001.luatex.tlg @@ -1,7 +1,6 @@ This is a generated file for the l3build validation system. Don't change this file in any respect. -(graphicx.tex -(../miniltx.tex +(graphicx.tex (../miniltx.tex \@tempcnta=\count... \@tempcntb=\count... \@tempdima=\dimen... @@ -26,19 +25,16 @@ Defining generic filename parser. \@dashdim=\dimen... \fboxsep=\dimen... \fboxrule=\dimen... -) -(../graphicx.sty +) (../graphicx.sty graphicx: ....-..-.. v... Enhanced LaTeX Graphics (DPC,SPQR) (../keyval.sty keyval: ....-..-.. v... key=value parser (DPC) \KV@toks@=\toks... -) -(../graphics.sty +) (../graphics.sty graphics: ....-..-.. v... Standard LaTeX Graphics (DPC,SPQR) (../trig.sty trig: ....-..-.. v... sin cos tan (DPC) -) -(../graphics.cfg +) (../graphics.cfg graphics.cfg: ....-..-.. v... sample graphics configuration ) graphics: Driver file: luatex.def diff --git a/testfiles-plain/eplain-001.tlg b/testfiles-plain/eplain-001.tlg index e358078..a995064 100644 --- a/testfiles-plain/eplain-001.tlg +++ b/testfiles-plain/eplain-001.tlg @@ -1,7 +1,6 @@ This is a generated file for the l3build validation system. Don't change this file in any respect. -(graphicx.tex -(../miniltx.tex +(graphicx.tex (../miniltx.tex \@tempcnta=\count... \@tempcntb=\count... \@tempdima=\dimen... @@ -26,19 +25,16 @@ Defining generic filename parser. \@dashdim=\dimen... \fboxsep=\dimen... \fboxrule=\dimen... -) -(../graphicx.sty +) (../graphicx.sty graphicx: ....-..-.. v... Enhanced LaTeX Graphics (DPC,SPQR) (../keyval.sty keyval: ....-..-.. v... key=value parser (DPC) \KV@toks@=\toks... -) -(../graphics.sty +) (../graphics.sty graphics: ....-..-.. v... Standard LaTeX Graphics (DPC,SPQR) (../trig.sty trig: ....-..-.. v... sin cos tan (DPC) -) -(../graphics.cfg +) (../graphics.cfg graphics.cfg: ....-..-.. v... sample graphics configuration ) graphics: Driver file: pdftex.def diff --git a/testfiles-plain/eplain-001.xetex.tlg b/testfiles-plain/eplain-001.xetex.tlg index 684bade..c56591a 100644 --- a/testfiles-plain/eplain-001.xetex.tlg +++ b/testfiles-plain/eplain-001.xetex.tlg @@ -1,7 +1,6 @@ This is a generated file for the l3build validation system. Don't change this file in any respect. -(graphicx.tex -(../miniltx.tex +(graphicx.tex (../miniltx.tex \@tempcnta=\count... \@tempcntb=\count... \@tempdima=\dimen... @@ -26,19 +25,16 @@ Defining generic filename parser. \@dashdim=\dimen... \fboxsep=\dimen... \fboxrule=\dimen... -) -(../graphicx.sty +) (../graphicx.sty graphicx: ....-..-.. v... Enhanced LaTeX Graphics (DPC,SPQR) (../keyval.sty keyval: ....-..-.. v... key=value parser (DPC) \KV@toks@=\toks... -) -(../graphics.sty +) (../graphics.sty graphics: ....-..-.. v... Standard LaTeX Graphics (DPC,SPQR) (../trig.sty trig: ....-..-.. v... sin cos tan (DPC) -) -(../graphics.cfg +) (../graphics.cfg graphics.cfg: ....-..-.. v... sample graphics configuration ) graphics: Driver file: xetex.def diff --git a/testfiles-xetex/xetex001.tlg b/testfiles-xetex/xetex001.tlg index ea498bc..6aec74f 100644 --- a/testfiles-xetex/xetex001.tlg +++ b/testfiles-xetex/xetex001.tlg @@ -131,7 +131,7 @@ Completed box being shipped out [2] ...\hbox(49.99988+0.0)x345.0, glue set 280.00012fil ....\hbox(0.0+0.0)x15.0 ....\hbox(49.99988+0.0)x49.99988 -.....\special{pdf:image bbox 12.9514 64.757 62.76448 114.57008 clip 1 width 49.9998\ETC.} +.....\special{pdf:image bbox 12.9514 64.757 62.76448 114.57008 clip 1 width 49.99988pt (clip-1-2.jpg) } ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 @@ -141,7 +141,7 @@ Completed box being shipped out [2] ...\hbox(49.99988+0.0)x345.0, glue set 280.00012fil ....\hbox(0.0+0.0)x15.0 ....\hbox(49.99988+0.0)x49.99988 -.....\special{pdf:image bbox 12.9514 64.757 62.76448 114.57008 clip 1 width 49.9998\ETC.} +.....\special{pdf:image bbox 12.9514 64.757 62.76448 114.57008 clip 1 width 49.99988pt (clip-1-2.png) } ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 @@ -151,7 +151,7 @@ Completed box being shipped out [2] ...\hbox(128.88118+0.0)x345.0, glue set 183.65361fil ....\hbox(0.0+0.0)x15.0 ....\hbox(128.88118+0.0)x146.34639 -.....\special{pdf:image bbox 0 0 145.79965 128.39969 clip 0 width 146.34639pt (clip\ETC.} +.....\special{pdf:image bbox 0 0 145.79965 128.39969 clip 0 width 146.34639pt (clip-1-2.jpg) <>} ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 diff --git a/testfiles/dvipdfmx001.luatex.tlg b/testfiles/dvipdfmx001.luatex.tlg index 4e669db..9e8094e 100644 --- a/testfiles/dvipdfmx001.luatex.tlg +++ b/testfiles/dvipdfmx001.luatex.tlg @@ -30,7 +30,7 @@ Completed box being shipped out [1] .....\localrightbox=null ....\hbox(0.0+0.0)x15.0, direction TLT ....\hbox(240.9+0.0)x321.2, direction TLT -.....\special{pdf:epdf pagebox cropbox bbox 0 0 320 240 clip 0 width 321.2pt (examp\ETC.} +.....\special{pdf:epdf pagebox cropbox bbox 0 0 320 240 clip 0 width 321.2pt (example-image-a.pdf) } ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 @@ -45,7 +45,7 @@ Completed box being shipped out [1] .....\localrightbox=null ....\hbox(0.0+0.0)x15.0, direction TLT ....\hbox(240.9+0.0)x321.2, direction TLT -.....\special{pdf:epdf page 1 pagebox cropbox bbox 0 0 320 240 clip 0 width 321.2pt\ETC.} +.....\special{pdf:epdf page 1 pagebox cropbox bbox 0 0 320 240 clip 0 width 321.2pt (example-image-a.pdf) } ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 @@ -60,7 +60,7 @@ Completed box being shipped out [1] .....\localrightbox=null ....\hbox(0.0+0.0)x15.0, direction TLT ....\hbox(50.1875+0.0)x30.11249, direction TLT -.....\special{pdf:epdf pagebox cropbox bbox 0 0 30 50 clip 0 width 30.11249pt (az2.\ETC.} +.....\special{pdf:epdf pagebox cropbox bbox 0 0 30 50 clip 0 width 30.11249pt (az2.pdf) } ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 @@ -99,7 +99,7 @@ Completed box being shipped out [2] .....\localrightbox=null ....\hbox(0.0+0.0)x15.0, direction TLT ....\hbox(36.135+0.0)x36.135, direction TLT -.....\special{pdf:epdf pagebox artbox bbox 36 36 72 72 clip 0 width 36.135pt (az2.p\ETC.} +.....\special{pdf:epdf pagebox artbox bbox 36 36 72 72 clip 0 width 36.135pt (az2.pdf) } ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 @@ -114,7 +114,7 @@ Completed box being shipped out [2] .....\localrightbox=null ....\hbox(0.0+0.0)x15.0, direction TLT ....\hbox(49.99988+0.0)x49.99988, direction TLT -.....\special{pdf:image bbox 12.9514 64.757 62.76448 114.57008 clip 1 width 49.9998\ETC.} +.....\special{pdf:image bbox 12.9514 64.757 62.76448 114.57008 clip 1 width 49.99988pt (clip-1-2.jpg) } ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 @@ -129,7 +129,7 @@ Completed box being shipped out [2] .....\localrightbox=null ....\hbox(0.0+0.0)x15.0, direction TLT ....\hbox(49.99988+0.0)x49.99988, direction TLT -.....\special{pdf:image bbox 12.9514 64.757 62.76448 114.57008 clip 1 width 49.9998\ETC.} +.....\special{pdf:image bbox 12.9514 64.757 62.76448 114.57008 clip 1 width 49.99988pt (clip-1-2.png) } ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 @@ -144,7 +144,7 @@ Completed box being shipped out [2] .....\localrightbox=null ....\hbox(0.0+0.0)x15.0, direction TLT ....\hbox(128.48+0.0)x146.54749, direction TLT -.....\special{pdf:image bbox 0 0 146 128 clip 0 width 146.54749pt (clip-1-2.jpg) <<\ETC.} +.....\special{pdf:image bbox 0 0 146 128 clip 0 width 146.54749pt (clip-1-2.jpg) <>} ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 diff --git a/testfiles/dvipdfmx001.tlg b/testfiles/dvipdfmx001.tlg index a1efdda..62dcf28 100644 --- a/testfiles/dvipdfmx001.tlg +++ b/testfiles/dvipdfmx001.tlg @@ -25,7 +25,7 @@ Completed box being shipped out [1] ...\hbox(240.9+0.0)x345.0, glue set 8.8fil ....\hbox(0.0+0.0)x15.0 ....\hbox(240.9+0.0)x321.2 -.....\special{pdf:epdf pagebox cropbox bbox 0 0 320 240 clip 0 width 321.2pt (examp\ETC.} +.....\special{pdf:epdf pagebox cropbox bbox 0 0 320 240 clip 0 width 321.2pt (example-image-a.pdf) } ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 @@ -35,7 +35,7 @@ Completed box being shipped out [1] ...\hbox(240.9+0.0)x345.0, glue set 8.8fil ....\hbox(0.0+0.0)x15.0 ....\hbox(240.9+0.0)x321.2 -.....\special{pdf:epdf page 1 pagebox cropbox bbox 0 0 320 240 clip 0 width 321.2pt\ETC.} +.....\special{pdf:epdf page 1 pagebox cropbox bbox 0 0 320 240 clip 0 width 321.2pt (example-image-a.pdf) } ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 @@ -45,7 +45,7 @@ Completed box being shipped out [1] ...\hbox(50.1875+0.0)x345.0, glue set 299.88751fil ....\hbox(0.0+0.0)x15.0 ....\hbox(50.1875+0.0)x30.11249 -.....\special{pdf:epdf pagebox cropbox bbox 0 0 30 50 clip 0 width 30.11249pt (az2.\ETC.} +.....\special{pdf:epdf pagebox cropbox bbox 0 0 30 50 clip 0 width 30.11249pt (az2.pdf) } ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 @@ -79,7 +79,7 @@ Completed box being shipped out [2] ...\hbox(36.135+0.0)x345.0, glue set 293.865fil ....\hbox(0.0+0.0)x15.0 ....\hbox(36.135+0.0)x36.135 -.....\special{pdf:epdf pagebox artbox bbox 36 36 72 72 clip 0 width 36.135pt (az2.p\ETC.} +.....\special{pdf:epdf pagebox artbox bbox 36 36 72 72 clip 0 width 36.135pt (az2.pdf) } ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 @@ -89,7 +89,7 @@ Completed box being shipped out [2] ...\hbox(49.99988+0.0)x345.0, glue set 280.00012fil ....\hbox(0.0+0.0)x15.0 ....\hbox(49.99988+0.0)x49.99988 -.....\special{pdf:image bbox 12.9514 64.757 62.76448 114.57008 clip 1 width 49.9998\ETC.} +.....\special{pdf:image bbox 12.9514 64.757 62.76448 114.57008 clip 1 width 49.99988pt (clip-1-2.jpg) } ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 @@ -99,7 +99,7 @@ Completed box being shipped out [2] ...\hbox(49.99988+0.0)x345.0, glue set 280.00012fil ....\hbox(0.0+0.0)x15.0 ....\hbox(49.99988+0.0)x49.99988 -.....\special{pdf:image bbox 12.9514 64.757 62.76448 114.57008 clip 1 width 49.9998\ETC.} +.....\special{pdf:image bbox 12.9514 64.757 62.76448 114.57008 clip 1 width 49.99988pt (clip-1-2.png) } ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 @@ -109,7 +109,7 @@ Completed box being shipped out [2] ...\hbox(128.48+0.0)x345.0, glue set 183.45251fil ....\hbox(0.0+0.0)x15.0 ....\hbox(128.48+0.0)x146.54749 -.....\special{pdf:image bbox 0 0 146 128 clip 0 width 146.54749pt (clip-1-2.jpg) <<\ETC.} +.....\special{pdf:image bbox 0 0 146 128 clip 0 width 146.54749pt (clip-1-2.jpg) <>} ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 diff --git a/testfiles/dvipdfmx001.xetex.tlg b/testfiles/dvipdfmx001.xetex.tlg index 7ac0ca6..cebfe51 100644 --- a/testfiles/dvipdfmx001.xetex.tlg +++ b/testfiles/dvipdfmx001.xetex.tlg @@ -25,7 +25,7 @@ Completed box being shipped out [1] ...\hbox(240.9+0.0)x345.0, glue set 8.8fil ....\hbox(0.0+0.0)x15.0 ....\hbox(240.9+0.0)x321.2 -.....\special{pdf:epdf pagebox cropbox bbox 0 0 320 240 clip 0 width 321.2pt (examp\ETC.} +.....\special{pdf:epdf pagebox cropbox bbox 0 0 320 240 clip 0 width 321.2pt (example-image-a.pdf) } ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 @@ -35,7 +35,7 @@ Completed box being shipped out [1] ...\hbox(240.9+0.0)x345.0, glue set 8.8fil ....\hbox(0.0+0.0)x15.0 ....\hbox(240.9+0.0)x321.2 -.....\special{pdf:epdf page 1 pagebox cropbox bbox 0 0 320 240 clip 0 width 321.2pt\ETC.} +.....\special{pdf:epdf page 1 pagebox cropbox bbox 0 0 320 240 clip 0 width 321.2pt (example-image-a.pdf) } ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 @@ -45,7 +45,7 @@ Completed box being shipped out [1] ...\hbox(50.1875+0.0)x345.0, glue set 299.88751fil ....\hbox(0.0+0.0)x15.0 ....\hbox(50.1875+0.0)x30.11249 -.....\special{pdf:epdf pagebox cropbox bbox 0 0 30 50 clip 0 width 30.11249pt (az2.\ETC.} +.....\special{pdf:epdf pagebox cropbox bbox 0 0 30 50 clip 0 width 30.11249pt (az2.pdf) } ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 @@ -79,7 +79,7 @@ Completed box being shipped out [2] ...\hbox(36.135+0.0)x345.0, glue set 293.865fil ....\hbox(0.0+0.0)x15.0 ....\hbox(36.135+0.0)x36.135 -.....\special{pdf:epdf pagebox artbox bbox 36 36 72 72 clip 0 width 36.135pt (az2.p\ETC.} +.....\special{pdf:epdf pagebox artbox bbox 36 36 72 72 clip 0 width 36.135pt (az2.pdf) } ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 @@ -89,7 +89,7 @@ Completed box being shipped out [2] ...\hbox(49.99988+0.0)x345.0, glue set 280.00012fil ....\hbox(0.0+0.0)x15.0 ....\hbox(49.99988+0.0)x49.99988 -.....\special{pdf:image bbox 12.9514 64.757 62.76448 114.57008 clip 1 width 49.9998\ETC.} +.....\special{pdf:image bbox 12.9514 64.757 62.76448 114.57008 clip 1 width 49.99988pt (clip-1-2.jpg) } ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 @@ -99,7 +99,7 @@ Completed box being shipped out [2] ...\hbox(49.99988+0.0)x345.0, glue set 280.00012fil ....\hbox(0.0+0.0)x15.0 ....\hbox(49.99988+0.0)x49.99988 -.....\special{pdf:image bbox 12.9514 64.757 62.76448 114.57008 clip 1 width 49.9998\ETC.} +.....\special{pdf:image bbox 12.9514 64.757 62.76448 114.57008 clip 1 width 49.99988pt (clip-1-2.png) } ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 @@ -109,7 +109,7 @@ Completed box being shipped out [2] ...\hbox(128.48+0.0)x345.0, glue set 183.45251fil ....\hbox(0.0+0.0)x15.0 ....\hbox(128.48+0.0)x146.54749 -.....\special{pdf:image bbox 0 0 146 128 clip 0 width 146.54749pt (clip-1-2.jpg) <<\ETC.} +.....\special{pdf:image bbox 0 0 146 128 clip 0 width 146.54749pt (clip-1-2.jpg) <>} ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 diff --git a/testfiles/dvips001.luatex.tlg b/testfiles/dvips001.luatex.tlg index faf917e..c5a561f 100644 --- a/testfiles/dvips001.luatex.tlg +++ b/testfiles/dvips001.luatex.tlg @@ -183,8 +183,7 @@ A funny symbol that I can't read has just been (re)read. Just continue, I'll change it to 0xFFFD. ! String contains an invalid utf-8 sequence. B - ššHqbŝ"ݡx^^T/nsss72727ѹѹ^^Z^^Z^^Yffr^^@99Al^^\B^^@^^UUm čU.. -. + ššHqbŝ"ݡx^^T/nsss72727ѹѹ^^Z^^Z^^Yffr^^@99Al^^\B^^@^^UUm čU... l. ...\includegraphics[page = 1]{example-image-a.pdf} A funny symbol that I can't read has just been (re)read. Just continue, I'll change it to 0xFFFD. @@ -244,15 +243,13 @@ A funny symbol that I can't read has just been (re)read. Just continue, I'll change it to 0xFFFD. ! String contains an invalid utf-8 sequence. - RRffd{.//,::,^^@^^Y,^^@^^YI5^^]Y^^@H^^E S^^GS^^G^^Dyoo^^B^^BPyy^^\^^\ -;^^\;]UVGRPPC^^^^^@... + RRffd{.//,::,^^@^^Y,^^@^^YI5^^]Y^^@H^^E S^^GS^^G^^Dyoo^^B^^BPyy^^\^^\;^^\;]UVGRPPC^^^^^@... l. ...\includegraphics[page = 1]{example-image-a.pdf} A funny symbol that I can't read has just been (re)read. Just continue, I'll change it to 0xFFFD. ! String contains an invalid utf-8 sequence. RR - ffd{.//,::,^^@^^Y,^^@^^YI5^^]Y^^@H^^E S^^GS^^G^^Dyoo^^B^^BPyy^^\^^\ -;^^\;]UVGRPPC^^^^^@... + ffd{.//,::,^^@^^Y,^^@^^YI5^^]Y^^@H^^E S^^GS^^G^^Dyoo^^B^^BPyy^^\^^\;^^\;]UVGRPPC^^^^^@... l. ...\includegraphics[page = 1]{example-image-a.pdf} A funny symbol that I can't read has just been (re)read. Just continue, I'll change it to 0xFFFD. @@ -282,8 +279,7 @@ A funny symbol that I can't read has just been (re)read. Just continue, I'll change it to 0xFFFD. ! String contains an invalid utf-8 sequence. RRffd{.//,:: - ,^^@^^Y,^^@^^YI5^^]Y^^@H^^E S^^GS^^G^^Dyoo^^B^^BPyy^^\^^\;^^\;]UVGRPPC^^^^^@.. -. + ,^^@^^Y,^^@^^YI5^^]Y^^@H^^E S^^GS^^G^^Dyoo^^B^^BPyy^^\^^\;^^\;]UVGRPPC^^^^^@... l. ...\includegraphics[page = 1]{example-image-a.pdf} A funny symbol that I can't read has just been (re)read. Just continue, I'll change it to 0xFFFD. @@ -313,8 +309,7 @@ A funny symbol that I can't read has just been (re)read. Just continue, I'll change it to 0xFFFD. ! String contains an invalid utf-8 sequence. B&~I - "^^C``|JsJsJsbą^^F^^FOOՏ^^TSVr$GM]B@B@i;^^UOO|bb錖^^O-^^@^^@ݑ=ih'' -d... + "^^C``|JsJsJsbą^^F^^FOOՏ^^TSVr$GM]B@B@i;^^UOO|bb錖^^O-^^@^^@ݑ=ih''d... l. ...\includegraphics[page = 1]{example-image-a.pdf} A funny symbol that I can't read has just been (re)read. Just continue, I'll change it to 0xFFFD. @@ -374,8 +369,7 @@ A funny symbol that I can't read has just been (re)read. Just continue, I'll change it to 0xFFFD. ! String contains an invalid utf-8 sequence. - ^^]^^]-112٭^^^C.^^C.(^^~~~t[_ vv99oo^^L^^L@,[[+e$$%% ; ; -^^_^^_ᘜ<1^^d3֒... + ^^]^^]-112٭^^^C.^^C.(^^~~~t[_ vv99oo^^L^^L@,[[+e$$%% ; ;^^_^^_ᘜ<1^^d3֒... l. ...\includegraphics[page = 1]{example-image-a.pdf} A funny symbol that I can't read has just been (re)read. Just continue, I'll change it to 0xFFFD. @@ -387,50 +381,43 @@ A funny symbol that I can't read has just been (re)read. Just continue, I'll change it to 0xFFFD. ! String contains an invalid utf-8 sequence. ^^]^^]- - 112٭^^^C.^^C.(^^~~~t[_ vv99oo^^L^^L@,[[+e$$%% ; ; -^^_^^_ᘜ<1^^d3֒... + 112٭^^^C.^^C.(^^~~~t[_ vv99oo^^L^^L@,[[+e$$%% ; ;^^_^^_ᘜ<1^^d3֒... l. ...\includegraphics[page = 1]{example-image-a.pdf} A funny symbol that I can't read has just been (re)read. Just continue, I'll change it to 0xFFFD. ! String contains an invalid utf-8 sequence. ^^]^^]-112٭^ - ^^C.^^C.(^^~~~t[_ vv99oo^^L^^L@,[[+e$$%% ; ; -^^_^^_ᘜ<1^^d3֒... + ^^C.^^C.(^^~~~t[_ vv99oo^^L^^L@,[[+e$$%% ; ;^^_^^_ᘜ<1^^d3֒... l. ...\includegraphics[page = 1]{example-image-a.pdf} A funny symbol that I can't read has just been (re)read. Just continue, I'll change it to 0xFFFD. ! String contains an invalid utf-8 sequence. ^^]^^]-112٭^^^C.^^C.( - ^^~~~t[_ vv99oo^^L^^L@,[[+e$$%% ; ;^^_^^_ -ᘜ<1^^d3֒... + ^^~~~t[_ vv99oo^^L^^L@,[[+e$$%% ; ;^^_^^_ᘜ<1^^d3֒... l. ...\includegraphics[page = 1]{example-image-a.pdf} A funny symbol that I can't read has just been (re)read. Just continue, I'll change it to 0xFFFD. ! String contains an invalid utf-8 sequence. ^^]^^]-112٭^^^C.^^C.(^^~ - ~~t[_ vv99oo^^L^^L@,[[+e$$%% ; ;^^_^^_ᘜ<1 -^^d3֒... + ~~t[_ vv99oo^^L^^L@,[[+e$$%% ; ;^^_^^_ᘜ<1^^d3֒... l. ...\includegraphics[page = 1]{example-image-a.pdf} A funny symbol that I can't read has just been (re)read. Just continue, I'll change it to 0xFFFD. ! String contains an invalid utf-8 sequence. ^^]^^]-112٭^^^C.^^C.(^^~~~t[_ - vv99oo^^L^^L@,[[+e$$%% ; ;^^_^^_ᘜ<1 -^^d3֒... + vv99oo^^L^^L@,[[+e$$%% ; ;^^_^^_ᘜ<1^^d3֒... l. ...\includegraphics[page = 1]{example-image-a.pdf} A funny symbol that I can't read has just been (re)read. Just continue, I'll change it to 0xFFFD. ! String contains an invalid utf-8 sequence. ^^]^^]-112٭^^^C.^^C.(^^~~~t[_ vv - 99oo^^L^^L@,[[+e$$%% ; ;^^_^^_ᘜ<1^^d3 -֒... + 99oo^^L^^L@,[[+e$$%% ; ;^^_^^_ᘜ<1^^d3֒... l. ...\includegraphics[page = 1]{example-image-a.pdf} A funny symbol that I can't read has just been (re)read. Just continue, I'll change it to 0xFFFD. ! String contains an invalid utf-8 sequence. ^^]^^]-112٭^^^C.^^C.(^^~~~t[_ vv99o - o^^L^^L@,[[+e$$%% ; ;^^_^^_ᘜ<1^^d3֒.. -. + o^^L^^L@,[[+e$$%% ; ;^^_^^_ᘜ<1^^d3֒... l. ...\includegraphics[page = 1]{example-image-a.pdf} A funny symbol that I can't read has just been (re)read. Just continue, I'll change it to 0xFFFD. @@ -448,15 +435,13 @@ A funny symbol that I can't read has just been (re)read. Just continue, I'll change it to 0xFFFD. ! String contains an invalid utf-8 sequence. ^^9c^^_^^_ - ^^IǼu8.jt҂^^C^^^^_^^^_^Dz~*a*a]VVc;p;p0^^?"^^R^^RsLPLL5^^T[^^W^9-N^^I -^^[\^^[\... + ^^IǼu8.jt҂^^C^^^^_^^^_^Dz~*a*a]VVc;p;p0^^?"^^R^^RsLPLL5^^T[^^W^9-N^^I^^[\^^[\... l. ...\includegraphics[page = 1]{example-image-a.pdf} A funny symbol that I can't read has just been (re)read. Just continue, I'll change it to 0xFFFD. ! String contains an invalid utf-8 sequence. ^^9c^^_^^_^^IǼ - u8.jt҂^^C^^^^_^^^_^Dz~*a*a]VVc;p;p0^^?"^^R^^RsLPLL5^^T[^^W^9-N^^I -^^[\^^[\... + u8.jt҂^^C^^^^_^^^_^Dz~*a*a]VVc;p;p0^^?"^^R^^RsLPLL5^^T[^^W^9-N^^I^^[\^^[\... l. ...\includegraphics[page = 1]{example-image-a.pdf} A funny symbol that I can't read has just been (re)read. Just continue, I'll change it to 0xFFFD. @@ -528,8 +513,7 @@ A funny symbol that I can't read has just been (re)read. Just continue, I'll change it to 0xFFFD. ! String contains an invalid utf-8 sequence. - OOO``ass11^^NIaIaTTx^^X׊^^Ni}}؏^^DV^^L^^LXڎ^^Z(dd^^Vi]:JJKn)1^^D^^D.. -. + OOO``ass11^^NIaIaTTx^^X׊^^Ni}}؏^^DV^^L^^LXڎ^^Z(dd^^Vi]:JJKn)1^^D^^D... l. ...\includegraphics[page = 1]{example-image-a.pdf} A funny symbol that I can't read has just been (re)read. Just continue, I'll change it to 0xFFFD. diff --git a/testfiles/dvips001.tlg b/testfiles/dvips001.tlg index 5224a21..f9b761e 100644 --- a/testfiles/dvips001.tlg +++ b/testfiles/dvips001.tlg @@ -95,7 +95,7 @@ Completed box being shipped out [1] ...\hbox(49.99988+0.0)x345.0, glue set 280.00012fil ....\hbox(0.0+0.0)x15.0 ....\hbox(49.99988+0.0)x49.99988 -.....\special{PSfile="clip-1-2.jpg" llx=12.9514 lly=64.757 urx=62.76448 ury=114.570\ETC.} +.....\special{PSfile="clip-1-2.jpg" llx=12.9514 lly=64.757 urx=62.76448 ury=114.57008 rwi=498 clip} ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 @@ -105,7 +105,7 @@ Completed box being shipped out [1] ...\hbox(49.99988+0.0)x345.0, glue set 280.00012fil ....\hbox(0.0+0.0)x15.0 ....\hbox(49.99988+0.0)x49.99988 -.....\special{PSfile="clip-1-2.png" llx=12.9514 lly=64.757 urx=62.76448 ury=114.570\ETC.} +.....\special{PSfile="clip-1-2.png" llx=12.9514 lly=64.757 urx=62.76448 ury=114.57008 rwi=498 clip} ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 diff --git a/testfiles/dvips001.xetex.tlg b/testfiles/dvips001.xetex.tlg index 84a1230..834abef 100644 --- a/testfiles/dvips001.xetex.tlg +++ b/testfiles/dvips001.xetex.tlg @@ -5985,7 +5985,7 @@ Completed box being shipped out [1] ...\hbox(49.99988+0.0)x345.0, glue set 280.00012fil ....\hbox(0.0+0.0)x15.0 ....\hbox(49.99988+0.0)x49.99988 -.....\special{PSfile="clip-1-2.jpg" llx=12.9514 lly=64.757 urx=62.76448 ury=114.570\ETC.} +.....\special{PSfile="clip-1-2.jpg" llx=12.9514 lly=64.757 urx=62.76448 ury=114.57008 rwi=498 clip} ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 @@ -5995,7 +5995,7 @@ Completed box being shipped out [1] ...\hbox(49.99988+0.0)x345.0, glue set 280.00012fil ....\hbox(0.0+0.0)x15.0 ....\hbox(49.99988+0.0)x49.99988 -.....\special{PSfile="clip-1-2.png" llx=12.9514 lly=64.757 urx=62.76448 ury=114.570\ETC.} +.....\special{PSfile="clip-1-2.png" llx=12.9514 lly=64.757 urx=62.76448 ury=114.57008 rwi=498 clip} ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 diff --git a/testfiles/pagecolor-001.luatex.tlg b/testfiles/pagecolor-001.luatex.tlg index 868eb85..14d8dbd 100644 --- a/testfiles/pagecolor-001.luatex.tlg +++ b/testfiles/pagecolor-001.luatex.tlg @@ -7,8 +7,7 @@ Completed box being shipped out [1] ..\vbox(0.0+0.0)x0.0, glue set 72.26999fil, direction TLT ...\kern-72.26999 ...\hbox(0.0+0.0)x0.0, direction TLT -....\hbox(17.59016+0.39809)x0.0, glue set - 316.93994fil, shifted 216.81, direct -ion TLT +....\hbox(17.59016+0.39809)x0.0, glue set - 316.93994fil, shifted 216.81, direction TLT .....\kern72.26999 .....\TU/lmr/m/n/24.88 B .....\TU/lmr/m/n/24.88 A @@ -89,16 +88,14 @@ Completed box being shipped out [2] ..\vbox(0.0+0.0)x0.0, glue set 72.26999fil, direction TLT ...\kern-72.26999 ...\hbox(0.0+0.0)x0.0, direction TLT -....\hbox(794.96999+0.0)x0.0, glue set - 614.29498fil, shifted 794.96999, direct -ion TLT +....\hbox(794.96999+0.0)x0.0, glue set - 614.29498fil, shifted 794.96999, direction TLT .....\kern0.0 .....\pdfcolorstack 0 push {1 0 0 rg 1 0 0 RG} .....\hbox(794.96999+0.0)x614.295, direction TLT ......\rule(794.96999+0.0)x614.295 .....\glue 0.0 plus 1.0fil minus 1.0fil ....\pdfcolorstack 0 pop -....\hbox(17.59016+0.39809)x0.0, glue set - 316.93994fil, shifted 216.81, direct -ion TLT +....\hbox(17.59016+0.39809)x0.0, glue set - 316.93994fil, shifted 216.81, direction TLT .....\kern72.26999 .....\TU/lmr/m/n/24.88 B .....\TU/lmr/m/n/24.88 A @@ -173,8 +170,7 @@ Completed box being shipped out [3] ..\vbox(0.0+0.0)x0.0, glue set 72.26999fil, direction TLT ...\kern-72.26999 ...\hbox(0.0+0.0)x0.0, direction TLT -....\hbox(17.59016+0.39809)x0.0, glue set - 316.93994fil, shifted 216.81, direct -ion TLT +....\hbox(17.59016+0.39809)x0.0, glue set - 316.93994fil, shifted 216.81, direction TLT .....\kern72.26999 .....\TU/lmr/m/n/24.88 B .....\TU/lmr/m/n/24.88 A @@ -254,16 +250,14 @@ Completed box being shipped out [4] ..\vbox(0.0+0.0)x0.0, glue set 72.26999fil, direction TLT ...\kern-72.26999 ...\hbox(0.0+0.0)x0.0, direction TLT -....\hbox(794.96999+0.0)x0.0, glue set - 614.29498fil, shifted 794.96999, direct -ion TLT +....\hbox(794.96999+0.0)x0.0, glue set - 614.29498fil, shifted 794.96999, direction TLT .....\kern0.0 .....\pdfcolorstack 0 push {0 1 0 rg 0 1 0 RG} .....\hbox(794.96999+0.0)x614.295, direction TLT ......\rule(794.96999+0.0)x614.295 .....\glue 0.0 plus 1.0fil minus 1.0fil ....\pdfcolorstack 0 pop -....\hbox(17.59016+0.39809)x0.0, glue set - 316.93994fil, shifted 216.81, direct -ion TLT +....\hbox(17.59016+0.39809)x0.0, glue set - 316.93994fil, shifted 216.81, direction TLT .....\kern72.26999 .....\TU/lmr/m/n/24.88 B .....\TU/lmr/m/n/24.88 A @@ -339,16 +333,14 @@ Completed box being shipped out [5] ..\vbox(0.0+0.0)x0.0, glue set 72.26999fil, direction TLT ...\kern-72.26999 ...\hbox(0.0+0.0)x0.0, direction TLT -....\hbox(794.96999+0.0)x0.0, glue set - 1228.58997fil, shifted 794.96999, direc -tion TLT +....\hbox(794.96999+0.0)x0.0, glue set - 1228.58997fil, shifted 794.96999, direction TLT .....\kern0.0 .....\pdfcolorstack 0 push {0 1 0 rg 0 1 0 RG} .....\hbox(794.96999+0.0)x1228.59, direction TLT ......\rule(794.96999+0.0)x1228.59 .....\glue 0.0 plus 1.0fil minus 1.0fil ....\pdfcolorstack 0 pop -....\hbox(17.59016+0.39809)x0.0, glue set - 316.93994fil, shifted 216.81, direct -ion TLT +....\hbox(17.59016+0.39809)x0.0, glue set - 316.93994fil, shifted 216.81, direction TLT .....\kern72.26999 .....\TU/lmr/m/n/24.88 B .....\TU/lmr/m/n/24.88 A diff --git a/testfiles/pagecolor-002.luatex.tlg b/testfiles/pagecolor-002.luatex.tlg index 8f7f0bb..8398515 100644 --- a/testfiles/pagecolor-002.luatex.tlg +++ b/testfiles/pagecolor-002.luatex.tlg @@ -65,8 +65,7 @@ Completed box being shipped out [2] ..\vbox(0.0+0.0)x0.0, glue set 72.26999fil, direction TLT ...\kern-72.26999 ...\hbox(0.0+0.0)x0.0, direction TLT -....\hbox(794.96999+0.0)x0.0, glue set - 614.29498fil, shifted 794.96999, direct -ion TLT +....\hbox(794.96999+0.0)x0.0, glue set - 614.29498fil, shifted 794.96999, direction TLT .....\kern0.0 .....\pdfcolorstack 0 push {1 0 0 rg 1 0 0 RG} .....\hbox(794.96999+0.0)x614.295, direction TLT diff --git a/testfiles/pagecolor-003.luatex.tlg b/testfiles/pagecolor-003.luatex.tlg index 1291edd..163d890 100644 --- a/testfiles/pagecolor-003.luatex.tlg +++ b/testfiles/pagecolor-003.luatex.tlg @@ -7,8 +7,7 @@ Completed box being shipped out [1] ..\vbox(0.0+0.0)x0.0, glue set 72.26999fil, direction TLT ...\kern-72.26999 ...\hbox(0.0+0.0)x0.0, direction TLT -....\hbox(794.96999+0.0)x0.0, glue set - 614.29498fil, shifted 794.96999, direct -ion TLT +....\hbox(794.96999+0.0)x0.0, glue set - 614.29498fil, shifted 794.96999, direction TLT .....\kern0.0 .....\pdfcolorstack 0 push {1 0 0 rg 1 0 0 RG} .....\hbox(794.96999+0.0)x614.295, direction TLT @@ -74,8 +73,7 @@ Completed box being shipped out [2] ..\vbox(0.0+0.0)x0.0, glue set 72.26999fil, direction TLT ...\kern-72.26999 ...\hbox(0.0+0.0)x0.0, direction TLT -....\hbox(794.96999+0.0)x0.0, glue set - 614.29498fil, shifted 794.96999, direct -ion TLT +....\hbox(794.96999+0.0)x0.0, glue set - 614.29498fil, shifted 794.96999, direction TLT .....\kern0.0 .....\pdfcolorstack 0 push {1 0 0 rg 1 0 0 RG} .....\hbox(794.96999+0.0)x614.295, direction TLT diff --git a/testfiles/pdftex001.luatex.tlg b/testfiles/pdftex001.luatex.tlg index 1ec5c10..e17d642 100644 --- a/testfiles/pdftex001.luatex.tlg +++ b/testfiles/pdftex001.luatex.tlg @@ -11,7 +11,8 @@ spelling (e.g., `I\hbox'). Otherwise just continue, and I'll forget about whatever was undefined. ! Undefined control sequence. \pdfximage - \ifnum 0\ifx \Gin@decode \@empty \else 1\fi \ifGin@interpolate 1\fi l. ...\includegraphics{example-image-a} + \ifnum 0\ifx \Gin@decode \@empty \else 1\fi \ifGin@interpolate 1\fi +l. ...\includegraphics{example-image-a} The control sequence at the end of the top line of your error message was never \def'ed. If you have misspelled it (e.g., `\hobx'), type `I' and the correct @@ -72,13 +73,15 @@ and I'll forget about whatever was undefined. \ifx \Gin@page \@empty \e... l. ...\includegraphics{example-image-a} I'm forgetting what you said and using zero instead. -! Illegal parameter number in definition of \example-image-a.pdf image:cropbox. +! Illegal parameter number in definition of \example-image-a.pdf image:cropbox. + 1 l. ...\includegraphics{example-image-a} You meant to type ## instead of #, right? Or maybe a } was forgotten somewhere earlier, and things are all screwed up? I'm going to assume that you meant ##. -! Illegal parameter number in definition of \example-image-a.pdf image:cropbox. +! Illegal parameter number in definition of \example-image-a.pdf image:cropbox. + 1 l. ...\includegraphics{example-image-a} You meant to type ## instead of #, right? diff --git a/testfiles/pdftex001.tlg b/testfiles/pdftex001.tlg index 3f217e1..7f29c0a 100644 --- a/testfiles/pdftex001.tlg +++ b/testfiles/pdftex001.tlg @@ -216,6 +216,7 @@ Completed box being shipped out [2] ....\OT1/cmr/m/n/10 2 ....\glue 0.0 plus 1.0fil .\kern 0.0 + <./az2.pdf> <./clip-1-2.jpg> Completed box being shipped out \hbox(49.99988+0.0)x49.99988 .\hbox(128.8815+0.0)x133.3468, shifted 64.99983 @@ -227,4 +228,4 @@ Completed box being shipped out .\hbox(128.8815+0.0)x133.3468, shifted 64.99983 ..\glue -12.99995 ..\pdfrefximage(128.8815+0.0)x146.34676 - <./clip-1-2.png> <./az2.pdf> <./clip-1-2.jpg> + <./clip-1-2.png> diff --git a/testfiles/zipped-000.xetex.tlg b/testfiles/zipped-000.xetex.tlg index 3d3c1e7..04167ac 100644 --- a/testfiles/zipped-000.xetex.tlg +++ b/testfiles/zipped-000.xetex.tlg @@ -1164,8 +1164,7 @@ Invalid UTF-8 byte or sequence at line 11 replaced by U+FFFD. Invalid UTF-8 byte or sequence at line 11 replaced by U+FFFD. Invalid UTF-8 byte or sequence at line 11 replaced by U+FFFD. Invalid UTF-8 byte or sequence at line 11 replaced by U+FFFD. -! LaTeX Error: Cannot determine size of graphic in foob^^e1.eps.gz (no BoundingBox -). +! LaTeX Error: Cannot determine size of graphic in foob^^e1.eps.gz (no BoundingBox). See the LaTeX manual or LaTeX Companion for explanation. Type H for immediate help. ... From 2ea31c9cb8229a3da74331a85d7dfe37a263d7ae Mon Sep 17 00:00:00 2001 From: David Carlisle Date: Sun, 14 Apr 2024 00:09:37 +0100 Subject: [PATCH 03/10] errors in different place on wrong driver as shell escape test removed --- testfiles/luatex001.tlg | 130 ++++++++++++ testfiles/pdftex001.xetex.tlg | 373 ++++++++++++++++++++++------------ 2 files changed, 369 insertions(+), 134 deletions(-) diff --git a/testfiles/luatex001.tlg b/testfiles/luatex001.tlg index e69de29..d9cd4d2 100644 --- a/testfiles/luatex001.tlg +++ b/testfiles/luatex001.tlg @@ -0,0 +1,130 @@ +This is a generated file for the l3build validation system. +Don't change this file in any respect. +! Undefined control sequence. + \saveimageresource + \ifnum 0\ifx \Gin@decode \@empty \else 1\fi \i... +l. ...\includegraphics{example-image-a} +The control sequence at the end of the top line +of your error message was never \def'ed. If you have +misspelled it (e.g., `\hobx'), type `I' and the correct +spelling (e.g., `I\hbox'). Otherwise just continue, +and I'll forget about whatever was undefined. +! Undefined control sequence. + ...@tempboxa =\hbox {\useimageresource + \lastsavedimageresourceind... +l. ...\includegraphics{example-image-a} +The control sequence at the end of the top line +of your error message was never \def'ed. If you have +misspelled it (e.g., `\hobx'), type `I' and the correct +spelling (e.g., `I\hbox'). Otherwise just continue, +and I'll forget about whatever was undefined. +! Undefined control sequence. + ...source \lastsavedimageresourceindex + }\def \Gin@llx {0}\let \Gi... +l. ...\includegraphics{example-image-a} +The control sequence at the end of the top line +of your error message was never \def'ed. If you have +misspelled it (e.g., `\hobx'), type `I' and the correct +spelling (e.g., `I\hbox'). Otherwise just continue, +and I'll forget about whatever was undefined. +! Undefined control sequence. + ...@hash \endcsname {\useimageresource + \the \lastsavedimageresour... +l. ...\includegraphics{example-image-a} +The control sequence at the end of the top line +of your error message was never \def'ed. If you have +misspelled it (e.g., `\hobx'), type `I' and the correct +spelling (e.g., `I\hbox'). Otherwise just continue, +and I'll forget about whatever was undefined. +! Undefined control sequence. + ...e \the \lastsavedimageresourceindex + }\expandafter \xdef \csnam... +l. ...\includegraphics{example-image-a} +The control sequence at the end of the top line +of your error message was never \def'ed. If you have +misspelled it (e.g., `\hobx'), type `I' and the correct +spelling (e.g., `I\hbox'). Otherwise just continue, +and I'll forget about whatever was undefined. +! You can't use `end-group character }' after \the. + ... \the \lastsavedimageresourceindex } + \expandafter \xdef \csname... +l. ...\includegraphics{example-image-a} +I'm forgetting what you said and using zero instead. +! Undefined control sequence. + ...d=\the \lastsavedimageresourceindex + , \ifx \Gin@page \@empty \... +l. ...\includegraphics{example-image-a} +The control sequence at the end of the top line +of your error message was never \def'ed. If you have +misspelled it (e.g., `\hobx'), type `I' and the correct +spelling (e.g., `I\hbox'). Otherwise just continue, +and I'll forget about whatever was undefined. +! You can't use `the character ,' after \the. + ...=\the \lastsavedimageresourceindex , + \ifx \Gin@page \@empty \e... +l. ...\includegraphics{example-image-a} +I'm forgetting what you said and using zero instead. +! Illegal parameter number in definition of \example-image-a.pdf image:cropbox. + + 1 +l. ...\includegraphics{example-image-a} +You meant to type ## instead of #, right? +Or maybe a } was forgotten somewhere earlier, and things +are all screwed up? I'm going to assume that you meant ##. +! Illegal parameter number in definition of \example-image-a.pdf image:cropbox. + + 1 +l. ...\includegraphics{example-image-a} +You meant to type ## instead of #, right? +Or maybe a } was forgotten somewhere earlier, and things +are all screwed up? I'm going to assume that you meant ##. +! Undefined control sequence. +\Gin@temp ->\@nil +l. ...\includegraphics{example-image-a} +The control sequence at the end of the top line +of your error message was never \def'ed. If you have +misspelled it (e.g., `\hobx'), type `I' and the correct +spelling (e.g., `I\hbox'). Otherwise just continue, +and I'll forget about whatever was undefined. +! Argument of \@providesfile has an extra }. + + \par +l. ...\includegraphics{example-image-a} +I've run across a `}' that doesn't seem to match anything. +For example, `\def\a#1{...}' and `\a}' would produce +this error. If you simply proceed now, the `\par' that +I've just inserted will cause me to report a runaway +argument that might be the root of the problem. But if +your `}' was spurious, just type `2' and it will go away. +Runaway argument? +{\Gin@base \Gin@ext } +! Paragraph ended before \@providesfile was complete. + + \par +l. ...\includegraphics{example-image-a} +I suspect you've forgotten a `}', causing me to apply this +control sequence to too much text. How can we recover? +My plan is to forget the whole thing and hope for the best. +Runaway argument? +{[}\def \@tempb {\@providesfile {\Gin@base \Gin@ext }[]}\ifx \@tempa \ETC. +! Paragraph ended before \@tempa was complete. + + \par +l. ... +I suspect you've forgotten a `}', causing me to apply this +control sequence to too much text. How can we recover? +My plan is to forget the whole thing and hope for the best. +! Improper \prevdepth. +\newpage ...everypar {}\fi \par \ifdim \prevdepth + >\z@ \vskip -\ifdim \prevd... +l. ...\clearpage +You can refer to \spacefactor only in horizontal mode; +you can refer to \prevdepth only in vertical mode; and +neither of these is meaningful inside \write. So +I'm forgetting what you said and using zero instead. +! TeX capacity exceeded, sorry [input stack size=10000]. +\TYPE #1->\begingroup \long \def \TYPE ## + 1{##1}\immediate \write 128{#1}\end... +l. ...\END +If you really absolutely need more capacity, +you can ask a wizard to enlarge me. diff --git a/testfiles/pdftex001.xetex.tlg b/testfiles/pdftex001.xetex.tlg index 0ed9dda..dd33417 100644 --- a/testfiles/pdftex001.xetex.tlg +++ b/testfiles/pdftex001.xetex.tlg @@ -1,137 +1,242 @@ This is a generated file for the l3build validation system. Don't change this file in any respect. -! Undefined control sequence. -\Gread@pdftex ...\expandafter \relax \pdffilesize - {#1}\relax \expandafter \@... +! Package pdftex.def Error: File `example-image-a.pdf' not found: using draft setting. +See the pdftex.def package documentation for explanation. +Type H for immediate help. + ... l. ...\includegraphics{example-image-a} -The control sequence at the end of the top line -of your error message was never \def'ed. If you have -misspelled it (e.g., `\hobx'), type `I' and the correct -spelling (e.g., `I\hbox'). Otherwise just continue, -and I'll forget about whatever was undefined. -! Undefined control sequence. - \pdfximage - \ifnum 0\ifx \Gin@decode \@empty \else 1\fi \ifGin@int... -l. ...\includegraphics{example-image-a} -The control sequence at the end of the top line -of your error message was never \def'ed. If you have -misspelled it (e.g., `\hobx'), type `I' and the correct -spelling (e.g., `I\hbox'). Otherwise just continue, -and I'll forget about whatever was undefined. -! Undefined control sequence. - ...ox \@tempboxa =\hbox {\pdfrefximage - \pdflastximage }\def \Gin@... -l. ...\includegraphics{example-image-a} -The control sequence at the end of the top line -of your error message was never \def'ed. If you have -misspelled it (e.g., `\hobx'), type `I' and the correct -spelling (e.g., `I\hbox'). Otherwise just continue, -and I'll forget about whatever was undefined. -! Undefined control sequence. - ...\hbox {\pdfrefximage \pdflastximage - }\def \Gin@llx {0}\let \Gi... -l. ...\includegraphics{example-image-a} -The control sequence at the end of the top line -of your error message was never \def'ed. If you have -misspelled it (e.g., `\hobx'), type `I' and the correct -spelling (e.g., `I\hbox'). Otherwise just continue, -and I'll forget about whatever was undefined. -! Undefined control sequence. - ...attr@hash \endcsname {\pdfrefximage - \the \pdflastximage }\expa... -l. ...\includegraphics{example-image-a} -The control sequence at the end of the top line -of your error message was never \def'ed. If you have -misspelled it (e.g., `\hobx'), type `I' and the correct -spelling (e.g., `I\hbox'). Otherwise just continue, -and I'll forget about whatever was undefined. -! Undefined control sequence. - ... {\pdfrefximage \the \pdflastximage - }\expandafter \xdef \csnam... -l. ...\includegraphics{example-image-a} -The control sequence at the end of the top line -of your error message was never \def'ed. If you have -misspelled it (e.g., `\hobx'), type `I' and the correct -spelling (e.g., `I\hbox'). Otherwise just continue, -and I'll forget about whatever was undefined. -! You can't use `end-group character }' after \the. - ...{\pdfrefximage \the \pdflastximage } - \expandafter \xdef \csname... -l. ...\includegraphics{example-image-a} -I'm forgetting what you said and using zero instead. -! Undefined control sequence. - ...n@base .pdf, id=\the \pdflastximage - , \ifx \Gin@page \@empty \... -l. ...\includegraphics{example-image-a} -The control sequence at the end of the top line -of your error message was never \def'ed. If you have -misspelled it (e.g., `\hobx'), type `I' and the correct -spelling (e.g., `I\hbox'). Otherwise just continue, -and I'll forget about whatever was undefined. -! You can't use `the character ,' after \the. - ...@base .pdf, id=\the \pdflastximage , - \ifx \Gin@page \@empty \e... -l. ...\includegraphics{example-image-a} -I'm forgetting what you said and using zero instead. -! Illegal parameter number in definition of \example-image-a.pdf image:cropbox. - 1 -l. ...\includegraphics{example-image-a} -You meant to type ## instead of #, right? -Or maybe a } was forgotten somewhere earlier, and things -are all screwed up? I'm going to assume that you meant ##. -! Illegal parameter number in definition of \example-image-a.pdf image:cropbox. - 1 -l. ...\includegraphics{example-image-a} -You meant to type ## instead of #, right? -Or maybe a } was forgotten somewhere earlier, and things -are all screwed up? I'm going to assume that you meant ##. -! Undefined control sequence. -\Gin@temp ->\@nil -l. ...\includegraphics{example-image-a} -The control sequence at the end of the top line -of your error message was never \def'ed. If you have -misspelled it (e.g., `\hobx'), type `I' and the correct -spelling (e.g., `I\hbox'). Otherwise just continue, -and I'll forget about whatever was undefined. -! Argument of \@providesfile has an extra }. - - \par -l. ...\includegraphics{example-image-a} -I've run across a `}' that doesn't seem to match anything. -For example, `\def\a#1{...}' and `\a}' would produce -this error. If you simply proceed now, the `\par' that -I've just inserted will cause me to report a runaway -argument that might be the root of the problem. But if -your `}' was spurious, just type `2' and it will go away. -Runaway argument? -{\Gin@base \Gin@ext } -! Paragraph ended before \@providesfile was complete. - - \par -l. ...\includegraphics{example-image-a} -I suspect you've forgotten a `}', causing me to apply this -control sequence to too much text. How can we recover? -My plan is to forget the whole thing and hope for the best. -Runaway argument? -{[}\def \@tempb {\@providesfile {\Gin@base \Gin@ext }[]}\ifx \@tempa \ETC. -! Paragraph ended before \@tempa was complete. - - \par -l. ... -I suspect you've forgotten a `}', causing me to apply this -control sequence to too much text. How can we recover? -My plan is to forget the whole thing and hope for the best. -! Improper \prevdepth. -\newpage ...everypar {}\fi \par \ifdim \prevdepth - >\z@ \vskip -\ifdim \prevd... -l. ...\clearpage -You can refer to \spacefactor only in horizontal mode; -you can refer to \prevdepth only in vertical mode; and -neither of these is meaningful inside \write. So -I'm forgetting what you said and using zero instead. -! TeX capacity exceeded, sorry [input stack size=10000]. -\TYPE #1->\begingroup \long \def \TYPE ## - 1{##1}\immediate \write 128{#1}\end... -l. ...\END -If you really absolutely need more capacity, -you can ask a wizard to enlarge me. +Try typing to proceed. +If that doesn't work, type X to quit. +! Package pdftex.def Error: File `example-image-a.pdf' not found: using draft setting. +See the pdftex.def package documentation for explanation. +Type H for immediate help. + ... +l. ......udegraphics[page = 1]{example-image-a.pdf} +Try typing to proceed. +If that doesn't work, type X to quit. +! Package pdftex.def Error: File `az2.pdf' not found: using draft setting. +See the pdftex.def package documentation for explanation. +Type H for immediate help. + ... +l. ...\includegraphics{az2} +Try typing to proceed. +If that doesn't work, type X to quit. +! Package pdftex.def Error: File `az2.pdf' not found: using draft setting. +See the pdftex.def package documentation for explanation. +Type H for immediate help. + ... +l. ...\includegraphics[pagebox = artbox]{az2} +Try typing to proceed. +If that doesn't work, type X to quit. +Package pdftex.def Info: Option `bb' equivalent to `viewport' with the pdftex driver on input line .... +! Package pdftex.def Error: File `clip-1-2.jpg' not found: using draft setting. +See the pdftex.def package documentation for explanation. +Type H for immediate help. + ... +l. ......b=13pt 65pt 63pt 115pt,clip]{clip-1-2.jpg} +Try typing to proceed. +If that doesn't work, type X to quit. +Package pdftex.def Info: Option `bb' equivalent to `viewport' with the pdftex driver on input line .... +! Package pdftex.def Error: File `clip-1-2.png' not found: using draft setting. +See the pdftex.def package documentation for explanation. +Type H for immediate help. + ... +l. ......b=13pt 65pt 63pt 115pt,clip]{clip-1-2.png} +Try typing to proceed. +If that doesn't work, type X to quit. +! Package pdftex.def Error: File `clip-1-2.jpg' not found: using draft setting. +See the pdftex.def package documentation for explanation. +Type H for immediate help. + ... +l. ......graphics[interpolate = true]{clip-1-2.jpg} +Try typing to proceed. +If that doesn't work, type X to quit. +Completed box being shipped out [1] +\vbox(633.0+0.0)x407.0 +.\hbox(0.0+0.0)x0.0 +..\kern -72.26999 +..\vbox(0.0+0.0)x0.0, glue set 72.26999fil +...\kern -72.26999 +...\hbox(0.0+0.0)x0.0 +....\glue 0.0 plus 1.0fil minus 1.0fil +...\glue 0.0 plus 1.0fil minus 1.0fil +.\glue 16.0 +.\vbox(617.0+0.0)x345.0, shifted 62.0 +..\vbox(12.0+0.0)x345.0, glue set 12.0fil +...\glue 0.0 plus 1.0fil +...\hbox(0.0+0.0)x345.0 +....\hbox(0.0+0.0)x345.0 +..\glue 25.0 +..\glue(\lineskip) 0.0 +..\vbox(550.0+0.0)x345.0, glue set 70.52286fil +...\write-{} +...\glue(\topskip) 0.0 +...\hbox(72.26999+2.05998)x345.0, glue set 167.45001fil +....\hbox(0.0+0.0)x15.0 +....\TU/lmr/m/n/10 example-image-a.pdf +....\hbox(72.26999+0.0)x72.26999, glue set - 0.4fil +.....\rule(*+*)x0.4 +.....\glue 0.0 plus 1.0fil minus 1.0fil +.....\vbox(72.26999+0.0)x72.26999, glue set 31.50502fil +......\rule(0.4+0.0)x72.26999 +......\glue 0.0 plus 1.0fil minus 1.0fil +......\hbox(6.17+2.28998)x0.0, glue set - 103.08fil +.......\glue 3.33 plus 1.665 minus 1.11 +.......\TU/lmtt/m/n/10 example-image-a.pdf +.......\glue 0.0 plus 1.0fil minus 1.0fil +......\glue 0.0 plus 1.0fil minus 1.0fil +......\rule(0.4+0.0)x* +.....\glue 0.0 plus 1.0fil minus 1.0fil +.....\rule(*+*)x0.4 +....\penalty 10000 +....\glue(\parfillskip) 0.0 plus 1.0fil +....\glue(\rightskip) 0.0 +...\glue(\parskip) 0.0 plus 1.0 +...\glue(\parskip) 0.0 +...\glue(\lineskip) 1.0 +...\hbox(72.26999+2.05998)x345.0, glue set 167.45001fil +....\hbox(0.0+0.0)x15.0 +....\TU/lmr/m/n/10 example-image-a.pdf +....\hbox(72.26999+0.0)x72.26999, glue set - 0.4fil +.....\rule(*+*)x0.4 +.....\glue 0.0 plus 1.0fil minus 1.0fil +.....\vbox(72.26999+0.0)x72.26999, glue set 31.50502fil +......\rule(0.4+0.0)x72.26999 +......\glue 0.0 plus 1.0fil minus 1.0fil +......\hbox(6.17+2.28998)x0.0, glue set - 103.08fil +.......\glue 3.33 plus 1.665 minus 1.11 +.......\TU/lmtt/m/n/10 example-image-a.pdf +.......\glue 0.0 plus 1.0fil minus 1.0fil +......\glue 0.0 plus 1.0fil minus 1.0fil +......\rule(0.4+0.0)x* +.....\glue 0.0 plus 1.0fil minus 1.0fil +.....\rule(*+*)x0.4 +....\penalty 10000 +....\glue(\parfillskip) 0.0 plus 1.0fil +....\glue(\rightskip) 0.0 +...\glue(\parskip) 0.0 plus 1.0 +...\glue(\parskip) 0.0 +...\glue(\lineskip) 1.0 +...\hbox(72.26999+1.93999)x345.0, glue set 226.05fil +....\hbox(0.0+0.0)x15.0 +....\TU/lmr/m/n/10 az2.pdf +....\hbox(72.26999+0.0)x72.26999, glue set - 0.4fil +.....\rule(*+*)x0.4 +.....\glue 0.0 plus 1.0fil minus 1.0fil +.....\vbox(72.26999+0.0)x72.26999, glue set 31.51501fil +......\rule(0.4+0.0)x72.26999 +......\glue 0.0 plus 1.0fil minus 1.0fil +......\hbox(6.22+2.21999)x0.0, glue set - 40.08fil +.......\glue 3.33 plus 1.665 minus 1.11 +.......\TU/lmtt/m/n/10 az2.pdf +.......\glue 0.0 plus 1.0fil minus 1.0fil +......\glue 0.0 plus 1.0fil minus 1.0fil +......\rule(0.4+0.0)x* +.....\glue 0.0 plus 1.0fil minus 1.0fil +.....\rule(*+*)x0.4 +....\penalty 10000 +....\glue(\parfillskip) 0.0 plus 1.0fil +....\glue(\rightskip) 0.0 +...\glue(\parskip) 0.0 plus 1.0 +...\glue(\parskip) 0.0 +...\glue(\lineskip) 1.0 +...\hbox(72.26999+1.93999)x345.0, glue set 226.05fil +....\hbox(0.0+0.0)x15.0 +....\TU/lmr/m/n/10 az2.pdf +....\hbox(72.26999+0.0)x72.26999, glue set - 0.4fil +.....\rule(*+*)x0.4 +.....\glue 0.0 plus 1.0fil minus 1.0fil +.....\vbox(72.26999+0.0)x72.26999, glue set 31.51501fil +......\rule(0.4+0.0)x72.26999 +......\glue 0.0 plus 1.0fil minus 1.0fil +......\hbox(6.22+2.21999)x0.0, glue set - 40.08fil +.......\glue 3.33 plus 1.665 minus 1.11 +.......\TU/lmtt/m/n/10 az2.pdf +.......\glue 0.0 plus 1.0fil minus 1.0fil +......\glue 0.0 plus 1.0fil minus 1.0fil +......\rule(0.4+0.0)x* +.....\glue 0.0 plus 1.0fil minus 1.0fil +.....\rule(*+*)x0.4 +....\penalty 10000 +....\glue(\parfillskip) 0.0 plus 1.0fil +....\glue(\rightskip) 0.0 +...\glue(\parskip) 0.0 plus 1.0 +...\glue(\parskip) 0.0 +...\glue(\lineskip) 1.0 +...\hbox(49.99988+2.05998)x345.0, glue set 231.38013fil +....\hbox(0.0+0.0)x15.0 +....\TU/lmr/m/n/10 clip-1-2.jpg +....\hbox(49.99988+0.0)x49.99988, glue set - 0.4fil +.....\rule(*+*)x0.4 +.....\glue 0.0 plus 1.0fil minus 1.0fil +.....\vbox(49.99988+0.0)x49.99988, glue set 20.34496fil +......\rule(0.4+0.0)x49.99988 +......\glue 0.0 plus 1.0fil minus 1.0fil +......\hbox(6.22+2.28998)x0.0, glue set - 66.33fil +.......\glue 3.33 plus 1.665 minus 1.11 +.......\TU/lmtt/m/n/10 clip-1-2.jpg +.......\glue 0.0 plus 1.0fil minus 1.0fil +......\glue 0.0 plus 1.0fil minus 1.0fil +......\rule(0.4+0.0)x* +.....\glue 0.0 plus 1.0fil minus 1.0fil +.....\rule(*+*)x0.4 +....\penalty 10000 +....\glue(\parfillskip) 0.0 plus 1.0fil +....\glue(\rightskip) 0.0 +...\glue(\parskip) 0.0 plus 1.0 +...\glue(\parskip) 0.0 +...\glue(\lineskip) 1.0 +...\hbox(49.99988+2.05998)x345.0, glue set 228.88013fil +....\hbox(0.0+0.0)x15.0 +....\TU/lmr/m/n/10 clip-1-2.png +....\hbox(49.99988+0.0)x49.99988, glue set - 0.4fil +.....\rule(*+*)x0.4 +.....\glue 0.0 plus 1.0fil minus 1.0fil +.....\vbox(49.99988+0.0)x49.99988, glue set 20.34496fil +......\rule(0.4+0.0)x49.99988 +......\glue 0.0 plus 1.0fil minus 1.0fil +......\hbox(6.22+2.28998)x0.0, glue set - 66.33fil +.......\glue 3.33 plus 1.665 minus 1.11 +.......\TU/lmtt/m/n/10 clip-1-2.png +.......\glue 0.0 plus 1.0fil minus 1.0fil +......\glue 0.0 plus 1.0fil minus 1.0fil +......\rule(0.4+0.0)x* +.....\glue 0.0 plus 1.0fil minus 1.0fil +.....\rule(*+*)x0.4 +....\penalty 10000 +....\glue(\parfillskip) 0.0 plus 1.0fil +....\glue(\rightskip) 0.0 +...\glue(\parskip) 0.0 plus 1.0 +...\glue(\parskip) 0.0 +...\glue(\lineskip) 1.0 +...\hbox(72.26999+2.05998)x345.0, glue set 209.11002fil +....\hbox(0.0+0.0)x15.0 +....\TU/lmr/m/n/10 clip-1-2.jpg +....\hbox(72.26999+0.0)x72.26999, glue set - 0.4fil +.....\rule(*+*)x0.4 +.....\glue 0.0 plus 1.0fil minus 1.0fil +.....\vbox(72.26999+0.0)x72.26999, glue set 31.48001fil +......\rule(0.4+0.0)x72.26999 +......\glue 0.0 plus 1.0fil minus 1.0fil +......\hbox(6.22+2.28998)x0.0, glue set - 66.33fil +.......\glue 3.33 plus 1.665 minus 1.11 +.......\TU/lmtt/m/n/10 clip-1-2.jpg +.......\glue 0.0 plus 1.0fil minus 1.0fil +......\glue 0.0 plus 1.0fil minus 1.0fil +......\rule(0.4+0.0)x* +.....\glue 0.0 plus 1.0fil minus 1.0fil +.....\rule(*+*)x0.4 +....\penalty 10000 +....\glue(\parfillskip) 0.0 plus 1.0fil +....\glue(\rightskip) 0.0 +...\glue -2.05998 +...\glue 0.0 plus 1.0fil +...\glue 0.0 +...\glue 0.0 plus 0.0001fil +..\glue(\baselineskip) 23.34 +..\hbox(6.66+0.0)x345.0 +...\hbox(6.66+0.0)x345.0, glue set 170.0fil +....\glue 0.0 plus 1.0fil +....\TU/lmr/m/n/10 1 +....\glue 0.0 plus 1.0fil +.\kern 0.0 From 4d54770a5c62114212a8dbcb77249d64b37a4249 Mon Sep 17 00:00:00 2001 From: David Carlisle Date: Sun, 14 Apr 2024 09:56:00 +0100 Subject: [PATCH 04/10] require graphics-pln for tests --- .github/tl_packages | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/tl_packages b/.github/tl_packages index 46e04b8..8308a68 100644 --- a/.github/tl_packages +++ b/.github/tl_packages @@ -17,3 +17,6 @@ kvsetkeys ltxcmds pdftexcmds mwe +# +# for tests with plain tex +graphics-pln From 38dfba5a748deeb54b24588a868a1af2d7428775 Mon Sep 17 00:00:00 2001 From: David Carlisle Date: Sun, 14 Apr 2024 10:07:35 +0100 Subject: [PATCH 05/10] require eplain for tests --- .github/tl_packages | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/tl_packages b/.github/tl_packages index 8308a68..e43606e 100644 --- a/.github/tl_packages +++ b/.github/tl_packages @@ -20,3 +20,5 @@ mwe # # for tests with plain tex graphics-pln +eplain + From 526693456bd768b92916b5ae25e5e3116bf566a5 Mon Sep 17 00:00:00 2001 From: David Carlisle Date: Sun, 14 Apr 2024 10:13:49 +0100 Subject: [PATCH 06/10] require supp-pdf for tests --- .github/tl_packages | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/tl_packages b/.github/tl_packages index e43606e..d4a684f 100644 --- a/.github/tl_packages +++ b/.github/tl_packages @@ -21,4 +21,6 @@ mwe # for tests with plain tex graphics-pln eplain +mptopdf +amsfonts From cec8a4d0f13c51403f2501203f414538ca8ca12b Mon Sep 17 00:00:00 2001 From: David Carlisle Date: Sun, 14 Apr 2024 10:27:25 +0100 Subject: [PATCH 07/10] spurious local graphicx file --- testfiles-plain/eplain-001.tlg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testfiles-plain/eplain-001.tlg b/testfiles-plain/eplain-001.tlg index a995064..63300dd 100644 --- a/testfiles-plain/eplain-001.tlg +++ b/testfiles-plain/eplain-001.tlg @@ -1,6 +1,6 @@ This is a generated file for the l3build validation system. Don't change this file in any respect. -(graphicx.tex (../miniltx.tex +(../graphicx.tex (../miniltx.tex \@tempcnta=\count... \@tempcntb=\count... \@tempdima=\dimen... From fe8eb8fa35b50c96d32f2eb4877c15b4e12af177 Mon Sep 17 00:00:00 2001 From: David Carlisle Date: Sun, 14 Apr 2024 10:32:56 +0100 Subject: [PATCH 08/10] spurious local graphicx file --- testfiles-plain/eplain-001.luatex.tlg | 2 +- testfiles-plain/eplain-001.xetex.tlg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testfiles-plain/eplain-001.luatex.tlg b/testfiles-plain/eplain-001.luatex.tlg index 889ced5..3954eaa 100644 --- a/testfiles-plain/eplain-001.luatex.tlg +++ b/testfiles-plain/eplain-001.luatex.tlg @@ -1,6 +1,6 @@ This is a generated file for the l3build validation system. Don't change this file in any respect. -(graphicx.tex (../miniltx.tex +(../graphicx.tex (../miniltx.tex \@tempcnta=\count... \@tempcntb=\count... \@tempdima=\dimen... diff --git a/testfiles-plain/eplain-001.xetex.tlg b/testfiles-plain/eplain-001.xetex.tlg index c56591a..ef859d0 100644 --- a/testfiles-plain/eplain-001.xetex.tlg +++ b/testfiles-plain/eplain-001.xetex.tlg @@ -1,6 +1,6 @@ This is a generated file for the l3build validation system. Don't change this file in any respect. -(graphicx.tex (../miniltx.tex +(../graphicx.tex (../miniltx.tex \@tempcnta=\count... \@tempcntb=\count... \@tempdima=\dimen... From c19880a65827fd9423c67c26efee13283fc104b3 Mon Sep 17 00:00:00 2001 From: David Carlisle Date: Sun, 14 Apr 2024 10:45:39 +0100 Subject: [PATCH 09/10] update checkout actions to avoid deprecation warnings --- .github/workflows/deploy.yaml | 5 +++-- .github/workflows/main.yaml | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 5c8e055..5102eb6 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -14,7 +14,7 @@ jobs: steps: # Boilerplate - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 # GitHub Actions don't regenerate the test if the key doesn't change, so # we integrate a random UUID into the key to keep them different. # DO NOT CHANGE THIS @@ -36,7 +36,8 @@ jobs: key: texlive-v0-${{ steps.get-id.outputs.id }} restore-keys: texlive-v0- - name: Install TeX Live - uses: zauguin/install-texlive@v1 + id: texlive + uses: zauguin/install-texlive@v3 with: # List the required TeX Live packages in a separate file to allow reuse in # different workflows. diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index ab5b509..8dd6c30 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -12,7 +12,7 @@ jobs: steps: # Boilerplate - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 # GitHub Actions don't regenerate the test if the key doesn't change, so # we integrate a random UUID into the key to keep them different. # DO NOT CHANGE THIS @@ -34,7 +34,8 @@ jobs: key: texlive-v0-${{ steps.get-id.outputs.id }} restore-keys: texlive-v0- - name: Install TeX Live - uses: zauguin/install-texlive@v1 + id: texlive + uses: zauguin/install-texlive@v3 with: # List the required TeX Live packages in a separate file to allow reuse in # different workflows. From 5a5f91876926678336c6c4114c363ab442638ae7 Mon Sep 17 00:00:00 2001 From: David Carlisle Date: Tue, 16 Apr 2024 17:02:55 +0100 Subject: [PATCH 10/10] remove commented code, fix comments to document shell escape change --- luatex.def | 12 ++++++------ pdftex.def | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/luatex.def b/luatex.def index 3c83254..b03835a 100644 --- a/luatex.def +++ b/luatex.def @@ -651,9 +651,8 @@ } % Load package epstopdf if % a) LaTeX is running (plain TeX users are on their own), -% XXXb) and shell escape is enabled (possibly restricted), -% c) and \DoNotLoadEpstopdf either does not exist or is not \relax, -% d) and neither pst-pdf nor pdftricks is loaded (by \begin{document}). +% b) and \DoNotLoadEpstopdf either does not exist or is not \relax, +% c) and neither pst-pdf nor pdftricks is loaded (by \begin{document}). % % In other words, by default .eps files will be automatically % converted to .pdf files when outputting pdf. This can be wrong! @@ -661,6 +660,10 @@ % \newcommand{\DoNotLoadEpstopdf}{} % before even the \documentclass line of your document. % +% Earlier versions did not load epstopdf if shell escape was disabled. +% Now load, for better error reporting and to allow inclusion of pre-esisting +% converted files: see gh/38 +% % More information about the epstopdf run will be in the .log file; % see http://ctan.org/pkg/epstopdf-pkg for more info about the % epstopdf package itself. In turn, it calls the epstopdf script @@ -680,11 +683,8 @@ \@ifpackageloaded{pst-pdf}{}{% \@ifpackageloaded{pdftricks}{}{% \@ifpackageloaded{graphics}{% -% \ifnum\directlua{tex.sprint(status.shell_escape)}>0 % - % only add .eps to file extension list if epstopdf is loaded \edef\Gin@extensions{\Gin@extensions,.eps}% \RequirePackage{epstopdf-base}[2009/07/12]% -% \fi }{} }% pdftricks not loaded }% pst-pdf not loaded diff --git a/pdftex.def b/pdftex.def index ff6bedd..ffa65f4 100644 --- a/pdftex.def +++ b/pdftex.def @@ -652,9 +652,8 @@ E \else } % Load package epstopdf if % a) LaTeX is running (plain TeX users are on their own), -% XXXb) and shell escape (\write18) is enabled (possibly restricted), -% c) and \DoNotLoadEpstopdf either does not exist or is not \relax, -% d) and neither pst-pdf nor pdftricks is loaded (by \begin{document}). +% b) and \DoNotLoadEpstopdf either does not exist or is not \relax, +% c) and neither pst-pdf nor pdftricks is loaded (by \begin{document}). % % In other words, by default .eps files will be automatically % converted to .pdf files when outputting pdf. This can be wrong! @@ -662,6 +661,10 @@ E \else % \newcommand{\DoNotLoadEpstopdf}{} % before even the \documentclass line of your document. % +% Earlier versions did not load epstopdf if shell escape was disabled. +% Now load, for better error reporting and to allow inclusion of pre-esisting +% converted files: see gh/38 +% % More information about the epstopdf run will be in the .log file; % see http://ctan.org/pkg/epstopdf-pkg for more info about the % epstopdf package itself. In turn, it calls the epstopdf script @@ -681,11 +684,8 @@ E \else \@ifpackageloaded{pst-pdf}{}{% \@ifpackageloaded{pdftricks}{}{% \@ifpackageloaded{graphics}{% -% \ifnum\pdfshellescape>0 % - % only add .eps to file extension list if epstopdf is loaded \edef\Gin@extensions{\Gin@extensions,.eps}% \RequirePackage{epstopdf-base}[2009/07/12]% -% \fi }{} }% pdftricks not loaded }% pst-pdf not loaded