summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/caption/subcaption.dtx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-02-03 23:00:45 +0000
committerKarl Berry <karl@freefriends.org>2016-02-03 23:00:45 +0000
commitc2b77b4b887eba9dfa698b9a70e5e73b0f5bbcfa (patch)
tree208536948ab3c4efa6e3eafe32bac014b50df900 /Master/texmf-dist/source/latex/caption/subcaption.dtx
parent155385f13efe07d552563c30de184f94da15704b (diff)
caption (3feb16)
git-svn-id: svn://tug.org/texlive/trunk@39562 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/caption/subcaption.dtx')
-rw-r--r--Master/texmf-dist/source/latex/caption/subcaption.dtx48
1 files changed, 29 insertions, 19 deletions
diff --git a/Master/texmf-dist/source/latex/caption/subcaption.dtx b/Master/texmf-dist/source/latex/caption/subcaption.dtx
index b1a8becb95e..112e1900999 100644
--- a/Master/texmf-dist/source/latex/caption/subcaption.dtx
+++ b/Master/texmf-dist/source/latex/caption/subcaption.dtx
@@ -2,10 +2,10 @@
%
% This is file `subcaption.dtx'.
%
-% $Id: subcaption.dtx 117 2015-09-20 20:43:35Z sommerfeldt $
+% $Id: subcaption.dtx 136 2016-02-02 09:41:30Z sommerfeldt $
% $HeadURL: svn+ssh://sommerfeldt@svn.code.sf.net/p/latex-caption/code/branches/3.3/source/subcaption.dtx $
%
-% Copyright (C) 2007-2012 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
+% Copyright (C) 2007-2016 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
%
% --------------------------------------------------------------------------
%
@@ -28,7 +28,7 @@
% and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex.
%
% \fi
-% \CheckSum{142}
+% \CheckSum{147}
%
% \iffalse
%<*driver>
@@ -882,8 +882,8 @@
% \changes{v0.2}{2007/11/11}{\cs{subcaptionbox} added}
% \changes{v0.3}{2007/12/06}{Adapted to \package{caption} package \version{3.1f}}
% \changes{v1.0}{2008/03/16}{\cs{subfloat} added}
-% \changes{v1.0c}{2010/10/27}{An error message will be issued when the subfigure or subfig package is loaded}
-% \changes{v1.0c}{2011/01/22}{Undocumented command \cs{subfloat} removed}
+% \changes{v1.0}{2010/10/27}{An error message will be issued when the subfigure or subfig package is loaded}
+% \changes{v1.0}{2011/01/22}{Undocumented command \cs{subfloat} removed}
%
% \newcommand*\Note[2][Note]{\par{\small\emph{#1:} #2}}
%
@@ -903,7 +903,7 @@
\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: subcaption.dtx 117 2015-09-20 20:43:35Z sommerfeldt $
+\caption@tempa $Id: subcaption.dtx 136 2016-02-02 09:41:30Z sommerfeldt $
\ProvidesPackage{subcaption}[\caption@tempa v1.1-\caption@tempb Sub-captions (AR)]
% \end{macrocode}
%
@@ -913,7 +913,7 @@
% \begin{macrocode}
\RequirePackage{caption}[2012/03/25] % needs v3.3 or newer
% \end{macrocode}
-% \changes{v1.1b}{2011/09/01}{Compatibility error added}
+% \changes{v1.1}{2011/09/01}{Compatibility error added}
% \begin{macrocode}
\caption@AtBeginDocument{\caption@ifcompatibility{%
\caption@Error{%
@@ -958,19 +958,29 @@
%
% \subsection{Main code}
%
-% \changes{v1.1c}{2011/10/30}{Adapted to the newfloat package}
+% \changes{v1.1}{2011/10/30}{Adapted to the newfloat package}
% We call |\Declare|\-|Caption|\-|Sub|\-|Type| for |figure|, |table|,
% and each caption type declared with |\Declare|\-|Floating|\-|Environment| here.
% \begin{macrocode}
\caption@ForEachType{\DeclareCaptionSubType{#1}}
% \end{macrocode}
%
+% \begin{macro}{\newsubfloat}
+% \changes{v1.1}{2016/01/31}{Adapted to the memoir document class}
+% We re-define |\new|\-|sub|\-|float| (offered by the \package{memoir} document class),
+% so our stuff will be used instead.
+% \begin{macrocode}
+\caption@ifundefined\newsubfloat{}{%
+ \renewcommand*\newsubfloat{\DeclareCaptionSubType}}
+% \end{macrocode}
+% \end{macro}
+%
% \pagebreak[3]
% \subsubsection{The \cs{subcaption} command}
%
% \begin{macro}{\subcaption}
-% \changes{v1.1f}{2012/04/06}{\cs{newcommand} changed to \cs{def}
-% so it works with the \puresf{memoir} document class, too}
+% \changes{v1.1}{2012/04/06}{\cs{newcommand} changed to \cs{def}
+% so it works with the \package{memoir} document class, too}
% Without a prefacing |\set|\-|caption|\-|sub|\-|type|, |\sub|\-|caption| is some kind
% of |\caption|\-|of{sub|\-|\@cap|\-|type}|.
% \Note{Like \cs{captionof}, this command is designed to be used inside an
@@ -1037,11 +1047,11 @@
% \subsubsection{The \cs{subcaptionbox} command}
%
% \begin{macro}{\subcaptionbox}
-% \changes{v1.0a}{2008/05/06}{Adapted to the \opt{rule} option of the \package{caption} package}
-% \changes{v1.0b}{2008/08/31}{Definition and usage of \cs{subcaption@hrule} added}
-% \changes{v1.0c}{2010/12/17}{Uses \cs{caption@box} now}
+% \changes{v1.0}{2008/05/06}{Adapted to the \opt{rule} option of the \package{caption} package}
+% \changes{v1.0}{2008/08/31}{Definition and usage of \cs{subcaption@hrule} added}
+% \changes{v1.0}{2010/12/17}{Uses \cs{caption@box} now}
% \changes{v1.1}{2011/08/16}{Adapted to actual version of \cs{caption@box}}
-% \changes{v1.1f}{2012/04/09}{Adapted to actual version of \cs{caption@ibox}}
+% \changes{v1.1}{2012/04/09}{Adapted to actual version of \cs{caption@ibox}}
% A |\parbox| with contents and sub-caption, separated by an invisible |\hrule|.
% \begin{macrocode}
\newcommand*\subcaptionbox{%
@@ -1062,8 +1072,8 @@
% \end{macrocode}
%
% \begin{macro}{\subcaption@label}
-% \changes{v1.1b}{2011/09/12}{Redefinition of \cs{SK@} added}
-% \changes{v1.1b}{2011/09/12}{Uses \cs{caption@withoptargs} now}
+% \changes{v1.1}{2011/09/12}{Redefinition of \cs{SK@} added}
+% \changes{v1.1}{2011/09/12}{Uses \cs{caption@withoptargs} now}
% When a label will be placed for a sub-caption, we automatically place
% a second one for |\subref|, too. This second label will contain
% the sub-type counter only.
@@ -1084,9 +1094,9 @@
%
% \begin{macro}{\subref}
% \changes{v1.1}{2011/08/14}{Caption option \opt{subrefformat=} added}
-% \changes{v1.1a}{2011/08/18}{Uses \cs{caption@setoptions*} now}
-% \changes{v1.1d}{2012/01/12}{Usage of \cs{caption@setoptions*} replaced by \cs{caption@setoptions}}
-% \changes{v1.1f}{2012/04/09}{Revised}
+% \changes{v1.1}{2011/08/18}{Uses \cs{caption@setoptions*} now}
+% \changes{v1.1}{2012/01/12}{Usage of \cs{caption@setoptions*} replaced by \cs{caption@setoptions}}
+% \changes{v1.1}{2012/04/09}{Revised}
% This one calls |\ref| with the second label. (see |\subcaption@label|)
% \begin{macrocode}
\DeclareRobustCommand*\subref{%