memoir (23mar21) (branch)

git-svn-id: svn://tug.org/texlive/branches/branch2020.0@58672 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 17 insertions, 94 deletions

diff --git a/Master/texmf-dist/tex/latex/memoir/memoir.cls b/Master/texmf-dist/tex/latex/memoir/memoir.cls
index f70a856b48f..6a97300b66f 100644
--- a/Master/texmf-dist/tex/latex/memoir/memoir.cls
+++ b/Master/texmf-dist/tex/latex/memoir/memoir.cls
@@ -28,8 +28,8 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{memoir}%
-  [2020/10/04 v3.7n configurable book, report, article document class]
-\newcommand\memversion{v3.7n, 2020/10/04}
+  [2021/03/23 v3.7o configurable book, report, article document class]
+\newcommand\memversion{v3.7o, 2021/03/23}
 \newcommand*{\@ptsize}{}
 \newcommand*{\@memptsize}{}
 \newlength{\onelineskip}
@@ -3044,19 +3044,19 @@
 \newcommand\settocpreprocessor[2]{%
   \@namedef{#1@f@rtoc@before@write@hook}{#2}}
 \def\@makechapterhead#1{%
-  \chapterheadstart%  \vspace*{50\p@}%
-  {%\parindent \z@ \raggedright \normalfont
+  \chapterheadstart%
+  {%
    \parskip \z@
    \parindent \z@ \memRTLraggedright \normalfont
    \ifm@m@And
      \printchaptername \chapternamenum \printchapternum
-     \afterchapternum % \par\nobreak \vskip 20\p@
+     \afterchapternum %
    \else
      \printchapternonum
    \fi
    \interlinepenalty\@M
-   \printchaptertitle{#1} % \Huge \bfseries #1
-   \afterchaptertitle % \par\nobreak \vskip 40\p@
+   \printchaptertitle{#1} %
+   \afterchaptertitle %
   }}
 
 \newcommand*{\insertchapterspace}{%
@@ -3117,7 +3117,7 @@
 
 \def\@makeschapterhead#1{%
   \chapterheadstart
-  {%\parindent \z@ \raggedright \normalfont
+  {%
    \parskip \z@%
    \parindent \z@ \memRTLraggedright \normalfont
    \printchapternonum
@@ -3180,9 +3180,7 @@
 
 \newcommand*{\reparticle}{%
   \chapterstyle{reparticle}
-%%%  \setsecheadstyle{\normalfont\large\bfseries\raggedright}
   \setsecheadstyle{\normalfont\large\bfseries\memRTLraggedright}%
-%%%  \setsubsecheadstyle{\normalfont\bfseries\raggedright}
   \setsubsecheadstyle{\normalfont\bfseries\memRTLraggedright}%
 }
 
@@ -3243,7 +3241,6 @@
   \renewcommand*{\printchapternum}{}
   \renewcommand*{\afterchapternum}{}
   \renewcommand*{\printchaptertitle}[1]{%
- %%%    \raggedright\Large\scshape\MakeLowercase{##1}}
     \memRTLraggedright\Large\scshape\MakeTextLowercase{##1}}
   \renewcommand*{\afterchaptertitle}{%
   \vskip\onelineskip \hrule\vskip\onelineskip}}
@@ -3444,7 +3441,6 @@
   \setlength{\midchapskip}{\textwidth}% \rightblock
   \addtolength{\midchapskip}{-\beforechapskip}
   \renewcommand*{\chapterheadstart}{\vspace*{2\baselineskip}}
-%%%  \renewcommand*{\chaptitlefont}{\huge\rmfamily\raggedright}
   \renewcommand*{\chaptitlefont}{\huge\rmfamily\memRTLraggedright}
   \renewcommand*{\chapnumfont}{\chaptitlefont}
   \renewcommand*{\printchaptername}{}
@@ -3572,7 +3568,6 @@
   \renewcommand*{\chapnumfont}{\normalfont\huge\bfseries}%
   \renewcommand*{\printchapternum}{\chapnumfont \thechapter\quad}%
   \renewcommand*{\afterchapternum}{}%
-%%%  \renewcommand*{\chaptitlefont}{\chapnumfont\raggedright}}
   \renewcommand*{\chaptitlefont}{\chapnumfont\memRTLraggedright}}
 
 \makechapterstyle{wilsondob}{%
@@ -3724,7 +3719,6 @@
   \setaftersecskip{2.3ex \@plus .2ex}
 \newcommand{\secheadstyle}{}
 \newcommand{\setsecheadstyle}[1]{\renewcommand{\secheadstyle}{#1}}
-%%%  \setsecheadstyle{\Large\bfseries\raggedright}
   \setsecheadstyle{\Large\bfseries\memRTLraggedright}
 
 \newcommand{\subsection}{%
@@ -3747,7 +3741,6 @@
   \setaftersubsecskip{1.5ex \@plus .2ex}
 \newcommand{\subsecheadstyle}{}
 \newcommand{\setsubsecheadstyle}[1]{\renewcommand{\subsecheadstyle}{#1}}
-%%%  \setsubsecheadstyle{\large\bfseries\raggedright}
   \setsubsecheadstyle{\large\bfseries\memRTLraggedright}
 
 \newcommand{\subsubsection}{%
@@ -3762,20 +3755,19 @@
 \newlength{\subsubsecindent}
 \newcommand{\setsubsubsecindent}[1]{%
             \setlength{\subsubsecindent}{#1}}
-  \setsubsubsecindent{\z@}
+\setsubsubsecindent{\z@}
 \newskip\beforesubsubsecskip
 \newcommand{\setbeforesubsubsecskip}[1]{%
             \setlength{\beforesubsubsecskip}{#1}}
-  \setbeforesubsubsecskip{-3.25ex \@plus -1ex \@minus -.2ex}
+\setbeforesubsubsecskip{-3.25ex \@plus -1ex \@minus -.2ex}
 \newskip\aftersubsubsecskip
 \newcommand{\setaftersubsubsecskip}[1]{%
             \setlength{\aftersubsubsecskip}{#1}}
-  \setaftersubsubsecskip{1.5ex \@plus .2ex}
+\setaftersubsubsecskip{1.5ex \@plus .2ex}
 \newcommand{\subsubsecheadstyle}{}
 \newcommand{\setsubsubsecheadstyle}[1]{%
             \renewcommand{\subsubsecheadstyle}{#1}}
-%%%  \setsubsubsecheadstyle{\normalsize\bfseries\raggedright}
-  \setsubsubsecheadstyle{\normalsize\bfseries\memRTLraggedright}
+\setsubsubsecheadstyle{\normalsize\bfseries\memRTLraggedright}
 
 \newcommand{\paragraph}{%
   \parahook%
@@ -3979,19 +3971,16 @@
   \setsecindent{\z@}%
   \setbeforesecskip{-3.5ex \@plus -1ex \@minus -.2ex}%
   \setaftersecskip{2.3ex \@plus .2ex}%
-%%%  \setsecheadstyle{\Large\bfseries\raggedright}%
   \setsecheadstyle{\Large\bfseries\memRTLraggedright}%
   \setsubsechook{}%
   \setsubsecindent{\z@}%
   \setbeforesubsecskip{-3.25ex \@plus -1ex \@minus -.2ex}%
   \setaftersubsecskip{1.5ex \@plus .2ex}%
-%%%  \setsubsecheadstyle{\large\bfseries\raggedright}%
   \setsubsecheadstyle{\large\bfseries\memRTLraggedright}%
   \setsubsubsechook{}%
   \setsubsubsecindent{\z@}%
   \setbeforesubsubsecskip{-3.25ex \@plus -1ex \@minus -.2ex}%
   \setaftersubsubsecskip{1.5ex \@plus .2ex}%
-%%%  \setsubsubsecheadstyle{\normalsize\bfseries\raggedright}%
   \setsubsubsecheadstyle{\normalsize\bfseries\memRTLraggedright}%
   \setparahook{}%
   \setparaindent{\z@}%
@@ -4022,17 +4011,14 @@
   \setbeforesecskip{-1.333\onelineskip
                     \@plus -0.5\onelineskip \@minus -.5\onelineskip}%
   \setaftersecskip{0.667\onelineskip \@plus 0.1\onelineskip}%
-%%%  \setsecheadstyle{\normalfont\scshape\raggedright}%
   \setsecheadstyle{\normalfont\scshape\memRTLraggedright}%
   \setbeforesubsecskip{-0.667\onelineskip
                        \@plus -0.25\onelineskip \@minus -0.25\onelineskip}%
   \setaftersubsecskip{0.333\onelineskip \@plus 0.1\onelineskip}%
-%%%  \setsubsecheadstyle{\normalfont\bfseries\raggedright}%
   \setsubsecheadstyle{\normalfont\bfseries\memRTLraggedright}%
   \setbeforesubsubsecskip{-0.667\onelineskip
                           \@plus -0.25\onelineskip \@minus -0.25\onelineskip}%
   \setaftersubsubsecskip{0.333\onelineskip \@plus 0.1\onelineskip}%
-%%%  \setsubsubsecheadstyle{\normalfont\normalsize\itshape\raggedright}%
   \setsubsubsecheadstyle{\normalfont\normalsize\itshape\memRTLraggedright}%
   \setbeforeparaskip{1.0\onelineskip
                      \@plus 0.5\onelineskip \@minus 0.2\onelineskip}%
@@ -4049,12 +4035,10 @@
   \setbeforesecskip{-1\onelineskip
                     \@plus -0.5\onelineskip \@minus -.5\onelineskip}%
   \setaftersecskip{1\onelineskip \@plus 0.1\onelineskip}%
-%%%  \setsecheadstyle{\normalfont\raggedright\scshape\MakeLowercase}%
   \setsecheadstyle{\normalfont\memRTLraggedright\scshape\MakeTextLowercase}%
   \setbeforesubsecskip{-1.0\onelineskip
                        \@plus -0.25\onelineskip \@minus -0.25\onelineskip}%
   \setaftersubsecskip{1.0\onelineskip \@plus 0.1\onelineskip}%
-%%%  \setsubsecheadstyle{\sethangfrom{\noindent ####1}\normalfont\itshape\raggedright}%
   \setsubsecheadstyle{\sethangfrom{\noindent ####1}\normalfont\itshape\memRTLraggedright}%
   \setbeforesubsubsecskip{1.0\onelineskip
                           \@plus 0.5\onelineskip \@minus 0.2\onelineskip}%
@@ -4125,15 +4109,12 @@
   \chapterstyle{komalike}
   \setbeforesecskip{-3.5ex \@plus -1ex \@minus -.2ex}%
   \setaftersecskip{2.3ex \@plus .2ex}%
-%%%  \setsecheadstyle{\normalfont\Large\sffamily\bfseries\raggedright}%
   \setsecheadstyle{\normalfont\Large\sffamily\bfseries\memRTLraggedright}%
   \setbeforesubsecskip{-3.25ex \@plus -1ex \@minus -.2ex}%
   \setaftersubsecskip{1.5ex \@plus .2ex}%
-%%%  \setsubsecheadstyle{\normalfont\large\sffamily\bfseries\raggedright}%
   \setsubsecheadstyle{\normalfont\large\sffamily\bfseries\memRTLraggedright}%
   \setbeforesubsubsecskip{-3.25ex \@plus -1ex \@minus -.2ex}%
   \setaftersubsubsecskip{1.5ex \@plus .2ex}%
-%%%  \setsubsubsecheadstyle{\normalfont\normalsize\sffamily\bfseries\raggedright}%
   \setsubsubsecheadstyle{\normalfont\normalsize\sffamily\bfseries\memRTLraggedright}%
   \setbeforeparaskip{3.25ex \@plus 1ex \@minus .2ex}%
   \setafterparaskip{-1em}%
@@ -4173,17 +4154,14 @@
   \setbeforesecskip{-2\onelineskip
                     \@plus -0.5\onelineskip \@minus -.5\onelineskip}%
   \setaftersecskip{1\onelineskip \@plus 0.1\onelineskip}%
-%%%  \setsecheadstyle{\normalfont\raggedright\MakeUppercase}%
   \setsecheadstyle{\normalfont\memRTLraggedright\MakeTextUppercase}%
   \setbeforesubsecskip{-1.2\onelineskip
                        \@plus -0.25\onelineskip \@minus -0.25\onelineskip}%
   \setaftersubsecskip{0.8\onelineskip \@plus 0.1\onelineskip}%
-%%%  \setsubsecheadstyle{\normalfont\Large\itshape\raggedright}%
   \setsubsecheadstyle{\normalfont\Large\itshape\memRTLraggedright}%
   \setbeforesubsubsecskip{-0.667\onelineskip
                           \@plus -0.25\onelineskip \@minus -0.25\onelineskip}%
   \setaftersubsubsecskip{0.333\onelineskip \@plus 0.1\onelineskip}%
-%%%  \setsubsubsecheadstyle{\normalfont\normalsize\bfseries\raggedright}%
   \setsubsubsecheadstyle{\normalfont\normalsize\bfseries\memRTLraggedright}%
   \setbeforeparaskip{1.0\onelineskip
                      \@plus 0.5\onelineskip \@minus 0.2\onelineskip}%
@@ -4200,17 +4178,14 @@
   \setbeforesecskip{-1.333\onelineskip
                     \@plus -0.5\onelineskip \@minus -.5\onelineskip}%
   \setaftersecskip{0.667\onelineskip \@plus 0.1\onelineskip}%
-%%%  \setsecheadstyle{\normalfont\raggedright\MakeUppercase}%
   \setsecheadstyle{\normalfont\memRTLraggedright\MakeTextUppercase}%
   \setbeforesubsecskip{-0.667\onelineskip
                        \@plus -0.25\onelineskip \@minus -0.25\onelineskip}%
   \setaftersubsecskip{0.333\onelineskip \@plus 0.1\onelineskip}%
-%%%  \setsubsecheadstyle{\normalfont\Large\itshape\raggedright}%
   \setsubsecheadstyle{\normalfont\Large\itshape\memRTLraggedright}%
   \setbeforesubsubsecskip{-0.667\onelineskip
                           \@plus -0.25\onelineskip \@minus -0.25\onelineskip}%
   \setaftersubsubsecskip{0.333\onelineskip \@plus 0.1\onelineskip}%
-%%%  \setsubsubsecheadstyle{\normalfont\normalsize\raggedright\scshape\MakeLowercase}%
   \setsubsubsecheadstyle{\normalfont\normalsize\memRTLraggedright\scshape\MakeTextLowercase}%
   \setbeforeparaskip{1.0\onelineskip
                      \@plus 0.5\onelineskip \@minus 0.2\onelineskip}%
@@ -4444,9 +4419,7 @@
 
 \newcommand*{\raggedrightthenleft}{%
   \parindent \z@
-%%%  \leftskip \z@ \@plus 1fill
   \memRTLleftskip \z@ \@plus 1fill
-%%%  \rightskip\@flushglue
   \memRTLrightskip\@flushglue
   \parfillskip \z@
   \everypar{\hskip \z@ \@plus -1fill}}
@@ -7234,7 +7207,6 @@
   \advance\m@mscaplkern \m@mscapmainwidth}
 
 \newcommand*{\sidecapstyle}{%
-%%%  \captionnamefont{\bfseries}%
   \ifscapmargleft
     \captionstyle{\raggedleft}%
   \else
@@ -9289,7 +9261,7 @@
 \setlength{\footmarksep}{-1.8em}
 \setlength{\footparindent}{1em}
 
-\newcommand{\footref}[1]{%
+\providecommand{\footref}[1]{%
   \begingroup
     \unrestored@protected@xdef\@thefnmark{\ref{#1}}%
   \endgroup
@@ -13157,7 +13129,10 @@
 \EmulatedPackage{index}[2008/07/23]
 \EmulatedPackage{makeidx}[2008/07/23]
 \EmulatedPackage{moreverb}[2008/07/23]
-\EmulatedPackage{mparhack}[2008/07/23]
+\if@twocolumn
+  \RequirePackage{mparhack}
+\fi
+  %\EmulatedPackage{mparhack}[2008/07/23]
 \EmulatedPackage{needspace}[2008/07/23]
 \EmulatedPackage{newfile}[2008/07/23]
 \EmulatedPackage{nextpage}[2008/07/23]
@@ -13176,58 +13151,6 @@
 \EmulatedPackage{verbatim}[2008/07/23]
 \EmulatedPackage{verse}[2008/07/23]
 
-%%% revert changes to captioning macros if the caption package is used.
-\AtBeginPackage{caption}{
-  %\ClassWarningNoLine{memoir}{%
-  \ClassInfo{memoir}{%
-    For the caption package to function properly with memoir,
-    we will now reset \string\caption\space and friends to
-    kernel defaults and then let the^^Jcaption package take over.
-    Remember: all caption configuration now goes via the caption
-    package interface, not the interface from the memoir class.
-    }
-
-  \long\def\@makecaption##1##2{%
-    \vskip\abovecaptionskip
-    \sbox\@tempboxa{##1: ##2}%
-    \ifdim \wd\@tempboxa >\hsize
-      ##1: ##2\par
-    \else
-      \global \@minipagefalse
-     \hb@xt@\hsize{\hfil\box\@tempboxa\hfil}%
-    \fi
-    \vskip\belowcaptionskip}
-
-  \def\caption{%
-    \ifx\@captype\@undefined
-      \@latex@error{\noexpand\caption outside float}\@ehd
-       \expandafter\@gobble
-    \else
-      \refstepcounter\@captype
-      \expandafter\@firstofone
-    \fi
-    {\@dblarg{\@caption\@captype}}%
-  }
-
-  \long\def\@caption##1[##2]##3{%
-    \par
-    \addcontentsline{\csname ext@##1\endcsname}{##1}%
-    {\protect\numberline{\csname the##1\endcsname}{\ignorespaces ##2}}%
-    \begingroup
-      \@parboxrestore
-      \if@minipage
-        \@setminipage
-      \fi
-      \normalsize
-      \@makecaption{\csname fnum@##1\endcsname}{\ignorespaces ##3}\par
-      \endgroup}
-
-
-  \setlength\abovecaptionskip{10\p@}
-  \setlength\belowcaptionskip{0\p@}
-
-} % end \AtBeginPackage
-
 \AtBeginPackage{float}{\let\newfloat\relax}
 
 \ifartopt