From cf3e954514eb50bea0335bdc97d6b76f80f5d03e Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Tue, 22 Aug 2023 03:01:06 +0000 Subject: CTAN sync 202308220301 --- macros/latex/contrib/memoir/memoir.dtx | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) (limited to 'macros/latex/contrib/memoir/memoir.dtx') diff --git a/macros/latex/contrib/memoir/memoir.dtx b/macros/latex/contrib/memoir/memoir.dtx index fb6dc088cb..674082db74 100644 --- a/macros/latex/contrib/memoir/memoir.dtx +++ b/macros/latex/contrib/memoir/memoir.dtx @@ -20,7 +20,7 @@ % This work consists of the files listed in the README file. % % \fi -% \CheckSum{28676} +% \CheckSum{28664} % % \changes{v0.1}{2001/05/20}{First public alpha release} % \changes{v0.2}{2001/06/03}{First beta release} @@ -133,7 +133,9 @@ % \changes{v3.8}{2023/08/08}{Maintenance, see the README for details} % \changes{v3.8a}{2023/08/14}{Forgot to enable stopping if the LaTeX % format is too old} -% +% \changes{v3.8.1}{2023/08/21}{Moved AddToHook from \@xfloat to +% \@floatboxreset as the float package causes issues} +% % \def\dtxfile{memoir.dtx} % % \def\fileversion{v0.1} \def\filedate{2001/05/20} @@ -433,8 +435,8 @@ % Announce the name, option files and version for LaTeX2e files: % \begin{macrocode} %\ProvidesClass{memoir}% -% [2023/08/14 v3.8a configurable book, report, article document class] -%\newcommand\memversion{v3.8a, 2023/08/14} +% [2023/08/21 v3.8.1 configurable book, report, article document class] +%\newcommand\memversion{v3.8.1, 2023/08/21} % \end{macrocode} % % \changes{v3.7m}{2020/08/05}{Added \cs{IfFormatAtLeastTF}} @@ -7880,13 +7882,16 @@ % to the float until after \cs{normalsize}. Reported at \protect\url{https://tex.stackexchange.com/q/368422/3929}} % \changes{v3.8}{2023/05/08}{Additions to \cs{@xfloat} now added % via a cmd/after hook if the format supports it} +% \changes{v3.8.1}{2023/08/21}{Changed the hook to add to +% \cs{@floatboxreset} as the \Lpack{float} package redefines +% \cs{@xfloat} so the Hook cannot access it.} % \begin{macrocode} \IfFormatAtLeastTF{2021/04/20}{% - \AddToHook{cmd/@xfloat/after}{% + \AddToHook{cmd/@floatboxreset/after}{% \def\baselinestretch{\m@m@float@spacing}% \normalsize% - \@nameuse{\@captype adjustment}% \@xfloat stores its #1 arg in \@captype - }% + \@nameuse{\@captype adjustment}% + } }{% \AtBeginDocument{% % \typeout{Old kernel, redefining \string\@xfloat\ instead of using a hook} @@ -7899,15 +7904,6 @@ }% }% } -% The code can also be made (slightly modified) using a cmd hook -% eliminating the explicit \AtBeginDocument, note that we probably -% need a format check in order to be able to use the cmd hook -% \AddToHook{cmd/@xfloat/after}{% -% \def\baselinestretch{\m@m@float@spacing}% -% \normalsize% -% \@nameuse{\@captype adjustment}% \@xfloat stores its #1 arg in \@captype -% } - % \end{macrocode} % \end{macro} -- cgit v1.2.3