firstaid (16dec20)

git-svn-id: svn://tug.org/texlive/trunk@57154 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 22 insertions, 14 deletions

diff --git a/Master/texmf-dist/doc/latex/firstaid/changes.txt b/Master/texmf-dist/doc/latex/firstaid/changes.txt
index d149c92299e..5d70ebc2cb2 100644
--- a/Master/texmf-dist/doc/latex/firstaid/changes.txt
+++ b/Master/texmf-dist/doc/latex/firstaid/changes.txt
@@ -1,3 +1,9 @@
+2020-12-14  Frank Mittelbach  <Frank.Mittelbach@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@latex-project.org>
 
 	* latex2e-first-aid-for-external-files.dtx:
diff --git a/Master/texmf-dist/doc/latex/firstaid/latex2e-first-aid-for-external-files.pdf b/Master/texmf-dist/doc/latex/firstaid/latex2e-first-aid-for-external-files.pdf
index 5bd38056bd0..6affd3174a6 100644
--- a/Master/texmf-dist/doc/latex/firstaid/latex2e-first-aid-for-external-files.pdf
+++ b/Master/texmf-dist/doc/latex/firstaid/latex2e-first-aid-for-external-files.pdf
diff --git a/Master/texmf-dist/source/latex/firstaid/latex2e-first-aid-for-external-files.dtx b/Master/texmf-dist/source/latex/firstaid/latex2e-first-aid-for-external-files.dtx
index 384242e82c1..9dcedaf4359 100644
--- a/Master/texmf-dist/source/latex/firstaid/latex2e-first-aid-for-external-files.dtx
+++ b/Master/texmf-dist/source/latex/firstaid/latex2e-first-aid-for-external-files.dtx
@@ -30,7 +30,7 @@
 %
 % \providecommand\pkg[1]{\texttt{#1}}
 %
-% \title{First aid for external files and packages that need updating\thanks{}}
+% \title{First aid for external files and packages that need updating}
 % \author{Frank Mittelbach, \LaTeX{} Project}
 %
 % \maketitle
@@ -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@originalshipout 
-  \cs_set_eq:NN \pgfpages@originalshipout \tex_shipout:D
-  \cs_set_eq:NN \tex_shipout:D \pgfpages@interceptshipout
+\AddToHook{file/after/pgfmorepages.sty}[firstaid]{
+  \cs_set_nopar:Npn \pgfhookintoshipout {
+    \cs_set_eq:NN \pgfpages@originalshipout \tex_shipout:D
+    \cs_set_eq:NN \tex_shipout:D \pgfpages@interceptshipout
+  }
 }
 \ExplSyntaxOff
 %    \end{macrocode}
diff --git a/Master/texmf-dist/tex/latex/firstaid/latex2e-first-aid-for-external-files.ltx b/Master/texmf-dist/tex/latex/firstaid/latex2e-first-aid-for-external-files.ltx
index be7833fcd6e..68c0d6ad424 100644
--- a/Master/texmf-dist/tex/latex/firstaid/latex2e-first-aid-for-external-files.ltx
+++ b/Master/texmf-dist/tex/latex/firstaid/latex2e-first-aid-for-external-files.ltx
@@ -33,8 +33,8 @@
 %% File: latex2e-first-aid-for-external-files.dtx (C) Copyright 2020
 %% The LaTeX Project and any individual authors listed elsewhere
 %% in this file.
-\def\LaTeXFirstAidDate{2020/10/29}
-\def\LaTeXFirstAidVersion{v1.0h}
+\def\LaTeXFirstAidDate{2020/12/14}
+\def\LaTeXFirstAidVersion{v1.0i}
 \ProvidesFile{latex2e-first-aid-for-external-files.ltx}
              [\LaTeXFirstAidDate\space \LaTeXFirstAidVersion\space
                LaTeX kernel fixes to external files and packages]
@@ -71,10 +71,11 @@
 }
 \ExplSyntaxOff
 \ExplSyntaxOn
-\AddToHook{file/after/pgfmorepages.sty}[firstaid]{%
-  \cs_gset_eq:NN \shipout \pgfpages@originalshipout
-  \cs_set_eq:NN \pgfpages@originalshipout \tex_shipout:D
-  \cs_set_eq:NN \tex_shipout:D \pgfpages@interceptshipout
+\AddToHook{file/after/pgfmorepages.sty}[firstaid]{
+  \cs_set_nopar:Npn \pgfhookintoshipout {
+    \cs_set_eq:NN \pgfpages@originalshipout \tex_shipout:D
+    \cs_set_eq:NN \tex_shipout:D \pgfpages@interceptshipout
+  }
 }
 \ExplSyntaxOff
 \endinput