summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/l3kernel/l3file.dtx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-08-16 22:41:08 +0000
committerKarl Berry <karl@freefriends.org>2012-08-16 22:41:08 +0000
commitca1c73f9a8de69e467230c4a57ccf8b07cd275a9 (patch)
tree6272657307f73c14327d6b8bce5d6b7ff97c3f66 /Master/texmf-dist/source/latex/l3kernel/l3file.dtx
parent22c251adda514ed7b453066de05b2f89707d0fe6 (diff)
finish l3 update
git-svn-id: svn://tug.org/texlive/trunk@27427 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/l3kernel/l3file.dtx')
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3file.dtx30
1 files changed, 20 insertions, 10 deletions
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3file.dtx b/Master/texmf-dist/source/latex/l3kernel/l3file.dtx
index 919281bd552..3816602c541 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3file.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3file.dtx
@@ -34,8 +34,8 @@
%% -----------------------------------------------------------------------
%
%<*driver|package>
-\RequirePackage{l3names}
-\GetIdInfo$Id: l3file.dtx 3986 2012-07-15 19:23:51Z joseph $
+\RequirePackage{l3bootstrap}
+\GetIdInfo$Id: l3file.dtx 4059 2012-08-08 13:12:06Z bruno $
{L3 File and I/O operations}
%</driver|package>
%<*driver>
@@ -207,7 +207,7 @@
% additive).
% \end{function}
%
-% \begin{function}[updated = 2012-07-03]
+% \begin{function}[updated = 2012-07-31]
% {\ior_close:N, \ior_close:c, \iow_close:N, \iow_close:c}
% \begin{syntax}
% \cs{ior_close:N} \meta{stream}
@@ -246,7 +246,7 @@
% \end{texnote}
% \end{function}
%
-% \begin{function}[added = 2012-06-24]{\ior_get_str:NN}
+% \begin{function}[added = 2012-06-24, updated = 2012-07-31]{\ior_get_str:NN}
% \begin{syntax}
% \cs{ior_get_str:NN} \meta{stream} \meta{token list variable}
% \end{syntax}
@@ -257,8 +257,10 @@
% category code $12$ (other), with the exception of space
% characters which are given category code $10$ (space).
% \begin{texnote}
-% This protected macro expands to the \eTeX{} primitive \tn{readline}
-% along with the |to| keyword.
+% This protected macro is a wrapper around the \eTeX{} primitive
+% \tn{readline}. However, the end-line character normally added by
+% this primitive is not included in the result of
+% \cs{ior_get_str:NN}.
% \end{texnote}
% \end{function}
%
@@ -490,7 +492,7 @@
% higher-level
% functions which have already fully expanded the \meta{file name} and which
% need to perform multiple open or close operations. See for example the
-% implementation of \cs{file_add_path:Nn},
+% implementation of \cs{file_add_path:nN},
% \end{function}
%
% \end{documentation}
@@ -1112,10 +1114,18 @@
% \end{macro}
%
% \begin{macro}{\ior_get_str:NN}
-% Reading as strings is also a primitive wrapper.
+% Reading as strings is a more complicated wrapper, as we wish to
+% remove the endline character.
% \begin{macrocode}
\cs_new_protected:Npn \ior_get_str:NN #1#2
- { \etex_readline:D #1 to #2 }
+ {
+ \use:x
+ {
+ \int_set_eq:NN \tex_endlinechar:D \c_minus_one
+ \exp_not:n { \etex_readline:D #1 to #2 }
+ \int_set:Nn \tex_endlinechar:D { \int_use:N \tex_endlinechar:D }
+ }
+ }
% \end{macrocode}
% \end{macro}
%
@@ -1293,7 +1303,7 @@
{
\int_compare:nNnF #1 > \c_fifteen
{
- \tex_closeout:D #1
+ \tex_immediate:D \tex_closeout:D #1
\prop_gremove:NV \g_@@_streams_prop #1
\cs_gset_eq:NN #1 \c_term_iow
}