caption 3.1b (22sep07)

git-svn-id: svn://tug.org/texlive/trunk@5018 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 13 insertions, 18 deletions

diff --git a/Master/texmf-dist/tex/latex/caption/caption3.sty b/Master/texmf-dist/tex/latex/caption/caption3.sty
index 14a28367e74..4bc31c25115 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/09/16 v3.1a caption3 kernel (AR)]
+\ProvidesPackage{caption3}[2007/09/22 v3.1b caption3 kernel (AR)]
 \providecommand*\@nameundef[1]{%
   \expandafter\let\csname #1\endcsname\@undefined}
 \providecommand\l@addto@macro[2]{%
@@ -153,12 +153,11 @@
    \caption@@begindocumenthook
    \let\caption@@begindocumenthook\@undefined
    \PackageInfo{caption}{End \noexpand\AtBeginDocument code\@gobble}}
-\newcommand*\caption@Error[1]{%
-  \PackageError\caption@Package{#1}\caption@eh}
-\newcommand*\caption@Package{caption}
+\newcommand*\caption@Error[1]{\PackageError{caption}{#1}\caption@eh}
+\let\caption@KV@err\caption@Error
 \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.\MessageBreak
   \@ehc}
 \RequirePackage{keyval}[1997/11/10]
 \providecommand*\undefine@key[2]{%
@@ -257,22 +256,18 @@
       on input line \csname caption@opt@#1@lineno\endcsname}}}
 \newcommand*\caption@setkeys{\@dblarg\caption@@setkeys}
 \long\def\caption@@setkeys[#1]#2#3{%
-  \ifx\caption@keydepth\@empty
-    \let\caption@ORI@KV@errx\KV@errx
-    \let\caption@ORI@KV@err\KV@err
-    \let\KV@errx\caption@Error
-    \let\KV@err\caption@Error
-  \fi
-  \l@addto@macro\caption@keydepth.%
-  \def\caption@Package{#1}%
+  \expandafter\let\csname ORI@KV@err\caption@keydepth\endcsname\KV@err
+  \expandafter\let\csname ORI@KV@errx\caption@keydepth\endcsname\KV@errx
+  \@ifundefined{#1@KV@err}%
+    {\let\KV@err\ORI@KV@err\let\KV@errx\ORI@KV@errx}%
+    {\expandafter\let\expandafter\KV@err\csname #1@KV@err\endcsname
+     \let\KV@errx\KV@err}%
+  \l@addto@macro\caption@keydepth i%
   \caption@Debug{\protect\setkeys{#2}{#3}}%
   \setkeys{#2}{#3}%
-  \def\caption@Package{caption}%
   \edef\caption@keydepth{\expandafter\@cdr\caption@keydepth\@nil}%
-  \ifx\caption@keydepth\@empty
-    \let\KV@errx\caption@ORI@KV@errx
-    \let\KV@err\caption@ORI@KV@err
-  \fi}
+  \expandafter\let\expandafter\KV@err\csname ORI@KV@err\caption@keydepth\endcsname
+  \expandafter\let\expandafter\KV@errx\csname ORI@KV@errx\caption@keydepth\endcsname}
 \let\caption@keydepth\@empty
 \newcommand*\caption@ExecuteOptions[2]{%
   \@expandtwoargs\caption@setkeys{#1}{#2}}%