diff options
author | Karl Berry <karl@freefriends.org> | 2022-02-20 21:12:00 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2022-02-20 21:12:00 +0000 |
commit | 1d4a2d0e142220d907b1ce6d432b049dc433560e (patch) | |
tree | 696b8342adb8890bdfade72bea7baee4488021ba /Master/texmf-dist/source/latex/caption/caption-light.dtx | |
parent | 532bb929a3231121a804afa7eadaf70f5f0ece58 (diff) |
caption (20feb22)
git-svn-id: svn://tug.org/texlive/trunk@62097 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/caption/caption-light.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/caption/caption-light.dtx | 36 |
1 files changed, 24 insertions, 12 deletions
diff --git a/Master/texmf-dist/source/latex/caption/caption-light.dtx b/Master/texmf-dist/source/latex/caption/caption-light.dtx index c56734a4142..697f8233ab9 100644 --- a/Master/texmf-dist/source/latex/caption/caption-light.dtx +++ b/Master/texmf-dist/source/latex/caption/caption-light.dtx @@ -2,7 +2,7 @@ % % This is file `caption-light.dtx'. % -% Copyright (C) 2020 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) +% Copyright (C) 2020-2021 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) % % -------------------------------------------------------------------------- % @@ -27,12 +27,11 @@ % caption.sty, caption-light.sty, caption2.sty, caption3.sty, % caption-ams-smf.sto, caption-beamer.sto, caption-elsarticle.sto, % caption-koma.sto, caption-memoir.sto, caption-ntg.sto, -% caption-thesis.sto, bicaption.sty, ltcaption.sty, subcaption.sty, -% and the user manuals -% caption-deu.tex, caption-eng.tex, caption-rus.tex. +% caption-thesis.sto, bicaption.sty, ltcaption.sty, subcaption.sty. % % \fi -% \CheckSum{84} +% +% \CheckSum{99} % % \iffalse %<*driver> @@ -221,6 +220,7 @@ % \DoNotIndex{\hangindent,\hbox,\hfil,\hsize,\hskip,\hspace,\hss} % \DoNotIndex{\ifcase,\ifdim,\ifnum,\ifodd,\ifvoid,\ifvmode} % \DoNotIndex{\ifx,\ignorespaces,\itshape} +% \DoNotIndex{\kernel@ifnextchar} % \DoNotIndex{\Large,\large,\leavevmode,\leftmargini,\leftskip,\let,\linewidth} % \DoNotIndex{\llap,\long,\m@ne,\margin,\mdseries,\message} % \DoNotIndex{\newcommand,\newdimen,\newlength,\newline,\newif,\newsavebox} @@ -264,13 +264,13 @@ % % \begin{macrocode} \NeedsTeXFormat{LaTeX2e}[1994/12/01] -\ProvidesPackage{caption-light}[2020/08/24 v1.0 Customizing captions (AR)] +\ProvidesPackage{caption-light}[2021/03/21 v1.0a Customizing captions (AR)] % \end{macrocode} % % \section{Loading the kernel} % % \begin{macrocode} -\RequirePackage{caption3}[2020/08/23] % needs v2.0 or newer +\RequirePackage{caption3}[2020/08/30] % needs v2.0 or newer % \end{macrocode} % % \section{Check against unknown document classes} @@ -310,6 +310,7 @@ % \end{macrocode} % % \begin{macro}{\caption@makecaption} +% \changes{v1.0a}{2021/03/21}{Support of \cs{ifcaption@star} and \cs{caption@@make@epilogue} added} % |\@makecaption|\marg{label}\marg{text}\\ % We do basically the same as the original code (from the standard % \LaTeX\ document classes), but take care of selected settings @@ -327,15 +328,26 @@ \global \@minipagefalse \hb@xt@\hsize{\hfil\box\@tempboxa\hfil}% \fi - \caption@iftop\caption@aboveskip\caption@belowskip} + \caption@iftop\caption@aboveskip\caption@belowskip + \caption@@make@epilogue} % \end{macrocode} % \begin{macrocode} \newcommand\caption@@makecaption[2]{% \caption@applyfont - {\captionlabelfont #1}% - {\caption@iflabelfont\captionlabelfont - \relax\caption@labelsep}% - {\captiontextfont #2}} + \ifcaption@star\else + \begingroup + \captionlabelfont #1\relax\relax + \endgroup + \fi + \ifcaption@star\else + \begingroup + \caption@iflabelfont\captionlabelfont + \relax\caption@labelsep + \endgroup + \fi + \begingroup + \captiontextfont #2% + \endgroup} % \end{macrocode} % \end{macro} % |