summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/caption
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2007-04-22 17:15:40 +0000
committerKarl Berry <karl@freefriends.org>2007-04-22 17:15:40 +0000
commit5fdc1983dd12ec0b4ec68aad3d0c6ab016207208 (patch)
tree311bff8fcc0120fb4167bf670643f85e65c861b4 /Master/texmf-dist/tex/latex/caption
parent520623ea11cabc166b0d623ece2e85129da61cbd (diff)
caption 3.0q (17apr07)
git-svn-id: svn://tug.org/texlive/trunk@4173 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/caption')
-rw-r--r--Master/texmf-dist/tex/latex/caption/caption.sty12
-rw-r--r--Master/texmf-dist/tex/latex/caption/caption2.sty23
-rw-r--r--Master/texmf-dist/tex/latex/caption/caption3.sty42
3 files changed, 36 insertions, 41 deletions
diff --git a/Master/texmf-dist/tex/latex/caption/caption.sty b/Master/texmf-dist/tex/latex/caption/caption.sty
index 9fac17f8caf..20b2a3ceed9 100644
--- a/Master/texmf-dist/tex/latex/caption/caption.sty
+++ b/Master/texmf-dist/tex/latex/caption/caption.sty
@@ -27,11 +27,10 @@
%% caption.sty, caption2.sty, caption3.sty, and manual.tex.
%%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption}[2007/04/09 v3.0p Customising captions (AR)]
+\ProvidesPackage{caption}[2007/04/16 v3.0q Customising captions (AR)]
\RequirePackage{caption3}[2007/01/31] % needs v3.0l or newer
-\def\caption@package{caption}%
\@ifpackageloaded{caption2}{%
- \caption@error{You can't use both the caption *and* caption2 package}%
+ \caption@Error{You can't use both the caption *and* caption2 package}%
\endinput
}{}
\DeclareCaptionOption{config}[caption]{%
@@ -189,14 +188,9 @@
\caption@iftop{\vskip\abovecaptionskip}{\vskip\belowcaptionskip}}
\@ifundefined{scr@caption}{}{%
\caption@Info{KOMA-Script class detected}
+ \AtBeginDocument{\let\scr@caption\caption}
\def\onelinecaptionstrue{\caption@setbool{slc}{1}}
\def\onelinecaptionsfalse{\caption@setbool{slc}{0}}
- \ifonelinecaptions
- \onelinecaptionstrue
- \else
- \onelinecaptionsfalse
- \fi
- \AtBeginDocument{\let\scr@caption\caption}
\def\captionabove{%
\caption@setposition{t}\let\caption@setposition\@gobble
\scr@caption}
diff --git a/Master/texmf-dist/tex/latex/caption/caption2.sty b/Master/texmf-dist/tex/latex/caption/caption2.sty
index 0fd4bd37639..bedf31d09ed 100644
--- a/Master/texmf-dist/tex/latex/caption/caption2.sty
+++ b/Master/texmf-dist/tex/latex/caption/caption2.sty
@@ -27,13 +27,12 @@
%% caption.sty, caption2.sty, caption3.sty, and manual.tex.
%%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption2}[2007/04/06 v2.2 Customising captions (AS)]
-\PackageWarning{caption2}{%
+\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
-\def\caption@package{caption2}
\@ifpackageloaded{caption}{%
- \caption@error{You can't use both the caption *and* caption2 package}%
+ \PackageError{caption2}{You can't use both the caption *and* caption2 package}{\caption@eh}%
\endinput
}{}
\newcommand*\captionlabeldelim{}
@@ -379,30 +378,30 @@
\ifx\subcapfont\undefined
\PackageInfo{caption2}{subfigure package v2.0 detected}
\let\subcapfont\@empty
- \newcommand\subfigcapwidth{\z@}
- \newcommand\setsubcapmargin{%
+ \newcommand*\subfigcapwidth{\z@}
+ \newcommand*\setsubcapmargin{%
\subfigcapwidthfalse
\renewcommand*\subfigcapmargin}
- \newcommand\setsubcapwidth{%
+ \newcommand*\setsubcapwidth{%
\subfigcapwidthtrue
\renewcommand*\subfigcapwidth}
- \newcommand\subcaplabelsep{\space}
+ \newcommand*\subcaplabelsep{\space}
\let\caption@subfig@hss\hfil
\else
\PackageInfo{caption2}{subfigure package v2.1 (or newer) detected}
\newdimen\subfigcapwidth
- \newcommand\setsubcapmargin{%
+ \newcommand*\setsubcapmargin{%
\subfigcapwidthfalse
\setlength\subfigcapmargin}
- \newcommand\setsubcapwidth{%
+ \newcommand*\setsubcapwidth{%
\subfigcapwidthtrue
\setlength\subfigcapwidth}
- \newcommand\subcaplabelsep{\hskip\subfiglabelskip}
+ \newcommand*\subcaplabelsep{\hskip\subfiglabelskip}
\let\caption@subfig@hss\hss
\fi
\newif\ifsubfigcapwidth
\newdimen\subcapindent
- \newcommand\subcaplabeldelim{}
+ \newcommand*\subcaplabeldelim{}
\newcommand*\subcapstyle[1]{%
\expandafter\ifx\csname caption@@#1\endcsname\relax
\PackageError{caption2}{Undefined caption style `#1'}{\caption@eh}%
diff --git a/Master/texmf-dist/tex/latex/caption/caption3.sty b/Master/texmf-dist/tex/latex/caption/caption3.sty
index 34a8e52fb0d..8dba296a100 100644
--- a/Master/texmf-dist/tex/latex/caption/caption3.sty
+++ b/Master/texmf-dist/tex/latex/caption/caption3.sty
@@ -27,7 +27,7 @@
%% caption.sty, caption2.sty, caption3.sty, and manual.tex.
%%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption3}[2007/04/09 v3.0p caption3 kernel (AR)]
+\ProvidesPackage{caption3}[2007/04/11 v3.0q caption3 kernel (AR)]
\providecommand*\@nameundef[1]{%
\expandafter\let\csname #1\endcsname\@undefined}
\providecommand{\l@addto@macro}[2]{%
@@ -59,7 +59,7 @@
}{\caption@ifinlist{#2}{0,false,no,off}{%
\expandafter\let\csname caption@if#1\endcsname\@secondoftwo
}{%
- \caption@error{Undefined boolean value `#2'}%
+ \caption@Error{Undefined boolean value `#2'}%
}}}
\def\caption@ifbool#1{\@nameuse{caption@if#1}}
\def\caption@undefbool#1{\@nameundef{caption@if#1}}
@@ -72,12 +72,12 @@
\xdef#1{\the\@tempcnta}%
\endgroup}
\def\caption@stepcounter#1{\caption@addtocounter#1\@ne}
-\newcommand\caption@package{caption}
-\newcommand*\caption@error[1]{%
- \PackageError\caption@package{#1}\caption@eh}
+\newcommand\caption@Package{caption}
+\newcommand*\caption@Error[1]{%
+ \PackageError\caption@Package{#1}\caption@eh}
\newcommand\caption@eh{%
If you do not understand this error, please take a closer look\MessageBreak
- at the documentation of the `\caption@package' package.\MessageBreak
+ at the documentation of the `\caption@Package' package.\MessageBreak
\@ehc}
\RequirePackage{keyval}[1997/11/10]
\providecommand*\undefine@key[2]{%
@@ -102,14 +102,14 @@
\ifnum\caption@keydepth=0\relax
\let\caption@KV@errx\KV@errx
\let\caption@KV@err\KV@err
- \let\KV@errx\caption@error
- \let\KV@err\caption@error
+ \let\KV@errx\caption@Error
+ \let\KV@err\caption@Error
\fi
\caption@stepcounter\caption@keydepth
- \def\caption@package{#1}%
+ \def\caption@Package{#1}%
\caption@Debug{\protect\setkeys{#2}{#3}}%
\setkeys{#2}{#3}%
- \def\caption@package{caption}%
+ \def\caption@Package{caption}%
\caption@addtocounter\caption@keydepth\m@ne
\ifnum\caption@keydepth=0\relax
\let\KV@errx\caption@KV@errx
@@ -233,7 +233,7 @@
\@ifstar{\caption@@setstyle\@gobble}{\caption@@setstyle\@firstofone}}
\newcommand*\caption@@setstyle[2]{%
\@ifundefined{caption@sty@#2}%
- {#1{\caption@error{Undefined caption style `#2'}}}%
+ {#1{\caption@Error{Undefined caption style `#2'}}}%
{\expandafter\let\expandafter\caption@sls\csname caption@sls@#2\endcsname
\caption@setdefault\caption@esetup{\csname caption@sty@#2\endcsname}}}
\newcommand\caption@setdefault{\captionsetup{%
@@ -253,7 +253,7 @@
\DeclareCaptionOption{format}{\caption@setformat{#1}}
\newcommand*\caption@setformat[1]{%
\@ifundefined{caption@fmt@#1}%
- {\caption@error{Undefined caption format `#1'}}%
+ {\caption@Error{Undefined caption format `#1'}}%
{\expandafter\let\expandafter\caption@ifh\csname caption@ifh@#1\endcsname
\expandafter\let\expandafter\caption@fmt\csname caption@fmt@#1\endcsname}}
\DeclareCaptionFormat{plain}{#1#2#3\par}
@@ -271,7 +271,7 @@
\DeclareCaptionOption{labelformat}{\caption@setlabelformat{#1}}
\newcommand*\caption@setlabelformat[1]{%
\@ifundefined{caption@lfmt@#1}%
- {\caption@error{Undefined caption label format `#1'}}%
+ {\caption@Error{Undefined caption label format `#1'}}%
{\expandafter\let\expandafter\caption@lfmt\csname caption@lfmt@#1\endcsname}}
\DeclareCaptionLabelFormat{empty}{}
\DeclareCaptionLabelFormat{simple}{\bothIfFirst{#1}{\nobreakspace}#2}
@@ -289,7 +289,7 @@
\DeclareCaptionOption{labelseparator}{\caption@setlabelseparator{#1}}
\newcommand*\caption@setlabelseparator[1]{%
\@ifundefined{caption@lsep@#1}%
- {\caption@error{Undefined caption label separator `#1'}}%
+ {\caption@Error{Undefined caption label separator `#1'}}%
{\expandafter\let\expandafter\caption@iflf\csname caption@iflf@#1\endcsname
\expandafter\let\expandafter\caption@lsep\csname caption@lsep@#1\endcsname}}
\DeclareCaptionLabelSeparator{none}{}
@@ -307,7 +307,7 @@
\DeclareCaptionOption{textformat}{\caption@settextformat{#1}}
\newcommand*\caption@settextformat[1]{%
\@ifundefined{caption@tfmt@#1}%
- {\caption@error{Undefined caption text format `#1'}}%
+ {\caption@Error{Undefined caption text format `#1'}}%
{\expandafter\let\expandafter\caption@tfmt\csname caption@tfmt@#1\endcsname}}
\DeclareCaptionTextFormat{simple}{#1}
\DeclareCaptionTextFormat{period}{#1.}
@@ -318,7 +318,7 @@
\DeclareCaptionOption{justification}{\caption@setjustification{#1}}
\newcommand*\caption@setjustification[1]{%
\@ifundefined{caption@hj@#1}%
- {\caption@error{Undefined caption justification `#1'}}%
+ {\caption@Error{Undefined caption justification `#1'}}%
{\expandafter\let\expandafter\caption@hj\csname caption@hj@#1\endcsname}}
\DeclareCaptionJustification{justified}{}
\DeclareCaptionJustification{centering}{\centering}
@@ -350,7 +350,7 @@
\DeclareCaptionJustification{RaggedRight}{%
\caption@ragged\RaggedRight\raggedright}
\newcommand*\caption@ragged{%
- \caption@Info{We need ragged2e}%
+ \caption@Debug{We need ragged2e}%
\protected@write\@auxout{}{\string\caption@newlabel{ragged2e}{}}%
\global\let\caption@ragged\caption@@ragged
\caption@@ragged}
@@ -362,8 +362,10 @@
\global\@namedef{caption\string#1}}{}%
#2}
\AtBeginDocument{%
- \@ifundefined{caption@ragged2e}{}{%
- \caption@Info{We load ragged2e}%
+ \@ifundefined{caption@ragged2e}{%
+ \let\caption@@ragged\@secondoftwo % suppress warning above
+ }{%
+ \caption@Debug{We load ragged2e}%
\IfFileExists{ragged2e.sty}{%
\RequirePackage{ragged2e}\let\caption@@ragged\@firstoftwo}{}%
}}
@@ -418,7 +420,7 @@
}{\caption@ifinlist{#1}{a,auto}{%
\let\caption@position\@undefined
}{%
- \caption@error{Undefined caption position `#1'}%
+ \caption@Error{Undefined caption position `#1'}%
}}}}}
\let\caption@defaultpos\@secondoftwo
\newcommand\caption@iftop{%