summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty')
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty199
1 files changed, 104 insertions, 95 deletions
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty
index 511dc188501..851868441a9 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `patch-memoir')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% Copyright 2016-2020 Brian Dunn
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -38,7 +38,14 @@
\RequirePackage{lwarp-parskip}
\RequirePackage{lwarp-setspace}% req'd
\RequirePackage{lwarp-showidx}
-\RequirePackage{lwarp-subfigure}% red'q
+
+\AtBeginDocument{%
+ \@ifpackageloaded{subcaption}{}{
+ \RequirePackage{lwarp-subfigure}
+ \let\subfigure\subbottom
+ \let\subtable\subtop
+ }%
+}%
\makeindex
\LetLtxMacro\LWR@memorignewsubfloat\newsubfloat
\RenewDocumentCommand{\newsubfloat}{O{} m}{%
@@ -213,8 +220,9 @@
\newcommand{\titlingpageend}[2]{}
\let\andnext\and
\renewcommand*{\thanksmarkstyle}[1]{}
+
\renewcommand{\thanksfootmark}{%
-\thanksscript{\tamark}%
+ \thanksscript{\tamark}%
}
\renewcommand*{\abstractcol}{}
@@ -239,7 +247,7 @@
}
\DeclareDocumentCommand{\frontmatter}{s}{%
-\boolfalse{LWR@mainmatter}%
+ \boolfalse{LWR@mainmatter}%
}
\renewcommand*{\raggedbottomsection}{}
\renewcommand*{\normalbottomsection}{}
@@ -354,17 +362,17 @@
\RenewDocumentCommand{\plainbreak}{s m}{\begin{center}~\end{center}}
\RenewDocumentCommand{\fancybreak}{s +m}{%
-\begin{center}#2\end{center}%
+ \begin{center}#2\end{center}%
}
\RenewDocumentCommand{\plainfancybreak}{s m m +m}{%
-\begin{center}#4\end{center}%
+ \begin{center}#4\end{center}%
}
\RenewDocumentCommand{\pfbreak}{s}{%
-\begin{center}
-\pfbreakdisplay
-\end{center}
+ \begin{center}
+ \pfbreakdisplay
+ \end{center}
}
\renewcommand{\pfbreakdisplay}{*\quad*\quad*}
@@ -436,13 +444,14 @@
\renewcommand*{\leftcenterright}{}
\renewcommand{\leftspringright}[4]{%
-\begin{minipage}{#1\linewidth}#3\end{minipage}\qquad%
-\begin{minipage}{#2\linewidth}\begin{flushright}#4\end{flushright}\end{minipage}%
+ \begin{minipage}{#1\linewidth}#3\end{minipage}\qquad%
+ \begin{minipage}{#2\linewidth}\begin{flushright}#4\end{flushright}\end{minipage}%
}
\renewenvironment*{blockdescription}
{\LWR@descriptionstart\LWR@origdescription}
{\enddescription}
+
\renewcommand*{\blockdescriptionlabel}[1]{\textbf{#1}}
\renewenvironment*{labelled}[1]{\begin{description}}{\end{description}}
\renewenvironment*{flexlabelled}[6]{\begin{description}}{\end{description}}
@@ -636,40 +645,40 @@
\DeclareRobustCommand{\cftpagenumbersoff}[1]{}
\DeclareRobustCommand{\cftpagenumberson}[1]{}
\RenewDocumentCommand{\newfloat}{o m m m}{%
-\IfValueTF{#1}%
-{\DeclareFloatingEnvironment[fileext=#3,within=#1,name={#4}]{#2}}%
-{\DeclareFloatingEnvironment[fileext=#3,name={#4}]{#2}}%
-\cslet{listof#2s}\relax%
-\cslet{listof#2es}\relax%
+ \IfValueTF{#1}%
+ {\DeclareFloatingEnvironment[fileext=#3,within=#1,name={#4}]{#2}}%
+ {\DeclareFloatingEnvironment[fileext=#3,name={#4}]{#2}}%
+ \cslet{listof#2s}\relax%
+ \cslet{listof#2es}\relax%
}
\RenewDocumentCommand{\newlistof}{o m m m}
{%
-\IfValueTF{#1}
-{\newlistentry[#1]{#2}{#3}{0}}
-{\newlistentry{#2}{#3}{0}}
-\@namedef{ext@#2}{#3}%
-\@ifundefined{c@#3depth}{\newcounter{#3depth}}{}%
-\setcounter{#3depth}{1}%
-\@namedef{#3mark}{}%
-\@namedef{#2}{\listof{#2}{#4}}
-\@namedef{@cftmake#3title}{}
-\@ifundefined{cftbefore#3titleskip}{
- \expandafter\newlength\csname cftbefore#3titleskip\endcsname
- \expandafter\newlength\csname cftafter#3titleskip\endcsname
-}{}
-\@namedef{cft#3titlefont}{}
-\@namedef{cftafter#3title}{}
-\@namedef{cft#3prehook}{}
-\@namedef{cft#3posthook}{}
+ \IfValueTF{#1}%
+ {\newlistentry[#1]{#2}{#3}{0}}%
+ {\newlistentry{#2}{#3}{0}}%
+ \@namedef{ext@#2}{#3}%
+ \@ifundefined{c@#3depth}{\newcounter{#3depth}}{}%
+ \setcounter{#3depth}{1}%
+ \@namedef{#3mark}{}%
+ \@namedef{#2}{\listof{#2}{#4}}%
+ \@namedef{@cftmake#3title}{}%
+ \@ifundefined{cftbefore#3titleskip}{%
+ \expandafter\newlength\csname cftbefore#3titleskip\endcsname%
+ \expandafter\newlength\csname cftafter#3titleskip\endcsname%
+ }{}%
+ \@namedef{cft#3titlefont}{}%
+ \@namedef{cftafter#3title}{}%
+ \@namedef{cft#3prehook}{}%
+ \@namedef{cft#3posthook}{}%
}
\renewcommand{\setfloatadjustment}[2]{}
\NewDocumentEnvironment{KFLTmemoir@marginfloat}{O{-1.2ex} m}
{% start
-\LWR@BlockClassWP{float:right; width:2in; margin:10pt}{}{marginblock}%
-\captionsetup{type=#2}%
+ \LWR@BlockClassWP{float:right; width:2in; margin:10pt}{}{marginblock}%
+ \captionsetup{type=#2}%
}
{%
-\endLWR@BlockClassWP%
+ \endLWR@BlockClassWP%
}
\DeclareDocumentEnvironment{marginfigure}{o}
@@ -697,7 +706,7 @@
\renewcommand{\flegtocfigure}{}
\renewcommand{\subcaption}[2][]{%
-\ifblank{#1}{\subfloat[#2]{}}{\subfloat[#1][#2]{}}%
+ \ifblank{#1}{\subfloat[#2]{}}{\subfloat[#1][#2]{}}%
}
\renewcommand{\contsubcaption}{\ContinuedFloat\subcaption}
@@ -718,9 +727,9 @@
\RenewDocumentEnvironment{sidecaption}{o m o}
{}
-{
-\IfValueTF{#1}{\caption[#1]{#2}}{\caption{#2}}%
-\IfValueT{#3}{\label{#3}}%
+{%
+ \IfValueTF{#1}{\caption[#1]{#2}}{\caption{#2}}%
+ \IfValueT{#3}{\label{#3}}%
}
\renewcommand*{\setsidecaps}[2]{}
@@ -731,20 +740,20 @@
\RenewDocumentEnvironment{sidecontcaption}{m o}
{}
{%
-\ContinuedFloat%
-\caption{#1}%
-\IfValueT{#2}{\label[\@captype]{#2}}%
+ \ContinuedFloat%
+ \caption{#1}%
+ \IfValueT{#2}{\label[\@captype]{#2}}%
}
\renewenvironment{sidenamedlegend}[2][]{
-\begin{center}
-\@nameuse{\@captype name}\CaptionSeparator#2
-\end{center}
+ \begin{center}
+ \@nameuse{\@captype name}\CaptionSeparator#2
+ \end{center}
}
{}
\renewenvironment{sidelegend}[1]
{\begin{center}
-#1
+ #1
}
{\end{center}}
@@ -757,20 +766,20 @@
\LetLtxMacro\endctabular\endtabular
\renewcommand{\autorows}[5][]{%
-#5
+ #5%
}
\renewcommand{\autocols}[5][]{%
-#5
+ #5%
}
\renewcommand*{\feetabovefloat}{}
\renewcommand*{\feetbelowfloat}{}
\renewcommand*{\feetatbottom}{}
-\renewcommand*{\verbfootnote}[2][]{
-\PackageError{lwarp,memoir}
-{Verbatim footnotes are not yet supported by lwarp.}
-{This may be improved some day.}
+\renewcommand*{\verbfootnote}[2][]{%
+ \PackageError{lwarp,memoir}%
+ {Verbatim footnotes are not yet supported by lwarp.}%
+ {This may be improved some day.}%
}
\renewcommand*{\plainfootnotes}{}
@@ -779,10 +788,10 @@
\renewcommand*{\paragraphfootnotes}{}
\renewcommand*{\footfudgefiddle}{}
-\renewcommand*{\newfootnoteseries}[1]{
-\PackageError{lwarp,memoir}
-{Memoir footnote series are not yet supported by lwarp.}
-{This may be improved some day.}
+\renewcommand*{\newfootnoteseries}[1]{%
+ \PackageError{lwarp,memoir}%
+ {Memoir footnote series are not yet supported by lwarp.}%
+ {This may be improved some day.}%
}
\renewcommand*{\plainfootstyle}[1]{}
@@ -845,9 +854,9 @@
\renewcommand*{\vleftofline}[1]{#1}
\DeclareDocumentCommand{\PoemTitle}{s o o m}{%
-\IfValueTF{#2}%
-{\poemtitle[#2]{#4}}%
-{\poemtitle{#4}}%
+ \IfValueTF{#2}%
+ {\poemtitle[#2]{#4}}%
+ {\poemtitle{#4}}%
}
\renewcommand*{\NumberPoemTitle}{}
@@ -1019,10 +1028,10 @@
\renewcommand{\postcaption}[1]{}
\renewcommand{\midbicaption}[1]{}
\renewcommand{\contcaption}[1]{%
-\begin{LWR@figcaption}% later becomes \caption*
-\LWR@isolate{\@nameuse{\@captype name}}~%
-\thechapter.\the\value{\@captype}\CaptionSeparator\LWR@isolate{#1}%
-\end{LWR@figcaption}
+ \begin{LWR@figcaption}% later becomes \caption*
+ \LWR@isolate{\@nameuse{\@captype name}}~%
+ \thechapter.\the\value{\@captype}\CaptionSeparator\LWR@isolate{#1}%
+ \end{LWR@figcaption}%
}
\newlength{\abovelegendskip}
@@ -1032,11 +1041,11 @@
\renewcommand{\legend}[1]{\begin{center}#1\\\end{center}}
-\renewcommand{\namedlegend}[2][]{
-\begin{center}
-\@nameuse{fleg\@captype}\CaptionSeparator#2\\
-\end{center}
-\@nameuse{flegtoc\@captype}{#1}
+\renewcommand{\namedlegend}[2][]{%
+ \begin{center}
+ \@nameuse{fleg\@captype}\CaptionSeparator#2\\
+ \end{center}
+ \@nameuse{flegtoc\@captype}{#1}
}
\renewcommand{\newfixedcaption}[3][\caption]{%
@@ -1047,54 +1056,54 @@
\providecommand{#2}{\def\@captype{#3}#1}}
\renewcommand{\bitwonumcaption}[6][]{%
-\ifblank{#2}{\caption{#3}}{\caption[#2]{#3}}%
-\addtocounter{\@captype}{-1}%
-\begingroup%
-\csdef{\@captype name}{#4}%
-\ifblank{#5}{\caption{#6}}{\caption[#5]{#6}}%
-\endgroup%
-\ifblank{#1}{}{\label{#1}}%
+ \ifblank{#2}{\caption{#3}}{\caption[#2]{#3}}%
+ \addtocounter{\@captype}{-1}%
+ \begingroup%
+ \csdef{\@captype name}{#4}%
+ \ifblank{#5}{\caption{#6}}{\caption[#5]{#6}}%
+ \endgroup%
+ \ifblank{#1}{}{\label{#1}}%
}
\LetLtxMacro\bionenumcaption\bitwonumcaption% todo
\renewcommand{\bicaption}[5][]{%
-\ifblank{#2}{\caption{#3}}{\caption[#2]{#3}}%
-\begin{LWR@figcaption}% later becomes \caption*
-\LWR@isolate{#4} \thechapter.\the\value{\@captype}\CaptionSeparator\LWR@isolate{#5}%
-\end{LWR@figcaption}
-\ifblank{#1}{}{\label{#1}}%
+ \ifblank{#2}{\caption{#3}}{\caption[#2]{#3}}%
+ \begin{LWR@figcaption}% later becomes \caption*
+ \LWR@isolate{#4} % space
+ \thechapter.\the\value{\@captype}\CaptionSeparator\LWR@isolate{#5}%
+ \end{LWR@figcaption}%
+ \ifblank{#1}{}{\label{#1}}%
}
\renewcommand{\bicontcaption}[3]{%
-\contcaption{#1}%
-\begingroup%
-\csdef{\@captype name}{#2}%
-\contcaption{#3}%
-\endgroup%
+ \contcaption{#1}%
+ \begingroup%
+ \csdef{\@captype name}{#2}%
+ \contcaption{#3}%
+ \endgroup%
}
\RenewDocumentCommand{\subtop}{O{} O{} m}{%
-\subfloat[#1][#2]{#3}%
+ \subfloat[#1][#2]{#3}%
}
\RenewDocumentCommand{\subbottom}{O{} O{} m}{%
-\subfloat[#1][#2]{#3}%
+ \subfloat[#1][#2]{#3}%
}
\renewcommand{\contsubtop}{%
-\ContinuedFloat\addtocounter{\@captype}{1}%
-\subtop}
+ \ContinuedFloat\addtocounter{\@captype}{1}%
+ \subtop%
+}
\renewcommand{\contsubbottom}{%
-\ContinuedFloat\addtocounter{\@captype}{1}%
-\subbottom}
+ \ContinuedFloat\addtocounter{\@captype}{1}%
+ \subbottom%
+}
\renewcommand{\subconcluded}{}
-\let\subfigure\subbottom
-\let\subtable\subtop
-
\let\contsubtable\contsubtop
\let\contsubfigure\contsubbottom
\newcommand{\newfloatentry}[4][\@empty]{TODO: newfloatentry}