[latex3-commits] [git/LaTeX3-latex3-latex2e] shipout-hook-adjust: add some debugging info if raw shipout is used (3e8abfcc)
Frank Mittelbach
frank.mittelbach at latex-project.org
Tue Jan 12 19:06:22 CET 2021
Repository : https://github.com/latex3/latex2e
On branch : shipout-hook-adjust
Link : https://github.com/latex3/latex2e/commit/3e8abfcc5c7954c6fed96bec8295053775239e0f
>---------------------------------------------------------------
commit 3e8abfcc5c7954c6fed96bec8295053775239e0f
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date: Tue Jan 12 19:06:22 2021 +0100
add some debugging info if raw shipout is used
>---------------------------------------------------------------
3e8abfcc5c7954c6fed96bec8295053775239e0f
base/ltfilehook.dtx | 4 ++--
base/lthooks.dtx | 4 ++--
base/ltshipout.dtx | 12 ++++++++----
base/testfiles-lthooks2/shipout2-008.lvt | 4 ++--
base/testfiles-lthooks2/shipout2-008.tlg | 5 +++++
base/testfiles-lthooks2/shipout2-009.lvt | 4 ++--
base/testfiles-lthooks2/shipout2-009.tlg | 6 ++++++
base/testfiles-lthooks2/shipout2-010.tlg | 2 ++
base/testfiles-lthooks2/shipout2-012.tlg | 1 +
9 files changed, 30 insertions(+), 12 deletions(-)
diff --git a/base/ltfilehook.dtx b/base/ltfilehook.dtx
index 56d366d5..c991e8a8 100644
--- a/base/ltfilehook.dtx
+++ b/base/ltfilehook.dtx
@@ -1,7 +1,7 @@
% \iffalse meta-comment
%
-% Copyright (C) 2020-2021 Frank Mittelbach,
-% Phelype Oleinik & LaTeX Team
+% Copyright (C) 2020-2021
+% Frank Mittelbach, Phelype Oleinik & LaTeX Team
%
% This file is part of the LaTeX base system.
% -------------------------------------------
diff --git a/base/lthooks.dtx b/base/lthooks.dtx
index 3c891dc1..e562afda 100644
--- a/base/lthooks.dtx
+++ b/base/lthooks.dtx
@@ -1,7 +1,7 @@
% \iffalse meta-comment
%
-% Copyright (C) 2020-2021 Frank Mittelbach,
-% Phelype Oleinik & LaTeX Team
+% Copyright (C) 2020-2021
+% Frank Mittelbach, Phelype Oleinik & LaTeX Team
%
% This file is part of the LaTeX base system.
% -------------------------------------------
diff --git a/base/ltshipout.dtx b/base/ltshipout.dtx
index 564118ce..2f12bce0 100644
--- a/base/ltshipout.dtx
+++ b/base/ltshipout.dtx
@@ -1,6 +1,7 @@
% \iffalse meta-comment
%
-% Copyright (C) 2020-2021 Frank Mittelbach, LaTeX Team
+% Copyright (C) 2020-2021
+% Frank Mittelbach & LaTeX Team
%
%
% This file is part of the LaTeX base system.
@@ -665,7 +666,8 @@
%
%
% \begin{macro}{\l_@@_raw_box}
-% The \cs{RawShipout} gets it own box but it is internal as there is no hook manipulation for it.
+% The \cs{RawShipout} gets it own box but it is internal as there
+% is no hook manipulation for it.
% \begin{macrocode}
\box_new:N \l_@@_raw_box
% \end{macrocode}
@@ -965,10 +967,12 @@
\tex_aftergroup:D \@@_execute_nohooks_cont:
}
% \end{macrocode}
-%
+% Well, not totally empty arguments, we add some debugging if we
+% are actually doing a shipout.
% \begin{macrocode}
\cs_new:Npn \@@_execute_nohooks_cont: {
- \@@_execute_main_cont:Nnnn \l_@@_raw_box {}{}{}
+ \@@_execute_main_cont:Nnnn \l_@@_raw_box
+ {} { \@@_debug:n{\typeout{Doing~ raw~ shipout~ ...}} } {}
}
% \end{macrocode}
% \end{macro}
diff --git a/base/testfiles-lthooks2/shipout2-008.lvt b/base/testfiles-lthooks2/shipout2-008.lvt
index c7188cb2..53491e91 100644
--- a/base/testfiles-lthooks2/shipout2-008.lvt
+++ b/base/testfiles-lthooks2/shipout2-008.lvt
@@ -16,11 +16,11 @@
% before first page only generate a verso page if there is actual material
\ifnum \ReadonlyShipoutCounter = 0
\ifvoid\chapteropeningbox \else
- \RawShipout\vbox to\textheight{\vss \usebox\chapteropeningbox \vss}%
+ \RawShipout\vbox to\textheight{\vss \box\chapteropeningbox \vss}%
\fi
\else
% later do it always
- \RawShipout\vbox to\textheight{\vss \usebox\chapteropeningbox \vss}%
+ \RawShipout\vbox to\textheight{\vss \box\chapteropeningbox \vss}%
\fi
}
diff --git a/base/testfiles-lthooks2/shipout2-008.tlg b/base/testfiles-lthooks2/shipout2-008.tlg
index 8087f661..2d6dfbd8 100644
--- a/base/testfiles-lthooks2/shipout2-008.tlg
+++ b/base/testfiles-lthooks2/shipout2-008.tlg
@@ -5,26 +5,31 @@ Absolute page = 1 (target: 11)
[1
]
Absolute page = 2 (target: 11)
+Doing raw shipout ...
[2]
Absolute page = 3 (target: 11)
[2]
Absolute page = 4 (target: 11)
+Doing raw shipout ...
[3]
Absolute page = 5 (target: 11)
[3]
Chapter 2.
Absolute page = 6 (target: 11)
+Doing raw shipout ...
[4]
Absolute page = 7 (target: 11)
[4
]
Chapter 3.
Absolute page = 8 (target: 11)
+Doing raw shipout ...
[5]
Absolute page = 9 (target: 11)
[5
]
Absolute page = 10 (target: 11)
+Doing raw shipout ...
[6]
Absolute page = 11 (target: 11)
[6] (shipout2-008.aux)
diff --git a/base/testfiles-lthooks2/shipout2-009.lvt b/base/testfiles-lthooks2/shipout2-009.lvt
index 633e31a6..f6c15d84 100644
--- a/base/testfiles-lthooks2/shipout2-009.lvt
+++ b/base/testfiles-lthooks2/shipout2-009.lvt
@@ -16,11 +16,11 @@
% before first page only generate a verso page if there is actual material
\ifnum \ReadonlyShipoutCounter = 0
\ifvoid\chapteropeningbox \else
- \RawShipout\vbox to\textheight{\vss \usebox\chapteropeningbox \vss}%
+ \RawShipout\vbox to\textheight{\vss \box\chapteropeningbox \vss}%
\fi
\else
% later do it always
- \RawShipout\vbox to\textheight{\vss \usebox\chapteropeningbox \vss}%
+ \RawShipout\vbox to\textheight{\vss \box\chapteropeningbox \vss}%
\fi
}
diff --git a/base/testfiles-lthooks2/shipout2-009.tlg b/base/testfiles-lthooks2/shipout2-009.tlg
index 238cb7f4..415ee86e 100644
--- a/base/testfiles-lthooks2/shipout2-009.tlg
+++ b/base/testfiles-lthooks2/shipout2-009.tlg
@@ -2,31 +2,37 @@ This is a generated file for the l3build validation system.
Don't change this file in any respect.
Chapter 1.
Absolute page = 1 (target: 12)
+Doing raw shipout ...
[1]
Absolute page = 2 (target: 12)
[1
]
Absolute page = 3 (target: 12)
+Doing raw shipout ...
[2]
Absolute page = 4 (target: 12)
[2]
Absolute page = 5 (target: 12)
+Doing raw shipout ...
[3]
Absolute page = 6 (target: 12)
[3]
Chapter 2.
Absolute page = 7 (target: 12)
+Doing raw shipout ...
[4]
Absolute page = 8 (target: 12)
[4
]
Chapter 3.
Absolute page = 9 (target: 12)
+Doing raw shipout ...
[5]
Absolute page = 10 (target: 12)
[5
]
Absolute page = 11 (target: 12)
+Doing raw shipout ...
[6]
Absolute page = 12 (target: 12)
[6] (shipout2-009.aux)
diff --git a/base/testfiles-lthooks2/shipout2-010.tlg b/base/testfiles-lthooks2/shipout2-010.tlg
index d489238b..0f81a720 100644
--- a/base/testfiles-lthooks2/shipout2-010.tlg
+++ b/base/testfiles-lthooks2/shipout2-010.tlg
@@ -1,6 +1,7 @@
This is a generated file for the l3build validation system.
Don't change this file in any respect.
Absolute page = 1 (target: 4)
+Doing raw shipout ...
Completed box being shipped out [1]
\vbox(633.0+0.0)x407.0
.\glue 16.0
@@ -82,6 +83,7 @@ Completed box being shipped out [1]
.\kern 0.0
.\kern 0.0
Absolute page = 3 (target: 4)
+Doing raw shipout ...
Completed box being shipped out [2]
\vbox(633.0+0.0)x407.0
.\glue 16.0
diff --git a/base/testfiles-lthooks2/shipout2-012.tlg b/base/testfiles-lthooks2/shipout2-012.tlg
index 23bd037f..efaf85c0 100644
--- a/base/testfiles-lthooks2/shipout2-012.tlg
+++ b/base/testfiles-lthooks2/shipout2-012.tlg
@@ -7,6 +7,7 @@ LaTeX Warning: Ignoring void shipout box on input line ....
Absolute page = 2 (target: 6)
[2]
Absolute page = 3 (target: 6)
+Doing raw shipout ...
[3]
Absolute page = 4 (target: 6)
[3]
More information about the latex3-commits
mailing list.