[latex3-commits] [git/LaTeX3-latex3-latex3] master: Deprecate \c_term_ior (455599dad)

Joseph Wright joseph.wright at morningstar2.co.uk
Thu Aug 1 10:38:55 CEST 2019


Repository : https://github.com/latex3/latex3
On branch  : master
Link       : https://github.com/latex3/latex3/commit/455599dada5104665fe7da30b885d7e3d2b2b438

>---------------------------------------------------------------

commit 455599dada5104665fe7da30b885d7e3d2b2b438
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Thu Aug 1 09:30:59 2019 +0100

    Deprecate \c_term_ior


>---------------------------------------------------------------

455599dada5104665fe7da30b885d7e3d2b2b438
 l3kernel/CHANGELOG.md                   |  4 ++++
 l3kernel/l3deprecation.dtx              |  9 +++++++++
 l3kernel/l3file.dtx                     | 35 ++++++++++++---------------------
 l3kernel/l3obsolete.txt                 |  1 +
 l3kernel/testfiles/m3expl001.luatex.tlg |  7 ++++---
 l3kernel/testfiles/m3expl001.ptex.tlg   |  7 ++++---
 l3kernel/testfiles/m3expl001.tlg        |  7 ++++---
 l3kernel/testfiles/m3expl001.uptex.tlg  |  7 ++++---
 l3kernel/testfiles/m3expl001.xetex.tlg  |  7 ++++---
 l3kernel/testfiles/m3expl003.luatex.tlg |  7 ++++---
 l3kernel/testfiles/m3expl003.ptex.tlg   |  7 ++++---
 l3kernel/testfiles/m3expl003.tlg        |  7 ++++---
 l3kernel/testfiles/m3expl003.uptex.tlg  |  7 ++++---
 l3kernel/testfiles/m3expl003.xetex.tlg  |  7 ++++---
 14 files changed, 67 insertions(+), 52 deletions(-)

diff --git a/l3kernel/CHANGELOG.md b/l3kernel/CHANGELOG.md
index 609407c14..c6b7fec10 100644
--- a/l3kernel/CHANGELOG.md
+++ b/l3kernel/CHANGELOG.md
@@ -7,6 +7,10 @@ this project uses date-based 'snapshot' version identifiers.
 
 ## [Unreleased]
 
+### Deprecated
+
+- `\c_term_ior`
+
 ## [2019-07-25]
 
 ### Fixed
diff --git a/l3kernel/l3deprecation.dtx b/l3kernel/l3deprecation.dtx
index 2eb2a8c7f..c00fa3684 100644
--- a/l3kernel/l3deprecation.dtx
+++ b/l3kernel/l3deprecation.dtx
@@ -927,6 +927,15 @@
 %    \end{macrocode}
 % \end{macro}
 %
+% \subsection{Deprecated \pkg{l3file} functions}
+%
+% \begin{macro}[EXP, deprecated = 2021-07-01]{\c_term_ior}
+%    \begin{macrocode}
+\__kernel_patch_deprecation:nnNNpn { 2021-01-01 } { -1 }
+\cs_new_protected:Npn \c_term_ior { -1 \scan_stop: }
+%    \end{macrocode}
+% \end{macro}
+%
 %    \begin{macrocode}
 %</initex|package>
 %    \end{macrocode}
diff --git a/l3kernel/l3file.dtx b/l3kernel/l3file.dtx
index abc93cfaf..408fd8efc 100644
--- a/l3kernel/l3file.dtx
+++ b/l3kernel/l3file.dtx
@@ -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}
diff --git a/l3kernel/l3obsolete.txt b/l3kernel/l3obsolete.txt
index a993bc1e0..8706c0aba 100644
--- a/l3kernel/l3obsolete.txt
+++ b/l3kernel/l3obsolete.txt
@@ -46,6 +46,7 @@ Function                   Expires end
 \c_two_hundred_fifty_six          2019
 \c_one_thousand                   2019
 \c_ten_thousand                   2019
+\c_term_ior                       2020
 \etex_....:D                      2019
 \hbox_unpack_clear:c              2020
 \hbox_unpack_clear:N              2020
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index dc5605900..621cfad64 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -2719,7 +2719,7 @@ Defining \exp_args:Nnnff on line ...
 Defining \__kernel_msg_expandable_error:nnff on line ...
 Defining \__kernel_msg_expandable_error:nnf on line ...
 Defining \l__ior_internal_tl on line ...
-Defining \c_term_ior on line ...
+Defining \c__ior_term_ior on line ...
 Defining \g__ior_streams_seq on line ...
 Defining \l__ior_stream_tl on line ...
 Defining \g__ior_streams_prop on line ...
@@ -2760,8 +2760,8 @@ Defining \__ior_str_get:NN on line ...
 Defining \ior_str_get:NNT on line ...
 Defining \ior_str_get:NNF on line ...
 Defining \ior_str_get:NNTF on line ...
-Defining \c__ior_term_ior on line ...
-\c__ior_term_ior=\count...
+Defining \c__ior_term_noprompt_ior on line ...
+\c__ior_term_noprompt_ior=\count...
 Defining \ior_get_term:nN on line ...
 Defining \ior_str_get_term:nN on line ...
 Defining \__ior_get_term:NnN on line ...
@@ -6800,6 +6800,7 @@ Defining \tl_show_analysis:n on line ...
 Defining \token_get_prefix_spec:N on line ...
 Defining \token_get_arg_spec:N on line ...
 Defining \token_get_replacement_spec:N on line ...
+Defining \c_term_ior on line ...
 )
 Defining message LaTeX/expl/wrong-driver on line ...
 Defining \l__expl_driver_tl on line ...
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index 793aac381..767a61afa 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -2973,7 +2973,7 @@ Defining \exp_args:Nnnff on line ...
 Defining \__kernel_msg_expandable_error:nnff on line ...
 Defining \__kernel_msg_expandable_error:nnf on line ...
 Defining \l__ior_internal_tl on line ...
-Defining \c_term_ior on line ...
+Defining \c__ior_term_ior on line ...
 Defining \g__ior_streams_seq on line ...
 Defining \l__ior_stream_tl on line ...
 Defining \g__ior_streams_prop on line ...
@@ -3014,8 +3014,8 @@ Defining \__ior_str_get:NN on line ...
 Defining \ior_str_get:NNT on line ...
 Defining \ior_str_get:NNF on line ...
 Defining \ior_str_get:NNTF on line ...
-Defining \c__ior_term_ior on line ...
-\c__ior_term_ior=\count...
+Defining \c__ior_term_noprompt_ior on line ...
+\c__ior_term_noprompt_ior=\count...
 Defining \ior_get_term:nN on line ...
 Defining \ior_str_get_term:nN on line ...
 Defining \__ior_get_term:NnN on line ...
@@ -6797,6 +6797,7 @@ Defining \tl_show_analysis:n on line ...
 Defining \token_get_prefix_spec:N on line ...
 Defining \token_get_arg_spec:N on line ...
 Defining \token_get_replacement_spec:N on line ...
+Defining \c_term_ior on line ...
 )
 Defining message LaTeX/expl/wrong-driver on line ...
 Defining \l__expl_driver_tl on line ...
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index ac8aa1f2b..8b3bb649d 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -2973,7 +2973,7 @@ Defining \exp_args:Nnnff on line ...
 Defining \__kernel_msg_expandable_error:nnff on line ...
 Defining \__kernel_msg_expandable_error:nnf on line ...
 Defining \l__ior_internal_tl on line ...
-Defining \c_term_ior on line ...
+Defining \c__ior_term_ior on line ...
 Defining \g__ior_streams_seq on line ...
 Defining \l__ior_stream_tl on line ...
 Defining \g__ior_streams_prop on line ...
@@ -3014,8 +3014,8 @@ Defining \__ior_str_get:NN on line ...
 Defining \ior_str_get:NNT on line ...
 Defining \ior_str_get:NNF on line ...
 Defining \ior_str_get:NNTF on line ...
-Defining \c__ior_term_ior on line ...
-\c__ior_term_ior=\count...
+Defining \c__ior_term_noprompt_ior on line ...
+\c__ior_term_noprompt_ior=\count...
 Defining \ior_get_term:nN on line ...
 Defining \ior_str_get_term:nN on line ...
 Defining \__ior_get_term:NnN on line ...
@@ -7097,6 +7097,7 @@ Defining \tl_show_analysis:n on line ...
 Defining \token_get_prefix_spec:N on line ...
 Defining \token_get_arg_spec:N on line ...
 Defining \token_get_replacement_spec:N on line ...
+Defining \c_term_ior on line ...
 )
 Defining message LaTeX/expl/wrong-driver on line ...
 Defining \l__expl_driver_tl on line ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index 8ae433a7a..ecc2e70ed 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -2973,7 +2973,7 @@ Defining \exp_args:Nnnff on line ...
 Defining \__kernel_msg_expandable_error:nnff on line ...
 Defining \__kernel_msg_expandable_error:nnf on line ...
 Defining \l__ior_internal_tl on line ...
-Defining \c_term_ior on line ...
+Defining \c__ior_term_ior on line ...
 Defining \g__ior_streams_seq on line ...
 Defining \l__ior_stream_tl on line ...
 Defining \g__ior_streams_prop on line ...
@@ -3014,8 +3014,8 @@ Defining \__ior_str_get:NN on line ...
 Defining \ior_str_get:NNT on line ...
 Defining \ior_str_get:NNF on line ...
 Defining \ior_str_get:NNTF on line ...
-Defining \c__ior_term_ior on line ...
-\c__ior_term_ior=\count...
+Defining \c__ior_term_noprompt_ior on line ...
+\c__ior_term_noprompt_ior=\count...
 Defining \ior_get_term:nN on line ...
 Defining \ior_str_get_term:nN on line ...
 Defining \__ior_get_term:NnN on line ...
@@ -7093,6 +7093,7 @@ Defining \tl_show_analysis:n on line ...
 Defining \token_get_prefix_spec:N on line ...
 Defining \token_get_arg_spec:N on line ...
 Defining \token_get_replacement_spec:N on line ...
+Defining \c_term_ior on line ...
 )
 Defining message LaTeX/expl/wrong-driver on line ...
 Defining \l__expl_driver_tl on line ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index 1f45c7e34..11412af1a 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -2717,7 +2717,7 @@ Defining \exp_args:Nnnff on line ...
 Defining \__kernel_msg_expandable_error:nnff on line ...
 Defining \__kernel_msg_expandable_error:nnf on line ...
 Defining \l__ior_internal_tl on line ...
-Defining \c_term_ior on line ...
+Defining \c__ior_term_ior on line ...
 Defining \g__ior_streams_seq on line ...
 Defining \l__ior_stream_tl on line ...
 Defining \g__ior_streams_prop on line ...
@@ -2758,8 +2758,8 @@ Defining \__ior_str_get:NN on line ...
 Defining \ior_str_get:NNT on line ...
 Defining \ior_str_get:NNF on line ...
 Defining \ior_str_get:NNTF on line ...
-Defining \c__ior_term_ior on line ...
-\c__ior_term_ior=\count...
+Defining \c__ior_term_noprompt_ior on line ...
+\c__ior_term_noprompt_ior=\count...
 Defining \ior_get_term:nN on line ...
 Defining \ior_str_get_term:nN on line ...
 Defining \__ior_get_term:NnN on line ...
@@ -6798,6 +6798,7 @@ Defining \tl_show_analysis:n on line ...
 Defining \token_get_prefix_spec:N on line ...
 Defining \token_get_arg_spec:N on line ...
 Defining \token_get_replacement_spec:N on line ...
+Defining \c_term_ior on line ...
 )
 Defining message LaTeX/expl/wrong-driver on line ...
 Defining \l__expl_driver_tl on line ...
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index dc5605900..621cfad64 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -2719,7 +2719,7 @@ Defining \exp_args:Nnnff on line ...
 Defining \__kernel_msg_expandable_error:nnff on line ...
 Defining \__kernel_msg_expandable_error:nnf on line ...
 Defining \l__ior_internal_tl on line ...
-Defining \c_term_ior on line ...
+Defining \c__ior_term_ior on line ...
 Defining \g__ior_streams_seq on line ...
 Defining \l__ior_stream_tl on line ...
 Defining \g__ior_streams_prop on line ...
@@ -2760,8 +2760,8 @@ Defining \__ior_str_get:NN on line ...
 Defining \ior_str_get:NNT on line ...
 Defining \ior_str_get:NNF on line ...
 Defining \ior_str_get:NNTF on line ...
-Defining \c__ior_term_ior on line ...
-\c__ior_term_ior=\count...
+Defining \c__ior_term_noprompt_ior on line ...
+\c__ior_term_noprompt_ior=\count...
 Defining \ior_get_term:nN on line ...
 Defining \ior_str_get_term:nN on line ...
 Defining \__ior_get_term:NnN on line ...
@@ -6800,6 +6800,7 @@ Defining \tl_show_analysis:n on line ...
 Defining \token_get_prefix_spec:N on line ...
 Defining \token_get_arg_spec:N on line ...
 Defining \token_get_replacement_spec:N on line ...
+Defining \c_term_ior on line ...
 )
 Defining message LaTeX/expl/wrong-driver on line ...
 Defining \l__expl_driver_tl on line ...
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index 793aac381..767a61afa 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -2973,7 +2973,7 @@ Defining \exp_args:Nnnff on line ...
 Defining \__kernel_msg_expandable_error:nnff on line ...
 Defining \__kernel_msg_expandable_error:nnf on line ...
 Defining \l__ior_internal_tl on line ...
-Defining \c_term_ior on line ...
+Defining \c__ior_term_ior on line ...
 Defining \g__ior_streams_seq on line ...
 Defining \l__ior_stream_tl on line ...
 Defining \g__ior_streams_prop on line ...
@@ -3014,8 +3014,8 @@ Defining \__ior_str_get:NN on line ...
 Defining \ior_str_get:NNT on line ...
 Defining \ior_str_get:NNF on line ...
 Defining \ior_str_get:NNTF on line ...
-Defining \c__ior_term_ior on line ...
-\c__ior_term_ior=\count...
+Defining \c__ior_term_noprompt_ior on line ...
+\c__ior_term_noprompt_ior=\count...
 Defining \ior_get_term:nN on line ...
 Defining \ior_str_get_term:nN on line ...
 Defining \__ior_get_term:NnN on line ...
@@ -6797,6 +6797,7 @@ Defining \tl_show_analysis:n on line ...
 Defining \token_get_prefix_spec:N on line ...
 Defining \token_get_arg_spec:N on line ...
 Defining \token_get_replacement_spec:N on line ...
+Defining \c_term_ior on line ...
 )
 Defining message LaTeX/expl/wrong-driver on line ...
 Defining \l__expl_driver_tl on line ...
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index ac8aa1f2b..8b3bb649d 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -2973,7 +2973,7 @@ Defining \exp_args:Nnnff on line ...
 Defining \__kernel_msg_expandable_error:nnff on line ...
 Defining \__kernel_msg_expandable_error:nnf on line ...
 Defining \l__ior_internal_tl on line ...
-Defining \c_term_ior on line ...
+Defining \c__ior_term_ior on line ...
 Defining \g__ior_streams_seq on line ...
 Defining \l__ior_stream_tl on line ...
 Defining \g__ior_streams_prop on line ...
@@ -3014,8 +3014,8 @@ Defining \__ior_str_get:NN on line ...
 Defining \ior_str_get:NNT on line ...
 Defining \ior_str_get:NNF on line ...
 Defining \ior_str_get:NNTF on line ...
-Defining \c__ior_term_ior on line ...
-\c__ior_term_ior=\count...
+Defining \c__ior_term_noprompt_ior on line ...
+\c__ior_term_noprompt_ior=\count...
 Defining \ior_get_term:nN on line ...
 Defining \ior_str_get_term:nN on line ...
 Defining \__ior_get_term:NnN on line ...
@@ -7097,6 +7097,7 @@ Defining \tl_show_analysis:n on line ...
 Defining \token_get_prefix_spec:N on line ...
 Defining \token_get_arg_spec:N on line ...
 Defining \token_get_replacement_spec:N on line ...
+Defining \c_term_ior on line ...
 )
 Defining message LaTeX/expl/wrong-driver on line ...
 Defining \l__expl_driver_tl on line ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index 8ae433a7a..ecc2e70ed 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -2973,7 +2973,7 @@ Defining \exp_args:Nnnff on line ...
 Defining \__kernel_msg_expandable_error:nnff on line ...
 Defining \__kernel_msg_expandable_error:nnf on line ...
 Defining \l__ior_internal_tl on line ...
-Defining \c_term_ior on line ...
+Defining \c__ior_term_ior on line ...
 Defining \g__ior_streams_seq on line ...
 Defining \l__ior_stream_tl on line ...
 Defining \g__ior_streams_prop on line ...
@@ -3014,8 +3014,8 @@ Defining \__ior_str_get:NN on line ...
 Defining \ior_str_get:NNT on line ...
 Defining \ior_str_get:NNF on line ...
 Defining \ior_str_get:NNTF on line ...
-Defining \c__ior_term_ior on line ...
-\c__ior_term_ior=\count...
+Defining \c__ior_term_noprompt_ior on line ...
+\c__ior_term_noprompt_ior=\count...
 Defining \ior_get_term:nN on line ...
 Defining \ior_str_get_term:nN on line ...
 Defining \__ior_get_term:NnN on line ...
@@ -7093,6 +7093,7 @@ Defining \tl_show_analysis:n on line ...
 Defining \token_get_prefix_spec:N on line ...
 Defining \token_get_arg_spec:N on line ...
 Defining \token_get_replacement_spec:N on line ...
+Defining \c_term_ior on line ...
 )
 Defining message LaTeX/expl/wrong-driver on line ...
 Defining \l__expl_driver_tl on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index 1f45c7e34..11412af1a 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -2717,7 +2717,7 @@ Defining \exp_args:Nnnff on line ...
 Defining \__kernel_msg_expandable_error:nnff on line ...
 Defining \__kernel_msg_expandable_error:nnf on line ...
 Defining \l__ior_internal_tl on line ...
-Defining \c_term_ior on line ...
+Defining \c__ior_term_ior on line ...
 Defining \g__ior_streams_seq on line ...
 Defining \l__ior_stream_tl on line ...
 Defining \g__ior_streams_prop on line ...
@@ -2758,8 +2758,8 @@ Defining \__ior_str_get:NN on line ...
 Defining \ior_str_get:NNT on line ...
 Defining \ior_str_get:NNF on line ...
 Defining \ior_str_get:NNTF on line ...
-Defining \c__ior_term_ior on line ...
-\c__ior_term_ior=\count...
+Defining \c__ior_term_noprompt_ior on line ...
+\c__ior_term_noprompt_ior=\count...
 Defining \ior_get_term:nN on line ...
 Defining \ior_str_get_term:nN on line ...
 Defining \__ior_get_term:NnN on line ...
@@ -6798,6 +6798,7 @@ Defining \tl_show_analysis:n on line ...
 Defining \token_get_prefix_spec:N on line ...
 Defining \token_get_arg_spec:N on line ...
 Defining \token_get_replacement_spec:N on line ...
+Defining \c_term_ior on line ...
 )
 Defining message LaTeX/expl/wrong-driver on line ...
 Defining \l__expl_driver_tl on line ...





More information about the latex3-commits mailing list