summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/l3kernel/l3file.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-04-23 23:35:34 +0000
committerKarl Berry <karl@freefriends.org>2012-04-23 23:35:34 +0000
commit06f92e7988867477e0e8ba1b2dea3752d90f7fbe (patch)
tree6cc2f8ec5dbfc078c9c5f37bfb15814c704b1793 /Master/texmf-dist/tex/latex/l3kernel/l3file.sty
parent84c410717bd484db4ccea240224d83fbb42b464a (diff)
l3kernel 3570 (23apr12)
git-svn-id: svn://tug.org/texlive/trunk@26111 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.sty50
1 files changed, 24 insertions, 26 deletions
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3file.sty b/Master/texmf-dist/tex/latex/l3kernel/l3file.sty
index 25eda0dc609..a86de65f88f 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 3464 2012-02-26 15:30:29Z bruno $
+\GetIdInfo$Id: l3file.dtx 3520 2012-03-09 19:34:07Z joseph $
{L3 Experimental file and I/O operations}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -205,20 +205,20 @@
\cs_generate_variant:Nn \iow_open:Nn { c }
\cs_new_protected:Npn \ior_open_aux:Nn #1#2
{
- \file_add_path:nN {#2} \l_file_name_internal_tl
+ \file_add_path:nN {#2} \l_file_internal_name_tl
\quark_if_no_value:NTF \l_file_internal_name_tl
{ \file_input_error:n {#2} }
- { \ior_open_unsafe:No #1 \l_file_name_internal_tl }
+ { \ior_open_unsafe:No #1 \l_file_internal_name_tl }
}
\prg_new_protected_conditional:Npnn \ior_open:Nn #1#2 { T , F , TF }
{ \file_name_sanitize:nn {#2} { \ior_open_aux:NnTF #1 } }
\cs_new_protected:Npn \ior_open_aux:NnTF #1#2
{
- \file_add_path:nN {#2} \l_file_name_internal_tl
+ \file_add_path:nN {#2} \l_file_internal_name_tl
\quark_if_no_value:NTF \l_file_internal_name_tl
{ \prg_return_false: }
{
- \ior_open_unsafe:No #1 \l_file_name_internal_tl
+ \ior_open_unsafe:No #1 \l_file_internal_name_tl
\prg_return_true:
}
}
@@ -272,8 +272,7 @@
\ior_new:N \g_ior_internal_ior
\cs_new_protected:Npn \iow_stream_alloc:N #1
{
- \cs_if_exist:cTF { g_iow_ \int_use:N \l_iow_stream_int _iow }
- { \cs_gset_eq:Nc #1 { g_iow_ \int_use:N \l_iow_stream_int _iow } }
+ \cs_if_exist:cF { g_iow_ \int_use:N \l_iow_stream_int _iow }
{
\iow_stream_alloc_aux:
\int_compare:nNnT \l_iow_stream_int = \c_sixteen
@@ -283,26 +282,25 @@
\cs_gset_eq:cN
{ g_iow_ \int_use:N \l_iow_stream_int _iow } \g_iow_internal_iow
}
- \cs_gset_eq:Nc #1 { g_iow_ \int_use:N \l_iow_stream_int _iow }
}
+ \cs_gset_eq:Nc #1 { g_iow_ \int_use:N \l_iow_stream_int _iow }
}
\cs_new_protected_nopar:Npn \iow_stream_alloc_aux:
{
\int_incr:N \l_iow_stream_int
\int_compare:nNnT \l_iow_stream_int < \c_sixteen
{
- \cs_if_exist:cTF { g_iow_ \int_use:N \l_iow_stream_int _iow }
- {
- \prop_if_in:NVT \g_iow_streams_prop \l_iow_stream_int
- { \iow_stream_alloc_aux: }
- }
- { \iow_stream_alloc_aux: }
+ \cs_if_exist:cTF { g_iow_ \int_use:N \l_iow_stream_int _iow }
+ {
+ \prop_if_in:NVT \g_iow_streams_prop \l_iow_stream_int
+ { \iow_stream_alloc_aux: }
+ }
+ { \iow_stream_alloc_aux: }
}
}
\cs_new_protected:Npn \ior_stream_alloc:N #1
{
- \cs_if_exist:cTF { g_ior_ \int_use:N \l_ior_stream_int _ior }
- { \cs_gset_eq:Nc #1 { g_ior_ \int_use:N \l_ior_stream_int _ior } }
+ \cs_if_exist:cF { g_ior_ \int_use:N \l_ior_stream_int _ior }
{
\ior_stream_alloc_aux:
\int_compare:nNnT \l_ior_stream_int = \c_sixteen
@@ -312,20 +310,20 @@
\cs_gset_eq:cN
{ g_ior_ \int_use:N \l_iow_stream_int _ior } \g_ior_internal_ior
}
- \cs_gset_eq:Nc #1 { g_ior_ \int_use:N \l_ior_stream_int _ior }
}
+ \cs_gset_eq:Nc #1 { g_ior_ \int_use:N \l_ior_stream_int _ior }
}
\cs_new_protected_nopar:Npn \ior_stream_alloc_aux:
{
\int_incr:N \l_ior_stream_int
\int_compare:nNnT \l_ior_stream_int < \c_sixteen
{
- \cs_if_exist:cTF { g_ior_ \int_use:N \l_ior_stream_int _ior }
- {
- \prop_if_in:NVT \g_ior_streams_prop \l_ior_stream_int
- { \ior_stream_alloc_aux: }
- }
- { \ior_stream_alloc_aux: }
+ \cs_if_exist:cTF { g_ior_ \int_use:N \l_ior_stream_int _ior }
+ {
+ \prop_if_in:NVT \g_ior_streams_prop \l_ior_stream_int
+ { \ior_stream_alloc_aux: }
+ }
+ { \ior_stream_alloc_aux: }
}
}
\cs_new_protected:Npn \ior_close:N #1
@@ -621,10 +619,10 @@
}
\tl_new:N \l_ior_internal_tl
\msg_kernel_new:nnnn { file } { file-not-found }
- { Space~in~file~name~'#1'. }
+ { File~'#1'~not~found. }
{
- Spaces~are~not~permitted~in~files~loaded~by~LaTeX: \\
- Further~errors~may~follow!
+ The~requested~file~could~not~be~found~in~the~current~directory,~
+ in~the~TeX~search~path~or~in~the~LaTeX~search~path.
}
\msg_kernel_new:nnnn { file } { space-in-file-name }
{ Space~in~file~name~'#1'. }