texlive[67752] Master/texmf-dist: caption (28jul23)
commits+karl at tug.org
commits+karl at tug.org
Fri Jul 28 22:40:52 CEST 2023
Revision: 67752
http://tug.org/svn/texlive?view=revision&revision=67752
Author: karl
Date: 2023-07-28 22:40:52 +0200 (Fri, 28 Jul 2023)
Log Message:
-----------
caption (28jul23)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/caption/README
trunk/Master/texmf-dist/doc/latex/caption/bicaption.pdf
trunk/Master/texmf-dist/doc/latex/caption/caption.pdf
trunk/Master/texmf-dist/doc/latex/caption/caption2.pdf
trunk/Master/texmf-dist/doc/latex/caption/ltcaption.pdf
trunk/Master/texmf-dist/doc/latex/caption/subcaption.pdf
trunk/Master/texmf-dist/source/latex/caption/bicaption.dtx
trunk/Master/texmf-dist/source/latex/caption/caption-ams-smf.dtx
trunk/Master/texmf-dist/source/latex/caption/caption-beamer.dtx
trunk/Master/texmf-dist/source/latex/caption/caption-elsarticle.dtx
trunk/Master/texmf-dist/source/latex/caption/caption-koma.dtx
trunk/Master/texmf-dist/source/latex/caption/caption-light.dtx
trunk/Master/texmf-dist/source/latex/caption/caption-memoir.dtx
trunk/Master/texmf-dist/source/latex/caption/caption-ntg.dtx
trunk/Master/texmf-dist/source/latex/caption/caption-thesis.dtx
trunk/Master/texmf-dist/source/latex/caption/caption.dtx
trunk/Master/texmf-dist/source/latex/caption/caption2.dtx
trunk/Master/texmf-dist/source/latex/caption/caption3.dtx
trunk/Master/texmf-dist/source/latex/caption/ltcaption.dtx
trunk/Master/texmf-dist/source/latex/caption/subcaption.dtx
trunk/Master/texmf-dist/tex/latex/caption/caption.sty
trunk/Master/texmf-dist/tex/latex/caption/caption3.sty
trunk/Master/texmf-dist/tex/latex/caption/subcaption.sty
Modified: trunk/Master/texmf-dist/doc/latex/caption/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/caption/README 2023-07-28 20:40:36 UTC (rev 67751)
+++ trunk/Master/texmf-dist/doc/latex/caption/README 2023-07-28 20:40:52 UTC (rev 67752)
@@ -1,7 +1,7 @@
==========================================================================
The `caption' package bundle
-Release 2023-03-12
+Release 2023-07-28
Copyright (C) 1994-2023 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
License: LPPL = LaTeX Project Public Licence
@@ -10,24 +10,16 @@
Home page:
https://gitlab.com/axelsommerfeldt/caption
-If you need help for installation please visit:
- https://texfaq.org/FAQ-inst-miktexstar
- https://texfaq.org/FAQ-installthings
- https://texfaq.org/FAQ-privinst
+Important note:
+ The packages offered by this bundle are incompatible to the most recent
+ LaTeX release (2023/06/01), therefore I wouldn't use them.
+ But if the goal is compiling already existing documents which are using
+ one or more of them, please add
+ \RequirePackage[2022/11/01]{latexrelease}
+ to your document file, before the usage of \documentclass.
+ One user has reported that including the `hyperref` package has helped,
+ so you could try this as an alternative.
-If you need help using these packages please visit:
- https://latex.org/forum/
- https://topanswers.xyz/tex
- https://tex.stackexchange.com/
- https://golatex.de/ (German)
- https://texwelt.de/ (German)
-
-If you think you may have found a bug in these packages,
-or want to report a suggestion for improvement, please either visit
- https://gitlab.com/axelsommerfeldt/caption/issues
-or send an e-mail to
- axel.sommerfeldt at f-m.fm
-
--------------------------------------------------------------------------
The `caption' package v3.6 offers customization of captions of floating
@@ -40,9 +32,9 @@
Furthermore the `floatrow', the `subcaption', and the `subfig' package
supports the `caption' package and uses its \captionsetup interface.
-User Manual: caption.pdf (English)
+User Manual: caption.pdf (English, currently in review)
-An outdated user manual in Russian and German could be downloaded from
+Outdated user manuals in Russian and German could be downloaded from
https://gitlab.com/axelsommerfeldt/caption/-/tree/master/doc/outdated
--------------------------------------------------------------------------
Modified: trunk/Master/texmf-dist/doc/latex/caption/bicaption.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/caption/caption.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/caption/caption2.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/subcaption.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/caption/bicaption.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/caption/bicaption.dtx 2023-07-28 20:40:36 UTC (rev 67751)
+++ trunk/Master/texmf-dist/source/latex/caption/bicaption.dtx 2023-07-28 20:40:52 UTC (rev 67752)
@@ -36,69 +36,20 @@
% \iffalse
%<*driver>
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesFile{bicaption.drv}[2023/03/11 v1.6 Adds a bilingual caption feature to the caption package]
-\hbadness=9999 \newcount\hbadness \hfuzz=74pt % Make TeX shut up.
+\ProvidesFile{bicaption.drv}[2023/07/10 v1.6 Adds a bilingual caption feature to the caption package]
%\errorcontextlines=3
%
-\documentclass[german,english]{ltxdoc}
-\setlength\parindent{0pt}
-\setlength\parskip{\smallskipamount}
+\documentclass[german,english]{captiondoc}
+\hypersetup{pdfkeywords={LaTeX, package, bicaption}}
%
-\usepackage{ifpdf}
-\ifpdf
- \usepackage{mathptmx,courier}
- \usepackage[scaled=0.90]{helvet}
- \addtolength\marginparwidth{15pt}
-\fi
-%
\usepackage[T1]{fontenc}
\usepackage[german,english]{babel}
%\usepackage{selinput}\SelectInputMappings{adieresis={ä},germandbls={ß}}
\usepackage[utf8]{inputenc}
%
-\usepackage[bottom]{footmisc}
-%
-\usepackage{hypdoc}
-\ifpdf\usepackage{hypdestopt}\fi
-\hypersetup{pdfkeywords={LaTeX, package, bicaption},pdfstartpage={},pdfstartview={}}
-%
\usepackage{bicaption}[2023/02/19]
\usepackage{subcaption}[2023/02/19]
%
-\newcommand*\purerm[1]{{\upshape\mdseries\rmfamily #1}}
-\newcommand*\puresf[1]{{\upshape\mdseries\sffamily #1}}
-\newcommand*\purett[1]{{\upshape\mdseries\ttfamily #1}}
-\let\package\puresf
-\let\env\purett \let\opt\purett
-%
-\newcommand*\csmarg[1]{\texttt{\char`\{#1\char`\}}}
-\newcommand*\csoarg[1]{\texttt{\char`\[#1\char`\]}}
-\newcommand*\version[2][]{v$#2$}
-%
-\usepackage{marvosym}
-\makeatletter
-\newcommand*\INFO{\@ifstar{\@INFO{}}{\@INFO{\vbox to \ht\strutbox}}}
-\newcommand*\@INFO[1]{\MARGINSYM{#1{\LARGE\Info}}}
-\makeatother
-%
-\usepackage[alpine]{ifsym}
-\newenvironment{background}{\par\bigskip\csname background*\endcsname}{\csname endbackground*\endcsname}
-\newenvironment{background*}{\small\MARGINSYM{\Mountain}\ignorespaces}{\par}
-%
-\makeatletter
-\newcommand*\MARGINSYM[1]{\hskip 1sp \marginpar{\raggedleft\textcolor{blue}{{#1}}}}
-\newcommand*\NEW[1]{\@ifstar{\@NEW{#1}{\vskip2pt}}{\@NEW{#1}{}}}
-\newcommand*\@NEW[3]{\MARGINSYM{#2\footnotesize#1\\#3}}
-\makeatother
-%
-\newenvironment{Options}[1]%
- {\list{}{\renewcommand\makelabel[1]{\texttt{##1}\hfil}%
- \settowidth\labelwidth{\texttt{#1\space}}%
- \setlength\leftmargin{10pt}%
- \addtolength\leftmargin{\labelwidth}%
- \addtolength\leftmargin{\labelsep}}}%
- {\endlist}
-%
\begin{document}
\DocInput{bicaption.dtx}
\end{document}
@@ -105,15 +56,9 @@
%</driver>
% \fi
%
-% \let\subsectionautorefname\sectionautorefname
-% \let\subsubsectionautorefname\sectionautorefname
+% \def\thispackage{the \pkg{bicaption} package}
+% \def\Thispackage{The \pkg{bicaption} package}
%
-% \def\thispackage{the \package{bicaption} package}
-% \def\Thispackage{The \package{bicaption} package}
-%
-% \newcommand\NEWfeature{\NEW{New feature}}
-% \newcommand\NEWdescription{\NEW{New description}}
-%
% \GetFileInfo{bicaption.drv}
% \let\docdate\filedate
% \let\docversion\fileversion
@@ -142,7 +87,7 @@
% \begin{quote}
% |\usepackage|\oarg{options}|{bicaption}|\quad.
% \end{quote}
-% The options for \thispackage\ are the same ones as for the \package{caption}
+% The options for \thispackage\ are the same ones as for the \pkg{caption}
% package and specify settings which are used for the second language \emph{additionally}.
% In fact
% \begin{quote}
@@ -154,8 +99,8 @@
% |\bicaptionsetup{}|\marg{options}\quad.
% \end{quote}
%
-% When used with the \package{babel} or \package{polyglossia} package, the
-% \package{bicaption} package should be loaded \emph{after} it, so the main
+% When used with the \pkg{babel} or \pkg{polyglossia} package, the
+% \pkg{bicaption} package should be loaded \emph{after} it, so the main
% language will be set automatically. See \autoref{sec:babel} for details.
%
% \pagebreak[3]
@@ -169,7 +114,7 @@
% \begin{quote}
% |\bicaptionsetup|\marg{options for 1st language}\marg{options for 2nd language}
% \end{quote}
-% sets options which will be used for the first resp.\ second heading
+% sets options which will be used for the first or second heading
% of the bilingual captions \emph{additionally} to the ones which are setup for the
% specific floating environment.
%
@@ -201,6 +146,7 @@
% \item Environmental bilingual settings
% {\small(|\bicaptionsetup[figure|\emph{ -or- }|table]{|\ldots|}{|\ldots|}|)}
% \end{enumerate}
+% \pagebreak[3]
% An example:
% \begin{quote}
% |\usepackage[labelsep=quad,indention=10pt]{caption}|\\
@@ -241,7 +187,7 @@
% \label{sec:additional-options}
%
% These options are available additional to the ones offered by the
-% \package{caption} package:
+% \pkg{caption} package:
%
% \begin{Options}{language=}
% \item[lang=]
@@ -305,7 +251,7 @@
% will place |3pt| extra vertical space between the two bilingual captions.
% \par\medskip
% \textit{Note:} In contrast to the original \LaTeX\ code for |\caption| the
-% \package{caption} package does not apply |\normal|\-|size| directly
+% \pkg{caption} package does not apply |\normal|\-|size| directly
% but will apply the caption font definition |normal|\-|size| instead
% (which is usually defined as |\normal|\-|size|).
% Therefore the vertical space between both captions
@@ -333,6 +279,14 @@
%
% \medskip
%
+% Just like in |\caption| an empty \meta{list entry} will suppress the entry in the list of figures or tables, for example
+% \begin{quote}
+% |\bicaption[]|\marg{heading \#1}|[]|\marg{heading \#2}
+% \end{quote}
+% suppresses both entries.
+%
+% \medskip
+%
% \DescribeMacro\bicaptionbox
% Bilingual caption boxes will be typeset by
% \begin{quote}
@@ -346,7 +300,7 @@
%
% \begingroup\small
% (For a description of the optional parameters \meta{width} and \meta{inner-pos}
-% please take a look at the \package{caption} package documentation,
+% please take a look at the \pkg{caption} package documentation,
% \cs{captionbox}.)
% \endgroup
%
@@ -355,8 +309,8 @@
% \label{sec:lists}
%
% \DescribeMacro{list=}
-% As default both caption texts will be insert into the List of Figures resp. List of Tables.
-% To suppress the second entry just pass the option |list=off| to the \package{bicaption}
+% As default both caption texts will be insert into the List of Figures or List of Tables.
+% To suppress the second entry just pass the option |list=off| to the \pkg{bicaption}
% package, e.g.:
% \begin{quote}
% |\usepackage[lang=english,|\ldots|,list=off]{bicaption}|
@@ -374,7 +328,7 @@
% \begin{quote}
% |listtype+=|\meta{list type extension}
% \end{quote}
-% can be used to tell the \package{bicaption} package to use a different list
+% can be used to tell the \pkg{bicaption} package to use a different list
% for the second caption text.
% The given value will be appended to the current environment type;
% for example with |listtype+=X| the list entries will be put into the list
@@ -382,10 +336,11 @@
% |figureX| ($=$ |figure| $+$ |X|), |tableX| ($=$ |table| $+$ |X|) etc.
%
% Such a \meta{list type} can be defined using |\Declare|\-|Floating|\-|Environment|
-% offered by the \package{newfloat} package, but some document classes
+% offered by the \pkg{newfloat} package, but some document classes
% or other packages offer macros for defining new floating environment types
% (and their corresponding lists) as well.
%
+% \pagebreak[3]
% A sample document:
% \begin{quote}
% |\documentclass[a4paper]{article}|\\
@@ -394,21 +349,21 @@
% |\usepackage[english,ngerman]{babel}|\\
% ||\\
% |% Load the bicaption package with 2nd language set to|\\
-% |% "english", and list type "figureEng" resp. "tableEng"|\\
-% |\usepackage[lang=english,listtype+=Eng]{bicaption}|\\
+% |% "english", and list type "figureEnglish" or "tableEnglish"|\\
+% |\usepackage[lang=english,listtype+=English]{bicaption}|\\
% ||\\
% |\usepackage{newfloat}|\\
-% |% Define type "figureEng" and \listoffigureEng|\\
-% |\DeclareFloatingEnvironment[fileext=lof2]{figureEng}|\\
+% |% Define type "figureEnglish" and \listoffigureEnglish|\\
+% |\DeclareFloatingEnvironment[fileext=lof2]{figureEnglish}|\\
% | [Figure][List of Figures]|\\
-% |% Define type "tableEng" and \listoftableEng|\\
-% |\DeclareFloatingEnvironment[fileext=lot2]{tableEng}|\\
+% |% Define type "tableEnglish" and \listoftableEnglish|\\
+% |\DeclareFloatingEnvironment[fileext=lot2]{tableEnglish}|\\
% | [Table][List of Tables]|\\
% ||\\
% |\begin{document}|\\
% ||\\
-% |\listoffigures % typeset "Abbildungsverzeichnis"|\\
-% |\listoffigureEng % typeset "List of Figures"|\\
+% |\listoffigures % typeset "Abbildungsverzeichnis"|\\
+% |\listoffigureEnglish % typeset "List of Figures"|\\
% ||\\
% |\begin{figure}|\\
% | \centering|\\
@@ -421,9 +376,9 @@
%
% \pagebreak[3]
% A different approach is using one list for both languages, but with different formatting.
-% Since the \package{caption} package does not offer options and commands for
+% Since the \pkg{caption} package does not offer options and commands for
% customising the format of the lists, one need an additional package for this purpose,
-% for example the \package{titletoc} package:
+% for example the \pkg{titletoc} package:
%
% \begin{quote}
% |\documentclass[a4paper]{article}|\\
@@ -432,7 +387,7 @@
% |\usepackage[english,ngerman]{babel}|\\
% ||\\
% |% Load the bicaption package with 2nd language set to|\\
-% |% "english", and list type "figure2" resp. "table2"|\\
+% |% "english", and list type "figure2" or "table2"|\\
% |\usepackage[lang=english,listtype+=2]{bicaption}|\\
% ||\\
% |% We load the titletoc package for customising lists|\\
@@ -486,10 +441,10 @@
% |\caption|\-|main|\-|lan|\-|guage| contains the main language, for example
% `french' or `german'.
% If not set manually, \thispackage\ will try to obtain this setting from
-% the \package{babel} or \package{polyglossia} package after the preamble of
+% the \pkg{babel} or \pkg{polyglossia} package after the preamble of
% the document, i.e.~at |\begin{doc|\-|u|\-|ment}|.
%
-% So if you are using either \package{babel} or \package{polyglossia}, and want to inherit
+% So if you are using either \pkg{babel} or \pkg{polyglossia}, and want to inherit
% the main language setting from it, then simply forget about the
% |\caption|\-|main|\-|lan|\-|guage| stuff and skip the rest of the section.
%
@@ -517,8 +472,8 @@
% for setting the language of the list entry \meta{font-or-list-entry} will be
% |\@second|\-|of|\-|two|.~\footnote{\cs{@firstoftwo} and \cs{@secondoftwo} are defined
% in the \LaTeX\ kernel and simply pick either the 1st or 2nd argument.}
-% It defaults to |\select at lan|\-|guage| (caption) resp.~|\select|\-|lan|\-|guage| (list entry)
-% offered by the \package{babel} and \package{polyglossia} package:
+% It defaults to |\select at lan|\-|guage| (caption) or |\select|\-|lan|\-|guage| (list entry)
+% offered by the \pkg{babel} and \pkg{polyglossia} package:
% \begin{quote}
% |\providecommand*\selectcaptionlanguage[2]{%|\\
% | #1{\select at language}{\selectlanguage}{#2}}|
@@ -527,7 +482,7 @@
% loading \thispackage, or redefine it afterwards.
%
% \pagebreak[3]
-% Example document using \package{babel}:
+% Example document using \pkg{babel}:
% \begin{quote}
% |\documentclass[a4paper]{article}|\\
% ||\\
@@ -562,7 +517,7 @@
% \pagebreak[3]
% The same example document but using a custom implementation of
% |\caption|\-|main|\-|language| and |\select|\-|caption|\-|language|
-% instead of \package{babel}:
+% instead of \pkg{babel}:
% \begin{quote}
% |\documentclass[a4paper]{article}|\\
% ||\\
@@ -606,7 +561,7 @@
% Since \version{1.5} a warning is issued if the main language could neither be
% detected automatically nor was it set explicitly by the user.
% If you really don't want to set languages for bi-captions but are annoyed by
-% the warning you could trick the \package{bicaption} by defining a custom
+% the warning you could trick the \pkg{bicaption} by defining a custom
% dummy language-selection mechanism, e.g.:
% \begin{quote}
% |\newcommand\captionmainlanguage{dummy}|\\
@@ -615,6 +570,7 @@
%
% \medskip
%
+% \pagebreak[3]
% \DescribeMacro{\DeclareCaption-\\LangOption}
% \NEWfeature*{v1.2}
% For internal implementation reasons the selection of language will be done delayed,
@@ -626,6 +582,7 @@
% be set to |quad| afterwards. Some time later, right before the caption is actually
% typeset, the language will be set to |ngerman|.
%
+% \pagebreak[3]
% 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}
@@ -636,6 +593,7 @@
% 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.
%
+% \pagebreak[3]
% For that reason the command
% \begin{quote}
% |\DeclareCaptionLangOption|\marg{caption option name}
@@ -657,14 +615,14 @@
% \label{sec:caption}
%
% \NEWfeature{v1.4}
-% Starting with version $1.4$ the \package{bicaption} package requires at least version $3.2$
-% of the \package{caption} package and loads it automatically.
-% (Older versions of the \package{bicaption} package have required exactly the version of the
-% \package{caption} package which was released with it.)
+% Starting with version $1.4$ the \pkg{bicaption} package requires at least version $3.2$
+% of the \pkg{caption} package and loads it automatically.
+% (Older versions of the \pkg{bicaption} package have required exactly the version of the
+% \pkg{caption} package which was released with it.)
%
% \pagebreak[3]
-% If you need to use a specific version of the \package{caption} package you need to load it
-% \emph{before} the \package{bicaption} package, e.g.:
+% If you need to use a specific version of the \pkg{caption} package you need to load it
+% \emph{before} the \pkg{bicaption} package, e.g.:
% \begin{quote}
% |\usepackage[| \ldots |]{caption}[=v3.5]|\\
% |\usepackage[| \ldots |]{bicaption}|
@@ -671,27 +629,28 @@
% \end{quote}
%
% \pagebreak[3]
-% Note that there are limitations if an older version of the \package{caption} package
+% Note that there are limitations if an older version of the \pkg{caption} package
% is used:
% \begin{itemize}
% \item Full support of list entries of the \env{lstlisting} environment
-% (offered by the \package{listings} package) needs at least \package{caption} \version{3.6}.
+% (offered by the \pkg{listings} package) needs at least \pkg{caption} \version{3.6}.
% \end{itemize}
%
% \section{Supported packages}
% \label{sec:packages}
%
-% The \package{bicaption} package was adapted to the following packages which deals with captions, too:
-% \package{listings}~\cite{listings}, \package{longtable}~\cite{longtable}, and \package{subcaption}~\cite{subcaption}.
+% The \pkg{bicaption} package was adapted to the following packages which deals with captions, too:
+% \pkg{listings}~\cite{listings}, \pkg{longtable}~\cite{longtable}, and \pkg{subcaption}~\cite{subcaption}.
%
% \subsection{Support of the listings package}
% \label{sec:listings}
%
% \NEWfeature{v1.5}
-% If the \package{listings} package~\cite{listings} is loaded, the \package{listings} options \opt{caption1}
+% If the \pkg{listings} package~\cite{listings} is loaded, the \pkg{listings} options \opt{caption1}
% and \opt{caption2} are available additionally, where option \opt{caption1} specifies the
% caption of the first language and \opt{caption2} of the second one.
%
+% \pagebreak[3]
% Example document, using distinctive lists for each language:
% \begin{quote}
% |\documentclass[a4paper]{article}|\\
@@ -701,8 +660,8 @@
% |\usepackage[english,ngerman]{babel}|\\
% ||\\
% |% Load the bicaption package with 2nd language set to|\\
-% |% "english", and list type "figureEng" resp. "tableEng"|\\
-% |\usepackage[lang=english,listtype+=Eng,font=it]{bicaption}|\\
+% |% "english", and list type "figureEnglish" or "tableEnglish"|\\
+% |\usepackage[lang=english,listtype+=English,font=it]{bicaption}|\\
% |\captionsetup{slc=off} % do not center short captions|\\
% ||\\
% |\usepackage{listings}|\\
@@ -721,15 +680,15 @@
% |}|\\
% ||\\
% |\usepackage{newfloat}|\\
-% |% Define the new floating environment type "lstlistingEng"|\\
+% |% Define the new floating environment type "lstlistingEnglish"|\\
% |% (just to get an extra list for English listing captions)|\\
-% |\DeclareFloatingEnvironment[fileext=lol2]{lstlistingEng}|\\
+% |\DeclareFloatingEnvironment[fileext=lol2]{lstlistingEnglish}|\\
% | [Listing][List of Listings]|\\
% ||\\
% |\begin{document}|\\
% ||\\
-% |\lstlistoflistings % German|\\
-% |\listoflstlistingEng % English|\\
+% |\lstlistoflistings % German|\\
+% |\listoflstlistingEnglish % English|\\
% ||\\
% |\clearpage|\\
% ||\\
@@ -750,7 +709,7 @@
% \subsection{Support of the longtable package}
% \label{sec:longtable}
%
-% If the \package{longtable} package~\cite{longtable} is loaded, |\bicaption| is available
+% If the \pkg{longtable} package~\cite{longtable} is loaded, |\bicaption| is available
% in the \env{longtable} environment as well, e.g.:
% \begin{quote}
% |\documentclass[a4paper]{article}|\\
@@ -779,11 +738,12 @@
% \subsection{Support of the subcaption package}
% \label{sec:subcaption}
%
-% If the \package{subcaption} package~\cite{subcaption} is loaded, these commands are available
+% If the \pkg{subcaption} package~\cite{subcaption} is loaded, these commands are available
% additionally:
%
% \smallskip
%
+% \pagebreak[3]
% \DescribeMacro\bisubcaption
% Bilingual sub-captions will be typeset by
% \begin{quote}
@@ -793,6 +753,7 @@
% \end{quote}
% The |\label| should be placed either after this command, or inside the first heading.
%
+% \pagebreak[3]
% \DescribeMacro\bisubcaptionbox
% Bilingual sub-caption boxes will be typeset by
% \begin{quote}
@@ -806,7 +767,7 @@
%
% \begingroup\small
% (For a description of the optional parameters \meta{width} and \meta{inner-pos}
-% please take a look at the \package{subcaption} package documentation,
+% please take a look at the \pkg{subcaption} package documentation,
% \cs{subcaptionbox}.)
% \endgroup
%
@@ -1115,7 +1076,7 @@
% \changes{v0.7}{2010/07/13}{Option \opt{bi-lang} added}
% \changes{v0.8}{2010/09/04}{Adapted to current version of the caption kernel}
% \changes{v0.9}{2010/09/17}{Option \opt{bi-swap} added}
-% \changes{v0.9a}{2011/07/13}{Warning regarding \package{babel} package added}
+% \changes{v0.9a}{2011/07/13}{Warning regarding \pkg{babel} package added}
%
% \newcommand*\Note[2][Note]{\par{\small\emph{#1:} #2}}
%
@@ -1154,7 +1115,7 @@
\ProvidesPackage{bicaption}[2023/02/19 v1.6 Bilingual Captions (AR)]
% \end{macrocode}
%
-% Since we base on the \package{caption} package we load it here.
+% Since we base on the \pkg{caption} package we load it here.
% \begin{macrocode}
\RequirePackage{caption}[2011/11/10] % we need at least v3.2e
% \end{macrocode}
@@ -1296,7 +1257,7 @@
%
% The option |lang=|\meta{language} will setup the language of the caption.
% We can't set the language immediately because otherwise we will get in trouble, e.g. when
-% using the \package{microtype} package via |\usepackage[babel]{microtype}|.
+% using the \pkg{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. Therefore we will save specific options
@@ -1374,7 +1335,7 @@
{\bicaption at language}%
\bicaption at language@setoptions}}
% \end{macrocode}
-% |\caption at beginhook| (of the \package{caption} package kernel) will be extended here
+% |\caption at beginhook| (of the \pkg{caption} package kernel) will be extended here
% so the language setting will actually take effect.
% \begin{macrocode}
\g at addto@macro\caption at beginhook{%
@@ -1403,8 +1364,8 @@
% Set the language for the first caption.
% (Since \version{1.5a} we do this |\At|\-|Begin|\-|Document| so
% |\caption|\-|main|\-|language| could be defined \emph{after} loading the
-% \package{bicaption} package resp.~\package{babel} or \package{polyglossia}
-% could be loaded \emph{after} the \package{bicaption} package.)
+% \pkg{bicaption} package or \pkg{babel} or \pkg{polyglossia}
+% could be loaded \emph{after} the \pkg{bicaption} package.)
% \begin{macrocode}
\AtBeginDocument{%
\ifcsname captionmainlanguage\endcsname
@@ -1459,8 +1420,8 @@
% \begin{macro}{\caption at addcontentsline}
% \changes{v1.0}{2011/08/31}{Redefinition of \cs{caption at kernel@addcontentsline} added}
% \changes{v1.0b}{2012/01/15}{\cs{caption at kernel@addcontentsline} changed to \cs{caption at addcontentsline}}
-% \changes{v1.1}{2016/02/01}{Adaption to \package{longtable} package added}
-% We patch |\caption at add|\-|contents|\-|line| (of the \package{caption} package kernel)
+% \changes{v1.1}{2016/02/01}{Adaption to \pkg{longtable} package added}
+% We patch |\caption at add|\-|contents|\-|line| (of the \pkg{caption} package kernel)
% so |bi|\-|caption at add|\-|contents|\-|line| will be used for bilingual captions instead.
% \begin{macrocode}
\let\bicaption at addcontentsline@ORI\caption at addcontentsline
@@ -1525,7 +1486,7 @@
%
% \begin{macro}{\caption@@make}
% \changes{v1.4}{2020/12/25}{Fallback code of \cs{caption@@make@} added}
-% We redefine |\caption@@make| (of the \package{caption} package kernel)
+% We redefine |\caption@@make| (of the \pkg{caption} package kernel)
% so |\bi|\-|caption@@make| will be used for bilingual captions instead.
% \begin{macrocode}
\caption at ifundefined\caption@@make@
@@ -1621,7 +1582,7 @@
% applies the given list of options.
% \begin{macrocode}
\newcommand*\bicaptionsetup{%
- \caption at teststar\@bicaptionsetup*{}}
+ \caption at teststar\@bicaptionsetup*{}}
% \end{macrocode}
% \begin{macrocode}
\newcommand*\@bicaptionsetup[1]{%
@@ -1846,13 +1807,13 @@
% \changes{v1.1}{2013/05/02}{Definition of \cs{bicaption at listof} removed}
%
% \subsection{Support of the listings package}
-% \changes{v1.5}{2021/01/04}{Support of the \package{listings} package added}
+% \changes{v1.5}{2021/01/04}{Support of the \pkg{listings} package added}
%
% \begin{macrocode}
\caption at IfPackageLoaded{listings}[2004/02/13 v1.2]{%
% \end{macrocode}
%
-% If the \package{listings} package is loaded, we define the new options `caption1' and `caption2'.
+% If the \pkg{listings} package is loaded, we define the new options `caption1' and `caption2'.
% \begin{macrocode}
\lst at Key{caption1}\relax{%
\lstKV at OptArg[{#1}]{#1}{%
@@ -1881,10 +1842,10 @@
% \subsection{Support of the longtable package}
%
% \begin{macro}{\LT at bicaption}
-% \changes{v1.1}{2016/01/31}{Adaption to \package{longtable} package added}
-% Same as |\@bicaption| but for |longtable| (offered by the \package{longtable} package).
+% \changes{v1.1}{2016/01/31}{Adaption to \pkg{longtable} package added}
+% Same as |\@bicaption| but for |longtable| (offered by the \pkg{longtable} package).
% |\bi|\-|caption at LT|\-|setup| will be executed later on, inside |\LT at make|\-|caption|
-% offered by the \package{caption} package.
+% offered by the \pkg{caption} package.
% \begin{macrocode}
\newcommand\LT at bicaption{%
\noalign\bgroup
@@ -1920,10 +1881,10 @@
% \end{macro}
%
% \begin{macro}{\caption at LT@setup}
-% \changes{v1.1}{2016/01/31}{Adaption to \package{longtable} package added}
-% \changes{v1.4}{2020/12/25}{Fallback code for \package{caption} package \version{3.2} added}
+% \changes{v1.1}{2016/01/31}{Adaption to \pkg{longtable} package added}
+% \changes{v1.4}{2020/12/25}{Fallback code for \pkg{caption} package \version{3.2} added}
% Execute the stuff defined by \cs{LT at bicaption} to prepare the typesetting
-% of the \package{longtable} bilingual caption.
+% of the \pkg{longtable} bilingual caption.
% \begin{macrocode}
\caption at ifundefined\caption at LT@setup{%
% Fallback code for caption v3.2
Modified: trunk/Master/texmf-dist/source/latex/caption/caption-ams-smf.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/caption/caption-ams-smf.dtx 2023-07-28 20:40:36 UTC (rev 67751)
+++ trunk/Master/texmf-dist/source/latex/caption/caption-ams-smf.dtx 2023-07-28 20:40:52 UTC (rev 67752)
@@ -2,7 +2,7 @@
%
% This is file `caption-ams-smf.dtx'.
%
-% Copyright (C) 2007-2022 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
+% Copyright (C) 2007-2023 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
%
% --------------------------------------------------------------------------
%
@@ -36,35 +36,12 @@
% \iffalse
%<*driver>
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesFile{caption-ams-smf.drv}[2022/12/27 v2.0 Implementation of the caption-ams-smf package]
-\hbadness=9999 \newcount\hbadness \hfuzz=100pt % Make TeX shut up.
+\ProvidesFile{caption-ams-smf.drv}[2023/07/10 v2.0 Implementation of the caption-ams-smf package]
%\errorcontextlines=3
%
-\documentclass{ltxdoc}
-\setlength\parindent{0pt}
-\setlength\parskip{\smallskipamount}
+\documentclass{captiondoc}
+\hypersetup{pdfkeywords={LaTeX, package, caption-ams-smf}}
%
-\makeatletter % make room for subsections like 2.16.14 in the TOC
-%\newcommand*\l at subsection{\@dottedtocline{2}{1.5em}{2.3em}}
-\renewcommand*\l at subsection{\@dottedtocline{2}{1.5em}{2.7em}}
-\makeatother
-%
-\usepackage{ifpdf}
-\ifpdf
- \usepackage{mathptmx,courier}
- \usepackage[scaled=0.90]{helvet}
- \addtolength\marginparwidth{15pt}
-\fi
-%
-\usepackage{hypdoc}
-\ifpdf\usepackage{hypdestopt}\fi
-\hypersetup{pdfkeywords={LaTeX, package, caption},pdfstartpage={},pdfstartview={}}
-%
-\DeclareRobustCommand*\AmS{\texorpdfstring
- {{\protect\usefont{OMS}{cmsy}{m}{n}A\kern-.1667em\lower.5ex\hbox{M}\kern-.125emS}}%
- {AMS}}
-\DeclareRobustCommand*\SmF{SMF}
-%
\begin{document}
\DocInput{caption-ams-smf.dtx}
\end{document}
@@ -71,16 +48,6 @@
%</driver>
% \fi
%
-% \newcommand*\purerm[1]{\texorpdfstring{{\upshape\mdseries\rmfamily #1}}{#1}}
-% \newcommand*\puresf[1]{\texorpdfstring{{\upshape\mdseries\sffamily #1}}{#1}}
-% \newcommand*\purett[1]{\texorpdfstring{{\upshape\mdseries\ttfamily #1}}{#1}}
-% \let\class\puresf \let\package\puresf
-% \let\env\purett \let\opt\purett
-%
-% \newcommand*\csmarg[1]{\texttt{\char`\{#1\char`\}}}
-% \newcommand*\csoarg[1]{\texttt{\char`\[#1\char`\]}}
-% \newcommand*\version[2][]{v$#2$}
-%
% \GetFileInfo{caption-ams-smf.drv}
% \let\docdate\filedate
% \let\docversion\fileversion
@@ -87,7 +54,7 @@
% \GetFileInfo{caption-ams-smf.sto}
%
% \title{\texorpdfstring
-% {The adaption of the \package{caption} package to the \AmS\ and \SmF\ document classes\thanks{%^^A
+% {The adaption of the \pkg{caption} package to the \AmS\ and \SmF\ document classes\thanks{%^^A
% This adaption has version number \docversion.}}%^^A
% {The adaption of the caption package to the AMS and SMF document classes}}
% \author{Axel Sommerfeldt\\
@@ -96,7 +63,7 @@
% \maketitle
%
% \begin{abstract}
-% This package adapts the \package{caption} package to the \AmS\ and \SmF\ document classes.
+% This package adapts the \pkg{caption} package to the \AmS\ and \SmF\ document classes.
% \end{abstract}
%
% \section*{User manual}
@@ -172,7 +139,7 @@
% \newcommand*\Note[2][Note]{\par{\small\emph{#1:} #2}\par}
%
% \changes{v1.1}{2007/07/29}{\AmS\ \& \SmF\ classes support added}
-% \changes{v2.0}{2020/07/27}{\AmS\ \& \SmF\ class support adapted to \package{caption3}~\version{2.0}}
+% \changes{v2.0}{2020/07/27}{\AmS\ \& \SmF\ class support adapted to \pkg{caption3}~\version{2.0}}
%
% \iffalse
% --------------------------------------------------------------------------- %
@@ -191,7 +158,7 @@
\ProvidesFile{caption-ams-smf.sto}[2020/08/22 v2.0 Adaption of the caption package to the AMS and SMF document classes (AR)]
% \end{macrocode}
%
-% \section{Margin resp. width}
+% \section{Margin or width}
%
% The \AmS\ document classes use |\caption|\-|indent| as fixed margin, usually set to |3pc|.
% \begin{macrocode}
@@ -206,8 +173,8 @@
%
% \section{Fonts}
%
-% The `default' fonts map to |\@caption|\-|font| resp.~|\@caption|\-|head|\-|font|
-% which are usually set to |\sc|\-|shape| resp.~|\normalfont|.
+% The `default' fonts map to |\@caption|\-|font| or |\@caption|\-|head|\-|font|
+% which are usually set to |\sc|\-|shape| or |\normal|\-|font|.
%
% \begin{macrocode}
\DeclareCaptionFont{ams at font}{\@captionfont}
@@ -221,11 +188,11 @@
% \section{Vertical spaces before and after captions}
%
% The \AmS\ document classes uses |\above|\-|caption|\-|skip| and |\below|\-|caption|\-|skip|
-% different than the standard document classes and the \package{caption} package:
+% different than the standard document classes and the \pkg{caption} package:
% They typeset |\above|\-|caption|\-|skip| before the `figure' caption and
% |\below|\-|caption|\-|skip| after all other captions. Both are preset to |12pt|.
%
-% For this reason we have to set the |\below|\-|caption|\-|skip| to |0pt| if the \package{caption}
+% For this reason we have to set the |\below|\-|caption|\-|skip| to |0pt| if the \pkg{caption}
% package is used, so no extra vertical space will be created.
%
% \begin{macrocode}
Modified: trunk/Master/texmf-dist/source/latex/caption/caption-beamer.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/caption/caption-beamer.dtx 2023-07-28 20:40:36 UTC (rev 67751)
+++ trunk/Master/texmf-dist/source/latex/caption/caption-beamer.dtx 2023-07-28 20:40:52 UTC (rev 67752)
@@ -2,7 +2,7 @@
%
% This is file `caption-beamer.dtx'.
%
-% Copyright (C) 2007-2022 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
+% Copyright (C) 2007-2023 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
%
% --------------------------------------------------------------------------
%
@@ -36,30 +36,12 @@
% \iffalse
%<*driver>
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesFile{caption-beamer.drv}[2022/12/27 v2.0 Implementation of the caption-beamer package]
-\hbadness=9999 \newcount\hbadness \hfuzz=100pt % Make TeX shut up.
+\ProvidesFile{caption-beamer.drv}[2023/07/10 v2.0 Implementation of the caption-beamer package]
%\errorcontextlines=3
%
-\documentclass{ltxdoc}
-\setlength\parindent{0pt}
-\setlength\parskip{\smallskipamount}
+\documentclass{captiondoc}
+\hypersetup{pdfkeywords={LaTeX, package, caption-beamer}}
%
-\makeatletter % make room for subsections like 2.16.14 in the TOC
-%\newcommand*\l at subsection{\@dottedtocline{2}{1.5em}{2.3em}}
-\renewcommand*\l at subsection{\@dottedtocline{2}{1.5em}{2.7em}}
-\makeatother
-%
-\usepackage{ifpdf}
-\ifpdf
- \usepackage{mathptmx,courier}
- \usepackage[scaled=0.90]{helvet}
- \addtolength\marginparwidth{15pt}
-\fi
-%
-\usepackage{hypdoc}
-\ifpdf\usepackage{hypdestopt}\fi
-\hypersetup{pdfkeywords={LaTeX, package, caption},pdfstartpage={},pdfstartview={}}
-%
\begin{document}
\DocInput{caption-beamer.dtx}
\end{document}
@@ -66,16 +48,6 @@
%</driver>
% \fi
%
-% \newcommand*\purerm[1]{\texorpdfstring{{\upshape\mdseries\rmfamily #1}}{#1}}
-% \newcommand*\puresf[1]{\texorpdfstring{{\upshape\mdseries\sffamily #1}}{#1}}
-% \newcommand*\purett[1]{\texorpdfstring{{\upshape\mdseries\ttfamily #1}}{#1}}
-% \let\class\puresf \let\package\puresf
-% \let\env\purett \let\opt\purett
-%
-% \newcommand*\csmarg[1]{\texttt{\char`\{#1\char`\}}}
-% \newcommand*\csoarg[1]{\texttt{\char`\[#1\char`\]}}
-% \newcommand*\version[2][]{v$#2$}
-%
% \GetFileInfo{caption-beamer.drv}
% \let\docdate\filedate
% \let\docversion\fileversion
@@ -82,7 +54,7 @@
% \GetFileInfo{caption-beamer.sto}
%
% \title{\texorpdfstring
-% {The adaption of the \package{caption} package to the \class{beamer} document class\thanks{%^^A
+% {The adaption of the \pkg{caption} package to the \cls{beamer} document class\thanks{%^^A
% This adaption has version number \docversion.}}%^^A
% {The adaption of the caption package to the beamer document class}}
% \author{Axel Sommerfeldt\\
@@ -91,7 +63,7 @@
% \maketitle
%
% \begin{abstract}
-% This package adapts the \package{caption} package to the \class{beamer} document class.
+% This package adapts the \pkg{caption} package to the \cls{beamer} document class.
% \end{abstract}
%
% \section*{User manual}
@@ -166,13 +138,13 @@
% \setlength{\parskip}{0pt plus 1pt}
% \newcommand*\Note[2][Note]{\par{\small\emph{#1:} #2}\par}
%
-% \changes{v1.1}{2007/03/10}{\class{beamer} class support added}
-% \changes{v1.3}{2011/08/06}{\class{beamer} class support revised}
-% \changes{v1.5}{2013/04/27}{The \class{beamer} template \texttt{caption label separator} will be used now}
-% \changes{v1.7}{2016/05/22}{Re-definition of label format \texttt{simpleMagyar} added to \class{beamer} class support}
+% \changes{v1.1}{2007/03/10}{\cls{beamer} class support added}
+% \changes{v1.3}{2011/08/06}{\cls{beamer} class support revised}
+% \changes{v1.5}{2013/04/27}{The \cls{beamer} template \texttt{caption label separator} will be used now}
+% \changes{v1.7}{2016/05/22}{Re-definition of label format \texttt{simpleMagyar} added to \cls{beamer} class support}
% \changes{v1.7}{2018/04/15}{Re-definition of label format \texttt{simpleMagyar} revised}
-% \changes{v1.7}{2018/05/01}{Definition of \class{beamer} default label font revised}
-% \changes{v2.0}{2020/07/27}{\class{beamer} class support adapted to \package{caption3}~\version{2.0}}
+% \changes{v1.7}{2018/05/01}{Definition of \cls{beamer} default label font revised}
+% \changes{v2.0}{2020/07/27}{\cls{beamer} class support adapted to \pkg{caption3}~\version{2.0}}
%
% \iffalse
% --------------------------------------------------------------------------- %
@@ -220,15 +192,15 @@
% \end{macrocode}
%
% \begin{macro}{\footnote}
-% \changes{v1.12b}{2020/07/20}{Special adaption to \class{beamer} added}
-% The patch of \cs{footnote} provided by the \package{caption3} package assumes
+% \changes{v1.12b}{2020/07/20}{Special adaption to \cls{beamer} added}
+% The patch of \cs{footnote} provided by the \pkg{caption3} package assumes
% that the optional arguments of \cs{footnote} and \cs{footnotemark} match.
-% Since this is not the case in \class{beamer} based documents,
-% and since \class{beamer} extents the syntax of \cs{footnote} in a special way,
+% Since this is not the case in \cls{beamer} based documents,
+% and since \cls{beamer} extents the syntax of \cs{footnote} in a special way,
% we need a special patch here.\par
% \emph{Note:} For this patch we assume that \cs{footnote} will always end with the usage of
% \cs{beamer at footnotetext}. (Unfortunately \cs{footnote} is defined too monolithic
-% in \class{beamer} to offer a less dirty patch.)
+% in \cls{beamer} to offer a less dirty patch.)
% \begin{macrocode}
\providecommand*\AtCaptionSingleLineCheck{\g at addto@macro\caption at prepareslc} % for caption v3.5
\let\caption at footnote@ORI\footnote
@@ -254,7 +226,7 @@
{#1}{#2}}
% \end{macrocode}
%
-% The \package{magyar} babel package redefines the current label format to a one called |simple|\-|Magyar|,
+% The \pkg{magyar} babel package redefines the current label format to a one called |simple|\-|Magyar|,
% defined within |\@@magyar at caption|\-|fix| which will be executed |\At|\-|Begin|\-|Document|:
% \begin{quote}
% |\DeclareCaptionLabelFormat{simpleMagyar}%|\\
@@ -268,7 +240,7 @@
{\caption at labelformat@unnumbered{#1}{#2}}}
% \end{macrocode}
% \begin{macro}{\@@magyar at captionfix}
-% Prevent \package{magyar} from defining this caption label format on its own.
+% Prevent \pkg{magyar} from defining this caption label format on its own.
% \begin{macrocode}
\let\@@magyar at captionfix\relax
\AtBeginDocument{\let\@@magyar at captionfix\relax}
@@ -299,7 +271,7 @@
%
% \section{Fonts}
%
-% The `default' caption font maps to the beamer settings for `caption' resp. `caption name'.
+% The `default' caption font maps to the beamer settings for `caption' or `caption name'.
% \begin{macrocode}
\DeclareCaptionFont{beamer at font}{%
\usebeamerfont*{caption}%
@@ -340,8 +312,8 @@
% \end{macrocode}
%
% \begin{macro}{\figure}
-% \changes{v1.1f}{2007/12/17}{This re-definition for \class{beamer} document class added}
-% \changes{v1.8d}{2019/09/01}{This re-definition for \class{beamer} document class revised}
+% \changes{v1.1f}{2007/12/17}{This re-definition for \cls{beamer} document class added}
+% \changes{v1.8d}{2019/09/01}{This re-definition for \cls{beamer} document class revised}
% We re-define |figure| so our type-specific options will be used etc.
% \begin{macrocode}
\expandafter\let\expandafter\caption at beamer@figure
@@ -353,8 +325,8 @@
% \end{macro}
%
% \begin{macro}{\table}
-% \changes{v1.1f}{2007/12/17}{This re-definition for \class{beamer} document class added}
-% \changes{v1.8d}{2019/09/01}{This re-definition for \class{beamer} document class revised}
+% \changes{v1.1f}{2007/12/17}{This re-definition for \cls{beamer} document class added}
+% \changes{v1.8d}{2019/09/01}{This re-definition for \cls{beamer} document class revised}
% \changes{v1.8e}{2019/10/18}{Bug fixed which was introduced in previous revision}
% We re-define |table| as well so our type-specific options will be used etc.
% \begin{macrocode}
@@ -367,9 +339,9 @@
% \end{macro}
%
% \begin{macro}{\caption at nobreak}
-% \changes{v2.0c}{2022/01/06}{This re-definition for \class{beamer} document class added}
+% \changes{v2.0c}{2022/01/06}{This re-definition for \cls{beamer} document class added}
% We re-define |\caption at nobreak| to activate the usage of |\nobreak| inside |\caption|.
-% |\caption at nobreak| is only available since \version{3.6} of the \package{caption}
+% |\caption at nobreak| is only available since \version{3.6} of the \pkg{caption}
% package, for this reason we use |\def| instead of |\renewcommand|.
% \begin{macrocode}
\def\caption at nobreak{\nobreak}
Modified: trunk/Master/texmf-dist/source/latex/caption/caption-elsarticle.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/caption/caption-elsarticle.dtx 2023-07-28 20:40:36 UTC (rev 67751)
+++ trunk/Master/texmf-dist/source/latex/caption/caption-elsarticle.dtx 2023-07-28 20:40:52 UTC (rev 67752)
@@ -37,29 +37,11 @@
%<*driver>
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
\ProvidesFile{caption-elsarticle.drv}[2022/12/27 v2.0 Implementation of the caption-elsarticle package]
-\hbadness=9999 \newcount\hbadness \hfuzz=100pt % Make TeX shut up.
%\errorcontextlines=3
%
-\documentclass{ltxdoc}
-\setlength\parindent{0pt}
-\setlength\parskip{\smallskipamount}
+\documentclass{captiondoc}
+\hypersetup{pdfkeywords={LaTeX, package, caption-elsarticle}}
%
-\makeatletter % make room for subsections like 2.16.14 in the TOC
-%\newcommand*\l at subsection{\@dottedtocline{2}{1.5em}{2.3em}}
-\renewcommand*\l at subsection{\@dottedtocline{2}{1.5em}{2.7em}}
-\makeatother
-%
-\usepackage{ifpdf}
-\ifpdf
- \usepackage{mathptmx,courier}
- \usepackage[scaled=0.90]{helvet}
- \addtolength\marginparwidth{15pt}
-\fi
-%
-\usepackage{hypdoc}
-\ifpdf\usepackage{hypdestopt}\fi
-\hypersetup{pdfkeywords={LaTeX, package, caption},pdfstartpage={},pdfstartview={}}
-%
\begin{document}
\DocInput{caption-elsarticle.dtx}
\end{document}
@@ -66,16 +48,6 @@
%</driver>
% \fi
%
-% \newcommand*\purerm[1]{\texorpdfstring{{\upshape\mdseries\rmfamily #1}}{#1}}
-% \newcommand*\puresf[1]{\texorpdfstring{{\upshape\mdseries\sffamily #1}}{#1}}
-% \newcommand*\purett[1]{\texorpdfstring{{\upshape\mdseries\ttfamily #1}}{#1}}
-% \let\class\puresf \let\package\puresf
-% \let\env\purett \let\opt\purett
-%
-% \newcommand*\csmarg[1]{\texttt{\char`\{#1\char`\}}}
-% \newcommand*\csoarg[1]{\texttt{\char`\[#1\char`\]}}
-% \newcommand*\version[2][]{v$#2$}
-%
% \GetFileInfo{caption-elsarticle.drv}
% \let\docdate\filedate
% \let\docversion\fileversion
@@ -82,7 +54,7 @@
% \GetFileInfo{caption-elsarticle.sto}
%
% \title{\texorpdfstring
-% {The adaption of the \package{caption} package to the \class{elsarticle} document class\thanks{%^^A
+% {The adaption of the \pkg{caption} package to the \cls{elsarticle} document class\thanks{%^^A
% This adaption has version number \docversion.}}%^^A
% {The adaption of the caption package to the elsarticle document class}}
% \author{Axel Sommerfeldt\\
@@ -91,7 +63,7 @@
% \maketitle
%
% \begin{abstract}
-% This package adapts the \package{caption} package to the \package{elsarticle} document class.
+% This package adapts the \pkg{caption} package to the \pkg{elsarticle} document class.
% \end{abstract}
%
% \section*{User manual}
@@ -166,8 +138,8 @@
% \setlength{\parskip}{0pt plus 1pt}
% \newcommand*\Note[2][Note]{\par{\small\emph{#1:} #2}\par}
%
-% \changes{v1.5}{2013/01/06}{\class{elsarticle} class support added}
-% \changes{v2.0}{2020/07/27}{\class{elsarticle} class support adapted to \package{caption3}~\version{2.0}}
+% \changes{v1.5}{2013/01/06}{\cls{elsarticle} class support added}
+% \changes{v2.0}{2020/07/27}{\cls{elsarticle} class support adapted to \pkg{caption3}~\version{2.0}}
%
% \iffalse
% --------------------------------------------------------------------------- %
Modified: trunk/Master/texmf-dist/source/latex/caption/caption-koma.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/caption/caption-koma.dtx 2023-07-28 20:40:36 UTC (rev 67751)
+++ trunk/Master/texmf-dist/source/latex/caption/caption-koma.dtx 2023-07-28 20:40:52 UTC (rev 67752)
@@ -2,7 +2,7 @@
%
% This is file `caption-koma.dtx'.
%
-% Copyright (C) 2004-2022 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
+% Copyright (C) 2004-2023 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
%
% --------------------------------------------------------------------------
%
@@ -36,34 +36,12 @@
% \iffalse
%<*driver>
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesFile{caption-koma.drv}[2022/12/27 v2.0 Implementation of the caption-koma package]
-\hbadness=9999 \newcount\hbadness \hfuzz=100pt % Make TeX shut up.
+\ProvidesFile{caption-koma.drv}[2023/07/10 v2.0 Implementation of the caption-koma package]
%\errorcontextlines=3
%
-\documentclass{ltxdoc}
-\setlength\parindent{0pt}
-\setlength\parskip{\smallskipamount}
+\documentclass{captiondoc}
+\hypersetup{pdfkeywords={LaTeX, package, caption-koma}}
%
-\makeatletter % make room for subsections like 2.16.14 in the TOC
-%\newcommand*\l at subsection{\@dottedtocline{2}{1.5em}{2.3em}}
-\renewcommand*\l at subsection{\@dottedtocline{2}{1.5em}{2.7em}}
-\makeatother
-%
-\usepackage{ifpdf}
-\ifpdf
- \usepackage{mathptmx,courier}
- \usepackage[scaled=0.90]{helvet}
- \addtolength\marginparwidth{15pt}
-\fi
-%
-\usepackage{hypdoc}
-\ifpdf\usepackage{hypdestopt}\fi
-\hypersetup{pdfkeywords={LaTeX, package, caption},pdfstartpage={},pdfstartview={}}
-%
-\DeclareRobustCommand*\KOMAScript{\texorpdfstring
- {\textsf{K\kern.05em O\kern.05em M\kern.05em A\kern.1em-\kern.1em Script}}%
- {KOMA-Script}}
-%
\begin{document}
\DocInput{caption-koma.dtx}
\end{document}
@@ -70,16 +48,6 @@
%</driver>
% \fi
%
-% \newcommand*\purerm[1]{\texorpdfstring{{\upshape\mdseries\rmfamily #1}}{#1}}
-% \newcommand*\puresf[1]{\texorpdfstring{{\upshape\mdseries\sffamily #1}}{#1}}
-% \newcommand*\purett[1]{\texorpdfstring{{\upshape\mdseries\ttfamily #1}}{#1}}
-% \let\cls\puresf \let\pkg\puresf
-% \let\env\purett \let\opt\purett
-%
-% \newcommand*\csmarg[1]{\texttt{\char`\{#1\char`\}}}
-% \newcommand*\csoarg[1]{\texttt{\char`\[#1\char`\]}}
-% \newcommand*\version[2][]{v$#2$}
-%
% \GetFileInfo{caption-koma.drv}
% \let\docdate\filedate
% \let\docversion\fileversion
@@ -204,7 +172,7 @@
\ProvidesFile{caption-koma.sto}[2022/12/27 v2.0c Adaption of the caption package to the KOMA-Script document classes (AR)]
% \end{macrocode}
%
-% \section{Margin resp. width}
+% \section{Margin or width}
%
% \begin{macro}{\setcapwidth}
% \changes{v1.9}{2018/12/26}{Bugfix: Missing curly braces added}
@@ -364,7 +332,7 @@
%
% \section{Fonts}
%
-% The `default' fonts map to \cs{scr at fnt@caption} resp. \cs{scr at fnt@captonlabel}.
+% The `default' fonts map to \cs{scr at fnt@caption} or \cs{scr at fnt@captonlabel}.
% \begin{macrocode}
\DeclareCaptionFont{scr at font}{\scr at fnt@caption}
\DeclareCaptionFont{scr at labelfont}{\scr at fnt@captionlabel}
Modified: trunk/Master/texmf-dist/source/latex/caption/caption-light.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/caption/caption-light.dtx 2023-07-28 20:40:36 UTC (rev 67751)
+++ trunk/Master/texmf-dist/source/latex/caption/caption-light.dtx 2023-07-28 20:40:52 UTC (rev 67752)
@@ -37,54 +37,13 @@
%<*driver>
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
\ProvidesFile{caption-light.drv}[2020/08/24 v1.0 Customizing captions (AR)]
-\hbadness=9999 \newcount\hbadness \hfuzz=74pt % Make TeX shut up.
%\errorcontextlines=3
%
-\documentclass{ltxdoc}
-\setlength\parindent{0pt}
-\setlength\parskip{\smallskipamount}
+\documentclass{captiondoc}
+\hypersetup{pdfkeywords={LaTeX, package, caption-light}}
%
-\newcommand\LineBreak{\linebreak[3]}
-\newcommand\PageBreak{\pagebreak[3]}
-\usepackage{ifpdf}
-\ifpdf
- \usepackage{mathptmx,courier}
- \usepackage[scaled=0.90]{helvet}
- \addtolength\marginparwidth{15pt}
- \ifdim\paperheight=297mm % a4paper
- \renewcommand\LineBreak{\\}
- \renewcommand\PageBreak{\clearpage}
- \fi
-\fi
-%
-\usepackage[bottom]{footmisc}
-%
-\PassOptionsToPackage{breaklinks=true}{hyperref}
-\usepackage{hypdoc}
-\ifpdf\usepackage{hypdestopt}\fi
-\hypersetup{pdfkeywords={LaTeX, package, subcaption},pdfstartpage={},pdfstartview={}}
-%
\usepackage{caption-light}[2020/08/23] % needs v1.0 or newer
%
-\newcommand*\purerm[1]{{\upshape\mdseries\rmfamily #1}}
-\newcommand*\puresf[1]{{\upshape\mdseries\sffamily #1}}
-\newcommand*\purett[1]{{\upshape\mdseries\ttfamily #1}}
-\let\package\puresf
-\let\env\purett \let\opt\purett
-%
-\newcommand*\csmarg[1]{\texttt{\char`\{#1\char`\}}}
-\newcommand*\csoarg[1]{\texttt{\char`\[#1\char`\]}}
-\newcommand*\version[2][]{v$#2$}
-%
-\usepackage{marvosym}
-\makeatletter
-\newcommand*\INFO{\@ifstar{\@INFO{}}{\@INFO{\vbox to \ht\strutbox}}}
-\newcommand*\@INFO[1]{\MARGINSYM{#1{\LARGE\Info}}}
-\makeatother
-%
-\newcommand*\MARGINSYM[1]{\hskip 1sp \marginpar{\raggedleft\textcolor{blue}{{#1}}}}
-\newcommand*\NEW[2]{\MARGINSYM{\vskip2pt\footnotesize#1\\#2}}
-%
\begin{document}
\DocInput{caption-light.dtx}
\end{document}
@@ -91,21 +50,9 @@
%</driver>
% \fi
%
-% \let\subsectionautorefname\sectionautorefname
-% \let\subsubsectionautorefname\sectionautorefname
+% \def\thispackage{the \pkg{caption-light} package}
+% \def\Thispackage{The \pkg{caption-light} package}
%
-% \def\thispackage{the \package{caption-light} package}
-% \def\Thispackage{The \package{caption-light} package}
-%
-% \newcommand\NEWfeature{\NEW{New feature}}
-% \newcommand\NEWdescription{\NEW{New description}}
-%
-% \makeatletter
-% \def\Ref{\@ifstar{\@Ref\ref}{\@Ref\autoref}}
-% \def\@Ref#1#2{#1{#2}: \textit{\nameref{#2}}}
-% \makeatother
-% \def\See#1{\nopagebreak{\small (See #1)}}
-%
% \GetFileInfo{caption-light.drv}
% \let\docdate\filedate
% \let\docversion\fileversion
@@ -126,9 +73,9 @@
% \textit{Please note:} Many document classes already have build-in options and
% commands for customizing captions.
% If these possibilities are sufficient for you, there is usually no need for
-% you to use the \package{caption} package at all.
+% you to use the \pkg{caption} package at all.
% And if you are just interested in using the command \cs{captionof}, loading
-% of the very small \package{capt-of} package is usually sufficient.
+% of the very small \pkg{capt-of} package is usually sufficient.
% \end{abstract}
%
% \iffalse\clearpage\fi
@@ -148,7 +95,7 @@
% \ldots\\
% |\captionsetup|\marg{options}
% \end{quote}
-% As opposite to the \package{caption} package only a limited set of options is
+% As opposite to the \pkg{caption} package only a limited set of options is
% supported by \thispackage:
% |aboveskip=|\ldots,
% |belowskip=|\ldots,
@@ -161,7 +108,7 @@
% |skip=|\ldots, and
% |textfont=|\ldots
%
-% See \package{caption} package documentation for the meaning and usage of
+% See \pkg{caption} package documentation for the meaning and usage of
% these options.
%
% \section{Commands}
@@ -171,7 +118,7 @@
%
% \section{Why this package?}
%
-% This package offers some advantages over the \package{caption} package:
+% This package offers some advantages over the \pkg{caption} package:
% \begin{itemize}
% \item It does not depend on correct |\hsize| for "long" captions,
% just like the original definition included in |article|, |report|, and |book|.
@@ -185,7 +132,7 @@
% \end{itemize}
%
% In short it's a more compatible and less troublesome variant of the
-% \package{caption} package, but (much) less powerful.
+% \pkg{caption} package, but (much) less powerful.
%
% \iffalse
% --------------------------------------------------------------------------- %
@@ -302,7 +249,7 @@
%
% \section{\cs{@makecaption}}
%
-% If the \package{caption} package is loaded, we abort processing this file.
+% If the \pkg{caption} package is loaded, we abort processing this file.
% \begin{macrocode}
\caption at ifdefined\caption at makecaption
{\caption at Info{\noexpand\caption at makecaption is already defined}%
@@ -314,7 +261,7 @@
% |\@makecaption|\marg{label}\marg{text}\\
% We do basically the same as the original code (from the standard
% \LaTeX\ document classes), but take care of selected settings
-% offered by the \package{caption3} kernel.
+% offered by the \pkg{caption3} kernel.
% \begin{macrocode}
\long\def\caption at makecaption#1#2{%
\caption at iftop\caption at belowskip\caption at aboveskip
Modified: trunk/Master/texmf-dist/source/latex/caption/caption-memoir.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/caption/caption-memoir.dtx 2023-07-28 20:40:36 UTC (rev 67751)
+++ trunk/Master/texmf-dist/source/latex/caption/caption-memoir.dtx 2023-07-28 20:40:52 UTC (rev 67752)
@@ -2,7 +2,7 @@
%
% This is file `caption-memoir.dtx'.
%
-% Copyright (C) 2011-2022 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
+% Copyright (C) 2011-2023 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
%
% --------------------------------------------------------------------------
%
@@ -36,30 +36,12 @@
% \iffalse
%<*driver>
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesFile{caption-memoir.drv}[2022/12/27 v2.2 Implementation of the caption-memoir package]
-\hbadness=9999 \newcount\hbadness \hfuzz=100pt % Make TeX shut up.
+\ProvidesFile{caption-memoir.drv}[2023/07/10 v2.2 Implementation of the caption-memoir package]
%\errorcontextlines=3
%
-\documentclass{ltxdoc}
-\setlength\parindent{0pt}
-\setlength\parskip{\smallskipamount}
+\documentclass{captiondoc}
+\hypersetup{pdfkeywords={LaTeX, package, caption-memoir}}
%
-\makeatletter % make room for subsections like 2.16.14 in the TOC
-%\newcommand*\l at subsection{\@dottedtocline{2}{1.5em}{2.3em}}
-\renewcommand*\l at subsection{\@dottedtocline{2}{1.5em}{2.7em}}
-\makeatother
-%
-\usepackage{ifpdf}
-\ifpdf
- \usepackage{mathptmx,courier}
- \usepackage[scaled=0.90]{helvet}
- \addtolength\marginparwidth{15pt}
-\fi
-%
-\usepackage{hypdoc}
-\ifpdf\usepackage{hypdestopt}\fi
-\hypersetup{pdfkeywords={LaTeX, package, caption},pdfstartpage={},pdfstartview={}}
-%
\begin{document}
\DocInput{caption-memoir.dtx}
\end{document}
@@ -66,16 +48,6 @@
%</driver>
% \fi
%
-% \newcommand*\purerm[1]{\texorpdfstring{{\upshape\mdseries\rmfamily #1}}{#1}}
-% \newcommand*\puresf[1]{\texorpdfstring{{\upshape\mdseries\sffamily #1}}{#1}}
-% \newcommand*\purett[1]{\texorpdfstring{{\upshape\mdseries\ttfamily #1}}{#1}}
-% \let\class\puresf \let\package\puresf
-% \let\env\purett \let\opt\purett
-%
-% \newcommand*\csmarg[1]{\texttt{\char`\{#1\char`\}}}
-% \newcommand*\csoarg[1]{\texttt{\char`\[#1\char`\]}}
-% \newcommand*\version[2][]{v$#2$}
-%
% \GetFileInfo{caption-memoir.drv}
% \let\docdate\filedate
% \let\docversion\fileversion
@@ -82,7 +54,7 @@
% \GetFileInfo{caption-memoir.sto}
%
% \title{\texorpdfstring
-% {The adaption of the \package{caption} package to the \class{memoir} document class\thanks{%^^A
+% {The adaption of the \pkg{caption} package to the \cls{memoir} document class\thanks{%^^A
% This adaption has version number \docversion.}}%^^A
% {The adaption of the caption package to the memoir document class}}
% \author{Axel Sommerfeldt\\
@@ -91,7 +63,7 @@
% \maketitle
%
% \begin{abstract}
-% This package adapts the \package{caption} package to the \class{memoir} document class.
+% This package adapts the \pkg{caption} package to the \cls{memoir} document class.
% \end{abstract}
%
% \section*{User manual}
@@ -166,8 +138,8 @@
% \setlength{\parskip}{0pt plus 1pt}
% \newcommand*\Note[2][Note]{\par{\small\emph{#1:} #2}\par}
%
-% \changes{v1.4a}{2011/10/21}{\class{memoir} class support added}
-% \changes{v2.0}{2020/07/27}{\class{memoir} class support adapted to \package{caption3}~\version{2.0}}
+% \changes{v1.4a}{2011/10/21}{\cls{memoir} class support added}
+% \changes{v2.0}{2020/07/27}{\cls{memoir} class support adapted to \pkg{caption3}~\version{2.0}}
%
% \iffalse
% --------------------------------------------------------------------------- %
@@ -188,13 +160,13 @@
%
% \section{Adaptions already included in the caption package}
%
-% The following adaptions to the \class{memoir} document class are already included in the \package{caption} package:
+% The following adaptions to the \cls{memoir} document class are already included in the \pkg{caption} package:
% \begin{itemize}
% \item \cs{@caption} expands \cs{memcaptioninfo}
% \item \cs{caption at prepareanchor} expands \cs{M at gettitle}
% \item \cs{caption at refstepcounter} expands \cs{donemaincaptiontrue}
% \item All sub-caption counters will be reset at |\@mem|\-|reset|\-|sub|\-|counter|,
-% even if they weren't defined by the \class{memoir} document class itself.
+% even if they weren't defined by the \cls{memoir} document class itself.
% As work-around this command will be patched to protect the counters
% defined by |\Declare|\-|Caption|\-|Sub|\-|Type|.
% \end{itemize}
@@ -221,7 +193,7 @@
%
% \begin{macro}{\captiondelim}
% \changes{v2.1}{2020/10/10}{Re-definition of \cs{captiondelim} added}
-% We re-define |\caption|\-|delim| so it will set the \package{caption3} label separator setting, too.
+% We re-define |\caption|\-|delim| so it will set the \pkg{caption3} label separator setting, too.
% \begin{macrocode}
\let\caption at memoir@delim\captiondelim
\renewcommand\captiondelim{%
@@ -232,9 +204,9 @@
%
% \changes{v2.0a}{2020/10/10}{Re-definition of label separator `gobble' added}
% If |\fnum at figure| (or |\fnum at table| or\ldots) ends with |\@gobble|, the `:' part of the caption
-% label separator will be suppressed when a standard document class (\class{article}, \class{report},
-% or \class{book}) will be used, leaving the following space character intact.
-% This is different when using the \class{memoir} document class, in this case the complete
+% label separator will be suppressed when a standard document class (\cls{article}, \cls{report},
+% or \cls{book}) will be used, leaving the following space character intact.
+% This is different when using the \cls{memoir} document class, in this case the complete
% label separator will be suppressed. For this reason we re-define the pre-defined caption label
% separator `gobble' to emulate this behaviour.
%
@@ -244,7 +216,7 @@
%
% \section{Fonts}
%
-% The `default' caption fonts map to \cs{@contnfont} resp.~\cs{conttfont}.
+% The `default' caption fonts map to \cs{@contnfont} or \cs{conttfont}.
% \begin{macrocode}
\DeclareCaptionFont{@contnfont}{\@contnfont}
\SetCaptionDefault{labelfont}{@contnfont}
@@ -256,7 +228,7 @@
%
% \begin{macro}{\captionnamefont}
% \changes{v2.1}{2020/10/10}{Re-definition of \cs{captionnamefont} added}
-% We re-define |\caption|\-|delim| so it will set the \package{caption3} label separator setting, too.
+% We re-define |\caption|\-|delim| so it will set the \pkg{caption3} label separator setting, too.
% \begin{macrocode}
\let\caption at memoir@namefont\captionnamefont
\renewcommand\captionnamefont{%
@@ -267,7 +239,7 @@
%
% \begin{macro}{\captiontitlefont}
% \changes{v2.1}{2020/10/10}{Re-definition of \cs{captiontitlefont} added}
-% We re-define |\caption|\-|delim| so it will set the \package{caption3} label separator setting, too.
+% We re-define |\caption|\-|delim| so it will set the \pkg{caption3} label separator setting, too.
% \begin{macrocode}
\let\caption at memoir@titlefont\captiontitlefont
\renewcommand\captiontitlefont{%
@@ -278,12 +250,12 @@
%
% \section{Vertical spaces before and after captions}
%
-% The \class{memoir} document classes uses |\above|\-|caption|\-|skip| and |\below|\-|caption|\-|skip|
-% different than the standard document classes and the \package{caption} package:
+% The \cls{memoir} document classes uses |\above|\-|caption|\-|skip| and |\below|\-|caption|\-|skip|
+% different than the standard document classes and the \pkg{caption} package:
% They always typeset |\above|\-|caption|\-|skip| before the caption and
% |\below|\-|caption|\-|skip| after the captions. Both are preset to |0.5\one|\-|line|\-|skip|.
%
-% For this reason we have to set the |\below|\-|caption|\-|skip| to |0pt| if the \package{caption}
+% For this reason we have to set the |\below|\-|caption|\-|skip| to |0pt| if the \pkg{caption}
% package is used, so no extra vertical space will be created.
%
% \begin{macrocode}
@@ -292,8 +264,8 @@
% \end{macrocode}
%
% Furthermore we adapt the `auto' positioning algorithm to match the one implemented
-% in the \class{memoir} document class.
-% (Note: This needs at least \package{caption3} \version{2.3}.)
+% in the \cls{memoir} document class.
+% (Note: This needs at least \pkg{caption3} \version{2.3}.)
%
% \begin{macrocode}
\@ifundefined{DeclareCaptionAutoPosition}{}{%
Modified: trunk/Master/texmf-dist/source/latex/caption/caption-ntg.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/caption/caption-ntg.dtx 2023-07-28 20:40:36 UTC (rev 67751)
+++ trunk/Master/texmf-dist/source/latex/caption/caption-ntg.dtx 2023-07-28 20:40:52 UTC (rev 67752)
@@ -2,7 +2,7 @@
%
% This is file `caption-ntg.dtx'.
%
-% Copyright (C) 2007-2022 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
+% Copyright (C) 2007-2023 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
%
% --------------------------------------------------------------------------
%
@@ -36,32 +36,12 @@
% \iffalse
%<*driver>
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesFile{caption-ntg.drv}[2022/12/27 v2.0 Implementation of the caption-ntg package]
-\hbadness=9999 \newcount\hbadness \hfuzz=100pt % Make TeX shut up.
+\ProvidesFile{caption-ntg.drv}[2023/07/10 v2.0 Implementation of the caption-ntg package]
%\errorcontextlines=3
%
-\documentclass{ltxdoc}
-\setlength\parindent{0pt}
-\setlength\parskip{\smallskipamount}
+\documentclass{captiondoc}
+\hypersetup{pdfkeywords={LaTeX, package, caption-ntg}}
%
-\makeatletter % make room for subsections like 2.16.14 in the TOC
-%\newcommand*\l at subsection{\@dottedtocline{2}{1.5em}{2.3em}}
-\renewcommand*\l at subsection{\@dottedtocline{2}{1.5em}{2.7em}}
-\makeatother
-%
-\usepackage{ifpdf}
-\ifpdf
- \usepackage{mathptmx,courier}
- \usepackage[scaled=0.90]{helvet}
- \addtolength\marginparwidth{15pt}
-\fi
-%
-\usepackage{hypdoc}
-\ifpdf\usepackage{hypdestopt}\fi
-\hypersetup{pdfkeywords={LaTeX, package, caption},pdfstartpage={},pdfstartview={}}
-%
-\DeclareRobustCommand*\NTG{NTG}
-%
\begin{document}
\DocInput{caption-ntg.dtx}
\end{document}
@@ -68,16 +48,6 @@
%</driver>
% \fi
%
-% \newcommand*\purerm[1]{\texorpdfstring{{\upshape\mdseries\rmfamily #1}}{#1}}
-% \newcommand*\puresf[1]{\texorpdfstring{{\upshape\mdseries\sffamily #1}}{#1}}
-% \newcommand*\purett[1]{\texorpdfstring{{\upshape\mdseries\ttfamily #1}}{#1}}
-% \let\class\puresf \let\package\puresf
-% \let\env\purett \let\opt\purett
-%
-% \newcommand*\csmarg[1]{\texttt{\char`\{#1\char`\}}}
-% \newcommand*\csoarg[1]{\texttt{\char`\[#1\char`\]}}
-% \newcommand*\version[2][]{v$#2$}
-%
% \GetFileInfo{caption-ntg.drv}
% \let\docdate\filedate
% \let\docversion\fileversion
@@ -84,7 +54,7 @@
% \GetFileInfo{caption-ntg.sto}
%
% \title{\texorpdfstring
-% {The adaption of the \package{caption} package to the \NTG\ document classes\thanks{%^^A
+% {The adaption of the \pkg{caption} package to the \NTG\ document classes\thanks{%^^A
% This adaption has version number \docversion.}}%^^A
% {The adaption of the caption package to the NTG document classes}}
% \author{Axel Sommerfeldt\\
@@ -93,7 +63,7 @@
% \maketitle
%
% \begin{abstract}
-% This package adapts the \package{caption} package to the \NTG\ document classes.
+% This package adapts the \pkg{caption} package to the \NTG\ document classes.
% \end{abstract}
%
% \section*{User manual}
@@ -169,7 +139,7 @@
% \newcommand*\Note[2][Note]{\par{\small\emph{#1:} #2}\par}
%
% \changes{v1.1}{2007/04/06}{\NTG\ class support added}
-% \changes{v2.0}{2020/08/01}{\NTG\ class support adapted to \package{caption3}~\version{2.0}}
+% \changes{v2.0}{2020/08/01}{\NTG\ class support adapted to \pkg{caption3}~\version{2.0}}
%
% \iffalse
% --------------------------------------------------------------------------- %
@@ -190,7 +160,7 @@
%
% \section{Fonts}
%
-% The `default' fonts map to \cs{CaptionLabelFont} resp. \cs{CaptionTextFont}.
+% The `default' fonts map to \cs{CaptionLabelFont} or \cs{CaptionTextFont}.
% \begin{macrocode}
\DeclareCaptionFont{ntg at labelfont}{\CaptionLabelFont}
\DeclareCaptionFont{ntg at textfont}{\CaptionTextFont}
Modified: trunk/Master/texmf-dist/source/latex/caption/caption-thesis.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/caption/caption-thesis.dtx 2023-07-28 20:40:36 UTC (rev 67751)
+++ trunk/Master/texmf-dist/source/latex/caption/caption-thesis.dtx 2023-07-28 20:40:52 UTC (rev 67752)
@@ -2,7 +2,7 @@
%
% This is file `caption-thesis.dtx'.
%
-% Copyright (C) 2008-2022 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
+% Copyright (C) 2008-2023 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
%
% --------------------------------------------------------------------------
%
@@ -36,30 +36,12 @@
% \iffalse
%<*driver>
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesFile{caption-thesis.drv}[2022/12/27 v2.0 Implementation of the caption-thesis package]
-\hbadness=9999 \newcount\hbadness \hfuzz=100pt % Make TeX shut up.
+\ProvidesFile{caption-thesis.drv}[2023/07/10 v2.0 Implementation of the caption-thesis package]
%\errorcontextlines=3
%
-\documentclass{ltxdoc}
-\setlength\parindent{0pt}
-\setlength\parskip{\smallskipamount}
+\documentclass{captiondoc}
+\hypersetup{pdfkeywords={LaTeX, package, caption-thesis}}
%
-\makeatletter % make room for subsections like 2.16.14 in the TOC
-%\newcommand*\l at subsection{\@dottedtocline{2}{1.5em}{2.3em}}
-\renewcommand*\l at subsection{\@dottedtocline{2}{1.5em}{2.7em}}
-\makeatother
-%
-\usepackage{ifpdf}
-\ifpdf
- \usepackage{mathptmx,courier}
- \usepackage[scaled=0.90]{helvet}
- \addtolength\marginparwidth{15pt}
-\fi
-%
-\usepackage{hypdoc}
-\ifpdf\usepackage{hypdestopt}\fi
-\hypersetup{pdfkeywords={LaTeX, package, caption},pdfstartpage={},pdfstartview={}}
-%
\begin{document}
\DocInput{caption-thesis.dtx}
\end{document}
@@ -66,16 +48,6 @@
%</driver>
% \fi
%
-% \newcommand*\purerm[1]{\texorpdfstring{{\upshape\mdseries\rmfamily #1}}{#1}}
-% \newcommand*\puresf[1]{\texorpdfstring{{\upshape\mdseries\sffamily #1}}{#1}}
-% \newcommand*\purett[1]{\texorpdfstring{{\upshape\mdseries\ttfamily #1}}{#1}}
-% \let\class\puresf \let\package\puresf
-% \let\env\purett \let\opt\purett
-%
-% \newcommand*\csmarg[1]{\texttt{\char`\{#1\char`\}}}
-% \newcommand*\csoarg[1]{\texttt{\char`\[#1\char`\]}}
-% \newcommand*\version[2][]{v$#2$}
-%
% \GetFileInfo{caption-thesis.drv}
% \let\docdate\filedate
% \let\docversion\fileversion
@@ -82,7 +54,7 @@
% \GetFileInfo{caption-thesis.sto}
%
% \title{\texorpdfstring
-% {The adaption of the \package{caption} package to the \class{thesis} document class\thanks{%^^A
+% {The adaption of the \pkg{caption} package to the \cls{thesis} document class\thanks{%^^A
% This adaption has version number \docversion.}}%^^A
% {The adaption of the caption package to the thesis document class}}
% \author{Axel Sommerfeldt\\
@@ -91,7 +63,7 @@
% \maketitle
%
% \begin{abstract}
-% This package adapts the \package{caption} package to the thesis document class.
+% This package adapts the \pkg{caption} package to the thesis document class.
% \end{abstract}
%
% \section*{User manual}
@@ -168,7 +140,7 @@
%
% \changes{v1.2a}{2008/01/31}{thesis class support added}
% \changes{v1.2e}{2009/11/15}{Bugfix 09-11-14: thesis class support revised}
-% \changes{v2.0}{2020/08/01}{thesis class support adapted to \package{caption3}~\version{2.0}}
+% \changes{v2.0}{2020/08/01}{thesis class support adapted to \pkg{caption3}~\version{2.0}}
%
% \iffalse
% --------------------------------------------------------------------------- %
@@ -196,7 +168,7 @@
%
% \section{Fonts}
%
-% The `default' fonts map to \cs{cph at font} resp. \cs{cpb at font}.
+% The `default' fonts map to \cs{cph at font} or \cs{cpb at font}.
% \begin{macrocode}
\DeclareCaptionFont{cph at font}{\cph at font}
\DeclareCaptionFont{cpb at font}{\cpb at font}
Modified: trunk/Master/texmf-dist/source/latex/caption/caption.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/caption/caption.dtx 2023-07-28 20:40:36 UTC (rev 67751)
+++ trunk/Master/texmf-dist/source/latex/caption/caption.dtx 2023-07-28 20:40:52 UTC (rev 67752)
@@ -31,73 +31,21 @@
%
% \fi
%
-% \CheckSum{2920}
+% \CheckSum{2922}
%
% \iffalse
%<*driver>
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesFile{caption.drv}[2022/02/20 v3.6 Implementation of the caption package]
-\hbadness=9999 \newcount\hbadness \hfuzz=100pt % Make TeX shut up.
+\ProvidesFile{caption.drv}[2023/07/10 v3.6 The caption package]
%\errorcontextlines=3
%
-\documentclass{ltxdoc}
-\setlength\parindent{0pt}
-\setlength\parskip{\smallskipamount}
-\setlength\leftmargini{2em}% default = 2.5em
-%\makeatletter\g at addto@macro\MacroFont{\normalcolor}\makeatother
+\documentclass{captiondoc}
+\hypersetup{pdfkeywords={LaTeX, package, caption}}
%
-\makeatletter % make room for subsections like 2.16.14 in the TOC
-%\newcommand*\l at subsection{\@dottedtocline{2}{1.5em}{2.3em}}
-\renewcommand*\l at subsection{\@dottedtocline{2}{1.5em}{2.7em}}
-\makeatother
-%
-\newcommand\LineBreak{\linebreak[3]}
-\newcommand\PageBreak{\pagebreak[3]}
-%
-\usepackage{ifpdf}
-\ifpdf
- \usepackage{mathptmx,courier}
- \usepackage[scaled=0.90]{helvet}
- \addtolength\marginparwidth{15pt}
-\fi
-%
-\usepackage[bottom]{footmisc}
-\usepackage{graphicx,longtable,setspace}
-%
-\usepackage{hypdoc}
-\ifpdf\usepackage{hypdestopt}\fi
-\hypersetup{pdfkeywords={LaTeX, package, caption},pdfstartpage={},pdfstartview={}}
-\hypersetup{breaklinks=true}
-\AtBeginDocument{%
- \let\subsectionautorefname\sectionautorefname
- \let\subsubsectionautorefname\sectionautorefname}
-%
\usepackage[listof=false,hypcap=false]{caption}[2022/01/06]
%
-\DeclareRobustCommand*\eTeX{\texorpdfstring
- {\leavevmode\hbox{$\varepsilon$}-\TeX}%
- {e-TeX}}
-\DeclareRobustCommand*\AmS{\texorpdfstring
- {{\protect\usefont{OMS}{cmsy}{m}{n}A\kern-.1667em\lower.5ex\hbox{M}\kern-.125emS}}%
- {AMS}}
-\DeclareRobustCommand*\KOMAScript{\texorpdfstring
- {\textsf{K\kern.05em O\kern.05em M\kern.05em A\kern.1em-\kern.1em Script}}%
- {KOMA-Script}}
-\DeclareRobustCommand*\NTG{NTG}
-\DeclareRobustCommand*\SmF{SMF}
+\usepackage{graphicx,longtable}
%
-\usepackage{marvosym}
-\makeatletter
-\newcommand*\INFO{\@ifstar{\@INFO{}}{\@INFO{\vbox to \ht\strutbox}}}
-\newcommand*\@INFO[1]{\MARGINSYM{#1{\LARGE\Info}}}
-\makeatother
-
-\makeatletter
-\newcommand*\MARGINSYM[1]{\hskip 1sp \marginpar{\raggedleft\textcolor{blue}{{#1}}}}
-\newcommand*\NEW[1]{\@ifstar{\@NEW{#1}{\vskip2pt}}{\@NEW{#1}{}}}
-\newcommand*\@NEW[3]{\MARGINSYM{#2\footnotesize#1\\#3}}
-\makeatother
-
% \ContinuedFloat
\DeclareCaptionLabelFormat{continued1}{Continued #1~#2}
\DeclareCaptionLabelFormat{continued2}{#1~#2\alph{ContinuedFloat}}
@@ -120,76 +68,6 @@
\DeclareCaptionFormat{llapx}{\llap{\makebox[5em][l]{#1}}#3\par}
% Example 4
\DeclareCaptionLabelFormat{andtable}{#1~#2 \& \tablename~\thetable}
-
-\newcommand*\purerm[1]{\texorpdfstring{{\upshape\mdseries\rmfamily #1}}{#1}}
-\newcommand*\puresf[1]{\texorpdfstring{{\upshape\mdseries\sffamily #1}}{#1}}
-\newcommand*\purett[1]{\texorpdfstring{{\upshape\mdseries\ttfamily #1}}{#1}}
-\let\class\puresf \let\package\puresf % obsolete
-\let\cls\puresf \let\pkg\puresf
-\let\env\purett \let\opt\purett
-
-\newcommand*\csmarg[1]{\texttt{\char`\{#1\char`\}}}
-\newcommand*\csoarg[1]{\texttt{\char`\[#1\char`\]}}
-\newcommand*\version[2][]{v$#2$}
-\newcommand*\issue[1]{GitLab~\##1}
-\newcommand*\x{\discretionary{}{}{}}
-
-\newenvironment{Annotation}%
- {\ifvmode\else\unskip\par\fi\pagebreak[2]%
- \smallskip
- \small(\ignorespaces}{\unskip)\par}
-\newenvironment{Annotation*}%
- {\ifvmode\else\unskip\par\fi\pagebreak[2]%
- \small(\ignorespaces}{\unskip)\par}
-
-\newenvironment{Example}%
- {\ifvmode\else\unskip\par\fi\pagebreak[2]%
- \minipage{\linewidth}\smallskip}%
- {\smallskip\endminipage\par}
-
-\makeatletter
-\newcommand\example{\@ifstar
- {\@example{belowskip=\abovecaptionskip}}%
- {\@example{}}}
-\def\@example#1{%
- \@testopt{\@@example{#1}}{figure}}
-\long\def\@@example#1[#2]#3#4{%
- \begingroup
- \captionsetup{#1,size=small,margin={\leftmargini,10pt},#3}%
- \captionof{#2}[]{#4}%
- \endgroup}
-\makeatother
-
-\newenvironment{Expert}%
- {\ifvmode\else\unskip\par\fi\pagebreak[3]%
- \smallskip
- \footnotesize\ignorespaces}{\par}
-\newenvironment{Expert*}%
- {\ifvmode\else\unskip\par\fi\pagebreak[3]%
- \footnotesize\ignorespaces}{\par}
-
-\newenvironment{Note}[1][\DefaultNoteText]%
- {\ifvmode\else\unskip\par\fi
- \smallskip
- \small\emph{#1:}~\ignorespaces}{\par}
-\newenvironment{Note*}[1][\DefaultNoteText]%
- {\ifvmode\else\unskip\par\fi
- \small\emph{#1:}~\ignorespaces}{\par}
-
-\newenvironment{Options}[1]%
- {\list{}{\renewcommand\makelabel[1]{\texttt{##1}\hfil}%
- \settowidth\labelwidth{\texttt{#1\space}}%
- \setlength\leftmargin{10pt}%
- \addtolength\leftmargin{\labelwidth}%
- \addtolength\leftmargin{\labelsep}}}%
- {\endlist}
-
-\makeatletter
-\def\Ref{\@ifstar{\@Ref\ref}{\@Ref\autoref}}
-\def\@Ref#1#2{#1{#2}: \textit{\nameref{#2}}}
-\newcommand*\SEE[3][]{\nopagebreak{#1(#2 #3)}}
-\newcommand*\SeeUserDefined[1][]{\See{\Ref{declare}#1}}
-\makeatother
%
\begin{document}
\DocInput{caption.dtx}
@@ -197,18 +75,69 @@
%</driver>
% \fi
%
+% \iffalse
+% ----------------------------------------------------------------------------------------------- %
+% \fi
%
-% \def\thispackage{the \package{caption} package}
-% \def\Thispackage{The \package{caption} package}
+% \def\thispackage{the \pkg{caption} package}
+% \def\Thispackage{The \pkg{caption} package}
%
+% \def\x{\-}
+%
+% \newenvironment{Annotation}%
+% {\ifvmode\else\unskip\par\fi\pagebreak[2]%
+% \smallskip
+% \small(\ignorespaces}{\unskip)\par}
+% \newenvironment{Annotation*}%
+% {\ifvmode\else\unskip\par\fi\pagebreak[2]%
+% \small(\ignorespaces}{\unskip)\par}
+%
+% \newenvironment{Example}%
+% {\ifvmode\else\unskip\par\fi\pagebreak[2]%
+% \minipage{\linewidth}\smallskip}%
+% {\smallskip\endminipage\par}
+%
+% \makeatletter
+% \newcommand\example{\@ifstar
+% {\@example{belowskip=\abovecaptionskip}}%
+% {\@example{}}}
+% \def\@example#1{%
+% \@testopt{\@@example{#1}}{figure}}
+% \long\def\@@example#1[#2]#3#4{%
+% \begingroup
+% \captionsetup{#1,size=small,margin={\leftmargini,10pt},#3}%
+% \captionof{#2}[]{#4}%
+% \endgroup}
+% \makeatother
+%
+% \newenvironment{Expert}%
+% {\ifvmode\else\unskip\par\fi\pagebreak[3]%
+% \smallskip
+% \footnotesize\ignorespaces}{\par}
+% \newenvironment{Expert*}%
+% {\ifvmode\else\unskip\par\fi\pagebreak[3]%
+% \footnotesize\ignorespaces}{\par}
+%
+% \newenvironment{Note}[1][\DefaultNoteText]%
+% {\ifvmode\else\unskip\par\fi
+% \smallskip
+% \small\emph{#1:}~\ignorespaces}{\par}
+% \newenvironment{Note*}[1][\DefaultNoteText]%
+% {\ifvmode\else\unskip\par\fi
+% \small\emph{#1:}~\ignorespaces}{\par}
% \newcommand*\DefaultNoteText{Note}
-% \newcommand*\NEWfeature{\NEW{New feature}}
-% \newcommand*\NEWdescription{\NEW{New description}}
+%
% \makeatletter
-% \newcommand*\See{\@ifstar{\SEE{See}}{\SEE[\small]{See}}}
-% \newcommand*\see{\@ifstar{\SEE{see}}{\SEE[\small]{see}}}
+% \def\see{\@ifstar{\SEE\relax{see}}{\SEE\small{see}}}
+% \def\See{\@ifstar{\SEE\relax{See}}{\SEE\small{See}}}
+% \newcommand*\SEE[3]{\nopagebreak{#1(#2 #3)}}
+% \newcommand*\SeeUserDefined[1][]{\See{\longref{declare}#1}}
% \makeatother
%
+% \iffalse
+% ----------------------------------------------------------------------------------------------- %
+% \fi
+%
% \GetFileInfo{caption.drv}
% \let\docdate\filedate
% \let\docversion\fileversion
@@ -231,9 +160,9 @@
% \textit{Please note:} Many document classes already have build-in options and
% commands for customizing captions.
% If these possibilities are sufficient for you, there is usually no need for
-% you to use the \package{caption} package at all.
+% you to use the \pkg{caption} package at all.
% And if you are only interested in using the command \cs{captionof}, loading of
-% the very small \package{capt-of} package is usually sufficient.
+% the very small \pkg{capt-of} package is usually sufficient.
% \end{abstract}
%
% \newcommand\shortexampletext{%
@@ -272,7 +201,7 @@
% \small
% Please note that \thispackage\ is only controlling the look \& feel of the
% captions. It does \emph{not} control the placement of the captions.
-% (But you could do so by using other packages like the \package{floatrow}
+% (But you could do so by using other packages like the \pkg{floatrow}
% package\cite{floatrow}.)
% \end{minipage}
%
@@ -346,7 +275,7 @@
% so all the other captions remain untouched.
%
% \begin{Annotation}
-% For a detailed description of |\caption|\-|setup| see \Ref{captionsetup}.
+% For a detailed description of |\caption|\-|setup| see \longref{captionsetup}.
% \end{Annotation}
%
% \iffalse
@@ -487,7 +416,7 @@
%
% \begin{Note*}
% Some environments, e.g.~the |algorithm| environment offered by the
-% \package{algorithm2e} package, might react allergic to a change of the
+% \pkg{algorithm2e} package, might react allergic to a change of the
% caption label format.
% \end{Note*}
%
@@ -633,15 +562,15 @@
% \iffalse
% \item[RaggedRight]
% Each line of the caption will be moved to the left margin using
-% the command |\RaggedRight| from the \package{ragged2e} package.
+% the command |\RaggedRight| from the \pkg{ragged2e} package.
% \else
% \item[RaggedRight]
% Each line of the caption will be moved to the left margin, too.
-% But this time the command |\RaggedRight| of the \package{ragged2e}
+% But this time the command |\RaggedRight| of the \pkg{ragged2e}
% package will be used to achieve this.
% The main difference to |raggedright| is that the word breaking
% algorithm of \TeX\ will work inside captions.\footnote{%
-% The need for the \package{ragged2e} package will be detected at
+% The need for the \pkg{ragged2e} package will be detected at
% run-time, therefore you maybe need a second \LaTeX\ run if this
% option is used for the first time.}
% \fi
@@ -652,7 +581,7 @@
% \iffalse
% \item[RaggedLeft]
% Each line of the caption will be moved to the right margin using
-% the command |\RaggedLeft| from the \package{ragged2e} package.
+% the command |\RaggedLeft| from the \pkg{ragged2e} package.
% \fi
%
% \item[\UserDefined]
@@ -689,8 +618,8 @@
%
% \PageBreak
% \DescribeMacro{singlelinecheck=}
-% The standard \LaTeX\ document classes (\class{article}, \class{report}, and
-% \class{book}) automatically center a caption if it fits in one single line:
+% The standard \LaTeX\ document classes (\cls{article}, \cls{report}, and
+% \cls{book}) automatically center a caption if it fits in one single line:
%
% \example*{}{A short caption.}
%
@@ -769,17 +698,17 @@
% \end{Options}
% \vspace{0pt}\pagebreak[3]
% \begin{Options}{stretch=\meta{amount}}
-% \item[singlespacing] Single spacing \See{\Ref{setspace}}
-% \item[onehalfspacing] One-and-a-half spacing \See{\Ref{setspace}}
-% \item[doublespacing] Double spacing \See{\Ref{setspace}}
-% \item[stretch=\meta{amount}] |\setstretch|\marg{amount} \See{\Ref{setspace}}
+% \item[singlespacing] Single spacing \See{\longref{setspace}}
+% \item[onehalfspacing] One-and-a-half spacing \See{\longref{setspace}}
+% \item[doublespacing] Double spacing \See{\longref{setspace}}
+% \item[stretch=\meta{amount}] |\setstretch|\marg{amount} \See{\longref{setspace}}
% \end{Options}
% \vspace{0pt}\pagebreak[3]
% \begin{Options}{stretch=\meta{amount}}
% \item[normalcolor] |\normalcolor|
% \item[color=\meta{colour}] |\color|\marg{colour}
-% {\small(If the \package{color} or \package{xcolor} package is loaded,
-% see \Ref{declare} for an example)}
+% {\small(If the \pkg{color} or \pkg{xcolor} package is loaded,
+% see \longref{declare} for an example)}
% \end{Options}
% \vspace{0pt}\pagebreak[3]
% \begin{Options}{stretch=\meta{amount}}
@@ -852,8 +781,8 @@
% For all captions you can specify \emph{either} an extra margin \emph{or}
% a fixed width:~\footnote{Only fixed widths are supported here; if you are
% looking for a way to limit the width of the caption to the width of the
-% figure or table, please take a look at the \package{floatrow}\cite{floatrow}
-% or \package{threeparttable}\cite{threeparttable} package.}
+% figure or table, please take a look at the \pkg{floatrow}\cite{floatrow}
+% or \pkg{threeparttable}\cite{threeparttable} package.}
% \begin{quote}\begin{tabular}{@{}r@{}ll}
% |margin=| & \meta{amount} & \emph{--or--}\\
% |margin=| & |{|\meta{left amount}|,|\meta{right amount}|}| & \emph{--or--}\\
@@ -898,9 +827,9 @@
%
% \begin{Note}
% When the caption is placed beside the contents (for example in a |SC|\-|figure|
-% environment offered by the \package{sidecap} package\cite{sidecap}) or the
+% environment offered by the \pkg{sidecap} package\cite{sidecap}) or the
% figure is an in-text figure (for example in a |wrap|\-|figure| environment
-% offered by the \package{wrapfig} package\cite{wrapfig}), the margin setting
+% offered by the \pkg{wrapfig} package\cite{wrapfig}), the margin setting
% will be automatically reset to |0pt| at the very beginning of the environment.
% But if you really want to setup an extra margin for these environments, you can
% do so by setting this margin either inside the environment itself, of by
@@ -922,7 +851,7 @@
% You can also set a minimum or maximum margin amount. This can be useful for
% limiting the margin amount in smaller environments, e.g.~|minipage|s.
% For example the \SmF\ document classes limit the margin amount to
-% |maxmargin=|\x|0.1\linewidth|. (See \Ref{SMF})
+% |maxmargin=|\x|0.1\linewidth|. (See \longref{SMF})
% \end{Expert}
%
% \medskip
@@ -1013,7 +942,7 @@
% \NEWfeature{v3.1}
% The |base| style puts all options you already know about to values reflecting
% the look of the captions when using one of the base \LaTeX\ document classes
-% \class{article}, \class{report}, and \class{book}.
+% \cls{article}, \cls{report}, and \cls{book}.
% This means that specifying the option
% \begin{quote}
% |style=base|
@@ -1044,8 +973,8 @@
% the caption fits into a single line.
% \end{Annotation*}
%
-% So if you use one of the base \LaTeX\ document classes \class{article},
-% \class{report}, or \class{book}, both caption styles, |base| and |default|,
+% So if you use one of the base \LaTeX\ document classes \cls{article},
+% \cls{report}, or \cls{book}, both caption styles, |base| and |default|,
% point to (nearly) the same settings.
%
% \begin{Note}
@@ -1066,8 +995,8 @@
% \begin{quote}
% |skip=|\meta{amount}\quad.
% \end{quote}
-% The standard \LaTeX\ document classes \class{article}, \class{report} and
-% \class{book} preset it to |skip=|\x|10pt|, but other document classes may
+% The standard \LaTeX\ document classes \cls{article}, \cls{report} and
+% \cls{book} preset it to |skip=|\x|10pt|, but other document classes may
% use a different amount.
%
% \bigskip
@@ -1114,7 +1043,7 @@
% \DescribeMacro{tableposition=}
% The |position| option is especially useful when used together with the
% optional argument of the |\caption|\-|setup| command.
-% \See{also \Ref{captionsetup}}\par
+% \See{also \longref{captionsetup}}\par
% For example
% \begin{quote}
% |\captionsetup[table]{position=above}|
@@ -1145,12 +1074,12 @@
% For example the \KOMAScript\ document classes support the |skip=|
% setting, but will always typeset |figure| captions as ``bottom'' captions,
% and |table| captions are dependent on the global option
-% |table|\-|captions|\-|above| resp.\ |table|\-|captions|\-|below|.
-% \See{\Ref{KOMA}}
+% |table|\-|captions|\-|above| or |table|\-|captions|\-|below|.
+% \See{\longref{KOMA}}
%
% Furthermore some packages control the behavior of the spacing above and
-% below the caption for themself, e.g.~the \package{float}, the
-% \package{floatrow}, and the \package{supertabular} package.
+% below the caption for themself, e.g.~the \pkg{float}, the
+% \pkg{floatrow}, and the \pkg{supertabular} package.
%
% \bigskip
%
@@ -1164,8 +1093,8 @@
% So technically speaking, this package swaps the meaning of these two skips
% when |position=|\x|top| is set.
% Please note that there are several packages around which do the same trick
-% (like the \package{ftcap}, the \package{nonfloat}, and the \package{topcap}
-% package), so the usage of the \package{caption} option |position=| is not
+% (like the \pkg{ftcap}, the \pkg{nonfloat}, and the \pkg{topcap}
+% package), so the usage of the \pkg{caption} option |position=| is not
% supported if one of these packages will be used, too.
% \end{Expert*}
%
@@ -1179,12 +1108,12 @@
% \DescribeMacro{list=}
% \NEWfeature*{v3.1}
% The |\caption| command usually places an entry in the List of Figures
-% resp.~List of Tables. You can either suppress that individually by giving an
-% empty optional argument to |\caption| {\small(see \Ref{caption})}, or
+% or List of Tables. You can either suppress that individually by giving an
+% empty optional argument to |\caption| {\small(see \longref{caption})}, or
% programmatically by saying
% \begin{quote}
% |list=no|\quad(or any other boolean value instead of |no|)\quad.~\footnote{%
-% Please note that the \package{subfig} package\cite{subfig} is not supporting
+% Please note that the \pkg{subfig} package\cite{subfig} is not supporting
% this option, it uses the counters \texttt{lofdepth} \& \texttt{lotdepth} for
% this purpose instead.}
% \end{quote}
@@ -1199,7 +1128,7 @@
% \end{quote}
% \nopagebreak[3]
% you can specify how the |figure| or |table| number will be typeset within
-% the List of Figures resp.~List of Tables.
+% the List of Figures or List of Tables.
% There are five standard caption list formats:
%
% \begin{Options}{\OptionLabel}
@@ -1223,16 +1152,16 @@
% \SeeUserDefined
% \end{Options}
%
-% The prefix ($=$|\p at figure| resp.~|\p at table|), which runs ahead of the
-% number ($=$|\the|\-|figure| resp.~|\the|\-|table|) in lists (e.g.~List of
+% The prefix ($=$|\p at figure| or |\p at table|), which runs ahead of the
+% number ($=$|\the|\-|figure| or |\the|\-|table|) in lists (e.g.~List of
% Figure/Table) and references, is usually empty,
% so the list formats |simple| and |subsimple| gives equal results;
% same with |parens| and |subparens|.
% But this can be different for sub-figures or sub-tables listed in the List of
-% Figures resp.~List of Tables, or when the label prefix is redefined for a
+% Figures or List of Tables, or when the label prefix is redefined for a
% different purpose.\footnote{%
-% Sub-figures and sub-tables can be typeset using the \package{subcaption}
-% or \package{subfig} package.}
+% Sub-figures and sub-tables can be typeset using the \pkg{subcaption}
+% or \pkg{subfig} package.}
%
% \iffalse
% --------------------------------------------------------------------------- %
@@ -1274,8 +1203,8 @@
% \end{quote}
% prior to the usage of the |\caption| command (and other commands like
% |\Continued|\-|Float|, or |\sub|\-|caption|\-|box| offered by the
-% \package{subcaption} package, or |\sub|\-|float| offered by the
-% \package{subfig} package\cite{subfig}),
+% \pkg{subcaption} package, or |\sub|\-|float| offered by the
+% \pkg{subfig} package\cite{subfig}),
% for example within an non-floating environment like |minipage|:
% \begin{quote}
% |\noindent\begin{minipage}{\textwidth}|\\
@@ -1289,9 +1218,9 @@
% \begin{Expert}
% There is also a starred variant of this option, |type*=|\meta{float type},
% which behaves different than |type=|\meta{float type} if the
-% \package{hyperref} package\cite{hyperref} is loaded: While |type=| sets an
+% \pkg{hyperref} package\cite{hyperref} is loaded: While |type=| sets an
% hyperlink anchor (if |hypcap=|\x|true| is set), |type*=| does not.
-% (See also \Ref{hyperref}\,)
+% (See also \longref{hyperref}\,)
% \end{Expert}
% \begin{Expert}
% \emph{\DefaultNoteText:} Please don't re-define the internal macro |\@captype|
@@ -1302,9 +1231,9 @@
% \medskip
%
% Own float types can be defined with
-% |\Declare|\-|Floating|\-|Environment| offered by the \package{newfloat} package,
-% |\new|\-|float| offered by the \package{float} package\cite{float}, or
-% |\Declare|\-|New|\-|Float|\-|Type| offered by the \package{floatrow} package\cite{float}.
+% |\Declare|\-|Floating|\-|Environment| offered by the \pkg{newfloat} package,
+% |\new|\-|float| offered by the \pkg{float} package\cite{float}, or
+% |\Declare|\-|New|\-|Float|\-|Type| offered by the \pkg{floatrow} package\cite{float}.
%
% \medskip
%
@@ -1346,7 +1275,7 @@
% if no \meta{list entry} has been given. But if a \meta{list entry} is given,
% this argument is moving instead.
% ``\emph{Moving} argument'' means that the argument will be written to the
-% list-of file, make it appearing in the ``List of Figures'' resp.
+% list-of file, make it appearing in the ``List of Figures'' or
% ``List of Tables'', too.
% \emph{Moving} arguments are not allowed to contain \emph{fragile} commands,
% everything must be \emph{robust}, otherwise the argument could get
@@ -1383,7 +1312,7 @@
%
% \pagebreak[3]
% \DescribeMacro{\caption*}
-% The \package{longtable} package defines the command |\caption*| which
+% The \pkg{longtable} package defines the command |\caption*| which
% typesets the caption without label and without entry in the list of tables.
% An example:
% \begin{quote}
@@ -1448,7 +1377,7 @@
% restrictions as for the |type| option apply here, so you should use both
% |\caption|\-|of| and |\caption|\-|of*| only \emph{inside} boxes or
% environments, too.
-% \See{\Ref{types}}
+% \See{\longref{types}}
%
% \bigskip
%
@@ -1472,7 +1401,7 @@
% |\endhead|\\
% | |\ldots
% \end{quote}
-% But since the \package{longtable} package does not offer an
+% But since the \pkg{longtable} package does not offer an
% |\end|\-|first|\-|foot| command, you cannot easily have captions \emph{below}
% the table contents and a single list entry which points to the first page of
% the table.
@@ -1486,7 +1415,7 @@
% \end{quote}
%
% \begin{Annotation*}
-% Another example can be found in \Ref{examples}.
+% Another example can be found in \longref{examples}.
% \end{Annotation*}
%
% \begin{Expert}
@@ -1493,7 +1422,7 @@
% There is also a starred variant, |\caption|\-|list|\-|entry*|, which does not
% increment the \meta{float type} counter.
% (Note that inside |long|\-|table| environments |\caption|\-|list|\-|entry|
-% never increments the |table| counter. See also \Ref{longtable}.)
+% never increments the |table| counter. See also \longref{longtable}.)
% \end{Expert}
%
% \begin{Expert}
@@ -1505,7 +1434,7 @@
% \label{captionsetup}
%
% \DescribeMacro{\captionsetup}
-% We already know the |\caption|\-|setup| command (see \Ref{usage}),
+% We already know the |\caption|\-|setup| command (see \longref{usage}),
% but this time we get enlighten about its optional argument
% \meta{float type}.
%
@@ -1545,11 +1474,11 @@
%
% As \meta{float type} you can usually give one of these two only:
% |figure| or |table|.
-% But as we will see later some \LaTeX\ packages (like the \package{floatrow},
-% \package{longtable}, and \package{sidecap} package for example) and also
+% But as we will see later some \LaTeX\ packages (like the \pkg{floatrow},
+% \pkg{longtable}, and \pkg{sidecap} package for example) and also
% this package offer additional environments with captions and these two
% commands can also be used with them.
-% \See{\Ref{declare} and \Ref{packages}}
+% \See{\longref{declare} and \longref{packages}}
%
% \begin{Expert}
% \NEWfeature{v3.1}
@@ -1728,7 +1657,7 @@
% \centerline{\ldots}
% \end{Example}
% \smallskip
-% \See{\Ref{declare} for an explanation of
+% \See{\longref{declare} for an explanation of
% \cs{Declare}\-\texttt{Caption}\-\texttt{Label}\-\texttt{Format}.}
%
% \medskip
@@ -1831,13 +1760,13 @@
%
% \begin{Note}
% Unfortunately \cs{ContinuedFloat*} is not available if the
-% \package{subfig} package\cite{subfig} is loaded.
+% \pkg{subfig} package\cite{subfig} is loaded.
% \end{Note}
%
% \pagebreak[3]
% \subsubsection*{A note about longtables}
% If you want to have a different caption label in |long|\-|table|s (offered
-% by the \package{longtable} package\cite{longtable}) after a page break,
+% by the \pkg{longtable} package\cite{longtable}) after a page break,
% this can \emph{not} be archived by using |\Continued|\-|Float|,
% but instead you could write something like:
% \begin{quote}
@@ -1905,7 +1834,7 @@
% \DescribeMacro{\bothIfFirst}
% \DescribeMacro{\bothIfSecond}
% If you define your own caption label formats and use the
-% \package{subcaption} or \package{subfig}\cite{subfig} package,
+% \pkg{subcaption} or \pkg{subfig}\cite{subfig} package,
% you should take care of empty caption label names.
% For this purpose the commands
% \begin{quote}
@@ -1990,7 +1919,7 @@
% |\DeclareCaptionFont{bf}{\bfseries}|\quad.
% \end{quote}
% \iffalse
-% The line spacing could be customized using the \package{setspace} package,
+% The line spacing could be customized using the \pkg{setspace} package,
% for example:%\NEWdescription{v3.0h}
% \begin{quote}
% |\usepackage{setspace}|\\
@@ -2035,7 +1964,7 @@
% under a given name. You can wake up these options at any time with the
% option |style=|\meta{style name}.
%
-% All caption styles are based on the |base| set of options. (See \Ref{style}
+% All caption styles are based on the |base| set of options. (See \longref{style}
% for a complete list.) So you only need to specify options which are different
% to them.
%
@@ -2207,7 +2136,7 @@
% \MakeShortVerb{\|}
%
% (Please remember that |\caption|\-|list|\-|entry| increments the figure
-% resp.~table counter.)
+% or table counter.)
%
% \iffalse
% --------------------------------------------------------------------------- %
@@ -2218,8 +2147,8 @@
% \label{classes}
%
% This section will give you an overview of the document classes the
-% \package{caption} supports, what do they already offer regarding captions,
-% what side effects will occur when using the \package{caption} package with
+% \pkg{caption} supports, what do they already offer regarding captions,
+% what side effects will occur when using the \pkg{caption} package with
% them, and what are the `default' settings for them.
%
% \NEWfeature{v3.1}
@@ -2231,9 +2160,9 @@
% \begingroup\setlength\leftmargini{0.3em}% default = 2.5em
% \INFO
% If you don't find the document class you use in this section, you usually
-% don't have to worry: Many document classes (e.g.~the \class{octavo} class)
-% are derived from one of the standard document classes \class{article},
-% \class{report}, or \class{book}, and behave the same regarding captions.
+% don't have to worry: Many document classes (e.g.~the \cls{octavo} class)
+% are derived from one of the standard document classes \cls{article},
+% \cls{report}, or \cls{book}, and behave the same regarding captions.
% \Thispackage\ automatically does a compatibility check against the document
% class used and will give you the clear warning
% \begin{quote}\footnotesize
@@ -2323,8 +2252,8 @@
% |labelformat=| & \textit{not numbered} \\
% |labelsep=| & |colon| \\
% |justification=| & |raggedright| \\
-% |font=| & \class{beamer} ``|caption|'' \settings \\
-% |labelfont=| & \class{beamer} ``|caption name|'' \settings \\
+% |font=| & \cls{beamer} ``|caption|'' \settings \\
+% |labelfont=| & \cls{beamer} ``|caption name|'' \settings \\
% |textfont=| & \nofont \\
% \end{tabular}
%
@@ -2335,7 +2264,7 @@
% This will still work, unless you set a different font with
% |\caption|\-|setup{font=|\x\meta{options}|}| or
% |\caption|\-|setup{label|\-|font=|\x\meta{options}|}|.\par
-% Furthermore the \class{beamer} classes offer different caption templates
+% Furthermore the \cls{beamer} classes offer different caption templates
% which can be chosen with
% |\set|\-|beamer|\-|template|\x|{caption}|\x|[|\meta{template}|]|.
% Since \thispackage\ replaces this caption template mechanism,
@@ -2368,11 +2297,11 @@
%
% \subsubsection*{Side effects}
% The optional argument of |\set|\-|cap|\-|width| is not supported and
-% will be ignored if used in conjunction with the \package{caption} package.
+% will be ignored if used in conjunction with the \pkg{caption} package.
% Furthermore the \KOMAScript\ options |table|\-|caption|\-|above| \&
% |table|\-|caption|\-|below| and the commands |\caption|\-|above| \&
% |\caption|\-|below| are stronger than the |position=| setting offered by
-% the \package{caption} package.
+% the \pkg{caption} package.
%
% \subsection{\NTG: artikel, rapport, and boek}
% \label{NTG}
@@ -2434,16 +2363,16 @@
% \label{babel}
%
% \NEWfeature{v3.5}
-% Since version \version{3.5} of the \package{caption} package the support
-% is independent on the load order of \package{caption} and \package{babel}.
+% Since version \version{3.5} of the \pkg{caption} package the support
+% is independent on the load order of \pkg{caption} and \pkg{babel}.
%
% \subsection{french babel option}
% \label{french}
%
-% If you use the \package{french} option of the \package{babel} package
+% If you use the \pkg{french} option of the \pkg{babel} package
% with one of the three standard \LaTeX{} classes (or a one derived from them)
% the default |label|\-|sep=| will be set to |\Caption|\-|Sep|\-|a|\-|ra|\-|tor|
-% (offered by \package{french}), overriding the default value set by the
+% (offered by \pkg{french}), overriding the default value set by the
% document class.
% So redefining |\Caption|\-|Sep|\-|a|\-|ra|\-|tor| will still work, unless you
% don't select a different |label|\-|sep=| than the default one.
@@ -2460,17 +2389,17 @@
% \Thispackage\ was adapted to the following packages which deals with
% captions, too:
% \begin{quote}
-% \package{float}, \package{floatflt}, \package{fltpage},
-% \package{hyperref}, \package{hypcap}, \package{listings},
-% \package{longtable}, \package{picinpar}, \package{picins},
-% \package{rotating}, \package{setspace}, \package{sidecap},
-% \package{subfigure}, \package{supertabular}, \package{threeparttable},
-% \package{wrapfig}, and \package{xtab}
+% \pkg{float}, \pkg{floatflt}, \pkg{fltpage},
+% \pkg{hyperref}, \pkg{hypcap}, \pkg{listings},
+% \pkg{longtable}, \pkg{picinpar}, \pkg{picins},
+% \pkg{rotating}, \pkg{setspace}, \pkg{sidecap},
+% \pkg{subfigure}, \pkg{supertabular}, \pkg{threeparttable},
+% \pkg{wrapfig}, and \pkg{xtab}
% \end{quote}
%
-% Furthermore the \package{floatrow} package\cite{floatrow}, the
-% \package{subcaption} package (which is part of the \package{caption} package
-% bundle), and the \package{subfig} package\cite{subfig} support \thispackage{}
+% Furthermore the \pkg{floatrow} package\cite{floatrow}, the
+% \pkg{subcaption} package (which is part of the \pkg{caption} package
+% bundle), and the \pkg{subfig} package\cite{subfig} support \thispackage{}
% and use its |\caption|\-|setup| interface.
%
% \bigskip
@@ -2502,8 +2431,8 @@
% \item |\ContinuedFloat|
% \item correctly justified captions in environments like \texttt{wide} and
% \texttt{addmargin} which add extra margins
-% \item the \textsf{hypcap} feature \See{\Ref{hyperref}\,}
-% \item the sub-caption feature \See{\package{subcaption} package documentation}
+% \item the \textsf{hypcap} feature \See{\longref{hyperref}\,}
+% \item the sub-caption feature \See{\pkg{subcaption} package documentation}
% \end{itemize}
%
% \DescribeMacro{compatibility=}
@@ -2526,13 +2455,13 @@
% \subsection{algorithms}
% \label{algorithms}
% \packagedescription{%
-% The \package{algorithms} package bundle\cite{algorithms} provides two
+% The \pkg{algorithms} package bundle\cite{algorithms} provides two
% environments: The \texttt{algorithmic} environment provides a possibility
% for describing algorithms, and the \texttt{algorithm} environment provides
% a ``float'' wrapper for algorithms.}
%
% Since the \texttt{algorithm} environment is implemented via |\new|\-|float|
-% provided by the \package{float} package\cite{float}, please see \Ref{float}.
+% provided by the \pkg{float} package\cite{float}, please see \longref{float}.
%
% \iffalse
% \pagebreak[3]
@@ -2539,18 +2468,18 @@
% \subsection{algorithm2e}
% \label{algorithm2e}
% \packagedescription{%
-% The \package{algorithm2e} package\cite{algorithm2e} offers an environment for
+% The \pkg{algorithm2e} package\cite{algorithm2e} offers an environment for
% writing algorithms in LaTeX2e.}
%
-% Since the \package{algorithm2e} package does not use some kind of standard
+% Since the \pkg{algorithm2e} package does not use some kind of standard
% interface for defining its floating environment (e.g.~|\newfloat| of the
-% \package{float} package) and typesetting its caption,
-% the \package{algorithm2e} package is \emph{not} supported by \thispackage.
+% \pkg{float} package) and typesetting its caption,
+% the \pkg{algorithm2e} package is \emph{not} supported by \thispackage.
%
% So if you want to customize the captions using \thispackage,
% you have to build a new environment which uses a supported interface regarding
-% floats (e.g. using the \package{float} or \package{floatrow} package),
-% and combine this environment with the internal \package{algorithm2e} code.
+% floats (e.g. using the \pkg{float} or \pkg{floatrow} package),
+% and combine this environment with the internal \pkg{algorithm2e} code.
%
% As first step you could define a non-floating environment \texttt{algorithmic},
% for example:
@@ -2567,13 +2496,13 @@
% \ldots
% \end{quote}
% Having defined this non-floating environment, you could define your own new
-% floating environment with |\newfloat| of the \package{float} package
-% (or |\DeclareNewFloatType| of the \package{floatrow} package),
+% floating environment with |\newfloat| of the \pkg{float} package
+% (or |\DeclareNewFloatType| of the \pkg{floatrow} package),
% and use the combination of this floating environment and \texttt{algorithmic}
% in its body, just like you would do when you use the
-% \package{algorithm}/\package{algorithmic} package tandem.
+% \pkg{algorithm}/\pkg{algorithmic} package tandem.
%
-% You could even use the \package{algorithm} package for this purpose, for example:
+% You could even use the \pkg{algorithm} package for this purpose, for example:
% \begin{quote}
% \ldots\\
% |% load the algorithm package to re-define the|\\
@@ -2594,11 +2523,11 @@
% |\end{algorithmic}|
% \end{quote}
% Now you are finally able to customize the float and caption layout like every
-% other floating environment defined with the \package{float} package\cite{float},
-% please see \Ref{float}.
+% other floating environment defined with the \pkg{float} package\cite{float},
+% please see \longref{float}.
%
% \begin{Annotation}
-% An alternative would be using the \package{algorithmicx} package.
+% An alternative would be using the \pkg{algorithmicx} package.
% \end{Annotation}
% \fi
%
@@ -2606,7 +2535,7 @@
% \subsection{float}
% \label{float}
% \packagedescription{%
-% The \package{float} package\cite{float} introduces the commands
+% The \pkg{float} package\cite{float} introduces the commands
% \cs{restylefloat} to give existing floating environments a new look \& feel
% and \cs{newfloat} to define new floating environments.
% It also provides the ``\texttt{H}'' float placement option which places
@@ -2643,13 +2572,13 @@
% |\new|\-|float| or |\re|\-|style|\-|float|, furthermore these environments
% are not behaving exactly like the pre-defined floats |figure| and |table|.
% As a consequence many packages do not cooperate well with these.
-% Furthermore the \package{float} package has some caveats \& limitations,
+% Furthermore the \pkg{float} package has some caveats \& limitations,
% so if you just want to define a new simple floating environment---behaving
% like |figure| or |table|---I recommend using |\Declare|\-|Floating|\-|Environment|
-% offered by the \package{newfloat} package instead.
+% offered by the \pkg{newfloat} package instead.
% And for defining non-simple floating environments and customization I
% recommend using |\Declare|\-|New|\-|Float|\-|Type| offered by the
-% \package{floatrow} package\cite{floatrow}.
+% \pkg{floatrow} package\cite{floatrow}.
% \end{Note}
%
% \iffalse
@@ -2665,7 +2594,7 @@
% \subsection{floatflt}
% \label{floatflt}
% \packagedescription{%
-% The \package{floatflt} package\cite{floatflt} offers figures and tables
+% The \pkg{floatflt} package\cite{floatflt} offers figures and tables
% which do not span the full width of a page and are float around by text.}
%
% \NEWfeature{v3.1}
@@ -2676,12 +2605,12 @@
% |\captionsetup[floatingtable]|\marg{options}\quad.
% \end{quote}
% These options will be executed additionally to the regular ones for
-% |figure| resp.~|table|.
+% |figure| or |table|.
%
% \begin{Note}
-% The |margin| resp.~|width| setting will not be used for these figures resp.~tables,
+% The |margin| or |width| setting will not be used for these figures or tables,
% unless you set it explicit with |\caption|\-|setup[floating|\-|figure]{|\ldots|}|
-% resp.~|\caption|\-|setup[floating|\-|table]{|\ldots|}|.
+% or |\caption|\-|setup[floating|\-|table]{|\ldots|}|.
% \end{Note}
%
% \pagebreak[3]
@@ -2688,7 +2617,7 @@
% \subsection{fltpage}
% \label{fltpage}
% \packagedescription{%
-% The \package{fltpage} package\cite{fltpage} offers the outhouse of the
+% The \pkg{fltpage} package\cite{fltpage} offers the outhouse of the
% caption for |figure|s or |table|s which needs the whole page
% for its contents. This will be done by placing the caption on the bottom
% of the previous or next page.}
@@ -2721,9 +2650,9 @@
% \subsection{frenchle and frenchpro packages}
% \label{frenchpro}
%
-% If you use the \package{frenchle} or \package{frenchpro} package,
+% If you use the \pkg{frenchle} or \pkg{frenchpro} package,
% the default |label|\-|sep=| will be set to |\caption|\-|sep|\-|a|\-|ra|\-|tor|
-% (offered by \package{frenchle/pro}) plus \cs{space}, overriding the default
+% (offered by \pkg{frenchle/pro}) plus \cs{space}, overriding the default
% value set by the document class.
% So redefining |\caption|\-|sep|\-|a|\-|ra|\-|tor| will still work, unless you
% don't select a different |label|\-|sep=| than the default one.
@@ -2730,9 +2659,9 @@
%
% Furthermore the default |text|\-|font=| will be set to |text|\-|font=|\x|it|,
% since this emulates the default setting of |\caption|\-|font| defined by the
-% \package{frenchle} or \package{frenchpro} package.
+% \pkg{frenchle} or \pkg{frenchpro} package.
% Please note that the command |\caption|\-|font| is used by the
-% \package{caption} package internally for a different purpose,
+% \pkg{caption} package internally for a different purpose,
% so you should not change it (anymore).
%
% The command |\un|\-|numbered|\-|captions|\marg{figure \emph{or} table} will
@@ -2740,20 +2669,20 @@
% than the default one.
%
% \NEWfeature{v3.5}
-% Since version \version{3.5} of the \package{caption} package the support
-% is independent on the load order of \package{caption} and \package{frenchle}
-% resp~.\package{frenchpro}.
+% Since version \version{3.5} of the \pkg{caption} package the support
+% is independent on the load order of \pkg{caption} and \pkg{frenchle}
+% resp~.\pkg{frenchpro}.
%
% \pagebreak[3]
% \subsection{hyperref}
% \label{hyperref}
% \packagedescription{%
-% The \package{hyperref} package\cite{hyperref} is used to handle cross
+% The \pkg{hyperref} package\cite{hyperref} is used to handle cross
% referencing commands in LaTeX to produce hypertext links in the document.}
%
% \NEWfeature{v3.1}
% There are two options available to control the placement of hyperlink
-% anchors:~\footnote{These options are named after the \package{hypcap} package
+% anchors:~\footnote{These options are named after the \pkg{hypcap} package
% which they supersede.}
% \begin{description}
% \item{\texttt{hypcap=true} or \texttt{hypcap=false}}\\[\smallskipamount]
@@ -2771,10 +2700,10 @@
% \end{description}
%
% Both settings have no effect in |lst|\-|listing|s (provided by the
-% \package{listings} package), |long|\-|table|s (provided by the
-% \package{longtable} package), |super|\-|tabular|s (provided by the
-% \package{supertabular} package), and |x|\-|tabular|s (provided by the
-% \package{xtab} package), within these environments hyperlink
+% \pkg{listings} package), |long|\-|table|s (provided by the
+% \pkg{longtable} package), |super|\-|tabular|s (provided by the
+% \pkg{supertabular} package), and |x|\-|tabular|s (provided by the
+% \pkg{xtab} package), within these environments hyperlink
% anchors will always be placed as if |hyp|\-|cap=|\x|true| and
% |hyp|\-|cap|\-|space=|\x|0pt| would be set.
%
@@ -2783,8 +2712,8 @@
% \item{\cs{captionof}\marg{type}\csmarg{\purerm\ldots}
% vs.~\cs{captionsetup}\csmarg{type=\textrm{\meta{type}}}$+$\cs{caption}\csmarg{\purerm\ldots}}%
% \\[\smallskipamount]
-% Without \package{hyperref} loaded, both will give you identical results.
-% But with \package{hyperref} loaded, and with |hyp|\-|cap=|\x|true| requested,
+% Without \pkg{hyperref} loaded, both will give you identical results.
+% But with \pkg{hyperref} loaded, and with |hyp|\-|cap=|\x|true| requested,
% the hyperlink anchor will be placed different.
% For example:
% \begin{quote}
@@ -2809,8 +2738,8 @@
%
% \item{\cs{caption}\csoarg{}\csmarg{\purerm\ldots}
% vs.~\cs{captionsetup}\csmarg{list=false}$+$\cs{caption}\csmarg{\purerm\ldots}}\\[\smallskipamount]
-% Again, without \package{hyperref} loaded, both will give you identical results.
-% But with \package{hyperref} loaded, the difference is in the nuances.
+% Again, without \pkg{hyperref} loaded, both will give you identical results.
+% But with \pkg{hyperref} loaded, the difference is in the nuances.
% So for example the optional argument of |\caption| will also be written to
% the |aux| file, and will be used by the |\name|\-|ref| command.
% So if you choose to use |\caption| with empty optional argument,
@@ -2823,39 +2752,39 @@
% \subsection{hypcap}
% \label{hypcap}
% \packagedescription{%
-% The \package{hyp\-cap} package\cite{hypcap} offers a solution to the problem
-% that links to a float using \package{hyper\-ref} may anchors to the caption
+% The \pkg{hyp\-cap} package\cite{hypcap} offers a solution to the problem
+% that links to a float using \pkg{hyper\-ref} may anchors to the caption
% rather than the beginning of the float.
% Since \thispackage\ \version{3.1} already solves this problem for itself,
-% the \package{hypcap} package is usually not needed.}
+% the \pkg{hypcap} package is usually not needed.}
%
-% If the \package{hyp\-cap} package is loaded additionally to the
-% \package{hyper\-ref} package, it takes over the control of the hyperlink
+% If the \pkg{hyp\-cap} package is loaded additionally to the
+% \pkg{hyper\-ref} package, it takes over the control of the hyperlink
% anchor placement from \thispackage, overriding the options |hyp|\-|cap=|
% and |hyp|\-|cap|\-|space=|.
%
% So for a manual placement of hyperlink anchors
% |\caption|\-|setup{type=|\x\meta{type}|}| is not sufficient anymore,
-% instead you need to use |\cap|\-|start| (provided by the \package{hyp\-cap}
+% instead you need to use |\cap|\-|start| (provided by the \pkg{hyp\-cap}
% package) for this.
%
-% Regarding the automatically placement the \package{hypcap} package offers good
+% Regarding the automatically placement the \pkg{hypcap} package offers good
% placement of hyperlink anchors for the floating environments |figure| and
% |table| only. In contrast the |hypcap=|\x|true| option of \thispackage\ also
% offers good placements of hyperlink anchors for
-% |floating|\-|figure|s (provided by the \package{float\-flt} package),
-% |FP|\-|figure|s \& |FPtable|s (provided by the \package{flt\-page} package),
-% |fig|\-|window|s (provided by the \package{pic\-in\-par} package),
-% |par|\-|pic|s (provided by the \package{pic\-ins} package),
-% |SC|\-|figure|s (provided by the \package{side\-cap} package),
-% |three|\-|part|\-|table|s (provided by the \package{three\-part\-table} package),
-% and |wrapfigure|s (provided by the \package{wrap\-fig} package).
+% |floating|\-|figure|s (provided by the \pkg{float\-flt} package),
+% |FP|\-|figure|s \& |FPtable|s (provided by the \pkg{flt\-page} package),
+% |fig|\-|window|s (provided by the \pkg{pic\-in\-par} package),
+% |par|\-|pic|s (provided by the \pkg{pic\-ins} package),
+% |SC|\-|figure|s (provided by the \pkg{side\-cap} package),
+% |three|\-|part|\-|table|s (provided by the \pkg{three\-part\-table} package),
+% and |wrapfigure|s (provided by the \pkg{wrap\-fig} package).
%
% \pagebreak[3]
% \subsection{listings}
% \label{listings}
% \packagedescription{%
-% The \package{listings} package\cite{listings} typesets programming code.}
+% The \pkg{listings} package\cite{listings} typesets programming code.}
%
% If you want to setup special options for the |lst|\-|listing| environment
% you can use
@@ -2863,11 +2792,11 @@
% |\captionsetup[lstlisting]|\marg{options}\quad.
% \end{quote}
%
-% Please note that the \package{listings} package has its very own options
+% Please note that the \pkg{listings} package has its very own options
% for controlling the position and the skips of the caption:
% |caption|\-|pos=|, |above|\-|caption|\-|skip=|, and |below|\-|caption|\-|skip=|.
-% \See{\package{listings} documentation for details.}
-% These \package{listings} options override the \package{caption}'s ones, but
+% \See{\pkg{listings} documentation for details.}
+% These \pkg{listings} options override the \pkg{caption}'s ones, but
% can be again overwritten by |\caption|\-|setup[lst|\-|listing]{|\ldots|}|,
% e.g.%~
% \begin{quote}|\caption|\-|setup[lst|\-|listing]{skip=|\x|10pt}|\quad.\end{quote}
@@ -2876,7 +2805,7 @@
% \subsection{longtable}
% \label{longtable}
% \packagedescription{%
-% The \package{longtable} package\cite{longtable} offers an environment
+% The \pkg{longtable} package\cite{longtable} offers an environment
% which behaves similar to the \texttt{tabular} environment, but the table
% itself can span multiple pages.}
%
@@ -2905,7 +2834,7 @@
% \NEWfeature{v3.1}
% If you need a |long|\-|table| which does not increment the |table| counter
% please use the |long|\-|table*| environment (offered by the
-% \package{ltcaption} package which is part of \thispackage\ bundle and will be
+% \pkg{ltcaption} package which is part of \thispackage\ bundle and will be
% loaded automatically).
% \end{Note}
%
@@ -2913,7 +2842,7 @@
% \subsection{picinpar}
% \label{picinpar}
% \packagedescription{%
-% Similar to the \package{floatflt} package the \package{picinpar}
+% Similar to the \pkg{floatflt} package the \pkg{picinpar}
% package\cite{picinpar} offers figures and tables which do not span the full
% width of a page and are float around by text.
% For a detailed discussion about the differences between these packages
@@ -2930,7 +2859,7 @@
% |figure| or |table|.
%
% \begin{Note}
-% The |margin| resp.~|width| setting will not be used for these figures and tables,
+% The |margin| or |width| setting will not be used for these figures and tables,
% unless you set it explicit with |\caption|\-|setup[fig|\-|window]{|\ldots|}| or
% |\caption|\-|setup[fig|\-|table]{|\ldots|}|.
% \end{Note}
@@ -2939,8 +2868,8 @@
% \subsection{picins}
% \label{picins}
% \packagedescription{%
-% Similar to the \package{floatflt} and \package{picinpar} package the
-% \package{picins} package\cite{picins} offers figures and tables which do not
+% Similar to the \pkg{floatflt} and \pkg{picinpar} package the
+% \pkg{picins} package\cite{picins} offers figures and tables which do not
% span the full width of a page and are float around by text.
% For a detailed discussion about the differences between these packages
% please take a look at The \LaTeX\ Companion\cite{TLC2}.}
@@ -2957,7 +2886,7 @@
% and |\pic|\-|caption*{|\ldots|}| gives an unlabeled \& unnumbered caption.
%
% \begin{Note}
-% The |margin| resp.~|width| setting will not be used for these figures and tables.
+% The |margin| or |width| setting will not be used for these figures and tables.
% \iffalse
% if |pic|\-|caption|\-|side| or |pic|\-|caption|\-|top|\-|side| is used.
% The |width| setting will not be used (but the |margin| setting will) if
@@ -2968,7 +2897,7 @@
% \end{Note}
%
% If you want to have a |\pic|\-|caption| of another type as |figure|, please
-% do \emph{not} re-define |\@cap|\-|type| as suggested by the \package{picins}
+% do \emph{not} re-define |\@cap|\-|type| as suggested by the \pkg{picins}
% documentation. Please use the |\pic|\-|caption|\-|type|\marg{type} command
% which is offered by \thispackage\ instead, e.g.:
% \begin{quote}
@@ -2981,9 +2910,9 @@
% \subsection{rotating}
% \label{rotating}
% \packagedescription{%
-% The \package{rotating} package\cite{rotating} offers the floating
+% The \pkg{rotating} package\cite{rotating} offers the floating
% environments \texttt{side\-ways\-figure} and \texttt{side\-ways\-table} which
-% are just like normal figures and tables but rotated by 90 resp.~270 degree.
+% are just like normal figures and tables but rotated by 90 or 270 degree.
% Furthermore a command \cs{rot\-caption} is offered for rotated captions only.}
%
% \iffalse % No, we don't do that
@@ -3005,22 +2934,22 @@
% \subsection{setspace}
% \label{setspace}
% \packagedescription{%
-% The \package{setspace} package\cite{setspace} offers options and commands
+% The \pkg{setspace} package\cite{setspace} offers options and commands
% to change the spacing,
% e.g.\ \cs{usepackage}\x\csoarg{one\-half\-spacing}\x\csmarg{set\-space}
% causes the document to be typeset in one-and-a-half spacing.}
%
-% If the \package{setspace} package is used in conjunction with \thispackage,
+% If the \pkg{setspace} package is used in conjunction with \thispackage,
% the caption will be typeset with single spacing as default. This can be changed
% by specifying either |font=|\x|one|\-|half|\-|spacing|,
% |font=|\x|double|\-|spacing|, or |font={stretch=|\x\meta{amount}|}|.
-% \See{also \Ref{fonts}}
+% \See{also \longref{fonts}}
%
% \pagebreak[3]
% \subsection{sidecap}
% \label{sidecap}
% \packagedescription{%
-% The \package{sidecap} package\cite{sidecap} offers the floating environments
+% The \pkg{sidecap} package\cite{sidecap} offers the floating environments
% \texttt{SC\-figure} and \texttt{SC\-table} which are like usual figures
% and tables but the caption will be put \emph{beside} the contents.}
%
@@ -3035,13 +2964,13 @@
%
% \pagebreak[3]
% \begin{Note}
-% The \package{sidecap} package offers its own options for justification.
+% The \pkg{sidecap} package offers its own options for justification.
% If set, they will override the one specified with the caption option
% |jus|\-|ti|\-|fi|\-|ca|\-|tion=| for captions beside their contents.
% \end{Note}
%
% \begin{Note}
-% The |margin| resp.~|width| setting will not be used for these figures and tables,
+% The |margin| or |width| setting will not be used for these figures and tables,
% unless you set it explicit with |\caption|\-|setup[SC|\-|figure]{|\ldots|}|
% or |\caption|\-|setup[SC|\-|table]{|\ldots|}|.
% \end{Note}
@@ -3049,14 +2978,14 @@
% \medskip
%
% \begin{Annotation*}
-% Instead of using the \package{sidecap} package you can also use the more
-% powerful and flexible \package{floatrow} package\cite{floatrow} for typesetting
+% Instead of using the \pkg{sidecap} package you can also use the more
+% powerful and flexible \pkg{floatrow} package\cite{floatrow} for typesetting
% captions beside the contents.
% \end{Annotation*}
%
% \pagebreak[3]
% \subsubsection*{Undocumented features}
-% The \package{sidecap} package \version{1.6} has some undocumented package
+% The \pkg{sidecap} package \version{1.6} has some undocumented package
% options and commands which allow further customization of the side-captions:
%
% \pagebreak[3]
@@ -3082,34 +3011,34 @@
% \subsection{subfigure}
% \label{subfigure}
% \packagedescription{%
-% The \package{subfigure} package\cite{subfigure} provides support for small or
+% The \pkg{subfigure} package\cite{subfigure} provides support for small or
% `sub' figures and tables within a single figure or table environment.
-% This package is obsolete, new users should use \package{subfig} instead.}
+% This package is obsolete, new users should use \pkg{subfig} instead.}
%
-% Since the \package{subfigure} package is obsolete it will only be supported in
+% Since the \pkg{subfigure} package is obsolete it will only be supported in
% a way that old documents (which have used \thispackage\ \version{1.x} during
% development) should still compile as expected.
%
-% Please use the \package{subfig} or \package{subcaption} package instead which both supports \thispackage\
+% Please use the \pkg{subfig} or \pkg{subcaption} package instead which both supports \thispackage\
% \version{3.x}.
%
-% \See{the \package{subfig} package\cite{subfig} documentation for details.}
+% \See{the \pkg{subfig} package\cite{subfig} documentation for details.}
%
% \pagebreak[3]
% \subsection{supertabular and xtab}
% \label{supertabular}
% \packagedescription{%
-% The \package{supertabular}\cite{supertabular} and \package{xtab}\cite{xtab}
+% The \pkg{supertabular}\cite{supertabular} and \pkg{xtab}\cite{xtab}
% packages offer an environment which can span multiple pages and is quite
% similar to the \texttt{long\-table} environment provided by the
-% \package{longtable} package\cite{longtable}.
+% \pkg{longtable} package\cite{longtable}.
% For a detailed discussion about the differences between these powerful
% packages please take a look at The \LaTeX\ Companion\cite{TLC2}.}
%
% If you want to setup special options for the |super|\-|tabular|
-% resp.~|x|\-|tabular| environment you can use
+% or |x|\-|tabular| environment you can use
% \begin{quote}
-% |\captionsetup[supertabular]|\marg{options}\quad\emph{resp.}\\
+% |\captionsetup[supertabular]|\marg{options}\quad\emph{or}\\
% |\captionsetup[xtabular]|\marg{options}\quad.
% \end{quote}
% These options will be executed additionally to the regular ones for
@@ -3123,7 +3052,7 @@
% \subsection{threeparttable}
% \label{threeparttable}
% \packagedescription{%
-% The \package{threeparttable} package\cite{threeparttable} provides a scheme
+% The \pkg{threeparttable} package\cite{threeparttable} provides a scheme
% for tables that have a structured note section after the table contents and
% the caption.
% This scheme provides an answer to the old problem of putting footnotes in
@@ -3141,7 +3070,7 @@
%
% \begin{Note}
% Since the caption will have the same width as the contents here,
-% the |margin| resp.~|width| setting will not be used for these figures and tables,
+% the |margin| or |width| setting will not be used for these figures and tables,
% at least unless you set it explicit with
% |\caption|\-|setup[three|\-|part|\-|table]{|\ldots|}| or
% |\caption|\-|setup[measured|\-|figure]{|\ldots|}|.
@@ -3150,8 +3079,8 @@
% \medskip
%
% \begin{Annotation*}
-% Instead of using the \package{threeparttable} package you can
-% also use the \package{floatrow} package\cite{floatrow} for this purpose.
+% Instead of using the \pkg{threeparttable} package you can
+% also use the \pkg{floatrow} package\cite{floatrow} for this purpose.
% \end{Annotation*}
%
% \pagebreak[3]
@@ -3158,8 +3087,8 @@
% \subsection{wrapfig}
% \label{wrapfig}
% \packagedescription{%
-% Similar to the \package{floatflt}, the \package{picinpar}, and the
-% \package{picins} package the \package{wrapfig} package\cite{wrapfig} offers
+% Similar to the \pkg{floatflt}, the \pkg{picinpar}, and the
+% \pkg{picins} package the \pkg{wrapfig} package\cite{wrapfig} offers
% figures and tables which do not span the full width of a page and are float
% around by text.
% For a detailed discussion about the differences between these packages
@@ -3176,7 +3105,7 @@
% |figure| or |table|.
%
% \begin{Note}
-% The |margin| resp.~|width| setting will not be used for these figures and
+% The |margin| or |width| setting will not be used for these figures and
% tables, unless you set it explicit with
% |\caption|\-|setup[wrap|\-|figure]{|\ldots|}|
% or |\caption|\-|setup[wrap|\-|table]{|\ldots|}|.
@@ -3339,13 +3268,13 @@
% \end{longtable*}
% \preambleoptiontext
% \footnotetext{The option \texttt{subtype} is explained in the
-% \package{subcaption} package documentation.}
+% \pkg{subcaption} package documentation.}
%
% \nopagebreak\parbox[t]{\linewidth}{% prevent from page break
% \begin{Note*}
% Obsolete options are not listed here. See
-% \Ref{caption1} and
-% \Ref{caption2} for a list of these options.
+% \longref{caption1} and
+% \longref{caption2} for a list of these options.
% \end{Note*}}
%
% \pagebreak[3]
@@ -3384,7 +3313,7 @@
% |\showcaptionsetup| & & \ref{captionsetup} \\
% \end{longtable*}
% \footnotetext{\cs{DeclareCaptionSubType} is explained in the
-% \package{subcaption} package documentation.}
+% \pkg{subcaption} package documentation.}
%
% \clearpage
% \subsection{Warnings}
@@ -3403,7 +3332,7 @@
% |\caption|\-|setup{type=|\x\meta{type}|}| command outside an box, group,
% or environment.
% You should not do this since it could cause some bad side-effects.
-% \par\See{\Ref{types} and \Ref{caption}}
+% \par\See{\longref{types} and \longref{caption}}
%
% \Message
% |\caption will not be redefined since it's already|\\
@@ -3421,7 +3350,7 @@
% you can give the unsupported(!) option |compatibility=|\x|false|
% a try and keep your fingers crossed.
% (But you will get the next warning instead.)
-% \par\See{\Ref{classes} and \Ref{compatibility}}
+% \par\See{\longref{classes} and \longref{compatibility}}
%
% \Message
% |Forced redefinition of \caption since the|\\
@@ -3433,18 +3362,18 @@
% But depending on the document class or other packages you use that
% can end in non-functional features or even errors. So keep your
% fingers crossed!
-% \par\See{\Ref{compatibility}}
+% \par\See{\longref{compatibility}}
%
% \Message
% |Hyperref support is turned off because hyperref has|\\
% |stopped early.|
% \Description
-% If the \package{hyperref} package stops early during loading
-% (because of what-ever reason), the \package{hyperref} support of
+% If the \pkg{hyperref} package stops early during loading
+% (because of what-ever reason), the \pkg{hyperref} support of
% \thispackage\ will not be available. As a result you could get
-% \package{hyperref} warnings and non-functional hyperlinks to figures
+% \pkg{hyperref} warnings and non-functional hyperlinks to figures
% or tables.
-% \par\See{\Ref{hyperref}\,}
+% \par\See{\longref{hyperref}\,}
%
% \Message
% |Ignoring optional argument [|\meta{pos}|] of \setcapwidth.|
@@ -3453,7 +3382,7 @@
% captions as best as it can. But the optional argument of the
% \KOMAScript\ command |\setcapwidth| is not (yet) working if you use
% this package, so if you try to use it anyway, you will get this warning.
-% \par\See{\Ref{KOMA}}
+% \par\See{\longref{KOMA}}
%
% \Message
% |Internal Warning: |\meta{warning message}|.|
@@ -3481,7 +3410,7 @@
% get this warning. If this is not because of a typo and you would like
% to suppress this warning, use |\clear|\-|caption|\-|setup*| instead of
% |\clear|\-|caption|\-|setup|.
-% \par\See{\Ref{captionsetup}}
+% \par\See{\longref{captionsetup}}
%
% \Message
% |Option list `|\meta{option list}|' undefined.|
@@ -3492,26 +3421,26 @@
% get this warning. If this is not because of a typo and you would like
% to suppress this warning, use |\clear|\-|caption|\-|setup*| instead of
% |\clear|\-|caption|\-|setup|.
-% \par\See{\Ref{captionsetup}}
+% \par\See{\longref{captionsetup}}
%
% \Message
% |Obsolete option `ignoreLTcapwidth' ignored.|
% \Description
-% The \package{caption2} package option |ignoreLTcapwidth| will not be
+% The \pkg{caption2} package option |ignoreLTcapwidth| will not be
% emulated by this version of \thispackage, usually you can simply wipe it
% away.
-% \par\See{\Ref{caption2} and \Ref{longtable}}
+% \par\See{\longref{caption2} and \longref{longtable}}
%
% \Message
% |`ragged2e' support has been changed. Rerun to get|\\
% |captions right.|
% \Description
-% The \package{ragged2e} package will only be loaded by \thispackage\ if it
+% The \pkg{ragged2e} package will only be loaded by \thispackage\ if it
% is actually needed.
% At least two \LaTeX\ runs are needed for that, so on the first run you could
% get this warning.
% Just compile your document again and this warning should go away.
-% \par\See{\Ref{justification}}
+% \par\See{\longref{justification}}
%
% \Message
% |Reference on page |\meta{page no.}| undefined.|
@@ -3521,7 +3450,7 @@
% At least two \LaTeX\ runs are needed for that, on the first run you could get
% this warning.
% Just compile your document again and this warning should go away.
-% \par\See{\Ref{margins}}
+% \par\See{\longref{margins}}
%
% \Message
% |The caption type was already set to `|\meta{type}|'.|
@@ -3535,7 +3464,7 @@
% as well.\par
% {\small(You can suppress this warning by using the starred form
% |\caption|\-|setup*{type=|\x\ldots|}|.)\par}
-% \par\See{\Ref{captionsetup}}
+% \par\See{\longref{captionsetup}}
%
% \Message
% |The option `hypcap=true' will be ignored for this|\\
@@ -3554,7 +3483,7 @@
% |\caption|\-|of| command which is causing the warning.
% If this is not ok for you, you can set a hyperlink anchor with
% |\caption|\-|setup{type=|\x\meta{float type}|}| for yourself.
-% \par\See{\Ref{hyperref}\,}
+% \par\See{\longref{hyperref}\,}
%
% \Message
% |Unsupported document class (or package) detected,|\\
@@ -3565,7 +3494,7 @@
% (which is responsible for typesetting the caption internally) as well.
% This means \thispackage\ will either change the design of captions in an
% unwanted way, or it even refuses to work correctly at all.
-% \par\See{\Ref{classes} and \Ref{compatibility}}
+% \par\See{\longref{classes} and \longref{compatibility}}
%
% \Message
% |Unused \captionsetup[|\meta{type}|].|
@@ -3578,7 +3507,7 @@
% of the environment \meta{type} after this line.
% (If you want to suppress this warning you can use |\caption|\-|setup*|
% instead of |\caption|\-|setup|.)
-% \par\See{\Ref{captionsetup}}
+% \par\See{\longref{captionsetup}}
%
% \Message
% |Usage of the |\meta{package}| package together with the|\\
@@ -3589,7 +3518,7 @@
% The package \meta{package} is dealing with caption skips as well.
% Please decide which one do you actually want to use, \thispackage\ or the
% other one, using both can lead to wrong skips above or below the caption.
-% \par\See{\Ref{skips}}
+% \par\See{\longref{skips}}
%
% \end{Warnings}
%
@@ -3604,10 +3533,10 @@
% |Paragraph ended before \@caption was complete.|
% \Description
% If you want to typeset something special (like a tabular) as caption,
-% you need to give an optional argument to |\caption| resp.~|\caption|\-|of|
-% for the List of Figures resp.~List of Tables, too, even if you don't
+% you need to give an optional argument to |\caption| or |\caption|\-|of|
+% for the List of Figures or List of Tables, too, even if you don't
% use such list.
-% \par\See{\Ref{caption}, \Ref{lists}, and \Ref{hyperref}\,}
+% \par\See{\longref{caption}, \longref{lists}, and \longref{hyperref}\,}
%
% \Message
% |\caption outside float.|
@@ -3617,7 +3546,7 @@
% If this is what you want to, please use either
% |\caption|\-|setup{type=|\x\meta{type}|}| $+$ |\caption| or
% |\caption|\-|of|.
-% \par\See{\Ref{caption}}
+% \par\See{\longref{caption}}
%
% \Message
% |\ContinuedFloat outside float.|
@@ -3630,7 +3559,7 @@
% working, but maybe using the |long|\-|table*| environment, which
% typesets a |long|\-|table| without incrementing the |table| counter,
% if sufficient for you.
-% \par\See{\Ref{ContinuedFloat} and \Ref{longtable}}
+% \par\See{\longref{ContinuedFloat} and \longref{longtable}}
%
% \Message
% |Continued `|\meta{type}|' after `|\meta{type}|'.|
@@ -3638,7 +3567,7 @@
% Continued figures or tables are not allowed to be interrupted by a floating
% environment (or |long|\-|table|) of another type,
% e.g.~a table between a figure and a continued figure.
-% \par\See{\Ref{ContinuedFloat}}
+% \par\See{\longref{ContinuedFloat}}
%
% \Message
% |For a successful cooperation we need at least version|\\
@@ -3662,9 +3591,9 @@
% not defined.
% \meta{type} should be either `\texttt{figure}' or `\texttt{table}', or
% any other floating environment defined with
-% |\Declare|\-|Floating|\-|Environment| offered by the \package{newfloat} package,
-% |\new|\-|float| offered by the \package{float} package\cite{float}, or
-% |\Declare|\-|New|\-|Float|\-|Type| offered by the \package{floatrow} package\cite{floatrow}.
+% |\Declare|\-|Floating|\-|Environment| offered by the \pkg{newfloat} package,
+% |\new|\-|float| offered by the \pkg{float} package\cite{float}, or
+% |\Declare|\-|New|\-|Float|\-|Type| offered by the \pkg{floatrow} package\cite{floatrow}.
%
% \Message
% |Not allowed in longtable* environment.|
@@ -3681,12 +3610,12 @@
% incompatible document class or an incompatible package which also
% extents the |\caption| command. Leaving the original extension intact,
% some features of \thispackage\ are not supported.
-% \par\See{\Ref{compatibility}}
+% \par\See{\longref{compatibility}}
%
% \Message
% |Only one \caption can be placed in this environment.|
% \Description
-% Inside the environments offered by the \package{fltpage} and \package{sidecap}
+% Inside the environments offered by the \pkg{fltpage} and \pkg{sidecap}
% package only \emph{one} caption can be placed. (This is due implementation design.)
%
% \Message
@@ -3696,11 +3625,11 @@
% \Description
% \Thispackage\ has already been loaded by some other \LaTeX\ package,
% so you can't do that again specifying different options.
-% A candidate causing this could be the \package{subfig} package; if this is
-% the case, please load \thispackage\ \emph{before} the \package{subfig}
+% A candidate causing this could be the \pkg{subfig} package; if this is
+% the case, please load \thispackage\ \emph{before} the \pkg{subfig}
% package or specify the option |caption=|\x|false| while loading the
-% \package{subfig} package.
-% \par\See{the \package{subfig} package\cite{subfig} documentation}
+% \pkg{subfig} package.
+% \par\See{the \pkg{subfig} package\cite{subfig} documentation}
%
% \Message
% |Paragraph ended before \caption at makecurrent was complete.|
@@ -3708,9 +3637,9 @@
% |Paragraph ended before \caption at prepareanchor was complete.|
% \Description
% If you want to typeset multi-paragraph captions, you need to give an
-% optional argument to |\caption| resp.~|\caption|\-|of| for the List of
-% Figures resp.~List of Tables, too, even if you don't use such list.
-% \par\See{\Ref{caption}, \Ref{lists}, and \Ref{hyperref}\,}
+% optional argument to |\caption| or |\caption|\-|of| for the List of
+% Figures or List of Tables, too, even if you don't use such list.
+% \par\See{\longref{caption}, \longref{lists}, and \longref{hyperref}\,}
%
% \Message
% |Something's wrong--perhaps a missing \caption|\\
@@ -3733,7 +3662,7 @@
% Please select either another caption label separator
% (e.g.~|labelsep=|\x|colon|) or another caption format
% (e.g.~|format=|\x|plain|).
-% \par\See{\Ref{formats} resp.~\Ref{KOMA}}
+% \par\See{\longref{formats} or \longref{KOMA}}
%
% \Message
% |The package option `caption=false' is obsolete.|\\
@@ -3741,12 +3670,12 @@
% |and do *not* load the caption package anymore.|
% \Description
% You have specified the option |caption=|\x|false|. This used to be a workaround
-% for not using the whole \package{caption} package (leaving the caption stuff
+% for not using the whole \pkg{caption} package (leaving the caption stuff
% offered by the document class or other packages intact), but keeping the
-% \package{subfig} package working. This mechanism is obsolete and not offered
-% anymore, please pass this option to the \package{subfig} package instead and
+% \pkg{subfig} package working. This mechanism is obsolete and not offered
+% anymore, please pass this option to the \pkg{subfig} package instead and
% do not load \thispackage\ anymore.
-% \par\See{the \package{subfig} package\cite{subfig} documentation}
+% \par\See{the \pkg{subfig} package\cite{subfig} documentation}
%
% \Message
% |Undefined boolean value `|\meta{value}|'.|
@@ -3760,7 +3689,7 @@
% \Description
% You tried to set a caption format which does not exists.
% Maybe a typo!?
-% \par\See{\Ref{formats}}
+% \par\See{\longref{formats}}
%
% \Message
% |Undefined label format `|\meta{name}|'.|
@@ -3767,7 +3696,7 @@
% \Description
% You tried to set a caption label format which does not exists.
% Maybe a typo!?
-% \par\See{\Ref{formats}}
+% \par\See{\longref{formats}}
%
% \Message
% |Undefined label separator `|\meta{name}|'.|
@@ -3774,7 +3703,7 @@
% \Description
% You tried to set a caption label separator which does not exists.
% Maybe a typo!?
-% \par\See{\Ref{formats}}
+% \par\See{\longref{formats}}
%
% \Message
% |Undefined list format `|\meta{name}|'.|
@@ -3781,7 +3710,7 @@
% \Description
% You tried to set a caption list-of format which does not exists.
% Maybe a typo!?
-% \par\See{\Ref{lists}}
+% \par\See{\longref{lists}}
%
% \Message
% |Undefined position `|\meta{name}|'.|
@@ -3788,7 +3717,7 @@
% \Description
% You tried to set a caption position with an improper value.
% Maybe a typo!?
-% \par\See{\Ref{skips}}
+% \par\See{\longref{skips}}
%
% \Message
% |Undefined style `|\meta{name}|'.|
@@ -3795,7 +3724,7 @@
% \Description
% You tried to set a caption style which does not exists.
% Maybe a typo!?
-% \par\See{\Ref{style}}
+% \par\See{\longref{style}}
%
% \Message
% |Usage of the `position' option is incompatible|\\
@@ -3806,7 +3735,7 @@
% of \thispackage\ or the mechanism of the other one; using both this way
% would lead to wrong skips above or below the caption and is therefore
% not supported.
-% \par\See{\Ref{skips}}
+% \par\See{\longref{skips}}
%
% \Message
% |Undefined text format `|\meta{name}|'.|
@@ -3813,7 +3742,7 @@
% \Description
% You tried to set a caption text format which does not exists.
% Maybe a typo!?
-% \par\See{\Ref{formats}}
+% \par\See{\longref{formats}}
%
% \Message
% |You can't use both, the (obsolete) caption2 *and*|\\
@@ -3821,7 +3750,7 @@
% \Description
% This error message says it all, you simply can't do that.
% Please use only \thispackage.
-% \par\See{\Ref{caption2}}
+% \par\See{\longref{caption2}}
%
% \end{Warnings}
%
@@ -3835,49 +3764,49 @@
%
% The version $1.0$ was written in 1994 and was offering a handful of options
% to customize the look \& feel of the captions.
-% Furthermore this version already supported the \package{rotating} and
-% \package{subfigure} packages.
+% Furthermore this version already supported the \pkg{rotating} and
+% \pkg{subfigure} packages.
% Version $1.1$ introduced the |center|\-|last| option;
-% version $1.2$ added the support of the \package{float} package.
-% Version $1,3$ offered a better support of the \package{subfigure} package,
+% version $1.2$ added the support of the \pkg{float} package.
+% Version $1,3$ offered a better support of the \pkg{subfigure} package,
% while version $1.4$ came with the new option |nooneline|.
%
-% The \package{caption2} package $2.0$ was an experimental side-version of
-% the regular \package{caption} package. It was made public as beta test version
+% The \pkg{caption2} package $2.0$ was an experimental side-version of
+% the regular \pkg{caption} package. It was made public as beta test version
% without proper documentation in 1995 because of the strong demand for new
-% features and adaptations to additional packages like the \package{longtable}
+% features and adaptations to additional packages like the \pkg{longtable}
% package.
-% Furthermore it offered a revised support of the \package{subfigure} package.
+% Furthermore it offered a revised support of the \pkg{subfigure} package.
% (An improved version $2.1$ was offered in 2002.)
%
% In 2003 I finally found some time, so a new regular release $3.0$
-% of the \package{caption} package could be build in cooperation with
+% of the \pkg{caption} package could be build in cooperation with
% Frank Mittelbach and Steven Cochran.
% It was released in December 2003 and superseded the neglected
-% \package{caption2} package.
+% \pkg{caption2} package.
% Main parts were re-written and it provided a complete re-work of
% the user interface.
-% Furthermore it supported the \package{hyperref}, \package{hypcap},
-% \package{listings}, \package{sidecap}, and \package{supertabular} packages
+% Furthermore it supported the \pkg{hyperref}, \pkg{hypcap},
+% \pkg{listings}, \pkg{sidecap}, and \pkg{supertabular} packages
% additionally.
%
% While all the previous versions were designed for usage with the standard
-% \LaTeX\ document classes \class{article}, \class{report}, and \class{book},
+% \LaTeX\ document classes \cls{article}, \cls{report}, and \cls{book},
% the current version $3.1$ released in 2007 also supports the \AmS,
-% \KOMAScript, \NTG, and \SmF\ document classes, and the \class{beamer} class
+% \KOMAScript, \NTG, and \SmF\ document classes, and the \cls{beamer} class
% as well.
-% Furthermore it was adapted to the \package{french} Babel option,
-% the \package{frenchle} \& \package{frenchpro} packages,
-% and the \package{floatflt}, \package{fltpage}, \package{picinpar},
-% \package{picins}, \package{setspace}, \package{threeparttable},
-% and \package{wrapfig} packages.
+% Furthermore it was adapted to the \pkg{french} Babel option,
+% the \pkg{frenchle} \& \pkg{frenchpro} packages,
+% and the \pkg{floatflt}, \pkg{fltpage}, \pkg{picinpar},
+% \pkg{picins}, \pkg{setspace}, \pkg{threeparttable},
+% and \pkg{wrapfig} packages.
% New options and commands were introduced as well, among other things
% |font+|, |figure|\-|within| \& |table|\-|within|,
% |list| \& |list|\-|format|, |max|\-|margin| \& |min|\-|margin|,
% |\caption|\-|list|\-|entry|, |\Declare|\-|Caption|\-|List|\-|Format|.
-% Further benefits are the new compatibility check \see*{\Ref{compatibility}},
-% the new ``hypcap'' feature \see*{\Ref{hyperref}\,}, and the sub-caption
-% feature \see*{\package{subcaption} package documentation}.
+% Further benefits are the new compatibility check \see*{\longref{compatibility}},
+% the new ``hypcap'' feature \see*{\longref{hyperref}\,}, and the sub-caption
+% feature \see*{\pkg{subcaption} package documentation}.
%
% \iffalse
% --------------------------------------------------------------------------- %
@@ -3900,7 +3829,7 @@
%
% \begin{center}\small
% \begin{tabular}{ll}
-% \package{caption} \version{1.x} & \package{caption} \version{3.x}\\
+% \pkg{caption} \version{1.x} & \pkg{caption} \version{3.x}\\
% \hline
% |normal| & |format=plain|\\
% |hang| & |format=hang|\\
@@ -3927,7 +3856,7 @@
% \end{center}
%
% Beside the options for setting up the desired font there were also
-% the commands |\caption|\-|size| resp.~|\caption|\-|font| and
+% the commands |\caption|\-|size| or |\caption|\-|font| and
% |\caption|\-|label|\-|font| who could be redefined with
% |\re|\-|new|\-|command| and allowed an alternate and more flexible way to
% change the font used for captions.
@@ -3946,7 +3875,7 @@
% \begin{quote}
% |\captionsetup{margin=|\ldots|}|\qquad.
% \end{quote}
-% \See{\Ref{margins}}
+% \See{\longref{margins}}
%
% For example the old-style code
% \begin{quote}
@@ -3968,7 +3897,7 @@
%
% The quite exotic option |ruled| which allowed a partial usage of
% the caption settings for |ruled| floats defined with the
-% \package{float} package will be emulated by this version of the
+% \pkg{float} package will be emulated by this version of the
% caption package, too.
% But using this option is not recommended anymore since this
% version of \thispackage\ offers a more flexible way
@@ -3976,21 +3905,21 @@
% \begin{quote}
% |\DeclareCaptionStyle{ruled}{|\ldots|}|
% \end{quote}
-% resp.
+% or
% \begin{quote}
% |\captionsetup[ruled]{|\ldots|}|\qquad.
% \end{quote}
-% \SeeUserDefined[, \Ref{captionsetup}, and \Ref{float}]
+% \SeeUserDefined[, \longref{captionsetup}, and \longref{float}]
%
% \subsection{caption2 v\texorpdfstring{$2.x$}{2.x}}
% \label{caption2}
%
-% Although they do very similar stuff, the packages \package{caption} and
-% its experimental and now obsolete variant \package{caption2} have a
+% Although they do very similar stuff, the packages \pkg{caption} and
+% its experimental and now obsolete variant \pkg{caption2} have a
% very different implementation design.
% Therefore a full compatibility could not be offered.
% For that reason you will still find a file called |caption2.sty| in
-% this package distribution, so old documents using the \package{caption2}
+% this package distribution, so old documents using the \pkg{caption2}
% package will still compile fine.
%
% Newly created documents should use the actual version of
@@ -4004,8 +3933,8 @@
% \end{quote}
% But some options and commands will not be emulated, so you can get
% error messages afterwards. This section will hopefully help you removing
-% these errors. If you have problems migrating from \package{caption2}
-% to \package{caption} please don't hesitate to send me an e-mail asking
+% these errors. If you have problems migrating from \pkg{caption2}
+% to \pkg{caption} please don't hesitate to send me an e-mail asking
% for help.
%
% In addition to the obsolete options shown in the last section
@@ -4013,7 +3942,7 @@
%
% \begin{center}\small
% \begin{tabular}{ll}
-% \package{caption2} \version{2.x} & \package{caption} \version{3.x}\\
+% \pkg{caption2} \version{2.x} & \pkg{caption} \version{3.x}\\
% \hline
% |flushleft| & |justification=raggedright|\\
% |flushright| & |justification=raggedleft|\\
@@ -4023,15 +3952,15 @@
%
% Setting the margin for captions was done in \version{2.x} with
% \begin{quote}\leavevmode\hbox{%
-% |\setcaptionmargin{|\ldots|}| resp.
+% |\setcaptionmargin{|\ldots|}| or
% |\setcaptionwidth{|\ldots|}|\quad.
% }\end{quote}
% This was replaced by
% \begin{quote}\leavevmode\hbox{%
-% |\captionsetup{margin=|\ldots|}| resp.
+% |\captionsetup{margin=|\ldots|}| or
% |\captionsetup{width=|\ldots|}|\quad.
% }\end{quote}
-% \See{\Ref{margins}}
+% \See{\longref{margins}}
%
% Setting an indention was done in \version{2.x} with
% \begin{quote}
@@ -4050,9 +3979,9 @@
% |\oneline|\-|captions|\-|true| (for switching the check on).
% This was replaced by
% |\caption|\-|setup{single|\-|line|\-|check=|\x|off}|
-% resp.
+% or
% |\caption|\-|setup{single|\-|line|\-|check=|\x|on}|\quad.
-% \See{\Ref{justification}}
+% \See{\longref{justification}}
%
% The commands
% \begin{quote}
@@ -4075,14 +4004,14 @@
% in this version of \thispackage\ the value of |\LT|\-|cap|\-|width|
% will be ignored anyway (unless you set it to a different value than the
% default one which is |4in|).
-% \See{\Ref{longtable}}
+% \See{\longref{longtable}}
%
% \subsection{caption v\texorpdfstring{$3.0$}{3.0}}
% \label{caption3}
%
% \Thispackage\ \version{3.0} did not support any document classes
-% other than the standard \LaTeX\ ones: \class{article}, \class{report},
-% and \class{book}.
+% other than the standard \LaTeX\ ones: \cls{article}, \cls{report},
+% and \cls{book}.
% Therefore the default settings used to be fixed, but now \thispackage{}
% supports more classes, therefore they are now set in dependence on the
% document class used.
@@ -4091,7 +4020,7 @@
% |jus|\-|ti|\-|fi|\-|ca|\-|tion| used to be always |jus|\-|ti|\-|fied|,
% it's now still |jus|\-|ti|\-|fied| when using one of the standard document
% classes, but |ragged|\-|right| will be used as default format when used
-% with the \class{beamer} document class.
+% with the \cls{beamer} document class.
%
% An easy way to select the `old' defaults is using the option
% |style=base| when loading \thispackage\ (or later on using |\caption|\-|setup|).
@@ -4114,11 +4043,11 @@
%
% \begin{Note*}
% \Thispackage\ \version{3.0} offered the option |caption=|\x|false|,
-% which used to be a workaround for not using the whole \package{caption} package
+% which used to be a workaround for not using the whole \pkg{caption} package
% (leaving the caption stuff offered by the document class or other packages
-% intact), but keeping the \package{subfig} package\cite{subfig} working.
+% intact), but keeping the \pkg{subfig} package\cite{subfig} working.
% This mechanism is obsolete and not offered anymore, please pass this option
-% to the \package{subfig} package instead and do not load \thispackage\ anymore.
+% to the \pkg{subfig} package instead and do not load \thispackage\ anymore.
% \end{Note*}
%
% \iffalse
@@ -4128,16 +4057,16 @@
% \clearpage
% \section{Commands for document class authors}
%
-% A document class could simply load the \package{caption} package instead
+% A document class could simply load the \pkg{caption} package instead
% of defining an own variant of |\@make|\-|caption|. However if the author decides
% not to do this -- for whatever reason -- there is a second option:
%
% \NEWfeature{v3.5}
% If a document class defines |\caption at document|\-|class|, an adaption to the
-% \package{caption} package will be loaded as |caption-|\meta{documentclass}|.sto|
-% if the \package{caption} kernel is loaded.
+% \pkg{caption} package will be loaded as |caption-|\meta{documentclass}|.sto|
+% if the \pkg{caption} kernel is loaded.
% The goal of this adaption file is changing the default settings of the
-% \package{caption} package so simply loading it (without any package options)
+% \pkg{caption} package so simply loading it (without any package options)
% will not make any harm to the look at feel of the captions.
% This gives end-users the opportunity to fine-tune certain aspects of the
% appearance of captions by adding package options, without unwanted
@@ -4144,7 +4073,7 @@
% side-effects on other aspects of the appearance.
%
% In both cases the command |\Set|\-|Caption|\-|Default|
-% could be used to adapt the \package{caption} package default values:
+% could be used to adapt the \pkg{caption} package default values:
%
% \DescribeMacro{\SetCaptionDefault}
% The command
@@ -4194,11 +4123,11 @@
% environment.
%
% \DescribeMacro{\AtCaptionPackage}
-% The adaption file will be loaded when the \package{caption} kernel |caption3.sty|
-% will be loaded so the given adaptions will be done for the \package{floatrow}
-% and \package{subfig} packages even if the \package{caption} package isn't loaded.
+% The adaption file will be loaded when the \pkg{caption} kernel |caption3.sty|
+% will be loaded so the given adaptions will be done for the \pkg{floatrow}
+% and \pkg{subfig} packages even if the \pkg{caption} package isn't loaded.
%
-% But some adaptions have to be done for the \package{caption} package,
+% But some adaptions have to be done for the \pkg{caption} package,
% and for this reason the hook
% \begin{quote}|\AtCaptionPackage|\marg{code}\end{quote}
% is offered to authors of adaption files.
@@ -4206,7 +4135,7 @@
% options will be evaluated.
%
% For example the adaption file for the \KOMAScript\ document classes
-% uses |\At|\-|Begin|\-|Caption| to re-define the \package{caption} package
+% uses |\At|\-|Begin|\-|Caption| to re-define the \pkg{caption} package
% options |figure|\-|position| and |table|\-|position| to issue a warning
% that using these options have little effect here.
%
@@ -4215,7 +4144,7 @@
% \begin{quote}|\AfterCaptionPackage|\marg{code}\end{quote}
% is offered to authors of adaption files as well.
% The \meta{code} inside the hook will be executed at the very end of the
-% \package{caption} package.
+% \pkg{caption} package.
%
% \iffalse
% --------------------------------------------------------------------------- %
@@ -4226,7 +4155,7 @@
%
% \NEWfeature{v3.5}
% \DescribeMacro{\caption at switchdefault}
-% If the \package{caption3} kernel package is loaded, the command
+% If the \pkg{caption3} kernel package is loaded, the command
% \begin{quote}|\caption at switchdefault|\marg{option}\marg{code with \#1}\marg{new value}\end{quote}
% is available which saves the old default value of the given option using
% \meta{code} and sets the new default value afterwards.
@@ -4251,7 +4180,7 @@
% |\caption at restoredefault{font}{\original at captionfont}%|\\
% \end{quote}
%
-% Since boths commands are defined with |\def| inside the \package{caption3}
+% Since boths commands are defined with |\def| inside the \pkg{caption3}
% kernel, they could be pre-defined with
% \begin{quote}
% |\providecommand\caption at switchdefault[3]{}|\\
@@ -4261,7 +4190,7 @@
% prior use.
%
% Additionally babel language packages should not re-define |\@make|\-|caption|
-% if the \package{caption} package is loaded, i.e.~if |\caption at makecaption| is
+% if the \pkg{caption} package is loaded, i.e.~if |\caption at makecaption| is
% defined. (Unfortunately one cannot use the \LaTeX{} kernel command
% |\@if|\-|package|\-|loaded{caption}| here since it's only available in the
% document preamble.)
@@ -4276,13 +4205,13 @@
% | \caption at switchdefault{|\ldots|}{\babel at save #1}{|\ldots|}%|\\
% | }}|
% \end{quote}
-% would be wrong since it mixes up the presence of the \package{caption3} kernel
-% and the \package{caption} package.
-% If the \package{caption3} kernel is loaded this does not mean that the
-% \package{caption} package is loaded, too, and the latter one re-defines
-% |\caption|, |\@caption|, and |\@make|\-|caption| while the \package{caption3}
+% would be wrong since it mixes up the presence of the \pkg{caption3} kernel
+% and the \pkg{caption} package.
+% If the \pkg{caption3} kernel is loaded this does not mean that the
+% \pkg{caption} package is loaded, too, and the latter one re-defines
+% |\caption|, |\@caption|, and |\@make|\-|caption| while the \pkg{caption3}
% kernel does not re-define any of them, instead it only provides (default) values
-% for the \package{caption}, \package{floatrow}, and \package{subfig} package.
+% for the \pkg{caption}, \pkg{floatrow}, and \pkg{subfig} package.
%
% Currently there is build-in support for the following babel language options:
% |arabic|, |farsi|, |french|, |hungarian|, |latvian|, and |magyar|.
@@ -4305,15 +4234,15 @@
% \begin{quote}\begin{tabular}{ll}
% Internal command & Currently used by \\
% \hline
-% |\caption at kernel@addcontentsline| & \package{floatrow} \\
-% |\caption at settype| & \package{newfloat} \\
-% |\caption at xlabel| & \package{cleveref} \\
+% |\caption at kernel@addcontentsline| & \pkg{floatrow} \\
+% |\caption at settype| & \pkg{newfloat} \\
+% |\caption at xlabel| & \pkg{cleveref} \\
% \end{tabular}\end{quote}
%
-% If your package wants to use any other internal command of the \package{caption} package,
+% If your package wants to use any other internal command of the \pkg{caption} package,
% please write me an e-mail so we can define a proper interface together.
%
-% The \package{lwarp} package uses a lot of internal commands as well,
+% The \pkg{lwarp} package uses a lot of internal commands as well,
% but we are working on it on the Git branch \texttt{feature/lwarp}:
% \url{https://gitlab.com/axelsommerfeldt/caption/-/tree/feature/lwarp}
%
@@ -4528,12 +4457,12 @@
%
% \changes{v1.0}{1994/10/27}{First release}
% \changes{v1.1}{1994/11/03}{New option \texttt{centerlast}}
-% \changes{v1.2}{1994/11/28}{Support of the \package{float} package}
+% \changes{v1.2}{1994/11/28}{Support of the \pkg{float} package}
% \changes{v1.3}{1995/01/09}{Support of \cs{captionlabelfont} in subcaptions}
% \changes{v1.4}{1995/01/30}{New option \texttt{nooneline}}
% \changes{v1.4b}{1995/04/05}{Bugfix release}
% \changes{v3.0}{2003/12/20}{Rewritten; many new commands and features}
-% \changes{v3.0d}{2004/11/28}{Split into two packages: \package{caption} \& \package{caption3}}
+% \changes{v3.0d}{2004/11/28}{Split into two packages: \pkg{caption} \& \pkg{caption3}}
%
% \iffalse
% --------------------------------------------------------------------------- %
@@ -4556,13 +4485,13 @@
% |\caption@@make|, giving the user the possibility to control the look \& feel
% of the captions from floating environments like |figure| and |table|.
% Furthermore it does similar to the caption stuff coming from other packages
-% (like the \package{longtable} or \package{supertabular} package):
+% (like the \pkg{longtable} or \pkg{supertabular} package):
% Mapping the appropriate internal commands (like |\LT at makecaption| or
-% |\ST at caption|) to the ones offered by the \package{caption3} kernel.
+% |\ST at caption|) to the ones offered by the \pkg{caption3} kernel.
% So you can think of \thispackage\ as a layer package, it
% simply provides adaptation layers between the caption stuff coming from
% \LaTeXe\ or packages, and the caption stuff offered by the
-% \package{caption3} kernel.
+% \pkg{caption3} kernel.
%
% \subsection{Identification}
%
@@ -4592,28 +4521,29 @@
%
% Identify the current version of the package.
% \begin{macrocode}
-\ProvidesPackage{caption}[2023/03/12 v3.6j Customizing captions (AR)]
+\ProvidesPackage{caption}[2023/07/28 v3.6m Customizing captions (AR)]
% \end{macrocode}
%
% \subsection{Loading the kernel}
%
-% Load a matching version of the \package{caption} kernel.
+% Load a matching version of the \pkg{caption} kernel.
% \begin{macrocode}
-\RequirePackage{caption3}[2022/04/06] % needs v2.4 or newer
+\RequirePackage{caption3}[2023/07/28] % needs v2.4c or newer
% \end{macrocode}
%
% \subsection{Check against unknown document classes}
%
% \begin{macrocode}
-\caption at ifbool{documentclass}{}{%
- \caption at WarningNoLine{%
- Unknown document class (or package),\MessageBreak
- standard defaults will be used}}
+\caption at ifdocumentclass{unknown}%
+ {\caption at WarningNoLine{%
+ Unknown document class (or package),\MessageBreak
+ standard defaults will be used}}%
+ {}
% \end{macrocode}
%
% \subsection{Check against incompatible packages}
%
-% \changes{v3.0p}{2007/04/06}{Check against obsolete \package{caption2} package added}
+% \changes{v3.0p}{2007/04/06}{Check against obsolete \pkg{caption2} package added}
% \begin{macrocode}
\@ifpackageloaded{caption2}{%
\caption at Error{%
@@ -4624,10 +4554,10 @@
% \end{macrocode}
%
% Check against incompatible packages which used to work fine with \version{1} of the `caption' package.
-% \changes{v3.1}{2007/06/15}{Check against incompatible \package{ftcap} package added}
-% \changes{v3.1}{2007/06/15}{Check against incompatible \package{nonfloat} package added}
-% \changes{v3.1}{2007/06/18}{Check against incompatible \package{topcapt} package added}
-% \changes{v3.6}{2021/01/02}{Check against incompatible packages \package{ftcap}, \package{nonfloat}, and \package{topcapt} revised}
+% \changes{v3.1}{2007/06/15}{Check against incompatible \pkg{ftcap} package added}
+% \changes{v3.1}{2007/06/15}{Check against incompatible \pkg{nonfloat} package added}
+% \changes{v3.1}{2007/06/18}{Check against incompatible \pkg{topcapt} package added}
+% \changes{v3.6}{2021/01/02}{Check against incompatible packages \pkg{ftcap}, \pkg{nonfloat}, and \pkg{topcapt} revised}
% \begin{macrocode}
\caption at AtBeginDocument{%
\caption at setincompatible{\@ifpackageloaded{captcont}}{captcont package}%
@@ -4816,10 +4746,10 @@
% \subsubsection{fltpage package support options}
%
% \changes{v3.1}{2007/09/01}{Options `FPlist' \& `FPref' added}
-% With these options is controlled where the list-of entry and |\ref| resp.
+% With these options is controlled where the list-of entry and |\ref| or
% |\pageref| or |\autoref| will link to.
% Defaults are |FPlist=caption| and |FPref=figure| which is inconsistent,
-% but compatible to the usual behaviour of the \package{fltpage} package.
+% but compatible to the usual behaviour of the \pkg{fltpage} package.
% \begin{macrocode}
\DeclareCaptionOption{FPlist}[1]{\caption at setFPoption{list}{#1}}
\DeclareCaptionOption{FPref}[1]{\caption at setFPoption{ref}{#1}}
@@ -4839,7 +4769,7 @@
% \subsubsection{hyperref package support options}
%
% \changes{v3.1}{2007/06/21}{Options `hypcap' \& `hypcapspace' added}
-% With |hypcap=off| one can turn the \package{hypcap} support off
+% With |hypcap=off| one can turn the \pkg{hypcap} support off
% (default is |on|).
% \begin{macrocode}
\DeclareCaptionOption{hypcap}[1]{\caption at setbool{hypcap}{#1}}
@@ -4879,11 +4809,11 @@
% Since we support continued floats and sub-figures it's not an easy task
% to manage the figure (and table) counter, especially since previous versions
% of the caption package have proven that correcting a counter locally is not a good idea,
-% and to make it dependent on the |position=| setting (like the \package{subfig} package does)
+% and to make it dependent on the |position=| setting (like the \pkg{subfig} package does)
% is not a good idea, either.
%
% In the past three boolean switches were used to store the flags, but since some
-% packages (like the \package{floatrow} and \package{tabu} package) try hard to keep
+% packages (like the \pkg{floatrow} and \pkg{tabu} package) try hard to keep
% \LaTeX{} counter changes locally under certain circumstances, it seems a good idea to make
% these flags a \LaTeX{} counter value.
%
@@ -5106,7 +5036,7 @@
\caption at if@minipage\@minipagetrue\@minipagefalse}%
\caption at end}
% \end{macrocode}
-% \class{memoir} document class stuff:
+% \cls{memoir} document class stuff:
% \begin{macrocode}
\providecommand\memcaptioninfo[4]{}
% \end{macrocode}
@@ -5121,7 +5051,7 @@
\caption at ifhypcap\caption@@start\relax
\M at gettitle{#2}}
% \end{macrocode}
-% \class{memoir} document class stuff:
+% \cls{memoir} document class stuff:
% \begin{macrocode}
\providecommand\M at gettitle[1]{}
% \end{macrocode}
@@ -5129,7 +5059,7 @@
%
% \begin{macro}{\caption at nobreak}
% \changes{v3.6}{2022/01/06}{This macro added}
-% |\caption at nobreak| for use in places where |\@caption| resp.~|\beamer at makecaption| does |\nobreak|.
+% |\caption at nobreak| for use in places where |\@caption| or |\beamer at makecaption| does |\nobreak|.
% It's defined to do nothing unless the \cls{beamer} document class is used.
% \begin{macrocode}
\newcommand*\caption at nobreak{}
@@ -5154,7 +5084,7 @@
% |\@makecaption|\marg{label}\marg{text}\par
% We do basically the same as the original code (from the standard
% \LaTeX\ document classes), but take care of the |position=| setting
-% and use |\caption@@make| from the \package{caption} kernel to finally
+% and use |\caption@@make| from the \pkg{caption} kernel to finally
% typeset the caption.
% \begin{macrocode}
\long\def\caption at makecaption#1#2{%
@@ -5173,7 +5103,7 @@
% \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|.
+% Typesets the stuff above or below the caption, depending on |\caption at iftop|.
% \begin{macrocode}
\newcommand*\caption at make@above{%
\caption at iftop
@@ -5198,7 +5128,7 @@
\newcommand*\caption at redefine{%
% \end{macrocode}
% Prior to \version{3.4} we only redefined |\caption| and |\@caption| if the current definitions
-% were well known, so documents written in the old (\package{caption} package \version{1.x}) days
+% were well known, so documents written in the old (\pkg{caption} package \version{1.x}) days
% (where |\caption| \& |\@caption| were not redefined by us) still compiled fine.
% This used to make sense when introducing \version{3.0} in the year 2003
% but is simply overcautious and especially unwanted by the user nowadays.
@@ -5209,7 +5139,7 @@
\let\@caption\caption@@caption
% \end{macrocode}
% We redefine |\@x|\-|float| so inside floating environments our
-% type-specific options will be used, a \package{hyperref}
+% type-specific options will be used, a \pkg{hyperref}
% anchor will be set etc.
% \begin{macrocode}
\let\caption at ORI@xfloat\@xfloat
@@ -5216,7 +5146,7 @@
\let\@xfloat\caption at xfloat
% \end{macrocode}
% We redefine |\@xdbl|\-|float|, too, so special options for |figure*|
-% resp.~|table*| will be applied here.
+% or |table*| will be applied here.
% \begin{macrocode}
\let\caption at ORI@xdblfloat\@xdblfloat
\let\@xdblfloat\caption at xdblfloat
@@ -5224,7 +5154,7 @@
% \begin{macrocode}
}
% \end{macrocode}
-% Some packages (like the \package{hyperref} package for example) redefines
+% Some packages (like the \pkg{hyperref} package for example) redefines
% |\caption| and |\@caption|, too.
% So we have to use |\At|\-|Begin|\-|Document| here, so we can make sure
% our definition is the one which will be valid at last.
@@ -5303,14 +5233,14 @@
%
% \begin{macro}{\setcaptiontype}
% \changes{v3.2}{2010/10/24}{This macro added}
-% \changes{v3.5}{2020/08/24}{Definition method adapted to the \package{caption-light} package}
+% \changes{v3.5}{2020/08/24}{Definition method adapted to the \pkg{caption-light} package}
% \changes{v3.6}{2022/02/20}{Optional argument added}
% \changes{v3.6e}{2022/04/17}{Re-written, task sequence corrected}
% \changes{v3.6f}{2022/04/18}{\cs{@ifnextchar} replaced by \cs{kernel at ifnextchar}}
% |\setcaptiontype*|\oarg{additional options}\marg{type}\\
% Like |\captionsetup{type=|\meta{type}|}|, but also works if |\caption|\-|setup| was redefined.
-% The non-starred version sets a \package{hyperref} anchor additionally
-% (if |hypcap=|\-|true| and the \package{hypcap} package is not loaded).
+% The non-starred version sets a \pkg{hyperref} anchor additionally
+% (if |hypcap=|\-|true| and the \pkg{hypcap} package is not loaded).
% \begin{macrocode}
\def\setcaptiontype{%
\caption at teststar\@setcaptiontype\@gobble\@iden}
@@ -5354,7 +5284,7 @@
% (using |\caption at set|\-|options|).
% Furthermore we check |\current|\-|group|\-|level| (if avail), and
% use the macro |\caption@|(|sub|)|type|\-|hook| (which will be used by our
-% \package{float} package support).\par
+% \pkg{float} package support).\par
% \begin{macrocode}
\newcommand*\caption at settype{%
\caption at initposition
@@ -5401,8 +5331,8 @@
% |\setcaptionsubtype*|\\
% Like |\captionsetup{subtype}|, but also works if |\caption|\-|setup| was redefined.
% Sets |\@sub|\-|cap|\-|type| and executes the options associated with it.
-% The non-starred version sets a \package{hyperref} anchor additionally
-% (if |hypcap=|\-|true| and the \package{hypcap} package is not loaded).
+% The non-starred version sets a \pkg{hyperref} anchor additionally
+% (if |hypcap=|\-|true| and the \pkg{hypcap} package is not loaded).
% \begin{macrocode}
\newcommand*\setcaptionsubtype{%
\caption at teststar\@setcaptionsubtype\@gobble\@iden}
@@ -5478,7 +5408,7 @@
%
% \begin{macro}{\caption at checktype}
% \changes{v3.4g}{2020/01/02}{This macro definition added}
-% \changes{v3.4m}{2020/07/29}{Check of \cs{sf at counterlist} from \package{subfig} package added}
+% \changes{v3.4m}{2020/07/29}{Check of \cs{sf at counterlist} from \pkg{subfig} package added}
% |\caption at checktype|\marg{type}\marg{code}\par
% is used by |\caption at settype| and should either expand the code or issue an error
% if the given type is not a proper type, i.e. it is a sub-type instead (either defined by
@@ -5494,8 +5424,8 @@
%
% \begin{macro}{\caption at checksubtype}
% \changes{v3.4g}{2020/01/02}{This macro definition added}
-% \changes{v3.4m}{2020/07/29}{Check of \cs{sf at counterlist} from \package{subfig} package added}
-% \changes{v3.6c}{2022/04/06}{Check of \cs{sf at counterlist} from \package{subfig} package removed}
+% \changes{v3.4m}{2020/07/29}{Check of \cs{sf at counterlist} from \pkg{subfig} package added}
+% \changes{v3.6c}{2022/04/06}{Check of \cs{sf at counterlist} from \pkg{subfig} package removed}
% \changes{v3.6c}{2022/04/06}{Usage of \cs{caption at subtypesource} added}
% |\caption at checksubtype|\marg{type}\marg{code}\par
% is used by |\caption at settype| and should either expand the code or issue an error
@@ -5593,7 +5523,7 @@
% \changes{v3.1c}{2007/09/22}{Bugfix: Redefinition of \cs{caption at setfloatcapt} removed}
% \changes{v3.1e}{2007/10/30}{Better compatibility: Will be defined with \cs{AtBeginDocument} now}
% \changes{v3.2}{2010/10/24}{Bugfix 10-10-17: Uses \cs{setcaptiontype} instead of \cs{caption at settype} now}
-% \changes{v3.5}{2020/08/24}{Definition method adapted to the \package{caption-light} package}
+% \changes{v3.5}{2020/08/24}{Definition method adapted to the \pkg{caption-light} package}
% |\captionof|\marg{type}\oarg{lst\_entry}\marg{heading}\\
% |\captionof*|\oarg{lst\_entry}\marg{heading}\par
% \Note{This will be defined with \cs{AtBeginDocument} so
@@ -5763,8 +5693,8 @@
% \changes{v3.2a}{2011/08/16}{\cs{captionsetup} replaces with \cs{captionbox at settype} and \cs{caption at setposition}}
% \changes{v3.3}{2012/04/09}{Adapted to revised version of \cs{caption at withoptargs}}
% \changes{v3.3}{2017/03/19}{When used with fixed witdh the content will not be hboxed anymore}
-% \changes{v3.3c}{2019/09/01}{Adapted so it could be used by \cs{subfloat} offered by \package{subcaption}}
-% \changes{v3.5}{2020/07/28}{Adapted to \package{caption3} v2.0}
+% \changes{v3.3c}{2019/09/01}{Adapted so it could be used by \cs{subfloat} offered by \pkg{subcaption}}
+% \changes{v3.5}{2020/07/28}{Adapted to \pkg{caption3} v2.0}
% \changes{v3.6}{2020/12/24}{Check of argument \meta{inner-pos} added}
% A |\parbox| with contents and caption, separated by an invisible |\hrule|.
% \begin{macrocode}
@@ -5883,7 +5813,7 @@
% \begin{macro}{\continuedfloat}
% \changes{v3.0i}{2005/11/12}{Optional argument added}
% \changes{v3.0g}{2005/06/28}{Bugfix: \cs{newcounter} replaced by \cs{newcount}}
-% \changes{v3.1}{2007/07/02}{Format of \package{hyperref} extension changed}
+% \changes{v3.1}{2007/07/02}{Format of \pkg{hyperref} extension changed}
% \changes{v3.1}{2007/07/07}{\cs{caption at setoptions} added}
% \changes{v3.1g}{2008/01/29}{Starred variant added}
% \changes{v3.2f}{2011/12/17}{Undocumented optional argument removed}
@@ -5890,7 +5820,7 @@
% \changes{v3.2f}{2011/12/17}{Redefinition of \cs{caption@@@continuedfloat} added}
% \changes{v3.3}{2011/12/28}{Uses \cs{ifcaption at ContinuedFloat} now}
% \changes{v3.3}{2013/05/01}{Usage of \cs{caption at restorecounters} added}
-% \changes{v3.3}{2013/12/16}{Bugfix: Does not use \cs{caption at ContinuedFloat} anymore since this breaks \cs{ContinuedFloat} offered by the \package{subfig} package}
+% \changes{v3.3}{2013/12/16}{Bugfix: Does not use \cs{caption at ContinuedFloat} anymore since this breaks \cs{ContinuedFloat} offered by the \pkg{subfig} package}
% \changes{v3.4}{2015/09/16}{Renamed from \cs{ContinuedFloat} to \cs{continuedfloat}}
% \changes{v3.5f}{2020/10/06}{Usage of \cs{caption at restorecounters} removed}
% \changes{v3.6}{2020/12/27}{Check of counter caption type out-sourced to \cs{caption at check@continuedfloat}}
@@ -5924,7 +5854,7 @@
\caption at setoptions{continued#1}%
\expandafter\l at addto@macro\csname the#1\endcsname\thecontinuedfloat
% \end{macrocode}
-% When the \package{hyperref} package is used we have the problem
+% When the \pkg{hyperref} package is used we have the problem
% that the usage of |\continued|\-|float| will create duplicate
% hyper links -- |\@current|\-|Href| will be the same for the main float and
% the continued ones. So we have to make sure unique labels and references
@@ -5934,13 +5864,13 @@
% will be used instead of
% \begin{quote}\meta{type}|.|\meta{type \#}\quad\quad.\end{quote}
% \par{\small(This implementation follows an idea from Steven Douglas Cochran.)}
-% \Note{This does not help if the \package{hyperref} package option \texttt{naturalnames=true} is set.}
+% \Note{This does not help if the \pkg{hyperref} package option \texttt{naturalnames=true} is set.}
% \begin{macrocode}
\@ifundefined{theH#1}{}{%
\expandafter\l at addto@macro\csname theH#1\endcsname{%
\@alph\c at continuedfloat}}%
% \end{macrocode}
-% Make sure the options and the \package{hyperref} patch is only applied once (per group).
+% Make sure the options and the \pkg{hyperref} patch is only applied once (per group).
% \begin{macrocode}
\let\caption@@@continuedfloat\@gobble}
% \end{macrocode}
@@ -5957,8 +5887,8 @@
% \changes{v3.0f}{2005/06/11}{This macro added}
% \changes{v3.3}{2013/12/16}{Bugfix: Revised and defined with \cs{def} instead of \cs{newcommand}}
% |\caption at ContinuedFloat|\marg{caption type}\par
-% This one is used by \cs{ContinuedFloat} offered by the \package{subfig} package.
-% Since the \package{subfig} package does its own counter handling we try not to
+% This one is used by \cs{ContinuedFloat} offered by the \pkg{subfig} package.
+% Since the \pkg{subfig} package does its own counter handling we try not to
% interfere by changing couter-related flags.
% not interfere with it
% \begin{macrocode}
@@ -5972,7 +5902,7 @@
% \changes{v3.6}{2021/01/09}{Usage of \cs{flushsubcaptionlistentries} added}
% \changes{v3.6}{2022/01/05}{Usage of \cs{caption at Error} replaced by \cs{caption at OutsideFloat}}
% |\nextfloat| resets the flags (indicating that the next contents of the floating environment starts here),
-% and sets a new \package{hyperref} anchor.
+% and sets a new \pkg{hyperref} anchor.
% \begin{macrocode}
\providecommand*\nextfloat{%
\caption at teststar\caption at nextfloat\@firstoftwo\@secondoftwo}
@@ -6234,7 +6164,7 @@
%
% \begin{macro}{\caption at normalsize}
% \changes{v3.1}{2007/05/05}{This macro definition added}
-% \changes{v3.5}{2020/07/27}{Adapted to \package{caption3} v2.0}
+% \changes{v3.5}{2020/07/27}{Adapted to \pkg{caption3} v2.0}
% This one will be used by |\@caption| instead of |\normalsize|.
% \begin{macrocode}
\newcommand*\caption at normalsize{%
@@ -6243,7 +6173,7 @@
% \end{macro}
%
% \begin{macro}{\caption at setfloatcapt}
-% Needed for support of the \package{float} package, where the caption will
+% Needed for support of the \pkg{float} package, where the caption will
% not be typeset directly, but catched in a |\vbox| called |\@floatcapt|
% instead.
% \begin{macrocode}
@@ -6252,7 +6182,7 @@
% \end{macro}
%
% \begin{macro}{\caption at makecurrent}
-% This one is needed for support of the \package{nameref} and \package{hyperref} package.
+% This one is needed for support of the \pkg{nameref} and \pkg{hyperref} package.
% \changes{v3.2f}{2012/01/14}{Bugfix: Usage of \cs{caption at gettitle} added}
% \begin{macrocode}
\newcommand*\caption at makecurrent[1]{\caption at gettitle}
@@ -6264,7 +6194,7 @@
% \begin{macro}{\caption@@start}
% \begin{macro}{\caption at freezeHref}
% \begin{macro}{\caption at defrostHref}
-% All these are needed for support of the \package{hyperref} package.
+% All these are needed for support of the \pkg{hyperref} package.
% \begin{macrocode}
\let\caption at makeanchor\@firstofone
\let\caption at start\relax
@@ -6280,7 +6210,7 @@
%
% \begin{macro}{\caption at gettitle}
% \changes{v3.1}{2007/05/05}{This macro definition added}
-% This one is needed for support of the \package{nameref} package.
+% This one is needed for support of the \pkg{nameref} package.
% \begin{macrocode}
\newcommand\caption at gettitle[1]{%
\caption at ifdefined\NR at gettitle
@@ -6292,6 +6222,25 @@
% \subsection{Support for sub-captions}
% \changes{v3.1f}{2007/11/16}{Support for sub-captions added}
%
+% \begin{macro}{\subcaptionsetup}
+% \changes{v3.6l}{2023/03/22}{This macro definition moved from \pkg{subcaption} package to here}
+% |\subcaptionsetup*|\oarg{environment}\marg{options}
+% is an abbreviation for |\caption|\-|setup*[sub|\meta{environment}|]|\marg{options},
+% especially |\sub|\-|caption|\-|setup|\marg{options} sets options valid for all sub-captions.
+% \begin{macrocode}
+\newcommand*\subcaptionsetup{%
+ \caption at teststar\@subcaptionsetup*{}}
+% \end{macrocode}
+% \begin{macrocode}
+\newcommand*\@subcaptionsetup[1]{%
+ \@testopt{\captionsetup at sub{#1}}{}}
+% \end{macrocode}
+% \begin{macrocode}
+\def\captionsetup at sub#1[#2]#3{%
+ \captionsetup#1[sub#2]{#3}}
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}{\caption at subtypehook}
% \changes{v3.1g}{2008/03/20}{Redefinition of \cs{caption at setlist} added}
% \changes{v3.1k}{2009/10/09}{Bugfix 09-08-12b: \cs{@makecaption} will now be restored here, too}
@@ -6303,14 +6252,14 @@
% \changes{v3.3}{2012/03/15}{Usage of \cs{caption at setbox} added}
% \changes{v3.3}{2013/05/01}{Redefinition of \cs{caption at settype} added}
% \changes{v3.3}{2013/06/17}{Missing redefinition of \cs{captionlistentry} added}
-% \changes{v3.3}{2018/09/06}{Adapted to the \package{chkfloat} package}
+% \changes{v3.3}{2018/09/06}{Adapted to the \pkg{chkfloat} package}
% \changes{v3.4f}{2020/01/03}{Redefinition of \cs{@caption} added since it was redefined by the \env{threeparttable} environment}
-% \changes{v3.5}{2020/07/27}{Adapted to \package{caption3} v2.0}
+% \changes{v3.5}{2020/07/27}{Adapted to \pkg{caption3} v2.0}
% \changes{v3.6}{2020/09/20}{Handling of flags out-sourced to \cs{caption at stepcounter}}
% \changes{v3.6d}{2022/04/17}{Usage of \cs{if at subfloatrow} removed in favour of a re-definition of \env{subfloatrow*}}
% Hook, will be used inside \cs{caption at setsubtype}.\par
% (Note: If we are inside an |sub|\-|float|\-|row| environment we have to keep
-% the |\@make|\-|caption| code of the \package{floatrow} package intact.)
+% the |\@make|\-|caption| code of the \pkg{floatrow} package intact.)
% \begin{macrocode}
\newcommand*\caption at subtypehook{%
\ifx\caption\caption at subcaption \else
@@ -6416,14 +6365,13 @@
% \changes{v3.2c}{2011/08/19}{Uses \cs{caption at gobble} instead of \cs{@gobble} now}
% \changes{v3.3}{2012/01/15}{Debug message added}
% \changes{v3.3}{2013/03/10}{A single \cs{protect} replaced by \cs{noexpand}}
+% \changes{v3.6m}{2023/07/28}{Redefinition of \cs{label} etc. replaced by \cs{caption at prepareslc}}
% Add a pending sub-caption list entry.
% \begin{macrocode}
\newcommand*\caption at addsubcontentsline[4]{%
\caption at Debug{\string\caption at addsubcontentsline{#1}{#2}}%
\begingroup
- \let\label\caption at gobble
- \let\index\caption at gobble
- \let\glossary\caption at gobble
+ \caption at prepareslc
\protected at edef\@tempa{\endgroup
\noexpand\g at addto@macro\noexpand\caption at subcontentslines{%
\noexpand\@namedef{the#2}{\csname the#2\endcsname}%
@@ -6458,14 +6406,14 @@
% \subsection{Babel package support}
%
% \subsubsection{The arabic \& farsi babel option}
-% \changes{v3.5}{2020/08/02}{\package{arabic} babel support addded}
+% \changes{v3.5}{2020/08/02}{\pkg{arabic} babel support addded}
%
% \begin{macrocode}
\caption at IfBabelArabi{%
% \end{macrocode}
%
-% The \package{arabicore} package re-defines |\@make|\-|caption|, |\fnum at figure|, and |\fnum at table|
-% incompatible to the \package{caption} package, therefore we have to restore our resp.~the original definitions here.
+% The \pkg{arabicore} package re-defines |\@make|\-|caption|, |\fnum at figure|, and |\fnum at table|
+% incompatible to the \pkg{caption} package, therefore we have to restore our or the original definitions here.
%
% \begin{macrocode}
\let\@makecaption\caption at makecaption
@@ -6478,8 +6426,8 @@
% \end{macrocode}
%
% \subsubsection{The frenchle \& frenchpro package}
-% \changes{v3.0h}{2005/10/03}{\package{frenchle/pro} package support added}
-% \changes{v3.5}{2020/08/01}{\package{frenchle/pro} package support updated}
+% \changes{v3.0h}{2005/10/03}{\pkg{frenchle/pro} package support added}
+% \changes{v3.5}{2020/08/01}{\pkg{frenchle/pro} package support updated}
%
% \begin{macrocode}
\caption at IfFrenchLe{%
@@ -6500,7 +6448,7 @@
% \end{macro}
% \end{macro}
%
-% Since the \package{frenchle} package overwrites |\@make|\-|caption| (within |\GO|\-|french|),
+% Since the \pkg{frenchle} package overwrites |\@make|\-|caption| (within |\GO|\-|french|),
% we need to save it beforehand and restore it afterwards.
% \begin{macrocode}
\caption at AtBeginDocument{%
@@ -6514,18 +6462,18 @@
% \end{macrocode}
%
% \subsubsection{The hungarian \& magyar babel option}
-% \changes{v3.2}{2009/03/29}{\package{magyar} babel support added}
-% \changes{v3.3}{2018/08/26}{\package{magyar} babel support revised}
-% \changes{v3.5}{2020/08/02}{\package{magyar} babel support updated}
+% \changes{v3.2}{2009/03/29}{\pkg{magyar} babel support added}
+% \changes{v3.3}{2018/08/26}{\pkg{magyar} babel support revised}
+% \changes{v3.5}{2020/08/02}{\pkg{magyar} babel support updated}
%
% \begin{macrocode}
\caption at IfBabelHungarian{%
% \end{macrocode}
%
-% Since the \package{magyar} package tends to overwrite |\@make|\-|caption|
+% Since the \pkg{magyar} package tends to overwrite |\@make|\-|caption|
% we save it beforehand and restore it afterwards.
% \Note{Currently it will not be overwritten, caused by a side-effect of a
-% work-around for the \package{floatrow} package within \package{caption3}.}
+% work-around for the \pkg{floatrow} package within \pkg{caption3}.}
%
% \begin{macrocode}
\caption at AtBeginDocument{%
@@ -6543,13 +6491,13 @@
% \end{macrocode}
%
% \subsubsection{The latvian babel option}
-% \changes{v3.5}{2020/08/02}{\package{latvian} babel support updated}
+% \changes{v3.5}{2020/08/02}{\pkg{latvian} babel support updated}
%
% \begin{macrocode}
\caption at IfBabelLatvian{%
% \end{macrocode}
%
-% The \package{latvian} package re-defines |\@make|\-|caption| incompatible to the \package{caption} package,
+% The \pkg{latvian} package re-defines |\@make|\-|caption| incompatible to the \pkg{caption} package,
% therefore we have to restore our definitions here.
%
% \begin{macrocode}
@@ -6605,7 +6553,7 @@
% \changes{v3.1}{2007/05/05}{This macro definition added}
% \changes{v3.6}{2021/01/17}{Adapted to current implementation of \cs{caption at setmargin}}
% This macro will be used by some package support stuff where the usual
-% margin setting is not welcome, e.g. in the \package{sidecap} package.
+% margin setting is not welcome, e.g. in the \pkg{sidecap} package.
% \begin{macrocode}
\newcommand*\caption at clearmargin{%
\caption at setmargin\z@
@@ -6622,7 +6570,7 @@
% \begin{macro}{\caption at freezetype}
% \changes{v3.3}{2013/05/01}{This macro added}
% |\caption at freezetype|\marg{type}\par
-% Used by the \package{fltpage} \& \package{sidecap} package support.
+% Used by the \pkg{fltpage} \& \pkg{sidecap} package support.
% \begin{macrocode}
\newcommand*\caption at freezetype[1]{%
\caption at settype{#1}%
@@ -6644,7 +6592,7 @@
% \changes{v3.2c}{2011/08/21}{Revised}
% \changes{v3.3}{2013/01/06}{Adapted to new switch \cs{caption at caption} etc.}
% |\caption at freeze|\par
-% Used by the \package{bicaption} package.
+% Used by the \pkg{bicaption} package.
% \begin{macrocode}
\newcommand*\caption at freeze{%
\let\caption at frozen@continuedfloat\continuedfloat
@@ -6749,7 +6697,7 @@
% \end{macro}
%
% \subsubsection{The changepage package}
-% \changes{v3.4k}{2020/05/30}{Patch of the \package{changepage} package added}
+% \changes{v3.4k}{2020/05/30}{Patch of the \pkg{changepage} package added}
%
% \begin{macrocode}
\caption at IfPackageLoaded{changepage}[2008/07/23 memoir-v3.7k]{%
@@ -6817,7 +6765,7 @@
% \end{macrocode}
%
% \subsubsection{The chkfloat package}
-% \changes{v3.3}{2018/09/06}{Support of the \package{chkfloat} package added}
+% \changes{v3.3}{2018/09/06}{Support of the \pkg{chkfloat} package added}
%
% \begin{macrocode}
\caption at IfPackageLoaded{chkfloat}[2012/08/19 v0.1]{%
@@ -6842,13 +6790,13 @@
% \end{macrocode}
%
% \subsubsection{The float package}
-% \changes{v3.0f}{2005/05/31}{\package{float} package support rewritten and improved}
+% \changes{v3.0f}{2005/05/31}{\pkg{float} package support rewritten and improved}
% \iffalse
% (This is a more straight-ahead implementation, but it only works with \version{1.3}
% now, so \version{1.2} is no longer supported.
% \fi
%
-% The \package{float} package usually do not use the \LaTeX\ kernel command
+% The \pkg{float} package usually do not use the \LaTeX\ kernel command
% |\@caption| to typeset the caption but |\float at caption| instead.
% (|\@caption| will only be used if the float is re-styled with
% |\restylefloat*|.)
@@ -6876,7 +6824,7 @@
% \changes{v3.1k}{2009/10/09}{Bugfix 08-12-05: \cs{color at begin/endgroup} added
% to redefinition of \cs{caption at setfloatcapt}}
% \changes{v3.4b}{2019/12/16}{Usage of \cs{caption at float@setname} added}
-% |\@float at setevery|\marg{float type} is provided by the \package{float}
+% |\@float at setevery|\marg{float type} is provided by the \pkg{float}
% package; it's called every time a floating environment defined with
% |\newfloat| or |\restylefloat| begins.
% We use this hook to do some adaptations and to setup the proper caption
@@ -6894,7 +6842,7 @@
% contents) to our |position=| setting.
% Since the spacing above and below the caption will be done by the float
% style and \emph{not} by us this sounds quite useless. But in fact it isn't,
-% since some packages based on \thispackage\ (like the \package{subfig}
+% since some packages based on \thispackage\ (like the \pkg{subfig}
% package) could have an interest for this information and therefore use the
% |\caption at iftop| macro we provide in our kernel. Furthermore we need this
% information for ourself in |\captionof| which uses |\@makecaption| to
@@ -6937,7 +6885,7 @@
% \begin{macrocode}
\caption at AtBeginDocument{%
% \end{macrocode}
-% If it was redefined by the \package{hyperref} package,
+% If it was redefined by the \pkg{hyperref} package,
% we need to build on the original definition (and not on the redefined one).
% \begin{macrocode}
\caption at ifdefined\HyOrg at float@makebox
@@ -6957,18 +6905,18 @@
% \changes{v3.6i}{2023/02/19}{Uses \cs{def} instead of \cs{let} now}
% \LaTeX\ and almost every other packages use
% |\|\meta{type}|name|
-% to provide a macro for the type resp.~environment name -- for example
+% to provide a macro for the type or environment name -- for example
% the command |\figure|\-|name| will usually contain the name of the floating
% environment |figure|:
% \begin{quote}
% |\newcommand\figurename{Figure}|
% \end{quote}
-% But the \package{float} package doesn't follow this common naming
+% But the \pkg{float} package doesn't follow this common naming
% convention:
% For floats defined with |\new|\-|float| it uses |\fname@|\meta{type} instead,
% which breaks with our code (and with |\auto|\-|ref| and some other things as
% well).
-% So we have to map the \package{float} package name to the common one here.\par
+% So we have to map the \pkg{float} package name to the common one here.\par
% \Note{If the float was not defined with \cs{newfloat} but with
% \cs{restylefloat} instead, \cs{fname@}\meta{type} is not defined.}
% \begin{macrocode}
@@ -7008,7 +6956,7 @@
% \changes{v3.1}{2007/06/10}{This macro added}
% |\float at getstyle|\marg{cmd}\marg{type}\par
% Determining the float style is not so easy because the only hint
-% provided by the \package{float} package is the macro
+% provided by the \pkg{float} package is the macro
% |\fst@|\meta{float type} which points to the macro which represents the
% float style. So for example after
% \begin{quote}
@@ -7037,7 +6985,7 @@
% \begin{macro}{\float at ifcaption}
% \changes{v3.1}{2007/06/23}{This macro added}
% |\float at ifcaption|\marg{type}\marg{if-clause}\marg{else-clause}\par
-% Here we determine if the user has used |\newfloat| resp.~|\restylefloat|,
+% Here we determine if the user has used |\newfloat| or |\restylefloat|,
% or |\restylefloat*|.
% This is quite easy: If |\@float at c@|\meta{captype} is the same as
% |\float at caption|, the user has used |\newfloat| or |\restylefloat|,
@@ -7085,7 +7033,7 @@
% \end{macrocode}
%
% \subsubsection{The floatflt package}
-% \changes{v3.1}{2007/06/10}{Support of the \package{floatflt} package added}
+% \changes{v3.1}{2007/06/10}{Support of the \pkg{floatflt} package added}
%
% \begin{macrocode}
\caption at IfPackageLoaded{floatflt}[1996/02/27 v1.3]{%
@@ -7199,7 +7147,7 @@
% \end{macrocode}
%
% \subsubsection{The fltpage package}
-% \changes{v3.1}{2007/07/22}{Support of the \package{fltpage} package added}
+% \changes{v3.1}{2007/07/22}{Support of the \pkg{fltpage} package added}
%
% \begin{macrocode}
\caption at IfPackageLoaded{fltpage}[1998/10/29 v.0.3]{%
@@ -7349,11 +7297,11 @@
% \end{macrocode}
%
% \subsubsection{The hyperref package}
-% \changes{v3.0f}{2005/06/11}{Support of the \package{hyperref} package added}
+% \changes{v3.0f}{2005/06/11}{Support of the \pkg{hyperref} package added}
% \changes{v3.1}{2007/03/09}{Usage of \cs{hyper at makecurrent} instead of
-% \cs{theHfigure} as indicator for \package{hyperref} package}
-% \changes{v3.2}{2011/07/30}{Test if \package{hyperref} has stopped early revised}
-% \changes{v3.2c}{2011/08/24}{Test if \package{hyperref} has stopped early adapted to current version of \package{hyperref} package: Usage of \cs{IfHyperBoolean} added}
+% \cs{theHfigure} as indicator for \pkg{hyperref} package}
+% \changes{v3.2}{2011/07/30}{Test if \pkg{hyperref} has stopped early revised}
+% \changes{v3.2c}{2011/08/24}{Test if \pkg{hyperref} has stopped early adapted to current version of \pkg{hyperref} package: Usage of \cs{IfHyperBoolean} added}
%
% \begin{macrocode}
\caption at IfPackageLoaded{hyperref}[2003/11/30 v6.74m]{%
@@ -7387,7 +7335,7 @@
%
% \begin{macro}{\caption at makecurrent}
% \changes{v3.1l}{2010/01/09}{Adapted to current version of nameref package}
-% We redefine |\caption at makecurrent| so a \package{hyperref} label
+% We redefine |\caption at makecurrent| so a \pkg{hyperref} label
% will be defined inside |\@caption|.
% \Note{Will be redefined by \cs{caption at start}.}
% \begin{macrocode}
@@ -7403,7 +7351,7 @@
%
% \begin{macro}{\caption at makeanchor}
% \changes{v3.1l}{2010/01/09}{Adapted to the current hyperref package}
-% We redefine |\caption at makeanchor| so a \package{hyperref} anchor
+% We redefine |\caption at makeanchor| so a \pkg{hyperref} anchor
% will be set inside |\@caption|.
% \Note{Will be redefined by \cs{caption at start}.}
% \begin{macrocode}
@@ -7426,7 +7374,7 @@
% \paragraph{The hypcap option}
%
% \begin{macro}{\if at capstart}
-% Like the \package{hypcap} package we define the switch |\if at capstart|, too.
+% Like the \pkg{hypcap} package we define the switch |\if at capstart|, too.
% \begin{macrocode}
\newif\if at capstart
% \end{macrocode}
@@ -7437,7 +7385,7 @@
% \cs{caption at currentHref} renamed to \cs{hc at currentHref}}
% \changes{v3.1}{2007/06/21}{%
% This macro renamed from \cs{capstart} to \cs{caption at start} and revised}
-% While the \package{hypcap} package defines a macro called |\capstart|
+% While the \pkg{hypcap} package defines a macro called |\capstart|
% our variant is called |\caption at start| and is controlled by the option
% |hypcap=||false|/|true|.
% \begin{macrocode}
@@ -7444,15 +7392,15 @@
\def\caption at start{\caption at ifhypcap\caption at start@\relax}%
\def\caption at start@{%
% \end{macrocode}
-% Generate the \package{hyperref} label and set the \package{hyperref} anchor,
+% Generate the \pkg{hyperref} label and set the \pkg{hyperref} anchor,
% usually (if |hypcap=false|) both is done inside |\@caption|.
% \begin{macrocode}
\caption at makestart\@captype
\caption at startanchor\@currentHref
% \end{macrocode}
-% Prevent |\@caption| from generating a new \package{hyperref} label,
+% Prevent |\@caption| from generating a new \pkg{hyperref} label,
% use the label we save in |\hc at currentHref| instead.
-% (We also support the |@capstart| flag from the \package{hypcap} package.)
+% (We also support the |@capstart| flag from the \pkg{hypcap} package.)
% \begin{macrocode}
\global\@capstarttrue
\let\hc at currentHref\@currentHref
@@ -7460,7 +7408,7 @@
\global\@capstartfalse
\global\let\@currentHref\hc at currentHref}%
% \end{macrocode}
-% Prevent |\@caption| from generating a \package{hyperref} anchor since this
+% Prevent |\@caption| from generating a \pkg{hyperref} anchor since this
% has already been done.
% \begin{macrocode}
\let\caption at makeanchor\@firstofone
@@ -7474,10 +7422,10 @@
% \changes{v3.1c}{2007/09/30}{\cs{@currentHref} will be extended by \texttt{caption}
% instead of \texttt{xxx} now}
% |\caption at makestart|\marg{type}
-% defines a \package{hyperref} anchor inside |\caption at start|.\par
+% defines a \pkg{hyperref} anchor inside |\caption at start|.\par
% Since we offer |\continuedfloat| the float counter can change between
% `now' and |\caption|, i.e., we simply don't know the figure or table counter
-% yet and therefore we are not able to generate the `right' \package{hyperref}
+% yet and therefore we are not able to generate the `right' \pkg{hyperref}
% label.
% Two different solutions of this problem came into my mind:
% \begin{enumerate}
@@ -7511,13 +7459,13 @@
% \changes{v3.1b}{2007/09/17}{Bugfix 06-09-17: We use \cs{caption at anchor} instead of \cs{hyper@@anchor}}
% \changes{v3.1g}{2008/03/16}{Warning about TeX mode replaced with debug info}
% |\caption at startanchor|\marg{Href}
-% sets a \package{hyperref} anchor inside |\caption at start|.\par
-% This code was taken from the \package{hypcap} package\cite{hypcap} and adapted.
+% sets a \pkg{hyperref} anchor inside |\caption at start|.\par
+% This code was taken from the \pkg{hypcap} package\cite{hypcap} and adapted.
% \Note{Since \cs{hyper@@anchor}\marg{Href}\csmarg{\string\relax} can cause
% a change from vertical mode to horizontal mode (design flaw in
-% \package{hyperref} package!?), and since the workaround
+% \pkg{hyperref} package!?), and since the workaround
% \cs{let}\cs{leavevmode}\cs{relax} which can be found in the
-% \package{hypcap} package is not always sufficient
+% \pkg{hypcap} package is not always sufficient
% (for example with ``Direct pdfmark support'' and \texttt{breaklinks=true}),
% we use \cs{caption at anchor} instead of \cs{hyper@@anchor} here.}
% \begin{macrocode}
@@ -7539,7 +7487,7 @@
%
% \begin{macro}{\caption at anchor}
% \changes{v3.1c}{2007/10/17}{Workaround 07-10-17: We use \cs{caption at raisedlink} instead of \cs{Hy at raisedlink} now}
-% |\caption at anchor|\marg{Href} sets a \package{hyperref} anchor.
+% |\caption at anchor|\marg{Href} sets a \pkg{hyperref} anchor.
% \begin{macrocode}
\newcommand*\caption at anchor[1]{%
\ifmeasuring@ \else
@@ -7548,7 +7496,7 @@
% \end{macrocode}
% \Note{Since \cs{Hy at raisedlink} change \cs{@tempdima} we surrounded it by \cs{ifvmode},
% suppressing ``\texttt{LaTeX Warning: Float too large for page by 1.0pt}'' in \texttt{sideways} floats.
-% (This is not necessary since \package{hyperref} \version{6.77}.)}
+% (This is not necessary since \pkg{hyperref} \version{6.77}.)}
% \begin{macrocode}
\ifx\HyperRaiseLinkLength\@tempdima
\def\caption at raisedlink#1{\ifvmode#1\else\Hy at raisedlink{#1}\fi}%
@@ -7560,7 +7508,7 @@
%
% \begin{macro}{\caption@@start}
% Will be used by |\caption at freezeHref|. Apart from that we issue a warning
-% if we expect a saved \package{hyperref} label coming from |\caption at start|,
+% if we expect a saved \pkg{hyperref} label coming from |\caption at start|,
% but there isn't any.
% \begin{macrocode}
\def\caption@@start{%
@@ -7572,11 +7520,11 @@
% \end{macro}
%
% \begin{macro}{\caption at freezeHref}
-% Suppress |\caption at start| from generating a \package{hyperref} label and
-% setting a \package{hyperref} anchor. Instead if |\@caption| generates a
-% \package{hyperref} label, it will be stored in |\caption at currentHref|.
+% Suppress |\caption at start| from generating a \pkg{hyperref} label and
+% setting a \pkg{hyperref} anchor. Instead if |\@caption| generates a
+% \pkg{hyperref} label, it will be stored in |\caption at currentHref|.
% Furthermore we need to redefine |\caption at setfloatcapt| so no
-% \package{hyperref} anchor will be placed in |\@caption|.
+% \pkg{hyperref} anchor will be placed in |\@caption|.
% \iffalse
% (Since |\caption at setfloatcapt| will be set to |\@firstofone| inside
% |\subcaption| there is no need to add its restauration to
@@ -7607,7 +7555,7 @@
% \end{macro}
%
% \begin{macro}{\caption at defrostHref}
-% If there is a freezed |\@currentHref|, we set the \package{hyperref}
+% If there is a freezed |\@currentHref|, we set the \pkg{hyperref}
% anchor here.
% \begin{macrocode}
\def\caption at defrostHref{%
@@ -7623,9 +7571,9 @@
% \end{macrocode}
%
% \subsubsection{The hypcap package}
-% \changes{v3.0f}{2005/06/22}{Support of the \package{hypcap} package added}
-% \changes{v3.0l}{2007/02/20}{Adapted to \package{hypcap} \version{1.6}}
-% \changes{v3.1e}{2007/11/04}{\package{hypcap} support adapted to \package{hyperref} \version{6.77}}
+% \changes{v3.0f}{2005/06/22}{Support of the \pkg{hypcap} package added}
+% \changes{v3.0l}{2007/02/20}{Adapted to \pkg{hypcap} \version{1.6}}
+% \changes{v3.1e}{2007/11/04}{\pkg{hypcap} support adapted to \pkg{hyperref} \version{6.77}}
%
% \begin{macrocode}
\caption at IfPackageLoaded{hypcap}{% v1.0
@@ -7632,12 +7580,12 @@
\ifx\caption at start\relax \else % hyperref hasn't stopped early
% \end{macrocode}
%
-% If the \package{hypcap} package was loaded, we give up our own
+% If the \pkg{hypcap} package was loaded, we give up our own
% hyperlink placement algorithm and give the control over the placement
-% to the \package{hypcap} package instead.
+% to the \pkg{hypcap} package instead.
%
% \begin{macro}{\capstart}
-% \changes{v3.1k}{2009/10/09}{Support of \cs{ifcapstart} (\package{hypcap} package \version{1.10}) added}
+% \changes{v3.1k}{2009/10/09}{Support of \cs{ifcapstart} (\pkg{hypcap} package \version{1.10}) added}
% We do this simply by mapping |\capstart| to |\caption at start@|,
% although our code does not behave exactly like the original one:
% The original |\capstart| has an effect on the next |\caption|
@@ -7654,7 +7602,7 @@
%
% \begin{macro}{\caption at hypcapspace}
% Furthermore we map our |\caption at hypcapspace| to |\hypcapspace|
-% offered by the \package{hypcap} package.
+% offered by the \pkg{hypcap} package.
% \begin{macrocode}
\caption at set@bool\caption at ifhypcap 1%
\renewcommand*\caption at hypcapspace{\hypcapspace}%
@@ -7666,7 +7614,7 @@
% \end{macrocode}
%
% \subsubsection{The listings package}
-% \changes{v3.0b}{2004/05/16}{Support of the \package{listings} package added}
+% \changes{v3.0b}{2004/05/16}{Support of the \pkg{listings} package added}
%
% \begin{macrocode}
\caption at IfPackageLoaded{listings}[2004/02/13 v1.2]{%
@@ -7679,10 +7627,10 @@
% \changes{v3.4c}{2020/01/01}{Ugly workaround for usage in lists added}
% \changes{v3.4d}{2020/01/01}{Ugly workaround for usage in lists revised}
% \changes{v3.6}{2021/01/04}{Re-definition of \cs{addcontentsline} added}
-% To support the \package{listings} package we need to redefine
+% To support the \pkg{listings} package we need to redefine
% |\lst at Make|\-|Caption| so the original stuff is nested with
% |\caption at begin| and |\caption at end| etc.\par
-% We set a flag inside the "Init" hook of the \package{listings} package (where adaption of |\line|\-|width| etc.~takes place).
+% We set a flag inside the "Init" hook of the \pkg{listings} package (where adaption of |\line|\-|width| etc.~takes place).
% \begin{macrocode}
\caption at setbool{lst at Init}{0}%
\lst at AddToHook{Init}{\caption at setbool{lst at Init}{1}}%
@@ -7691,14 +7639,14 @@
\let\caption at ORI@lst at MakeCaption\lst at MakeCaption
\renewcommand*\lst at MakeCaption[1]{% #1 is `t' or `b'
% \end{macrocode}
-% This macro is always called twice by the \package{listings} package (with `t' resp. `b' as parameter),
+% This macro is always called twice by the \pkg{listings} package (with `t' or `b' as parameter),
% therefore we need an extra group here.
% \begin{macrocode}
\begingroup
% \end{macrocode}
-% Inside lists the \package{listings} package ignores the left margin (|\@total|\-|left|\-|margin|) for captions.
+% Inside lists the \pkg{listings} package ignores the left margin (|\@total|\-|left|\-|margin|) for captions.
% We emulate this behaviour by adding a negative skip which will be typeset ahead of |\caption at box|.\par
-% Note: We only need to do this if the ``Init'' hook of the \package{listings} package wasn't called yet.
+% Note: We only need to do this if the ``Init'' hook of the \pkg{listings} package wasn't called yet.
% \begin{macrocode}
\caption at iflst@Init{}{%
\edef\caption at lst@leftskip{\noexpand\hskip-\the\@totalleftmargin\noexpand\relax}%
@@ -7705,8 +7653,8 @@
\l at addto@macro\caption at beginhook\caption at lst@leftskip}%
% \end{macrocode}
% We set |position=#1| and if it was set to `top',
-% we swap the skips so the default behavior of the \package{listings} package
-% will not be changed. (Note that the \package{listings} package has set its
+% we swap the skips so the default behavior of the \pkg{listings} package
+% will not be changed. (Note that the \pkg{listings} package has set its
% own |\abovecaptionskip| \& |\belowcaptionskip| values prior to calling
% \cs{lst at MakeCaption}.)
% \begin{macrocode}
@@ -7725,7 +7673,7 @@
\caption at setoptions{lstlisting}%
% \end{macrocode}
% If the |position=| is now set to |auto|, we take over the |captionpos=|
-% setting from the \package{listings} package.
+% setting from the \pkg{listings} package.
% \begin{macrocode}
\caption at setautoposition{#1}%
% \end{macrocode}
@@ -7751,7 +7699,7 @@
%
% \begin{macro}{\lst at makecaption}
% \begin{macro}{\lst at maketitle}
-% Wrapper macros for typesetting the |caption=| resp. |title=| value.
+% Wrapper macros for typesetting the |caption=| or |title=| value.
% \begin{macrocode}
\def\lst at makecaption{\caption at starfalse\@makecaption}%
\def\lst at maketitle{\caption at startrue\@makecaption\@empty}%
@@ -7761,7 +7709,7 @@
%
% \begin{macro}{\ext at lstlisting}
% \changes{v3.1}{2007/03/03}{This macro added}
-% Since the \package{listings} package do not define |\ext at lstlisting|
+% Since the \pkg{listings} package do not define |\ext at lstlisting|
% but we needed it when |\captionof{lstlisting}| will be done by the end user,
% we define it here.
% \begin{macrocode}
@@ -7822,9 +7770,9 @@
% \changes{v3.6}{2022/01/05}{Usage of \cs{caption at Error} replaced by \cs{caption at OutsideFloat}}
% \changes{v3.6g}{2022/04/18}{Adapted to recent version of \pkg{caption3} package}
% We redefine |\LT at array| here to get |\captionsetup|\marg{options} working inside |longtable|s.
-% \Note{Since the \package{hyperref} package patches \cs{LT at array} as well
+% \Note{Since the \pkg{hyperref} package patches \cs{LT at array} as well
% and since this only works with the original definition of \cs{LT at array},
-% we have to do this after the \package{hyperref} package, i.e.~\cs{AtBeginDocument}.}
+% we have to do this after the \pkg{hyperref} package, i.e.~\cs{AtBeginDocument}.}
% \begin{macrocode}
\caption at AtBeginDocument{%
\let\caption at ORI@LT at array\LT at array
@@ -7854,7 +7802,7 @@
% \end{macrocode}
% |\continuedfloat| for longtable:\\
% {\small(Commented out, since it's not deeply tested and quite useless anyway)}
-% \Note{\package{hyperref} versions $<$ v6.76j uses $2\times$ \cs{hyper at makecurrent}}
+% \Note{\pkg{hyperref} versions $<$ v6.76j uses $2\times$ \cs{hyper at makecurrent}}
% \begin{macrocode}
% \caption at ifhypcap{%
% \let\caption at ORI@hyper at makecurrent\hyper at makecurrent
@@ -7917,7 +7865,7 @@
% \changes{v3.0e}{2005/05/05}{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}
+% \changes{v3.3a}{2019/04/02}{Work-around for problem with \pkg{floatrow} added}
% \changes{v3.6}{2021/01/09}{Adapted to current interface of \cs{caption at prepare@stepcounter}}
% |\LT at makecaption|\marg{cmd}\marg{label}\marg{text}\par
% \smallskip
@@ -7942,7 +7890,7 @@
\caption at LT@make{%
\caption at LT@settype\LTcaptype
% \end{macrocode}
-% |\caption at LT@setup| is re-defined inside the \package{bicaption} package
+% |\caption at LT@setup| is re-defined inside the \pkg{bicaption} package
% and contains the preparation of typesetting of the bilingual caption.
% \begin{macrocode}
\caption at LT@setup
@@ -7949,7 +7897,7 @@
% \end{macrocode}
% \iffalse
% The default |position=| setting for longtables is |top|.
-% (This emulates the standard behavior of the \package{longtable} package
+% (This emulates the standard behavior of the \pkg{longtable} package
% which has no skip above the caption but a skip below it.)
% \fi
% |position=auto| is a bad idea for longtables, but we do our very best.
@@ -7983,9 +7931,9 @@
% \begin{macrocode}
\vskip-\ht\strutbox
% \end{macrocode}
-% Work-around for problem with \package{floatrow}:
+% Work-around for problem with \pkg{floatrow}:
% The |\below|\-|caption|\-|skip| 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.
+% so we supress this skip if the \pkg{floatrow} package is loaded.
% (This fixes \issue{50})
% \begin{macrocode}
\caption at ifdefined\FBifcaptop{%
@@ -8042,9 +7990,9 @@
%
% \begin{macro}{\flrow at setlist}
% \changes{v3.4g}{2020/01/03}{Redefinition of this macro added}
-% The \package{floatrow} package uses |\flrow at setlist{{table}{longtable}}| inside its redefinition of |\LT at array| without setting |\@captype| first,
+% The \pkg{floatrow} package uses |\flrow at setlist{{table}{longtable}}| inside its redefinition of |\LT at array| without setting |\@captype| first,
% and this makes |\captionsetup[table]{name=...}| doomed to fail for longtables (``Undefined control sequence'').
-% Unfortunately we cannot easily patch |\LT at array| again to fix this bug in \package{floatrow} since it will be patched |\AtBeginDocument|.
+% Unfortunately we cannot easily patch |\LT at array| again to fix this bug in \pkg{floatrow} since it will be patched |\AtBeginDocument|.
% Therefore we patch |\flrow at setlist| instead to catch and fix the bug on-the-fly.
% \begin{macrocode}
\caption at AtBeginDocument{\caption at ifdefined\flrow at setlist@{%
@@ -8070,7 +8018,7 @@
%
% \begin{macro}{\caption at LT@setup}
% \changes{v3.3}{2016/02/01}{This macro added}
-% Hook for stuff which prepares the typesetting of the \package{longtable} caption.
+% Hook for stuff which prepares the typesetting of the \pkg{longtable} caption.
% \begin{macrocode}
\providecommand*\caption at LT@setup{}
% \end{macrocode}
@@ -8077,7 +8025,7 @@
% \end{macro}
%
% \subsubsection{The picinpar package}
-% \changes{v3.1}{2007/06/13}{Support of the \package{picinpar} package added}
+% \changes{v3.1}{2007/06/13}{Support of the \pkg{picinpar} package added}
%
% \begin{macrocode}
\caption at IfPackageLoaded{picinpar}{%
@@ -8085,7 +8033,7 @@
%
% \begin{macro}{\figwindow}
% \begin{macro}{\tabwindow}
-% The \package{picinpar} package comes with its own caption code
+% The \pkg{picinpar} package comes with its own caption code
% (|\wincaption|, |\@wincaption|, |\@makewincaption|, \ldots)
% so we redefine |\figwindow| \& |\tabwindow| to use |\caption| instead.
% \begin{macrocode}
@@ -8106,8 +8054,8 @@
% \begin{macro}{\caption at window}
% \changes{v3.1c}{2007/10/06}{Bugfix: \cs{caption at clearmargin} added}
% Beside calling |\caption at settype| we redefine |\caption at par|\-|box|\-|restore|
-% (as in \package{floatflt} \& \package{picins} package support)
-% and |\@makecaption| (as in \package{float} package support) here.
+% (as in \pkg{floatflt} \& \pkg{picins} package support)
+% and |\@makecaption| (as in \pkg{float} package support) here.
% \begin{macrocode}
\newcommand*\caption at window[1]{%
\let\@makecaption\caption@@make
@@ -8164,16 +8112,16 @@
% \end{macrocode}
%
% \subsubsection{The picins package}
-% \changes{v3.0j}{2006/01/26}{Support of the \package{picins} package added}
+% \changes{v3.0j}{2006/01/26}{Support of the \pkg{picins} package added}
%
% \begin{macro}{\piccaptiontype}
% |\piccaptiontype|\marg{type}\par
% We offer this macro for changing the \meta{type} of the caption, so the user
-% doesn't have to redefine |\@captype|, as proposed in the \package{picins}
+% doesn't have to redefine |\@captype|, as proposed in the \pkg{picins}
% documentation.
% \Note{We define this macro here so it can be used in the
% preamble of the document, even when \thispackage\ was loaded prior to the
-% \package{picins} package.}
+% \pkg{picins} package.}
% \begin{macrocode}
\newcommand*\piccaptiontype[1]{\def\@piccaptype{#1}}
% \end{macrocode}
@@ -8184,7 +8132,7 @@
% \end{macrocode}
%
% Initial set |\@piccaptype| and undefine |\@captype| which was set to
-% |figure| by the \package{picins} package.
+% |figure| by the \pkg{picins} package.
% \begin{macrocode}
\caption at ifundefined\@piccaptype{%
\caption at iftype{%
@@ -8279,7 +8227,7 @@
% \begin{macro}{\ivparpic}
% \changes{v3.3}{2018/12/26}{Bugfix: Missing curly braces added}
-% We need to set our \package{hyperref} anchor here.
+% We need to set our \pkg{hyperref} anchor here.
% Not bullet-proof since we have to redefine |\noindent| here!
% \begin{macrocode}
\let\caption at ORI@ivparpic\ivparpic
@@ -8308,7 +8256,7 @@
%
% \begin{macro}{\rotcaption}
% \changes{v3.0c}{2004/07/16}{Bugfix: Check for \cs{caption at star} removed}
-% \changes{v3.0i}{2005/12/07}{Rewritten, works with \package{hyperref} now}
+% \changes{v3.0i}{2005/12/07}{Rewritten, works with \pkg{hyperref} now}
% Make |\rotcaption*| work.
% \begin{macrocode}
\def\rotcaption{\let\@makecaption\@makerotcaption\caption}%
@@ -8366,17 +8314,17 @@
% \end{macrocode}
%
% \subsubsection{The scrextend package}
-% \changes{v3.6j}{2023/03/12}{Patch of the \package{scrextend} package added}
+% \changes{v3.6j}{2023/03/12}{Patch of the \pkg{scrextend} package added}
%
% \begin{macro}{\caption at IfKomaPackageLoaded}
% \changes{v3.6j}{2023/03/12}{This macro definition added}
+% \changes{v3.6k}{2023/03/14}{Check for \cs{scr at caption} replaced by \cs{caption at ifdocumentclass}}
% \begin{macrocode}
-\caption at ifdefined\scr at caption{%
- \long\def\caption at IfKomaPackageLoaded#1[#2]#3#4{%
- \caption at InfoNoLine{KOMA-Script #1 package detected}
- #3}}{%
- \let\caption at IfKomaPackageLoaded\caption at IfPackageLoaded
- }
+\caption at ifdocumentclass{koma}%
+ {\long\def\caption at IfKomaPackageLoaded#1[#2]#3#4{%
+ \caption at InfoNoLine{KOMA-Script #1 package detected}%
+ #3}}%
+ {\let\caption at IfKomaPackageLoaded\caption at IfPackageLoaded}
% \end{macrocode}
% \end{macro}
%
@@ -8495,7 +8443,7 @@
% \changes{v3.0i}{2006/01/12}{\cs{@listdepth}\cs{z@} added}
% \changes{v3.1}{2007/05/05}{Call of \cs{caption at setoptions}\arg{SCfloat} added}
% This macro will be called at the end of the environment, here we need to
-% setup our stuff before the \package{sidecap} package actually typesets
+% setup our stuff before the \pkg{sidecap} package actually typesets
% its caption.
% \begin{macrocode}
\let\caption at ORI@endSC at FLOAT\endSC at FLOAT
@@ -8508,7 +8456,7 @@
% to a skip of zero anyway.)\par
% Furthermore |\SC at justify| will override the caption justification, if set.
% The usage of |\SC at justify| differs from version to version of the
-% \package{sidecap} package:\par
+% \pkg{sidecap} package:\par
% \begin{tabular}{ll}
% Version 1.4: & |\SC at justify| is not defined\\
% Version 1.5: & |\SC at justify| is |\relax| when not set\\
@@ -8524,7 +8472,7 @@
% \end{macrocode}
% Make the original definition of |\endSC at FLOAT| to use our caption
% stuff instead of its own.
-% \Note{At this point the \package{sidecap} definition of \cs{caption} is valid,
+% \Note{At this point the \pkg{sidecap} definition of \cs{caption} is valid,
% not the regular one!}
% \begin{macrocode}
\let\caption\SC at orig@caption
@@ -8555,8 +8503,8 @@
%
% \begin{macro}{\sf at ifpositiontop}
% \changes{v3.1a}{2007/09/15}{Bugfix 07-09-15: Check for \cs{@captype} added}
-% If the \package{subfigure} package is loaded, we map |\sf at ifpositiontop|
-% to |\iffiguretopcap| resp. |\iftabletopcap|, so the \package{subfigure}
+% If the \pkg{subfigure} package is loaded, we map |\sf at ifpositiontop|
+% to |\iffiguretopcap| or |\iftabletopcap|, so the \pkg{subfigure}
% \version{2.1} options \opt{figbotcap} etc. will still work.
% \begin{macrocode}
\def\sf at ifpositiontop{%
@@ -8638,7 +8586,7 @@
\caption at setoptions{supertabular}%
% \end{macrocode}
% The |position=| setting will be overwritten by the
-% \package{supertabular} package: If |\topcaption| was used,
+% \pkg{supertabular} package: If |\topcaption| was used,
% the position will be |top| automatically, |bottom| otherwise.
% \begin{macrocode}
\caption at setposition{\if at topcaption t\else b\fi}%
@@ -8726,7 +8674,7 @@
% \end{macrocode}
%
% \subsubsection{The threeparttable package}
-% \changes{v3.1}{2007/05/08}{Support of the \package{threeparttable} package added}
+% \changes{v3.1}{2007/05/08}{Support of the \pkg{threeparttable} package added}
%
% \begin{macrocode}
\caption at IfPackageLoaded{threeparttable}[2003/06/13 v3.0]{%
@@ -8759,7 +8707,7 @@
%
% \begin{macro}{\caption at setthreeparttabletype}
% \changes{v3.6e}{2022/04/17}{Extracted from \cs{threeparttable} and \cs{measuredfigure}}
-% \changes{v3.6e}{2022/04/17}{Support for usage inside \env{subtable} resp.~\env{subfigure} added}
+% \changes{v3.6e}{2022/04/17}{Support for usage inside \env{subtable} or \env{subfigure} added}
% |\caption at setthreeparttabletype|\marg{threepart type}\marg{main type}
% \begin{macrocode}
\newcommand*\caption at setthreeparttabletype[2]{%
@@ -8811,8 +8759,8 @@
% \end{macrocode}
%
% \subsubsection{The wrapfig package}
-% \changes{v3.1}{2007/05/05}{Support of the \package{wrapfig} package added}
-% \changes{v3.2d}{2011/11/02}{Support of the \package{wrapfig} package rewritten}
+% \changes{v3.1}{2007/05/05}{Support of the \pkg{wrapfig} package added}
+% \changes{v3.2d}{2011/11/02}{Support of the \pkg{wrapfig} package rewritten}
%
% \begin{macrocode}
\caption at IfPackageLoaded{wrapfig}[2003/01/31 v3.6]{%
@@ -8821,9 +8769,9 @@
% \begin{macro}{\wrapfloat}
% \changes{v3.2d}{2011/11/02}{Redefinition of this macro added}
% \changes{v3.6}{2020/12/28}{Usage of \cs{@testopt} added}
-% First of all we make the \package{wrapfig} package independent from the package
-% load order regarding the \package{float} package.
-% Since the usage of |\@float at set|\-|every| is missing in the code of the \package{wrapfig}
+% First of all we make the \pkg{wrapfig} package independent from the package
+% load order regarding the \pkg{float} package.
+% Since the usage of |\@float at set|\-|every| is missing in the code of the \pkg{wrapfig}
% package (it should be in the redefinition of |\float at re|\-|style|, right after
% |\@nameuse{fst@#1}|), we don't use it here, too,
% especially since |\wrap|\-|float| will usually not be used when used with re-styled floats.
@@ -8865,10 +8813,10 @@
% \begin{macro}{\WF at captionstyhook}
% \changes{v3.2d}{2011/11/02}{This macro added}
% \changes{v3.2e}{2011/11/10}{Bugfix 11-11-09: float package support fixed}
-% We place our \package{hyperref} anchor here, apply the `wrap' options etc.
-% Since the usage of |\@float at set|\-|every| is missing in the \package{wrapfig}
+% We place our \pkg{hyperref} anchor here, apply the `wrap' options etc.
+% Since the usage of |\@float at set|\-|every| is missing in the \pkg{wrapfig}
% package we will catch it up here for making the necessary adaptions to the
-% \package{float} package.
+% \pkg{float} package.
% \begin{macrocode}
\def\WF at captionstyhook#1{%
\let\@captype\@undefined
Modified: trunk/Master/texmf-dist/source/latex/caption/caption2.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/caption/caption2.dtx 2023-07-28 20:40:36 UTC (rev 67751)
+++ trunk/Master/texmf-dist/source/latex/caption/caption2.dtx 2023-07-28 20:40:52 UTC (rev 67752)
@@ -2,7 +2,7 @@
%
% This is file `caption2.dtx'.
%
-% Copyright (C) 1994-2021 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
+% Copyright (C) 1994-2023 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
%
% --------------------------------------------------------------------------
%
@@ -36,25 +36,12 @@
% \iffalse
%<*driver>
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesFile{caption2.drv}[2007/11/28 v2.2 Documentated code of the (obsolete) caption2 package]
-\hbadness=9999 \newcount\hbadness \hfuzz=100pt % Make TeX shut up.
+\ProvidesFile{caption2.drv}[2023/07/10 v2.2 The (obsolete) caption2 package]
%\errorcontextlines=3
%
-\documentclass{ltxdoc}
-\setlength\parindent{0pt}
-\setlength\parskip{\smallskipamount}
+\documentclass{captiondoc}
+\hypersetup{pdfkeywords={LaTeX, package, caption2}}
%
-\usepackage{ifpdf}
-\ifpdf
- \usepackage{mathptmx,courier}
- \usepackage[scaled=0.90]{helvet}
-% \addtolength\marginparwidth{15pt}
-\fi
-%
-\usepackage{hypdoc}
-\ifpdf\usepackage{hypdestopt}\fi
-\hypersetup{pdfkeywords={LaTeX, package, caption2},pdfstartpage={},pdfstartview={}}
-%
\usepackage{caption2}[2008/07/01]
%
%<+driver>\OnlyDescription
@@ -65,25 +52,15 @@
%</driver>
% \fi
%
-% \newcommand*{\purerm}[1]{{\upshape\mdseries\rmfamily #1}}
-% \newcommand*{\puresf}[1]{{\upshape\mdseries\sffamily #1}}
-% \newcommand*{\purett}[1]{{\upshape\mdseries\ttfamily #1}}
-% \let\class\puresf \let\package\puresf
-% \let\env\purett \let\opt\purett
+% \def\thispackage{the \pkg{caption2} package}
+% \def\Thispackage{The \pkg{caption2} package}
%
-% \def\thispackage{the \package{caption2} package}
-% \def\Thispackage{The \package{caption2} package}
-%
-% \newcommand*\csmarg[1]{\texttt{\char`\{#1\char`\}}}
-% \newcommand*\csoarg[1]{\texttt{\char`\[#1\char`\]}}
-% \newcommand*\version[2][]{v$#2$}
-%
% \GetFileInfo{caption2.drv}
% \let\docdate\filedate
% \let\docversion\fileversion
% \GetFileInfo{caption2.sty}
%
-% \title{The (obsolete) \texorpdfstring{\package{caption2} package\thanks{%^^A
+% \title{The (obsolete) \texorpdfstring{\pkg{caption2} package\thanks{%^^A
% This package has version number \docversion.}}%^^A
% {caption2 package}}
% \author{Axel Sommerfeldt\\
@@ -104,46 +81,46 @@
%
% \section*{THIS PACKAGE IS OBSOLETE!}
%
-% The \package{caption2} package used to be an experimental side-version of
-% the regular \package{caption} package. It was made public as beta test version
+% The \pkg{caption2} package used to be an experimental side-version of
+% the regular \pkg{caption} package. It was made public as beta test version
% without documentation in 1995 because of the strong demand for new features and
-% adaptations to other packages like the \package{longtable} and
-% \package{subfigure} one.
+% adaptations to other packages like the \pkg{longtable} and
+% \pkg{subfigure} one.
%
% But within the next years I found no time to reintegrate some of the
-% well-tried features into the regular \package{caption} package. So I
-% decided to release a version $2.1$ of the \package{caption2} package in 2002
+% well-tried features into the regular \pkg{caption} package. So I
+% decided to release a version $2.1$ of the \pkg{caption2} package in 2002
% instead, which included some minor bug fixes and adaptations to the new
-% version $2.1$ of the \package{subfigure} package. Furthermore I started
+% version $2.1$ of the \pkg{subfigure} package. Furthermore I started
% to write a documentation for this package, but unfortunately did not get
% very far with this\ldots
%
% In 2003 I finally found some (more) time, so a new regular release $3.0$
-% of the \package{caption} package could be build in cooperation with
+% of the \pkg{caption} package could be build in cooperation with
% Frank Mittelbach and Steven Cochran.
% It was released in December 2003 and superseded the neglected
-% \package{caption2} package.
+% \pkg{caption2} package.
%
-% {\small (In parallel, Steven Cochran released the \package{subfig} package which
-% superseded the \package{subfigure} package.)}
+% {\small (In parallel, Steven Cochran released the \pkg{subfig} package which
+% superseded the \pkg{subfigure} package.)}
%
% So please don't use this package for new documents. It's old, it's obsolete
% and it starts to begin smell bad!
% Please ignore all hints in books or other documents which try to tell you
-% that the \package{caption2} package should be used instead of the
-% \package{caption} package -- these hints are outdated since December 2003.
+% that the \pkg{caption2} package should be used instead of the
+% \pkg{caption} package -- these hints are outdated since December 2003.
%
% \vfill
% \bigskip
% \pagebreak[4]
%
-% \section*{How to migrate to the regular \package{caption} package?}
+% \section*{How to migrate to the regular \pkg{caption} package?}
%
-% Usually replacing \package{caption2} by \package{caption} is sufficient
-% because the \package{caption} package emulates most of the options and
-% commands offered by the \package{caption2} package.
+% Usually replacing \pkg{caption2} by \pkg{caption} is sufficient
+% because the \pkg{caption} package emulates most of the options and
+% commands offered by the \pkg{caption2} package.
% If you get some errors or wired results afterwards, please take a closer
-% look at the \package{caption} package documentation which will hopefully
+% look at the \pkg{caption} package documentation which will hopefully
% help you clearing these problems. You will also find a section called
% `Compatibility to older versions' there which should help you with the
% migration process.
@@ -151,16 +128,17 @@
%
% \section*{What will happen to this package?}
%
-% The \package{caption2} package is still some kind of supported, that means
-% it will be part of future releases of the \package{caption} package bundle,
+% The \pkg{caption2} package is still some kind of supported, that means
+% it will be part of future releases of the \pkg{caption} package bundle,
% and bugs will still be fixed so existing documents using this package will
% still compile.
% But it will \emph{not} be enhanced in the future.
%
-% This means migrating to the actual \package{caption} package should not be
+% This means migrating to the actual \pkg{caption} package should not be
% necessary for old documents -- they should still compile fine as they are.
-% If not, please don't hesitate to write me an e-mail asking for
-% maintainance.
+% If not, please don't hesitate to write me an e-mail to
+% \href{mailto:axel.sommerfeldt at f-m.fm}{\texttt{axel.sommerfeldt at f-m.fm}}
+% asking for maintainance.
%
% \StopEventually{}
%
@@ -264,7 +242,7 @@
% \end{macro}
%
% \subsection{Check against the regular caption package}
-% \changes{v2.2}{2007/04/06}{Check against regular \package{caption} package added}
+% \changes{v2.2}{2007/04/06}{Check against regular \pkg{caption} package added}
% \changes{v2.2a}{2007/04/11}{Bugfix: Usage of \cs{caption at error} replaced by \cs{PackageError}}
%
% \begin{macrocode}
@@ -292,7 +270,7 @@
% \end{macro}
%
% \begin{macro}{\captionwidth}
-% \changes{v2.2h}{2021/01/19}{Re-added since the \package{caption3} kernel uses \cs{caption at width} now}
+% \changes{v2.2h}{2021/01/19}{Re-added since the \pkg{caption3} kernel uses \cs{caption at width} now}
% \begin{macrocode}
\@ifundefined{captionwidth}
{\let\captionwidth\caption at width}
@@ -311,10 +289,10 @@
% \end{macro}
%
% \begin{macro}{\captionindent}
-% \changes{v2.2b}{2007/08/12}{Re-added since the \package{caption3} kernel uses \cs{caption at indent} now}
+% \changes{v2.2b}{2007/08/12}{Re-added since the \pkg{caption3} kernel uses \cs{caption at indent} now}
% \changes{v2.2g}{2020/12/25}{Will only be defined if it is not defined yet}
% \cs{captionindent} will be used in caption style \texttt{indent} and specifies the indention
-% after the first line. (In \package{caption3} \version{1.1} \cs{captionindent} was renamed to
+% after the first line. (In \pkg{caption3} \version{1.1} \cs{captionindent} was renamed to
% \cs{caption at indent} to improve compatibility to the AMS \& SMF document classes.)
% \begin{macrocode}
\@ifundefined{captionindent}
@@ -363,10 +341,10 @@
% \end{macro}
%
% \begin{macro}{\setcaptionmargin}
-% \changes{v2.2h}{2021/01/19}{Re-added since the \package{caption3} kernel does not define it anymore}
+% \changes{v2.2h}{2021/01/19}{Re-added since the \pkg{caption3} kernel does not define it anymore}
% \begin{macro}{\setcaptionwidth}
-% \changes{v2.2h}{2021/01/19}{Re-added since the \package{caption3} kernel does not define it anymore}
-% User-friendly commands to set the caption margin resp.\ width.
+% \changes{v2.2h}{2021/01/19}{Re-added since the \pkg{caption3} kernel does not define it anymore}
+% User-friendly commands to set the caption margin or width.
% Note that they additionally set the \cs{ifcaptionwidth} flag.
% \begin{macrocode}
\providecommand*\setcaptionmargin{%
@@ -787,8 +765,8 @@
%
% \begin{macro}{\captionof}
% \begin{macro}{\captionof*}
-% \cs{captionof} resp.\ \cs{captionof*} will just set \cs{@captype} and do the normal
-% \cs{caption} resp.\ \cs{caption*}, so we can also typeset captions outside floating
+% \cs{captionof} or \cs{captionof*} will just set \cs{@captype} and do the normal
+% \cs{caption} or \cs{caption*}, so we can also typeset captions outside floating
% environments.
% \changes{v2.1}{2002/02/19}{New commands \cs{captionof} and \cs{captionof*}}
% \begin{macrocode}
@@ -823,7 +801,7 @@
% within \thispackage\ \version{2.0}, so we will offer this, too.)
%
% \cs{captionlabel} and \cs{captiontext} will be set to the caption label
-% resp.\ the caption text.
+% or the caption text.
% (Because \cs{captionlabel} and \cs{captiontext} will be locally defined with
% \cs{def} we do not need to define them here.)
% \begin{macrocode}
@@ -837,7 +815,7 @@
% \begin{macro}{\usecaptionmargin}
% A helper macro for caption style authors:
% It calculates \cs{leftskip} and \cs{rightskip} out of
-% \cs{captionlinewidth} and \cs{captionmargin} resp.\ \cs{captionwidth}.
+% \cs{captionlinewidth} and \cs{captionmargin} or \cs{captionwidth}.
% Also \cs{captionlinewidth} will be corrected to the appropriate value.
% \begin{macrocode}
\newcommand*\usecaptionmargin{%
Modified: trunk/Master/texmf-dist/source/latex/caption/caption3.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/caption/caption3.dtx 2023-07-28 20:40:36 UTC (rev 67751)
+++ trunk/Master/texmf-dist/source/latex/caption/caption3.dtx 2023-07-28 20:40:52 UTC (rev 67752)
@@ -2,7 +2,7 @@
%
% This is file `caption3.dtx'.
%
-% Copyright (C) 1994-2022 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
+% Copyright (C) 1994-2023 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
%
% --------------------------------------------------------------------------
%
@@ -31,41 +31,19 @@
%
% \fi
%
-% \CheckSum{3830}
+% \CheckSum{3865}
%
% \iffalse
%<*driver>
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesFile{caption3.drv}[2021/01/02 v2.4 Implementation of the caption kernel]
-\hbadness=9999 \newcount\hbadness \hfuzz=100pt % Make TeX shut up.
+\ProvidesFile{caption3.drv}[2023/07/10 v2.4 Implementation of the caption kernel]
%\errorcontextlines=3
%
-\documentclass{ltxdoc}
-\setlength\parindent{0pt}
-\setlength\parskip{\smallskipamount}
+\documentclass{captiondoc}
+\hypersetup{pdfkeywords={LaTeX, package, caption3}}
%
-\makeatletter % make room for subsections like 2.16.14 in the TOC
-%\newcommand*\l at subsection{\@dottedtocline{2}{1.5em}{2.3em}}
-\renewcommand*\l at subsection{\@dottedtocline{2}{1.5em}{2.7em}}
-\makeatother
-%
-\usepackage{ifpdf}
-\ifpdf
- \usepackage{mathptmx,courier}
- \usepackage[scaled=0.90]{helvet}
- \addtolength\marginparwidth{15pt}
-\fi
-%
-\usepackage{hypdoc}
-\ifpdf\usepackage{hypdestopt}\fi
-\hypersetup{pdfkeywords={LaTeX, package, caption},pdfstartpage={},pdfstartview={}}
-%
\usepackage{caption3}[2020/12/22]
%
-\DeclareRobustCommand*\eTeX{\texorpdfstring
- {\leavevmode\hbox{$\varepsilon$}-\TeX}%
- {e-TeX}}
-%
\begin{document}
\DocInput{caption3.dtx}
\end{document}
@@ -72,20 +50,9 @@
%</driver>
% \fi
%
-% \def\thispackage{the \package{caption} kernel}
-% \def\Thispackage{The \package{caption} kernel}
+% \def\thispackage{the \pkg{caption} kernel}
+% \def\Thispackage{The \pkg{caption} kernel}
%
-% \newcommand*\purerm[1]{{\upshape\mdseries\rmfamily #1}}
-% \newcommand*\puresf[1]{{\upshape\mdseries\sffamily #1}}
-% \newcommand*\purett[1]{{\upshape\mdseries\ttfamily #1}}
-% \let\class\puresf \let\package\puresf
-% \let\cls\puresf \let\pkg\puresf
-% \let\env\purett \let\opt\purett
-%
-% \newcommand*\csmarg[1]{\texttt{\char`\{#1\char`\}}}
-% \newcommand*\csoarg[1]{\texttt{\char`\[#1\char`\]}}
-% \newcommand*\version[2][]{v$#2$}
-%
% \GetFileInfo{caption3.drv}
% \let\docdate\filedate
% \let\docversion\fileversion
@@ -113,8 +80,8 @@
% options which can be selected with |\caption|\-|setup|.
% Loading the kernel part do not change the output of a \LaTeX\ document
% -- it just provides functionality which can be used by \LaTeXe\ packages
-% which typesets captions, for example the \package{caption} and
-% \package{subfig} packages.
+% which typesets captions, for example the \pkg{caption} and
+% \pkg{subfig} packages.
% \end{abstract}
%
% \section*{Internal commands}
@@ -124,21 +91,21 @@
% \begin{quote}\begin{tabular}{ll}
% Internal command & Currently used by \\
% \hline
-% |\caption at addcontentsline| & \package{floatrow} \\
-% |\caption at fnun| & \package{floatrow} \\
-% |\caption at getlabel| & \package{subcaption} \\
-% |\caption at gobble| & \package{subcaption} \\
-% |\caption at ifinlist| & \package{floatrow} \\
-% |\caption at iftop| & \package{keyfloat} \\
-% |\caption at make| & \package{subfig} \\
-% |\caption@@make| & \package{floatrow} \\
-% |\caption at setoptions| & \package{floatrow} \\
-% |\caption at setposition| & \package{floatrow} \\
+% |\caption at addcontentsline| & \pkg{floatrow} \\
+% |\caption at fnun| & \pkg{floatrow} \\
+% |\caption at getlabel| & \pkg{subcaption} \\
+% |\caption at gobble| & \pkg{subcaption} \\
+% |\caption at ifinlist| & \pkg{floatrow} \\
+% |\caption at iftop| & \pkg{keyfloat} \\
+% |\caption at make| & \pkg{subfig} \\
+% |\caption@@make| & \pkg{floatrow} \\
+% |\caption at setoptions| & \pkg{floatrow} \\
+% |\caption at setposition| & \pkg{floatrow} \\
% |\caption at switchdefault| & \emph{none} \\
-% |\caption at withoptargs| & \package{subcaption} \\
+% |\caption at withoptargs| & \pkg{subcaption} \\
% \end{tabular}\end{quote}
%
-% If your package wants to use any other internal command of the \package{caption3} package,
+% If your package wants to use any other internal command of the \pkg{caption3} package,
% please write me an e-mail so we can define a proper interface together.
%
% Unfortunately these internal commands are used by other packages and therefore will likely
@@ -147,22 +114,22 @@
% \begin{quote}\begin{tabular}{ll}
% Internal command & Currently used by \\
% \hline
-% |\caption@@@make| & \package{floatrow} \\
-% |\caption at set@bool| & \package{floatrow} \\
-% |\caption at setfont| & \package{floatrow} \\
-% |\caption at setkeys| & \package{floatrow} \\
-% |\caption at setstyle*| & \package{floatrow} \\
+% |\caption@@@make| & \pkg{floatrow} \\
+% |\caption at set@bool| & \pkg{floatrow} \\
+% |\caption at setfont| & \pkg{floatrow} \\
+% |\caption at setkeys| & \pkg{floatrow} \\
+% |\caption at setstyle*| & \pkg{floatrow} \\
% \hline
-% |\caption at hj@|\meta{name} & \package{floatrow} \\
-% |\caption at lsep@|\meta{name} & \package{floatrow} \\
-% |\caption at lsep@default| & \package{babel-hungarian} \\
-% |\caption at sty@|\meta{name} & \package{floatrow} \\
+% |\caption at hj@|\meta{name} & \pkg{floatrow} \\
+% |\caption at lsep@|\meta{name} & \pkg{floatrow} \\
+% |\caption at lsep@default| & \pkg{babel-hungarian} \\
+% |\caption at sty@|\meta{name} & \pkg{floatrow} \\
% \end{tabular}\end{quote}
%
-% Furthermore the \package{floatrow} package uses the undocumented option
+% Furthermore the \pkg{floatrow} package uses the undocumented option
% |position=a| (as abbreviation of |position=auto|).
%
-% The \package{lwarp} package uses a lot of internal commands as well,
+% The \pkg{lwarp} package uses a lot of internal commands as well,
% but we are working on it on the Git branch \texttt{feature/lwarp}:
% \url{https://gitlab.com/axelsommerfeldt/caption/-/tree/feature/lwarp}
%
@@ -226,7 +193,7 @@
% \newcommand*\Note[2][Note]{\par{\small\emph{#1:} #2}\par}
%
% \changes{v1.0}{2003/12/20}{Rewritten; many new commands and features}
-% \changes{v1.0c}{2004/11/28}{Split into two packages: \package{caption} \& \package{caption3}}
+% \changes{v1.0c}{2004/11/28}{Split into two packages: \pkg{caption} \& \pkg{caption3}}
%
% \iffalse
% --------------------------------------------------------------------------- %
@@ -265,7 +232,7 @@
%
% Identify the current version of the package.
% \begin{macrocode}
-\ProvidesPackage{caption3}[2023/03/12 v2.4 caption3 kernel (AR)]
+\ProvidesPackage{caption3}[2023/07/28 v2.4c caption3 kernel (AR)]
% \end{macrocode}
%
% \section{Generic helpers}
@@ -390,7 +357,7 @@
% |\caption at ifinlist{frank}{axel,frank,olga,steven}{yes}{no}|
% \end{quote}
% would expand to |yes|.\par
-% (Note: Since this command is used by the \package{floatrow} package as well
+% (Note: Since this command is used by the \pkg{floatrow} package as well
% its syntax should not change.)
% \begin{macrocode}
\newcommand*\caption at ifinlist{%
@@ -736,7 +703,7 @@
%
% \section{Using the keyval package}
%
-% We need the \package{keyval} package for option handling, so we load it here.\par
+% We need the \pkg{keyval} package for option handling, so we load it here.\par
% \emph{TODO:} Use some recent stuff instead, for example kvdefinekey and kvsetkeys.
% \begin{macrocode}
\RequirePackage{keyval}[1997/11/10]
@@ -1036,7 +1003,7 @@
% |\caption at removefromoptlist|\marg{type}\\
% adds or removes an \meta{type} to the list of unused caption options.
% Note that the catcodes of \meta{type} are sanitized here so removing
-% \meta{type} from the list do not fail when the \package{float} package
+% \meta{type} from the list do not fail when the \pkg{float} package
% is used (since |\float at getstyle| gives a result which tokens have catcode
% 12 $=$ ``other'').
% \begin{macrocode}
@@ -1081,7 +1048,7 @@
% \changes{v2.4}{2022/04/18}{\cs{captionsetup at starfalse} removed}
% |\caption at setkeys|\oarg{package}\marg{family}\marg{key-values}\\
% expands to |\setkeys|\marg{family}\marg{key-values},
-% but lets the error messages not refer to the \package{keyval} package
+% but lets the error messages not refer to the \pkg{keyval} package
% but to the \meta{package} package instead.
% \begin{macrocode}
\newcommand*\caption at setkeys{\@dblarg\caption@@setkeys}
@@ -1146,7 +1113,7 @@
% processes the given options using the keyval package, so we use this one
% instead of |\Process|\-|Options| offered by \LaTeXe.
% The starred variant does not process the global options.
-% (This code was taken from the \package{hyperref} package\cite{hyperref}
+% (This code was taken from the \pkg{hyperref} package\cite{hyperref}
% \version{6.74} and modified.)
% \begin{macrocode}
\newcommand*\caption at ProcessOptions{%
@@ -1365,7 +1332,7 @@
% to-be-overwritten internal command as argument, so it can be stored (and
% restored later on).
% The main purpose of this command is switching default settings in
-% \package{babel} language packages, e.g.:
+% \pkg{babel} language packages, e.g.:
% \begin{quote}|\caption at switchdefault{labelfont}{\babel at save #1}{sc}|\end{quote}
% \begin{macrocode}
\def\caption at switchdefault#1#2{%
@@ -1413,7 +1380,7 @@
% |\caption at decl@package|\marg{option}\marg{cmd}\oarg{package}\marg{name}\ldots\\
% Helper command to declare a caption package option value which is dependent
% on the existence of a specific package, for example the |font| value
-% |one|\-|half|\-|spacing| which is dependent on the \package{setspace}
+% |one|\-|half|\-|spacing| which is dependent on the \pkg{setspace}
% package.
% \begin{macrocode}
\newcommand*\caption at decl@package[2]{%
@@ -1506,7 +1473,7 @@
% \end{macrocode}
% \end{macro}
%
-% \section{Margin resp. width}
+% \section{Margin or width}
% \changes{v1.0n}{2007/04/03}{Option `twoside' added}
% \changes{v1.1}{2007/08/11}{Options `margin*', `minmargin', and `maxmargin' added}
% \changes{v1.2}{2007/11/10}{Option `oneside' added}
@@ -1514,7 +1481,7 @@
% \begin{macro}{\captionmargin}
% |\captionmargin| contains the extra margin used for captions (if different than |0pt|).
% It is just available for user documents to provide compatibility to \version{1.x} of
-% the \package{caption} package where |\set|\-|length\caption|\-|margin{|\ldots|}| was
+% the \pkg{caption} package where |\set|\-|length\caption|\-|margin{|\ldots|}| was
% the way how a caption margin was set.
% \begin{macrocode}
\newdimen\captionmargin
@@ -1584,7 +1551,7 @@
% \changes{v1.1}{2007/08/11}{Starred variant added}
% \changes{v1.1}{2007/08/12}{\cs{setlength}\cs{captionmargin} \& \cs{setlength}\cs{captionmargin@} swapped so `\texttt{margin*=}\cs{captionmargin}' works in singleline options}
% \changes{v1.3}{2010/11/07}{Support for option \opt{calcmargin} added}
-% \changes{v2.3}{2021/01/17}{Renamed from \cs{setcaptionmargin} to \cs{caption at setmargin}; sets \cs{caption at width} resp.~\cs{caption at leftmargin} and \cs{caption at rightmargin} now}
+% \changes{v2.3}{2021/01/17}{Renamed from \cs{setcaptionmargin} to \cs{caption at setmargin}; sets \cs{caption at width} or \cs{caption at leftmargin} and \cs{caption at rightmargin} now}
% \changes{v2.3}{2021/01/19}{Only the left or right margin can be set by leaving the other value blank}
% |\caption at setmargin*|\marg{amount}\\
% sets the caption margin to the given \meta{amount}.
@@ -1625,7 +1592,7 @@
% \changes{v1.0f}{2005/10/24}{Renamed from \cs{caption at setwidth} to \cs{setcaptionwidth}}
% \changes{v1.3}{2010/11/07}{Starred variant added}
% \changes{v1.3}{2010/11/07}{Support for option \opt{calcwidth} added}
-% \changes{v2.3}{2021/01/17}{Renamed from \cs{setcaptionwidth} to \cs{caption at setwidth}; sets \cs{caption at width} resp.~\cs{caption at leftmargin} and \cs{caption at rightmargin} now}
+% \changes{v2.3}{2021/01/17}{Renamed from \cs{setcaptionwidth} to \cs{caption at setwidth}; sets \cs{caption at width} or \cs{caption at leftmargin} and \cs{caption at rightmargin} now}
% |\caption at setwidth*|\marg{amount}\\
% sets the caption width to the given \meta{amount}.
% \begin{macrocode}
@@ -1752,6 +1719,7 @@
% \changes{v1.1}{2007/09/01}{This macro added}
% \changes{v1.2d}{2009/10/09}{Uses \cs{@latex at warning} instead of \cs{caption at Warning}}
% \changes{v2.4}{2023/03/12}{The warning refers to \texttt{caption at NUM} instead of \texttt{NUM}}
+% \changes{v2.4a}{2023/03/13}{The warning refers to \texttt{caption NUM} instead of \texttt{caption at NUM}}
% |\caption at pageref|\marg{name}\\
% This command is a modified version of |\page|\-|ref| from \LaTeX2e.
% It will be used inside |\caption at if|\-|odd|\-|page| and |\FP at help|\-|Note|.
@@ -1759,7 +1727,7 @@
\newcommand*\caption at pageref[1]{%
\expandafter\ifx\csname caption at r@#1\endcsname\relax
\G at refundefinedtrue % => 'There are undefined references.'
- \@latex at warning{Reference `caption@#1' on page \thepage \space undefined}%
+ \@latex at warning{Reference `caption #1' on page \thepage \space undefined}%
\else
\expandafter\let\expandafter\caption at thepage\csname caption at r@#1\endcsname
\fi}
@@ -1772,7 +1740,7 @@
% \changes{v2.4}{2023/03/12}{Multiple use for the same counter will be handled correctly}
% Currently this macro uses an own label\ldots ref mechanism,
% but an alternative implementation method would use the
-% \package{refcount} package\cite{refcount} and
+% \pkg{refcount} package\cite{refcount} and
% |\ifodd\get|\-|page|\-|ref|\-|number{|\ldots|}|.
% Maybe we will change that in a later release.
% \Note{This macro re-defines itself so the \texttt{.aux} file will only be used once per group.
@@ -1855,9 +1823,9 @@
{\def\caption at slsty{#2}%
\def\caption at sty{#3}}%
% \end{macrocode}
-% The \package{floatrow} package uses |\@if|\-|undefined{caption at sty@#1}| to
+% The \pkg{floatrow} package uses |\@if|\-|undefined{caption at sty@#1}| to
% determine in |\flrow at set|\-|style| if a caption style is defined or not.
-% Since the \package{floatrow} package is unmaintained we fake the definition
+% Since the \pkg{floatrow} package is unmaintained we fake the definition
% so the test will still work.
% \begin{macrocode}
\@namedef{caption at sty@#1}{\@unused}}
@@ -2033,7 +2001,7 @@
\DeclareCaptionOption{boxsep}{\setlength\fboxsep{#1}}
% \end{macrocode}
%
-% `default' usually maps to `none' resp.~`parbox'.
+% `default' usually maps to `none' or `parbox'.
% \begin{macrocode}
\SetCaptionDefault{box}{none}
%\SetCaptionDefault{parbox}{parbox}
@@ -2158,7 +2126,7 @@
{\caption at labelformat@fallback{#1}{#2}}}
% \end{macrocode}
%
-% `default' usually maps to `original' resp. `simple'.
+% `default' usually maps to `original' or `simple'.
% \begin{macrocode}
\SetCaptionDefault{labelformat}{original}
\SetCaptionFallback{labelformat}{simple}
@@ -2211,11 +2179,11 @@
\def\caption at labelsep@name{#2}%
\def\caption at labelsep{#3}}%
% \end{macrocode}
-% Unfortunately |\Declare|\-|Float|\-|Separators| of the \package{floatrow}
+% Unfortunately |\Declare|\-|Float|\-|Separators| of the \pkg{floatrow}
% package mis-uses |\Declare|\-|Caption|\-|Label|\-|Separator| instead of
-% storing the definition on its own. Since the \package{floatrow} package is
+% storing the definition on its own. Since the \pkg{floatrow} package is
% unmaintained we have to store the separator definition inside
-% |\caption at lsep@|\meta{name} for \package{floatrow}, too. (Sigh!)
+% |\caption at lsep@|\meta{name} for \pkg{floatrow}, too. (Sigh!)
% \begin{macrocode}
\@namedef{caption at lsep@#2}{#3}}
% \end{macrocode}
@@ -2222,7 +2190,7 @@
% Since the `default' caption label separator will usually not be defined
% with |\Declare|\-|Caption|\-|Label|\-|Separator|, we need to define
% |\caption at lsep@default| manually.
-% \Note{This definition is used by \package{magyar.ldf} but only needs to be different
+% \Note{This definition is used by \pkg{magyar.ldf} but only needs to be different
% than \cs{caption at lsep} (which is usually undefined).}
% \begin{macrocode}
\newcommand*\caption at lsep@default{\caption at labelseparator@default\caption at labelsep}%
@@ -2290,8 +2258,8 @@
% (taken from \url{https://comp.text.tex.narkive.com/XkJnYryR/figure-without-caption}).
%
% We emulate the behaviour of |\@make|\-|caption| of the base document classes
-% \class{article}, \class{report}, and \class{book} in this regard (in |\caption@@@make|)
-% so these hacks still work if the \package{caption} package is loaded.
+% \cls{article}, \cls{report}, and \cls{book} in this regard (in |\caption@@@make|)
+% so these hacks still work if the \pkg{caption} package is loaded.
%
% These are the label separators used when one or two tokens after the label format
% should be dropped, called `gobble' and `gobbletwo':
@@ -2306,7 +2274,7 @@
% |\captionnewline|\\
% will be used in the caption label separator |new|\-|line|,
% and re-defined for |long|\-|table| environments
-% (in package \package{ltcaption}).
+% (in package \pkg{ltcaption}).
% \begin{macrocode}
\newcommand*\captionnewline{\\\relax}
% \end{macrocode}
@@ -2362,7 +2330,7 @@
% \end{macrocode}
%
% \begin{macro}{\caption at getlabel}
-% \changes{v1.7}{2015/09/16}{Moved from \package{bicaption} package to \package{caption3}}
+% \changes{v1.7}{2015/09/16}{Moved from \pkg{bicaption} package to \pkg{caption3}}
% \changes{v2.0}{2020/08/23}{Syntax changed}
% |\caption at getlabel|\marg{text}\\
% gets the label command out of the given caption text and stores it to
@@ -2403,7 +2371,7 @@
% \end{macro}
%
% \begin{macro}{\caption at clrlabel}
-% \changes{v1.7}{2015/09/16}{Moved from \package{bicaption} package to \package{caption3}}
+% \changes{v1.7}{2015/09/16}{Moved from \pkg{bicaption} package to \pkg{caption3}}
% \changes{v1.8d}{2019/09/01}{Bugfix: Global definition of \cs{caption at thelabel} added}
% \changes{v2.3}{2020/12/26}{Code moved into the new macro \cs{caption at clrlabel}}
% |\caption at clrlabel|\\
@@ -2426,7 +2394,7 @@
% \begin{macro}{\DeclareCaptionFont}
% \changes{v1.0a}{2004/01/22}{Bugfix: Multi token arguments are allowed now}
% \changes{v1.1}{2007/05/07}{Internal: Uses \cs{caption at fnt} instead of \cs{caption at temp} now}
-% \changes{v1.8h}{2020/01/03}{Check for \package{ragged2e} package related options added}
+% \changes{v1.8h}{2020/01/03}{Check for \pkg{ragged2e} package related options added}
% \changes{v1.10}{2020/05/10}{Optional argument \opt{package} added}
% |\DeclareCaptionFont|\oarg{package}\marg{name}\marg{code}
% \begin{macrocode}
@@ -2559,7 +2527,7 @@
\SetCaptionDefault{textfont}{none}
% \end{macrocode}
%
-% The \package{floatrow} package uses the fonts `footfont` and `@tempa` additionally,
+% The \pkg{floatrow} package uses the fonts `footfont` and `@tempa` additionally,
% so we need to map and define the default value for them, too.
% \begin{macrocode}
\caption at setmapping{footfont}{font}
@@ -2671,10 +2639,10 @@
\newcommand*\DeclareCaptionJustification{%
% \caption at decl@package{justification}{\caption at decl{justification}}} % Because of floatrow it isn't so easy...
% \end{macrocode}
-% Unfortunately the (unmaintained) \package{floatrow} uses the old storage scheme
-% of the \package{caption} package and therefore expects the justification code
+% Unfortunately the (unmaintained) \pkg{floatrow} uses the old storage scheme
+% of the \pkg{caption} package and therefore expects the justification code
% in |\caption at hj@|\meta{name} instead of |\caption at justification@|\meta{name}.
-% For this reason we have to store the code for the \package{floatrow} package
+% For this reason we have to store the code for the \pkg{floatrow} package
% additionally, so |\flrow at FBo|\-|Align| will still work fine.
% \begin{macrocode}
\caption at withoptargs\caption at declare@justification}
@@ -2783,8 +2751,8 @@
%
% These macros handle the right position of the caption.
% Note that the position is actually \emph{not} controlled by the
-% \package{caption3} kernel options, but by the user (or a specific package
-% like the \package{float} package) instead.
+% \pkg{caption3} kernel options, but by the user (or a specific package
+% like the \pkg{float} package) instead.
% The user can put the |\caption| command wherever he likes! So this stuff
% is only to give us a \emph{hint} where to put the right skips, the user
% usually has to take care for himself that this hint actually matches the
@@ -2826,7 +2794,7 @@
% \changes{v2.3}{2021/01/02}{Uses \cs{caption at initposition} additionally}
% |\caption at setposition|\marg{position}\\
% puts |\caption at position| to the right value.
-% (Note: Since this command is used by the \package{floatrow} package as well its syntax should not change.)
+% (Note: Since this command is used by the \pkg{floatrow} package as well its syntax should not change.)
% \begin{macrocode}
\newcommand*\caption at setposition{%
\caption at initposition
@@ -2930,7 +2898,7 @@
% A different solution would be setting the |\space|\-|factor| to something
% not much less than 1000 (for example 994) in |\caption at start| and
% checking this value here by |\ifnum\space|\-|factor=994|.
-% (It's implemented in the \package{threeparttable} package\cite{threeparttable} this way.)
+% (It's implemented in the \pkg{threeparttable} package\cite{threeparttable} this way.)
%
% Another idea would be checking |\@if|\-|mini|\-|page|, but since some packages
% typeset the caption within a simple |\vbox| this does not seem to be a good one.
@@ -3052,7 +3020,7 @@
\DeclareCaptionOption{listformat}{\caption at set{listformat}{#1}}
% \end{macrocode}
%
-% There are seven pre-defined list formats. (The first five were taken from the \package{subfig} package.)
+% There are seven pre-defined list formats. (The first five were taken from the \pkg{subfig} package.)
% \begin{macrocode}
\DeclareCaptionListFormat{empty}{}
\DeclareCaptionListFormat{simple}{#1#2}
@@ -3071,7 +3039,7 @@
% \begin{macro}{\caption at lstfmt}
% \changes{v2.0}{This macro added}
% To provide backward compatibility we still offer \cs{caption at lstfmt}.
-% (\cs{caption at lstfmt} is used in the \package{dgruyter} package.)
+% (\cs{caption at lstfmt} is used in the \pkg{dgruyter} package.)
% \begin{macrocode}
\newcommand*\caption at lstfmt{\caption at listformat}
% \end{macrocode}
@@ -3154,15 +3122,6 @@
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\caption at ifdocumentclass}
-% Boolean switch which is set if the document class could be detected
-% successfully, i.e. |\caption at document|\-|class| is set to a proper value.
-% (If |\caption at document|\-|class| is already set, this flag will also be set.)
-% \begin{macrocode}
-\caption at setbool{documentclass}{1}
-% \end{macrocode}
-% \end{macro}
-%
% \begin{macro}{\caption at documentclass}
% \changes{v1.8e}{2018/05/11}{This macro added}
% Determine document class used.
@@ -3217,6 +3176,7 @@
% \LaTeX\ document classes |article|, |report|, or |book|, we assume it's
% either one of them or is compatible to them.
% \begin{macrocode}
+ \def\caption at documentclass{standard}%
\ifx\@makecaption\@undefined
\caption at InfoNoLine{Document class w/o caption stuff detected}%
\else
@@ -3238,7 +3198,7 @@
Unknown document class (or package),\MessageBreak
standard defaults will be used}%
\caption at InfoNoLine{\string\@makecaption\space=\space\meaning\@makecaption\@gobble}%
- \caption at setbool{documentclass}{0}% unknown document class
+ \def\caption at documentclass{unknown}%
\fi
\fi
\fi
@@ -3245,17 +3205,34 @@
\fi
% \end{macrocode}
% \begin{macrocode}
- \let\caption at documentclass\@empty % don't load adaption code later on
}}}}}}}%
}{}
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\caption at ifdocumentclass}
+% \changes{v2.4b}{2023/03/14}{This macro redefined}
+% |\caption at ifdocumentclass|\marg{name}\marg{yes-code}\marg{no-code}\\
+% expands the given \meta{yes-code} if |\caption at document|\-|class| matches the given \meta{name}.
+% Otherwise the \meta{no-code} is expanded.
+% \begin{macrocode}
+\newcommand*\caption at ifdocumentclass[1]{%
+ \begingroup
+ \edef\caption at tempa{\caption at documentclass}%
+ \edef\caption at tempb{#1}%
+ \ifx\caption at tempa\caption at tempb
+ \endgroup\expandafter\@firstoftwo
+ \else
+ \endgroup\expandafter\@secondoftwo
+ \fi}
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}{\AtCaptionPackage}
% \changes{v2.0}{2018/05/14}{This macro added}
% |\AtCaptionPackage|\marg{code}\\
% can be used by the document class adaption packages to execute extra code
-% if the \package{caption} package is loaded (later on).
+% if the \pkg{caption} package is loaded (later on).
% This code will by applied right before the package options are evaluated.
% \begin{macrocode}
\newcommand*\AtCaptionPackage{%
@@ -3272,7 +3249,7 @@
% \changes{v2.1}{2020/09/12}{This macro added}
% |\AfterCaptionPackage|\marg{code}\\
% can be used by the document class adaption packages to execute extra code
-% if the \package{caption} package is loaded (later on).
+% if the \pkg{caption} package is loaded (later on).
% This code will by applied at the very end.
% \begin{macrocode}
\newcommand*\AfterCaptionPackage{%
@@ -3308,9 +3285,9 @@
% \end{macro}
%
% \subsection{The arabic \& farsi babel option}
-% \changes{v1.8}{2018/05/20}{\package{arabic} babel support added}
-% \changes{v2.0}{2020/08/02}{\package{arabic} babel support updated}
-% \changes{v2.0}{2020/08/02}{\package{farsi} babel support added}
+% \changes{v1.8}{2018/05/20}{\pkg{arabic} babel support added}
+% \changes{v2.0}{2020/08/02}{\pkg{arabic} babel support updated}
+% \changes{v2.0}{2020/08/02}{\pkg{farsi} babel support added}
%
% \begin{macrocode}
\DeclareCaptionLabelSeparator{arabi}{\if at rl\space\fi: }
@@ -3357,8 +3334,8 @@
% \end{macrocode}
%
% \subsection{The babel-french package}
-% \changes{v1.1}{2006/05/14}{\package{frenchb} babel support added}
-% \changes{v2.0}{2020/08/01}{\package{french} babel support updated}
+% \changes{v1.1}{2006/05/14}{\pkg{frenchb} babel support added}
+% \changes{v2.0}{2020/08/01}{\pkg{french} babel support updated}
%
% We provide a `french' caption label separator.
% |\caption at french@label|\-|separator| will be defined later on,
@@ -3384,7 +3361,7 @@
\caption at IfBabelFrench{%
% \end{macrocode}
%
-% The \package{babel-french} package uses |\Caption|\-|Separator| as label separator.
+% The \pkg{babel-french} package uses |\Caption|\-|Separator| as label separator.
%
% \begin{macrocode}
\providecommand\caption at french@labelseparator{\CaptionSeparator}%
@@ -3426,8 +3403,8 @@
% \end{macrocode}
%
% \subsection{The frenchle \& frenchpro package}
-% \changes{v1.1}{2006/05/14}{\package{frenchle/pro} package support added}
-% \changes{v2.0}{2020/08/01}{\package{frenchle/pro} package support updated}
+% \changes{v1.1}{2006/05/14}{\pkg{frenchle/pro} package support added}
+% \changes{v2.0}{2020/08/01}{\pkg{frenchle/pro} package support updated}
%
% \begin{macro}{\caption at IfFrenchLe}
% |\caption at IfFrenchLe|\marg{yes-code}\marg{no-code}
@@ -3445,7 +3422,7 @@
\caption at IfFrenchLe{%
% \end{macrocode}
%
-% The \package{frenchle} package uses |\caption|\-|separator| plus |\space| as label separator.
+% The \pkg{frenchle} package uses |\caption|\-|separator| plus |\space| as label separator.
%
% \begin{macrocode}
\providecommand\caption at french@labelseparator{\captionseparator\space}%
@@ -3465,7 +3442,7 @@
\caption at restoredefault{labelfont}{\caption at original@labelfont}}%
% \end{macrocode}
%
-% Since the \package{frenchle} package overwrites |\caption|\-|font| and |\caption|\-|label|\-|font|
+% Since the \pkg{frenchle} package overwrites |\caption|\-|font| and |\caption|\-|label|\-|font|
% (within |\GOfrench|) we need to save them beforehand and restore them afterwards.
%
% \begin{macrocode}
@@ -3482,10 +3459,10 @@
% \end{macrocode}
%
% \subsection{The babel-hungarian package}
-% \changes{v1.3}{2009/03/29}{\package{magyar} babel support added}
-% \changes{v1.3a}{2011/08/12}{\package{magyar} babel support revised}
-% \changes{v1.8b}{2018/08/26}{\package{magyar} babel support revised}
-% \changes{v2.0}{2020/08/03}{\package{magyar} babel support updated}
+% \changes{v1.3}{2009/03/29}{\pkg{magyar} babel support added}
+% \changes{v1.3a}{2011/08/12}{\pkg{magyar} babel support revised}
+% \changes{v1.8b}{2018/08/26}{\pkg{magyar} babel support revised}
+% \changes{v2.0}{2020/08/03}{\pkg{magyar} babel support updated}
%
% \begin{macrocode}
\DeclareCaptionLabelFormat{magyar}{#2\bothIfSecond{.~}{#1}}
@@ -3662,8 +3639,8 @@
% \changes{v1.11}{2020/05/10}{Usage of \cs{RequirePackage} replaced by \cs{caption at usepackage}}
% \changes{v2.0}{2020/07/27}{This macro revised}
% |\caption at newfloat|\marg{option}\marg{value}\marg{code}\\
-% loads the \package{newfloat} package and executes the given code afterwards.
-% (Note: Since the package might use the crappy \package{keyval}
+% loads the \pkg{newfloat} package and executes the given code afterwards.
+% (Note: Since the package might use the crappy \pkg{keyval}
% package, too, we need to save \& restore some macros here, otherwise this
% recursion won't work properly.)
% \begin{macrocode}
@@ -3703,10 +3680,10 @@
% \changes{v1.2}{2007/11/18}{After-preamble variant added}
% \changes{v1.2a}{2008/02/28}{Renamed from \cs{caption at SetFloatName} to \cs{caption at SetName}}
% \changes{v1.2b}{2008/08/02}{Bugfix: Works now without \cs{addto}, too}
-% \changes{v1.4a}{2011/10/29}{Outsourced to \package{newfloat} package}
+% \changes{v1.4a}{2011/10/29}{Outsourced to \pkg{newfloat} package}
% \changes{v1.4b}{2012/01/12}{Bugfix: Uses \cs{caption at newfloat} now}
% |\caption at SetName|\marg{float}\marg{name}\\
-% loads the \package{newfloat} package and uses |\newfloat at set|\-|name|.
+% loads the \pkg{newfloat} package and uses |\newfloat at set|\-|name|.
% \begin{macrocode}
\newcommand*\caption at SetName[2]{%
\caption at newfloat{#1name}{\newfloat at setname{#1}{#2}}}
@@ -3740,10 +3717,10 @@
%
% \begin{macro}{\caption at within}
% \changes{v1.2}{2007/12/21}{This macro added}
-% \changes{v1.4a}{2011/10/29}{Outsourced to \package{newfloat} package}
+% \changes{v1.4a}{2011/10/29}{Outsourced to \pkg{newfloat} package}
% \changes{v1.4b}{2012/01/12}{Bugfix: Uses \cs{caption at newfloat} now}
% |\caption at within|\marg{float}\marg{value}\\
-% loads the \package{newfloat} package and uses |\newfloat at set|\-|within|.
+% loads the \pkg{newfloat} package and uses |\newfloat at set|\-|within|.
% \begin{macrocode}
\newcommand*\caption at within[2]{%
\caption at newfloat{#1within=#2}{\newfloat at setwithin{#1}{#2}}}
@@ -3761,12 +3738,12 @@
% \end{macrocode}
%
% \subsection{The ragged2e package}
-% \changes{v1.0b}{2004/05/16}{Improved \package{ragged2e} package support}
-% \changes{v1.8h}{2020/01/03}{Revised \package{ragged2e} package support}
-% \changes{v1.9}{2020/05/05}{Enhanced \package{ragged2e} package support}
-% \changes{v1.10}{2020/05/10}{Revised \package{ragged2e} package support}
+% \changes{v1.0b}{2004/05/16}{Improved \pkg{ragged2e} package support}
+% \changes{v1.8h}{2020/01/03}{Revised \pkg{ragged2e} package support}
+% \changes{v1.9}{2020/05/05}{Enhanced \pkg{ragged2e} package support}
+% \changes{v1.10}{2020/05/10}{Revised \pkg{ragged2e} package support}
%
-% We support the upper-case commands offered by the \package{ragged2e}
+% We support the upper-case commands offered by the \pkg{ragged2e}
% package.
% \begin{macrocode}
\DeclareCaptionJustification[ragged2e]{Justified}{\justifying}
@@ -3776,8 +3753,8 @@
% \end{macrocode}
%
% \subsection{The sansmath package}
-% \changes{v1.3}{2011/01/01}{\package{sansmath} package support added}
-% \changes{v1.10}{2020/05/10}{\package{sansmath} package support revised}
+% \changes{v1.3}{2011/01/01}{\pkg{sansmath} package support added}
+% \changes{v1.10}{2020/05/10}{\pkg{sansmath} package support revised}
%
% \begin{macrocode}
\DeclareCaptionFont[sansmath]{sansmath}{\sansmath}
@@ -3784,9 +3761,9 @@
% \end{macrocode}
%
% \subsection{The setspace package}
-% \changes{v1.0n}{2007/04/02}{\package{setspace} package support added}
-% \changes{v1.2d}{2009/10/09}{\package{setspace} package support revised}
-% \changes{v2.3}{2021/11/20}{The font option \opt{stretch} does not require the \package{setspace} package anymore}
+% \changes{v1.0n}{2007/04/02}{\pkg{setspace} package support added}
+% \changes{v1.2d}{2009/10/09}{\pkg{setspace} package support revised}
+% \changes{v2.3}{2021/11/20}{The font option \opt{stretch} does not require the \pkg{setspace} package anymore}
%
% \begin{macrocode}
\DeclareCaptionFont{singlespacing}{%
@@ -3804,13 +3781,13 @@
% \end{macrocode}
%
% \subsection{The subfig package}
-% \changes{v1.1}{2007/07/07}{Adaptions to the \package{subfig} package added}
-% \changes{v1.4a}{2011/11/01}{Test for the \package{subfig} package revised}
+% \changes{v1.1}{2007/07/07}{Adaptions to the \pkg{subfig} package added}
+% \changes{v1.4a}{2011/11/01}{Test for the \pkg{subfig} package revised}
% \changes{v2.0a}{2020/09/07}{Re-definition of \cs{sf at ifpositiontop} added}
%
-% Since the \package{subfig} package is not maintained anymore,
+% Since the \pkg{subfig} package is not maintained anymore,
% we have to make adaptions to \thispackage~\version{1.1} here.
-% Please note that we only support the version $1.3$ of the \package{subfig} package,
+% Please note that we only support the version $1.3$ of the \pkg{subfig} package,
% so older versions do not work with this version of \thispackage, and newer
% versions are expected to be adapted.
%
@@ -3876,7 +3853,7 @@
% \end{macrocode}
% \end{macro}
%
-% Make the \package{subfig} package documentation compile.
+% Make the \pkg{subfig} package documentation compile.
% \begin{macrocode}
\DeclareCaptionOption{lofdepth}[2]{\caption at ifdefined\c at lofdepth{\setcounter{lofdepth}{#1}}{}}
\DeclareCaptionOption{lotdepth}[2]{\caption at ifdefined\c at lotdepth{\setcounter{lotdepth}{#1}}{}}
@@ -3892,8 +3869,8 @@
% \changes{v1.4}{2011/08/30}{Support for option \opt{listtype=} added}
% \changes{v1.5}{2012/01/15}{Usage of \cs{caption at addsubcontentslines} added}
% \changes{v1.7}{2015/09/15}{Argument \#3 which holds the environment name added to \cs{caption at lstfmt}}
-% \changes{v1.7}{2015/09/20}{Unfortunately \package{subfig} defines and uses \cs{caption at lstfmt} as well, so I replaced the third argument with \cs{captionlisttype}}
-% \changes{v1.8}{2018/09/06}{Adapted to the \package{chkfloat} package}
+% \changes{v1.7}{2015/09/20}{Unfortunately \pkg{subfig} defines and uses \cs{caption at lstfmt} as well, so I replaced the third argument with \cs{captionlisttype}}
+% \changes{v1.8}{2018/09/06}{Adapted to the \pkg{chkfloat} package}
% \changes{v2.3}{2021/01/06}{Usage of \cs{p at xxx} and \cs{thexxx} replaced by \cs{caption at p} and \cs{caption at the}}
% |\caption at addcontentsline|\marg{type}\marg{list entry}\\
% makes an entry in the list-of-whatever, if requested, i.e.~the argument
@@ -3974,7 +3951,7 @@
% \begin{macro}{\caption at belowskip}
% \changes{v2.0}{2020/08/23}{This macro moved from package to kernel}
% |\caption at aboveskip| and |\caption at belowskip|\\
-% typeset the skip above resp.~below the caption.
+% typeset the skip above or below the caption.
% \begin{macrocode}
\newcommand*\caption at aboveskip{%
\vskip\abovecaptionskip}
@@ -4007,7 +3984,7 @@
%
% \begin{macro}{\caption at setfnum}
% \changes{v1.1}{2007/03/10}{This macro added}
-% \changes{v2.0}{2020/08/03}{Adapted to \package{caption3} v2.0}
+% \changes{v2.0}{2020/08/03}{Adapted to \pkg{caption3} v2.0}
% \changes{v2.3}{2022/01/05}{Definition moved from package to kernel}
% |\caption at setfnum|\marg{type}\\
% stores the original definition of |\fnum@|\meta{type} in |\caption at fnum@|\meta{type}
@@ -4059,7 +4036,7 @@
%
% \begin{macro}{\caption@@make}
% \changes{v1.0b}{2004/05/16}{Bugfix 04-05-05: \cs{ifdim}\cs{captionindent=}\cs{z@} added}
-% \changes{v1.0c}{2005/02/12}{Bugfix 04-10-26: Use \cs{@tempdima} instead of \cs{captionmargin} resp. \cs{captionwidth}; check for \cs{z@} added}
+% \changes{v1.0c}{2005/02/12}{Bugfix 04-10-26: Use \cs{@tempdima} instead of \cs{captionmargin} or \cs{captionwidth}; check for \cs{z@} added}
% \changes{v1.0c}{2005/02/12}{Bugfix: \cs{hskip}\cs{captionmargin} to the end of caption added}
% \changes{v1.0c}{2005/02/12}{Bugfix: \cs{strut} moved from here to \cs{caption@@@make}}
% \changes{v1.0c}{2005/02/12}{Single-line-check moved up so it can affect margins now}
@@ -4077,7 +4054,7 @@
% \changes{v1.5}{2012/03/15}{Uses \cs{caption at tempdima} instead of \cs{@tempdima}}
% \changes{v1.5}{2012/12/26}{max-margin stuff moved to \cs{caption at calcmargin}}
% \changes{v1.6}{2013/05/01}{Usage of \cs{caption at box} added}
-% \changes{v1.7}{2016/01/31}{Adapted to the \package{bicaption} package}
+% \changes{v1.7}{2016/01/31}{Adapted to the \pkg{bicaption} package}
% \changes{v1.8f}{2019/12/18}{Usage of \cs{linewidth} replaced by \cs{hsize}}
% \changes{v2.3}{2021/01/16}{Some code encapsulated as \cs{caption at make@leftmargin}, \cs{caption at make@parbox}, \cs{caption at make@indention}, and \cs{caption at make@rightmargin}}
% |\caption@@make|\marg{caption label}\marg{caption text}
@@ -4169,7 +4146,7 @@
% \changes{v1.1}{2006/05/13}{Check of \cs{@listdepth} removed (not necessary anymore), use \cs{linewidth} instead of \cs{hsize}}
% \changes{v1.5}{2012/12/26}{max-margin stuff moved from \cs{caption@@make} to here}
% \changes{v1.8f}{2019/12/18}{Usage of \cs{linewidth} replaced by \cs{hsize}}
-% \changes{v2.3}{2021/01/17}{Uses \cs{caption at width} resp.~\cs{caption at leftmargin} and \cs{caption at rightmargin} now}
+% \changes{v2.3}{2021/01/17}{Uses \cs{caption at width} or \cs{caption at leftmargin} and \cs{caption at rightmargin} now}
% |\caption at calcmargin|\\
% calculates |\caption|\-|@left|\-|margin|, |\caption|\-|@width|, and |\caption|\-|@right|\-|margin|,
% so all three contain valid values afterwards.
@@ -4317,7 +4294,7 @@
% \changes{v1.0b}{2004/05/16}{Redefinition of \cs{label} \& \cs{@footnotetext} added}
% \changes{v1.0b}{2004/05/16}{Redefine \cs{stepcounter} instead of \cs{footnote(mark)}}
% \changes{v1.0c}{2005/02/12}{\cs{let}\cs{caption at justification}\cs{relax} added}
-% \changes{v1.0f}{2005/07/09}{Support of \package{endnotes} package added}
+% \changes{v1.0f}{2005/07/09}{Support of \pkg{endnotes} package added}
% \changes{v1.1}{2007/06/13}{\cs{let}\cs{caption at justification}\cs{relax} moved to \cs{caption at slc}}
% \changes{v1.1}{2007/06/13}{Redefinition of \cs{(H@)refstepcounter} added}
% \changes{v1.1}{2007/08/12}{Redefinition of \cs{label} improved}
@@ -4329,12 +4306,20 @@
% \changes{v1.8}{2018/05/26}{Definition method changed so it can be pre-defined by other packages}
% \changes{v1.8}{2018/05/27}{Redefinition of \cs{hypertarget} added}
% \changes{v2.3}{2021/07/03}{Redefinition of \cs{footnote} and \cs{endnote} stuff revised}
+% \changes{v2.4c}{2023/07/28}{Redefinition of \cs{index} and \cs{glossary} added}
+% \changes{v2.4c}{2023/07/28}{Application of code defined via \cs{GetTitleStringDisableCommands} added}
% |\caption at prepareslc|\\
% re-defines anything which could disturb the single-line-check.
% \begin{macrocode}
\providecommand*\caption at prepareslc{}
\AtCaptionSingleLineCheck{%
+ \let\caption at protect\protect
+ \caption at ifdefined\GTS at DisablePredefinedCmds\GTS at DisablePredefinedCmds\relax
+% \end{macrocode}
+% \begin{macrocode}
\let\label\caption at gobble
+ \let\index\caption at gobble
+ \let\glossary\caption at gobble
\let\hypertarget\@gobbletwo
% \end{macrocode}
% We re-define \cs{footnote} so
@@ -4349,7 +4334,7 @@
\let\footnotetext\caption at footnotetext
\let\@footnotetext\@gobble
% \end{macrocode}
-% Adaption to the \package{hyperref} package
+% Adaption to the \pkg{hyperref} package
% \begin{macrocode}
\let\H@@footnotetext\@gobble
\let\H@@mpfootnotetext\@gobble
@@ -4357,7 +4342,7 @@
{\let\@footnotemark\H@@footnotemark}%
{}%
% \end{macrocode}
-% Adaption to the \package{tablefootnote} package
+% Adaption to the \pkg{tablefootnote} package
% \begin{macrocode}
\let\tablefootnote\caption at footnote
% \end{macrocode}
@@ -4368,23 +4353,28 @@
\let\endnotetext\caption at endnotetext
\let\@endnotetext\@gobble
% \end{macrocode}
-% Adaption to the \package{acronym} package\par
+% Adaption to the \pkg{acronym} package\par
% See also \url{https://tex.stackexchange.com/questions/428788}
% \begin{macrocode}
\let\acused\@gobble
\let\AC at placelabel\@gobble
% \end{macrocode}
-% Adaption to the \package{glossaries} package.\par
+% Adaption to the \pkg{glossaries} package\par
% Please note that while this adaption is usually sufficient
% it could give incorrect measuring results if \cs{gls} is both used
% for the very first time and more than once (for a particular acronym).
% The alternative would be using internal macros of the
-% \package{glossaries} package which I would like to avoid.\par
+% \pkg{glossaries} package which I would like to avoid.\par
% See also \url{https://tex.stackexchange.com/questions/108368}
% \begin{macrocode}
\let\glsunset\@gobble
% \end{macrocode}
+% Execute code defined by |\Get|\-|Title|\-|String|\-|Disable|\-|Commands|
% \begin{macrocode}
+ \caption at ifdefined\GTS at DisableHook\GTS at DisableHook\relax
+ \let\protect\caption at protect
+% \end{macrocode}
+% \begin{macrocode}
}
% \end{macrocode}
% \end{macro}
@@ -4399,7 +4389,7 @@
% only be incremented temporarily for the single-line-check.
% (In the past we had re-used the original code but with re-defined
% |\step|\-|counter| but this has proofed as non-sufficient when
-% using footnote related packages like the \package{footmisc} package.
+% using footnote related packages like the \pkg{footmisc} package.
% Now we might end up getting a wrong footnote marker, but this code has to
% be sufficient for the single-line-check.))
% \begin{macrocode}
@@ -4526,17 +4516,17 @@
% \changes{v1.7}{2016/02/01}{Bugfix: \cs{relax} added before \cs{caption at lsep} so the label separator will not be gobbled if the label font command ignores spaces, e.g. by usage of \cs{color}}
% \changes{v1.8}{2018/09/12}{\cs{par} replaced by \cs{caption at textend}}
% \changes{v2.2c}{2020/10/10}{Usage of the label separators \opt{gobble} and \opt{gobbletwo} added}
-% \changes{v2.2e}{2020/10/21}{Adaptions to \package{floatrow} package added}
+% \changes{v2.2e}{2020/10/21}{Adaptions to \pkg{floatrow} package added}
% |\caption@@@make|\marg{caption label}\marg{caption text}\\
% This one finally typesets the caption paragraph, without margin and indention.
% \begin{macrocode}
\newcommand\caption@@@make[2]{%
% \end{macrocode}
-% The \package{floatrow} package uses |\caption@@@make|, too,
+% The \pkg{floatrow} package uses |\caption@@@make|, too,
% but without using |\caption at single|\-|line| or |\caption at multi|\-|line|.
% For this reason we must expand |\caption at format| if |\caption at fmt| isn't defined yet.
% Furthermore it uses |\caption at lfmt| as argument which was renamed to
-% |\caption at label|\-|format| in \package{caption3}\version{2.0}.
+% |\caption at label|\-|format| in \pkg{caption3}\version{2.0}.
% \begin{macrocode}
\ifx\caption at fmt\@undefined\caption at format\fi
\let\caption at lfmt\caption at labelformat
@@ -4695,9 +4685,9 @@
% \changes{v1.2b}{2008/08/02}{Support of \cs{float at exts} and \cs{float at addtolists} added}
% \changes{v1.2e}{2010/01/09}{Usage of \cs{caption at DeclareWithinOption} added}
% \changes{v1.3}{2011/08/06}{Definition of \cs{listofXXXes} added}
-% \changes{v1.4a}{2011/10/29}{Outsourced to \package{newfloat} package}
+% \changes{v1.4a}{2011/10/29}{Outsourced to \pkg{newfloat} package}
% |\DeclareCaptionType|\oarg{options}\marg{environment}\oarg{name}\oarg{list name}\\
-% loads the \package{newfloat} package and uses |\Declare|\-|Floating|\-|Environment|.
+% loads the \pkg{newfloat} package and uses |\Declare|\-|Floating|\-|Environment|.
% \begin{macrocode}
\newcommand*\DeclareCaptionType{%
\caption at loadpackage{newfloat}{declare type}%
@@ -4713,7 +4703,7 @@
% will execute the given code for each (known) floating environment.
% The starred variant will only work for already existing environments,
% i.e.~no hook will be placed inside |\Declare|\-|Floating|\-|Environment|
-% (offered by the \package{newfloat} package).
+% (offered by the \pkg{newfloat} package).
% \begin{macrocode}
\newcommand*\ForEachCaptionType{%
\@ifstar
@@ -4736,7 +4726,7 @@
% |\newfloat at addtohook|\marg{code with \#1}\\
% adds code to the hook called in |\Declare|\-|Floating|\-|Environment|.\par
% Note: We use |\provide|\-|command| instead of |\new|\-|command| here since the
-% exact same code is defined in the \package{newfloat} package.
+% exact same code is defined in the \pkg{newfloat} package.
% \begin{macrocode}
\providecommand\newfloat at addtohook[1]{%
\toks@=\expandafter{\newfloat at hook{##1}#1}%
@@ -4807,7 +4797,7 @@
\@namedef{ext@#4}{\csname ext@#3\endcsname}%
\caption at declaresublistentry{#3}%
% \end{macrocode}
-% Support of \package{titletoc} package
+% Support of \pkg{titletoc} package
% \begin{macrocode}
\caption at ifdefined\contentsuse{%
\contentsuse{#4}{\csname ext@#4\endcsname}}{}%
@@ -4957,8 +4947,8 @@
% \changes{v1.5}{2013/05/01}{The macro \cs{caption at savesubcounters} added}
% \changes{v1.13}{2020/07/28}{Uses \cs{caption at for@list} now for iterating the list}
% \changes{v2.2b}{2020/10/06}{This stuff replaced by a patch of \cs{@memresetsubcounter}}
-% The \class{memoir} document class resets the \texttt{subfigure}
-% resp.~\texttt{subtable} counter at the begin of floating environments using
+% The \cls{memoir} document class resets the \texttt{subfigure}
+% or \texttt{subtable} counter at the begin of floating environments using
% |\@mem|\-|reset|\-|sub|\-|counter|.
% As a side-effect |\continued|\-|float| does not work correctly.
% For that reason we need to patch |\@mem|\-|reset|\-|sub|\-|counter| here,
@@ -4976,16 +4966,16 @@
% \section{Execution of options}
%
% \begin{macrocode}
-\ifx\caption at documentclass\@empty\else
- \@pushfilename
- \edef\@currname{caption-\caption at documentclass}
- \edef\@currext{sto}
- \InputIfFileExists
- {\@currname.\@currext}%
- {}%
- {\@missingfileerror\@currname\@currext}%
- \@popfilename
-\fi
+\caption at ifdocumentclass{unknown}{}{%
+ \caption at ifdocumentclass{standard}{}{%
+ \@pushfilename
+ \edef\@currname{caption-\caption at documentclass}
+ \edef\@currext{sto}
+ \InputIfFileExists
+ {\@currname.\@currext}%
+ {}%
+ {\@missingfileerror\@currname\@currext}%
+ \@popfilename}}
% \end{macrocode}
%
% \begin{macrocode}
Modified: trunk/Master/texmf-dist/source/latex/caption/ltcaption.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/caption/ltcaption.dtx 2023-07-28 20:40:36 UTC (rev 67751)
+++ trunk/Master/texmf-dist/source/latex/caption/ltcaption.dtx 2023-07-28 20:40:52 UTC (rev 67752)
@@ -2,7 +2,7 @@
%
% This is file `ltcaption.dtx'.
%
-% Copyright (C) 2007-2020 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
+% Copyright (C) 2007-2023 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
%
% --------------------------------------------------------------------------
%
@@ -36,34 +36,17 @@
% \iffalse
%<*driver>
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesFile{ltcaption.drv}[2013/06/01 v1.4 This package fixes caption problems with other-than-centered aligned longtables]
-\hbadness=9999 \newcount\hbadness \hfuzz=48pt % Make TeX shut up.
+\ProvidesFile{ltcaption.drv}[2023/07/10 v1.4 This package fixes caption problems with other-than-centered aligned longtables]
%
-\documentclass{ltxdoc}
-\setlength\parindent{0pt}
-\setlength\parskip{\smallskipamount}
+\documentclass{captiondoc}
+\hypersetup{pdfkeywords={LaTeX, package, ltcaption}}
%
-\usepackage{ifpdf}
-\ifpdf
- \usepackage{mathptmx,courier}
- \usepackage[scaled=0.90]{helvet}
-% \addtolength\marginparwidth{15pt}
-\fi
-%
-\usepackage[bottom]{footmisc}
\usepackage{longtable}
\makeatletter\let\LT at makecaption@ORI\LT at makecaption\makeatother
%
-\usepackage{hypdoc}
-\ifpdf\usepackage{hypdestopt}\fi
-\hypersetup{pdfkeywords={LaTeX, package, ltcaption},pdfstartpage={},pdfstartview={}}
-%
\usepackage{ltcaption}[2007/09/01]
%\usepackage[LTcapwidthtotable]{fr-longtable}
%
-\DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em%
- M\kern.05em A\kern.1em-\kern.1em Script}}
-%
\begin{document}
\DocInput{ltcaption.dtx}
\end{document}
@@ -70,15 +53,8 @@
%</driver>
% \fi
%
-% \newcommand*\purerm[1]{{\upshape\mdseries\rmfamily #1}}
-% \newcommand*\puresf[1]{{\upshape\mdseries\sffamily #1}}
-% \newcommand*\purett[1]{{\upshape\mdseries\ttfamily #1}}
-% \let\class\puresf \let\package\puresf
-% \let\env\purett \let\opt\purett
-%
-% \def\thispackage{the \package{ltcaption} package}
-% \def\Thispackage{The \package{ltcaption} package}
-% \newcommand*\version[2][]{v$#2$}
+% \def\thispackage{the \pkg{ltcaption} package}
+% \def\Thispackage{The \pkg{ltcaption} package}
%
% \GetFileInfo{ltcaption.drv}
% \let\docdate\filedate
@@ -110,7 +86,7 @@
% This is sufficient for centered longtables, but for left or right aligned longtables
% this results in captions moved into the left or right page margin.
%
-% To solve this problem just include this package \emph{after} the \package{longtable}
+% To solve this problem just include this package \emph{after} the \pkg{longtable}
% package\cite{longtable}, e.g.:
% \begin{quote}
% |\usepackage{longtable,ltcaption}|
@@ -128,7 +104,7 @@
% When \thispackage\ is loaded it will be set to |\abovecaptionskip| which
% usually represents the skip between caption and contents in floating
% environments.
-% (Without this package, the \package{longtable} package uses |\baselineskip| here.)
+% (Without this package, the \pkg{longtable} package uses |\baselineskip| here.)
%
% \DescribeMacro{\LTcapleft}
% \DescribeMacro{\LTcapright}
@@ -142,7 +118,7 @@
% |\LTcapleft| \& |\LTcapright|.
%
% \emph{Note:}
-% If \thispackage\ will be used with one of the \package{NTG} document
+% If \thispackage\ will be used with one of the \pkg{NTG} document
% classes\cite{NTGclasses}, |\CaptionLabelFont| \& |\CaptionTextFont| will
% not only be used for |figure| \& |table| captions, but for |longtable|
% captions as well.
@@ -149,16 +125,16 @@
%
% \emph{Note:}
% These lengths \& commands do not work when \thispackage\ is used with one
-% of the \KOMAScript\ document classes \class{scrartcl}, \class{scrreprt}, or \class{scrbook}~\cite{KOMAScript},
-% or used with the \class{memoir} document class~\cite{memoir}.
-% The \KOMAScript\ resp.~\class{memoir} settings for captions are used instead.
-% Same with the \package{caption} package which also uses its own options
+% of the \KOMAScript\ document classes \cls{scrartcl}, \cls{scrreprt}, or \cls{scrbook}~\cite{KOMAScript},
+% or used with the \cls{memoir} document class~\cite{memoir}.
+% The \KOMAScript\ or \cls{memoir} settings for captions are used instead.
+% Same with the \pkg{caption} package which also uses its own options
% and settings.
%
% \subsection{Bonus features}
%
% \DescribeMacro{\LTcaptype}
-% As a bonus feature this package patches the \package{longtable} package
+% As a bonus feature this package patches the \pkg{longtable} package
% so |\LTcaptype| will be used internally instead of the fixed caption type
% `table'. So for example this code snipped:
% \begin{quote}
@@ -279,7 +255,7 @@
%
% \begin{minipage}{\linewidth}
% With \thispackage\ and |\LTcapleft=0pt|
-% resp. |\LTcapright=0pt|:
+% or |\LTcapright=0pt|:
%
% \noindent\rule{\textwidth}{1pt}
%
@@ -306,7 +282,7 @@
%
% \begin{minipage}{\linewidth}
% With \thispackage\ and |\LTcapleft=\tabcolsep|\\
-% resp. |\LTcapright=\tabcolsep|:
+% or |\LTcapright=\tabcolsep|:
%
% \noindent\rule{\textwidth}{1pt}
%
@@ -502,7 +478,7 @@
% \end{macro}
%
% \begin{macro}{\ext at lstlisting}
-% Since the \package{listings} package do not define |\ext at lstlisting|,
+% Since the \pkg{listings} package do not define |\ext at lstlisting|,
% but we needed it when |\renewcommand\LTcaptype{lstlisting}| was done
% by the end user, we define it here.
% \begin{macrocode}
@@ -513,7 +489,7 @@
% \end{macro}
%
% To save \TeX\ memory some stuff will not be defined if the
-% \package{caption} package is loaded.
+% \pkg{caption} package is loaded.
%
% \begin{macrocode}
\@ifpackageloaded{caption}{}{%
@@ -520,7 +496,7 @@
% \end{macrocode}
%
% \changes{v1.1}{2007/04/20}{The skips will not be defined if the
-% \package{caption} package is loaded}
+% \pkg{caption} package is loaded}
%
% \begin{macro}{\LTcapskip}
% \changes{v1.2}{2007/03/28}{This skip added}
@@ -548,7 +524,7 @@
%
% \begin{macro}{\CaptionLabelFont}
% \begin{macro}{\CaptionTextFont}
-% These commands are provided by the \package{NTG} document classes.
+% These commands are provided by the \pkg{NTG} document classes.
% To make this package work with other document classes as well,
% we need to define |\Caption|\-|Label|\-|Font| \& |\Caption|\-|Text|\-|Font| here.
% \begin{macrocode}
@@ -575,9 +551,9 @@
% \changes{v1.1a}{2008/03/21}{Improved redefinition of \cs{refstepcounter} etc.}
% \changes{v1.4b}{2020/05/30}{Re-definition of \cs{captionnewline} added}
% We insert our stuff into the definition of |\LT at array| here.
-% Since the \package{hyperref} package patches |\LT at array| as well
+% Since the \pkg{hyperref} package patches |\LT at array| as well
% and since this only works with the original definition of |\LT at array|,
-% we have to do this after the \package{hyperref} package,
+% we have to do this after the \pkg{hyperref} package,
% i.e. |\AtBeginDocument|.
% \begin{macrocode}
\@ifundefined{caption at AtBeginDocument}\AtBeginDocument\caption at AtBeginDocument{%
@@ -584,7 +560,7 @@
\let\ltcaption at ORI@LT at array\LT at array
\renewcommand*\LT at array{%
% \end{macrocode}
-% We modify |\ref|\-|step|\-|counter| resp.~|\H at ref|\-|step|\-|counter| and
+% We modify |\ref|\-|step|\-|counter| or |\H at ref|\-|step|\-|counter| and
% |\hyper at make|\-|current|, so |\LT|\-|cap|\-|type| is used instead of |table|.
% \begin{macrocode}
\let\caption at LT@refstepcounter\refstepcounter
@@ -650,7 +626,7 @@
%
% \begin{macro}{\LT at makecaption}
% \changes{v1.1}{2007/04/20}{\cs{LT@@makecaption} added}
-% \changes{v1.1}{2007/06/27}{Adapted to the \package{floatrow} package by Olga Lapko}
+% \changes{v1.1}{2007/06/27}{Adapted to the \pkg{floatrow} package by Olga Lapko}
% \changes{v1.2}{2007/03/28}{Uses \cs{LTcapskip} instead of \cs{baselineskip} now}
% \changes{v1.3}{2011/09/12}{Usage of \cs{CaptionLabelSeparator} added}
% |\LT at makecaption|\marg{cmd}\marg{label}\marg{text}\par
@@ -670,7 +646,7 @@
% \endgraf\vskip\baselineskip}%
% \hss}}}
% \end{verbatim}%^^A
-% Our code:\footnote{Adapted to the \package{floatrow} package by Olga Lapko}
+% Our code:\footnote{Adapted to the \pkg{floatrow} package by Olga Lapko}
% \begin{macrocode}
\renewcommand\LT at makecaption[3]{%
\LT@@makecaption{%
@@ -702,8 +678,8 @@
\hskip\LTright
\fi}}}
% \end{macrocode}
-% This one will be usually defined by the \package{fr-longtable} package,
-% which is part of the \package{floatrow} package\cite{floatrow}:
+% This one will be usually defined by the \pkg{fr-longtable} package,
+% which is part of the \pkg{floatrow} package\cite{floatrow}:
% \begin{macrocode}
\AtBeginDocument{\providecommand*\FBifLTcapwidth[1]{}}
% \end{macrocode}
@@ -715,7 +691,7 @@
\newcommand\caption at LT@make[1]{%
\noalign{\caption at LT@config}%
% \end{macrocode}
-% Note: If used with the \package{array} package |\caption at LTfmt| needs
+% Note: If used with the \pkg{array} package |\caption at LTfmt| needs
% to be expanded, therefore we need some |\expandafter| here.
% \begin{macrocode}
\expandafter\LT at mcol\expandafter\LT at cols\expandafter{\caption at LTfmt}{%
Modified: trunk/Master/texmf-dist/source/latex/caption/subcaption.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/caption/subcaption.dtx 2023-07-28 20:40:36 UTC (rev 67751)
+++ trunk/Master/texmf-dist/source/latex/caption/subcaption.dtx 2023-07-28 20:40:52 UTC (rev 67752)
@@ -31,68 +31,24 @@
%
% \fi
%
-% \CheckSum{513}
+% \CheckSum{511}
%
% \iffalse
%<*driver>
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesFile{subcaption.drv}[2023/02/19 v1.6 Adds a sub-caption feature to the caption package]
-\hbadness=9999 \newcount\hbadness \hfuzz=74pt % Make TeX shut up.
+\ProvidesFile{subcaption.drv}[2023/07/10 v1.6 Adds a sub-caption feature to the caption package]
%\errorcontextlines=3
%
-\documentclass{ltxdoc}
-\setlength\parindent{0pt}
-\setlength\parskip{\smallskipamount}
-\addtolength\marginparwidth{15pt}
+\documentclass{captiondoc}
+\hypersetup{pdfkeywords={LaTeX, package, subcaption}}
%
-\usepackage{ifpdf}
-\ifpdf
- \usepackage{mathptmx,courier}
- \usepackage[scaled=0.90]{helvet}
-\fi
-%
-\usepackage[bottom]{footmisc}
-\usepackage{array,diagbox,graphicx,overpic,pict2e,stackengine,tikz}
-%
-\PassOptionsToPackage{breaklinks=true}{hyperref}
-\usepackage{hypdoc}
-\ifpdf\usepackage{hypdestopt}\fi
-\hypersetup{pdfkeywords={LaTeX, package, subcaption},pdfstartpage={},pdfstartview={}}
-%
\usepackage{caption}[2022/01/07] % needs v3.6 or newer to typeset this document
\usepackage{subcaption}[2022/01/07] % needs v1.5 or newer to typeset this document
\DeclareCaptionSubType*[arabic]{table}
\captionsetup[subtable]{labelformat=simple,labelsep=colon}
%
-\newcommand*\purerm[1]{{\upshape\mdseries\rmfamily #1}}
-\newcommand*\puresf[1]{{\upshape\mdseries\sffamily #1}}
-\newcommand*\purett[1]{{\upshape\mdseries\ttfamily #1}}
-\let\cls\puresf \let\pkg\puresf
-\let\env\purett \let\opt\purett
+\usepackage{array,diagbox,graphicx,overpic,pict2e,stackengine,tikz}
%
-\newcommand*\csmarg[1]{\texttt{\char`\{#1\char`\}}}
-\newcommand*\csoarg[1]{\texttt{\char`\[#1\char`\]}}
-\newcommand*\version[2][]{v$#2$}
-%
-\usepackage{marvosym}
-\makeatletter
-\newcommand*\INFO{\@ifstar{\@INFO{}}{\@INFO{\vbox to \ht\strutbox}}}
-\newcommand*\@INFO[1]{\MARGINSYM{#1{\LARGE\Info}}}
-\makeatother
-%
-\usepackage[alpine]{ifsym}
-\newenvironment{background}{\par\bigskip\csname background*\endcsname}{\csname endbackground*\endcsname}
-\newenvironment{background*}{\small\MARGINSYM{\Mountain}\ignorespaces}{\par}
-%
-\makeatletter
-\newcommand*\MARGINSYM[1]{\hskip 1sp \marginpar{\raggedleft\textcolor{blue}{{#1}}}}
-\newcommand*\NEW[1]{\@ifstar{\@NEW{#1}{\vskip2pt}}{\@NEW{#1}{}}}
-\newcommand*\@NEW[3]{\MARGINSYM{#2\footnotesize#1\\#3}}
-\makeatother
-%
-\newcommand*\PageBreak{\pagebreak[3]}
-\newcommand*\changenote[1]{}
-%
\begin{document}
\DocInput{subcaption.dtx}
\end{document}
@@ -99,21 +55,9 @@
%</driver>
% \fi
%
-% \let\subsectionautorefname\sectionautorefname
-% \let\subsubsectionautorefname\sectionautorefname
-%
% \def\thispackage{the \pkg{subcaption} package}
% \def\Thispackage{The \pkg{subcaption} package}
%
-% \newcommand\NEWfeature{\NEW{New feature}}
-% \newcommand\NEWdescription{\NEW{New description}}
-%
-% \makeatletter
-% \def\Ref{\@ifstar{\@Ref\ref}{\@Ref\autoref}}
-% \def\@Ref#1#2{#1{#2}: \textit{\nameref{#2}}}
-% \makeatother
-% \def\See#1{\nopagebreak{\small (See #1)}}
-%
% \GetFileInfo{subcaption.drv}
% \let\docdate\filedate
% \let\docversion\fileversion
@@ -283,7 +227,7 @@
%
% \DescribeMacro\subcaptionbox
% The |\sub|\-|caption|\-|box| command typesets given content and caption.
-% It automatically aligns the sub-figures resp.~sub-tables by their very first caption line.
+% It automatically aligns the sub-figures or sub-tables by their very first caption line.
%
% \pagebreak[3]
% Its syntax is:
@@ -449,8 +393,8 @@
% \NEWfeature{v1.2}
% Beside the \meta{outer-pos} values of `c', `t', and `b', \thispackage\ also offers the
% values `T' and `B' additionally which align the contents at the
-% very top resp.~bottom. (In contrast `t' and `b' align the contents at the
-% top resp.~bottom \textit{baseline}.)
+% very top or bottom. (In contrast `t' and `b' align the contents at the
+% top or bottom \textit{baseline}.)
%
% \bigskip
%
@@ -521,13 +465,13 @@
% Hyperlinks targeted to this sub-figure will jump to the beginning
% of the |sub|\-|caption|\-|block|, and not to the |\caption| inside it
% (if |hypcap=true| is set for sub-captions).
-% \See{\Ref{hypcap}}
+% \See{\longref{hypcap}}
% \end{itemize}
%
% \DescribeEnv{subfigure}
% \DescribeEnv{subtable}
-% The |sub|\-|caption|\-|block| environment is also offered as |sub|\-|figure| resp.~|sub|\-|table|.
-% (And prior version $1.5$ of \thispackage\ it was only available as |sub|\-|figure| resp.~|sub|\-|table|.)
+% The |sub|\-|caption|\-|block| environment is also offered as |sub|\-|figure| or |sub|\-|table|.
+% (And prior version $1.5$ of \thispackage\ it was only available as |sub|\-|figure| or |sub|\-|table|.)
%
% There is no difference in them except the environment name should match the current floating environment,
% i.e. inside a |figure| a |sub|\-|figure| should be used, and inside a |table| a |sub|\-|table| should be used.
@@ -782,12 +726,29 @@
%
% \bigskip
%
+% \pagebreak[3]
% \INFO
% {\small Please note that you need to surround redefinitions of |\p@|\-\meta{counter}
-% with |\makeatletter| and |\makeatother|. See
+% with |\make|\-|at|\-|letter| and |\make|\-|at|\-|other|. See
% \url{http://tex.stackexchange.com/questions/8351/}
-% for details.}
+% for details.
%
+% Since October 2019 |\p@|\-\meta{counter} could be redefined using |\label|\-|format| instead,
+% dropping the need to use |\make|\-|at|\-|letter| and |\make|\-|at|\-|other|.
+% Furthermore not only prefixes could be specified this way,
+% instead the counter representation could be used at any position in the text.
+% So for example
+% \begin{quote}
+% |\makeatletter|\\
+% |\renewcommand\p at subfigure{\thefigure}|\\
+% |\makeatother|\\
+% \end{quote}
+% (which prefixes the subfigure counter representation with the figure counter representation)
+% could be replaced by
+% \begin{quote}
+% |\labelformat{subfigure}{\thefigure #1}|
+% \end{quote}}
+%
% \pagebreak[3]
% \subsection{The \cs{subref} command}
% \label{subref}
@@ -860,7 +821,7 @@
% instead of |\caption|.
%
% |\phantom|\-|caption| is offered by the \pkg{caption} package since version $3.2$ and
-% does not generate any output but increases the sub-figure resp.~sub-table counter
+% does not generate any output but increases the sub-figure or sub-table counter
% and gives you an anchor for a |\label| command which can be placed after it.
%
% \pagebreak[3]
@@ -910,10 +871,10 @@
%
% |\caption|\-|list|\-|entry| is offered by the \pkg{caption} package since version $3.3$ and
% (just like |\phantom|\-|caption|) does not generate any output but increases
-% the sub-figure resp.~sub-table counter
+% the sub-figure or sub-table counter
% and gives you an anchor for a |\label| command which can be placed after it.
% Additionally to |\phantom|\-|caption| this command puts an entry into the list
-% of figures resp.~tables.
+% of figures or tables.
%
% \pagebreak[3]
% An example:
@@ -941,14 +902,14 @@
%
% The |\caption| command is a multi-purpose command:
% \begin{enumerate}
-% \item It increments the sub-figure resp.~sub-table counter and generates an internal reference which could be used with |\label|
-% \item It puts an entry into the list of figures resp.~tables
+% \item It increments the sub-figure or sub-table counter and generates an internal reference which could be used with |\label|
+% \item It puts an entry into the list of figures or tables
% \item It finally typesets a caption
% \end{enumerate}
%
% When put into a command or into an environment which either evaluates its content more than once or
% does not like one of the first two actions (for whatever reason), the result could be either an error message or an incorrect
-% result, for example a sub-figure resp.~sub-table counter which was incremented more than once.
+% result, for example a sub-figure or sub-table counter which was incremented more than once.
%
% \DescribeMacro\captiontext
% In these cases the |\caption| command could be split into
@@ -964,11 +925,11 @@
% |\captiontext*|\oarg{number}\marg{text of sub-caption}
% \end{quote}
% |\caption|\-|text| is offered by the \pkg{caption} package since version $3.6$ and
-% as opposite to |\caption| it does not increase the sub-figure resp.~sub-table counter
+% as opposite to |\caption| it does not increase the sub-figure or sub-table counter
% and does not give you an anchor for a |\label| command.
% It typesets the caption only, using existing counter values unless a \meta{number} is given explicitly.
%
-% For example code please take a look at \Ref{inside}.
+% For example code please take a look at \longref{inside}.
%
% \pagebreak[3]
% \subsection{Where to place the \cs{label} command?}
@@ -1068,14 +1029,14 @@
% Nearly all code examples so far have placed the caption either above or below the sub-figure.
% But it is possible to put the caption inside the sub-figure, too:
% \begin{itemize}
-% \item The caption could already be part of the image. (This case is already handled in \Ref{without}.)
+% \item The caption could already be part of the image. (This case is already handled in \longref{without}.)
% \item \LaTeX\ packages like \pkg{overpic}, \pkg{stackengine}, or \pkg{tikz} could be used.
-% Note that the commands resp.~environments offered by these packages usually evaluate their content more than once,
+% Note that the commands or environments offered by these packages usually evaluate their content more than once,
% resulting in either errors or wrong reference counters.
% For this reason |\caption| should not be used here, instead
-% |\phantomcaption| or |\captionlistentry| should be used outside the command resp.~environment and
+% |\phantomcaption| or |\captionlistentry| should be used outside the command or environment and
% |\captiontext| should be used inside it.
-% See also \Ref{without2}
+% See also \longref{without2}
% \item The options |skip=| and |margin=| could be used to place the caption onto the image.
% \end{itemize}
%
@@ -1083,7 +1044,7 @@
% \subsection{Using the overpic package}
% \label{overpic}
%
-% The same example as in section \Ref{without}, but using the \env{overpic} environment
+% The same example as in section \longref{without}, but using the \env{overpic} environment
% offered by the \pkg{overpic} package~\cite{overpic}
% to place the captions inside the pictures:
% \begin{quote}
@@ -1128,13 +1089,13 @@
% \bigskip
%
% If neither a reference to the sub-figures nor an entry in the List of Figures is needed,
-% the usage of |\phantom|\-|caption| resp.~|\caption|\-|list|\-|entry| could be dropped.
+% the usage of |\phantom|\-|caption| or |\caption|\-|list|\-|entry| could be dropped.
% Since this leaves |\caption|\-|text| without a valid sub-figure number value it must be
% given to it explicitly as optional argument.
%
% Furthermore the usage of the |sub|\-|caption|\-|group| environment could be dropped here,
% instead it would be sufficient to replace |\caption|\-|text| with |\sub|\-|caption|\-|text|.
-% \See{\Ref{subcaption}}
+% \See{\longref{subcaption}}
%
% \begin{quote}
% |\usepackage{overpic}|\\
@@ -1155,7 +1116,7 @@
% \subsection{Using the stackengine package}
% \label{stackengine}
%
-% The same example as in section \Ref{without}, but using the |\stack|\-|inset| command
+% The same example as in section \longref{without}, but using the |\stack|\-|inset| command
% offered by the \pkg{stackengine} package~\cite{stackengine}
% to place the captions inside the pictures:
% \begin{quote}
@@ -1213,7 +1174,7 @@
% \subsection{Using the tikz package}
% \label{tikz}
%
-% The same example as in section \Ref{without}, but using the \env{tikzpicture} environment
+% The same example as in section \longref{without}, but using the \env{tikzpicture} environment
% offered by the \pkg{tikz} package~\cite{tikz}
% to place the captions inside the pictures:
% \begin{quote}
@@ -1293,7 +1254,7 @@
% at a specific horizontal position within the image, too.
%
% \pagebreak[3]
-% The same example as in section \Ref{without}, but using the |skip=|\ldots and |margin=|\ldots options:
+% The same example as in section \longref{without}, but using the |skip=|\ldots and |margin=|\ldots options:
% \begin{quote}
% |\begin{figure}|\\
% | \centering|\\
@@ -1452,12 +1413,12 @@
% \ldots
% \end{quote}
%
-% See also: \Ref{sec:caption}
+% See also: \longref{sec:caption}
%
% \subsection{Pittfall \#2: Expecting \cs{caption} to increment the counter}
%
% \pagebreak[3]
-% Usually |\caption| increments the figure resp.~table counter and therefore
+% Usually |\caption| increments the figure or table counter and therefore
% it is usally safe to assume that the counter was not incremented yet in code
% used before |\caption|:
% \begin{quote}
@@ -1499,7 +1460,7 @@
% figure counter while the second one and especially the |\caption| does not.
%
% Usually this is no problem at all but keep this in mind if you are doing
-% tricky stuff with the figure resp.~table counter within figures resp.~tables.
+% tricky stuff with the figure or table counter within figures or tables.
%
% \iffalse
% --------------------------------------------------------------------------- %
@@ -1514,7 +1475,7 @@
% \DescribeMacro\subcaptionlistentry
% \DescribeMacro\subcaptiontext
% \hskip1pt %^^A work-around for bug in \DescribeMacro to prevent red colored margin note
-% As we have seen in sections {\Ref{overpic}, \Ref{stackengine}, and \Ref{tikz}}
+% As we have seen in sections {\longref{overpic}, \longref{stackengine}, and \longref{tikz}}
% it's sometimes inconvenient to use the commands and environments
% described so far.
%
@@ -1631,10 +1592,11 @@
% Note that there are limitations if an older version of the \pkg{caption} package
% is used:
% \begin{itemize}
-% \item The |\phantomsubcaption| command need at least \pkg{caption} \version{3.2}.
-% \item The |\subcaptionlistentry| command need at least \pkg{caption} \version{3.3}.
-% \item The |\subcaptiontext| command need at least \pkg{caption} \version{3.6}.
+% \item The |\phantomsubcaption| command needs at least \pkg{caption} \version{3.2}.
+% \item The |\subcaptionlistentry| command needs at least \pkg{caption} \version{3.3}.
% \item The |\subfloat| emulation needs at least \pkg{caption} \version{3.4}.
+% \item The |\subcaptiontext| command needs at least \pkg{caption} \version{3.6}.
+% \item The |\subcaptionsetup| command needs at least \pkg{caption} \version{3.6l}.
% \end{itemize}
%
% \iffalse
@@ -1873,7 +1835,7 @@
%
% Identify the current version of the package.
% \begin{macrocode}
-\ProvidesPackage{subcaption}[2023/02/19 v1.6 Sub-captions (AR)]
+\ProvidesPackage{subcaption}[2023/07/28 v1.6b Sub-captions (AR)]
% \end{macrocode}
%
% Since we base on the \pkg{caption} package we load it here.
@@ -1930,17 +1892,6 @@
%
% \subsection{Main code}
%
-% \begin{macro}{\subcaptionsetup}
-% \changes{v1.6}{2023/02/19}{This macro definition added}
-% |\subcaptionsetup*|\oarg{environment}\marg{options}
-% is an abbreviation for |\caption|\-|setup*[sub|\meta{environment}|]|\marg{options},
-% especially |\sub|\-|caption|\-|setup|\marg{options} sets options valid for all sub-captions.
-% \begin{macrocode}
-\newcommand*\subcaptionsetup[1][]{%
- \@ifstar{\captionsetup*[{sub#1}]}{\captionsetup[{sub#1}]}}
-% \end{macrocode}
-% \end{macro}
-%
% \begin{macro}{\setcaptionsubtype}
% \changes{v1.4}{2020/12/24}{This macro definition added}
% \changes{v1.5}{2022/01/07}{Check added if used inside a floating environment}
@@ -2284,6 +2235,7 @@
% \changes{v1.3h}{2020/09/28}{Usage of \cs{caption at Error} replaced by \cs{subcaption at Error}}
% \changes{v1.3j}{2020/10/07}{Definition of the label formats \texttt{subsimple} and \texttt{subparens} added}
% \changes{v1.4}{2020/12/24}{Adapted to older versions of the caption package (fallback)}
+% \changes{v1.6b}{2023/07/28}{Adapted to the \pkg{subfig} package}
% |\subcaption at setrefformat|\marg{name}\par
% Selecting a subref format simply means saving the code (in |\subcaption at reffmt|).
% \begin{macrocode}
@@ -2290,9 +2242,10 @@
\newcommand*\subcaption at setrefformat[1]{%
\@ifundefined{caption at labelformat@#1}% caption3 v2.x
{\@ifundefined{caption at lfmt@#1}% caption3 v1.x
- {\subcaption at Error{Undefined label format `#1'}}%
+ {\@ifundefined{caption at subreffmt@#1}{\subcaption at Error{Undefined label format `#1'}}{}}%
{\expandafter\let\expandafter\subcaption at reffmt\csname caption at lfmt@#1\endcsname}}%
- {\expandafter\let\expandafter\subcaption at reffmt\csname caption at labelformat@#1\endcsname}}
+ {\expandafter\let\expandafter\subcaption at reffmt\csname caption at labelformat@#1\endcsname}%
+ \@ifundefined{caption at subreffmt@#1}{}{\caption at setsubrefformat{#1}}} % subfig v1.3
% \end{macrocode}
% \begin{macrocode}
\subcaption at setrefformat{simple}
@@ -2315,8 +2268,8 @@
% \begin{macrocode}
\let\caption at setkeys@ORI\caption at setkeys
\@ifundefined{caption at SetupOptions} % caption3 v1.3
- {\renewcommand\caption at setkeys[2]{\subcaptionsetup{#2}}}
- {\caption at SetupOptions{subcaption}{\subcaptionsetup{#2}}}
+ {\renewcommand\caption at setkeys[2]{\captionsetup[sub]{#2}}}
+ {\caption at SetupOptions{subcaption}{\captionsetup[sub]{#2}}}
% \end{macrocode}
% \begin{macrocode}
\@ifundefined{caption at smaller} % caption3 v1.7-169
Modified: trunk/Master/texmf-dist/tex/latex/caption/caption.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/caption/caption.sty 2023-07-28 20:40:36 UTC (rev 67751)
+++ trunk/Master/texmf-dist/tex/latex/caption/caption.sty 2023-07-28 20:40:52 UTC (rev 67752)
@@ -46,12 +46,13 @@
\DeclareRelease{v3.4}{2019-11-24}{caption_2020-07-29.sty}
\DeclareRelease{v3.5}{2020-08-30}{caption_2020-10-26.sty}
\DeclareCurrentRelease{v3.6}{2022-02-20}
-\ProvidesPackage{caption}[2023/03/12 v3.6j Customizing captions (AR)]
-\RequirePackage{caption3}[2022/04/06] % needs v2.4 or newer
-\caption at ifbool{documentclass}{}{%
- \caption at WarningNoLine{%
- Unknown document class (or package),\MessageBreak
- standard defaults will be used}}
+\ProvidesPackage{caption}[2023/07/28 v3.6m Customizing captions (AR)]
+\RequirePackage{caption3}[2023/07/28] % needs v2.4c or newer
+\caption at ifdocumentclass{unknown}%
+ {\caption at WarningNoLine{%
+ Unknown document class (or package),\MessageBreak
+ standard defaults will be used}}%
+ {}
\@ifpackageloaded{caption2}{%
\caption at Error{%
You can't use both, the (obsolete) caption2 *and*\MessageBreak
@@ -629,6 +630,12 @@
\caption at ifdefined\NR at gettitle
{\NR at gettitle{#1}}%
{\def\@currentlabelname{#1}}}
+\newcommand*\subcaptionsetup{%
+ \caption at teststar\@subcaptionsetup*{}}
+\newcommand*\@subcaptionsetup[1]{%
+ \@testopt{\captionsetup at sub{#1}}{}}
+\def\captionsetup at sub#1[#2]#3{%
+ \captionsetup#1[sub#2]{#3}}
\newcommand*\caption at subtypehook{%
\ifx\caption\caption at subcaption \else
\caption at warmup
@@ -675,9 +682,7 @@
\newcommand*\caption at addsubcontentsline[4]{%
\caption at Debug{\string\caption at addsubcontentsline{#1}{#2}}%
\begingroup
- \let\label\caption at gobble
- \let\index\caption at gobble
- \let\glossary\caption at gobble
+ \caption at prepareslc
\protected at edef\@tempa{\endgroup
\noexpand\g at addto@macro\noexpand\caption at subcontentslines{%
\noexpand\@namedef{the#2}{\csname the#2\endcsname}%
@@ -1291,12 +1296,11 @@
\caption@@make{#1}{#2}}%
\nobreak\hspace{12pt}}%
}{}
-\caption at ifdefined\scr at caption{%
- \long\def\caption at IfKomaPackageLoaded#1[#2]#3#4{%
- \caption at InfoNoLine{KOMA-Script #1 package detected}
- #3}}{%
- \let\caption at IfKomaPackageLoaded\caption at IfPackageLoaded
- }
+\caption at ifdocumentclass{koma}%
+ {\long\def\caption at IfKomaPackageLoaded#1[#2]#3#4{%
+ \caption at InfoNoLine{KOMA-Script #1 package detected}%
+ #3}}%
+ {\let\caption at IfKomaPackageLoaded\caption at IfPackageLoaded}
\caption at IfKomaPackageLoaded{scrextend}[2002/07/01 v3.0]{%
\let\caption at addmargin@env\@addmargin
\renewcommand*\@addmargin{%
Modified: trunk/Master/texmf-dist/tex/latex/caption/caption3.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/caption/caption3.sty 2023-07-28 20:40:36 UTC (rev 67751)
+++ trunk/Master/texmf-dist/tex/latex/caption/caption3.sty 2023-07-28 20:40:52 UTC (rev 67752)
@@ -45,7 +45,7 @@
\DeclareRelease{v1.13}{2019-11-24}{caption3_2020-07-29.sty} % for caption v3.4
\DeclareRelease{v2.0} {2020-08-30}{caption3_2020-10-26.sty} % for caption v3.5
\DeclareCurrentRelease{v2.3}{2022-02-20} % for caption v3.6
-\ProvidesPackage{caption3}[2023/03/12 v2.4 caption3 kernel (AR)]
+\ProvidesPackage{caption3}[2023/07/28 v2.4c caption3 kernel (AR)]
\@ifundefined{kernel at ifnextchar}{\let\kernel at ifnextchar\@ifnextchar}{}
\providecommand*\@nameundef[1]{%
\expandafter\let\csname #1\endcsname\@undefined}
@@ -591,7 +591,7 @@
\newcommand*\caption at pageref[1]{%
\expandafter\ifx\csname caption at r@#1\endcsname\relax
\G at refundefinedtrue % => 'There are undefined references.'
- \@latex at warning{Reference `caption@#1' on page \thepage \space undefined}%
+ \@latex at warning{Reference `caption #1' on page \thepage \space undefined}%
\else
\expandafter\let\expandafter\caption at thepage\csname caption at r@#1\endcsname
\fi}
@@ -1122,7 +1122,6 @@
\hbox to\hsize{\hfil\box\@tempboxa\hfil}%
\fi}
\@onlypreamble\@makecaption at latvian
-\caption at setbool{documentclass}{1}
\caption at ifundefined\caption at documentclass{%
\@ifclassloaded{beamer}{%
\caption at InfoNoLine{beamer document class detected}%
@@ -1150,6 +1149,7 @@
\caption at InfoNoLine{thesis document class detected}%
\def\caption at documentclass{thesis}%
}{%
+ \def\caption at documentclass{standard}%
\ifx\@makecaption\@undefined
\caption at InfoNoLine{Document class w/o caption stuff detected}%
\else
@@ -1166,14 +1166,22 @@
Unknown document class (or package),\MessageBreak
standard defaults will be used}%
\caption at InfoNoLine{\string\@makecaption\space=\space\meaning\@makecaption\@gobble}%
- \caption at setbool{documentclass}{0}% unknown document class
+ \def\caption at documentclass{unknown}%
\fi
\fi
\fi
\fi
- \let\caption at documentclass\@empty % don't load adaption code later on
}}}}}}}%
}{}
+\newcommand*\caption at ifdocumentclass[1]{%
+ \begingroup
+ \edef\caption at tempa{\caption at documentclass}%
+ \edef\caption at tempb{#1}%
+ \ifx\caption at tempa\caption at tempb
+ \endgroup\expandafter\@firstoftwo
+ \else
+ \endgroup\expandafter\@secondoftwo
+ \fi}
\newcommand*\AtCaptionPackage{%
\g at addto@macro\caption at documentclass@code}
\@onlypreamble\AtCaptionPackage
@@ -1586,7 +1594,11 @@
\g at addto@macro\caption at prepareslc}
\providecommand*\caption at prepareslc{}
\AtCaptionSingleLineCheck{%
+ \let\caption at protect\protect
+ \caption at ifdefined\GTS at DisablePredefinedCmds\GTS at DisablePredefinedCmds\relax
\let\label\caption at gobble
+ \let\index\caption at gobble
+ \let\glossary\caption at gobble
\let\hypertarget\@gobbletwo
\let\footnote\caption at footnote
\let\footnotemark\caption at footnotemark
@@ -1605,6 +1617,8 @@
\let\acused\@gobble
\let\AC at placelabel\@gobble
\let\glsunset\@gobble
+ \caption at ifdefined\GTS at DisableHook\GTS at DisableHook\relax
+ \let\protect\caption at protect
}
\newcommand*\caption at footnote{%
\kernel at ifnextchar[%]
@@ -1859,16 +1873,16 @@
\renewcommand*\@memresetsubcounter[1]{%
\caption at ifdefined@subtype{sub#1}\@gobble\caption at memresetsubcounter{#1}}}%
{}
-\ifx\caption at documentclass\@empty\else
- \@pushfilename
- \edef\@currname{caption-\caption at documentclass}
- \edef\@currext{sto}
- \InputIfFileExists
- {\@currname.\@currext}%
- {}%
- {\@missingfileerror\@currname\@currext}%
- \@popfilename
-\fi
+\caption at ifdocumentclass{unknown}{}{%
+ \caption at ifdocumentclass{standard}{}{%
+ \@pushfilename
+ \edef\@currname{caption-\caption at documentclass}
+ \edef\@currext{sto}
+ \InputIfFileExists
+ {\@currname.\@currext}%
+ {}%
+ {\@missingfileerror\@currname\@currext}%
+ \@popfilename}}
\captionsetup{style=default,position=default,listformat=default}
\ProcessOptions*
\endinput
Modified: trunk/Master/texmf-dist/tex/latex/caption/subcaption.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/caption/subcaption.sty 2023-07-28 20:40:36 UTC (rev 67751)
+++ trunk/Master/texmf-dist/tex/latex/caption/subcaption.sty 2023-07-28 20:40:52 UTC (rev 67752)
@@ -39,7 +39,7 @@
\providecommand\DeclareRelease[3]{}
\providecommand\DeclareCurrentRelease[2]{}
\DeclareCurrentRelease{v1}{2007/12/06}
-\ProvidesPackage{subcaption}[2023/02/19 v1.6 Sub-captions (AR)]
+\ProvidesPackage{subcaption}[2023/07/28 v1.6b Sub-captions (AR)]
\RequirePackage{caption}[2010/01/09] % we need at least v3.1m
\newcommand*\subcaption at Info{%
\PackageInfo{subcaption}}
@@ -53,8 +53,6 @@
section about errors.\MessageBreak\@ehc}
\newcommand*\subcaption at OutsideFloat[1]{%
\subcaption at Error{\string#1 outside float}}
-\newcommand*\subcaptionsetup[1][]{%
- \@ifstar{\captionsetup*[{sub#1}]}{\captionsetup[{sub#1}]}}
\providecommand\setcaptionsubtype{%
\caption at iftype
{\@ifstar{\captionsetup{subtype*}}{\captionsetup{subtype}}}%
@@ -206,16 +204,17 @@
\newcommand*\subcaption at setrefformat[1]{%
\@ifundefined{caption at labelformat@#1}% caption3 v2.x
{\@ifundefined{caption at lfmt@#1}% caption3 v1.x
- {\subcaption at Error{Undefined label format `#1'}}%
+ {\@ifundefined{caption at subreffmt@#1}{\subcaption at Error{Undefined label format `#1'}}{}}%
{\expandafter\let\expandafter\subcaption at reffmt\csname caption at lfmt@#1\endcsname}}%
- {\expandafter\let\expandafter\subcaption at reffmt\csname caption at labelformat@#1\endcsname}}
+ {\expandafter\let\expandafter\subcaption at reffmt\csname caption at labelformat@#1\endcsname}%
+ \@ifundefined{caption at subreffmt@#1}{}{\caption at setsubrefformat{#1}}} % subfig v1.3
\subcaption at setrefformat{simple}
\DeclareCaptionLabelFormat{subsimple}{#2}
\DeclareCaptionLabelFormat{subparens}{(#2)}
\let\caption at setkeys@ORI\caption at setkeys
\@ifundefined{caption at SetupOptions} % caption3 v1.3
- {\renewcommand\caption at setkeys[2]{\subcaptionsetup{#2}}}
- {\caption at SetupOptions{subcaption}{\subcaptionsetup{#2}}}
+ {\renewcommand\caption at setkeys[2]{\captionsetup[sub]{#2}}}
+ {\caption at SetupOptions{subcaption}{\captionsetup[sub]{#2}}}
\@ifundefined{caption at smaller} % caption3 v1.7-169
{\caption at ExecuteOptions{subcaption}{%
font+=small,labelformat=parens,labelsep=space,skip=6pt,list=0,hypcap=0}}
More information about the tex-live-commits
mailing list.