diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3kernel/l3file.sty')
| -rw-r--r-- | Master/texmf-dist/tex/latex/l3kernel/l3file.sty | 45 |
1 files changed, 23 insertions, 22 deletions
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3file.sty b/Master/texmf-dist/tex/latex/l3kernel/l3file.sty index 5ee45083280..2ae16bd987d 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/l3file.sty +++ b/Master/texmf-dist/tex/latex/l3kernel/l3file.sty @@ -13,7 +13,7 @@ %% %% Do not distribute a modified version of this file. %% -%% File: l3file.dtx Copyright (C) 2009-2011 The LaTeX3 Project +%% File: l3file.dtx Copyright (C) 2009-2012 The LaTeX3 Project %% %% It may be distributed and/or modified under the conditions of the %% LaTeX Project Public License (LPPL), either version 1.3c of this @@ -46,7 +46,7 @@ %% %% ----------------------------------------------------------------------- \RequirePackage{l3names} -\GetIdInfo$Id: l3file.dtx 3095 2011-12-26 22:33:23Z joseph $ +\GetIdInfo$Id: l3file.dtx 3158 2012-01-09 00:47:42Z bruno $ {L3 Experimental file operations} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} @@ -55,17 +55,18 @@ \tl_gset_eq:NN \g_file_current_name_tl \@currname \seq_new:N \g_file_stack_seq \seq_new:N \g_file_record_seq -\tl_new:N \l_file_name_tl +\tl_new:N \l_file_internal_name_tl \seq_new:N \l_file_search_path_seq -\seq_new:N \l_file_search_path_saved_seq -\seq_new:N \l_file_tmpa_seq +\seq_new:N \l_file_internal_saved_path_seq +\seq_new:N \l_file_internal_seq +\ior_new:N \g_file_internal_ior \cs_new_protected:Npn \file_add_path:nN #1#2 { - \ior_open:Nn \g_file_test_ior {#1} - \ior_if_eof:NTF \g_file_test_ior + \ior_open:Nn \g_file_internal_ior {#1} + \ior_if_eof:NTF \g_file_internal_ior { \file_add_path_search:nN {#1} #2 } { - \ior_close:N \g_file_test_ior + \ior_close:N \g_file_internal_ior \tl_set:Nx #2 {#1} } } @@ -74,40 +75,40 @@ \tl_clear:N #2 \cs_if_exist:NT \input@path { - \seq_set_eq:NN \l_file_search_path_saved_seq \l_file_search_path_seq - \seq_set_from_clist:NN \l_file_tmpa_seq \input@path + \seq_set_eq:NN \l_file_internal_saved_path_seq \l_file_search_path_seq + \seq_set_from_clist:NN \l_file_internal_seq \input@path \seq_concat:NNN \l_file_search_path_seq - \l_file_search_path_seq \l_file_tmpa_seq + \l_file_search_path_seq \l_file_internal_seq } \seq_map_inline:Nn \l_file_search_path_seq { - \ior_open:Nn \g_file_test_ior { ##1 #1 } - \ior_if_eof:NF \g_file_test_ior + \ior_open:Nn \g_file_internal_ior { ##1 #1 } + \ior_if_eof:NF \g_file_internal_ior { \tl_set:Nx #2 { ##1 #1 } \seq_map_break: } } \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_ior + { \seq_set_eq:NN \l_file_search_path_seq \l_file_internal_saved_path_seq } + \ior_close:N \g_file_internal_ior } \prg_new_protected_conditional:Nnn \file_if_exist:n { T , F , TF } { - \file_add_path:nN {#1} \l_file_name_tl - \tl_if_empty:NTF \l_file_name_tl + \file_add_path:nN {#1} \l_file_internal_name_tl + \tl_if_empty:NTF \l_file_internal_name_tl { \prg_return_false: } { \prg_return_true: } } \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 + \file_add_path:nN {#1} \l_file_internal_name_tl + \tl_if_empty:NF \l_file_internal_name_tl { \@addtofilelist {#1} \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 \c_space_tl + \exp_after:wN \tex_input:D \l_file_internal_name_tl \c_space_tl \seq_gpop:NN \g_file_stack_seq \g_file_current_name_tl } } @@ -127,8 +128,8 @@ } \AtBeginDocument { - \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 + \seq_set_from_clist:NN \l_file_internal_seq \@filelist + \seq_gconcat:NNN \g_file_record_seq \g_file_record_seq \l_file_internal_seq } %% %% |