summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-11-24 21:23:07 +0000
committerKarl Berry <karl@freefriends.org>2019-11-24 21:23:07 +0000
commit86d1fcf155b86d95f64cb13634a6ecb6b3cabed2 (patch)
tree546bd4260076765583d55b8f90067ef94153d89f /Master/texmf-dist/tex
parent38b88fb70bbb7d0d278d6bc2bbee04a191bd7a61 (diff)
caption (24nov19)
git-svn-id: svn://tug.org/texlive/trunk@52905 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/caption/caption.sty619
-rw-r--r--Master/texmf-dist/tex/latex/caption/caption3.sty423
-rw-r--r--Master/texmf-dist/tex/latex/caption/newfloat.sty891
3 files changed, 235 insertions, 1698 deletions
diff --git a/Master/texmf-dist/tex/latex/caption/caption.sty b/Master/texmf-dist/tex/latex/caption/caption.sty
index fe21decf4e4..f38cc6a59bc 100644
--- a/Master/texmf-dist/tex/latex/caption/caption.sty
+++ b/Master/texmf-dist/tex/latex/caption/caption.sty
@@ -25,26 +25,21 @@
%% This Current Maintainer of this work is Axel Sommerfeldt.
%%
%% This work consists of the files
-%% CHANGELOG, README, SUMMARY, caption.ins,
-%% caption.dtx, caption2.dtx, caption3.dtx,
-%% bicaption.dtx, ltcaption.dtx, subcaption.dtx,
-%% newfloat.dtx, and totalcount.dtx
+%% caption.ins, caption.dtx, caption2.dtx, caption3.dtx,
+%% bicaption.dtx, ltcaption.dtx, subcaption.dtx, totalcount.dtx,
%% the derived files
%% caption.sty, caption2.sty, caption3.sty,
-%% bicaption.sty, ltcaption.sty, subcaption.sty,
-%% newfloat.sty, and totalcount.sty
+%% bicaption.sty, ltcaption.sty, subcaption.sty, totalcount.sty,
%% and the user manuals
-%% caption-deu.tex, caption-eng.tex, and caption-rus.tex.
+%% caption-deu.tex, caption-eng.tex, caption-rus.tex.
%%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption}[2019/09/01 v3.3d Customizing captions (AR)]
-\RequirePackage{caption3}[2019/09/01] % needs v1.8d or newer
+\ProvidesPackage{caption}[2019/10/18 v3.4a Customizing captions (AR)]
+\RequirePackage{caption3}[2019/09/09] % needs v1.8e or newer
\caption@ifbool{documentclass}{}{%
\caption@WarningNoLine{%
- Unsupported document class (or package) detected,\MessageBreak
- usage of the caption package is not recommended}%
- \caption@InfoNoLine{\string\@makecaption\space=\space\meaning\@makecaption}%
-}
+ Unknown document class (or package),\MessageBreak
+ standard defaults will be used}}
\@ifpackageloaded{caption2}{%
\caption@Error{%
You can't use both, the (obsolete) caption2 *and*\MessageBreak
@@ -132,8 +127,26 @@
{\let\caption@if@minipage\@gobbletwo}%
{\caption@set@bool\caption@if@minipage{#1}}}
\captionsetup{@minipage=default}
-\DeclareCaptionOption{compatibility}[1]{\caption@setbool{compatibility}{#1}}
+\DeclareCaptionOption{compatibility}[v1]{%
+ \caption@ifinlist{#1}{v1,1,true,yes,on}{%
+ \let\caption@ifcompatibility\@firstoftwo
+ }{\caption@ifinlist{#1}{v3,3,0,false,no,off}{%
+ \let\caption@ifcompatibility\@secondoftwo
+ }{%
+ \caption@Error{Undefined compatibility value `#1'}%
+ }}}
\@onlypreamble@key{caption}{compatibility}
+\caption@setbool{compatibility}{0} % default: Try not to be compatible to v1.x
+\newcommand*\caption@setincompatible[2]{%
+ #1{%
+ \caption@WarningNoLine{%
+ #2;\MessageBreak
+ Setting compatibility to v1}%
+ \caption@setbool{compatibility}{1}%
+ }{}}
+\caption@AtBeginDocument{\caption@ifcompatibility{}{%
+ \caption@setincompatible{\@ifpackageloaded{captcont}}{captcont package is loaded}%
+}}
\DeclareCaptionOptionNoValue*{normal}{%
\caption@setformat{plain}%
\caption@setjustification{justified}}
@@ -195,11 +208,11 @@
\DeclareCaptionOption{hypcap}[1]{\caption@setbool{hypcap}{#1}}
\DeclareCaptionOption{hypcapspace}{\def\caption@hypcapspace{#1}}
\captionsetup{hypcap=1,hypcapspace=.5\baselineskip}
-\caption@ifamsclass{%
+\caption@ifclassloaded{ams}{%
\caption@InfoNoLine{AMS or SMF document class}%
\setlength\belowcaptionskip{0pt}% set to 12pt by AMS class
-}
-\caption@ifkomaclass{%
+}{}
+\caption@ifclassloaded{koma}{%
\caption@InfoNoLine{KOMA-Script document class}%
\g@addto@macro\@tablecaptionabovetrue{\captionsetup*[table]{position=t}}
\g@addto@macro\@tablecaptionabovefalse{\captionsetup*[table]{position=b}}
@@ -208,7 +221,7 @@
\else
\@tablecaptionabovefalse
\fi
- \caption@ifundefined\@figurecaptionabovetrue{}{%
+ \caption@ifdefined\@figurecaptionabovetrue{%
\g@addto@macro\@figurecaptionabovetrue{\captionsetup*[figure]{position=t}}
\g@addto@macro\@figurecaptionabovefalse{\captionsetup*[figure]{position=b}}
\if@figurecaptionabove
@@ -216,7 +229,7 @@
\else
\@figurecaptionabovefalse
\fi
- }%
+ }{}%
\g@addto@macro\onelinecaptionstrue{\let\caption@ifslc\@firstoftwo}
\g@addto@macro\onelinecaptionsfalse{\let\caption@ifslc\@secondoftwo}
\ifonelinecaptions
@@ -228,10 +241,12 @@
\g@addto@macro\@captionabovefalse{\let\caption@position\@secondoftwo}
\DeclareCaptionOption{figureposition}{%
\caption@WarningNoLine{Option `figureposition=#1' has no effect\MessageBreak
- when used with a KOMA script document class}}
+ when used with a KOMA script document class}%
+ \captionsetup*[figure]{position=#1}}
\DeclareCaptionOption{tableposition}{%
\caption@WarningNoLine{Option `tableposition=#1' has no effect\MessageBreak
- when used with a KOMA script document class}}
+ when used with a KOMA script document class}%
+ \captionsetup*[table]{position=#1}}
\let\caption@KOMA@setcapindent\@setcapindent
\renewcommand*\@setcapindent[1]{%
\caption@KOMA@setcapindent{#1}\caption@setcapindent}
@@ -240,18 +255,18 @@
\caption@KOMA@@setcapindent{#1}\caption@setcapindent}
\newcommand*\caption@setcapindent{%
\captionsetup{indent=\ifdim\cap@indent<\z@\z@\else\cap@indent\fi}}
- \caption@ifundefined\cap@indent{}{\caption@setcapindent}
+ \caption@ifdefined\cap@indent{\caption@setcapindent}{}
\expandafter\let\expandafter\caption@KOMA@setcapwidth
\csname\string\setcapwidth\endcsname
\@namedef{\string\setcapwidth}[#1]#2{%
\caption@KOMA@setcapwidth[{#1}]{#2}\caption@setcapwidth{#1}}
\newcommand*\caption@setcapwidth[1]{%
\ifx\\#1\\\else
- \caption@ifundefined\cap@margin{}{%
+ \caption@ifdefined\cap@margin{%
\def\@tempa{captionbeside}%
\ifx\@tempa\@currenvir\else\caption@Warning{%
Ignoring optional argument [#1] of \string\setcapwidth\MessageBreak}%
- \fi}%
+ \fi}{}%
\fi
\captionsetup{width=\cap@width}}
\def\caption@tempa{\hsize}%
@@ -284,7 +299,7 @@
\ifx\cap@margin\relax \else
\caption@setcapmargin
\fi
-}
+}{}
\caption@SetupOptions{caption}{\caption@setkeys{#1}{#2}}
\caption@ProcessOptions*{caption}
\newcounter{caption@flags}
@@ -359,413 +374,26 @@
\vskip\belowcaptionskip}
\newcommand*\caption@redefine{}
\g@addto@macro\caption@redefine{%
- \caption@setbool{incompatible}{0}%
- \caption@CheckCommand\caption{%
- % ltfloat.dtx [2002/10/01 v1.1v LaTeX Kernel (Floats)]
- \def\caption{%
- \ifx\@captype\@undefined
- \@latex@error{\noexpand\caption outside float}\@ehd
- \expandafter\@gobble
- \else
- \refstepcounter\@captype
- \expandafter\@firstofone
- \fi
- {\@dblarg{\@caption\@captype}}%
- }}%
- \caption@CheckCommand\caption{%
- % beamerbaselocalstructure.sty,v 1.53 2007/01/28 20:48:21 tantau
- \def\caption{
- \ifx\@captype\@undefined
- \@latex@error{\noexpand\caption outside figure or table}\@ehd
- \expandafter\@gobble
- \else
- \refstepcounter\@captype
- \expandafter\@firstofone
- \fi
- {\@dblarg{\@caption\@captype}}%
- }}%
- \caption@CheckCommand\caption{%
- % beamerbaselocalstructure.sty, Joseph Wright committed 4ac715c 2013-09-04
- \def\caption{%
- \ifx\@captype\@undefined
- \@latex@error{\noexpand\caption outside figure or table}\@ehd
- \expandafter\@gobble
- \else
- \refstepcounter\@captype
- \expandafter\@firstofone
- \fi
- {\@dblarg{\@caption\@captype}}%
- }}%
- \caption@CheckCommand\caption{%
- % float.sty [2001/11/08 v1.3d Float enhancements (AL)]
- \long\def\caption{%
- \ifx\@captype\@undefined
- \@latex@error{\noexpand\caption outside float}\@ehd
- \expandafter\@gobble
- \else
- \refstepcounter\@captype
- \let\@tempf\@caption
- \expandafter\ifx\csname @float@c@\@captype\endcsname\relax\else
- \expandafter\expandafter\let
- \expandafter\@tempf\csname @float@c@\@captype\endcsname
- \fi
- \fi
- \@dblarg{\@tempf\@captype}}}%
- \caption@CheckCommand\caption{%
- % hyperref.sty [2007/02/27 v6.75t Hypertext links for LaTeX]
- % hyperref.sty [2007/04/09 v6.76a Hypertext links for LaTeX]
- % hyperref.sty [2007/06/12 v6.76h Hypertext links for LaTeX]
- \def\caption{%
- \ifx\@captype\@undefined
- \@latex@error{\noexpand\caption outside float}\@ehd
- \expandafter\@gobble
- \else
- \H@refstepcounter\@captype
- \@ifundefined{fst@\@captype}{%
- \let\Hy@tempa\@caption
- }{%
- \let\Hy@tempa\Hy@float@caption
- }%
- \expandafter\@firstofone
- \fi
- {\@dblarg{\Hy@tempa\@captype}}%
- }}%
- \caption@CheckCommand\caption{%
- % hyperref.sty [2007/08/05 v6.76j Hypertext links for LaTeX]
- \def\caption{%
- \ifx\@captype\@undefined
- \@latex@error{\noexpand\caption outside float}\@ehd
- \expandafter\@gobble
- \else
- \H@refstepcounter\@captype
- \let\Hy@tempa\@caption
- \@ifundefined{float@caption}{%
- }{%
- \expandafter\ifx\csname @float@c@\@captype\endcsname\float@caption
- \let\Hy@tempa\Hy@float@caption
- \fi
- }%
- \expandafter\@firstofone
- \fi
- {\@dblarg{\Hy@tempa\@captype}}%
- }}%
- \caption@CheckCommand\caption{%
- % memhfixc.sty [2010/08/17 v1.15 nameref/hyperref package fixes for memoir class]
- % \let\m@moldhypcaption\caption
- \long\def\caption{\donemaincaptiontrue\m@moldhypcaption}}%
- \caption@IfCheckCommand{}{%
- \caption@InfoNoLine{%
- Incompatible package detected (regarding \string\caption).\MessageBreak
- \string\caption\space=\space\meaning\caption}%
- \caption@setbool{incompatible}{1}}%
- \caption@CheckCommand\@caption{%
- % ltfloat.dtx [2002/10/01 v1.1v LaTeX Kernel (Floats)]
- \long\def\@caption#1[#2]#3{%
- \par
- \addcontentsline{\csname ext@#1\endcsname}{#1}%
- {\protect\numberline{\csname the#1\endcsname}{\ignorespaces #2}}%
- \begingroup
- \@parboxrestore
- \if@minipage
- \@setminipage
- \fi
- \normalsize
- \@makecaption{\csname fnum@#1\endcsname}{\ignorespaces #3}\par
- \endgroup}}%
- \caption@CheckCommand\@caption{%
- % beamerbaselocalstructure.sty,v 1.53 2007/01/28 20:48:21 tantau
- \long\def\@caption#1[#2]#3{% second argument ignored
- \par\nobreak
- \begingroup
- \@parboxrestore
- \if@minipage
- \@setminipage
- \fi
- \beamer@makecaption{#1}{\ignorespaces #3}\par\nobreak
- \endgroup}}%
- \caption@CheckCommand\@caption{%
- % memhfixc.sty [2010/08/17 v1.15 nameref/hyperref package fixes for memoir class]
- \long\def\@caption#1[#2]#3{%
- \MNR@old@caption{#1}[{#2}]{#3}%
- \def\@currentlabelname{#2}%
- \M@gettitle{#2}%
- }}%
- \caption@CheckCommand\@caption{%
- % arabicore.sty [2006/01/01 v1.0 Arabi Core switching commands (may still change)]
- \long\def\@caption#1[#2]#3{%
- \par
- \addtocontents{\csname ext@#1\endcsname}{\xstring\select@language{\main@Arabi@language}}%
- \addcontentsline{\csname ext@#1\endcsname}{#1}%
- {\protect\numberline{\csname the#1\endcsname}{\ignorespaces \if@rl{\textRL{#2}}\else\textLR{#2}\fi}}%
- \begingroup
- \@parboxrestore
- \if@minipage
- \@setminipage
- \fi
- \normalsize
- \@makecaption{\csname fnum@#1\endcsname}{\ignorespaces \if@rl{\textRL{#3}}\else\textLR{#3}\fi}\par
- \endgroup}}%
- \caption@CheckCommand\@caption{%
- % rlbabel.def [2005/03/30 v2.3h Right-to-Left support from the babel system Hebrew language support from the babel system]
- \long\def\@caption#1[#2]#3{%
- \par
- \addcontentsline{\csname ext@#1\endcsname}{#1}%
- {\protect\numberline{\csname the#1\endcsname}%
- {\ignorespaces #2}}%
- \def\@fignm{figure}
- \ifx#1\@fignm\addcontentsline{fol}{#1}%
- {\protect\numberline{\csname the#1\endcsname}%
- {\ignorespaces #2}}\fi%
- \def\@tblnm{table}
- \ifx#1\@tblnm\addcontentsline{tol}{#1}%
- {\protect\numberline{\csname the#1\endcsname}%
- {\ignorespaces #2}}\fi%
- \begingroup
- \@parboxrestore
- \if@minipage
- \@setminipage
- \fi
- \normalsize
- \@makecaption{\csname fnum@#1\endcsname}{\ignorespaces #3}\par
- \endgroup}}%
- \caption@CheckCommand\@caption{%
- % magyar.ldf [2005/03/30 v1.4j Magyar support from the babel system]
- \long\def\@caption#1[#2]#3{%
- \csname par\endcsname
- \addcontentsline{\csname ext@#1\endcsname}{#1}%
- {\protect\numberline{\csname the#1\endcsname.}{\ignorespaces #2}}%
- \begingroup
- \@parboxrestore
- \if@minipage
- \@setminipage
- \fi
- \normalsize
- \@makecaption{\csname fnum@#1\endcsname}%
- {\ignorespaces #3}\csname par\endcsname
- \endgroup}}%
- \caption@CheckCommand\@caption{%
- % hyperref.sty [2007/02/27 v6.75t Hypertext links for LaTeX]
- \long\def\@caption#1[#2]#3{%
- \hyper@makecurrent{\@captype}%
- \def\@currentlabelname{#2}%
- \par\addcontentsline{\csname ext@#1\endcsname}{#1}{%
- \protect\numberline{\csname the#1\endcsname}{\ignorespaces #2}%
- }%
- \begingroup
- \@parboxrestore
- \if@minipage
- \@setminipage
- \fi
- \normalsize
- \@makecaption{\csname fnum@#1\endcsname}{%
- \ignorespaces
- \ifHy@nesting
- \hyper@@anchor{\@currentHref}{#3}%
- \else
- \Hy@raisedlink{\hyper@@anchor{\@currentHref}{\relax}}#3%
- \fi
- }%
- \par
- \endgroup
- }}%
- \caption@CheckCommand\@caption{%
- % hyperref.sty [2007/04/09 v6.76a Hypertext links for LaTeX]
- % hyperref.sty [2007/06/12 v6.76h Hypertext links for LaTeX]
- % hyperref.sty [2007/08/05 v6.76j Hypertext links for LaTeX]
- \long\def\@caption#1[#2]#3{%
- \expandafter\ifx\csname if@capstart\expandafter\endcsname
- \csname iftrue\endcsname
- \global\let\@currentHref\hc@currentHref
- \else
- \hyper@makecurrent{\@captype}%
- \fi
- \def\@currentlabelname{#2}%
- \par\addcontentsline{\csname ext@#1\endcsname}{#1}{%
- \protect\numberline{\csname the#1\endcsname}{\ignorespaces #2}%
- }%
- \begingroup
- \@parboxrestore
- \if@minipage
- \@setminipage
- \fi
- \normalsize
- \expandafter\ifx\csname if@capstart\expandafter\endcsname
- \csname iftrue\endcsname
- \global\@capstartfalse
- \@makecaption{\csname fnum@#1\endcsname}{\ignorespaces#3}%
- \else
- \@makecaption{\csname fnum@#1\endcsname}{%
- \ignorespaces
- \ifHy@nesting
- \hyper@@anchor{\@currentHref}{#3}%
- \else
- \Hy@raisedlink{\hyper@@anchor{\@currentHref}{\relax}}#3%
- \fi
- }%
- \fi
- \par
- \endgroup
- }}%
- \caption@CheckCommand\@caption{%
- % hyperref.sty [2009/11/27 v6.79k Hypertext links for LaTeX]
- \long\def\@caption#1[#2]#3{%
- \expandafter\ifx\csname if@capstart\expandafter\endcsname
- \csname iftrue\endcsname
- \global\let\@currentHref\hc@currentHref
- \else
- \hyper@makecurrent{\@captype}%
- \fi
- \def\@currentlabelname{#2}%
- \par\addcontentsline{\csname ext@#1\endcsname}{#1}{%
- \protect\numberline{\csname the#1\endcsname}{\ignorespaces #2}%
- }%
- \begingroup
- \@parboxrestore
- \if@minipage
- \@setminipage
- \fi
- \normalsize
- \expandafter\ifx\csname if@capstart\expandafter\endcsname
- \csname iftrue\endcsname
- \global\@capstartfalse
- \@makecaption{\csname fnum@#1\endcsname}{\ignorespaces#3}%
- \else
- \@makecaption{\csname fnum@#1\endcsname}{%
- \ignorespaces
- \ifHy@nesting
- \expandafter\hyper@@anchor\expandafter{\@currentHref}{#3}%
- \else
- \Hy@raisedlink{%
- \expandafter\hyper@@anchor\expandafter{\@currentHref}{\relax}%
- }%
- #3%
- \fi
- }%
- \fi
- \par
- \endgroup
- }}%
- \caption@CheckCommand\@caption{%
- % hyperref.sty [2009/12/09 v6.79m Hypertext links for LaTeX]
- % hyperref.sty [2009/12/28 v6.79z Hypertext links for LaTeX]
- \long\def\@caption#1[#2]#3{%
- \expandafter\ifx\csname if@capstart\expandafter\endcsname
- \csname iftrue\endcsname
- \global\let\@currentHref\hc@currentHref
- \else
- \hyper@makecurrent{\@captype}%
- \fi
- \@ifundefined{NR@gettitle}{%
- \def\@currentlabelname{#2}%
- }{%
- \NR@gettitle{#2}%
- }%
- \par\addcontentsline{\csname ext@#1\endcsname}{#1}{%
- \protect\numberline{\csname the#1\endcsname}{\ignorespaces #2}%
- }%
- \begingroup
- \@parboxrestore
- \if@minipage
- \@setminipage
- \fi
- \normalsize
- \expandafter\ifx\csname if@capstart\expandafter\endcsname
- \csname iftrue\endcsname
- \global\@capstartfalse
- \@makecaption{\csname fnum@#1\endcsname}{\ignorespaces#3}%
- \else
- \@makecaption{\csname fnum@#1\endcsname}{%
- \ignorespaces
- \ifHy@nesting
- \expandafter\hyper@@anchor\expandafter{\@currentHref}{#3}%
- \else
- \Hy@raisedlink{%
- \expandafter\hyper@@anchor\expandafter{%
- \@currentHref
- }{\relax}%
- }%
- #3%
- \fi
- }%
- \fi
- \par
- \endgroup
- }}%
- \caption@CheckCommand\@caption{%
- % nameref.sty [2006/12/27 v2.28 Cross-referencing by name of section]
- \long\def\@caption#1[#2]{%
- \def\@currentlabelname{#2}%
- \NR@@caption{#1}[{#2}]%
- }}%
- \caption@CheckCommand\@caption{%
- % nameref.sty [2009/11/27 v2.32 Cross-referencing by name of section]
- \long\def\@caption#1[#2]{%
- \NR@gettitle{#2}%
- \NR@@caption{#1}[{#2}]%
- }}%
- \caption@CheckCommand\@caption{%
- % subfigure.sty [2002/07/30 v2.1.4 subfigure package]
- \long\def\@caption#1[#2]#3{%
- \@ifundefined{if#1topcap}%
- {\subfig@oldcaption{#1}[{#2}]{#3}}%
- {\@nameuse{if#1topcap}%
- \@listsubcaptions{#1}%
- \subfig@oldcaption{#1}[{#2}]{#3}%
- \else
- \subfig@oldcaption{#1}[{#2}]{#3}%
- \@listsubcaptions{#1}%
- \fi}}}%
- \caption@CheckCommand\@caption{%
- % subfig.sty [2005/06/28 ver: 1.3 subfig package]
- \def\@caption{\caption@}%
- }%
- \caption@CheckCommand\@caption{%
- % chkfloat.sty [2012/08/19 v0.1 chkfloat: check for moved floats]
- \def\@caption#1[#2]#3{\chkfloat@caption{#1}[#2]{#3}%
- \addtocontents{fof}{\protect\chkfloat@{\thepage}{\chkfloat@page}{\csname fnum@#1\endcsname: #2}}%
- }}%
- \caption@CheckCommand\@caption{%
- % chkfloat.sty [20??/??/?? v0.? chkfloat: check for moved floats]
- \def\@caption#1[#2]#3{\chkfloat@caption{#1}[{#2}]{#3}%
- \chkfloat@addcontentsline{#1}{#2}%
- }}%
- \caption@IfCheckCommand{}{%
- \caption@InfoNoLine{%
- Incompatible package detected (regarding \string\@caption).\MessageBreak
- \string\@caption\space=\space\meaning\@caption}%
- \caption@setbool{incompatible}{1}}%
- \caption@ifundefined\caption@ifcompatibility
- {\let\caption@ifcompatibility\caption@ifincompatible
- \let\caption@tempa\caption@WarningNoLine}%
- {\let\caption@tempa\@gobble}% suppress warning
\caption@ifcompatibility{%
- \caption@tempa{%
- \noexpand\caption will not be redefined since it's already\MessageBreak
- redefined by a document class or package which is\MessageBreak
- unknown to the caption package}%
+ \caption@InfoNoLine{
+ \noexpand\caption will not be redefined since `compatibility' is set to v1}%
\renewcommand*\caption@redefine{}%
- \renewcommand*\caption@ContinuedFloatX[1]{%
+ \renewcommand*\caption@continuedfloat[1]{%
\caption@Error{Not available in compatibility mode}}%
\caption@AtBeginDocument*{%
\let\caption@start\relax
- \caption@ifundefined\caption@ORI@capstart{}{%
+ \caption@ifdefined\caption@ORI@capstart{%
\caption@Debug{%
Restore hypcap definition of \string\capstart\@gobble}%
- \let\capstart\caption@ORI@capstart}%
+ \let\capstart\caption@ORI@capstart}{}%
}%
\renewcommand*\caption@star[2]{#1#2}%
}{%
- \caption@ifincompatible{%
- \caption@WarningNoLine{%
- Forced redefinition of \noexpand\caption since the\MessageBreak
- unsupported(!) package option `compatibility=false'\MessageBreak
- was given}%
- }{}%
\renewcommand*\caption@redefine{%
\let\caption\caption@caption
\let\@caption\caption@@caption}%
- \caption@redefine
}%
+ \caption@redefine
\caption@AtBeginDocument*{%
\let\caption@ORI@capstart\@undefined}%
\let\caption@ORI@xfloat\@xfloat
@@ -830,8 +458,7 @@
\fi
\caption@start}}
\newcommand*\caption@typehook{}
-\newcommand*\caption@iftype{%
- \caption@ifundefined\@captype\@secondoftwo\@firstoftwo}
+\newcommand*\caption@iftype{\caption@ifdefined\@captype}
\caption@ifeTeX{%
\newcommand*\caption@checkgrouplevel[2]{%
\@ifundefined{#1caption@grouplevel}{%
@@ -920,48 +547,52 @@
\providecommand*\caption@hj@l{\raggedright}
\providecommand*\caption@hj@r{\raggedleft}
\providecommand*\caption@hj@s{}
-\def\ContinuedFloat{%
+\def\continuedfloat{%
\caption@iftype
- {\caption@ContinuedFloatX\@captype}%
- {\caption@Error{\noexpand\ContinuedFloat outside float}}}
-\newcommand*\caption@ContinuedFloatX[1]{%
+ {\caption@continuedfloat\@captype}%
+ {\caption@Error{\noexpand\continuedfloat outside float}}}
+\newcommand*\caption@continuedfloat[1]{%
\@ifstar
{\caption@@refstepcounter\@captype
- \caption@@ContinuedFloat{#1}}%
- {\caption@Continued@Float{#1}}}
-\newcommand*\caption@Continued@Float[1]{%
+ \caption@@continuedfloat{#1}}%
+ {\caption@continued@float{#1}}}
+\newcommand*\caption@continued@float[1]{%
\edef\caption@tempa{#1}%
\ifx\caption@tempa\caption@CFtype
\caption@restorecounters
- \caption@@ContinuedFloat{#1}%
+ \caption@@continuedfloat{#1}%
\else
\caption@Error{Continued `#1' after `\caption@CFtype'}%
\fi}
-\newcommand*\caption@@ContinuedFloat{%
- \caption@setflag1% ContinuedFloat
- \caption@@@ContinuedFloat}
-\newcommand*\caption@@@ContinuedFloat{%
- \stepcounter{ContinuedFloat}%
- \caption@@@@ContinuedFloat}
-\newcommand*\caption@@@@ContinuedFloat[1]{%
- \caption@setoptions{ContinuedFloat}%
+\newcommand*\caption@@continuedfloat{%
+ \caption@setflag1% continued float
+ \caption@@@continuedfloat}
+\newcommand*\caption@@@continuedfloat{%
+ \stepcounter{continuedfloat}%
+ \caption@@@@continuedfloat}
+\newcommand*\caption@@@@continuedfloat[1]{%
+ \caption@setoptions{ContinuedFloat}% for compatibility reasons
+ \caption@setoptions{continuedfloat}%
\caption@setoptions{continued#1}%
- \expandafter\l@addto@macro\csname the#1\endcsname\theContinuedFloat
+ \expandafter\l@addto@macro\csname the#1\endcsname\thecontinuedfloat
\@ifundefined{theH#1}{}{%
\expandafter\l@addto@macro\csname theH#1\endcsname{%
- \@alph\c@ContinuedFloat}}%
- \let\caption@@@@ContinuedFloat\@gobble}
+ \@alph\c@continuedfloat}}%
+ \let\caption@@@@continuedfloat\@gobble}
\newcommand*\caption@CFtype{??}
-\newcounter{ContinuedFloat}
-\let\theContinuedFloat\@empty
-\def\caption@ContinuedFloat{%
- \let\caption@resetContinuedFloat\@gobble
- \caption@@@ContinuedFloat}
-\newcommand*\caption@resetContinuedFloat[1]{%
+\newcounter{continuedfloat}
+\let\c@ContinuedFloat\c@continuedfloat % defined for compatibility reasons
+\def\thecontinuedfloat{\theContinuedFloat}
+\let\theContinuedFloat\@empty % defined for compatibility reasons
+\newcommand*\caption@reset@continuedfloat[1]{%
\xdef\caption@CFtype{#1}%
- \@stpelt{ContinuedFloat}}
-\caption@ifundefined\donemaincaptionfalse{}{%
- \g@addto@macro\donemaincaptionfalse\caption@savesubcounters}
+ \@stpelt{continuedfloat}}
+\def\ContinuedFloat{\continuedfloat} % defined for compatibility reasons
+\def\caption@ContinuedFloat{%
+ \let\caption@reset@continuedfloat\@gobble
+ \caption@@@continuedfloat}
+\caption@ifdefined\donemaincaptionfalse{%
+ \g@addto@macro\donemaincaptionfalse\caption@savesubcounters}{}
\newcommand*\caption@refstepcounter[1]{%
\@ifundefined{c@#1}%
{\caption@Error{No float type '#1' defined}}%
@@ -971,9 +602,9 @@
\caption@clrflag4% subcaption
\@nameuse{donemaincaptiontrue}}}
\newcommand*\caption@ref@stepcounter{%
- \caption@ifflag1{% ContinuedFloat
+ \caption@ifflag1{% continued float
\let\caption@tempa\caption@@refcounter
- \caption@clrflag1% ContinuedFloat
+ \caption@clrflag1% continued float
}{%
\let\caption@tempa\caption@@refstepcounter
\caption@ifflag2{}{% caption
@@ -1001,7 +632,7 @@
\caption@@@stepcounter{#1}}
\newcommand*\caption@prepare@stepcounter[2]{%
\caption@addsubcontentslines{#2stepcounter}%
- \caption@resetContinuedFloat{#1}}
+ \caption@reset@continuedfloat{#1}}
\newcommand*\caption@@@refstepcounter{\refstepcounter}
\newcommand*\caption@@@stepcounter{\stepcounter}
\@ifundefined{kernel@ifnextchar}{\let\kernel@ifnextchar\@ifnextchar}{}
@@ -1053,18 +684,18 @@
\let\caption@freezeHref\relax
\let\caption@defrostHref\relax
\newcommand\caption@gettitle[1]{%
- \caption@ifundefined\NR@gettitle
- {\def\@currentlabelname{#1}}%
- {\NR@gettitle{#1}}}
+ \caption@ifdefined\NR@gettitle
+ {\NR@gettitle{#1}}%
+ {\def\@currentlabelname{#1}}}
\def\caption@DeclareSubType sub#1\@nil{%
\caption@Debug{Initializing subtype for `#1'\@gobble}%
\@namedef{caption@beginsub#1}{\caption@beginsubfloat{#1}}}
\@onlypreamble\caption@DeclareSubType
\caption@For*{subtypelist}{\caption@DeclareSubType sub#1\@nil}
\caption@AtBeginDocument*{%
- \caption@ifundefined\sf@counterlist{}{%
+ \caption@ifdefined\sf@counterlist{%
\@for\sf@temp:=\sf@counterlist\do{%
- \expandafter\caption@DeclareSubType\sf@temp\@nil}}}
+ \expandafter\caption@DeclareSubType\sf@temp\@nil}}{}}
\newcommand*\caption@subtypehook{%
\ifx\caption\caption@subcaption \else
\caption@warmup
@@ -1072,7 +703,7 @@
\let\caption@add@contentsline\caption@addsubcontentsline
\let\caption@addsubcontentslines\@gobble
\caption@ifflag4{}{% subcaption
- \caption@ifflag1{% ContinuedFloat
+ \caption@ifflag1{% continued float
\caption@clrflag1%
}{%
\caption@@stepcounter\@captype
@@ -1080,7 +711,7 @@
\caption@setflag4% subcaption
}%
}%
- \c@ContinuedFloat=0\relax
+ \c@continuedfloat=0\relax
\let\caption@setfloatcapt\@firstofone
\let\caption@chkfloat\@gobbletwo
\caption@setbox{none}%
@@ -1090,7 +721,7 @@
\caption@setoptions{subfloat}% for subfig-package compatibility
\def\caption@settype{\caption@withoptargs\caption@sub@settype}%
\def\caption@sub@settype##1##2{%
- \def\caption@tempa{##2}%
+ \edef\caption@tempa{##2}%
\ifx\caption@tempa\@captype
%%% \caption@setsubtype##1\relax
\else
@@ -1152,36 +783,37 @@
\caption@subcontentslines
\endgroup
\caption@clearsubcontentslines}
-\AtBeginDocument{\caption@ifundefined\chapter{}{%
- \let\caption@chapter@ORI\chapter
- \def\chapter{%
- \caption@addsubcontentslines{chapter}\caption@chapter@ORI}}}
-\AtBeginDocument{\caption@ifundefined\appendix{}{%
- \let\caption@appendix@ORI\appendix
- \def\appendix{%
- \caption@addsubcontentslines{appendix}\caption@appendix@ORI}}}
-\AtEndDocument{%
- \caption@addsubcontentslines{AtEndDocument}}
-\caption@ifundefined\smf@makecaption{}{\let\smf@makecaption\@makecaption}
+\AtBeginDocument{%
+ \caption@ifdefined\chapter{%
+ \let\caption@chapter@ORI\chapter
+ \def\chapter{%
+ \caption@addsubcontentslines{chapter}\caption@chapter@ORI}}{}%
+ \caption@ifdefined\appendix{%
+ \let\caption@appendix@ORI\appendix
+ \def\appendix{%
+ \caption@addsubcontentslines{appendix}\caption@appendix@ORI}}{}%
+ \caption@addsubcontentslines{AtEndDocument}%
+}
+\caption@ifdefined\smf@makecaption{\let\smf@makecaption\@makecaption}{}
\@ifclassloaded{beamer}{%
\caption@InfoNoLine{beamer document class}%
\let\caption@ORI@figure\figure
\def\figure{\caption@settype{figure}\caption@ORI@figure}
- \let\caption@ORI@table\figure
+ \let\caption@ORI@table\table
\def\table{\caption@settype{table}\caption@ORI@table}
}{}
-\caption@ifundefined\scr@caption{}{%
- \caption@AtBeginDocument{\let\scr@caption\caption}}
+\caption@ifdefined\scr@caption{%
+ \caption@AtBeginDocument{\let\scr@caption\caption}}{}
\@nameuse{caption@frenchb}\@nameundef{caption@frenchb}
-\caption@AtBeginDocument{\caption@ifundefined\frenchTeXmods{}{%
+\caption@AtBeginDocument{\caption@ifdefined\frenchTeXmods{%
\caption@InfoNoLine{frenchle/pro package is loaded}%
\let\captionfont@ORI\captionfont
\let\captionlabelfont@ORI\captionlabelfont
\let\@makecaption@ORI\@makecaption
- \caption@ifundefined\GOfrench
- {\let\caption@tempa\@firstofone}%
+ \caption@ifdefined\GOfrench
{\def\caption@tempa{\g@addto@macro\GOfrench}}%
+ {\let\caption@tempa\@firstofone}%
\caption@tempa{%
\let\captionfont\captionfont@ORI
\let\captionfont@ORI\@undefined
@@ -1204,7 +836,7 @@
\def\f@tfrench{\ifx\listoftables\relax\else\tablename~\thetable\fi}%
\caption@tempa
}%
-}}
+}{}}
\def\caption@tempa#1{%
\@ifpackagewith{babel}{#1}{%
\caption@InfoNoLine{#1 babel option is loaded}%
@@ -1250,10 +882,10 @@
\captionsetup*[sub]{hypcap=true}% Note: This is just a (q&d) workaround!
\caption@freeze}%
\newcommand*\caption@freeze{%
- \let\caption@frozen@ContinuedFloat\ContinuedFloat
- \def\ContinuedFloat{%
- \caption@@freeze{\caption@@@@ContinuedFloat\@captype}%
- \caption@frozen@ContinuedFloat}%
+ \let\caption@frozen@continuedfloat\continuedfloat
+ \def\continuedfloat{%
+ \caption@@freeze{\caption@@@@continuedfloat\@captype}%
+ \caption@frozen@continuedfloat}%
\let\caption@frozen@setup\caption@setup
\def\caption@setup##1{%
\caption@@freeze{\caption@setup{##1}}%
@@ -1289,7 +921,7 @@
\long\def\caption@@freeze{%
\g@addto@macro\caption@frozen@content}%
\def\caption@warmup{%
- \let\ContinuedFloat\caption@frozen@ContinuedFloat
+ \let\continuedfloat\caption@frozen@continuedfloat
\let\caption@setup\caption@frozen@setup
\let\caption\caption@frozen@caption
\let\label\caption@frozen@label}}%
@@ -1306,12 +938,13 @@
\caption@undefbool{needfreeze}}
\let\caption@warmup\relax
\caption@IfPackageLoaded{chkfloat}[2012/08/19 v0.1]{%
- \caption@ifundefined\chkfloat@addcontentsline{%
- \renewcommand\caption@chkfloat[2]{%
- \caption@ifundefined\chkfloat@page{}{%
- \addtocontents{fof}{\protect\chkfloat@{\thepage}{\chkfloat@page}{\csname fnum@#1\endcsname: #2}}}}%
- }{%
+ \caption@ifdefined\chkfloat@addcontentsline{%
\renewcommand\caption@chkfloat{\chkfloat@addcontentsline}%
+ }{%
+ \renewcommand\caption@chkfloat[2]{%
+ \caption@ifdefined\chkfloat@page{%
+ \addtocontents{fof}{\protect\chkfloat@{\thepage}{\chkfloat@page}{\csname fnum@#1\endcsname: #2}}%
+ }{}}%
}%
}{}%
\caption@IfPackageLoaded{float}[2001/11/08 v1.3d]{%
@@ -1333,9 +966,9 @@
\caption@freezeHref % will be defrosted in \float@makebox
\caption@ORI@float@setevery{#1}}%
\caption@AtBeginDocument{\caption@ifcompatibility{}{%
- \caption@ifundefined\HyOrg@float@makebox
- {\let\caption@ORI@float@makebox\float@makebox}%
+ \caption@ifdefined\HyOrg@float@makebox
{\let\caption@ORI@float@makebox\HyOrg@float@makebox}%
+ {\let\caption@ORI@float@makebox\float@makebox}%
\renewcommand\float@makebox[1]{%
\caption@ORI@float@makebox{#1\relax \caption@defrostHref}}%
}}%
@@ -1590,8 +1223,8 @@
{\egroup\LT@listentry\LTcaptype}}%
%% \let\Hy@LT@currentHlabel\@currentHlabel
%% \let\@currentHlabel\Hy@LT@currentHlabel
- \def\ContinuedFloat{\noalign{%
- \caption@Error{\noexpand\ContinuedFloat outside float}}}%
+ \def\continuedfloat{\noalign{%
+ \caption@Error{\noexpand\continuedfloat outside float}}}%
\let\bicaption\LT@bicaption
\caption@ORI@LT@array}}%
\def\LT@capti@n{%
@@ -1608,8 +1241,8 @@
\caption@begin\LTcaptype
\caption@normalsize
\vskip-\ht\strutbox
- \caption@ifundefined\FBifcaptop{}{%
- \let\caption@belowskip\@empty}%
+ \caption@ifdefined\FBifcaptop{%
+ \let\caption@belowskip\@empty}{}%
\caption@make@above
\caption@@make{#2}{#3}\endgraf
\caption@make@below
diff --git a/Master/texmf-dist/tex/latex/caption/caption3.sty b/Master/texmf-dist/tex/latex/caption/caption3.sty
index dc0897cf9f0..fe0a5625e34 100644
--- a/Master/texmf-dist/tex/latex/caption/caption3.sty
+++ b/Master/texmf-dist/tex/latex/caption/caption3.sty
@@ -37,7 +37,7 @@
%% caption-deu.tex, caption-eng.tex, and caption-rus.tex.
%%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption3}[2019/09/01 v1.8d caption3 kernel (AR)]
+\ProvidesPackage{caption3}[2019/09/09 v1.8e caption3 kernel (AR)]
\providecommand\caption@FixArabTeX{%
\def\caption@tempa##1{}%
\ifx\caption@tempa\@gobble
@@ -84,6 +84,14 @@
\else
\expandafter\expandafter\expandafter\@secondoftwo
\fi\fi}
+\newcommand*\caption@ifdefined[1]{%
+ \ifx#1\@undefined
+ \expandafter\@secondoftwo
+ \else\ifx#1\relax
+ \expandafter\expandafter\expandafter\@secondoftwo
+ \else
+ \expandafter\expandafter\expandafter\@firstoftwo
+ \fi\fi}
\newcommand*\caption@ifinlist{%
\@expandtwoargs\caption@@ifinlist}
\newcommand*\caption@@ifinlist[2]{%
@@ -165,27 +173,6 @@
\expandafter\caption@tempb\expandafter{\caption@tempa}}
\DeclareRobustCommand*\caption@gobble{%
\caption@withoptargs\@gobbletwo}
-\newcommand\caption@DoCheckCommand[2]{%
- \begingroup
- \let\caption@tempa#1%
- #2%
- \ifx\caption@tempa#1%
- \endgroup
- \let\caption@CheckCommand\@gobbletwo
- \else
- \endgroup
- \fi}
-\@onlypreamble\caption@DoCheckCommand
-\let\caption@CheckCommand\caption@DoCheckCommand
-\@onlypreamble\caption@CheckCommand
-\newcommand*\caption@IfCheckCommand{%
- \ifx\caption@CheckCommand\@gobbletwo
- \let\caption@CheckCommand\caption@DoCheckCommand
- \expandafter\@firstoftwo
- \else
- \expandafter\@secondoftwo
- \fi}
-\@onlypreamble\caption@IfCheckCommand
\let\caption@begindocumenthook\@empty
\let\caption@@begindocumenthook\@empty
\def\caption@AtBeginDocument{%
@@ -523,25 +510,6 @@
\setlength\caption@hangindent{#1}}
\DeclareCaptionOption{parskip}{%
\l@addto@macro\caption@@par{\setlength\parskip{#1}}}
-\providecommand*\caption@ifkomaclass{%
- \caption@ifundefined\scr@caption\@gobble\@firstofone}
-\@onlypreamble\caption@ifkomaclass
-\caption@ifkomaclass{%
- \let\caption@KV@parindent\KV@caption@parindent
- \DeclareCaptionOption{parindent}[]{%
- \ifx,#1,%
- \caption@Debug{Option `parindent' ignored}%
- \else
- \caption@KV@parindent{#1}%
- \fi}%
- \let\caption@KV@parskip\KV@caption@parskip
- \DeclareCaptionOption{parskip}[]{%
- \ifx,#1,%
- \caption@Debug{Option `parskip' ignored}%
- \else
- \caption@KV@parskip{#1}%
- \fi}%
-}
\newcommand*\DeclareCaptionStyle[1]{%
\@testopt{\caption@declarestyle{#1}}{}}
\@onlypreamble\DeclareCaptionStyle
@@ -858,8 +826,8 @@
\DeclareCaptionFont{larger}{\caption@larger}
\DeclareCaptionFont{sansmath}{\sansmath}
\DeclareCaptionFont{singlespacing}{%
- \caption@ifundefined\setspace@singlespace{}{%
- \setstretch\setspace@singlespace}}% normally 1
+ \caption@ifdefined\setspace@singlespace{%
+ \setstretch\setspace@singlespace}{}}% normally 1
\DeclareCaptionFont{onehalfspacing}{\onehalfspacing}
\DeclareCaptionFont{doublespacing}{\doublespacing}
\DeclareCaptionFont{stretch}{\setstretch{#1}}
@@ -1048,26 +1016,37 @@
{\let\caption@Debug\@gobble}}
\DeclareOption{debug}{\setkeys{caption}{debug}}
\setkeys{caption}{debug=0}
-\caption@CheckCommand\@makecaption{%
- % article|report|book [2005/09/16 v1.4f Standard LaTeX document class]
- \long\def\@makecaption#1#2{%
- \vskip\abovecaptionskip
- \sbox\@tempboxa{#1: #2}%
- \ifdim \wd\@tempboxa >\hsize
- #1: #2\par
- \else
- \global \@minipagefalse
- \hb@xt@\hsize{\hfil\box\@tempboxa\hfil}%
- \fi
- \vskip\belowcaptionskip}}
-\providecommand*\caption@ifelsarticleclass{%
- \@ifclassloaded{elsarticle}\@firstofone\@gobble}
-\@onlypreamble\caption@ifelsarticleclass
-\caption@ifelsarticleclass{%
- \caption@CheckCommand\@makecaption{%
- % elsarticle.cls,v 1.20 2008-10-13 04:24:12 cvr Exp
- \long\def\@makecaption#1#2{%
- \vskip\abovecaptionskip\footnotesize
+\caption@setbool{documentclass}{1}
+\caption@ifundefined\caption@documentclass{%
+ \@ifclassloaded{beamer}{%
+ \caption@InfoNoLine{beamer document class detected}%
+ \def\caption@documentclass{beamer}%
+ }{\@ifclassloaded{elsarticle}{%
+ \caption@InfoNoLine{elsarticle document class detected}%
+ \def\caption@documentclass{elsarticle}%
+ }{\@ifclassloaded{memoir}{%
+ \caption@InfoNoLine{memoir document class detected}%
+ \def\caption@documentclass{memoir}%
+ }{\caption@ifdefined\scr@caption{%
+ \caption@InfoNoLine{KOMA-Script document class detected}%
+ \def\caption@documentclass{koma}%
+ }{\caption@ifdefined\@captionheadfont{%
+ \caption@InfoNoLine{AMS or SMF document class detected}%
+ \def\caption@documentclass{ams}%
+ }{\caption@ifdefined\CaptionFonts{%
+ \caption@InfoNoLine{NTG document class detected}%
+ \def\caption@documentclass{ntg}%
+ }{\caption@ifdefined\cph@font{%
+ \caption@ifdefined\cpb@font\@firstoftwo\@secondoftwo
+ }{%
+ \@secondoftwo
+ }{%
+ \caption@InfoNoLine{thesis document class detected}%
+ \def\caption@documentclass{thesis}%
+ }{%
+ % article|report|book [2005/09/16 v1.4f Standard LaTeX document class]
+ \long\def\caption@tempa#1#2{%
+ \vskip\abovecaptionskip
\sbox\@tempboxa{#1: #2}%
\ifdim \wd\@tempboxa >\hsize
#1: #2\par
@@ -1076,77 +1055,34 @@
\hb@xt@\hsize{\hfil\box\@tempboxa\hfil}%
\fi
\vskip\belowcaptionskip}}
+ \ifx\caption@tempa\@makecaption
+ \caption@InfoNoLine{Standard document class detected}%
+ \else
+ \caption@InfoNoLine{%
+ Unknown document class (or package),\MessageBreak
+ standard defaults will be used}%
+ \caption@InfoNoLine{\string\@makecaption\space=\space\meaning\@makecaption\@gobble}%
+ \caption@setbool{documentclass}{0}%
+ \fi
+ \def\caption@documentclass{base}%
+ }}}}}}%
+}{}
+\newcommand*\caption@ifclassloaded[1]{%
+ \edef\caption@tempa{#1}%
+ \ifx\caption@tempa\caption@documentclass
+ \expandafter\@firstoftwo
+ \else
+ \expandafter\@secondoftwo
+ \fi}
+\caption@ifclassloaded{elsarticle}{%
\DeclareCaptionDefaultFont{font}{\footnotesize}
-}
-\providecommand*\caption@ifamsclass{%
- \caption@ifundefined\@captionheadfont\@gobble\@firstofone}
-\@onlypreamble\caption@ifamsclass
-\caption@ifamsclass{%
- \caption@CheckCommand\@makecaption{%
- % amsart|amsproc|amsbook [2004/08/06 v2.20]
- \long\def\@makecaption#1#2{%
- \setbox\@tempboxa\vbox{\color@setgroup
- \advance\hsize-2\captionindent\noindent
- \@captionfont\@captionheadfont#1\@xp\@ifnotempty\@xp
- {\@cdr#2\@nil}{.\@captionfont\upshape\enspace#2}%
- \unskip\kern-2\captionindent\par
- \global\setbox\@ne\lastbox\color@endgroup}%
- \ifhbox\@ne % the normal case
- \setbox\@ne\hbox{\unhbox\@ne\unskip\unskip\unpenalty\unkern}%
- \fi
- \ifdim\wd\@tempboxa=\z@ % this means caption will fit on one line
- \setbox\@ne\hbox to\columnwidth{\hss\kern-2\captionindent\box\@ne\hss}%
- \else % tempboxa contained more than one line
- \setbox\@ne\vbox{\unvbox\@tempboxa\parskip\z@skip
- \noindent\unhbox\@ne\advance\hsize-2\captionindent\par}%
- \fi
- \ifnum\@tempcnta<64 % if the float IS a figure...
- \addvspace\abovecaptionskip
- \hbox to\hsize{\kern\captionindent\box\@ne\hss}%
- \else % if the float IS NOT a figure...
- \hbox to\hsize{\kern\captionindent\box\@ne\hss}%
- \nobreak
- \vskip\belowcaptionskip
- \fi
- \relax
- }}
- \caption@CheckCommand\@makecaption{%
- % smfart|smfbook [1999/11/15 v1.2f Classe LaTeX pour les articles publies par la SMF]
- \long\def\@makecaption#1#2{%
- \ifdim\captionindent>.1\hsize \captionindent.1\hsize \fi
- \setbox\@tempboxa\vbox{\color@setgroup
- \advance\hsize-2\captionindent\noindent
- \@captionfont\@captionheadfont#1\@xp\@ifnotempty\@xp
- {\@cdr#2\@nil}{\@addpunct{.}\@captionfont\upshape\enspace#2}%
- \unskip\kern-2\captionindent\par
- \global\setbox\@ne\lastbox\color@endgroup}%
- \ifhbox\@ne % the normal case
- \setbox\@ne\hbox{\unhbox\@ne\unskip\unskip\unpenalty\unkern}%
- \fi
- \ifdim\wd\@tempboxa=\z@ % this means caption will fit on one line
- \setbox\@ne\hbox to\columnwidth{\hss\kern-2\captionindent\box\@ne\hss}%
- \@tempdima\wd\@ne\advance\@tempdima-\captionindent
- \wd\@ne\@tempdima
- \else % tempboxa contained more than one line
- \setbox\@ne\vbox{\rightskip=0pt plus\captionindent\relax
- \unvbox\@tempboxa\parskip\z@skip
- \noindent\unhbox\@ne\advance\hsize-2\captionindent\par}%
- \fi
- \ifnum\@tempcnta<64 % if the float IS a figure...
- \addvspace\abovecaptionskip
- \noindent\kern\captionindent\box\@ne
- \else % if the float IS NOT a figure...
- \noindent\kern\captionindent\box\@ne
- \nobreak
- \vskip\belowcaptionskip
- \fi
- \relax
- }}
+}{}
+\caption@ifclassloaded{ams}{%
\let\captionmargin\captionindent % set to 3pc by AMS class
\begingroup\edef\@tempa{\endgroup
\noexpand\caption@g@addto@list\noexpand\caption@sty@default
{margin=\the\captionmargin
- \caption@ifundefined\smf@makecaption{}{,maxmargin=.1\linewidth}}}
+ \caption@ifdefined\smf@makecaption{,maxmargin=.1\linewidth}{}}}
\@tempa
\caption@g@addto@list\caption@sls@default{margin*=.5\captionmargin}
\DeclareCaptionLabelSeparator{default}{.\enspace}
@@ -1155,26 +1091,8 @@
\DeclareCaptionDefaultFont{textfont}{\@captionfont\upshape}
\captionsetup[figure]{position=b}
\captionsetup[table]{position=t}
-}
-\providecommand*\caption@ifbeamerclass{%
- \@ifclassloaded{beamer}\@firstofone\@gobble}
-\@onlypreamble\caption@ifbeamerclass
-\caption@ifbeamerclass{%
- \caption@CheckCommand\beamer@makecaption{%
- % beamerbaselocalstructure.sty,v 1.53 2007/01/28 20:48:21 tantau
- \long\def\beamer@makecaption#1#2{%
- \def\insertcaptionname{\csname#1name\endcsname}%
- \def\insertcaptionnumber{\csname the#1\endcsname}%
- \def\insertcaption{#2}%
- \nobreak\vskip\abovecaptionskip\nobreak
- \sbox\@tempboxa{\usebeamertemplate**{caption}}%
- \ifdim \wd\@tempboxa >\hsize
- \usebeamertemplate**{caption}\par
- \else
- \global \@minipagefalse
- \hb@xt@\hsize{\hfil\box\@tempboxa\hfil}%
- \fi
- \nobreak\vskip\belowcaptionskip\nobreak}}
+}{}
+\caption@ifclassloaded{beamer}{%
\newcommand*\caption@ifbeamertemplate[1]{%
\begingroup
\let\beamer@@tmpl@caption@ORI\beamer@@tmpl@caption
@@ -1225,25 +1143,8 @@
% \usebeamertemplate**{caption} will set font
\DeclareCaptionDefaultFont{font}{}%
\setbeamertemplate{caption}[caption3]}
-}
-\providecommand*\caption@ifkomaclass{%
- \caption@ifundefined\scr@caption\@gobble\@firstofone}
-\@onlypreamble\caption@ifkomaclass
-\caption@ifkomaclass{%
- \caption@CheckCommand\@makecaption{%
- % scrartcl|scrreprt|scrbook [2007/03/07 v2.97a KOMA-Script document class]
- \long\def\@makecaption#1#2{%
- \if@captionabove
- \vskip\belowcaptionskip
- \else
- \vskip\abovecaptionskip
- \fi
- \@@makecaption\@firstofone{#1}{#2}%
- \if@captionabove
- \vskip\abovecaptionskip
- \else
- \vskip\belowcaptionskip
- \fi}}
+}{}
+\caption@ifclassloaded{koma}{%
\DeclareCaptionFormat{default}[#1#2#3\par]{%
\ifdofullc@p
\caption@ifin@list\caption@lsepcrlist\caption@lsepname
@@ -1264,90 +1165,41 @@
\DeclareCaptionLabelSeparator{default}{\captionformat}
\DeclareCaptionDefaultFont{font}{\scr@fnt@caption}
\DeclareCaptionDefaultFont{labelfont}{\scr@fnt@captionlabel}
-}
-\providecommand*\caption@ifntgclass{%
- \caption@ifundefined\CaptionFonts\@gobble\@firstofone}
-\@onlypreamble\caption@ifntgclass
-\caption@ifntgclass{%
- \caption@CheckCommand\@makecaption{%
- % artikel|rapport|boek [2004/06/07 v2.1a NTG LaTeX document class]
- \long\def\@makecaption#1#2{%
- \vskip\abovecaptionskip
- \sbox\@tempboxa{{\CaptionLabelFont#1:} \CaptionTextFont#2}%
- \ifdim \wd\@tempboxa >\hsize
- {\CaptionLabelFont#1:} \CaptionTextFont#2\par
- \else
- \global \@minipagefalse
- \hb@xt@\hsize{\hfil\box\@tempboxa\hfil}%
- \fi
- \vskip\belowcaptionskip}}
+ \let\caption@KV@parindent\KV@caption@parindent
+ \DeclareCaptionOption{parindent}[]{%
+ \ifx,#1,%
+ \caption@Debug{Option `parindent' ignored}%
+ \else
+ \caption@KV@parindent{#1}%
+ \fi}%
+ \let\caption@KV@parskip\KV@caption@parskip
+ \DeclareCaptionOption{parskip}[]{%
+ \ifx,#1,%
+ \caption@Debug{Option `parskip' ignored}%
+ \else
+ \caption@KV@parskip{#1}%
+ \fi}%
+}{}
+\caption@ifclassloaded{ntg}{%
\DeclareCaptionDefaultFont{labelfont}{\CaptionLabelFont}
\DeclareCaptionDefaultFont{textfont}{\CaptionTextFont}
-}
-\providecommand*\caption@ifthesisclass{%
- \caption@ifundefined\cph@font
- {\@gobble}%
- {\caption@ifundefined\cpb@font\@gobble\@firstofone}}
-\caption@ifthesisclass{%
- \caption@CheckCommand\@makecaption{%
- % thesis.cls 1996/25/01 1.0g LaTeX document class (wm).
- \long\def\@makecaption#1#2{%
- \vskip\abovecaptionskip
- \setbox\@tempboxa\hbox{{\cph@font #1:} {\cpb@font #2}}%
- \ifdim \wd\@tempboxa >\hsize
- \@hangfrom{\cph@font #1: }{\cpb@font #2\par}%
- \else
- \hbox to\hsize{\hfil\box\@tempboxa\hfil}%
- \fi
- \vskip\belowcaptionskip}}
+}{}
+\caption@ifclassloaded{thesis}{%
\DeclareCaptionDefaultFormat{hang}
\DeclareCaptionDefaultFont{labelfont}{\cph@font}
\DeclareCaptionDefaultFont{textfont}{\cpb@font}
-}
-\caption@ifundefined\ArabiCoreLoaded{%
- \let\caption@rl\@firstofone
-}{%
+}{}
+\caption@ifdefined\ArabiCoreLoaded{%
\newcommand\caption@rl[1]{\if@rl\textRL{#1}\else\textLR{#1}\fi}
\def\fnum@figure{\figurename\nobreakspace\thefigure}%
\def\fnum@table{\tablename\nobreakspace\thetable}%
\DeclareCaptionLabelSeparator{arabi}{ : }
\DeclareCaptionLabelSeparator{default}{%
\if@rl\caption@lsep@arabi\else\caption@lsep@colon\fi}
- \caption@CheckCommand\@makecaption{%
- % arabicore.sty [2006/01/01 v1.0 Arabi Core switching commands (may still change)]
- \long\def\@makecaption#1#2{%
- \vskip\abovecaptionskip
- \sbox\@tempboxa{#1: #2}%
- \sbox\@Arabitempboxa{\textRL{#2} : #1}%
- \if@rl{
- \ifdim \wd\@Arabitempboxa >\hsize
- \textRL{#2} : #1\par
- \else
- \global \@minipagefalse
- \hb@xt@\hsize{\hfil\box\@Arabitempboxa\hfil}%
- \fi}\else{
- \ifdim \wd\@tempboxa >\hsize
- #1: #2\par
- \else
- \global \@minipagefalse
- \hb@xt@\hsize{\hfil\box\@tempboxa\hfil}%
- \fi}\fi
- \vskip\belowcaptionskip}}
+}{%
+ \let\caption@rl\@firstofone
}
-\caption@ifundefined\FB@makecaption{}{%
- \caption@CheckCommand\@makecaption{%
- % frenchb.ldf [2005/02/06 v1.6g French support from the babel system]
- % frenchb.ldf [2007/10/05 v2.0e French support from the babel system]
- \long\def\@makecaption#1#2{%
- \vskip\abovecaptionskip
- \sbox\@tempboxa{#1\CaptionSeparator #2}%
- \ifdim \wd\@tempboxa >\hsize
- #1\CaptionSeparator #2\par
- \else
- \global \@minipagefalse
- \hb@xt@\hsize{\hfil\box\@tempboxa\hfil}%
- \fi
- \vskip\belowcaptionskip}}
+\caption@ifdefined\FB@makecaption{%
\ifx\@makecaption\STD@makecaption
\DeclareCaptionLabelSeparator{default}{\CaptionSeparator}
\def\caption@frenchb{% supress frenchb warning
@@ -1361,60 +1213,12 @@
frenchb will NOT customize it}%
\fi
\fi
-}
-\caption@ifundefined\frenchTeXmods{}{%
- \caption@CheckCommand\@makecaption{%
- % french(le).sty [2006/10/03 The french(le) package /V5,9991/]
- % french(le).sty [2007/06/28 The french(le) package /V5,9994/]
- \def\@makecaption#1#2{%
- \ifFTY%
- \def\@secondofmany##1##2\void{##2}%
- \def\@tempa{\@secondofmany#2\void}%
- \ifx\@tempa\empty%
- \let\captionseparator\empty%
- \fi%
- \@mcORI{#1}{\relax\captionfont{#2}}%
- \else
- \@mcORI{#1}{#2}%
- \fi}}%
- \caption@CheckCommand\@makecaption{%
- % french(le).sty [2007/02/11 The french(le) package /V5,9993/]
- \def\@makecaption#1#2{%
- \ifFTY%
- \def\@secondofmany##1##2\void{##2}%
- \protected@edef\@tempa{\@secondofmany#2\void}%
- \ifx\@tempa\empty%
- \let\captionseparator\empty%
- \fi%
- \@mcORI{#1}{\relax\captionfont{#2}}%
- \else
- \@mcORI{#1}{#2}%
- \fi}}%
+}{}
+\caption@ifdefined\frenchTeXmods{%
\DeclareCaptionDefaultFont{textfont}{\itshape}%
\DeclareCaptionLabelSeparator{default}{\captionseparator\space}%
-}
- \caption@CheckCommand\@makecaption{%
- % rlbabel.def [2005/03/30 v2.3h Right-to-Left support from the babel system Hebrew language support from the babel system]
- \long\def\@makecaption#1#2{%
- \vskip\abovecaptionskip%
- \begin{center}%
- #1: #2%
- \end{center} \par%
- \vskip\belowcaptionskip}}%
+}{}
\DeclareCaptionListFormat{subperiod}{#2.}
-\caption@ifundefined\hunnewlabel{}{%
- \caption@CheckCommand\@makecaption{%
- % magyar.ldf [2005/03/30 v1.4j Magyar support from the babel system]
- \def\@makecaption#1#2{%
- \vskip\abovecaptionskip
- \sbox\@tempboxa{#1. #2}%
- \ifdim \wd\@tempboxa >\hsize
- {#1. #2\csname par\endcsname}
- \else
- \global \@minipagefalse
- \hb@xt@\hsize{\hfil\box\@tempboxa\hfil}%
- \fi
- \vskip\belowcaptionskip}}}
\def\caption@tempa#1{%
\@ifpackagewith{babel}{#1}{%
\caption@InfoNoLine{#1 babel option is loaded}%
@@ -1429,15 +1233,6 @@
}{}}
\caption@tempa{hungarian}
\caption@tempa{magyar}
-\caption@IfCheckCommand{%
- \caption@setbool{documentclass}{1}%
-}{%
- \caption@setbool{documentclass}{0}%
- \caption@InfoNoLine{%
- Unknown document class (or package),\MessageBreak
- standard defaults will be used}%
- \caption@Debug{\string\@makecaption\space=\space\meaning\@makecaption\@gobble}%
-}
\captionsetup{style=default,position=default,%
list,listformat=default,twoside=\if@twoside 1\else 0\fi}
\ProcessOptions*
@@ -1445,13 +1240,13 @@
\caption@ifcontentsline{#2}{%
\begingroup
\let\@tempa\@gobble
- \caption@ifundefined\caption@listtype
- {\edef\caption@listtype{#1}}%
+ \caption@ifdefined\caption@listtype
{\let\@tempa\@firstofone}%
- \caption@ifundefined\caption@listtype@ext
- {}%
+ {\edef\caption@listtype{#1}}%
+ \caption@ifdefined\caption@listtype@ext
{\edef\caption@listtype{\caption@listtype\caption@listtype@ext}%
\let\@tempa\@firstofone}%
+ {}%
\@tempa
{\caption@Debug{addcontentsline: #1 => \caption@listtype}%
\@namedef{the\caption@listtype}{\@nameuse{the#1}}}%
@@ -1692,13 +1487,13 @@
\DeclareFloatingEnvironment}
\@onlypreamble\DeclareCaptionType
\newcommand\caption@ForEachType[1]{%
- \caption@ifundefined\ForEachFloatingEnvironment
+ \caption@ifdefined\ForEachFloatingEnvironment
+ {\ForEachFloatingEnvironment{#1}}%
{\def\@elt##1{#1}%
- \caption@ifundefined\c@figure\@gobble\@elt{figure}%
- \caption@ifundefined\c@table\@gobble\@elt{table}%
+ \caption@ifdefined\c@figure\@elt\@gobble{figure}%
+ \caption@ifdefined\c@table\@elt\@gobble{table}%
\let\@elt\relax
- \newfloat@addtohook{#1}}%
- {\ForEachFloatingEnvironment{#1}}}
+ \newfloat@addtohook{#1}}}
\providecommand\newfloat@addtohook[1]{%
\toks@=\expandafter{\newfloat@hook{##1}#1}%
\edef\@tempa{\def\noexpand\newfloat@hook####1{\the\toks@}}%
@@ -1721,8 +1516,8 @@
\caption@declaresublistentry{#3}%
\@cons\caption@subtypelist{{#3}}}%
{\caption@Debug{Modify caption `sub#3'}}%
- \caption@ifundefined\contentsuse{}{%
- \contentsuse{sub#3}{\csname ext@sub#3\endcsname}}%
+ \caption@ifdefined\contentsuse{%
+ \contentsuse{sub#3}{\csname ext@sub#3\endcsname}}{}%
\@namedef{sub#3name}{}%
\@namedef{sub#3autorefname}{\csname #3autorefname\endcsname}%
#1% is \@firstoftwo in star form, and \@secondoftwo otherwise
@@ -1734,9 +1529,9 @@
}}
\@onlypreamble\caption@@declaresubtype
\newcommand*\caption@declaresublistentry{%
- \caption@ifundefined\l@chapter
- {\caption@@declaresublistentry\l@subsubsection}%
- {\caption@@declaresublistentry\l@subsection}}
+ \caption@ifdefined\l@chapter
+ {\caption@@declaresublistentry\l@subsection}%
+ {\caption@@declaresublistentry\l@subsubsection}}
\@onlypreamble\caption@declaresublistentry
\newcommand*\caption@@declaresublistentry[2]{%
\ifx#1\@undefined
diff --git a/Master/texmf-dist/tex/latex/caption/newfloat.sty b/Master/texmf-dist/tex/latex/caption/newfloat.sty
deleted file mode 100644
index a561c956c48..00000000000
--- a/Master/texmf-dist/tex/latex/caption/newfloat.sty
+++ /dev/null
@@ -1,891 +0,0 @@
-%%
-%% This is file `newfloat.sty',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% newfloat.dtx (with options: `package')
-%%
-%% Copyright (C) 1994-2019 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
-%%
-%% https://gitlab.com/axelsommerfeldt/caption
-%%
-%% --------------------------------------------------------------------------
-%%
-%% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
-%% of this license or (at your option) any later version.
-%% The latest version of this license is in
-%% http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
-%% version 2003/12/01 or later.
-%%
-%% This work has the LPPL maintenance status "maintained".
-%%
-%% This Current Maintainer of this work is Axel Sommerfeldt.
-%%
-%% This work consists of the files
-%% CHANGELOG, README, SUMMARY, caption.ins,
-%% caption.dtx, caption2.dtx, caption3.dtx,
-%% bicaption.dtx, ltcaption.dtx, subcaption.dtx,
-%% newfloat.dtx, and totalcount.dtx
-%% the derived files
-%% caption.sty, caption2.sty, caption3.sty,
-%% bicaption.sty, ltcaption.sty, subcaption.sty,
-%% newfloat.sty, and totalcount.sty
-%% and the user manuals
-%% caption-deu.tex, caption-eng.tex, and caption-rus.tex.
-%%
-\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{newfloat}[2019/09/01 v1.1k Defining new floating environments (AR)]
-\newcommand*\newfloat@Info[1]{%
- \PackageInfo{newfloat}{#1}}
-\newcommand*\newfloat@InfoNoLine[1]{%
- \newfloat@Info{#1\@gobble}}
-\newcommand*\newfloat@Warning[1]{%
- \PackageWarning{newfloat}{#1}}
-\newcommand*\newfloat@WarningNoLine[1]{%
- \newfloat@Warning{#1\@gobble}}
-\newcommand*\newfloat@Error[1]{%
- \PackageError{newfloat}{#1}\newfloat@eh}
-\newcommand*\newfloat@eh{%
- If you do not understand this error, please take a closer look\MessageBreak
- at the documentation of the `newfloat' package.\MessageBreak\@ehc}
-\RequirePackage{keyval}[1997/11/10]
-\newcommand*\newfloat@def[2]{%
- \newfloat@ifundefined{#1}{%
- \@namedef{#1}{#2}}}
-\newcommand*\newfloat@let[2]{%
- \newfloat@ifundefined{#1}{%
- \expandafter\let\csname #1\endcsname#2}}
-\newcommand*\newfloat@ifundefined[2]{%
- \@ifundefined{#1}{#2}{%
- \newfloat@Info{%
- \expandafter\string\csname#1\endcsname\space is already defined}}}
-\newcommand*\DeclareFloatingEnvironment{%
- \@testopt\@DeclareFloatingEnvironment{}}
-\@onlypreamble\DeclareFloatingEnvironment
-\def\@DeclareFloatingEnvironment[#1]#2{%
- \newfloat@Info{New float `#2' with options `#1'}%
- \newfloat@ifundefined{c@#2}{\newcounter{#2}}%
- \@ifundefined{c@float@type}% from float package
- {\@ifundefined{c@newflo@tctr}% from memoir document class
- {\ifdefined\newfloat@ftype \else
- \newcount\newfloat@ftype
- \newfloat@ftype=8\relax
- \fi
- \expandafter\xdef\csname ftype@#2\endcsname{\the\newfloat@ftype}%
- \advance\newfloat@ftype\newfloat@ftype}%
- {\expandafter\edef\csname ftype@#2\endcsname{\the\c@newflo@tctr}%
- \advance\c@newflo@tctr \c@newflo@tctr}}%
- {\expandafter\edef\csname ftype@#2\endcsname{\the\value{float@type}}%
- \addtocounter{float@type}{\value{float@type}}}%
- \newfloat@Info{float type `#2'=\@nameuse{ftype@#2}}%
- \newfloat@def{fnum@#2}%
- {\@nameuse{#2name}\nobreakspace\@nameuse{the#2}%
- \ifdefined\autodot\expandafter\autodot\fi}%
- \newfloat@capitalize\newfloat@Type{#2}%
- \newfloat@let{#2name}{\newfloat@Type}%
- \newfloat@def{fleg#2}{\@nameuse{#2name}}% legend naming (memoir)
- \newfloat@ifundefined{flegtoc#2}{\@namedef{flegtoc#2}##1{}}%
- \ifcsname @tufte@float\endcsname
- \newenvironment{#2}[1][htbp]%
- {\begin{@tufte@float}[{##1}]{#2}{}}%
- {\end{@tufte@float}}%
- \newenvironment{#2*}[1][htbp]%
- {\begin{@tufte@float}[{##1}]{#2}{star}}%
- {\end{@tufte@float}}%
- \else
- \@ifclassloaded{beamer}{%
- \newenvironment{#2}[1][]{\beamer@float{#2}}{\end@beamer@float}%
- }{%
- \newenvironment{#2}{\@float{#2}}{\end@float}%
- \newenvironment{#2*}{\@dblfloat{#2}}{\end@dblfloat}%
- }%
- \fi
- \newfloat@def{listof#2}{\newfloat@listof{#2}}%
- \newfloat@def{listof#2s}{\@nameuse{listof#2}}%
- \newfloat@def{listof#2es}{\@nameuse{listof#2s}}%
- \newfloat@def{newfloat@listof#2@hook}{}%
- \ifdefined\l@figure
- \newfloat@let{l@#2}{\l@figure}%
- \else
- \newfloat@def{l@#2}{\@dottedtocline{1}{1.5em}{2.3em}}%
- \fi
- \edef\newfloat@tempa{List of \newfloat@Type s}%
- \newfloat@let{list#2name}{\newfloat@tempa}%
- \expandafter\let\csname fst@#2\endcsname\@undefined
- \newfloat@ifundefined{fps@#2}{\newfloat@setplacement{#2}{tbp}}%
- \newfloat@ifundefined{ext@#2}{\newfloat@setfileext{#2}{lo#2}}%
- \newfloat@setoptions*{#2}{#1}%
- \@expandtwoargs\newfloat@announce{#2}{\@nameuse{ext@#2}}%
- \@ifnextchar[\newfloat@DFE@setname\relax}
-\@onlypreamble\@DeclareFloatingEnvironment
-\def\newfloat@DFE@setname[#1]{%
- \KV@@newfloat@name{#1}%
- \@ifnextchar[\newfloat@DFE@setlistname\relax}
-\@onlypreamble\newfloat@DFE@setname
-\def\newfloat@DFE@setlistname[#1]{%
- \KV@@newfloat@listname{#1}}
-\@onlypreamble\newfloat@DFE@setlistname
-\newcommand*\newfloat@capitalize[2]{%
- \edef\newfloat@tempa{\gdef\noexpand#1{\@car#2\@nil}}%
- \uppercase\expandafter{\newfloat@tempa}%
- \edef\newfloat@tempa{%
- \noexpand\g@addto@macro\noexpand#1{\@cdr#2\@nil}}%
- \newfloat@tempa}
-\newcommand*\newfloat@listof[1]{%
- \@ifstar
- {\newfloat@list@of{#1}*}%
- {\newfloat@list@of{#1}\relax}}
-\newcommand*\newfloat@list@of[1]{%
- \@expandtwoargs\newfloat@list@of@{#1}{\@nameuse{ext@#1}}}
-\newcommand*\newfloat@list@of@[3]{%
- \begingroup
- \expandafter\let\expandafter\listfigurename\csname list#1name\endcsname
- \def\ext@figure{#2}%
- \let\newfloat@starttoc\@starttoc
- \def\@starttoc##1{\newfloat@starttoc{#2}}%
- \let\newfloat@listoftoc\listoftoc
- \def\listoftoc##1{\newfloat@listoftoc{#2}}%
- \@nameuse{newfloat@listof#1@hook}%
- \listoffigures#3%
- \endgroup}
-\newcommand*\newfloat@setoptions{%
- \@ifstar
- {\newfloat@@setoptions\@firstofone}%
- {\newfloat@@setoptions\@gobble}}
-\newcommand*\newfloat@@setoptions[3]{%
- \let\newfloat@within@value\@undefined
- \let\newfloat@chapterlistsgaps@value\@undefined
- #1{\KV@@newfloat@within\newfloat@within@default}% set default value for new floats
- \def\newfloat@type{#2}%
- \setkeys{@newfloat}{#3}%
- \ifx\newfloat@within@value\@undefined \else
- \newfloat@setoption{within}\newfloat@within@value
- \fi
- \ifx\newfloat@chapterlistsgaps@value\@undefined \else
- \newfloat@setoption{chapterlistsgaps}\newfloat@chapterlistsgaps@value
- \fi}
-\newcommand*\newfloat@within@default{%
- \ifcsname c@chapter\endcsname chapter\else none\fi}
-\@onlypreamble\newfloat@within@default
-\newcommand*\newfloat@setoption[1]{%
- \edef\caption@tempa{\noexpand\@nameuse{newfloat@set#1}{\newfloat@type}}%
- \caption@tempa}
-\newcommand*\newfloat@setfileext[2]{%
- \@namedef{ext@#1}{#2}}
-\define@key{@newfloat}{fileext}{%
- \newfloat@setoption{fileext}{#1}}
-\newcommand*\newfloat@setlistname[2]{%
- \@namedef{list#1name}{#2}}
-\define@key{@newfloat}{listname}{%
- \newfloat@setoption{listname}{#1}}
-\newcommand*\newfloat@setname[2]{%
- \newfloat@@setname{#1}{#2}%
- \begingroup
- \ifcsname languagename\endcsname
- \ifcsname captions\languagename\endcsname
- \expandafter\g@addto@macro\csname captions\languagename\endcsname
- {\newfloat@@setname{#1}{#2}}%
- \fi
- \fi
- \endgroup}
-%%\AtBeginDocument{\let\newfloat@setname\newfloat@@setname}
-\newcommand*\newfloat@@setname[2]{%
- \@namedef{#1name}{#2}}
-\define@key{@newfloat}{name}{%
- \newfloat@setoption{name}{#1}}
-\newcommand*\newfloat@setplacement[2]{%
- \@namedef{fps@#1}{#2}}
-\define@key{@newfloat}{placement}{%
- \newfloat@setoption{placement}{#1}}
-\newcommand*\newfloat@setwithin[2]{%
- \ifcsname c@chapter\endcsname
- \@removefromreset{#1}{chapter}%
- \fi
- \@removefromreset{#1}{section}%
- \edef\@tempa{#2}%
- \ifx\@tempa\@empty
- \def\@tempa{none}%
- \fi
- \def\@tempb{none}%
- \ifx\@tempa\@tempb
- \ifcsname c@chapter\endcsname
- \@chapterlistsgap@off{#1}%
- \fi
- \newfloat@@setwithin{#1}{}{}%
- \else
- \def\@tempb{chapter}%
- \ifx\@tempa\@tempb
- \@addtoreset{#1}{chapter}%
- \@chapterlistsgap@on{#1}%
- \newfloat@@setwithin{#1}{\ifnum\c@chapter>\z@ \thechapter.\fi}{\theHchapter.}%
- \else
- \def\@tempb{section}%
- \ifx\@tempa\@tempb
- \@addtoreset{#1}{section}%
- \ifcsname c@chapter\endcsname
- \@addtoreset{#1}{chapter}%
- \@chapterlistsgap@on{#1}%
- \newfloat@@setwithin{#1}{\thesection.}{\theHsection.}%
- \else
- \newfloat@@setwithin{#1}{\ifnum\c@section>\z@ \thesection.\fi}{\theHsection.}%
- \fi
- \else
- \newfloat@Error{Invalid value `#2' for option `within'}%
- \fi
- \fi
- \fi}
-\newcommand*\newfloat@@setwithin[3]{%
- \global\@namedef{the#1}{#2\arabic{#1}}%
- \global\@namedef{theH#1}{#3\arabic{#1}}}
-\define@key{@newfloat}{within}{%
- \def\newfloat@within@value{#1}}
-\newcommand*\newfloat@setwithout[1]{%
- \newfloat@setwithin{#1}{none}}
-\define@key{@newfloat}{without}[]{%
- \def\newfloat@within@value{none}}
-\newcommand*\newfloat@setchapterlistsgaps[2]{%
- \edef\@tempa{#2}%
- \def\@tempb{off}%
- \ifx\@tempa\@tempb
- \@chapterlistsgap@off{#1}%
- \else
- \def\@tempb{on}%
- \ifx\@tempa\@tempb
- \@chapterlistsgap@on{#1}%
- \else
- \newfloat@Error{Invalid value `#2' for option `chapterlistsgaps'}%
- \fi
- \fi}
-\define@key{@newfloat}{chapterlistsgaps}{%
- \def\newfloat@chapterlistsgaps@value{#1}}
-\providecommand*\@removefromreset[2]{{%
- \expandafter\let\csname c@#1\endcsname\@removefromreset
- \def\@elt##1{%
- \expandafter\ifx\csname c@##1\endcsname\@removefromreset
- \else
- \noexpand\@elt{##1}%
- \fi}%
- \expandafter\xdef\csname cl@#2\endcsname{%
- \csname cl@#2\endcsname}}}
-\newcommand*\newfloat@announce[2]{%
- \@cons\newfloat@list{{#1}}%
- \@cons\newfloat@@list{{#1}}%
- \newfloat@ifundefined{newfloat@ext@#2}{%
- \@namedef{newfloat@ext@#2}{#1}%
- \ifcsname c@lofdepth\endcsname
- \newfloat@ifundefined{c@#2depth}{%
- \newcounter{#2depth}%
- \setcounter{#2depth}{1}}%
- \fi
- \ifcsname addtotoclist\endcsname
- \addtotoclist[float]{#2}%
- \newfloat@def{listof#2name}{\@nameuse{list#1name}}%
- \fi
- }%
- \ifcsname contentsuse\endcsname
- \contentsuse{#1}{#2}%
- \fi
- \newfloat@hook{#1}}
-\@onlypreamble\newfloat@announce
-\newcommand*\newfloat@@list{}
-\newcommand*\SetupFloatingEnvironment[1]{%
- \newfloat@addtolist{#1}%
- \newfloat@setoptions{#1}}
-\newcommand\ForEachFloatingEnvironment{%
- \@ifstar
- {\@ForEachFloatingEnvironment\@gobble}%
- {\@ForEachFloatingEnvironment\@iden}}
-\newcommand\@ForEachFloatingEnvironment[2]{%
- \def\@elt##1{#2}%
- \newfloat@list
- \let\@elt\relax
- #1{\newfloat@addtohook{#2}}}
-\providecommand\newfloat@addtohook[1]{%
- \toks@=\expandafter{\newfloat@hook{##1}#1}%
- \edef\@tempa{\def\noexpand\newfloat@hook####1{\the\toks@}}%
- \@tempa}
-\providecommand*\newfloat@hook[1]{}
-\newcommand\PrepareListOf[1]{%
- \expandafter\g@addto@macro\csname newfloat@listof#1@hook\endcsname}
-\@onlypreamble\PrepareListOf
-\newcommand*\newfloat@list{}
-\newcommand*\newfloat@addtolist[1]{%
- \newfloat@ifinlist{#1}{}{%
- \ifcsname ext@#1\endcsname
- \@cons\newfloat@list{{#1}}%
- \@namedef{newfloat@ext@\@nameuse{ext@#1}}{#1}%
- \newfloat@let{@ifchapterlistsgap@#1}{\@iden}%
- \else
- \newfloat@Error{`#1' does not seem to be a floating environment}%
- \fi}}
-\newcommand*\newfloat@ifinlist[1]{%
- \let\next\@secondoftwo
- \begingroup
- \expandafter\let\csname c@#1\endcsname\newfloat@ifinlist
- \def\@elt##1{%
- \expandafter\ifx\csname c@##1\endcsname\newfloat@ifinlist
- \global\let\next\@firstoftwo
- \fi}%
- \newfloat@list
- \endgroup
- \next}
-\ifcsname ext@figure\endcsname
- \newfloat@addtolist{figure}
-\fi
-\ifcsname ext@table\endcsname
- \newfloat@addtolist{table}
-\fi
-\ifcsname @chapter\endcsname
- \providecommand*\@chapterlistsgap{10\p@}%
- \@ifpackageloaded{dgruyter}{\renewcommand*\@chapterlistsgap{13\p@}}{}%
- \providecommand*\@addchapterlistsgap[2]{%
- \@nameuse{@ifchapterlistsgap@#1}{% if switched on
- \@@addchapterlistsgap{#1}{#2}}}
- \providecommand*\@@addchapterlistsgap[2]{%
- \@ifundefined{@addchapterlistsgap@#2}{% only once per extension
- \@namedef{@addchapterlistsgap@#2}{#1}%
- \@@@addchapterlistsgap{#2}}{}}
- \providecommand*\@@@addchapterlistsgap[1]{%
- \ifdim \@chapterlistsgap>\z@
- \addtocontents{#1}{\protect\addvspace{\@chapterlistsgap}}%
- \fi}
- \providecommand*\@addchapterlistsgaps{%
- \begingroup
- \def\@elt##1{%
- \@expandtwoargs\@addchapterlistsgap{##1}{\@nameuse{ext@##1}}}%
- \newfloat@list
- \endgroup}
- \providecommand*\@chapterlistsgap@off[1]{%
- \expandafter\let\csname @ifchapterlistsgap@#1\endcsname\@gobble
- \ifcsname unsettoc\endcsname
- \@expandtwoargs\unsettoc{\@nameuse{ext@#1}}{chapteratlist}%
- \fi}
- \providecommand*\@chapterlistsgap@on[1]{%
- \expandafter\let\csname @ifchapterlistsgap@#1\endcsname\@iden
- \ifcsname setuptoc\endcsname
- \@expandtwoargs\setuptoc{\@nameuse{ext@#1}}{chapteratlist}%
- \fi}
-\fi
-\define@key{newfloat}{chapterlistsgap}{%
- \renewcommand*\@chapterlistsgap{#1}}
-\define@key{newfloat}{within}{%
- \def\newfloat@within@default{#1}% set new default value
- \def\@elt##1{\newfloat@setwithin{##1}{#1}}%
- \newfloat@list
- \let\@elt\relax}
-\define@key{newfloat}{without}[]{%
- \KV@newfloat@within{none}}
-\def\@elt#1{%
- \define@key{newfloat}{#1name}{%
- \newfloat@setname{#1}{##1}}%
- \define@key{newfloat}{list#1name}{%
- \newfloat@setname{list#1}{##1}}%
- \define@key{newfloat}{#1within}{%
- \newfloat@setwithin{#1}{##1}}%
- \define@key{newfloat}{#1without}[]{%
- \newfloat@setwithout{#1}}%
-}%
-\newfloat@list
-\let\@elt\relax
-\define@key{newfloat}{planb}[true]{%
- \def\@tempa{#1}%
- \def\@tempb{false}%
- \ifx\@tempa\@tempb
- \let\newfloat@ifplanb\@gobble
- \else
- \def\@tempb{true}%
- \ifx\@tempa\@tempb
- \let\newfloat@ifplanb\@iden
- \else
- \newfloat@Error{Invalid value `#1' for option `planb'}%
- \fi
- \fi}
-\define@key{newfloat}{planb-fileext}{%
- \newfloat@Info{Setting Plan B file extension to `#1'}
- \xdef\newfloat@addtocontents@ext{#1}}
-\let\@tempc\relax
-\@expandtwoargs\setkeys{newfloat}{planb,\@ptionlist{\@currname.\@currext}}%
-\AtEndOfPackage{\let\@unprocessedoptions\relax}
-\newcommand*\newfloatsetup{\setkeys{newfloat}}
-\newcommand\newfloat@replace@chapter[3]{%
- \begingroup
- \let\if@twocolumn\iffalse
- \let\if@mainmatter\iffalse
- \let\if@thema\iffalse
- \let\if@chapnum\iffalse
- \def\@tempa[##1]##2{#2}%
- \ifx\@tempa\@chapter
- \newfloat@InfoNoLine{Document class `#1' detected}%
- \gdef\@chapter[##1]##2{#3}%
- \global\let\newfloat@replace@chapter\newfloat@dont@replace@chapter
- \else\ifx\@tempa\Hy@org@chapter
- \newfloat@InfoNoLine{Document class `#1' detected (Hy)}%
- \gdef\Hy@org@chapter[##1]##2{#3}%
- \global\let\newfloat@replace@chapter\newfloat@dont@replace@chapter
- \fi\fi
- \endgroup}
-\newcommand\newfloat@dont@replace@chapter[3]{}
-\ifcsname @chapter\endcsname \else
- \let\newfloat@replace@chapter\newfloat@dont@replace@chapter
-\fi
-\newfloat@replace@chapter{report}{%
- \ifnum \c@secnumdepth >\m@ne
- \refstepcounter{chapter}%
- \typeout{\@chapapp\space\thechapter.}%
- \addcontentsline{toc}{chapter}%
- {\protect\numberline{\thechapter}#1}%
- \else
- \addcontentsline{toc}{chapter}{#1}%
- \fi
- \chaptermark{#1}%
- \addtocontents{lof}{\protect\addvspace{10\p@}}%
- \addtocontents{lot}{\protect\addvspace{10\p@}}%
- \if@twocolumn
- \@topnewpage[\@makechapterhead{#2}]%
- \else
- \@makechapterhead{#2}%
- \@afterheading
- \fi
-}{%
- \ifnum \c@secnumdepth >\m@ne
- \refstepcounter{chapter}%
- \typeout{\@chapapp\space\thechapter.}%
- \addcontentsline{toc}{chapter}%
- {\protect\numberline{\thechapter}#1}%
- \else
- \addcontentsline{toc}{chapter}{#1}%
- \fi
- \chaptermark{#1}%
- \@addchapterlistsgaps
- \if@twocolumn
- \@topnewpage[\@makechapterhead{#2}]%
- \else
- \@makechapterhead{#2}%
- \@afterheading
- \fi}
-\newfloat@replace@chapter{book}{%
- \ifnum \c@secnumdepth >\m@ne
- \if@mainmatter
- \refstepcounter{chapter}%
- \typeout{\@chapapp\space\thechapter.}%
- \addcontentsline{toc}{chapter}%
- {\protect\numberline{\thechapter}#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@twocolumn
- \@topnewpage[\@makechapterhead{#2}]%
- \else
- \@makechapterhead{#2}%
- \@afterheading
- \fi
-}{%
- \ifnum \c@secnumdepth >\m@ne
- \if@mainmatter
- \refstepcounter{chapter}%
- \typeout{\@chapapp\space\thechapter.}%
- \addcontentsline{toc}{chapter}%
- {\protect\numberline{\thechapter}#1}%
- \else
- \addcontentsline{toc}{chapter}{#1}%
- \fi
- \else
- \addcontentsline{toc}{chapter}{#1}%
- \fi
- \chaptermark{#1}%
- \@addchapterlistsgaps
- \if@twocolumn
- \@topnewpage[\@makechapterhead{#2}]%
- \else
- \@makechapterhead{#2}%
- \@afterheading
- \fi}
-\newfloat@replace@chapter{amsbook}{%
- \refstepcounter{chapter}%
- \ifnum\c@secnumdepth<\z@ \let\@secnumber\@empty
- \else \let\@secnumber\thechapter \fi
- \typeout{\chaptername\space\@secnumber}%
- \def\@toclevel{0}%
- \ifx\chaptername\appendixname \@tocwriteb\tocappendix{chapter}{#2}%
- \else \@tocwriteb\tocchapter{chapter}{#2}\fi
- \chaptermark{#1}%
- \addtocontents{lof}{\protect\addvspace{10\p@}}%
- \addtocontents{lot}{\protect\addvspace{10\p@}}%
- \@makechapterhead{#2}\@afterheading
-}{%
- \refstepcounter{chapter}%
- \ifnum\c@secnumdepth<\z@ \let\@secnumber\@empty
- \else \let\@secnumber\thechapter \fi
- \typeout{\chaptername\space\@secnumber}%
- \def\@toclevel{0}%
- \ifx\chaptername\appendixname \@tocwriteb\tocappendix{chapter}{#2}%
- \else \@tocwriteb\tocchapter{chapter}{#2}\fi
- \chaptermark{#1}%
- \@addchapterlistsgaps
- \@makechapterhead{#2}\@afterheading}
-\@ifpackageloaded{tocbasic}{%
- \let\newfloat@replace@chapter\newfloat@dont@replace@chapter}{}
-\ifcsname insertchapterspace\endcsname
- \renewcommand*\insertchapterspace{\@addchapterlistsgaps}
- \let\newfloat@replace@chapter\newfloat@dont@replace@chapter
-\fi
-\newfloat@replace@chapter{rapport}{%
- \ifnum \c@secnumdepth >\m@ne
- \refstepcounter{chapter}%
- \typeout{\@chapapp\space\thechapter.}%
- \addcontentsline{toc}{chapter}%
- {\protect\numberline{\thechapter}\toc@font0 #1}%
- \else
- \addcontentsline{toc}{chapter}{\toc@font0 #1}%
- \fi
- \chaptermark{#1}%
- \addtocontents{lof}{\protect\addvspace{10\p@}}%
- \addtocontents{lot}{\protect\addvspace{10\p@}}%
- \if@twocolumn
- \@topnewpage[\@makechapterhead{#2}]%
- \else
- \@makechapterhead{#2}%
- \@afterheading
- \fi
-}{%
- \ifnum \c@secnumdepth >\m@ne
- \refstepcounter{chapter}%
- \typeout{\@chapapp\space\thechapter.}%
- \addcontentsline{toc}{chapter}%
- {\protect\numberline{\thechapter}\toc@font0 #1}%
- \else
- \addcontentsline{toc}{chapter}{\toc@font0 #1}%
- \fi
- \chaptermark{#1}%
- \@addchapterlistsgaps
- \if@twocolumn
- \@topnewpage[\@makechapterhead{#2}]%
- \else
- \@makechapterhead{#2}%
- \@afterheading
- \fi}
-\newfloat@replace@chapter{boek}{%
- \ifnum \c@secnumdepth >\m@ne
- \if@mainmatter
- \refstepcounter{chapter}%
- \typeout{\@chapapp\space\thechapter.}%
- \addcontentsline{toc}{chapter}%
- {\protect\numberline{\thechapter}\toc@font0 #1}%
- \else
- \addcontentsline{toc}{chapter}{\toc@font0 #1}%
- \fi
- \else
- \addcontentsline{toc}{chapter}{\toc@font0 #1}%
- \fi
- \chaptermark{#1}%
- \addtocontents{lof}{\protect\addvspace{10\p@}}%
- \addtocontents{lot}{\protect\addvspace{10\p@}}%
- \if@twocolumn
- \@topnewpage[\@makechapterhead{#2}]%
- \else
- \@makechapterhead{#2}%
- \@afterheading
- \fi
-}{%
- \ifnum \c@secnumdepth >\m@ne
- \if@mainmatter
- \refstepcounter{chapter}%
- \typeout{\@chapapp\space\thechapter.}%
- \addcontentsline{toc}{chapter}%
- {\protect\numberline{\thechapter}\toc@font0 #1}%
- \else
- \addcontentsline{toc}{chapter}{\toc@font0 #1}%
- \fi
- \else
- \addcontentsline{toc}{chapter}{\toc@font0 #1}%
- \fi
- \chaptermark{#1}%
- \@addchapterlistsgaps
- \if@twocolumn
- \@topnewpage[\@makechapterhead{#2}]%
- \else
- \@makechapterhead{#2}%
- \@afterheading
- \fi}
-\newfloat@replace@chapter{thesis}{%
- \ifnum \c@secnumdepth >\m@ne
- \if@mainmatter
- \refstepcounter{chapter}%
- \typeout{\chaptername\space\thechapter.}
- \if@thema
- \ifx\@shortauthor\@empty
- \addcontentsline{toc}{chapter}{%
- \protect\numberline{\thechapter.}#1}%
- \else
- \addcontentsline{toc}{chapter}{%
- \protect\numberline{\thechapter.}%
- \@shortauthor\hfill\mbox{}\vskip\normallineskip #1}%
- \fi
- \else
- \addcontentsline{toc}{chapter}{%
- \protect\numberline{\thechapter.}#1}%
- \fi
- \else
- \addcontentsline{toc}{chapter}{#1}
- \fi
- \else
- \addcontentsline{toc}{chapter}{#1}
- \fi
- \chaptermark{#1}
- \addtocontents{lof}{\protect\addvspace{10pt}}
- \addtocontents{lot}{\protect\addvspace{10pt}}
- \if@twocolumn
- \@topnewpage[\@makechapterhead{#2}]
- \else
- \@makechapterhead{#2}
- \@afterheading
- \fi
-}{%
- \ifnum \c@secnumdepth >\m@ne
- \if@mainmatter
- \refstepcounter{chapter}%
- \typeout{\chaptername\space\thechapter.}%
- \if@thema
- \ifx\@shortauthor\@empty
- \addcontentsline{toc}{chapter}{%
- \protect\numberline{\thechapter.}#1}%
- \else
- \addcontentsline{toc}{chapter}{%
- \protect\numberline{\thechapter.}%
- \@shortauthor\hfill\mbox{}\vskip\normallineskip #1}%
- \fi
- \else
- \addcontentsline{toc}{chapter}{%
- \protect\numberline{\thechapter.}#1}%
- \fi
- \else
- \addcontentsline{toc}{chapter}{#1}%
- \fi
- \else
- \addcontentsline{toc}{chapter}{#1}%
- \fi
- \chaptermark{#1}%
- \@addchapterlistsgaps
- \if@twocolumn
- \@topnewpage[\@makechapterhead{#2}]%
- \else
- \@makechapterhead{#2}%
- \@afterheading
- \fi}
-\newfloat@replace@chapter{svmono}{%
- \if@chapnum % war mal \ifnum \c@secnumdepth >\m@ne
- \refstepcounter{chapter}%
- \if@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@twocolumn
- \@topnewpage[\@makechapterhead{#2}]%
- \else
- \@makechapterhead{#2}%
- \@afterheading
- \fi
-}{%
- \if@chapnum % war mal \ifnum \c@secnumdepth >\m@ne
- \refstepcounter{chapter}%
- \if@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@twocolumn
- \@topnewpage[\@makechapterhead{#2}]%
- \else
- \@makechapterhead{#2}%
- \@afterheading
- \fi}
-\newfloat@replace@chapter{dgruyter}{%
- \let\thesection\theinchapsection
- \let\theequation\theinchapequation
- \let\thefigure\theinchapfigure
- \let\thetable\theinchaptable
- \ifx\bookDOI\@undefined
- \else
- \@tempcnta\numexpr\componentd@i+\@ne\relax
- \xdef\componentd@i{\the\@tempcnta}%
- \xdef\@DOI{%
- https://doi.org/\bookDOI
- -\ifx\thepage\thefrontmatterpage2\else\ifnum\@tempcnta<100 0\fi\fi
- \ifnum\@tempcnta<10 0\fi\componentd@i}%
- \fi
- \ifnum \c@secnumdepth >\m@ne
- \if@mainmatter
- \refstepcounter{chapter}%
- \typeout{\@chapapp\space\thechapter.}%
- \addcontentsline{toc}{chapter}{\protect\numberline{\thechapter}#1}%
- \else
- \addcontentsline{toc}{schapter}{#1}%
- \fi
- \else
- \addcontentsline{toc}{schapter}{#1}%
- \fi
- \chaptermark{#1}%
- \addtocontents{lof}{\protect\addvspace{13\p@}}%
- \addtocontents{lot}{\protect\addvspace{13\p@}}%
- \if@twocolumn
- \@topnewpage[\@makechapterhead{#2}]%
- \else
- \@makechapterhead{#2}%
- \@afterheading
- \fi
-}{%
- \let\thesection\theinchapsection
- \let\theequation\theinchapequation
- \let\thefigure\theinchapfigure
- \let\thetable\theinchaptable
- \ifx\bookDOI\@undefined
- \else
- \@tempcnta\numexpr\componentd@i+\@ne\relax
- \xdef\componentd@i{\the\@tempcnta}%
- \xdef\@DOI{%
- https://doi.org/\bookDOI
- -\ifx\thepage\thefrontmatterpage2\else\ifnum\@tempcnta<100 0\fi\fi
- \ifnum\@tempcnta<10 0\fi\componentd@i}%
- \fi
- \ifnum \c@secnumdepth >\m@ne
- \if@mainmatter
- \refstepcounter{chapter}%
- \typeout{\@chapapp\space\thechapter.}%
- \addcontentsline{toc}{chapter}{\protect\numberline{\thechapter}#1}%
- \else
- \addcontentsline{toc}{schapter}{#1}%
- \fi
- \else
- \addcontentsline{toc}{schapter}{#1}%
- \fi
- \chaptermark{#1}%
- \@addchapterlistsgaps
- \if@twocolumn
- \@topnewpage[\@makechapterhead{#2}]%
- \else
- \@makechapterhead{#2}%
- \@afterheading
- \fi}
-\ifx\newfloat@replace@chapter\newfloat@dont@replace@chapter \else
- \newfloat@InfoNoLine{%
- Unsupported document class, or \noexpand\@chapter\MessageBreak
- was already redefined by another package}
- \newfloat@InfoNoLine{\string\@chapter\space=\space\meaning\@chapter}
- \newfloat@InfoNoLine{\string\Hy@org@chapter\space=\space\meaning\Hy@org@chapter}
- \newfloat@ifplanb{\AtBeginDocument{%
- \newfloat@InfoNoLine{Trying Plan B..}%
- \let\newfloat@addtocontents@ORI\addtocontents
- \long\def\addtocontents#1#2{%
- \newfloat@addtocontents{#1}{#2}#2\addvspace\newfloat@nil}%
- \long\def\newfloat@addtocontents#1#2#3\addvspace#4\newfloat@nil{%
- \def\newfloat@tempa{#4}%
- \ifx\newfloat@tempa\@empty
- \newfloat@addtocontents@ORI{#1}{#2}%
- \else
- \ifx\newfloat@addtocontents@ext\@undefined
- \newfloat@Info{Setting Plan B file extension to `#1'...}%
- \xdef\newfloat@addtocontents@ext{#1}%
- \fi
- \edef\newfloat@tempa{#1}%
- \ifx\newfloat@tempa\newfloat@addtocontents@ext
- \begingroup
- \let\addtocontents\newfloat@addtocontents@ORI
- \@addchapterlistsgaps
- \endgroup
- \fi
- \fi}}}
-\fi
-\ifcsname beamer@float\endcsname \else
- \def\beamer@float#1{%
- \ifcsname caption@settype\endcsname
- \caption@settype{#1}%
- \else
- \def\@captype{#1}%
- \fi
- \par\nobreak\begin{center}\nobreak}
- \def\end@beamer@float{%
- \par\nobreak\end{center}}
-\fi
-\newcommand\newfloat@IfPackageLoaded[3]{%
- \@ifpackageloaded{#1}{%
- \newfloat@@IfPackageLoaded{#1}{#2}{#3}%
- }{%
- \AtBeginDocument{%
- \@ifpackageloaded{#1}{%
- \newfloat@@IfPackageLoaded{#1}{#2}{#3}%
- }{}}%
- }}
-\@onlypreamble\newfloat@IfPackageLoaded
-\newcommand\newfloat@@IfPackageLoaded[3]{%
- \newfloat@InfoNoLine{`#1' package detected}%
- % Execute code for every previous \DeclareFloatingEnvironment
- \def\@elt##1{\newfloat@@@IfPackageLoaded{#1}{#2}{#3}}%
- \newfloat@@list
- \let\@elt\relax
- % Execute code for every future \DeclareFloatingEnvironment
- \newfloat@addtohook{\newfloat@@@IfPackageLoaded{#1}{#2}{#3}}}
-\@onlypreamble\newfloat@@IfPackageLoaded
-\newcommand\newfloat@@@IfPackageLoaded[3]{%
- \ifcsname#2\endcsname
- \newfloat@WarningNoLine{%
- Command \@backslashchar#2 already defined.\MessageBreak
- (`#1' package support)}%
- \else
- #3%
- \fi}
-\@onlypreamble\newfloat@@@IfPackageLoaded
-\newfloat@IfPackageLoaded{dgruyter}{plist@#1}{%
- \expandafter\newcommand\csname plist@#1\endcsname{%
- \@nameuse{#1name}\space}}
-\newfloat@IfPackageLoaded{float}{newfloat@undefined}{%
- \@nameuse{@ifchapterlistsgap@#1}{% if switched on
- \let\float@do=\relax
- \edef\@tempa{%
- \noexpand\float@exts{\the\float@exts\float@do{\@nameuse{ext@#1}}}}%
- \@tempa}}
-\newfloat@IfPackageLoaded{fltpage}{FP#1}{%
- \newcounter{FP@#1C}%
- \newenvironment{FP#1}{\FP@floatBegin{#1}}{\FP@floatEnd}}
-\providecommand*\ext@lstlisting{lol}%
-\newfloat@IfPackageLoaded{rotating}{sideways#1}{%
- \newenvironment{sideways#1}{\@rotfloat{#1}}{\end@rotfloat}%
- \newenvironment{sideways#1*}{\@rotdblfloat{#1}}{\end@rotdblfloat}}
-\newcommand*\newfloat@For@SC[2]{%
- \def#1{b}% = \sidecaptionvpos{#2}{b} (v1.6)
- \newenvironment{SC#2}%
- {\SC@float[{#1}]{#2}}{\endSC@float}%
- \newenvironment{SC#2*}%
- {\SC@dblfloat[{#1}]{#2}}{\endSC@dblfloat}}
-\@onlypreamble\newfloat@For@SC
-\newfloat@IfPackageLoaded{sidecap}{SC#1}{%
- \expandafter\newfloat@For@SC\csname SC@#1@vpos\endcsname{#1}}
-\newfloat@IfPackageLoaded{wrapfig}{wrap#1}{%
- \newenvironment{wrap#1}{\wrapfloat{#1}}{\endwrapfloat}}
-\endinput
-%%
-%% End of file `newfloat.sty'.
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-25 05:28:59 +0000