From 0f78a073b59e97071fc8c44f73d1be15e920ae1c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 21 Aug 2023 20:20:30 +0000 Subject: memoir (21aug23) git-svn-id: svn://tug.org/texlive/trunk@68004 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/memoir/README | 9 ++++++++ Master/texmf-dist/doc/latex/memoir/memman.pdf | Bin 2826438 -> 2826556 bytes Master/texmf-dist/source/latex/memoir/memoir.dtx | 28 ++++++++++------------- Master/texmf-dist/tex/latex/memoir/memoir.cls | 10 ++++---- 4 files changed, 26 insertions(+), 21 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/memoir/README b/Master/texmf-dist/doc/latex/memoir/README index 7ad41300bf1..a42cbee5426 100644 --- a/Master/texmf-dist/doc/latex/memoir/README +++ b/Master/texmf-dist/doc/latex/memoir/README @@ -22,6 +22,15 @@ un-updated LaTeX systems and we often make no attempt to be backwards compatible. Instead we assume that users use updated memoir with an updated LaTeX installation. +Changes (2023/08/21) + +o memoir v3.8.1 + +-- The new additions to \@xfloat via AddToHook is too fragile (the + float package changes \@xfloat in an incompatible way). We've moved + the additions to the \@floatboxreset. + + Changes (2023/08/14) o memoir v3.8a diff --git a/Master/texmf-dist/doc/latex/memoir/memman.pdf b/Master/texmf-dist/doc/latex/memoir/memman.pdf index 706dc8ff11d..ce132d58484 100644 Binary files a/Master/texmf-dist/doc/latex/memoir/memman.pdf and b/Master/texmf-dist/doc/latex/memoir/memman.pdf differ diff --git a/Master/texmf-dist/source/latex/memoir/memoir.dtx b/Master/texmf-dist/source/latex/memoir/memoir.dtx index fb6dc088cbf..674082db74c 100644 --- a/Master/texmf-dist/source/latex/memoir/memoir.dtx +++ b/Master/texmf-dist/source/latex/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} diff --git a/Master/texmf-dist/tex/latex/memoir/memoir.cls b/Master/texmf-dist/tex/latex/memoir/memoir.cls index ab4300e5de7..bb7b0e38354 100644 --- a/Master/texmf-dist/tex/latex/memoir/memoir.cls +++ b/Master/texmf-dist/tex/latex/memoir/memoir.cls @@ -29,8 +29,8 @@ \def\mem@atleast@kernel{2021/06/01} \NeedsTeXFormat{LaTeX2e}[\mem@atleast@kernel] \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} \providecommand\IfFormatAtLeastTF{\@ifl@t@r\fmtversion} \IfFormatAtLeastTF{\mem@atleast@kernel}{}{ \ClassError{memoir}{% @@ -2428,11 +2428,11 @@ \memdskips} \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} -- cgit v1.2.3