summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-09-02 21:34:30 +0000
committerKarl Berry <karl@freefriends.org>2020-09-02 21:34:30 +0000
commit4b81beda956165383bb21ad95c6831707bf3e1e0 (patch)
tree78acac65d84f6ec9f15d3220bd00e09e5c189384 /Master/texmf-dist
parent08070c3d08be4fe8fe08cd660561907a320b6763 (diff)
caption (2sep20)
git-svn-id: svn://tug.org/texlive/trunk@56243 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/doc/latex/caption/README2
-rw-r--r--Master/texmf-dist/source/latex/caption/caption.dtx51
-rw-r--r--Master/texmf-dist/tex/latex/caption/caption.sty47
3 files changed, 44 insertions, 56 deletions
diff --git a/Master/texmf-dist/doc/latex/caption/README b/Master/texmf-dist/doc/latex/caption/README
index 76c478b98fa..ca3df1b169c 100644
--- a/Master/texmf-dist/doc/latex/caption/README
+++ b/Master/texmf-dist/doc/latex/caption/README
@@ -1,7 +1,7 @@
==========================================================================
The `caption' package bundle
-Release 2020-08-30
+Release 2020-09-02
Copyright (C) 1994-2020 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
License: LPPL = LaTeX Project Public Licence
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}{%
diff --git a/Master/texmf-dist/tex/latex/caption/caption.sty b/Master/texmf-dist/tex/latex/caption/caption.sty
index 68fa82690cb..2a9beffc938 100644
--- a/Master/texmf-dist/tex/latex/caption/caption.sty
+++ b/Master/texmf-dist/tex/latex/caption/caption.sty
@@ -38,8 +38,8 @@
%% caption-deu.tex, caption-eng.tex, caption-rus.tex.
%%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption}[2020/08/30 v3.5 Customizing captions (AR)]
-\RequirePackage{caption3}[2020/08/23] % needs v2.0 or newer
+\ProvidesPackage{caption}[2020/09/02 v3.5a Customizing captions (AR)]
+\RequirePackage{caption3}[2020/08/30] % needs v2.0 or newer
\caption@ifbool{documentclass}{}{%
\caption@WarningNoLine{%
Unknown document class (or package),\MessageBreak
@@ -114,45 +114,38 @@
\caption@setincompatible{\@ifpackageloaded{captcont}}{captcont package is loaded}%
}}
\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}}
\DeclareCaptionOptionNoValue*{scriptsize}{\def\captionfont{\scriptsize}}
\DeclareCaptionOptionNoValue*{footnotesize}{\def\captionfont{\footnotesize}}
\DeclareCaptionOptionNoValue*{small}{\def\captionfont{\small}}
\DeclareCaptionOptionNoValue*{normalsize}{\def\captionfont{\normalsize}}
\DeclareCaptionOptionNoValue*{large}{\def\captionfont{\large}}
\DeclareCaptionOptionNoValue*{Large}{\def\captionfont{\Large}}
-\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*{nooneline}{\caption@setbool{slc}{0}}
+\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}}
+\DeclareCaptionOptionNoValue*{nooneline}{\caption@setup{slc=0}}
\caption@setbool{ruled}{0}
\DeclareCaptionOptionNoValue*{ruled}{\caption@setbool{ruled}{1}}
\DeclareCaptionOptionNoValue*{flushleft}{%
- \caption@setformat{plain}%
- \caption@setjustification{raggedright}}
+ \caption@setup{format=plain,justification=raggedright}}
\DeclareCaptionOptionNoValue*{flushright}{%
- \caption@setformat{plain}%
- \caption@setjustification{raggedleft}}
-\DeclareCaptionOptionNoValue*{oneline}{\caption@setbool{slc}{1}}
+ \caption@setup{format=plain,justification=raggedleft}}
+\DeclareCaptionOptionNoValue*{oneline}{\caption@setup{slc=1}}
\DeclareCaptionOptionNoValue*{ignoreLTcapwidth}{%
\caption@WarningNoLine{Obsolete option `ignoreLTcapwidth' ignored}}
\DeclareCaptionOption*{caption}{%