memoir (5apr18)

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

4 files changed, 392 insertions, 113 deletions

diff --git a/Master/texmf-dist/doc/latex/memoir/README b/Master/texmf-dist/doc/latex/memoir/README
index fb4074c8af1..b94bb579f52 100644
--- a/Master/texmf-dist/doc/latex/memoir/README
+++ b/Master/texmf-dist/doc/latex/memoir/README
@@ -36,6 +36,62 @@ o Backmatter:
     Bibliography, indexes                               ~  50 pages
 
 
+Changed (2018/04/04)
+
+o memoir v3.7g
+
+-- is now using colorlinks hyperref option in the manual. We switched
+   it off year ago because some users were printing the
+   manual. Nowadays most is reading the manual online, and thus
+   colorlinks brings a better reading experience.
+-- under hyperref \index{... |)} now also adds `|)hyperpage` to the
+   idx file. This is needed for xindy to process the idx
+   file. Makeindex does not seem to mind. Reported via private email.
+-- added examples of the nine much overlooked \setpageXX macros, these can
+   be used instead of \settrimmedsize and \settrims to place a trimmed
+   page on the stock in nine often used configurations.
+-- the way the class writes the pagesize to the output have been
+   rewritten and should now work with lualatex. Therefore we no longer
+   auto load the luatex85 package. We have also canceled \fixpdflayout
+   and \fixdvipslayout (they now just emit a warning)
+-- the class will truncate certain layout lengths to a whole number of
+   point (e.g. \textwidth). This can now be disabled using the
+   fullptlayout class option, reported via
+   https://tex.stackexchange.com/q/372381/3929 
+-- in as of the release of TeXLive 2018 \counterwithin/out will be
+   added to the LaTeX kernel, we changed our version to use
+   \providecommand accordingly 
+-- removed loading the mempatch.sty package, it has been empty for
+   many years
+-- now requiring ifpdf, ifetex, ifxetex and ifluatex packages to exist.
+   Earlier we attempted to emulate them if missing, this does not make
+   sense any more
+-- started adding "Recommended alternative" blocks to the
+   manual. These are just mentioning more modern alternatives to what
+   ever is mentioned in the manual. Fx using tcolorbox instead of the
+   buildin framed env. Suggestions are welcome (by email)
+-- added \titlingpageend{}{} which can be used to set the clearing
+   code at the end of the titlingpage env.
+-- clearified the interaction between 14pt and extrafontsizes options
+-- updating the embedded array and tabularx copies fixes
+   https://tex.stackexchange.com/q/411862/3929 (an issue with bidi)
+-- dumped the emulated date for delarray to 2014/10/28 (the code,
+   after the array update) is the same
+-- fixed a bad interaction in \subbottom when the showkeys and
+   hyperref is loaded. Reported via
+   https://tex.stackexchange.com/q/374301/3929 
+-- removed unnecessary \phansomsection from the thebiblipgraphy
+   setup. Reported via https://tex.stackexchange.com/a/396303/3929
+-- added \nobreak to \@vslnumleft and @vslnumright (internal to
+   verse), reported via https://tex.stackexchange.com/a/415939/3929
+-- added \phansomsection to \startnoteentrystart, otherwise \label in
+   \pagenote does not work correctly.   
+-- fixed a typo in \@listii where \itemsep is not pointing towards
+   \itemsepii, similar to the other \@listK macros. 
+-- fixed problem with \setfloatadjustment, font size changes did not
+   come through
+
+
 Changed (2016/05/16)
 
 o memoir v3.7f
@@ -343,7 +399,6 @@ mem30.clo
 mem36.clo
 mem48.clo
 mem60.clo
-mempatch.sty
 memhfixc.sty
 basic.gst.
 ------------------------------------------------------------------- 
@@ -353,7 +408,6 @@ basic.gst.
 README           (this file)
 memoir.(dtx|ins)   Class source and installation files
 mempatch.(dtx|ins) Source and installation for patch files
-mempatch.sty       Patch file for memoir class
 memhfixc.sty       Patch file for hyperref package
 memman.tex         LaTeX source for the user manual
                     (requires the memoir class and the alltt,
@@ -381,8 +435,8 @@ o run: latex memoir.ins (which will generate memoir.cls,
 o Move memoir.cls, the mem*.clo files and any mem*.sty file to locations 
   where LaTeX will find them (typically in a local texmf tree at 
   /tex/latex/memoir) and refresh the file database. 
-  See the FAQ on CTAN at help/uk-tex-faq
-  or http://www.tug.ac.uk/faq for more information on this.
+  See the FAQ on CTAN at help
+  or http://www.tex.ac.uk/ for more information on this.
 
 However, it is alway recommended that you update your LaTeX
 installation, instead of attempting to manually install a Package or
diff --git a/Master/texmf-dist/doc/latex/memoir/memman.pdf b/Master/texmf-dist/doc/latex/memoir/memman.pdf
index 351c1aa914a..2528978dcff 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 4672e816f32..a86e15feaf9 100644
--- a/Master/texmf-dist/doc/latex/memoir/memman.tex
+++ b/Master/texmf-dist/doc/latex/memoir/memman.tex
@@ -2167,9 +2167,9 @@ an em, often a quad is 1em.
 
 \svnidlong
 {$Ignore: $}
-{$LastChangedDate: 2015-08-21 12:00:47 +0200 (Fri, 21 Aug 2015) $}
-{$LastChangedRevision: 544 $}
-{$LastChangedBy: daleif $}
+{$LastChangedDate: 2018-03-09 13:41:30 +0100 (Fri, 09 Mar 2018) $}
+{$LastChangedRevision: 587 $}
+{$LastChangedBy: daleif@math.au.dk $}
 
 \chapter{Starting off} \label{chap:starting}
 
@@ -2433,8 +2433,10 @@ offers a wider range of type sizes\index{type size} than usual. These are:\index
 \glossary(12ptco)%
   {\Popt{12pt}}%
   {Class option for a 12pt body font.}
-\item[\Lopt{14pt}] for 14pt as the normal type size
-\glossary(14ptco)%
+\item[\Lopt{14pt}] for 14pt as the normal type size\footnote{Note that
+    for \Lopt{14pt}, \cs{huge}, \cs{Huge} and \cs{HUGE} will be the
+    same as \cs{LARGE}, unless the \Lopt{extrafontsizes} option is
+    also is activated.}  \glossary(14ptco)%
   {\Popt{14pt}}%
   {Class option for a 14pt body font.}
 \item[\Lopt{17pt}] for 17pt as the normal type size
@@ -2469,7 +2471,14 @@ offers a wider range of type sizes\index{type size} than usual. These are:\index
 \glossary(*ptco)%
   {\Popt{*pt}}%
   {Class option for an author-defined size for the body font.}
-\item[\Lopt{extrafontsizes}] Using scalable fonts that can exceed 25pt.
+\item[\Lopt{extrafontsizes}] Using scalable fonts that can exceed
+  25pt.
+
+  \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
+  \Lopt{14pt}, there sizes above \cs{LARGE} will just be unavailable
+  unless \Lopt{extrafontsizes} is used.}
 \glossary(extrafontsizes)%
   {\Popt{extrafontsizes}}%
   {Class option for using scalable fonts that can exceed 25pt.}
@@ -2652,7 +2661,7 @@ as an example of what must be specified in your \file{clo} file.
   {Class option for printing trimming marks.}
 
 \end{itemize}
-
+%
     The defaults among the printing options\index{default!printing options} 
 are \Lopt{twoside}, \Lopt{onecolumn}, \Lopt{openright}, and \Lopt{final}.
 
@@ -2687,7 +2696,8 @@ are \Lopt{twoside}, \Lopt{onecolumn}, \Lopt{openright}, and \Lopt{final}.
 
 \item[\Lopt{article}]\index{class options!article} 
   typesetting \emph{simulates} the \Lclass{article} class,
-  but the \cmd{\chapter} command is not disabled.
+  but the \cmd{\chapter} command is not disabled, basically
+  \cmd{\chapter} will behave as if it was \cmd{\section}.
   Chapters\index{chapter} do not start a new page and chapter
   headings\index{heading!chapter} are typeset 
   like a section heading\index{heading!sections}. The numbering of 
@@ -2706,9 +2716,17 @@ are \Lopt{twoside}, \Lopt{onecolumn}, \Lopt{openright}, and \Lopt{final}.
   {\Popt{oldfontcommands}}%
   {Class option for permitting obsolete, deprecated font commands.}
 
-\end{itemize}
 
-    None of these options are defaulted.
+\item[\Lopt{fullptlayout}]\index{class options!layout truncation} 
+  disable point trunction of certain layout lengths, for example
+  \cmd{\textwidth}. The default is to round these of to a whole number
+  of points, this option disables this feature.
+  \glossary(fullptlayout)%
+  {\Popt{fullptlayout}}%
+  {Class option to disable point truncation of certain layout lengths.}
+\end{itemize}
+%
+None of these options are defaulted.
 
 \section{Remarks}
 
@@ -2777,8 +2795,8 @@ want to put \cmd{\raggedbottom} in the preamble\index{preamble}.
 
 \svnidlong
 {$Ignore: $}
-{$LastChangedDate: 2015-11-23 09:32:30 +0100 (Mon, 23 Nov 2015) $}
-{$LastChangedRevision: 547 $}
+{$LastChangedDate: 2018-03-12 11:00:16 +0100 (Mon, 12 Mar 2018) $}
+{$LastChangedRevision: 589 $}
 {$LastChangedBy: daleif@math.au.dk $}
 
 \chapter{Laying out the page} \label{chap:layingpage}
@@ -3112,7 +3130,7 @@ giving the desired page size. Taking a design where, say, the page
 is 90\% of the stock size it's easy to get \ltx\ to do the calculation:
 \begin{lcode}
 \setlength{\trimtop}{\stockheight}    % \trimtop = \stockheight
-\addtolengh{\trimtop}{-\paperheight}  %          - \paperheight
+\addtolength{\trimtop}{-\paperheight}  %          - \paperheight
 \setlength{\trimedge}{\stockwidth}    % \trimedge = \stockwidth
 \addtolength{\trimedge}{-\paperwidth} %           - \paperwidth
 \end{lcode}
@@ -4235,59 +4253,71 @@ is like this (\Lopt{twoside} is the default class option):
 ...
 \end{lcode}
 
-\section{Printing and viewing}
-  
-    When \pdfltx\ is used to generate a \pixpdf\ version of a \Pclass{memoir}
-document some special setup must be done.
-\begin{syntax}
-\cmd{\fixpdflayout} \\
-\end{syntax}
-\glossary(fixpdflayout)%
-  {\cs{fixpdflayout}}%
-  {Sets up page size information for \pdfltx.}
-The macro \cmd{\fixpdflayout}\index{page layout!PDF} is automatically called after the preamble when
-\pdfltx{} is used to generate \pixpdf. The default definition is effectively:
-\begin{lcode}
-\newcommand*{\fixpdflayout}{
-  \pdfpageheight=\the\stockheight
-  \pdfpagewidth=\the\stockwidth
-  \ifxetex\else
-  \ifdim\pdforigin=0pt\pdforigin=1in\fi
-  \ifdim\pdfhorigin=0pt\pdfhorigin=1in\fi
-  \fi}
-\end{lcode}
-The first settings (\verb?\pdfpage...?) ensure that \pdfltx{} knows
-the size of the physical sheet\indextwo{stock}{size} for printing. 
-The \verb?\...origin? settings
-set the \pdf{} origin per the \tx\ origin, provided that their values are
-0pt. If you have set the origin values yourself, either in a \pdfltx{} 
-configuration\index{configuration file} file or earlier in the preamble, 
-the \cmd{\fixpdflayout}
-macro will not alter them (if you need an origin value to be 0 then
-set it to 1sp, which is visually indistinguishable from 0pt).
+%\section{Printing and viewing}
+
+\section{Emitting the page size}
+\label{sec:emitting-page-size}
+
+At the start of the document the class will automatically emit the
+chosen stocksize to the output format (DVI or PDF).\footnote{In
+  earlier versions we had macros \cs{fixpdflayout} and
+  \cs{fixdvipslayout} that held some of the code needed to emit this
+  data. With the newer engines like LuaLaTeX, this became unfeasible
+  thus they we discontinued (their use now emit a warning).}
 
-\begin{syntax}
-\cmd{\fixdvipslayout} \\
-\end{syntax}
-\glossary(fixdvipslayout)%
-  {\cs{fixdvipslayout}}%
-  {Sets up page size information for dvi processors.}
 
-The macro \cmd{\fixdvipslayout}\index{page layout!dvips} is automatically 
-called after the preamble 
-when \pixpdf{} output is not being produced. It provides the \Lprog{dvips} 
-processor
-with information about the stock\indextwo{stock}{size} size, 
-which a viewer or printer may use.
+%     When \pdfltx\ is used to generate a \pixpdf\ version of a \Pclass{memoir}
+% document some special setup must be done.
+% \begin{syntax}
+% \cmd{\fixpdflayout} \\
+% \end{syntax}
+% \glossary(fixpdflayout)%
+%   {\cs{fixpdflayout}}%
+%   {Sets up page size information for \pdfltx.}
+% The macro \cmd{\fixpdflayout}\index{page layout!PDF} is
+% \emph{automatically}\footnote{That is you do not need to.} called after the preamble when
+% \pdfltx{} is used to generate \pixpdf. The default definition is effectively:
+% \begin{lcode}
+% \newcommand*{\fixpdflayout}{
+%   \pdfpageheight=\the\stockheight
+%   \pdfpagewidth=\the\stockwidth
+%   \ifxetex\else
+%   \ifdim\pdforigin=0pt\pdforigin=1in\fi
+%   \ifdim\pdfhorigin=0pt\pdfhorigin=1in\fi
+%   \fi}
+% \end{lcode}
+% The first settings (\verb?\pdfpage...?) ensure that \pdfltx{} knows
+% the size of the physical sheet\indextwo{stock}{size} for printing. 
+% The \verb?\...origin? settings
+% set the \pdf{} origin per the \tx\ origin, provided that their values are
+% 0pt. If you have set the origin values yourself, either in a \pdfltx{} 
+% configuration\index{configuration file} file or earlier in the preamble, 
+% the \cmd{\fixpdflayout}
+% macro will not alter them (if you need an origin value to be 0 then
+% set it to 1sp, which is visually indistinguishable from 0pt).
+
+% \begin{syntax}
+% \cmd{\fixdvipslayout} \\
+% \end{syntax}
+% \glossary(fixdvipslayout)%
+%   {\cs{fixdvipslayout}}%
+%   {Sets up page size information for dvi processors.}
 
-The macros \cmd{\fixpdflayout} and \cmd{\fixdvipslayout} are
-automatically executed at the start of the document, in combinations
-that make the most sense (i.e., \cmd{\fixpdflayout} when using XeLaTeX
-or \pdfltx{} and \cmd{fixdvipslayout} for the rest.
+% The macro \cmd{\fixdvipslayout}\index{page layout!dvips} is automatically 
+% called after the preamble 
+% when \pixpdf{} output is not being produced. It provides the \Lprog{dvips} 
+% processor
+% with information about the stock\indextwo{stock}{size} size, 
+% which a viewer or printer may use.
 
+% The macros \cmd{\fixpdflayout} and \cmd{\fixdvipslayout} are
+% automatically executed at the start of the document, in combinations
+% that make the most sense (i.e., \cmd{\fixpdflayout} when using XeLaTeX
+% or \pdfltx{} and \cmd{fixdvipslayout} for the rest.
 
-\LMnote{2015/02/23}{Next lines outcommented as I do not feel that this
-  kind of examples below in a manual like this}
+
+% \LMnote{2015/02/23}{Next lines outcommented as I do not feel that this
+%   kind of examples belong in a manual like this}
 
 %     With a \Lopt{landscape} document and using the processing route
 % \verb?latex -> dvips? the resulting \file{ps} \pscript{} file may appear 
@@ -4684,6 +4714,71 @@ 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.
+
+\begin{lcode}
+\documentclass[showtrims]{memoir}
+\trimLmarks
+\setstocksize{18cm}{15cm}
+\makeatletter
+\setpagebl{16cm}{12cm}{*}
+\makeatother
+\setlrmarginsandblock{15mm}{15mm}{*}
+\setulmarginsandblock{15mm}{15mm}{*}
+\setheadfoot{5mm}{5mm}
+\checkandfixthelayout[fixed]
+\pagestyle{empty}
+\AtBeginDocument{\LARGE}
+\begin{document}
+\begin{vplace}
+  \centering
+  \cs{setpagebl}\marg{height}\marg{width}\marg{ratio}
+\end{vplace}
+\end{document}
+\end{lcode}
+
+
+
+
+\begin{figure}[htbp]
+  \centering
+  \fboxsep=0pt
+  \fbox{\includegraphics[page=1,scale=0.3]{setpage-example.pdf}}
+  \hfill
+  \fbox{\includegraphics[page=2,scale=0.3]{setpage-example.pdf}}
+  \hfill
+  \fbox{\includegraphics[page=3,scale=0.3]{setpage-example.pdf}}
+
+  \medskip
+  
+  \fbox{\includegraphics[page=4,scale=0.3]{setpage-example.pdf}}
+  \hfill
+  \fbox{\includegraphics[page=5,scale=0.3]{setpage-example.pdf}}
+  \hfill
+  \fbox{\includegraphics[page=6,scale=0.3]{setpage-example.pdf}}
+
+  \medskip
+
+  
+  \fbox{\includegraphics[page=7,scale=0.3]{setpage-example.pdf}}
+  \hfill
+  \fbox{\includegraphics[page=8,scale=0.3]{setpage-example.pdf}}
+  \hfill
+  \fbox{\includegraphics[page=9,scale=0.3]{setpage-example.pdf}}
+
+  \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.}
+  \label{fig:setpage}
+\end{figure}
+
+
+
+
 
 %#% extend
 %#% extstart include text-and-fonts.tex
@@ -6004,9 +6099,9 @@ citations using a non-nummeric style.
 
 \svnidlong
 {$Ignore: $}
-{$LastChangedDate: 2013-04-24 17:14:15 +0200 (Wed, 24 Apr 2013) $}
-{$LastChangedRevision: 442 $}
-{$LastChangedBy: daleif $}
+{$LastChangedDate: 2018-03-06 15:58:01 +0100 (Tue, 06 Mar 2018) $}
+{$LastChangedRevision: 584 $}
+{$LastChangedBy: daleif@math.au.dk $}
 
 
 \chapter{Titles}
@@ -6339,15 +6434,21 @@ in the argument to the new \cmd{\published} command.
 
 \begin{syntax}
 \senv{titlingpage} text \eenv{titlingpage} \\
-\senv{titlingpage*} text \eenv{titlingpage*} 
+\senv{titlingpage*} text \eenv{titlingpage*}\\
+\cmd{\titlingpageend}\marg{twoside code}\marg{oneside code} 
 \end{syntax}
 \glossary(titlingpage)%
   {\senv{titlingpage}}%
   {Environment for a title page, resets the page counter to 1 after it}
 \glossary(titlingpage*)%
   {\senv{titlingpage*}}%
-  {Like \senv{titlingpage}, but does not reset the page counter.}
-   When one of the standard classes is used with the \Lopt{titlepage}
+  {Like \senv{titlingpage}, but does not reset the page counter.}%
+\glossary(titlingpageend)%
+  {\cs{titlingpageend}}%
+  {Can be used to set what kind of page clearing is issued at the end
+    of a titling page. The default for the two args are
+    \cs{cleardoublepage} and \cs{clearpage}.}
+When one of the standard classes is used with the \Lopt{titlepage}
 option, \cmd{\maketitle} puts the title elements on an unnumbered page
 and then starts a new page numbered page 1. 
 The standard classes also provide
@@ -6368,6 +6469,19 @@ at the end it starts another ordinary page numbered one
 The \pstyle{titlingpage} pagestyle is initially defined to be the same
 as the \pstyle{empty} pagestyle.
 
+At the end of a \Ie{titlingpage} clearing code is issued, which can
+send you to the next page or the next right handed page. Using
+\cmd{\titlingpageend}\marg{twoside code}\marg{oneside code}, you can
+specify what this clearing code should be. The default is
+\cs{cleardoublepage} and \cs{clearpage} respectively.\footnote{Thus
+  this refactorization will not change existing documents, LM, 2018/03/06.} However a
+better choice might be to just let it follow \cs{clearforchapter}:
+\begin{lcode}
+  \titlingpageend{\clearforchapter}{\clearforchapter}
+\end{lcode}
+-- using this value, \Ie{titlingpage} will work as expected with \Lopt{openany}.
+
+
    For example, to put both the title and an abstract\index{abstract} 
 on a title page,
 with a \pstyle{plain} pagestyle:
@@ -11262,9 +11376,9 @@ like:
 
 \svnidlong
 {$Ignore: $}
-{$LastChangedDate: 2015-07-20 13:55:32 +0200 (Mon, 20 Jul 2015) $}
-{$LastChangedRevision: 542 $}
-{$LastChangedBy: daleif $}
+{$LastChangedDate: 2018-03-09 13:41:30 +0100 (Fri, 09 Mar 2018) $}
+{$LastChangedRevision: 587 $}
+{$LastChangedBy: daleif@math.au.dk $}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -12215,8 +12329,9 @@ counter typeset as a lowercase Roman numeral followed by a single parenthesis
 
 
 \LMnote{2013/05/16}{Added hint about enumitem}
-\begin{hint}
-  \theclass\ does not provide high level interfaces to configure the
+\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.
 
@@ -12232,14 +12347,27 @@ counter typeset as a lowercase Roman numeral followed by a single parenthesis
   \end{lcode}
   syntax will work out of the box.
 
-  One difference though: In \theclass\ \verb?\ref{item:tst}? will give you
+  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}.
-\end{hint}
-
-
 
+  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|(} %|
@@ -23181,9 +23309,9 @@ and the result is shown on the next page.
 
 \svnidlong
 {$Ignore: $}
-{$LastChangedDate: 2013-04-24 17:14:15 +0200 (Wed, 24 Apr 2013) $}
-{$LastChangedRevision: 442 $}
-{$LastChangedBy: daleif $}
+{$LastChangedDate: 2018-03-06 15:58:01 +0100 (Tue, 06 Mar 2018) $}
+{$LastChangedRevision: 584 $}
+{$LastChangedBy: daleif@math.au.dk $}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%%%% membook
@@ -23317,16 +23445,28 @@ For complete information on this see the documentation for the
 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.
+\end{recommended}
+
+
+
 %%    Following the declaration \cmd{\frameasnomaltrue}, which is the
 %default, normal paragraphing is used for the framed text. On the
 %%other hand, following the declaration \cmd{\frameasnormalfalse}
 %the paragraphing follows the \Ie{minipage} style layout (i.e.,
 %%no indentation of the first line).
 
-    Be aware that these boxes are somewhat delicate; they do not work
-in all circumstances. For example they will not work with the
-\Lpack{multicol} package~\cite{MULTICOL}, and any floats or footnotes
-in the boxes will disappear.
+Be aware that the boxes we present in this manual are somewhat
+delicate; they do not work in all circumstances. For example they will
+not work with the \Lpack{multicol} package~\cite{MULTICOL}, and any
+floats or footnotes in the boxes will disappear.
 
 \begin{syntax}
 \lnc{\FrameRule} \lnc{\FrameSep} \lnc{\FrameHeightAdjust} \\
@@ -24143,6 +24283,11 @@ the numbers inside the box.
     Verbatim tabbing, but not wrapping, applies to the \Ie{boxedverbatim}
 environment.
 
+\begin{recommended}
+  Again the \Lpack{tcolorbox} package offers boxes vs verbatim text.
+\end{recommended}
+
+
 \subsection{New verbatims}
 
 \index{verbatim!new|(}
@@ -27376,9 +27521,9 @@ pdflatex memman
 
 \svnidlong
 {$Ignore: $}
-{$LastChangedDate: 2014-03-31 11:34:44 +0200 (Mon, 31 Mar 2014) $}
-{$LastChangedRevision: 480 $}
-{$LastChangedBy: daleif $}
+{$LastChangedDate: 2018-04-05 11:07:48 +0200 (Thu, 05 Apr 2018) $}
+{$LastChangedRevision: 596 $}
+{$LastChangedBy: daleif@math.au.dk $}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %\clearpage
@@ -27928,6 +28073,17 @@ between the two styles. The current value of \Pcn{ctr} is unaffected by these
 commands. If you want to change the value use \cmd{\setcounter}, and to change
 the typesetting style use \cmd{\renewcommand} on \cs{thectr}.
 
+
+\begin{caveat}
+  As of 2018 \cmd{\counterwithout} and \cmd{\counterwithin} will be
+  provided by the \LaTeX-kernel, thus we only provide it if it does
+  not already exist.
+\end{caveat}
+
+
+
+
+
 \LMnote{2010/01/30}{Added \cs{letcountercounter}}
 \begin{syntax}
   \cmd{\letcountercounter}\marg{counterA}\marg{counterB}\\
@@ -28787,7 +28943,8 @@ If you want a \file{dvi} file output use \ltx\ and if you want a
 \begin{syntax}
 \piif{ifpdf} ... \verb?\fi? \\
 \end{syntax}
-The class provides \piif{ifpdf} which is \ptrue\ when the document is
+The class provides \piif{ifpdf} (by autoloading the \Lpack{ifpdf}
+package) which is \ptrue\ when the document is
 being processed by \pixpdfltx\ and \pfalse\ otherwise. You can use it like this:
 \begin{lcode}
 \ifpdf
@@ -28802,17 +28959,19 @@ If there is no \ltx\ specific code then don't write the \verb?\else? part.
 
     Modern \ltx\ distributions use \pixetx, which is an extended version
 of \tx, as the underlying engine. \pixetx\ provides some more primitives
-than \tx, which may be useful, but not everybody has \pixetx\ available.
+than \tx, which may be useful, but not everybody has \pixetx\
+available (Though, as of 2018, this is \emph{very} rare).
 
 \begin{syntax}
 \piif{ifetex} \\
 \end{syntax}
 \glossary(ifetex)%
-  {\cs{ifetex}}%
-  {\ptrue\ if \etx\ is the underlying engine, otherwise \pfalse.}
-\piif{ifetex} can be used to determine if \pixetx\ is being used as the
-underlying engine; it is analagous to \piif{ifpdf} which tests for
-\pixpdfltx. For example:
+{\cs{ifetex}}%
+{\ptrue\ if \etx\ is the underlying engine, otherwise \pfalse.}
+\piif{ifetex} can be used to determine if \pixetx\ is being used as
+the underlying engine; it is analagous to \piif{ifpdf} which tests for
+\pixpdfltx\ (provided by autoloading the \Lpack{ifetex} package). For
+example:
 \begin{lcode}
 \ifetex
   %%% code only processible by etex
@@ -28835,16 +28994,31 @@ to process the document.
   {\ptrue\ if \xetx\ is being used to process the document.}
 
 In a similar manner you can use \piif{ifxetex} to check if the document
-is being processed by \pixxetx.
+is being processed by \pixxetx\ (provided by autoloading the
+\Lpack{ifxetex} package).
 
 \begin{syntax}
 \cmd{\RequireXeTeX} \\
 \end{syntax}
 \glossary(RequireXeTeX)%
-  {\cs{RequireXeTeX}}%
-  {Generates an error if the document is not being processed by \xetx.}
-The class also provides \cmd{\RequireXeTeX}, which generates an error if
-\pixxetx\ is not being used to process the document.
+{\cs{RequireXeTeX}}%
+{Generates an error if the document is not being processed by \xetx.}
+The \Lpack{ifxetex} package also provides \cmd{\RequireXeTeX}, which
+generates an error if \pixxetx\ is not being used to process the
+document. This can be useful if you make your own class building upon
+\Lclass{memoir}.
+
+\subsection{Checking for LuaTeX}
+\label{sec:checking-lualatex}
+
+Similarly you can use 
+\begin{syntax}
+\piif{ifluatex} \\
+\end{syntax}
+\glossary(ifluatex)%
+  {\cs{ifluatex}}%
+  {\ptrue\ if \luatx\ is being used to process the document.}
+to check if the doc is being process by  \luatx.
 
 
 \section{Leading}
@@ -37770,9 +37944,9 @@ recognized.
 
 \svnidlong
 {$Ignore: $}
-{$LastChangedDate: 2013-05-15 17:07:24 +0200 (Wed, 15 May 2013) $}
-{$LastChangedRevision: 463 $}
-{$LastChangedBy: daleif $}
+{$LastChangedDate: 2018-04-05 11:07:48 +0200 (Thu, 05 Apr 2018) $}
+{$LastChangedRevision: 596 $}
+{$LastChangedBy: daleif@math.au.dk $}
 
 \chapter{Comments}
 \label{cha:comments}
@@ -37784,7 +37958,8 @@ Over time we may use this section to explain, or list some of the
 algorithms for some of the macros in the class. The information may be
 useful to some.
 
-\subsection{Autoadjusting \cs{marginparwidth}}
+\subsection{Autoadjusting
+  \texorpdfstring{\cs{marginparwidth}}{\textbackslash marginparwidth}}
 \label{sec:auto-csmarg}
 
 This algorithm is used within \cmd{\fixthelayout} unless the user have
@@ -39206,7 +39381,26 @@ the indexed topic.\vskip\onelineskip}
 \onecolindex
 \renewcommand*{\preindexhook}{}
 \renewcommand*{\indexname}{Index of first lines}
-%%%\indexintoc
+%%% \indexintoc
+
+
+\makeatletter
+\renewcommand{\doidxbookmark}[1]{{\def\@tempa{Symbols}\def\@tempb{#1}%
+  \centering\bfseries \ifx\@tempa\@tempb %
+  Analphabetics 
+%  \phantomsection%
+%  \pdfbookmark[0]{Analphabetics}{Analphabetics-idx}%
+%  \label{AnalphabeticsAnalphabeticsAnalphabetics-idx}%
+  \else 
+  #1%
+%  \phantomsection%
+%  \pdfbookmark[0]{#1}{#1-idx}%
+%  \label{#1#1#1-idx}%
+  \fi%
+  \vskip\onelineskip\par}}
+\makeatother
+
+
 \printindex[lines]
 
 \cleardoublepage
@@ -39228,8 +39422,13 @@ Computer Modern family.
 
 \end{center}
 
+
 \end{adjustwidth}
 
+
+
+
+
 \vfil
 
 %#% extend
diff --git a/Master/texmf-dist/doc/latex/memoir/memsty.sty b/Master/texmf-dist/doc/latex/memoir/memsty.sty
index d0b64f00809..bf2c27748cd 100644
--- a/Master/texmf-dist/doc/latex/memoir/memsty.sty
+++ b/Master/texmf-dist/doc/latex/memoir/memsty.sty
@@ -161,7 +161,7 @@
               pdfpagelabels,
 %%%  hyperfootnotes=false,
               bookmarksnumbered,
-%              colorlinks,
+              colorlinks,
 %              ocgcolorlinks, % this only works for pdflatex
              ]{hyperref} 
   \DeclareGraphicsRule{*}{mps}{*}{}
@@ -190,7 +190,7 @@
   % \definecolor{filecolor}{rgb}{0,0.2,0.6}
   \definecolor{urlcolour} {rgb}{0.8,0,0.8}
 }{%
-  typeout{Asked for black links, so that is what you are going to get}
+  \typeout{Asked for black links, so that is what you are going to get}
   \definecolor{linkcolour}{rgb}{0,0,0}
   \definecolor{citecolour}{rgb}{0,0,0}
   % \definecolor{filecolor}{rgb}{0,0,0}
@@ -199,7 +199,7 @@
 }
 \hypersetup{
     pdftitle={The memoir class},
-    pdfauthor={Peter Wilson},
+    pdfauthor={Peter Wilson, maintained by Lars Madsen},
     linkcolor=linkcolour,citecolor=citecolour,
     filecolor=urlcolour,urlcolor=urlcolour,
   }
@@ -218,6 +218,8 @@
 \providecommand*{\ixetx}{\index{etex?\etx}}
 \providecommand*{\pixetx}{\etx\ixetx}            % print & index etex
 \providecommand*{\xetx}{Xe\tx}
+\providecommand*{\luatx}{Lua\tx}
+
 \providecommand*{\ixxetx}{\index{XeTeX?\xetx}}
 \providecommand*{\pixxetx}{\xetx\ixxetx}         % print & index XeTeX
 \providecommand*{\TeXUG}{\tx{} Users Group}
@@ -558,9 +560,9 @@ chapterstyle. It is one of several styles that come as part of the
     \fi
     \c@chapter=\savechapcnt
     \advance\c@chapter\m@ne
-    \renewcommand{\theHchapter}{\thepage.\thechapter-\the\demochapcnt}
+    \renewcommand{\theHchapter}{\thepage.\thechapter-\the\demochapcnt.\thesheetsequence}
     \refstepcounter{chapter}%
-%%    \stepcounter{chapter}
+%    \stepcounter{chapter}
     \begin{center}
       \caption{The #2 chapterstyle}\label{dc#2}
     \end{center}
@@ -1065,7 +1067,7 @@ it to use the new width for the  margin par}
 \newcommand*\snipletref[1]{\snipletname~\ref{#1} on~\pref{#1}}
 \newenvironment{sniplet}[1][]{
   \refstepcounter{sniplet}
-  \edef\mem@e{\@ifnotmtarg{#1}{~(#1)}}
+  \edef\mem@e{\@ifnotmtarg{#1}{\space(#1)}}
   \section*{\snipletname~\thesniplet\mem@e}
   \phantomsection
   \addcontentsline{toc}{section}{\snipletname\ \thesniplet\mem@e}
@@ -1122,6 +1124,30 @@ it to use the new width for the  margin par}
 
 
 
+\newenvironment{recommended}{%
+  \@zeroseps%
+  \parskip\z@ \topsep\z@%
+  \definecolor{shadecolor}{gray}{0.9}%
+  \fboxsep0pt%
+  \shaded%
+  \list{}{%
+    \labelwidth\z@
+    \itemindent\z@
+    \addtolength\itemindent{\labelsep}
+    \parsep\z@
+    \listparindent1.5em
+    \leftmargin\z@
+    \rightmargin\leftmargin}
+    \item[\textbf{Recommended alternative}]\mbox{}\par\smallskip
+      \nobreak%\ignorespaces
+  \noindent\ignorespaces}%
+  { \endlist
+    \endshaded}
+
+
+
+
+
 \typeout{End memsty.sty}
 \endinput