6 files changed, 15 insertions, 111 deletions
diff --git a/Master/texmf-dist/tex/latex/floatrow/floatpagestyle.sty b/Master/texmf-dist/tex/latex/floatrow/floatpagestyle.sty
index 3775df81e91..dca9cd27cf5 100644
--- a/Master/texmf-dist/tex/latex/floatrow/floatpagestyle.sty
+++ b/Master/texmf-dist/tex/latex/floatrow/floatpagestyle.sty
@@ -23,22 +23,6 @@
 \NeedsTeXFormat{LaTeX2e}[1995/06/01]
 \ProvidesPackage{floatpagestyle}
        [2005/10/02 v0.1h floating page style]
-%%^^A|\newcommand\CenterFloatBoxes{\CADJfalse\OADJfalse|
-%%^^A
-%%^^A
-%%^^A
-%%^^A
-%%^^A
-%%^^A
-%%^^A
-%%^^A
-%%^^A
-%%^^A
-%%^^A
-%%^^A
-%%^^A
-%%^^A
-%%^^A
 \newcommand\floatpagestyle[1]{\@ifundefined{ps@#1}\undefinedpagestyle
   {\begingroup
    \let\thepage\relax\let\protect\@unexpandable@protect
diff --git a/Master/texmf-dist/tex/latex/floatrow/floatrow.sty b/Master/texmf-dist/tex/latex/floatrow/floatrow.sty
index c93a0b9b3ac..01a33fbdfd2 100644
--- a/Master/texmf-dist/tex/latex/floatrow/floatrow.sty
+++ b/Master/texmf-dist/tex/latex/floatrow/floatrow.sty
@@ -22,23 +22,7 @@
 %% in the same archive or directory.)
 \NeedsTeXFormat{LaTeX2e}[1995/06/01]
 \ProvidesPackage{floatrow}
-       [2009/06/20 v0.3a floatrow: float package extension]
-%%^^A|\newcommand\CenterFloatBoxes{\CADJfalse\OADJfalse|
-%%^^A
-%%^^A
-%%^^A
-%%^^A
-%%^^A
-%%^^A
-%%^^A
-%%^^A
-%%^^A
-%%^^A
-%%^^A
-%%^^A
-%%^^A
-%%^^A
-%%^^A
+       [2008/08/02 v0.3b floatrow: float package extension]
 \@ifundefined{float@caption}{%
   \@ifundefined{rotfloat@float}{}%
     {\PackageError{floatrow}{Do not use rotfloat package with floatrow.\MessageBreak
@@ -278,16 +262,12 @@
   \DeclareNewFloatType{#1}{placement=#2,fileext=#3,within=#4}}
 \let\@float@Hx\@xfloat
 \def\@xfloat#1[{\@ifnextchar{H}{\@float@HH{#1}[}{\@float@Hx{#1}[}}
-\AtBeginDocument
-{\@ifundefined{latex@xfloat}{}{\let\@xfloat\setspace@xfloat
-}\let\setspace@xfloat\relax}
-\@ifdefinable\setspace@xfloat{}
-\def\setspace@xfloat #1[#2]{%
-  \latex@xfloat #1[#2]%
-  \def\baselinestretch{\setspace@singlespace}%
-  \normalsize
-  \floatfont
-}
+\AtBeginDocument{%
+  \@ifundefined{latex@xfloat}{}{%
+    \let\floatrow@ORI@xfloat\@xfloat
+    \def\@xfloat#1[#2]{%
+      \floatrow@ORI@xfloat{#1}[#2]%
+      \floatfont}}}%
 \newsavebox\float@box
 \def\@float@HH#1[H]{%
   \@ifundefined{FloatHBarrier}{}\FloatHBarrier
@@ -295,7 +275,7 @@
   \FR@ifdoubleaswide
    {\expandafter\let\csname end#1*\endcsname\float@endH}\relax
   \let\@currbox\float@box
-  \flrow@setlist{{floatH}{#1H}}%
+  \flrow@setlist*{{floatH}{#1H}}%
   \def\@captype{#1}%\setbox\@floatcapt=\vbox{}%
   \setbox\@currbox\color@vbox\normalcolor
     \vbox\bgroup
@@ -864,12 +844,12 @@
 \newbox\flrow@rowbox
 \newcommand\floatrow[1][2]{\c@FRobj=#1\relax
   \ifcase\floatbox@depth
-    \flrow@setlist{{floatrow}{\@captype row}}%
+    \flrow@setlist*{{floatrow}{\@captype row}}%
   \or
     \flrow@settype{subfloat}\flrow@settype{subtype}\flrow@settype{sub\@captype}%
     \flrow@settype{subfloatrow}\flrow@settype{sub\@captype row}%
     \ifx\flrow@to\empty\def\flrow@boxset##1{}\fi
-  \fi
+  \fi%
   \FB@facing\@tempswafalse\FR@iffacing\@tempswatrue\relax
   \ifCADJ\@tempswatrue\fi\ifOADJ\@tempswatrue\fi
   \if@tempswa\FB@readaux{\relax}\fi
@@ -972,7 +952,11 @@
   \edef\FR@tmp{\noexpand\flrow@setup{#1}}\FR@tmp}
 \def\flrow@settype#1{\@ifundefined{flrow@typ@#1}{}%
   {\flrow@esetup{\csname flrow@typ@#1\endcsname}}}%
-\newcommand\flrow@setlist[1]{\@flrow@setlist#1{tmpset};%
+\newcommand\flrow@setlist{\@ifstar\flrow@setlist@@\flrow@setlist@}
+\newcommand\flrow@setlist@[1]{\@flrow@setlist#1{tmpset};%
+  \FR@ifCST{\flrow@capsetup}\relax\@cap@setlist#1;%
+  \caption@setposition{\FBifcaptop tb}}
+\newcommand\flrow@setlist@@[1]{\@flrow@setlist#1;%
   \FR@ifCST{\flrow@capsetup}\relax\@cap@setlist#1;%
   \caption@setposition{\FBifcaptop tb}}
 \newcommand\@flrow@setlist[1]{\flrow@settype{#1}\@ifnextchar;\@gobble
diff --git a/Master/texmf-dist/tex/latex/floatrow/fr-fancy.sty b/Master/texmf-dist/tex/latex/floatrow/fr-fancy.sty
index d4c279002bd..c7e2cd092b8 100644
--- a/Master/texmf-dist/tex/latex/floatrow/fr-fancy.sty
+++ b/Master/texmf-dist/tex/latex/floatrow/fr-fancy.sty
@@ -23,22 +23,6 @@
 \NeedsTeXFormat{LaTeX2e}[1995/06/01]
 \ProvidesPackage{fr-fancy}
        [2007/11/28 v0.1i floatrow: fancy boxes]
-%%^^A|\newcommand\CenterFloatBoxes{\CADJfalse\OADJfalse|
-%%^^A
-%%^^A
-%%^^A
-%%^^A
-%%^^A
-%%^^A
-%%^^A
-%%^^A
-%%^^A
-%%^^A
-%%^^A
-%%^^A
-%%^^A
-%%^^A
-%%^^A
 \RequirePackage{fancybox}
 \newcommand\wshadowbox{\VerbBox\@wshadowbox}
 \newcommand\@wshadowbox[1]{%
diff --git a/Master/texmf-dist/tex/latex/floatrow/fr-longtable.sty b/Master/texmf-dist/tex/latex/floatrow/fr-longtable.sty
index 48e991ec2e6..0c82c2f359d 100644
--- a/Master/texmf-dist/tex/latex/floatrow/fr-longtable.sty
+++ b/Master/texmf-dist/tex/latex/floatrow/fr-longtable.sty
@@ -23,22 +23,6 @@
 \NeedsTeXFormat{LaTeX2e}[1995/06/01]
 \ProvidesPackage{fr-longtable}
        [2007/11/28 v0.1b (beta) floatrow: additions for longtable]
-%%^^A|\newcommand\CenterFloatBoxes{\CADJfalse\OADJfalse|
-%%^^A
-%%^^A
-%%^^A
-%%^^A
-%%^^A
-%%^^A
-%%^^A
-%%^^A
-%%^^A
-%%^^A
-%%^^A
-%%^^A
-%%^^A
-%%^^A
-%%^^A
 \RequirePackage{longtable}[2004/02/01]
 \@ifdefinable\flrow@oriLT@array{\let\flrow@oriLT@array\LT@array}
 \renewcommand\LT@array{%
diff --git a/Master/texmf-dist/tex/latex/floatrow/fr-subfig.sty b/Master/texmf-dist/tex/latex/floatrow/fr-subfig.sty
index 56452ba8132..3ec9313ff1c 100644
--- a/Master/texmf-dist/tex/latex/floatrow/fr-subfig.sty
+++ b/Master/texmf-dist/tex/latex/floatrow/fr-subfig.sty
@@ -23,22 +23,6 @@
 \NeedsTeXFormat{LaTeX2e}[1995/06/01]
 \ProvidesPackage{fr-subfig}
        [2007/12/24 v0.1g (beta) floatrow: additions for subfig]
-%%^^A|\newcommand\CenterFloatBoxes{\CADJfalse\OADJfalse|
-%%^^A
-%%^^A
-%%^^A
-%%^^A
-%%^^A
-%%^^A
-%%^^A
-%%^^A
-%%^^A
-%%^^A
-%%^^A
-%%^^A
-%%^^A
-%%^^A
-%%^^A
 \def\@tempb{2005/06/28 ver: 1.3 subfig package}
 \expandafter\let\csname @tempa\expandafter\endcsname
     \csname ver@subfig.\@pkgextension\endcsname
diff --git a/Master/texmf-dist/tex/latex/floatrow/listpen.sty b/Master/texmf-dist/tex/latex/floatrow/listpen.sty
index 65cc2ff0bbf..fd35e74a1fc 100644
--- a/Master/texmf-dist/tex/latex/floatrow/listpen.sty
+++ b/Master/texmf-dist/tex/latex/floatrow/listpen.sty
@@ -23,22 +23,6 @@
 \NeedsTeXFormat{LaTeX2e}[1995/06/01]
 \ProvidesPackage{listpen}
        [2007/10/28 v0.1d list penalty managing]
-%%^^A|\newcommand\CenterFloatBoxes{\CADJfalse\OADJfalse|
-%%^^A
-%%^^A
-%%^^A
-%%^^A
-%%^^A
-%%^^A
-%%^^A
-%%^^A
-%%^^A
-%%^^A
-%%^^A
-%%^^A
-%%^^A
-%%^^A
-%%^^A
 \newcommand\allowprelistbreaks{\let\LP@penalty\@beginparpenalty
   \@testopt{\LP@setlistbreaks}{-1}}
 \newcommand\allowpostlistbreaks{\let\LP@penalty\@endparpenalty