summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-04-05 21:10:27 +0000
committerKarl Berry <karl@freefriends.org>2018-04-05 21:10:27 +0000
commit2534e37457206c5394c4902839bf656c211154d7 (patch)
tree2a947cac9bb720de10ccad6f9ae5197f9f8b8974 /Master/texmf-dist/tex/latex
parentca6f70c9dba74f8a8593e1ecfbbe7d187907d78c (diff)
memoir (5apr18)
git-svn-id: svn://tug.org/texlive/trunk@47305 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r--Master/texmf-dist/tex/latex/memoir/mem10.clo2
-rw-r--r--Master/texmf-dist/tex/latex/memoir/mem11.clo2
-rw-r--r--Master/texmf-dist/tex/latex/memoir/mem12.clo2
-rw-r--r--Master/texmf-dist/tex/latex/memoir/mem14.clo2
-rw-r--r--Master/texmf-dist/tex/latex/memoir/mem17.clo2
-rw-r--r--Master/texmf-dist/tex/latex/memoir/mem20.clo2
-rw-r--r--Master/texmf-dist/tex/latex/memoir/mem25.clo2
-rw-r--r--Master/texmf-dist/tex/latex/memoir/mem30.clo2
-rw-r--r--Master/texmf-dist/tex/latex/memoir/mem36.clo2
-rw-r--r--Master/texmf-dist/tex/latex/memoir/mem48.clo2
-rw-r--r--Master/texmf-dist/tex/latex/memoir/mem60.clo2
-rw-r--r--Master/texmf-dist/tex/latex/memoir/mem9.clo2
-rw-r--r--Master/texmf-dist/tex/latex/memoir/memhfixc.sty1
-rw-r--r--Master/texmf-dist/tex/latex/memoir/memoir.cls513
-rw-r--r--Master/texmf-dist/tex/latex/memoir/mempatch.sty38
15 files changed, 284 insertions, 292 deletions
diff --git a/Master/texmf-dist/tex/latex/memoir/mem10.clo b/Master/texmf-dist/tex/latex/memoir/mem10.clo
index 6d3a3372d36..a12f85bbfc1 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-- Lars Madsen
+%% Copyright 2013-- 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 ebb4e70e528..784e2a015ae 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-- Lars Madsen
+%% Copyright 2013-- 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 d9b47f7a6dd..7d640e09e82 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-- Lars Madsen
+%% Copyright 2013-- 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 bc2ac073117..03c64fe20fa 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-- Lars Madsen
+%% Copyright 2013-- 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 3b82d53db2d..7480b783780 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-- Lars Madsen
+%% Copyright 2013-- 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 fb441aac8f1..76c0c71c0b2 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-- Lars Madsen
+%% Copyright 2013-- 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 333623134bb..663ff6eb5f5 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-- Lars Madsen
+%% Copyright 2013-- 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 db5c14d008f..ed911232e44 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-- Lars Madsen
+%% Copyright 2013-- 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 beede867153..42e5f4c461d 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-- Lars Madsen
+%% Copyright 2013-- 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 d953736e8d3..bf66e3303fe 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-- Lars Madsen
+%% Copyright 2013-- 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 ffb406ef1e9..25b10eea2e8 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-- Lars Madsen
+%% Copyright 2013-- 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 b128812eb9e..65721556a60 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-- Lars Madsen
+%% Copyright 2013-- Lars Madsen
%% Maintainer: Lars Madsen (daleif at math dot au dot dk)
%%
%%
diff --git a/Master/texmf-dist/tex/latex/memoir/memhfixc.sty b/Master/texmf-dist/tex/latex/memoir/memhfixc.sty
index 4de14936d4d..bb898d7d9ea 100644
--- a/Master/texmf-dist/tex/latex/memoir/memhfixc.sty
+++ b/Master/texmf-dist/tex/latex/memoir/memhfixc.sty
@@ -9,6 +9,7 @@
%% Author: Peter Wilson (Herries Press) herries dot press at earthlink dot net
%% Copyright 2001 --- 2010 Peter R. Wilson
%% Copyright 2011 --- 2013 Peter R. Wilson
+%% Copyright 2013 --- 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/tex/latex/memoir/memoir.cls b/Master/texmf-dist/tex/latex/memoir/memoir.cls
index d3c67ef6613..a0f3aa4e91a 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-- Lars Madsen
+%% Copyright 2013-- Lars Madsen
%% Maintainer: Lars Madsen (daleif at math dot au dot dk)
%%
%%
@@ -28,8 +28,8 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{memoir}%
- [2016/05/16 v3.7f configurable book, report, article document class]
-\newcommand\memversion{v3.7f, 2016/05/16}
+ [2018/04/04 v3.7g configurable book, report, article document class]
+\newcommand\memversion{v3.7g, 2018/04/04}
\newcommand*{\@ptsize}{}
\newcommand*{\@memptsize}{}
\newlength{\onelineskip}
@@ -217,98 +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}{%
- \ClassWarningNoLine{memoir}{%
- Package `ifpdf' is not installed.\MessageBreak
- The package is being emulated}%
-\m@mifpdftrue
-\expandafter\newif\csname ifpdf\endcsname
- \pdffalse
-\ifx\pdfoutput\undefined
-\else
- \ifx\pdfoutput\@undefined
- \else
- \ifx\pdfoutput\relax
- \else
- \ifnum\pdfoutput>0\relax
- \pdftrue
- \fi
- \fi
- \fi
-\fi
-%%\EmulatedPackage{ifpdf}[2008/07/23]
-}
-
-\newif\ifm@mifetex
- \m@mifetexfalse
-\IfFileExists{ifetex.sty}{\RequirePackage{ifetex}\relax}{%
- \ClassInfo{memoir}{%
- An `ifetex' package is being emulated}%
-\m@mifetextrue
-\newif\ifetex
- \etexfalse
-\ifx\eTeXversion\undefined
-\else
- \ifx\eTeXversion\@undefined
- \else
- \ifx\eTeXversion\relax
- \else
- \ifnum\eTeXversion>0\relax
- \etextrue
- \fi
- \fi
- \fi
-\fi
-%%\EmulatedPackage{ifetex}[2008/07/23]
-}
-
-\newif\ifm@mifxetex
- \m@mifxetexfalse
-\IfFileExists{ifxetex.sty}{\RequirePackage{ifxetex}\relax}{%
- \ClassWarningNoLine{memoir}{%
- The `ifxetex' package is not installed.\MessageBreak
- The package is being emulated}%
-\expandafter\newif\csname ifxetex\endcsname
-\@ifundefined{XeTeXrevision}{\xetexfalse}{\xetextrue}
-\m@mifxetextrue%
-%%\EmulatedPackage{ifxetex}[2008/07/23]
-}
-\ifm@mifxetex%
-\def\RequireXeTeX{%
- \ifxetex\else
- \@memerror{XeTeX is required to process this document}%
- {Try again with xelatex, not (pdf)latex.\MessageBreak
- Or try removing any XeTeX package(s).}
- \fi}
-\fi
-
-\newif\ifm@mifluatex
- \m@mifluatexfalse
-\IfFileExists{ifluatex.sty}{\RequirePackage{ifluatex}\relax}{%
- \ClassWarningNoLine{memoir}{%
- The `ifluatex' package is not installed.\MessageBreak
- The package is being emulated}%
-\m@mifluatextrue
-\expandafter\newif\csname ifluatex\endcsname
- \luatexfalse
-\ifx\luatexversion\@undefined
-\else
- \ifx\luatexversion\undefined
- \else
- \ifx\luatexversion\relax
- \else
- \luatextrue
- \fi
- \fi
-\fi
-%%\EmulatedPackage{ifluatex}[2008/07/23]
-}
+\RequirePackage{ifpdf}[2017/03/15]
+\RequirePackage{ifetex}
+\RequirePackage{ifxetex}[2010/09/12]
+\RequirePackage{ifluatex}[2016/05/16]
\edef\wo@dmacro{%
\string m\string a\string c\string r\string o\string :%
@@ -672,6 +584,9 @@
\DeclareOption{oldfontcommands}{\@memoldfonttrue}
\DeclareOption{extrafontsizes}{\extrafontsizestrue}
+\newcommand\mem@settopoint[1]{\@settopoint{#1}}
+\DeclareOption{fullptlayout}{\renewcommand\mem@settopoint{\@gobble}}
+
\newif\ifmem@noetex
\mem@noetexfalse
\DeclareOption{noetex}{\mem@noetextrue}
@@ -1034,7 +949,7 @@
\setlength\textwidth{\@tempdima}
\fi
\fi
-\@settopoint\textwidth
+\mem@settopoint\textwidth
\setlength\@tempdima{\paperheight}
\addtolength\@tempdima{-3.5in}
@@ -1063,15 +978,15 @@
\ifdim\marginparwidth>2in
\setlength\marginparwidth{2in}%
\fi
-\@settopoint\oddsidemargin
-\@settopoint\marginparwidth
+\mem@settopoint\oddsidemargin
+\mem@settopoint\marginparwidth
\ifdim\marginparwidth<1pt \setlength\marginparwidth{1pt}\fi
\setlength\evensidemargin {\paperwidth}
\addtolength\evensidemargin{-2in}
\addtolength\evensidemargin{-\textwidth}
\addtolength\evensidemargin{-\oddsidemargin}
-\@settopoint\evensidemargin
+\mem@settopoint\evensidemargin
\setlength\topmargin {\paperheight}
\addtolength\topmargin{-2in}
\addtolength\topmargin{-\headheight}
@@ -1079,7 +994,7 @@
\addtolength\topmargin{-\textheight}
\addtolength\topmargin{-\footskip}
\addtolength\topmargin{-.5\topmargin}
-\@settopoint\topmargin
+\mem@settopoint\topmargin
\setlength{\spinemargin}{\oddsidemargin}
\addtolength{\spinemargin}{1in}
@@ -1292,9 +1207,9 @@
\evensidemargin = \trimedge
\advance\evensidemargin \foremargin
\advance\evensidemargin -1in\relax
- \@settopoint\textwidth
- \@settopoint\oddsidemargin
- \@settopoint\evensidemargin
+ \mem@settopoint\textwidth
+ \mem@settopoint\oddsidemargin
+ \mem@settopoint\evensidemargin
\fixheaderwidths
\memifmacroused\setmarginnotes{}{\mem@autoadjust@marginparwidth}
\mem@reset@used@macros
@@ -1429,30 +1344,38 @@
\fixthelayout
\typeoutlayout}
+\newcommand\mem@fixpagelayout{%
+ \@ifundefined{pdfpageheight}{}{\pdfpageheight=\the\stockheight}
+ \@ifundefined{pdfpagewidth}{}{\pdfpagewidth=\the\stockwidth}
+ \@ifundefined{pageheight}{}{\pageheight=\the\stockheight}
+ \@ifundefined{pagewidth}{}{\pagewidth=\the\stockwidth}
+ \@ifundefined{pdfvorigin}{}{\ifdim\pdfvorigin=0pt\pdfvorigin=1in\fi}
+ \@ifundefined{pdfhorigin}{}{\ifdim\pdfhorigin=0pt\pdfhorigin=1in\fi}
+ \ifluatex\else
+ \ifxetex\else
+ \ifpdf\else
+ \AtBeginDvi{\special{papersize=\the\stockwidth,\the\stockheight}}
+ \fi
+ \fi
+ \fi
+}
+
+\AtBeginDocument{\mem@fixpagelayout}
+
\newcommand*{\fixpdflayout}{%
- \pdfpageheight=\the\stockheight
- \pdfpagewidth=\the\stockwidth
- \ifxetex\else
- \ifdim\pdfvorigin=0pt\pdfvorigin=1in\fi
- \ifdim\pdfhorigin=0pt\pdfhorigin=1in\fi
- \fi}
+ \ClassWarning{memoir}{As of 2018, \string\fixpdflayout\ is no longer used}
+ % \pdfpageheight=\the\stockheight
+ % \pdfpagewidth=\the\stockwidth
+ % \ifxetex\else
+ % \ifdim\pdfvorigin=0pt\pdfvorigin=1in\fi
+ % \ifdim\pdfhorigin=0pt\pdfhorigin=1in\fi
+ % \fi
+}
\newcommand*{\fixdvipslayout}{%
- \AtBeginDvi{\special{papersize=\the\stockwidth,\the\stockheight}}}
+ \ClassWarning{memoir}{As of 2018, \string\fixdvipslayout\ is no longer used}
+ %\AtBeginDvi{\special{papersize=\the\stockwidth,\the\stockheight}}
+}
-\AtBeginDocument{%
- \ifxetex
- \fixpdflayout
- \else
- \ifpdf
- \ifnum\pdfoutput<\@ne
- \fixdvipslayout
- \else
- \fixpdflayout
- \fi
- \else
- \fixdvipslayout
- \fi
- \fi}
\newcommand{\typeoutstandardlayout}{%
\typeout{}
@@ -2382,7 +2305,9 @@
\def\@xfloat #1[#2]{%
\m@m@xfloat #1[#2]%
\def\baselinestretch{\m@m@float@spacing}%
- \normalsize}
+ \normalsize%
+ \@nameuse{#1adjustment}%
+ }
}
\newdimen\memPD
@@ -2545,6 +2470,12 @@
\par
\vskip 1.5em}
+\newcommand\titlingpageend[2]{%
+ \def\mem@titlingpage@clear@for@twoside{#1}%
+ \def\mem@titlingpage@clear@for@oneside{#2}%
+}
+ % default
+\titlingpageend{\cleardoublepage}{\clearpage}
\newenvironment{mem@titlingpage}%
{\let\footnoterule\relax
\let\footnotesize\small
@@ -2558,7 +2489,8 @@
}{%
\thispagestyle{titlingpage}%
\if@restonecol \twocolumn \fi
- \if@twoside \cleardoublepage \else \clearpage \fi
+ % \if@twoside \cleardoublepage \else \clearpage \fi
+ \if@twoside \mem@titlingpage@clear@for@twoside \else \mem@titlingpage@clear@for@oneside \fi
\if\mem@titlpg@reset\setcounter{page}{\@ne}\fi}
\newenvironment{titlingpage}{%
\def\mem@titlpg@reset{00}%
@@ -4624,7 +4556,7 @@
\advance\labelwidth-\labelsep
\topsep\topsepii
\parsep\parsepii
- \itemsep\parsepii}
+ \itemsep\itemsepii}
\def\@listiii{\leftmargin\leftmarginiii
\labelwidth\leftmarginiii
@@ -4966,10 +4898,12 @@
\verselinenumbersright
\newcommand*{\@vslnumright}{%
+ \nobreak%
\hfill\rlap{%\kern\vrightskip\kern\rightmargin%
\kern\memRTLvrightskip\kern\rightmargin%
\vlvnumfont\getthelinenumber{poemline}{memfvsline}}}
\newcommand*{\@vslnumleft}{%
+ \nobreak%
\hfill\rlap{%\kern-\textwidth\kern-\vrightskip%
\kern-\textwidth\kern-\memRTLvrightskip%
\vlvnumfont\getthelinenumber{poemline}{memfvsline}}}
@@ -5329,6 +5263,8 @@
%%%%%%%%%% With acknowledgements to %%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%% Frank Mittelbach & David Carlisle %%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%% Copy corresponds to array.sty 2016/10/06 v2.4d %%%%%%%%%
+
\def\@addtopreamble#1{\xdef\@preamble{\@preamble #1}}
\def\@testpach{\@chclass
\ifnum \@lastchclass=6 \@ne \@chnum \@ne \else
@@ -5343,7 +5279,7 @@
\if \@nextchar l\@ne \else
\if \@nextchar r\tw@ \else
\z@ \@chclass
- \if\@nextchar |\@ne \else%| emacs
+ \if\@nextchar |\@ne \else
\if \@nextchar !6 \else
\if \@nextchar @7 \else
\if \@nextchar <8 \else
@@ -5355,43 +5291,39 @@
\if \@nextchar b5 \else
\z@ \@chclass \z@ \@preamerr \z@ \fi \fi \fi \fi
\fi \fi \fi \fi \fi \fi \fi \fi \fi \fi \fi \fi}
+\def\@xexpast#1*#2#3#4\@@{%
+ \@tempcnta #2
+ \toks@={#1}\@temptokena={#3}%
+ \let\the@toksz\relax \let\the@toks\relax
+ \def\@tempa{\the@toksz}%
+ \ifnum\@tempcnta >0 \@whilenum\@tempcnta >0\do
+ {\edef\@tempa{\@tempa\the@toks}\advance \@tempcnta \m@ne}%
+ \let \@tempb \@xexpast \else
+ \let \@tempb \@xexnoop \fi
+ \def\the@toksz{\the\toks@}\def\the@toks{\the\@temptokena}%
+ \edef\@tempa{\@tempa}%
+ \expandafter \@tempb \@tempa #4\@@}
\def\prepnext@tok{\advance \count@ \@ne
\toks\count@{}}
-
-\def\save@decl{\toks \count@ = \expandafter\expandafter\expandafter
- {\expandafter\@nextchar\the\toks\count@}}
-
+\def\save@decl{\toks\count@ \expandafter{\@nextchar}}
\def\insert@column{%
\the@toks \the \@tempcnta
\ignorespaces \@sharp \unskip
\the@toks \the \count@ \relax}
-\let\m@mold@addamp\@addamp
-\newcommand*{\m@m@addamp}{%
- \if@firstamp
- \@firstampfalse
- \global\@curtab\@ne
- \else
- \@addtopreamble{&}
- \global\advance\@curtab\@ne
- \fi}
-\let\@addamp\m@m@addamp
-
\newdimen\col@sep
\def\@acol{\@addtopreamble{\hskip\col@sep}}
\def\@mkpream#1{\gdef\@preamble{}\@lastchclass 4 \@firstamptrue
\let\@sharp\relax \let\@startpbox\relax \let\@endpbox\relax
- \@temptokena{#1}\@tempswatrue
- \@whilesw\if@tempswa\fi{\@tempswafalse\the\NC@list}%
+ \@xexpast #1*0x\@@
\count@\m@ne
\let\the@toks\relax
\prepnext@tok
\expandafter \@tfor \expandafter \@nextchar
- \expandafter :\expandafter =\the\@temptokena \do
+ \expandafter :\expandafter =\@tempa \do
{\@testpach
\ifcase \@chclass \@classz \or \@classi \or \@classii
\or \save@decl \or \or \@classv \or \@classvi
- \or \@classvii \or \@classviii
- \or \@classx
+ \or \@classvii \or \@classviii \or \@classix
\or \@classx \fi
\@lastchclass\@chclass}%
\ifcase\@lastchclass
@@ -5422,43 +5354,33 @@
\d@llarend \hfil \or
\hskip1sp\d@llarbegin \insert@column \d@llarend \hfil \or
\hfil\hskip1sp\d@llarbegin \insert@column \d@llarend \or
- $\vcenter%$
- \@startpbox{\@nextchar}\insert@column \@endpbox $\or%$
+ $\vcenter%$ emacs
+ \@startpbox{\@nextchar}\insert@column \@endpbox $\or%$ emacs
\vtop \@startpbox{\@nextchar}\insert@column \@endpbox \or
\vbox \@startpbox{\@nextchar}\insert@column \@endpbox
\fi}\prepnext@tok}
-
-\let\@classix\relax
-
-\def\@classviii{\ifnum \@lastchclass >\z@\ifnum\@lastchclass=\tw@\else
- \@preamerr 4\@chclass 6 \@classvi \fi\fi}
-
+\def\@classix{\ifnum \@lastchclass = \thr@@
+ \@preamerr \thr@@ \fi
+ \@classx}
+\def\@classviii{\ifnum \@lastchclass >\z@
+ \@preamerr 4\@chclass 6 \@classvi \fi}
\def\@arrayrule{\@addtopreamble \vline}
-
\def\@classvii{\ifnum \@lastchclass = \thr@@
\@preamerr \thr@@ \fi}
-
\def\@classvi{\ifcase \@lastchclass
\@acol \or
\@addtopreamble{\hskip \doublerulesep}\or
\@acol \or
\@classvii
\fi}
-
\def\@classii{\advance \count@ \m@ne
\save@decl\prepnext@tok}
-
\def\@classv{\save@decl
- \expandafter\NC@ecs\@nextchar\extracolsep{}\extracolsep\@@@
\@addtopreamble{\d@llarbegin\the@toks\the\count@\relax\d@llarend}%
\prepnext@tok}
-\def\NC@ecs#1\extracolsep#2#3\extracolsep#4\@@@{\def\@tempa{#2}%
- \ifx\@tempa\@empty\else\toks\count@={#1\tabskip#2\relax#3}\fi}
-
\def\@classi{\@classvi
\ifcase \@chnum \@arrayrule \or
\@classv \fi}
-
\def\@startpbox#1{\bgroup
\setlength\hsize{#1}\@arrayparboxrestore
\everypar{%
@@ -5487,6 +5409,7 @@
\baselineskip \z@
\m@th
\let\\\@arraycr \let\tabularnewline\\\let\par\@empty \@preamble}
+\def\arraybackslash{\let\\\tabularnewline}
\newdimen \extrarowheight
\extrarowheight=0pt
\def\@arstrut{\unhcopy\@arstrutbox}
@@ -5514,23 +5437,20 @@
\let\d@llarbegin\begingroup
\let\d@llarend\endgroup
\def\array{\col@sep\arraycolsep
- \def\d@llarbegin{$}\let\d@llarend\d@llarbegin\gdef\@halignto{}%$
+ \def\d@llarbegin{$}\let\d@llarend\d@llarbegin\def\@halignto{}%$ emacs
\@tabarray}
-\def\@tabarray{\@ifnextchar[{\@@array}{\@@array[c]}}
-\let\@@array\@array
-\def\tabular{\gdef\@halignto{}\@tabular}
+\def\@tabarray{\@ifnextchar[{\@array}{\@array[c]}}
+\def\tabular{\def\@halignto{}\@tabular}
\expandafter\def\csname tabular*\endcsname#1{%
\setlength\dimen@{#1}%
- \xdef\@halignto{to\the\dimen@}\@tabular}
+ \edef\@halignto{to\the\dimen@}\@tabular}
\def\@tabular{%
\leavevmode
- \hbox \bgroup $\col@sep\tabcolsep \let\d@llarbegin\begingroup%$
+ \hbox \bgroup $\col@sep\tabcolsep \let\d@llarbegin\begingroup% $ emacs
\let\d@llarend\endgroup
\@tabarray}
-\def\endarray{\crcr \egroup \egroup \@arrayright \gdef\@preamble{}}
-\let\@arrayleft\@empty
-\let\@arrayright\@empty
-\def\endtabular{\endarray $\egroup}%$
+\def\endarray{\crcr \egroup \egroup \gdef\@preamble{}}
+\def\endtabular{\endarray $\egroup}%$ emacs
\expandafter\let\csname endtabular*\endcsname=\endtabular
\let\@ampacol=\relax \let\@expast=\relax
\let\@arrayclassiv=\relax \let\@arrayclassz=\relax
@@ -5539,21 +5459,23 @@
\let\@tabularcr=\relax \let\@@endpbox=\relax
\let\@argtabularcr=\relax \let\@xtabularcr=\relax
\def\@preamerr#1{\def\@tempd{{..} at wrong position: }%
- \ClassError{memoir}{%
+ %\PackageError{array}{%
+ \ClassError{memoir}{% changed in menoir
\ifcase #1 Illegal pream-token (\@nextchar): `c' used\or %0
Missing arg: token ignored\or %1
Empty preamble: `l' used\or %2
>\@tempd token ignored\or %3
<\@tempd changed to !{..}\or %4
Only one column-spec. allowed.\fi}\@ehc} %5
-
\def\newcolumntype#1{%
\edef\NC@char{\string#1}%
\@ifundefined{NC@find@\NC@char}%
- {\@tfor\next:=<>clrmbp@!|\do{\if\noexpand\next\NC@char%|emacs
- \@memwarn{Redefining primitive column \NC@char}\fi}%
+ {\@tfor\next:=<>clrmbp@!|\do{\if\noexpand\next\NC@char
+ %\PackageWarning{array}%
+ \@memwarn{Redefining primitive column \NC@char}\fi}% memoir change
\NC@list\expandafter{\the\NC@list\NC@do#1}}%
- {\@memwarn{Column \NC@char\space is already defined}}%
+ {%\PackageWarning{array}
+ \@memwarn{Column \NC@char\space is already defined}}% memoir change
\@namedef{NC@find@\NC@char}##1#1{\NC@{##1}}%
\@ifnextchar[{\newcol@{\NC@char}}{\newcol@{\NC@char}[0]}}
\def\newcol@#1[#2]#3{\expandafter\@reargdef
@@ -5581,15 +5503,57 @@
\count@#1\relax
\loop
\ifnum\count@>\z@
- \advance\count@\m@ne
- \@temptokena\expandafter{\the\@temptokena#2}%
+ \advance\count@\m@ne
+ \@temptokena\expandafter{\the\@temptokena#2}%
\repeat
\NC@find}
-
+\let\@xexpast\relax
+\let\@xexnoop\relax
+\def\save@decl{\toks \count@ = \expandafter\expandafter\expandafter
+ {\expandafter\@nextchar\the\toks\count@}}
+\def\@mkpream#1{\gdef\@preamble{}\@lastchclass 4 \@firstamptrue
+ \let\@sharp\relax \let\@startpbox\relax \let\@endpbox\relax
+ \@temptokena{#1}\@tempswatrue
+ \@whilesw\if@tempswa\fi{\@tempswafalse\the\NC@list}%
+ \count@\m@ne
+ \let\the@toks\relax
+ \prepnext@tok
+ \expandafter \@tfor \expandafter \@nextchar
+ \expandafter :\expandafter =\the\@temptokena \do
+ {\@testpach
+ \ifcase \@chclass \@classz \or \@classi \or \@classii
+ \or \save@decl \or \or \@classv \or \@classvi
+ \or \@classvii \or \@classviii
+ \or \@classx
+ \or \@classx \fi
+ \@lastchclass\@chclass}%
+ \ifcase\@lastchclass
+ \@acol \or
+ \or
+ \@acol \or
+ \@preamerr \thr@@ \or
+ \@preamerr \tw@ \@addtopreamble\@sharp \or
+ \or
+ \else \@preamerr \@ne \fi
+ \def\the@toks{\the\toks}}
+\let\@classix\relax
+\def\@classviii{\ifnum \@lastchclass >\z@\ifnum\@lastchclass=\tw@\else
+ \@preamerr 4\@chclass 6 \@classvi \fi\fi}
+\def\@classv{\save@decl
+ \expandafter\NC@ecs\@nextchar\extracolsep{}\extracolsep\@@@
+ \@addtopreamble{\d@llarbegin\the@toks\the\count@\relax\d@llarend}%
+ \prepnext@tok}
+\def\NC@ecs#1\extracolsep#2#3\extracolsep#4\@@@{\def\@tempa{#2}%
+ \ifx\@tempa\@empty\else\toks\count@={#1\tabskip#2\relax#3}\fi}
+\def\@tabarray{\@ifnextchar[{\@@array}{\@@array[c]}}
+\let\@@array\@array
+\def\endarray{\crcr \egroup \egroup \@arrayright \gdef\@preamble{}}
+\let\@arrayleft\@empty
+\let\@arrayright\@empty
\newlength{\extratabsurround}
\setlength{\extratabsurround}{2pt}
\newlength{\backup@length}
-\newcommand{\firsthline}{%
+\newcommand{\firsthline}{%}} emacs
\multicolumn1c{%
\global\backup@length\ht\@arstrutbox
\global\advance\backup@length\dp\@arstrutbox
@@ -5597,7 +5561,7 @@
\raise\extratabsurround\copy\@arstrutbox
}\\[-\backup@length]\hline
}
-\newcommand{\lasthline}{\hline\multicolumn1c{%
+\newcommand{\lasthline}{\hline\multicolumn1c{%}} emacs
\global\backup@length2\ht\@arstrutbox
\global\advance\backup@length2\dp\@arstrutbox
\global\advance\backup@length\arrayrulewidth
@@ -5615,8 +5579,20 @@
\vskip\doublerulesep
\fi
\ifnum0=`{\fi}}
+%%%%%%%%%% end array.sty 2016/10/06 v2.4d %%%%%%%%%
+
+\newif \@iffirstamp
+\let\m@mold@addamp\@addamp
+\newcommand*{\m@m@addamp}{%
+ \if@firstamp
+ \@firstampfalse
+ \global\@curtab\@ne
+ \else
+ \@addtopreamble{&}
+ \global\advance\@curtab\@ne
+ \fi}
+\let\@addamp\m@m@addamp
-%%%%%%%%%%% end Array package code %%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%% Dcolumn package code %%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%% With acknowledgements to David Carlisle %%%%%%%%%%%%%%%%%%%%%
@@ -5686,6 +5662,12 @@
%%%%%%%%%% Tabularx package code %%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%% With acknowledgements to David Carlisle %%%%%%%%%%%%%%%%%%%%%
+%%% This is a carbon copy of the tabularx dtx sources for v2.11,
+%%% 2016/02/03 with two changes: error messages mention the class
+%%% instead of tabularx.
+
+%%%%%%%%%% Tabularx package code v2.11 2016/02/03 %%%%%%%%%%%%%%%%%%%%%
+
\newdimen\TX@col@width
\newdimen\TX@old@table
\newdimen\TX@old@col
@@ -5708,8 +5690,28 @@
\ifx\@tempa\TX@\expandafter\TX@endtabularx
\else\toks@\expandafter
{\the\toks@\end{#1}}\expandafter\TX@get@body\fi}
+\long\def\TX@find@endtabularxa
+ #1\endtabularx#2\endtabularx#3\TX@find@endtabularxa{%
+ \ifx\TX@#2\relax\else
+ \toks@\expandafter{\the\toks@#1}%
+ \fi}
+\long\def\TX@find@endtabularxb
+ #1\endtabularx#2\endtabularx#3\TX@find@endtabularxb{%
+ \ifx\TX@#2%
+ \expandafter\@firstoftwo
+ \else
+ \expandafter\@secondoftwo
+ \fi
+ {#1}{#2}}
+\def\TX@find@endtabularxbb{%
+ \expandafter\expandafter\expandafter
+ \TX@find@endtabularxb
+}
\def\TX@{tabularx}
\def\TX@endtabularx{%
+ \expandafter\expandafter\expandafter
+ \TX@find@endtabularxa\csname end\TX@\endcsname
+ \endtabularx\TX@\endtabularx\TX@find@endtabularxa
\expandafter\TX@newcol\expandafter{\tabularxcolumn{\TX@col@width}}%
\let\verb\TX@verb
\def\@elt##1{\global\value{##1}\the\value{##1}\relax}%
@@ -5733,9 +5735,19 @@
\csname endtabular*\endcsname}%
\global\TX@ftn\expandafter{\expandafter}\the\TX@ftn
\ifnum0=`{\fi}%
- \expandafter\end\expandafter{\TX@}}
+ \expandafter\expandafter\expandafter
+ \TX@find@endtabularxbb
+ \expandafter\end\expandafter{\TX@}%
+ \endtabularx\TX@\endtabularx\TX@find@endtabularxb
+}
\def\TX@arith{%
\TX@false
+ \@tempdimb\maxdimen
+ \divide\@tempdimb\TX@cols
+ \ifdim\TX@col@width>\@tempdimb
+ \TX@typeout@{Don't exceed \maxdimen}%
+ \wd\@tempboxa\maxdimen
+ \fi
\ifdim\TX@old@table=\wd\@tempboxa
\TX@col@width\TX@old@col
\TX@typeout@{Reached minimum width, backing up.}%
@@ -5751,7 +5763,8 @@
\divide\dimen@\TX@cols
\advance\dimen@ -\TX@col@width
\ifdim \dimen@ >\z@
- \@memwarn{X Columns too narrow (table too wide)\MessageBreak}%
+ %\PackageWarning{tabularx}%
+ \@memwarn{X Columns too narrow (table too wide)\MessageBreak}% <-- change here
\TX@col@width\TX@error@width\relax
\else
\TX@old@col\TX@col@width
@@ -5795,9 +5808,12 @@
\ifnum#1<\@m\space\fi
\ifnum#1<\@M\space\fi
#1.#2#3#4#5#6#7#8\space\space}
-\def\arraybackslash{\let\\\@arraycr}
+\ifx\arraybackslash\@undefined
+\def\arraybackslash{\let\\\tabularnewline}
+\fi
\def\tracingtabularx{%
- \def\TX@typeout{\ClassWarningNoLine{memoir}}%
+ %\def\TX@typeout{\PackageWarningNoLine{tabularx}}%
+ \def\TX@typeout{\ClassWarningNoLine{memoir}}% <--- changed
\def\TX@typeout@##1{\typeout{(tabularx) ##1}}}
\let\TX@typeout\@gobble
\let\TX@typeout@\@gobble
@@ -5836,7 +5852,7 @@
\@warning{\noexpand\verb may be unreliable inside tabularx}%
\global\let\TX@vwarn\@empty}
-%%%%%%%%%% end Tabularx package code %%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%% end Tabularx package code v2.11 %%%%%%%%%%%%%%%%%%%%%
%%\@memfakeusepackage{array}
%%\@memfakeusepackage{dcolumn}
@@ -6355,8 +6371,8 @@
\newenvironment{#2*}{\@dblfloat{#2}}{\end@dblfloat}
} % end \newfloat
-\let\mem@old@xfloat\@xfloat
-\def\@xfloat#1[#2]{\mem@old@xfloat{#1}[#2]\@nameuse{#1adjustment}}
+ %\let\mem@old@xfloat\@xfloat
+ %\def\@xfloat#1[#2]{\mem@old@xfloat{#1}[#2]\@nameuse{#1adjustment}}
\newcommand*{\setfloatlocations}[2]{\@namedef{fps@#1}{#2}}
\newcommand*\setfloatadjustment[2]{\@namedef{#1adjustment}{#2}}
@@ -6983,10 +6999,13 @@
\protected@edef\mem@currentlabelname{#1}%
\sf@@memsub@label{#2}}
+\newcommand\sf@@memsub@label@hook[1]{}
+
\AtBeginDocument{%
\@ifpackageloaded{nameref}{%
\newcommand*{\sf@@memsub@label}[1]{%
\@bsphack
+ \sf@@memsub@label@hook{#1}%
\protected@write\@auxout{}{%
\string\newlabel{#1}%
{{\@nameuse{p@sub\@captype}\@nameuse{@@thesub\@captype}}%
@@ -7000,35 +7019,43 @@
{\mem@currentlabelname\relax}%
{\@currentHref}{}}}%
\@esphack}
- }{\@ifpackageloaded{hyperref}{%
- \newcommand*{\sf@@memsub@label}[1]{%
- \@bsphack
- \protected@write\@auxout{}{%
- \string\newlabel{#1}%
- {{\@nameuse{p@sub\@captype}\@nameuse{@@thesub\@captype}}%
- {\thepage}%
- {\mem@currentlabelname\relax}%
- {\@currentHref}{}}}%
- \protected@write\@auxout{}{%
- \string\newlabel{sub@#1}%
- {{\@nameuse{@@thesub\@captype}}%
- {\thepage}%
- {\mem@currentlabelname\relax}%
- {\@currentHref}{}}}%
- \@esphack}
- }{%
- \let\@memoldlabel\label
- \newcommand*{\sf@@memsub@label}[1]{%
- \@bsphack
- \@memoldlabel{#1}%
- \protected@write\@auxout{}{%
- \string\newlabel{sub@#1}%
- {{\@nameuse{@@thesub\@captype}}%
- {\thepage}}}%
- \@esphack}
- }{}%
- }
-}
+ }{% no nameref
+ \@ifpackageloaded{hyperref}{%
+ \newcommand*{\sf@@memsub@label}[1]{%
+ \@bsphack
+ \sf@@memsub@label@hook{#1}%
+ \protected@write\@auxout{}{%
+ \string\newlabel{#1}%
+ {{\@nameuse{p@sub\@captype}\@nameuse{@@thesub\@captype}}%
+ {\thepage}%
+ {\mem@currentlabelname\relax}%
+ {\@currentHref}{}}}%
+ \protected@write\@auxout{}{%
+ \string\newlabel{sub@#1}%
+ {{\@nameuse{@@thesub\@captype}}%
+ {\thepage}%
+ {\mem@currentlabelname\relax}%
+ {\@currentHref}{}}}%
+ \@esphack}
+ }{% no hyperref
+ \let\@memoldlabel\label
+ \newcommand*{\sf@@memsub@label}[1]{%
+ \@bsphack
+ \sf@@memsub@label@hook{#1}%
+ \@memoldlabel{#1}%
+ \protected@write\@auxout{}{%
+ \string\newlabel{sub@#1}%
+ {{\@nameuse{@@thesub\@captype}}%
+ {\thepage}}}%
+ \@esphack}
+ }{}%
+ }% end no nameref
+ \@ifpackageloaded{showkeys}{%
+ \renewcommand\sf@@memsub@label@hook[1]{%
+ \SK@\SK@@label{#1}%
+ }
+ }{}
+} % end AtBeginDocument
\DeclareRobustCommand{\subcaptionref}{%
\@ifstar{\ssc@ref}{\sc@ref}}
@@ -8269,7 +8296,7 @@
\chapter*{\bibname}%
\bibmark
\ifnobibintoc\else
- \phantomsection
+ % \phantomsection
\addcontentsline{toc}{chapter}{\bibname}%
\fi
\prebibhook}
@@ -8403,8 +8430,13 @@
\protected@write\@auxout{}%
{\string\@@wrindexm@m{\@idxfile}{#1|#2hyperpage}{\thepage}}%
\else
- \protected@write\@auxout{}%
- {\string\@@wrindexm@m{\@idxfile}{#1|#2}{\thepage}}%
+ \ifx\Hy@temp@A\HyInd@ParenRight
+ \protected@write\@auxout{}%
+ {\string\@@wrindexm@m{\@idxfile}{#1|#2hyperpage}{\thepage}}%
+ \else
+ \protected@write\@auxout{}%
+ {\string\@@wrindexm@m{\@idxfile}{#1|#2}{\thepage}}%
+ \fi
\fi
\fi
\endgroup
@@ -10560,7 +10592,7 @@
\newcommand\startnoteentrystart[4]{%
\prenoteinnotes%
\noteidinnotes{#1}{#2}%
- \@ifmtarg{#2}{\def\@currentlabel{#1}}{}%
+ \@ifmtarg{#2}{\phantomsection\def\@currentlabel{#1}}{}%
\pagenoteanchor{#4}%
\pageinnotes{#3}%
\prenotetext%
@@ -11873,17 +11905,17 @@
{% else both counter and within are defined
#3}}}
-\newcommand{\counterwithin}{\@ifstar{\@csinstar}{\@csin}}
-\newcommand{\@csinstar}[2]{%
+\providecommand{\counterwithin}{\@ifstar{\@csinstar}{\@csin}}
+\providecommand{\@csinstar}[2]{%
\@ifbothcntrs{#1}{#2}{\@addtoreset{#1}{#2}}}
-\newcommand{\@csin}[2]{%
+\providecommand{\@csin}[2]{%
\@ifbothcntrs{#1}{#2}{\@addtoreset{#1}{#2}%
\@namedef{the#1}{\@nameuse{the#2}.\arabic{#1}}}}
-\newcommand{\counterwithout}{\@ifstar{\@csoutstar}{\@csout}}
-\newcommand{\@csoutstar}[2]{%
+\providecommand{\counterwithout}{\@ifstar{\@csoutstar}{\@csout}}
+\providecommand{\@csoutstar}[2]{%
\@ifbothcntrs{#1}{#2}{\@removefromreset{#1}{#2}}}
-\newcommand{\@csout}[2]{%
+\providecommand{\@csout}[2]{%
\@ifbothcntrs{#1}{#2}{\@removefromreset{#1}{#2}%
\@namedef{the#1}{\arabic{#1}}}}
@@ -12968,7 +13000,7 @@
\EmulatedPackage{abstract}[2008/07/23]
\EmulatedPackage{appendix}[2008/07/23]
-\EmulatedPackage{array}[2008/09/09]
+\EmulatedPackage{array}[2016/10/06]
\EmulatedPackage{booktabs}[2016/05/16]
\EmulatedPackage{ccaption}[2008/07/23]
\EmulatedPackage{changepage}[2008/07/23]
@@ -12976,15 +13008,15 @@
\EmulatedPackage{chngpage}[2008/07/23]
\EmulatedPackage{crop}
\EmulatedPackage{dcolumn}[2008/07/23]
-\EmulatedPackage{delarray}[2008/07/23]
+\EmulatedPackage{delarray}[2014/10/28]
\EmulatedPackage{enumerate}[2008/07/23]
\EmulatedPackage{epigraph}[2008/07/23]
%%%%%\EmulatedPackage{framed}[2008/07/23]
\EmulatedPackage{ifmtarg}[2008/07/23]
-\ifm@mifetex\EmulatedPackage{ifetex}[2008/07/23]\fi
-\ifm@mifluatex\EmulatedPackage{ifluatex}[2008/07/23]\fi
-\ifm@mifpdf\EmulatedPackage{ifpdf}[2008/07/23]\fi
-\ifm@mifxetex\EmulatedPackage{ifxetex}[2008/07/23]\fi
+ %\ifm@mifetex\EmulatedPackage{ifetex}[2008/07/23]\fi
+ %\ifm@mifluatex\EmulatedPackage{ifluatex}[2008/07/23]\fi
+ %\ifm@mifpdf\EmulatedPackage{ifpdf}[2008/07/23]\fi
+ %\ifm@mifxetex\EmulatedPackage{ifxetex}[2008/07/23]\fi
\EmulatedPackage{index}[2008/07/23]
\EmulatedPackage{makeidx}[2008/07/23]
\EmulatedPackage{moreverb}[2008/07/23]
@@ -12998,7 +13030,7 @@
\EmulatedPackage{setspace}[2008/07/23]
\EmulatedPackage{shortvrb}[2008/07/23]
\EmulatedPackage{showidx}[2008/07/23]
-\EmulatedPackage{tabularx}[2008/07/23]
+\EmulatedPackage{tabularx}[2016/02/03]
\EmulatedPackage{titleref}[2008/07/23]
\EmulatedPackage{titling}[2008/07/23]
\EmulatedPackage{tocbibind}[2008/07/23]
@@ -13060,9 +13092,6 @@
\AtBeginPackage{float}{\let\newfloat\relax}
-\IfFileExists{mempatch.sty}{%
- \RequirePackage{mempatch}}{}
-
\endinput
%%
%% End of file `memoir.cls'.
diff --git a/Master/texmf-dist/tex/latex/memoir/mempatch.sty b/Master/texmf-dist/tex/latex/memoir/mempatch.sty
deleted file mode 100644
index d5c55e97b85..00000000000
--- a/Master/texmf-dist/tex/latex/memoir/mempatch.sty
+++ /dev/null
@@ -1,38 +0,0 @@
-%%
-%% This is file `mempatch.sty',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% mempatch.dtx (with options: `patch')
-%%
-%% Author: Peter Wilson (Herries Press) herries dot press at earthlink dot net
-%% Copyright 2001 --- 2010 Peter R. Wilson
-%% Copyright 2011 --- 2013 Peter R. Wilson
-%% Maintainer: Lars Madsen (daleif at math dot au dot dk)
-%%
-%% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either
-%% version 1.3 of this license or (at your option) any
-%% later version.
-%% The latest version of the license is in
-%% http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of
-%% LaTeX version 2003/06/01 or later.
-%%
-%% This work has the LPPL maintenance status "maintained".
-%%
-%% This work consists of the files listed in the README file.
-%%
-\ProvidesPackage{mempatch}[2009/07/24 v6.0f Patches for memoir class v1.6180339]
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% Version 6.0 was released simultaneously with version 1.6180339
-%%% of memoir.
-%%% By definition there were no patches.
-%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-\endinput
-%%
-%% End of file `mempatch.sty'.