diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/lwarp/lwarp-floatrow.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/lwarp/lwarp-floatrow.sty | 55 |
1 files changed, 43 insertions, 12 deletions
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-floatrow.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-floatrow.sty index fac91b4d693..fa8388f28d1 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-floatrow.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-floatrow.sty @@ -50,22 +50,49 @@ -\NewDocumentCommand{\floatbox}{o m o o o +m +m}{% -\ifbool{LWR@insubfloatrow} -{ -\IfValueTF{#3} -{\@nameuse{sub#2}{#3}} -{\@nameuse{sub#2}{\linewidth}} +\newbool{LWR@subcaptionloaded} + +\AtBeginDocument{ +\@ifpackageloaded{subcaption} +{\booltrue{LWR@subcaptionloaded}} +{\boolfalse{LWR@subcaptionloaded}} } -{ + +\NewDocumentCommand{\floatbox}{o m o o o +m +m}{% +\ifbool{LWR@subcaptionloaded}% +{% subcaption +\ifbool{LWR@insubfloatrow}% +{% subcaption in a subfloatrow +\IfValueTF{#3}% +{\@nameuse{sub#2}{#3}}% +{\@nameuse{sub#2}{\linewidth}}% +}% subcaption in a subfloatrow +{% subcaption not in subfloatrow +\@nameuse{#2}% +}% subcaption not in subfloatrow +#6 + +#7 +\ifbool{LWR@insubfloatrow}% +{\@nameuse{endsub#2}}% +{\@nameuse{end#2}}% +}% subcaption +{% assume subfig +\ifbool{LWR@insubfloatrow}% +{% subfig in a subfloatrow +\begingroup +\let\caption\@firstofone +\subfloat[#6]{#7} +\endgroup +}% subfig in a subfloatrow +{% subfig package, but not a subfig \@nameuse{#2} -} #6 #7 -\ifbool{LWR@insubfloatrow} -{\@nameuse{endsub#2}} -{\@nameuse{end#2}} +\@nameuse{end#2} +}% subfig package, but not a subfig +}% assume subfig } \newcommand*{\nocapbeside}{} @@ -139,7 +166,7 @@ \LWR@frowkeyfileext\ \LWR@frowkeywithin}% \newfloat{#1}{\LWR@frowkeyplacement}% {\LWR@frowkeyfileext}[\LWR@frowkeywithin]% -\LWR@traceinfo{*** finished newfloat #1} +\LWR@traceinfo{finished newfloat #1} }% \ifthenelse{\equal{\LWR@frowkeyname}{}} {} @@ -256,6 +283,10 @@ + + + + \endinput %% %% End of file `lwarp-floatrow.sty'. |