summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/l3kernel/l3file.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-12-29 23:03:42 +0000
committerKarl Berry <karl@freefriends.org>2011-12-29 23:03:42 +0000
commit7a50f35d6fd3bd705c78298b1ccc085991638f87 (patch)
tree7f749391d34aa12a37a30a33c00b3098b2320e7c /Master/texmf-dist/tex/latex/l3kernel/l3file.sty
parent0bc9393ae50667d7ff769a76321a9548a70351fc (diff)
l3kernel 3109 (29dec11)
git-svn-id: svn://tug.org/texlive/trunk@24971 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3kernel/l3file.sty')
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3file.sty24
1 files changed, 12 insertions, 12 deletions
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3file.sty b/Master/texmf-dist/tex/latex/l3kernel/l3file.sty
index 1437c74f4da..5ee45083280 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3file.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3file.sty
@@ -46,7 +46,7 @@
%%
%% -----------------------------------------------------------------------
\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}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -59,17 +59,17 @@
\seq_new:N \l_file_search_path_seq
\seq_new:N \l_file_search_path_saved_seq
\seq_new:N \l_file_tmpa_seq
-\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
\cs_if_exist:NT \input@path
@@ -81,8 +81,8 @@
}
\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:
@@ -90,7 +90,7 @@
}
\cs_if_exist:NT \input@path
{ \seq_set_eq:NN \l_file_search_path_seq \l_file_search_path_saved_seq }
- \ior_close:N \g_file_test_stream
+ \ior_close:N \g_file_test_ior
}
\prg_new_protected_conditional:Nnn \file_if_exist:n { T , F , TF }
{
@@ -99,7 +99,7 @@
{ \prg_return_false: }
{ \prg_return_true: }
}
-\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
@@ -111,12 +111,12 @@
\seq_gpop:NN \g_file_stack_seq \g_file_current_name_tl
}
}
-\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} }
\cs_new_protected_nopar:Npn \file_list:
{