[latex3-commits] [git/LaTeX3-latex3-latex2e] TL21-2-kernel-msgs: Normalize shipout warnings (a9958ef4)

[Frank Mittelbach]

Repository : https://github.com/latex3/latex2e
On branch  : TL21-2-kernel-msgs
Link       : https://github.com/latex3/latex2e/commit/a9958ef44e1ec5f62c0ce69f8d56a6ab6433e6bd

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

commit a9958ef44e1ec5f62c0ce69f8d56a6ab6433e6bd
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date:   Wed Jun 9 15:52:17 2021 +0200

    Normalize shipout warnings


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

a9958ef44e1ec5f62c0ce69f8d56a6ab6433e6bd
 base/changes.txt                         |  5 +++++
 base/ltshipout.dtx                       | 16 +++++++---------
 base/testfiles-lthooks2/shipout2-012.tlg |  6 +++---
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/base/changes.txt b/base/changes.txt
index a25943e7..40ac124a 100644
--- a/base/changes.txt
+++ b/base/changes.txt
@@ -6,6 +6,11 @@ completeness or accuracy and it contains some references to files that
 are not part of the distribution.
 ================================================================================
 
+2021-06-09  Frank Mittelbach  <Frank.Mittelbach at latex-project.org>
+
+	* ltshipout.dtx:
+	Normalize message texts
+
 2021-06-09  Frank Mittelbach  <Frank.Mittelbach at latex-project.org>
 
 	* ltfssbas.dtx (section{Macros for setting up the tables}):
diff --git a/base/ltshipout.dtx b/base/ltshipout.dtx
index f773cd23..6e687ee4 100644
--- a/base/ltshipout.dtx
+++ b/base/ltshipout.dtx
@@ -32,8 +32,8 @@
 %%% From File: ltshipout.dtx
 %
 %    \begin{macrocode}
-\providecommand\ltshipoutversion{v1.0i}
-\providecommand\ltshipoutdate{2021/03/17}
+\providecommand\ltshipoutversion{v1.0j}
+\providecommand\ltshipoutdate{2021/06/09}
 %    \end{macrocode}
 %
 %<*driver>
@@ -867,7 +867,7 @@
 %    \begin{macrocode}
 \cs_new:Npn \@@_execute_main_cont:Nnnn #1#2#3#4 {
   \box_if_empty:NTF #1
-    { \@latex at warning{Ignoring~ void~ shipout~ box} }
+    { \@latex at warning@no at line{ Ignoring~ void~ shipout~ box } }
     {
 %    \end{macrocode}
 %    Otherwise we assume that we will ship something and prepare for
@@ -935,9 +935,8 @@
 %    practice way is to use the request mechanism.
 %    \begin{macrocode}
         { \box_if_empty:NTF #1
-            { \@latex at warning{
-                Shipout~ box~ was~ voided~ by~ hook,\MessageBreak
-                ignoring~ shipout~ box  }
+            { \@latex at warning@no at line { Ignoring~ void~ shipout~ box.
+                 \MessageBreak The~ shipout~ box~ was~ voided~ by~ hook~ code }
             }
 %    \end{macrocode}
 %    Finally, if the box is still non-empty we are nearly ready to
@@ -1183,9 +1182,8 @@
 %    \begin{macrocode}
   \cs_gset_eq:NN \@@_run_firstpage_hook: \prg_do_nothing:
   \cs_gset:Npn \@@_add_firstpage_material:Nn ##1 ##2 {
-    \@latex at warning{
-        First~ page~ is~ already~ shipped~ out,~ ignoring\MessageBreak
-        \string##1 }
+    \@latex at warning{ First~ page~ is~ already~ shipped~ out,~ ignoring
+                     \MessageBreak \string##1 }
   }
 }
 %    \end{macrocode}
diff --git a/base/testfiles-lthooks2/shipout2-012.tlg b/base/testfiles-lthooks2/shipout2-012.tlg
index efaf85c0..e99e0553 100644
--- a/base/testfiles-lthooks2/shipout2-012.tlg
+++ b/base/testfiles-lthooks2/shipout2-012.tlg
@@ -3,7 +3,7 @@ Don't change this file in any respect.
 Absolute page = 1 (target: 6)
 [1
 ]
-LaTeX Warning: Ignoring void shipout box on input line ....
+LaTeX Warning: Ignoring void shipout box.
 Absolute page = 2 (target: 6)
 [2]
 Absolute page = 3 (target: 6)
@@ -11,8 +11,8 @@ Doing raw shipout ...
 [3]
 Absolute page = 4 (target: 6)
 [3]
-LaTeX Warning: Shipout box was voided by hook,
-               ignoring shipout box on input line ....
+LaTeX Warning: Ignoring void shipout box.
+               The shipout box was voided by hook code.
 Absolute page = 5 (target: 6)
 [5]
 LaTeX Info: Completed page discarded.