memoir (16may16)

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

13 files changed, 49 insertions, 34 deletions

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