diff options
Diffstat (limited to 'Master/texmf-dist/source/latex/caption/caption3.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/caption/caption3.dtx | 44 |
1 files changed, 33 insertions, 11 deletions
diff --git a/Master/texmf-dist/source/latex/caption/caption3.dtx b/Master/texmf-dist/source/latex/caption/caption3.dtx index ffb0fd2172a..6ae6658e7cf 100644 --- a/Master/texmf-dist/source/latex/caption/caption3.dtx +++ b/Master/texmf-dist/source/latex/caption/caption3.dtx @@ -2,10 +2,10 @@ % % This is file `caption3.dtx'. % -% $Id: caption3.dtx 117 2015-09-20 20:43:35Z sommerfeldt $ +% $Id: caption3.dtx 136 2016-02-02 09:41:30Z sommerfeldt $ % $HeadURL: svn+ssh://sommerfeldt@svn.code.sf.net/p/latex-caption/code/branches/3.3/source/caption3.dtx $ % -% Copyright (C) 1994-2015 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) +% Copyright (C) 1994-2016 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) % % -------------------------------------------------------------------------- % @@ -28,7 +28,7 @@ % and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex. % % \fi -% \CheckSum{3635} +% \CheckSum{3646} % % \iffalse %<*driver> @@ -203,7 +203,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.dtx 117 2015-09-20 20:43:35Z sommerfeldt $ +\caption@tempa $Id: caption3.dtx 136 2016-02-02 09:41:30Z sommerfeldt $ \ProvidesPackage{caption3}[\caption@tempa v1.7-\caption@tempb caption3 kernel (AR)] % \end{macrocode} % @@ -3215,10 +3215,17 @@ % \changes{v1.5}{2012/03/15}{Uses \cs{caption@tempdima} instead of \cs{@tempdima}} % \changes{v1.5}{2012/12/26}{max-margin stuff moved to \cs{caption@calcmargin}} % \changes{v1.6}{2013/05/01}{Usage of \cs{caption@box} added} +% \changes{v1.7}{2016/01/31}{Adapted to the \package{bicaption} package} % |\caption@@make|\marg{caption label}\marg{caption text} % \begin{macrocode} \newcommand\caption@@make[2]{% \begingroup + \caption@@make@{#1}{#2}% + \endgroup + \caption@@make@epilogue} +% \end{macrocode} +% \begin{macrocode} +\newcommand\caption@@make@[2]{% \caption@stepthecounter \caption@beginhook % \end{macrocode} @@ -3286,11 +3293,10 @@ % \end{macrocode} % % \begin{macrocode} - \caption@endhook - \endgroup + \caption@endhook} % \end{macrocode} -% % \begin{macrocode} +\newcommand\caption@@make@epilogue{% \global\caption@starfalse} % \end{macrocode} % \end{macro} @@ -3475,6 +3481,8 @@ % \changes{v1.2}{2007/11/17}{Made option \opt{size=} stronger than \opt{font=}} % \changes{v1.3}{2010/09/04}{Uses \cs{caption@applyfont} now} % \changes{v1.3}{2010/11/01}{Bugfix: If the caption text is empty, the text format will be set to \opt{simple} now} +% \changes{v1.7}{2016/02/01}{Bugfix: \cs{relax} added before \cs{caption@lsep} so the label separator +% will not be gobbled if the label font command ignores spaces, e.g. by usage of \cs{color}} % |\caption@@@make|\marg{caption label}\marg{caption text}\par % This one finally typesets the caption paragraph, without margin and indention. % \begin{macrocode} @@ -3511,14 +3519,28 @@ % \begin{macrocode} \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{\vrule\@height\z@\@depth\dp\strutbox\@width\z@}{}% - \caption@ifstrut{\ifhmode\@finalstrut\strutbox\fi}{}% + \caption@ifstrut + {\ifhmode\@finalstrut\strutbox\fi}% + {}% \par}}} % \end{macrocode} % \end{macro} |