[latex3-commits] [git/LaTeX3-latex3-latex3] master: Deprecate \msg_interrupt:nn (4930947)
Joseph Wright
joseph.wright at morningstar2.co.uk
Mon Oct 15 12:56:19 CEST 2018
Repository : https://github.com/latex3/latex3
On branch : master
Link : https://github.com/latex3/latex3/commit/49309477e5b62e27b576d66c3fec85099ea2c83f
>---------------------------------------------------------------
commit 49309477e5b62e27b576d66c3fec85099ea2c83f
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Mon Oct 15 11:56:19 2018 +0100
Deprecate \msg_interrupt:nn
The auxiliaries here will need to be copied in a later commit:
the aim is to reformat errors in a non-trivial way.
>---------------------------------------------------------------
49309477e5b62e27b576d66c3fec85099ea2c83f
l3kernel/CHANGELOG.md | 2 +-
l3kernel/l3msg.dtx | 63 +++++++++++--------------------
l3kernel/l3obsolete.txt | 1 +
l3kernel/testfiles/m3expl001.luatex.tlg | 3 +-
l3kernel/testfiles/m3expl001.ptex.tlg | 3 +-
l3kernel/testfiles/m3expl001.tlg | 3 +-
l3kernel/testfiles/m3expl001.uptex.tlg | 3 +-
l3kernel/testfiles/m3expl001.xetex.tlg | 3 +-
l3kernel/testfiles/m3expl003.luatex.tlg | 3 +-
l3kernel/testfiles/m3expl003.ptex.tlg | 3 +-
l3kernel/testfiles/m3expl003.tlg | 3 +-
l3kernel/testfiles/m3expl003.uptex.tlg | 3 +-
l3kernel/testfiles/m3expl003.xetex.tlg | 3 +-
13 files changed, 45 insertions(+), 51 deletions(-)
diff --git a/l3kernel/CHANGELOG.md b/l3kernel/CHANGELOG.md
index 4c1097c..898dacb 100644
--- a/l3kernel/CHANGELOG.md
+++ b/l3kernel/CHANGELOG.md
@@ -14,7 +14,7 @@ this project uses date-based 'snapshot' version identifiers.
### Deprecated
-- `\msg_log:n` and `\msg_term:n`
+- `\mg_interrupt:nn`, `\msg_log:n` and `\msg_term:n`
### Fixed
diff --git a/l3kernel/l3msg.dtx b/l3kernel/l3msg.dtx
index ead4177..a8f7c04 100644
--- a/l3kernel/l3msg.dtx
+++ b/l3kernel/l3msg.dtx
@@ -493,41 +493,6 @@
% \end{verbatim}
% \end{function}
%
-% \section{Low-level message functions}
-%
-% The lower-level message functions should usually be accessed from the
-% higher-level system. However, there are occasions where direct
-% access to these functions is desirable.
-%
-% \begin{function}[added = 2012-06-28]{\msg_interrupt:nnn}
-% \begin{syntax}
-% \cs{msg_interrupt:nnn} \Arg{first line} \Arg{text} \Arg{extra text}
-% \end{syntax}
-% Interrupts the \TeX{} run, issuing a formatted message comprising
-% \meta{first line} and \meta{text} laid out in the format
-% \begin{verbatim}
-% !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-% !
-% ! <first line>
-% !
-% ! <text>
-% !...............................................
-% \end{verbatim}
-% where the \meta{text} is wrapped to fit within the current
-% line length. The user may then request more information, at which
-% stage the \meta{extra text} is shown in the terminal in the
-% format
-% \begin{verbatim}
-% |'''''''''''''''''''''''''''''''''''''''''''''''
-% | <extra text>
-% |...............................................
-% \end{verbatim}
-% where the \meta{extra text} is wrapped within the current
-% line length. Wrapping of both \meta{text} and \meta{more text} takes place
-% using \cs{iow_wrap:nnnN}; the documentation for the latter should be
-% consulted for full details.
-% \end{function}
-%
% \end{documentation}
%
% \begin{implementation}
@@ -706,7 +671,7 @@
%
% \subsection{Showing messages: low level mechanism}
%
-% \begin{macro}{\msg_interrupt:nnn}
+% \begin{macro}{\@@_interrupt:nnn}
% The low-level interruption macro is rather opaque, unfortunately.
% Depending on the availability of more information there is a choice
% of how to set up the further help. We feed the extra help text and
@@ -714,7 +679,7 @@
% must first setup \TeX{}'s \tn{errhelp} register before issuing an
% \tn{errmessage}.
% \begin{macrocode}
-\cs_new_protected:Npn \msg_interrupt:nnn #1#2#3
+\cs_new_protected:Npn \@@_interrupt:nnn #1#2#3
{
\tl_if_empty:nTF {#3}
{
@@ -988,7 +953,7 @@
% \begin{macrocode}
\@@_class_new:nn { fatal }
{
- \msg_interrupt:nnn
+ \@@_interrupt:nnn
{ \msg_fatal_text:n {#1} : ~ "#2" }
{
\use:c { \c_@@_text_prefix_tl #1 / #2 } {#3} {#4} {#5} {#6}
@@ -1016,7 +981,7 @@
% \begin{macrocode}
\@@_class_new:nn { critical }
{
- \msg_interrupt:nnn
+ \@@_interrupt:nnn
{ \msg_critical_text:n {#1} : ~ "#2" }
{
\use:c { \c_@@_text_prefix_tl #1 / #2 } {#3} {#4} {#5} {#6}
@@ -1051,7 +1016,7 @@
{ \c_@@_more_text_prefix_tl #1 / #2 }
{#3} {#4} {#5} {#6}
{
- \msg_interrupt:nnn
+ \@@_interrupt:nnn
{ \msg_error_text:n {#1} : ~ "#2" }
{
\use:c { \c_@@_text_prefix_tl #1 / #2 } {#3} {#4} {#5} {#6}
@@ -2114,6 +2079,24 @@
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}[deprecated = 2019-12-31]{\msg_interrupt:nnn}
+% \begin{macrocode}
+\__kernel_patch_deprecation:nnNNpn { 2019-12-31 } { [Defined~error~message] }
+\cs_new_protected:Npn \msg_interrupt:nnn #1#2#3
+ {
+ \tl_if_empty:nTF {#3}
+ {
+ \@@_interrupt_wrap:nn { \\ \c_@@_no_info_text_tl }
+ {#1 \\\\ #2 \\\\ \c_@@_continue_text_tl }
+ }
+ {
+ \@@_interrupt_wrap:nn { \\ #3 }
+ {#1 \\\\ #2 \\\\ \c_@@_help_text_tl }
+ }
+ }
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macrocode}
%</initex|package>
% \end{macrocode}
diff --git a/l3kernel/l3obsolete.txt b/l3kernel/l3obsolete.txt
index ab497d3..ae7702a 100644
--- a/l3kernel/l3obsolete.txt
+++ b/l3kernel/l3obsolete.txt
@@ -57,6 +57,7 @@ Function Expires end
\lua_now_x:n 2019
\lua_shipout_x:n 2019
\luatex_...:D 2019
+\msg_interrupt:nn 2019
\msg_log:n 2019
\msg_term:n 2019
\pdftex_...:D 2019
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index f1d3893..72d8f86 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -2483,7 +2483,7 @@ Defining \c__msg_on_line_text_tl on line ...
Defining \c__msg_return_text_tl on line ...
Defining \c__msg_trouble_text_tl on line ...
Defining \msg_line_number: on line ...
-Defining \msg_interrupt:nnn on line ...
+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 ...
@@ -2716,6 +2716,7 @@ 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 \msg_interrupt:nnn 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 670d54a..2cde339 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -2775,7 +2775,7 @@ Defining \c__msg_on_line_text_tl on line ...
Defining \c__msg_return_text_tl on line ...
Defining \c__msg_trouble_text_tl on line ...
Defining \msg_line_number: on line ...
-Defining \msg_interrupt:nnn on line ...
+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 ...
@@ -3009,6 +3009,7 @@ 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 \msg_interrupt:nnn 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 ad5c5a4..97339cf 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -2775,7 +2775,7 @@ Defining \c__msg_on_line_text_tl on line ...
Defining \c__msg_return_text_tl on line ...
Defining \c__msg_trouble_text_tl on line ...
Defining \msg_line_number: on line ...
-Defining \msg_interrupt:nnn on line ...
+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 ...
@@ -3009,6 +3009,7 @@ 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 \msg_interrupt:nnn 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 80d7840..50054e0 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -2775,7 +2775,7 @@ Defining \c__msg_on_line_text_tl on line ...
Defining \c__msg_return_text_tl on line ...
Defining \c__msg_trouble_text_tl on line ...
Defining \msg_line_number: on line ...
-Defining \msg_interrupt:nnn on line ...
+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 ...
@@ -3009,6 +3009,7 @@ 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 \msg_interrupt:nnn 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 3782d0e..3e0cc72 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -2520,7 +2520,7 @@ Defining \c__msg_on_line_text_tl on line ...
Defining \c__msg_return_text_tl on line ...
Defining \c__msg_trouble_text_tl on line ...
Defining \msg_line_number: on line ...
-Defining \msg_interrupt:nnn on line ...
+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 ...
@@ -2754,6 +2754,7 @@ 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 \msg_interrupt:nnn 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 f1d3893..72d8f86 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -2483,7 +2483,7 @@ Defining \c__msg_on_line_text_tl on line ...
Defining \c__msg_return_text_tl on line ...
Defining \c__msg_trouble_text_tl on line ...
Defining \msg_line_number: on line ...
-Defining \msg_interrupt:nnn on line ...
+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 ...
@@ -2716,6 +2716,7 @@ 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 \msg_interrupt:nnn 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 670d54a..2cde339 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -2775,7 +2775,7 @@ Defining \c__msg_on_line_text_tl on line ...
Defining \c__msg_return_text_tl on line ...
Defining \c__msg_trouble_text_tl on line ...
Defining \msg_line_number: on line ...
-Defining \msg_interrupt:nnn on line ...
+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 ...
@@ -3009,6 +3009,7 @@ 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 \msg_interrupt:nnn 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 ad5c5a4..97339cf 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -2775,7 +2775,7 @@ Defining \c__msg_on_line_text_tl on line ...
Defining \c__msg_return_text_tl on line ...
Defining \c__msg_trouble_text_tl on line ...
Defining \msg_line_number: on line ...
-Defining \msg_interrupt:nnn on line ...
+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 ...
@@ -3009,6 +3009,7 @@ 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 \msg_interrupt:nnn 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 80d7840..50054e0 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -2775,7 +2775,7 @@ Defining \c__msg_on_line_text_tl on line ...
Defining \c__msg_return_text_tl on line ...
Defining \c__msg_trouble_text_tl on line ...
Defining \msg_line_number: on line ...
-Defining \msg_interrupt:nnn on line ...
+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 ...
@@ -3009,6 +3009,7 @@ 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 \msg_interrupt:nnn 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 3782d0e..3e0cc72 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -2520,7 +2520,7 @@ Defining \c__msg_on_line_text_tl on line ...
Defining \c__msg_return_text_tl on line ...
Defining \c__msg_trouble_text_tl on line ...
Defining \msg_line_number: on line ...
-Defining \msg_interrupt:nnn on line ...
+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 ...
@@ -2754,6 +2754,7 @@ 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 \msg_interrupt:nnn on line ...
Defining \l__ior_internal_tl on line ...
Defining \c_term_ior on line ...
Defining \g__ior_streams_seq on line ...
More information about the latex3-commits
mailing list