[latex3-commits] [git/LaTeX3-latex3-latex3] master: Copy \msg_interrupt:nn internals (f57e8f8)

[Joseph Wright]

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

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

commit f57e8f8a213e271dd28ad0439aa6df427b587cb5
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Mon Oct 15 14:13:58 2018 +0100

    Copy \msg_interrupt:nn internals
    
    These are needed for the deprecated version:
    code update will change the output otherwise.


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

f57e8f8a213e271dd28ad0439aa6df427b587cb5
 l3kernel/l3msg.dtx                      |   56 +++++++++++++++++++++++++++++--
 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 ++
 11 files changed, 84 insertions(+), 2 deletions(-)

diff --git a/l3kernel/l3msg.dtx b/l3kernel/l3msg.dtx
index 64657f3..3c866c4 100644
--- a/l3kernel/l3msg.dtx
+++ b/l3kernel/l3msg.dtx
@@ -2089,14 +2089,66 @@
   {
     \tl_if_empty:nTF {#3}
       {
-        \@@_interrupt_wrap:nn { \\ \c_@@_no_info_text_tl }
+        \@@_old_interrupt_wrap:nn { \\ \c_@@_no_info_text_tl }
           {#1 \\\\ #2 \\\\ \c_@@_continue_text_tl }
       }
       {
-        \@@_interrupt_wrap:nn { \\ #3 }
+        \@@_old_interrupt_wrap:nn { \\ #3 }
           {#1 \\\\ #2 \\\\ \c_@@_help_text_tl }
       }
   }
+\cs_new_protected:Npn \@@_old_interrupt_wrap:nn #1#2
+  {
+    \iow_wrap:nnnN {#1} { | ~ } { } \@@_old_interrupt_more_text:n
+    \iow_wrap:nnnN {#2} { ! ~ } { } \@@_old_interrupt_text:n
+  }
+\cs_new_protected:Npn \@@_old_interrupt_more_text:n #1
+  {
+    \exp_args:Nx \tex_errhelp:D
+      {
+        |'''''''''''''''''''''''''''''''''''''''''''''''
+        #1 \iow_newline:
+        |...............................................
+      }
+  }
+\group_begin:
+  \char_set_lccode:nn {`\{} {`\ }
+  \char_set_lccode:nn {`\}} {`\ }
+  \char_set_lccode:nn {`\&} {`\!}
+  \char_set_catcode_active:N \&
+\tex_lowercase:D
+  {
+    \group_end:
+    \cs_new_protected:Npn \@@_old_interrupt_text:n #1
+      {
+        \iow_term:x
+          {
+            \iow_newline:
+            !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+            \iow_newline:
+            !
+          }
+        \__kernel_iow_with:Nnn \tex_newlinechar:D { `\^^J }
+          {
+            \__kernel_iow_with:Nnn \tex_errorcontextlines:D { -1 }
+              {
+                \group_begin:
+                  \cs_set_protected:Npn &
+                    {
+                      \tex_errmessage:D
+                        {
+                          #1
+                          \use_none:n
+                            { ............................................ }
+                        }
+                    }
+                  \exp_after:wN
+                \group_end:
+                &
+              }
+          }
+      }
+  }
 %    \end{macrocode}
 % \end{macro}
 %
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index 72d8f86..37c6253 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -2717,6 +2717,9 @@ 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 \__msg_old_interrupt_wrap:nn on line ...
+Defining \__msg_old_interrupt_more_text:n on line ...
+Defining \__msg_old_interrupt_text: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 2cde339..54eaf9d 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -3010,6 +3010,9 @@ 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 \__msg_old_interrupt_wrap:nn on line ...
+Defining \__msg_old_interrupt_more_text:n on line ...
+Defining \__msg_old_interrupt_text: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 97339cf..283d94d 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -3010,6 +3010,9 @@ 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 \__msg_old_interrupt_wrap:nn on line ...
+Defining \__msg_old_interrupt_more_text:n on line ...
+Defining \__msg_old_interrupt_text: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 50054e0..df7c3af 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -3010,6 +3010,9 @@ 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 \__msg_old_interrupt_wrap:nn on line ...
+Defining \__msg_old_interrupt_more_text:n on line ...
+Defining \__msg_old_interrupt_text: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 3e0cc72..de43bbd 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -2755,6 +2755,9 @@ 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 \__msg_old_interrupt_wrap:nn on line ...
+Defining \__msg_old_interrupt_more_text:n on line ...
+Defining \__msg_old_interrupt_text: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 72d8f86..37c6253 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -2717,6 +2717,9 @@ 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 \__msg_old_interrupt_wrap:nn on line ...
+Defining \__msg_old_interrupt_more_text:n on line ...
+Defining \__msg_old_interrupt_text: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 2cde339..54eaf9d 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -3010,6 +3010,9 @@ 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 \__msg_old_interrupt_wrap:nn on line ...
+Defining \__msg_old_interrupt_more_text:n on line ...
+Defining \__msg_old_interrupt_text: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 97339cf..283d94d 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -3010,6 +3010,9 @@ 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 \__msg_old_interrupt_wrap:nn on line ...
+Defining \__msg_old_interrupt_more_text:n on line ...
+Defining \__msg_old_interrupt_text: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 50054e0..df7c3af 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -3010,6 +3010,9 @@ 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 \__msg_old_interrupt_wrap:nn on line ...
+Defining \__msg_old_interrupt_more_text:n on line ...
+Defining \__msg_old_interrupt_text: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 3e0cc72..de43bbd 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -2755,6 +2755,9 @@ 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 \__msg_old_interrupt_wrap:nn on line ...
+Defining \__msg_old_interrupt_more_text:n on line ...
+Defining \__msg_old_interrupt_text:n on line ...
 Defining \l__ior_internal_tl on line ...
 Defining \c_term_ior on line ...
 Defining \g__ior_streams_seq on line ...