memoir (23mar21) (branch)

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

8 files changed, 274 insertions, 369 deletions

diff --git a/Master/texmf-dist/doc/latex/memoir/README b/Master/texmf-dist/doc/latex/memoir/README
index 199f5d9e9c9..00ab227b2fa 100644
--- a/Master/texmf-dist/doc/latex/memoir/README
+++ b/Master/texmf-dist/doc/latex/memoir/README
@@ -27,6 +27,22 @@ o Backmatter:
     Command glossary                                    ~  40 pages
     Bibliography, indexes                               ~  50 pages
 
+Changed (2021/03/23)
+
+o memoir v3.7o
+
+-- \footref will be added to the kernel, so we now "provide" it instead
+-- as of late 2020 the caption package will now adjust it self to the
+   class. It will even map several of the caption styling macros the
+   class provides onto the the corresponding setup in the caption
+   package. Special thanks to Axel Sommerfeldt for this
+   feature. Therefore we no longer reset in preparation for caption.
+-- The mparhack package is no longer marked as emulated as we did not
+   emulate the fix for the bug regarding \if@firstcolumn. If a document
+   specifies as twocolumn, we automatically load mparhack
+-- some internal cleanup and added some recommended alternatives
+
+
 
 Changed (2020/10/04)
 
@@ -568,12 +584,12 @@ Earlier changes are noted at the end.
  
   This work may be distributed and/or modified under the
   conditions of the LaTeX Project Public License, either
-  version 1.3 of this license or (at your option) any 
+  version 1.3c of this license or (at your option) any 
   later version.
   The latest version of the license is in
      http://www.latex-project.org/lppl.txt
-  and version 1.3 or later is part of all distributions of
-  LaTeX version 2003/06/01 or later.
+  and version 1.3c or later is part of all distributions of
+  LaTeX version 2008/05/04 or later.
  
   This work has the LPPL maintenance status "maintained".
  
diff --git a/Master/texmf-dist/doc/latex/memoir/memman.pdf b/Master/texmf-dist/doc/latex/memoir/memman.pdf
index ceaa77861d9..82de66876cd 100644
--- a/Master/texmf-dist/doc/latex/memoir/memman.pdf
+++ b/Master/texmf-dist/doc/latex/memoir/memman.pdf
diff --git a/Master/texmf-dist/doc/latex/memoir/memman.tex b/Master/texmf-dist/doc/latex/memoir/memman.tex
index 9ac76c5a16d..03a1af27e25 100644
--- a/Master/texmf-dist/doc/latex/memoir/memman.tex
+++ b/Master/texmf-dist/doc/latex/memoir/memman.tex
@@ -11888,8 +11888,8 @@ like:
 
 \svnidlong
 {$Ignore: $}
-{$LastChangedDate: 2018-03-09 13:41:30 +0100 (Fri, 09 Mar 2018) $}
-{$LastChangedRevision: 587 $}
+{$LastChangedDate: 2021-03-22 14:24:31 +0100 (Mon, 22 Mar 2021) $}
+{$LastChangedRevision: 706 $}
 {$LastChangedBy: daleif@math.au.dk $}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -12663,6 +12663,49 @@ if necessary reset it to its original value --- the default value for
 
 \section{Lists}
 
+\LMnote{2013/05/16}{Added hint about enumitem}
+\LMnote{2018/03/09}{Changed hint to be a recommended section}
+\begin{recommended}
+  The \theclass\ class does not provide high level interfaces to
+  configure the appearance of lists. We provide some simple tools to
+  adjust vertical spacing, see below.
+
+  Users seeking more control can have a look at the excellent
+  \Lpack{enumitem} package by Javier Bezos. If loaded as
+  \begin{lcode}
+    \usepackage[shortlabels]{enumitem}
+  \end{lcode}
+  then our
+  \begin{lcode}
+    \begin{enumerate}[i)] 
+     \item \label{item:tst}  ...
+  \end{lcode}
+  syntax will work out of the box.
+
+  One key difference: In \theclass\ \verb?\ref{item:tst}? will give
+  you `i', whereas, if \Lpack{enumitem} is loaded the full formatting
+  is returned from the cross reference, i.e., `i)'. This is fully
+  configurable in \Lpack{enumitem}.
+
+  Note that, \cmd{\tightlists}, \cmd{\defaultlists}, \cmd{\firmlists},
+  \cmd{\firmlists*} presented below, are not supported by
+  \Lpack{enumitem}, it provides a highlevel key based interface
+  instead.
+
+  Tip: If you use the the new kernel environment hooks (see
+  \cite{LTHOOKS}, or use \cmd{\AtBeginEnvironment} from
+  \Lpack{etoolbox}), then you can fx add default formatting of
+  \Pe{enumerate} to all of your theorem constructions and then no need
+  to use 
+  \begin{lcode}
+    \begin{enumerate}[(a)]
+  \end{lcode}
+  every single time, because you wanted lists use use letters inside
+  theorems, and something else outside.
+\end{recommended}
+
+
+
 \index{list|(} %|
 
     Standard \ltx\ provides four kinds of lists. There is a general \Ie{list}
@@ -12839,49 +12882,6 @@ counter typeset as a lowercase Roman numeral followed by a single parenthesis
 ...
 \end{lcode} 
 
-
-\LMnote{2013/05/16}{Added hint about enumitem}
-\LMnote{2018/03/09}{Changed hint to be a recommended section}
-\begin{recommended}
-    \theclass\ does not provide high level interfaces to configure the
-  appearance. We provide some simple tools to adjust vertical spacing,
-  see below.
-
-  Users seeking more control can have a look at the excellent \Lpack{enumitem}
-  package by Javier Bezos. If loaded as
-  \begin{lcode}
-    \usepackage[shortlabels]{enumitem}
-  \end{lcode}
-  then our
-  \begin{lcode}
-    \begin{enumerate}[i)] 
-     \item \label{item:tst}  ...
-  \end{lcode}
-  syntax will work out of the box.
-
-  One key difference: In \theclass\ \verb?\ref{item:tst}? will give you
-  `i', whereas, if \Lpack{enumitem} is loaded the full formatting is
-  returned from the cross reference, i.e., `i)'. This is fully
-  configurable in \Lpack{enumitem}.
-
-  Note that, \cmd{\tightlists}, \cmd{\defaultlists}, \cmd{\firmlists},
-  \cmd{\firmlists*} presented below, are not supported by
-  \Lpack{enumitem}, it provides a highlevel key based interface
-  instead.
-
-  Another feature from \Lpack{enumitem} that I (LM) uses a lot is to
-  combine the \cmd{\setlist} with \cmd{\AtBeginEnvironment} from the
-  \Lpack{etoolbox} package to specifically adjust enumerate used
-  inside certain theorem constructions. That wway we can control the
-  apparence of the lists from the preamble and does not need to use
-  say
-  \begin{lcode}
-    \begin{enumerate}[(a)]
-  \end{lcode}
-  every single time.
-\end{recommended}
-
-
 \index{list!tight|(} %|
 
 
@@ -15454,8 +15454,8 @@ before the stuff you want to have moved out of, say, a part.
 
 \svnidlong
 {$Ignore: $}
-{$LastChangedDate: 2020-03-15 19:48:39 +0100 (Sun, 15 Mar 2020) $}
-{$LastChangedRevision: 682 $}
+{$LastChangedDate: 2021-03-22 11:32:59 +0100 (Mon, 22 Mar 2021) $}
+{$LastChangedRevision: 705 $}
 {$LastChangedBy: daleif@math.au.dk $}
 
 
@@ -15622,16 +15622,16 @@ Tufte \LaTeX\ collection.
   \senv{margintable}\oarg{len} float material \eenv{margintable} \\
 \end{syntax}
 \glossary(marginfigure)%
-  {\senv{marginfigure}\oarg{length}}%
-  {Environment which inserts its contents into the margin, and enables
-  figure captions. The optional argument should be a length and is used
-to perform manual up/down adjustments to the placement.}
+{\senv{marginfigure}\oarg{length}}%
+{Environment which inserts its contents into the margin, and enables
+  figure captions. The optional argument should be a length and is
+  used to perform manual up/down adjustments to the placement.}
 \glossary(margintable)%
-  {\senv{margintable}\oarg{length}}%
-  {Environment which inserts its contents into the margin, and enables
+{\senv{margintable}\oarg{length}}%
+{Environment which inserts its contents into the margin, and enables
   figure captions.The optional argument should be a length and is used
-to perform manual up/down adjustments to the placement.}
-Because this is inserted differently than the ordinary \Ie{figure} or
+  to perform manual up/down adjustments to the placement.}  Because
+this is inserted differently than the ordinary \Ie{figure} or
 \Ie{table} floats, one might get into the situation where a figure
 float inserted before a margin float, might float \emph{past} the
 margin float and thus have different caption numbering. For this
@@ -15639,6 +15639,10 @@ reason the margin float contain a float blocking device such that any
 unplaced floats are forced to be placed before we start typesetting a
 margin figure.
 
+Additionally, note that the term ``float'' is used very lightly
+here. As things are placed using \cmd{\marginpar}, margin floats only
+``float'' on the page it self, they never float on to the next page.
+
 \fancybreak{}
 
 The \Ie{marginfigure} and \Ie{margintable} environments can of course
@@ -16093,6 +16097,13 @@ and \cs{subcaption}.}
 
 \index{float!placement|(}%|
 
+Note that this section is not just relevant to the class, but for
+\ltx\ in general. The main difference for placement between the class
+and, say, the \Lclass{book} class are the default values of some
+settings.
+
+
+
  The general format for a float environment is: \\
  \senv{float}\oarg{loc} ... \eenv{float} 
 or for double column\index{float!double column} floats: \\
@@ -16456,15 +16467,19 @@ figure\index{figure} environment.
     The commands described below are very similar to
 those supplied by the \Lpack{ccaption} package~\cite{CCAPTION}.
 
-As an alternative (it has more features that what the class offers) we
-recommend the \Lpack{caption} package by Axel Sommerfeldt. In fact if
-the \Lpack{caption} package is loaded, the class will detect it and
-reset it self such that \Lpack{caption} can take over. This also means
-that all the macros described in the next section will have no effect
-if \Lpack{caption} is loaded (either intentionally or
-unintentionally).
-
-
+\begin{recommended}
+  As an alternative to the styling features in the class we recommend
+  the \Lpack{caption} package by Axel Sommerfeldt (many more features
+  compared to the class).
+
+  As of late 2020, Axel was kind enough to add a feature to
+  \Lpack{caption} such that if loaded with \theclass\ then
+  \Lpack{caption} will map most of the styling commands presented in
+  the next section onto the equivalent settings used by the
+  \Lpack{caption} package. Just make sure your settings are set
+  \emph{after} loading \Lpack{caption}.\footnotemark
+\end{recommended}
+\footnotetext{Be aware that other packages may auto load \Lpack{caption}.}
 
 
 \section{Caption styling} 
@@ -20342,8 +20357,8 @@ illustrate these points.
 
 \svnidlong
 {$Ignore: $}
-{$LastChangedDate: 2020-03-25 19:00:55 +0100 (Wed, 25 Mar 2020) $}
-{$LastChangedRevision: 686 $}
+{$LastChangedDate: 2021-03-22 14:24:31 +0100 (Mon, 22 Mar 2021) $}
+{$LastChangedRevision: 706 $}
 {$LastChangedBy: daleif@math.au.dk $}
 
 \chapter{Page notes} \label{chap:mnotes}
@@ -21143,7 +21158,7 @@ The default corresponds to \verb?\marginparmargin{outer}?.
      \small
     \item[Two column document] If the note is placed in the first
       column, to the left, otherwise  to the right, irrespective the
-      document being one- or two-side and of the users choices
+      document being one- or two-side and of the users choices. 
 \item[One sided document] If user specified \emph{left}, notes are
   placed to the left, otherwise to the right. 
 \item[Two sided document] depends on whether a recto or verso page:
@@ -21173,14 +21188,17 @@ The original convoluted methods of specifying the margin for
 \cmd{\marginpar} is deprecated, although still supported; if you need
 to know what they are then you can read all about them in \texttt{memoir.dtx}.
 
-     Sometimes \ltx\ gets confused near a page break and a note just after
-a break may get put into the wrong\index{margin note!wrong margin} margin 
-(the wrong margin for the current 
-page but the right one if the note fell on the previous page). If this occurs
-then inserting the \cmd{\strictpagecheck} declaration before 
-any \cmd{\marginpar}
-command is used will prevent this, at the cost of at least one additional
-\ltx\ run.
+Sometimes \ltx\ gets confused near a page break and a note just after
+a break may get put into the wrong\index{margin note!wrong margin}
+margin (the wrong margin for the current page but the right one if the
+note fell on the previous page). If this occurs then inserting the
+\cmd{\strictpagecheck} declaration before any \cmd{\marginpar} command
+is used will prevent this, at the cost of at least one additional
+\ltx\ run. Note: In twocolumn mode the \Lpack{mparhack} package is
+automatically loaded as it fixes a bug, there the test for whether one
+is in the first column may fail.\footnote{If you want to use
+  \Lpack{mparhack} with the \Lopt{debug} option, use
+  \cs{RequirePackage[debug]\{mparhack\}} before \cs{documentclass}.}
 
 
 \section{Side notes}
@@ -23930,8 +23948,8 @@ and the result is shown on the next page.
 
 \svnidlong
 {$Ignore: $}
-{$LastChangedDate: 2018-03-06 15:58:01 +0100 (Tue, 06 Mar 2018) $}
-{$LastChangedRevision: 584 $}
+{$LastChangedDate: 2021-03-22 14:24:31 +0100 (Mon, 22 Mar 2021) $}
+{$LastChangedRevision: 706 $}
 {$LastChangedBy: daleif@math.au.dk $}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -24067,13 +24085,8 @@ In the \Ie{snugshaded} environment the box clings more closely to its
 contents than it does in the \Ie{shaded} environment.
 
 \begin{recommended}
-  Since the class was originally written, much have happened in the
-  gfx generating capabilities in LaTeX, especially the popularity of
-  TikZ has provided many more extensive box and graphics generating
-  packages.
-
-  As of 2018 one of the most impressive packages for all sorts of
-  boxes is the \Lpack{tcolorbox} package by Thomas~F.~Sturm.
+  See the \Lpack{tcolorbox} package by Thomas~F.~Sturm. An impressive
+  system of boxes and decorations and much much more. All based on TikZ.
 \end{recommended}
 
 
@@ -28144,8 +28157,8 @@ pdflatex memman
 
 \svnidlong
 {$Ignore: $}
-{$LastChangedDate: 2020-10-04 21:52:58 +0200 (Sun, 04 Oct 2020) $}
-{$LastChangedRevision: 696 $}
+{$LastChangedDate: 2021-03-22 18:32:04 +0100 (Mon, 22 Mar 2021) $}
+{$LastChangedRevision: 707 $}
 {$LastChangedBy: daleif@math.au.dk $}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -28814,6 +28827,20 @@ but they do not produce any warning messages.
 
 \section{Changing macros} \label{sec:addtodef}
 
+\begin{recommended}
+  See also the \Lpack{xpatch} (which extends the patching capabilities
+  of \Lpack{etoolbox}) and \Lpack{letltxmacro} packages.
+
+  Additionally the LaTeX-format of October 2020 include some new
+  hooking features fx to hook into environments, see \cite{LTHOOKS}
+  (see section 2.8.1 for some utility macros). The new format also
+  adds \cs{NewCommandCopy} and \cs{RenewCommandCopy} which are
+  extended versions of what \Lpack{letltxmacro} provides.
+\end{recommended}
+
+
+
+
      Commands are provided for extending simple macro 
 definitions.\index{extend a macro}\index{add to a macro}
 
@@ -29984,42 +30011,46 @@ and where they used.
 
 \begin{table}
 \centering
-\caption{Defined words and phrases}\label{tab:defwordsphrases}
+\caption{Some defined words and phrases. \textsuperscript{*} marks
+  macros under language control
+  (\Lpack{babel}), see the \cs{addto}\cs{captions}\meta{language}
+  feature in \Lpack{babel}. }\label{tab:defwordsphrases}
+\newcommand\B{\textsuperscript{*}}
 \begin{tabular}{lll}\toprule
-Macro & Default & Usage \\ \midrule
-\cmd{\abstractname}     & \abstractname\     & title for \Ie{abstract} environment \\
-\cmd{\alsoname}         & \alsoname\         & used by \cmd{\seealso} \\
-\cmd{\amname}           & \amname\           & used in printing time of day \\
-\cmd{\appendixname}     & \appendixname\     & name for an appendix heading \\
-\cmd{\appendixpagename} & \appendixpagename\ & name for an \cmd{\appendixpage} \\
-\cmd{\appendixtocname}  & \appendixtocname\  & ToC entry announcing appendices \\
-\cmd{\bibname}          & \bibname\          & title for \cmd{\thebibliography} \\
-\cmd{\bookname}         & \bookname\         & name for \cmd{\book} heading \\
-\cmd{\bookrefname}      & \bookrefname\      & used by \cmd{\Bref} \\
-\cmd{\chaptername}      & \chaptername\      & name for \cmd{\chapter} heading \\
-\cmd{\chapterrefname}   & \chapterrefname\   & used by \cmd{\Cref} \\
-\cmd{\contentsname}     & \contentsname\     & title for \cmd{\tableofcontents} \\
-\cmd{\figurename}       & \figurename\       & name for figure \cmd{\caption} \\
-\cmd{\figurerefname}    & \figurerefname\    & used by \cmd{\fref} \\
-\cmd{\glossaryname}     & Glossary           & title for \cmd{\theglossary} \\
-\cmd{\indexname}        & \indexname\        & title for \cmd{\theindex} \\
-\cmd{\lcminusname}      & \lcminusname\      & used in named number formatting \\
-\cmd{\listfigurename}   & \listfigurename\   & title for \cmd{\listoffigugres} \\
-\cmd{\listtablename}    & \listtablename\    & title for \cmd{\listoftables} \\
-\cmd{\minusname}        & \minusname\        & used in named number formatting \\
-\cmd{\namenumberand}    & \namenumberand\    & used in named number formatting \\
-\cmd{\namenumbercomma}  & \namenumbercomma\  & used in named number formatting \\
-\cmd{\notesname}        & \notesname\        & title of \cmd{\notedivision} \\
-\cmd{\pagename}         & \pagename\         & for your use \\
-\cmd{\pagerefname}      & \pagerefname\      & used by \cmd{\pref} \\
-\cmd{\partname}         & \partname\         & name for \cmd{\part} heading \\
-\cmd{\partrefname}      & \partrefname\      & used by \cmd{\Pref} \\
-\cmd{\pmnane}           & \pmname\           & used in printing time of day \\
-\cmd{\sectionrefname}   & \sectionrefname\   & used by \cmd{\Sref} \\
-\cmd{\seename}          & \seename\          & used by \cmd{\see} \\
-\cmd{\tablename}        & \tablename\        & name for table \cmd{\caption} \\
-\cmd{\tablerefname}     & \tablerefname\     & used by \cmd{\tref} \\
-\cmd{\ucminusname}      & \ucminusname\      & used in named number formatting \\
+Macro                   & Default            & Usage                               \\ \midrule
+\cmd{\abstractname}     & \abstractname\B    & title for \Ie{abstract} environment \\
+\cmd{\alsoname}         & \alsoname\B        & used by \cmd{\seealso}              \\
+\cmd{\amname}           & \amname\           & used in printing time of day        \\
+\cmd{\appendixname}     & \appendixname\B    & name for an appendix heading        \\
+\cmd{\appendixpagename} & \appendixpagename\ & name for an \cmd{\appendixpage}     \\
+\cmd{\appendixtocname}  & \appendixtocname\  & ToC entry announcing appendices     \\
+\cmd{\bibname}          & \bibname\B         & title for \cmd{\thebibliography}    \\
+\cmd{\bookname}         & \bookname\         & name for \cmd{\book} heading        \\
+\cmd{\bookrefname}      & \bookrefname\      & used by \cmd{\Bref}                 \\
+\cmd{\chaptername}      & \chaptername\B     & name for \cmd{\chapter} heading     \\
+\cmd{\chapterrefname}   & \chapterrefname\   & used by \cmd{\Cref}                 \\
+\cmd{\contentsname}     & \contentsname\B    & title for \cmd{\tableofcontents}    \\
+\cmd{\figurename}       & \figurename\B      & name for figure \cmd{\caption}      \\
+\cmd{\figurerefname}    & \figurerefname\    & used by \cmd{\fref}                 \\
+\cmd{\glossaryname}     & Glossary           & title for \cmd{\theglossary}        \\
+\cmd{\indexname}        & \indexname\B       & title for \cmd{\theindex}           \\
+\cmd{\lcminusname}      & \lcminusname\      & used in named number formatting     \\
+\cmd{\listfigurename}   & \listfigurename\B  & title for \cmd{\listoffigugres}     \\
+\cmd{\listtablename}    & \listtablename\B   & title for \cmd{\listoftables}       \\
+\cmd{\minusname}        & \minusname\        & used in named number formatting     \\
+\cmd{\namenumberand}    & \namenumberand\    & used in named number formatting     \\
+\cmd{\namenumbercomma}  & \namenumbercomma\  & used in named number formatting     \\
+\cmd{\notesname}        & \notesname\        & title of \cmd{\notedivision}        \\
+\cmd{\pagename}         & \pagename\         & for your use                        \\
+\cmd{\pagerefname}      & \pagerefname\      & used by \cmd{\pref}                 \\
+\cmd{\partname}         & \partname\B        & name for \cmd{\part} heading        \\
+\cmd{\partrefname}      & \partrefname\      & used by \cmd{\Pref}                 \\
+\cmd{\pmnane}           & \pmname\           & used in printing time of day        \\
+\cmd{\sectionrefname}   & \sectionrefname\   & used by \cmd{\Sref}                 \\
+\cmd{\seename}          & \seename\B         & used by \cmd{\see}                  \\
+\cmd{\tablename}        & \tablename\B       & name for table \cmd{\caption}       \\
+\cmd{\tablerefname}     & \tablerefname\     & used by \cmd{\tref}                 \\
+\cmd{\ucminusname}      & \ucminusname\      & used in named number formatting     \\
 \bottomrule
 \end{tabular}
 \end{table}
@@ -30144,13 +30175,36 @@ a similar internal command to ensure that the packages are not
 loaded following some later \cmd{\usepackage} command. The names of the
 emulated packages are written to the \pixfile{log} file. At the time
 of writing the emulated packages are:
-\Lpack{abstract}, \Lpack{appendix}, \Lpack{array}, \Lpack{booktabs}, 
-\Lpack{ccaption}, \Lpack{chngcntr}, \Lpack{crop}, \Lpack{dcolumn}, 
-\Lpack{delarray}, \Lpack{enumerate}, \Lpack{epigraph}, %%%%%% \Lpack{framed}, 
-\Lpack{ifmtarg}, \Lpack{ifpdf}, \Lpack{index}, \Lpack{makeidx}, 
-\Lpack{moreverb}, \Lpack{needspace}, \Lpack{newfile}, \Lpack{nextpage}, 
-\Lpack{pagenote}, \Lpack{patchcmd}, \Lpack{parskip}, \Lpack{setspace}, \Lpack{shortvrb}, \Lpack{showidx}, 
-\Lpack{tabularx}, \Lpack{titleref}, \Lpack{tocbibind}, \Lpack{tocloft}, 
+\Lpack{abstract},
+\Lpack{appendix},
+%\Lpack{array},
+ \Lpack{booktabs}, 
+\Lpack{ccaption},
+ \Lpack{chngcntr},
+ \Lpack{crop},
+% \Lpack{dcolumn}, 
+%\Lpack{delarray},
+ \Lpack{enumerate},
+ \Lpack{epigraph},
+ %%%%%% \Lpack{framed}, 
+\Lpack{ifmtarg},
+ \Lpack{ifpdf},
+ \Lpack{index},
+ \Lpack{makeidx}, 
+\Lpack{moreverb},
+ \Lpack{needspace},
+ \Lpack{newfile},
+ \Lpack{nextpage}, 
+\Lpack{pagenote},
+ \Lpack{patchcmd},
+ \Lpack{parskip},
+ \Lpack{setspace},
+ \Lpack{shortvrb},
+ \Lpack{showidx}, 
+%\Lpack{tabularx},
+ \Lpack{titleref},
+ \Lpack{tocbibind},
+ \Lpack{tocloft}, 
 \Lpack{verbatim}, 
 and
 \Lpack{verse}.
@@ -38881,6 +38935,15 @@ access CTAN is available at \url{http://www.tug.org}.
   \newblock (Available as \texttt{alltt.dtx} and 
   \texttt{alltt.ins} from CTAN via  \CTANurl{/macros/latex/base/})
 
+\bibitem[Bra20]{SOURCE2E}
+  Johannes Braams \textit{et al}.
+  \newblock \emph{The \LaTeXe\ Sourses}.
+  \newblock October, 2020.
+  \newblock (Available from CTAN via \CTANurl{/pkg/source2e})
+
+
+
+  
 %%% keep
 \bibitem[Bri99]{BRINGHURST99}
   Robert Bringhurst.
diff --git a/Master/texmf-dist/source/latex/memoir/memoir.dtx b/Master/texmf-dist/source/latex/memoir/memoir.dtx
index 123d6371c1a..f63ba259abf 100644
--- a/Master/texmf-dist/source/latex/memoir/memoir.dtx
+++ b/Master/texmf-dist/source/latex/memoir/memoir.dtx
@@ -8,19 +8,19 @@
 % 
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either
-% version 1.3 of this license or (at your option) any 
+% version 1.3c of this license or (at your option) any 
 % later version.
 % The latest version of the license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3 or later is part of all distributions of
-% LaTeX version 2003/06/01 or later.
+% and version 1.3c or later is part of all distributions of
+% LaTeX version 2008/05/04 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
 % This work consists of the files listed in the README file.
 % 
 % \fi
-% \CheckSum{31219}
+% \CheckSum{30999}
 %
 % \changes{v0.1}{2001/05/20}{First public alpha release}
 % \changes{v0.2}{2001/06/03}{First beta release}
@@ -125,7 +125,8 @@
 % \changes{v3.7m}{2020/09/10}{More preparations for october kernel update} 
 % \changes{v3.7n}{2020/10/04}{Foced # doubling in AtBegin/EndX macros
 % to ensure backwards compatability} 
-%                             
+% \changes{v3.7o}{2021/03/23}{Maintenance and a provide for the kernel}
+% 
 % \def\dtxfile{memoir.dtx}
 %
 % \def\fileversion{v0.1}  \def\filedate{2001/05/20}
@@ -187,6 +188,7 @@
 % \def\fileversion{v3.7l}          \def\filedate{2020/06/02} 
 % \def\fileversion{v3.7m}          \def\filedate{2020/09/10} 
 % \def\fileversion{v3.7n}          \def\filedate{2020/10/04} 
+% \def\fileversion{v3.7o}          \def\filedate{2021/03/23} 
 % \title{The LaTeX \Lpack{memoir} class for configurable book 
 %        typesetting: Source code\thanks{This
 %        file (\texttt{\dtxfile}) has version number \fileversion, last revised
@@ -417,11 +419,11 @@
 %    Announce the name, option files and version for LaTeX2e files:
 %    \begin{macrocode}
 %<class>\ProvidesClass{memoir}%
-%<class>  [2020/10/04 v3.7n configurable book, report, article document class]
+%<class>  [2021/03/23 v3.7o configurable book, report, article document class]
 %    \end{macrocode}
 %  In the manual it is useful to know the current version.
 %    \begin{macrocode}
-%<class>\newcommand\memversion{v3.7n, 2020/10/04}
+%<class>\newcommand\memversion{v3.7o, 2021/03/23}
 %<9pt>\ProvidesFile{mem9.clo}%
 %<9pt>              [2008/01/30 v0.4 memoir class 9pt size option]
 %<10pt>\ProvidesFile{mem10.clo}%
@@ -9668,8 +9670,8 @@
 % non-zero \cs{parskip} to not interfer with the placement of the title}
 %    \begin{macrocode}
 \def\@makechapterhead#1{%
-  \chapterheadstart%  \vspace*{50\p@}%
-  {%\parindent \z@ \raggedright \normalfont
+  \chapterheadstart% 
+  {%
    \parskip \z@
    \parindent \z@ \memRTLraggedright \normalfont
 %    \end{macrocode}
@@ -9677,7 +9679,7 @@
 %    \begin{macrocode}
    \ifm@m@And
      \printchaptername \chapternamenum \printchapternum 
-     \afterchapternum % \par\nobreak \vskip 20\p@
+     \afterchapternum % 
    \else
      \printchapternonum
    \fi
@@ -9685,8 +9687,8 @@
 % Typeset the title.
 %    \begin{macrocode}
    \interlinepenalty\@M
-   \printchaptertitle{#1} % \Huge \bfseries #1
-   \afterchaptertitle % \par\nobreak \vskip 40\p@
+   \printchaptertitle{#1} % 
+   \afterchaptertitle % 
   }}
 
 %    \end{macrocode}
@@ -9838,7 +9840,7 @@
 %    \begin{macrocode}
 \def\@makeschapterhead#1{%
   \chapterheadstart
-  {%\parindent \z@ \raggedright \normalfont
+  {%
    \parskip \z@% 
    \parindent \z@ \memRTLraggedright \normalfont
    \printchapternonum
@@ -9966,9 +9968,7 @@
 %    \begin{macrocode}
 \newcommand*{\reparticle}{%
   \chapterstyle{reparticle}
-%%%  \setsecheadstyle{\normalfont\large\bfseries\raggedright}
   \setsecheadstyle{\normalfont\large\bfseries\memRTLraggedright}%
-%%%  \setsubsecheadstyle{\normalfont\bfseries\raggedright}
   \setsubsecheadstyle{\normalfont\bfseries\memRTLraggedright}%
 }
 
@@ -10072,7 +10072,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}}
@@ -10383,7 +10382,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}{}
@@ -10580,7 +10578,6 @@
   \renewcommand*{\chapnumfont}{\normalfont\huge\bfseries}%
   \renewcommand*{\printchapternum}{\chapnumfont \thechapter\quad}%
   \renewcommand*{\afterchapternum}{}%
-%%%  \renewcommand*{\chaptitlefont}{\chapnumfont\raggedright}}
   \renewcommand*{\chaptitlefont}{\chapnumfont\memRTLraggedright}}
 
 %    \end{macrocode}
@@ -10935,7 +10932,6 @@
   \setaftersecskip{2.3ex \@plus .2ex}
 \newcommand{\secheadstyle}{}
 \newcommand{\setsecheadstyle}[1]{\renewcommand{\secheadstyle}{#1}}
-%%%  \setsecheadstyle{\Large\bfseries\raggedright}
   \setsecheadstyle{\Large\bfseries\memRTLraggedright}
 
 %    \end{macrocode}
@@ -10997,7 +10993,6 @@
   \setaftersubsecskip{1.5ex \@plus .2ex}
 \newcommand{\subsecheadstyle}{}
 \newcommand{\setsubsecheadstyle}[1]{\renewcommand{\subsecheadstyle}{#1}}
-%%%  \setsubsecheadstyle{\large\bfseries\raggedright}
   \setsubsecheadstyle{\large\bfseries\memRTLraggedright}
 
 %    \end{macrocode}
@@ -11052,20 +11047,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}
 
 %    \end{macrocode}
 % \end{macro}
@@ -11571,7 +11565,6 @@
   \setsecindent{\z@}%
   \setbeforesecskip{-3.5ex \@plus -1ex \@minus -.2ex}%
   \setaftersecskip{2.3ex \@plus .2ex}%
-%%%  \setsecheadstyle{\Large\bfseries\raggedright}%
   \setsecheadstyle{\Large\bfseries\memRTLraggedright}%
 %    \end{macrocode}
 % Default \cs{subsection} style
@@ -11582,7 +11575,6 @@
   \setsubsecindent{\z@}%
   \setbeforesubsecskip{-3.25ex \@plus -1ex \@minus -.2ex}%
   \setaftersubsecskip{1.5ex \@plus .2ex}%
-%%%  \setsubsecheadstyle{\large\bfseries\raggedright}%
   \setsubsecheadstyle{\large\bfseries\memRTLraggedright}%
 %    \end{macrocode}
 % Default \cs{subsubsection} style
@@ -11593,7 +11585,6 @@
   \setsubsubsecindent{\z@}%
   \setbeforesubsubsecskip{-3.25ex \@plus -1ex \@minus -.2ex}%
   \setaftersubsubsecskip{1.5ex \@plus .2ex}%
-%%%  \setsubsubsecheadstyle{\normalsize\bfseries\raggedright}%
   \setsubsubsecheadstyle{\normalsize\bfseries\memRTLraggedright}%
 %    \end{macrocode}
 % Default \cs{paragraph} style
@@ -11656,19 +11647,16 @@
   \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}%
 % subsection
   \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}%
 % subsubsection
   \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}%
 % paragraph
   \setbeforeparaskip{1.0\onelineskip 
@@ -11697,13 +11685,11 @@
   \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}%
 % subsection
   \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}%
 % subsubsection
   \setbeforesubsubsecskip{1.0\onelineskip 
@@ -11813,17 +11799,14 @@
 % section
   \setbeforesecskip{-3.5ex \@plus -1ex \@minus -.2ex}%
   \setaftersecskip{2.3ex \@plus .2ex}%
-%%%  \setsecheadstyle{\normalfont\Large\sffamily\bfseries\raggedright}%
   \setsecheadstyle{\normalfont\Large\sffamily\bfseries\memRTLraggedright}%
 % subsection
   \setbeforesubsecskip{-3.25ex \@plus -1ex \@minus -.2ex}%
   \setaftersubsecskip{1.5ex \@plus .2ex}%
-%%%  \setsubsecheadstyle{\normalfont\large\sffamily\bfseries\raggedright}%
   \setsubsecheadstyle{\normalfont\large\sffamily\bfseries\memRTLraggedright}%
 % subsubsection
   \setbeforesubsubsecskip{-3.25ex \@plus -1ex \@minus -.2ex}%
   \setaftersubsubsecskip{1.5ex \@plus .2ex}%
-%%%  \setsubsubsecheadstyle{\normalfont\normalsize\sffamily\bfseries\raggedright}%
   \setsubsubsecheadstyle{\normalfont\normalsize\sffamily\bfseries\memRTLraggedright}%
 % paragraph
   \setbeforeparaskip{3.25ex \@plus 1ex \@minus .2ex}%
@@ -11889,19 +11872,16 @@
   \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}%
 % subsection
   \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}%
 % subsubsection
   \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}%
 % paragraph
   \setbeforeparaskip{1.0\onelineskip 
@@ -11930,19 +11910,16 @@
   \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}%
 % subsection
   \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}%
 % subsubsection
   \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}%
 % paragraph
   \setbeforeparaskip{1.0\onelineskip 
@@ -12547,9 +12524,7 @@
 %    \begin{macrocode}
 \newcommand*{\raggedrightthenleft}{%
   \parindent \z@
-%%%  \leftskip \z@ \@plus 1fill
   \memRTLleftskip \z@ \@plus 1fill
-%%%  \rightskip\@flushglue
   \memRTLrightskip\@flushglue
   \parfillskip \z@
   \everypar{\hskip \z@ \@plus -1fill}}
@@ -21421,7 +21396,6 @@
 % margin captions.
 %    \begin{macrocode}
 \newcommand*{\sidecapstyle}{%
-%%%  \captionnamefont{\bfseries}%
   \ifscapmargleft
     \captionstyle{\raggedleft}%
   \else
@@ -27178,7 +27152,9 @@
 % from \file{ltfloat.dtx}.
 % \changes{v1.0}{2001/10/30}{Added \cs{footref}}
 %    \begin{macrocode}
-\newcommand{\footref}[1]{%
+% \changes{v3.7o}{2021/02/24}{in 2021/05 \cs{footref} will be in the
+% kernel, thus we make it provide}
+\providecommand{\footref}[1]{%
   \begingroup
     \unrestored@protected@xdef\@thefnmark{\ref{#1}}%
   \endgroup
@@ -36587,7 +36563,15 @@
 \EmulatedPackage{index}[2008/07/23]
 \EmulatedPackage{makeidx}[2008/07/23]
 \EmulatedPackage{moreverb}[2008/07/23]
-\EmulatedPackage{mparhack}[2008/07/23]
+%    \end{macrocode}
+% \changes{v3.7o}{2021/03/22}{removed mparhack emulation, as we don't
+% emulate all of it, especially not the fix for \cs{if@firstcolumn},
+% instead load it if twocolumn }
+%    \begin{macrocode}
+\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]
@@ -36615,95 +36599,14 @@
 %
 % \subsection{Interaction with the \Lpack{caption} package}
 %
-% Although the author of the \Lpack{caption} package has, over the
-% years, made it work with many other classes he has not extended it
-% to either recognise or work with the memoir class. Some authors want
-% to use the \Lpack{caption} package, hence\ldots
-%
-% The easiest manner in which to make the \Lpack{caption} package to
-% work with the class, is to restore the kernel defaults for the main
-% captioning macros. 
-%
-% Kill changes to the caption macros when the \Lpack{caption} package
-% is used.  The \Lpack{caption} package checks the definitions of the
-% \cs{@makecaption}, \cs{caption} and \cs{@caption} macros. These need
-% to be identical to the definitions in the standard classes for the
-% package to disbelieve that the \Lpack{memoir} class is being used.
+% As of 2020, whenever the \Lpack{caption} package is loaded with the
+% memoir class, it will map relevant memoir captioning macros onto the
+% corresponding features provided by \Lpack{caption}. As this is now
+% done automatically, we have removed the code that reset \cs{caption}
+% to something more friendly to \Lpack{caption} in earler versions of
+% the class.
 %
-% \begin{macro}{\@makecaption}
-% \begin{macro}{\caption}
-% \begin{macro}{\@caption}
-% \changes{v1.61803}{2008/01/30}{Killed memoir's captioning when the caption
-% package is used (mempatch v4.9).}
-% \changes{v3.6k}{2012/05/04}{Changed the warning text to be more
-% informative.}
-% \changes{v3.7i}{2018/12/19}{Users still get spooked by the warning,
-% tried to rewrite it in a better manner}
-%    \begin{macrocode}
-%%% 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}
-
-%    \end{macrocode}
-% By request of the \Lpack{caption} package author (Axel Sommerfeldt),
-% we also restore the caption skips to the kernel defaults. The class
-% sets both to be 0.5\cs{onelineskip}, which may cause confusion when
-% using certain features in the \Lpack{caption} package.
-% \changes{v3.6k}{2012/05/04}{Added \cs{captionXskip} reset to default
-% values.}
-%    \begin{macrocode}
-
-  \setlength\abovecaptionskip{10\p@}
-  \setlength\belowcaptionskip{0\p@}
-
-} % end \AtBeginPackage
-
-%    \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
+% \changes{v3.7o}{2021/03/15}{removed code to reset for the caption package}
 %
 % \subsection{Interaction with the \Lpack{float} package}
 %
diff --git a/Master/texmf-dist/source/latex/memoir/memoir.ins b/Master/texmf-dist/source/latex/memoir/memoir.ins
index 51d5199da70..06f849e9012 100644
--- a/Master/texmf-dist/source/latex/memoir/memoir.ins
+++ b/Master/texmf-dist/source/latex/memoir/memoir.ins
@@ -6,12 +6,12 @@
 %%
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
-%% version 1.3 of this license or (at your option) any 
+%% version 1.3c of this license or (at your option) any 
 %% later version.
 %% The latest version of the license is in
 %%    http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of
-%% LaTeX version 2003/06/01 or later.
+%% and version 1.3c or later is part of all distributions of
+%% LaTeX version 2008/05/04 or later.
 %%
 %% This work has the LPPL maintenance status "maintained".
 %% (Note: Lars Madsen is gradually taking over maintenance)
diff --git a/Master/texmf-dist/source/latex/memoir/mempatch.dtx b/Master/texmf-dist/source/latex/memoir/mempatch.dtx
index eeb291600c9..560af702e55 100644
--- a/Master/texmf-dist/source/latex/memoir/mempatch.dtx
+++ b/Master/texmf-dist/source/latex/memoir/mempatch.dtx
@@ -7,12 +7,12 @@
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either
-% version 1.3 of this license or (at your option) any 
+% version 1.3c of this license or (at your option) any 
 % later version.
 % The latest version of the license is in
 %    http://www.latex-project.org/lppl.txt
-% and version 1.3 or later is part of all distributions of
-% LaTeX version 2003/06/01 or later.
+% and version 1.3c or later is part of all distributions of
+% LaTeX version 2008/05/04 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
diff --git a/Master/texmf-dist/source/latex/memoir/mempatch.ins b/Master/texmf-dist/source/latex/memoir/mempatch.ins
index a42ac89c6cd..3dfe4b0cd2c 100644
--- a/Master/texmf-dist/source/latex/memoir/mempatch.ins
+++ b/Master/texmf-dist/source/latex/memoir/mempatch.ins
@@ -6,12 +6,12 @@
 %%
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
-%% version 1.3 of this license or (at your option) any 
+%% version 1.3c of this license or (at your option) any 
 %% later version.
 %% The latest version of the license is in
 %%    http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of
-%% LaTeX version 2003/06/01 or later.
+%% and version 1.3c or later is part of all distributions of
+%% LaTeX version 2008/05/04 or later.
 %%
 %% This work has the LPPL maintenance status "maintained".
 %%
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