caption 3.2 (15mar12)

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

24 files changed, 325 insertions, 264 deletions

diff --git a/Master/texmf-dist/doc/latex/caption/README b/Master/texmf-dist/doc/latex/caption/README
index bd96db4d81b..b24f060023a 100644
--- a/Master/texmf-dist/doc/latex/caption/README
+++ b/Master/texmf-dist/doc/latex/caption/README
@@ -1,7 +1,7 @@
 ==========================================================================
 
 The `caption' package bundle
-Copyright (C) 1994-2011 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
+Copyright (C) 1994-2012 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
 
 License: LPPL = LaTeX Project Public Licence
 Maintenance Status: maintained (by Axel Sommerfeldt)
diff --git a/Master/texmf-dist/doc/latex/caption/bicaption.pdf b/Master/texmf-dist/doc/latex/caption/bicaption.pdf
index 5b3b1b21b26..3c421f85ee1 100644
--- a/Master/texmf-dist/doc/latex/caption/bicaption.pdf
+++ b/Master/texmf-dist/doc/latex/caption/bicaption.pdf
diff --git a/Master/texmf-dist/doc/latex/caption/caption-deu.pdf b/Master/texmf-dist/doc/latex/caption/caption-deu.pdf
index 586ebb6eaca..9c71dcc842d 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 dc1751c32a9..3b310ae1c75 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 4d29eb32e7d..ff59b87505b 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/caption2.pdf b/Master/texmf-dist/doc/latex/caption/caption2.pdf
index f6af5e1b6db..65f6ef3b379 100644
--- a/Master/texmf-dist/doc/latex/caption/caption2.pdf
+++ b/Master/texmf-dist/doc/latex/caption/caption2.pdf
diff --git a/Master/texmf-dist/doc/latex/caption/caption3.pdf b/Master/texmf-dist/doc/latex/caption/caption3.pdf
index c7c2d1d499d..353339029a9 100644
--- a/Master/texmf-dist/doc/latex/caption/caption3.pdf
+++ b/Master/texmf-dist/doc/latex/caption/caption3.pdf
diff --git a/Master/texmf-dist/doc/latex/caption/ltcaption.pdf b/Master/texmf-dist/doc/latex/caption/ltcaption.pdf
index 6b04eda03a1..af0e42b9502 100644
--- a/Master/texmf-dist/doc/latex/caption/ltcaption.pdf
+++ b/Master/texmf-dist/doc/latex/caption/ltcaption.pdf
diff --git a/Master/texmf-dist/doc/latex/caption/newfloat.pdf b/Master/texmf-dist/doc/latex/caption/newfloat.pdf
index abb31fcb1e6..0ba3f9866c8 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/doc/latex/caption/subcaption.pdf b/Master/texmf-dist/doc/latex/caption/subcaption.pdf
index f5fb6d27ec5..35153a937c6 100644
--- a/Master/texmf-dist/doc/latex/caption/subcaption.pdf
+++ b/Master/texmf-dist/doc/latex/caption/subcaption.pdf
diff --git a/Master/texmf-dist/source/latex/caption/caption-deu.tex b/Master/texmf-dist/source/latex/caption/caption-deu.tex
index b0742d81db2..451a55b6db4 100644
--- a/Master/texmf-dist/source/latex/caption/caption-deu.tex
+++ b/Master/texmf-dist/source/latex/caption/caption-deu.tex
@@ -1692,6 +1692,9 @@ ergibt als Ergebnis:
   \captionsetup{type=table,position=b,skip=0pt}
   \caption{Eine Tabelle}
   \centerline{\ldots}
+\end{Example}
+\begin{Example}
+  \captionsetup{type=table,position=b,skip=0pt}
   \ContinuedFloat
   \caption{Eine Tabelle (Fortsetzung)}
   \centerline{\ldots}
@@ -2076,8 +2079,8 @@ Eigene Listenformate können mit
   |\DeclareCaptionListFormat|\marg{Name}\marg{Code mit \#1 und \#2}
 \end{quote}
 definiert werden.
-Im Laufe des Dokumentes wird \#1 dann mit dem Bezeichner-Präfix
-(z.B.~|\p@figure|), und \#2 mit der Referenznummer (z.B.~|\thefigure|) ersetzt.
+Im Laufe des Dokumentes wird \#1 dann mit dem Bezeichner"=Präfix
+(z.B.~|\p@figure|), und \#2 mit der Referenznummer (z.B.~|\the|\-|figure|) ersetzt.
 
 % --------------------------------------------------------------------------- %
 
@@ -3571,27 +3574,6 @@ Befehl                           & & Abschnitt \\
   anstelle von |\clear|\-|caption|\-|setup| verwenden.
   \par\See{\Ref{captionsetup}}
 
-\iffalse
-\Message
-  |Possibly superfluous \restylefloat{|\meta{type}|} detected.|\\
-  |If you think that this warning is unjustified,|\\
-  |you can switch it off using the caption package|\\
-  |option `restylefloatcheck=off'.|
-\Description
-  \TODO
-\fi
-
-\Message
-  |`ragged2e' package not loaded, therefore|\\
-  |substituting \raggedright for \RaggedRight.|
-\Description
-  Die Option |justification=|\x|RaggedRight| ist nur dann voll funktionsfähig,
-  wenn Sie das \package{ragged2e}"=Paket auf Ihrem \TeX"=System installiert haben.
-  Ist dies nicht der Fall, erhalten Sie diese Warnung und |justification=|\x|RaggedRight|
-  wird im späteren Verlauf des Dokumentes wie |justification=|\x|raggedright|
-  behandelt werden.
-  \par\See{\Ref{justification}}
-
 \Message
   |Obsolete option `ignoreLTcapwidth' ignored.|
 \Description
diff --git a/Master/texmf-dist/source/latex/caption/caption-eng.tex b/Master/texmf-dist/source/latex/caption/caption-eng.tex
index 45efb2896a6..0893e216c9f 100644
--- a/Master/texmf-dist/source/latex/caption/caption-eng.tex
+++ b/Master/texmf-dist/source/latex/caption/caption-eng.tex
@@ -1643,6 +1643,9 @@ gives the following result:
   \captionsetup{type=table,position=b,skip=0pt}
   \caption{A table}
   \centerline{\ldots}
+\end{Example}
+\begin{Example}
+  \captionsetup{type=table,position=b,skip=0pt}
   \ContinuedFloat
   \caption{A table (cont.)}
   \centerline{\ldots}
@@ -3437,26 +3440,6 @@ Command                          & & Section \\
   |\clear|\-|caption|\-|setup|.
   \par\See{\Ref{captionsetup}}
 
-\iffalse
-\Message
-  |Possibly superfluous \restylefloat{|\meta{type}|} detected.|\\
-  |If you think that this warning is unjustified,|\\
-  |you can switch it off using the caption package|\\
-  |option `restylefloatcheck=off'.|
-\Description
-  \TODO
-\fi
-
-\Message
-  |`ragged2e' package not loaded, therefore|\\
-  |substituting \raggedright for \RaggedRight.|
-\Description
-  The caption option |justification=|\x|RaggedRight| is only full functional
-  if you have the \package{ragged2e} package installed in your \TeX\ system.
-  If not, you will get this warning, and |justification=|\x|RaggedRight|
-  will be treated as |justification=|\x|raggedright|.
-  \par\See{\Ref{justification}}
-
 \Message
   |Obsolete option `ignoreLTcapwidth' ignored.|
 \Description
diff --git a/Master/texmf-dist/source/latex/caption/caption.dtx b/Master/texmf-dist/source/latex/caption/caption.dtx
index 1b8b47474f5..e60749285e8 100644
--- a/Master/texmf-dist/source/latex/caption/caption.dtx
+++ b/Master/texmf-dist/source/latex/caption/caption.dtx
@@ -2,7 +2,7 @@
 % 
 % This is file `caption.dtx'.
 % 
-% Copyright (C) 1994-2011 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
+% Copyright (C) 1994-2012 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
 % 
 % --------------------------------------------------------------------------
 % 
@@ -25,7 +25,7 @@
 % and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex.
 % 
 % \fi
-% \CheckSum{3534}
+% \CheckSum{3545}
 %
 % \iffalse
 %<*driver>
@@ -220,7 +220,7 @@
 %
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption}[2011/11/10 v3.2e Customizing captions (AR)]
+\ProvidesPackage{caption}[2012/02/19 v3.2f Customizing captions (AR)]
 %\@ifundefined{PackageRedefines}{}{\PackageRedefines{caption}{caption}}
 %    \end{macrocode}
 %
@@ -308,14 +308,18 @@
 % \changes{v3.1f}{2007/11/18}{Option \opt{name} added}
 %    \begin{macrocode}
 \DeclareCaptionOption{figurename}{\caption@SetName{figure}{#1}}
+\@onlypreamble@key{caption}{figurename}
 \DeclareCaptionOption{tablename}{\caption@SetName{table}{#1}}
+\@onlypreamble@key{caption}{tablename}
 \DeclareCaptionOption{name}{\caption@setname\@captype{#1}}
 %    \end{macrocode}
 %
 % \changes{v3.1g}{2008/02/28}{Options \opt{listfigurename} and \opt{listtablename} added}
 %    \begin{macrocode}
 \DeclareCaptionOption{listfigurename}{\caption@SetName{listfigure}{#1}}
+\@onlypreamble@key{caption}{listfigurename}
 \DeclareCaptionOption{listtablename}{\caption@SetName{listtable}{#1}}
+\@onlypreamble@key{caption}{listtablename}
 %    \end{macrocode}
 %
 % \begin{macro}{\caption@SetName}
@@ -324,17 +328,16 @@
 % \changes{v3.1g}{2008/02/28}{Renamed from \cs{caption@SetFloatName} to \cs{caption@SetName}}
 % \changes{v3.1i}{2008/08/02}{Bugfix: Works now without \cs{addto}, too}
 % \changes{v3.2d}{2011/10/29}{Outsourced to \package{newfloat} package}
-%  |\caption@SetName|\marg{cmd}\marg{value}
+% \changes{v3.2f}{2012/01/12}{Bugfix: Uses \cs{caption@NewFloat} now}
+%  |\caption@SetName|\marg{float}\marg{name}
 %    \begin{macrocode}
-\newcommand*\caption@SetName{%
-  \RequirePackage{newfloat}%
-  \newfloat@setname}
+\newcommand*\caption@SetName[2]{%
+  \caption@NewFloat{\newfloat@setname{#1}{#2}}}
+\@onlypreamble\caption@SetName
 %    \end{macrocode}
 %    \begin{macrocode}
-\newcommand*\caption@setname[2]{\@namedef{#1name}{#2}}
-%    \end{macrocode}
-%    \begin{macrocode}
-\caption@AtBeginDocument{\let\caption@SetName\caption@setname}
+\newcommand*\caption@setname[2]{%
+  \@namedef{#1name}{#2}}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -346,6 +349,9 @@
 %
 % \begin{macro}{\caption@DeclareWithinOption}
 % \changes{v3.1l}{2010/01/09}{This macro and its usage added}
+% |\caption@DeclareWithinOption|\marg{float}
+% declares the options \meta{float}\texttt{within} and \meta{float}\texttt{without},
+% e.g. \texttt{figurewithin} and \texttt{figurewithout}.
 %    \begin{macrocode}
 \newcommand*\caption@DeclareWithinOption[1]{%
   \DeclareCaptionOption{#1within}{\caption@Within{#1}{##1}}%
@@ -359,19 +365,36 @@
 %    \end{macrocode}
 %    \begin{macrocode}
 \DeclareCaptionOption{within}{%
-  \RequirePackage{newfloat}%
-  \newfloatsetup{within=#1}}
+  \caption@NewFloat{\newfloatsetup{within=#1}}}
 \DeclareCaptionOptionNoValue{without}{%
-  \RequirePackage{newfloat}%
-  \newfloatsetup{without}}
+  \caption@NewFloat{\newfloatsetup{without}}}
 %    \end{macrocode}
 % \begin{macro}{\caption@Within}
 % \changes{v3.1}{2007/12/21}{This macro added}
 % \changes{v3.2d}{2011/10/29}{Outsourced to \package{newfloat} package}
+% \changes{v3.2f}{2012/01/12}{Bugfix: Uses \cs{caption@NewFloat} now}
+% |\caption@Within|\marg{float}\marg{value}
 %    \begin{macrocode}
-\newcommand*\caption@Within{%
-  \RequirePackage{newfloat}%
-  \newfloat@setwithin}
+\newcommand*\caption@Within[2]{%
+  \caption@NewFloat{\newfloat@setwithin{#1}{#2}}}
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\caption@NewFloat}
+% \changes{v3.2f}{2012/01/12}{This macro added}
+% |\caption@NewFloat|\marg{code}
+% loads the \package{newfloat} package and executes the given code afterwards.
+% Note: Since the \package{newfloat} package uses the crappy \package{keyval}
+% package, too, we need to save \& restore some macros here, otherwise this
+% recursion won't work properly.
+% {\itshape (TODO: Re-write \package{newfloat} so it uses \package{kvoptions} instead.)}
+%    \begin{macrocode}
+\newcommand*\caption@NewFloat[1]{%
+  \let\KV@prefix@ORI\KV@prefix
+  \let\@tempc@ORI\@tempc
+  \caption@ifpackageloaded{newfloat}{#1}{}%
+  \let\@tempc\@tempc@ORI
+  \let\KV@prefix\KV@prefix@ORI}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -796,6 +819,7 @@
 % \changes{v3.1f}{2007/11/28}{Support of option \opt{@minipage} added}
 % \changes{v3.1g}{2008/03/16}{Internal: Uses \cs{caption@prepareanchor} now}
 % \changes{v3.2d}{2011/10/21}{Adapted to the \textsf{memoir} document class}
+% \changes{v3.2f}{2012/01/14}{Usage of \cs{M@gettitle} moved to \cs{caption@prepareanchor}}
 %  As above, our version has been adapted to the packages we support.
 %  Additionally our code is nested by |\caption@beginex| \&
 %  |\caption@end| instead of |\begingroup| \& |\endgroup|.
@@ -811,7 +835,6 @@
 %    \begin{macrocode}
   \ifcaption@star \else
     \caption@prepareanchor{#1}{#2}%
-    \M@gettitle{#2}%
     \memcaptioninfo{#1}{\csname the#1\endcsname}{#2}{#3}%
   \fi
 %    \end{macrocode}
@@ -841,10 +864,12 @@
 %
 % \begin{macro}{\caption@prepareanchor}
 % \changes{v3.1g}{2008/03/16}{This macro added}
+% \changes{v3.2f}{2012/01/14}{Usage of \cs{M@gettitle} moved from \cs{caption@@caption}}
 %    \begin{macrocode}
 \newcommand*\caption@prepareanchor[2]{%
   \caption@makecurrent{#1}{#2}%
-  \caption@ifhypcap\caption@@start{}}
+  \caption@ifhypcap\caption@@start{}%
+  \M@gettitle{#2}}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -1715,6 +1740,7 @@
 % \changes{v3.1}{2007/07/02}{Format of \package{hyperref} extension changed}
 % \changes{v3.1}{2007/07/07}{\cs{caption@setoptions} added}
 % \changes{v3.1g}{2008/01/29}{Starred variant and hook \cs{sf@ContinuedFloat} added}
+% \changes{v3.2f}{2011/12/17}{Undocumented optional argument removed}
 %  |\ContinuedFloat|\\
 %  |\ContinuedFloat*|\par
 %  This mainly decrements the appropriate counter and increments the
@@ -1741,13 +1767,6 @@
 %        \texttt{naturalnames=true} is set.}
 %    \begin{macrocode}
 \def\ContinuedFloat{%
-  \@ifnextchar[\@Continued@Float\@ContinuedFloat}
-%    \end{macrocode}
-%    \begin{macrocode}
-\def\@Continued@Float[#1]{\addtocounter{#1}\m@ne}
-%    \end{macrocode}
-%    \begin{macrocode}
-\def\@ContinuedFloat{%
   \caption@iftype
     {\addtocounter\@captype\m@ne
      \caption@ContinuedFloat\@captype}%
@@ -1803,12 +1822,16 @@
 % \end{macro}
 %
 % \begin{macro}{\caption@resetContinuedFloat}
+% \changes{v3.2f}{2011/12/17}{Redefinition of \cs{ContinuedFloat} added}
 %  |\caption@resetContinuedFloat|\marg{type}\par
 %  If a continuation counter is defined, we reset it.
 %  (This one will be called inside |\@caption|.)
 %    \begin{macrocode}
 \newcommand*\caption@resetContinuedFloat[1]{%
-  \@stpelt{ContinuedFloat}\xdef\caption@CFtype{#1}}
+  \@stpelt{ContinuedFloat}%
+  \xdef\caption@CFtype{#1}%
+  \def\ContinuedFloat{\caption@Error{%
+    \noexpand\ContinuedFloat must be placed at the top of the environment}}}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -2014,6 +2037,13 @@
 % \end{macro}
 %
 % \begin{macro}{\caption@makecurrent}
+%  This one is needed for support of the \package{nameref} and \package{hyperref} package.
+% \changes{v3.3}{2012/01/14}{Bugfix: Usage of \cs{caption@gettitle} added}
+%    \begin{macrocode}
+\newcommand*\caption@makecurrent[1]{\caption@gettitle}
+%    \end{macrocode}
+% \end{macro}
+%
 % \begin{macro}{\caption@makeanchor}
 % \begin{macro}{\caption@start}
 % \begin{macro}{\caption@@start}
@@ -2021,7 +2051,6 @@
 % \begin{macro}{\caption@defrostHref}
 %  All these are needed for support of the \package{hyperref} package.
 %    \begin{macrocode}
-\newcommand*\caption@makecurrent[2]{}
 \let\caption@makeanchor\@firstofone
 \let\caption@start\relax
 \let\caption@@start\relax
@@ -2033,7 +2062,6 @@
 % \end{macro}
 % \end{macro}
 % \end{macro}
-% \end{macro}
 %
 % \begin{macro}{\caption@gettitle}
 % \changes{v3.1}{2007/05/05}{This macro and its usage added}
@@ -2427,16 +2455,11 @@
   \@ifpackageloaded{#1}\@firstofone{%
     \caption@Debug{#1 package is not loaded (yet)\@gobble}%
     \caption@AtBeginDocument}{%
-      \caption@@ifpackageloaded{#1}[#2]{#3}{#4}}}
+      \caption@If@Package@Loaded{#1}[#2]{#3}{#4}}}
 \@onlypreamble\caption@@IfPackageLoaded
 %    \end{macrocode}
 %    \begin{macrocode}
-\newcommand\caption@ifpackageloaded[1]{%
-  \@testopt{\caption@@ifpackageloaded{#1}}{}}
-\@onlypreamble\caption@ifpackageloaded
-%    \end{macrocode}
-%    \begin{macrocode}
-\long\def\caption@@ifpackageloaded#1[#2]{%
+\long\def\caption@If@Package@Loaded#1[#2]{%
   \@ifpackageloaded{#1}{%
     \caption@InfoNoLine{#1 package is loaded}%
     \@ifpackagelater{#1}{#2}\@firstoftwo{%
@@ -2448,7 +2471,7 @@
         is available}%
       \@secondoftwo}%
   }{\@secondoftwo}}
-\@onlypreamble\caption@@ifpackageloaded
+\@onlypreamble\caption@If@Package@Loaded
 %    \end{macrocode}
 % \end{macro}
 %
@@ -2612,7 +2635,7 @@
 %    \begin{macrocode}
 \caption@IfPackageLoaded{float}[2001/11/08 v1.3d]{%
  \@ifpackageloaded{floatrow}{%
-  \caption@ifpackageloaded{floatrow}[2007/08/24 v0.2a]{}{}%
+  \caption@If@Package@Loaded{floatrow}[2007/08/24 v0.2a]{}{}%
  }{%
 %    \end{macrocode}
 %
@@ -2885,6 +2908,7 @@
 % \changes{v3.1f}{2007/11/16}{Uses `space hack' instead of \cs{ignorespaces} now}
 % \changes{v3.1k}{2009/10/09}{Bugfix 09-09-11: Missing \cs{ignorespaces} added}
 % \changes{v3.2c}{2011/08/28}{Adapted to current version of \cs{caption@freeze}}
+% \changes{v3.2f}{2012/02/19}{Bugfix 12-02-16: \texttt{minipage} environment added}
 % Original code:
 % \begin{verbatim}
 % \newcommand{\FP@floatBegin}[1]{%
@@ -2907,6 +2931,7 @@
   \renewcommand*\FP@floatBegin[1]{%
     \def\FP@captype{#1}%
     \begin{lrbox}{\FP@floatCorpusBOX}%
+    \minipage\hsize % changes from LR mode to vertical mode
     \caption@settype*{#1}%
     \caption@freeze
     \global\let\FP@Label\@empty
@@ -2921,6 +2946,7 @@
 % \begin{macro}{\FP@floatEnd}
 % \changes{v3.1g}{2008/01/30}{Some minor bugfixes}
 % \changes{v3.2c}{2011/08/28}{Adapted to current version of \cs{caption@freeze}}
+% \changes{v3.2f}{2012/02/19}{Bugfix 12-02-16: \texttt{minipage} environment added}
 % Original code:
 % \begin{verbatim}
 % \newcommand{\FP@floatEnd}{%
@@ -2955,6 +2981,7 @@
 % \end{verbatim}%^^A
 %    \begin{macrocode}
   \renewcommand*\FP@floatEnd{%
+    \endminipage
     \end{lrbox}%
 %    \end{macrocode}
 %    \begin{macrocode}
diff --git a/Master/texmf-dist/source/latex/caption/caption.ins b/Master/texmf-dist/source/latex/caption/caption.ins
index e3edbef61d7..412fe0ce3cd 100644
--- a/Master/texmf-dist/source/latex/caption/caption.ins
+++ b/Master/texmf-dist/source/latex/caption/caption.ins
@@ -6,7 +6,7 @@
 
 \preamble
 
-Copyright (C) 1994-2011 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
+Copyright (C) 1994-2012 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
 
 --------------------------------------------------------------------------
 
diff --git a/Master/texmf-dist/source/latex/caption/caption3.dtx b/Master/texmf-dist/source/latex/caption/caption3.dtx
index 51699c2e1df..4a084501a2a 100644
--- a/Master/texmf-dist/source/latex/caption/caption3.dtx
+++ b/Master/texmf-dist/source/latex/caption/caption3.dtx
@@ -2,7 +2,7 @@
 % 
 % This is file `caption3.dtx'.
 % 
-% Copyright (C) 1994-2011 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
+% Copyright (C) 1994-2012 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
 % 
 % --------------------------------------------------------------------------
 % 
@@ -25,7 +25,7 @@
 % and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex.
 % 
 % \fi
-% \CheckSum{3390}
+% \CheckSum{3410}
 %
 % \iffalse
 %<*driver>
@@ -200,7 +200,7 @@
 %
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption3}[2011/11/01 v1.4a caption3 kernel (AR)]
+\ProvidesPackage{caption3}[2012/01/12 v1.4b caption3 kernel (AR)]
 %    \end{macrocode}
 %
 % \subsection{Generic helpers}
@@ -838,9 +838,9 @@
 %
 % \changes{v1.1}{2007/07/02}{Option \opt{options=} added}
 % \changes{v1.3}{2010/09/05}{Option \opt{options*=} added}
+% \changes{v1.4b}{2012/01/12}{Option \opt{options*=} removed}
 %    \begin{macrocode}
 \DeclareCaptionOption{options}{\caption@setoptions{#1}}
-\DeclareCaptionOption{options*}{\caption@setoptions*{#1}}
 %    \end{macrocode}
 %
 % \begin{macro}{\caption@setoptions}
@@ -851,22 +851,22 @@
 % \changes{v1.1}{2007/05/09}{Renamed from \cs{caption@settype} to \cs{caption@setoptions}}
 % \changes{v1.2}{2007/12/03}{Definition of \cs{caption@iftypewarning} removed}
 % \changes{v1.3}{2010/09/05}{Starred variant added}
-%  |\caption@setoptions*|\marg{type or environment or\ldots}\par
+% \changes{v1.4b}{2012/01/12}{Starred variant removed}
+%  |\caption@setoptions|\marg{type or environment or\ldots}\par
 %  Caption options which have been saved with |\captionsetup|\oarg{type} can
 %  be executed by using this command.
 %  It simply executes the saved option list (and clears it afterwards),
-%  if there is any. (The starred variant do not clear the option list.)
-%    \begin{macrocode}
-\newcommand*\caption@setoptions{%
-  \caption@teststar\caption@set@options\@gobble\@firstofone}
-%    \end{macrocode}
+%  if there is any.
+% \iffalse
+% (The starred variant do not clear the option list.)
+% \fi
 %    \begin{macrocode}
-\newcommand*\caption@set@options[2]{%
-  \caption@Debug{options=#2}%
-  \expandafter\let\expandafter\caption@opt\csname caption@opt@#2\endcsname
+\newcommand*\caption@setoptions[1]{%
+  \caption@Debug{options=#1}%
+  \expandafter\let\expandafter\caption@opt\csname caption@opt@#1\endcsname
   \ifx\caption@opt\relax \else
     \caption@xsetup\caption@opt
-    #1{\caption@clearsetup{#2}}% #1 = \@firstofone -or- \@gobble
+    \caption@clearsetup{#1}%
   \fi}
 %    \end{macrocode}
 %    \begin{macrocode}
@@ -2029,49 +2029,73 @@
 % \changes{v1.0o}{2007/04/11}{Bugfix: Usage of \cs{caption@Info} replaced
 %         by \cs{caption@Debug}}
 % \changes{v1.1}{2007/04/16}{A different warning will be given on first \LaTeX\ run}
-%  |\caption@ragged| will be basically defined as
-%  \begin{quote}
-%    |\AtBeginDocument{\IfFileExists{ragged2e.sty}%|\\
-%    |  {\RequirePackage{ragged2e}\let\caption@ragged\@firstoftwo}%|\\
-%    |  {\let\caption@ragged\@secondoftwo}}|
-%  \end{quote}
-%  but with an additional warning if the ragged2e package is not loaded (yet).
-%  (This warning will be type out only one time per option, that's why
-%  we need the |caption\string#1| stuff.)
-%  Furthermore we load the \package{ragged2e} package, if needed and available.
+% \changes{v1.4f}{2012/01/12}{Uses \cs{caption@IfPackageLoaded} now}
+% |\caption@ragged|\marg{yes-code}\marg{no-code}
+% executes the \meta{yes-code} if the \package{ragged2e} package is loaded
+% and \meta{no-code} if not. Additionally it tries to load the \package{ragged2e}
+% package.
 %    \begin{macrocode}
-\newcommand*\caption@ragged{%
-  \caption@Debug{We need ragged2e}%
-  \protected@write\@auxout{}{\string\caption@newlabel{ragged2e}{}}%
-  \global\let\caption@ragged\caption@@ragged
-  \caption@ragged}
+\newcommand*\caption@ragged{\caption@ifpackageloaded{ragged2e}}
 %    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\caption@ifpackageloaded}
+% \changes{v1.4f}{2012/01/12}{This macro added}
+% |\caption@ifpackageloaded|\marg{package}\marg{yes-code}\marg{no-code}
+% executes the \meta{yes-code} if the given package is loaded
+% and \meta{no-code} if not. Additionally it tries to load the package.
 %    \begin{macrocode}
-\caption@AtBeginDocument{%
-  \@ifundefined{caption@r@ragged2e}{%
-    \newcommand*\caption@@ragged{%
-      \caption@Warning{%
-        `ragged2e' support has been changed.\MessageBreak
-        Rerun to get captions right}%
-      \global\let\caption@ragged\@secondoftwo % suppress further warnings
-      \caption@ragged}%
-  }{%
-    \caption@Debug{We load ragged2e}%
-    \IfFileExists{ragged2e.sty}{%
-      \RequirePackage{ragged2e}%
-      \let\caption@@ragged\@firstoftwo
-    }{%
-      \newcommand*\caption@@ragged[2]{%
-        \@ifundefined{caption\string#1}{%
-          \caption@Warning{%
-            `ragged2e' package not loaded, therefore\MessageBreak
-            substituting \string#2 for \string#1\MessageBreak}%
-          \global\@namedef{caption\string#1}}{}%
-        #2}%
-    }%
-  }}
+\newcommand*\caption@ifpackageloaded[1]{%
+  \@ifundefined{caption@ifpkg@#1}%
+    {\caption@RequirePackage{#1}%
+     \caption@pkg@true{#1}}%
+    {}%
+  \caption@ifpkg{#1}}
+%    \end{macrocode}
+%    \begin{macrocode}
+\AtBeginDocument{\renewcommand*\caption@ifpackageloaded[1]{%
+  \@ifundefined{caption@ifpkg@#1}%
+    {\caption@addto@pkg@list{#1}%
+     \caption@pkg@false{#1}%
+     \caption@Warning{%
+       `#1' support has been changed.\MessageBreak
+       Rerun to get captions right}}%
+    {}%
+  \caption@ifpkg{#1}}}
+%    \end{macrocode}
+%    \begin{macrocode}
+\newcommand*\caption@ifpkg[1]{%
+  \csname caption@ifpkg@#1\endcsname}
+\newcommand*\caption@pkg@true[1]{%
+  \global\expandafter\let\csname caption@ifpkg@#1\endcsname\@firstoftwo}
+\newcommand*\caption@pkg@false[1]{%
+  \global\expandafter\let\csname caption@ifpkg@#1\endcsname\@secondoftwo}
+%    \end{macrocode}
+%    \begin{macrocode}
+\newcommand*\caption@pkg@list{}
+\newcommand*\caption@addto@pkg@list[1]{%
+  \protected@write\@auxout{}{%
+    \string\@cons\string\caption@pkg@list{{#1}}}}
+%    \end{macrocode}
+%    \begin{macrocode}
+\AtBeginDocument{%
+  \def\caption@tempa{\endgroup}%
+  \begingroup
+  \def\@elt#1{%
+    \g@addto@macro\caption@tempa{%
+      \caption@RequirePackage{#1}%
+      \@namedef{caption@ifpkg@#1}{%
+        \caption@addto@pkg@list{#1}%
+        \caption@pkg@true{#1}%
+        \caption@ifpkg{#1}}}}%
+  \caption@pkg@list
+  \caption@tempa}
 %    \end{macrocode}
 %    \begin{macrocode}
+\newcommand*\caption@RequirePackage[1]{%
+  \caption@Info{We need package `#1'}%
+  \RequirePackage{#1}}
+\@onlypreamble\caption@RequirePackage
 %    \end{macrocode}
 % \end{macro}
 %
@@ -2893,7 +2917,7 @@
          \let\@tempa\@firstofone}%
       \@tempa
         {\caption@Debug{addcontentsline: #1 => \caption@listtype}%
-%        \caption@setoptions*\caption@listtype
+%        \caption@setoptions\caption@listtype
          \@namedef{the\caption@listtype}{\@nameuse{the#1}}}%
       \expandafter\caption@@addcontentsline\expandafter{\caption@listtype}{#2}%
     \endgroup}}
@@ -3571,12 +3595,9 @@
 %
 % \subsection{subfig package adaptions}
 % \changes{v1.0i}{2007/01/07}{Very small bugfix of \package{subfig} package added}
-% \changes{v1.0j}{2007/01/31}{Bugfix of subfig package moved from package}
+% \changes{v1.0j}{2007/01/31}{Bugfix of \package{subfig} package moved from package to kernel}
 % \changes{v1.1}{2007/07/07}{Several adaptions to the \package{subfig} package added}
-% \changes{v1.2e}{2010/01/09}{Patch for better hyperref support added to \package{subfig} package adaptions}
-% \changes{v1.2f}{2010/01/14}{Latest patch didn't worked without hyperref; fixed}
-% \changes{v1.3}{2010/12/20}{subfig package bugfixes dropped}
-% \changes{v1.4a}{2011/11/01}{Bugfix 11-11-01: Test for the subfig package revised}
+% \changes{v1.4a}{2011/11/01}{Bugfix 11-11-01: Test for the \package{subfig} package revised}
 %
 % Since the \package{subfig} package is not maintained anymore,
 % we have to make several adaptions to \thispackage~\version{1.1} here.
@@ -3599,6 +3620,9 @@
   \let\sf@NEW@dottedxxxline\@undefined
   \let\sf@NEW@subfloat\@undefined}
 %    \end{macrocode}
+%
+% \begin{macro}{\@dottedxxxline}
+% New version of |\@dottedxxxline|
 %    \begin{macrocode}
 \def\sf@NEW@dottedxxxline#1#2#3#4#5#6#7{%
   \begingroup
@@ -3610,9 +3634,15 @@
     \fi
   \endgroup}
 %    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\sf@subfloat}
+% \changes{v1.4b}{2011/12/29}{Bugfix 11-12-23: Usage of \cs{caption@warmup} added}
+% New version of |\sf@subfloat|
 %    \begin{macrocode}
 \def\sf@NEW@subfloat{%
   \begingroup
+   \@nameuse{caption@warmup}%
     \caption@setfloattype\@captype
     \sf@ifpositiontop{%
       \maincaptiontoptrue
@@ -3632,6 +3662,7 @@
       {\sf@@subfloat}%
       {\sf@@subfloat[\@empty]}}
 %    \end{macrocode}
+% \end{macro}
 %
 % \iffalse
 %</package>
@@ -3639,6 +3670,11 @@
 %
 % \clearpage
 % \begin{thebibliography}{99}
+%   \bibitem{TLC2}
+%   Frank Mittelbach and Michel Goossens:\\
+%   \newblock {\em The {\LaTeX} Companion (2nd.~Ed.)},\\
+%   \newblock Addison-Wesley, 2004.
+%
 %   \bibitem{Anne}
 %   Anne Br\"uggemann-Klein:\\
 %   \emph{Einf\"uhrung in die Dokumentverarbeitung},\\
diff --git a/Master/texmf-dist/source/latex/caption/newfloat.dtx b/Master/texmf-dist/source/latex/caption/newfloat.dtx
index 47cbdf5a289..00f04984a80 100644
--- a/Master/texmf-dist/source/latex/caption/newfloat.dtx
+++ b/Master/texmf-dist/source/latex/caption/newfloat.dtx
@@ -25,7 +25,7 @@
 % and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex.
 % 
 % \fi
-% \CheckSum{1199}
+% \CheckSum{1204}
 %
 % \iffalse
 %<*driver>
@@ -83,8 +83,6 @@
 % \newcommand*\csmarg[1]{\texttt{\char`\{#1\char`\}}}
 % \newcommand*\csoarg[1]{\texttt{\char`\[#1\char`\]}}
 % \newcommand*\version[2][]{\textit{v#2}}
-% \newcommand*\x{\discretionary{-}{}{}}
-% \newcommand*\xx{\discretionary{}{}{}}
 %
 % \setlength\leftmargini{1.5em}
 %
@@ -103,7 +101,7 @@
 % \begin{abstract}
 % \centering
 % This package offers the command
-% |\Declare|\x|Floating|\x|Environment| for defining new floating environments
+% |\Declare|\-|Floating|\-|Environment| for defining new floating environments
 % which behave like |figure| and |table|.
 % \end{abstract}
 % 
@@ -125,7 +123,7 @@
 % The ``within'' counter specifies the counter which will be used to reset
 % the counter of the floating environments |figure| and |table| .
 % (Furthermore this setting will be used as default setting for
-% |\Declare|\x|Floating|\x|Environment|.)
+% |\Declare|\-|Floating|\-|Environment|.)
 %
 % So for example |within=chapter| will give you a numbering scheme
 % \meta{chapter}.\meta{x} for floating environments,
@@ -137,7 +135,7 @@
 %
 % The option |chapterlistsgap=|\meta{value} sets the amount of the
 % vertical gap inserted into the ``List of Figure'', ``List of Tables'',
-% and all lists created with |\Declare|\x|Floating|\x|Environment|
+% and all lists created with |\Declare|\-|Floating|\-|Environment|
 % when a new chapter will be started.
 % The default value is |10pt|.
 % (This option will only be available if the document class used offer
@@ -206,9 +204,9 @@
 % the list will be stored in a file with the extension |lodiagram|, the name
 % (used for the caption) will be ``Diagram'' and the list name
 % ``List of Diagrams''.
-% The list could be typeset with |\list|\x|of|\x|diagrams|.
-% Dependent on which packages are loaded, the environments |FP|\x|diagram|,
-% |sideways|\x|diagram|, |SC|\x|diagram|, and |wrap|\x|diagram| will be defined additionally.
+% The list could be typeset with |\list|\-|of|\-|diagrams|.
+% Dependent on which packages are loaded, the environments |FP|\-|diagram|,
+% |sideways|\-|diagram|, |SC|\-|diagram|, and |wrap|\-|diagram| will be defined additionally.
 %
 % \pagebreak[3]
 % Another example:
@@ -233,17 +231,17 @@
 % |\SetupFloatingEnvironment|\marg{floating environment}\marg{options}
 % \end{quote}
 % will change the settings of existing ones, i.e. either |figure| or |table|,
-% or a one created with |\Declare|\x|Floating|\x|Environment|,
-% or a one created with |\new|\x|float| offered by the \package{float} package,
-% or a one created with |\new|\x|float| offered by the \package{memoir} document class,
-% or a one created with |\Declare|\x|New|\x|Float|\x|Type| offered by the \package{floatrow} package,
+% or a one created with |\Declare|\-|Floating|\-|Environment|,
+% or a one created with |\new|\-|float| offered by the \package{float} package,
+% or a one created with |\new|\-|float| offered by the \package{memoir} document class,
+% or a one created with |\Declare|\-|New|\-|Float|\-|Type| offered by the \package{floatrow} package,
 % or \ldots
 %
 % The \meta{options} are the same as the options for
-% |\Declare|\x|Floating|\x|Environment|,
+% |\Declare|\-|Floating|\-|Environment|,
 % but one should avoid changing the file extension
 % of existing floating environments,
-% i.e.~using the |fileext=| option within |\Setup|\x|Floating|\x|Environment|
+% i.e.~using the |fileext=| option within |\Setup|\-|Floating|\-|Environment|
 % is usually a very bad idea.
 %
 % \bigskip
@@ -263,7 +261,7 @@
 %  |\ForEachFloatingEnvironment|\meta{code with \#1}
 % \end{quote}
 % will execute the given \meta{code} for all known floating environments,
-% and for ones defined with |\Declare|\x|Floating|\x|Environment| later on.
+% and for ones defined with |\Declare|\-|Floating|\-|Environment| later on.
 %
 % \pagebreak[3]
 % So for example the \package{subcaption} packages uses
@@ -275,9 +273,9 @@
 %
 % \medskip
 %
-% There is also a starred variant |\For|\x|Each|\x|Floating|\x|Environment*|
+% There is also a starred variant |\For|\-|Each|\-|Floating|\-|Environment*|
 % which will execute the given code for already existing floating environments
-% only, i.e.~no hook will be placed inside |\Declare|\x|Floating|\x|Environment|.
+% only, i.e.~no hook will be placed inside |\Declare|\-|Floating|\-|Environment|.
 %
 % \pagebreak[3]
 % An example:
@@ -291,7 +289,7 @@
 % \pagebreak[3]
 % \section{For \LaTeX{} package authors}
 %
-% |\For|\x|Each|\x|Floating|\x|Environment| without \package{newfloat} package:
+% |\For|\-|Each|\-|Floating|\-|Environment| without \package{newfloat} package:
 % \begin{quote}
 %   |\newcommand\mypackage@foreachfloat[1]{%|\\
 %   |  \@ifundefined{ForEachFloatingEnvironment}%|\\
@@ -449,7 +447,7 @@
 %
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{newfloat}[2011/10/30 v1.0 Defining new floating environments (AR)]
+\ProvidesPackage{newfloat}[2011/11/16 v1.0a Defining new floating environments (AR)]
 %    \end{macrocode}
 %
 % \begin{macro}{\newfloat@Info}
@@ -485,6 +483,7 @@
 % \subsection{\cs{DeclareFloatingEnvironment}}
 %
 % \begin{macro}{\DeclareFloatingEnvironment}
+% \changes{v1.0a}{2011/11/16}{Bugfix: Undefines \cs{fst@}\meta{environment} now}
 %  |\DeclareFloatingEnvironment|\oarg{options}\marg{environment}\oarg{name}\oarg{list name}
 %    \begin{macrocode}
 \newcommand*\DeclareFloatingEnvironment{%
@@ -558,6 +557,13 @@
   \expandafter\newcommand\csname list#2name\endcsname{}%
   \expandafter\xdef\csname list#2name\endcsname{List of \newfloat@Type s}%
 %    \end{macrocode}
+% We undefine |\fst@|\meta{environment} so the new environment
+% will not be recognized as defined by the \package{float} package.
+% (|\fst@|\meta{type} use to hold the float style, see \package{float} package
+% implementation for details.)
+%    \begin{macrocode}
+  \expandafter\let\csname fst@#2\endcsname\@undefined
+%    \end{macrocode}
 % Set default parameters
 %    \begin{macrocode}
   \newfloat@setplacement{#2}{tbp}%
@@ -620,7 +626,7 @@
 \newcommand*\newfloat@@setoptions[3]{%
   \let\newfloat@within@value\@undefined
   \let\newfloat@chapterlistsgaps@value\@undefined
-  #1{\KV@@newfloat@within\newfloat@within@default}% set default value
+  #1{\KV@@newfloat@within\newfloat@within@default}% set default value for new floats
   \def\newfloat@type{#2}%
   \setkeys{@newfloat}{#3}%
   \ifx\newfloat@within@value\@undefined \else
@@ -695,7 +701,7 @@
       \fi
     \fi
   \endgroup}
-%\AtBeginDocument{\let\newfloat@setname\newfloat@@setname}
+%%\AtBeginDocument{\let\newfloat@setname\newfloat@@setname}
 %    \end{macrocode}
 %    \begin{macrocode}
 \newcommand*\newfloat@@setname[2]{%
@@ -765,6 +771,11 @@
     \fi
   \fi}
 %    \end{macrocode}
+% Note: Since the \package{hyperref} package with version $<$ 6.82k defines
+% |\the|\-|H|\-|figure| and |\the|\-|H|\-|table| with |\new|\-|command|,
+% |\newfloat@@setwithin| will yield to an error message when using with an
+% old version of \package{hyperref},
+% e.g. ``\texttt{LaTeX Error: Command \cs{theHfigure} already defined}''.
 %    \begin{macrocode}
 \newcommand*\newfloat@@setwithin[3]{%
   \global\@namedef{the#1}{#2\arabic{#1}}%
@@ -874,7 +885,7 @@
 %
 % \begin{macro}{\newfloat@@list}
 % |\newfloat@@list| is an \cs{@elt}-list containing the floating environments defined
-% with |\Declare|\x|Floating|\x|Environment| only.
+% with |\Declare|\-|Floating|\-|Environment| only.
 %    \begin{macrocode}
 \newcommand*\newfloat@@list{}
 %    \end{macrocode}
@@ -899,7 +910,7 @@
 % |\ForEachFloatingEnvironment|\marg{code}
 % will execute the given code for each floating environment.
 % The starred variant will only work for already existing environment,
-% i.e.~no hook will be placed inside |\Declare|\x|Floating|\x|Environment|.
+% i.e.~no hook will be placed inside |\Declare|\-|Floating|\-|Environment|.
 %    \begin{macrocode}
 \newcommand\ForEachFloatingEnvironment{%
   \@ifstar
@@ -929,7 +940,7 @@
 %
 % \begin{macro}{\newfloat@list}
 % |\newfloat@list| is an \cs{@elt}-list containing the already existising floating
-% environments as well the ones defined with |\Declare|\x|Floating|\x|Environment|.
+% environments as well the ones defined with |\Declare|\-|Floating|\-|Environment|.
 %    \begin{macrocode}
 \newcommand*\newfloat@list{}
 %    \end{macrocode}
@@ -1129,7 +1140,7 @@
 %
 % \begin{macro}{\newfloat@replace@chapter}
 %   |\newfloat@replace@chapter|\marg{original code}\marg{replacement code}\par
-%   tries to patch |\@chapter| so |\@add|\x|chapter|\x|lists|\x|gaps| will be supported.
+%   tries to patch |\@chapter| so |\@add|\-|chapter|\-|lists|\-|gaps| will be supported.
 %   It checks for |\Hy@org@chapter|, too, since the original code will be stored here
 %   if the \package{hyperref} package was loaded.
 %    \begin{macrocode}
@@ -1280,8 +1291,8 @@
 %
 % If a \KOMAScript{} document class or the \package{tocbasic} package is used
 % we don't need to patch anything.
-% Instead we use |\setup|\x|toc| and |\un|\x|set|\x|toc| to setup the
-% chapters gap in |\@chapter|\x|lists|\x|gap@on| and |\@chapter|\x|lists|\x|gap@off|.
+% Instead we use |\setup|\-|toc| and |\un|\-|set|\-|toc| to setup the
+% chapters gap in |\@chapter|\-|lists|\-|gap@on| and |\@chapter|\-|lists|\-|gap@off|.
 %    \begin{macrocode}
 \@ifpackageloaded{tocbasic}{%
   \let\newfloat@replace@chapter\@gobbletwo}{}
@@ -1291,7 +1302,7 @@
 % \subsubsection{memoir document classes}
 %
 % If the \package{memoir} document class is used,
-% replacing |\insert|\x|chapter|\x|space| by |\@add|\x|chapter|\x|lists|\x|gaps| is sufficient.
+% replacing |\insert|\-|chapter|\-|space| by |\@add|\-|chapter|\-|lists|\-|gaps| is sufficient.
 %    \begin{macrocode}
 \ifcsname insertchapterspace\endcsname
   \renewcommand*\insertchapterspace{\@addchapterlistsgaps}
@@ -1479,8 +1490,8 @@
 % \begin{macro}{\newfloat@ForEachNew}
 % |\newfloat@ForEachNew|\oarg{command}\marg{code}
 % will execute the given code for every floating environment defined with
-% |\Declare|\x|Floating|\x|Environment|.
-% This will be done |\At|\x|Begin|\x|Document| so the affected package could be loaded
+% |\Declare|\-|Floating|\-|Environment|.
+% This will be done |\At|\-|Begin|\-|Document| so the affected package could be loaded
 % after \thispackage.
 % (If a \meta{command} is given this will only be done if \meta{command} is
 %  defined.)
@@ -1516,7 +1527,7 @@
 %
 % We define a FP-variant of new floating environments here.
 %    \begin{macrocode}
-\newfloat@ForEachNew[FPfigure]{%
+\newfloat@ForEachNew[FP@floatBegin]{%
   \newcounter{FP@#1C}%
   \newenvironment{FP#1}{\FP@floatBegin{#1}}{\FP@floatEnd}}
 %    \end{macrocode}
@@ -1525,8 +1536,8 @@
 % \subsubsection{\package{listings}}
 %
 % \begin{macro}{\ext@lstlisting}
-% Since the \package{listings} package do not define |\ext@lst|\x|listing|
-% but we needed it when |Setup|\x|Floating|\x|Environment{lst|\x|listing}{|\ldots|}|
+% Since the \package{listings} package do not define |\ext@lst|\-|listing|
+% but we needed it when |Setup|\-|Floating|\-|Environment{lst|\-|listing}{|\ldots|}|
 % will be done by the end user, we define it here.
 %    \begin{macrocode}
 \providecommand*\ext@lstlisting{lol}%
@@ -1538,7 +1549,7 @@
 %
 % We define a sideways-variant of new floating environments here.
 %    \begin{macrocode}
-\newfloat@ForEachNew[sidewaysfigure]{%
+\newfloat@ForEachNew[@rotfloat]{%
   \newenvironment{sideways#1}{\@rotfloat{#1}}{\end@rotfloat}%
   \newenvironment{sideways#1*}{\@rotdblfloat{#1}}{\end@rotdblfloat}}
 %    \end{macrocode}
@@ -1557,7 +1568,7 @@
 \@onlypreamble\newfloat@For@SC
 %    \end{macrocode}
 %    \begin{macrocode}
-\newfloat@ForEachNew[SCfigure]{%
+\newfloat@ForEachNew[SC@float]{%
   \expandafter\newfloat@For@SC\csname SC@#1@vpos\endcsname{#1}}
 %    \end{macrocode}
 %
@@ -1566,7 +1577,7 @@
 %
 % We define a wrap-variant of new floating environments here.
 %    \begin{macrocode}
-\newfloat@ForEachNew[wrapfigure]{%
+\newfloat@ForEachNew[wrapfloat]{%
   \newenvironment{wrap#1}{\wrapfloat{#1}}{\endwrapfloat}}
 %    \end{macrocode}
 % \iffalse
diff --git a/Master/texmf-dist/source/latex/caption/subcaption.dtx b/Master/texmf-dist/source/latex/caption/subcaption.dtx
index 4ca7b6c55f5..ae8350c876e 100644
--- a/Master/texmf-dist/source/latex/caption/subcaption.dtx
+++ b/Master/texmf-dist/source/latex/caption/subcaption.dtx
@@ -2,7 +2,7 @@
 % 
 % This is file `subcaption.dtx'.
 % 
-% Copyright (C) 2007-2011 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
+% Copyright (C) 2007-2012 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
 % 
 % --------------------------------------------------------------------------
 % 
@@ -73,7 +73,6 @@
 \newcommand*\csmarg[1]{\texttt{\char`\{#1\char`\}}}
 \newcommand*\csoarg[1]{\texttt{\char`\[#1\char`\]}}
 \newcommand*\version[2][]{$v#2$}
-\newcommand*\x{\discretionary{}{}{}}
 %
 \usepackage{marvosym}
 \makeatletter
@@ -883,7 +882,7 @@
 % \subsection{Identification}
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{subcaption}[2011/10/30 v1.1c Sub-captions (AR)]
+\ProvidesPackage{subcaption}[2012/01/12 v1.1d Sub-captions (AR)]
 %    \end{macrocode}
 %
 % \subsection{Initial code}
@@ -1059,10 +1058,12 @@
 %
 % \begin{macro}{\subref}
 % \changes{v1.1}{2011/08/14}{Caption option \opt{subrefformat=} added}
-% \changes{v1.1a}{2011/08/18}{Uses \cs{caption@setoptions} now}
+% \changes{v1.1a}{2011/08/18}{Uses \cs{caption@setoptions*} now}
+% \changes{v1.1d}{2012/01/12}{Usage of \cs{caption@setoptions*} replaced by \cs{caption@setoptions}}
 % This one calls |\ref| with the second label. (see |\subcaption@label|)
 %    \begin{macrocode}
-\DeclareRobustCommand*\subref{\@ifstar{\subcaption@ref*}\@subref}
+\DeclareRobustCommand*\subref{%
+  \@ifstar{\subcaption@ref*}\@subref}
 \newcommand*\@subref{%
   \caption@withoptargs\@@subref}
 \newcommand*\@@subref[2]{%
@@ -1075,7 +1076,7 @@
   \caption@withoptargs\subcaption@@ref}
 \newcommand*\subcaption@@ref[2]{%
   \begingroup
-    \caption@setoptions*{sub}%
+    \caption@setoptions{sub}%
     \subcaption@reffmt\p@subref{\ref#1{sub@#2}}%
   \endgroup}
 %    \end{macrocode}
diff --git a/Master/texmf-dist/tex/latex/caption/bicaption.sty b/Master/texmf-dist/tex/latex/caption/bicaption.sty
index b1a0c37f5e0..1f3e8f7841c 100644
--- a/Master/texmf-dist/tex/latex/caption/bicaption.sty
+++ b/Master/texmf-dist/tex/latex/caption/bicaption.sty
@@ -6,7 +6,7 @@
 %%
 %% bicaption.dtx  (with options: `package')
 %% 
-%% Copyright (C) 1994-2011 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
+%% Copyright (C) 1994-2012 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
 %% 
 %% --------------------------------------------------------------------------
 %% 
diff --git a/Master/texmf-dist/tex/latex/caption/caption.sty b/Master/texmf-dist/tex/latex/caption/caption.sty
index 70e6762193a..324e981af4f 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-2011 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
+%% Copyright (C) 1994-2012 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
 %% 
 %% --------------------------------------------------------------------------
 %% 
@@ -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/10 v3.2e Customizing captions (AR)]
+\ProvidesPackage{caption}[2012/02/19 v3.2f Customizing captions (AR)]
 \RequirePackage{caption3}[2011/08/30] % needs v1.4 or newer
 \caption@ifbool{documentclass}{}{%
   \caption@WarningNoLine{%
@@ -62,15 +62,19 @@
   \captionsetup*[table]{position=#1}}
 \@onlypreamble@key{caption}{tableposition}
 \DeclareCaptionOption{figurename}{\caption@SetName{figure}{#1}}
+\@onlypreamble@key{caption}{figurename}
 \DeclareCaptionOption{tablename}{\caption@SetName{table}{#1}}
+\@onlypreamble@key{caption}{tablename}
 \DeclareCaptionOption{name}{\caption@setname\@captype{#1}}
 \DeclareCaptionOption{listfigurename}{\caption@SetName{listfigure}{#1}}
+\@onlypreamble@key{caption}{listfigurename}
 \DeclareCaptionOption{listtablename}{\caption@SetName{listtable}{#1}}
-\newcommand*\caption@SetName{%
-  \RequirePackage{newfloat}%
-  \newfloat@setname}
-\newcommand*\caption@setname[2]{\@namedef{#1name}{#2}}
-\caption@AtBeginDocument{\let\caption@SetName\caption@setname}
+\@onlypreamble@key{caption}{listtablename}
+\newcommand*\caption@SetName[2]{%
+  \caption@NewFloat{\newfloat@setname{#1}{#2}}}
+\@onlypreamble\caption@SetName
+\newcommand*\caption@setname[2]{%
+  \@namedef{#1name}{#2}}
 \newcommand*\caption@DeclareWithinOption[1]{%
   \DeclareCaptionOption{#1within}{\caption@Within{#1}{##1}}%
   \DeclareCaptionOptionNoValue{#1without}{\caption@Within{#1}{none}}}
@@ -78,14 +82,17 @@
 \caption@DeclareWithinOption{figure}
 \caption@DeclareWithinOption{table}
 \DeclareCaptionOption{within}{%
-  \RequirePackage{newfloat}%
-  \newfloatsetup{within=#1}}
+  \caption@NewFloat{\newfloatsetup{within=#1}}}
 \DeclareCaptionOptionNoValue{without}{%
-  \RequirePackage{newfloat}%
-  \newfloatsetup{without}}
-\newcommand*\caption@Within{%
-  \RequirePackage{newfloat}%
-  \newfloat@setwithin}
+  \caption@NewFloat{\newfloatsetup{without}}}
+\newcommand*\caption@Within[2]{%
+  \caption@NewFloat{\newfloat@setwithin{#1}{#2}}}
+\newcommand*\caption@NewFloat[1]{%
+  \let\KV@prefix@ORI\KV@prefix
+  \let\@tempc@ORI\@tempc
+  \caption@ifpackageloaded{newfloat}{#1}{}%
+  \let\@tempc\@tempc@ORI
+  \let\KV@prefix\KV@prefix@ORI}
 \DeclareCaptionOption*{config}[caption]{%
    \InputIfFileExists{#1.cfg}%
      {\typeout{*** Local configuration file #1.cfg used ***}}%
@@ -270,7 +277,6 @@
 \long\def\caption@@caption#1[#2]#3{%
   \ifcaption@star \else
     \caption@prepareanchor{#1}{#2}%
-    \M@gettitle{#2}%
     \memcaptioninfo{#1}{\csname the#1\endcsname}{#2}{#3}%
   \fi
   \par
@@ -292,7 +298,8 @@
 \providecommand\memcaptioninfo[4]{}
 \newcommand*\caption@prepareanchor[2]{%
   \caption@makecurrent{#1}{#2}%
-  \caption@ifhypcap\caption@@start{}}
+  \caption@ifhypcap\caption@@start{}%
+  \M@gettitle{#2}}
 \long\def\caption@makecaption#1#2{%
   \caption@iftop
     {\vskip\belowcaptionskip}%
@@ -795,9 +802,6 @@
 \providecommand*\caption@hj@r{\raggedleft}
 \providecommand*\caption@hj@s{}
 \def\ContinuedFloat{%
-  \@ifnextchar[\@Continued@Float\@ContinuedFloat}
-\def\@Continued@Float[#1]{\addtocounter{#1}\m@ne}
-\def\@ContinuedFloat{%
   \caption@iftype
     {\addtocounter\@captype\m@ne
      \caption@ContinuedFloat\@captype}%
@@ -831,7 +835,10 @@
 \newcounter{ContinuedFloat}
 \let\theContinuedFloat\@empty
 \newcommand*\caption@resetContinuedFloat[1]{%
-  \@stpelt{ContinuedFloat}\xdef\caption@CFtype{#1}}
+  \@stpelt{ContinuedFloat}%
+  \xdef\caption@CFtype{#1}%
+  \def\ContinuedFloat{\caption@Error{%
+    \noexpand\ContinuedFloat must be placed at the top of the environment}}}
 \newcommand\phantomcaption{%
   \caption@iftype
     {\caption@refstepcounter\@captype}%
@@ -885,7 +892,7 @@
 \newcommand*\caption@normalsize{%
   \caption@font*{\KV@caption@fnt@normal\@unused}}
 \let\caption@setfloatcapt\@firstofone
-\newcommand*\caption@makecurrent[2]{}
+\newcommand*\caption@makecurrent[1]{\caption@gettitle}
 \let\caption@makeanchor\@firstofone
 \let\caption@start\relax
 \let\caption@@start\relax
@@ -1057,12 +1064,9 @@
   \@ifpackageloaded{#1}\@firstofone{%
     \caption@Debug{#1 package is not loaded (yet)\@gobble}%
     \caption@AtBeginDocument}{%
-      \caption@@ifpackageloaded{#1}[#2]{#3}{#4}}}
+      \caption@If@Package@Loaded{#1}[#2]{#3}{#4}}}
 \@onlypreamble\caption@@IfPackageLoaded
-\newcommand\caption@ifpackageloaded[1]{%
-  \@testopt{\caption@@ifpackageloaded{#1}}{}}
-\@onlypreamble\caption@ifpackageloaded
-\long\def\caption@@ifpackageloaded#1[#2]{%
+\long\def\caption@If@Package@Loaded#1[#2]{%
   \@ifpackageloaded{#1}{%
     \caption@InfoNoLine{#1 package is loaded}%
     \@ifpackagelater{#1}{#2}\@firstoftwo{%
@@ -1074,7 +1078,7 @@
         is available}%
       \@secondoftwo}%
   }{\@secondoftwo}}
-\@onlypreamble\caption@@ifpackageloaded
+\@onlypreamble\caption@If@Package@Loaded
 \newcommand*\caption@clearmargin{%
   \setcaptionmargin\z@
   \let\caption@minmargin\@undefined}
@@ -1149,7 +1153,7 @@
 \let\caption@warmup\relax
 \caption@IfPackageLoaded{float}[2001/11/08 v1.3d]{%
  \@ifpackageloaded{floatrow}{%
-  \caption@ifpackageloaded{floatrow}[2007/08/24 v0.2a]{}{}%
+  \caption@If@Package@Loaded{floatrow}[2007/08/24 v0.2a]{}{}%
  }{%
   \let\caption@ORI@float@setevery\@float@setevery
   \def\@float@setevery#1{%
@@ -1222,6 +1226,7 @@
   \renewcommand*\FP@floatBegin[1]{%
     \def\FP@captype{#1}%
     \begin{lrbox}{\FP@floatCorpusBOX}%
+    \minipage\hsize % changes from LR mode to vertical mode
     \caption@settype*{#1}%
     \caption@freeze
     \global\let\FP@Label\@empty
@@ -1231,6 +1236,7 @@
           \g@addto@macro\FP@Label{\FP@label##1{##2}}}}%
     \ignorespaces}%
   \renewcommand*\FP@floatEnd{%
+    \endminipage
     \end{lrbox}%
     \stepcounter{FP@\FP@captype C}%
     \caption@label\FP@positionLabel
diff --git a/Master/texmf-dist/tex/latex/caption/caption2.sty b/Master/texmf-dist/tex/latex/caption/caption2.sty
index 377f1c1f548..0cf8f362070 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-2011 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
+%% Copyright (C) 1994-2012 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
 %% 
 %% --------------------------------------------------------------------------
 %% 
diff --git a/Master/texmf-dist/tex/latex/caption/caption3.sty b/Master/texmf-dist/tex/latex/caption/caption3.sty
index 6bfa4f541a9..1187760af37 100644
--- a/Master/texmf-dist/tex/latex/caption/caption3.sty
+++ b/Master/texmf-dist/tex/latex/caption/caption3.sty
@@ -6,7 +6,7 @@
 %%
 %% caption3.dtx  (with options: `package')
 %% 
-%% Copyright (C) 1994-2011 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
+%% Copyright (C) 1994-2012 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
 %% 
 %% --------------------------------------------------------------------------
 %% 
@@ -29,7 +29,7 @@
 %% and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex.
 %% 
 \NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption3}[2011/11/01 v1.4a caption3 kernel (AR)]
+\ProvidesPackage{caption3}[2012/01/12 v1.4b caption3 kernel (AR)]
 \providecommand*\@nameundef[1]{%
   \expandafter\let\csname #1\endcsname\@undefined}
 \providecommand\l@addto@macro[2]{%
@@ -284,15 +284,12 @@
       }}%
   \@esphack}
 \DeclareCaptionOption{options}{\caption@setoptions{#1}}
-\DeclareCaptionOption{options*}{\caption@setoptions*{#1}}
-\newcommand*\caption@setoptions{%
-  \caption@teststar\caption@set@options\@gobble\@firstofone}
-\newcommand*\caption@set@options[2]{%
-  \caption@Debug{options=#2}%
-  \expandafter\let\expandafter\caption@opt\csname caption@opt@#2\endcsname
+\newcommand*\caption@setoptions[1]{%
+  \caption@Debug{options=#1}%
+  \expandafter\let\expandafter\caption@opt\csname caption@opt@#1\endcsname
   \ifx\caption@opt\relax \else
     \caption@xsetup\caption@opt
-    #1{\caption@clearsetup{#2}}% #1 = \@firstofone -or- \@gobble
+    \caption@clearsetup{#1}%
   \fi}
 \newcommand*\caption@xsetup[1]{\expandafter\caption@setup\expandafter{#1}}
 \newcommand*\caption@addtooptlist[1]{%
@@ -751,34 +748,48 @@
   \caption@ragged\RaggedLeft\raggedleft}
 \DeclareCaptionJustification{RaggedRight}{%
   \caption@ragged\RaggedRight\raggedright}
-\newcommand*\caption@ragged{%
-  \caption@Debug{We need ragged2e}%
-  \protected@write\@auxout{}{\string\caption@newlabel{ragged2e}{}}%
-  \global\let\caption@ragged\caption@@ragged
-  \caption@ragged}
-\caption@AtBeginDocument{%
-  \@ifundefined{caption@r@ragged2e}{%
-    \newcommand*\caption@@ragged{%
-      \caption@Warning{%
-        `ragged2e' support has been changed.\MessageBreak
-        Rerun to get captions right}%
-      \global\let\caption@ragged\@secondoftwo % suppress further warnings
-      \caption@ragged}%
-  }{%
-    \caption@Debug{We load ragged2e}%
-    \IfFileExists{ragged2e.sty}{%
-      \RequirePackage{ragged2e}%
-      \let\caption@@ragged\@firstoftwo
-    }{%
-      \newcommand*\caption@@ragged[2]{%
-        \@ifundefined{caption\string#1}{%
-          \caption@Warning{%
-            `ragged2e' package not loaded, therefore\MessageBreak
-            substituting \string#2 for \string#1\MessageBreak}%
-          \global\@namedef{caption\string#1}}{}%
-        #2}%
-    }%
-  }}
+\newcommand*\caption@ragged{\caption@ifpackageloaded{ragged2e}}
+\newcommand*\caption@ifpackageloaded[1]{%
+  \@ifundefined{caption@ifpkg@#1}%
+    {\caption@RequirePackage{#1}%
+     \caption@pkg@true{#1}}%
+    {}%
+  \caption@ifpkg{#1}}
+\AtBeginDocument{\renewcommand*\caption@ifpackageloaded[1]{%
+  \@ifundefined{caption@ifpkg@#1}%
+    {\caption@addto@pkg@list{#1}%
+     \caption@pkg@false{#1}%
+     \caption@Warning{%
+       `#1' support has been changed.\MessageBreak
+       Rerun to get captions right}}%
+    {}%
+  \caption@ifpkg{#1}}}
+\newcommand*\caption@ifpkg[1]{%
+  \csname caption@ifpkg@#1\endcsname}
+\newcommand*\caption@pkg@true[1]{%
+  \global\expandafter\let\csname caption@ifpkg@#1\endcsname\@firstoftwo}
+\newcommand*\caption@pkg@false[1]{%
+  \global\expandafter\let\csname caption@ifpkg@#1\endcsname\@secondoftwo}
+\newcommand*\caption@pkg@list{}
+\newcommand*\caption@addto@pkg@list[1]{%
+  \protected@write\@auxout{}{%
+    \string\@cons\string\caption@pkg@list{{#1}}}}
+\AtBeginDocument{%
+  \def\caption@tempa{\endgroup}%
+  \begingroup
+  \def\@elt#1{%
+    \g@addto@macro\caption@tempa{%
+      \caption@RequirePackage{#1}%
+      \@namedef{caption@ifpkg@#1}{%
+        \caption@addto@pkg@list{#1}%
+        \caption@pkg@true{#1}%
+        \caption@ifpkg{#1}}}}%
+  \caption@pkg@list
+  \caption@tempa}
+\newcommand*\caption@RequirePackage[1]{%
+  \caption@Info{We need package `#1'}%
+  \RequirePackage{#1}}
+\@onlypreamble\caption@RequirePackage
 \caption@ifundefined\abovecaptionskip{%
   \newlength\abovecaptionskip\setlength\abovecaptionskip{10\p@}}{}
 \caption@ifundefined\belowcaptionskip{%
@@ -1536,6 +1547,7 @@
   \endgroup}
 \def\sf@NEW@subfloat{%
   \begingroup
+   \@nameuse{caption@warmup}%
     \caption@setfloattype\@captype
     \sf@ifpositiontop{%
       \maincaptiontoptrue
diff --git a/Master/texmf-dist/tex/latex/caption/ltcaption.sty b/Master/texmf-dist/tex/latex/caption/ltcaption.sty
index 3619423a779..20778a3fc41 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-2011 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
+%% Copyright (C) 1994-2012 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
 %% 
 %% --------------------------------------------------------------------------
 %% 
diff --git a/Master/texmf-dist/tex/latex/caption/newfloat.sty b/Master/texmf-dist/tex/latex/caption/newfloat.sty
index dcee36a3233..b4ccd4b4610 100644
--- a/Master/texmf-dist/tex/latex/caption/newfloat.sty
+++ b/Master/texmf-dist/tex/latex/caption/newfloat.sty
@@ -6,7 +6,7 @@
 %%
 %% newfloat.dtx  (with options: `package')
 %% 
-%% Copyright (C) 1994-2011 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
+%% Copyright (C) 1994-2012 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
 %% 
 %% --------------------------------------------------------------------------
 %% 
@@ -29,7 +29,7 @@
 %% and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex.
 %% 
 \NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{newfloat}[2011/10/30 v1.0 Defining new floating environments (AR)]
+\ProvidesPackage{newfloat}[2011/11/16 v1.0a Defining new floating environments (AR)]
 \newcommand*\newfloat@Info[1]{%
   \PackageInfo{newfloat}{#1}}
 \newcommand*\newfloat@Error[1]{%
@@ -80,6 +80,7 @@
   \fi
   \expandafter\newcommand\csname list#2name\endcsname{}%
   \expandafter\xdef\csname list#2name\endcsname{List of \newfloat@Type s}%
+  \expandafter\let\csname fst@#2\endcsname\@undefined
   \newfloat@setplacement{#2}{tbp}%
   \newfloat@setfileext{#2}{lo#2}%
   \newfloat@setoptions*{#2}{#1}%
@@ -113,7 +114,7 @@
 \newcommand*\newfloat@@setoptions[3]{%
   \let\newfloat@within@value\@undefined
   \let\newfloat@chapterlistsgaps@value\@undefined
-  #1{\KV@@newfloat@within\newfloat@within@default}% set default value
+  #1{\KV@@newfloat@within\newfloat@within@default}% set default value for new floats
   \def\newfloat@type{#2}%
   \setkeys{@newfloat}{#3}%
   \ifx\newfloat@within@value\@undefined \else
@@ -145,6 +146,7 @@
       \fi
     \fi
   \endgroup}
+%%\AtBeginDocument{\let\newfloat@setname\newfloat@@setname}
 \newcommand*\newfloat@@setname[2]{%
   \@namedef{#1name}{#2}}
 \define@key{@newfloat}{name}{%
@@ -631,11 +633,11 @@
     \edef\@tempa{%
       \noexpand\float@exts{\the\float@exts\float@do{\@nameuse{ext@#1}}}}%
     \@tempa}}
-\newfloat@ForEachNew[FPfigure]{%
+\newfloat@ForEachNew[FP@floatBegin]{%
   \newcounter{FP@#1C}%
   \newenvironment{FP#1}{\FP@floatBegin{#1}}{\FP@floatEnd}}
 \providecommand*\ext@lstlisting{lol}%
-\newfloat@ForEachNew[sidewaysfigure]{%
+\newfloat@ForEachNew[@rotfloat]{%
   \newenvironment{sideways#1}{\@rotfloat{#1}}{\end@rotfloat}%
   \newenvironment{sideways#1*}{\@rotdblfloat{#1}}{\end@rotdblfloat}}
 \newcommand*\newfloat@For@SC[2]{%
@@ -645,9 +647,9 @@
   \newenvironment{SC#2*}%
     {\SC@dblfloat[#1]{#2}}{\endSC@dblfloat}}
 \@onlypreamble\newfloat@For@SC
-\newfloat@ForEachNew[SCfigure]{%
+\newfloat@ForEachNew[SC@float]{%
   \expandafter\newfloat@For@SC\csname SC@#1@vpos\endcsname{#1}}
-\newfloat@ForEachNew[wrapfigure]{%
+\newfloat@ForEachNew[wrapfloat]{%
   \newenvironment{wrap#1}{\wrapfloat{#1}}{\endwrapfloat}}
 \endinput
 %%
diff --git a/Master/texmf-dist/tex/latex/caption/subcaption.sty b/Master/texmf-dist/tex/latex/caption/subcaption.sty
index 66dae89eef4..13cfa8b6b71 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-2011 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
+%% Copyright (C) 1994-2012 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
 %% 
 %% --------------------------------------------------------------------------
 %% 
@@ -29,7 +29,7 @@
 %% and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex.
 %% 
 \NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{subcaption}[2011/10/30 v1.1c Sub-captions (AR)]
+\ProvidesPackage{subcaption}[2012/01/12 v1.1d Sub-captions (AR)]
 \RequirePackage{caption}[2011/08/18] % needs v3.2b or newer
 \caption@AtBeginDocument{\caption@ifcompatibility{%
   \caption@Error{%
@@ -87,7 +87,8 @@
     \protected@edef\@currentlabel{\csname thesub\@captype\endcsname}%
     \subcaption@ORI@label#1{sub@#2}%
   \endgroup\@esphack}
-\DeclareRobustCommand*\subref{\@ifstar{\subcaption@ref*}\@subref}
+\DeclareRobustCommand*\subref{%
+  \@ifstar{\subcaption@ref*}\@subref}
 \newcommand*\@subref{%
   \caption@withoptargs\@@subref}
 \newcommand*\@@subref[2]{%
@@ -98,7 +99,7 @@
   \caption@withoptargs\subcaption@@ref}
 \newcommand*\subcaption@@ref[2]{%
   \begingroup
-    \caption@setoptions*{sub}%
+    \caption@setoptions{sub}%
     \subcaption@reffmt\p@subref{\ref#1{sub@#2}}%
   \endgroup}
 \newcommand*\p@subref{}