diff options
Diffstat (limited to 'Master/texmf-dist/source/latex/l3kernel/l3file.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/l3kernel/l3file.dtx | 39 |
1 files changed, 15 insertions, 24 deletions
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3file.dtx b/Master/texmf-dist/source/latex/l3kernel/l3file.dtx index 36e0d59df62..334375a07f5 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3file.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3file.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2019-07-25} +% \date{Released 2019-08-14} % % \maketitle % @@ -166,7 +166,7 @@ % % Reading from files and reading from the terminal are separate processes in % \pkg{expl3}. The functions \cs{ior_get:NN} and \cs{ior_str_get:NN}, and their -% branching equivalents, are designed to work with files. +% branching equivalents, are designed to work with \emph{files}. % % \begin{function}[noTF, added = 2012-06-24, updated = 2019-03-23]{\ior_get:NN} % \begin{syntax} @@ -174,7 +174,7 @@ % \cs{ior_get:NNTF} \meta{stream} \meta{token list variable} \meta{true code} \meta{false code} % \end{syntax} % Function that reads one or more lines (until an equal number of left -% and right braces are found) from the input \meta{stream} and stores +% and right braces are found) from the file input \meta{stream} and stores % the result locally in the \meta{token list} variable. % The material read from the \meta{stream} is tokenized by \TeX{} % according to the category codes and \tn{endlinechar} in force when @@ -215,7 +215,7 @@ % \cs{ior_str_get:NN} \meta{stream} \meta{token list variable} % \cs{ior_str_get:NNTF} \meta{stream} \meta{token list variable} \meta{true code} \meta{false code} % \end{syntax} -% Function that reads one line from the input \meta{stream} and stores +% Function that reads one line from the file input \meta{stream} and stores % the result locally in the \meta{token list} variable. % The material is read from the \meta{stream} as a series of tokens with % category code $12$ (other), with the exception of space @@ -327,7 +327,7 @@ % \cs{ior_if_eof_p:N} \meta{stream} \\ % \cs{ior_if_eof:NTF} \meta{stream} \Arg{true code} \Arg{false code} % \end{syntax} -% Tests if the end of a \meta{stream} has been reached during a reading +% Tests if the end of a file \meta{stream} has been reached during a reading % operation. The test also returns a \texttt{true} value if % the \meta{stream} is not open. % \end{function} @@ -511,15 +511,6 @@ % % \subsection{Constant input--output streams, and variables} % -% \begin{variable}{\c_term_ior} -% Constant input stream for reading from the terminal. Reading from this -% stream using \cs{ior_get:NN} or similar results in a prompt from -% \TeX{} of the form -% \begin{verbatim} -% <tl>= -% \end{verbatim} -% \end{variable} -% % \begin{variable}[added = 2017-12-11]{\g_tmpa_ior, \g_tmpb_ior} % Scratch input stream for global use. These are never used by % the kernel code, and so are safe for use with any \LaTeX3-defined @@ -784,12 +775,12 @@ % \end{macrocode} % \end{variable} % -% \begin{variable}{\c_term_ior} +% \begin{variable}{\c_@@_term_ior} % Reading from the terminal (with a prompt) is done using a positive % but non-existent stream number. Unlike writing, there is no concept % of reading from the log. % \begin{macrocode} -\int_const:Nn \c_term_ior { 16 } +\int_const:Nn \c_@@_term_ior { 16 } % \end{macrocode} % \end{variable} % @@ -850,7 +841,7 @@ % Reserving a new stream is done by defining the name as equal to using the % terminal. % \begin{macrocode} -\cs_new_protected:Npn \ior_new:N #1 { \cs_new_eq:NN #1 \c_term_ior } +\cs_new_protected:Npn \ior_new:N #1 { \cs_new_eq:NN #1 \c_@@_term_ior } \cs_generate_variant:Nn \ior_new:N { c } % \end{macrocode} % \end{macro} @@ -971,13 +962,13 @@ % \begin{macrocode} \cs_new_protected:Npn \ior_close:N #1 { - \int_compare:nT { -1 < #1 < \c_term_ior } + \int_compare:nT { -1 < #1 < \c_@@_term_ior } { \tex_closein: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_ior } } \cs_generate_variant:Nn \ior_close:N { c } @@ -1029,7 +1020,7 @@ { \cs_if_exist:NTF #1 { - \int_compare:nTF { -1 < #1 < \c_term_ior } + \int_compare:nTF { -1 < #1 < \c_@@_term_ior } { \if_eof:w #1 \prg_return_true: @@ -1094,10 +1085,10 @@ % \end{macro} % \end{macro} % -% \begin{variable}{\c_@@_term_ior} +% \begin{variable}{\c_@@_term_noprompt_ior} % For reading without a prompt. % \begin{macrocode} -\int_const:Nn \c_@@_term_ior { -1 } +\int_const:Nn \c_@@_term_noprompt_ior { -1 } % \end{macrocode} % \end{variable} % @@ -1114,8 +1105,8 @@ \group_begin: \tex_escapechar:D = -1 \scan_stop: \tl_if_blank:nTF {#2} + { \exp_args:NNc #1 \c_@@_term_noprompt_ior } { \exp_args:NNc #1 \c_@@_term_ior } - { \exp_args:NNc #1 \c_term_ior } {#2} \exp_args:NNNv \group_end: \tl_set:Nn #3 {#2} @@ -1699,7 +1690,7 @@ \cs_new_protected:Npn \iow_wrap:nnnN #1#2#3#4 { \group_begin: -%<package> \use:c { conditionally@traceoff } +%<package> \cs_if_exist_use:N \conditionally@traceoff \int_set:Nn \tex_escapechar:D { -1 } \cs_set:Npx \{ { \token_to_str:N \{ } \cs_set:Npx \# { \token_to_str:N \# } |