caption (10nov11)

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

7 files changed, 52 insertions, 7 deletions

diff --git a/Master/texmf-dist/doc/latex/caption/caption-deu.pdf b/Master/texmf-dist/doc/latex/caption/caption-deu.pdf
index a2029123b05..586ebb6eaca 100644
--- a/Master/texmf-dist/doc/latex/caption/caption-deu.pdf
+++ b/Master/texmf-dist/doc/latex/caption/caption-deu.pdf
diff --git a/Master/texmf-dist/doc/latex/caption/caption-eng.pdf b/Master/texmf-dist/doc/latex/caption/caption-eng.pdf
index 312a0a2cbf0..dc1751c32a9 100644
--- a/Master/texmf-dist/doc/latex/caption/caption-eng.pdf
+++ b/Master/texmf-dist/doc/latex/caption/caption-eng.pdf
diff --git a/Master/texmf-dist/doc/latex/caption/caption.pdf b/Master/texmf-dist/doc/latex/caption/caption.pdf
index 23ff4377f38..4d29eb32e7d 100644
--- a/Master/texmf-dist/doc/latex/caption/caption.pdf
+++ b/Master/texmf-dist/doc/latex/caption/caption.pdf
diff --git a/Master/texmf-dist/doc/latex/caption/newfloat.pdf b/Master/texmf-dist/doc/latex/caption/newfloat.pdf
index 48472ea1cd1..abb31fcb1e6 100644
--- a/Master/texmf-dist/doc/latex/caption/newfloat.pdf
+++ b/Master/texmf-dist/doc/latex/caption/newfloat.pdf
diff --git a/Master/texmf-dist/source/latex/caption/caption.dtx b/Master/texmf-dist/source/latex/caption/caption.dtx
index de809f491a5..1b8b47474f5 100644
--- a/Master/texmf-dist/source/latex/caption/caption.dtx
+++ b/Master/texmf-dist/source/latex/caption/caption.dtx
@@ -220,7 +220,7 @@
 %
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption}[2011/11/02 v3.2d Customizing captions (AR)]
+\ProvidesPackage{caption}[2011/11/10 v3.2e Customizing captions (AR)]
 %\@ifundefined{PackageRedefines}{}{\PackageRedefines{caption}{caption}}
 %    \end{macrocode}
 %
@@ -4305,14 +4305,19 @@
 %    \end{macrocode}
 %
 % \begin{macro}{\wrapfloat}
+% \changes{v3.2d}{2011/11/02}{Redefinition of this macro added}
 % First of all we make the \package{wrapfig} package independent from the package
 % load order regarding the \package{float} package.
-% (|\wrap|\x|float| will usually not be used when used with re-styled floats.)
+% Since the usage of |\@float@set|\x|every| is missing in the code of the \package{wrapfig}
+% package (it should be in the redefinition of |\float@re|\x|style|, right after
+% |\@nameuse{fst@#1}|), we don't use it here, too,
+% especially since |\wrap|\x|float| will usually not be used when used with re-styled floats.
 %    \begin{macrocode}
   \renewcommand*\wrapfloat[1]{%
     \def\@captype{#1}%
     \@ifundefined{fst@#1}{}{%
       \@nameuse{fst@#1}%
+%     \@float@setevery{#1}%
       \def\WF@floatstyhook{\let\@currbox\WF@box 
          \global\setbox\WF@box\float@makebox{\wd\WF@box}}}%
     \@ifnextchar[\WF@wr{\WF@wr[]}}
@@ -4320,6 +4325,7 @@
 % \end{macro}
 %
 % \begin{macro}{\WF@rapt}
+% \changes{v3.2d}{2011/11/02}{Usage of \cs{WF@captionstyhook} added}
 % Original code:
 % \begin{verbatim}
 %   \def\WF@rapt[#1]#2{% final two args: #1 = overhang,  #2 = width,
@@ -4342,15 +4348,20 @@
 % \end{macro}
 %
 % \begin{macro}{\WF@captionstyhook}
+% \changes{v3.2d}{2011/11/02}{This macro added}
+% \changes{v3.2e}{2011/11/10}{Bugfix 11-11-09: float package support fixed}
 % We place our \package{hyperref} anchor here, 	apply the `wrap' options etc.
+% Since the usage of |\@float@set|\x|every| is missing in the \package{wrapfig}
+% package we will catch it up here for making the necessary adaptions to the
+% \package{float} package.
 %    \begin{macrocode}
   \def\WF@captionstyhook#1{%
     \let\@captype\@undefined
-    \caption@ifundefined\@float@setevery{}{\@float@setevery{#1}}%
+    \@ifundefined{fst@#1}{}{\@float@setevery{#1}}%
     \caption@settype{#1}%
     \caption@clearmargin
 %%%    \caption@setoptions{wrapfloat}%
-    \caption@setoptions{wrap#1}}
+    \caption@setoptions{wrap#1}}%
 %    \end{macrocode}
 % \end{macro}
 %
diff --git a/Master/texmf-dist/source/latex/caption/newfloat.dtx b/Master/texmf-dist/source/latex/caption/newfloat.dtx
index 297145ab348..47cbdf5a289 100644
--- a/Master/texmf-dist/source/latex/caption/newfloat.dtx
+++ b/Master/texmf-dist/source/latex/caption/newfloat.dtx
@@ -288,6 +288,40 @@
 % and log file.
 %
 % \iffalse
+% \pagebreak[3]
+% \section{For \LaTeX{} package authors}
+%
+% |\For|\x|Each|\x|Floating|\x|Environment| without \package{newfloat} package:
+% \begin{quote}
+%   |\newcommand\mypackage@foreachfloat[1]{%|\\
+%   |  \@ifundefined{ForEachFloatingEnvironment}%|\\
+%   |    {\def\@elt##1{#1}%|\\
+%   |      \@ifundefined{c@figure}\@gobble\@elt{figure}%|\\
+%   |      \@ifundefined{c@table}\@gobble\@elt{table}%|\\
+%   |      \let\@elt\relax|\\
+%   |      \newfloat@addtohook{#1}}%|\\
+%   |    {\ForEachFloatingEnvironment{#1}}}|\\
+%   |\providecommand\newfloat@addtohook[1]{%|\\
+%   |  \toks@=\expandafter{\newfloat@hook{##1}#1}%|\\
+%   |  \edef\@tempa{\def\noexpand\newfloat@hook####1{\the\toks@}}%|\\
+%   |  \@tempa}|\\
+%   |\providecommand*\newfloat@hook[1]{}|
+% \end{quote}
+%
+% \pagebreak[3]
+% Adding environment to list of floating environments:
+% \begin{quote}
+%   |\SetupFloatingEnvironment|\marg{environment}|{}|
+% \end{quote}
+% or (without \package{newfloat} package loaded):
+% \begin{quote}
+%   |\providecommand\newfloat@list{}|\\
+%   |\@cons\newfloat@list{|\marg{environment}|}|
+% \end{quote}
+% (Please note the doubled curly braces around the environment name.)
+% \fi
+%
+% \iffalse
 % --------------------------------------------------------------------------- %
 % \fi
 %
diff --git a/Master/texmf-dist/tex/latex/caption/caption.sty b/Master/texmf-dist/tex/latex/caption/caption.sty
index 61d6435ff03..70e6762193a 100644
--- a/Master/texmf-dist/tex/latex/caption/caption.sty
+++ b/Master/texmf-dist/tex/latex/caption/caption.sty
@@ -29,7 +29,7 @@
 %% and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex.
 %% 
 \NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption}[2011/11/02 v3.2d Customizing captions (AR)]
+\ProvidesPackage{caption}[2011/11/10 v3.2e Customizing captions (AR)]
 \RequirePackage{caption3}[2011/08/30] % needs v1.4 or newer
 \caption@ifbool{documentclass}{}{%
   \caption@WarningNoLine{%
@@ -1699,11 +1699,11 @@
     \ignorespaces \fi}%
   \def\WF@captionstyhook#1{%
     \let\@captype\@undefined
-    \caption@ifundefined\@float@setevery{}{\@float@setevery{#1}}%
+    \@ifundefined{fst@#1}{}{\@float@setevery{#1}}%
     \caption@settype{#1}%
     \caption@clearmargin
 %%%    \caption@setoptions{wrapfloat}%
-    \caption@setoptions{wrap#1}}
+    \caption@setoptions{wrap#1}}%
 }{}
 \endinput
 %%