[latex3-commits] [git/LaTeX3-latex3-latex3] master: Fix file lookup with \input at path (ad31c8cb3)

PhelypeOleinik tex.phelype at gmail.com
Wed Jul 8 23:24:10 CEST 2020


Repository : https://github.com/latex3/latex3
On branch  : master
Link       : https://github.com/latex3/latex3/commit/ad31c8cb31120dc5ca94b95baeda2135b1e6c9ad

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

commit ad31c8cb31120dc5ca94b95baeda2135b1e6c9ad
Author: PhelypeOleinik <tex.phelype at gmail.com>
Date:   Wed Jul 8 18:24:10 2020 -0300

    Fix file lookup with \input at path


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

ad31c8cb31120dc5ca94b95baeda2135b1e6c9ad
 l3kernel/l3file.dtx | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/l3kernel/l3file.dtx b/l3kernel/l3file.dtx
index 7d91d40e9..47d86c96f 100644
--- a/l3kernel/l3file.dtx
+++ b/l3kernel/l3file.dtx
@@ -2701,8 +2701,8 @@
 % \end{macro}
 %
 % \begin{macro}[EXP]{\file_full_name:n, \@@_full_name:n}
-% \begin{macro}[EXP]{\@@_full_name_aux:nn}
-% \begin{macro}[EXP]{\@@_full_name_aux:n}
+% \begin{macro}[EXP]{\@@_full_name_aux:Nnn}
+% \begin{macro}[EXP]{\@@_full_name_aux:nN}
 % \begin{macro}[EXP]{\@@_name_cleanup:w}
 % \begin{macro}[EXP]{\@@_name_end:}
 % \begin{macro}[EXP]{\@@_name_ext_check:n}
@@ -2733,12 +2733,12 @@
         \tl_if_blank:eTF { \@@_size:n {#1} }
           {
             \seq_map_tokens:Nn \l_file_search_path_seq
-              { \@@_full_name_aux:nn {#1} }
+              { \@@_full_name_aux:Nnn \seq_map_break:n {#1} }
 %<*package>
             \cs_if_exist:NT \input at path
               {
                 \tl_map_tokens:Nn \input at path
-                  { \@@_full_name_aux:nn {#1} }
+                  { \@@_full_name_aux:Nnn \tl_map_break:n {#1} }
               }
 %</package>
             \@@_name_end:
@@ -2750,13 +2750,13 @@
 %   Two pars to the auxiliary here so we can avoid doing quoting
 %   twice in the event we find the right file.
 %    \begin{macrocode}
-\cs_new:Npn \@@_full_name_aux:nn #1#2
-  { \exp_args:Ne \@@_full_name_aux:n { \tl_to_str:n {#2} / #1 } }
-\cs_new:Npn \@@_full_name_aux:n #1
+\cs_new:Npn \@@_full_name_aux:Nnn #1#2#3
+  { \exp_args:Ne \@@_full_name_aux:nN { \tl_to_str:n {#3} / #2 } #1 }
+\cs_new:Npn \@@_full_name_aux:nN #1 #2
   {
     \tl_if_blank:eF { \@@_size:n {#1} }
       {
-        \seq_map_break:n
+        #2
           {
             \@@_ext_check:n {#1}
             \@@_name_cleanup:w





More information about the latex3-commits mailing list.