summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-10-11 00:11:10 +0000
committerKarl Berry <karl@freefriends.org>2009-10-11 00:11:10 +0000
commit33f064e1a7beda1691c83d430ea320c2ecc36a11 (patch)
treeda1a936dd9824252939f52fb6ae562d3160f3c79 /Master/texmf-dist/tex
parentbcda2cdc279653e631186f23777eebe8b02c0d70 (diff)
caption update (10oct09)
git-svn-id: svn://tug.org/texlive/trunk@15752 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/caption/caption.sty320
-rw-r--r--Master/texmf-dist/tex/latex/caption/caption2.sty2
-rw-r--r--Master/texmf-dist/tex/latex/caption/caption3.sty104
-rw-r--r--Master/texmf-dist/tex/latex/caption/ltcaption.sty2
-rw-r--r--Master/texmf-dist/tex/latex/caption/subcaption.sty2
5 files changed, 257 insertions, 173 deletions
diff --git a/Master/texmf-dist/tex/latex/caption/caption.sty b/Master/texmf-dist/tex/latex/caption/caption.sty
index 5db710300bb..c4b7ff5b642 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-2008 Axel Sommerfeldt (caption@sommerfee.de)
+%% Copyright (C) 1994-2009 Axel Sommerfeldt (caption@sommerfee.de)
%%
%% --------------------------------------------------------------------------
%%
@@ -28,10 +28,16 @@
%% user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex.
%%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption}[2008/08/24 v3.1j Customizing captions (AR)]
+\ProvidesPackage{caption}[2009/10/09 v3.1k Customizing captions (AR)]
\newcommand*\caption@Info[1]{\PackageInfo{caption}{#1\@gobble}}
\@onlypreamble\caption@Info
\RequirePackage{caption3}[2008/08/24] % needs v3.1j or newer
+\caption@ifbool{documentclass}{}{%
+ \caption@WarningNoLine{%
+ Unsupported document class (or package) detected,\MessageBreak
+ usage of the caption package is not recommended}%
+ \caption@Info{\string\@makecaption\space=\space\meaning\@makecaption}%
+}
\@ifpackageloaded{caption2}{%
\caption@Error{%
You can't use both, the (obsolete) caption2 *and*\MessageBreak
@@ -50,87 +56,6 @@
\caption@Error{Usage of the `position' option is incompatible\MessageBreak
to the `#1' package}}}
\@onlypreamble\caption@DisablePositionOption
-\caption@ifbool{documentclass}{}{%
- \caption@WarningNoLine{%
- Unsupported document class (or package) detected,\MessageBreak
- usage of the caption package is not recommended}%
- \caption@Info{\string\@makecaption\space=\space\meaning\@makecaption}%
-}
-\@ifundefined{@captionheadfont}{}{%
- \caption@Info{AMS or SMF document class}%
- \setlength\belowcaptionskip{0pt}% set to 12pt by AMS class
-}
-\@ifundefined{scr@caption}{}{%
- \caption@Info{KOMA-Script document class}%
- \g@addto@macro\@tablecaptionabovetrue{\captionsetup*[table]{position=t}}
- \g@addto@macro\@tablecaptionabovefalse{\captionsetup*[table]{position=b}}
- \if@tablecaptionabove
- \@tablecaptionabovetrue
- \else
- \@tablecaptionabovefalse
- \fi
- \g@addto@macro\onelinecaptionstrue{\let\caption@ifslc\@firstoftwo}
- \g@addto@macro\onelinecaptionsfalse{\let\caption@ifslc\@secondoftwo}
- \ifonelinecaptions
- \onelinecaptionstrue
- \else
- \onelinecaptionsfalse
- \fi
- \g@addto@macro\@captionabovetrue{\let\caption@position\@firstoftwo}
- \g@addto@macro\@captionabovefalse{\let\caption@position\@secondoftwo}
- \let\caption@KOMA@setcapindent\@setcapindent
- \renewcommand*\@setcapindent[1]{%
- \caption@KOMA@setcapindent{#1}\caption@setcapindent}
- \let\caption@KOMA@@setcapindent\@@setcapindent
- \renewcommand*\@@setcapindent[1]{%
- \caption@KOMA@@setcapindent{#1}\caption@setcapindent}
- \newcommand*\caption@setcapindent{%
- \captionsetup{indent=\ifdim\cap@indent<\z@\z@\else\cap@indent\fi}}
- \@ifundefined{cap@indent}{}{\caption@setcapindent}
- \expandafter\let\expandafter\caption@KOMA@setcapwidth
- \csname\string\setcapwidth\endcsname
- \@namedef{\string\setcapwidth}[#1]#2{%
- \caption@KOMA@setcapwidth[#1]{#2}\caption@setcapwidth{#1}}
- \newcommand*\caption@setcapwidth[1]{%
- \ifx\\#1\\\else
- \@ifundefined{cap@margin}{}{%
- \def\@tempa{captionbeside}%
- \ifx\@tempa\@currenvir\else\caption@Warning{%
- Ignoring optional argument [#1] of \string\setcapwidth\MessageBreak}%
- \fi}%
- \fi
- \captionsetup{width=\cap@width}}
- \def\caption@tempa{\hsize}%
- \ifx\caption@tempa\cap@width \else
- \caption@setcapwidth{?}
- \fi
- \expandafter\let\expandafter\caption@KOMA@setcapmargin
- \csname\string\@setcapmargin\endcsname
- \@namedef{\string\@setcapmargin}[#1]#2{%
- \caption@KOMA@setcapmargin[#1]{#2}\caption@setcapmargin}
- \expandafter\let\expandafter\caption@KOMA@@setcapmargin
- \csname\string\@@setcapmargin\endcsname
- \@namedef{\string\@@setcapmargin}[#1]#2{%
- \caption@KOMA@@setcapmargin[#1]{#2}\caption@setcapmargin}
- \newcommand*\caption@setcapmargin{%
- \begingroup
- \let\onelinecaptionsfalse\relax
- \def\@twoside{0}%
- \def\if@twoside{\def\@twoside{1}\iffalse}%
- \cap@margin
- \def\@tempa{\endgroup}%
- \ifx\cap@left\hfill\else\ifx\cap@right\hfill\else
- \def\hspace##1##{\@firstofone}%
- \edef\@tempa{\endgroup
- \noexpand\captionsetup{%
- twoside=\@twoside,slc=0,%
- margin={\cap@left,\cap@right}}}%
- \fi\fi
- \@tempa}
- \ifx\cap@margin\relax \else
- \caption@setcapmargin
- \fi
-}
\DeclareCaptionOption{figureposition}{%
\captionsetup*[figure]{position=#1}}
\@onlypreamble@key{caption}{figureposition}
@@ -237,13 +162,94 @@
\@onlypreamble@key{caption}{FPlist}
\@onlypreamble@key{caption}{FPref}
\newcommand*\caption@setFPoption[2]{%
- \edef\@tempa{\@car#2\@nil}%
- \caption@setbool{FP#1cap}{\if c\@tempa 1\else 0\fi}}
+ \edef\caption@tempa{\@car#2\@nil}%
+ \caption@setbool{FP#1cap}{\if c\caption@tempa 1\else 0\fi}}
\@onlypreamble\caption@setFPoption
\captionsetup{FPlist=caption,FPref=figure}
\DeclareCaptionOption{hypcap}[1]{\caption@setbool{hypcap}{#1}}
\DeclareCaptionOption{hypcapspace}{\def\caption@hypcapspace{#1}}
\captionsetup{hypcap=1,hypcapspace=.5\baselineskip}
+\@ifundefined{@captionheadfont}{}{%
+ \caption@Info{AMS or SMF document class}%
+ \setlength\belowcaptionskip{0pt}% set to 12pt by AMS class
+}
+\@ifundefined{scr@caption}{}{%
+ \caption@Info{KOMA-Script document class}%
+ \g@addto@macro\@tablecaptionabovetrue{\captionsetup*[table]{position=t}}
+ \g@addto@macro\@tablecaptionabovefalse{\captionsetup*[table]{position=b}}
+ \if@tablecaptionabove
+ \@tablecaptionabovetrue
+ \else
+ \@tablecaptionabovefalse
+ \fi
+ \g@addto@macro\onelinecaptionstrue{\let\caption@ifslc\@firstoftwo}
+ \g@addto@macro\onelinecaptionsfalse{\let\caption@ifslc\@secondoftwo}
+ \ifonelinecaptions
+ \onelinecaptionstrue
+ \else
+ \onelinecaptionsfalse
+ \fi
+ \g@addto@macro\@captionabovetrue{\let\caption@position\@firstoftwo}
+ \g@addto@macro\@captionabovefalse{\let\caption@position\@secondoftwo}
+ \DeclareCaptionOption{figureposition}{%
+ \caption@WarningNoLine{Option `figureposition=#1' has no effect\MessageBreak
+ when used with a KOMA script document class}}
+ \DeclareCaptionOption{tableposition}{%
+ \caption@WarningNoLine{Option `tableposition=#1' has no effect\MessageBreak
+ when used with a KOMA script document class}}
+ \let\caption@KOMA@setcapindent\@setcapindent
+ \renewcommand*\@setcapindent[1]{%
+ \caption@KOMA@setcapindent{#1}\caption@setcapindent}
+ \let\caption@KOMA@@setcapindent\@@setcapindent
+ \renewcommand*\@@setcapindent[1]{%
+ \caption@KOMA@@setcapindent{#1}\caption@setcapindent}
+ \newcommand*\caption@setcapindent{%
+ \captionsetup{indent=\ifdim\cap@indent<\z@\z@\else\cap@indent\fi}}
+ \@ifundefined{cap@indent}{}{\caption@setcapindent}
+ \expandafter\let\expandafter\caption@KOMA@setcapwidth
+ \csname\string\setcapwidth\endcsname
+ \@namedef{\string\setcapwidth}[#1]#2{%
+ \caption@KOMA@setcapwidth[#1]{#2}\caption@setcapwidth{#1}}
+ \newcommand*\caption@setcapwidth[1]{%
+ \ifx\\#1\\\else
+ \@ifundefined{cap@margin}{}{%
+ \def\@tempa{captionbeside}%
+ \ifx\@tempa\@currenvir\else\caption@Warning{%
+ Ignoring optional argument [#1] of \string\setcapwidth\MessageBreak}%
+ \fi}%
+ \fi
+ \captionsetup{width=\cap@width}}
+ \def\caption@tempa{\hsize}%
+ \ifx\caption@tempa\cap@width \else
+ \caption@setcapwidth{?}
+ \fi
+ \expandafter\let\expandafter\caption@KOMA@setcapmargin
+ \csname\string\@setcapmargin\endcsname
+ \@namedef{\string\@setcapmargin}[#1]#2{%
+ \caption@KOMA@setcapmargin[#1]{#2}\caption@setcapmargin}
+ \expandafter\let\expandafter\caption@KOMA@@setcapmargin
+ \csname\string\@@setcapmargin\endcsname
+ \@namedef{\string\@@setcapmargin}[#1]#2{%
+ \caption@KOMA@@setcapmargin[#1]{#2}\caption@setcapmargin}
+ \newcommand*\caption@setcapmargin{%
+ \begingroup
+ \let\onelinecaptionsfalse\relax
+ \def\@twoside{0}%
+ \def\if@twoside{\def\@twoside{1}\iffalse}%
+ \cap@margin
+ \def\@tempa{\endgroup}%
+ \ifx\cap@left\hfill\else\ifx\cap@right\hfill\else
+ \def\hspace##1##{\@firstofone}%
+ \edef\@tempa{\endgroup
+ \noexpand\captionsetup{%
+ twoside=\@twoside,slc=0,%
+ margin={\cap@left,\cap@right}}}%
+ \fi\fi
+ \@tempa}
+ \ifx\cap@margin\relax \else
+ \caption@setcapmargin
+ \fi
+}
\caption@ProcessOptions*{caption}
\caption@AtBeginDocument{%
\DeclareCaptionOption{type}{\caption@settype{#1}}%
@@ -266,11 +272,11 @@
\caption@checkgrouplevel{#1}{%
\captionsetup{#1type#2*\@empty=...}#2{ or
\@backslashchar#1captionof}{}}%
- \edef\@tempa{#3}%
- \expandafter\ifx\csname @#1captype\endcsname\@tempa \else
+ \edef\caption@tempa{#3}%
+ \expandafter\ifx\csname @#1captype\endcsname\caption@tempa \else
\ifcaptionsetup@star\else\@nameuse{caption@#1type@warning}\fi
\fi
- \expandafter\let\csname @#1captype\endcsname\@tempa
+ \expandafter\let\csname @#1captype\endcsname\caption@tempa
\@nameuse{caption@#1typehook}%
\caption@setoptions{#3}%
\ifx\caption@opt\relax
@@ -310,7 +316,7 @@
\fi
\newcommand*\caption@undefinedlabel{%
\protect\caption@xref{\caption@labelname}{\on@line}}
-\newcommand*\caption@xref[2]{%
+\DeclareRobustCommand*\caption@xref[2]{%
\caption@WarningNoLine{\noexpand\label before \string\caption#2}%
\@setref\relax\@undefined{#1}}
\newcommand*\caption@labelname{??}
@@ -355,8 +361,8 @@
\def\caption@resetContinuedFloat##1{\xdef\caption@CFtype{##1}}%
\caption@@ContinuedFloat}
\def\caption@Continued@Float#1{%
- \edef\@tempa{#1}%
- \ifx\@tempa\caption@CFtype
+ \edef\caption@tempa{#1}%
+ \ifx\caption@tempa\caption@CFtype
\stepcounter{ContinuedFloat}%
\let\caption@resetContinuedFloat\@gobble
\caption@@ContinuedFloat{#1}%
@@ -424,7 +430,47 @@
\let\caption@@start\relax
\let\caption@freezeHref\relax
\let\caption@defrostHref\relax
-\caption@AtBeginDocument{%
+\def\caption@caption{%
+ \caption@iftype
+ {\caption@checkgrouplevel\@empty\caption
+ \caption@star
+ {\caption@refstepcounter\@captype}%
+ {\caption@dblarg{\@caption\@captype}}}%
+ {\caption@Error{\noexpand\caption outside float}}}%
+\newcommand*\caption@star[2]{%
+ \@ifstar{\global\caption@startrue#2[]}{#1#2}}%
+\long\def\caption@@caption#1[#2]#3{%
+ \ifcaption@star \else
+ \caption@prepareanchor{#1}{#2}%
+ \fi
+ \par
+ \caption@beginex{#1}{#2}{#3}%
+ \caption@setfloatcapt{%
+ \caption@boxrestore
+ \if@minipage
+ \@setminipage
+ \fi
+ \caption@normalsize
+ \ifcaption@star
+ \let\caption@makeanchor\@firstofone
+ \fi
+ \@makecaption{\csname fnum@#1\endcsname}%
+ {\ignorespaces\caption@makeanchor{#3}}\par
+ \caption@if@minipage\@minipagetrue\@minipagefalse}%
+ \caption@end}%
+\newcommand*\caption@prepareanchor[2]{%
+ \caption@makecurrent{#1}{#2}%
+ \caption@ifhypcap\caption@@start{}}
+\long\def\caption@makecaption#1#2{%
+ \caption@iftop
+ {\vskip\belowcaptionskip}%
+ {\caption@rule\vskip\abovecaptionskip}%
+ \caption@@make{#1}{#2}%
+ \caption@iftop
+ {\vskip\abovecaptionskip\caption@rule}%
+ {\vskip\belowcaptionskip}}
+\newcommand*\caption@redefine{}
+\g@addto@macro\caption@redefine{%
\caption@setbool{incompatible}{0}%
\caption@CheckCommand\caption{%
% ltfloat.dtx [2002/10/01 v1.1v LaTeX Kernel (Floats)]
@@ -625,13 +671,14 @@
\caption@setbool{incompatible}{1}}%
\@ifundefined{caption@ifcompatibility}%
{\let\caption@ifcompatibility\caption@ifincompatible
- \let\@tempa\caption@WarningNoLine}%
- {\let\@tempa\@gobble}% suppress warning
+ \let\caption@tempa\caption@WarningNoLine}%
+ {\let\caption@tempa\@gobble}% suppress warning
\caption@ifcompatibility{%
- \@tempa{%
+ \caption@tempa{%
\noexpand\caption will not be redefined since it's already\MessageBreak
redefined by a document class or package which is\MessageBreak
unknown to the caption package}%
+ \renewcommand*\caption@redefine{}%
\renewcommand*\caption@ContinuedFloat[1]{%
\caption@Error{Not available in compatibility mode}}%
\caption@AtBeginDocument*{%
@@ -645,7 +692,7 @@
Restore hyperref redefinition of \string\float@makebox\@gobble}%
\let\float@makebox\caption@ORI@float@makebox}%
}%
- \newcommand*\caption@star[2]{#1#2}%
+ \renewcommand*\caption@star[2]{#1#2}%
}{%
\caption@ifincompatible{%
\caption@WarningNoLine{%
@@ -653,37 +700,10 @@
unsupported(!) package option `compatibility=false'\MessageBreak
was given}%
}{}%
- \def\caption{%
- \caption@iftype
- {\caption@checkgrouplevel\@empty\caption
- \caption@star
- {\caption@refstepcounter\@captype}%
- {\caption@dblarg{\@caption\@captype}}}%
- {\caption@Error{\noexpand\caption outside float}}}%
- \newcommand*\caption@star[2]{%
- \@ifstar{\global\caption@startrue#2[]}{#1#2}}%
- \long\def\@caption#1[#2]#3{%
- \ifcaption@star \else
- \caption@prepareanchor{#1}{#2}%
- \fi
- \par
- \caption@beginex{#1}{#2}{#3}%
- \caption@setfloatcapt{%
- \caption@boxrestore
- \if@minipage
- \@setminipage
- \fi
- \caption@normalsize
- \ifcaption@star
- \let\caption@makeanchor\@firstofone
- \fi
- \@makecaption{\csname fnum@#1\endcsname}%
- {\ignorespaces\caption@makeanchor{#3}}\par
- \caption@if@minipage\@minipagetrue\@minipagefalse}%
- \caption@end}%
- \newcommand*\caption@prepareanchor[2]{%
- \caption@makecurrent{#1}{#2}%
- \caption@ifhypcap\caption@@start{}}
+ \renewcommand*\caption@redefine{%
+ \let\caption\caption@caption
+ \let\@caption\caption@@caption}%
+ \caption@redefine
}%
\caption@AtBeginDocument*{%
\let\caption@ORI@capstart\@undefined
@@ -693,14 +713,8 @@
\caption@ORI@xfloat{#1}[#2]%
\caption@settype{#1}}%
}
-\long\def\@makecaption#1#2{%
- \caption@iftop
- {\vskip\belowcaptionskip}%
- {\caption@rule\vskip\abovecaptionskip}%
- \caption@@make{#1}{#2}%
- \caption@iftop
- {\vskip\abovecaptionskip\caption@rule}%
- {\vskip\belowcaptionskip}}
+\caption@AtBeginDocument{\caption@redefine}
+\let\@makecaption\caption@makecaption
\def\caption@DeclareSubType sub#1\@nil{%
\caption@Debug{Initializing subtype for `#1'\@gobble}%
\@namedef{caption@c@#1}{0}%
@@ -733,6 +747,7 @@
\caption@setoptions{sub}%
\caption@setoptions{subfloat}% for subfig-package compatibility
\let\caption\caption@subcaption
+ \let\@makecaption\caption@makecaption
\fi}%
\newcommand*\caption@subcaption{%
\caption@iftype
@@ -804,9 +819,9 @@
\let\@makecaption@ORI\@makecaption
\@ifundefined{GOfrench}%
- {\let\@tempa\@firstofone}%
- {\def\@tempa{\g@addto@macro\GOfrench}}%
- \@tempa{%
+ {\let\caption@tempa\@firstofone}%
+ {\def\caption@tempa{\g@addto@macro\GOfrench}}%
+ \caption@tempa{%
\let\captionfont\captionfont@ORI
\let\captionfont@ORI\@undefined
\let\captionlabelfont\captionlabelfont@ORI
@@ -817,16 +832,16 @@
\let\caption@tcORI\@tablescaption
\def\@tablescaption{\caption@star\relax\caption@tcORI}%
\let\@eatDP\@undefined
- \let\@tempa\@empty
+ \let\caption@tempa\@empty
\ifx\f@ffrench\fnum@figure
- \l@addto@macro\@tempa{\let\fnum@figure\f@ffrench}%
+ \l@addto@macro\caption@tempa{\let\fnum@figure\f@ffrench}%
\fi
\ifx\f@tfrench\fnum@table
- \l@addto@macro\@tempa{\let\fnum@table\f@tfrench}%
+ \l@addto@macro\caption@tempa{\let\fnum@table\f@tfrench}%
\fi
\def\f@ffrench{\ifx\listoffigures\relax\else\figurename~\thefigure\fi}%
\def\f@tfrench{\ifx\listoftables\relax\else\tablename~\thetable\fi}%
- \@tempa
+ \caption@tempa
}%
}}
\newcommand\caption@IfPackageLoaded[1]{%
@@ -933,9 +948,10 @@
\def\@float@setevery#1{%
\float@ifcaption{#1}{%
\caption@setposition{\@fs@iftopcapt t\else b\fi}%
- \renewcommand\caption@setfloatcapt{%
+ \renewcommand\caption@setfloatcapt[1]{%
\let\@makecaption\caption@@make
- \global\setbox\@floatcapt\vbox}%
+ \global\setbox\@floatcapt\vbox{%
+ \color@begingroup ##1\color@endgroup}}%
\float@getstyle\float@style{#1}%
\caption@setstyle*\float@style
\caption@setoptions\float@style
@@ -1013,7 +1029,8 @@
\caption@ifFPrefcap
{\caption@freeze\relax}%
{\def\label##1{\@bsphack\gdef\FP@LabelText{##1}\@esphack}%
- \caption@freeze*}}%
+ \caption@freeze*}%
+ \ignorespaces}%
\renewcommand*\FP@floatEnd{%
\end{lrbox}%
\stepcounter{FP@\@captype C}%
@@ -1056,6 +1073,7 @@
\end\@captype}%
}%
\caption@For{typelist}{%
+ \newcounter{FP@#1C}%
\newenvironment{FP#1}{\FP@floatBegin{#1}}{\FP@floatEnd}}%
}{%
\let\caption@ifFPlistcap\@undefined
@@ -1084,7 +1102,8 @@
\fi}%
\g@addto@macro\caption@prepareslc{\let\caption@makeanchor\@firstofone}%
\newif\if@capstart
- \def\caption@start{\caption@ifhypcap{%
+ \def\caption@start{\caption@ifhypcap\caption@start@\relax}%
+ \def\caption@start@{%
\caption@makestart\@captype
\caption@startanchor\@currentHref
\global\@capstarttrue
@@ -1093,7 +1112,7 @@
\global\@capstartfalse
\global\let\@currentHref\hc@currentHref}%
\let\caption@makeanchor\@firstofone
- }{}}%
+ }%
\newcommand*\caption@makestart[1]{%
\begingroup
\Hy@hypertexnamesfalse
@@ -1154,10 +1173,12 @@
\caption@IfPackageLoaded{hypcap}{% v1.0
\ifx\caption@start\relax \else % hyperref hasn't stopped early
\let\caption@ORI@capstart\capstart % save for compatibility mode
- \let\capstart\caption@start
+ \@ifundefined{capstarttrue}% check for v1.10 of hypcap package
+ {\def\capstart{\caption@start@}}%
+ {\def\capstart{\ifcapstart\caption@start@\fi}}%
\let\caption@start\relax
\let\caption@@start\relax
- \caption@set@bool\caption@ifhypcap1%
+ \caption@set@bool\caption@ifhypcap 1%
\renewcommand*\caption@hypcapspace{\hypcapspace}%
\fi}{}
\caption@IfPackageLoaded{listings}[2004/02/13 v1.2]{%
@@ -1169,6 +1190,7 @@
\@tempdima\belowcaptionskip
\belowcaptionskip\abovecaptionskip
\abovecaptionskip\@tempdima}{}%
+ \caption@setup{rule=0}%
\caption@setoptions{lstlisting}%
\caption@setautoposition{#1}%
\caption@begin{lstlisting}%
diff --git a/Master/texmf-dist/tex/latex/caption/caption2.sty b/Master/texmf-dist/tex/latex/caption/caption2.sty
index 88edf30d74f..8b83dffa3ae 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-2008 Axel Sommerfeldt (caption@sommerfee.de)
+%% Copyright (C) 1994-2009 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 99d841e9e99..7276c25e374 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-2008 Axel Sommerfeldt (caption@sommerfee.de)
+%% Copyright (C) 1994-2009 Axel Sommerfeldt (caption@sommerfee.de)
%%
%% --------------------------------------------------------------------------
%%
@@ -28,7 +28,7 @@
%% user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex.
%%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption3}[2008/08/24 v3.1j caption3 kernel (AR)]
+\ProvidesPackage{caption3}[2009/10/09 v3.1k caption3 kernel (AR)]
\providecommand*\@nameundef[1]{%
\expandafter\let\csname #1\endcsname\@undefined}
\providecommand\l@addto@macro[2]{%
@@ -302,6 +302,10 @@
\expandafter\let\csname ORI@KV@err\caption@keydepth\endcsname\KV@err
\expandafter\let\csname ORI@KV@errx\caption@keydepth\endcsname\KV@errx
\expandafter\let\expandafter\KV@err\csname #1@KV@err\endcsname
+ \ifx\KV@err\relax
+ \def\KV@err##1{\PackageError{#1}{##1}{%
+ See the #1 package documentation for explanation.}}%
+ \fi
\let\KV@errx\KV@err
\edef\caption@keydepth{\caption@keydepth i}%
\caption@Debug{\protect\setkeys{#2}{#3}}%
@@ -380,7 +384,7 @@
\newcommand*\caption@pageref[1]{%
\expandafter\ifx\csname caption@r@#1\endcsname\relax
\G@refundefinedtrue % => 'There are undefined references.'
- \caption@Warning{Reference on page \thepage \space undefined}%
+ \@latex@warning{Reference `#1' on page \thepage \space undefined}%
\else
\expandafter\let\expandafter\caption@thepage\csname caption@r@#1\endcsname
\fi}
@@ -544,8 +548,17 @@
\DeclareCaptionLabelSeparator*{quad}{\quad}
\DeclareCaptionLabelSeparator*{newline}{\\}
\DeclareCaptionLabelSeparator*{endash}{\space\textendash\space}
-\def\caption@lsep@default{\caption@lsep@colon}
-\def\caption@iflf@default{\caption@iflf@colon}
+\newcommand*\caption@setdefaultlabelsep[1]{%
+ \ifx\caption@lsep\caption@lsep@default
+ \caption@set@default@labelsep{#1}%
+ \caption@setlabelseparator{default}%
+ \else
+ \caption@set@default@labelsep{#1}%
+ \fi}
+\newcommand*\caption@set@default@labelsep[1]{%
+ \def\caption@lsep@default{\@nameuse{caption@lsep@#1}}%
+ \def\caption@iflf@default{\@nameuse{caption@iflf@#1}}}
+\caption@set@default@labelsep{colon}
\newcommand*\DeclareCaptionTextFormat[2]{%
\global\long\@namedef{caption@tfmt@#1}##1{#2}}
\@onlypreamble\DeclareCaptionTextFormat
@@ -611,11 +624,12 @@
\DeclareCaptionFont{normalsize}{\normalsize}
\DeclareCaptionFont{large}{\large}
\DeclareCaptionFont{Large}{\Large}
-\DeclareCaptionFont{singlespacing}{\setstretch\setspace@singlespace}% normally 1
+\DeclareCaptionFont{singlespacing}{%
+ \@ifundefined{setspace@singlespace}{}{%
+ \setstretch\setspace@singlespace}}% normally 1
\DeclareCaptionFont{onehalfspacing}{\onehalfspacing}
\DeclareCaptionFont{doublespacing}{\doublespacing}
\DeclareCaptionFont{stretch}{\setstretch{#1}}
-\caption@AtBeginDocument{\providecommand*\setstretch[1]{}}
\DeclareCaptionFont{normal}{%
\caption@font*{%
\KV@caption@fnt@normalcolor\@unused
@@ -760,7 +774,16 @@
\DeclareCaptionListFormat{parens}{#1(#2)}
\DeclareCaptionListFormat{subsimple}{#2}
\DeclareCaptionListFormat{subparens}{(#2)}
-\def\caption@lstfmt@default{\caption@lstfmt@subsimple}
+\newcommand*\caption@setdefaultlistformat[1]{%
+ \ifx\caption@lstfmt\caption@lstfmt@default
+ \caption@set@default@listformat{#1}%
+ \caption@setlistformat{default}%
+ \else
+ \caption@set@default@listformat{#1}%
+ \fi}
+\newcommand*\caption@set@default@listformat[1]{%
+ \def\caption@lstfmt@default{\@nameuse{caption@lstfmt@#1}}}
+\caption@set@default@listformat{subsimple}
\DeclareCaptionOption{debug}[1]{%
\caption@set@bool\caption@ifdebug{#1}%
\caption@ifdebug
@@ -1013,6 +1036,24 @@
\DeclareCaptionDefaultFont{textfont}{\itshape}%
\DeclareCaptionLabelSeparator{default}{\captionseparator\space}%
}
+\DeclareCaptionListFormat{subperiod}{#2.}
+%%% \def\caption@tempa#1{\@ifundefined{extras#1}{}{%
+%%% \expandafter\addto\csname extras#1\endcsname{%
+%%% % reverse changes made by magyar.ldf
+%%% \let\@makecaption\caption@makecaption
+%%% \babel@save\@makecaption
+%%% \caption@redefine
+%%% \babel@save\@caption
+%%% % change default labelsep and listformat
+%%% \caption@setdefaultlabelsep{period}%
+%%% \caption@setdefaultlistformat{subperiod}}%
+%%% \expandafter\addto\csname noextras#1\endcsname{%
+%%% % change default labelsep and listformat
+%%% \caption@setdefaultlabelsep{colon}%
+%%% \caption@setdefaultlistformat{subsimple}}%
+%%% }}
+%%% \caption@tempa{hungarian}
+%%% \caption@tempa{magyar}
\captionsetup{style=default,position=default,%
list,listformat=default,twoside=\if@twoside 1\else 0\fi}
\ProcessOptions*
@@ -1268,22 +1309,15 @@
\define@key{caption@within}{none}[]{%
\caption@within{}{}}
\@onlypreamble@key{caption@within}{none}
-\@ifundefined{c@chapter}{%
- \define@key{caption@within}{section}[]{%
- \@addtoreset\caption@type{section}%
- \caption@within{\ifnum\c@section>\z@ \thesection.\fi}{\theHsection.}}
-}{%
+\define@key{caption@within}{section}[]{%
+ \@addtoreset\caption@type{section}%
+ \caption@within{\ifnum\c@section>\z@ \thesection.\fi}{\theHsection.}}
+\@onlypreamble@key{caption@within}{section}
+\@ifundefined{c@chapter}{}{%
\define@key{caption@within}{chapter}[]{%
\@addtoreset\caption@type{chapter}%
\caption@within{\ifnum\c@chapter>\z@ \thechapter.\fi}{\theHchapter.}}
- \@onlypreamble@key{caption@within}{chapter}
- \define@key{caption@within}{section}[]{%
- \@addtoreset\caption@type{chapter}%
- \@addtoreset\caption@type{section}%
- \caption@within{\ifnum\c@chapter>\z@ \thechapter.\fi
- \ifnum\c@section>\z@ \thesection.\fi}{%
- \theHchapter.\theHsection.}}
-}\@onlypreamble@key{caption@within}{section}
+ \@onlypreamble@key{caption@within}{chapter}}
\newcommand*\caption@within{%
\expandafter\caption@within@\expandafter{\caption@type}}
\@onlypreamble\caption@within
@@ -1602,6 +1636,33 @@
\endgroup}
\@onlypreamble\caption@patch@chapter
\long\def \@gobblethree #1#2#3{}
+\newcommand*\caption@patch@stpelt{%
+ \let\caption@stpelt\@stpelt
+ \def\@stpelt##1{%
+ \caption@stpelt{##1}%
+ \begingroup
+ \let\@elt\caption@stpelt
+ \csname caption@cl@##1\endcsname
+ \endgroup}%
+ \let\caption@patch@stpelt\relax}
+\@onlypreamble\caption@patch@stpelt
+\newcommand*\caption@addtoreset[2]{%
+ \caption@patch@stpelt
+ \@ifundefined{caption@cl@#2}{\@namedef{caption@cl@#2}{}}{}%
+ \expandafter\@cons\csname caption@cl@#2\endcsname{{#1}}}
+\@onlypreamble\caption@addtoreset
+\newcommand*\caption@removefromreset[2]{%
+ \begingroup
+ \expandafter\let\csname c@#1\endcsname\caption@removefromreset
+ \def\@elt##1{%
+ \expandafter\ifx\csname c@##1\endcsname\caption@removefromreset
+ \else
+ \noexpand\@elt{##1}%
+ \fi}%
+ \expandafter\xdef\csname caption@cl@#2\endcsname{%
+ \csname caption@cl@#2\endcsname}%
+ \endgroup}
+\@onlypreamble\caption@removefromreset
\newcommand*\DeclareCaptionSubType{%
\caption@teststar\@DeclareCaptionSubType\@firstoftwo\@secondoftwo}
\@onlypreamble\DeclareCaptionSubType
@@ -1614,6 +1675,7 @@
{\@ifundefined{c@sub#3}%
{\caption@Debug{New subtype `sub#3'}%
\newcounter{sub#3}%
+ \caption@addtoreset{sub#3}{#3}%
\@namedef{ext@sub#3}{\csname ext@#3\endcsname}%
\@ifundefined{l@chapter}%
{\edef\@tempa{\expandafter\expandafter\expandafter\noexpand
diff --git a/Master/texmf-dist/tex/latex/caption/ltcaption.sty b/Master/texmf-dist/tex/latex/caption/ltcaption.sty
index 073a52f626e..baa250653c8 100644
--- a/Master/texmf-dist/tex/latex/caption/ltcaption.sty
+++ b/Master/texmf-dist/tex/latex/caption/ltcaption.sty
@@ -6,7 +6,7 @@
%%
%% ltcaption.dtx (with options: `package')
%%
-%% Copyright (C) 1994-2008 Axel Sommerfeldt (caption@sommerfee.de)
+%% Copyright (C) 1994-2009 Axel Sommerfeldt (caption@sommerfee.de)
%%
%% --------------------------------------------------------------------------
%%
diff --git a/Master/texmf-dist/tex/latex/caption/subcaption.sty b/Master/texmf-dist/tex/latex/caption/subcaption.sty
index ac9c91d2306..ec9b65eecdc 100644
--- a/Master/texmf-dist/tex/latex/caption/subcaption.sty
+++ b/Master/texmf-dist/tex/latex/caption/subcaption.sty
@@ -6,7 +6,7 @@
%%
%% subcaption.dtx (with options: `package')
%%
-%% Copyright (C) 1994-2008 Axel Sommerfeldt (caption@sommerfee.de)
+%% Copyright (C) 1994-2009 Axel Sommerfeldt (caption@sommerfee.de)
%%
%% --------------------------------------------------------------------------
%%