memoir (25mar20)

git-svn-id: svn://tug.org/texlive/trunk@54548 c570f23f-e606-0410-a88d-b1316a301751

8 files changed, 303 insertions, 182 deletions

diff --git a/Master/texmf-dist/doc/latex/memoir/README b/Master/texmf-dist/doc/latex/memoir/README
index 8f2448200d8..f27ca28265b 100644
--- a/Master/texmf-dist/doc/latex/memoir/README
+++ b/Master/texmf-dist/doc/latex/memoir/README
@@ -27,6 +27,30 @@ o Backmatter:
     Command glossary                                    ~  40 pages
     Bibliography, indexes                               ~  50 pages
 
+
+
+Changed (2020/03/25)
+
+o memoir v3.7k
+
+-- Changed how glossaries are written to the glo file. Should now
+   support UTF8 just fine. This fixes
+   https://tex.stackexchange.com/q/529127/3929
+
+-- typo in manual: for \subbottom the \label goes into the subtitle
+   part, aka \subbottom[...\label{...}]{...}. Text in example fixed
+
+-- added a check for showkeys final-mode, and do nothing in that
+   case. This fixes https://tex.stackexchange.com/q/526922/3929
+
+-- brought the class into sync with booktabs dated 2020/01/12
+
+-- the provided .ins files will now just overwrite instead of asking
+   for permission.
+
+-- various typos
+
+
 Changed (2019/11/21)
 
 o memoir v3.7j
diff --git a/Master/texmf-dist/doc/latex/memoir/memman.pdf b/Master/texmf-dist/doc/latex/memoir/memman.pdf
index 01af28adb97..4f0f3125698 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 965da3bb865..5ed8b9935c0 100644
--- a/Master/texmf-dist/doc/latex/memoir/memman.tex
+++ b/Master/texmf-dist/doc/latex/memoir/memman.tex
@@ -7,12 +7,14 @@
 %   This work has the LPPL maintenance status "maintained".
 %   Maintainer: Lars Madsen (daleif at math dot au dot dk)
 %
-\listfiles
+%\listfiles
 \documentclass[10pt,letterpaper,extrafontsizes]{memoir}
 \usepackage{comment}
 
 \hfuzz=5pt
 
+%\setlength\overfullrule{5pt}
+
 
 % For (non-printing) notes  \PWnote{date}{text}
 \newcommand{\PWnote}[2]{} 
@@ -84,8 +86,8 @@
 
 % \svnidlong
 % {}
-% {$LastChangedDate: 2019-11-14 18:06:44 +0100 (Thu, 14 Nov 2019) $}
-% {$LastChangedRevision: 662 $}
+% {$LastChangedDate: 2020-03-25 19:00:55 +0100 (Wed, 25 Mar 2020) $}
+% {$LastChangedRevision: 686 $}
 % {$LastChangedBy: daleif@math.au.dk $}
 
 
@@ -124,7 +126,7 @@
 %#% extend
 
 
-\hfuzz=10pt
+%\hfuzz=10pt
 
 \usepackage[draft]{fixme}
 \fxsetup{
@@ -346,7 +348,7 @@ Manual last changed \svnyear/\svnmonth/\svnday
 
 \setupshorttoc
 \tableofcontents
-\clearpage
+\clearforchapter
 \setupparasubsecs
 \setupmaintoc
 
@@ -2273,8 +2275,8 @@ an em, often a quad is 1em.
 
 \svnidlong
 {$Ignore: $}
-{$LastChangedDate: 2019-11-04 16:13:21 +0100 (Mon, 04 Nov 2019) $}
-{$LastChangedRevision: 658 $}
+{$LastChangedDate: 2020-02-19 15:38:41 +0100 (Wed, 19 Feb 2020) $}
+{$LastChangedRevision: 679 $}
 {$LastChangedBy: daleif@math.au.dk $}
 
 \chapter{Starting off} \label{chap:starting}
@@ -2586,7 +2588,7 @@ offers a wider range of type sizes\index{type size} than usual. These are:\index
 
   \emph{Note that this includes \cs{huge}, \cs{Huge} and \cs{HUGE}
   under \Lopt{14pt}. For \Lopt{17pt} and up, an error is thrown if
-  used withput \Lopt{extrafontsizes}, no error is given for
+  used without \Lopt{extrafontsizes}, no error is given for
   \Lopt{14pt}, there sizes above \cs{LARGE} will just be unavailable
   unless \Lopt{extrafontsizes} is used.}
 \glossary(extrafontsizes)%
@@ -2905,8 +2907,8 @@ want to put \cmd{\raggedbottom} in the preamble\index{preamble}.
 
 \svnidlong
 {$Ignore: $}
-{$LastChangedDate: 2018-03-12 11:00:16 +0100 (Mon, 12 Mar 2018) $}
-{$LastChangedRevision: 589 $}
+{$LastChangedDate: 2020-03-25 19:00:55 +0100 (Wed, 25 Mar 2020) $}
+{$LastChangedRevision: 686 $}
 {$LastChangedBy: daleif@math.au.dk $}
 
 \chapter{Laying out the page} \label{chap:layingpage}
@@ -3253,8 +3255,8 @@ on and specify
 
 \fancybreak{}
 
-See also section~\ref{sec:predefined-layouts} --
-\emph{\titleref{sec:predefined-layouts}}, where we present some extra
+See also section~\ref{sec:place-trimmed-page} --
+\emph{\titleref{sec:place-trimmed-page}}, where we present some extra
 commands. For example \cmd{\setpagecc} for placing a trimmed page
 centered on the stock.
 
@@ -3854,33 +3856,11 @@ is calculated from $B_{h} = P_{h} - U - L$.
   Readers may find several folio designs in \cite{MEMDESIGN}.
 \end{note}
 
+See also Section~\ref{sec:predefined-layouts}
+(\emph{\titleref{sec:predefined-layouts}}) for some predefined layouts.
 
 
-\fancybreak{}
 
-\begin{syntax}
-\cmd{\setcolsepandrule}\marg{colsep}\marg{thickness} \\
-\end{syntax}
-\glossary(setcolsepandrule)%
-  {\cs{setcolsepandrule}\marg{colsep}\marg{thickness}}%
-  {Sets the width of the gutter and the thickness of the rule in the gutter.}
-\glossary(columnsep)%
-  {\ls{columnsep}}%
-  {Width of the gutter between columns.}
-\glossary(columnseprule)%
-  {\ls{columnseprule}}%
- {Thickness of the rule in the gutter.}
-    For twocolumn\index{column!double} text the width of 
-the gutter\index{gutter}
-between the columns must be specified. \ltx\ also lets you draw a 
-vertical rule in the middle of the 
-gutter. The macro \cmd{\setcolsepandrule} 
-sets the gutter width\index{gutter!width}, \lnc{\columnsep}, to \meta{colsep} 
-and the thickness of the rule, \lnc{\columnseprule}, 
-to \meta{thickness}. A \meta{thickness} of 0pt means that the rule will be
-invisible. Visible rules usually have a thickness\index{rule!thickness} 
-of about 0.4pt. The total width of the twocolumns\index{column!double} 
-of text and the gutter equals the width of the typeblock\index{typeblock}.
 
     This completes the methods for specifying the layout of the
 main elements of the page --- the page\index{page!specifying size} 
@@ -4032,6 +4012,33 @@ is set to \meta{push}.
 \section{Other}
 \label{sec:other}
 
+\begin{syntax}
+\cmd{\setcolsepandrule}\marg{colsep}\marg{thickness} \\
+\end{syntax}
+\glossary(setcolsepandrule)%
+  {\cs{setcolsepandrule}\marg{colsep}\marg{thickness}}%
+  {Sets the width of the gutter and the thickness of the rule in the gutter.}
+\glossary(columnsep)%
+  {\ls{columnsep}}%
+  {Width of the gutter between columns.}
+\glossary(columnseprule)%
+  {\ls{columnseprule}}%
+ {Thickness of the rule in the gutter.}
+    For twocolumn\index{column!double} text the width of 
+the gutter\index{gutter}
+between the columns must be specified. \ltx\ also lets you draw a 
+vertical rule in the middle of the 
+gutter. The macro \cmd{\setcolsepandrule} 
+sets the gutter width\index{gutter!width}, \lnc{\columnsep}, to \meta{colsep} 
+and the thickness of the rule, \lnc{\columnseprule}, 
+to \meta{thickness}. A \meta{thickness} of 0pt means that the rule will be
+invisible. Visible rules usually have a thickness\index{rule!thickness} 
+of about 0.4pt. The total width of the twocolumns\index{column!double} 
+of text and the gutter equals the width of the typeblock\index{typeblock}.
+
+
+\fancybreak{}
+
 
 \begin{syntax}
 \cmd{\setfootins}\marg{length for normal}\marg{length for minipage} \\
@@ -4303,6 +4310,23 @@ the layout in any way, you must call \cmd{\checkandfixthelayout} after you have
 made all the necessary changes. As an aid, the final layout parameter values
 are displayed on the terminal and written out to the log file.
 
+At the beginning of the document we will automatically add the
+page/stock sizes etc to the output such that viewers etc reacts
+accordingly. In incase you need to manually have the class rewrite
+these sizes to the document, you can use 
+
+\begin{syntax}
+\cmd{\refixpagelayout}\\
+\end{syntax}
+\glossary(refixpagelayout)%
+  {\cs{refixpagelayout}}%
+  {Command to reemit the document size to the output.}%
+Please note that this macro (and its name), may change in the
+future.\footnote{In a comming version, in later in 2020, we will
+  hopefully be able to support changing the stock and layout mid
+  document, like what is provided by the \Lpack{geometry}.}
+
+
 \LMnote{2010/09/17}{added \cs{\settypeoutlayoutunit}}
 \begin{syntax}
 \cmd{\typeoutlayout} \\
@@ -4607,7 +4631,8 @@ changes to match the new layout).
 \begin{minipage}[b]{\pwlayi}
 \drawaspread{\pwlayii}{1.3}{1.62}{0.18}{1.13}{1.5}{0}
 \end{minipage}
-\caption{Default layout for letterpaper} \label{fig:pagefirstlay}
+\caption{Default layout for letterpaper}
+\label{fig:pagefirstlay}
 
 \begin{minipage}[b]{\pwlayi}
 \drawaspread{\pwlayii}{1.3}{1.19}{0.11}{1.5}{2}{0}
@@ -4697,7 +4722,8 @@ example, to get narrower margins with the spine being 1/12 the page width:
 \begin{lcode}
 \medievalpage[12]
 \end{lcode}
-Note that \meta{spine} must be an integer.
+Note that \meta{spine} must be an integer. See
+Figures~\ref{fig:pagefirstlay}--\ref{fig:pagelastlay}.
 
 \begin{syntax}
 \cmd{\isopage}\oarg{spine} \\
@@ -4735,12 +4761,30 @@ of \cmd{\isopage}.
 through \ref{fig:pagelastlay}. These were produced with the aid of the
 \Lpack{layouts} package.
 
-\fancybreak{}
+
+\section{Place trimmed page on the stock}
+\label{sec:place-trimmed-page}
+
+As mentined earlier, when the resulting paper size is smaller than the
+stock that it is printed on, you'll need to specify the trimmed size
+(the resulting paper size) using \cmd{\settrimmedsize} and you'll want
+to position that in relation to the stock using \cmd{\settrims}. 
+
+There are nine common layouts, so we made nine easy tro use
+macros. The take the same arguments as \cmd{\settrimmedsize} and then
+automatically add an appropriate \cmd{\settrims}.
+
 
 \begin{syntax}
-\cmd{\setpagebl}\marg{height}\marg{width}\marg{ratio} \\
-\cmd{\setpageml}\marg{height}\marg{width}\marg{ratio} \\
-\cmd{\setpagetl}\marg{height}\marg{width}\marg{ratio} \\
+\cmd{\setpagetl}\marg{height}\marg{width}\marg{ratio}  (top-left) \\
+\cmd{\setpagetm}\marg{height}\marg{width}\marg{ratio} (top-middle)\\
+\cmd{\setpagetr}\marg{height}\marg{width}\marg{ratio}  (top-right)\\
+\cmd{\setpagebl}\marg{height}\marg{width}\marg{ratio} (bottom-left)\\
+\cmd{\setpagebm}\marg{height}\marg{width}\marg{ratio} (bottom-middle)\\
+\cmd{\setpagebr}\marg{height}\marg{width}\marg{ratio} (bottom-right) \\
+\cmd{\setpageml}\marg{height}\marg{width}\marg{ratio} (middle-left) \\
+\cmd{\setpagecc}\marg{height}\marg{width}\marg{ratio} (center, alias \cmd{\setpagemm}) \\
+\cmd{\setpagemr}\marg{height}\marg{width}\marg{ratio}  (middle-right)\\
 \end{syntax}
 \glossary(setpagebl)%
   {\cs{setpagebl}\marg{height}\marg{width}\marg{ratio}}%
@@ -4753,42 +4797,7 @@ through \ref{fig:pagelastlay}. These were produced with the aid of the
 \glossary(setpagebl)%
   {\cs{setpagetl}\marg{height}\marg{width}\marg{ratio}}%
   {Specifies a page of the given dimensions positioned at the top left
-   of the stock; see \cs{settrimmedsize}.}
-When your page is smaller than the stock it has to be positioned on
-the stock by specifying the trims to give the desired size and location.
-The macro \cmd{\setpagebl}, which takes the same arguments as 
-\cmd{\settrimmedsize} (see \tref{tab:rectsize} on \pref{tab:rectsize}),
-calculates the trims so that the page is located at the bottom left of
-the stock. Similarly \cmd{\setpageml} and \cmd{\setpagetl} will locate
-the page at the middle left and the top left, respectively, of the stock.
-For instance, if you are using letterpaper stock but want the final trimmed
-page size to be A5, then this will put page area at the bottom left of the
-stock.
-\begin{lcode}
-\pagebv % sets page height and width for A5 paper
-\setpagebl{\paperheight}{\paperwidth}{*}
-...
-\checkandfixthelayout
-\end{lcode}
-The above macros position the page at the left of the stock because usually 
-trimming of the stock is limited to the top, right, and bottom, the left 
-being the spine when the pages are finally assembled. To reposition the page to
-the center of the stock the following will halve the top and edge
-trims.
-\begin{lcode}
-\settrims{0.5\trimtop}{0.5\trimedge}
-...
-\checkandfixthelayout
-\end{lcode}
-
-\begin{syntax}
-\cmd{\setpagetm}\marg{height}\marg{width}\marg{ratio} \\
-\cmd{\setpagetr}\marg{height}\marg{width}\marg{ratio} \\
-\cmd{\setpagemr}\marg{height}\marg{width}\marg{ratio} \\
-\cmd{\setpagebr}\marg{height}\marg{width}\marg{ratio} \\
-\cmd{\setpagebm}\marg{height}\marg{width}\marg{ratio} \\
-\cmd{\setpagecc}\marg{height}\marg{width}\marg{ratio} \\
-\end{syntax}
+    of the stock; see \cs{settrimmedsize}.}
 \glossary(setpagetm)%
   {\cs{setpagetm}\marg{height}\marg{width}\marg{ratio}}%
   {Specifies a page of the given dimensions positioned at the top middle
@@ -4812,31 +4821,72 @@ trims.
 \glossary(setpagecc)%
   {\cs{setpagecc}\marg{height}\marg{width}\marg{ratio}}%
   {Specifies a page of the given dimensions positioned at the center
-   of the stock; see \cs{settrimmedsize}.}
+    of the stock; see \cs{settrimmedsize}.}
+
+  \noindent
+Note: Always remember to combine this with \cmd{\checkandfixthelayout}!
+  
+  
+% When your page is smaller than the stock it has to be positioned on
+% the stock by specifying the trims to give the desired size and location.
+% The macro \cmd{\setpagebl}, which takes the same arguments as 
+% \cmd{\settrimmedsize} (see \tref{tab:rectsize} on \pref{tab:rectsize}),
+% calculates the trims so that the page is located at the bottom left of
+% the stock. Similarly \cmd{\setpageml} and \cmd{\setpagetl} will locate
+% the page at the middle left and the top left, respectively, of the
+% stock.
+
+\goodbreak
+ 
+ \noindent
+For instance, if you are using letterpaper stock but want the final trimmed
+page size to be A5, then this will put page area at the bottom left of the
+stock.
+\begin{lcode}
+% letterpaper stock added via class option  
+\pagebv % sets \paperheight and \paperwidth for A5 paper
+\setpagebl{\paperheight}{\paperwidth}{*}
+...
+\checkandfixthelayout
+\end{lcode}
+The above macros position the page at the left of the stock because usually 
+trimming of the stock is limited to the top, right, and bottom, the left 
+being the spine when the pages are finally assembled.
 
-    The commands \cmd{\setpagetm}, \cmd{\setpagetr}, \cmd{\setpagemr},
-\cmd{\setpagebr}, \cmd{\setpagebm}, \cmd{\setpagecc} are analagous to the
-earlier ones and they set a page at the top middle, top right, middle right,
-bottom right, bottom middle and centered with respect to the stock.
 
+% To reposition the page to
+% the center of the stock the following will halve the top and edge
+% trims.
+% \begin{lcode}
+% \settrims{0.5\trimtop}{0.5\trimedge}
+% ...
+% \checkandfixthelayout
+% \end{lcode}
 
-Remember that after you have finished defining the layout you want you
-have to call \cmd{\checkandfixthelayout} for all the changes to take
-effect.
+% \begin{syntax}
+% \end{syntax}
 
-\fancybreak{}
+%     The commands \cmd{\setpagetm}, \cmd{\setpagetr}, \cmd{\setpagemr},
+% \cmd{\setpagebr}, \cmd{\setpagebm}, \cmd{\setpagecc} are analagous to the
+% earlier ones and they set a page at the top middle, top right, middle right,
+% bottom right, bottom middle and centered with respect to the stock.
+
+
+% Remember that after you have finished defining the layout you want you
+% have to call \cmd{\checkandfixthelayout} for all the changes to take
+% effect.
+
+% \fancybreak{}
 
 In Figure~\ref{fig:setpage} we show the effect of the nine
 \cmd{\setpageXX}. The code used for the examples is similar to the
-code below, and then the result is scaled down.
+code below, and then the result was scaled down.
 
 \begin{lcode}
 \documentclass[showtrims]{memoir}
 \trimLmarks
 \setstocksize{18cm}{15cm}
-\makeatletter
 \setpagebl{16cm}{12cm}{*}
-\makeatother
 \setlrmarginsandblock{15mm}{15mm}{*}
 \setulmarginsandblock{15mm}{15mm}{*}
 \setheadfoot{5mm}{5mm}
@@ -4882,7 +4932,9 @@ code below, and then the result is scaled down.
 
   \caption{Example of the nine \cs{setpageXX} macros for placing
     a trimmed page on the stock. These are all odd pages, under
-    \Lopt{twoside}, even pages will have the left/right trims reversed.}
+    \Lopt{twoside}, even pages will have the left/right trims
+    reversed. The outer fra indicate the stock size. Inside the trim
+    marks hint at where the page is positioned on the stock.}
   \label{fig:setpage}
 \end{figure}
 
@@ -4895,8 +4947,8 @@ code below, and then the result is scaled down.
 
 \svnidlong
 {$Ignore: $}
-{$LastChangedDate: 2019-10-22 14:49:52 +0200 (Tue, 22 Oct 2019) $}
-{$LastChangedRevision: 651 $}
+{$LastChangedDate: 2020-03-25 19:00:55 +0100 (Wed, 25 Mar 2020) $}
+{$LastChangedRevision: 686 $}
 {$LastChangedBy: daleif@math.au.dk $}
 
 
@@ -5885,6 +5937,9 @@ spaced text then you
 may need to use the \Ie{vminipage} environment instead to get the before and
 after spacing correct.
 
+\index{double spacing|)}
+
+
 
 \section{Overfull lines}
 
@@ -15399,8 +15454,8 @@ before the stuff you want to have moved out of, say, a part.
 
 \svnidlong
 {$Ignore: $}
-{$LastChangedDate: 2018-09-06 15:05:23 +0200 (Thu, 06 Sep 2018) $}
-{$LastChangedRevision: 612 $}
+{$LastChangedDate: 2020-03-15 19:48:39 +0100 (Sun, 15 Mar 2020) $}
+{$LastChangedRevision: 682 $}
 {$LastChangedBy: daleif@math.au.dk $}
 
 
@@ -16161,7 +16216,7 @@ commands. This can be done via
 \glossary(setFloatBlockFor)%
 {\cs{setFloatBLockFor}\marg{sectional name}}%
 {Adds \cs{FloatBlock} within the \cs{\meta{section name}} macro.}
-where \meta{sectional name} is \emph{withput} the \cs{}, i.e.\
+where \meta{sectional name} is \emph{without} the \cs{}, i.e.\
 \begin{lcode}
   \setFloatBlockFor{section}
 \end{lcode}
@@ -16401,6 +16456,17 @@ 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).
+
+
+
+
 \section{Caption styling} 
 
 \index{caption!style|(} %)|
@@ -17491,9 +17557,9 @@ following this one were produced by the code shown below.
 namely \ref{sf:1} and \subcaptionref{sf:2}.
 \begin{shadefigure}
 %\centering
-\subbottom[Subfigure 1]{\fbox{SUBFIGURE ONE}\label{sf:1}}
+\subbottom[Subfigure 1\label{sf:1}]{\fbox{SUBFIGURE ONE}}
 \hfill
-\subbottom[Subfigure 2]{\fbox{SUBFIGURE TWO}\label{sf:2}}
+\subbottom[Subfigure 2\label{sf:2}]{\fbox{SUBFIGURE TWO}}
 \caption{Figure with two subfigures} \label{fig:twosubfig}
 \end{shadefigure}
 \begin{lcode}
@@ -17501,9 +17567,9 @@ namely \ref{sf:1} and \subcaptionref{sf:2}.
 namely \ref{sf:1} and \subcaptionref{sf:2}.
 \begin{figure}
 \centering
-\subbottom[Subfigure 1]{\fbox{SUBFIGURE ONE}\label{sf:1}}
+\subbottom[Subfigure 1\label{sf:1}]{\fbox{SUBFIGURE ONE}}
 \hfill
-\subbottom[Subfigure 2]{\fbox{SUBFIGURE TWO}\label{sf:2}}
+\subbottom[Subfigure 2\label{sf:2}]{\fbox{SUBFIGURE TWO}}
 \caption{Figure with two subfigures} \label{fig:twosubfig}
 \end{figure}
 \end{lcode}
@@ -20276,8 +20342,8 @@ illustrate these points.
 
 \svnidlong
 {$Ignore: $}
-{$LastChangedDate: 2019-11-14 18:06:44 +0100 (Thu, 14 Nov 2019) $}
-{$LastChangedRevision: 662 $}
+{$LastChangedDate: 2020-03-25 19:00:55 +0100 (Wed, 25 Mar 2020) $}
+{$LastChangedRevision: 686 $}
 {$LastChangedBy: daleif@math.au.dk $}
 
 \chapter{Page notes} \label{chap:mnotes}
@@ -20292,6 +20358,7 @@ for fixed marginal notes and sidebars.
 
 
 \section{Footnotes}
+\index{footnote|(}
 
 
     A footnote can be considered to be a special kind of float\index{float} 
@@ -26232,9 +26299,9 @@ will require the use of \cmd{\titleref} and so the declaration
 
 \svnidlong
 {$Ignore: $}
-{$LastChangedDate: 2014-03-31 11:34:44 +0200 (Mon, 31 Mar 2014) $}
-{$LastChangedRevision: 480 $}
-{$LastChangedBy: daleif $}
+{$LastChangedDate: 2020-03-25 19:00:55 +0100 (Wed, 25 Mar 2020) $}
+{$LastChangedRevision: 686 $}
+{$LastChangedBy: daleif@math.au.dk $}
 
 
 \LMnote{2010/06/09}{Several \cs{ixfile}'s changed to \cs{pixfile},
@@ -27055,6 +27122,8 @@ Which will be remember'd for a very long time.
 \end{verse}}
 was mentioned on page 37.
 
+\index{index!preparation|)}
+
 
 \subsection{MakeIndex}
 
@@ -27311,7 +27380,7 @@ and \cmd{\alsoname}, whose default definitions are:
 of the \texttt{!}, \texttt{@}, \texttt{|} or \texttt{"} characters there
 is the difficulty of persuading \Lmakeindex\ to ignore the special
 meaning. This is solved by the \texttt{quote} specifier, which is
-normally the \texttt{"} character\index{\" (qs)?\texttt{"} (quote specifier)}. 
+normally the \texttt{"} character\index{\"" (qs)?\texttt{""} (quote specifier)}. 
 The character
 immediately after \texttt{"} is treated as non-special. For example,
 if you needed to index the \texttt{@} and \texttt{!} characters:
@@ -30665,9 +30734,9 @@ of the standard commands needs to be replaced.
 
 \svnidlong
 {$Ignore: $}
-{$LastChangedDate: 2013-04-24 17:14:15 +0200 (Wed, 24 Apr 2013) $}
-{$LastChangedRevision: 442 $}
-{$LastChangedBy: daleif $}
+{$LastChangedDate: 2020-03-25 19:00:55 +0100 (Wed, 25 Mar 2020) $}
+{$LastChangedRevision: 686 $}
+{$LastChangedBy: daleif@math.au.dk $}
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -30936,6 +31005,7 @@ to the page size --- another reason for not switching the layout here.
 \drawmarginparstrue
 \drawparametersfalse
 \drawstock
+\vskip-2pt
 \legend{An illustration of Bringhurst's page layout style when printed
 on US letter paper stock. Also shown are the values used for the
 page layout parameters for this design.} \label{fig:bplayout}
@@ -39763,13 +39833,6 @@ Martin Scharrer,
             \url{/macros/latex/contrib/booklet})
 \end{comment}
 
-%%% keep
-\bibitem[Wil03a]{LAYOUTS}
-  Peter Wilson.
-  \newblock \emph{The layouts package}
-  \newblock November, 2003.
-  \newblock (Available from CTAN in 
-            \CTANurl{/macros/latex/contrib/layouts/})
 
 %%% keep
 \bibitem[Wil03b]{LEDMAC}
@@ -39804,6 +39867,13 @@ Peter Wilson.
             \CTANurl{/macros/latex/contrib/pagenote/})
 
 
+%%% keep
+\bibitem[Wil04c]{LAYOUTS}
+  Peter Wilson.
+  \newblock \emph{The layouts package}
+  \newblock October, 2004.
+  \newblock (Available from CTAN in 
+            \CTANurl{/macros/latex/contrib/layouts/})
 
 
 %%% keep
diff --git a/Master/texmf-dist/doc/latex/memoir/memsty.sty b/Master/texmf-dist/doc/latex/memoir/memsty.sty
index a0427c232b1..b3362e981e7 100644
--- a/Master/texmf-dist/doc/latex/memoir/memsty.sty
+++ b/Master/texmf-dist/doc/latex/memoir/memsty.sty
@@ -92,6 +92,7 @@
   \let\oldprecistoctext\precistoctext
   \renewcommand{\precistoctext}[1]{}
   \let\oldcftchapterfillnum\cftchapterfillnum
+  \let\oldcftchapterformatpnum\cftchapterformatpnum
   \renewcommand*{\changetocdepth}[1]{}
   \setcounter{tocdepth}{0}% chapters
   \renewcommand*{\cftchapterfont}{\hfill\sffamily}
@@ -100,10 +101,16 @@
   \renewcommand*{\cftchapterafterpnum}{\cftparfillskip}
 %%  \setpnumwidth{0em}
 %%  \setpnumwidth{1.5em}
-  \renewcommand*{\cftchapterfillnum}[1]{%
-    {\cftchapterleader}\nobreak
-    \hbox to 1.5em{\cftchapterpagefont ##1\hfil}\cftchapterafterpnum\par}
+%  \renewcommand*{\cftchapterfillnum}[1]{%
+%    {\cftchapterleader}\nobreak
+%    \hbox to 2.5em{\cftchapterpagefont
+%    ##1\hfil}\cftchapterafterpnum\par}
+  % make the box left aligned not right aliged
+  \renewcommand*{\cftchapterformatpnum}[1]{%
+    \cftchapterformatpnumhook{##1}%
+    \hb@xt@\@pnumwidth{\cftchapterpagefont ##1\hfil}}
   \setrmarg{0.3\textwidth}
+%  \setpnumwidth{6em}
   \setlength{\unitlength}{\@tocrmarg}
   \addtolength{\unitlength}{1.5em}
   \let\oldcftpartformatpnum\cftpartformatpnum
@@ -141,6 +148,7 @@
   \let\changetocdepth\oldchangetocdepth
   \let\precistoctext\oldprecistoctext
   \let\cftchapterfillnum\oldcftchapterfillnum
+  \let\cftchapterformatpnum\oldcftchapterformatpnum
   \addtodef{\cftchapterbreak}{\par}{}
   \renewcommand*{\cftchapterfont}{\normalfont\sffamily}
   \renewcommand*{\cftchapterleader}{\sffamily\cftdotfill{\cftchapterdotsep}}
@@ -1025,6 +1033,7 @@ chapterstyle. It is one of several styles that come as part of the
 \settypeblocksize{7.75in}{33pc}{*}
 \setulmargins{4cm}{*}{*}
 \setlrmargins{1.25in}{*}{*}
+%\setlrmargins{*}{*}{1}
 \setmarginnotes{17pt}{51pt}{\onelineskip}
 \setheadfoot{\onelineskip}{2\onelineskip}
 \setheaderspaces{*}{2\onelineskip}{*}
@@ -1052,8 +1061,8 @@ it to use the new width for the  margin par}
 
 %%%%% Pavlic `fix' for index
 
-\let\original@wrindexm@m\@wrindexm@m
-\def\@wrindexm@m{\catcode`\ =10 \original@wrindexm@m}
+%\let\original@wrindexm@m\@wrindexm@m
+%\def\@wrindexm@m{\catcode`\ =10 \original@wrindexm@m}
 
 % for letter group bookmarks for glossary items
 \newcommand\doglobookmark[1]{%
diff --git a/Master/texmf-dist/source/latex/memoir/memoir.dtx b/Master/texmf-dist/source/latex/memoir/memoir.dtx
index 0139b5c4bd3..1d45b947278 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{31140}
+% \CheckSum{31149}
 %
 % \changes{v0.1}{2001/05/20}{First public alpha release}
 % \changes{v0.2}{2001/06/03}{First beta release}
@@ -120,7 +120,8 @@
 % \changes{v3.7i}{2019/11/15}{Maintenance, various edits}
 % \changes{v3.7j}{2019/11/21}{Typo in embeded textcase, now that it is
 %                             inside \cs{IfFileExists} \# needs to be doubled}
-% 
+% \changes{v3.7k}{2020/03/25}{Maintenance} 
+%                             
 % \def\dtxfile{memoir.dtx}
 %
 % \def\fileversion{v0.1}  \def\filedate{2001/05/20}
@@ -178,6 +179,7 @@
 % \def\fileversion{v3.7h}          \def\filedate{2018/12/12} 
 % \def\fileversion{v3.7i}          \def\filedate{2019/11/15} 
 % \def\fileversion{v3.7j}          \def\filedate{2019/11/21} 
+% \def\fileversion{v3.7k}          \def\filedate{2020/03/25} 
 % \title{The LaTeX \Lpack{memoir} class for configurable book 
 %        typesetting: Source code\thanks{This
 %        file (\texttt{\dtxfile}) has version number \fileversion, last revised
@@ -408,11 +410,11 @@
 %    Announce the name, option files and version for LaTeX2e files:
 %    \begin{macrocode}
 %<class>\ProvidesClass{memoir}%
-%<class>  [2019/11/21 v3.7j configurable book, report, article document class]
+%<class>  [2020/03/25 v3.7k 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.7j, 2019/11/21}
+%<class>\newcommand\memversion{v3.7k, 2020/03/25}
 %<9pt>\ProvidesFile{mem9.clo}%
 %<9pt>              [2008/01/30 v0.4 memoir class 9pt size option]
 %<10pt>\ProvidesFile{mem10.clo}%
@@ -5245,6 +5247,11 @@
 }
 
 \AtBeginDocument{\mem@fixpagelayout}
+%    \end{macrocode}
+% 
+% \changes{v3.7k}{2020/03/25}{Added a link to \cs{mem@fixpagelayout}}
+%    \begin{macrocode}
+\let\refixpagelayout\mem@fixpagelayout
 
 %    \end{macrocode}
 % \end{macro}
@@ -5474,6 +5481,7 @@
 % at the top right, middle right, bottom right, bottom middle, and centered.
 % \changes{v1.6180339c}{2008/12/26}{Added \cs{setpagetr}, \cs{setpagemr}, \cs{setpagebr},
 %                       \cs{setpagebm} and \cs{setpagecc}}
+% \changes{v3.7k}{2020/03/15}{Added \cs{setpagemm} as an alias to \cs{setpagecc}}
 %    \begin{macrocode}
 \newcommand*{\setpagetr}[3]{%
   \settrimmedsize{#1}{#2}{#3}%
@@ -5499,7 +5507,8 @@
     \advance\trimtop -0.5\trimtop
   \trimedge=\stockwidth \advance\trimedge -\paperwidth
     \advance\trimedge -0.5\trimedge}
-
+\let\setpagemm\setpagecc
+  
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -18316,39 +18325,34 @@
 %
 % \changes{v3.7f}{2016/05/16}{changed the order so the \cs{ifx} lines
 % come first. From booktabs 2016/04/27 v1.618033}
-% Now we work out, by a very nasty hack, if we're within a
-%  \texttt{longtable}. It's easy if \cs{longtable} isn't even defined: then we
-%  can't be. But it is not enough just to check if \texttt{longtable} is
+% \changes{v3.7k}{2020/02/06}{changed to be in sync with booktabs
+% datad 2020/01/12. The comments are a carbon copy from booktabs.dtx}
+%  Now we work out, by a very nasty hack, if we're within a
+%  \verb|longtable|. It's easy if \verb=\longtable= isn't even defined: then we
+%  can't be. But it is not enough just to check if \verb=longtable= is
 %  loaded --- we might be within an ordinary table rather than a
-%  longtable. So we look to see if \cs{hline} has been re-defined
+%  longtable. So we look to see if \verb=\hline= has been re-defined
 %  from its \LaTeX\ definition to be the same as
-%  \cs{LT@hline}. (Longtable currently does this redefinition when it opens a
-%  \texttt{longtable} environment, but not globally, so it is
+%  \verb=\LT@hline=. (Longtable currently does this redefinition when it opens a
+%  \verb=longtable= environment, but not globally, so it is
 %  cleared it when the environment closes.) Another
-%  package could potentially do this! And \texttt{longtable} might change the
+%  package could potentially do this! And \verb=longtable= might change the
 %  way it implements this! So, it is not entirely safe, but I have
 %  found no better way so far.
 %
-%  We set up \cs{@BTswitch} to call \cs{@BTnormal} or \cs{@BLTrule}, as
+%  We set up \verb=\@BTswitch= to call \verb=\@BTnormal= or \verb=\@BLTrule=, as
 %  appropriate, then call it.
 %    \begin{macrocode}
-  \ifx\longtable\undefined 
+  \ifx\longtable\undefined
     \let\@BTswitch\@BTnormal
   \else\ifx\hline\LT@hline
+    \nobreak
     \let\@BTswitch\@BLTrule
   \else
+    \let\@BTswitch\@BTnormal
+  \fi\fi
 %    \end{macrocode}
-% \changes{v3.7i}{2019/10/21}{Added this extra if construction to
-% bring the class back into line with the latest booktabs changes, now
-% matching booktabs v1.6180339}
-%    \begin{macrocode}
-    \ifx\xltabular\undefined  
-      \let\@BTswitch\@BTnormal
-    \else
-      \let\@BTswitch\@BLTrule
-  \fi\fi\fi
-%    \end{macrocode}
-% On with the code
+% Call \verb=\@BTswitch= at end of macro
 %    \begin{macrocode}
   \global\@thisrulewidth=#1\relax
 %    \end{macrocode}
@@ -21080,11 +21084,15 @@
 % note that the placement of the \Lpack{showkeys} label, might be a
 % little strange.
 % \changes{v3.7g}{2018/02/28}{added}
+% \changes{v3.7k}{2020/02/06}{Added a check on \cs{SK@}, if not
+% defined showkeys is running under final mode}
 %    \begin{macrocode}
-  \@ifpackageloaded{showkeys}{%
-    \renewcommand\sf@@memsub@label@hook[1]{%
-      \SK@\SK@@label{#1}%
-    }
+   \@ifpackageloaded{showkeys}{%
+     \ifdefined\SK@\relax 
+       \renewcommand\sf@@memsub@label@hook[1]{%
+        \SK@\SK@@label{#1}%
+      }
+     \fi 
   }{}
 } % end AtBeginDocument
 
@@ -25575,12 +25583,18 @@
 % \verb?\glosaryentry{key@{data}}{num}? \\
 % (note where all the braces are).
 %
+% 
+% \changes{v3.7k}{2020/02/24}{Rewritten to use
+% \cs{immediate@protected@write} instead, otherwise UTF8 may get
+% written as latin1}
 %    \begin{macrocode}
 \newcommand{\memwritetoglo}[5]{\endgroup}
 \newcommand{\@ctualm@mwritetoglo}[5]{%
-  \immediate\write \memglofile{\string\glossaryentry{#1\@nameuse{memglsact\m@mgf}
-                    {\string\memgloterm{#2}}{\string\memglodesc{#3}}
-                    {\string\memgloref{#4}}\@nameuse{memglsnf\m@mgf}}{#5}}%
+  %\immediate\write \memglofile%
+  \immediate@protected@write\memglofile{}%
+        {\string\glossaryentry{#1\@nameuse{memglsact\m@mgf}
+        {\string\memgloterm{#2}}{\string\memglodesc{#3}}
+        {\string\memgloref{#4}}\@nameuse{memglsnf\m@mgf}}{#5}}%
   \endgroup}
 \AtBeginDocument{%
   \let\memwritetoglo\@ctualm@mwritetoglo}
diff --git a/Master/texmf-dist/source/latex/memoir/memoir.ins b/Master/texmf-dist/source/latex/memoir/memoir.ins
index 9ab38716105..51d5199da70 100644
--- a/Master/texmf-dist/source/latex/memoir/memoir.ins
+++ b/Master/texmf-dist/source/latex/memoir/memoir.ins
@@ -58,29 +58,29 @@
 
 \Msg{*** Generating the LaTeX2e document class files ***}
 
-\generateFile{memoir.cls}{t}{\from{memoir.dtx}{class}}
+\generateFile{memoir.cls}{n}{\from{memoir.dtx}{class}}
 
 
 \Msg{*** Generating the LaTeX2e document class option files ***}
 
-\generateFile{mem9.clo}{t}{\from{memoir.dtx}{9pt}}
-\generateFile{mem10.clo}{t}{\from{memoir.dtx}{10pt}}
-\generateFile{mem11.clo}{t}{\from{memoir.dtx}{11pt}}
-\generateFile{mem12.clo}{t}{\from{memoir.dtx}{12pt}}
-\generateFile{mem14.clo}{t}{\from{memoir.dtx}{14pt}}
-\generateFile{mem17.clo}{t}{\from{memoir.dtx}{17pt}}
-\generateFile{mem20.clo}{t}{\from{memoir.dtx}{20pt}}
-\generateFile{mem25.clo}{t}{\from{memoir.dtx}{25pt}}
-\generateFile{mem30.clo}{t}{\from{memoir.dtx}{30pt}}
-\generateFile{mem36.clo}{t}{\from{memoir.dtx}{36pt}}
-\generateFile{mem48.clo}{t}{\from{memoir.dtx}{48pt}}
-\generateFile{mem60.clo}{t}{\from{memoir.dtx}{60pt}}
+\generateFile{mem9.clo}{n}{\from{memoir.dtx}{9pt}}
+\generateFile{mem10.clo}{n}{\from{memoir.dtx}{10pt}}
+\generateFile{mem11.clo}{n}{\from{memoir.dtx}{11pt}}
+\generateFile{mem12.clo}{n}{\from{memoir.dtx}{12pt}}
+\generateFile{mem14.clo}{n}{\from{memoir.dtx}{14pt}}
+\generateFile{mem17.clo}{n}{\from{memoir.dtx}{17pt}}
+\generateFile{mem20.clo}{n}{\from{memoir.dtx}{20pt}}
+\generateFile{mem25.clo}{n}{\from{memoir.dtx}{25pt}}
+\generateFile{mem30.clo}{n}{\from{memoir.dtx}{30pt}}
+\generateFile{mem36.clo}{n}{\from{memoir.dtx}{36pt}}
+\generateFile{mem48.clo}{n}{\from{memoir.dtx}{48pt}}
+\generateFile{mem60.clo}{n}{\from{memoir.dtx}{60pt}}
 
 \Msg{*** Generating the MakeIndex configuration files ***}
 
 %%%%\usepreamble\empty
 \usepostamble\empty
-\generateFile{basic.gst}{t}{\from{memoir.dtx}{gst}}
+\generateFile{basic.gst}{n}{\from{memoir.dtx}{gst}}
 
 \Msg{***********************************************************}
 \Msg{*}
diff --git a/Master/texmf-dist/source/latex/memoir/mempatch.ins b/Master/texmf-dist/source/latex/memoir/mempatch.ins
index 39c858e3d78..a42ac89c6cd 100644
--- a/Master/texmf-dist/source/latex/memoir/mempatch.ins
+++ b/Master/texmf-dist/source/latex/memoir/mempatch.ins
@@ -58,7 +58,7 @@
 
 \Msg{*** Generating the LaTeX2e package files ***}
 
-\generateFile{memhfixc.sty}{t}{\from{mempatch.dtx}{hyper}}
+\generateFile{memhfixc.sty}{n}{\from{mempatch.dtx}{hyper}}
 %\generateFile{mempatch.sty}{t}{\from{mempatch.dtx}{patch}}
 
 \Msg{***********************************************************}
diff --git a/Master/texmf-dist/tex/latex/memoir/memoir.cls b/Master/texmf-dist/tex/latex/memoir/memoir.cls
index c351805fbc4..5f8c4a9dcb4 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}%
-  [2019/11/21 v3.7j configurable book, report, article document class]
-\newcommand\memversion{v3.7j, 2019/11/21}
+  [2020/03/25 v3.7k configurable book, report, article document class]
+\newcommand\memversion{v3.7k, 2020/03/25}
 \newcommand*{\@ptsize}{}
 \newcommand*{\@memptsize}{}
 \newlength{\onelineskip}
@@ -1377,6 +1377,7 @@
 }
 
 \AtBeginDocument{\mem@fixpagelayout}
+\let\refixpagelayout\mem@fixpagelayout
 
 \newcommand*{\fixpdflayout}{%
   \ClassWarning{memoir}{As of 2018, \string\fixpdflayout\ is no longer used}
@@ -1488,6 +1489,7 @@
     \advance\trimtop -0.5\trimtop
   \trimedge=\stockwidth \advance\trimedge -\paperwidth
     \advance\trimedge -0.5\trimedge}
+\let\setpagemm\setpagecc
 
 \setcounter{topnumber}{3}
 \renewcommand{\topfraction}{.85}
@@ -6016,13 +6018,11 @@
   \ifx\longtable\undefined
     \let\@BTswitch\@BTnormal
   \else\ifx\hline\LT@hline
+    \nobreak
     \let\@BTswitch\@BLTrule
   \else
-    \ifx\xltabular\undefined
-      \let\@BTswitch\@BTnormal
-    \else
-      \let\@BTswitch\@BLTrule
-  \fi\fi\fi
+    \let\@BTswitch\@BTnormal
+  \fi\fi
   \global\@thisrulewidth=#1\relax
   \ifnum\@thisruleclass=\tw@\vskip\@aboverulesep\else
   \ifnum\@lastruleclass=\z@\vskip\@aboverulesep\else
@@ -7134,10 +7134,12 @@
     \@esphack}
     }{}%
   }% end no nameref
-  \@ifpackageloaded{showkeys}{%
-    \renewcommand\sf@@memsub@label@hook[1]{%
-      \SK@\SK@@label{#1}%
-    }
+   \@ifpackageloaded{showkeys}{%
+     \ifdefined\SK@\relax
+       \renewcommand\sf@@memsub@label@hook[1]{%
+        \SK@\SK@@label{#1}%
+      }
+     \fi
   }{}
 } % end AtBeginDocument
 
@@ -8792,9 +8794,11 @@
 
 \newcommand{\memwritetoglo}[5]{\endgroup}
 \newcommand{\@ctualm@mwritetoglo}[5]{%
-  \immediate\write \memglofile{\string\glossaryentry{#1\@nameuse{memglsact\m@mgf}
-                    {\string\memgloterm{#2}}{\string\memglodesc{#3}}
-                    {\string\memgloref{#4}}\@nameuse{memglsnf\m@mgf}}{#5}}%
+  %\immediate\write \memglofile%
+  \immediate@protected@write\memglofile{}%
+        {\string\glossaryentry{#1\@nameuse{memglsact\m@mgf}
+        {\string\memgloterm{#2}}{\string\memglodesc{#3}}
+        {\string\memgloref{#4}}\@nameuse{memglsnf\m@mgf}}{#5}}%
   \endgroup}
 \AtBeginDocument{%
   \let\memwritetoglo\@ctualm@mwritetoglo}