diff options
| -rw-r--r-- | Master/texmf-dist/doc/latex/caption/caption-deu.pdf | bin | 320101 -> 319765 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/latex/caption/caption-deu.tex | 40 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/caption/caption-eng.pdf | bin | 330119 -> 329731 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/latex/caption/caption-eng.tex | 58 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/caption/caption.pdf | bin | 354519 -> 354669 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/latex/caption/caption2.pdf | bin | 139207 -> 139207 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/latex/caption/ltcaption.pdf | bin | 121528 -> 121528 bytes | |||
| -rw-r--r-- | Master/texmf-dist/source/latex/caption/caption.dtx | 78 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/caption/caption.sty | 27 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/caption/caption3.sty | 23 |
10 files changed, 124 insertions, 102 deletions
diff --git a/Master/texmf-dist/doc/latex/caption/caption-deu.pdf b/Master/texmf-dist/doc/latex/caption/caption-deu.pdf Binary files differindex b5398813498..1404a393428 100644 --- a/Master/texmf-dist/doc/latex/caption/caption-deu.pdf +++ b/Master/texmf-dist/doc/latex/caption/caption-deu.pdf diff --git a/Master/texmf-dist/doc/latex/caption/caption-deu.tex b/Master/texmf-dist/doc/latex/caption/caption-deu.tex index 3b2b526eefd..c8a0d893541 100644 --- a/Master/texmf-dist/doc/latex/caption/caption-deu.tex +++ b/Master/texmf-dist/doc/latex/caption/caption-deu.tex @@ -23,7 +23,7 @@ % caption-eng.tex, and caption-rus.tex. % \NeedsTeXFormat{LaTeX2e}[1994/12/01] -\ProvidesFile{caption-deu.tex}[2007/10/01 v3.1c Das caption-Paket] +\ProvidesFile{caption-deu.tex}[2007/10/02 v3.1c Das caption-Paket] \hbadness=9999 \newcount\hbadness \hfuzz=20pt % Make TeX shut up. %\errorcontextlines=3 @@ -2118,6 +2118,7 @@ und Tabellenbeschriftungen bzgl.~ ihres Aussehens genau im Auge behalten. % \def\Description{\nopagebreak\par\nopagebreak\color{black}\leftskip=1.5em\nopagebreak}% % }% % {\color{black}\end{trivlist}} +\makeatletter \newenvironment{Warnings}{% \newif\ifMessage \def\Message{% @@ -2130,9 +2131,13 @@ und Tabellenbeschriftungen bzgl.~ ihres Aussehens genau im Auge behalten. \Messagetrue}% \def\Description{% \par\color{black}\leftskip=1.5em}% + \def\Or{\@testopt\@Or{oder}}% + \def\@Or[##1]{% + \\{\small\color{black}\hspace{1.5em}\textit{-- ##1 --}}\\}% }{% \ifMessage\end{minipage}\par\fi } +\makeatother \subsection{Befehle} @@ -2463,8 +2468,8 @@ Option & Kurzbeschreibung & Abschnitt \\ \begin{Warnings} \Message - |Argument of \@caption has an extra }.|\\ -{\color{black}\hspace{1.5em}-- oder --}\\ + |Argument of \@caption has an extra }.| +\Or |Paragraph ended before \@caption was complete.| \Description Beim Setzen von Beschriftungen, die etwas spezielles wie z.B.~eine @@ -2486,17 +2491,14 @@ Option & Kurzbeschreibung & Abschnitt \\ \par\See{\Ref{commands}} \Message - |\caption outside group or environment.| -\Description - |\caption| bzw. |\captionof| sind nur für die Anwendung innerhalb einer - Box, Gruppe oder Umgebung konzipiert. - \par\See{\Ref{commands}} - -\Message - |\captionsetup{type=|\meta{type}|} outside group or environment.| + |\caption outside box or environment.| +\Or + |\captionsetup{type=...} outside box or environment.| +\Or + |\captionsetup{type*=...} or \captionof outside box or environment.| \Description - |\captionof| bzw. |\captionsetup{|\xx|type=|\xx\meta{type}|}| sind nur - für die Anwendung innerhalb einer Box, Gruppe oder Umgebung konzipiert. + |\caption|, |\captionof| sowie |\captionsetup{|\xx|type=|\xx\meta{type}|}| + sind nur für die Anwendung innerhalb einer Box, Gruppe oder Umgebung konzipiert. \par\See{\Ref{commands}} \Message @@ -2580,8 +2582,8 @@ Option & Kurzbeschreibung & Abschnitt \\ Paket zur Verfügung stellt, kann nur eine Bildbeschriftung gesetzt werden. \Message - |Option clash for package caption.|\\ -{\color{black}\hspace{1.5em}-- oder vielleicht auch --}\\ + |Option clash for package caption.| +\Or[aber manchmal auch] |Missing \begin{document}.| \Description Ein anderes \LaTeX-Paket hat \thispackage\ bereits geladen, Sie können es @@ -2630,8 +2632,8 @@ Option & Kurzbeschreibung & Abschnitt \\ \Message |The option `labelsep=|\meta{name}|' does not work|\\ - |with `format=hang'.|\\ -{\color{black}\hspace{1.5em}-- oder --}\\ + |with `format=hang'.| +\Or |The option `labelsep=|\meta{name}|' does not work|\\ |with \setcaphanging (which is set by default).| \Description @@ -2724,8 +2726,8 @@ Option & Kurzbeschreibung & Abschnitt \\ \Message |You can't use the caption package option|\\ | `tableposition=|\meta{position}|'|\\ - |and use the |\meta{package}| package, too.|\\ -{\color{black}\hspace{1.5em}-- oder --}\\ + |and use the |\meta{package}| package, too.| +\Or |You can't use the global option|\\ | `tablecaptionabove'|\\ |and use the |\meta{package}| package, too.| diff --git a/Master/texmf-dist/doc/latex/caption/caption-eng.pdf b/Master/texmf-dist/doc/latex/caption/caption-eng.pdf Binary files differindex 6bb484396d2..30f567a3c19 100644 --- a/Master/texmf-dist/doc/latex/caption/caption-eng.pdf +++ b/Master/texmf-dist/doc/latex/caption/caption-eng.pdf diff --git a/Master/texmf-dist/doc/latex/caption/caption-eng.tex b/Master/texmf-dist/doc/latex/caption/caption-eng.tex index 6f27f879e0f..28ca85babf9 100644 --- a/Master/texmf-dist/doc/latex/caption/caption-eng.tex +++ b/Master/texmf-dist/doc/latex/caption/caption-eng.tex @@ -23,7 +23,7 @@ % caption-eng.tex, and caption-rus.tex. % \NeedsTeXFormat{LaTeX2e}[1994/12/01] -\ProvidesFile{caption-eng.tex}[2007/10/17 v3.1c The caption package] +\ProvidesFile{caption-eng.tex}[2007/10/23 v3.1d The caption package] \hbadness=9999 \newcount\hbadness \hfuzz=20pt % Make TeX shut up. %\errorcontextlines=3 @@ -1401,7 +1401,7 @@ If you don't get such warning everything is fine, but if you get it the usage of Furthermore the margin will be set to |\captionindent| for more-than-one-line captions (which will be set to |3pc| by the \AmS\ classes), the margin for single-line captions will be set to the half of it instead. -If you want to use a common margin for both, insert |\clearcaptionsetup[margin]{SingleLine}| +If you want to use a common margin for both, insert |\clearcaptionsetup[margin*]{singleline}| into the preamble of your document, after loading \thispackage. Additionally the options |figureposition=b,tableposition=t| will be set. @@ -1494,6 +1494,7 @@ Additionally the margin is limited up to the tenth of the |\linewidth|. If you don't like this limitation, you can switch it off with the option |maxmargin=off| or |maxmargin=false| (which both means the same). +\pagebreak[4] \subsection{The frenchb Babel option} \label{frenchb} @@ -1730,7 +1731,7 @@ But |\end{minipage}| \end{quote} will place the hyperlink anchor at the beginning of the |minipage|, -since |\captionsetup{type=figure}| does not only set the caption type +since |\caption|\x|setup|\xx|{type=|\xx|figure}| does not only set the caption type to ``figure'' but does place a hyperlink anchor, too. \item{\cs{caption}\csoarg{}\csmarg\ldots\ vs. @@ -1842,8 +1843,8 @@ These options will be executed additionally to the regular ones for \Note The |margin| resp.~|width| setting will not be used for these figures \& tables, -unless you set it explicit with |\captionsetup[figwindow]{|\ldots|}| or -|\captionsetup[figtable]{|\ldots|}|. +unless you set it explicit with |\caption|\x|setup|\xx|[figwindow]{|\ldots|}| or +|\caption|\x|setup|\xx|[figtable]{|\ldots|}|. \pagebreak[3] \subsection{picins} @@ -1909,7 +1910,7 @@ The command \cs{rotcaption} will be extended by \thispackage, so \NEWfeature{v3.1} Furthermore \cs{DefineFloatingEnvironment}\marg{name} will also define an environment called |sideways|\meta{name} which behaves like -|sidewaysfigure| and |sidewaystable|. +|sideways|\x|figure| and |sideways|\x|table|. \pagebreak[3] \subsection{sidecap} @@ -2008,8 +2009,8 @@ These options will be executed additionally to the regular ones for Since the caption will have the same width as the contents here, the |margin| resp.~|width| setting will not be used for these figures \& tables, at least unless you set it explicit with -|\captionsetup|\xx|[threeparttable]|\xx|{|\ldots|}| -or |\captionsetup|\xx|[measuredfigure]|\xx|{|\ldots|}|. +|\caption|\x|setup|\xx|[threeparttable]|\xx|{|\ldots|}| +or |\caption|\x|setup|\xx|[measuredfigure]|\xx|{|\ldots|}|. \medskip{\small(Instead of using the \package{sidecap} package you can also use the \package{floatrow} package\cite{floatrow} for this purpose.)} @@ -2041,8 +2042,8 @@ an environment called |wrap|\meta{name} which behaves like |wrapfigure| and \Note The |margin| resp.~|width| setting will not be used for these figures \& tables, -unless you set it explicit with |\captionsetup[wrapfigure]{|\ldots|}| or -|\captionsetup[wraptable]{|\ldots|}|. +unless you set it explicit with |\caption|\x|setup|\xx|[wrapfigure]|\xx|{|\ldots|}| +or |\caption|\x|setup|\xx|[wraptable]|\xx|{|\ldots|}|. \Note If the \package{wrapfig} package should be used in coorperation with the @@ -2283,6 +2284,7 @@ you should use it with care. % \def\Description{\nopagebreak\par\nopagebreak\color{black}\leftskip=1.5em\nopagebreak}% % }% % {\color{black}\end{trivlist}} +\makeatletter \newenvironment{Warnings}{% \newif\ifMessage \def\Message{% @@ -2295,9 +2297,13 @@ you should use it with care. \Messagetrue}% \def\Description{% \par\color{black}\leftskip=1.5em}% + \def\Or{\@testopt\@Or{or}}% + \def\@Or[##1]{% + \\{\small\color{black}\hspace{1.5em}\textit{-- ##1 --}}\\}% }{% \ifMessage\end{minipage}\par\fi } +\makeatother \subsection{Commands} @@ -2615,8 +2621,8 @@ Option & Short description & Section \\ \begin{Warnings} \Message - |Argument of \@caption has an extra }.|\\ -{\color{black}\hspace{1.5em}-or-}\\ + |Argument of \@caption has an extra }.| +\Or |Paragraph ended before \@caption was complete.| \Description If you want to typeset something special (like a tabular) as caption, @@ -2634,20 +2640,18 @@ Option & Short description & Section \\ \par\See{\Ref{commands}} \Message - |\caption outside group or environment.| + |\caption outside box or environment.| +\Or + |\captionsetup{type=...} outside box or environment.| +\Or + |\captionsetup{type*=...} or \captionof outside box or environment.| \Description - You have placed a |\caption| command outside an box, group, or environment. + You have placed a |\caption|, |\captionof|, or |\captionsetup{type=|\meta{type}|}| + command outside an box, group, or environment. This is not supported. \par\See{\Ref{commands}} \Message - |\captionsetup{type=|\meta{type}|} outside group or environment.| -\Description - You have placed a |\captionof| or |\captionsetup{|\xx|type=|\xx\meta{type}|}| - command outside an box, group, or environment. This is not supported. - \par\See{\Ref{commands}} - -\Message |\ContinuedFloat outside float.| \Description You have placed a |\ContinuedFloat| command outside a floating environment. @@ -2725,8 +2729,8 @@ Option & Short description & Section \\ package only one caption can be placed. (This is due implementation design.) \Message - |Option clash for package caption.|\\ -{\color{black}\hspace{1.5em}-- or maybe --}\\ + |Option clash for package caption.| +\Or[but sometimes also] |Missing \begin{document}.| \Description \Thispackage\ has already been loaded by some other \LaTeX\ package, @@ -2771,8 +2775,8 @@ Option & Short description & Section \\ \Message |The option `labelsep=|\meta{name}|' does not work|\\ - |with `format=hang'.|\\ -{\color{black}\hspace{1.5em}-or-}\\ + |with `format=hang'.| +\Or |The option `labelsep=|\meta{name}|' does not work|\\ |with \setcaphanging (which is set by default).| \Description @@ -2864,8 +2868,8 @@ Option & Short description & Section \\ \Message |You can't use the caption package option|\\ | `tableposition=|\meta{position}|'|\\ - |and use the |\meta{package}| package, too.|\\ -{\color{black}\hspace{1.5em}-or-}\\ + |and use the |\meta{package}| package, too.| +\Or |You can't use the global option|\\ | `tablecaptionabove'|\\ |and use the |\meta{package}| package, too.| diff --git a/Master/texmf-dist/doc/latex/caption/caption.pdf b/Master/texmf-dist/doc/latex/caption/caption.pdf Binary files differindex 2ff8927af65..f1655cfea71 100644 --- a/Master/texmf-dist/doc/latex/caption/caption.pdf +++ b/Master/texmf-dist/doc/latex/caption/caption.pdf diff --git a/Master/texmf-dist/doc/latex/caption/caption2.pdf b/Master/texmf-dist/doc/latex/caption/caption2.pdf Binary files differindex ab1a998f21b..5029bc7bd8e 100644 --- a/Master/texmf-dist/doc/latex/caption/caption2.pdf +++ b/Master/texmf-dist/doc/latex/caption/caption2.pdf diff --git a/Master/texmf-dist/doc/latex/caption/ltcaption.pdf b/Master/texmf-dist/doc/latex/caption/ltcaption.pdf Binary files differindex a7917e089a9..97e009c4aa8 100644 --- a/Master/texmf-dist/doc/latex/caption/ltcaption.pdf +++ b/Master/texmf-dist/doc/latex/caption/ltcaption.pdf diff --git a/Master/texmf-dist/source/latex/caption/caption.dtx b/Master/texmf-dist/source/latex/caption/caption.dtx index 173f3fea4e8..07520a637bb 100644 --- a/Master/texmf-dist/source/latex/caption/caption.dtx +++ b/Master/texmf-dist/source/latex/caption/caption.dtx @@ -24,12 +24,12 @@ % caption-eng.tex, and caption-rus.tex. % % \fi -% \CheckSum{5489} +% \CheckSum{5491} % % \iffalse %<*driver> \NeedsTeXFormat{LaTeX2e}[1994/12/01] -\ProvidesFile{caption.drv}[2007/10/17 v3.1c Implementation of the caption package] +\ProvidesFile{caption.drv}[2007/10/25 v3.1d Implementation of the caption package] \hbadness=9999 \newcount\hbadness \hfuzz=100pt % Make TeX shut up. %\errorcontextlines=3 % @@ -52,7 +52,7 @@ \usepackage{hypdoc} \hypersetup{pdfkeywords={LaTeX, package, caption},pdfstartview={}} % -\usepackage[debug]{caption}[2007/09/25] +\usepackage[debug]{caption}[2007/10/25] % \DeclareRobustCommand*\eTeX{\texorpdfstring {\leavevmode\hbox{$\varepsilon$}-\TeX}% @@ -224,7 +224,7 @@ % % \begin{macrocode} \NeedsTeXFormat{LaTeX2e}[1994/12/01] -\ProvidesPackage{caption3}[2007/10/17 v3.1c caption3 kernel (AR)] +\ProvidesPackage{caption3}[2007/10/25 v3.1d caption3 kernel (AR)] % \end{macrocode} % % \subsection{Generic helpers} @@ -549,9 +549,12 @@ % \changes{v3.1b}{2007/09/18}{This macro added} % |\caption@Error|\marg{message} % \begin{macrocode} -\newcommand*\caption@Warning[1]{\caption@WarningNoLine{#1\on@line}} -\newcommand*\caption@WarningNoLine[1]{\PackageWarning{caption}{#1.^^J\caption@wh\@gobbletwo}} -\newcommand*\caption@Error[1]{\PackageError{caption}{#1}\caption@eh} +\newcommand*\caption@Warning[1]{% + \caption@WarningNoLine{#1\on@line}} +\newcommand*\caption@WarningNoLine[1]{% + \PackageWarning{caption}{#1.^^J\caption@wh\@gobbletwo}} +\newcommand*\caption@Error[1]{% + \PackageError{caption}{#1}\caption@eh} \let\caption@KV@err\caption@Error % \end{macrocode} % \end{macro} @@ -954,7 +957,7 @@ % \changes{v3.1}{2007/08/11}{Starred variant added} % \changes{v3.1}{2007/08/12}{\cs{setlength}\cs{captionmargin} \& % \cs{setlength}\cs{captionmargin@} swapped so -% `\texttt{margin*=}\cs{captionmargin}' works in SingleLine options} +% `\texttt{margin*=}\cs{captionmargin}' works in singleline options} % |\setcaptionmargin|\marg{amount}\\ % |\setcaptionmargin*|\marg{amount}\par % Please never use this in user documents, it's just there to @@ -1191,6 +1194,7 @@ % \begin{macro}{\caption@setstyle} % \changes{v3.0f}{2005/06/01}{Starred variant added} % \changes{v3.1}{2007/07/29}{Recursive style definitions should work now} +% \changes{v3.1d}{2007/10/23}{`SingleLine' renamed to `singleline' for consistency} % |\caption@setstyle|\marg{name}\\ % |\caption@setstyle*|\marg{name}\par % Selecting a caption style means saving the additional @@ -1219,7 +1223,7 @@ \expandafter\caption@setup\expandafter{\caption@sty}% \fi \expandafter\let\expandafter\caption@sls\csname caption@sls@#2\endcsname - \expandafter\caption@l@addto@list\expandafter\caption@opt@SingleLine + \expandafter\caption@l@addto@list\expandafter\caption@opt@singleline \expandafter{\caption@sls}}} % \end{macrocode} % \end{macro} @@ -1227,6 +1231,7 @@ % \begin{macro}{\caption@resetstyle} % \changes{v3.1}{2007/02/04}{% % This macro renamed from \cs{caption@setdefault} to \cs{caption@resetstyle}} +% \changes{v3.1d}{2007/10/23}{`SingleLine' renamed to `singleline' for consistency} % This resets (nearly) all caption options to the base ones. % \emph{Note that this does not touch the skips and the positioning!} % \begin{macrocode} @@ -1237,7 +1242,7 @@ margin=0pt,minmargin=0,maxmargin=0,% indent=0pt,parindent=0pt,hangindent=0pt,% singlelinecheck=1,strut=1}% - \caption@clearsetup{SingleLine}} + \caption@clearsetup{singleline}} % \end{macrocode} % \end{macro} % @@ -1329,7 +1334,7 @@ \caption@@par#3\par}} % \end{macrocode} % -% \changes{v3.0a}{2004/01/23}{Caption format \opt{default} linked to \opt{normal}} +% \changes{v3.0a}{2004/01/23}{Caption format \opt{default} linked to \opt{plain}} % \changes{v3.0e}{2005/04/28}{Bugfix 05-04-28: Missing \cs{caption@ifh@default} added} % `default' usually maps to `plain'. % \begin{macrocode} @@ -2421,7 +2426,7 @@ % \changes{v3.0d}{2005/02/09}{Improvement: \cs{caption@ifh} added} % \changes{v3.0d}{2005/02/09}{Bugfix: \cs{leavevmode} added} % \changes{v3.0h}{2005/08/24}{Uses \cs{sbox} instead of \cs{setbox} in single-line-check} -% \changes{v3.0i}{2005/12/04}{Uses \cs{caption@slc}} +% \changes{v3.0i}{2005/12/04}{Uses \cs{caption@slc} now} % \changes{v3.0i}{2006/01/11}{Bugfix: \cs{caption@calcmargin} inside % single-line-check replaced by \cs{relax}} % \changes{v3.0i}{2006/01/11}{Bugfix: \cs{caption@startbox} will always be @@ -2555,13 +2560,14 @@ % \changes{v3.1}{2007/07/29}{\cs{caption@setup}\cs{caption@sls} added after \cs{begingroup}} % \changes{v3.1}{2007/07/29}{\cs{caption@calcmargin} added} % \changes{v3.1c}{2007/10/14}{Support of \cs{caption@slfmt} added} +% \changes{v3.1d}{2007/10/23}{`SingleLine' renamed to `singleline' for consistency} % |\caption@slc|\marg{label}\marg{text}\marg{width}\marg{extra code}\par % This one does the single-line-check. % \begin{macrocode} \newcommand\caption@slc[4]{% \caption@Debug{Begin SLC}% \begingroup - \caption@SingleLine + \caption@singleline \let\caption@hj\@empty \caption@calcmargin % calculate #3 if necessary \caption@prepareslc @@ -2570,14 +2576,14 @@ \endgroup \else \endgroup - \caption@SingleLine + \caption@singleline #4% \fi \caption@Debug{End SLC}} % \end{macrocode} % \begin{macrocode} -\newcommand*\caption@SingleLine{% - \expandafter\caption@setup\expandafter{\caption@opt@SingleLine}% +\newcommand*\caption@singleline{% + \expandafter\caption@setup\expandafter{\caption@opt@singleline}% \let\caption@fmt\caption@slfmt} % \end{macrocode} % \end{macro} @@ -2893,7 +2899,8 @@ % % \begin{macrocode} \NeedsTeXFormat{LaTeX2e}[1994/12/01] -\ProvidesPackage{caption}[2007/10/17 v3.1c Customising captions (AR)] +\ProvidesPackage{caption}[2007/10/25 v3.1d Customising captions (AR)] +%\@ifundefined{PackageRedefines}{}{\PackageRedefines{caption}{caption}} % \end{macrocode} % % \begin{macro}{\caption@Info} @@ -2909,7 +2916,7 @@ % \subsection{Loading the kernel} % % \begin{macrocode} -\RequirePackage{caption3}[2007/10/17] % needs v3.1c or newer +\RequirePackage{caption3}[2007/10/25] % needs v3.1d or newer % \end{macrocode} % % \subsection{Check against incompatible packages} @@ -3212,17 +3219,18 @@ % \end{macro} % % \subsection{caption v1.x compatibility options} +% \changes{v3.1}{2007/07/21}{Option `compatibility' added} +% \changes{v3.1}{2007/09/01}{caption v1.x compatibility options revised} +% \changes{v3.1d}{2007/10/24}{Bugfix 07-10-24 in caption v1.x$ compatibility options} % -% \changes{v3.1}{2005/07/21}{Option `compatibility' added} % \begin{macrocode} \DeclareCaptionOption{compatibility}[1]{\caption@setbool{compatibility}{#1}} \@onlypreamble@key{caption}{compatibility} % \end{macrocode} % -% \changes{v3.1}{2007/09/01}{caption v1.x compatibility options revised} % \begin{macrocode} \DeclareCaptionOptionNoValue*{normal}{% - \caption@setformat{normal}% + \caption@setformat{plain}% \caption@setjustification{justified}} \DeclareCaptionOptionNoValue*{isu}{% \caption@setformat{hang}% @@ -3231,13 +3239,13 @@ \caption@setformat{hang}% \caption@setjustification{justified}} \DeclareCaptionOptionNoValue*{center}{% - \caption@setformat{normal}% + \caption@setformat{plain}% \caption@setjustification{centering}} \DeclareCaptionOptionNoValue*{anne}{% - \caption@setformat{normal}% + \caption@setformat{plain}% \caption@setjustification{centerlast}} \DeclareCaptionOptionNoValue*{centerlast}{% - \caption@setformat{normal}% + \caption@setformat{plain}% \caption@setjustification{centerlast}} % \end{macrocode} % @@ -3273,14 +3281,15 @@ % % \subsection{caption2 v2.x compatibility options} % \changes{v3.0h}{2005/07/08}{caption2 \version{2.x} compatibility options added} -% % \changes{v3.1}{2007/09/01}{caption2 v2.x compatibility options revised} +% \changes{v3.1d}{2007/10/24}{Bugfix 07-10-24 in caption v2.x$ compatibility options} +% % \begin{macrocode} \DeclareCaptionOptionNoValue*{flushleft}{% - \caption@setformat{normal}% + \caption@setformat{plain}% \caption@setjustification{raggedright}} \DeclareCaptionOptionNoValue*{flushright}{% - \caption@setformat{normal}% + \caption@setformat{plain}% \caption@setjustification{raggedleft}} % \end{macrocode} % \begin{macrocode} @@ -3369,6 +3378,7 @@ % \begin{macro}{\caption@settype} % \changes{v3.1}{2007/05/09}{This macro added} % \changes{v3.1b}{2007/09/22}{Usage of \cs{caption@xlabel} added} +% \changes{v3.1d}{2007/10/23}{Error message for \cs{caption@checkgrouplevel} revised} % |\caption@settype*|\marg{type}\par % sets |\@captype| and executes the options associated with it % (using |\caption@setoptions|). @@ -3385,15 +3395,16 @@ % \end{macrocode} % \begin{macrocode} \newcommand*\caption@@settype[1]{% - \caption@teststar{\caption@@@settype{#1}}\@gobble\@firstofone} + \caption@teststar{\caption@@@settype{#1}}\@firstoftwo\@secondoftwo} % \end{macrocode} % \begin{macrocode} \newcommand*\caption@@@settype[3]{% % #1 = "" or "sub" -% #2 = \@gobble in star form, \@firstofone otherwise +% #2 = \@firstoftwo in star form, \@secondoftwo otherwise % #3 = <type>, e.g. "figure" or "table" \caption@Debug{type=#3}% - \caption@checkgrouplevel{#1}{\captionsetup{#1type#2\@gobble*=#3}}% + \caption@checkgrouplevel{#1}{% + \captionsetup{#1type#2*\@empty=...}#2{ or \@backslashchar#1captionof}{}}% % \end{macrocode} % \begin{macrocode} \@ifundefined{@#1captype}{}{% @@ -3411,7 +3422,7 @@ % \end{macrocode} % \begin{macrocode} \let\caption@ifrefstepcounter\@secondoftwo - #2{% \@gobble or \@firstofone + #2{}{% \let\@currentlabel\caption@undefinedlabel % \let\@currentHlabel\@undefined \ifx\caption@ORI@label\@undefined @@ -3466,7 +3477,7 @@ \expandafter\edef\csname #1caption@grouplevel\endcsname{% \the\currentgrouplevel}% \else - \caption@Error{\string#2 outside group or environment}% + \caption@Error{\string#2\MessageBreak outside box or environment}% \fi }{}} \fi @@ -5649,6 +5660,7 @@ % \end{macro} % % \begin{macro}{\caption@wincaption} +% \changes{v3.1d}{2007/10/25}{Missing \% added} % This one finally typesets the caption using |\caption|. % \begin{macrocode} \newcommand\caption@wincaption[1]{% @@ -5670,7 +5682,7 @@ % support a starred variant -- as in |\caption*| -- so we test for~|*|, too. % \begin{macrocode} \edef\@tempa{\expandafter\noexpand\@car#1\@nil}% - \if\@tempa* + \if\@tempa*% \let\@tempa\@firstofone \else\if\@tempa[%] \let\@tempa\@firstofone diff --git a/Master/texmf-dist/tex/latex/caption/caption.sty b/Master/texmf-dist/tex/latex/caption/caption.sty index 06e20a785ed..6b9a5319ccb 100644 --- a/Master/texmf-dist/tex/latex/caption/caption.sty +++ b/Master/texmf-dist/tex/latex/caption/caption.sty @@ -28,10 +28,10 @@ %% caption-eng.tex, and caption-rus.tex. %% \NeedsTeXFormat{LaTeX2e}[1994/12/01] -\ProvidesPackage{caption}[2007/10/17 v3.1c Customising captions (AR)] +\ProvidesPackage{caption}[2007/10/25 v3.1d Customising captions (AR)] \newcommand*\caption@Info[1]{\PackageInfo{caption}{#1\@gobble}} \@onlypreamble\caption@Info -\RequirePackage{caption3}[2007/10/17] % needs v3.1c or newer +\RequirePackage{caption3}[2007/10/25] % needs v3.1d or newer \@ifpackageloaded{caption2}{% \caption@Error{% You can't use both, the (obsolete) caption2 *and*\MessageBreak @@ -185,7 +185,7 @@ \DeclareCaptionOption{compatibility}[1]{\caption@setbool{compatibility}{#1}} \@onlypreamble@key{caption}{compatibility} \DeclareCaptionOptionNoValue*{normal}{% - \caption@setformat{normal}% + \caption@setformat{plain}% \caption@setjustification{justified}} \DeclareCaptionOptionNoValue*{isu}{% \caption@setformat{hang}% @@ -194,13 +194,13 @@ \caption@setformat{hang}% \caption@setjustification{justified}} \DeclareCaptionOptionNoValue*{center}{% - \caption@setformat{normal}% + \caption@setformat{plain}% \caption@setjustification{centering}} \DeclareCaptionOptionNoValue*{anne}{% - \caption@setformat{normal}% + \caption@setformat{plain}% \caption@setjustification{centerlast}} \DeclareCaptionOptionNoValue*{centerlast}{% - \caption@setformat{normal}% + \caption@setformat{plain}% \caption@setjustification{centerlast}} \DeclareCaptionOptionNoValue*{scriptsize}{\def\captionfont{\scriptsize}} \DeclareCaptionOptionNoValue*{footnotesize}{\def\captionfont{\footnotesize}} @@ -221,10 +221,10 @@ \caption@setbool{ruled}{0} \DeclareCaptionOptionNoValue*{ruled}{\caption@setbool{ruled}{1}} \DeclareCaptionOptionNoValue*{flushleft}{% - \caption@setformat{normal}% + \caption@setformat{plain}% \caption@setjustification{raggedright}} \DeclareCaptionOptionNoValue*{flushright}{% - \caption@setformat{normal}% + \caption@setformat{plain}% \caption@setjustification{raggedleft}} \DeclareCaptionOptionNoValue*{oneline}{\caption@setbool{slc}{1}} \DeclareCaptionOptionNoValue*{ignoreLTcapwidth}{% @@ -255,10 +255,11 @@ \newcommand*\caption@settype{% \caption@@settype{}} \newcommand*\caption@@settype[1]{% - \caption@teststar{\caption@@@settype{#1}}\@gobble\@firstofone} + \caption@teststar{\caption@@@settype{#1}}\@firstoftwo\@secondoftwo} \newcommand*\caption@@@settype[3]{% \caption@Debug{type=#3}% - \caption@checkgrouplevel{#1}{\captionsetup{#1type#2\@gobble*=#3}}% + \caption@checkgrouplevel{#1}{% + \captionsetup{#1type#2*\@empty=...}#2{ or \@backslashchar#1captionof}{}}% \@ifundefined{@#1captype}{}{% \edef\@tempa{#3}% \expandafter\ifx\csname @#1captype\endcsname\@tempa \else @@ -270,7 +271,7 @@ \@nameuse{#1caption@settypehook}% \expandafter\caption@setoptions\csname @#1captype\endcsname \let\caption@ifrefstepcounter\@secondoftwo - #2{% \@gobble or \@firstofone + #2{}{% \let\@currentlabel\caption@undefinedlabel \ifx\caption@ORI@label\@undefined \let\caption@ORI@label\label @@ -293,7 +294,7 @@ \expandafter\edef\csname #1caption@grouplevel\endcsname{% \the\currentgrouplevel}% \else - \caption@Error{\string#2 outside group or environment}% + \caption@Error{\string#2\MessageBreak outside box or environment}% \fi }{}} \fi @@ -1108,7 +1109,7 @@ \caption@prepareslc \fi \edef\@tempa{\expandafter\noexpand\@car#1\@nil}% - \if\@tempa* + \if\@tempa*% \let\@tempa\@firstofone \else\if\@tempa[%] \let\@tempa\@firstofone diff --git a/Master/texmf-dist/tex/latex/caption/caption3.sty b/Master/texmf-dist/tex/latex/caption/caption3.sty index 7d89e2f142e..5b0beadfba3 100644 --- a/Master/texmf-dist/tex/latex/caption/caption3.sty +++ b/Master/texmf-dist/tex/latex/caption/caption3.sty @@ -28,7 +28,7 @@ %% caption-eng.tex, and caption-rus.tex. %% \NeedsTeXFormat{LaTeX2e}[1994/12/01] -\ProvidesPackage{caption3}[2007/10/17 v3.1c caption3 kernel (AR)] +\ProvidesPackage{caption3}[2007/10/25 v3.1d caption3 kernel (AR)] \providecommand*\@nameundef[1]{% \expandafter\let\csname #1\endcsname\@undefined} \providecommand\l@addto@macro[2]{% @@ -153,9 +153,12 @@ \caption@@begindocumenthook \let\caption@@begindocumenthook\@undefined \PackageInfo{caption}{End \noexpand\AtBeginDocument code\@gobble}} -\newcommand*\caption@Warning[1]{\caption@WarningNoLine{#1\on@line}} -\newcommand*\caption@WarningNoLine[1]{\PackageWarning{caption}{#1.^^J\caption@wh\@gobbletwo}} -\newcommand*\caption@Error[1]{\PackageError{caption}{#1}\caption@eh} +\newcommand*\caption@Warning[1]{% + \caption@WarningNoLine{#1\on@line}} +\newcommand*\caption@WarningNoLine[1]{% + \PackageWarning{caption}{#1.^^J\caption@wh\@gobbletwo}} +\newcommand*\caption@Error[1]{% + \PackageError{caption}{#1}\caption@eh} \let\caption@KV@err\caption@Error \newcommand*\caption@wh{% See the caption package documentation for explanation.} @@ -420,7 +423,7 @@ \expandafter\caption@setup\expandafter{\caption@sty}% \fi \expandafter\let\expandafter\caption@sls\csname caption@sls@#2\endcsname - \expandafter\caption@l@addto@list\expandafter\caption@opt@SingleLine + \expandafter\caption@l@addto@list\expandafter\caption@opt@singleline \expandafter{\caption@sls}}} \newcommand*\caption@resetstyle{% \caption@setup{% @@ -429,7 +432,7 @@ margin=0pt,minmargin=0,maxmargin=0,% indent=0pt,parindent=0pt,hangindent=0pt,% singlelinecheck=1,strut=1}% - \caption@clearsetup{SingleLine}} + \caption@clearsetup{singleline}} \DeclareCaptionStyle{base}[indent=0pt,justification=centering]{} \DeclareCaptionStyle{default}[indent=0pt,justification=centering]{% format=default,labelsep=default,textformat=default,% @@ -1038,7 +1041,7 @@ \newcommand\caption@slc[4]{% \caption@Debug{Begin SLC}% \begingroup - \caption@SingleLine + \caption@singleline \let\caption@hj\@empty \caption@calcmargin % calculate #3 if necessary \caption@prepareslc @@ -1047,12 +1050,12 @@ \endgroup \else \endgroup - \caption@SingleLine + \caption@singleline #4% \fi \caption@Debug{End SLC}} -\newcommand*\caption@SingleLine{% - \expandafter\caption@setup\expandafter{\caption@opt@SingleLine}% +\newcommand*\caption@singleline{% + \expandafter\caption@setup\expandafter{\caption@opt@singleline}% \let\caption@fmt\caption@slfmt} \newcommand*\caption@prepareslc{% \let\@footnotetext\@gobble\let\@endnotetext\@gobble |