summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/caption/subcaption.dtx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-03-15 22:55:09 +0000
committerKarl Berry <karl@freefriends.org>2012-03-15 22:55:09 +0000
commit9cb823777741267aa9b1dc0a77508da79eb86025 (patch)
tree241821ff3af9d5fc8eaaaefa2a54af2e01346b75 /Master/texmf-dist/source/latex/caption/subcaption.dtx
parentd1ad8fadf5a36d2b3eb1d25d8437eb6e8f1142f0 (diff)
caption 3.2 (15mar12)
git-svn-id: svn://tug.org/texlive/trunk@25657 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.dtx13
1 files changed, 7 insertions, 6 deletions
diff --git a/Master/texmf-dist/source/latex/caption/subcaption.dtx b/Master/texmf-dist/source/latex/caption/subcaption.dtx
index 4ca7b6c55f5..ae8350c876e 100644
--- a/Master/texmf-dist/source/latex/caption/subcaption.dtx
+++ b/Master/texmf-dist/source/latex/caption/subcaption.dtx
@@ -2,7 +2,7 @@
%
% This is file `subcaption.dtx'.
%
-% Copyright (C) 2007-2011 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
+% Copyright (C) 2007-2012 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
%
% --------------------------------------------------------------------------
%
@@ -73,7 +73,6 @@
\newcommand*\csmarg[1]{\texttt{\char`\{#1\char`\}}}
\newcommand*\csoarg[1]{\texttt{\char`\[#1\char`\]}}
\newcommand*\version[2][]{$v#2$}
-\newcommand*\x{\discretionary{}{}{}}
%
\usepackage{marvosym}
\makeatletter
@@ -883,7 +882,7 @@
% \subsection{Identification}
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{subcaption}[2011/10/30 v1.1c Sub-captions (AR)]
+\ProvidesPackage{subcaption}[2012/01/12 v1.1d Sub-captions (AR)]
% \end{macrocode}
%
% \subsection{Initial code}
@@ -1059,10 +1058,12 @@
%
% \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.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}}
% This one calls |\ref| with the second label. (see |\subcaption@label|)
% \begin{macrocode}
-\DeclareRobustCommand*\subref{\@ifstar{\subcaption@ref*}\@subref}
+\DeclareRobustCommand*\subref{%
+ \@ifstar{\subcaption@ref*}\@subref}
\newcommand*\@subref{%
\caption@withoptargs\@@subref}
\newcommand*\@@subref[2]{%
@@ -1075,7 +1076,7 @@
\caption@withoptargs\subcaption@@ref}
\newcommand*\subcaption@@ref[2]{%
\begingroup
- \caption@setoptions*{sub}%
+ \caption@setoptions{sub}%
\subcaption@reffmt\p@subref{\ref#1{sub@#2}}%
\endgroup}
% \end{macrocode}