summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Master/texmf-dist/doc/latex/caption/README4
-rw-r--r--Master/texmf-dist/source/latex/caption/bicaption.dtx93
-rw-r--r--Master/texmf-dist/source/latex/caption/caption.dtx59
-rw-r--r--Master/texmf-dist/source/latex/caption/caption.ins2
-rw-r--r--Master/texmf-dist/source/latex/caption/caption3.dtx44
-rw-r--r--Master/texmf-dist/source/latex/caption/subcaption.dtx48
-rw-r--r--Master/texmf-dist/tex/latex/caption/bicaption.sty57
-rw-r--r--Master/texmf-dist/tex/latex/caption/caption.sty21
-rw-r--r--Master/texmf-dist/tex/latex/caption/caption3.sty34
-rw-r--r--Master/texmf-dist/tex/latex/caption/subcaption.sty6
10 files changed, 282 insertions, 86 deletions
diff --git a/Master/texmf-dist/doc/latex/caption/README b/Master/texmf-dist/doc/latex/caption/README
index fd90321262e..0468be7a06d 100644
--- a/Master/texmf-dist/doc/latex/caption/README
+++ b/Master/texmf-dist/doc/latex/caption/README
@@ -1,8 +1,8 @@
==========================================================================
The `caption' package bundle
-Release 2015-09-20
-Copyright (C) 1994-2015 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
+Release 2016-02-02
+Copyright (C) 1994-2016 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
License: LPPL = LaTeX Project Public Licence
Maintenance Status: maintained (by Axel Sommerfeldt)
diff --git a/Master/texmf-dist/source/latex/caption/bicaption.dtx b/Master/texmf-dist/source/latex/caption/bicaption.dtx
index 728948065e8..5975f9561d2 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 111 2015-09-17 09:48:20Z sommerfeldt $
+% $Id: bicaption.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/bicaption.dtx $
%
-% Copyright (C) 2010-2015 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
+% Copyright (C) 2010-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{330}
+% \CheckSum{393}
%
% \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 111 2015-09-17 09:48:20Z sommerfeldt $
+\caption@tempa $Id: bicaption.dtx 136 2016-02-02 09:41:30Z sommerfeldt $
\ProvidesPackage{bicaption}[\caption@tempa v1.1-\caption@tempb Bilingual Captions (AR)]
% \end{macrocode}
% \begin{macrocode}
-\RequirePackage{caption}[2015/09/01] % needs v3.3 or newer
+\RequirePackage{caption}[2016/02/01] % needs v3.3-134 or newer
% \end{macrocode}
% \changes{v1.0}{2011/09/01}{Compatibility error added}
% \begin{macrocode}
@@ -981,11 +981,19 @@
% \begin{macro}{\caption@addcontentsline}
% \changes{v1.0}{2011/08/31}{Redefinition of \cs{caption@kernel@addcontentsline} added}
% \changes{v1.0b}{2012/01/15}{\cs{caption@kernel@addcontentsline} changed to \cs{caption@addcontentsline}}
+% \changes{v1.1}{2016/02/01}{Adaption to \package{longtable} package added}
% We patch |\caption@add|\-|contents|\-|line| (of the \package{caption} package kernel)
% so |bi|\-|caption@add|\-|contents|\-|line| will be used for bilingual captions instead.
% \begin{macrocode}
\let\bicaption@addcontentsline@ORI\caption@addcontentsline
\renewcommand*\caption@addcontentsline[2]{%
+% \end{macrocode}
+% \begin{macrocode}
+ \caption@ifundefined\bicaption@LT@setup{}{%
+ \bicaption@LT@setup
+ \global\let\bicaption@LT@setup\@undefined}%
+% \end{macrocode}
+% \begin{macrocode}
\caption@ifundefined\bicaption@lentry
{\bicaption@addcontentsline@ORI{#1}{#2}}%
{\expandafter\bicaption@addcontentsline\expandafter
@@ -1039,16 +1047,20 @@
% \end{macro}
%
% \begin{macro}{\caption@@make}
-% We patch |\caption@@make| (of the \package{caption} package kernel)
+% We redefine |\caption@@make| (of the \package{caption} package kernel)
% so |\bi|\-|caption@@make| will be used for bilingual captions instead.
% \begin{macrocode}
-\let\caption@@make@ORI\caption@@make
\renewcommand\caption@@make[2]{%
\caption@ifundefined\bicaption@text
- {\caption@@make@ORI{#1}{#2}}%
+ {\begingroup
+ \caption@@make@{#1}{#2}%
+ \endgroup}%
{\expandafter\bicaption@@make\expandafter
{\bicaption@text}{#1}{#2}%
- \global\let\bicaption@text\@undefined}}
+ \global\let\bicaption@text\@undefined}%
+% \end{macrocode}
+% \begin{macrocode}
+ \caption@@make@epilogue}
% \end{macrocode}
% \end{macro}
%
@@ -1081,7 +1093,7 @@
\else
\begingroup
\caption@setoptions{bi-first}%
- \caption@@make@ORI{#2}{#3}%
+ \caption@@make@{#2}{#3}%
\endgroup
\fi
% \end{macrocode}
@@ -1091,9 +1103,10 @@
\else
\begingroup
\caption@setoptions{bi-second}%
- \caption@@make@ORI{#2}{#1}%
+ \caption@@make@{#2}{#1}%
\endgroup
- \fi}
+ \fi
+}
% \end{macrocode}
% \end{macro}
%
@@ -1139,11 +1152,11 @@
% |\@bicaption|\marg{cmd}*\oarg{entry \#1}\marg{text \#1}\oarg{entry \#2}\marg{text \#2}\ldots
% \begin{macrocode}
\newcommand*\@bicaption[1]{%
- \def\bicaption@cmd{#1}%
\@ifstar
- {\l@addto@macro\bicaption@cmd*%
+ {\def\bicaption@cmd{\bicaption@star{#1}}%
\@@bicaption}%
- {\caption@dblarg\@@@bicaption}}
+ {\def\bicaption@cmd{#1}%
+ \caption@dblarg\@@@bicaption}}
% \end{macrocode}
% \begin{macrocode}
\newcommand\@@bicaption[1]{%
@@ -1162,6 +1175,55 @@
{\bicaption@setup{#3}{#4}%
\bicaption@cmd[{#1}]{#2}}}
% \end{macrocode}
+% \begin{macrocode}
+\long\def\bicaption@star#1[#2]{#1*}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\LT@bicaption}
+% \changes{v1.1}{2016/01/31}{Adaption to \package{longtable} package added}
+% Same as |\@bicaption| but for |longtable| (offered by the \package{longtable} package).
+% |\bicaption@LTsetup| will be executed later on, inside |\LT@makecaption| offered by the \package{caption} package.
+% \begin{macrocode}
+\newcommand\LT@bicaption{%
+ \noalign\bgroup
+ \@ifstar
+ {\gdef\bicaption@cmd{\LT@c@ption\@gobble}%
+ \LT@@bicaption}%
+ {\gdef\bicaption@cmd{\LT@c@ption\@firstofone}%
+ \caption@dblarg\LT@@@bicaption}}
+\newcommand\LT@@bicaption[1]{%
+ \LT@@@@bicaption{}{#1}[]}
+% \end{macrocode}
+% \begin{macrocode}
+\long\def\LT@@@bicaption[#1]#2{%
+ \caption@dblarg{\LT@@@@bicaption{#1}{#2}}}
+% \end{macrocode}
+% \begin{macrocode}
+\long\def\LT@@@@bicaption#1#2[#3]#4{%
+ \gdef\bicaption@LTsetup{%
+ \caption@getlabel#2\label{}\@nil
+ \bicaption@LT@setup}%
+ \gdef\bicaption@LT@setup{%
+ \bicaption@ifswap
+ {\bicaption@setup{#1}{#2}}%
+ {\bicaption@setup{#3}{#4}}}%
+ \bicaption@ifswap
+ {\egroup\bicaption@cmd[{#3}]{#4}}%
+ {\egroup\bicaption@cmd[{#1}]{#2}}}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\caption@LT@setup}
+% \changes{v1.1}{2016/01/31}{Adaption to \package{longtable} package added}
+% Execute the stuff defined by \cs{LT@bicaption} to prepare the typesetting
+% of the \package{longtable} bilingual caption.
+% \begin{macrocode}
+\g@addto@macro\caption@LT@setup{%
+ \caption@ifundefined\bicaption@LTsetup{}{%
+ \bicaption@LTsetup
+ \global\let\bicaption@LTsetup\@undefined}}
+% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\bicaption@setup}
@@ -1222,3 +1284,4 @@
% \Finale
%
\endinput
+
diff --git a/Master/texmf-dist/source/latex/caption/caption.dtx b/Master/texmf-dist/source/latex/caption/caption.dtx
index a519cdd1ef2..f16cfd85c81 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 118 2015-09-20 20:51:09Z sommerfeldt $
+% $Id: caption.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/caption.dtx $
%
-% Copyright (C) 1994-2015 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
+% Copyright (C) 1994-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{3558}
+% \CheckSum{3578}
%
% \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 118 2015-09-20 20:51:09Z sommerfeldt $
+\caption@tempa $Id: caption.dtx 136 2016-02-02 09:41:30Z sommerfeldt $
\ProvidesPackage{caption}[\caption@tempa v3.3-\caption@tempb Customizing captions (AR)]
% \end{macrocode}
%
% \subsection{Loading the kernel}
%
% \begin{macrocode}
-\RequirePackage{caption3}[2015/09/01] % needs v1.7 or newer
+\RequirePackage{caption3}[2016/02/01] % needs v1.7-130 or newer
% \end{macrocode}
%
% \subsection{Check against incompatible document classes}
@@ -3729,6 +3729,7 @@
% \changes{v3.1a}{2007/09/14}{Bugfix 07-09-14: Redefinition of \cs{@captionabovetrue} \& \cs{@captionabovefalse} added}
% \changes{v3.1a}{2007/09/16}{Bugfix: This redefinition will always be done \cs{AtBeginDocument}}
% \changes{v3.1g}{2008/01/20}{Bugfix in \cs{captionlistentry}: Table counter will not be incremented anymore, \cs{nameref} works}
+% \changes{v3.3}{2016/01/31}{Support for \cs{bicaption} added}
% We redefine |\LT@array| here to get |\captionsetup|\marg{options}
% working inside |longtable|s.
% \Note{Since the \package{hyperref} package patches \cs{LT@array} as well
@@ -3798,11 +3799,34 @@
\def\ContinuedFloat{\noalign{%
\caption@Error{\noexpand\ContinuedFloat outside float}}}%
% \end{macrocode}
+% |\bicaption| for longtable:
+% \begin{macrocode}
+ \let\bicaption\LT@bicaption
+% \end{macrocode}
+%
% \begin{macrocode}
\caption@ORI@LT@array}}%
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\LT@capti@n}
+% \changes{v3.3}{2016/02/01}{This re-definition added}
+% The original implementation:
+% \begin{verbatim}
+% \def\LT@capti@n{%
+% \@ifstar
+% {\egroup\LT@c@ption\@gobble[]}%
+% {\egroup\@xdblarg{\LT@c@ption\@firstofone}}}
+% \end{verbatim}%^^A
+% Our implementation uses |\caption@xdblarg| instead of |\@xdblarg|:
+% \begin{macrocode}
+ \def\LT@capti@n{%
+ \@ifstar
+ {\egroup\LT@c@ption\@gobble[]}%
+ {\egroup\caption@xdblarg{\LT@c@ption\@firstofone}}}
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}{\LT@c@ption}
% \changes{v3.1g}{2008/01/22}{Made it \cs{long}}
% The original implementation:
@@ -3829,6 +3853,7 @@
% \changes{v3.0e}{2005/05/05}{%
% Bugfix: \cs{captionsetup[longtable]} overrides \cs{LTcapwidth} now}
% \changes{v3.0h}{2005/10/07}{\cs{caption@LT@make} introduced}
+% \changes{v3.3}{2016/02/01}{Support for \cs{bicaption} via \cs{caption@LT@setup} added}
% |\LT@makecaption|\marg{cmd}\marg{label}\marg{text}\par
% \smallskip
% The original definition:
@@ -3865,6 +3890,12 @@
\caption@setoptions{@longtable}%
% \end{macrocode}
%
+% |\caption@LT@setup| is re-defined inside the \package{bicaption} package
+% and contains the preparation of typesetting of the bilingual caption.
+% \begin{macrocode}
+ \caption@LT@setup
+% \end{macrocode}
+%
% \iffalse
% The default |position=| setting for longtables is |top|.
% (This emulates the standard behavior of the \package{longtable} package
@@ -3921,6 +3952,14 @@
}{}
% \end{macrocode}
%
+% \begin{macro}{\caption@LT@setup}
+% \changes{v3.3}{2016/02/01}{This macro added}
+% Hook for stuff which prepares the typesetting of the \package{longtable} caption.
+% \begin{macrocode}
+\providecommand*\caption@LT@setup{}
+% \end{macrocode}
+% \end{macro}
+%
% \subsubsection{The picinpar package}
% \changes{v3.1}{2007/06/13}{Support of the \package{picinpar} package added}
%
@@ -4490,25 +4529,27 @@
% \end{macrocode}
%
% \begin{macro}{\threeparttable}
+% \changes{v3.3}{2016/01/31}{Bugfix: \cs{@captype} will be used if already defined}
% Unfortunately |\@captype| is not set when |\TPT@common| will be used,
% so we have to redefine |\threeparttable| and |\measuredfigure| instead.
% \begin{macrocode}
\let\caption@ORI@threeparttable\threeparttable
\renewcommand*\threeparttable{%
- \caption@settype{table}%
- \caption@setposition a% ?
+ \caption@settype{\@ifundefined{@captype}{table}{\@captype}}%
+%%% \caption@setposition a% ?
\caption@clearmargin
\caption@setoptions{threeparttable}%
\caption@ORI@threeparttable}%
% \end{macrocode}
% \end{macro}
% \begin{macro}{\measuredfigure}
+% \changes{v3.3}{2016/01/31}{Bugfix: \cs{@captype} will be used if already defined}
% Same here\ldots
% \begin{macrocode}
\let\caption@ORI@measuredfigure\measuredfigure
\renewcommand*\measuredfigure{%
- \caption@settype{figure}%
- \caption@setposition a% ?
+ \caption@settype{\@ifundefined{@captype}{figure}{\@captype}}%
+%%% \caption@setposition a% ?
\caption@clearmargin
\caption@setoptions{measuredfigure}%
\caption@ORI@measuredfigure}%
diff --git a/Master/texmf-dist/source/latex/caption/caption.ins b/Master/texmf-dist/source/latex/caption/caption.ins
index 566711ab117..dc2eace4295 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-2015 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
+Copyright (C) 1994-2016 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
http://sourceforge.net/projects/latex-caption/
diff --git a/Master/texmf-dist/source/latex/caption/caption3.dtx b/Master/texmf-dist/source/latex/caption/caption3.dtx
index ffb0fd2172a..6ae6658e7cf 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 117 2015-09-20 20:43:35Z sommerfeldt $
+% $Id: caption3.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/caption3.dtx $
%
-% Copyright (C) 1994-2015 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
+% Copyright (C) 1994-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{3635}
+% \CheckSum{3646}
%
% \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 117 2015-09-20 20:43:35Z sommerfeldt $
+\caption@tempa $Id: caption3.dtx 136 2016-02-02 09:41:30Z sommerfeldt $
\ProvidesPackage{caption3}[\caption@tempa v1.7-\caption@tempb caption3 kernel (AR)]
% \end{macrocode}
%
@@ -3215,10 +3215,17 @@
% \changes{v1.5}{2012/03/15}{Uses \cs{caption@tempdima} instead of \cs{@tempdima}}
% \changes{v1.5}{2012/12/26}{max-margin stuff moved to \cs{caption@calcmargin}}
% \changes{v1.6}{2013/05/01}{Usage of \cs{caption@box} added}
+% \changes{v1.7}{2016/01/31}{Adapted to the \package{bicaption} package}
% |\caption@@make|\marg{caption label}\marg{caption text}
% \begin{macrocode}
\newcommand\caption@@make[2]{%
\begingroup
+ \caption@@make@{#1}{#2}%
+ \endgroup
+ \caption@@make@epilogue}
+% \end{macrocode}
+% \begin{macrocode}
+\newcommand\caption@@make@[2]{%
\caption@stepthecounter
\caption@beginhook
% \end{macrocode}
@@ -3286,11 +3293,10 @@
% \end{macrocode}
%
% \begin{macrocode}
- \caption@endhook
- \endgroup
+ \caption@endhook}
% \end{macrocode}
-%
% \begin{macrocode}
+\newcommand\caption@@make@epilogue{%
\global\caption@starfalse}
% \end{macrocode}
% \end{macro}
@@ -3475,6 +3481,8 @@
% \changes{v1.2}{2007/11/17}{Made option \opt{size=} stronger than \opt{font=}}
% \changes{v1.3}{2010/09/04}{Uses \cs{caption@applyfont} now}
% \changes{v1.3}{2010/11/01}{Bugfix: If the caption text is empty, the text format will be set to \opt{simple} now}
+% \changes{v1.7}{2016/02/01}{Bugfix: \cs{relax} added before \cs{caption@lsep} so the label separator
+% will not be gobbled if the label font command ignores spaces, e.g. by usage of \cs{color}}
% |\caption@@@make|\marg{caption label}\marg{caption text}\par
% This one finally typesets the caption paragraph, without margin and indention.
% \begin{macrocode}
@@ -3511,14 +3519,28 @@
% \begin{macrocode}
\caption@applyfont
\caption@fmt
- {\ifcaption@star\else{\captionlabelfont#1}\fi}%
- {\ifcaption@star\else{\caption@iflf\captionlabelfont\caption@lsep}\fi}%
+ {\ifcaption@star\else
+ \begingroup
+ \captionlabelfont
+ #1%
+ \endgroup
+ \fi}%
+ {\ifcaption@star\else
+ \begingroup
+ \caption@iflf\captionlabelfont
+ \relax\caption@lsep
+ \endgroup
+ \fi}%
{{\captiontextfont
- \caption@ifstrut{\vrule\@height\ht\strutbox\@width\z@}{}%
+ \caption@ifstrut
+ {\vrule\@height\ht\strutbox\@width\z@}%
+ {}%
\nobreak\hskip\z@skip % enable hyphenation
\caption@tfmt{#2}%
% \caption@ifstrut{\vrule\@height\z@\@depth\dp\strutbox\@width\z@}{}%
- \caption@ifstrut{\ifhmode\@finalstrut\strutbox\fi}{}%
+ \caption@ifstrut
+ {\ifhmode\@finalstrut\strutbox\fi}%
+ {}%
\par}}}
% \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 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{%
diff --git a/Master/texmf-dist/tex/latex/caption/bicaption.sty b/Master/texmf-dist/tex/latex/caption/bicaption.sty
index 05f7e511911..f018a58e35f 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-2015 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
+%% Copyright (C) 1994-2016 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.sty 111 2015-09-17 09:48:20Z sommerfeldt $
+\caption@tempa $Id: bicaption.sty 136 2016-02-02 09:41:30Z sommerfeldt $
\ProvidesPackage{bicaption}[\caption@tempa v1.1-\caption@tempb Bilingual Captions (AR)]
-\RequirePackage{caption}[2015/09/01] % needs v3.3 or newer
+\RequirePackage{caption}[2016/02/01] % needs v3.3-134 or newer
\caption@AtBeginDocument{\caption@ifcompatibility{%
\caption@Error{%
The `bicaption' package does not work correctly\MessageBreak
@@ -109,6 +109,9 @@
\caption@ProcessOptions*{bicaption}
\let\bicaption@addcontentsline@ORI\caption@addcontentsline
\renewcommand*\caption@addcontentsline[2]{%
+ \caption@ifundefined\bicaption@LT@setup{}{%
+ \bicaption@LT@setup
+ \global\let\bicaption@LT@setup\@undefined}%
\caption@ifundefined\bicaption@lentry
{\bicaption@addcontentsline@ORI{#1}{#2}}%
{\expandafter\bicaption@addcontentsline\expandafter
@@ -136,13 +139,15 @@
\caption@ifcontentsline{#2}{%
\bicaption@selectlanguage\@secondoftwo
\bicaption@addcontentsline@ORI{#1}{#2}}}
-\let\caption@@make@ORI\caption@@make
\renewcommand\caption@@make[2]{%
\caption@ifundefined\bicaption@text
- {\caption@@make@ORI{#1}{#2}}%
+ {\begingroup
+ \caption@@make@{#1}{#2}%
+ \endgroup}%
{\expandafter\bicaption@@make\expandafter
{\bicaption@text}{#1}{#2}%
- \global\let\bicaption@text\@undefined}}
+ \global\let\bicaption@text\@undefined}%
+ \caption@@make@epilogue}
\newcommand\bicaption@@make[3]{%
\caption@setoptions{bi}%
\ifnum\bicaption@lang=0\relax
@@ -157,16 +162,17 @@
\else
\begingroup
\caption@setoptions{bi-first}%
- \caption@@make@ORI{#2}{#3}%
+ \caption@@make@{#2}{#3}%
\endgroup
\fi
\ifnum\bicaption@lang=1\relax
\else
\begingroup
\caption@setoptions{bi-second}%
- \caption@@make@ORI{#2}{#1}%
+ \caption@@make@{#2}{#1}%
\endgroup
- \fi}
+ \fi
+}
\newcommand\bicaption{\@bicaption\caption}
\newcommand\bicaptionbox{\@bicaption\captionbox}
\newcommand\bisubcaption{\@bicaption\subcaption}
@@ -174,11 +180,11 @@
\newcommand\bisubcaptionbox{\@bicaption\subcaptionbox}
\let\subbicaptionbox\bisubcaptionbox
\newcommand*\@bicaption[1]{%
- \def\bicaption@cmd{#1}%
\@ifstar
- {\l@addto@macro\bicaption@cmd*%
+ {\def\bicaption@cmd{\bicaption@star{#1}}%
\@@bicaption}%
- {\caption@dblarg\@@@bicaption}}
+ {\def\bicaption@cmd{#1}%
+ \caption@dblarg\@@@bicaption}}
\newcommand\@@bicaption[1]{%
\@@@@bicaption{}{#1}[]}
\long\def\@@@bicaption[#1]#2{%
@@ -190,6 +196,33 @@
\bicaption@cmd[{#3}]{#4}}%
{\bicaption@setup{#3}{#4}%
\bicaption@cmd[{#1}]{#2}}}
+\long\def\bicaption@star#1[#2]{#1*}
+\newcommand\LT@bicaption{%
+ \noalign\bgroup
+ \@ifstar
+ {\gdef\bicaption@cmd{\LT@c@ption\@gobble}%
+ \LT@@bicaption}%
+ {\gdef\bicaption@cmd{\LT@c@ption\@firstofone}%
+ \caption@dblarg\LT@@@bicaption}}
+\newcommand\LT@@bicaption[1]{%
+ \LT@@@@bicaption{}{#1}[]}
+\long\def\LT@@@bicaption[#1]#2{%
+ \caption@dblarg{\LT@@@@bicaption{#1}{#2}}}
+\long\def\LT@@@@bicaption#1#2[#3]#4{%
+ \gdef\bicaption@LTsetup{%
+ \caption@getlabel#2\label{}\@nil
+ \bicaption@LT@setup}%
+ \gdef\bicaption@LT@setup{%
+ \bicaption@ifswap
+ {\bicaption@setup{#1}{#2}}%
+ {\bicaption@setup{#3}{#4}}}%
+ \bicaption@ifswap
+ {\egroup\bicaption@cmd[{#3}]{#4}}%
+ {\egroup\bicaption@cmd[{#1}]{#2}}}
+\g@addto@macro\caption@LT@setup{%
+ \caption@ifundefined\bicaption@LTsetup{}{%
+ \bicaption@LTsetup
+ \global\let\bicaption@LTsetup\@undefined}}
\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 5e80c921d5c..5668328743a 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-2015 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
+%% Copyright (C) 1994-2016 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: caption.sty 111 2015-09-17 09:48:20Z sommerfeldt $
+\caption@tempa $Id: caption.sty 136 2016-02-02 09:41:30Z sommerfeldt $
\ProvidesPackage{caption}[\caption@tempa v3.3-\caption@tempb Customizing captions (AR)]
-\RequirePackage{caption3}[2015/09/01] % needs v1.7 or newer
+\RequirePackage{caption3}[2016/02/01] % needs v1.7-130 or newer
\caption@ifbool{documentclass}{}{%
\caption@WarningNoLine{%
Unsupported document class (or package) detected,\MessageBreak
@@ -1529,7 +1529,12 @@
%% \let\@currentHlabel\Hy@LT@currentHlabel
\def\ContinuedFloat{\noalign{%
\caption@Error{\noexpand\ContinuedFloat outside float}}}%
+ \let\bicaption\LT@bicaption
\caption@ORI@LT@array}}%
+ \def\LT@capti@n{%
+ \@ifstar
+ {\egroup\LT@c@ption\@gobble[]}%
+ {\egroup\caption@xdblarg{\LT@c@ption\@firstofone}}}
\long\def\LT@c@ption#1[#2]#3{%
\LT@makecaption#1{\csname fnum@\LTcaptype\endcsname}{#3}%
\LT@captionlistentry{#2}}%
@@ -1541,6 +1546,7 @@
\fi
\caption@setoptions{longtable}%
\caption@setoptions{@longtable}%
+ \caption@LT@setup
\caption@setautoposition{\ifcase\LT@rows t\else b\fi}%
\caption@startrue#1\caption@starfalse
\caption@prepare@stepcounter\LTcaptype{LT}%
@@ -1552,6 +1558,7 @@
\caption@iftop{\vskip\abovecaptionskip}{\vskip\belowcaptionskip}%
\caption@end}}%
}{}
+\providecommand*\caption@LT@setup{}
\caption@IfPackageLoaded{picinpar}{%
\long\def\figwindow[#1,#2,#3,#4] {%
\caption@window{figure}%
@@ -1732,15 +1739,15 @@
\caption@IfPackageLoaded{threeparttable}[2003/06/13 v3.0]{%
\let\caption@ORI@threeparttable\threeparttable
\renewcommand*\threeparttable{%
- \caption@settype{table}%
- \caption@setposition a% ?
+ \caption@settype{\@ifundefined{@captype}{table}{\@captype}}%
+%%% \caption@setposition a% ?
\caption@clearmargin
\caption@setoptions{threeparttable}%
\caption@ORI@threeparttable}%
\let\caption@ORI@measuredfigure\measuredfigure
\renewcommand*\measuredfigure{%
- \caption@settype{figure}%
- \caption@setposition a% ?
+ \caption@settype{\@ifundefined{@captype}{figure}{\@captype}}%
+%%% \caption@setposition a% ?
\caption@clearmargin
\caption@setoptions{measuredfigure}%
\caption@ORI@measuredfigure}%
diff --git a/Master/texmf-dist/tex/latex/caption/caption3.sty b/Master/texmf-dist/tex/latex/caption/caption3.sty
index 27fcf88e2c9..d082e95f366 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-2015 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
+%% Copyright (C) 1994-2016 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: caption3.sty 115 2015-09-20 15:20:31Z sommerfeldt $
+\caption@tempa $Id: caption3.sty 136 2016-02-02 09:41:30Z sommerfeldt $
\ProvidesPackage{caption3}[\caption@tempa v1.7-\caption@tempb caption3 kernel (AR)]
\providecommand*\@nameundef[1]{%
\expandafter\let\csname #1\endcsname\@undefined}
@@ -1364,6 +1364,10 @@
\newcommand\caption@make[2]{\caption@@make{\caption@lfmt{#1}{#2}}}
\newcommand\caption@@make[2]{%
\begingroup
+ \caption@@make@{#1}{#2}%
+ \endgroup
+ \caption@@make@epilogue}
+\newcommand\caption@@make@[2]{%
\caption@stepthecounter
\caption@beginhook
\caption@box\linewidth{%
@@ -1391,8 +1395,8 @@
\fi
\hspace\caption@tempdima
}%
- \caption@endhook
- \endgroup
+ \caption@endhook}
+\newcommand\caption@@make@epilogue{%
\global\caption@starfalse}
\newcommand*\caption@calcmargin{%
\caption@calcmargin@hook
@@ -1480,13 +1484,27 @@
\@setpar{\@@par\caption@@par}\caption@@par
\caption@applyfont
\caption@fmt
- {\ifcaption@star\else{\captionlabelfont#1}\fi}%
- {\ifcaption@star\else{\caption@iflf\captionlabelfont\caption@lsep}\fi}%
+ {\ifcaption@star\else
+ \begingroup
+ \captionlabelfont
+ #1%
+ \endgroup
+ \fi}%
+ {\ifcaption@star\else
+ \begingroup
+ \caption@iflf\captionlabelfont
+ \relax\caption@lsep
+ \endgroup
+ \fi}%
{{\captiontextfont
- \caption@ifstrut{\vrule\@height\ht\strutbox\@width\z@}{}%
+ \caption@ifstrut
+ {\vrule\@height\ht\strutbox\@width\z@}%
+ {}%
\nobreak\hskip\z@skip % enable hyphenation
\caption@tfmt{#2}%
- \caption@ifstrut{\ifhmode\@finalstrut\strutbox\fi}{}%
+ \caption@ifstrut
+ {\ifhmode\@finalstrut\strutbox\fi}%
+ {}%
\par}}}
\newcommand\caption@ifempty[1]{%
\caption@if@empty{#1}%
diff --git a/Master/texmf-dist/tex/latex/caption/subcaption.sty b/Master/texmf-dist/tex/latex/caption/subcaption.sty
index 2afa81d0727..68a9bf6d27c 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 (axel.sommerfeldt@f-m.fm)
+%% Copyright (C) 1994-2016 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: subcaption.sty 100 2015-09-15 17:00:16Z sommerfeldt $
+\caption@tempa $Id: subcaption.sty 136 2016-02-02 09:41:30Z 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{%
@@ -63,6 +63,8 @@
font+=small,labelformat=parens,labelsep=space,skip=6pt,list=0,hypcap=0}
\caption@ProcessOptions*{subcaption}
\caption@ForEachType{\DeclareCaptionSubType{#1}}
+\caption@ifundefined\newsubfloat{}{%
+ \renewcommand*\newsubfloat{\DeclareCaptionSubType}}
\def\subcaption{%
\caption@iftype
{\setcaptionsubtype*\caption}%
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-25 13:05:58 +0000