[latex3-commits] [l3svn] r6774 - Rename \ior_get_str:NN to \ior_str_get:NN and deprecate (closes #308)

[noreply at latex-project.org]

Author: bruno
Date: 2016-12-05 05:52:08 +0100 (Mon, 05 Dec 2016)
New Revision: 6774

Modified:
   trunk/l3kernel/l3file.dtx
   trunk/l3kernel/testfiles/m3expl001.luatex.tlg
   trunk/l3kernel/testfiles/m3expl001.ptex.tlg
   trunk/l3kernel/testfiles/m3expl001.tlg
   trunk/l3kernel/testfiles/m3expl001.uptex.tlg
   trunk/l3kernel/testfiles/m3expl001.xetex.tlg
   trunk/l3kernel/testfiles/m3expl003.luatex.tlg
   trunk/l3kernel/testfiles/m3expl003.ptex.tlg
   trunk/l3kernel/testfiles/m3expl003.tlg
   trunk/l3kernel/testfiles/m3expl003.uptex.tlg
   trunk/l3kernel/testfiles/m3expl003.xetex.tlg
Log:
Rename \ior_get_str:NN to \ior_str_get:NN and deprecate (closes #308)

This is for consistency with \ior_str_map_inline:Nn because
alternatives such as \ior_map_inline_str:Nn look worse.


Modified: trunk/l3kernel/l3file.dtx
===================================================================
--- trunk/l3kernel/l3file.dtx	2016-12-03 12:54:32 UTC (rev 6773)
+++ trunk/l3kernel/l3file.dtx	2016-12-05 04:52:08 UTC (rev 6774)
@@ -278,9 +278,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 +302,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}
 %
@@ -1186,11 +1186,11 @@
 %    \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
       {
@@ -1892,7 +1892,16 @@
   { 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}
 %

Modified: trunk/l3kernel/testfiles/m3expl001.luatex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl001.luatex.tlg	2016-12-03 12:54:32 UTC (rev 6773)
+++ trunk/l3kernel/testfiles/m3expl001.luatex.tlg	2016-12-05 04:52:08 UTC (rev 6774)
@@ -2804,7 +2804,7 @@
 Defining \ior_if_eof:NF on line ...
 Defining \ior_if_eof:NTF on line ...
 Defining \ior_get:NN on line ...
-Defining \ior_get_str:NN on line ...
+Defining \ior_str_get:NN on line ...
 Defining \g__file_internal_ior on line ...
 Defining \c_log_iow on line ...
 Defining \c_term_iow on line ...
@@ -2883,6 +2883,7 @@
 Defining message LaTeX/kernel/output-streams-exhausted on line ...
 Defining message LaTeX/kernel/unbalanced-quote-in-filename on line ...
 Defining message LaTeX/kernel/indent-outside-wrapping-code on line ...
+Defining \ior_get_str:NN on line ...
 Defining \if_dim:w on line ...
 Defining \__dim_eval:w on line ...
 Defining \__dim_eval_end: on line ...

Modified: trunk/l3kernel/testfiles/m3expl001.ptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl001.ptex.tlg	2016-12-03 12:54:32 UTC (rev 6773)
+++ trunk/l3kernel/testfiles/m3expl001.ptex.tlg	2016-12-05 04:52:08 UTC (rev 6774)
@@ -2795,7 +2795,7 @@
 Defining \ior_if_eof:NF on line ...
 Defining \ior_if_eof:NTF on line ...
 Defining \ior_get:NN on line ...
-Defining \ior_get_str:NN on line ...
+Defining \ior_str_get:NN on line ...
 Defining \g__file_internal_ior on line ...
 Defining \c_log_iow on line ...
 Defining \c_term_iow on line ...
@@ -2874,6 +2874,7 @@
 Defining message LaTeX/kernel/output-streams-exhausted on line ...
 Defining message LaTeX/kernel/unbalanced-quote-in-filename on line ...
 Defining message LaTeX/kernel/indent-outside-wrapping-code on line ...
+Defining \ior_get_str:NN on line ...
 Defining \if_dim:w on line ...
 Defining \__dim_eval:w on line ...
 Defining \__dim_eval_end: on line ...

Modified: trunk/l3kernel/testfiles/m3expl001.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl001.tlg	2016-12-03 12:54:32 UTC (rev 6773)
+++ trunk/l3kernel/testfiles/m3expl001.tlg	2016-12-05 04:52:08 UTC (rev 6774)
@@ -2795,7 +2795,7 @@
 Defining \ior_if_eof:NF on line ...
 Defining \ior_if_eof:NTF on line ...
 Defining \ior_get:NN on line ...
-Defining \ior_get_str:NN on line ...
+Defining \ior_str_get:NN on line ...
 Defining \g__file_internal_ior on line ...
 Defining \c_log_iow on line ...
 Defining \c_term_iow on line ...
@@ -2874,6 +2874,7 @@
 Defining message LaTeX/kernel/output-streams-exhausted on line ...
 Defining message LaTeX/kernel/unbalanced-quote-in-filename on line ...
 Defining message LaTeX/kernel/indent-outside-wrapping-code on line ...
+Defining \ior_get_str:NN on line ...
 Defining \if_dim:w on line ...
 Defining \__dim_eval:w on line ...
 Defining \__dim_eval_end: on line ...

Modified: trunk/l3kernel/testfiles/m3expl001.uptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl001.uptex.tlg	2016-12-03 12:54:32 UTC (rev 6773)
+++ trunk/l3kernel/testfiles/m3expl001.uptex.tlg	2016-12-05 04:52:08 UTC (rev 6774)
@@ -2795,7 +2795,7 @@
 Defining \ior_if_eof:NF on line ...
 Defining \ior_if_eof:NTF on line ...
 Defining \ior_get:NN on line ...
-Defining \ior_get_str:NN on line ...
+Defining \ior_str_get:NN on line ...
 Defining \g__file_internal_ior on line ...
 Defining \c_log_iow on line ...
 Defining \c_term_iow on line ...
@@ -2874,6 +2874,7 @@
 Defining message LaTeX/kernel/output-streams-exhausted on line ...
 Defining message LaTeX/kernel/unbalanced-quote-in-filename on line ...
 Defining message LaTeX/kernel/indent-outside-wrapping-code on line ...
+Defining \ior_get_str:NN on line ...
 Defining \if_dim:w on line ...
 Defining \__dim_eval:w on line ...
 Defining \__dim_eval_end: on line ...

Modified: trunk/l3kernel/testfiles/m3expl001.xetex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl001.xetex.tlg	2016-12-03 12:54:32 UTC (rev 6773)
+++ trunk/l3kernel/testfiles/m3expl001.xetex.tlg	2016-12-05 04:52:08 UTC (rev 6774)
@@ -2802,7 +2802,7 @@
 Defining \ior_if_eof:NF on line ...
 Defining \ior_if_eof:NTF on line ...
 Defining \ior_get:NN on line ...
-Defining \ior_get_str:NN on line ...
+Defining \ior_str_get:NN on line ...
 Defining \g__file_internal_ior on line ...
 Defining \c_log_iow on line ...
 Defining \c_term_iow on line ...
@@ -2881,6 +2881,7 @@
 Defining message LaTeX/kernel/output-streams-exhausted on line ...
 Defining message LaTeX/kernel/unbalanced-quote-in-filename on line ...
 Defining message LaTeX/kernel/indent-outside-wrapping-code on line ...
+Defining \ior_get_str:NN on line ...
 Defining \if_dim:w on line ...
 Defining \__dim_eval:w on line ...
 Defining \__dim_eval_end: on line ...

Modified: trunk/l3kernel/testfiles/m3expl003.luatex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl003.luatex.tlg	2016-12-03 12:54:32 UTC (rev 6773)
+++ trunk/l3kernel/testfiles/m3expl003.luatex.tlg	2016-12-05 04:52:08 UTC (rev 6774)
@@ -2805,7 +2805,7 @@
 Defining \ior_if_eof:NF on line ...
 Defining \ior_if_eof:NTF on line ...
 Defining \ior_get:NN on line ...
-Defining \ior_get_str:NN on line ...
+Defining \ior_str_get:NN on line ...
 Defining \g__file_internal_ior on line ...
 Defining \c_log_iow on line ...
 Defining \c_term_iow on line ...
@@ -2884,6 +2884,7 @@
 Defining message LaTeX/kernel/output-streams-exhausted on line ...
 Defining message LaTeX/kernel/unbalanced-quote-in-filename on line ...
 Defining message LaTeX/kernel/indent-outside-wrapping-code on line ...
+Defining \ior_get_str:NN on line ...
 Defining \if_dim:w on line ...
 Defining \__dim_eval:w on line ...
 Defining \__dim_eval_end: on line ...

Modified: trunk/l3kernel/testfiles/m3expl003.ptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl003.ptex.tlg	2016-12-03 12:54:32 UTC (rev 6773)
+++ trunk/l3kernel/testfiles/m3expl003.ptex.tlg	2016-12-05 04:52:08 UTC (rev 6774)
@@ -2796,7 +2796,7 @@
 Defining \ior_if_eof:NF on line ...
 Defining \ior_if_eof:NTF on line ...
 Defining \ior_get:NN on line ...
-Defining \ior_get_str:NN on line ...
+Defining \ior_str_get:NN on line ...
 Defining \g__file_internal_ior on line ...
 Defining \c_log_iow on line ...
 Defining \c_term_iow on line ...
@@ -2875,6 +2875,7 @@
 Defining message LaTeX/kernel/output-streams-exhausted on line ...
 Defining message LaTeX/kernel/unbalanced-quote-in-filename on line ...
 Defining message LaTeX/kernel/indent-outside-wrapping-code on line ...
+Defining \ior_get_str:NN on line ...
 Defining \if_dim:w on line ...
 Defining \__dim_eval:w on line ...
 Defining \__dim_eval_end: on line ...

Modified: trunk/l3kernel/testfiles/m3expl003.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl003.tlg	2016-12-03 12:54:32 UTC (rev 6773)
+++ trunk/l3kernel/testfiles/m3expl003.tlg	2016-12-05 04:52:08 UTC (rev 6774)
@@ -2796,7 +2796,7 @@
 Defining \ior_if_eof:NF on line ...
 Defining \ior_if_eof:NTF on line ...
 Defining \ior_get:NN on line ...
-Defining \ior_get_str:NN on line ...
+Defining \ior_str_get:NN on line ...
 Defining \g__file_internal_ior on line ...
 Defining \c_log_iow on line ...
 Defining \c_term_iow on line ...
@@ -2875,6 +2875,7 @@
 Defining message LaTeX/kernel/output-streams-exhausted on line ...
 Defining message LaTeX/kernel/unbalanced-quote-in-filename on line ...
 Defining message LaTeX/kernel/indent-outside-wrapping-code on line ...
+Defining \ior_get_str:NN on line ...
 Defining \if_dim:w on line ...
 Defining \__dim_eval:w on line ...
 Defining \__dim_eval_end: on line ...

Modified: trunk/l3kernel/testfiles/m3expl003.uptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl003.uptex.tlg	2016-12-03 12:54:32 UTC (rev 6773)
+++ trunk/l3kernel/testfiles/m3expl003.uptex.tlg	2016-12-05 04:52:08 UTC (rev 6774)
@@ -2796,7 +2796,7 @@
 Defining \ior_if_eof:NF on line ...
 Defining \ior_if_eof:NTF on line ...
 Defining \ior_get:NN on line ...
-Defining \ior_get_str:NN on line ...
+Defining \ior_str_get:NN on line ...
 Defining \g__file_internal_ior on line ...
 Defining \c_log_iow on line ...
 Defining \c_term_iow on line ...
@@ -2875,6 +2875,7 @@
 Defining message LaTeX/kernel/output-streams-exhausted on line ...
 Defining message LaTeX/kernel/unbalanced-quote-in-filename on line ...
 Defining message LaTeX/kernel/indent-outside-wrapping-code on line ...
+Defining \ior_get_str:NN on line ...
 Defining \if_dim:w on line ...
 Defining \__dim_eval:w on line ...
 Defining \__dim_eval_end: on line ...

Modified: trunk/l3kernel/testfiles/m3expl003.xetex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl003.xetex.tlg	2016-12-03 12:54:32 UTC (rev 6773)
+++ trunk/l3kernel/testfiles/m3expl003.xetex.tlg	2016-12-05 04:52:08 UTC (rev 6774)
@@ -2803,7 +2803,7 @@
 Defining \ior_if_eof:NF on line ...
 Defining \ior_if_eof:NTF on line ...
 Defining \ior_get:NN on line ...
-Defining \ior_get_str:NN on line ...
+Defining \ior_str_get:NN on line ...
 Defining \g__file_internal_ior on line ...
 Defining \c_log_iow on line ...
 Defining \c_term_iow on line ...
@@ -2882,6 +2882,7 @@
 Defining message LaTeX/kernel/output-streams-exhausted on line ...
 Defining message LaTeX/kernel/unbalanced-quote-in-filename on line ...
 Defining message LaTeX/kernel/indent-outside-wrapping-code on line ...
+Defining \ior_get_str:NN on line ...
 Defining \if_dim:w on line ...
 Defining \__dim_eval:w on line ...
 Defining \__dim_eval_end: on line ...