summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2022-10-03 20:28:51 +0000
committerKarl Berry <karl@freefriends.org>2022-10-03 20:28:51 +0000
commit87a8de53ce7cbea132424fae3d4c8efe055cd5fc (patch)
tree533b988aa2504d76a42b45ace991265406778f60 /Master
parente7b7ed25d268bc14a9f361700c3974a77b696b5a (diff)
latex-firstaid-dev (3oct22)
git-svn-id: svn://tug.org/texlive/trunk@64594 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex-dev/firstaid/latex2e-first-aid-for-external-files.pdfbin240432 -> 268421 bytes
-rw-r--r--Master/texmf-dist/source/latex-dev/firstaid/latex2e-first-aid-for-external-files.dtx25
-rw-r--r--Master/texmf-dist/tex/latex-dev/firstaid/latex2e-first-aid-for-external-files.ltx17
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
index 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
Binary files differ
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
{