l3kernel 3570 (23apr12)

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

1 files changed, 24 insertions, 26 deletions

diff --git a/Master/texmf-dist/source/latex/l3kernel/l3file.dtx b/Master/texmf-dist/source/latex/l3kernel/l3file.dtx
index 28f53230235..9b8bd6b1a0a 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 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}
 %</driver|package>
 %<*driver>
@@ -976,20 +976,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:
       }
   }
@@ -1073,8 +1073,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 }
       {
 %<*package>
         \iow_stream_alloc_aux:
@@ -1089,8 +1088,8 @@
 %<*initex>
         \iow_raw_new:c { g_iow_ \int_use:N \l_iow_stream_int _iow }
 %</initex>
-        \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 }
   }
 %<*package>
 \cs_new_protected_nopar:Npn \iow_stream_alloc_aux:
@@ -1098,19 +1097,18 @@
     \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: }
       }
   }
 %</package>
 \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 }
       {
 %<*package>
         \ior_stream_alloc_aux:
@@ -1125,8 +1123,8 @@
 %<*initex>
         \ior_raw_new:c { g_ior_ \int_use:N \l_ior_stream_int _ior }
 %</initex>
-        \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 }
   }
 %<*package>
 \cs_new_protected_nopar:Npn \ior_stream_alloc_aux:
@@ -1134,12 +1132,12 @@
     \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: }
       }
   }
 %</package>
@@ -1758,10 +1756,10 @@
 %
 %    \begin{macrocode}
 \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'. }