diff options
Diffstat (limited to 'Master/texmf-dist/source/latex/caption/caption.dtx')
| -rw-r--r-- | Master/texmf-dist/source/latex/caption/caption.dtx | 59 |
1 files changed, 50 insertions, 9 deletions
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}% |