texlive[68004] Master/texmf-dist: memoir (21aug23)

[commits+karl at tug.org]

Revision: 68004
          http://tug.org/svn/texlive?view=revision&revision=68004
Author:   karl
Date:     2023-08-21 22:20:30 +0200 (Mon, 21 Aug 2023)
Log Message:
-----------
memoir (21aug23)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/latex/memoir/README
    trunk/Master/texmf-dist/doc/latex/memoir/memman.pdf
    trunk/Master/texmf-dist/source/latex/memoir/memoir.dtx
    trunk/Master/texmf-dist/tex/latex/memoir/memoir.cls

Modified: trunk/Master/texmf-dist/doc/latex/memoir/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/memoir/README	2023-08-21 20:20:20 UTC (rev 68003)
+++ trunk/Master/texmf-dist/doc/latex/memoir/README	2023-08-21 20:20:30 UTC (rev 68004)
@@ -22,6 +22,15 @@
 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

Modified: trunk/Master/texmf-dist/doc/latex/memoir/memman.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/source/latex/memoir/memoir.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/memoir/memoir.dtx	2023-08-21 20:20:20 UTC (rev 68003)
+++ trunk/Master/texmf-dist/source/latex/memoir/memoir.dtx	2023-08-21 20:20:30 UTC (rev 68004)
@@ -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}
 %<class>\ProvidesClass{memoir}%
-%<class>  [2023/08/14 v3.8a configurable book, report, article document class]
-%<class>\newcommand\memversion{v3.8a, 2023/08/14}
+%<class>  [2023/08/21 v3.8.1 configurable book, report, article document class]
+%<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 at m@float at 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,16 +7904,7 @@
     }%
   }%
 }
-% 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 at m@float at spacing}%
-%    \normalsize%
-%    \@nameuse{\@captype adjustment}% \@xfloat stores its #1 arg in \@captype
-% }
 
-
 %    \end{macrocode}
 % \end{macro}
 %

Modified: trunk/Master/texmf-dist/tex/latex/memoir/memoir.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/memoir/memoir.cls	2023-08-21 20:20:20 UTC (rev 68003)
+++ trunk/Master/texmf-dist/tex/latex/memoir/memoir.cls	2023-08-21 20:20:30 UTC (rev 68004)
@@ -29,8 +29,8 @@
 \def\mem at atleast@kernel{2021/06/01}
 \NeedsTeXFormat{LaTeX2e}[\mem at 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 at t@r\fmtversion}
 \IfFormatAtLeastTF{\mem at atleast@kernel}{}{
   \ClassError{memoir}{%
@@ -2428,11 +2428,11 @@
   \memdskips}
 
 \IfFormatAtLeastTF{2021/04/20}{%
-  \AddToHook{cmd/@xfloat/after}{%
+  \AddToHook{cmd/@floatboxreset/after}{%
     \def\baselinestretch{\m at m@float at 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}