diff options
author | Karl Berry <karl@freefriends.org> | 2015-09-21 21:58:06 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2015-09-21 21:58:06 +0000 |
commit | 231b3e33972bc418dc51de55e2dbd853adb90224 (patch) | |
tree | 0002463c9ee34d48fc80d4d2de23d45780223f43 /Master/texmf-dist/source/latex/caption/caption3.dtx | |
parent | 91ecd30193433c2d35e87b6810c790e2937c2f39 (diff) |
caption (21sep15)
git-svn-id: svn://tug.org/texlive/trunk@38425 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/caption/caption3.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/caption/caption3.dtx | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/Master/texmf-dist/source/latex/caption/caption3.dtx b/Master/texmf-dist/source/latex/caption/caption3.dtx index edf1839953d..ffb0fd2172a 100644 --- a/Master/texmf-dist/source/latex/caption/caption3.dtx +++ b/Master/texmf-dist/source/latex/caption/caption3.dtx @@ -2,7 +2,7 @@ % % This is file `caption3.dtx'. % -% $Id: caption3.dtx 111 2015-09-17 09:48:20Z sommerfeldt $ +% $Id: caption3.dtx 117 2015-09-20 20:43:35Z sommerfeldt $ % $HeadURL: svn+ssh://sommerfeldt@svn.code.sf.net/p/latex-caption/code/branches/3.3/source/caption3.dtx $ % % Copyright (C) 1994-2015 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{3633} +% \CheckSum{3635} % % \iffalse %<*driver> @@ -203,7 +203,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: caption3.dtx 111 2015-09-17 09:48:20Z sommerfeldt $ +\caption@tempa $Id: caption3.dtx 117 2015-09-20 20:43:35Z sommerfeldt $ \ProvidesPackage{caption3}[\caption@tempa v1.7-\caption@tempb caption3 kernel (AR)] % \end{macrocode} % @@ -2492,11 +2492,10 @@ % \begin{macro}{\DeclareCaptionListFormat} % \changes{v1.1}{2004/07/15}{This macro added} % \changes{v1.2}{2007/11/17}{Renamed from \cs{DeclareCaptionListOfFormat} to \cs{DeclareCaptionListFormat}} -% \changes{v1.7}{2015/09/15}{Argument \#3 added which holds the environment name} % |\DeclareCaptionListFormat|\marg{name}\marg{code with \#1 and \#2} % \begin{macrocode} \newcommand*\DeclareCaptionListFormat[2]{% - \global\@namedef{caption@lstfmt@#1}##1##2##3{#2}} + \global\@namedef{caption@lstfmt@#1}##1##2{#2}} \@onlypreamble\DeclareCaptionListFormat % \end{macrocode} % \end{macro} @@ -3104,6 +3103,7 @@ % \changes{v1.4}{2011/08/30}{Support for option \opt{listtype=} added} % \changes{v1.5}{2012/01/15}{Usage of \cs{caption@addsubcontentslines} added} % \changes{v1.7}{2015/09/15}{Argument \#3 which holds the environment name added to \cs{caption@lstfmt}} +% \changes{v1.7}{2015/09/20}{Unfortunately \package{subfig} defines and uses \cs{caption@lstfmt} as well, so I replaced the third argument with \cs{captionlisttype}} % |\caption@addcontentsline|\marg{type}\marg{list entry}\par % Makes an entry in the list-of-whatever, if requested, % i.e.~the argument \meta{list entry} is not empty and @@ -3133,11 +3133,12 @@ {\let\\\space \@ifundefined{ext@#1}% {\caption@Error{No float type '#1' defined}}% - {\caption@add@contentsline - {\csname ext@#1\endcsname}% - {#1}% - {\caption@lstfmt{\@nameuse{p@#1}}{\@nameuse{the#1}}{#1}}% - {\ignorespaces #2}}}} + {\def\captionlisttype{#1}% + \caption@add@contentsline + {\csname ext@#1\endcsname}% + {#1}% + {\caption@lstfmt{\@nameuse{p@#1}}{\@nameuse{the#1}}}% + {\ignorespaces #2}}}} % \end{macrocode} % \begin{macrocode} \newcommand*\caption@add@contentsline{% @@ -3905,19 +3906,19 @@ % % \bibitem{hyperref} % Sebastian Rahtz \& Heiko Oberdiek:\\ -% \href{http://tug.ctan.org/tex-archive/macros/latex/contrib/hyperref/}% +% \href{http://www.ctan.org/pkg/hyperref}% % {\emph{Hypertext marks in \LaTeX}},\\ % November 12, 2007 % % \bibitem{refcount} % Heiko Oberdiek:\\ -% \href{ftp://ctan.tug.org/tex-archive/macros/latex/contrib/oberdiek/refcount.pdf}% +% \href{http://www.ctan.org/pkg/refcount}% % {\emph{The refcount package}},\\ % 2006/02/20 % % \bibitem{threeparttable} % Donald Arseneau:\\ -% \href{http://tug.ctan.org/tex-archive/macros/latex/contrib/misc/}% +% \href{http://www.ctan.org/pkg/threeparttable}% % {\emph{Three part tables: title, tabular environment, notes}},\\ % 2003/06/13 % \end{thebibliography} |