diff options
author | Karl Berry <karl@freefriends.org> | 2007-02-21 23:53:27 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2007-02-21 23:53:27 +0000 |
commit | d13b89bc23ac3bf2bce2bd534b97ed97e0b091c1 (patch) | |
tree | fde2418c28764709391c818906401e93fdf9014f /Master/texmf-dist/tex/latex | |
parent | c454d8e2cafa481c5856580b78c273b5445114a9 (diff) |
caption 3.0l (21feb07)
git-svn-id: svn://tug.org/texlive/trunk@3976 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r-- | Master/texmf-dist/tex/latex/caption/caption.sty | 93 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/caption/caption2.sty | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/caption/caption3.sty | 132 |
3 files changed, 131 insertions, 96 deletions
diff --git a/Master/texmf-dist/tex/latex/caption/caption.sty b/Master/texmf-dist/tex/latex/caption/caption.sty index 382086e3532..5f799c915ba 100644 --- a/Master/texmf-dist/tex/latex/caption/caption.sty +++ b/Master/texmf-dist/tex/latex/caption/caption.sty @@ -6,7 +6,7 @@ %% %% caption.dtx (with options: `package') %% -%% Copyright (C) 1994-2006 Axel Sommerfeldt (caption@sommerfee.de) +%% Copyright (C) 1994-2007 Axel Sommerfeldt (caption@sommerfee.de) %% %% -------------------------------------------------------------------------- %% @@ -27,8 +27,8 @@ %% caption.sty, caption2.sty, caption3.sty, and manual.tex. %% \NeedsTeXFormat{LaTeX2e}[1994/12/01] -\ProvidesPackage{caption}[2007/01/07 v3.0k Customising captions (AR)] -\RequirePackage{caption3}[2006/01/12] % needs v3.0i or newer +\ProvidesPackage{caption}[2007/02/20 v3.0l Customising captions (AR)] +\RequirePackage{caption3}[2007/01/31] % needs v3.0l or newer \DeclareCaptionOption{config}[caption]{% \InputIfFileExists{#1.cfg}{\typeout{*** Local configuration file #1.cfg used ***}}% @@ -36,6 +36,8 @@ file #1.cfg not found}}} \DeclareCaptionOption*{figureposition}{\captionsetup[figure]{position=#1}} \DeclareCaptionOption*{tableposition}{\captionsetup[table]{position=#1}} +\DeclareCaptionOption*{figurename}{\captionsetup[figure]{name=#1}} +\DeclareCaptionOption*{tablename}{\captionsetup[table]{name=#1}} \DeclareCaptionOption*{normal}[]{\caption@setformat{normal}} \DeclareCaptionOption*{isu}[]{\caption@setformat{hang}} \DeclareCaptionOption*{hang}[]{\caption@setformat{hang}} @@ -65,18 +67,10 @@ \DeclareCaptionOption*{oneline}[]{\caption@setbool{slc}{1}} \DeclareCaptionOption*{ignoreLTcapwidth}[]{} \@ifundefined{scr@caption}{}{% - \DeclareCaptionOption*{onelinecaption}[]{\onelinecaptionstrue} - \DeclareCaptionOption*{noonelinecaption}[]{\onelinecaptionsfalse} + \DeclareCaptionOption*{onelinecaption}[]{\caption@setbool{slc}{1}} + \DeclareCaptionOption*{noonelinecaption}[]{\caption@setbool{slc}{0}} \DeclareCaptionOption*{tablecaptionabove}[]{\captionsetup[table]{position=t}} \DeclareCaptionOption*{tablecaptionbelow}[]{\captionsetup[table]{position=b}} - \def\onelinecaptionstrue{\caption@setbool{slc}{1}} - \def\onelinecaptionsfalse{\caption@setbool{slc}{0}} - \def\captionabove{% - \caption@setposition{t}\let\caption@setposition\@gobble - \scr@caption} - \def\captionbelow{% - \caption@setposition{b}\let\caption@setposition\@gobble - \scr@caption} } \newcommand*\caption@declarepackage[1]{% \caption@setbool{pkt@#1}{1}% @@ -104,35 +98,12 @@ \caption@declarepackage{rotating} \caption@declarepackage{sidecap} \caption@declarepackage{supertabular} -\def\ProcessOptionsWithKV#1{% - \let\@tempc\relax - \let\caption@tempa\@empty - \@for\CurrentOption:=\@classoptionslist\do{% - \@ifundefined{KV@#1@\CurrentOption}{% - }{% - \@ifundefined{KV@#1@\CurrentOption @default}{% - \PackageInfo{#1}{Global option `\CurrentOption' ignored}% - }{% - \PackageInfo{#1}{Global option `\CurrentOption' processed}% - \edef\caption@tempa{\caption@tempa,\CurrentOption,}% - \@expandtwoargs\@removeelement\CurrentOption - \@unusedoptionlist\@unusedoptionlist - }% - }% - }% - \edef\caption@tempa{% - \noexpand\caption@setkeys{#1}{% - \caption@tempa\@ptionlist{\@currname.\@currext}% - }% - }% - \caption@tempa - \let\CurrentOption\@empty - \AtEndOfPackage{\let\@unprocessedoptions\relax}} -\ProcessOptionsWithKV{caption} +\caption@ProcessOptions{caption} \caption@ifbool{pkt@caption}{}{\endinput} \caption@undefbool{pkt@caption} \def\captionof{\@ifstar{\caption@of{\caption*}}{\caption@of\caption}} \newcommand*\caption@of[2]{\def\@captype{#2}#1} +\DeclareCaptionOption{name}{\caption@setfloatname\@captype{#1}} \DeclareCaptionOption{type}{\def\@captype{#1}} \providecommand\ContinuedFloat{% \@ifnextchar[%] @@ -162,14 +133,16 @@ \fi \caption@fixposition \global\let\caption@fixedposition\caption@position} -\newcommand\caption@beginex[2]{% +\newcommand\caption@beginex[3]{% \caption@begin{#1}% \caption@iflof% {\def\caption@tempa{#2}}% {\let\caption@tempa\@empty}% \ifx\caption@tempa\@empty - \long\def\addcontentsline##1##2##3{}% - \fi} + \long\def\addcontentsline##1##2##3{}% There is no \@gobblethree... + \fi + \caption@ifempty{#3}{\let\caption@ifempty\@secondoftwo}% +} \newcommand*\caption@end{% \endgroup \let\caption@position\caption@fixedposition} @@ -178,18 +151,20 @@ \def\caption@setfloattype##1{% \caption@settype{##1}#2\caption@settype{#1}}} \newcommand*\caption@floatname[1]{\@nameuse{#1name}} +\newcommand*\caption@setfloatname[1]{\@namedef{#1name}} \AtBeginDocument{% \@ifundefined{cc@caption}{% + \@ifundefined{caption@old}{% \let\caption@old\caption \def\caption{\caption@caption\caption@old}% \def\caption@caption#1{% \@ifstar{\ContinuedFloat\global\caption@startrue#1[]}{#1}}% \let\caption@@old\@caption \long\def\@caption#1[#2]#3{% - \caption@beginex{#1}{#2}% + \caption@beginex{#1}{#2}{#3}% \caption@@old{#1}[{#2}]{#3}% \caption@end}% - }{% + }{}}{% \PackageInfo{caption}{captcont package v2.0 detected}% \def\caption@caption#1{#1}% }% @@ -198,10 +173,18 @@ \caption@iftop{\vskip\belowcaptionskip}{\vskip\abovecaptionskip}% \caption@@make{#1}{#2}% \caption@iftop{\vskip\abovecaptionskip}{\vskip\belowcaptionskip}} -\AtBeginDocument{\@ifundefined{scr@caption}{}{% +\@ifundefined{scr@caption}{}{% \PackageInfo{caption}{KOMA-Script class detected}% - \let\scr@caption\caption -}} + \AtBeginDocument{\let\scr@caption\caption} + \def\onelinecaptionstrue{\caption@setbool{slc}{1}} + \def\onelinecaptionsfalse{\caption@setbool{slc}{0}} + \def\captionabove{% + \caption@setposition{t}\let\caption@setposition\@gobble + \scr@caption} + \def\captionbelow{% + \caption@setposition{b}\let\caption@setposition\@gobble + \scr@caption} +} \AtBeginDocument{\@ifundefined{f@ffrench}{}{% \PackageInfo{caption}{french(le) package detected}% \@ifundefined{GOfrench}% @@ -235,7 +218,7 @@ \def\@captype{#2}#1}% \let\caption@@float\float@caption \long\def\float@caption#1[#2]#3{% - \caption@beginex{#1}{#2}% + \caption@beginex{#1}{#2}{#3}% \let\@fs@capt\caption@@make \caption@@float{#1}[{#2}]{#3}% \caption@of@float{% @@ -254,6 +237,7 @@ \def\@float@setevery#1{% \caption@float@setevery{#1}% \def\caption@floatname##1{\@nameuse{fname@#1}}% + \def\caption@setfloatname##1{\@namedef{fname@#1}}% \expandafter\let\expandafter\caption@tempa\csname @float@c@#1\endcsname \ifx\caption@tempa\float@caption \else\ifx\caption@tempa\@caption @@ -311,7 +295,7 @@ \let\H@refstepcounter\@gobble \Hy@hypertexnamesfalse \caption@capstart - \global\let\caption@currentHref\@currentHref + \global\let\hc@currentHref\@currentHref \endgroup \def\caption{% \let\caption\hc@org@caption @@ -319,11 +303,11 @@ \caption@caption\hc@caption}}% \let\caption@hc@@caption\hc@@caption \long\def\hc@@caption#1[#2]#3{% - \caption@beginex{#1}{#2}% + \caption@beginex{#1}{#2}{#3}% \let\caption@hyper@makecurrent\hyper@makecurrent \def\hyper@makecurrent\@captype{% \let\hyper@makecurrent\caption@hyper@makecurrent - \global\let\@currentHref\caption@currentHref}% + \global\let\@currentHref\hc@currentHref}% \caption@hc@@caption{#1}[{#2}]{#3}% \caption@end}% } @@ -414,13 +398,6 @@ \fi}% \caption@endSC@FLOAT}% } -\AtBeginDocument{% - \def\@tempa{\@ifstar\sf@@subref\sf@subref}% - \ifx\subref\@tempa - \PackageInfo{caption}{subref 1.2 or 1.3 detected}% - \DeclareRobustCommand*\subref{\@ifstar\sf@@subref\sf@subref}% - \fi -} \def\caption@setSTposition{% \caption@setposition{\if@topcaption t\else b\fi}} \caption@ifpackage{supertabular}{ST@caption}{% @@ -431,7 +408,7 @@ \long\def\ST@caption#1[#2]#3{\par% \caption@letfloattype{supertabular}{}% \let\caption@fixposition\caption@setSTposition - \caption@beginex{#1}{#2}% + \caption@beginex{#1}{#2}{#3}% \addcontentsline{\csname ext@#1\endcsname}{#1}% {\protect\numberline{% \csname the#1\endcsname}{\ignorespaces #2}}% diff --git a/Master/texmf-dist/tex/latex/caption/caption2.sty b/Master/texmf-dist/tex/latex/caption/caption2.sty index 60f829b6c79..02197eb69e7 100644 --- a/Master/texmf-dist/tex/latex/caption/caption2.sty +++ b/Master/texmf-dist/tex/latex/caption/caption2.sty @@ -6,7 +6,7 @@ %% %% caption2.dtx (with options: `package') %% -%% Copyright (C) 1994-2006 Axel Sommerfeldt (caption@sommerfee.de) +%% Copyright (C) 1994-2007 Axel Sommerfeldt (caption@sommerfee.de) %% %% -------------------------------------------------------------------------- %% diff --git a/Master/texmf-dist/tex/latex/caption/caption3.sty b/Master/texmf-dist/tex/latex/caption/caption3.sty index e22d9452f4c..60649de1fa3 100644 --- a/Master/texmf-dist/tex/latex/caption/caption3.sty +++ b/Master/texmf-dist/tex/latex/caption/caption3.sty @@ -6,7 +6,7 @@ %% %% caption.dtx (with options: `kernel') %% -%% Copyright (C) 1994-2006 Axel Sommerfeldt (caption@sommerfee.de) +%% Copyright (C) 1994-2007 Axel Sommerfeldt (caption@sommerfee.de) %% %% -------------------------------------------------------------------------- %% @@ -27,7 +27,7 @@ %% caption.sty, caption2.sty, caption3.sty, and manual.tex. %% \NeedsTeXFormat{LaTeX2e}[1994/12/01] -\ProvidesPackage{caption3}[2007/01/07 v3.0k caption3 kernel (AR)] +\ProvidesPackage{caption3}[2007/02/18 v3.0l caption3 kernel (AR)] \providecommand*\@nameundef[1]{% \expandafter\let\csname #1\endcsname\@undefined} \providecommand{\l@addto@macro}[2]{% @@ -71,10 +71,17 @@ }{\caption@ifinlist{#2}{0,false,no,off}{% \expandafter\let\csname caption@if#1\endcsname\@secondoftwo }{% - \PackageError{caption}{Undefined boolean value `#2'}{\caption@eh}% + \caption@error{Undefined boolean value `#2'}% }}} \def\caption@ifbool#1{\@nameuse{caption@if#1}} \def\caption@undefbool#1{\@nameundef{caption@if#1}} +\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 + \@ehc} \RequirePackage{keyval}[1997/11/10] \providecommand*\undefine@key[2]{% \@nameundef{KV@#1@#2}\@nameundef{KV@#1@#2@default}} @@ -92,22 +99,28 @@ {\@namedef{\caption@typ@#1}{#2}}% {\expandafter\l@addto@macro\csname\caption@typ@#1\endcsname{,#2}}} \newcommand\caption@setup{\caption@setkeys{caption}} -\newcommand*\caption@setkeys[2]{% - \let\caption@KV@errx\KV@errx - \let\caption@KV@err\KV@err - \def\KV@errx##1{\PackageError\caption@package{##1}\@ehc}% - \let\KV@err\KV@errx - \setkeys{#1}{#2}% - \let\KV@errx\caption@KV@errx - \let\KV@err\caption@KV@err} -\newcommand\caption@package{caption} -\newcommand\caption@settype{% - \@ifnextchar[\caption@@settype{\caption@@settype[caption]}} -\def\caption@@settype[#1]#2{% - \@ifundefined{\caption@typ@#2}{}{% - \def\caption@package{#1}% - \caption@esetup{\csname\caption@typ@#2\endcsname}% - \def\caption@package{caption}}} +\newcount\caption@keydepth \caption@keydepth=0 +\newcommand*\caption@setkeys{% + \@dblarg\caption@@setkeys} +\long\def\caption@@setkeys[#1]#2#3{% + \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 + \fi + \advance\caption@keydepth\@ne + \def\caption@package{#1}% + \setkeys{#2}{#3}% + \def\caption@package{caption}% + \advance\caption@keydepth\m@ne + \ifnum\caption@keydepth =0\relax + \let\KV@errx\caption@KV@errx + \let\KV@err\caption@KV@err + \fi} +\newcommand*\caption@settype[1]{% + \@ifundefined{\caption@typ@#1}{}{% + \caption@esetup{\csname\caption@typ@#1\endcsname}}} \newcommand*\caption@esetup[1]{% \edef\caption@tempa{\noexpand\caption@setup{#1}}% \caption@tempa} @@ -122,10 +135,31 @@ \@nameuse{\caption@typ@#2}% }% )}} -\newcommand\caption@eh{% - If you do not understand this error, please take a closer look\MessageBreak - at the documentation of the `caption' package.\MessageBreak - \@ehc} +\newcommand*\caption@ProcessOptions[1]{% + \let\@tempc\relax + \let\caption@tempa\@empty + \@for\CurrentOption:=\@classoptionslist\do{% + \@ifundefined{KV@#1@\CurrentOption}{% + }{% + \@ifundefined{KV@#1@\CurrentOption @default}{% + \PackageInfo{#1}{Global option `\CurrentOption' ignored}% + }{% + \PackageInfo{#1}{Global option `\CurrentOption' processed}% + \edef\caption@tempa{\caption@tempa,\CurrentOption,}% + \@expandtwoargs\@removeelement\CurrentOption + \@unusedoptionlist\@unusedoptionlist + }% + }% + }% + \edef\caption@tempa{% + \noexpand\caption@setkeys{#1}{% + \caption@tempa\@ptionlist{\@currname.\@currext}% + }% + }% + \caption@tempa + \let\CurrentOption\@empty + \AtEndOfPackage{\let\@unprocessedoptions\relax}} +\@onlypreamble\caption@ProcessOptions \newdimen\captionmargin \newdimen\captionmarginx \newdimen\captionwidth @@ -160,11 +194,11 @@ \@ifstar{\caption@@setstyle\@gobble}{\caption@@setstyle\@firstofone}} \newcommand*\caption@@setstyle[2]{% \@ifundefined{caption@sty@#2}% - {#1{\PackageError{caption}{Undefined caption style `#2'}{\caption@eh}}}% + {#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{% - format=default,labelformat=default,labelsep=default,% + format=default,labelformat=default,labelsep=default,textformat=default,% justification=default,font=default,labelfont=default,textfont=default,% margin=0pt,indent=0pt,parindent=0pt,hangindent=0pt,% singlelinecheck=1,strut=1}} @@ -180,7 +214,7 @@ \DeclareCaptionOption{format}{\caption@setformat{#1}} \newcommand*\caption@setformat[1]{% \@ifundefined{caption@fmt@#1}% - {\PackageError{caption}{Undefined caption format `#1'}{\caption@eh}}% + {\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} @@ -198,7 +232,7 @@ \DeclareCaptionOption{labelformat}{\caption@setlabelformat{#1}} \newcommand*\caption@setlabelformat[1]{% \@ifundefined{caption@lfmt@#1}% - {\PackageError{caption}{Undefined caption label format `#1'}{\caption@eh}}% + {\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} @@ -216,7 +250,7 @@ \DeclareCaptionOption{labelseparator}{\caption@setlabelseparator{#1}} \newcommand*\caption@setlabelseparator[1]{% \@ifundefined{caption@lsep@#1}% - {\PackageError{caption}{Undefined caption label separator `#1'}{\caption@eh}}% + {\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}{} @@ -228,22 +262,34 @@ \DeclareCaptionLabelSeparator*{endash}{\space\textendash\space} \def\caption@lsep@default{\caption@lsep@colon} \def\caption@iflf@default{\caption@iflf@colon} +\newcommand*\DeclareCaptionTextFormat[2]{% + \global\long\@namedef{caption@tfmt@#1}##1{#2}} +\@onlypreamble\DeclareCaptionTextFormat +\DeclareCaptionOption{textformat}{\caption@settextformat{#1}} +\newcommand*\caption@settextformat[1]{% + \@ifundefined{caption@tfmt@#1}% + {\caption@error{Undefined caption text format `#1'}}% + {\expandafter\let\expandafter\caption@tfmt\csname caption@tfmt@#1\endcsname}} +\DeclareCaptionTextFormat{simple}{#1} +\DeclareCaptionTextFormat{period}{#1.} +\def\caption@tfmt@default{\caption@tfmt@simple} \newcommand*\DeclareCaptionJustification[2]{% \global\@namedef{caption@hj@#1}{#2}} \@onlypreamble\DeclareCaptionJustification \DeclareCaptionOption{justification}{\caption@setjustification{#1}} \newcommand*\caption@setjustification[1]{% \@ifundefined{caption@hj@#1}% - {\PackageError{caption}{Undefined caption justification `#1'}{\caption@eh}}% + {\caption@error{Undefined caption justification `#1'}}% {\expandafter\let\expandafter\caption@hj\csname caption@hj@#1\endcsname}} \DeclareCaptionJustification{justified}{} \DeclareCaptionJustification{centering}{\centering} -\DeclareCaptionJustification{centerfirst}{\caption@centerfirst} -\DeclareCaptionJustification{centerlast}{\caption@centerlast} +\DeclareCaptionJustification{centerfirst}{\centerfirst} +\DeclareCaptionJustification{centerlast}{\centerlast} \DeclareCaptionJustification{raggedleft}{\raggedleft} \DeclareCaptionJustification{raggedright}{\raggedright} \def\caption@hj@default{\caption@hj@justified} -\newcommand\caption@centerfirst{% +\providecommand\centerfirst{% + \let\\\@centercr \edef\caption@normaladjust{% \leftskip\the\leftskip \rightskip\the\rightskip @@ -253,7 +299,8 @@ \parfillskip\z@skip \noindent\hskip\z@\@plus 2fil% \@setpar{\@@par\@restorepar\caption@normaladjust}} -\newcommand\caption@centerlast{% +\providecommand\centerlast{% + \let\\\@centercr \leftskip\z@\@plus 1fil% \rightskip\z@\@plus -1fil% \parfillskip\z@\@plus 2fil\relax} @@ -281,7 +328,7 @@ \newcommand*\caption@setfont[2]{% \let\caption@tempa\@empty \begingroup - \caption@setkeys{caption@fnt}{#2}% + \caption@setkeys[caption]{caption@fnt}{#2}% \endgroup \expandafter\let\csname caption#1\endcsname\caption@tempa} \DeclareCaptionFont{default}{} @@ -320,7 +367,7 @@ }{\caption@ifinlist{#1}{a,auto}{% \let\caption@position\@undefined }{% - \PackageError{caption}{Undefined caption position `#1'}{\caption@eh}% + \caption@error{Undefined caption position `#1'}% }}}}} \let\caption@defaultpos\@secondoftwo \newcommand\caption@iftop{% @@ -368,7 +415,11 @@ \caption@ifh{\advance\@tempdima by -\captionindent}% \captionbox\@tempdima{% \caption@ifh{% - \hskip-\captionindent}% + \ifdim\captionindent=\z@ + \leavevmode + \else + \hskip-\captionindent + \fi}% \caption@@@make{#1}{#2}}% \@tempdima\captionmargin \advance\@tempdima by \captionmarginx @@ -427,7 +478,7 @@ {{\captiontextfont \caption@ifstrut{\vrule\@height\ht\strutbox\@width\z@}{}% \nobreak\hskip\z@skip - #2% + \caption@tfmt{#2}% \caption@ifstrut{\@finalstrut\strutbox}{}% \par}}} \newcommand\caption@ifempty[1]{% @@ -443,6 +494,13 @@ \fi} \newcommand*\caption@@par{% \parindent\captionparindent\hangindent\captionhangindent}% +\AtBeginDocument{% + \def\@tempa{\@ifstar\sf@@subref\sf@subref}% + \ifx\subref\@tempa + \PackageInfo{caption}{subref 1.2 or 1.3 detected}% + \DeclareRobustCommand*\subref{\@ifstar\sf@@subref\sf@subref}% + \fi +} \endinput %% %% End of file `caption3.sty'. |