[latex3-commits] [git/LaTeX3-latex3-latex3] master: Deprecate \msg_log: and \msg_term:n (3d844b7)
Joseph Wright
joseph.wright at morningstar2.co.uk
Mon Oct 15 11:37:09 CEST 2018
Repository : https://github.com/latex3/latex3
On branch : master
Link : https://github.com/latex3/latex3/commit/3d844b75cfc58c15bf74b0521a363b5c1696c677
>---------------------------------------------------------------
commit 3d844b75cfc58c15bf74b0521a363b5c1696c677
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Mon Oct 15 10:18:33 2018 +0100
Deprecate \msg_log: and \msg_term:n
>---------------------------------------------------------------
3d844b75cfc58c15bf74b0521a363b5c1696c677
l3kernel/CHANGELOG.md | 4 ++
l3kernel/l3msg.dtx | 71 +++++++++----------------------
l3kernel/l3obsolete.txt | 2 +
l3kernel/testfiles/m3expl001.luatex.tlg | 4 +-
l3kernel/testfiles/m3expl001.ptex.tlg | 4 +-
l3kernel/testfiles/m3expl001.tlg | 4 +-
l3kernel/testfiles/m3expl001.uptex.tlg | 4 +-
l3kernel/testfiles/m3expl001.xetex.tlg | 4 +-
l3kernel/testfiles/m3expl003.luatex.tlg | 4 +-
l3kernel/testfiles/m3expl003.ptex.tlg | 4 +-
l3kernel/testfiles/m3expl003.tlg | 4 +-
l3kernel/testfiles/m3expl003.uptex.tlg | 4 +-
l3kernel/testfiles/m3expl003.xetex.tlg | 4 +-
l3kernel/testfiles/m3msg002.lvt | 5 ++-
l3kernel/testfiles/m3msg002.tlg | 2 -
15 files changed, 49 insertions(+), 75 deletions(-)
diff --git a/l3kernel/CHANGELOG.md b/l3kernel/CHANGELOG.md
index 1262c4b..4c1097c 100644
--- a/l3kernel/CHANGELOG.md
+++ b/l3kernel/CHANGELOG.md
@@ -12,6 +12,10 @@ this project uses date-based 'snapshot' version identifiers.
- `\g_msg_module_documentation_prop` (see #471)
- `\peek_remove_spaces:n`
+### Deprecated
+
+- `\msg_log:n` and `\msg_term:n`
+
### Fixed
- Handling of inheritance for choice keys (fixes #483)
diff --git a/l3kernel/l3msg.dtx b/l3kernel/l3msg.dtx
index de8fd9e..ead4177 100644
--- a/l3kernel/l3msg.dtx
+++ b/l3kernel/l3msg.dtx
@@ -528,37 +528,6 @@
% consulted for full details.
% \end{function}
%
-% \begin{function}[added = 2012-06-28]{\msg_log:n}
-% \begin{syntax}
-% \cs{msg_log:n} \Arg{text}
-% \end{syntax}
-% Writes to the log file with the \meta{text} laid out in the format
-% \begin{verbatim}
-% .................................................
-% . <text>
-% .................................................
-% \end{verbatim}
-% where the \meta{text} is wrapped to fit within the current
-% line length. Wrapping takes place using \cs{iow_wrap:nnnN}; the
-% documentation for the latter should be consulted for full details.
-% \end{function}
-%
-% \begin{function}[added = 2012-06-28]{\msg_term:n}
-% \begin{syntax}
-% \cs{msg_term:n} \Arg{text}
-% \end{syntax}
-% Writes to the terminal and log file with the \meta{text} laid out in the
-% format
-% \begin{verbatim}
-% *************************************************
-% * <text>
-% *************************************************
-% \end{verbatim}
-% where the \meta{text} is wrapped to fit within the current
-% line length. Wrapping takes place using \cs{iow_wrap:nnnN}; the
-% documentation for the latter should be consulted for full details.
-% \end{function}
-%
% \end{documentation}
%
% \begin{implementation}
@@ -855,27 +824,6 @@
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\msg_log:n}
-% \begin{macro}{\msg_term:n}
-% Printing to the log or terminal without a stop is rather easier.
-% A bit of simple visual work sets things off nicely.
-% \begin{macrocode}
-\cs_new_protected:Npn \msg_log:n #1
- {
- \iow_log:n { ................................................. }
- \iow_wrap:nnnN { . ~ #1} { . ~ } { } \iow_log:n
- \iow_log:n { ................................................. }
- }
-\cs_new_protected:Npn \msg_term:n #1
- {
- \iow_term:n { ************************************************* }
- \iow_wrap:nnnN { * ~ #1} { * ~ } { } \iow_term:n
- \iow_term:n { ************************************************* }
- }
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
% \subsection{Displaying messages}
%
% \LaTeX{} is handling error messages and so the \TeX{} ones are disabled.
@@ -2147,6 +2095,25 @@
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}[deprecated = 2019-12-31]{\msg_log:n, \msg_term:n}
+% \begin{macrocode}
+\__kernel_patch_deprecation:nnNNpn { 2019-12-31 } { \iow_log:n }
+\cs_new_protected:Npn \msg_log:n #1
+ {
+ \iow_log:n { ................................................. }
+ \iow_wrap:nnnN { . ~ #1} { . ~ } { } \iow_log:n
+ \iow_log:n { ................................................. }
+ }
+\__kernel_patch_deprecation:nnNNpn { 2019-12-31 } { \iow_term:n }
+\cs_new_protected:Npn \msg_term:n #1
+ {
+ \iow_term:n { ************************************************* }
+ \iow_wrap:nnnN { * ~ #1} { * ~ } { } \iow_term:n
+ \iow_term:n { ************************************************* }
+ }
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macrocode}
%</initex|package>
% \end{macrocode}
diff --git a/l3kernel/l3obsolete.txt b/l3kernel/l3obsolete.txt
index 3c588bc..ab497d3 100644
--- a/l3kernel/l3obsolete.txt
+++ b/l3kernel/l3obsolete.txt
@@ -57,6 +57,8 @@ Function Expires end
\lua_now_x:n 2019
\lua_shipout_x:n 2019
\luatex_...:D 2019
+\msg_log:n 2019
+\msg_term:n 2019
\pdftex_...:D 2019
\ptex_...:D 2019
\sort_ordered: 2018
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index 447e6f8..f1d3893 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -2487,8 +2487,6 @@ Defining \msg_interrupt:nnn on line ...
Defining \__msg_interrupt_wrap:nn on line ...
Defining \__msg_interrupt_more_text:n on line ...
Defining \__msg_interrupt_text:n on line ...
-Defining \msg_log:n on line ...
-Defining \msg_term:n on line ...
Defining \msg_fatal_text:n on line ...
Defining \msg_critical_text:n on line ...
Defining \msg_error_text:n on line ...
@@ -2716,6 +2714,8 @@ Defining \__kernel_msg_expandable_error:nnfff on line ...
Defining \exp_args:Nnnff on line ...
Defining \__kernel_msg_expandable_error:nnff on line ...
Defining \__kernel_msg_expandable_error:nnf on line ...
+Defining \msg_log:n on line ...
+Defining \msg_term:n on line ...
Defining \l__ior_internal_tl on line ...
Defining \c_term_ior on line ...
Defining \g__ior_streams_seq on line ...
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index 13e42f2..670d54a 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -2779,8 +2779,6 @@ Defining \msg_interrupt:nnn on line ...
Defining \__msg_interrupt_wrap:nn on line ...
Defining \__msg_interrupt_more_text:n on line ...
Defining \__msg_interrupt_text:n on line ...
-Defining \msg_log:n on line ...
-Defining \msg_term:n on line ...
Defining \msg_fatal_text:n on line ...
Defining \msg_critical_text:n on line ...
Defining \msg_error_text:n on line ...
@@ -3009,6 +3007,8 @@ Defining \__kernel_msg_expandable_error:nnfff on line ...
Defining \exp_args:Nnnff on line ...
Defining \__kernel_msg_expandable_error:nnff on line ...
Defining \__kernel_msg_expandable_error:nnf on line ...
+Defining \msg_log:n on line ...
+Defining \msg_term:n on line ...
Defining \l__ior_internal_tl on line ...
Defining \c_term_ior on line ...
Defining \g__ior_streams_seq on line ...
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index 806fb4e..ad5c5a4 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -2779,8 +2779,6 @@ Defining \msg_interrupt:nnn on line ...
Defining \__msg_interrupt_wrap:nn on line ...
Defining \__msg_interrupt_more_text:n on line ...
Defining \__msg_interrupt_text:n on line ...
-Defining \msg_log:n on line ...
-Defining \msg_term:n on line ...
Defining \msg_fatal_text:n on line ...
Defining \msg_critical_text:n on line ...
Defining \msg_error_text:n on line ...
@@ -3009,6 +3007,8 @@ Defining \__kernel_msg_expandable_error:nnfff on line ...
Defining \exp_args:Nnnff on line ...
Defining \__kernel_msg_expandable_error:nnff on line ...
Defining \__kernel_msg_expandable_error:nnf on line ...
+Defining \msg_log:n on line ...
+Defining \msg_term:n on line ...
Defining \l__ior_internal_tl on line ...
Defining \c_term_ior on line ...
Defining \g__ior_streams_seq on line ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index a93e66b..80d7840 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -2779,8 +2779,6 @@ Defining \msg_interrupt:nnn on line ...
Defining \__msg_interrupt_wrap:nn on line ...
Defining \__msg_interrupt_more_text:n on line ...
Defining \__msg_interrupt_text:n on line ...
-Defining \msg_log:n on line ...
-Defining \msg_term:n on line ...
Defining \msg_fatal_text:n on line ...
Defining \msg_critical_text:n on line ...
Defining \msg_error_text:n on line ...
@@ -3009,6 +3007,8 @@ Defining \__kernel_msg_expandable_error:nnfff on line ...
Defining \exp_args:Nnnff on line ...
Defining \__kernel_msg_expandable_error:nnff on line ...
Defining \__kernel_msg_expandable_error:nnf on line ...
+Defining \msg_log:n on line ...
+Defining \msg_term:n on line ...
Defining \l__ior_internal_tl on line ...
Defining \c_term_ior on line ...
Defining \g__ior_streams_seq on line ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index b91181e..3782d0e 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -2524,8 +2524,6 @@ Defining \msg_interrupt:nnn on line ...
Defining \__msg_interrupt_wrap:nn on line ...
Defining \__msg_interrupt_more_text:n on line ...
Defining \__msg_interrupt_text:n on line ...
-Defining \msg_log:n on line ...
-Defining \msg_term:n on line ...
Defining \msg_fatal_text:n on line ...
Defining \msg_critical_text:n on line ...
Defining \msg_error_text:n on line ...
@@ -2754,6 +2752,8 @@ Defining \__kernel_msg_expandable_error:nnfff on line ...
Defining \exp_args:Nnnff on line ...
Defining \__kernel_msg_expandable_error:nnff on line ...
Defining \__kernel_msg_expandable_error:nnf on line ...
+Defining \msg_log:n on line ...
+Defining \msg_term:n on line ...
Defining \l__ior_internal_tl on line ...
Defining \c_term_ior on line ...
Defining \g__ior_streams_seq on line ...
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index 447e6f8..f1d3893 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -2487,8 +2487,6 @@ Defining \msg_interrupt:nnn on line ...
Defining \__msg_interrupt_wrap:nn on line ...
Defining \__msg_interrupt_more_text:n on line ...
Defining \__msg_interrupt_text:n on line ...
-Defining \msg_log:n on line ...
-Defining \msg_term:n on line ...
Defining \msg_fatal_text:n on line ...
Defining \msg_critical_text:n on line ...
Defining \msg_error_text:n on line ...
@@ -2716,6 +2714,8 @@ Defining \__kernel_msg_expandable_error:nnfff on line ...
Defining \exp_args:Nnnff on line ...
Defining \__kernel_msg_expandable_error:nnff on line ...
Defining \__kernel_msg_expandable_error:nnf on line ...
+Defining \msg_log:n on line ...
+Defining \msg_term:n on line ...
Defining \l__ior_internal_tl on line ...
Defining \c_term_ior on line ...
Defining \g__ior_streams_seq on line ...
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index 13e42f2..670d54a 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -2779,8 +2779,6 @@ Defining \msg_interrupt:nnn on line ...
Defining \__msg_interrupt_wrap:nn on line ...
Defining \__msg_interrupt_more_text:n on line ...
Defining \__msg_interrupt_text:n on line ...
-Defining \msg_log:n on line ...
-Defining \msg_term:n on line ...
Defining \msg_fatal_text:n on line ...
Defining \msg_critical_text:n on line ...
Defining \msg_error_text:n on line ...
@@ -3009,6 +3007,8 @@ Defining \__kernel_msg_expandable_error:nnfff on line ...
Defining \exp_args:Nnnff on line ...
Defining \__kernel_msg_expandable_error:nnff on line ...
Defining \__kernel_msg_expandable_error:nnf on line ...
+Defining \msg_log:n on line ...
+Defining \msg_term:n on line ...
Defining \l__ior_internal_tl on line ...
Defining \c_term_ior on line ...
Defining \g__ior_streams_seq on line ...
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index 806fb4e..ad5c5a4 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -2779,8 +2779,6 @@ Defining \msg_interrupt:nnn on line ...
Defining \__msg_interrupt_wrap:nn on line ...
Defining \__msg_interrupt_more_text:n on line ...
Defining \__msg_interrupt_text:n on line ...
-Defining \msg_log:n on line ...
-Defining \msg_term:n on line ...
Defining \msg_fatal_text:n on line ...
Defining \msg_critical_text:n on line ...
Defining \msg_error_text:n on line ...
@@ -3009,6 +3007,8 @@ Defining \__kernel_msg_expandable_error:nnfff on line ...
Defining \exp_args:Nnnff on line ...
Defining \__kernel_msg_expandable_error:nnff on line ...
Defining \__kernel_msg_expandable_error:nnf on line ...
+Defining \msg_log:n on line ...
+Defining \msg_term:n on line ...
Defining \l__ior_internal_tl on line ...
Defining \c_term_ior on line ...
Defining \g__ior_streams_seq on line ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index a93e66b..80d7840 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -2779,8 +2779,6 @@ Defining \msg_interrupt:nnn on line ...
Defining \__msg_interrupt_wrap:nn on line ...
Defining \__msg_interrupt_more_text:n on line ...
Defining \__msg_interrupt_text:n on line ...
-Defining \msg_log:n on line ...
-Defining \msg_term:n on line ...
Defining \msg_fatal_text:n on line ...
Defining \msg_critical_text:n on line ...
Defining \msg_error_text:n on line ...
@@ -3009,6 +3007,8 @@ Defining \__kernel_msg_expandable_error:nnfff on line ...
Defining \exp_args:Nnnff on line ...
Defining \__kernel_msg_expandable_error:nnff on line ...
Defining \__kernel_msg_expandable_error:nnf on line ...
+Defining \msg_log:n on line ...
+Defining \msg_term:n on line ...
Defining \l__ior_internal_tl on line ...
Defining \c_term_ior on line ...
Defining \g__ior_streams_seq on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index b91181e..3782d0e 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -2524,8 +2524,6 @@ Defining \msg_interrupt:nnn on line ...
Defining \__msg_interrupt_wrap:nn on line ...
Defining \__msg_interrupt_more_text:n on line ...
Defining \__msg_interrupt_text:n on line ...
-Defining \msg_log:n on line ...
-Defining \msg_term:n on line ...
Defining \msg_fatal_text:n on line ...
Defining \msg_critical_text:n on line ...
Defining \msg_error_text:n on line ...
@@ -2754,6 +2752,8 @@ Defining \__kernel_msg_expandable_error:nnfff on line ...
Defining \exp_args:Nnnff on line ...
Defining \__kernel_msg_expandable_error:nnff on line ...
Defining \__kernel_msg_expandable_error:nnf on line ...
+Defining \msg_log:n on line ...
+Defining \msg_term:n on line ...
Defining \l__ior_internal_tl on line ...
Defining \c_term_ior on line ...
Defining \g__ior_streams_seq on line ...
diff --git a/l3kernel/testfiles/m3msg002.lvt b/l3kernel/testfiles/m3msg002.lvt
index 3488e5e..159bc7c 100644
--- a/l3kernel/testfiles/m3msg002.lvt
+++ b/l3kernel/testfiles/m3msg002.lvt
@@ -184,7 +184,10 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\TEST { iow_wrap:nnN~first~line~length }
{
- \msg_term:n { \prg_replicate:nn { 160 } { B~ } }
+ \iow_wrap:nnnN { * ~ \prg_replicate:nn { 160 } { B~ } }
+ { *~ }
+ { }
+ \iow_term:n
\iow_wrap:nnnN { \prg_replicate:nn { 45 } { a ~ } }
{ \prg_replicate:nn { 55 } { + } }
{ }
diff --git a/l3kernel/testfiles/m3msg002.tlg b/l3kernel/testfiles/m3msg002.tlg
index 149cf73..a1fe031 100644
--- a/l3kernel/testfiles/m3msg002.tlg
+++ b/l3kernel/testfiles/m3msg002.tlg
@@ -206,13 +206,11 @@ and I'll forget about whatever was undefined.
============================================================
TEST 8: iow_wrap:nnN first line length
============================================================
-*************************************************
* B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B
* B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B
* B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B
* B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B
* B B B B B B B B
-*************************************************
a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
+++++++++++++++++++++++++++++++++++++++++++++++++++++++a a a a a a
++++++++++++++++++++++++++++++++++++++++a a a a a a a a a a a a a a a a a a a
More information about the latex3-commits
mailing list