summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/caption/caption-memoir.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/source/latex/caption/caption-memoir.dtx')
-rw-r--r--Master/texmf-dist/source/latex/caption/caption-memoir.dtx72
1 files changed, 22 insertions, 50 deletions
diff --git a/Master/texmf-dist/source/latex/caption/caption-memoir.dtx b/Master/texmf-dist/source/latex/caption/caption-memoir.dtx
index e25c44b210c..9b76fbb64e5 100644
--- a/Master/texmf-dist/source/latex/caption/caption-memoir.dtx
+++ b/Master/texmf-dist/source/latex/caption/caption-memoir.dtx
@@ -2,7 +2,7 @@
%
% This is file `caption-memoir.dtx'.
%
-% Copyright (C) 2011-2022 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
+% Copyright (C) 2011-2023 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
%
% --------------------------------------------------------------------------
%
@@ -36,29 +36,11 @@
% \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}
-%
-\makeatletter % make room for subsections like 2.16.14 in the TOC
-%\newcommand*\l@subsection{\@dottedtocline{2}{1.5em}{2.3em}}
-\renewcommand*\l@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={}}
+\documentclass{captiondoc}
+\hypersetup{pdfkeywords={LaTeX, package, caption-memoir}}
%
\begin{document}
\DocInput{caption-memoir.dtx}
@@ -66,23 +48,13 @@
%</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
% \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@prepareanchor} expands \cs{M@gettitle}
% \item \cs{caption@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@memoir@delim\captiondelim
\renewcommand\captiondelim{%
@@ -232,9 +204,9 @@
%
% \changes{v2.0a}{2020/10/10}{Re-definition of label separator `gobble' added}
% If |\fnum@figure| (or |\fnum@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@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@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}{}{%