[latex3-commits] [git/LaTeX3-latex3-latex2e] master: hotfix for #455 (cca4cecb)

[Joseph Wright]

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

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

commit cca4cecb4b8ae4670042dab1d2fcff016db002ab
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date:   Mon Dec 14 23:04:34 2020 +0100

    hotfix for #455


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

cca4cecb4b8ae4670042dab1d2fcff016db002ab
 required/firstaid/changes.txt                             |  6 ++++++
 .../firstaid/latex2e-first-aid-for-external-files.dtx     | 15 ++++++++-------
 .../{firstaid-filehook.lvt => firstaid-pgfmorepages.lvt}  |  9 +++++----
 .../firstaid/testfiles/firstaid-pgfmorepages.tlg          |  4 ++--
 4 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/required/firstaid/changes.txt b/required/firstaid/changes.txt
index d149c922..5d70ebc2 100644
--- a/required/firstaid/changes.txt
+++ b/required/firstaid/changes.txt
@@ -1,3 +1,9 @@
+2020-12-14  Frank Mittelbach  <Frank.Mittelbach at latex-project.org>
+
+	* latex2e-first-aid-for-external-files.dtx:
+	bandage for pgfmorepages got detached, so need to adjust the first
+	aid (gh/455)
+
 2020-10-29  Frank Mittelbach  <Frank.Mittelbach at latex-project.org>
 
 	* latex2e-first-aid-for-external-files.dtx:
diff --git a/required/firstaid/latex2e-first-aid-for-external-files.dtx b/required/firstaid/latex2e-first-aid-for-external-files.dtx
index fc48ac15..9dcedaf4 100644
--- a/required/firstaid/latex2e-first-aid-for-external-files.dtx
+++ b/required/firstaid/latex2e-first-aid-for-external-files.dtx
@@ -110,8 +110,8 @@
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-\def\LaTeXFirstAidDate{2020/10/29}
-\def\LaTeXFirstAidVersion{v1.0h}
+\def\LaTeXFirstAidDate{2020/12/14}
+\def\LaTeXFirstAidVersion{v1.0i}
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -383,14 +383,15 @@
 \ExplSyntaxOff
 %    \end{macrocode}
 %
-% Same issue with \pkg{pgfmorepages}.
+% Same issue with \pkg{pgfmorepages} but slightly different implementation (sigh).
 %
 %    \begin{macrocode}
 \ExplSyntaxOn
-\AddToHook{file/after/pgfmorepages.sty}[firstaid]{%
-  \cs_gset_eq:NN \shipout \pgfpages at originalshipout 
-  \cs_set_eq:NN \pgfpages at originalshipout \tex_shipout:D
-  \cs_set_eq:NN \tex_shipout:D \pgfpages at interceptshipout
+\AddToHook{file/after/pgfmorepages.sty}[firstaid]{
+  \cs_set_nopar:Npn \pgfhookintoshipout {
+    \cs_set_eq:NN \pgfpages at originalshipout \tex_shipout:D
+    \cs_set_eq:NN \tex_shipout:D \pgfpages at interceptshipout
+  }
 }
 \ExplSyntaxOff
 %    \end{macrocode}
diff --git a/required/firstaid/testfiles/firstaid-filehook.lvt b/required/firstaid/testfiles/firstaid-pgfmorepages.lvt
similarity index 68%
copy from required/firstaid/testfiles/firstaid-filehook.lvt
copy to required/firstaid/testfiles/firstaid-pgfmorepages.lvt
index 34b7f0ef..68d59cca 100644
--- a/required/firstaid/testfiles/firstaid-filehook.lvt
+++ b/required/firstaid/testfiles/firstaid-pgfmorepages.lvt
@@ -4,14 +4,15 @@
 
 \input{regression-test}
 
-\START
 
-\usepackage{filehook}
+\usepackage{pgfmorepages}
+\usepackage{lipsum}
+
 
-\AtBeginOfEveryFile{\typeout{A file is loaded}}
+\START
 
 \begin{document}
 
-Test
+\lipsum[1-4]
 
 \end{document}
diff --git a/base/testfiles-disabled/lthooks2-003.tlg b/required/firstaid/testfiles/firstaid-pgfmorepages.tlg
similarity index 94%
copy from base/testfiles-disabled/lthooks2-003.tlg
copy to required/firstaid/testfiles/firstaid-pgfmorepages.tlg
index 3e824a24..8f10d580 100644
--- a/base/testfiles-disabled/lthooks2-003.tlg
+++ b/required/firstaid/testfiles/firstaid-pgfmorepages.tlg
@@ -1,6 +1,6 @@
 This is a generated file for the l3build validation system.
 Don't change this file in any respect.
-(lthooks2-003.aux)
+(firstaid-pgfmorepages.aux)
 LaTeX Font Info:    Checking defaults for OML/cmm/m/it on input line ....
 LaTeX Font Info:    ... okay on input line ....
 LaTeX Font Info:    Checking defaults for OMS/cmsy/m/n on input line ....
@@ -16,4 +16,4 @@ LaTeX Font Info:    ... okay on input line ....
 LaTeX Font Info:    Checking defaults for U/cmr/m/n on input line ....
 LaTeX Font Info:    ... okay on input line ....
 [1
-] (lthooks2-003.aux)
+] (firstaid-pgfmorepages.aux)