summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/l3kernel/l3file.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/source/latex/l3kernel/l3file.dtx')
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3file.dtx89
1 files changed, 44 insertions, 45 deletions
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3file.dtx b/Master/texmf-dist/source/latex/l3kernel/l3file.dtx
index aca87c16595..fee42ad5736 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3file.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3file.dtx
@@ -1,43 +1,30 @@
% \iffalse meta-comment
%
%% File: l3file.dtx Copyright (C) 1990-2016 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
-%% license or (at your option) any later version. The latest version
-%% of this license is in the file
-%%
-%% http://www.latex-project.org/lppl.txt
-%%
-%% This file is part of the "l3kernel bundle" (The Work in LPPL)
-%% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%% http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%% Snapshots taken from the repository represent work in progress and may
-%% not work or may contain conflicting material! We therefore ask
-%% people _not_ to put them into distributions, archives, etc. without
-%% prior consultation with 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
+% license or (at your option) any later version. The latest version
+% of this license is in the file
+%
+% http://www.latex-project.org/lppl.txt
+%
+% This file is part of the "l3kernel bundle" (The Work in LPPL)
+% and all files in that bundle must be distributed together.
+%
+% -----------------------------------------------------------------------
+%
+% The development version of the bundle can be found at
+%
+% https://github.com/latex3/latex3
+%
+% for those people who are interested.
%
%<*driver>
\documentclass[full]{l3doc}
%</driver>
%<*driver|package>
-\GetIdInfo$Id: l3file.dtx 6685 2016-08-19 16:26:52Z bruno $
+\GetIdInfo$Id: l3file.dtx 6805 2016-12-28 22:15:52Z joseph $
{L3 File and I/O operations}
%</driver|package>
%<*driver>
@@ -278,9 +265,9 @@
% \end{texnote}
% \end{function}
%
-% \begin{function}[added = 2012-06-24, updated = 2012-07-31]{\ior_get_str:NN}
+% \begin{function}[added = 2016-12-04]{\ior_str_get:NN}
% \begin{syntax}
-% \cs{ior_get_str:NN} \meta{stream} \meta{token list variable}
+% \cs{ior_str_get:NN} \meta{stream} \meta{token list variable}
% \end{syntax}
% Function that reads one line from the input \meta{stream} and stores
% the result locally in the \meta{token list} variable. If the
@@ -302,7 +289,7 @@
% 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}.
+% \cs{ior_str_get:NN}.
% \end{texnote}
% \end{function}
%
@@ -690,7 +677,10 @@
{
\group_begin:
\seq_map_inline:Nn \l_char_active_seq
- { \char_set:active:Npx ##1 { \cs_to_str:N ##1 } }
+ {
+ \tl_set:Nx \l_@@_internal_tl { \iow_char:N ##1 }
+ \char_set_active_eq:NN ##1 \l_@@_internal_tl
+ }
\tl_set:Nx \l_@@_internal_name_tl {#1}
\tl_set:Nx \l_@@_internal_name_tl
{ \tl_to_str:N \l_@@_internal_name_tl }
@@ -803,7 +793,7 @@
%
% \begin{macro}{\file_input:n}
% \begin{macro}[int]{\@@_if_exist:nT}
-% \begin{macro}[aux]{\@@_input:n \@@_input:V}
+% \begin{macro}[aux]{\@@_input:n, \@@_input:V}
% \begin{macro}[aux]{\@@_input_aux:n, \@@_input_aux:o}
% Loading a file is done in a safe way, checking first that the file
% exists and loading only if it does. Push the file name on the
@@ -1110,7 +1100,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \ior_close:N #1
{
- \int_compare:nT { \c_minus_one < #1 < \c_sixteen }
+ \int_compare:nT { - \c_one < #1 < \c_sixteen }
{
\tex_closein:D #1
\prop_gremove:NV \g_@@_streams_prop #1
@@ -1186,15 +1176,15 @@
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\ior_get_str:NN}
+% \begin{macro}{\ior_str_get:NN}
% 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
+\cs_new_protected:Npn \ior_str_get:NN #1#2
{
\use:x
{
- \int_set_eq:NN \tex_endlinechar:D \c_minus_one
+ \int_set:Nn \tex_endlinechar:D { - \c_one }
\exp_not:n { \etex_readline:D #1 to #2 }
\int_set:Nn \tex_endlinechar:D { \int_use:N \tex_endlinechar:D }
}
@@ -1349,13 +1339,13 @@
% \begin{macrocode}
\cs_new_protected:Npn \iow_close:N #1
{
- \int_compare:nT { \c_minus_one < #1 < \c_sixteen }
+ \int_compare:nT { - \c_one < #1 < \c_sixteen }
{
\tex_immediate:D \tex_closeout:D #1
\prop_gremove:NV \g_@@_streams_prop #1
\seq_if_in:NVF \g_@@_streams_seq #1
{ \seq_gpush:NV \g_@@_streams_seq #1 }
- \cs_gset_eq:NN #1 \c_term_ior
+ \cs_gset_eq:NN #1 \c_term_iow
}
}
\cs_generate_variant:Nn \iow_close:N { c }
@@ -1572,7 +1562,7 @@
% nicer.
% \begin{macrocode}
\group_begin:
- \int_set_eq:NN \tex_escapechar:D \c_minus_one
+ \int_set:Nn \tex_escapechar:D { - \c_one }
\tl_const:Nx \c_@@_wrap_marker_tl
{ \tl_to_str:n { \^^I \^^O \^^W \^^_ \^^W \^^R \^^A \^^P } }
\group_end:
@@ -1638,7 +1628,7 @@
\cs_new_protected:Npn \iow_wrap:nnnN #1#2#3#4
{
\group_begin:
- \int_set_eq:NN \tex_escapechar:D \c_minus_one
+ \int_set:Nn \tex_escapechar:D { - \c_one }
\cs_set:Npx \{ { \token_to_str:N \{ }
\cs_set:Npx \# { \token_to_str:N \# }
\cs_set:Npx \} { \token_to_str:N \} }
@@ -1892,6 +1882,15 @@
{ Only~\iow_wrap:nnnN~(arg~1)~allows~\iow_indent:n }
% \end{macrocode}
%
+% \subsection{Deprecated functions}
+%
+% \begin{macro}[added = 2012-06-24, updated = 2012-07-31, deprecated=2017-12-31]{\ior_get_str:NN}
+% For removal after 2017-12-31.
+% \begin{macrocode}
+\cs_new_eq:NN \ior_get_str:NN \ior_str_get:NN
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macrocode}
%</initex|package>
% \end{macrocode}