From 4b81beda956165383bb21ad95c6831707bf3e1e0 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 2 Sep 2020 21:34:30 +0000 Subject: caption (2sep20) git-svn-id: svn://tug.org/texlive/trunk@56243 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/source/latex/caption/caption.dtx | 51 ++++++++++------------ 1 file changed, 23 insertions(+), 28 deletions(-) (limited to 'Master/texmf-dist/source/latex/caption') diff --git a/Master/texmf-dist/source/latex/caption/caption.dtx b/Master/texmf-dist/source/latex/caption/caption.dtx index 0a029f8d387..1068796a870 100644 --- a/Master/texmf-dist/source/latex/caption/caption.dtx +++ b/Master/texmf-dist/source/latex/caption/caption.dtx @@ -32,7 +32,7 @@ % caption-deu.tex, caption-eng.tex, caption-rus.tex. % % \fi -% \CheckSum{2715} +% \CheckSum{2690} % % \iffalse %<*driver> @@ -217,13 +217,13 @@ % % \begin{macrocode} \NeedsTeXFormat{LaTeX2e}[1994/12/01] -\ProvidesPackage{caption}[2020/08/30 v3.5 Customizing captions (AR)] +\ProvidesPackage{caption}[2020/09/02 v3.5a 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} @@ -355,6 +355,7 @@ % \changes{v3.1}{2007/07/21}{Option `compatibility' added} % \changes{v3.1}{2007/09/01}{caption v1.x compatibility options revised} % \changes{v3.1d}{2007/10/24}{Bugfix 07-10-24 in caption v1.x$ compatibility options} +% \changes{v3.5a}{2020/09/02}{caption v1.x compatibility options fixed} % % Currently we support |v1| and |v3| as values for the |compatibility=| option. % But since this used to be a boolean option is the past we still support any boolean value @@ -405,20 +406,15 @@ % % \begin{macrocode} \DeclareCaptionOptionNoValue*{normal}{% - \caption@setformat{plain}% - \caption@setjustification{justified}} + \caption@setup{format=plain,justification=justified}} \DeclareCaptionOptionNoValue*{isu}{% - \caption@setformat{hang}% - \caption@setjustification{justified}} + \caption@setup{format=hang,justification=justified}} \DeclareCaptionOptionNoValue*{hang}{% - \caption@setformat{hang}% - \caption@setjustification{justified}} + \caption@setup{format=hang,justification=justified}} \DeclareCaptionOptionNoValue*{center}{% - \caption@setformat{plain}% - \caption@setjustification{centering}} + \caption@setup{format=plain,justification=centering}} \DeclareCaptionOptionNoValue*{centerlast}{% - \caption@setformat{plain}% - \caption@setjustification{centerlast}} + \caption@setup{format=plain,justification=centerlast}} % \end{macrocode} % % \begin{macrocode} @@ -431,19 +427,19 @@ % \end{macrocode} % % \begin{macrocode} -\DeclareCaptionOptionNoValue*{up}{\l@addto@macro\captionlabelfont\upshape} -\DeclareCaptionOptionNoValue*{it}{\l@addto@macro\captionlabelfont\itshape} -\DeclareCaptionOptionNoValue*{sl}{\l@addto@macro\captionlabelfont\slshape} -\DeclareCaptionOptionNoValue*{sc}{\l@addto@macro\captionlabelfont\scshape} -\DeclareCaptionOptionNoValue*{md}{\l@addto@macro\captionlabelfont\mdseries} -\DeclareCaptionOptionNoValue*{bf}{\l@addto@macro\captionlabelfont\bfseries} -\DeclareCaptionOptionNoValue*{rm}{\l@addto@macro\captionlabelfont\rmfamily} -\DeclareCaptionOptionNoValue*{sf}{\l@addto@macro\captionlabelfont\sffamily} -\DeclareCaptionOptionNoValue*{tt}{\l@addto@macro\captionlabelfont\ttfamily} +\DeclareCaptionOptionNoValue*{up}{\caption@setup{labelfont+=up}} +\DeclareCaptionOptionNoValue*{it}{\caption@setup{labelfont+=it}} +\DeclareCaptionOptionNoValue*{sl}{\caption@setup{labelfont+=sl}} +\DeclareCaptionOptionNoValue*{sc}{\caption@setup{labelfont+=sc}} +\DeclareCaptionOptionNoValue*{md}{\caption@setup{labelfont+=md}} +\DeclareCaptionOptionNoValue*{bf}{\caption@setup{labelfont+=bf}} +\DeclareCaptionOptionNoValue*{rm}{\caption@setup{labelfont+=rm}} +\DeclareCaptionOptionNoValue*{sf}{\caption@setup{labelfont+=sf}} +\DeclareCaptionOptionNoValue*{tt}{\caption@setup{labelfont+=tt}} % \end{macrocode} % % \begin{macrocode} -\DeclareCaptionOptionNoValue*{nooneline}{\caption@setbool{slc}{0}} +\DeclareCaptionOptionNoValue*{nooneline}{\caption@setup{slc=0}} % \end{macrocode} % % \begin{macrocode} @@ -455,17 +451,16 @@ % \changes{v3.0h}{2005/07/08}{caption2 \version{2.x} compatibility options added} % \changes{v3.1}{2007/09/01}{caption2 v2.x compatibility options revised} % \changes{v3.1d}{2007/10/24}{Bugfix 07-10-24 in caption v2.x$ compatibility options} +% \changes{v3.5a}{2020/09/02}{caption v2.x compatibility options fixed} % % \begin{macrocode} \DeclareCaptionOptionNoValue*{flushleft}{% - \caption@setformat{plain}% - \caption@setjustification{raggedright}} + \caption@setup{format=plain,justification=raggedright}} \DeclareCaptionOptionNoValue*{flushright}{% - \caption@setformat{plain}% - \caption@setjustification{raggedleft}} + \caption@setup{format=plain,justification=raggedleft}} % \end{macrocode} % \begin{macrocode} -\DeclareCaptionOptionNoValue*{oneline}{\caption@setbool{slc}{1}} +\DeclareCaptionOptionNoValue*{oneline}{\caption@setup{slc=1}} % \end{macrocode} % \begin{macrocode} \DeclareCaptionOptionNoValue*{ignoreLTcapwidth}{% -- cgit v1.2.3