[latex3-commits] [git/LaTeX3-latex3-latex3] main: Add \graphics_get_full_name:nN(TF) and revise \graphics_include:nn (f8a25d882)

Joseph Wright joseph.wright at morningstar2.co.uk
Sun Apr 10 22:21:35 CEST 2022


Repository : https://github.com/latex3/latex3
On branch  : main
Link       : https://github.com/latex3/latex3/commit/f8a25d88272074033b1dc2faeba83695dfadafe1

>---------------------------------------------------------------

commit f8a25d88272074033b1dc2faeba83695dfadafe1
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Sun Apr 10 21:21:35 2022 +0100

    Add \graphics_get_full_name:nN(TF) and revise \graphics_include:nn


>---------------------------------------------------------------

f8a25d88272074033b1dc2faeba83695dfadafe1
 l3experimental/CHANGELOG.md                        |  2 +-
 l3experimental/l3graphics/l3graphics.dtx           | 89 ++++++++++++++++------
 .../testfiles/m3graphics001.etex-dvips.tlg         | 28 +++++--
 .../testfiles/m3graphics001.etex-dvisvgm.tlg       | 28 +++++--
 .../l3graphics/testfiles/m3graphics001.luatex.tlg  | 28 +++++--
 .../l3graphics/testfiles/m3graphics001.lvt         | 27 ++++++-
 .../l3graphics/testfiles/m3graphics001.ptex.tlg    | 28 +++++--
 .../l3graphics/testfiles/m3graphics001.tlg         | 28 +++++--
 .../l3graphics/testfiles/m3graphics001.uptex.tlg   | 28 +++++--
 .../l3graphics/testfiles/m3graphics001.xetex.tlg   | 28 +++++--
 10 files changed, 237 insertions(+), 77 deletions(-)

diff --git a/l3experimental/CHANGELOG.md b/l3experimental/CHANGELOG.md
index 52a5d6c43..04bef5724 100644
--- a/l3experimental/CHANGELOG.md
+++ b/l3experimental/CHANGELOG.md
@@ -8,7 +8,7 @@ this project uses date-based 'snapshot' version identifiers.
 ## [Unreleased]
 
 ### Added
-- `\graphics_get_pagecount:nN`
+- `\graphics_get_pagecount:nN(TF)`
 
 ### Changed
 - Return an empty `seq` when `\sys_shell_split_ls:nN` is applied with a
diff --git a/l3experimental/l3graphics/l3graphics.dtx b/l3experimental/l3graphics/l3graphics.dtx
index 841ff96f7..8350320de 100644
--- a/l3experimental/l3graphics/l3graphics.dtx
+++ b/l3experimental/l3graphics/l3graphics.dtx
@@ -100,7 +100,7 @@
 %
 % \subsection{Including graphics}
 %
-% \begin{function}{\graphics_include:nn}
+% \begin{function}{\graphics_include:nn, \graphics_include:nV}
 %   \begin{syntax}
 %     \cs{graphics_include:nn} \Arg{keys} \Arg{file}
 %   \end{syntax}
@@ -108,10 +108,6 @@
 %   at the current location. The file \meta{type} may be given as one of the
 %   \meta{keys}, or will otherwise be determined from file extension. The
 %   \meta{keys} is used to pass settings as detailed above.
-%
-%   Where the \meta{file} is not found and the \meta{type} is \emph{not}
-%   given, a search for possible graphic files is undertaken using the extensions
-%   stored in \cs{l_graphics_search_ext_seq}.
 % \end{function}
 %
 % \begin{variable}{\l_graphics_ext_type_prop}
@@ -124,11 +120,6 @@
 %   \end{verbatim}
 % \end{variable}
 %
-% \begin{variable}{\l_graphics_search_ext_seq}
-%   Extensions to use for graphic searching when the given \meta{file} name is not
-%   found by \cs{graphics_include:n}.
-% \end{variable}
-%
 % \begin{variable}{\l_graphics_search_path_seq}
 %   Each entry is the path to a directory which should be searched when
 %   seeking an graphic file. Each path can be relative or absolute, and should
@@ -139,6 +130,24 @@
 %
 % \subsection{Utility functions}
 %
+% \begin{function}[noTF]{\graphics_get_full_name:nN}
+%   \begin{syntax}
+%     \cs{graphics_get_full_name:nN} \Arg{file} \meta{tl~var}
+%     \cs{graphics_get_full_name:nNTF} \Arg{file} \meta{tl~var} \Arg{true code} \Arg{false code}
+%   \end{syntax}
+%   Searches for \meta{file} first as given and then using the extensions
+%   listed in \cs{l_graphics_search_ext_seq}. The search path used will be
+%   the entries of \cs{l_graphics_search_path_seq}. If found, the full file
+%   name including any path and extension will be returned in the
+%   \meta{tl~var}. In the non-branching version, the \meta{tl var} will be
+%   set to \cs{q_no_value} in the case that the graphics is not found.
+% \end{function}
+%
+% \begin{variable}{\l_graphics_search_ext_seq}
+%   Extensions to use for graphic searching when the given \meta{file} name is not
+%   found by \cs{graphics_get_full_name:nN}.
+% \end{variable}
+%
 % \begin{function}{\graphics_get_pagecount:nN}
 %   \begin{syntax}
 %     \cs{graphics_get_pagecount:nn} \Arg{file} \meta{tl~var}
@@ -483,7 +492,7 @@
 %    \end{macrocode}
 % \end{variable}
 %
-% \begin{macro}{\graphics_include:nm}
+% \begin{macro}{\graphics_include:nn, \graphics_include:nV}
 % \begin{macro}{\@@_include_search:n}
 % \begin{macro}{\@@_include:}
 % \begin{macro}
@@ -506,22 +515,13 @@
       \file_get_full_name:nNTF {#2} \l_@@_full_name_str
         {
           \str_if_eq:eeTF { \l_@@_full_name_str } { #2 .tex }
-            { \@@_include_search:n {#2} }
+            { \msg_error:nnn { graphics } { graphic-not-found } {#2} }
             { \@@_include: }
         }
-        { \@@_include_search:n {#2} }
+        { \msg_error:nnn { graphics } { graphic-not-found } {#2} }
     \group_end:
   }
-\cs_new_protected:Npn \@@_include_search:n #1
-  {
-    \seq_map_inline:Nn \l_graphics_search_ext_seq
-      {
-        \file_get_full_name:nNT { #1 ##1 } \l_@@_full_name_str
-          { \seq_map_break:n { \use_i:nnn \@@_include: } }
-      }
-    \use:n
-      { \msg_error:nnn { graphics } { graphic-not-found } {#1} }
-  }
+\cs_generate_variant:Nn \graphics_include:nn { nV }
 \cs_new_protected:Npn \@@_include:
   {
     \str_if_empty:NTF \l_@@_type_str
@@ -628,6 +628,49 @@
 %
 % \subsection{Utility functions}
 %
+% \begin{macro}{\graphics_get_full_name:nN}
+% \begin{macro}[TF]{\graphics_get_full_name:nN}
+% \begin{macro}{\@@_get_full_name:n}
+%   A simple search.
+%    \begin{macrocode}
+\cs_new_protected:Npn \graphics_get_full_name:nN #1#2
+  {
+    \graphics_get_full_name:nNF {#1} #2
+      { \tl_set:Nn #2 { \q_no_value } }
+  }
+\prg_new_protected_conditional:Npnn \graphics_get_full_name:nN #1#2
+  { T , F , TF }
+  {
+    \group_begin:
+      \seq_set_eq:NN \l_file_search_path_seq \l_graphics_search_path_seq
+      \file_get_full_name:nNTF {#1} \l_@@_full_name_str
+        {
+          \str_if_eq:eeT { \l_@@_full_name_str } { #1 .tex }
+            { \@@_get_full_name:n {#1} }
+        }
+        { \@@_get_full_name:n {#1} }
+    \exp_args:NNNV \group_end:
+    \tl_set:Nn #2 \l_@@_full_name_str
+    \tl_if_empty:NTF #2
+      { \prg_return_false: }
+      { \prg_return_true: }
+  }
+\cs_new_protected:Npn \@@_get_full_name:n #1
+  {
+    \str_clear:N \l_@@_full_name_str
+    \seq_map_inline:Nn \l_graphics_search_ext_seq
+      {
+        \file_get_full_name:nNT { #1 ##1 } \l_@@_full_name_str
+          { \seq_map_break:n { \use_none:nn } }
+      }
+    \use:n
+      { \str_clear:N \l_@@_full_name_str }
+  }
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+%
 % \begin{macro}{\graphics_get_pagecount:nN}
 % \begin{macro}{\@@_get_pagecount:n}
 % \begin{macro}{\@@_get_pagecount:nw}
diff --git a/l3experimental/l3graphics/testfiles/m3graphics001.etex-dvips.tlg b/l3experimental/l3graphics/testfiles/m3graphics001.etex-dvips.tlg
index 5e142eb9d..63eb0201f 100644
--- a/l3experimental/l3graphics/testfiles/m3graphics001.etex-dvips.tlg
+++ b/l3experimental/l3graphics/testfiles/m3graphics001.etex-dvips.tlg
@@ -1,7 +1,20 @@
 This is a generated file for the LaTeX (2e + expl3) validation system.
 Don't change this file in any respect.
 ============================================================
-TEST 1: Basic graphic inclusion
+TEST 1: Finding graphics
+============================================================
+> \l_tmpa_tl=miau.ps.
+<recently read> }
+l. ...  }
+> \l_tmpa_tl=foo.bar.eps.
+<recently read> }
+l. ...  }
+> \l_tmpa_tl=foo bar.eps.
+<recently read> }
+l. ...  }
+============================================================
+============================================================
+TEST 2: Basic graphic inclusion
 ============================================================
 \c__graphics_miau.ps_llx_dim=\dimen...
 \c__graphics_miau.ps_lly_dim=\dimen...
@@ -36,20 +49,21 @@ l. ...  }
 ! OK.
 <argument> \l_tmpa_box 
 l. ...  }
+! Package graphics Error: Image file 'not-a-graphic' not found.
+For immediate help type H <return>.
+ ...                                              
+l. ...  }
+LaTeX tried to open graphic file 'not-a-graphic', but the file could not be
+read.
 ============================================================
 ============================================================
-TEST 2: Searching a sub path
+TEST 3: Searching a sub path
 ============================================================
 ! Package graphics Error: Image file 'meow' not found.
 For immediate help type H <return>.
  ...                                              
 l. ...  }
 LaTeX tried to open graphic file 'meow', but the file could not be read.
-> \box...=
-\hbox(0.0+0.0)x0.0
-! OK.
-<argument> \l_tmpa_box 
-l. ...  }
 \c__graphics_folder-a/meow.ps_llx_dim=\dimen...
 \c__graphics_folder-a/meow.ps_lly_dim=\dimen...
 \c__graphics_folder-a/meow.ps_urx_dim=\dimen...
diff --git a/l3experimental/l3graphics/testfiles/m3graphics001.etex-dvisvgm.tlg b/l3experimental/l3graphics/testfiles/m3graphics001.etex-dvisvgm.tlg
index 92e2eb731..5e972181a 100644
--- a/l3experimental/l3graphics/testfiles/m3graphics001.etex-dvisvgm.tlg
+++ b/l3experimental/l3graphics/testfiles/m3graphics001.etex-dvisvgm.tlg
@@ -1,7 +1,20 @@
 This is a generated file for the LaTeX (2e + expl3) validation system.
 Don't change this file in any respect.
 ============================================================
-TEST 1: Basic graphic inclusion
+TEST 1: Finding graphics
+============================================================
+> \l_tmpa_tl=miau.pdf.
+<recently read> }
+l. ...  }
+> \l_tmpa_tl=foo.bar.eps.
+<recently read> }
+l. ...  }
+> \l_tmpa_tl=foo bar.eps.
+<recently read> }
+l. ...  }
+============================================================
+============================================================
+TEST 2: Basic graphic inclusion
 ============================================================
 \c__graphics_miau.pdf:cropbox_urx_dim=\dimen...
 \c__graphics_miau.pdf:cropbox_ury_dim=\dimen...
@@ -34,20 +47,21 @@ l. ...  }
 ! OK.
 <argument> \l_tmpa_box 
 l. ...  }
+! Package graphics Error: Image file 'not-a-graphic' not found.
+For immediate help type H <return>.
+ ...                                              
+l. ...  }
+LaTeX tried to open graphic file 'not-a-graphic', but the file could not be
+read.
 ============================================================
 ============================================================
-TEST 2: Searching a sub path
+TEST 3: Searching a sub path
 ============================================================
 ! Package graphics Error: Image file 'meow' not found.
 For immediate help type H <return>.
  ...                                              
 l. ...  }
 LaTeX tried to open graphic file 'meow', but the file could not be read.
-> \box...=
-\hbox(0.0+0.0)x0.0
-! OK.
-<argument> \l_tmpa_box 
-l. ...  }
 \c__graphics_folder-a/meow.pdf:cropbox_urx_dim=\dimen...
 \c__graphics_folder-a/meow.pdf:cropbox_ury_dim=\dimen...
 > \box...=
diff --git a/l3experimental/l3graphics/testfiles/m3graphics001.luatex.tlg b/l3experimental/l3graphics/testfiles/m3graphics001.luatex.tlg
index b3e1cdda9..f14f67f76 100644
--- a/l3experimental/l3graphics/testfiles/m3graphics001.luatex.tlg
+++ b/l3experimental/l3graphics/testfiles/m3graphics001.luatex.tlg
@@ -1,7 +1,20 @@
 This is a generated file for the LaTeX (2e + expl3) validation system.
 Don't change this file in any respect.
 ============================================================
-TEST 1: Basic graphic inclusion
+TEST 1: Finding graphics
+============================================================
+> \l_tmpa_tl=miau.pdf.
+<recently read> }
+l. ...  }
+> \l_tmpa_tl=foo.bar.eps.
+<recently read> }
+l. ...  }
+> \l_tmpa_tl=foo bar.eps.
+<recently read> }
+l. ...  }
+============================================================
+============================================================
+TEST 2: Basic graphic inclusion
 ============================================================
 <./miau.pdf>
 \c__graphics_miau.pdf:cropbox_urx_dim=\dimen...
@@ -35,20 +48,21 @@ runsystem(repstopdf "foo bar.eps" "foo bar-eps-converted-to.pdf")...executed
 ! OK.
 <argument> \l_tmpa_box 
 l. ...  }
+! Package graphics Error: Image file 'not-a-graphic' not found.
+For immediate help type H <return>.
+ ...                                              
+l. ...  }
+LaTeX tried to open graphic file 'not-a-graphic', but the file could not be
+read.
 ============================================================
 ============================================================
-TEST 2: Searching a sub path
+TEST 3: Searching a sub path
 ============================================================
 ! Package graphics Error: Image file 'meow' not found.
 For immediate help type H <return>.
  ...                                              
 l. ...  }
 LaTeX tried to open graphic file 'meow', but the file could not be read.
-> \box...=
-\hbox(0.0+0.0)x0.0, direction TLT
-! OK.
-<argument> \l_tmpa_box 
-l. ...  }
 <./folder-a/meow.pdf>
 \c__graphics_folder-a/meow.pdf:cropbox_urx_dim=\dimen...
 \c__graphics_folder-a/meow.pdf:cropbox_ury_dim=\dimen...
diff --git a/l3experimental/l3graphics/testfiles/m3graphics001.lvt b/l3experimental/l3graphics/testfiles/m3graphics001.lvt
index 358001539..7b74fbf42 100644
--- a/l3experimental/l3graphics/testfiles/m3graphics001.lvt
+++ b/l3experimental/l3graphics/testfiles/m3graphics001.lvt
@@ -19,23 +19,42 @@
 \OMIT
 \cs_set_protected:Npn \test:n #1
   {
-    \hbox_set:Nn \l_tmpa_box { \graphics_include:nn { } {#1} }
-    \box_show:N \l_tmpa_box
+    \graphics_get_full_name:nNTF {#1} \l_tmpa_tl
+      {
+        \hbox_set:Nn \l_tmpa_box { \graphics_include:nV { } \l_tmpa_tl }
+        \box_show:N \l_tmpa_box
+      }
+      { \graphics_include:nn { } {#1} } % Force an error
   }
 \cs_set_protected:Npn \test:nn #1#2
   {
-    \hbox_set:Nn \l_tmpa_box { \graphics_include:nn {#1} {#2} }
-    \box_show:N \l_tmpa_box
+    \graphics_get_full_name:nNTF {#1} \l_tmpa_tl
+      {
+        \hbox_set:Nn \l_tmpa_box { \graphics_include:nV {#1} \l_tmpa_tl }
+        \box_show:N \l_tmpa_box
+      }
+      { \graphics_include:nn { } {#1} } % Force an error 
   }
 \TIMO
 
 \START
 
+\TEST { Finding~graphics }
+  {
+    \graphics_get_full_name:nN { miau } \l_tmpa_tl
+    \tl_show:N \l_tmpa_tl
+    \graphics_get_full_name:nN { foo.bar } \l_tmpa_tl
+    \tl_show:N \l_tmpa_tl
+    \graphics_get_full_name:nN { foo~bar } \l_tmpa_tl
+    \tl_show:N \l_tmpa_tl
+  }
+
 \TEST { Basic~graphic~inclusion }
   {
     \test:n { miau }
     \test:n { foo.bar }
     \test:n { foo~bar }
+    \test:n { not-a-graphic }
   }
 
 \TEST { Searching~a~sub~path }
diff --git a/l3experimental/l3graphics/testfiles/m3graphics001.ptex.tlg b/l3experimental/l3graphics/testfiles/m3graphics001.ptex.tlg
index 5e142eb9d..63eb0201f 100644
--- a/l3experimental/l3graphics/testfiles/m3graphics001.ptex.tlg
+++ b/l3experimental/l3graphics/testfiles/m3graphics001.ptex.tlg
@@ -1,7 +1,20 @@
 This is a generated file for the LaTeX (2e + expl3) validation system.
 Don't change this file in any respect.
 ============================================================
-TEST 1: Basic graphic inclusion
+TEST 1: Finding graphics
+============================================================
+> \l_tmpa_tl=miau.ps.
+<recently read> }
+l. ...  }
+> \l_tmpa_tl=foo.bar.eps.
+<recently read> }
+l. ...  }
+> \l_tmpa_tl=foo bar.eps.
+<recently read> }
+l. ...  }
+============================================================
+============================================================
+TEST 2: Basic graphic inclusion
 ============================================================
 \c__graphics_miau.ps_llx_dim=\dimen...
 \c__graphics_miau.ps_lly_dim=\dimen...
@@ -36,20 +49,21 @@ l. ...  }
 ! OK.
 <argument> \l_tmpa_box 
 l. ...  }
+! Package graphics Error: Image file 'not-a-graphic' not found.
+For immediate help type H <return>.
+ ...                                              
+l. ...  }
+LaTeX tried to open graphic file 'not-a-graphic', but the file could not be
+read.
 ============================================================
 ============================================================
-TEST 2: Searching a sub path
+TEST 3: Searching a sub path
 ============================================================
 ! Package graphics Error: Image file 'meow' not found.
 For immediate help type H <return>.
  ...                                              
 l. ...  }
 LaTeX tried to open graphic file 'meow', but the file could not be read.
-> \box...=
-\hbox(0.0+0.0)x0.0
-! OK.
-<argument> \l_tmpa_box 
-l. ...  }
 \c__graphics_folder-a/meow.ps_llx_dim=\dimen...
 \c__graphics_folder-a/meow.ps_lly_dim=\dimen...
 \c__graphics_folder-a/meow.ps_urx_dim=\dimen...
diff --git a/l3experimental/l3graphics/testfiles/m3graphics001.tlg b/l3experimental/l3graphics/testfiles/m3graphics001.tlg
index 665636a40..5a5d72df5 100644
--- a/l3experimental/l3graphics/testfiles/m3graphics001.tlg
+++ b/l3experimental/l3graphics/testfiles/m3graphics001.tlg
@@ -1,7 +1,20 @@
 This is a generated file for the LaTeX (2e + expl3) validation system.
 Don't change this file in any respect.
 ============================================================
-TEST 1: Basic graphic inclusion
+TEST 1: Finding graphics
+============================================================
+> \l_tmpa_tl=miau.pdf.
+<recently read> }
+l. ...  }
+> \l_tmpa_tl=foo.bar.eps.
+<recently read> }
+l. ...  }
+> \l_tmpa_tl=foo bar.eps.
+<recently read> }
+l. ...  }
+============================================================
+============================================================
+TEST 2: Basic graphic inclusion
 ============================================================
  <./miau.pdf>
 \c__graphics_miau.pdf:cropbox_urx_dim=\dimen...
@@ -35,20 +48,21 @@ runsystem(repstopdf "foo bar.eps" "foo bar-eps-converted-to.pdf")...executed saf
 ! OK.
 <argument> \l_tmpa_box 
 l. ...  }
+! Package graphics Error: Image file 'not-a-graphic' not found.
+For immediate help type H <return>.
+ ...                                              
+l. ...  }
+LaTeX tried to open graphic file 'not-a-graphic', but the file could not be
+read.
 ============================================================
 ============================================================
-TEST 2: Searching a sub path
+TEST 3: Searching a sub path
 ============================================================
 ! Package graphics Error: Image file 'meow' not found.
 For immediate help type H <return>.
  ...                                              
 l. ...  }
 LaTeX tried to open graphic file 'meow', but the file could not be read.
-> \box...=
-\hbox(0.0+0.0)x0.0
-! OK.
-<argument> \l_tmpa_box 
-l. ...  }
  <./folder-a/meow.pdf>
 \c__graphics_folder-a/meow.pdf:cropbox_urx_dim=\dimen...
 \c__graphics_folder-a/meow.pdf:cropbox_ury_dim=\dimen...
diff --git a/l3experimental/l3graphics/testfiles/m3graphics001.uptex.tlg b/l3experimental/l3graphics/testfiles/m3graphics001.uptex.tlg
index 5e142eb9d..63eb0201f 100644
--- a/l3experimental/l3graphics/testfiles/m3graphics001.uptex.tlg
+++ b/l3experimental/l3graphics/testfiles/m3graphics001.uptex.tlg
@@ -1,7 +1,20 @@
 This is a generated file for the LaTeX (2e + expl3) validation system.
 Don't change this file in any respect.
 ============================================================
-TEST 1: Basic graphic inclusion
+TEST 1: Finding graphics
+============================================================
+> \l_tmpa_tl=miau.ps.
+<recently read> }
+l. ...  }
+> \l_tmpa_tl=foo.bar.eps.
+<recently read> }
+l. ...  }
+> \l_tmpa_tl=foo bar.eps.
+<recently read> }
+l. ...  }
+============================================================
+============================================================
+TEST 2: Basic graphic inclusion
 ============================================================
 \c__graphics_miau.ps_llx_dim=\dimen...
 \c__graphics_miau.ps_lly_dim=\dimen...
@@ -36,20 +49,21 @@ l. ...  }
 ! OK.
 <argument> \l_tmpa_box 
 l. ...  }
+! Package graphics Error: Image file 'not-a-graphic' not found.
+For immediate help type H <return>.
+ ...                                              
+l. ...  }
+LaTeX tried to open graphic file 'not-a-graphic', but the file could not be
+read.
 ============================================================
 ============================================================
-TEST 2: Searching a sub path
+TEST 3: Searching a sub path
 ============================================================
 ! Package graphics Error: Image file 'meow' not found.
 For immediate help type H <return>.
  ...                                              
 l. ...  }
 LaTeX tried to open graphic file 'meow', but the file could not be read.
-> \box...=
-\hbox(0.0+0.0)x0.0
-! OK.
-<argument> \l_tmpa_box 
-l. ...  }
 \c__graphics_folder-a/meow.ps_llx_dim=\dimen...
 \c__graphics_folder-a/meow.ps_lly_dim=\dimen...
 \c__graphics_folder-a/meow.ps_urx_dim=\dimen...
diff --git a/l3experimental/l3graphics/testfiles/m3graphics001.xetex.tlg b/l3experimental/l3graphics/testfiles/m3graphics001.xetex.tlg
index 45fd9bd80..e1e142ccd 100644
--- a/l3experimental/l3graphics/testfiles/m3graphics001.xetex.tlg
+++ b/l3experimental/l3graphics/testfiles/m3graphics001.xetex.tlg
@@ -1,7 +1,20 @@
 This is a generated file for the LaTeX (2e + expl3) validation system.
 Don't change this file in any respect.
 ============================================================
-TEST 1: Basic graphic inclusion
+TEST 1: Finding graphics
+============================================================
+> \l_tmpa_tl=miau.pdf.
+<recently read> }
+l. ...  }
+> \l_tmpa_tl=foo.bar.eps.
+<recently read> }
+l. ...  }
+> \l_tmpa_tl=foo bar.eps.
+<recently read> }
+l. ...  }
+============================================================
+============================================================
+TEST 2: Basic graphic inclusion
 ============================================================
 \c__graphics_miau.pdf:P1_urx_dim=\dimen...
 \c__graphics_miau.pdf:P1_ury_dim=\dimen...
@@ -34,20 +47,21 @@ l. ...  }
 ! OK.
 <argument> \l_tmpa_box 
 l. ...  }
+! Package graphics Error: Image file 'not-a-graphic' not found.
+For immediate help type H <return>.
+ ...                                              
+l. ...  }
+LaTeX tried to open graphic file 'not-a-graphic', but the file could not be
+read.
 ============================================================
 ============================================================
-TEST 2: Searching a sub path
+TEST 3: Searching a sub path
 ============================================================
 ! Package graphics Error: Image file 'meow' not found.
 For immediate help type H <return>.
  ...                                              
 l. ...  }
 LaTeX tried to open graphic file 'meow', but the file could not be read.
-> \box...=
-\hbox(0.0+0.0)x0.0
-! OK.
-<argument> \l_tmpa_box 
-l. ...  }
 \c__graphics_folder-a/meow.pdf:P1_urx_dim=\dimen...
 \c__graphics_folder-a/meow.pdf:P1_ury_dim=\dimen...
 > \box...=





More information about the latex3-commits mailing list.