diff options
author | Karl Berry <karl@freefriends.org> | 2015-09-17 23:49:07 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2015-09-17 23:49:07 +0000 |
commit | 9fd7d087755d8f3890acd6ca639d5a725ed3b176 (patch) | |
tree | 766d2dfd21af44a1422fc88f130525e752ac712d /Master/texmf-dist/tex/latex/caption/caption.sty | |
parent | 6aabc6a32e1008cffcec6edce62975ba5f015436 (diff) |
caption (17sep15)
git-svn-id: svn://tug.org/texlive/trunk@38393 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/caption/caption.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/caption/caption.sty | 50 |
1 files changed, 36 insertions, 14 deletions
diff --git a/Master/texmf-dist/tex/latex/caption/caption.sty b/Master/texmf-dist/tex/latex/caption/caption.sty index 26e461fd682..5e80c921d5c 100644 --- a/Master/texmf-dist/tex/latex/caption/caption.sty +++ b/Master/texmf-dist/tex/latex/caption/caption.sty @@ -6,7 +6,7 @@ %% %% caption.dtx (with options: `package') %% -%% Copyright (C) 1994-2013 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) +%% Copyright (C) 1994-2015 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) %% %% http://sourceforge.net/projects/latex-caption/ %% @@ -36,13 +36,12 @@ %% and the user manuals %% caption-deu.tex, caption-eng.tex, and caption-rus.tex. %% - % bicaption.sty, ltcaption.sty, subcaption.sty, and newfloat.sty, \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: caption.dtx 89 2013-05-02 07:05:20Z sommerfeldt $ +\caption@tempa $Id: caption.sty 111 2015-09-17 09:48:20Z sommerfeldt $ \ProvidesPackage{caption}[\caption@tempa v3.3-\caption@tempb Customizing captions (AR)] -\RequirePackage{caption3}[2013/05/01] % needs v1.6 or newer +\RequirePackage{caption3}[2015/09/01] % needs v1.7 or newer \caption@ifbool{documentclass}{}{% \caption@WarningNoLine{% Unsupported document class (or package) detected,\MessageBreak @@ -379,6 +378,18 @@ {\@dblarg{\@caption\@captype}}% }}% \caption@CheckCommand\caption{% + % beamerbaselocalstructure.sty, Joseph Wright committed 4ac715c 2013-09-04 + \def\caption{% + \ifx\@captype\@undefined + \@latex@error{\noexpand\caption outside figure or table}\@ehd + \expandafter\@gobble + \else + \refstepcounter\@captype + \expandafter\@firstofone + \fi + {\@dblarg{\@caption\@captype}}% + }}% + \caption@CheckCommand\caption{% % float.sty [2001/11/08 v1.3d Float enhancements (AL)] \long\def\caption{% \ifx\@captype\@undefined @@ -678,7 +689,7 @@ redefined by a document class or package which is\MessageBreak unknown to the caption package}% \renewcommand*\caption@redefine{}% - \renewcommand*\caption@ContinuedFloat[1]{% + \renewcommand*\caption@ContinuedFloatX[1]{% \caption@Error{Not available in compatibility mode}}% \caption@AtBeginDocument*{% \let\caption@start\relax @@ -852,9 +863,9 @@ \providecommand*\caption@hj@s{} \def\ContinuedFloat{% \caption@iftype - {\caption@ContinuedFloat\@captype}% + {\caption@ContinuedFloatX\@captype}% {\caption@Error{\noexpand\ContinuedFloat outside float}}} -\newcommand*\caption@ContinuedFloat[1]{% +\newcommand*\caption@ContinuedFloatX[1]{% \@ifstar {\caption@@refstepcounter\@captype \caption@@ContinuedFloat{#1}}% @@ -867,21 +878,26 @@ \else \caption@Error{Continued `#1' after `\caption@CFtype'}% \fi} -\newcommand*\caption@@ContinuedFloat[1]{% +\newcommand*\caption@@ContinuedFloat{% \caption@setflag{ContinuedFloat}% + \caption@@@ContinuedFloat} +\newcommand*\caption@@@ContinuedFloat{% \stepcounter{ContinuedFloat}% - \caption@@@ContinuedFloat{#1}} -\newcommand*\caption@@@ContinuedFloat[1]{% + \caption@@@@ContinuedFloat} +\newcommand*\caption@@@@ContinuedFloat[1]{% \caption@setoptions{ContinuedFloat}% \caption@setoptions{continued#1}% \expandafter\l@addto@macro\csname the#1\endcsname\theContinuedFloat \@ifundefined{theH#1}{}{% \expandafter\l@addto@macro\csname theH#1\endcsname{% \@alph\c@ContinuedFloat}}% - \let\caption@@@ContinuedFloat\@gobble} + \let\caption@@@@ContinuedFloat\@gobble} \newcommand*\caption@CFtype{??} \newcounter{ContinuedFloat} \let\theContinuedFloat\@empty +\def\caption@ContinuedFloat{% + \let\caption@resetContinuedFloat\@gobble + \caption@@@ContinuedFloat} \newcommand*\caption@resetContinuedFloat[1]{% \xdef\caption@CFtype{#1}% \@stpelt{ContinuedFloat}} @@ -1022,6 +1038,8 @@ \fi}% \let\caption\caption@subcaption \let\phantomcaption\caption@subphantom + \let\captionlistentry\caption@sublistentry + \let\caption@refstepcounter\caption@@@refstepcounter \if@subfloatrow \caption@Debug{Keeping \string\@makecaption}% \else @@ -1040,11 +1058,15 @@ \newcommand*\caption@subcaption{% \caption@checkgrouplevel{sub}\subcaption \caption@star - {\caption@@@refstepcounter\@subcaptype}% + {\caption@refstepcounter\@subcaptype}% {\caption@dblarg{\@caption\@subcaptype}}} \newcommand*\caption@subphantom{% \caption@checkgrouplevel{sub}\phantomsubcaption - \caption@@@refstepcounter\@subcaptype} + \caption@refstepcounter\@subcaptype} +\newcommand*\caption@sublistentry{% + \caption@teststar\@subcaptionlistentry\@firstoftwo\@secondoftwo} +\newcommand*\@subcaptionlistentry[1]{% + \@testopt{\caption@listentry{#1}}\@subcaptype} \newcommand*\caption@clearsubcontentslines{% \global\let\caption@subcontentslines\@empty} \caption@clearsubcontentslines @@ -1177,7 +1199,7 @@ \newcommand*\caption@freeze{% \let\caption@frozen@ContinuedFloat\ContinuedFloat \def\ContinuedFloat{% - \caption@@freeze{\caption@@@ContinuedFloat\@captype}% + \caption@@freeze{\caption@@@@ContinuedFloat\@captype}% \caption@frozen@ContinuedFloat}% \let\caption@frozen@setup\caption@setup \def\caption@setup##1{% |