[latex3-commits] [git/LaTeX3-latex3-latex2e] shipout-lastpage: update message and tests (1fe76110)

[Frank Mittelbach]

Repository : https://github.com/latex3/latex2e
On branch  : shipout-lastpage
Link       : https://github.com/latex3/latex2e/commit/1fe76110e6795240eb3eed78ee0f6f5aaf80080d

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

commit 1fe76110e6795240eb3eed78ee0f6f5aaf80080d
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date:   Sun May 8 16:42:06 2022 +0200

    update message and tests


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

1fe76110e6795240eb3eed78ee0f6f5aaf80080d
 base/ltshipout.dtx                       | 4 +++-
 base/testfiles-lthooks/shipout-004.tlg   | 2 ++
 base/testfiles-lthooks2/shipout2-017.tlg | 3 ++-
 base/update-lthooks-tests.sh             | 3 +++
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/base/ltshipout.dtx b/base/ltshipout.dtx
index dcc09307..83fab820 100644
--- a/base/ltshipout.dtx
+++ b/base/ltshipout.dtx
@@ -1749,7 +1749,9 @@
            \int_compare:nNnF \@abspage at last = \g_shipout_readonly_int
             {
               \@latex at warning@no at line{Hook~ 'shipout/lastpage'~ executed~
-                   on~ wrong~ page.~ Rerun~ to~ correct~ this}%
+                on~ wrong~ page~ (\@abspage at last\space not~
+                \int_use:N\g_shipout_readonly_int).\MessageBreak
+                Rerun~ to~ correct~ this}%
             } 
          }
          {
diff --git a/base/testfiles-lthooks/shipout-004.tlg b/base/testfiles-lthooks/shipout-004.tlg
index 9573e5cb..60364fa7 100644
--- a/base/testfiles-lthooks/shipout-004.tlg
+++ b/base/testfiles-lthooks/shipout-004.tlg
@@ -91,4 +91,6 @@ Completed box being shipped out [5]
 ....\glue 0.0 plus 1.0fil
 ....\OT1/cmr/m/n/10 5
 ....\glue 0.0 plus 1.0fil
+LaTeX Warning: Hook 'shipout/lastpage' executed on wrong page (4 not 5).
+               Rerun to correct this.
 (shipout-004.aux)
diff --git a/base/testfiles-lthooks2/shipout2-017.tlg b/base/testfiles-lthooks2/shipout2-017.tlg
index f535e74d..60419322 100644
--- a/base/testfiles-lthooks2/shipout2-017.tlg
+++ b/base/testfiles-lthooks2/shipout2-017.tlg
@@ -9,5 +9,6 @@ Absolute page = 2 (target: 1)
 [2]
 Absolute page = 3 (target: 1)
 [3]
-LaTeX Warning: Hook 'shipout/lastpage' executed on wrong page. Rerun to correct this.
+LaTeX Warning: Hook 'shipout/lastpage' executed on wrong page (1 not 3).
+               Rerun to correct this.
 (shipout2-017.aux)
diff --git a/base/update-lthooks-tests.sh b/base/update-lthooks-tests.sh
index 84fac6f1..493f2fcb 100755
--- a/base/update-lthooks-tests.sh
+++ b/base/update-lthooks-tests.sh
@@ -15,6 +15,9 @@ l3build save -cconfig-lthooks2 \
    shipout2-012 \
    shipout2-013 \
    shipout2-014 \
+   shipout2-015 \
+   shipout2-016 \
+   shipout2-017 \
    github-0360  \
    github-0431  \
    ltpara-001 \