diff options
Diffstat (limited to 'Master')
22 files changed, 410 insertions, 220 deletions
diff --git a/Master/texmf-dist/doc/latex/caption/CHANGELOG b/Master/texmf-dist/doc/latex/caption/CHANGELOG index 38e2e691fb9..9d899d056ed 100644 --- a/Master/texmf-dist/doc/latex/caption/CHANGELOG +++ b/Master/texmf-dist/doc/latex/caption/CHANGELOG @@ -136,6 +136,9 @@ v1.2 (2008/03/28) v1.3 (2011/09/12) - New macro \CaptionLabelSeparator +v1.4 (2013/06/01) +- Adapted to the memoir document class (v3.7b) + subcaption package ================== diff --git a/Master/texmf-dist/doc/latex/caption/README b/Master/texmf-dist/doc/latex/caption/README index 41de4a54224..331f5e00c69 100644 --- a/Master/texmf-dist/doc/latex/caption/README +++ b/Master/texmf-dist/doc/latex/caption/README @@ -1,28 +1,30 @@ ========================================================================== The `caption' package bundle -Copyright (C) 1994-2013 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) +Copyright (C) 1994-2015 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) License: LPPL = LaTeX Project Public Licence Maintenance Status: maintained (by Axel Sommerfeldt) Home page: -http://sourceforge.net/projects/latex-caption/ + http://sourceforge.net/projects/latex-caption/ If you need help for installation please visit: -http://www.tex.ac.uk/cgi-bin/texfaq2html?label=inst-miktex* -http://www.tex.ac.uk/cgi-bin/texfaq2html?label=installthings -http://www.tex.ac.uk/cgi-bin/texfaq2html?label=privinst + http://www.tex.ac.uk/cgi-bin/texfaq2html?label=inst-miktex* + http://www.tex.ac.uk/cgi-bin/texfaq2html?label=installthings + http://www.tex.ac.uk/cgi-bin/texfaq2html?label=privinst If you need help using these packages please visit: -http://www.latex-community.org/ -http://tex.stackexchange.com/ -http://www.mrunix.de/ (German) -http://www.golatex.de/ (German) + http://www.latex-community.org/ + http://tex.stackexchange.com/ + http://www.mrunix.de/ (German) + http://www.golatex.de/ (German) If you think you may have found a bug in these packages, -or want to report a suggestion for improvement, please visit: -http://sourceforge.net/p/latex-caption/tickets/ +or want to report a suggestion for improvement, please either visit + http://sourceforge.net/p/latex-caption/tickets/ +or send an e-mail to me + axel.sommerfeldt@f-m.fm -------------------------------------------------------------------------- @@ -49,7 +51,7 @@ User Manual: bicaption.pdf (English) -------------------------------------------------------------------------- -The `ltcaption' package v1.3 fixes caption problems with +The `ltcaption' package v1.4 fixes caption problems with other-than-center aligned longtables. (solving LaTeX PR `tools/3387') A bonus feature is the addition of the environment longtable* which does diff --git a/Master/texmf-dist/doc/latex/caption/ltcaption.pdf b/Master/texmf-dist/doc/latex/caption/ltcaption.pdf Binary files differindex d035a4ad4ca..088b64eb521 100644 --- a/Master/texmf-dist/doc/latex/caption/ltcaption.pdf +++ b/Master/texmf-dist/doc/latex/caption/ltcaption.pdf diff --git a/Master/texmf-dist/source/latex/caption/bicaption.dtx b/Master/texmf-dist/source/latex/caption/bicaption.dtx index 90b7184f13a..728948065e8 100644 --- a/Master/texmf-dist/source/latex/caption/bicaption.dtx +++ b/Master/texmf-dist/source/latex/caption/bicaption.dtx @@ -2,10 +2,10 @@ % % This is file `bicaption.dtx'. % -% $Id: bicaption.dtx 89 2013-05-02 07:05:20Z sommerfeldt $ -% $HeadURL: svn+ssh://sommerfeldt@svn.code.sf.net/p/latex-caption/code/trunk/source/bicaption.dtx $ +% $Id: bicaption.dtx 111 2015-09-17 09:48:20Z sommerfeldt $ +% $HeadURL: svn+ssh://sommerfeldt@svn.code.sf.net/p/latex-caption/code/branches/3.3/source/bicaption.dtx $ % -% Copyright (C) 2010-2013 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) +% Copyright (C) 2010-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{387} +% \CheckSum{330} % % \iffalse %<*driver> @@ -797,11 +797,11 @@ \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: bicaption.dtx 89 2013-05-02 07:05:20Z sommerfeldt $ +\caption@tempa $Id: bicaption.dtx 111 2015-09-17 09:48:20Z sommerfeldt $ \ProvidesPackage{bicaption}[\caption@tempa v1.1-\caption@tempb Bilingual Captions (AR)] % \end{macrocode} % \begin{macrocode} -\RequirePackage{caption}[2012/12/26] % needs v3.3 or newer +\RequirePackage{caption}[2015/09/01] % needs v3.3 or newer % \end{macrocode} % \changes{v1.0}{2011/09/01}{Compatibility error added} % \begin{macrocode} @@ -1053,6 +1053,7 @@ % \end{macro} % % \begin{macro}{\bicaption@@make} +% \changes{v1.1}{2015/09/16}{\cs{bicaption@label} replaced by \cs{caption@thelabel}} % |\bicaption@@make|\marg{text \#2}\marg{label}\marg{text \#1}\par % Typeset both captions using the original version of \cs{caption@@make}. % \begin{macrocode} @@ -1075,8 +1076,8 @@ % (Otherwise we only apply the label of it.) % \begin{macrocode} \ifnum\bicaption@lang=2\relax - \bicaption@label - \global\let\bicaption@label\relax + \caption@thelabel + \global\let\caption@thelabel\relax \else \begingroup \caption@setoptions{bi-first}% @@ -1134,6 +1135,7 @@ % % \begin{macro}{\@bicaption} % \changes{v1.0}{2011/08/31}{Optional parameter \meta{list entry \#2} added} +% \changes{v1.1}{2015/09/16}{\cs{bicaption@getlabel} replaced by \cs{caption@getlabel}} % |\@bicaption|\marg{cmd}*\oarg{entry \#1}\marg{text \#1}\oarg{entry \#2}\marg{text \#2}\ldots % \begin{macrocode} \newcommand*\@bicaption[1]{% @@ -1153,7 +1155,7 @@ % \end{macrocode} % \begin{macrocode} \long\def\@@@@bicaption#1#2[#3]#4{% - \bicaption@getlabel#2\label{}\@nil + \caption@getlabel#2\label{}\@nil \bicaption@ifswap {\bicaption@setup{#1}{#2}% \bicaption@cmd[{#3}]{#4}}% @@ -1162,42 +1164,6 @@ % \end{macrocode} % \end{macro} % -% \begin{macro}{\bicaption@getlabel} -% \changes{v1.0}{2011/09/03}{\cs{label} can have optional arguments now} -% Gets the label command out of the (first) caption text and stores it to |\bi|\-|caption@label|. -% \begin{macrocode} -\long\def\bicaption@getlabel#1\label#2#3\@nil{% - \def\@tempa{#2}% - \ifx\@tempa\@empty - \let\bicaption@label\relax - \else - \def\@tempb{*}% - \ifx\@tempa\@tempb - \def\bicaption@label{\label*}% - \bicaption@@getlabel#3\@nil - \else - \def\bicaption@label{\label}% - \bicaption@@getlabel{#2}#3\@nil - \fi - \fi} -% \end{macrocode} -% \begin{macrocode} -\long\def\bicaption@@getlabel#1#2\@nil{% - \def\@tempa{#1}% - \def\@tempb{[}% - \ifx\@tempa\@tempb - \bicaption@@@getlabel#1#2\@nil - \else - \l@addto@macro\bicaption@label{{#1}}% - \fi} -% \end{macrocode} -% \begin{macrocode} -\long\def\bicaption@@@getlabel[#1]#2\@nil{% - \l@addto@macro\bicaption@label{[{#1}]}% - \bicaption@@getlabel#2\@nil} -% \end{macrocode} -% \end{macro} -% % \begin{macro}{\bicaption@setup} % |\bicaption@setup|\marg{list-entry}\marg{text}\par % Initiates the bilingual caption typesetting by storing the extra texts into diff --git a/Master/texmf-dist/source/latex/caption/caption-deu.tex b/Master/texmf-dist/source/latex/caption/caption-deu.tex index 55b639c408a..d83d1c1062c 100644 --- a/Master/texmf-dist/source/latex/caption/caption-deu.tex +++ b/Master/texmf-dist/source/latex/caption/caption-deu.tex @@ -2,7 +2,7 @@ % This is file `caption-deu.tex'. % % $Id: caption-deu.tex 64 2013-02-03 13:41:27Z sommerfeldt $ -% $HeadURL: svn+ssh://sommerfeldt@svn.code.sf.net/p/latex-caption/code/trunk/source/caption-deu.tex $ +% $HeadURL: svn+ssh://sommerfeldt@svn.code.sf.net/p/latex-caption/code/branches/3.3/source/caption-deu.tex $ % % Copyright (C) 1994-2012 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) % diff --git a/Master/texmf-dist/source/latex/caption/caption-eng.tex b/Master/texmf-dist/source/latex/caption/caption-eng.tex index 6c3782bb306..a6eb72e4434 100644 --- a/Master/texmf-dist/source/latex/caption/caption-eng.tex +++ b/Master/texmf-dist/source/latex/caption/caption-eng.tex @@ -2,7 +2,7 @@ % This is file `caption-eng.tex'. % % $Id: caption-eng.tex 64 2013-02-03 13:41:27Z sommerfeldt $ -% $HeadURL: svn+ssh://sommerfeldt@svn.code.sf.net/p/latex-caption/code/trunk/source/caption-eng.tex $ +% $HeadURL: svn+ssh://sommerfeldt@svn.code.sf.net/p/latex-caption/code/branches/3.3/source/caption-eng.tex $ % % Copyright (C) 1994-2012 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) % diff --git a/Master/texmf-dist/source/latex/caption/caption-rus.tex b/Master/texmf-dist/source/latex/caption/caption-rus.tex index 458259adcaa..582c0b07665 100644 --- a/Master/texmf-dist/source/latex/caption/caption-rus.tex +++ b/Master/texmf-dist/source/latex/caption/caption-rus.tex @@ -3,7 +3,7 @@ % Russian translation of `caption-eng.tex' % % $Id: caption-rus.tex 63 2013-02-03 13:27:05Z sommerfeldt $ -% $HeadURL: svn+ssh://sommerfeldt@svn.code.sf.net/p/latex-caption/code/trunk/source/caption-rus.tex $ +% $HeadURL: svn+ssh://sommerfeldt@svn.code.sf.net/p/latex-caption/code/branches/3.3/source/caption-rus.tex $ % % Copyright (C) 1994-2007 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) % diff --git a/Master/texmf-dist/source/latex/caption/caption.dtx b/Master/texmf-dist/source/latex/caption/caption.dtx index 36d35e39f2e..0cdb873108c 100644 --- a/Master/texmf-dist/source/latex/caption/caption.dtx +++ b/Master/texmf-dist/source/latex/caption/caption.dtx @@ -2,10 +2,10 @@ % % This is file `caption.dtx'. % -% $Id: caption.dtx 89 2013-05-02 07:05:20Z sommerfeldt $ -% $HeadURL: svn+ssh://sommerfeldt@svn.code.sf.net/p/latex-caption/code/trunk/source/caption.dtx $ +% $Id: caption.dtx 111 2015-09-17 09:48:20Z sommerfeldt $ +% $HeadURL: svn+ssh://sommerfeldt@svn.code.sf.net/p/latex-caption/code/branches/3.3/source/caption.dtx $ % -% Copyright (C) 1994-2013 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) +% Copyright (C) 1994-2015 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) % % -------------------------------------------------------------------------- % @@ -24,11 +24,11 @@ % This work consists of the files caption.ins, caption.dtx, caption2.dtx, % caption3.dtx, bicaption.dtx, ltcaption.dtx, subcaption.dtx, and newfloat.dtx, % the derived files caption.sty, caption2.sty, caption3.sty, - % bicaption.sty, ltcaption.sty, subcaption.sty, and newfloat.sty, +% bicaption.sty, ltcaption.sty, subcaption.sty, and newfloat.sty, % and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex. % % \fi -% \CheckSum{3507} +% \CheckSum{3558} % % \iffalse %<*driver> @@ -223,14 +223,14 @@ \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.dtx 111 2015-09-17 09:48:20Z sommerfeldt $ \ProvidesPackage{caption}[\caption@tempa v3.3-\caption@tempb Customizing captions (AR)] % \end{macrocode} % % \subsection{Loading the kernel} % % \begin{macrocode} -\RequirePackage{caption3}[2013/05/01] % needs v1.6 or newer +\RequirePackage{caption3}[2015/09/01] % needs v1.7 or newer % \end{macrocode} % % \subsection{Check against incompatible document classes} @@ -1041,6 +1041,21 @@ % % \begin{macrocode} \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}}% + }}% +% \end{macrocode} +% +% \begin{macrocode} + \caption@CheckCommand\caption{% % float.sty [2001/11/08 v1.3d Float enhancements (AL)] \long\def\caption{% \ifx\@captype\@undefined @@ -1425,7 +1440,7 @@ % % |\ContinuedFloat| is not supported in compatibility mode. % \begin{macrocode} - \renewcommand*\caption@ContinuedFloat[1]{% + \renewcommand*\caption@ContinuedFloatX[1]{% \caption@Error{Not available in compatibility mode}}% % \end{macrocode} % @@ -1856,18 +1871,15 @@ % \subsection{\cs{ContinuedFloat}} % % \begin{macro}{\ContinuedFloat} -% \changes{v3.0f}{2005/06/11}{% -% Call of \cs{caption@ContinuedFloat} added} -% \changes{v3.0i}{2005/11/12}{% -% Optional argument and call of \cs{caption@@ContinuedFloat} added} -% \changes{v3.0g}{2005/06/28}{% -% Bugfix: \cs{newcounter} replaced by \cs{newcount}} +% \changes{v3.0i}{2005/11/12}{Optional argument added} +% \changes{v3.0g}{2005/06/28}{Bugfix: \cs{newcounter} replaced by \cs{newcount}} % \changes{v3.1}{2007/07/02}{Format of \package{hyperref} extension changed} % \changes{v3.1}{2007/07/07}{\cs{caption@setoptions} added} % \changes{v3.1g}{2008/01/29}{Starred variant added} % \changes{v3.2f}{2011/12/17}{Undocumented optional argument removed} % \changes{v3.3}{2011/12/28}{Uses \cs{ifcaption@ContinuedFloat} now} % \changes{v3.3}{2013/05/01}{Usage of \cs{caption@restorecounters} added} +% \changes{v3.3}{2013/12/16}{Bugfix: Does not use \cs{caption@ContinuedFloat} anymore since this breaks \cs{ContinuedFloat} offered by the \package{subfig} package} % |\ContinuedFloat|\\ % |\ContinuedFloat*|\par % This mainly sets the appropriate flag, increments the @@ -1889,11 +1901,11 @@ % \begin{macrocode} \def\ContinuedFloat{% \caption@iftype - {\caption@ContinuedFloat\@captype}% + {\caption@ContinuedFloatX\@captype}% {\caption@Error{\noexpand\ContinuedFloat outside float}}} % \end{macrocode} % \begin{macrocode} -\newcommand*\caption@ContinuedFloat[1]{% +\newcommand*\caption@ContinuedFloatX[1]{% \@ifstar {\caption@@refstepcounter\@captype \caption@@ContinuedFloat{#1}}% @@ -1910,20 +1922,22 @@ \fi} % \end{macrocode} % \begin{macrocode} -\newcommand*\caption@@ContinuedFloat[1]{% +\newcommand*\caption@@ContinuedFloat{% \caption@setflag{ContinuedFloat}% + \caption@@@ContinuedFloat} +\newcommand*\caption@@@ContinuedFloat{% \stepcounter{ContinuedFloat}% - \caption@@@ContinuedFloat{#1}} + \caption@@@@ContinuedFloat} % \end{macrocode} % \begin{macrocode} -\newcommand*\caption@@@ContinuedFloat[1]{% +\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} % \end{macrocode} % \begin{macrocode} \newcommand*\caption@CFtype{??} @@ -1939,6 +1953,18 @@ % \end{macrocode} % \end{macro} % +% \begin{macro}{\caption@ContinuedFloat} +% \changes{v3.0f}{2005/06/11}{This macro added} +% \changes{v3.3}{2013/12/16}{Bugfix: Revised and defined with \cs{def} instead of \cs{newcommand}} +% |\caption@ContinuedFloat|\marg{type}\par +% This one is used by \cs{ContinuedFloat} offered by the \package{subfig} package. +% \begin{macrocode} +\def\caption@ContinuedFloat{% + \let\caption@resetContinuedFloat\@gobble + \caption@@@ContinuedFloat} +% \end{macrocode} +% \end{macro} +% % \begin{macro}{\caption@resetContinuedFloat} % \changes{v3.2f}{2011/12/17}{Redefinition of \cs{ContinuedFloat} added} % |\caption@resetContinuedFloat|\marg{type}\par @@ -2299,6 +2325,7 @@ % \changes{v3.3}{2011/12/28}{Bugfix 11-12-16: \cs{caption@l@stepcounter} replaced by \cs{stepcounter}} % \changes{v3.3}{2012/03/15}{Usage of \cs{caption@setbox} added} % \changes{v3.3}{2013/05/01}{Redefinition of \cs{caption@settype} added} +% \changes{v3.3}{2013/06/17}{Missing redefinition of \cs{captionlistentry} added} % Hook, will be used inside \cs{caption@setsubtype}.\par % (Note: If we are inside an |sub|\-|float|\-|row| environment we have to keep % the |\@make|\-|caption| code of the \package{floatrow} package intact.) @@ -2349,6 +2376,9 @@ % redefine \caption \let\caption\caption@subcaption \let\phantomcaption\caption@subphantom + \let\captionlistentry\caption@sublistentry +% \let\@captype\@subcaptype + \let\caption@refstepcounter\caption@@@refstepcounter % \end{macrocode} % \begin{macrocode} % restore \@makecaption @@ -2383,7 +2413,7 @@ \newcommand*\caption@subcaption{% \caption@checkgrouplevel{sub}\subcaption \caption@star - {\caption@@@refstepcounter\@subcaptype}% + {\caption@refstepcounter\@subcaptype}% {\caption@dblarg{\@caption\@subcaptype}}} % \end{macrocode} % \end{macro} @@ -2394,7 +2424,20 @@ % \begin{macrocode} \newcommand*\caption@subphantom{% \caption@checkgrouplevel{sub}\phantomsubcaption - \caption@@@refstepcounter\@subcaptype} + \caption@refstepcounter\@subcaptype} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\caption@sublistentry} +% \changes{v3.3}{2013/06/17}{This macro added} +% Same as |\captionlistentry|, but for sub-captions. +% \begin{macrocode} +\newcommand*\caption@sublistentry{% + \caption@teststar\@subcaptionlistentry\@firstoftwo\@secondoftwo} +% \end{macrocode} +% \begin{macrocode} +\newcommand*\@subcaptionlistentry[1]{% + \@testopt{\caption@listentry{#1}}\@subcaptype} % \end{macrocode} % \end{macro} % @@ -2730,7 +2773,7 @@ \newcommand*\caption@freeze{% \let\caption@frozen@ContinuedFloat\ContinuedFloat \def\ContinuedFloat{% - \caption@@freeze{\caption@@@ContinuedFloat\@captype}% + \caption@@freeze{\caption@@@@ContinuedFloat\@captype}% \caption@frozen@ContinuedFloat}% % \end{macrocode} % \begin{macrocode} diff --git a/Master/texmf-dist/source/latex/caption/caption.ins b/Master/texmf-dist/source/latex/caption/caption.ins index e431d36f94e..566711ab117 100644 --- a/Master/texmf-dist/source/latex/caption/caption.ins +++ b/Master/texmf-dist/source/latex/caption/caption.ins @@ -6,7 +6,7 @@ \preamble -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/ diff --git a/Master/texmf-dist/source/latex/caption/caption2.dtx b/Master/texmf-dist/source/latex/caption/caption2.dtx index 0b0369f091c..1cf2e1468ec 100644 --- a/Master/texmf-dist/source/latex/caption/caption2.dtx +++ b/Master/texmf-dist/source/latex/caption/caption2.dtx @@ -3,7 +3,7 @@ % This is file `caption2.dtx'. % % $Id: caption2.dtx 63 2013-02-03 13:27:05Z sommerfeldt $ -% $HeadURL: svn+ssh://sommerfeldt@svn.code.sf.net/p/latex-caption/code/trunk/source/caption2.dtx $ +% $HeadURL: svn+ssh://sommerfeldt@svn.code.sf.net/p/latex-caption/code/branches/3.3/source/caption2.dtx $ % % Copyright (C) 1994-2011 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) % diff --git a/Master/texmf-dist/source/latex/caption/caption3.dtx b/Master/texmf-dist/source/latex/caption/caption3.dtx index d1b72258426..edf1839953d 100644 --- a/Master/texmf-dist/source/latex/caption/caption3.dtx +++ b/Master/texmf-dist/source/latex/caption/caption3.dtx @@ -2,10 +2,10 @@ % % This is file `caption3.dtx'. % -% $Id: caption3.dtx 88 2013-05-02 05:15:09Z sommerfeldt $ -% $HeadURL: svn+ssh://sommerfeldt@svn.code.sf.net/p/latex-caption/code/trunk/source/caption3.dtx $ +% $Id: caption3.dtx 111 2015-09-17 09:48:20Z sommerfeldt $ +% $HeadURL: svn+ssh://sommerfeldt@svn.code.sf.net/p/latex-caption/code/branches/3.3/source/caption3.dtx $ % -% Copyright (C) 1994-2013 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) +% Copyright (C) 1994-2015 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) % % -------------------------------------------------------------------------- % @@ -28,12 +28,12 @@ % and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex. % % \fi -% \CheckSum{3543} +% \CheckSum{3633} % % \iffalse %<*driver> \NeedsTeXFormat{LaTeX2e}[1994/12/01] -\ProvidesFile{caption3.drv}[2013/05/01 v1.6 Implementation of the caption kernel] +\ProvidesFile{caption3.drv}[2015/09/15 v1.7 Implementation of the caption kernel] \hbadness=9999 \newcount\hbadness \hfuzz=100pt % Make TeX shut up. %\errorcontextlines=3 % @@ -203,8 +203,8 @@ \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 88 2013-05-02 05:15:09Z sommerfeldt $ -\ProvidesPackage{caption3}[\caption@tempa v1.6-\caption@tempb caption3 kernel (AR)] +\caption@tempa $Id: caption3.dtx 111 2015-09-17 09:48:20Z sommerfeldt $ +\ProvidesPackage{caption3}[\caption@tempa v1.7-\caption@tempb caption3 kernel (AR)] % \end{macrocode} % % \subsection{Generic helpers} @@ -1733,13 +1733,15 @@ % \end{macro} % % \changes{v1.2}{2007/12/16}{Caption label format \opt{brace} added} -% There are four pre-defined label formats, called `empty', `simple', -% `parens', and `brace'. +% \changes{v1.7}{2015/09/16}{Caption label format \opt{autodot} added} +% There are five pre-defined label formats, called `empty', `simple', +% `parens', `brace', and `autodot'. % \begin{macrocode} \DeclareCaptionLabelFormat{empty}{} \DeclareCaptionLabelFormat{simple}{\bothIfFirst{#1}{\nobreakspace}#2} \DeclareCaptionLabelFormat{parens}{\bothIfFirst{#1}{\nobreakspace}(#2)} \DeclareCaptionLabelFormat{brace}{\bothIfFirst{#1}{\nobreakspace}#2)} +\DeclareCaptionLabelFormat{autodot}{\bothIfFirst{#1}{\nobreakspace}\autodot} % \end{macrocode} % % `default' usually maps to `simple'. @@ -1867,8 +1869,20 @@ % % There are three pre-defined text formats, called `empty', `simple' and `period'. % \changes{v1.4}{2011/10/05}{Pre-defined text format `empty' added} +% \changes{v1.7}{2015/09/16}{The text format `empty' now takes care of the \cs{label}} +% \begin{macrocode} +\DeclareCaptionTextFormat{empty}{% + \caption@get@label#1\caption@makeanchor{}\@nil + \caption@thelabel} +\long\def\caption@get@label#1\caption@makeanchor#2#3\@nil{% + \def\caption@tempa{#2}% + \ifx\caption@tempa\@empty + \caption@getlabel#1\label{}\@nil + \else + \caption@getlabel#2\label{}\@nil + \fi} +% \end{macrocode} % \begin{macrocode} -\DeclareCaptionTextFormat{empty}{} \DeclareCaptionTextFormat{simple}{#1} \DeclareCaptionTextFormat{period}{#1.} % \end{macrocode} @@ -1878,6 +1892,43 @@ \def\caption@tfmt@default{\caption@tfmt@simple} % \end{macrocode} % +% \begin{macro}{\caption@getlabel} +% \changes{v1.0}{2011/09/03}{\cs{label} can have optional arguments now} +% \changes{v1.7}{2015/09/16}{Moved from \package{bicaption} package to \package{caption3}} +% Gets the label command out of the (first) caption text and stores it to |\caption@thelabel|. +% \begin{macrocode} +\long\def\caption@getlabel#1\label#2#3\@nil{% + \def\@tempa{#2}% + \ifx\@tempa\@empty + \let\caption@thelabel\relax + \else + \def\@tempb{*}% + \ifx\@tempa\@tempb + \def\caption@thelabel{\label*}% + \caption@@getlabel#3\@nil + \else + \def\caption@thelabel{\label}% + \caption@@getlabel{#2}#3\@nil + \fi + \fi} +% \end{macrocode} +% \begin{macrocode} +\long\def\caption@@getlabel#1#2\@nil{% + \def\@tempa{#1}% + \def\@tempb{[}% + \ifx\@tempa\@tempb + \caption@@@getlabel#1#2\@nil + \else + \l@addto@macro\caption@thelabel{{#1}}% + \fi} +% \end{macrocode} +% \begin{macrocode} +\long\def\caption@@@getlabel[#1]#2\@nil{% + \l@addto@macro\caption@thelabel{[{#1}]}% + \caption@@getlabel#2\@nil} +% \end{macrocode} +% \end{macro} +% % \subsection{Fonts} % % \begin{macro}{\DeclareCaptionFont} @@ -2441,10 +2492,11 @@ % \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{#2}} + \global\@namedef{caption@lstfmt@#1}##1##2##3{#2}} \@onlypreamble\DeclareCaptionListFormat % \end{macrocode} % \end{macro} @@ -3051,6 +3103,7 @@ % \changes{v1.4}{2011/08/19}{Split into three macros} % \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}} % |\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 @@ -3083,7 +3136,7 @@ {\caption@add@contentsline {\csname ext@#1\endcsname}% {#1}% - {\caption@lstfmt{\@nameuse{p@#1}}{\@nameuse{the#1}}}% + {\caption@lstfmt{\@nameuse{p@#1}}{\@nameuse{the#1}}{#1}}% {\ignorespaces #2}}}} % \end{macrocode} % \begin{macrocode} @@ -3590,6 +3643,7 @@ % \changes{v1.4}{2011/10/09}{Support of the titletoc package added} % \changes{v1.5}{2011/12/29}{Usage of \cs{caption@addtoreset} replaced by \cs{@addtoreset}} % \changes{v1.5}{2013/01/10}{Bugfix: Definition of autoref string corrected} +% \changes{v1.6}{2013/06/17}{Bugfix: \cs{c@tocdepth} will be set (locally) now} % |\DeclareCaptionSubType|\oarg{numbering scheme}\marg{type}\\ % |\DeclareCaptionSubType*|\oarg{numbering scheme}\marg{type}\par % The starred variant provides the numbering format @@ -3677,7 +3731,8 @@ % \begin{macrocode} \newcommand*\caption@@@@@declaresublistentry[4]{% \@namedef{l@sub#2}{#1{2}{#3}{#4}}% - \caption@@@@@@declaresublistentry#1{c@\csname ext@#2\endcsname depth}} + \expandafter\caption@@@@@@declaresublistentry + \expandafter#1\expandafter{\csname ext@#2\endcsname depth}} \@onlypreamble\caption@@@@@declaresublistentry % \end{macrocode} % \begin{macrocode} @@ -3685,9 +3740,11 @@ \ifx#1\relax \def#1##1{% \def\next{\@dottedtocline{##1}}% - \@ifundefined{#2}{}{% - \ifnum ##1>\@nameuse{#2}\relax + \@ifundefined{c@#2}{}{% + \ifnum ##1>\@nameuse{c@#2}\relax \let\next\@gobblefour + \else + \c@tocdepth=\@nameuse{c@#2}\relax \fi}% \next}% \fi} diff --git a/Master/texmf-dist/source/latex/caption/ltcaption.dtx b/Master/texmf-dist/source/latex/caption/ltcaption.dtx index e2e93706dd3..e3b2d4e23a4 100644 --- a/Master/texmf-dist/source/latex/caption/ltcaption.dtx +++ b/Master/texmf-dist/source/latex/caption/ltcaption.dtx @@ -2,10 +2,10 @@ % % This is file `ltcaption.dtx'. % -% $Id: ltcaption.dtx 63 2013-02-03 13:27:05Z sommerfeldt $ -% $HeadURL: svn+ssh://sommerfeldt@svn.code.sf.net/p/latex-caption/code/trunk/source/ltcaption.dtx $ +% $Id: ltcaption.dtx 94 2013-06-09 16:07:04Z sommerfeldt $ +% $HeadURL: svn+ssh://sommerfeldt@svn.code.sf.net/p/latex-caption/code/branches/3.3/source/ltcaption.dtx $ % -% Copyright (C) 2007-2011 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) +% Copyright (C) 2007-2013 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) % % -------------------------------------------------------------------------- % @@ -28,13 +28,13 @@ % and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex. % % \fi -% \CheckSum{356} +% \CheckSum{386} % % \iffalse %<*driver> \NeedsTeXFormat{LaTeX2e}[1994/12/01] \ProvidesFile{ltcaption.drv}% - [2009/03/30 v1.2 This package fixes caption problems with + [2013/06/01 v1.4 This package fixes caption problems with other-than-centered aligned longtables] \hbadness=9999 \newcount\hbadness \hfuzz=48pt % Make TeX shut up. % @@ -72,7 +72,7 @@ % \newcommand*\purerm[1]{{\upshape\mdseries\rmfamily #1}} % \newcommand*\puresf[1]{{\upshape\mdseries\sffamily #1}} % \newcommand*\purett[1]{{\upshape\mdseries\ttfamily #1}} -% \let\package\puresf +% \let\class\puresf \let\package\puresf % \let\env\purett \let\opt\purett % % \def\thispackage{the \package{ltcaption} package} @@ -84,7 +84,7 @@ % \GetFileInfo{ltcaption.sty} % % \title{\texorpdfstring{\Thispackage\thanks{%^^A -% This package has version number \fileversion, last revised \filedate.}}%^^A +% This package has version number \fileversion.}}%^^A % {The ltcaption package}} % \author{Axel Sommerfeldt\\ % \url{http://sourceforge.net/projects/latex-caption/}} @@ -147,8 +147,9 @@ % % \emph{Note:} % These lengths \& commands do not work when \thispackage\ is used with one -% of the \KOMAScript\ classes\cite{KOMAScript} |scrartcl|, |scrreprt| or -% |scrbook|, the \KOMAScript\ settings for captions are used instead. +% of the \KOMAScript\ document classes \class{scrartcl}, \class{scrreprt}, or \class{scrbook}~\cite{KOMAScript}, +% or used with the \class{memoir} document class~\cite{memoir}. +% The \KOMAScript\ resp.~\class{memoir} settings for captions are used instead. % Same with the \package{caption} package which also uses its own options % and settings. % @@ -165,7 +166,9 @@ % | A & B \\|\\ % |\end{longtable}| % \end{quote} +% \pagebreak[3] % will result in a longtable like this: +% \pagebreak[3] % \setcounter{figure}{6} % \begingroup % \renewcommand\LTcaptype{figure} @@ -180,7 +183,7 @@ % does not increment the |table| counter. (As a consequence, |\caption| is not % available for such longtables, but |\caption*| still is.) % -% \clearpage +% \pagebreak[3] % \section{Spot the difference} % % \begin{minipage}{\linewidth} @@ -369,19 +372,25 @@ % \bibitem{NTGclasses} % Victor Eijkhout: % \href{http://tug.ctan.org/tex-archive/macros/latex/contrib/ntgclass/}% -% {\emph{An introduction to the Dutch \LaTeX\ document classes}},\\ +% {\emph{An introduction to the Dutch \LaTeX\ document classes}}, % \mbox{3~September~1989} % % \bibitem{KOMAScript} % Markus Kohm \& Jens-Uwe-Morawski: % \href{http://tug.ctan.org/tex-archive/macros/latex/contrib/koma-script/}% -% {\emph{KOMA-Script -- a versatile \LaTeXe\ bundle}},\\ -% 2007-01-09 +% {\emph{KOMA-Script -- a versatile \LaTeXe\ bundle}}, +% 2012-07-22 +% +% \bibitem{memoir} +% Peter Wilson, maintained by Lars Madsen: +% \href{http://tug.ctan.org/tex-archive/macros/latex/contrib/koma-script/}% +% {\emph{The Memoir Class for Configurable Typesetting}}, +% 2013-05-30 % % \bibitem{floatrow} % Olga Lapko: % \href{http://tug.ctan.org/tex-archive/macros/latex/contrib/floatrow/}% -% {\emph{The floatrow package documentation}},\\ +% {\emph{The floatrow package documentation}}, % 2007/08/24 % \end{thebibliography} % } @@ -456,8 +465,8 @@ \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: ltcaption.dtx 63 2013-02-03 13:27:05Z sommerfeldt $ -\ProvidesPackage{ltcaption}[\caption@tempa v1.3-\caption@tempb longtable captions (AR)] +\caption@tempa $Id: ltcaption.dtx 94 2013-06-09 16:07:04Z sommerfeldt $ +\ProvidesPackage{ltcaption}[\caption@tempa v1.4-\caption@tempb longtable captions (AR)] % \end{macrocode} % % \begin{macrocode} @@ -830,7 +839,7 @@ \if@komalongtable % \end{macrocode} % \begin{macrocode} - \renewcommand{\LT@makecaption}[3]{% + \renewcommand\LT@makecaption[3]{% \noalign{% \if@captionabove \vskip\belowcaptionskip @@ -856,6 +865,32 @@ \fi} % \end{macrocode} % +% \subsection{Adaption for \texorpdfstring{Memoir}{Memoir}} +% +% \begin{macrocode} +\@ifclassloaded{memoir}{% + \@ifundefined{@@makecaption}{}{% + \renewcommand\LT@makecaption[3]{% +% \noalign{\vskip\abovecaptionskip}% + \caption@LT@make{% + \let\@memtempa\relax + % starred form -> #1 = \@gobble + \ifx#1\@gobble + \let\@contnfont\@empty + \let\@contdelim\@empty + \@@makecaption{}{#3}% + \else + \@@makecaption{#2}{#3}% + \fi + \endgraf\vskip\belowcaptionskip}}% +% \end{macrocode} +% \begin{macrocode} + \let\LT@@makecaption\@undefined +% \end{macrocode} +% \begin{macrocode} + }}{} +% \end{macrocode} +% % \iffalse %</package> % \fi diff --git a/Master/texmf-dist/source/latex/caption/newfloat.dtx b/Master/texmf-dist/source/latex/caption/newfloat.dtx index a3228bc1d69..f80eed4c129 100644 --- a/Master/texmf-dist/source/latex/caption/newfloat.dtx +++ b/Master/texmf-dist/source/latex/caption/newfloat.dtx @@ -2,10 +2,10 @@ % % This is file `newfloat.dtx'. % -% $Id: newfloat.dtx 91 2013-05-11 12:25:57Z sommerfeldt $ -% $HeadURL: svn+ssh://sommerfeldt@svn.code.sf.net/p/latex-caption/code/trunk/source/newfloat.dtx $ +% $Id: newfloat.dtx 109 2015-09-17 09:29:07Z sommerfeldt $ +% $HeadURL: svn+ssh://sommerfeldt@svn.code.sf.net/p/latex-caption/code/branches/3.3/source/newfloat.dtx $ % -% Copyright (C) 2011-2013 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) +% Copyright (C) 2011-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{1318} +% \CheckSum{1322} % % \iffalse %<*driver> @@ -536,7 +536,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: newfloat.dtx 91 2013-05-11 12:25:57Z sommerfeldt $ +\caption@tempa $Id: newfloat.dtx 109 2015-09-17 09:29:07Z sommerfeldt $ \ProvidesPackage{newfloat}[\caption@tempa v1.1-\caption@tempb Defining new floating environments (AR)] % \end{macrocode} % @@ -613,6 +613,8 @@ % \begin{macro}{\DeclareFloatingEnvironment} % \changes{v1.0a}{2011/11/16}{Bugfix: Undefines \cs{fst@}\meta{environment} now} % \changes{v1.1}{2013/04/27}{Revised, only defines stuff yet undefined now} +% \changes{v1.1}{2013/11/03}{Uses \cs{newfloat@capitalize} now} +% \changes{v1.1}{2015/09/16}{Support of \cs{autodot} (offered by the \KOMAScript\ classes) added} % |\DeclareFloatingEnvironment|\oarg{options}\marg{environment}\oarg{name}\oarg{list name} % \begin{macrocode} \newcommand*\DeclareFloatingEnvironment{% @@ -621,15 +623,7 @@ % \end{macrocode} % \begin{macrocode} \def\@DeclareFloatingEnvironment[#1]#2{% -% \end{macrocode} -% First of all, we set |\newfloat@Type| to the type name\par -% \begin{macrocode} \newfloat@Info{New float `#2' with options `#1'}% - \edef\newfloat@Type{\def\noexpand\newfloat@Type{\@car#2\@nil}}% - \uppercase\expandafter{\newfloat@Type}% - \edef\@tempa{% - \noexpand\g@addto@macro\noexpand\newfloat@Type{\@cdr#2\@nil}}% - \@tempa % \end{macrocode} % Define a counter with the same name as the floating environment % \begin{macrocode} @@ -657,11 +651,12 @@ % Define |\fnum@|\meta{type}, a macro to generate the figure number for a caption % \begin{macrocode} \newfloat@def{fnum@#2}% - {\@nameuse{#2name}\nobreakspace\@nameuse{the#2}}% + {\@nameuse{#2name}\nobreakspace\@nameuse{the#2}\@nameuse{autodot}}% % \end{macrocode} % Define |\|\meta{type}|name| used by |\fnum@|\meta{type} as \meta{type}, % but with first letter capitalized % \begin{macrocode} + \newfloat@capitalize\newfloat@Type{#2}% \newfloat@let{#2name}{\newfloat@Type}% \newfloat@def{fleg#2}{\@nameuse{#2name}}% legend naming (memoir) % \end{macrocode} @@ -739,6 +734,21 @@ % \end{macrocode} % \end{macro} % +% \begin{macro}{\newfloat@capitalize} +% \changes{v1.1}{2013/11/03}{Code extracted from \cs{DeclareFloatingEnvironment}} +% \changes{v1.1}{2013/11/03}{Uses \cs{newfloat@tempa} instead of \cs{@tempa} now} +% |\newfloat@capitalize|\marg{command}\marg{name}\\ +% Defines \meta{command} to \meta{name}, but with first letter capitalized. +% \begin{macrocode} +\newcommand*\newfloat@capitalize[2]{% + \edef\newfloat@tempa{\gdef\noexpand#1{\@car#2\@nil}}% + \uppercase\expandafter{\newfloat@tempa}% + \edef\newfloat@tempa{% + \noexpand\g@addto@macro\noexpand#1{\@cdr#2\@nil}}% + \newfloat@tempa} +% \end{macrocode} +% \end{macro} +% % \begin{macro}{\newfloat@listof} % \changes{v1.1}{2013/04/27}{Revised} % |\newfloat@listof|\marg{float type}\\ @@ -797,10 +807,12 @@ % \end{macro} % % \begin{macro}{\newfloat@setoption} +% \changes{v1.1}{2015/09/15}{Bugfix: \cs{@expandtwoargs} replaced by own expansion so the option value do not get expanded anymore} % |\newfloat@setoption|\marg{option name}{options} % \begin{macrocode} \newcommand*\newfloat@setoption[1]{% - \expandafter\@expandtwoargs\csname newfloat@set#1\endcsname\newfloat@type} + \edef\caption@tempa{\noexpand\@nameuse{newfloat@set#1}{\newfloat@type}}% + \caption@tempa} % \end{macrocode} % \end{macro} % diff --git a/Master/texmf-dist/source/latex/caption/subcaption.dtx b/Master/texmf-dist/source/latex/caption/subcaption.dtx index 2c37dfc6c89..484dd6b1f5e 100644 --- a/Master/texmf-dist/source/latex/caption/subcaption.dtx +++ b/Master/texmf-dist/source/latex/caption/subcaption.dtx @@ -3,7 +3,7 @@ % This is file `subcaption.dtx'. % % $Id: subcaption.dtx 75 2013-04-16 17:57:13Z sommerfeldt $ -% $HeadURL: svn+ssh://sommerfeldt@svn.code.sf.net/p/latex-caption/code/trunk/source/subcaption.dtx $ +% $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) % diff --git a/Master/texmf-dist/source/latex/caption/totalcount.dtx b/Master/texmf-dist/source/latex/caption/totalcount.dtx index b4f84db7676..19eb4b20bc3 100644 --- a/Master/texmf-dist/source/latex/caption/totalcount.dtx +++ b/Master/texmf-dist/source/latex/caption/totalcount.dtx @@ -3,7 +3,7 @@ % This is file `totalcount.dtx'. % % $Id: totalcount.dtx 93 2013-05-12 10:17:54Z sommerfeldt $ -% $HeadURL: svn+ssh://sommerfeldt@svn.code.sf.net/p/latex-caption/code/trunk/source/totalcount.dtx $ +% $HeadURL: svn+ssh://sommerfeldt@svn.code.sf.net/p/latex-caption/code/branches/3.3/source/totalcount.dtx $ % % Copyright (C) 2010-2013 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) % diff --git a/Master/texmf-dist/tex/latex/caption/bicaption.sty b/Master/texmf-dist/tex/latex/caption/bicaption.sty index 27735cb0998..05f7e511911 100644 --- a/Master/texmf-dist/tex/latex/caption/bicaption.sty +++ b/Master/texmf-dist/tex/latex/caption/bicaption.sty @@ -6,7 +6,7 @@ %% %% bicaption.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/ %% @@ -39,9 +39,9 @@ \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: bicaption.dtx 89 2013-05-02 07:05:20Z sommerfeldt $ +\caption@tempa $Id: bicaption.sty 111 2015-09-17 09:48:20Z sommerfeldt $ \ProvidesPackage{bicaption}[\caption@tempa v1.1-\caption@tempb Bilingual Captions (AR)] -\RequirePackage{caption}[2012/12/26] % needs v3.3 or newer +\RequirePackage{caption}[2015/09/01] % needs v3.3 or newer \caption@AtBeginDocument{\caption@ifcompatibility{% \caption@Error{% The `bicaption' package does not work correctly\MessageBreak @@ -152,8 +152,8 @@ {}% \fi \ifnum\bicaption@lang=2\relax - \bicaption@label - \global\let\bicaption@label\relax + \caption@thelabel + \global\let\caption@thelabel\relax \else \begingroup \caption@setoptions{bi-first}% @@ -184,37 +184,12 @@ \long\def\@@@bicaption[#1]#2{% \caption@dblarg{\@@@@bicaption{#1}{#2}}} \long\def\@@@@bicaption#1#2[#3]#4{% - \bicaption@getlabel#2\label{}\@nil + \caption@getlabel#2\label{}\@nil \bicaption@ifswap {\bicaption@setup{#1}{#2}% \bicaption@cmd[{#3}]{#4}}% {\bicaption@setup{#3}{#4}% \bicaption@cmd[{#1}]{#2}}} -\long\def\bicaption@getlabel#1\label#2#3\@nil{% - \def\@tempa{#2}% - \ifx\@tempa\@empty - \let\bicaption@label\relax - \else - \def\@tempb{*}% - \ifx\@tempa\@tempb - \def\bicaption@label{\label*}% - \bicaption@@getlabel#3\@nil - \else - \def\bicaption@label{\label}% - \bicaption@@getlabel{#2}#3\@nil - \fi - \fi} -\long\def\bicaption@@getlabel#1#2\@nil{% - \def\@tempa{#1}% - \def\@tempb{[}% - \ifx\@tempa\@tempb - \bicaption@@@getlabel#1#2\@nil - \else - \l@addto@macro\bicaption@label{{#1}}% - \fi} -\long\def\bicaption@@@getlabel[#1]#2\@nil{% - \l@addto@macro\bicaption@label{[{#1}]}% - \bicaption@@getlabel#2\@nil} \newcommand\bicaption@setup[2]{% \def\bicaption@lentry{#1}% \def\bicaption@text{\ignorespaces#2}} 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{% diff --git a/Master/texmf-dist/tex/latex/caption/caption2.sty b/Master/texmf-dist/tex/latex/caption/caption2.sty index a4a37457c66..487aac682ce 100644 --- a/Master/texmf-dist/tex/latex/caption/caption2.sty +++ b/Master/texmf-dist/tex/latex/caption/caption2.sty @@ -6,7 +6,7 @@ %% %% caption2.dtx (with options: `package') %% -%% Copyright (C) 1994-2013 Axel Sommerfeldt +%% Copyright (C) 1994-2013 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) %% %% http://sourceforge.net/projects/latex-caption/ %% @@ -24,16 +24,22 @@ %% %% This Current Maintainer of this work is Axel Sommerfeldt. %% -%% This work consists of the files caption.ins, caption.dtx, caption2.dtx, -%% caption3.dtx, bicaption.dtx, ltcaption.dtx, subcaption.dtx, and newfloat.dtx, -%% the derived files caption.sty, caption2.sty, caption3.sty, -%% bicaption.sty, ltcaption.sty, subcaption.sty, and newfloat.sty, -%% and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex. +%% This work consists of the files +%% CHANGELOG, README, SUMMARY, caption.ins, +%% caption.dtx, caption2.dtx, caption3.dtx, +%% bicaption.dtx, ltcaption.dtx, subcaption.dtx, +%% newfloat.dtx, and totalcount.dtx +%% the derived files +%% caption.sty, caption2.sty, caption3.sty, +%% bicaption.sty, ltcaption.sty, subcaption.sty, +%% newfloat.sty, and totalcount.sty +%% and the user manuals +%% caption-deu.tex, caption-eng.tex, and caption-rus.tex. %% \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: caption2.sty 62 2013-02-03 10:40:15Z sommerfeldt $ +\caption@tempa $Id: caption2.sty 100 2015-09-15 17:00:16Z sommerfeldt $ \ProvidesPackage{caption2}[\caption@tempa v2.2-\caption@tempb Customising captions (AR)] \PackageWarning{caption2}{% ****************************************************\MessageBreak diff --git a/Master/texmf-dist/tex/latex/caption/caption3.sty b/Master/texmf-dist/tex/latex/caption/caption3.sty index c621116bf6e..43fa98f09f7 100644 --- a/Master/texmf-dist/tex/latex/caption/caption3.sty +++ b/Master/texmf-dist/tex/latex/caption/caption3.sty @@ -6,7 +6,7 @@ %% %% caption3.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/ %% @@ -39,8 +39,8 @@ \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 88 2013-05-02 05:15:09Z sommerfeldt $ -\ProvidesPackage{caption3}[\caption@tempa v1.6-\caption@tempb caption3 kernel (AR)] +\caption@tempa $Id: caption3.sty 111 2015-09-17 09:48:20Z sommerfeldt $ +\ProvidesPackage{caption3}[\caption@tempa v1.7-\caption@tempb caption3 kernel (AR)] \providecommand*\@nameundef[1]{% \expandafter\let\csname #1\endcsname\@undefined} \begingroup\expandafter\expandafter\expandafter\endgroup @@ -647,6 +647,7 @@ \DeclareCaptionLabelFormat{simple}{\bothIfFirst{#1}{\nobreakspace}#2} \DeclareCaptionLabelFormat{parens}{\bothIfFirst{#1}{\nobreakspace}(#2)} \DeclareCaptionLabelFormat{brace}{\bothIfFirst{#1}{\nobreakspace}#2)} +\DeclareCaptionLabelFormat{autodot}{\bothIfFirst{#1}{\nobreakspace}\autodot} \def\caption@lfmt@default{\caption@lfmt@simple} \newcommand\DeclareCaptionLabelSeparator{% \caption@teststar\caption@declarelabelseparator\@gobble\@firstofone} @@ -696,10 +697,44 @@ \@ifundefined{caption@tfmt@#1}% {\caption@Error{Undefined text format `#1'}}% {\expandafter\let\expandafter\caption@tfmt\csname caption@tfmt@#1\endcsname}} -\DeclareCaptionTextFormat{empty}{} +\DeclareCaptionTextFormat{empty}{% + \caption@get@label#1\caption@makeanchor{}\@nil + \caption@thelabel} +\long\def\caption@get@label#1\caption@makeanchor#2#3\@nil{% + \def\caption@tempa{#2}% + \ifx\caption@tempa\@empty + \caption@getlabel#1\label{}\@nil + \else + \caption@getlabel#2\label{}\@nil + \fi} \DeclareCaptionTextFormat{simple}{#1} \DeclareCaptionTextFormat{period}{#1.} \def\caption@tfmt@default{\caption@tfmt@simple} +\long\def\caption@getlabel#1\label#2#3\@nil{% + \def\@tempa{#2}% + \ifx\@tempa\@empty + \let\caption@thelabel\relax + \else + \def\@tempb{*}% + \ifx\@tempa\@tempb + \def\caption@thelabel{\label*}% + \caption@@getlabel#3\@nil + \else + \def\caption@thelabel{\label}% + \caption@@getlabel{#2}#3\@nil + \fi + \fi} +\long\def\caption@@getlabel#1#2\@nil{% + \def\@tempa{#1}% + \def\@tempb{[}% + \ifx\@tempa\@tempb + \caption@@@getlabel#1#2\@nil + \else + \l@addto@macro\caption@thelabel{{#1}}% + \fi} +\long\def\caption@@@getlabel[#1]#2\@nil{% + \l@addto@macro\caption@thelabel{[{#1}]}% + \caption@@getlabel#2\@nil} \newcommand*\DeclareCaptionFont[2]{% \define@key{caption@fnt}{#1}[]{\l@addto@macro\caption@fnt{#2}}} \@onlypreamble\DeclareCaptionFont @@ -915,7 +950,7 @@ \newcommand*\caption@setlisttype@ext{% \caption@@setlisttype\caption@listtype@ext} \newcommand*\DeclareCaptionListFormat[2]{% - \global\@namedef{caption@lstfmt@#1}##1##2{#2}} + \global\@namedef{caption@lstfmt@#1}##1##2##3{#2}} \@onlypreamble\DeclareCaptionListFormat \DeclareCaptionOption{listformat}{\caption@setlistformat{#1}} \newcommand*\caption@setlistformat[1]{% @@ -1307,7 +1342,7 @@ {\caption@add@contentsline {\csname ext@#1\endcsname}% {#1}% - {\caption@lstfmt{\@nameuse{p@#1}}{\@nameuse{the#1}}}% + {\caption@lstfmt{\@nameuse{p@#1}}{\@nameuse{the#1}}{#1}}% {\ignorespaces #2}}}} \newcommand*\caption@add@contentsline{% \caption@@@addcontentsline} @@ -1564,15 +1599,18 @@ \@onlypreamble\caption@@@@declaresublistentry \newcommand*\caption@@@@@declaresublistentry[4]{% \@namedef{l@sub#2}{#1{2}{#3}{#4}}% - \caption@@@@@@declaresublistentry#1{c@\csname ext@#2\endcsname depth}} + \expandafter\caption@@@@@@declaresublistentry + \expandafter#1\expandafter{\csname ext@#2\endcsname depth}} \@onlypreamble\caption@@@@@declaresublistentry \newcommand*\caption@@@@@@declaresublistentry[2]{ \ifx#1\relax \def#1##1{% \def\next{\@dottedtocline{##1}}% - \@ifundefined{#2}{}{% - \ifnum ##1>\@nameuse{#2}\relax + \@ifundefined{c@#2}{}{% + \ifnum ##1>\@nameuse{c@#2}\relax \let\next\@gobblefour + \else + \c@tocdepth=\@nameuse{c@#2}\relax \fi}% \next}% \fi} diff --git a/Master/texmf-dist/tex/latex/caption/ltcaption.sty b/Master/texmf-dist/tex/latex/caption/ltcaption.sty index 153f4c875f0..74f6a26dde7 100644 --- a/Master/texmf-dist/tex/latex/caption/ltcaption.sty +++ b/Master/texmf-dist/tex/latex/caption/ltcaption.sty @@ -6,7 +6,7 @@ %% %% ltcaption.dtx (with options: `package') %% -%% Copyright (C) 1994-2013 Axel Sommerfeldt +%% Copyright (C) 1994-2013 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) %% %% http://sourceforge.net/projects/latex-caption/ %% @@ -24,17 +24,23 @@ %% %% This Current Maintainer of this work is Axel Sommerfeldt. %% -%% This work consists of the files caption.ins, caption.dtx, caption2.dtx, -%% caption3.dtx, bicaption.dtx, ltcaption.dtx, subcaption.dtx, and newfloat.dtx, -%% the derived files caption.sty, caption2.sty, caption3.sty, -%% bicaption.sty, ltcaption.sty, subcaption.sty, and newfloat.sty, -%% and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex. +%% This work consists of the files +%% CHANGELOG, README, SUMMARY, caption.ins, +%% caption.dtx, caption2.dtx, caption3.dtx, +%% bicaption.dtx, ltcaption.dtx, subcaption.dtx, +%% newfloat.dtx, and totalcount.dtx +%% the derived files +%% caption.sty, caption2.sty, caption3.sty, +%% bicaption.sty, ltcaption.sty, subcaption.sty, +%% newfloat.sty, and totalcount.sty +%% and the user manuals +%% caption-deu.tex, caption-eng.tex, and caption-rus.tex. %% \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: ltcaption.sty 62 2013-02-03 10:40:15Z sommerfeldt $ -\ProvidesPackage{ltcaption}[\caption@tempa v1.3-\caption@tempb longtable captions (AR)] +\caption@tempa $Id: ltcaption.sty 94 2013-06-09 16:07:04Z sommerfeldt $ +\ProvidesPackage{ltcaption}[\caption@tempa v1.4-\caption@tempb longtable captions (AR)] \@ifpackageloaded{longtable}{}{% \PackageError{ltcaption}{longtable package not loaded, aborting}{RTFM}} \providecommand*\LTcaptype{table} @@ -175,7 +181,7 @@ {\endlongtable} \@ifundefined{@komalongtablefalse}{}{% \if@komalongtable - \renewcommand{\LT@makecaption}[3]{% + \renewcommand\LT@makecaption[3]{% \noalign{% \if@captionabove \vskip\belowcaptionskip @@ -195,6 +201,22 @@ }% \let\LT@@makecaption\@undefined \fi} +\@ifclassloaded{memoir}{% + \@ifundefined{@@makecaption}{}{% + \renewcommand\LT@makecaption[3]{% + \caption@LT@make{% + \let\@memtempa\relax + % starred form -> #1 = \@gobble + \ifx#1\@gobble + \let\@contnfont\@empty + \let\@contdelim\@empty + \@@makecaption{}{#3}% + \else + \@@makecaption{#2}{#3}% + \fi + \endgraf\vskip\belowcaptionskip}}% + \let\LT@@makecaption\@undefined + }}{} \endinput %% %% End of file `ltcaption.sty'. diff --git a/Master/texmf-dist/tex/latex/caption/newfloat.sty b/Master/texmf-dist/tex/latex/caption/newfloat.sty index c72ffd9ab61..de68c5d1610 100644 --- a/Master/texmf-dist/tex/latex/caption/newfloat.sty +++ b/Master/texmf-dist/tex/latex/caption/newfloat.sty @@ -6,7 +6,7 @@ %% %% newfloat.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/ %% @@ -39,7 +39,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: newfloat.sty 91 2013-05-11 12:25:57Z sommerfeldt $ +\caption@tempa $Id: newfloat.sty 109 2015-09-17 09:29:07Z sommerfeldt $ \ProvidesPackage{newfloat}[\caption@tempa v1.1-\caption@tempb Defining new floating environments (AR)] \newcommand*\newfloat@Info[1]{% \PackageInfo{newfloat}{#1}} @@ -66,11 +66,6 @@ \@onlypreamble\DeclareFloatingEnvironment \def\@DeclareFloatingEnvironment[#1]#2{% \newfloat@Info{New float `#2' with options `#1'}% - \edef\newfloat@Type{\def\noexpand\newfloat@Type{\@car#2\@nil}}% - \uppercase\expandafter{\newfloat@Type}% - \edef\@tempa{% - \noexpand\g@addto@macro\noexpand\newfloat@Type{\@cdr#2\@nil}}% - \@tempa \newfloat@ifundefined{c@#2}{\newcounter{#2}}% \ifdefined\c@float@type % from float package \expandafter\edef\csname ftype@#2\endcsname{\the\value{float@type}}% @@ -88,7 +83,8 @@ \fi\fi \newfloat@Info{float type `#2'=\@nameuse{ftype@#2}}% \newfloat@def{fnum@#2}% - {\@nameuse{#2name}\nobreakspace\@nameuse{the#2}}% + {\@nameuse{#2name}\nobreakspace\@nameuse{the#2}\@nameuse{autodot}}% + \newfloat@capitalize\newfloat@Type{#2}% \newfloat@let{#2name}{\newfloat@Type}% \newfloat@def{fleg#2}{\@nameuse{#2name}}% legend naming (memoir) \newfloat@ifundefined{flegtoc#2}{\@namedef{flegtoc#2}##1{}}% @@ -128,6 +124,12 @@ \def\newfloat@DFE@setlistname[#1]{% \KV@@newfloat@listname{#1}} \@onlypreamble\newfloat@DFE@setlistname +\newcommand*\newfloat@capitalize[2]{% + \edef\newfloat@tempa{\gdef\noexpand#1{\@car#2\@nil}}% + \uppercase\expandafter{\newfloat@tempa}% + \edef\newfloat@tempa{% + \noexpand\g@addto@macro\noexpand#1{\@cdr#2\@nil}}% + \newfloat@tempa} \newcommand*\newfloat@listof[1]{% \@expandtwoargs\newfloat@list@of{#1}{\@nameuse{ext@#1}}} \newcommand*\newfloat@list@of[2]{% @@ -161,7 +163,8 @@ \ifcsname c@chapter\endcsname chapter\else none\fi} \@onlypreamble\newfloat@within@default \newcommand*\newfloat@setoption[1]{% - \expandafter\@expandtwoargs\csname newfloat@set#1\endcsname\newfloat@type} + \edef\caption@tempa{\noexpand\@nameuse{newfloat@set#1}{\newfloat@type}}% + \caption@tempa} \newcommand*\newfloat@setfileext[2]{% \@namedef{ext@#1}{#2}} \define@key{@newfloat}{fileext}{% diff --git a/Master/texmf-dist/tex/latex/caption/subcaption.sty b/Master/texmf-dist/tex/latex/caption/subcaption.sty index 759a19ab24d..2afa81d0727 100644 --- a/Master/texmf-dist/tex/latex/caption/subcaption.sty +++ b/Master/texmf-dist/tex/latex/caption/subcaption.sty @@ -6,7 +6,7 @@ %% %% subcaption.dtx (with options: `package') %% -%% Copyright (C) 1994-2013 Axel Sommerfeldt +%% Copyright (C) 1994-2013 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) %% %% http://sourceforge.net/projects/latex-caption/ %% @@ -24,16 +24,22 @@ %% %% This Current Maintainer of this work is Axel Sommerfeldt. %% -%% This work consists of the files caption.ins, caption.dtx, caption2.dtx, -%% caption3.dtx, bicaption.dtx, ltcaption.dtx, subcaption.dtx, and newfloat.dtx, -%% the derived files caption.sty, caption2.sty, caption3.sty, -%% bicaption.sty, ltcaption.sty, subcaption.sty, and newfloat.sty, -%% and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex. +%% This work consists of the files +%% CHANGELOG, README, SUMMARY, caption.ins, +%% caption.dtx, caption2.dtx, caption3.dtx, +%% bicaption.dtx, ltcaption.dtx, subcaption.dtx, +%% newfloat.dtx, and totalcount.dtx +%% the derived files +%% caption.sty, caption2.sty, caption3.sty, +%% bicaption.sty, ltcaption.sty, subcaption.sty, +%% newfloat.sty, and totalcount.sty +%% and the user manuals +%% caption-deu.tex, caption-eng.tex, and caption-rus.tex. %% \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.sty 62 2013-02-03 10:40:15Z sommerfeldt $ +\caption@tempa $Id: subcaption.sty 100 2015-09-15 17:00:16Z sommerfeldt $ \ProvidesPackage{subcaption}[\caption@tempa v1.1-\caption@tempb Sub-captions (AR)] \RequirePackage{caption}[2012/03/25] % needs v3.3 or newer \caption@AtBeginDocument{\caption@ifcompatibility{% |