l3kernel 2828 (15sep11)

git-svn-id: svn://tug.org/texlive/trunk@23983 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 24 insertions, 9 deletions

diff --git a/Master/texmf-dist/source/latex/l3kernel/l3file.dtx b/Master/texmf-dist/source/latex/l3kernel/l3file.dtx
index d124905c547..2c043f66ec0 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3file.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3file.dtx
@@ -9,7 +9,7 @@
 %%
 %%    http://www.latex-project.org/lppl.txt
 %%
-%% This file is part of the "expl3 bundle" (The Work in LPPL)
+%% This file is part of the "l3kernel bundle" (The Work in LPPL)
 %% and all files in that bundle must be distributed together.
 %%
 %% The released version of this bundle is available from CTAN.
@@ -35,7 +35,7 @@
 %
 %<*driver|package>
 \RequirePackage{l3names}
-\GetIdInfo$Id: l3file.dtx 2665 2011-08-25 22:15:27Z joseph $
+\GetIdInfo$Id: l3file.dtx 2776 2011-09-07 18:33:19Z joseph $
   {L3 Experimental file operations}
 %</driver|package>
 %<*driver>
@@ -183,7 +183,12 @@
 %
 % \begin{variable}{\l_file_search_path_saved_seq}
 %   When loaded on top of \LaTeXe{}, there is a need to save the search
-%   path so that \cs{input@path} can be used as appropriate.
+%   path so that \tn{input@path} can be used as appropriate.
+% \end{variable}
+%
+% \begin{variable}[added = 2011-09-06]{\l_file_tmpa_seq}
+%   When loaded on top of \LaTeXe{}, there is a need to convert
+%   the comma lists \tn{input@path} and \tn{@filelist} to sequences.
 % \end{variable}
 %
 % \end{documentation}
@@ -275,6 +280,15 @@
 %    \end{macrocode}
 % \end{variable}
 %
+% \begin{variable}{\l_file_tmpa_seq}
+%   Scratch space for comma list conversion in package mode.
+%    \begin{macrocode}
+%<*package>
+\seq_new:N \l_file_tmpa_seq
+%</package>
+%    \end{macrocode}
+% \end{variable}
+%
 % \begin{macro}{\file_add_path:nN}
 % \begin{variable}{\g_file_test_stream}
 % \begin{macro}[aux]{\file_add_path_search:nN}
@@ -302,8 +316,9 @@
     \cs_if_exist:NT \input@path
       {
         \seq_set_eq:NN \l_file_search_path_saved_seq \l_file_search_path_seq
-        \clist_map_inline:Nn \input@path
-          { \seq_put_right:Nn \l_file_search_path_seq {##1} }
+        \seq_set_from_clist:NN \l_file_tmpa_seq \input@path
+        \seq_concat:NNN \l_file_search_path_seq
+          \l_file_search_path_seq \l_file_tmpa_seq
       }
 %</package>
     \seq_map_inline:Nn \l_file_search_path_seq
@@ -359,7 +374,7 @@
 %</package>
         \seq_gpush:NV \g_file_stack_seq \g_file_current_name_tl
         \tl_gset:Nn \g_file_current_name_tl {#1}
-        \exp_after:wN \tex_input:D \l_file_name_tl ~
+        \exp_after:wN \tex_input:D \l_file_name_tl \c_space_tl
         \seq_gpop:NN \g_file_stack_seq \g_file_current_name_tl
       }
   }
@@ -400,8 +415,8 @@
 %<*package>
 \AtBeginDocument
   {
-    \clist_map_inline:Nn \@filelist
-      { \seq_put_right:Nn \g_file_record_seq {#1} }
+    \seq_set_from_clist:NN \l_file_tmpa_seq \@filelist
+    \seq_gconcat:NNN \g_file_record_seq \g_file_record_seq \l_file_tmpa_seq
   }
 %</package>
 %    \end{macrocode}
@@ -412,4 +427,4 @@
 %
 % \end{implementation}
 %
-% \PrintIndex
\ No newline at end of file
+% \PrintIndex