diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/caption/caption3.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/caption/caption3.sty | 34 |
1 files changed, 26 insertions, 8 deletions
diff --git a/Master/texmf-dist/tex/latex/caption/caption3.sty b/Master/texmf-dist/tex/latex/caption/caption3.sty index 27fcf88e2c9..d082e95f366 100644 --- a/Master/texmf-dist/tex/latex/caption/caption3.sty +++ b/Master/texmf-dist/tex/latex/caption/caption3.sty @@ -6,7 +6,7 @@ %% %% caption3.dtx (with options: `package') %% -%% Copyright (C) 1994-2015 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) +%% Copyright (C) 1994-2016 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) %% %% http://sourceforge.net/projects/latex-caption/ %% @@ -39,7 +39,7 @@ \NeedsTeXFormat{LaTeX2e}[1994/12/01] \def\caption@tempa$Id: #1 #2 #3-#4-#5 #6${% \def\caption@tempa{#3/#4/#5 }\def\caption@tempb{#2 }} -\caption@tempa $Id: caption3.sty 115 2015-09-20 15:20:31Z sommerfeldt $ +\caption@tempa $Id: caption3.sty 136 2016-02-02 09:41:30Z sommerfeldt $ \ProvidesPackage{caption3}[\caption@tempa v1.7-\caption@tempb caption3 kernel (AR)] \providecommand*\@nameundef[1]{% \expandafter\let\csname #1\endcsname\@undefined} @@ -1364,6 +1364,10 @@ \newcommand\caption@make[2]{\caption@@make{\caption@lfmt{#1}{#2}}} \newcommand\caption@@make[2]{% \begingroup + \caption@@make@{#1}{#2}% + \endgroup + \caption@@make@epilogue} +\newcommand\caption@@make@[2]{% \caption@stepthecounter \caption@beginhook \caption@box\linewidth{% @@ -1391,8 +1395,8 @@ \fi \hspace\caption@tempdima }% - \caption@endhook - \endgroup + \caption@endhook} +\newcommand\caption@@make@epilogue{% \global\caption@starfalse} \newcommand*\caption@calcmargin{% \caption@calcmargin@hook @@ -1480,13 +1484,27 @@ \@setpar{\@@par\caption@@par}\caption@@par \caption@applyfont \caption@fmt - {\ifcaption@star\else{\captionlabelfont#1}\fi}% - {\ifcaption@star\else{\caption@iflf\captionlabelfont\caption@lsep}\fi}% + {\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@}{}% + \caption@ifstrut + {\vrule\@height\ht\strutbox\@width\z@}% + {}% \nobreak\hskip\z@skip % enable hyphenation \caption@tfmt{#2}% - \caption@ifstrut{\ifhmode\@finalstrut\strutbox\fi}{}% + \caption@ifstrut + {\ifhmode\@finalstrut\strutbox\fi}% + {}% \par}}} \newcommand\caption@ifempty[1]{% \caption@if@empty{#1}% |