diff options
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.sty | 186 |
1 files changed, 103 insertions, 83 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 0db069503aa..ab62119c547 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty @@ -218,6 +218,8 @@ \renewcommand*{\sloppybottom}{} \csletcs{titlingpage*}{titlingpage} \csletcs{endtitlingpage*}{endtitlingpage} +\let\titlingpageend\relax +\newcommand{\titlingpageend}[2]{} \let\andnext\and \renewcommand*{\thanksmarkstyle}[1]{} \renewcommand{\thanksfootmark}{% @@ -426,7 +428,7 @@ \let\memorigdbs\LWR@endofline \let\memorigpar\par \let\atcentercr\LWR@endofline -\renewcommand*{\flushleftright}{} + \renewcommand*{\linenottooshort}[1][]{} \renewcommand*{\russianpar}{} \renewcommand*{\lastlinerulefill}{} @@ -688,101 +690,20 @@ \renewcommand*{\FloatBlockAllowAbove}{} \renewcommand*{\FloatBlockAllowBelow}{} \renewcommand*{\setFloatBlockFor}{} -\renewcommand*{\captiondelim}[1]{\renewcommand*{\CaptionSeparator}{#1}} -\renewcommand*{\captionnamefont}[1]{} -\renewcommand*{\captiontitlefont}[1]{} -\renewcommand*{\captionstyle}[2][]{} -\renewcommand*{\centerlastline}{} -\renewcommand*{\hangcaption}{} -\renewcommand*{\indentcaption}[1]{} -\renewcommand*{\normalcaption}{} -\renewcommand*{\changecaptionwidth}{} -\DeclareDocumentCommand{\captionwidth}{m}{} -\renewcommand*{\normalcaptionwidth}{} -\renewcommand{\precaption}[1]{} -\renewcommand{\captiontitlefinal}[1]{} -\renewcommand{\postcaption}[1]{} -\renewcommand{\contcaption}[1]{% -\begin{LWR@figcaption}% later becomes \caption* -\csuse{\@captype name} \thechapter.\the\value{\@captype}\CaptionSeparator #1 -\end{LWR@figcaption} -} -\renewcommand{\legend}[1]{\begin{center}#1\\\end{center}} - -\renewcommand{\namedlegend}[2][]{ -\begin{center} -\csuse{fleg\@captype}\CaptionSeparator#2\\ -\end{center} -\csuse{flegtoc\@captype}{#1} -} +\renewcommand{\captiontitlefinal}[1]{} \renewcommand{\flegtable}{\tablename} \renewcommand{\flegfigure}{\figurename} \renewcommand{\flegtoctable}{} \renewcommand{\flegtocfigure}{} -\renewcommand{\newfixedcaption}[3][\caption]{% - \renewcommand{#2}{\def\@captype{#3}#1}} -\renewcommand{\renewfixedcaption}[3][\caption]{% - \renewcommand{#2}{\def\@captype{#3}#1}} -\renewcommand{\providefixedcaption}[3][\caption]{% - \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}}% -} - -\LetLtxMacro\bionenumcaption\bitwonumcaption% todo - -\renewcommand{\bicaption}[5][]{% -\ifblank{#2}{\caption{#3}}{\caption[#2]{#3}}% -\begin{LWR@figcaption}% later becomes \caption* -#4 \thechapter.\the\value{\@captype}\CaptionSeparator #5 -\end{LWR@figcaption} -\ifblank{#1}{}{\label{#1}}% -} - -\renewcommand{\bicontcaption}[3]{% -\contcaption{#1}% -\begingroup% -\csdef{\@captype name}{#2}% -\contcaption{#3}% -\endgroup% -} - -\renewcommand{\midbicaption}[1]{} - \renewcommand{\subcaption}[2][]{% \ifblank{#1}{\subfloat[#2]{}}{\subfloat[#1][#2]{}}% } -\RenewDocumentCommand{\subtop}{O{} O{} m}{% -\subfloat[#1][#2]{#3}% -} - -\RenewDocumentCommand{\subbottom}{O{} O{} m}{% -\subfloat[#1][#2]{#3}% -} - \renewcommand{\contsubcaption}{\ContinuedFloat\subcaption} -\renewcommand{\contsubtop}{% -\ContinuedFloat\addtocounter{\@captype}{1}% -\subtop} - -\renewcommand{\contsubbottom}{% -\ContinuedFloat\addtocounter{\@captype}{1}% -\subbottom} - -\renewcommand{\subconcluded}{} - \LetLtxMacro\subcaptionref\subref \renewcommand*{\tightsubcaptions}{} @@ -1047,6 +968,105 @@ \renewcommand*{\cleartoverso}{} \renewenvironment{vplace}[1][]{}{} +\renewcommand*{\captiondelim}[1]{\renewcommand*{\CaptionSeparator}{#1}} +\renewcommand*{\captionnamefont}[1]{} +\renewcommand*{\captiontitlefont}[1]{} +\renewcommand*{\flushleftright}{} +\renewcommand*{\centerlastline}{} +\renewcommand*{\captionstyle}[2][]{} +\DeclareDocumentCommand{\captionwidth}{m}{} +\renewcommand*{\changecaptionwidth}{} +\renewcommand*{\normalcaptionwidth}{} +\renewcommand*{\hangcaption}{} +\renewcommand*{\indentcaption}[1]{} +\renewcommand*{\normalcaption}{} +\renewcommand{\precaption}[1]{} +\renewcommand{\postcaption}[1]{} +\renewcommand{\midbicaption}[1]{} +\renewcommand{\contcaption}[1]{% +\begin{LWR@figcaption}% later becomes \caption* +\csuse{\@captype name} \thechapter.\the\value{\@captype}\CaptionSeparator #1 +\end{LWR@figcaption} +} + +\newlength{\abovelegendskip} +\setlength{\abovelegendskip}{0.5\baselineskip} +\newlength{\belowlegendskip} +\setlength{\belowlegendskip}{\abovelegendskip} + +\renewcommand{\legend}[1]{\begin{center}#1\\\end{center}} + +\renewcommand{\namedlegend}[2][]{ +\begin{center} +\csuse{fleg\@captype}\CaptionSeparator#2\\ +\end{center} +\csuse{flegtoc\@captype}{#1} +} + +\renewcommand{\newfixedcaption}[3][\caption]{% + \renewcommand{#2}{\def\@captype{#3}#1}} +\renewcommand{\renewfixedcaption}[3][\caption]{% + \renewcommand{#2}{\def\@captype{#3}#1}} +\renewcommand{\providefixedcaption}[3][\caption]{% + \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}}% +} + +\LetLtxMacro\bionenumcaption\bitwonumcaption% todo + +\renewcommand{\bicaption}[5][]{% +\ifblank{#2}{\caption{#3}}{\caption[#2]{#3}}% +\begin{LWR@figcaption}% later becomes \caption* +#4 \thechapter.\the\value{\@captype}\CaptionSeparator #5 +\end{LWR@figcaption} +\ifblank{#1}{}{\label{#1}}% +} + +\renewcommand{\bicontcaption}[3]{% +\contcaption{#1}% +\begingroup% +\csdef{\@captype name}{#2}% +\contcaption{#3}% +\endgroup% +} + +\RenewDocumentCommand{\subtop}{O{} O{} m}{% +\subfloat[#1][#2]{#3}% +} + +\RenewDocumentCommand{\subbottom}{O{} O{} m}{% +\subfloat[#1][#2]{#3}% +} + +\renewcommand{\contsubtop}{% +\ContinuedFloat\addtocounter{\@captype}{1}% +\subtop} + +\renewcommand{\contsubbottom}{% +\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} +\newcommand{\newfloatlist}[5][\@empty]{TODO: newfloatlist} +\newcommand{\newfloatenv}[4][\@empty]{TODO: newfloatenv} +\DeclareRobustCommand{\newfloatpagesoff}[1]{} +\DeclareRobustCommand{\newfloatpageson}[1]{} +\newcommand{\setnewfloatindents}[3]{} \newlistof{tableofcontents}{toc}{\contentsname} \newlistof{listoffigures}{lof}{\listfigurename} \newlistof{listoftables}{lot}{\listtablename} |