memoir (16may16)

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

19 files changed, 174 insertions, 95 deletions

diff --git a/Master/texmf-dist/doc/latex/memoir/README b/Master/texmf-dist/doc/latex/memoir/README
index a69d578404f..fb4074c8af1 100644
--- a/Master/texmf-dist/doc/latex/memoir/README
+++ b/Master/texmf-dist/doc/latex/memoir/README
@@ -36,6 +36,18 @@ o Backmatter:
     Bibliography, indexes                               ~  50 pages
 
 
+Changed (2016/05/16)
+
+o memoir v3.7f
+
+-- Sidecaption placement in oneside docs did not work as
+   advertised. Now left and inner will place it on the left side, and
+   right and outer will place it on the right.
+-- fixed sporious spaces in \createmark
+-- added loading luatex85 under certain conditions
+-- updated the embedded booktabs code so we are back aligned with
+   latest booktabs version.
+
 
 Changed (2015/07/08)
 
@@ -296,6 +308,7 @@ Earlier changes are noted at the end.
 ------------------------------------------------------------------- 
   Author: Peter Wilson (Herries Press) herries dot press at earthlink dot net
   Copyright 2001--2010 Peter R. Wilson
+  Copyright 2011--     Lars Madsen
   Maintainer: Lars Madsen daleif at math dot au dot dk
  
   This work may be distributed and/or modified under the
diff --git a/Master/texmf-dist/doc/latex/memoir/memman.pdf b/Master/texmf-dist/doc/latex/memoir/memman.pdf
index 5484b6b959b..351c1aa914a 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 09fa2546a00..4672e816f32 100644
--- a/Master/texmf-dist/doc/latex/memoir/memman.tex
+++ b/Master/texmf-dist/doc/latex/memoir/memman.tex
@@ -213,7 +213,7 @@
 \setlength{\parskip}{\baselineskip}
 %%\ttfamily
 \textcopyright{} 2001 --- 2010 Peter R. Wilson \\
-\textcopyright{} 2011 --- 2014 Lars Madsen \\
+\textcopyright{} 2011 --- \phantom{2014} Lars Madsen \\
 All rights reserved
 
 The Herries Press, Normandy Park, WA.
@@ -245,6 +245,7 @@ Seventh edition:                       & 10 May 2008 \\
 Eighth impression, with very minor corrections: & 12 July 2008 \\
 Ninth impression, with additions and corrections: & 8 July 2009 \\
 Eighth edition:                        & August 2009 \\
+Tenth impression, with additions and corrections: & 11 November 2015 \\
 \end{tabular}
 \end{center}
 \ifMASTER
@@ -2166,8 +2167,8 @@ an em, often a quad is 1em.
 
 \svnidlong
 {$Ignore: $}
-{$LastChangedDate: 2015-04-23 14:33:14 +0200 (Thu, 23 Apr 2015) $}
-{$LastChangedRevision: 528 $}
+{$LastChangedDate: 2015-08-21 12:00:47 +0200 (Fri, 21 Aug 2015) $}
+{$LastChangedRevision: 544 $}
 {$LastChangedBy: daleif $}
 
 \chapter{Starting off} \label{chap:starting}
@@ -2540,10 +2541,10 @@ file containing all the size and space specifications for your chosen font
 size, and also tell \Mname\ the name of the file. \emph{Before} the 
 \cmd{\documentclass} command define two macros, \cmd{\anyptfilebase} and
 \cmd{\anyptsize} like: 
-\begin{lcode}
-  \newcommand*{\anyptfilebase}\marg{chars}
-  \newcommand*{\anyptsize}\marg{num} 
-\end{lcode}
+\begin{syntax}
+  \verb|\newcommand*{\anyptfilebase}|\marg{chars}\\
+  \verb|\newcommand*{\anyptsize}|\marg{num} 
+\end{syntax}
 \glossary(anyptsize)%
   {\cs{anyptsize}}%
   {Second part (the pointsize) of the name the \texttt{clo} file for the
@@ -2776,9 +2777,9 @@ want to put \cmd{\raggedbottom} in the preamble\index{preamble}.
 
 \svnidlong
 {$Ignore: $}
-{$LastChangedDate: 2015-04-22 13:01:10 +0200 (Wed, 22 Apr 2015) $}
-{$LastChangedRevision: 524 $}
-{$LastChangedBy: daleif $}
+{$LastChangedDate: 2015-11-23 09:32:30 +0100 (Mon, 23 Nov 2015) $}
+{$LastChangedRevision: 547 $}
+{$LastChangedBy: daleif@math.au.dk $}
 
 \chapter{Laying out the page} \label{chap:layingpage}
 
@@ -3405,7 +3406,7 @@ commands\index{packages before class} before
     The height of the typeblock\index{typeblock!height} should be 
 equivalent to an integral number of lines. The class provides two
 different methods to specify the typeblock. \cmd{\settypeblocksize}
-(below) will set the size of the typoblock, other commands will then
+(below) will set the size of the typeblock, other commands will then
 be used to place it on the paper. Alternatively the typeblock size can
 be determined by setting the margins around it. We present this later
 on in this section (see \cmd{\setlrmarginsandblock} and
@@ -7126,8 +7127,8 @@ optional argument of the \cmd{\twocolumn} command. In fact,
 
 \svnidlong
 {$Ignore: $}
-{$LastChangedDate: 2015-04-22 15:51:45 +0200 (Wed, 22 Apr 2015) $}
-{$LastChangedRevision: 526 $}
+{$LastChangedDate: 2015-07-17 12:08:47 +0200 (Fri, 17 Jul 2015) $}
+{$LastChangedRevision: 541 $}
 {$LastChangedBy: daleif $}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -7262,7 +7263,7 @@ figure numbering throughout, i.e.,
 \renewcommand\@memfront@floats{}
 \renewcommand\@memmain@floats{}
 \newcommand\@memback@floats{}
-\makeatletter
+\makeatother
 \end{lcode}
 in the preamble.
 
@@ -11261,8 +11262,8 @@ like:
 
 \svnidlong
 {$Ignore: $}
-{$LastChangedDate: 2014-11-05 16:28:11 +0100 (Wed, 05 Nov 2014) $}
-{$LastChangedRevision: 501 $}
+{$LastChangedDate: 2015-07-20 13:55:32 +0200 (Mon, 20 Jul 2015) $}
+{$LastChangedRevision: 542 $}
 {$LastChangedBy: daleif $}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -12282,7 +12283,7 @@ The starred version, \cmd{\firmlists*}, allows sligthly less space around
 the lists when they are preceded by a blank line than does the 
 unstarred \cmd{\firmlists}.
 \begin{caveat}
-  Due to the manner i which \cmd{\small} and \cmd{\footnotesize} are
+  Due to the manner in which \cmd{\small} and \cmd{\footnotesize} are
   implemented, \cmd{\tightlists} and \cmd{\firmlists} will have \emph{no
     effect} on lists typeset under \cmd{\small} or
   \cmd{\footnotesize}.
@@ -12500,8 +12501,8 @@ other environments.
 
 \svnidlong
 {$Ignore: $}
-{$LastChangedDate: 2015-05-11 13:47:08 +0200 (Mon, 11 May 2015) $}
-{$LastChangedRevision: 531 $}
+{$LastChangedDate: 2015-07-20 13:55:32 +0200 (Mon, 20 Jul 2015) $}
+{$LastChangedRevision: 542 $}
 {$LastChangedBy: daleif $}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -12516,7 +12517,7 @@ classes the typographic design of these is virtually fixed as it is buried
 within the class definitions.
 
     As well as allowing these lists to appear multiple times in a
-documant, the \Mname\ class gives handles to easily manipulate the design 
+document, the \Mname\ class gives handles to easily manipulate the design 
 elements. The class also provides means for you to define your own new kinds of
 `\listofx'. 
 
diff --git a/Master/texmf-dist/makeindex/memoir/basic.gst b/Master/texmf-dist/makeindex/memoir/basic.gst
index 323c518939f..90927842e4b 100644
--- a/Master/texmf-dist/makeindex/memoir/basic.gst
+++ b/Master/texmf-dist/makeindex/memoir/basic.gst
@@ -9,7 +9,7 @@
 %%   Author: Peter Wilson  (herries dot press at earthlink dot net)
 %%           Herries Press
 %%   Copyright 2001--2011 Peter R. Wilson
-%%   Copyright 2011--2013 Lars Madsen
+%%   Copyright 2011--     Lars Madsen
 %%   Maintainer: Lars Madsen (daleif at math dot au dot dk)
 %% 
 %% 
diff --git a/Master/texmf-dist/source/latex/memoir/memoir.dtx b/Master/texmf-dist/source/latex/memoir/memoir.dtx
index ea366334874..7780157dded 100644
--- a/Master/texmf-dist/source/latex/memoir/memoir.dtx
+++ b/Master/texmf-dist/source/latex/memoir/memoir.dtx
@@ -4,7 +4,7 @@
 % Author: Peter Wilson (Herries Press) herries dot press at earthlink dot net 
 % Maintainer: Lars Madsen (daleif at math dot au dot dk) 
 % Copyright 2001--2010 Peter R. Wilson
-% Copyright 2011--2013 Lars Madsen
+% Copyright 2011--     Lars Madsen
 % 
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either
@@ -20,7 +20,7 @@
 % This work consists of the files listed in the README file.
 % 
 % \fi
-% \CheckSum{30752}
+% \CheckSum{30773}
 %
 % \changes{v0.1}{2001/05/20}{First public alpha release}
 % \changes{v0.2}{2001/06/03}{First beta release}
@@ -114,7 +114,7 @@
 % \changes{v3.7d}{2015/04/23}{Misc. bugfixes}
 % \changes{v3.7e}{2015/07/08}{Per request from LaTeX Team, etex is not
 % autoloaded on newer kernels}
-%
+% \changes{v3.7f}{2016/05/16}{Maintenance, luatex85 and booktabs update}
 %
 % \def\dtxfile{memoir.dtx}
 %
@@ -168,6 +168,7 @@
 % \def\fileversion{v3.7c}          \def\filedate{2015/03/05}
 % \def\fileversion{v3.7d}          \def\filedate{2015/04/23}
 % \def\fileversion{v3.7e}          \def\filedate{2015/07/08}
+% \def\fileversion{v3.7f}          \def\filedate{2016/05/16}
 % \title{The LaTeX \Lpack{memoir} class for configurable book 
 %        typesetting: Source code\thanks{This
 %        file (\texttt{\dtxfile}) has version number \fileversion, last revised
@@ -397,11 +398,11 @@
 %    Announce the name, option files and version for LaTeX2e files:
 %    \begin{macrocode}
 %<class>\ProvidesClass{memoir}%
-%<class>  [2015/07/08 v3.7e configurable book, report, article document class]
+%<class>  [2016/05/16 v3.7f 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.7e, 2015/07/08}
+%<class>\newcommand\memversion{v3.7f, 2016/05/16}
 %<9pt>\ProvidesFile{mem9.clo}%
 %<9pt>             [2008/01/30 v0.4 memoir class 9pt size option]
 %<10pt>\ProvidesFile{mem10.clo}%
@@ -439,6 +440,7 @@
 % things with \cs{@tempa}, \cs{@tempb} and \cs{@tempc}. I have now replaced
 % any use of these with \cs{@memtempa}, etc.
 %
+%
 %    In this part we define a few commands that are used later on.
 %
 % \begin{macro}{\@ptsize}
@@ -1139,6 +1141,22 @@
 % senseless for a class to attempt to take account of everything that might 
 % be used with it.
 %
+% Note (2016/05/16): Due to recent changes in Luatex, most notably the
+% removal of several \cs{pdf...} macro, several PDF tests fail with
+% LuaLaTeX. As a temporary measure the following is used to restore
+% the old functionality when a newer LuaLaTeX is used. Code courtesy
+% of David Carlisle. At some point we will include some of this into
+% the class.
+% \changes{v3.7f}{2016/05/16}{Temp measure to make the class work with
+% updated luatex}
+%    \begin{macrocode}
+\ifx\pdfextension\@undefined\else
+  \RequirePackage{luatex85}
+\fi    
+
+%    \end{macrocode}
+% 
+%
 % \begin{macro}{\ifpdf}
 % \begin{macro}{\pdftrue}
 % \begin{macro}{\pdffalse}
@@ -6561,6 +6579,7 @@
 %    \end{macrocode}
 % The three \meta{marks} cases, \texttt{left}, \texttt{both} and
 % \texttt{right}; fails to \texttt{both}.
+% \changes{v3.7f}{2015/08/25}{Sporious spaces}
 %    \begin{macrocode}
   \nametest{#2}{left}%
   \ifsamename
@@ -6579,7 +6598,7 @@
     \nametest{#2}{right}
     \ifsamename
       \@namedef{#1mark}##1{%
-        \@setclcnt{#1}{@memmarkcntra}
+        \@setclcnt{#1}{@memmarkcntra}%
         \advance\c@@memmarkcntra\m@ne
         \markright{%
           \memUChead{%
@@ -6598,7 +6617,7 @@
         I will assume you meant `both'}%	
       \fi
     \@namedef{#1mark}##1{%
-      \@setclcnt{#1}{@memmarkcntra}
+      \@setclcnt{#1}{@memmarkcntra}%
       \advance\c@@memmarkcntra\m@ne
       \markboth{%
         \memUChead{%
@@ -17652,6 +17671,38 @@
 % All the rules (except \cs{addlinespace}) share this code.
 %    \begin{macrocode}
 \def\@BTrule[#1]{%
+%    \end{macrocode}
+% Note (2016/05/16): code rearranged a bit to come back into sync with
+% \Lpack{booktabs} v1.618033.
+%
+% \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
+%  loaded --- we might be within an ordinary table rather than a
+%  longtable. So we look to see if \cs{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
+%  cleared it when the environment closes.) Another
+%  package could potentially do this! And \texttt{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
+%  appropriate, then call it.
+%    \begin{macrocode}
+  \ifx\longtable\undefined 
+    \let\@BTswitch\@BTnormal
+  \else\ifx\hline\LT@hline
+    \let\@BTswitch\@BLTrule
+  \else
+    \let\@BTswitch\@BTnormal
+  \fi\fi
+%    \end{macrocode}
+% On with the code
+%    \begin{macrocode}
   \global\@thisrulewidth=#1\relax
 %    \end{macrocode}
 % Save the width argument (if the user didn't give one, then the
@@ -17670,25 +17721,7 @@
 % but if immediately after a
 % previous rule, insert a \cs{doublerulesep}.
 %
-% 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
-%  loaded --- we might be within an ordinary table rather than a
-%  longtable. So we look to see if \cs{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
-%  cleared it when the environment closes.) Another
-%  package could potentially do this! And \texttt{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
-%  appropriate, then call it.
 %    \begin{macrocode}
-  \ifx\longtable\undefined\let\@BTswitch\@BTnormal\else
-  \ifx\hline\LT@hline\let\@BTswitch\@BLTrule
-  \else\let\@BTswitch\@BTnormal\fi\fi
   \@BTswitch}
 
 %    \end{macrocode}
@@ -17897,18 +17930,21 @@
 % This code (called below) actually draws the rules. They are drawn
 % as boxes in text, rather than in a \cs{noalign} group, which permits
 % the left and right kerning.
+% \changes{v3.7f}{2016/05/16}{Added \cs{kern}\cs{z@} to comply to
+% latest booktabs updates. In Booktabs they were added to protect
+% against unskips.}
 %    \begin{macrocode}
 \def\@cmidrulea{%
   \multispan\@cmidla&\multispan\@cmidlb
 %%    \unskip\hskip \cmrkern@l\leaders\bktabrule{\@thisrulewidth}\hfill
     \unskip\hskip \cmrkern@l{%
-    \CT@arc@\leaders\bktabrule{\@thisrulewidth}\hfill}%
+    \CT@arc@\leaders\bktabrule{\@thisrulewidth}\hfill\kern\z@}%
     \hskip \cmrkern@r\cr}
 \def\@cmidruleb{%
   \multispan\@cmidlb
 %%    \unskip\hskip \cmrkern@l\leaders\bktabrule{\@thisrulewidth}\hfill
   \unskip\hskip \cmrkern@l{%
-    \CT@arc@\leaders\bktabrule{\@thisrulewidth}\hfill}%
+    \CT@arc@\leaders\bktabrule{\@thisrulewidth}\hfill\kern\z@}%
     \hskip \cmrkern@r\cr}
 
 %    \end{macrocode}
@@ -20820,12 +20856,27 @@
         \fi
       \fi
     \else%     oneside
-      \scapmarglefttrue
-      \ifnum\m@mscapmarg>\@ne
-        \ifnum\m@mscapmarg<\thr@@
-          \scapmargleftfalse
-        \fi
-      \fi
+%    \end{macrocode}
+% In oneside documents, inner and outer is the same as left and right.
+% \changes{v3.7f}{2015/08/10}{Side caption placement bugfix for
+% onesided docs. Related to \protect\url{http://tex.stackexchange.com/q/259324/3929}.
+% }
+%    \begin{macrocode}
+      % \scapmarglefttrue% 0 and 3
+      % \ifnum\m@mscapmarg>\@ne
+      %   \ifnum\m@mscapmarg<\thr@@
+      %     \scapmargleftfalse
+      %   \fi
+      % \fi
+      \ifcase\m@mscapmarg\relax% 0
+        \scapmarglefttrue%
+      \or% 1
+        \scapmargleftfalse%
+      \or% 2
+        \scapmargleftfalse%
+      \or% 3
+        \scapmarglefttrue%
+      \fi%
     \fi}
 
 %    \end{macrocode}
@@ -35530,7 +35581,7 @@
 % v2.4b (2005) and c (2008) are some copyright years.}
 %    \begin{macrocode}
 \EmulatedPackage{array}[2008/09/09]
-\EmulatedPackage{booktabs}[2008/07/23]
+\EmulatedPackage{booktabs}[2016/05/16]
 \EmulatedPackage{ccaption}[2008/07/23]
 \EmulatedPackage{changepage}[2008/07/23]
 \EmulatedPackage{chngcntr}[2008/07/23]
@@ -35600,10 +35651,9 @@
     You are using the caption package with the memoir class.
     To prepare we will now reset all captioning macros and 
     configurations to kernel defaults, and then let the 
-    caption package take over. Please remember to use the
-    caption package interfaces in order to configure 
-    your captions. 
-  }
+    caption package take over. Please remember to use^^J
+    the caption package interfaces in order to^^J
+    configure your captions}
 
   \long\def\@makecaption##1##2{%
     \vskip\abovecaptionskip
diff --git a/Master/texmf-dist/source/latex/memoir/memoir.ins b/Master/texmf-dist/source/latex/memoir/memoir.ins
index 971456fb09c..db724a236a8 100644
--- a/Master/texmf-dist/source/latex/memoir/memoir.ins
+++ b/Master/texmf-dist/source/latex/memoir/memoir.ins
@@ -1,7 +1,7 @@
 %% memoir.ins
 %% Author: Peter Wilson (herries dot press at earthlink dot net)
 %% Copyright 2001--2011 Peter R. Wilson
-%% Copyright 2011--2013 Lars Madsen
+%% Copyright 2011--     Lars Madsen
 %% Maintainer: Lars Madsen (daleif at imf dot au dot dk)
 %%
 %% This work may be distributed and/or modified under the
@@ -31,7 +31,7 @@
   Author: Peter Wilson  (herries dot press at earthlink dot net)
           Herries Press
   Copyright 2001--2011 Peter R. Wilson
-  Copyright 2011--2013 Lars Madsen
+  Copyright 2011--     Lars Madsen
   Maintainer: Lars Madsen (daleif at math dot au dot dk)
  
 
diff --git a/Master/texmf-dist/tex/latex/memoir/mem10.clo b/Master/texmf-dist/tex/latex/memoir/mem10.clo
index 55e452a8458..6d3a3372d36 100644
--- a/Master/texmf-dist/tex/latex/memoir/mem10.clo
+++ b/Master/texmf-dist/tex/latex/memoir/mem10.clo
@@ -9,7 +9,7 @@
 %%   Author: Peter Wilson  (herries dot press at earthlink dot net)
 %%           Herries Press
 %%   Copyright 2001--2011 Peter R. Wilson
-%%   Copyright 2011--2013 Lars Madsen
+%%   Copyright 2011--     Lars Madsen
 %%   Maintainer: Lars Madsen (daleif at math dot au dot dk)
 %% 
 %% 
diff --git a/Master/texmf-dist/tex/latex/memoir/mem11.clo b/Master/texmf-dist/tex/latex/memoir/mem11.clo
index 51fd28a90c0..ebb4e70e528 100644
--- a/Master/texmf-dist/tex/latex/memoir/mem11.clo
+++ b/Master/texmf-dist/tex/latex/memoir/mem11.clo
@@ -9,7 +9,7 @@
 %%   Author: Peter Wilson  (herries dot press at earthlink dot net)
 %%           Herries Press
 %%   Copyright 2001--2011 Peter R. Wilson
-%%   Copyright 2011--2013 Lars Madsen
+%%   Copyright 2011--     Lars Madsen
 %%   Maintainer: Lars Madsen (daleif at math dot au dot dk)
 %% 
 %% 
diff --git a/Master/texmf-dist/tex/latex/memoir/mem12.clo b/Master/texmf-dist/tex/latex/memoir/mem12.clo
index 6edfd5d205a..d9b47f7a6dd 100644
--- a/Master/texmf-dist/tex/latex/memoir/mem12.clo
+++ b/Master/texmf-dist/tex/latex/memoir/mem12.clo
@@ -9,7 +9,7 @@
 %%   Author: Peter Wilson  (herries dot press at earthlink dot net)
 %%           Herries Press
 %%   Copyright 2001--2011 Peter R. Wilson
-%%   Copyright 2011--2013 Lars Madsen
+%%   Copyright 2011--     Lars Madsen
 %%   Maintainer: Lars Madsen (daleif at math dot au dot dk)
 %% 
 %% 
diff --git a/Master/texmf-dist/tex/latex/memoir/mem14.clo b/Master/texmf-dist/tex/latex/memoir/mem14.clo
index 98e9764f82f..bc2ac073117 100644
--- a/Master/texmf-dist/tex/latex/memoir/mem14.clo
+++ b/Master/texmf-dist/tex/latex/memoir/mem14.clo
@@ -9,7 +9,7 @@
 %%   Author: Peter Wilson  (herries dot press at earthlink dot net)
 %%           Herries Press
 %%   Copyright 2001--2011 Peter R. Wilson
-%%   Copyright 2011--2013 Lars Madsen
+%%   Copyright 2011--     Lars Madsen
 %%   Maintainer: Lars Madsen (daleif at math dot au dot dk)
 %% 
 %% 
diff --git a/Master/texmf-dist/tex/latex/memoir/mem17.clo b/Master/texmf-dist/tex/latex/memoir/mem17.clo
index 4ca9c556013..3b82d53db2d 100644
--- a/Master/texmf-dist/tex/latex/memoir/mem17.clo
+++ b/Master/texmf-dist/tex/latex/memoir/mem17.clo
@@ -9,7 +9,7 @@
 %%   Author: Peter Wilson  (herries dot press at earthlink dot net)
 %%           Herries Press
 %%   Copyright 2001--2011 Peter R. Wilson
-%%   Copyright 2011--2013 Lars Madsen
+%%   Copyright 2011--     Lars Madsen
 %%   Maintainer: Lars Madsen (daleif at math dot au dot dk)
 %% 
 %% 
diff --git a/Master/texmf-dist/tex/latex/memoir/mem20.clo b/Master/texmf-dist/tex/latex/memoir/mem20.clo
index 84cd9555f87..fb441aac8f1 100644
--- a/Master/texmf-dist/tex/latex/memoir/mem20.clo
+++ b/Master/texmf-dist/tex/latex/memoir/mem20.clo
@@ -9,7 +9,7 @@
 %%   Author: Peter Wilson  (herries dot press at earthlink dot net)
 %%           Herries Press
 %%   Copyright 2001--2011 Peter R. Wilson
-%%   Copyright 2011--2013 Lars Madsen
+%%   Copyright 2011--     Lars Madsen
 %%   Maintainer: Lars Madsen (daleif at math dot au dot dk)
 %% 
 %% 
diff --git a/Master/texmf-dist/tex/latex/memoir/mem25.clo b/Master/texmf-dist/tex/latex/memoir/mem25.clo
index 44a297a31d1..333623134bb 100644
--- a/Master/texmf-dist/tex/latex/memoir/mem25.clo
+++ b/Master/texmf-dist/tex/latex/memoir/mem25.clo
@@ -9,7 +9,7 @@
 %%   Author: Peter Wilson  (herries dot press at earthlink dot net)
 %%           Herries Press
 %%   Copyright 2001--2011 Peter R. Wilson
-%%   Copyright 2011--2013 Lars Madsen
+%%   Copyright 2011--     Lars Madsen
 %%   Maintainer: Lars Madsen (daleif at math dot au dot dk)
 %% 
 %% 
diff --git a/Master/texmf-dist/tex/latex/memoir/mem30.clo b/Master/texmf-dist/tex/latex/memoir/mem30.clo
index 572a9c61456..db5c14d008f 100644
--- a/Master/texmf-dist/tex/latex/memoir/mem30.clo
+++ b/Master/texmf-dist/tex/latex/memoir/mem30.clo
@@ -9,7 +9,7 @@
 %%   Author: Peter Wilson  (herries dot press at earthlink dot net)
 %%           Herries Press
 %%   Copyright 2001--2011 Peter R. Wilson
-%%   Copyright 2011--2013 Lars Madsen
+%%   Copyright 2011--     Lars Madsen
 %%   Maintainer: Lars Madsen (daleif at math dot au dot dk)
 %% 
 %% 
diff --git a/Master/texmf-dist/tex/latex/memoir/mem36.clo b/Master/texmf-dist/tex/latex/memoir/mem36.clo
index f49d3864f20..beede867153 100644
--- a/Master/texmf-dist/tex/latex/memoir/mem36.clo
+++ b/Master/texmf-dist/tex/latex/memoir/mem36.clo
@@ -9,7 +9,7 @@
 %%   Author: Peter Wilson  (herries dot press at earthlink dot net)
 %%           Herries Press
 %%   Copyright 2001--2011 Peter R. Wilson
-%%   Copyright 2011--2013 Lars Madsen
+%%   Copyright 2011--     Lars Madsen
 %%   Maintainer: Lars Madsen (daleif at math dot au dot dk)
 %% 
 %% 
diff --git a/Master/texmf-dist/tex/latex/memoir/mem48.clo b/Master/texmf-dist/tex/latex/memoir/mem48.clo
index 921b87f3b35..d953736e8d3 100644
--- a/Master/texmf-dist/tex/latex/memoir/mem48.clo
+++ b/Master/texmf-dist/tex/latex/memoir/mem48.clo
@@ -9,7 +9,7 @@
 %%   Author: Peter Wilson  (herries dot press at earthlink dot net)
 %%           Herries Press
 %%   Copyright 2001--2011 Peter R. Wilson
-%%   Copyright 2011--2013 Lars Madsen
+%%   Copyright 2011--     Lars Madsen
 %%   Maintainer: Lars Madsen (daleif at math dot au dot dk)
 %% 
 %% 
diff --git a/Master/texmf-dist/tex/latex/memoir/mem60.clo b/Master/texmf-dist/tex/latex/memoir/mem60.clo
index bbf0baa4046..ffb406ef1e9 100644
--- a/Master/texmf-dist/tex/latex/memoir/mem60.clo
+++ b/Master/texmf-dist/tex/latex/memoir/mem60.clo
@@ -9,7 +9,7 @@
 %%   Author: Peter Wilson  (herries dot press at earthlink dot net)
 %%           Herries Press
 %%   Copyright 2001--2011 Peter R. Wilson
-%%   Copyright 2011--2013 Lars Madsen
+%%   Copyright 2011--     Lars Madsen
 %%   Maintainer: Lars Madsen (daleif at math dot au dot dk)
 %% 
 %% 
diff --git a/Master/texmf-dist/tex/latex/memoir/mem9.clo b/Master/texmf-dist/tex/latex/memoir/mem9.clo
index dda06b05faf..b128812eb9e 100644
--- a/Master/texmf-dist/tex/latex/memoir/mem9.clo
+++ b/Master/texmf-dist/tex/latex/memoir/mem9.clo
@@ -9,7 +9,7 @@
 %%   Author: Peter Wilson  (herries dot press at earthlink dot net)
 %%           Herries Press
 %%   Copyright 2001--2011 Peter R. Wilson
-%%   Copyright 2011--2013 Lars Madsen
+%%   Copyright 2011--     Lars Madsen
 %%   Maintainer: Lars Madsen (daleif at math dot au dot dk)
 %% 
 %% 
diff --git a/Master/texmf-dist/tex/latex/memoir/memoir.cls b/Master/texmf-dist/tex/latex/memoir/memoir.cls
index 9ce322f4ef1..d3c67ef6613 100644
--- a/Master/texmf-dist/tex/latex/memoir/memoir.cls
+++ b/Master/texmf-dist/tex/latex/memoir/memoir.cls
@@ -9,7 +9,7 @@
 %%   Author: Peter Wilson  (herries dot press at earthlink dot net)
 %%           Herries Press
 %%   Copyright 2001--2011 Peter R. Wilson
-%%   Copyright 2011--2013 Lars Madsen
+%%   Copyright 2011--     Lars Madsen
 %%   Maintainer: Lars Madsen (daleif at math dot au dot dk)
 %% 
 %% 
@@ -28,8 +28,8 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{memoir}%
-  [2015/07/08 v3.7e configurable book, report, article document class]
-\newcommand\memversion{v3.7e, 2015/07/08}
+  [2016/05/16 v3.7f configurable book, report, article document class]
+\newcommand\memversion{v3.7f, 2016/05/16}
 \newcommand*{\@ptsize}{}
 \newcommand*{\@memptsize}{}
 \newlength{\onelineskip}
@@ -217,6 +217,10 @@
 \newcommand{\cmd}[1]{\cmdprint{#1}%
   \index{\expandafter\@gobble\string#1?\string\cmdprint{\string#1}}}
 
+\ifx\pdfextension\@undefined\else
+  \RequirePackage{luatex85}
+\fi
+
 \newif\ifm@mifpdf
   \m@mifpdffalse
 \IfFileExists{ifpdf.sty}{\RequirePackage{ifpdf}\relax}{%
@@ -1964,7 +1968,7 @@
     \nametest{#2}{right}
     \ifsamename
       \@namedef{#1mark}##1{%
-        \@setclcnt{#1}{@memmarkcntra}
+        \@setclcnt{#1}{@memmarkcntra}%
         \advance\c@@memmarkcntra\m@ne
         \markright{%
           \memUChead{%
@@ -1983,7 +1987,7 @@
         I will assume you meant `both'}%
       \fi
     \@namedef{#1mark}##1{%
-      \@setclcnt{#1}{@memmarkcntra}
+      \@setclcnt{#1}{@memmarkcntra}%
       \advance\c@@memmarkcntra\m@ne
       \markboth{%
         \memUChead{%
@@ -5917,14 +5921,17 @@
   \futurelet\@tempa\@BTendrule}
 
 \def\@BTrule[#1]{%
+  \ifx\longtable\undefined
+    \let\@BTswitch\@BTnormal
+  \else\ifx\hline\LT@hline
+    \let\@BTswitch\@BLTrule
+  \else
+    \let\@BTswitch\@BTnormal
+  \fi\fi
   \global\@thisrulewidth=#1\relax
   \ifnum\@thisruleclass=\tw@\vskip\@aboverulesep\else
   \ifnum\@lastruleclass=\z@\vskip\@aboverulesep\else
   \ifnum\@lastruleclass=\@ne\vskip\doublerulesep\fi\fi\fi
-
-  \ifx\longtable\undefined\let\@BTswitch\@BTnormal\else
-  \ifx\hline\LT@hline\let\@BTswitch\@BLTrule
-  \else\let\@BTswitch\@BTnormal\fi\fi
   \@BTswitch}
 
 \def\@BTnormal{%
@@ -5994,13 +6001,13 @@
   \multispan\@cmidla&\multispan\@cmidlb
 %%    \unskip\hskip \cmrkern@l\leaders\bktabrule{\@thisrulewidth}\hfill
     \unskip\hskip \cmrkern@l{%
-    \CT@arc@\leaders\bktabrule{\@thisrulewidth}\hfill}%
+    \CT@arc@\leaders\bktabrule{\@thisrulewidth}\hfill\kern\z@}%
     \hskip \cmrkern@r\cr}
 \def\@cmidruleb{%
   \multispan\@cmidlb
 %%    \unskip\hskip \cmrkern@l\leaders\bktabrule{\@thisrulewidth}\hfill
   \unskip\hskip \cmrkern@l{%
-    \CT@arc@\leaders\bktabrule{\@thisrulewidth}\hfill}%
+    \CT@arc@\leaders\bktabrule{\@thisrulewidth}\hfill\kern\z@}%
     \hskip \cmrkern@r\cr}
 
 \def\morecmidrules{\noalign{\relax}}
@@ -7222,12 +7229,21 @@
         \fi
       \fi
     \else%     oneside
-      \scapmarglefttrue
-      \ifnum\m@mscapmarg>\@ne
-        \ifnum\m@mscapmarg<\thr@@
-          \scapmargleftfalse
-        \fi
-      \fi
+      % \scapmarglefttrue% 0 and 3
+      % \ifnum\m@mscapmarg>\@ne
+      %   \ifnum\m@mscapmarg<\thr@@
+      %     \scapmargleftfalse
+      %   \fi
+      % \fi
+      \ifcase\m@mscapmarg\relax% 0
+        \scapmarglefttrue%
+      \or% 1
+        \scapmargleftfalse%
+      \or% 2
+        \scapmargleftfalse%
+      \or% 3
+        \scapmarglefttrue%
+      \fi%
     \fi}
 
 \newcommand*{\overridescapmargin}[1]{%
@@ -12953,7 +12969,7 @@
 \EmulatedPackage{abstract}[2008/07/23]
 \EmulatedPackage{appendix}[2008/07/23]
 \EmulatedPackage{array}[2008/09/09]
-\EmulatedPackage{booktabs}[2008/07/23]
+\EmulatedPackage{booktabs}[2016/05/16]
 \EmulatedPackage{ccaption}[2008/07/23]
 \EmulatedPackage{changepage}[2008/07/23]
 \EmulatedPackage{chngcntr}[2008/07/23]
@@ -12997,10 +13013,9 @@
     You are using the caption package with the memoir class.
     To prepare we will now reset all captioning macros and
     configurations to kernel defaults, and then let the
-    caption package take over. Please remember to use the
-    caption package interfaces in order to configure
-    your captions.
-  }
+    caption package take over. Please remember to use^^J
+    the caption package interfaces in order to^^J
+    configure your captions}
 
   \long\def\@makecaption##1##2{%
     \vskip\abovecaptionskip