diff options
3 files changed, 38 insertions, 4 deletions
diff --git a/Master/texmf-dist/doc/latex-dev/firstaid/latex2e-first-aid-for-external-files.pdf b/Master/texmf-dist/doc/latex-dev/firstaid/latex2e-first-aid-for-external-files.pdf Binary files differindex b1d179b6ed8..04325d3fe5a 100644 --- a/Master/texmf-dist/doc/latex-dev/firstaid/latex2e-first-aid-for-external-files.pdf +++ b/Master/texmf-dist/doc/latex-dev/firstaid/latex2e-first-aid-for-external-files.pdf diff --git a/Master/texmf-dist/source/latex-dev/firstaid/latex2e-first-aid-for-external-files.dtx b/Master/texmf-dist/source/latex-dev/firstaid/latex2e-first-aid-for-external-files.dtx index 1e6e286a737..2a1e2a8d5eb 100644 --- a/Master/texmf-dist/source/latex-dev/firstaid/latex2e-first-aid-for-external-files.dtx +++ b/Master/texmf-dist/source/latex-dev/firstaid/latex2e-first-aid-for-external-files.dtx @@ -111,8 +111,8 @@ % \end{macrocode} % % \begin{macrocode} -\def\LaTeXFirstAidDate{2022/02/20} -\def\LaTeXFirstAidVersion{v1.0r} +\def\LaTeXFirstAidDate{2022/06/23} +\def\LaTeXFirstAidVersion{v1.0s} % \end{macrocode} % % \begin{macrocode} @@ -586,6 +586,27 @@ % \end{macrocode} % % +% \subsection{First aid for \pkg{memoir}} +% +% The introduction of \cs{stockheight} and \cs{stockwidth} into the +% kernel requires some first aid. This has to go in \emph{before} +% loading the class, so we cannot check the version string here. +% \begin{macrocode} +\AddToHook{file/memoir.cls/before}[firstaid]{% + \expandafter\def\expandafter\@tempa\string\dimen{}% + \edef\kernel@stockheight{\expandafter\@tempa\meaning\stockheight}% + \edef\kernel@stockwidth{\expandafter\@tempa\meaning\stockwidth}% + \let\stockheight\@undefined + \let\stockwidth\@undefined +} +\AddToHook{file/memoir.cls/after}[firstaid]{% + \dimen\kernel@stockheight=\stockheight + \dimen\kernel@stockwidth=\stockwidth + \dimendef\stockheight=\kernel@stockheight + \dimendef\stockwidth=\kernel@stockwidth +} +% \end{macrocode} +% % % \subsection[Temporary fixes for the kernel (until the next % patch-level release)] diff --git a/Master/texmf-dist/tex/latex-dev/firstaid/latex2e-first-aid-for-external-files.ltx b/Master/texmf-dist/tex/latex-dev/firstaid/latex2e-first-aid-for-external-files.ltx index 4f3e22c741f..6d89029bf83 100644 --- a/Master/texmf-dist/tex/latex-dev/firstaid/latex2e-first-aid-for-external-files.ltx +++ b/Master/texmf-dist/tex/latex-dev/firstaid/latex2e-first-aid-for-external-files.ltx @@ -34,8 +34,8 @@ %% %% The LaTeX Project and any individual authors listed elsewhere %% in this file. -\def\LaTeXFirstAidDate{2022/02/20} -\def\LaTeXFirstAidVersion{v1.0r} +\def\LaTeXFirstAidDate{2022/06/23} +\def\LaTeXFirstAidVersion{v1.0s} \ProvidesFile{latex2e-first-aid-for-external-files.ltx} [\LaTeXFirstAidDate\space \LaTeXFirstAidVersion\space LaTeX kernel fixes to external files and packages] @@ -131,6 +131,19 @@ \ngermanTeX }% } +\AddToHook{file/memoir.cls/before}[firstaid]{% + \expandafter\def\expandafter\@tempa\string\dimen{}% + \edef\kernel@stockheight{\expandafter\@tempa\meaning\stockheight}% + \edef\kernel@stockwidth{\expandafter\@tempa\meaning\stockwidth}% + \let\stockheight\@undefined + \let\stockwidth\@undefined +} +\AddToHook{file/memoir.cls/after}[firstaid]{% + \dimen\kernel@stockheight=\stockheight + \dimen\kernel@stockwidth=\stockwidth + \dimendef\stockheight=\kernel@stockheight + \dimendef\stockwidth=\kernel@stockwidth +} \ExplSyntaxOn \sys_if_engine_luatex:T { |