From 4c1269d4c5953786fff1af6ed5c07fc595e91fa3 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 27 Oct 2007 17:51:15 +0000 Subject: caption 3.1d (26oct07) git-svn-id: svn://tug.org/texlive/trunk@5284 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/caption/caption.sty | 27 ++++++++++++------------ Master/texmf-dist/tex/latex/caption/caption3.sty | 23 +++++++++++--------- 2 files changed, 27 insertions(+), 23 deletions(-) (limited to 'Master/texmf-dist/tex/latex/caption') 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 -- cgit v1.2.3