From 4b81beda956165383bb21ad95c6831707bf3e1e0 Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
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/tex/latex/caption/caption.sty | 47 +++++++++++--------------
 1 file changed, 20 insertions(+), 27 deletions(-)

(limited to 'Master/texmf-dist/tex/latex/caption/caption.sty')

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}{%
-- 
cgit v1.2.3

