texlive[51973] Master/texmf-dist: caption (29aug19)
commits+karl at tug.org
commits+karl at tug.org
Thu Aug 29 01:41:02 CEST 2019
Revision: 51973
http://tug.org/svn/texlive?view=revision&revision=51973
Author: karl
Date: 2019-08-29 01:41:01 +0200 (Thu, 29 Aug 2019)
Log Message:
-----------
caption (29aug19)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/caption/CHANGELOG
trunk/Master/texmf-dist/doc/latex/caption/README
trunk/Master/texmf-dist/doc/latex/caption/bicaption.pdf
trunk/Master/texmf-dist/doc/latex/caption/ltcaption.pdf
trunk/Master/texmf-dist/doc/latex/caption/newfloat.pdf
trunk/Master/texmf-dist/doc/latex/caption/subcaption.pdf
trunk/Master/texmf-dist/doc/latex/caption/totalcount.pdf
trunk/Master/texmf-dist/source/latex/caption/bicaption.dtx
trunk/Master/texmf-dist/source/latex/caption/caption.dtx
trunk/Master/texmf-dist/source/latex/caption/caption.ins
trunk/Master/texmf-dist/source/latex/caption/caption2.dtx
trunk/Master/texmf-dist/source/latex/caption/ltcaption.dtx
trunk/Master/texmf-dist/source/latex/caption/newfloat.dtx
trunk/Master/texmf-dist/source/latex/caption/subcaption.dtx
trunk/Master/texmf-dist/source/latex/caption/totalcount.dtx
trunk/Master/texmf-dist/tex/latex/caption/bicaption.sty
trunk/Master/texmf-dist/tex/latex/caption/caption.sty
trunk/Master/texmf-dist/tex/latex/caption/caption2.sty
trunk/Master/texmf-dist/tex/latex/caption/ltcaption.sty
trunk/Master/texmf-dist/tex/latex/caption/newfloat.sty
trunk/Master/texmf-dist/tex/latex/caption/subcaption.sty
Modified: trunk/Master/texmf-dist/doc/latex/caption/CHANGELOG
===================================================================
--- trunk/Master/texmf-dist/doc/latex/caption/CHANGELOG 2019-08-28 23:40:39 UTC (rev 51972)
+++ trunk/Master/texmf-dist/doc/latex/caption/CHANGELOG 2019-08-28 23:41:01 UTC (rev 51973)
@@ -125,7 +125,10 @@
v1.1 (2012/12/26)
- \captionmainlanguage and \selectcaptionlanguage added
+v1.2 (2016/03/27)
+- \DeclareLangDependantCaptionOption added
+
ltcaption package
-----------------
@@ -158,7 +161,10 @@
- New caption option subrefformat=
- New command \phantomsubcaption
+v1.2 (2018/05/13)
+- Optional argument values `B' and `T' added to the environments `subfigure' and `subtable'
+
newfloat package
----------------
Modified: trunk/Master/texmf-dist/doc/latex/caption/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/caption/README 2019-08-28 23:40:39 UTC (rev 51972)
+++ trunk/Master/texmf-dist/doc/latex/caption/README 2019-08-28 23:41:01 UTC (rev 51973)
@@ -1,8 +1,8 @@
==========================================================================
The `caption' package bundle
-Release 2018-10-06
-Copyright (C) 1994-2018 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
+Release 2019-08-28
+Copyright (C) 1994-2019 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
License: LPPL = LaTeX Project Public Licence
Maintenance Status: maintained (by Axel Sommerfeldt)
@@ -45,7 +45,7 @@
--------------------------------------------------------------------------
-The `bicaption' package v1.1 is a tiny package supporting the typesetting
+The `bicaption' package v1.2 is a tiny package supporting the typesetting
of bilingual captions.
User Manual: bicaption.pdf (English)
@@ -65,7 +65,7 @@
--------------------------------------------------------------------------
-The `subcaption' package v1.1 is a small package supporting typesetting
+The `subcaption' package v1.2 is a small package supporting typesetting
of sub-captions (by using the the sub-caption feature of the `caption'
package).
Modified: trunk/Master/texmf-dist/doc/latex/caption/bicaption.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/caption/ltcaption.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/caption/newfloat.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/caption/subcaption.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/caption/totalcount.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/caption/bicaption.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/caption/bicaption.dtx 2019-08-28 23:40:39 UTC (rev 51972)
+++ trunk/Master/texmf-dist/source/latex/caption/bicaption.dtx 2019-08-28 23:41:01 UTC (rev 51973)
@@ -2,7 +2,7 @@
%
% This is file `bicaption.dtx'.
%
-% Copyright (C) 2010-2016 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
+% Copyright (C) 2010-2018 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
%
% --------------------------------------------------------------------------
%
@@ -25,12 +25,12 @@
% and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex.
%
% \fi
-% \CheckSum{402}
+% \CheckSum{427}
%
% \iffalse
%<*driver>
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesFile{bicaption.drv}[2012/04/10 v1.1 Adds a bilingual caption feature to the caption package]
+\ProvidesFile{bicaption.drv}[2016/03/27 v1.2 Adds a bilingual caption feature to the caption package]
\hbadness=9999 \newcount\hbadness \hfuzz=74pt % Make TeX shut up.
%\errorcontextlines=3
%
@@ -61,8 +61,8 @@
\ifpdf\usepackage{hypdestopt}\fi
\hypersetup{pdfkeywords={LaTeX, package, bicaption},pdfstartpage={},pdfstartview={}}
%
-\usepackage{bicaption}[2012/12/26]
-\usepackage{subcaption}[2012/04/09]
+\usepackage{bicaption}[2016/03/27]
+\usepackage{subcaption}[2016/02/21]
%
\newcommand*\purerm[1]{{\upshape\mdseries\rmfamily #1}}
\newcommand*\puresf[1]{{\upshape\mdseries\sffamily #1}}
@@ -85,7 +85,7 @@
\newenvironment{background*}{\small\MARGINSYM{\Mountain}\ignorespaces}{\par}
%
\newcommand*\MARGINSYM[1]{\hskip 1sp \marginpar{\raggedleft\textcolor{blue}{{#1}}}}
-%\newcommand*\NEW[2]{}%\hskip 1sp \marginpar{\footnotesize\sffamily\raggedleft#1\\#2}}
+\newcommand*\NEW[2]{\MARGINSYM{\vskip2pt\footnotesize#1\\#2}}
%
\newenvironment{Options}[1]%
{\list{}{\renewcommand\makelabel[1]{\texttt{##1}\hfil}%
@@ -118,10 +118,11 @@
%
% \GetFileInfo{bicaption.drv}
% \let\docdate\filedate
+% \let\docversion\fileversion
% \GetFileInfo{bicaption.sty}
%
% \title{\texorpdfstring{\Thispackage\thanks{%^^A
-% This package has version number \fileversion, last revised \filedate.}}%^^A
+% This package has version number \docversion.}}%^^A
% {The bicaption package}}
% \author{Axel Sommerfeldt\\
% \url{https://gitlab.com/axelsommerfeldt/caption}}
@@ -228,8 +229,9 @@
% |\captionsetup[figure][bi-first]|\oarg{options}
% \end{quote}
% will limit the settings to the first heading of |figure| environments only.
-% Please note that the environment name has to be specified as first optional argument
-% while the bilingual selection as second one.
+% Please note that the environment name (|figure|, |table|, \ldots) has to be specified
+% as first optional argument while the bilingual selection (|bi|, |bi-first|, or |bi-second|)
+% as second one.
%
% \section{Additional options}
% \label{sec:additional-options}
@@ -685,6 +687,7 @@
% \medskip
%
% \DescribeMacro\selectcaptionlanguage
+% \NEWfeature{v1.1}
% |\select|\-|caption|\-|lan|\-|guage| will be used internally to select the language:
% \begin{quote}
% |\selectcaptionlanguage|\marg{font-or-list-entry}\marg{language}
@@ -704,9 +707,44 @@
%
% \medskip
%
-% Please note that all of this will only be relevant if the |lang=| option will be used.
-% Otherwise |\select|\-|caption|\-|lan|\-|guage| won't be used by \thispackage\ at all.
+% \DescribeMacro\DeclareCaptionLangOption
+% \NEWfeature{v1.2}
+% For internal implementation reasons the selection of language will be done delayed,
+% i.e.~not done immediately at |lang=|\meta{language}. So if you do
+% \begin{quote}
+% |\captionsetup[bi-second]{lang=ngerman,labelsep=quad}|
+% \end{quote}
+% the language |ngerman| will only be stored internally, and the label separator will
+% be set to |quad| afterwards. Some time later, right before the caption is actually
+% typeset, the language will be set to |ngerman|.
%
+% Usually this is no problem, but think of options which will be overwritten by the
+% language selection, or options which act on the language currently set, for example
+% \begin{quote}
+% |\captionsetup[bi-second]{lang=ngerman,name=Bild}|\quad.
+% \end{quote}
+% |lang=ngerman| changes the environment name to ``Abbildung'', and |name=Bild|
+% changes the environment name to ``Bild''. One would expect that the name is
+% finally ``Bild'', but because of the delayed nature of |lang=ngerman| it will
+% be ``Abbildung'' instead, at least if we don't take action about this.
+%
+% For that reason the command
+% \begin{quote}
+% |\DeclareCaptionLangOption|\marg{caption option name}
+% \end{quote}
+% is offered. Options handled this way will be applied twice if used after the |lang=|
+% option, when the option is actually used, and right after the language is selected.
+%
+% \begin{quote}
+% |\DeclareCaptionLangOption{name}|
+% \end{quote}
+% will be done by \thispackage\ automatically, since the environment name will usually
+% be overwritten by a language selection. So actually
+% \begin{quote}
+% |\captionsetup[bi-second]{lang=ngerman,name=Bild}|
+% \end{quote}
+% will give the expected result, i.e. the environment name is typeset as ``Bild''.
+%
% \iffalse
% --------------------------------------------------------------------------- %
% \fi
@@ -792,10 +830,10 @@
%
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{bicaption}[2018/08/26 v1.1-159 Bilingual Captions (AR)]
+\ProvidesPackage{bicaption}[2016/03/27 v1.2 Bilingual Captions (AR)]
% \end{macrocode}
% \begin{macrocode}
-\RequirePackage{caption}[2016/02/01] % needs v3.3-134 or newer
+\RequirePackage{caption}[2018/05/11] % needs v3.4 or newer
% \end{macrocode}
% \changes{v1.0}{2011/09/01}{Compatibility error added}
% \begin{macrocode}
@@ -902,35 +940,52 @@
% using the \package{microtype} package via |\usepackage[babel]{microtype}|.
% So we store the selected language to |\bicaption at language| instead and will set it later on.
% But this has a drawback, option settings which will be overwritten by the selection of
-% the language do not work correctly anymore.
-% The only option affected I'm aware off is the |name=| option, so this will be saved
-% and set later on, too.
-% (Since the user can declare own options it would be nice to have a new command for handling
-% delayed option settings because of the language selection,
-% e.g. |\DeclareCaptionLangOption|\marg{option key}.
-% This will be offered by a future version of \thispackage.)
+% the language do not work correctly anymore. Therefore we will save specific options
+% and set them (again) after setting the language.
% \begin{macrocode}
\DeclareCaptionOption{lang}{%
\caption at ifundefined\bicaption at language
- {\let\KV at bicaption@name\KV at caption@name
- \def\KV at caption@name{\bicaption at KV{name}}}%
- {}%
+ \bicaption at language@setupkeys
+ \relax
\def\bicaption at language{#1}%
- \let\bicaption at language@options\@empty}
+ \let\bicaption at language@setoptions\@empty}
% \end{macrocode}
+% Map |language=| to |lang=|.
% \begin{macrocode}
\let\KV at caption@language\KV at caption@lang
% \end{macrocode}
%
-% \begin{macro}{\bicaption at KV}
-% \changes{v1.1}{2016/03/27}{This macro added}
-% |\bicaption at KV|\marg{option key}\marg{option value}\par
-% This macro do execute the given caption package option, and store it additionally for
-% delayed execution after setting the language.
+% \begin{macro}{\DeclareCaptionLangOption}
+% \changes{v1.2}{2016/03/27}{This macro added}
+% |\DeclareCaptionLangOption|\marg{option key}\par
+% Saves the gives \meta{option key} to the list |\bicaption at language@keylist|.
+% These options will be stored and set (again) after setting the language.
% \begin{macrocode}
+\newcommand*\bicaption at language@keylist{}
+% \end{macrocode}
+% \begin{macrocode}
+\newcommand*\DeclareCaptionLangOption[1]{%
+ \@ifundefined{KV at caption@#1}%
+ {\bicaption at Error{Undefined caption option `#1'}}%
+ {\@cons\bicaption at language@keylist{{#1}}}}
+% \end{macrocode}
+% \begin{macrocode}
+\let\DeclareCaptionLanguageOption\DeclareCaptionLangOption
+% \end{macrocode}
+% \begin{macrocode}
+\newcommand*\bicaption at language@setupkeys{%
+ \def\@elt##1{%
+ \expandafter\let\csname KV at bicaption@##1\expandafter\endcsname
+ \csname KV at caption@##1\endcsname
+ \@namedef{KV at caption@##1}{\bicaption at KV{##1}}}%
+ \bicaption at language@keylist
+ \let\@elt\relax}
+% \end{macrocode}
+% \begin{macrocode}
\newcommand\bicaption at KV[2]{%
\@bicaption at KV{#1}{#2}%
- \l at addto@macro\bicaption at language@options{\@bicaption at KV{#1}{#2}}}
+ \l at addto@macro\bicaption at language@setoptions{%
+ \@bicaption at KV{#1}{#2}}}
% \end{macrocode}
% \begin{macrocode}
\newcommand\@bicaption at KV[1]{%
@@ -938,11 +993,17 @@
% \end{macrocode}
% \end{macro}
%
+% The only option affected I'm aware off is the |name=| option, so this will be saved
+% and set later on.
+% \begin{macrocode}
+\DeclareCaptionLangOption{name}
+% \end{macrocode}
+%
% \begin{macro}{\bicaption at selectlanguage}
% \changes{v1.0}{2011/08/31}{Starred variant added}
% \changes{v1.1}{2012/04/09}{Support of \cs{selectcaptionlanguage} added}
% \changes{v1.1}{2016/03/25}{Patching of \cs{caption at applyfont} replaced by \cs{caption at beginhook}}
-% \changes{v1.1}{2016/03/27}{Usage of \cs{bicaption at language@options} added}
+% \changes{v1.1}{2016/03/27}{Usage of \cs{bicaption at language@setoptions} added}
% |\bicaption at selectlanguage|\marg{font-or-list-entry}\par
% Set the language (stored in |\bi|\-|caption at lan|\-|guage|)
% via |\select|\-|bi|\-|caption|\-|lan|\-|guage|.
@@ -949,8 +1010,9 @@
% \begin{macrocode}
\newcommand*\bicaption at selectlanguage[1]{%
\caption at ifundefined\bicaption at language{}{%
- \expandafter\selectcaptionlanguage\expandafter#1\expandafter{\bicaption at language}%
- \bicaption at language@options}}
+ \expandafter\selectcaptionlanguage\expandafter#1\expandafter
+ {\bicaption at language}%
+ \bicaption at language@setoptions}}
% \end{macrocode}
% |\caption at beginhook| (of the \package{caption} package kernel) will be extended here
% so the language setting will actually take effect.
@@ -980,12 +1042,15 @@
% Set the language for the first caption.
% \begin{macrocode}
\ifcsname captionmainlanguage\endcsname
- \bicaption at InfoNoLine{main language is set to \captionmainlanguage}
+ \bicaption at InfoNoLine{%
+ main language is set to \captionmainlanguage}
\else\ifcsname bbl at main@language\endcsname
- \bicaption at InfoNoLine{babel found, main language is \bbl at main@language}
+ \bicaption at InfoNoLine{%
+ babel found, main language is \bbl at main@language}
\let\captionmainlanguage\bbl at main@language
\else\ifcsname xpg at main@language\endcsname
- \bicaption at InfoNoLine{polyglossia found, main language is \xpg at main@language}
+ \bicaption at InfoNoLine{%
+ polyglossia found, main language is \xpg at main@language}
\let\captionmainlanguage\xpg at main@language
\else
\bicaption at InfoNoLine{main language is not set}
@@ -993,7 +1058,8 @@
% \end{macrocode}
% \begin{macrocode}
\ifcsname captionmainlanguage\endcsname
- \edef\@tempa{\noexpand\captionsetup[bi-first]{lang=\captionmainlanguage}}
+ \edef\@tempa{%
+ \noexpand\captionsetup[bi-first]{lang=\captionmainlanguage}}
\@tempa
\fi
% \end{macrocode}
Modified: trunk/Master/texmf-dist/source/latex/caption/caption.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/caption/caption.dtx 2019-08-28 23:40:39 UTC (rev 51972)
+++ trunk/Master/texmf-dist/source/latex/caption/caption.dtx 2019-08-28 23:41:01 UTC (rev 51973)
@@ -25,7 +25,7 @@
% and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex.
%
% \fi
-% \CheckSum{3695}
+% \CheckSum{3702}
%
% \iffalse
%<*driver>
@@ -87,6 +87,8 @@
% \newcommand*\csoarg[1]{\texttt{\char`\[#1\char`\]}}
% \newcommand*\version[2][]{\textit{v#2}}
%
+% \newcommand*\issue[1]{GitLab~\##1}
+%
% \GetFileInfo{caption.drv}
% \let\docdate\filedate
% \GetFileInfo{caption.sty}
@@ -218,7 +220,7 @@
%
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption}[2018/10/06 v3.3-154 Customizing captions (AR)]
+\ProvidesPackage{caption}[2019/04/01 v3.3a Customizing captions (AR)]
% \end{macrocode}
%
% \subsection{Loading the kernel}
@@ -733,6 +735,7 @@
% \end{macrocode}
%
% \begin{macro}{\setcapwidth}
+% \changes{v3.3}{2018/12/26}{Bugfix: Missing curly braces added}
% \Note{The optional argument of \cs{setcapwidth} if not supported (yet),
% so we issue a warning if used.
% (Since this does not seem to have an negative effect when used
@@ -741,7 +744,7 @@
\expandafter\let\expandafter\caption at KOMA@setcapwidth
\csname\string\setcapwidth\endcsname
\@namedef{\string\setcapwidth}[#1]#2{%
- \caption at KOMA@setcapwidth[#1]{#2}\caption at setcapwidth{#1}}
+ \caption at KOMA@setcapwidth[{#1}]{#2}\caption at setcapwidth{#1}}
% \end{macrocode}
% \begin{macrocode}
\newcommand*\caption at setcapwidth[1]{%
@@ -768,13 +771,13 @@
\expandafter\let\expandafter\caption at KOMA@setcapmargin
\csname\string\@setcapmargin\endcsname
\@namedef{\string\@setcapmargin}[#1]#2{%
- \caption at KOMA@setcapmargin[#1]{#2}\caption at setcapmargin}
+ \caption at KOMA@setcapmargin[{#1}]{#2}\caption at setcapmargin}
% \end{macrocode}
% \begin{macrocode}
\expandafter\let\expandafter\caption at KOMA@@setcapmargin
\csname\string\@@setcapmargin\endcsname
\@namedef{\string\@@setcapmargin}[#1]#2{%
- \caption at KOMA@@setcapmargin[#1]{#2}\caption at setcapmargin}
+ \caption at KOMA@@setcapmargin[{#1}]{#2}\caption at setcapmargin}
% \end{macrocode}
% \begin{macrocode}
\newcommand*\caption at setcapmargin{%
@@ -982,16 +985,50 @@
% typeset the caption.
% \begin{macrocode}
\long\def\caption at makecaption#1#2{%
- \caption at iftop
- {\vskip\belowcaptionskip}%
- {\caption at rule\vskip\abovecaptionskip}%
+ \caption at make@above
\caption@@make{#1}{#2}%
+ \caption at make@below}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\caption at make@above}
+% \begin{macro}{\caption at make@below}
+% \changes{v3.3a}{2019/04/02}{This macro added}
+% |\caption at make@above|\\
+% |\caption at make@below|\par
+% Typesets the stuff above resp.~below the caption, depending on |\caption at iftop|.
+% \begin{macrocode}
+\newcommand*\caption at make@above{%
\caption at iftop
- {\vskip\abovecaptionskip\caption at rule}%
- {\vskip\belowcaptionskip}}
+ \caption at belowskip
+ {\caption at rule\caption at aboveskip}}
% \end{macrocode}
+% \begin{macrocode}
+\newcommand*\caption at make@below{%
+ \caption at iftop
+ {\caption at aboveskip\caption at rule}%
+ \caption at belowskip}
+% \end{macrocode}
% \end{macro}
+% \end{macro}
%
+% \begin{macro}{\caption at aboveskip}
+% \begin{macro}{\caption at belowskip}
+% \changes{v3.3a}{2019/04/02}{This macro added}
+% |\caption at aboveskip|\\
+% |\caption at belowskip|\par
+% Typesets the skip above resp.~below the caption.
+% \begin{macrocode}
+\newcommand*\caption at aboveskip{%
+ \vskip\abovecaptionskip}
+% \end{macrocode}
+% \begin{macrocode}
+\newcommand*\caption at belowskip{%
+ \vskip\belowcaptionskip}
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
% \begin{macro}{\caption at redefine}
% \changes{v3.1k}{2009/03/30}{This macro added, it contains the patching code now}
% We only redefine |\caption| and |\@caption| if the current definitions
@@ -1461,7 +1498,7 @@
% \begin{macrocode}
\caption at CheckCommand\@caption{%
% chkfloat.sty [20??/??/?? v0.? chkfloat: check for moved floats]
- \def\@caption#1[#2]#3{\chkfloat at caption{#1}[#2]{#3}%
+ \def\@caption#1[#2]#3{\chkfloat at caption{#1}[{#2}]{#3}%
\chkfloat at addcontentsline{#1}{#2}%
}}%
% \end{macrocode}
@@ -1556,6 +1593,7 @@
% \begin{macro}{\@xfloat}
% \changes{v3.1}{2007/05/09}{This re-definition added}
% \changes{v3.1b}{2007/09/22}{Will now be redefined in compatibility mode, too}
+% \changes{v3.3}{2018/12/26}{Bugfix: Missing curly braces added}
% We redefine |\@xfloat| so inside floating environments our
% type-specific options will be used, a \package{hyperref}
% anchor will be set etc.
@@ -1562,7 +1600,7 @@
% \begin{macrocode}
\let\caption at ORI@xfloat\@xfloat
\def\@xfloat#1[#2]{%
- \caption at ORI@xfloat{#1}[#2]%
+ \caption at ORI@xfloat{#1}[{#2}]%
\caption at settype{#1}}%
% \end{macrocode}
% \end{macro}
@@ -2607,12 +2645,13 @@
% \changes{v3.1f}{2007/12/17}{This re-definition for \class{beamer} document class added}
% \begin{macro}{\table}
% \changes{v3.1f}{2007/12/17}{This re-definition for \class{beamer} document class added}
+% \changes{v3.3}{2018/12/26}{Bugfix: Missing curly braces added}
% We redefine |figure| \& |table| so our type-specific options will be used etc.
% \begin{macrocode}
\expandafter\let\expandafter\caption at ORI@figure
\csname\string\figure\endcsname
\@namedef{\string\figure}[#1]{%
- \caption at ORI@figure[#1]%
+ \caption at ORI@figure[{#1}]%
\caption at settype{figure}}
% \end{macrocode}
% \begin{macrocode}
@@ -2619,7 +2658,7 @@
\expandafter\let\expandafter\caption at ORI@table
\csname\string\table\endcsname
\@namedef{\string\table}[#1]{%
- \caption at ORI@table[#1]%
+ \caption at ORI@table[{#1}]%
\caption at settype{table}}
% \end{macrocode}
% \end{macro}
@@ -2761,6 +2800,7 @@
% so no extra check is needed}
% \changes{v3.1}{2007/07/04}{Re-written \& renamed from \cs{caption at ifpackage}
% to \cs{caption at IfPackageLoaded}}
+% \changes{v3.3}{2018/12/26}{Bugfix: Missing curly braces added}
% |\caption at IfPackageLoaded|\marg{package}\oarg{version}\marg{true}\marg{false}\par
% Some kind of combination of |\@ifpackageloaded| and |\@ifpackagelater|.
% If the \meta{package} is not loaded yet, the check will be (re-)done
@@ -2775,7 +2815,7 @@
\@ifpackageloaded{#1}\@firstofone{%
\caption at Debug{#1 package is not loaded (yet)\@gobble}%
\caption at AtBeginDocument}{%
- \caption at If@Package at Loaded{#1}[#2]{#3}{#4}}}
+ \caption at If@Package at Loaded{#1}[{#2}]{#3}{#4}}}
\@onlypreamble\caption@@IfPackageLoaded
% \end{macrocode}
% \begin{macrocode}
@@ -3930,6 +3970,7 @@
% Bugfix: \cs{captionsetup[longtable]} overrides \cs{LTcapwidth} now}
% \changes{v3.0h}{2005/10/07}{\cs{caption at LT@make} introduced}
% \changes{v3.3}{2016/02/01}{Support for \cs{bicaption} via \cs{caption at LT@setup} added}
+% \changes{v3.3a}{2019/04/02}{Work-around for problem with \package{floatrow} added}
% |\LT at makecaption|\marg{cmd}\marg{label}\marg{text}\par
% \smallskip
% The original definition:
@@ -4002,12 +4043,21 @@
\vskip-\ht\strutbox
% \end{macrocode}
%
+% Work-around for problem with \package{floatrow}:
+% The |\belowcaptionskip| disturbs the environment in which the caption is actually typeset (by creating extra, unwanted space),
+% so we supress this skip if the \package{floatrow} package is loaded.
+% (This fixes \issue{50})
+% \begin{macrocode}
+ \caption at ifundefined\FBifcaptop{}{%
+ \let\caption at belowskip\@empty}%
+% \end{macrocode}
+%
% The following code should look familiar. We do our skips and use
% |\caption@@make| to typeset the caption itself.
% \begin{macrocode}
- \caption at iftop{\vskip\belowcaptionskip}{\vskip\abovecaptionskip}%
+ \caption at make@above
\caption@@make{#2}{#3}\endgraf
- \caption at iftop{\vskip\abovecaptionskip}{\vskip\belowcaptionskip}%
+ \caption at make@below
\caption at end}}%
% \end{macrocode}
% \end{macro}
@@ -4014,12 +4064,13 @@
%
% \begin{macro}{\LT at listentry}
% \changes{v3.3}{2018/08/26}{This macro added}
-% \changes{v3.3}{2018/10/05}{\cs{ignorespaces} added}
+% \changes{v3.3}{2018/10/05}{Bugfix: \cs{ignorespaces} added}
+% \changes{v3.3}{2018/12/26}{Bugfix: Missing curly braces added}
% \begin{macrocode}
\renewcommand*\LT at listentry[2]{%
\begingroup
\caption at LT@settype{#1}%
- \caption at listentry\@firstoftwo[#1]{#2}%
+ \caption at listentry\@firstoftwo[{#1}]{#2}%
\endgroup\ignorespaces}%
% \end{macrocode}
% \end{macro}
@@ -4260,6 +4311,7 @@
%
% \begin{macro}{\ivparpic}
+% \changes{v3.3}{2018/12/26}{Bugfix: Missing curly braces added}
% We need to set our \package{hyperref} anchor here.
% Not bullet-proof since we have to redefine |\noindent| here!
% \begin{macrocode}
@@ -4270,7 +4322,7 @@
\caption at defrostHref
\let\noindent\caption at ORI@noindent
\noindent}%
- \caption at ORI@ivparpic(#1,#2)(#3,#4)[#5][#6]{#7}%
+ \caption at ORI@ivparpic(#1,#2)(#3,#4)[{#5}][{#6}]{#7}%
\let\noindent\caption at ORI@noindent}%
% \end{macrocode}
% \end{macro}
@@ -4358,6 +4410,7 @@
% \changes{v3.1c}{2007/10/06}{\cs{caption} will be saved \& restored now}
% \changes{v3.2a}{2011/08/17}{Bugfix: Uses \cs{caption at freeze} instead of \cs{caption at freeze*} now}
% \changes{v3.3}{2013/05/01}{Usage of \cs{caption at freeze} replaced by \cs{caption at freezetype}}
+% \changes{v3.3}{2018/12/26}{Bugfix: Missing curly braces added}
% This macro will be called at the start of the environment, here is a good
% opportunity to do some adaptations to |\caption| and |\captionsetup|.
% \begin{macrocode}
@@ -4367,7 +4420,7 @@
% First we use the original definition, but restore \cs{caption} and \cs{label}
% so \cs{caption at freeze} and \cs{caption at warmup} will work correctly.
% \begin{macrocode}
- \caption at ORI@SC at zfloat{#1}{#2}{#3}[#4]%
+ \caption at ORI@SC at zfloat{#1}{#2}{#3}[{#4}]%
\SC at RestoreCommands
% \end{macrocode}
% Since the sidecap package uses our |\caption| code outside the
@@ -4503,12 +4556,13 @@
% \begin{macro}{\@xtablecaption}
% \changes{v3.1h}{2008/04/01}{Made \cs{nameref} \& \cs{autoref} work}
% \changes{v3.1l}{2010/01/09}{Adapted to current version of nameref package}
+% \changes{v3.3}{2018/12/26}{Bugfix: Missing curly braces added}
% Make |\nameref| and |\autoref| work.
% \begin{macrocode}
\let\caption at ORI@xtablecaption\@xtablecaption
\long\def\@xtablecaption[#1]#2{%
\caption at gettitle{#2}%
- \caption at ORI@xtablecaption[#1]{#2}}%
+ \caption at ORI@xtablecaption[{#1}]{#2}}%
% \end{macrocode}
% \end{macro}
%
@@ -4571,12 +4625,13 @@
%
% \begin{macro}{\@xtablecaption}
% \changes{v3.1l}{2010/01/09}{Adapted to current version of nameref package}
+% \changes{v3.3}{2018/12/26}{Bugfix: Missing curly braces added}
% Make |\nameref| and |\autoref| work.
% \begin{macrocode}
\let\caption at ORI@xtablecaption\@xtablecaption
\long\def\@xtablecaption[#1]#2{%
\caption at gettitle{#2}%
- \caption at ORI@xtablecaption[#1]{#2}}%
+ \caption at ORI@xtablecaption[{#1}]{#2}}%
% \end{macrocode}
% \end{macro}
%
Modified: trunk/Master/texmf-dist/source/latex/caption/caption.ins
===================================================================
--- trunk/Master/texmf-dist/source/latex/caption/caption.ins 2019-08-28 23:40:39 UTC (rev 51972)
+++ trunk/Master/texmf-dist/source/latex/caption/caption.ins 2019-08-28 23:41:01 UTC (rev 51973)
@@ -6,7 +6,7 @@
\preamble
-Copyright (C) 1994-2018 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
+Copyright (C) 1994-2019 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
https://gitlab.com/axelsommerfeldt/caption
Modified: trunk/Master/texmf-dist/source/latex/caption/caption2.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/caption/caption2.dtx 2019-08-28 23:40:39 UTC (rev 51972)
+++ trunk/Master/texmf-dist/source/latex/caption/caption2.dtx 2019-08-28 23:41:01 UTC (rev 51973)
@@ -2,7 +2,7 @@
%
% This is file `caption2.dtx'.
%
-% Copyright (C) 1994-2011 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
+% Copyright (C) 1994-2015 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
%
% --------------------------------------------------------------------------
%
@@ -68,10 +68,11 @@
%
% \GetFileInfo{caption2.drv}
% \let\docdate\filedate
+% \let\docversion\fileversion
% \GetFileInfo{caption2.sty}
%
% \title{The (obsolete) \texorpdfstring{\package{caption2} package\thanks{%^^A
-% This package has version number \fileversion, last revised \filedate.}}%^^A
+% This package has version number \docversion.}}%^^A
% {caption2 package}}
% \author{Axel Sommerfeldt\\
% \url{https://gitlab.com/axelsommerfeldt/caption}}
@@ -203,7 +204,7 @@
%
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption2}[2015/09/15 v2.2-100 Customising captions (AR)]
+\ProvidesPackage{caption2}[2015/09/15 v2.2d Customising captions (AR)]
% \end{macrocode}
%
% \changes{v2.2b}{2007/06/15}{Made obsolete warning even more annoying}
Modified: trunk/Master/texmf-dist/source/latex/caption/ltcaption.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/caption/ltcaption.dtx 2019-08-28 23:40:39 UTC (rev 51972)
+++ trunk/Master/texmf-dist/source/latex/caption/ltcaption.dtx 2019-08-28 23:41:01 UTC (rev 51973)
@@ -78,10 +78,11 @@
%
% \GetFileInfo{ltcaption.drv}
% \let\docdate\filedate
+% \let\docversion\fileversion
% \GetFileInfo{ltcaption.sty}
%
% \title{\texorpdfstring{\Thispackage\thanks{%^^A
-% This package has version number \fileversion.}}%^^A
+% This package has version number \docversion.}}%^^A
% {The ltcaption package}}
% \author{Axel Sommerfeldt\\
% \url{https://gitlab.com/axelsommerfeldt/caption}}
@@ -460,7 +461,7 @@
%
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{ltcaption}[2018/08/26 v1.4-95 longtable captions (AR)]
+\ProvidesPackage{ltcaption}[2018/08/26 v1.4a longtable captions (AR)]
% \end{macrocode}
%
% \begin{macrocode}
Modified: trunk/Master/texmf-dist/source/latex/caption/newfloat.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/caption/newfloat.dtx 2019-08-28 23:40:39 UTC (rev 51972)
+++ trunk/Master/texmf-dist/source/latex/caption/newfloat.dtx 2019-08-28 23:41:01 UTC (rev 51973)
@@ -2,7 +2,7 @@
%
% This is file `newfloat.dtx'.
%
-% Copyright (C) 2011-2015 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
+% Copyright (C) 2011-2019 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
%
% --------------------------------------------------------------------------
%
@@ -25,7 +25,7 @@
% and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex.
%
% \fi
-% \CheckSum{1307}
+% \CheckSum{1397}
%
% \iffalse
%<*driver>
@@ -88,10 +88,11 @@
%
% \GetFileInfo{newfloat.drv}
% \let\docdate\filedate
+% \let\docversion\fileversion
% \GetFileInfo{newfloat.sty}
%
% \title{\texorpdfstring{\Thispackage\thanks{%^^A
-% This package has version number \fileversion.}}%^^A
+% This package has version number \docversion.}}%^^A
% {The newfloat package}}
% \author{Axel Sommerfeldt\\
% \url{https://gitlab.com/axelsommerfeldt/caption}}
@@ -469,7 +470,7 @@
% \DoNotIndex{\@car,\@cdr,\@classoptionslist,\@cons,\@currext,\@currname}
% \DoNotIndex{\@ehc,\@ehd,\@empty,\@esphack,\@expandtwoargs}
% \DoNotIndex{\@for,\@firstofone,\@firstoftwo}
-% \DoNotIndex{\@gobble,\@gobblefour,\@gobbletwo,\@hangfrom}
+% \DoNotIndex{\@gobble,\@gobbletwo,\@gobblethree,\@gobblefour,\@hangfrom}
% \DoNotIndex{\@ifnextchar,\@ifpackagelater,\@ifpackageloaded}
% \DoNotIndex{\@ifstar,\@ifundefined,\@latex at error,\@namedef,\@nameuse}
% \DoNotIndex{\@onlypreamble,\@parboxrestore,\@plus,\@ptionlist}
@@ -515,6 +516,7 @@
% outsourced from the \package{caption3} package and revised}
% \changes{v1.1}{2013/04/27}{Adapted to the \package{tocloft} package}
% \changes{v1.1}{2013/04/27}{New command \cs{PrepareListOf} added}
+% \changes{v1.1d}{2019/03/16}{Adapted to the \package{dgruyter} package}
%
% \iffalse
% --------------------------------------------------------------------------- %
@@ -531,7 +533,7 @@
%
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{newfloat}[2018/03/04 v1.1a Defining new floating environments (AR)]
+\ProvidesPackage{newfloat}[2019/08/28 v1.1g Defining new floating environments (AR)]
% \end{macrocode}
%
% \begin{macro}{\newfloat at Info}
@@ -610,6 +612,8 @@
% \changes{v1.1}{2013/11/03}{Uses \cs{newfloat at capitalize} now}
% \changes{v1.1}{2015/09/16}{Support of \cs{autodot} (offered by the \KOMAScript\ classes) added}
% \changes{v1.1}{2018/03/04}{Usage of \cs{ifdefined} replaced by \cs{@ifundefined} to improve compatibility with the \package{listings} package}
+% \changes{v1.1b}{2018/12/26}{Bugfix: Missing curly braces added}
+% \changes{v1.1c}{2019/01/10}{Bugfix: Support of \cs{autodot} fixed}
% |\DeclareFloatingEnvironment|\oarg{options}\marg{environment}\oarg{name}\oarg{list name}
% \begin{macrocode}
\newcommand*\DeclareFloatingEnvironment{%
@@ -646,7 +650,8 @@
% Define |\fnum@|\meta{type}, a macro to generate the figure number for a caption
% \begin{macrocode}
\newfloat at def{fnum@#2}%
- {\@nameuse{#2name}\nobreakspace\@nameuse{the#2}\@nameuse{autodot}}%
+ {\@nameuse{#2name}\nobreakspace\@nameuse{the#2}%
+ \ifdefined\autodot\expandafter\autodot\fi}%
% \end{macrocode}
% Define |\|\meta{type}|name| used by |\fnum@|\meta{type} as \meta{type},
% but with first letter capitalized
@@ -666,10 +671,10 @@
% \begin{macrocode}
\ifcsname @tufte at float\endcsname
\newenvironment{#2}[1][htbp]%
- {\begin{@tufte at float}[##1]{#2}{}}%
+ {\begin{@tufte at float}[{##1}]{#2}{}}%
{\end{@tufte at float}}%
\newenvironment{#2*}[1][htbp]%
- {\begin{@tufte at float}[##1]{#2}{star}}%
+ {\begin{@tufte at float}[{##1}]{#2}{star}}%
{\end{@tufte at float}}%
\else
\newenvironment{#2}{\@float{#2}}{\end at float}%
@@ -746,14 +751,21 @@
%
% \begin{macro}{\newfloat at listof}
% \changes{v1.1}{2013/04/27}{Revised}
+% \changes{v1.1g}{2019/08/28}{Starred variant added}
% |\newfloat at listof|\marg{float type}\\
% typesets the list, using |\listoffigure| with patched list name and file extension.
% \begin{macrocode}
\newcommand*\newfloat at listof[1]{%
- \@expandtwoargs\newfloat at list@of{#1}{\@nameuse{ext@#1}}}
+ \@ifstar
+ {\newfloat at list@of{#1}*}%
+ {\newfloat at list@of{#1}\relax}}
% \end{macrocode}
% \begin{macrocode}
-\newcommand*\newfloat at list@of[2]{%
+\newcommand*\newfloat at list@of[1]{%
+ \@expandtwoargs\newfloat at list@of@{#1}{\@nameuse{ext@#1}}}
+% \end{macrocode}
+% \begin{macrocode}
+\newcommand*\newfloat at list@of@[3]{%
\begingroup
\expandafter\let\expandafter\listfigurename\csname list#1name\endcsname
\def\ext at figure{#2}%
@@ -762,7 +774,7 @@
\let\newfloat at listoftoc\listoftoc
\def\listoftoc##1{\newfloat at listoftoc{#2}}%
\@nameuse{newfloat at listof#1 at hook}%
- \listoffigures
+ \listoffigures#3%
\endgroup}
% \end{macrocode}
% \end{macro}
@@ -1063,7 +1075,7 @@
% \begin{macro}{\ForEachFloatingEnvironment}
% |\ForEachFloatingEnvironment|\marg{code}
% will execute the given code for each floating environment.
-% The starred variant will only work for already existing environment,
+% The starred variant will only work for already existing environments,
% i.e.~no hook will be placed inside |\Declare|\-|Floating|\-|Environment|.
% \begin{macrocode}
\newcommand\ForEachFloatingEnvironment{%
@@ -1294,7 +1306,7 @@
%
% \begin{macro}{planb=}
% \changes{v1.0b}{2012/05/18}{This option added}
-% This option switches the `Plan B' on or off. (default$=$off)
+% This option switches the `Plan B' on or off. (default$=$true)
% \begin{macrocode}
\define at key{newfloat}{planb}[true]{%
\def\@tempa{#1}%
@@ -1343,29 +1355,35 @@
% \subsection{Patching \cs{chapter}}
%
% \begin{macro}{\newfloat at replace@chapter}
-% |\newfloat at replace@chapter|\marg{original code}\marg{replacement code}\par
+% \changes{v1.1f}{2019/08/25}{Parameter \meta{class name} added to macro}
+% |\newfloat at replace@chapter|\marg{class name}\marg{original code}\marg{replacement code}\par
% tries to patch |\@chapter| so |\@add|\-|chapter|\-|lists|\-|gaps| will be supported.
% It checks for |\Hy at org@chapter|, too, since the original code will be stored here
% if the \package{hyperref} package was loaded.
% \begin{macrocode}
-\newcommand\newfloat at replace@chapter[2]{%
+\newcommand\newfloat at replace@chapter[3]{%
\begingroup
\let\if at twocolumn\iffalse
\let\if at mainmatter\iffalse
\let\if at thema\iffalse
- \def\@tempa[##1]##2{#1}%
+ \def\@tempa[##1]##2{#2}%
\ifx\@tempa\@chapter
- \gdef\@chapter[##1]##2{#2}%
- \global\let\newfloat at replace@chapter\@gobbletwo
+ \newfloat at InfoNoLine{Document class `#1' detected}%
+ \gdef\@chapter[##1]##2{#3}%
+ \global\let\newfloat at replace@chapter\newfloat at dont@replace at chapter
\else\ifx\@tempa\Hy at org@chapter
- \gdef\Hy at org@chapter[##1]##2{#2}%
- \global\let\newfloat at replace@chapter\@gobbletwo
+ \newfloat at InfoNoLine{Document class `#1' detected (Hy)}%
+ \gdef\Hy at org@chapter[##1]##2{#3}%
+ \global\let\newfloat at replace@chapter\newfloat at dont@replace at chapter
\fi\fi
\endgroup}
% \end{macrocode}
% \begin{macrocode}
+\newcommand\newfloat at dont@replace at chapter[3]{}
+% \end{macrocode}
+% \begin{macrocode}
\ifcsname @chapter\endcsname \else
- \let\newfloat at replace@chapter\@gobbletwo
+ \let\newfloat at replace@chapter\newfloat at dont@replace at chapter
\fi
% \end{macrocode}
% \end{macro}
@@ -1375,7 +1393,7 @@
%
% \begin{macrocode}
% report.cls [2005/09/16 v1.4f Standard LaTeX document class]
-\newfloat at replace@chapter{%
+\newfloat at replace@chapter{report}{%
\ifnum \c at secnumdepth >\m at ne
\refstepcounter{chapter}%
\typeout{\@chapapp\space\thechapter.}%
@@ -1414,7 +1432,7 @@
%
% \begin{macrocode}
% book.cls [2005/09/16 v1.4f Standard LaTeX document class]
-\newfloat at replace@chapter{%
+\newfloat at replace@chapter{book}{%
\ifnum \c at secnumdepth >\m at ne
\if at mainmatter
\refstepcounter{chapter}%
@@ -1465,7 +1483,7 @@
% \begin{macrocode}
% amsbook.cls [2004/08/06 v2.20]
% smfbook.cls [1999/11/15 v1.2f Classe LaTeX pour les monographies editees par la SMF]
-\newfloat at replace@chapter{%
+\newfloat at replace@chapter{amsbook}{%
\refstepcounter{chapter}%
\ifnum\c at secnumdepth<\z@ \let\@secnumber\@empty
\else \let\@secnumber\thechapter \fi
@@ -1499,7 +1517,7 @@
% chapters gap in |\@chapter|\-|lists|\-|gap at on| and |\@chapter|\-|lists|\-|gap at off|.
% \begin{macrocode}
\@ifpackageloaded{tocbasic}{%
- \let\newfloat at replace@chapter\@gobbletwo}{}
+ \let\newfloat at replace@chapter\newfloat at dont@replace at chapter}{}
% \end{macrocode}
%
% \pagebreak[3]
@@ -1510,7 +1528,7 @@
% \begin{macrocode}
\ifcsname insertchapterspace\endcsname
\renewcommand*\insertchapterspace{\@addchapterlistsgaps}
- \let\newfloat at replace@chapter\@gobbletwo
+ \let\newfloat at replace@chapter\newfloat at dont@replace at chapter
\fi
% \end{macrocode}
%
@@ -1519,7 +1537,7 @@
%
% \begin{macrocode}
% rapport1/3.cls [2004/06/07 v2.1a NTG LaTeX document class]
-\newfloat at replace@chapter{%
+\newfloat at replace@chapter{rapport}{%
\ifnum \c at secnumdepth >\m at ne
\refstepcounter{chapter}%
\typeout{\@chapapp\space\thechapter.}%
@@ -1557,7 +1575,7 @@
% \end{macrocode}
% \begin{macrocode}
% boek(3).cls [2004/06/07 v2.1a NTG LaTeX document class]
-\newfloat at replace@chapter{%
+\newfloat at replace@chapter{boek}{%
\ifnum \c at secnumdepth >\m at ne
\if at mainmatter
\refstepcounter{chapter}%
@@ -1607,7 +1625,7 @@
%
% \begin{macrocode}
% thesis.cls [1996/25/01 1.0g LaTeX document class (wm).]
-\newfloat at replace@chapter{%
+\newfloat at replace@chapter{thesis}{%
\ifnum \c at secnumdepth >\m at ne
\if at mainmatter
\refstepcounter{chapter}%
@@ -1675,24 +1693,78 @@
% \end{macrocode}
%
% \pagebreak[3]
+% \subsubsection{The Springer Verlag document classes}
+% \changes{v1.1f}{2019/08/25}{Support of \package{svmono} and \package{svmult} document classes added}
+%
+% \begin{macrocode}
+% svmono.cls [2018/06/25 v5.6 Springer Verlag global LaTeX document class for monographs]
+% svmult.cls [2018/01/11 v5.5 Springer Verlag global LaTeX document class for multi authored books]
+\newfloat at replace@chapter{svmono}{%
+ \if at chapnum % war mal \ifnum \c at secnumdepth >\m at ne
+ \refstepcounter{chapter}%
+ \if at mainmatter
+ \typeout{\@chapapp\space\thechapter.}%
+ \addcontentsline{toc}{chapter}{\protect
+ \numberline{\thechapter\thechapterend}#1}%
+ \else
+ \addcontentsline{toc}{chapter}{#1}%
+ \fi
+ \else
+ \addcontentsline{toc}{chapter}{#1}%
+ \fi
+ \chaptermark{#1}%
+ \addtocontents{lof}{\protect\addvspace{10\p@}}%
+ \addtocontents{lot}{\protect\addvspace{10\p@}}%
+ \if at twocolumn
+ \@topnewpage[\@makechapterhead{#2}]%
+ \else
+ \@makechapterhead{#2}%
+ \@afterheading
+ \fi}{%
+ \if at chapnum % war mal \ifnum \c at secnumdepth >\m at ne
+ \refstepcounter{chapter}%
+ \if at mainmatter
+ \typeout{\@chapapp\space\thechapter.}%
+ \addcontentsline{toc}{chapter}{\protect
+ \numberline{\thechapter\thechapterend}#1}%
+ \else
+ \addcontentsline{toc}{chapter}{#1}%
+ \fi
+ \else
+ \addcontentsline{toc}{chapter}{#1}%
+ \fi
+ \chaptermark{#1}%
+ \@addchapterlistsgaps
+ \if at twocolumn
+ \@topnewpage[\@makechapterhead{#2}]%
+ \else
+ \@makechapterhead{#2}%
+ \@afterheading
+ \fi}
+% \end{macrocode}
+%
+% \pagebreak[3]
% \subsubsection{Compatibility warning}
%
% \begin{macrocode}
-\ifx\newfloat at replace@chapter\@gobbletwo \else
+\ifx\newfloat at replace@chapter\newfloat at dont@replace at chapter \else
% \end{macrocode}
% If we were not able to patch |\@chapter| an info message is issued
% since we may not be able to support chapter lists gaps then.
% \begin{macrocode}
\newfloat at InfoNoLine{%
- Unsupported document class, or \noexpand\@chapter\MessageBreak
- was already redefined by another package}
+ Unsupported document class, or \noexpand\@chapter\MessageBreak
+ was already redefined by another package}
\newfloat at InfoNoLine{\string\@chapter\space=\space\meaning\@chapter}
\newfloat at InfoNoLine{\string\Hy at org@chapter\space=\space\meaning\Hy at org@chapter}
% \end{macrocode}
-% Plan B: We patch |\addtocontents| instead, and keep our fingers crossed in the hope
-% that this redefinition actually will fit.
+% Plan B: We patch |\add|\-|to|\-|contents| instead, and keep our fingers crossed
+% in the hope that this redefinition actually will fit.
+% (Note: Since \package{biblatex} patches |\add|\-|to|\-|contents| as well we do
+% this using |\At||Begin||Document|.)
+% \changes{v1.1f}{2019/08/25}{Plan B will now be done using \cs{AtBeginDocument}}
% \begin{macrocode}
- \newfloat at ifplanb{%
+ \newfloat at ifplanb{\AtBeginDocument{%
\newfloat at InfoNoLine{Trying Plan B..}%
\let\newfloat at addtocontents@ORI\addtocontents
\long\def\addtocontents#1#2{%
@@ -1713,7 +1785,7 @@
\@addchapterlistsgaps
\endgroup
\fi
- \fi}}
+ \fi}}}
% \end{macrocode}
% \begin{macrocode}
\fi
@@ -1723,21 +1795,22 @@
% \subsection{Support of other packages}
%
% \begin{macro}{\newfloat at ForEachNew}
-% |\newfloat at ForEachNew|\oarg{command}\marg{code}
+% \changes{v1.1e}{2019/03/17}{This macro revised; uses \cs{ForEachFloatingEnvironment} now}
+% |\newfloat at ForEachNew|\marg{command}\marg{code}
% will execute the given code for every floating environment defined with
-% |\Declare|\-|Floating|\-|Environment|.
-% This will be done |\At|\-|Begin|\-|Document| so the affected package could be loaded
-% after \thispackage.
-% (If a \meta{command} is given this will only be done if \meta{command} is
-% defined.)
+% |\Declare|\-|Floating|\-|Environment| if \meta{command} is defined.
+% This will be tried |\At|\-|Begin|\-|Document| additionally so the affected
+% package could be loaded after \thispackage.
% \begin{macrocode}
-\newcommand\newfloat at ForEachNew[2][newfloat@@list]{%
- \AtBeginDocument{%
- \ifcsname#1\endcsname
- \def\@elt##1{#2}%
- \newfloat@@list
- \let\@elt\relax
- \fi}}%
+\newcommand\newfloat at ForEachNew[2]{%
+ \ifcsname#1\endcsname
+ \ForEachFloatingEnvironment{#2}%
+ \else
+ \AtBeginDocument{%
+ \ifcsname#1\endcsname
+ \ForEachFloatingEnvironment{#2}%
+ \fi}%
+ \fi}%
\@onlypreamble\newfloat at ForEachNew
% \end{macrocode}
% \end{macro}
@@ -1749,7 +1822,7 @@
% extensions, too. Since this list will be used for inserting chapters gaps
% we only add the ones which are configured for chapters gaps on.
%% \begin{macrocode}
-\newfloat at ForEachNew[float at exts]{%
+\newfloat at ForEachNew{float at exts}{%
\@nameuse{@ifchapterlistsgap@#1}{% if switched on
\let\float at do=\relax
\edef\@tempa{%
@@ -1762,7 +1835,7 @@
%
% We define a FP-variant of new floating environments here.
% \begin{macrocode}
-\newfloat at ForEachNew[FP at floatBegin]{%
+\newfloat at ForEachNew{FP at floatBegin}{%
\newcounter{FP@#1C}%
\newenvironment{FP#1}{\FP at floatBegin{#1}}{\FP at floatEnd}}
% \end{macrocode}
@@ -1784,7 +1857,7 @@
%
% We define a sideways-variant of new floating environments here.
% \begin{macrocode}
-\newfloat at ForEachNew[@rotfloat]{%
+\newfloat at ForEachNew{@rotfloat}{%
\newenvironment{sideways#1}{\@rotfloat{#1}}{\end at rotfloat}%
\newenvironment{sideways#1*}{\@rotdblfloat{#1}}{\end at rotdblfloat}}
% \end{macrocode}
@@ -1793,19 +1866,22 @@
% \subsubsection{\package{sidecap}}
%
% We define a SC-variant of new floating environments here.
+% \begin{macro}{\SC at float}
+% \changes{v1.1b}{2018/12/26}{Bugfix: Missing curly braces added}
% \begin{macrocode}
\newcommand*\newfloat at For@SC[2]{%
\def#1{b}% = \sidecaptionvpos{#2}{b} (v1.6)
\newenvironment{SC#2}%
- {\SC at float[#1]{#2}}{\endSC at float}%
+ {\SC at float[{#1}]{#2}}{\endSC at float}%
\newenvironment{SC#2*}%
- {\SC at dblfloat[#1]{#2}}{\endSC at dblfloat}}
+ {\SC at dblfloat[{#1}]{#2}}{\endSC at dblfloat}}
\@onlypreamble\newfloat at For@SC
% \end{macrocode}
% \begin{macrocode}
-\newfloat at ForEachNew[SC at float]{%
+\newfloat at ForEachNew{SC at float}{%
\expandafter\newfloat at For@SC\csname SC@#1 at vpos\endcsname{#1}}
% \end{macrocode}
+% \end{macro}
%
% \pagebreak[3]
% \subsubsection{\package{wrapfig}}
@@ -1812,9 +1888,23 @@
%
% We define a wrap-variant of new floating environments here.
% \begin{macrocode}
-\newfloat at ForEachNew[wrapfloat]{%
+\newfloat at ForEachNew{wrapfloat}{%
\newenvironment{wrap#1}{\wrapfloat{#1}}{\endwrapfloat}}
% \end{macrocode}
+%
+% \pagebreak[3]
+% \subsubsection{\package{dgruyter}}
+%
+% The De Gruyter layout package (for preparing books for Walter de Gruyter GmbH)
+% is defining |\plist at figure| and |\plist at table|, and expects this to be
+% defined for other floating environments as well.
+% (This will be used as prefix for the ``List of''.)
+% \begin{macrocode}
+\newfloat at ForEachNew{plist at figure}{%
+ \expandafter\newcommand\csname plist@#1\endcsname{%
+ \@nameuse{#1name}\space}}
+% \end{macrocode}
+%
% \iffalse
%</package>
% \fi
Modified: trunk/Master/texmf-dist/source/latex/caption/subcaption.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/caption/subcaption.dtx 2019-08-28 23:40:39 UTC (rev 51972)
+++ trunk/Master/texmf-dist/source/latex/caption/subcaption.dtx 2019-08-28 23:41:01 UTC (rev 51973)
@@ -25,12 +25,12 @@
% and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex.
%
% \fi
-% \CheckSum{156}
+% \CheckSum{178}
%
% \iffalse
%<*driver>
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesFile{subcaption.drv}[2018/05/01 v1.1 Adds a sub-caption feature to the caption package]
+\ProvidesFile{subcaption.drv}[2018/05/13 v1.2 Adds a sub-caption feature to the caption package]
\hbadness=9999 \newcount\hbadness \hfuzz=74pt % Make TeX shut up.
%\errorcontextlines=3
%
@@ -47,7 +47,7 @@
\addtolength\marginparwidth{15pt}
\ifdim\paperheight=297mm % a4paper
\renewcommand\LineBreak{\\}
- \renewcommand\PageBreak{\clearpage}
+ \renewcommand\PageBreak{\clearpage}
\fi
\fi
%
@@ -109,10 +109,11 @@
%
% \GetFileInfo{subcaption.drv}
% \let\docdate\filedate
+% \let\docversion\fileversion
% \GetFileInfo{subcaption.sty}
%
% \title{\texorpdfstring{\Thispackage\thanks{%^^A
-% This package has version number \fileversion, last revised \filedate.}}%^^A
+% This package has version number \docversion.}}%^^A
% {The subcaption package}}
% \author{Axel Sommerfeldt\\
% \url{https://gitlab.com/axelsommerfeldt/caption}}
@@ -172,7 +173,7 @@
%
% The default settings for |sub|captions are:
% \begin{quote}
-% |margin=0pt,font+=smaller,labelformat=parens,labelsep=space,|\\
+% |margin=0pt,size=smaller,labelformat=parens,labelsep=space,|\\
% |skip=6pt,list=false,hypcap=false|~\footnote{%^^A
% This means that sub-captions are not listed in the List of Figures
% or Tables by default, but you can enable that by
@@ -193,7 +194,7 @@
% \item Local settings
% {\small(|\captionsetup{|\ldots|}| inside |figure| or |table| environment)}
% \item Default `sub' settings
-% {\small(|margin=0pt,font+=smaller,|\ldots, see above)}
+% {\small(|margin=0pt,size=smaller,|\ldots, see above)}
% \item Custom `sub' settings
% {\small(|\usepackage[|\ldots|]{subcaption}| and |\captionsetup[sub]{|\ldots|}|)}
% \item Environmental `sub' settings
@@ -217,133 +218,12 @@
% \end{quote}
%
% \PageBreak
-% \section{The \cs{subcaption} command}
-%
-% \DescribeMacro\subcaption
-% The easiest and most flexible method to apply a sub-caption is by using the
-% |\subcaption| command. Its syntax is analogous to the one of the |\caption|
-% command and shares its features:
-% \begin{quote}
-% |\subcaption|\oarg{list entry}\marg{heading}\\
-% |\subcaption*|\marg{heading}
-% \end{quote}
-% Please note that the |\subcaption| command \emph{must} be applied inside
-% its own box or environment.
-%
-% An example:
-% \begin{quote}
-% |\begin{figure}|\\
-% | \begin{minipage}[b]{.5\linewidth}|\\
-% | \centering\large A|\\
-% | \subcaption{A subfigure}\label{fig:1a}|\\
-% | \end{minipage}%|\\
-% | \begin{minipage}[b]{.5\linewidth}|\\
-% | \centering\large B|\\
-% | \subcaption{Another subfigure}\label{fig:1b}|\\
-% | \end{minipage}|\\
-% | \caption{A figure}\label{fig:1}|\\
-% |\end{figure}|
-% \end{quote}
-% gives the result:
-% \par\bigskip
-% \noindent\begin{minipage}{\linewidth}
-% \setcaptiontype{figure}
-% \begin{minipage}[b]{.5\linewidth}
-% \centering\large A
-% \subcaption{A subfigure}\label{fig:1a}
-% \end{minipage}%^^A
-% \begin{minipage}[b]{.5\linewidth}
-% \centering\large B
-% \subcaption{Another subfigure}\label{fig:1b}
-% \end{minipage}
-% \caption{A figure}\label{fig:1}
-% \end{minipage}
-%
-% \bigskip
-%
-% \begin{background}
-% Prepared with |\Declare|\-|Caption|\-|Sub|\-|Type| (offered by the
-% \package{caption} package), the caption package command |\set|\-|caption|\-|sub|\-|type|
-% becames available.
-% Analogous to the |\set|\-|caption|\-|type| command of the \package{caption} package,
-% the |\set|\-|caption|\-|sub|\-|type| command sets the sub-type of the box or environment
-% (so |\caption| will typeset a sub-caption instead of an ordinary one),
-% places a proper hyperlink anchor (non-starred variant only),
-% executes options associated with the sub-type etc.\par
-% The |\subcaption| command is just a simple combination of
-% |\set|\-|caption|\-|sub|\-|type*| and |\caption|.
-% \end{background}
-%
-% \PageBreak
-% \section{The subfigure \& subtable environments}
-%
-% \DescribeEnv{subfigure}
-% \DescribeEnv{subtable}
-% After loading \thispackage\ the new environments |sub|\-|figure| and
-% |sub|\-|table| are available, which have the same (optional \& mandatory)
-% arguments as the |mini|\-|page| environment:
-% \begin{quote}
-% |\begin{subfigure}|\oarg{pos}\marg{width}\\
-% \ldots\\
-% |\end{subfigure}|
-% \end{quote}
-% and
-% \begin{quote}
-% |\begin{subtable}|\oarg{pos}\marg{width}\\
-% \ldots\\
-% |\end{subtable}|
-% \end{quote}
-% Inside these environments you use the ordinary |\caption| command
-% for typesetting captions. So this example is the same as the last one,
-% but uses the |sub|\-|figure| environment:
-% \begin{quote}
-% |\begin{figure}|\\
-% | \begin{|\textcolor{blue}{\texttt{subfigure}}|}[b]{.5\linewidth}|\\
-% | \centering\large A|\\
-% | |\textcolor{blue}{\cs{caption}}|{A subfigure}\label{fig:1a}|\\
-% | \end{|\textcolor{blue}{\texttt{subfigure}}|}%|\\
-% | \begin{|\textcolor{blue}{\texttt{subfigure}}|}[b]{.5\linewidth}|\\
-% | \centering\large B|\\
-% | |\textcolor{blue}{\cs{caption}}|{Another subfigure}\label{fig:1b}|\\
-% | \end{|\textcolor{blue}{\texttt{subfigure}}|}|\\
-% | \caption{A figure}\label{fig:1}|\\
-% |\end{figure}|
-% \end{quote}
-% Using the |sub|\-|figure| or |sub|\-|table| environment instead of |\subcaption|
-% has two advantages:
-% \begin{itemize}
-% \item You can override the setttings for a specific subcaption
-% with a |\caption|\-|setup| inside the |sub|\-|figure| or |sub|\-|table| environment, e.g.:
-% \begin{quote}
-% |\begin{subfigure}[b]{.5\linewidth}|\\
-% | \centering\large A|\\
-% | |\textcolor{blue}{\cs{captionsetup}\csmarg{skip=3pt}}\\
-% | \caption{A subfigure}\label{fig:1a}|\\
-% |\end{subfigure}|\\
-% \end{quote}
-% \item Hyperlinks targeted to this subfigure will jump to the beginning
-% of the subfigure, and not to the caption of the subfigure
-% (if |hypcap=true| is set for sub-captions).
-% \See{\Ref{hypcap}}
-% \end{itemize}
-%
-% \bigskip
-%
-% \begin{background}
-% The |subfigure| \& |subtable| environments are just simple minipage
-% environments with |\set|\-|caption|\-|sub|\-|type| as first contents line.
-% These environments are defined with the help of
-% |\caption at For{subtypelist}|, which executes code for every sub-type
-% declared with |\Declare|\-|Caption|\-|Sub|\-|Type|.
-% \end{background}
-%
-% \PageBreak
% \section{The \cs{subcaptionbox} command}
%
% \DescribeMacro\subcaptionbox
-% A different way of setting sub-figures is
-% offered by the |\sub|\-|caption|\-|box| command, which automatically
-% aligns the sub-figures resp.~sub-tables by their very first caption line.
+% The easiest way to apply a sub-caption is by using the
+% |\sub|\-|caption|\-|box| command, which automatically aligns the
+% sub-figures resp.~sub-tables by their very first caption line.
%
% Its syntax is:
% \begingroup
@@ -470,6 +350,131 @@
% \end{background}
%
% \PageBreak
+% \section{The subfigure \& subtable environments}
+%
+% \DescribeEnv{subfigure}
+% \DescribeEnv{subtable}
+% After loading \thispackage\ the new environments |sub|\-|figure| and
+% |sub|\-|table| are available, which have the same (optional \& mandatory)
+% arguments as the |mini|\-|page| environment:
+% \begin{quote}
+% |\begin{subfigure}|\oarg{outer-pos}\oarg{height}\oarg{inner-pos}\marg{width}\\
+% \ldots\\
+% |\end{subfigure}|
+% \end{quote}
+% and
+% \begin{quote}
+% |\begin{subtable}|\oarg{outer-pos}\oarg{height}\oarg{inner-pos}\marg{width}\\
+% \ldots\\
+% |\end{subtable}|
+% \end{quote}
+% Inside these environments you use the ordinary |\caption| command
+% for typesetting captions. So this example is the same as the last one,
+% but uses the |sub|\-|figure| environment:
+% \begin{quote}
+% |\begin{figure}|\\
+% | \begin{|\textcolor{blue}{\texttt{subfigure}}|}[b]{.5\linewidth}|\\
+% | \centering\large A|\\
+% | |\textcolor{blue}{\cs{caption}}|{A subfigure}\label{fig:1a}|\\
+% | \end{|\textcolor{blue}{\texttt{subfigure}}|}%|\\
+% | \begin{|\textcolor{blue}{\texttt{subfigure}}|}[b]{.5\linewidth}|\\
+% | \centering\large B|\\
+% | |\textcolor{blue}{\cs{caption}}|{Another subfigure}\label{fig:1b}|\\
+% | \end{|\textcolor{blue}{\texttt{subfigure}}|}|\\
+% | \caption{A figure}\label{fig:1}|\\
+% |\end{figure}|
+% \end{quote}
+% Some additional notes:
+% \begin{itemize}
+% \item You can override the setttings for a specific subcaption
+% with a |\caption|\-|setup| inside the |sub|\-|figure| or |sub|\-|table| environment, e.g.:
+% \begin{quote}
+% |\begin{subfigure}[b]{.5\linewidth}|\\
+% | \centering\large A|\\
+% | |\textcolor{blue}{\cs{captionsetup}\csmarg{skip=3pt}}\\
+% | \caption{A subfigure}\label{fig:1a}|\\
+% |\end{subfigure}|\\
+% \end{quote}
+% \item Hyperlinks targeted to this subfigure will jump to the beginning
+% of the subfigure, and not to the caption of the subfigure
+% (if |hypcap=true| is set for sub-captions).
+% \See{\Ref{hypcap}}
+% \end{itemize}
+%
+% Beside the \meta{inner-pos} values of `c', `t', and `b', \thispackage\ also offers the
+% values `T' and `B' additionally which align the |sub|\-|figure| at the
+% very top resp.~bottom. (In contrast `t' and `b' align the |sub|\-|figure| at the
+% top resp.~bottom \textit{baseline}.)
+%
+% \bigskip
+%
+% \begin{background}
+% The |subfigure| \& |subtable| environments are just simple minipage
+% environments with |\set|\-|caption|\-|sub|\-|type| as first contents line.
+% These environments are defined with the help of
+% |\caption at For{subtypelist}|, which executes code for every sub-type
+% declared with |\Declare|\-|Caption|\-|Sub|\-|Type|.
+% \end{background}
+%
+% \iffalse\PageBreak\fi
+% \section{The \cs{subcaption} command}
+%
+% \DescribeMacro\subcaption
+% The most flexible way to apply a sub-caption is by using the
+% |\subcaption| command. Its syntax is analogous to the one of the |\caption|
+% command and shares its features:
+% \begin{quote}
+% |\subcaption|\oarg{list entry}\marg{heading}\\
+% |\subcaption*|\marg{heading}
+% \end{quote}
+% Please note that the |\subcaption| command \emph{must} be applied inside
+% its own box or environment.
+%
+% An example:
+% \begin{quote}
+% |\begin{figure}|\\
+% | \begin{minipage}[b]{.5\linewidth}|\\
+% | \centering\large A|\\
+% | \subcaption{A subfigure}\label{fig:1a}|\\
+% | \end{minipage}%|\\
+% | \begin{minipage}[b]{.5\linewidth}|\\
+% | \centering\large B|\\
+% | \subcaption{Another subfigure}\label{fig:1b}|\\
+% | \end{minipage}|\\
+% | \caption{A figure}\label{fig:1}|\\
+% |\end{figure}|
+% \end{quote}
+% gives the result:
+% \par\bigskip
+% \noindent\begin{minipage}{\linewidth}
+% \setcaptiontype{figure}
+% \begin{minipage}[b]{.5\linewidth}
+% \centering\large A
+% \subcaption{A subfigure}\label{fig:1a}
+% \end{minipage}%^^A
+% \begin{minipage}[b]{.5\linewidth}
+% \centering\large B
+% \subcaption{Another subfigure}\label{fig:1b}
+% \end{minipage}
+% \caption{A figure}\label{fig:1}
+% \end{minipage}
+%
+% \bigskip
+%
+% \begin{background}
+% Prepared with |\Declare|\-|Caption|\-|Sub|\-|Type| (offered by the
+% \package{caption} package), the caption package command |\set|\-|caption|\-|sub|\-|type|
+% becames available.
+% Analogous to the |\set|\-|caption|\-|type| command of the \package{caption} package,
+% the |\set|\-|caption|\-|sub|\-|type| command sets the sub-type of the box or environment
+% (so |\caption| will typeset a sub-caption instead of an ordinary one),
+% places a proper hyperlink anchor (non-starred variant only),
+% executes options associated with the sub-type etc.\par
+% The |\subcaption| command is just a simple combination of
+% |\set|\-|caption|\-|sub|\-|type*| and |\caption|.
+% \end{background}
+%
+% \PageBreak
% \section{The \cs{DeclareCaptionSubType} command}
%
% \DescribeMacro\DeclareCaptionSubType
@@ -898,7 +903,7 @@
%
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{subcaption}[2018/05/01 v1.1-162 Sub-captions (AR)]
+\ProvidesPackage{subcaption}[2018/05/13 v1.2 Sub-captions (AR)]
% \end{macrocode}
%
% \subsection{Initial code}
@@ -905,7 +910,7 @@
%
% Since we base on the \package{caption} package we load it here.
% \begin{macrocode}
-\RequirePackage{caption}[2018/05/01] % needs v3.3-147 or newer
+\RequirePackage{caption}[2018/05/11] % needs v3.4 or newer
% \end{macrocode}
%
% \begin{macro}{\subcaption at CheckCompatibility}
@@ -917,6 +922,13 @@
\newcommand\subcaption at CheckCompatibility{%
% \end{macrocode}
% \begin{macrocode}
+ \@ifundefined{caption at ifcompatibility}{}{%
+ \caption at ifcompatibility{%
+ \caption at Error{%
+ The `subcaption' package does not work correctly\MessageBreak
+ in compatibility mode}}{}}%
+% \end{macrocode}
+% \begin{macrocode}
\@ifpackageloaded{subfigure}{%
\PackageError{subcaption}%
{This package can't be used in cooperation\MessageBreak
@@ -946,19 +958,9 @@
% \end{macrocode}
% \begin{macrocode}
\caption at AtBeginDocument{%
-% \end{macrocode}
-% \begin{macrocode}
- \caption at ifcompatibility{%
- \caption at Error{%
- The `subcaption' package does not work correctly\MessageBreak
- in compatibility mode}}{}%
-% \end{macrocode}
-% \begin{macrocode}
\subcaption at CheckCompatibility
\let\subcaption at CheckCompatibility\@undefined
\let\subcaption at EH\@undefined
-% \end{macrocode}
-% \begin{macrocode}
}
% \end{macrocode}
% \end{macro}
@@ -972,11 +974,11 @@
%
% We use |\caption at ExecuteOptions| and |\caption at ProcessOptions| here to add
% the options to the `|sub|' option list instead of executing them immediately.
-% \changes{v1.1}{2018/05/01}{Bugfix: Option \texttt{font+=small} changed to \texttt{font+=smaller}}
+% \changes{v1.1}{2018/05/01}{Bugfix: Option \texttt{font+=small} changed to \texttt{size=smaller}}
% \begin{macrocode}
\caption at SetupOptions{subcaption}{\captionsetup[sub]{#2}}%
\caption at ExecuteOptions{subcaption}{%
- font+=smaller,labelformat=parens,labelsep=space,skip=6pt,list=0,hypcap=0}
+ size=smaller,labelformat=parens,labelsep=space,skip=6pt,list=0,hypcap=0}
\caption at ProcessOptions*{subcaption}
% \end{macrocode}
%
@@ -1047,21 +1049,42 @@
%
% \begin{macro}{subfigure}
% \begin{macro}{subtable}
+% \changes{v1.2}{2016/02/21}{Optional argument values `B' and `T' added}
% This is just an ordinary \env{minipage} environment with
% |\setcaptionsubtype| as first contents line.
% It will be defined using the helper macro |\caption at For{sub|\-|type|\-|list}|
% offered by the \package{caption} kernel, so for every caption type
-% declared with |\Declare|\-|Floating|\-|Environment| a corresponding `sub' environment
-% will be defined automatically.
+% declared with |\Declare|\-|Floating|\-|Environment| a corresponding
+% `sub' environment will be defined automatically.
% \begin{macrocode}
\caption at For{subtypelist}{%
\newenvironment{sub#1}%
- {\caption at withoptargs\subcaption at minipage}%
- {\endminipage}}%
+ {\@ifnextchar[%]
+ \subcaption at iminipage
+ {\subcaption at iminipage[c]}}%
+ {\subcaption at endminipage
+ \endminipage}}%
% \end{macrocode}
+% We pass all other optional arguments using the generic helper macro
+% |\caption at with|\-|opt|\-|args| offered by the \package{caption} kernel).
% \begin{macrocode}
-\newcommand*\subcaption at minipage[2]{%
- \minipage#1{#2}%
+\def\subcaption at iminipage[#1]{%
+ \caption at withoptargs{\subcaption at iiminipage{#1}}}
+% \end{macrocode}
+% `B' and `T' will add a |\vspace{0pt}|, all other values (and additional
+% optional arguments) will be passed unseen to the |minipage| environment.
+% \begin{macrocode}
+\newcommand*\subcaption at iiminipage[3]{%
+ \let\subcaption at endminipage\@empty
+ \if#1B%
+ \minipage[b]#2{#3}%
+ \def\subcaption at endminipage{\vspace{0pt}}%
+ \else\if#1T%
+ \minipage[t]#2{#3}%
+ \vspace{0pt}%
+ \else
+ \minipage[#1]#2{#3}%
+ \fi\fi
\setcaptionsubtype\relax}
% \end{macrocode}
% \end{macro}
@@ -1122,6 +1145,7 @@
% \changes{v1.1}{2011/08/18}{Uses \cs{caption at setoptions*} now}
% \changes{v1.1}{2012/01/12}{Usage of \cs{caption at setoptions*} replaced by \cs{caption at setoptions}}
% \changes{v1.1}{2012/04/09}{Revised}
+% \changes{v1.1}{2018/12/26}{Bugfix: Missing curly braces added}
% This one calls |\ref| with the second label. (see |\subcaption at label|)
% \begin{macrocode}
\DeclareRobustCommand*\subref{%
@@ -1131,7 +1155,7 @@
\newcommand*\@subref[2]{%
\caption at ifundefined\hyperref
{\subcaption at ref{#1}{#2}}%
- {\hyperref[#2]{\subcaption at ref{*#1}{#2}}}}
+ {\hyperref[{#2}]{\subcaption at ref{*#1}{#2}}}}
% \end{macrocode}
% \begin{macrocode}
\newcommand*\subcaption at ref[2]{%
Modified: trunk/Master/texmf-dist/source/latex/caption/totalcount.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/caption/totalcount.dtx 2019-08-28 23:40:39 UTC (rev 51972)
+++ trunk/Master/texmf-dist/source/latex/caption/totalcount.dtx 2019-08-28 23:41:01 UTC (rev 51973)
@@ -76,10 +76,11 @@
%
% \GetFileInfo{totalcount.drv}
% \let\docdate\filedate
+% \let\docversion\fileversion
% \GetFileInfo{totalcount.sty}
%
% \title{\texorpdfstring{\Thispackage\thanks{%^^A
-% This package has version number \fileversion, last revised \filedate.}}%^^A
+% This package has version number \docversion.}}%^^A
% {The totalcount package}}
% \author{Axel Sommerfeldt\\
% \url{https://gitlab.com/axelsommerfeldt/caption}}
Modified: trunk/Master/texmf-dist/tex/latex/caption/bicaption.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/caption/bicaption.sty 2019-08-28 23:40:39 UTC (rev 51972)
+++ trunk/Master/texmf-dist/tex/latex/caption/bicaption.sty 2019-08-28 23:41:01 UTC (rev 51973)
@@ -37,8 +37,8 @@
%% caption-deu.tex, caption-eng.tex, and caption-rus.tex.
%%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{bicaption}[2018/08/26 v1.1-159 Bilingual Captions (AR)]
-\RequirePackage{caption}[2016/02/01] % needs v3.3-134 or newer
+\ProvidesPackage{bicaption}[2016/03/27 v1.2 Bilingual Captions (AR)]
+\RequirePackage{caption}[2018/05/11] % needs v3.4 or newer
\caption at AtBeginDocument{\caption at ifcompatibility{%
\caption at Error{%
The `bicaption' package does not work correctly\MessageBreak
@@ -77,21 +77,36 @@
\caption at set@bool\bicaption at ifswap{#1}}
\DeclareCaptionOption{lang}{%
\caption at ifundefined\bicaption at language
- {\let\KV at bicaption@name\KV at caption@name
- \def\KV at caption@name{\bicaption at KV{name}}}%
- {}%
+ \bicaption at language@setupkeys
+ \relax
\def\bicaption at language{#1}%
- \let\bicaption at language@options\@empty}
+ \let\bicaption at language@setoptions\@empty}
\let\KV at caption@language\KV at caption@lang
+\newcommand*\bicaption at language@keylist{}
+\newcommand*\DeclareCaptionLangOption[1]{%
+ \@ifundefined{KV at caption@#1}%
+ {\bicaption at Error{Undefined caption option `#1'}}%
+ {\@cons\bicaption at language@keylist{{#1}}}}
+\let\DeclareCaptionLanguageOption\DeclareCaptionLangOption
+\newcommand*\bicaption at language@setupkeys{%
+ \def\@elt##1{%
+ \expandafter\let\csname KV at bicaption@##1\expandafter\endcsname
+ \csname KV at caption@##1\endcsname
+ \@namedef{KV at caption@##1}{\bicaption at KV{##1}}}%
+ \bicaption at language@keylist
+ \let\@elt\relax}
\newcommand\bicaption at KV[2]{%
\@bicaption at KV{#1}{#2}%
- \l at addto@macro\bicaption at language@options{\@bicaption at KV{#1}{#2}}}
+ \l at addto@macro\bicaption at language@setoptions{%
+ \@bicaption at KV{#1}{#2}}}
\newcommand\@bicaption at KV[1]{%
\@nameuse{KV at bicaption@#1}}
+\DeclareCaptionLangOption{name}
\newcommand*\bicaption at selectlanguage[1]{%
\caption at ifundefined\bicaption at language{}{%
- \expandafter\selectcaptionlanguage\expandafter#1\expandafter{\bicaption at language}%
- \bicaption at language@options}}
+ \expandafter\selectcaptionlanguage\expandafter#1\expandafter
+ {\bicaption at language}%
+ \bicaption at language@setoptions}}
\g at addto@macro\caption at beginhook{%
\bicaption at selectlanguage\@firstoftwo}
\providecommand*\selectcaptionlanguage[1]{%
@@ -98,18 +113,22 @@
#1\select at language\selectlanguage}
\caption at ExecuteOptions{caption}{bi-lang=0,bi-slc=1,bi-swap=0}
\ifcsname captionmainlanguage\endcsname
- \bicaption at InfoNoLine{main language is set to \captionmainlanguage}
+ \bicaption at InfoNoLine{%
+ main language is set to \captionmainlanguage}
\else\ifcsname bbl at main@language\endcsname
- \bicaption at InfoNoLine{babel found, main language is \bbl at main@language}
+ \bicaption at InfoNoLine{%
+ babel found, main language is \bbl at main@language}
\let\captionmainlanguage\bbl at main@language
\else\ifcsname xpg at main@language\endcsname
- \bicaption at InfoNoLine{polyglossia found, main language is \xpg at main@language}
+ \bicaption at InfoNoLine{%
+ polyglossia found, main language is \xpg at main@language}
\let\captionmainlanguage\xpg at main@language
\else
\bicaption at InfoNoLine{main language is not set}
\fi\fi\fi
\ifcsname captionmainlanguage\endcsname
- \edef\@tempa{\noexpand\captionsetup[bi-first]{lang=\captionmainlanguage}}
+ \edef\@tempa{%
+ \noexpand\captionsetup[bi-first]{lang=\captionmainlanguage}}
\@tempa
\fi
\caption at SetupOptions{bicaption}{\captionsetup[bi-second]{#2}}%
Modified: trunk/Master/texmf-dist/tex/latex/caption/caption.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/caption/caption.sty 2019-08-28 23:40:39 UTC (rev 51972)
+++ trunk/Master/texmf-dist/tex/latex/caption/caption.sty 2019-08-28 23:41:01 UTC (rev 51973)
@@ -6,7 +6,7 @@
%%
%% caption.dtx (with options: `package')
%%
-%% Copyright (C) 1994-2018 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
+%% Copyright (C) 1994-2019 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
%%
%% https://gitlab.com/axelsommerfeldt/caption
%%
@@ -37,7 +37,7 @@
%% caption-deu.tex, caption-eng.tex, and caption-rus.tex.
%%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption}[2018/10/06 v3.3-154 Customizing captions (AR)]
+\ProvidesPackage{caption}[2019/04/01 v3.3a Customizing captions (AR)]
\RequirePackage{caption3}[2018/09/12] % needs v1.8c or newer
\caption at ifbool{documentclass}{}{%
\caption at WarningNoLine{%
@@ -244,7 +244,7 @@
\expandafter\let\expandafter\caption at KOMA@setcapwidth
\csname\string\setcapwidth\endcsname
\@namedef{\string\setcapwidth}[#1]#2{%
- \caption at KOMA@setcapwidth[#1]{#2}\caption at setcapwidth{#1}}
+ \caption at KOMA@setcapwidth[{#1}]{#2}\caption at setcapwidth{#1}}
\newcommand*\caption at setcapwidth[1]{%
\ifx\\#1\\\else
\caption at ifundefined\cap at margin{}{%
@@ -261,11 +261,11 @@
\expandafter\let\expandafter\caption at KOMA@setcapmargin
\csname\string\@setcapmargin\endcsname
\@namedef{\string\@setcapmargin}[#1]#2{%
- \caption at KOMA@setcapmargin[#1]{#2}\caption at setcapmargin}
+ \caption at KOMA@setcapmargin[{#1}]{#2}\caption at setcapmargin}
\expandafter\let\expandafter\caption at KOMA@@setcapmargin
\csname\string\@@setcapmargin\endcsname
\@namedef{\string\@@setcapmargin}[#1]#2{%
- \caption at KOMA@@setcapmargin[#1]{#2}\caption at setcapmargin}
+ \caption at KOMA@@setcapmargin[{#1}]{#2}\caption at setcapmargin}
\newcommand*\caption at setcapmargin{%
\begingroup
\let\onelinecaptionsfalse\relax
@@ -342,13 +342,21 @@
\caption at ifhypcap\caption@@start\relax
\M at gettitle{#2}}
\long\def\caption at makecaption#1#2{%
- \caption at iftop
- {\vskip\belowcaptionskip}%
- {\caption at rule\vskip\abovecaptionskip}%
+ \caption at make@above
\caption@@make{#1}{#2}%
+ \caption at make@below}
+\newcommand*\caption at make@above{%
\caption at iftop
- {\vskip\abovecaptionskip\caption at rule}%
- {\vskip\belowcaptionskip}}
+ \caption at belowskip
+ {\caption at rule\caption at aboveskip}}
+\newcommand*\caption at make@below{%
+ \caption at iftop
+ {\caption at aboveskip\caption at rule}%
+ \caption at belowskip}
+\newcommand*\caption at aboveskip{%
+ \vskip\abovecaptionskip}
+\newcommand*\caption at belowskip{%
+ \vskip\belowcaptionskip}
\newcommand*\caption at redefine{}
\g at addto@macro\caption at redefine{%
\caption at setbool{incompatible}{0}%
@@ -718,7 +726,7 @@
}}%
\caption at CheckCommand\@caption{%
% chkfloat.sty [20??/??/?? v0.? chkfloat: check for moved floats]
- \def\@caption#1[#2]#3{\chkfloat at caption{#1}[#2]{#3}%
+ \def\@caption#1[#2]#3{\chkfloat at caption{#1}[{#2}]{#3}%
\chkfloat at addcontentsline{#1}{#2}%
}}%
\caption at IfCheckCommand{}{%
@@ -762,7 +770,7 @@
\let\caption at ORI@capstart\@undefined}%
\let\caption at ORI@xfloat\@xfloat
\def\@xfloat#1[#2]{%
- \caption at ORI@xfloat{#1}[#2]%
+ \caption at ORI@xfloat{#1}[{#2}]%
\caption at settype{#1}}%
}
\caption at AtBeginDocument{\caption at redefine}
@@ -1158,12 +1166,12 @@
\expandafter\let\expandafter\caption at ORI@figure
\csname\string\figure\endcsname
\@namedef{\string\figure}[#1]{%
- \caption at ORI@figure[#1]%
+ \caption at ORI@figure[{#1}]%
\caption at settype{figure}}
\expandafter\let\expandafter\caption at ORI@table
\csname\string\table\endcsname
\@namedef{\string\table}[#1]{%
- \caption at ORI@table[#1]%
+ \caption at ORI@table[{#1}]%
\caption at settype{table}}
}{}
\caption at ifundefined\scr at caption{}{%
@@ -1220,7 +1228,7 @@
\@ifpackageloaded{#1}\@firstofone{%
\caption at Debug{#1 package is not loaded (yet)\@gobble}%
\caption at AtBeginDocument}{%
- \caption at If@Package at Loaded{#1}[#2]{#3}{#4}}}
+ \caption at If@Package at Loaded{#1}[{#2}]{#3}{#4}}}
\@onlypreamble\caption@@IfPackageLoaded
\long\def\caption at If@Package at Loaded#1[#2]{%
\@ifpackageloaded{#1}{%
@@ -1604,14 +1612,16 @@
\caption at begin\LTcaptype
\caption at normalsize
\vskip-\ht\strutbox
- \caption at iftop{\vskip\belowcaptionskip}{\vskip\abovecaptionskip}%
+ \caption at ifundefined\FBifcaptop{}{%
+ \let\caption at belowskip\@empty}%
+ \caption at make@above
\caption@@make{#2}{#3}\endgraf
- \caption at iftop{\vskip\abovecaptionskip}{\vskip\belowcaptionskip}%
+ \caption at make@below
\caption at end}}%
\renewcommand*\LT at listentry[2]{%
\begingroup
\caption at LT@settype{#1}%
- \caption at listentry\@firstoftwo[#1]{#2}%
+ \caption at listentry\@firstoftwo[{#1}]{#2}%
\endgroup\ignorespaces}%
\newcommand*\caption at LT@settype[1]{%
\caption at settype*{#1}%
@@ -1690,7 +1700,7 @@
\caption at defrostHref
\let\noindent\caption at ORI@noindent
\noindent}%
- \caption at ORI@ivparpic(#1,#2)(#3,#4)[#5][#6]{#7}%
+ \caption at ORI@ivparpic(#1,#2)(#3,#4)[{#5}][{#6}]{#7}%
\let\noindent\caption at ORI@noindent}%
}{%
\let\piccaptiontype\@undefined
@@ -1714,7 +1724,7 @@
\caption at setbool{needfreeze}{1}%
\let\caption at ORI@SC at zfloat\SC at zfloat
\def\SC at zfloat#1#2#3[#4]{%
- \caption at ORI@SC at zfloat{#1}{#2}{#3}[#4]%
+ \caption at ORI@SC at zfloat{#1}{#2}{#3}[{#4}]%
\SC at RestoreCommands
\caption at freezetype{#2}%
\let\SC at label\label}%
@@ -1764,7 +1774,7 @@
\let\caption at ORI@xtablecaption\@xtablecaption
\long\def\@xtablecaption[#1]#2{%
\caption at gettitle{#2}%
- \caption at ORI@xtablecaption[#1]{#2}}%
+ \caption at ORI@xtablecaption[{#1}]{#2}}%
\long\def\ST at caption#1[#2]#3{\par%
\caption at settype*{#1}%
\caption at setoptions{supertabular}%
@@ -1784,7 +1794,7 @@
\let\caption at ORI@xtablecaption\@xtablecaption
\long\def\@xtablecaption[#1]#2{%
\caption at gettitle{#2}%
- \caption at ORI@xtablecaption[#1]{#2}}%
+ \caption at ORI@xtablecaption[{#1}]{#2}}%
\long\def\ST at caption#1[#2]#3{\par%
\caption at settype*{#1}%
\caption at setoptions{xtabular}%
Modified: trunk/Master/texmf-dist/tex/latex/caption/caption2.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/caption/caption2.sty 2019-08-28 23:40:39 UTC (rev 51972)
+++ trunk/Master/texmf-dist/tex/latex/caption/caption2.sty 2019-08-28 23:41:01 UTC (rev 51973)
@@ -37,7 +37,7 @@
%% caption-deu.tex, caption-eng.tex, and caption-rus.tex.
%%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption2}[2015/09/15 v2.2-100 Customising captions (AR)]
+\ProvidesPackage{caption2}[2015/09/15 v2.2d Customising captions (AR)]
\PackageWarning{caption2}{%
****************************************************\MessageBreak
THIS PACKAGE IS OBSOLETE:\MessageBreak
Modified: trunk/Master/texmf-dist/tex/latex/caption/ltcaption.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/caption/ltcaption.sty 2019-08-28 23:40:39 UTC (rev 51972)
+++ trunk/Master/texmf-dist/tex/latex/caption/ltcaption.sty 2019-08-28 23:41:01 UTC (rev 51973)
@@ -37,7 +37,7 @@
%% caption-deu.tex, caption-eng.tex, and caption-rus.tex.
%%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{ltcaption}[2018/08/26 v1.4-95 longtable captions (AR)]
+\ProvidesPackage{ltcaption}[2018/08/26 v1.4a longtable captions (AR)]
\@ifpackageloaded{longtable}{}{%
\PackageError{ltcaption}{longtable package not loaded, aborting}{RTFM}}
\providecommand*\LTcaptype{table}
Modified: trunk/Master/texmf-dist/tex/latex/caption/newfloat.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/caption/newfloat.sty 2019-08-28 23:40:39 UTC (rev 51972)
+++ trunk/Master/texmf-dist/tex/latex/caption/newfloat.sty 2019-08-28 23:41:01 UTC (rev 51973)
@@ -6,7 +6,7 @@
%%
%% newfloat.dtx (with options: `package')
%%
-%% Copyright (C) 1994-2018 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
+%% Copyright (C) 1994-2019 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
%%
%% https://gitlab.com/axelsommerfeldt/caption
%%
@@ -37,7 +37,7 @@
%% caption-deu.tex, caption-eng.tex, and caption-rus.tex.
%%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{newfloat}[2018/03/04 v1.1a Defining new floating environments (AR)]
+\ProvidesPackage{newfloat}[2019/08/28 v1.1g Defining new floating environments (AR)]
\newcommand*\newfloat at Info[1]{%
\PackageInfo{newfloat}{#1}}
\newcommand*\newfloat at InfoNoLine[1]{%
@@ -78,7 +78,8 @@
\addtocounter{float at type}{\value{float at type}}}%
\newfloat at Info{float type `#2'=\@nameuse{ftype@#2}}%
\newfloat at def{fnum@#2}%
- {\@nameuse{#2name}\nobreakspace\@nameuse{the#2}\@nameuse{autodot}}%
+ {\@nameuse{#2name}\nobreakspace\@nameuse{the#2}%
+ \ifdefined\autodot\expandafter\autodot\fi}%
\newfloat at capitalize\newfloat at Type{#2}%
\newfloat at let{#2name}{\newfloat at Type}%
\newfloat at def{fleg#2}{\@nameuse{#2name}}% legend naming (memoir)
@@ -85,10 +86,10 @@
\newfloat at ifundefined{flegtoc#2}{\@namedef{flegtoc#2}##1{}}%
\ifcsname @tufte at float\endcsname
\newenvironment{#2}[1][htbp]%
- {\begin{@tufte at float}[##1]{#2}{}}%
+ {\begin{@tufte at float}[{##1}]{#2}{}}%
{\end{@tufte at float}}%
\newenvironment{#2*}[1][htbp]%
- {\begin{@tufte at float}[##1]{#2}{star}}%
+ {\begin{@tufte at float}[{##1}]{#2}{star}}%
{\end{@tufte at float}}%
\else
\newenvironment{#2}{\@float{#2}}{\end at float}%
@@ -126,8 +127,12 @@
\noexpand\g at addto@macro\noexpand#1{\@cdr#2\@nil}}%
\newfloat at tempa}
\newcommand*\newfloat at listof[1]{%
- \@expandtwoargs\newfloat at list@of{#1}{\@nameuse{ext@#1}}}
-\newcommand*\newfloat at list@of[2]{%
+ \@ifstar
+ {\newfloat at list@of{#1}*}%
+ {\newfloat at list@of{#1}\relax}}
+\newcommand*\newfloat at list@of[1]{%
+ \@expandtwoargs\newfloat at list@of@{#1}{\@nameuse{ext@#1}}}
+\newcommand*\newfloat at list@of@[3]{%
\begingroup
\expandafter\let\expandafter\listfigurename\csname list#1name\endcsname
\def\ext at figure{#2}%
@@ -136,7 +141,7 @@
\let\newfloat at listoftoc\listoftoc
\def\listoftoc##1{\newfloat at listoftoc{#2}}%
\@nameuse{newfloat at listof#1 at hook}%
- \listoffigures
+ \listoffigures#3%
\endgroup}
\newcommand*\newfloat at setoptions{%
\@ifstar
@@ -397,24 +402,27 @@
\@expandtwoargs\setkeys{newfloat}{planb,\@ptionlist{\@currname.\@currext}}%
\AtEndOfPackage{\let\@unprocessedoptions\relax}
\newcommand*\newfloatsetup{\setkeys{newfloat}}
-\newcommand\newfloat at replace@chapter[2]{%
+\newcommand\newfloat at replace@chapter[3]{%
\begingroup
\let\if at twocolumn\iffalse
\let\if at mainmatter\iffalse
\let\if at thema\iffalse
- \def\@tempa[##1]##2{#1}%
+ \def\@tempa[##1]##2{#2}%
\ifx\@tempa\@chapter
- \gdef\@chapter[##1]##2{#2}%
- \global\let\newfloat at replace@chapter\@gobbletwo
+ \newfloat at InfoNoLine{Document class `#1' detected}%
+ \gdef\@chapter[##1]##2{#3}%
+ \global\let\newfloat at replace@chapter\newfloat at dont@replace at chapter
\else\ifx\@tempa\Hy at org@chapter
- \gdef\Hy at org@chapter[##1]##2{#2}%
- \global\let\newfloat at replace@chapter\@gobbletwo
+ \newfloat at InfoNoLine{Document class `#1' detected (Hy)}%
+ \gdef\Hy at org@chapter[##1]##2{#3}%
+ \global\let\newfloat at replace@chapter\newfloat at dont@replace at chapter
\fi\fi
\endgroup}
+\newcommand\newfloat at dont@replace at chapter[3]{}
\ifcsname @chapter\endcsname \else
- \let\newfloat at replace@chapter\@gobbletwo
+ \let\newfloat at replace@chapter\newfloat at dont@replace at chapter
\fi
-\newfloat at replace@chapter{%
+\newfloat at replace@chapter{report}{%
\ifnum \c at secnumdepth >\m at ne
\refstepcounter{chapter}%
\typeout{\@chapapp\space\thechapter.}%
@@ -449,7 +457,7 @@
\@makechapterhead{#2}%
\@afterheading
\fi}
-\newfloat at replace@chapter{%
+\newfloat at replace@chapter{book}{%
\ifnum \c at secnumdepth >\m at ne
\if at mainmatter
\refstepcounter{chapter}%
@@ -492,7 +500,7 @@
\@makechapterhead{#2}%
\@afterheading
\fi}
-\newfloat at replace@chapter{%
+\newfloat at replace@chapter{amsbook}{%
\refstepcounter{chapter}%
\ifnum\c at secnumdepth<\z@ \let\@secnumber\@empty
\else \let\@secnumber\thechapter \fi
@@ -516,12 +524,12 @@
\@addchapterlistsgaps
\@makechapterhead{#2}\@afterheading}
\@ifpackageloaded{tocbasic}{%
- \let\newfloat at replace@chapter\@gobbletwo}{}
+ \let\newfloat at replace@chapter\newfloat at dont@replace at chapter}{}
\ifcsname insertchapterspace\endcsname
\renewcommand*\insertchapterspace{\@addchapterlistsgaps}
- \let\newfloat at replace@chapter\@gobbletwo
+ \let\newfloat at replace@chapter\newfloat at dont@replace at chapter
\fi
-\newfloat at replace@chapter{%
+\newfloat at replace@chapter{rapport}{%
\ifnum \c at secnumdepth >\m at ne
\refstepcounter{chapter}%
\typeout{\@chapapp\space\thechapter.}%
@@ -557,7 +565,7 @@
\@afterheading
\fi}
% boek(3).cls [2004/06/07 v2.1a NTG LaTeX document class]
-\newfloat at replace@chapter{%
+\newfloat at replace@chapter{boek}{%
\ifnum \c at secnumdepth >\m at ne
\if at mainmatter
\refstepcounter{chapter}%
@@ -600,7 +608,7 @@
\@makechapterhead{#2}%
\@afterheading
\fi}
-\newfloat at replace@chapter{%
+\newfloat at replace@chapter{thesis}{%
\ifnum \c at secnumdepth >\m at ne
\if at mainmatter
\refstepcounter{chapter}%
@@ -665,13 +673,55 @@
\@makechapterhead{#2}%
\@afterheading
\fi}
-\ifx\newfloat at replace@chapter\@gobbletwo \else
+\newfloat at replace@chapter{svmono}{%
+ \if at chapnum % war mal \ifnum \c at secnumdepth >\m at ne
+ \refstepcounter{chapter}%
+ \if at mainmatter
+ \typeout{\@chapapp\space\thechapter.}%
+ \addcontentsline{toc}{chapter}{\protect
+ \numberline{\thechapter\thechapterend}#1}%
+ \else
+ \addcontentsline{toc}{chapter}{#1}%
+ \fi
+ \else
+ \addcontentsline{toc}{chapter}{#1}%
+ \fi
+ \chaptermark{#1}%
+ \addtocontents{lof}{\protect\addvspace{10\p@}}%
+ \addtocontents{lot}{\protect\addvspace{10\p@}}%
+ \if at twocolumn
+ \@topnewpage[\@makechapterhead{#2}]%
+ \else
+ \@makechapterhead{#2}%
+ \@afterheading
+ \fi}{%
+ \if at chapnum % war mal \ifnum \c at secnumdepth >\m at ne
+ \refstepcounter{chapter}%
+ \if at mainmatter
+ \typeout{\@chapapp\space\thechapter.}%
+ \addcontentsline{toc}{chapter}{\protect
+ \numberline{\thechapter\thechapterend}#1}%
+ \else
+ \addcontentsline{toc}{chapter}{#1}%
+ \fi
+ \else
+ \addcontentsline{toc}{chapter}{#1}%
+ \fi
+ \chaptermark{#1}%
+ \@addchapterlistsgaps
+ \if at twocolumn
+ \@topnewpage[\@makechapterhead{#2}]%
+ \else
+ \@makechapterhead{#2}%
+ \@afterheading
+ \fi}
+\ifx\newfloat at replace@chapter\newfloat at dont@replace at chapter \else
\newfloat at InfoNoLine{%
- Unsupported document class, or \noexpand\@chapter\MessageBreak
- was already redefined by another package}
+ Unsupported document class, or \noexpand\@chapter\MessageBreak
+ was already redefined by another package}
\newfloat at InfoNoLine{\string\@chapter\space=\space\meaning\@chapter}
\newfloat at InfoNoLine{\string\Hy at org@chapter\space=\space\meaning\Hy at org@chapter}
- \newfloat at ifplanb{%
+ \newfloat at ifplanb{\AtBeginDocument{%
\newfloat at InfoNoLine{Trying Plan B..}%
\let\newfloat at addtocontents@ORI\addtocontents
\long\def\addtocontents#1#2{%
@@ -692,41 +742,46 @@
\@addchapterlistsgaps
\endgroup
\fi
- \fi}}
+ \fi}}}
\fi
-\newcommand\newfloat at ForEachNew[2][newfloat@@list]{%
- \AtBeginDocument{%
- \ifcsname#1\endcsname
- \def\@elt##1{#2}%
- \newfloat@@list
- \let\@elt\relax
- \fi}}%
+\newcommand\newfloat at ForEachNew[2]{%
+ \ifcsname#1\endcsname
+ \ForEachFloatingEnvironment{#2}%
+ \else
+ \AtBeginDocument{%
+ \ifcsname#1\endcsname
+ \ForEachFloatingEnvironment{#2}%
+ \fi}%
+ \fi}%
\@onlypreamble\newfloat at ForEachNew
%% \begin{macrocode}
-\newfloat at ForEachNew[float at exts]{%
+\newfloat at ForEachNew{float at exts}{%
\@nameuse{@ifchapterlistsgap@#1}{% if switched on
\let\float at do=\relax
\edef\@tempa{%
\noexpand\float at exts{\the\float at exts\float at do{\@nameuse{ext@#1}}}}%
\@tempa}}
-\newfloat at ForEachNew[FP at floatBegin]{%
+\newfloat at ForEachNew{FP at floatBegin}{%
\newcounter{FP@#1C}%
\newenvironment{FP#1}{\FP at floatBegin{#1}}{\FP at floatEnd}}
\providecommand*\ext at lstlisting{lol}%
-\newfloat at ForEachNew[@rotfloat]{%
+\newfloat at ForEachNew{@rotfloat}{%
\newenvironment{sideways#1}{\@rotfloat{#1}}{\end at rotfloat}%
\newenvironment{sideways#1*}{\@rotdblfloat{#1}}{\end at rotdblfloat}}
\newcommand*\newfloat at For@SC[2]{%
\def#1{b}% = \sidecaptionvpos{#2}{b} (v1.6)
\newenvironment{SC#2}%
- {\SC at float[#1]{#2}}{\endSC at float}%
+ {\SC at float[{#1}]{#2}}{\endSC at float}%
\newenvironment{SC#2*}%
- {\SC at dblfloat[#1]{#2}}{\endSC at dblfloat}}
+ {\SC at dblfloat[{#1}]{#2}}{\endSC at dblfloat}}
\@onlypreamble\newfloat at For@SC
-\newfloat at ForEachNew[SC at float]{%
+\newfloat at ForEachNew{SC at float}{%
\expandafter\newfloat at For@SC\csname SC@#1 at vpos\endcsname{#1}}
-\newfloat at ForEachNew[wrapfloat]{%
+\newfloat at ForEachNew{wrapfloat}{%
\newenvironment{wrap#1}{\wrapfloat{#1}}{\endwrapfloat}}
+\newfloat at ForEachNew{plist at figure}{%
+ \expandafter\newcommand\csname plist@#1\endcsname{%
+ \@nameuse{#1name}\space}}
\endinput
%%
%% End of file `newfloat.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/caption/subcaption.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/caption/subcaption.sty 2019-08-28 23:40:39 UTC (rev 51972)
+++ trunk/Master/texmf-dist/tex/latex/caption/subcaption.sty 2019-08-28 23:41:01 UTC (rev 51973)
@@ -37,9 +37,14 @@
%% caption-deu.tex, caption-eng.tex, and caption-rus.tex.
%%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{subcaption}[2018/05/01 v1.1-162 Sub-captions (AR)]
-\RequirePackage{caption}[2018/05/01] % needs v3.3-147 or newer
+\ProvidesPackage{subcaption}[2018/05/13 v1.2 Sub-captions (AR)]
+\RequirePackage{caption}[2018/05/11] % needs v3.4 or newer
\newcommand\subcaption at CheckCompatibility{%
+ \@ifundefined{caption at ifcompatibility}{}{%
+ \caption at ifcompatibility{%
+ \caption at Error{%
+ The `subcaption' package does not work correctly\MessageBreak
+ in compatibility mode}}{}}%
\@ifpackageloaded{subfigure}{%
\PackageError{subcaption}%
{This package can't be used in cooperation\MessageBreak
@@ -59,10 +64,6 @@
section about errors.\MessageBreak\@ehc}
\subcaption at CheckCompatibility
\caption at AtBeginDocument{%
- \caption at ifcompatibility{%
- \caption at Error{%
- The `subcaption' package does not work correctly\MessageBreak
- in compatibility mode}}{}%
\subcaption at CheckCompatibility
\let\subcaption at CheckCompatibility\@undefined
\let\subcaption at EH\@undefined
@@ -69,7 +70,7 @@
}
\caption at SetupOptions{subcaption}{\captionsetup[sub]{#2}}%
\caption at ExecuteOptions{subcaption}{%
- font+=smaller,labelformat=parens,labelsep=space,skip=6pt,list=0,hypcap=0}
+ size=smaller,labelformat=parens,labelsep=space,skip=6pt,list=0,hypcap=0}
\caption at ProcessOptions*{subcaption}
\caption at ForEachType{\DeclareCaptionSubType{#1}}
\caption at ifundefined\newsubfloat{}{%
@@ -89,10 +90,24 @@
\let\phantomsubcaption\phantomcaption}
\caption at For{subtypelist}{%
\newenvironment{sub#1}%
- {\caption at withoptargs\subcaption at minipage}%
- {\endminipage}}%
-\newcommand*\subcaption at minipage[2]{%
- \minipage#1{#2}%
+ {\@ifnextchar[%]
+ \subcaption at iminipage
+ {\subcaption at iminipage[c]}}%
+ {\subcaption at endminipage
+ \endminipage}}%
+\def\subcaption at iminipage[#1]{%
+ \caption at withoptargs{\subcaption at iiminipage{#1}}}
+\newcommand*\subcaption at iiminipage[3]{%
+ \let\subcaption at endminipage\@empty
+ \if#1B%
+ \minipage[b]#2{#3}%
+ \def\subcaption at endminipage{\vspace{0pt}}%
+ \else\if#1T%
+ \minipage[t]#2{#3}%
+ \vspace{0pt}%
+ \else
+ \minipage[#1]#2{#3}%
+ \fi\fi
\setcaptionsubtype\relax}
\newcommand*\subcaptionbox{%
\caption at withoptargs{\caption at ibox\setcaptionsubtype}}
@@ -117,7 +132,7 @@
\newcommand*\@subref[2]{%
\caption at ifundefined\hyperref
{\subcaption at ref{#1}{#2}}%
- {\hyperref[#2]{\subcaption at ref{*#1}{#2}}}}
+ {\hyperref[{#2}]{\subcaption at ref{*#1}{#2}}}}
\newcommand*\subcaption at ref[2]{%
\begingroup
\caption at setoptions{sub}%
More information about the tex-live-commits
mailing list