summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/lwarp/lwarp-subfig.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/lwarp/lwarp-subfig.sty')
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-subfig.sty98
1 files changed, 25 insertions, 73 deletions
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-subfig.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-subfig.sty
index efb1a16c8ca..79745461deb 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-subfig.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-subfig.sty
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `subfig')
%% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -19,8 +19,15 @@
\LWR@ProvidesPackagePass{subfig}
\long\def\sf@@@subfloat#1[#2][#3]#4{%
-\begin{minipage}{\linewidth}% new
-\LWR@stoppars% new
+\begin{minipage}{\linewidth}% lwarp
+\IfValueTF{#2}{%
+ \LWR@setlatestname{#2}%
+}{%
+ \IfValueTF{#3}{%
+ \LWR@setlatestname{#3}%
+ }{}%
+}%
+\LWR@stoppars% lwarp
\@ifundefined{FBsc@max}{}%
{\FB@readaux{\let\FBsuboheight\relax}}%
\@tempcnta=\@ne
@@ -37,15 +44,6 @@
\sf@bottom=\sf@nearskip
\fi
\leavevmode
- \setbox\@tempboxa \hbox{#4}%
- \@tempdima=\wd\@tempboxa
- \@ifundefined{FBsc@max}{}%
- {\global\advance\Xhsize-\wd\@tempboxa
- \dimen@=\ht\@tempboxa
- \advance\dimen@\dp\@tempboxa
- \ifdim\dimen@>\FBso@max
- \global\FBso@max\dimen@
- \fi}%
\bgroup
\bgroup
\ifcase\@tempcnta
@@ -59,11 +57,11 @@
\ifx \@empty#3\relax \else
\sf@subcaption{#1}{#2}{#3}%
\fi\egroup
- \LWR@startpars% new
+ \LWR@startpars% lwarp
#4
- \LWR@stoppars% new
+ \LWR@stoppars% lwarp
}{%
- \LWR@startpars% new
+ \LWR@startpars% lwarp
\@ifundefined{FBsc@max}%
{
#4
@@ -73,7 +71,7 @@
\else
#4
\fi}%
- \LWR@stoppars% new
+ \LWR@stoppars% lwarp
\egroup
\ifx \@empty#3\relax \else
\sf@subcaption{#1}{#2}{#3}%
@@ -88,13 +86,13 @@
\ifmaincaptiontop\else
\global\advance\@nameuse{c@\@captype}\m@ne
\fi
-\end{minipage}% new
-\LWR@startpars% new
+\end{minipage}% lwarp
+\LWR@startpars% lwarp
\endgroup\ignorespaces%
}%
\long\def\sf@subcaption#1#2#3{%
-\LWR@stoppars% new
+\LWR@stoppars% lwarp
\ifx \relax#2\relax \else
\bgroup
\let\label=\@gobble
@@ -110,14 +108,14 @@
\fi
\@ifundefined{FBsc@max}%
{
-\LWR@traceinfo{sfsubcap B1}% new
- \LWR@figcaption% new
+\LWR@traceinfo{sfsubcap B1}% lwarp
+ \LWR@figcaption% lwarp
\caption@make
{\@nameuse{sub\@captype name}}%
{\@nameuse{thesub\@captype}}%
{#3}
- \endLWR@figcaption% new
-\LWR@traceinfo{sfsubcap B2}% new
+ \endLWR@figcaption% lwarp
+\LWR@traceinfo{sfsubcap B2}% lwarp
}%
{\dimen@\ht0%
\advance\dimen@\dp0%
@@ -133,66 +131,20 @@
}%
\fi
-\LWR@traceinfo{sfsubcap C1}% new
+\LWR@traceinfo{sfsubcap C1}% lwarp
\caption@make
{\@nameuse{sub\@captype name}}%
{\@nameuse{thesub\@captype}}%
{#3}
-\LWR@traceinfo{sfsubcap C1}% new
+\LWR@traceinfo{sfsubcap C1}% lwarp
}%
\egroup
-\LWR@startpars% new
-}
-
-\renewcommand\caption@@@make[2]{%
-\LWR@startpars% new
- \sbox\@tempboxa{#1}%
- \ifdim\wd\@tempboxa=\z@
- \let\caption@lsep\relax
- \fi
- \caption@ifempty{#2}{%
- \let\caption@lsep\@empty
- \let\caption@tfmt\@firstofone
- }%
- \renewcommand{\@@par}{\LWR@closeparagraph\LWR@orig@@par}% new
- \caption@applyfont
- \caption@fmt
- {\ifcaption@star\else
- \begingroup
- \captionlabelfont
- #1%
- \endgroup
- \fi}%
- {\ifcaption@star\else
- \begingroup
- \caption@iflf\captionlabelfont
- \relax\caption@lsep
- \endgroup
- \fi}%
- {{\captiontextfont
- \caption@ifstrut
- {\vrule\@height\ht\strutbox\@width\z@}%
- {}%
- \nobreak\hskip\z@skip % enable hyphenation
- \caption@tfmt{#2}
- \LWR@ensuredoingapar% new
- \caption@ifstrut
- {\ifhmode\@finalstrut\strutbox\fi}%
- {}%
- \par}}
-\LWR@stoppars% new
-}
-
-\renewcommand{\caption@@make@}[2]{%
- \caption@stepthecounter
- \caption@beginhook
- \caption@@@make{#1}{#2}%
- \caption@endhook
+\LWR@startpars% lwarp
}
\def\subfloat@label{%
-\LWR@ensuredoingapar% new
+\LWR@ensuredoingapar% lwarp
\@ifnextchar(% %) match left parenthesis
{\sf@sub@label}
{\sf@sub@label(Sub\@captype\space