diff options
Diffstat (limited to 'Master/texmf-dist/source/latex/l3kernel/l3file.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/l3kernel/l3file.dtx | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3file.dtx b/Master/texmf-dist/source/latex/l3kernel/l3file.dtx index 79c83e830de..30c212d3015 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3file.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3file.dtx @@ -35,7 +35,7 @@ % %<*driver|package> \RequirePackage{l3names} -\GetIdInfo$Id: l3file.dtx 2896 2011-10-09 20:36:50Z joseph $ +\GetIdInfo$Id: l3file.dtx 3095 2011-12-26 22:33:23Z joseph $ {L3 Experimental file operations} %</driver|package> %<*driver> @@ -290,7 +290,7 @@ % \end{variable} % % \begin{macro}{\file_add_path:nN} -% \begin{variable}{\g_file_test_stream} +% \begin{variable}{\g_file_test_ior} % \begin{macro}[aux]{\file_add_path_search:nN} % The way to test if a file exists is to try to open it: if it does not % exist then \TeX{} will report end-of-file. For files which are in the @@ -299,17 +299,17 @@ % location is of course treated as the correct one. If nothing is found, % |#2| is returned empty. % \begin{macrocode} -\cs_new_protected_nopar:Npn \file_add_path:nN #1#2 +\cs_new_protected:Npn \file_add_path:nN #1#2 { - \ior_open:Nn \g_file_test_stream {#1} - \ior_if_eof:NTF \g_file_test_stream + \ior_open:Nn \g_file_test_ior {#1} + \ior_if_eof:NTF \g_file_test_ior { \file_add_path_search:nN {#1} #2 } { - \ior_close:N \g_file_test_stream + \ior_close:N \g_file_test_ior \tl_set:Nx #2 {#1} } } -\cs_new_protected_nopar:Npn \file_add_path_search:nN #1#2 +\cs_new_protected:Npn \file_add_path_search:nN #1#2 { \tl_clear:N #2 %<*package> @@ -323,8 +323,8 @@ %</package> \seq_map_inline:Nn \l_file_search_path_seq { - \ior_open:Nn \g_file_test_stream { ##1 #1 } - \ior_if_eof:NF \g_file_test_stream + \ior_open:Nn \g_file_test_ior { ##1 #1 } + \ior_if_eof:NF \g_file_test_ior { \tl_set:Nx #2 { ##1 #1 } \seq_map_break: @@ -334,7 +334,7 @@ \cs_if_exist:NT \input@path { \seq_set_eq:NN \l_file_search_path_seq \l_file_search_path_saved_seq } %</package> - \ior_close:N \g_file_test_stream + \ior_close:N \g_file_test_ior } % \end{macrocode} % \end{macro} @@ -361,7 +361,7 @@ % Loading a file is done in a safe way, checking first that the file % exists and loading only if it does. % \begin{macrocode} -\cs_new_protected_nopar:Npn \file_input:n #1 +\cs_new_protected:Npn \file_input:n #1 { \file_add_path:nN {#1} \l_file_name_tl \tl_if_empty:NF \l_file_name_tl @@ -385,12 +385,12 @@ % \begin{macro}{\file_path_remove:n} % Wrapper functions to manage the search path. % \begin{macrocode} -\cs_new_protected_nopar:Npn \file_path_include:n #1 +\cs_new_protected:Npn \file_path_include:n #1 { \seq_if_in:NnF \l_file_search_path_seq {#1} { \seq_put_right:Nn \l_file_search_path_seq {#1} } } -\cs_new_protected_nopar:Npn \file_path_remove:n #1 +\cs_new_protected:Npn \file_path_remove:n #1 { \seq_remove_all:Nn \l_file_search_path_seq {#1} } % \end{macrocode} % \end{macro} |