summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/memoir/memoir.cls
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/memoir/memoir.cls')
-rw-r--r--Master/texmf-dist/tex/latex/memoir/memoir.cls35
1 files changed, 26 insertions, 9 deletions
diff --git a/Master/texmf-dist/tex/latex/memoir/memoir.cls b/Master/texmf-dist/tex/latex/memoir/memoir.cls
index 7b174c9ff58..8974e5b466b 100644
--- a/Master/texmf-dist/tex/latex/memoir/memoir.cls
+++ b/Master/texmf-dist/tex/latex/memoir/memoir.cls
@@ -28,8 +28,9 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{memoir}%
- [2021/06/16 v3.7p configurable book, report, article document class]
-\newcommand\memversion{v3.7p, 2021/06/16}
+ [2022/02/20 v3.7q configurable book, report, article document class]
+\newcommand\memversion{v3.7q, 2022/02/20}
+\RequirePackage{etoolbox}
\newcommand*{\@ptsize}{}
\newcommand*{\@memptsize}{}
\newlength{\onelineskip}
@@ -138,16 +139,16 @@
\@onlypreamble\DisemulatePackage
\IfFormatAtLeastTF{2020/10/01}{
- \newcommand\AtBeginFile[2]{\def\temp{\AddToHook{file/before/#1}{#2}}\temp}
- \newcommand\AtEndFile[2]{\def\temp{\AddToHook{file/after/#1}{#2}}\temp}
+ \newcommand\AtBeginFile[2]{\def\temp{\AddToHook{file/#1/before}{#2}}\temp}
+ \newcommand\AtEndFile[2]{\def\temp{\AddToHook{file/#1/after}{#2}}\temp}
- \newcommand\AtBeginPackage[2]{\def\temp{\AddToHook{package/before/#1}{#2}}\temp}
- \newcommand\AtEndPackage[2]{\def\temp{\AddToHook{package/after/#1}{#2}}\temp}
+ \newcommand\AtBeginPackage[2]{\def\temp{\AddToHook{package/#1/before}{#2}}\temp}
+ \newcommand\AtEndPackage[2]{\def\temp{\AddToHook{package/#1/after}{#2}}\temp}
\newcommand{\RequireAtEndPackage}[2]{%
\@ifpackageloaded{#1}{#2}{\AtEndPackage{#1}{#2}}}
- \newcommand\AtBeginClass[2]{\def\temp{\AddToHook{class/before/#1}{#2}}\temp}
- \newcommand\AtEndClass[2]{\def\temp{\AddToHook{class/after/#1}{#2}}\temp}
+ \newcommand\AtBeginClass[2]{\def\temp{\AddToHook{class/#1/before}{#2}}\temp}
+ \newcommand\AtEndClass[2]{\def\temp{\AddToHook{class/#1/after}{#2}}\temp}
\newcommand{\RequireAtEndClass}[2]{%
\@ifclassloaded{#1}{#2}{\AtEndClass{#1}{#2}}}
@@ -10097,6 +10098,7 @@
\gdef\@doclearpage{\mem@doclearpage}
\newcommand*{\m@m@makecolfloats}{%
+ \let\@elt\relax%
\xdef\@freelist{\@freelist\@midlist}%
\global\let\@midlist\@empty
\@combinefloats}
@@ -10347,6 +10349,20 @@
\m@m@makecoltext
\global \maxdepth \@maxdepth}
+\IfFormatAtLeastTF{2021-06-01}{
+ % adding to "hook" in footmisc
+ \AddToHook{cmd/@makecol@appendblocks/after}{\m@mdoextrafeet\m@mopsidefoot\m@mopsidebar}
+}{
+ \AtBeginDocument{
+ \@ifpackagelater{footmisc}{2011/06/07}{
+ \@memerror{You seem to have manually updated both memoir and^^J
+ footmisc on an older LaTeX kernel. Memoir is not compatible with
+ footmisc^^J version 2022/02/14 v6.0b on LaTeX kernels from before
+ 2021/06/01. Please^^J update your LaTeX installation instead of
+ manually updating classes^^J or packages}{Update your LaTeX installation}
+ }{}
+ }
+}
\gdef\mem@makecolbf{%
\m@m@makecolintro
\setbox\@outputbox \box\@cclv
@@ -12198,7 +12214,7 @@
\@ifl@t@r\fmtversion{2020-10-01}{
% nothing to do with newer kernel
}{%
-\newcommand{\medspace}{\kern .22222em }
+\providecommand{\medspace}{\kern .22222em }
\DeclareRobustCommand{\:}{%
\relax\ifmmode\mskip\medmuskip\else\medspace\fi}
\DeclareRobustCommand{\!}{%
@@ -13157,6 +13173,7 @@
\AtBeginPackage{float}{\let\newfloat\relax}
+\AtEndPackage{hyperref}{\RequirePackage{memhfixc}}
\ifartopt
\pagestyle{plain}
\else