summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/memoir
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-12-12 21:24:10 +0000
committerKarl Berry <karl@freefriends.org>2018-12-12 21:24:10 +0000
commit5c9613c8e5ee20a6d2a318def5ec195d866ef734 (patch)
treef4d31360d0add93dd9da21f01dc670269e449f4d /Master/texmf-dist/tex/latex/memoir
parent07419f17633908b8ff6f03a58fdc582f676d2ddd (diff)
memoir (12dec18)
git-svn-id: svn://tug.org/texlive/trunk@49394 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/memoir')
-rw-r--r--Master/texmf-dist/tex/latex/memoir/memoir.cls1210
1 files changed, 612 insertions, 598 deletions
diff --git a/Master/texmf-dist/tex/latex/memoir/memoir.cls b/Master/texmf-dist/tex/latex/memoir/memoir.cls
index a0f3aa4e91a..73adf32de65 100644
--- a/Master/texmf-dist/tex/latex/memoir/memoir.cls
+++ b/Master/texmf-dist/tex/latex/memoir/memoir.cls
@@ -28,8 +28,8 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{memoir}%
- [2018/04/04 v3.7g configurable book, report, article document class]
-\newcommand\memversion{v3.7g, 2018/04/04}
+ [2018/12/12 v3.7h configurable book, report, article document class]
+\newcommand\memversion{v3.7h, 2018/12/12}
\newcommand*{\@ptsize}{}
\newcommand*{\@memptsize}{}
\newlength{\onelineskip}
@@ -1649,7 +1649,7 @@
The material used in the footer is too large^^J%
(\the\mem@maxfootheight) for the given foot skip
(\the\footskip), it is recommended to^^J%
- either increase the foot skip or redesign the fotoer^^J%
+ either increase the foot skip or redesign the footer^^J%
(in both cases you will find help in the memoir manual).%
}
\newcommand\mem@hvboxm[1]{%
@@ -1850,7 +1850,7 @@
\@memerror{%
Unknown mark setting type `#2' for #1mark}{%
I expected `left', `both' or `right'. \MessageBreak
- I will assume you meant `both'}%
+ I will assume you meant `both'}%
\fi
\@namedef{#1mark}{\markboth{\memUChead{#3}}{\memUChead{#3}}}%
\fi
@@ -1907,7 +1907,7 @@
\@memerror{%
Unknown mark setting type `#2' for #1mark}{%
I expected `left', `both' or `right'. \MessageBreak
- I will assume you meant `both'}%
+ I will assume you meant `both'}%
\fi
\@namedef{#1mark}##1{%
\@setclcnt{#1}{@memmarkcntra}%
@@ -2179,7 +2179,7 @@
\setSpacing{\m@m@singlespace}%
\edef\m@m@footnote@spacing{\baselinestretch}%
\edef\m@m@float@spacing{\baselinestretch}%
- \vskip\baselineskip% correction for coming into single spacing
+ \@ifstar{}{\ifx\@nodocument\relax\vskip\baselineskip\fi}% correction for coming into single spacing
}
\SingleSpacing
@@ -5258,329 +5258,337 @@
\renewcommand{\theequation}{%
\ifnum \c@chapter>\z@ \thechapter.\fi \@arabic\c@equation}
-
-%%%%%%%%%% Array package code %%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%% 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
- \ifnum \@lastchclass=7 5 \else
- \ifnum \@lastchclass=8 \tw@ \else
- \ifnum \@lastchclass=9 \thr@@
- \else \z@
- \ifnum \@lastchclass = 10 \else
- \edef\@nextchar{\expandafter\string\@nextchar}%
- \@chnum
- \if \@nextchar c\z@ \else
- \if \@nextchar l\@ne \else
- \if \@nextchar r\tw@ \else
- \z@ \@chclass
- \if\@nextchar |\@ne \else
- \if \@nextchar !6 \else
- \if \@nextchar @7 \else
- \if \@nextchar <8 \else
- \if \@nextchar >9 \else
- 10
- \@chnum
- \if \@nextchar m\thr@@\else
- \if \@nextchar p4 \else
- \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{\@nextchar}}
-\def\insert@column{%
- \the@toks \the \@tempcnta
- \ignorespaces \@sharp \unskip
- \the@toks \the \count@ \relax}
-\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
- \@xexpast #1*0x\@@
- \count@\m@ne
- \let\the@toks\relax
- \prepnext@tok
- \expandafter \@tfor \expandafter \@nextchar
- \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 \@classix
- \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}}
-\def\@classx{%
- \ifcase \@lastchclass
- \@acolampacol \or
- \@addamp \@acol \or
- \@acolampacol \or
- \or
- \@acol \@firstampfalse \or
- \@addamp
- \fi}
-\def\@classz{\@classx
- \@tempcnta \count@
- \prepnext@tok
- \@addtopreamble{\ifcase \@chnum
- \hfil
- \d@llarbegin
- \insert@column
- \d@llarend \hfil \or
- \hskip1sp\d@llarbegin \insert@column \d@llarend \hfil \or
- \hfil\hskip1sp\d@llarbegin \insert@column \d@llarend \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}
-\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
- \@addtopreamble{\d@llarbegin\the@toks\the\count@\relax\d@llarend}%
- \prepnext@tok}
-\def\@classi{\@classvi
- \ifcase \@chnum \@arrayrule \or
- \@classv \fi}
-\def\@startpbox#1{\bgroup
- \setlength\hsize{#1}\@arrayparboxrestore
- \everypar{%
- \vrule \@height \ht\@arstrutbox \@width \z@
- \everypar{}}%
- }
-\def\@endpbox{\@finalstrut\@arstrutbox \egroup\hfil}
-\def\@array[#1]#2{%
- \@tempdima \ht \strutbox
- \advance \@tempdima by\extrarowheight
- \setbox \@arstrutbox \hbox{\vrule
- \@height \arraystretch \@tempdima
- \@depth \arraystretch \dp \strutbox
- \@width \z@}%
- \begingroup
- \@mkpream{#2}%
- \xdef\@preamble{\noexpand \ialign \@halignto
- \bgroup \@arstrut \@preamble
- \tabskip \z@ \cr}%
- \endgroup
- \@arrayleft
- \if #1t\vtop \else \if#1b\vbox \else \vcenter \fi \fi
- \bgroup
- \let \@sharp ##\let \protect \relax
- \lineskip \z@
- \baselineskip \z@
- \m@th
- \let\\\@arraycr \let\tabularnewline\\\let\par\@empty \@preamble}
-\def\arraybackslash{\let\\\tabularnewline}
-\newdimen \extrarowheight
-\extrarowheight=0pt
-\def\@arstrut{\unhcopy\@arstrutbox}
-\def\@arraycr{\relax\iffalse{\fi\ifnum 0=`}\fi
- \@ifstar \@xarraycr \@xarraycr}
-\def\@xarraycr{\@ifnextchar [%
- \@argarraycr {\ifnum 0=`{}\fi\cr}}
-\def\@argarraycr[#1]{\ifnum0=`{}\fi\ifdim #1>\z@
- \expandafter\@xargarraycr\else
- \expandafter\@yargarraycr\fi{#1}}
-\def\@xargarraycr#1{\unskip
- \@tempdima #1\advance\@tempdima \dp\@arstrutbox
- \vrule \@depth\@tempdima \@width\z@ \cr}
-\def\@yargarraycr#1{\cr\noalign{\vskip #1}}
-\long\def\multicolumn#1#2#3{%
- \multispan{#1}\begingroup
- \def\@addamp{\if@firstamp \@firstampfalse \else
- \@preamerr 5\fi}%
- \@mkpream{#2}\@addtopreamble\@empty
- \endgroup
- \def\@sharp{#3}%
- \@arstrut \@preamble
- \null
- \ignorespaces}
-\let\d@llarbegin\begingroup
-\let\d@llarend\endgroup
-\def\array{\col@sep\arraycolsep
- \def\d@llarbegin{$}\let\d@llarend\d@llarbegin\def\@halignto{}%$ emacs
- \@tabarray}
-\def\@tabarray{\@ifnextchar[{\@array}{\@array[c]}}
-\def\tabular{\def\@halignto{}\@tabular}
-\expandafter\def\csname tabular*\endcsname#1{%
- \setlength\dimen@{#1}%
- \edef\@halignto{to\the\dimen@}\@tabular}
-\def\@tabular{%
- \leavevmode
- \hbox \bgroup $\col@sep\tabcolsep \let\d@llarbegin\begingroup% $ emacs
- \let\d@llarend\endgroup
- \@tabarray}
-\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
-\let\@tabclassiv=\relax \let\@tabclassz=\relax
-\let\@arrayacol=\relax \let\@tabacol=\relax
-\let\@tabularcr=\relax \let\@@endpbox=\relax
-\let\@argtabularcr=\relax \let\@xtabularcr=\relax
-\def\@preamerr#1{\def\@tempd{{..} at wrong position: }%
- %\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
- %\PackageWarning{array}%
- \@memwarn{Redefining primitive column \NC@char}\fi}% memoir change
- \NC@list\expandafter{\the\NC@list\NC@do#1}}%
- {%\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
- \csname NC@rewrite@#1\endcsname[#2]{\NC@find#3}}
-\def\NC@#1{%
- \@temptokena\expandafter{\the\@temptokena#1}\futurelet\next\NC@ifend}
-\def\NC@ifend{%
- \ifx\next\relax
- \else\@tempswatrue\expandafter\NC@rewrite\fi}
-\def\NC@do#1{%
- \expandafter\let\expandafter\NC@rewrite
- \csname NC@rewrite@\string#1\endcsname
- \expandafter\let\expandafter\NC@find
- \csname NC@find@\string#1\endcsname
- \expandafter\@temptokena\expandafter{\expandafter}%
- \expandafter\NC@find\the\@temptokena#1\relax}
-\def\showcols{{\def\NC@do##1{\let\NC@do\NC@show}\the\NC@list}}
-\def\NC@show#1{%
- \typeout{Column #1\expandafter\expandafter\expandafter\NC@strip
- \expandafter\meaning\csname NC@rewrite@#1\endcsname\@@}}
-\def\NC@strip#1:#2->#3 #4\@@{#2 -> #4}
-\newtoks\NC@list
-\newcolumntype{*}[2]{}
-\long\@namedef{NC@rewrite@*}#1#2{%
- \count@#1\relax
- \loop
- \ifnum\count@>\z@
- \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}{%}} emacs
- \multicolumn1c{%
- \global\backup@length\ht\@arstrutbox
- \global\advance\backup@length\dp\@arstrutbox
- \global\advance\backup@length\arrayrulewidth
- \raise\extratabsurround\copy\@arstrutbox
- }\\[-\backup@length]\hline
-}
-\newcommand{\lasthline}{\hline\multicolumn1c{%}} emacs
- \global\backup@length2\ht\@arstrutbox
- \global\advance\backup@length2\dp\@arstrutbox
- \global\advance\backup@length\arrayrulewidth
- }\\[-\backup@length]%
- \multicolumn1c{%
- \lower\extratabsurround\copy\@arstrutbox
- }%
-}
-\CheckCommand*\@xhline{\ifx\reserved@a\hline
- \vskip\doublerulesep
- \vskip-\arrayrulewidth
- \fi
- \ifnum0=`{\fi}}
-\renewcommand*\@xhline{\ifx\reserved@a\hline
- \vskip\doublerulesep
- \fi
- \ifnum0=`{\fi}}
-%%%%%%%%%% end array.sty 2016/10/06 v2.4d %%%%%%%%%
-
+\RequirePackage{array}[2018/04/30]
+ %
+ % %%%%%%%%%% Array package code %%%%%%%%%%%%%%%%%%%%%
+ % %%%%%%%%%% With acknowledgements to %%%%%%%%%%%%%%%%%%%%%
+ % %%%%%%%%%% Frank Mittelbach & David Carlisle %%%%%%%%%%%%%%%%%%%%%
+ %
+ % %%%%%%%%%% Copy corresponds to array.sty 2016/10/06 v2.4d %%%%%%%%%
+ % % \newcount \@chclass
+ % % \newcount \@chnum
+ % % \newcount \@lastchclass
+ % \def\@addtopreamble#1{\xdef\@preamble{\@preamble #1}}
+ % \def\@testpach{\@chclass
+ % \ifnum \@lastchclass=6 \@ne \@chnum \@ne \else
+ % \ifnum \@lastchclass=7 5 \else
+ % \ifnum \@lastchclass=8 \tw@ \else
+ % \ifnum \@lastchclass=9 \thr@@
+ % \else \z@
+ % \ifnum \@lastchclass = 10 \else
+ % \edef\@nextchar{\expandafter\string\@nextchar}%
+ % \@chnum
+ % \if \@nextchar c\z@ \else
+ % \if \@nextchar l\@ne \else
+ % \if \@nextchar r\tw@ \else
+ % \z@ \@chclass
+ % \if\@nextchar |\@ne \else
+ % \if \@nextchar !6 \else
+ % \if \@nextchar @7 \else
+ % \if \@nextchar <8 \else
+ % \if \@nextchar >9 \else
+ % 10
+ % \@chnum
+ % \if \@nextchar m\thr@@\else
+ % \if \@nextchar p4 \else
+ % \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\@xexnoop#1\@@{}
+ % \def\prepnext@tok{\advance \count@ \@ne
+ % \toks\count@{}}
+ % \def\save@decl{\toks\count@ \expandafter{\@nextchar}}
+ % \def\insert@column{%
+ % \the@toks \the \@tempcnta
+ % \ignorespaces \@sharp \unskip
+ % \the@toks \the \count@ \relax}
+ % % \newif \@iffirstamp
+ % % \def\@addamp{\if@firstamp \@firstampfalse
+ % % \else \@addtopreamble &\fi}
+ % \newdimen\col@sep
+ % \def\@acol{\@addtopreamble{\hskip\col@sep}}
+ % % \def\@acolampacol{\@acol\@addamp\@acol}
+ % \def\@mkpream#1{\gdef\@preamble{}\@lastchclass 4 \@firstamptrue
+ % \let\@sharp\relax \let\@startpbox\relax \let\@endpbox\relax
+ % \@xexpast #1*0x\@@
+ % \count@\m@ne
+ % \let\the@toks\relax
+ % \prepnext@tok
+ % \expandafter \@tfor \expandafter \@nextchar
+ % \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 \@classix
+ % \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}}
+ % \def\@classx{%
+ % \ifcase \@lastchclass
+ % \@acolampacol \or
+ % \@addamp \@acol \or
+ % \@acolampacol \or
+ % \or
+ % \@acol \@firstampfalse \or
+ % \@addamp
+ % \fi}
+ % \def\@classz{\@classx
+ % \@tempcnta \count@
+ % \prepnext@tok
+ % \@addtopreamble{\ifcase \@chnum
+ % \hfil
+ % \d@llarbegin
+ % \insert@column
+ % \d@llarend \hfil \or
+ % \hskip1sp\d@llarbegin \insert@column \d@llarend \hfil \or
+ % \hfil\hskip1sp\d@llarbegin \insert@column \d@llarend \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}
+ % \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
+ % \@addtopreamble{\d@llarbegin\the@toks\the\count@\relax\d@llarend}%
+ % \prepnext@tok}
+ % \def\@classi{\@classvi
+ % \ifcase \@chnum \@arrayrule \or
+ % \@classv \fi}
+ % \def\@startpbox#1{\bgroup
+ % \setlength\hsize{#1}\@arrayparboxrestore
+ % \everypar{%
+ % \vrule \@height \ht\@arstrutbox \@width \z@
+ % \everypar{}}%
+ % }
+ % \def\@endpbox{\@finalstrut\@arstrutbox \egroup\hfil}
+ % \def\@array[#1]#2{%
+ % \@tempdima \ht \strutbox
+ % \advance \@tempdima by\extrarowheight
+ % \setbox \@arstrutbox \hbox{\vrule
+ % \@height \arraystretch \@tempdima
+ % \@depth \arraystretch \dp \strutbox
+ % \@width \z@}%
+ % \begingroup
+ % \@mkpream{#2}%
+ % \xdef\@preamble{\noexpand \ialign \@halignto
+ % \bgroup \@arstrut \@preamble
+ % \tabskip \z@ \cr}%
+ % \endgroup
+ % \@arrayleft
+ % \if #1t\vtop \else \if#1b\vbox \else \vcenter \fi \fi
+ % \bgroup
+ % \let \@sharp ##\let \protect \relax
+ % \lineskip \z@
+ % \baselineskip \z@
+ % \m@th
+ % \let\\\@arraycr \let\tabularnewline\\\let\par\@empty \@preamble}
+ % \def\arraybackslash{\let\\\tabularnewline}
+ % \newdimen \extrarowheight
+ % \extrarowheight=0pt
+ % \def\@arstrut{\unhcopy\@arstrutbox}
+ % \def\@arraycr{\relax\iffalse{\fi\ifnum 0=`}\fi
+ % \@ifstar \@xarraycr \@xarraycr}
+ % \def\@xarraycr{\@ifnextchar [%
+ % \@argarraycr {\ifnum 0=`{}\fi\cr}}
+ % \def\@argarraycr[#1]{\ifnum0=`{}\fi\ifdim #1>\z@
+ % \expandafter\@xargarraycr\else
+ % \expandafter\@yargarraycr\fi{#1}}
+ % \def\@xargarraycr#1{\unskip
+ % \@tempdima #1\advance\@tempdima \dp\@arstrutbox
+ % \vrule \@depth\@tempdima \@width\z@ \cr}
+ % \def\@yargarraycr#1{\cr\noalign{\vskip #1}}
+ % \long\def\multicolumn#1#2#3{%
+ % \multispan{#1}\begingroup
+ % \def\@addamp{\if@firstamp \@firstampfalse \else
+ % \@preamerr 5\fi}%
+ % \@mkpream{#2}\@addtopreamble\@empty
+ % \endgroup
+ % \def\@sharp{#3}%
+ % \@arstrut \@preamble
+ % \null
+ % \ignorespaces}
+ % \let\d@llarbegin\begingroup
+ % \let\d@llarend\endgroup
+ % \def\array{\col@sep\arraycolsep
+ % \def\d@llarbegin{$}\let\d@llarend\d@llarbegin\def\@halignto{}%$ emacs
+ % \@tabarray}
+ % \def\@tabarray{\@ifnextchar[{\@array}{\@array[c]}}
+ % \def\tabular{\def\@halignto{}\@tabular}
+ % \expandafter\def\csname tabular*\endcsname#1{%
+ % \setlength\dimen@{#1}%
+ % \edef\@halignto{to\the\dimen@}\@tabular}
+ % \def\@tabular{%
+ % \leavevmode
+ % \hbox \bgroup $\col@sep\tabcolsep \let\d@llarbegin\begingroup% $ emacs
+ % \let\d@llarend\endgroup
+ % \@tabarray}
+ % \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
+ % \let\@tabclassiv=\relax \let\@tabclassz=\relax
+ % \let\@arrayacol=\relax \let\@tabacol=\relax
+ % \let\@tabularcr=\relax \let\@@endpbox=\relax
+ % \let\@argtabularcr=\relax \let\@xtabularcr=\relax
+ % \def\@preamerr#1{\def\@tempd{{..} at wrong position: }%
+ % %\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
+ % %\PackageWarning{array}%
+ % \@memwarn{Redefining primitive column \NC@char}\fi}% memoir change
+ % \NC@list\expandafter{\the\NC@list\NC@do#1}}%
+ % {%\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
+ % \csname NC@rewrite@#1\endcsname[#2]{\NC@find#3}}
+ % \def\NC@#1{%
+ % \@temptokena\expandafter{\the\@temptokena#1}\futurelet\next\NC@ifend}
+ % \def\NC@ifend{%
+ % \ifx\next\relax
+ % \else\@tempswatrue\expandafter\NC@rewrite\fi}
+ % \def\NC@do#1{%
+ % \expandafter\let\expandafter\NC@rewrite
+ % \csname NC@rewrite@\string#1\endcsname
+ % \expandafter\let\expandafter\NC@find
+ % \csname NC@find@\string#1\endcsname
+ % \expandafter\@temptokena\expandafter{\expandafter}%
+ % \expandafter\NC@find\the\@temptokena#1\relax}
+ % \def\showcols{{\def\NC@do##1{\let\NC@do\NC@show}\the\NC@list}}
+ % \def\NC@show#1{%
+ % \typeout{Column #1\expandafter\expandafter\expandafter\NC@strip
+ % \expandafter\meaning\csname NC@rewrite@#1\endcsname\@@}}
+ % \def\NC@strip#1:#2->#3 #4\@@{#2 -> #4}
+ % \newtoks\NC@list
+ % \newcolumntype{*}[2]{}
+ % \long\@namedef{NC@rewrite@*}#1#2{%
+ % \count@#1\relax
+ % \loop
+ % \ifnum\count@>\z@
+ % \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}{%}} emacs
+ % \multicolumn1c{%
+ % \global\backup@length\ht\@arstrutbox
+ % \global\advance\backup@length\dp\@arstrutbox
+ % \global\advance\backup@length\arrayrulewidth
+ % \raise\extratabsurround\copy\@arstrutbox
+ % }\\[-\backup@length]\hline
+ % }
+ % \newcommand{\lasthline}{\hline\multicolumn1c{%}} emacs
+ % \global\backup@length2\ht\@arstrutbox
+ % \global\advance\backup@length2\dp\@arstrutbox
+ % \global\advance\backup@length\arrayrulewidth
+ % }\\[-\backup@length]%
+ % \multicolumn1c{%
+ % \lower\extratabsurround\copy\@arstrutbox
+ % }%
+ % }
+ % \CheckCommand*\@xhline{\ifx\reserved@a\hline
+ % \vskip\doublerulesep
+ % \vskip-\arrayrulewidth
+ % \fi
+ % \ifnum0=`{\fi}}
+ % \renewcommand*\@xhline{\ifx\reserved@a\hline
+ % \vskip\doublerulesep
+ % \fi
+ % \ifnum0=`{\fi}}
+ % %%%%%%%%%% end array.sty 2016/10/06 v2.4d %%%%%%%%%
+ %
\newif \@iffirstamp
\let\m@mold@addamp\@addamp
\newcommand*{\m@m@addamp}{%
@@ -5594,271 +5602,277 @@
\let\@addamp\m@m@addamp
-%%%%%%%%%% Dcolumn package code %%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%% With acknowledgements to David Carlisle %%%%%%%%%%%%%%%%%%%%%
-
-\def\DC@#1#2#3{%
- \uccode`\~=`#1\relax
- \m@th
- \afterassignment\DC@x\count@#3\relax{#1}{#2}}
-\def\DC@x#1\relax#2#3{%
- \ifnum\z@>\count@
- \expandafter\DC@centre
- \else
- \expandafter\DC@right
- \fi
- {#2}{#3}{#1}}
-\def\DC@centre#1#2#3{%
- \let\DC@end\DC@endcentre
- \uppercase{\def~}{$\egroup\setbox\tw@=\hbox\bgroup${#2}}%$
- \setbox\tw@=\hbox{${\phantom{{#2}}}$}%
- \setbox\z@=\hbox\bgroup$\mathcode`#1="8000 }%$
-\def\DC@endcentre{$\egroup%$
- \ifdim \wd\z@>\wd\tw@
- \setbox\tw@=\hbox to\wd\z@{\unhbox\tw@\hfill}%
- \else
- \setbox\z@=\hbox to\wd\tw@{\hfill\unhbox\z@}\fi
- \box\z@\box\tw@}
-\def\DC@right#1#2#3{%
- \ifx\relax#3\relax
- \hfill
- \let\DC@rl\bgroup
- \else
- \edef\DC@rl{to\the\count@\dimen@ii\bgroup\hss\hfill}%
- \count@\@gobble#3\relax
- \fi
- \let\DC@end\DC@endright
- \uppercase{\def~}{$\egroup\setbox\tw@\hbox to\dimen@\bgroup${#2}}%
- \setbox\z@\hbox{$1$}\dimen@ii\wd\z@
- \dimen@\count@\dimen@ii
- \setbox\z@\hbox{${#2}$}\advance\dimen@\wd\z@
- \setbox\tw@\hbox to\dimen@{}%
- \setbox\z@\hbox\DC@rl$\mathcode`#1="8000 }%$
-\def\DC@endright{$\hfil\egroup\box\z@\box\tw@}%$
-\newcolumntype{D}[3]{>{\DC@{#1}{#2}{#3}}c<{\DC@end}}
-
-%%%%%%%%%% end Dcolumn package code %%%%%%%%%%%%%%%%%%%%%
-
-%%%%%%%%%% Delarray package code %%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%% With acknowledgements to David Carlisle %%%%%%%%%%%%%%%%%%%%%
-
-\def\@@array[#1]{\@ifnextchar\bgroup
- {\let\@arrayleft\relax\let\@arrayright\relax\@array[#1]}%
- {\@del@array[#1]}}
-\def\@del@array[#1]#2#3#4{%
- \setbox\z@\hbox{$\left#2\right#4$}%
- \if#1c\def\@arrayleft{\left#2}\def\@arrayright{\right#4}%
- \else\def\@arrayleft{\setbox\z@}%
- \def\@arrayright{%
- \dimen@=\dp\z@
- \advance\dimen@-\ht\z@
- \divide \dimen@ by \tw@
- \advance\dimen@ by\fontdimen22 \textfont\tw@
- \lower\dimen@\hbox{$\left#2\vcenter{\unvbox\z@}\right#4$}}%
- \fi
- \@array[#1]{#3}}
-%%%%%%%%%% end Delarray package code %%%%%%%%%%%%%%%%%%%%%
-
-%%%%%%%%%% 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
-\newdimen\TX@target
-\newdimen\TX@delta
-\newcount\TX@cols
-\newif\ifTX@
-\def\tabularx#1{%
-\edef\TX@{\@currenvir}%
- {\ifnum0=`}\fi
- \setlength\TX@target{#1}%
- \TX@typeout{Target width: #1 = \the\TX@target.}%
- \toks@{}\TX@get@body}
-
-\let\endtabularx\relax
-\long\def\TX@get@body#1\end
- {\toks@\expandafter{\the\toks@#1}\TX@find@end}
-\def\TX@find@end#1{%
- \def\@tempa{#1}%
- \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}%
- \edef\TX@ckpt{\cl@@ckpt}%
- \let\@elt\relax
- \TX@old@table\maxdimen
- \TX@col@width\TX@target
- \global\TX@cols\@ne
- \TX@typeout@
- {\@spaces Table Width\@spaces Column Width\@spaces X Columns}%
- \TX@trial{\def\NC@rewrite@X{%
- \global\advance\TX@cols\@ne\NC@find p{\TX@col@width}}}%
- \loop
- \TX@arith
- \ifTX@
- \TX@trial{}%
- \repeat
- {\let\@footnotetext\TX@ftntext\let\@xfootnotenext\TX@xftntext
- \csname tabular*\expandafter\endcsname\expandafter\TX@target
- \the\toks@
- \csname endtabular*\endcsname}%
- \global\TX@ftn\expandafter{\expandafter}\the\TX@ftn
- \ifnum0=`{\fi}%
- \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.}%
- \else
- \dimen@\wd\@tempboxa
- \advance\dimen@ -\TX@target
- \ifdim\dimen@<\TX@delta
- \TX@typeout@{Reached target.}%
- \else
- \ifnum\TX@cols>\@ne
- \advance\TX@cols\m@ne
- \fi
- \divide\dimen@\TX@cols
- \advance\dimen@ -\TX@col@width
- \ifdim \dimen@ >\z@
- %\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
- \TX@old@table\wd\@tempboxa
- \TX@col@width-\dimen@
- \TX@true
- \fi
- \fi
- \fi}
-\def\TX@error@width{1em}
-\TX@delta\hfuzz
-\newcolumntype{X}{}
-\def\tabularxcolumn#1{p{#1}}
-\def\TX@newcol{\newcol@{X}[0]}
-\def\TX@trial#1{%
- \setbox\@tempboxa\hbox{%
- #1\relax
- \let\@footnotetext\TX@trial@ftn
- \let\TX@vwarn\@empty
- \expandafter\let\expandafter\tabularx\csname tabular*\endcsname
- \expandafter\let\expandafter\endtabularx\csname endtabular*\endcsname
- \def\write{\begingroup
- \def\let{\afterassignment\endgroup\toks@}%
- \afterassignment\let\count@}%
- \hbadness\@M
- \hfuzz\maxdimen
- \let\hbadness\@tempcnta
- \let\hfuzz\@tempdima
- \expandafter\tabular\the\toks@
- \endtabular}%
- \TX@ckpt
- \TX@typeout@{\@spaces
- \expandafter\TX@align
- \the\wd\@tempboxa\space\space\space\space\space\@@
- \expandafter\TX@align
- \the\TX@col@width\space\space\space\space\space\@@
- \@spaces\the\TX@cols}}
-\def\TX@align#1.#2#3#4#5#6#7#8#9\@@{%
- \ifnum#1<10 \space\fi
- \ifnum#1<100 \space\fi
- \ifnum#1<\@m\space\fi
- \ifnum#1<\@M\space\fi
- #1.#2#3#4#5#6#7#8\space\space}
-\ifx\arraybackslash\@undefined
-\def\arraybackslash{\let\\\tabularnewline}
-\fi
-\def\tracingtabularx{%
- %\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
-\newtoks\TX@ftn
-\long\def\TX@ftntext#1{%
- \edef\@tempa{\the\TX@ftn\noexpand\footnotetext
- [\the\csname c@\@mpfn\endcsname]}%
- \global\TX@ftn\expandafter{\@tempa{#1}}}%
-\long\def\TX@xftntext[#1]#2{%
- \global\TX@ftn\expandafter{\the\TX@ftn\footnotetext[#1]{#2}}}
-\long\def\TX@trial@ftn#1{}
-{\uccode`\*=`\ %
-\uppercase{\gdef\TX@verb{%
- \leavevmode\null\TX@vwarn
- {\ifnum0=`}\fi\ttfamily\let\\\ignorespaces
- \@ifstar{\let~*\TX@vb}{\TX@vb}}}}
-\def\TX@vb#1{\def\@tempa##1#1{\toks@{##1}\edef\@tempa{\the\toks@}%
- \expandafter\TX@v\meaning\@tempa\\ \\\ifnum0=`{\fi}}\@tempa!}
-\def\TX@v#1!{\afterassignment\TX@vfirst\let\@tempa= }
-\begingroup
-\catcode`\*=\catcode`\#
-\catcode`\#=12
-\gdef\TX@vfirst{%
- \if\@tempa#%
- \def\@tempb{\TX@v@#}%
- \else
- \let\@tempb\TX@v@
- \if\@tempa\space~\else\@tempa\fi
- \fi
- \@tempb}
-\gdef\TX@v@*1 *2{%
- \TX@v@hash*1##\relax\if*2\\\else~\expandafter\TX@v@\fi*2}
-\gdef\TX@v@hash*1##*2{*1\ifx*2\relax\else#\expandafter\TX@v@hash\fi*2}
-\endgroup
-\def\TX@vwarn{%
- \@warning{\noexpand\verb may be unreliable inside tabularx}%
- \global\let\TX@vwarn\@empty}
-
-%%%%%%%%%% end Tabularx package code v2.11 %%%%%%%%%%%%%%%%%%%%%
-
-%%\@memfakeusepackage{array}
-%%\@memfakeusepackage{dcolumn}
-%%\@memfakeusepackage{delarray}
-%%\@memfakeusepackage{tabularx}
-
+\RequirePackage{dcolumn}[2014/10/28]
+ % %%%%%%%%%% Dcolumn package code %%%%%%%%%%%%%%%%%%%%%
+ % %%%%%%%%%% With acknowledgements to David Carlisle %%%%%%%%%%%%%%%%%%%%%
+ %
+ % \def\DC@#1#2#3{%
+ % \uccode`\~=`#1\relax
+ % \m@th
+ % \afterassignment\DC@x\count@#3\relax{#1}{#2}}
+ % \def\DC@x#1\relax#2#3{%
+ % \ifnum\z@>\count@
+ % \expandafter\DC@centre
+ % \else
+ % \expandafter\DC@right
+ % \fi
+ % {#2}{#3}{#1}}
+ % \def\DC@centre#1#2#3{%
+ % \let\DC@end\DC@endcentre
+ % \uppercase{\def~}{$\egroup\setbox\tw@=\hbox\bgroup${#2}}%$
+ % \setbox\tw@=\hbox{${\phantom{{#2}}}$}%
+ % \setbox\z@=\hbox\bgroup$\mathcode`#1="8000 }%$
+ % \def\DC@endcentre{$\egroup%$
+ % \ifdim \wd\z@>\wd\tw@
+ % \setbox\tw@=\hbox to\wd\z@{\unhbox\tw@\hfill}%
+ % \else
+ % \setbox\z@=\hbox to\wd\tw@{\hfill\unhbox\z@}\fi
+ % \box\z@\box\tw@}
+ % \def\DC@right#1#2#3{%
+ % \ifx\relax#3\relax
+ % \hfill
+ % \let\DC@rl\bgroup
+ % \else
+ % \edef\DC@rl{to\the\count@\dimen@ii\bgroup\hss\hfill}%
+ % \count@\@gobble#3\relax
+ % \fi
+ % \let\DC@end\DC@endright
+ % \uppercase{\def~}{$\egroup\setbox\tw@\hbox to\dimen@\bgroup${#2}}%
+ % \setbox\z@\hbox{$1$}\dimen@ii\wd\z@
+ % \dimen@\count@\dimen@ii
+ % \setbox\z@\hbox{${#2}$}\advance\dimen@\wd\z@
+ % \setbox\tw@\hbox to\dimen@{}%
+ % \setbox\z@\hbox\DC@rl$\mathcode`#1="8000 }%$
+ % \def\DC@endright{$\hfil\egroup\box\z@\box\tw@}%$
+ % \newcolumntype{D}[3]{>{\DC@{#1}{#2}{#3}}c<{\DC@end}}
+ %
+ % %%%%%%%%%% end Dcolumn package code %%%%%%%%%%%%%%%%%%%%%
+ %
+\RequirePackage{delarray}[2014/10/28]
+ % %%%%%%%%%% Delarray package code %%%%%%%%%%%%%%%%%%%%%
+ % %%%%%%%%%% With acknowledgements to David Carlisle %%%%%%%%%%%%%%%%%%%%%
+ %
+ % \def\@@array[#1]{\@ifnextchar\bgroup
+ % {\let\@arrayleft\relax\let\@arrayright\relax\@array[#1]}%
+ % {\@del@array[#1]}}
+ % \def\@del@array[#1]#2#3#4{%
+ % \setbox\z@\hbox{$\left#2\right#4$}%
+ % \if#1c\def\@arrayleft{\left#2}\def\@arrayright{\right#4}%
+ % \else\def\@arrayleft{\setbox\z@}%
+ % \def\@arrayright{%
+ % \dimen@=\dp\z@
+ % \advance\dimen@-\ht\z@
+ % \divide \dimen@ by \tw@
+ % \advance\dimen@ by\fontdimen22 \textfont\tw@
+ % \lower\dimen@\hbox{$\left#2\vcenter{\unvbox\z@}\right#4$}}%
+ % \fi
+ % \@array[#1]{#3}}
+ % %%%%%%%%%% end Delarray package code %%%%%%%%%%%%%%%%%%%%%
+ %
+\RequirePackage{tabularx}[2016/02/03]
+
+ % %%%%%%%%%% 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
+ % \newdimen\TX@target
+ % \newdimen\TX@delta
+ % \newcount\TX@cols
+ % \newif\ifTX@
+ % \def\tabularx#1{%
+ % \edef\TX@{\@currenvir}%
+ % {\ifnum0=`}\fi
+ % \setlength\TX@target{#1}%
+ % \TX@typeout{Target width: #1 = \the\TX@target.}%
+ % \toks@{}\TX@get@body}
+ % \let\endtabularx\relax
+ % \long\def\TX@get@body#1\end
+ % {\toks@\expandafter{\the\toks@#1}\TX@find@end}
+ % \def\TX@find@end#1{%
+ % \def\@tempa{#1}%
+ % \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}%
+ % \edef\TX@ckpt{\cl@@ckpt}%
+ % \let\@elt\relax
+ % \TX@old@table\maxdimen
+ % \TX@col@width\TX@target
+ % \global\TX@cols\@ne
+ % \TX@typeout@
+ % {\@spaces Table Width\@spaces Column Width\@spaces X Columns}%
+ % \TX@trial{\def\NC@rewrite@X{%
+ % \global\advance\TX@cols\@ne\NC@find p{\TX@col@width}}}%
+ % \loop
+ % \TX@arith
+ % \ifTX@
+ % \TX@trial{}%
+ % \repeat
+ % {\let\@footnotetext\TX@ftntext\let\@xfootnotenext\TX@xftntext
+ % \csname tabular*\expandafter\endcsname\expandafter\TX@target
+ % \the\toks@
+ % \csname endtabular*\endcsname}%
+ % \global\TX@ftn\expandafter{\expandafter}\the\TX@ftn
+ % \ifnum0=`{\fi}%
+ % \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.}%
+ % \else
+ % \dimen@\wd\@tempboxa
+ % \advance\dimen@ -\TX@target
+ % \ifdim\dimen@<\TX@delta
+ % \TX@typeout@{Reached target.}%
+ % \else
+ % \ifnum\TX@cols>\@ne
+ % \advance\TX@cols\m@ne
+ % \fi
+ % \divide\dimen@\TX@cols
+ % \advance\dimen@ -\TX@col@width
+ % \ifdim \dimen@ >\z@
+ % %\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
+ % \TX@old@table\wd\@tempboxa
+ % \TX@col@width-\dimen@
+ % \TX@true
+ % \fi
+ % \fi
+ % \fi}
+ % \def\TX@error@width{1em}
+ % \TX@delta\hfuzz
+ % \newcolumntype{X}{}
+ % \def\tabularxcolumn#1{p{#1}}
+ % \def\TX@newcol{\newcol@{X}[0]}
+ % \def\TX@trial#1{%
+ % \setbox\@tempboxa\hbox{%
+ % #1\relax
+ % \let\@footnotetext\TX@trial@ftn
+ % \let\TX@vwarn\@empty
+ % \expandafter\let\expandafter\tabularx\csname tabular*\endcsname
+ % \expandafter\let\expandafter\endtabularx\csname endtabular*\endcsname
+ % \def\write{\begingroup
+ % \def\let{\afterassignment\endgroup\toks@}%
+ % \afterassignment\let\count@}%
+ % \hbadness\@M
+ % \hfuzz\maxdimen
+ % \let\hbadness\@tempcnta
+ % \let\hfuzz\@tempdima
+ % \expandafter\tabular\the\toks@
+ % \endtabular}%
+ % \TX@ckpt
+ % \TX@typeout@{\@spaces
+ % \expandafter\TX@align
+ % \the\wd\@tempboxa\space\space\space\space\space\@@
+ % \expandafter\TX@align
+ % \the\TX@col@width\space\space\space\space\space\@@
+ % \@spaces\the\TX@cols}}
+ % \def\TX@align#1.#2#3#4#5#6#7#8#9\@@{%
+ % \ifnum#1<10 \space\fi
+ % \ifnum#1<100 \space\fi
+ % \ifnum#1<\@m\space\fi
+ % \ifnum#1<\@M\space\fi
+ % #1.#2#3#4#5#6#7#8\space\space}
+ % \ifx\arraybackslash\@undefined
+ % \def\arraybackslash{\let\\\tabularnewline}
+ % \fi
+ % \def\tracingtabularx{%
+ % %\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
+ % \newtoks\TX@ftn
+ % \long\def\TX@ftntext#1{%
+ % \edef\@tempa{\the\TX@ftn\noexpand\footnotetext
+ % [\the\csname c@\@mpfn\endcsname]}%
+ % \global\TX@ftn\expandafter{\@tempa{#1}}}%
+ % \long\def\TX@xftntext[#1]#2{%
+ % \global\TX@ftn\expandafter{\the\TX@ftn\footnotetext[#1]{#2}}}
+ % \long\def\TX@trial@ftn#1{}
+ % {\uccode`\*=`\ %
+ % \uppercase{\gdef\TX@verb{%
+ % \leavevmode\null\TX@vwarn
+ % {\ifnum0=`}\fi\ttfamily\let\\\ignorespaces
+ % \@ifstar{\let~*\TX@vb}{\TX@vb}}}}
+ % \def\TX@vb#1{\def\@tempa##1#1{\toks@{##1}\edef\@tempa{\the\toks@}%
+ % \expandafter\TX@v\meaning\@tempa\\ \\\ifnum0=`{\fi}}\@tempa!}
+ % \def\TX@v#1!{\afterassignment\TX@vfirst\let\@tempa= }
+ % \begingroup
+ % \catcode`\*=\catcode`\#
+ % \catcode`\#=12
+ % \gdef\TX@vfirst{%
+ % \if\@tempa#%
+ % \def\@tempb{\TX@v@#}%
+ % \else
+ % \let\@tempb\TX@v@
+ % \if\@tempa\space~\else\@tempa\fi
+ % \fi
+ % \@tempb}
+ % \gdef\TX@v@*1 *2{%
+ % \TX@v@hash*1##\relax\if*2\\\else~\expandafter\TX@v@\fi*2}
+ % \gdef\TX@v@hash*1##*2{*1\ifx*2\relax\else#\expandafter\TX@v@hash\fi*2}
+ % \endgroup
+ % \def\TX@vwarn{%
+ % \@warning{\noexpand\verb may be unreliable inside tabularx}%
+ % \global\let\TX@vwarn\@empty}
+ %
+ % %%%%%%%%%% end Tabularx package code v2.11 %%%%%%%%%%%%%%%%%%%%%
+ %
+ %
+ %
+ %
+ % %%\@memfakeusepackage{array}
+ % %%\@memfakeusepackage{dcolumn}
+ % %%\@memfakeusepackage{delarray}
+ % %%\@memfakeusepackage{tabularx}
+ %
\newcommand*{\bktabrule}[1]{%
\hrule \@height#1}
@@ -13000,15 +13014,15 @@
\EmulatedPackage{abstract}[2008/07/23]
\EmulatedPackage{appendix}[2008/07/23]
-\EmulatedPackage{array}[2016/10/06]
+ % \EmulatedPackage{array}[2016/10/06]
\EmulatedPackage{booktabs}[2016/05/16]
\EmulatedPackage{ccaption}[2008/07/23]
\EmulatedPackage{changepage}[2008/07/23]
\EmulatedPackage{chngcntr}[2008/07/23]
\EmulatedPackage{chngpage}[2008/07/23]
\EmulatedPackage{crop}
-\EmulatedPackage{dcolumn}[2008/07/23]
-\EmulatedPackage{delarray}[2014/10/28]
+ % \EmulatedPackage{dcolumn}[2008/07/23]
+ % \EmulatedPackage{delarray}[2014/10/28]
\EmulatedPackage{enumerate}[2008/07/23]
\EmulatedPackage{epigraph}[2008/07/23]
%%%%%\EmulatedPackage{framed}[2008/07/23]
@@ -13030,7 +13044,7 @@
\EmulatedPackage{setspace}[2008/07/23]
\EmulatedPackage{shortvrb}[2008/07/23]
\EmulatedPackage{showidx}[2008/07/23]
-\EmulatedPackage{tabularx}[2016/02/03]
+ % \EmulatedPackage{tabularx}[2016/02/03]
\EmulatedPackage{titleref}[2008/07/23]
\EmulatedPackage{titling}[2008/07/23]
\EmulatedPackage{tocbibind}[2008/07/23]