summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/caption/caption2.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2007-09-08 15:59:17 +0000
committerKarl Berry <karl@freefriends.org>2007-09-08 15:59:17 +0000
commit788352558edd068d76fe19ad56b81827c0fe7646 (patch)
treeab733e20eaf33223cbfe9c59c783a30d802ee627 /Master/texmf-dist/tex/latex/caption/caption2.sty
parentba8058f661bc514c2d960695ddb21d5501abbf97 (diff)
caption 3.1 (7sep07)
git-svn-id: svn://tug.org/texlive/trunk@4911 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/caption/caption2.sty')
-rw-r--r--Master/texmf-dist/tex/latex/caption/caption2.sty38
1 files changed, 24 insertions, 14 deletions
diff --git a/Master/texmf-dist/tex/latex/caption/caption2.sty b/Master/texmf-dist/tex/latex/caption/caption2.sty
index bedf31d09ed..5fec636caf7 100644
--- a/Master/texmf-dist/tex/latex/caption/caption2.sty
+++ b/Master/texmf-dist/tex/latex/caption/caption2.sty
@@ -22,35 +22,45 @@
%%
%% This Current Maintainer of this work is Axel Sommerfeldt.
%%
-%% This work consists of the files caption.ins, caption.dtx,
-%% caption2.dtx, and anleitung.tex and the derived files
-%% caption.sty, caption2.sty, caption3.sty, and manual.tex.
+%% This work consists of the files caption.ins, caption.dtx, caption2.dtx,
+%% and ltcaption.dtx, the derived files caption.sty, caption2.sty,
+%% caption3.sty, and ltcaption.sty, and the user manuals caption-deu.tex,
+%% caption-eng.tex, and caption-rus.tex.
%%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption2}[2007/04/11 v2.2a Customising captions (AS)]
-\PackageWarningNoLine{caption2}{%
- *** THIS PACKAGE IS OBSOLETE, PLEASE USE caption ***}
-\RequirePackage{caption3}[2007/03/04] % needs v3.0m or newer
+\ProvidesPackage{caption2}[2007/08/12 v2.2b Customising captions (AS)]
+\PackageWarning{caption2}{%
+ ****************************************************\MessageBreak
+ THIS PACKAGE IS OBSOLETE:\MessageBreak
+ This package attempts to provide an caption 2.0/2.1\MessageBreak
+ author environment so that OLD documents can be\MessageBreak
+ successfully processed.\MessageBreak
+ It should NOT be used for NEW documents! New\MessageBreak
+ documents should use the caption package instead.\MessageBreak
+ ****************************************************\@gobbletwo}%
+\RequirePackage{caption3}[2007/08/12] % needs v3.1 or newer
\@ifpackageloaded{caption}{%
- \PackageError{caption2}{You can't use both the caption *and* caption2 package}{\caption@eh}%
+ \PackageError{caption2}{%
+ You can't use both, the (current) caption *and*\MessageBreak
+ the (obsolete) caption2 package}\caption@eh
\endinput
}{}
\newcommand*\captionlabeldelim{}
\newcommand*\captionlabelsep{}
\newcommand*\ifcaptionwidth{\ifdim\captionwidth>\z@}
-\newif\ifcaption@temp
+\let\captionindent\caption@indent
\def\ifcaptionlabel{%
\ifcaption@star
- \caption@tempfalse
+ \@tempswafalse
\else
- \caption@temptrue
+ \@tempswatrue
\fi
- \ifcaption@temp}
+ \if@tempswa}
\def\captionlabeltrue{\caption@starfalse}
\def\captionlabelfalse{\caption@startrue}
\def\ifonelinecaptions{%
- \caption@ifslc{\caption@temptrue}{\caption@tempfalse}%
- \ifcaption@temp}
+ \caption@ifslc{\@tempswatrue}{\@tempswafalse}%
+ \if@tempswa}
\def\onelinecaptionstrue{\caption@setbool{slc}{1}}
\def\onelinecaptionsfalse{\caption@setbool{slc}{0}}
\newif\ifignoreLTcapwidth