caption (4feb13)

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

7 files changed, 58 insertions, 34 deletions

diff --git a/Master/texmf-dist/tex/latex/caption/bicaption.sty b/Master/texmf-dist/tex/latex/caption/bicaption.sty
index 94b6fecdb8a..f3ca79f4242 100644
--- a/Master/texmf-dist/tex/latex/caption/bicaption.sty
+++ b/Master/texmf-dist/tex/latex/caption/bicaption.sty
@@ -6,7 +6,9 @@
 %%
 %% bicaption.dtx  (with options: `package')
 %% 
-%% Copyright (C) 1994-2013 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
+%% Copyright (C) 1994-2013 Axel Sommerfeldt
+%% 
+%% http://sourceforge.net/projects/latex-caption/
 %% 
 %% --------------------------------------------------------------------------
 %% 
@@ -29,7 +31,10 @@
 %% and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex.
 %% 
 \NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{bicaption}[2012/12/26 v1.1 Bilingual Captions (AR)]
+\def\caption@tempa$Id: #1 #2 #3-#4-#5 #6${%
+  \def\caption@tempa{#3/#4/#5 }\def\caption@tempb{#2 }}
+\caption@tempa $Id: bicaption.sty 62 2013-02-03 10:40:15Z sommerfeldt $
+\ProvidesPackage{bicaption}[\caption@tempa v1.1-\caption@tempb Bilingual Captions (AR)]
 \RequirePackage{caption}[2012/12/26] % needs v3.3 or newer
 \caption@AtBeginDocument{\caption@ifcompatibility{%
   \caption@Error{%
diff --git a/Master/texmf-dist/tex/latex/caption/caption.sty b/Master/texmf-dist/tex/latex/caption/caption.sty
index bf396d89096..8e6755e630d 100644
--- a/Master/texmf-dist/tex/latex/caption/caption.sty
+++ b/Master/texmf-dist/tex/latex/caption/caption.sty
@@ -6,7 +6,9 @@
 %%
 %% caption.dtx  (with options: `package')
 %% 
-%% Copyright (C) 1994-2013 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
+%% Copyright (C) 1994-2013 Axel Sommerfeldt
+%% 
+%% http://sourceforge.net/projects/latex-caption/
 %% 
 %% --------------------------------------------------------------------------
 %% 
@@ -30,7 +32,10 @@
 %% 
  % bicaption.sty, ltcaption.sty, subcaption.sty, and newfloat.sty,
 \NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption}[2013/01/06 v3.3 Customizing captions (AR)]
+\def\caption@tempa$Id: #1 #2 #3-#4-#5 #6${%
+  \def\caption@tempa{#3/#4/#5 }\def\caption@tempb{#2 }}
+\caption@tempa $Id: caption.sty 65 2013-02-03 15:09:48Z sommerfeldt $
+\ProvidesPackage{caption}[\caption@tempa v3.3-\caption@tempb Customizing captions (AR)]
 \RequirePackage{caption3}[2012/12/26] % needs v1.5 or newer
 \caption@ifbool{documentclass}{}{%
   \caption@WarningNoLine{%
@@ -654,10 +659,6 @@
         \caption@Debug{%
           Restore hypcap definition of \string\capstart\@gobble}%
         \let\capstart\caption@ORI@capstart}%
-      \caption@ifundefined\caption@ORI@float@makebox{}{%
-        \caption@Debug{%
-          Restore hyperref redefinition of \string\float@makebox\@gobble}%
-        \let\float@makebox\caption@ORI@float@makebox}%
     }%
     \renewcommand*\caption@star[2]{#1#2}%
   }{%
@@ -673,8 +674,7 @@
     \caption@redefine
   }%
   \caption@AtBeginDocument*{%
-    \let\caption@ORI@capstart\@undefined
-    \let\caption@ORI@float@makebox\@undefined}%
+    \let\caption@ORI@capstart\@undefined}%
   \let\caption@ORI@xfloat\@xfloat
   \def\@xfloat#1[#2]{%
     \caption@ORI@xfloat{#1}[#2]%
@@ -1208,6 +1208,13 @@
     }{}%
     \caption@freezeHref % will be defrosted in \float@makebox
     \caption@ORI@float@setevery{#1}}%
+  \caption@AtBeginDocument{\caption@ifcompatibility{}{%
+    \caption@ifundefined\HyOrg@float@makebox
+      {\let\caption@ORI@float@makebox\float@makebox}%
+      {\let\caption@ORI@float@makebox\HyOrg@float@makebox}%
+    \renewcommand\float@makebox[1]{%
+      \caption@ORI@float@makebox{#1\relax \caption@defrostHref}}%
+  }}%
   \g@addto@macro\caption@typehook{%
     \expandafter\ifx\csname #1name\endcsname\relax
       \expandafter\let\csname #1name\expandafter\endcsname
@@ -1398,19 +1405,6 @@
         \caption@startanchor\caption@currentHref
         \global\let\caption@currentHref\@undefined
       \fi}%
-    \caption@ifundefined\HyNew@float@makebox{}{%
-      \caption@ifundefined\HyOrg@float@makebox{%
-        \caption@Debug{%
-          Correcting wrong load order hyperref-float\@gobble}%
-        \let\HyOrg@float@makebox\float@makebox
-        \let\float@makebox\HyNew@float@makebox}{}}%
-    \caption@ifundefined\HyOrg@float@makebox{}{%
-      \caption@Debug{%
-        Redefining \noexpand\float@makebox (again)\@gobble}%
-      \let\caption@ORI@float@makebox\float@makebox % save for compatibility mode
-      \renewcommand\float@makebox[1]{%
-        \HyOrg@float@makebox{#1\relax \caption@defrostHref}}%
-    }%
   }}{}
 \caption@IfPackageLoaded{hypcap}{% v1.0
   \ifx\caption@start\relax \else % hyperref hasn't stopped early
diff --git a/Master/texmf-dist/tex/latex/caption/caption2.sty b/Master/texmf-dist/tex/latex/caption/caption2.sty
index 415b7241b01..a4a37457c66 100644
--- a/Master/texmf-dist/tex/latex/caption/caption2.sty
+++ b/Master/texmf-dist/tex/latex/caption/caption2.sty
@@ -6,7 +6,9 @@
 %%
 %% caption2.dtx  (with options: `package')
 %% 
-%% Copyright (C) 1994-2013 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
+%% Copyright (C) 1994-2013 Axel Sommerfeldt
+%% 
+%% http://sourceforge.net/projects/latex-caption/
 %% 
 %% --------------------------------------------------------------------------
 %% 
@@ -29,7 +31,10 @@
 %% and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex.
 %% 
 \NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption2}[2011/08/12 v2.2d Customising captions (AR)]
+\def\caption@tempa$Id: #1 #2 #3-#4-#5 #6${%
+  \def\caption@tempa{#3/#4/#5 }\def\caption@tempb{#2 }}
+\caption@tempa $Id: caption2.sty 62 2013-02-03 10:40:15Z sommerfeldt $
+\ProvidesPackage{caption2}[\caption@tempa v2.2-\caption@tempb Customising captions (AR)]
 \PackageWarning{caption2}{%
   ****************************************************\MessageBreak
   THIS PACKAGE IS OBSOLETE:\MessageBreak
diff --git a/Master/texmf-dist/tex/latex/caption/caption3.sty b/Master/texmf-dist/tex/latex/caption/caption3.sty
index 17eb5c5743c..c524f77aa1c 100644
--- a/Master/texmf-dist/tex/latex/caption/caption3.sty
+++ b/Master/texmf-dist/tex/latex/caption/caption3.sty
@@ -6,7 +6,9 @@
 %%
 %% caption3.dtx  (with options: `package')
 %% 
-%% Copyright (C) 1994-2013 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
+%% Copyright (C) 1994-2013 Axel Sommerfeldt
+%% 
+%% http://sourceforge.net/projects/latex-caption/
 %% 
 %% --------------------------------------------------------------------------
 %% 
@@ -29,7 +31,10 @@
 %% and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex.
 %% 
 \NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption3}[2013/01/06 v1.5 caption3 kernel (AR)]
+\def\caption@tempa$Id: #1 #2 #3-#4-#5 #6${%
+  \def\caption@tempa{#3/#4/#5 }\def\caption@tempb{#2 }}
+\caption@tempa $Id: caption3.sty 62 2013-02-03 10:40:15Z sommerfeldt $
+\ProvidesPackage{caption3}[\caption@tempa v1.5-\caption@tempb caption3 kernel (AR)]
 \providecommand*\@nameundef[1]{%
   \expandafter\let\csname #1\endcsname\@undefined}
 \providecommand\l@addto@macro[2]{%
@@ -1494,7 +1499,7 @@
      \caption@ifundefined\contentsuse{}{%
        \contentsuse{sub#3}{\csname ext@sub#3\endcsname}}%
      \@namedef{sub#3name}{}%
-     \@namedef{sub#3autorefname}{\csname #3name\endcsname}%
+     \@namedef{sub#3autorefname}{\csname #3autorefname\endcsname}%
      #1% is \@firstoftwo in star form, and \@secondoftwo otherwise
      {\@namedef{p@sub#3}{}%
       \@namedef{thesub#3}{\csname the#3\endcsname.\@nameuse{#2}{sub#3}}}%
diff --git a/Master/texmf-dist/tex/latex/caption/ltcaption.sty b/Master/texmf-dist/tex/latex/caption/ltcaption.sty
index 58bf6ddc01d..153f4c875f0 100644
--- a/Master/texmf-dist/tex/latex/caption/ltcaption.sty
+++ b/Master/texmf-dist/tex/latex/caption/ltcaption.sty
@@ -6,7 +6,9 @@
 %%
 %% ltcaption.dtx  (with options: `package')
 %% 
-%% Copyright (C) 1994-2013 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
+%% Copyright (C) 1994-2013 Axel Sommerfeldt
+%% 
+%% http://sourceforge.net/projects/latex-caption/
 %% 
 %% --------------------------------------------------------------------------
 %% 
@@ -29,7 +31,10 @@
 %% and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex.
 %% 
 \NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{ltcaption}[2011/09/12 v1.3 longtable captions (AR)]
+\def\caption@tempa$Id: #1 #2 #3-#4-#5 #6${%
+  \def\caption@tempa{#3/#4/#5 }\def\caption@tempb{#2 }}
+\caption@tempa $Id: ltcaption.sty 62 2013-02-03 10:40:15Z sommerfeldt $
+\ProvidesPackage{ltcaption}[\caption@tempa v1.3-\caption@tempb longtable captions (AR)]
 \@ifpackageloaded{longtable}{}{%
   \PackageError{ltcaption}{longtable package not loaded, aborting}{RTFM}}
 \providecommand*\LTcaptype{table}
diff --git a/Master/texmf-dist/tex/latex/caption/newfloat.sty b/Master/texmf-dist/tex/latex/caption/newfloat.sty
index 507be3322d4..b945f492bbb 100644
--- a/Master/texmf-dist/tex/latex/caption/newfloat.sty
+++ b/Master/texmf-dist/tex/latex/caption/newfloat.sty
@@ -6,7 +6,9 @@
 %%
 %% newfloat.dtx  (with options: `package')
 %% 
-%% Copyright (C) 1994-2013 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
+%% Copyright (C) 1994-2013 Axel Sommerfeldt
+%% 
+%% http://sourceforge.net/projects/latex-caption/
 %% 
 %% --------------------------------------------------------------------------
 %% 
@@ -29,7 +31,10 @@
 %% and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex.
 %% 
 \NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{newfloat}[2012/05/19 v1.0b Defining new floating environments (AR)]
+\def\caption@tempa$Id: #1 #2 #3-#4-#5 #6${%
+  \def\caption@tempa{#3/#4/#5 }\def\caption@tempb{#2 }}
+\caption@tempa $Id: newfloat.sty 62 2013-02-03 10:40:15Z sommerfeldt $
+\ProvidesPackage{newfloat}[\caption@tempa v1.0-\caption@tempb Defining new floating environments (AR)]
 \newcommand*\newfloat@Info[1]{%
   \PackageInfo{newfloat}{#1}}
 \newcommand*\newfloat@InfoNoLine[1]{%
diff --git a/Master/texmf-dist/tex/latex/caption/subcaption.sty b/Master/texmf-dist/tex/latex/caption/subcaption.sty
index 56ba02f214a..759a19ab24d 100644
--- a/Master/texmf-dist/tex/latex/caption/subcaption.sty
+++ b/Master/texmf-dist/tex/latex/caption/subcaption.sty
@@ -6,7 +6,9 @@
 %%
 %% subcaption.dtx  (with options: `package')
 %% 
-%% Copyright (C) 1994-2013 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
+%% Copyright (C) 1994-2013 Axel Sommerfeldt
+%% 
+%% http://sourceforge.net/projects/latex-caption/
 %% 
 %% --------------------------------------------------------------------------
 %% 
@@ -29,7 +31,10 @@
 %% and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex.
 %% 
 \NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{subcaption}[2012/04/09 v1.1f Sub-captions (AR)]
+\def\caption@tempa$Id: #1 #2 #3-#4-#5 #6${%
+  \def\caption@tempa{#3/#4/#5 }\def\caption@tempb{#2 }}
+\caption@tempa $Id: subcaption.sty 62 2013-02-03 10:40:15Z sommerfeldt $
+\ProvidesPackage{subcaption}[\caption@tempa v1.1-\caption@tempb Sub-captions (AR)]
 \RequirePackage{caption}[2012/03/25] % needs v3.3 or newer
 \caption@AtBeginDocument{\caption@ifcompatibility{%
   \caption@Error{%