floatrow 0.2c

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

6 files changed, 355 insertions, 296 deletions

diff --git a/Master/texmf-dist/tex/latex/floatrow/floatpagestyle.sty b/Master/texmf-dist/tex/latex/floatrow/floatpagestyle.sty
index dca9cd27cf5..9866f52d2a9 100644
--- a/Master/texmf-dist/tex/latex/floatrow/floatpagestyle.sty
+++ b/Master/texmf-dist/tex/latex/floatrow/floatpagestyle.sty
@@ -23,6 +23,7 @@
 \NeedsTeXFormat{LaTeX2e}[1995/06/01]
 \ProvidesPackage{floatpagestyle}
        [2005/10/02 v0.1h floating page style]
+%%^^A|\newcommand\CenterFloatBoxes{\CADJfalse\OADJfalse|
 \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 69be6d0725e..9667ec9b8f7 100644
--- a/Master/texmf-dist/tex/latex/floatrow/floatrow.sty
+++ b/Master/texmf-dist/tex/latex/floatrow/floatrow.sty
@@ -22,12 +22,15 @@
 %% in the same archive or directory.)
 \NeedsTeXFormat{LaTeX2e}[1995/06/01]
 \ProvidesPackage{floatrow}
-       [2007/08/24 v0.2a floatrow: float package extension]
+       [2008/03/28 v0.2c floatrow: float package extension]
+%%^^A|\newcommand\CenterFloatBoxes{\CADJfalse\OADJfalse|
 \@ifundefined{float@caption}{%
   \@ifundefined{rotfloat@float}{}%
-    {\PackageError{floatrow}{Do not use rotfloat package with floatrow}{}%
+    {\PackageError{floatrow}{Do not use rotfloat package with floatrow.\MessageBreak
+        The latter will be skipped}{}%
   \@namedef{opt@floatrow.sty}{}\endinput}}%
-  {\PackageError{floatrow}{Do not use float package with floatrow}{}%
+  {\PackageError{floatrow}{Do not use float package with floatrow.\MessageBreak
+        The latter will be skipped}{}%
   \@namedef{opt@floatrow.sty}{}\endinput}
 \@namedef{ver@float.sty}{2001/11/08 v1.3d (excerpt)
     Float enhancements (AL)}
@@ -40,12 +43,12 @@
     version `2007/04/11 v3.0q' of package caption,\MessageBreak
         but only version\MessageBreak
           `\csname ver@caption.\@pkgextension\endcsname'\MessageBreak
-        is available}\@eha}
+        is available}\@eha\endinput}
 \providecommand*\caption@fnum[1]{%
    \caption@lfmt{\@nameuse{#1name}}{\@nameuse{the#1}}}
 \@ifdefinable\FR@flboxreset{\let\FR@flboxreset\@floatboxreset}
 \@ifdefinable\FR@makecaption{\let\FR@makecaption\@makecaption}
-\newcommand\FB@caption{%
+\newcommand\flrow@caption{%
    \ifx\@captype\@undefined
      \@latex@error{\noexpand\caption outside float}\@ehd
      \expandafter\@gobble
@@ -61,8 +64,7 @@
   {\setcounter{float@type}{1}}%
   {\setcounter{float@type}{4}}
 \newcommand\flrow@package{floatrow}
-\newcommand*\flrow@error[1]{%
-  \PackageError\flrow@package{#1}\flrow@eh}
+\newcommand*\flrow@error[1]{\PackageError\flrow@package{#1}\flrow@eh}
 \newcommand*\flrow@eh{%
   If you do not understand this error, please take look\MessageBreak
   at `floatrow' and `caption' package documentations.\MessageBreak
@@ -81,7 +83,10 @@
     \let\@makecaption\flrow@makecaption
   \fi
   \let\@floatboxreset\flrow@flboxreset}
-\newcommand\flrow@makecaption[2]{\global\setbox\@floatcapt
+\newcommand\flrow@makecaption[2]{\ifnum\floatbox@depth=\z@
+    \ifvoid\@floatcapt
+      \else\flrow@error{Caption(s) lost}\fi\fi
+  \global\setbox\@floatcapt
   \vbox\bgroup\@parboxrestore
    \reset@font
    \if@@FS
@@ -92,75 +97,11 @@
       \fi
    \fi
    \linewidth\hsize
+   \ifdim\hsize<70mm\sloppy\fi
    \normalsize
    \abovecaptionskip\z@\belowcaptionskip\z@
    \FR@makecaption{#1}{#2}\egroup}
-\newcommand\killfloatstyle{\FBbuildtrue
-  \if@@FS\hsize\FB@wd\fi\@@FSfalse}
-\newcommand\RawFloats{\@ifnextchar[%]
-    \flrow@rawfloatschk\flrow@rawfloats}
-\newcommand\flrow@rawfloats{\killfloatstyle\@parboxrestore
-    \let\@makecaption\FR@makecaption
-    \expandafter\ifx\csname end\@captype\endcsname\float@endH
-        \@namedef{end\@captype}{\FBbuildfalse\float@endH}%
-    \else
-        \@namedef{end\@captype}{\end@float}%
-    \fi
-    \@namedef{end\@captype*}{\end@dblfloat}%
-  \@ifundefined{@rotfloat}{}{%
-    \@namedef{endsideways\@captype}{\end@rotfloat}%
-    \@namedef{endsideways\@captype*}{\end@rotdblfloat}%
-  }%
-  \@ifundefined{wrapfloat}{}{%
-    \@namedef{endwrap\@captype}{\endwrapfloat}%
-  }}
-\@ifdefinable\flrow@rawfloatschk{}
-\def\flrow@rawfloatschk[#1]{\@ifnextchar[%]
-    {\flrow@RawFloats[#1]}{\flrow@@RawFloats#1,;}}
-\@ifdefinable\flrow@RawFloats{}
-\def\flrow@RawFloats[#1][#2]{\flrow@RawFloats@[#1]#2,;}
-\def\flrow@RawFloats@[#1]#2,{%
-  \caption@ifinlist{#2}{float}{\@namedef{#1}{\@float{#1}}%
-  }{\caption@ifinlist{#2}{widefloat,wide}{\@namedef{#1*}{%
-    \let\@xdblfloat\@xfloat\@dblfloat{#1}}%
-  }{\caption@ifinlist{#2}{rotfloat,rot}{%
-    \@ifundefined{@rotfloat}{}{\@namedef{sideways#1}{\@rotfloat{#1}}}%
-  }{\caption@ifinlist{#2}{widerotfloat,widerot}{%
-    \@ifundefined{@rotfloat}{}{\@namedef{sideways#1*}{\@rotdblfloat{#1}}}%
-  }{\caption@ifinlist{#2}{wrapfloat,wrap}{%
-    \@ifundefined{wrapfloat}{}{\@namedef{wrap#1}{\wrapfloat{#1}}}}%
-  }{\caption@ifinlist{#2}{all,allfloats}{%
-    \flrow@@RawFloats{#1}%
-  }{\flrow@error{Undefined float subtype `#2'}%
-  }}}}}\@ifnextchar;\@gobble{\flrow@RawFloats@[#1]}}
-\@ifdefinable\flrow@@RawFloats{}
-\def\flrow@@RawFloats#1,{%
-    \@namedef{#1}{\@float{#1}}%
-    \@namedef{#1*}{\let\@xdblfloat\@xfloat\@dblfloat{#1}}%
-  \@ifundefined{@rotfloat}{}{%
-    \@namedef{sideways#1}{\@rotfloat{#1}}%
-    \@namedef{sideways#1*}{\@rotdblfloat{#1}}%
-  }%
-  \@ifundefined{wrapfloat}{}{%
-    \@namedef{wrap#1}{\wrapfloat{#1}}%
-  }\@ifnextchar;\@gobble\flrow@@RawFloats
-}
-\newcommand\flrow@Raw@restyle[1]{%
-    \@namedef{#1}{\@float{#1}}%
-    \@namedef{#1*}{\@dblfloat{#1}}%
-    \@namedef{end#1}{\end@float}%
-    \@namedef{end#1*}{\end@dblfloat}%
-  \@ifundefined{@rotfloat}{}{%
-    \@namedef{sideways#1}{\@rotfloat{#1}}%
-    \@namedef{sideways#1*}{\@rotdblfloat{#1}}%
-    \@namedef{endsideways#1}{\end@rotfloat}%
-    \@namedef{endsideways#1*}{\end@rotdblfloat}%
-  }%
-  \@ifundefined{wrapfloat}{}{%
-    \@namedef{wrap#1}{\wrapfloat{#1}}%
-    \@namedef{endwrap#1}{\endwrapfloat}%
-  }%
- }
+\newcommand\killfloatstyle{\FBbuildtrue\if@@FS\hsize\FB@wd\fi\@@FSfalse}
 \newcommand\flrow@capsetup{}
 \edef\float@style{plain}
 \@ifdefinable\FBB@wd{\let\FBB@wd\relax}
@@ -181,7 +122,7 @@
     \FRifFBOX\@@setframe\fi\@@FStrue\edef\FBB@wd{\the\textwidth}%
     \let\@xdblfloat\@xfloat\relax
     \FR@ifdoubleaswide
-       \if@twocolumn\else\let\@dblfloat\@float\fi\fi
+     {\if@twocolumn\else\let\@dblfloat\@float\fi}\relax
     \@dblfloat{#1}}%
   \expandafter\let\csname end#1\endcsname\float@end
   \expandafter\let\csname end#1*\endcsname\float@dblend
@@ -235,6 +176,81 @@
      \@ifundefined{FloatHBarrier}{}\FloatHBarrier
      }}
  \@ifundefined{sf@@@subfloat}{}{\@ifundefined{c@sub#1}{\newsubfloat{#1}}{}}}
+\newcommand\RawFloats{\@ifnextchar[%]
+    \flrow@rawfloatschk\flrow@rawfloats}
+\newcommand\flrow@rawfloats{\killfloatstyle\@parboxrestore
+    \let\@makecaption\FR@makecaption
+    \expandafter\ifx\csname end\@captype\endcsname\float@endH
+        \global\FBbuildfalse
+    \else
+        \@namedef{end\@captype}{\end@float}%
+    \fi
+    \expandafter\ifx\csname end\@captype*\endcsname\float@endH
+        \global\FBbuildfalse
+    \else
+        \@namedef{end\@captype*}{\end@dblfloat}%
+    \fi
+  \@ifundefined{@rotfloat}{}{%
+    \@namedef{endsideways\@captype}{\end@rotfloat}%
+    \@namedef{endsideways\@captype*}{\end@rotdblfloat}%
+  }%
+  \@ifundefined{wrapfloat}{}{%
+    \@namedef{endwrap\@captype}{\endwrapfloat}%
+  }}
+\@ifdefinable\flrow@rawfloatschk{}
+\def\flrow@rawfloatschk[#1]{\@ifnextchar[%]
+    {\flrow@RawFloats[#1]}{\flrow@@RawFloats#1,;}}
+\@ifdefinable\flrow@RawFloats{}
+\newcommand\flrow@raw@set{\AtBeginDocument}
+\AtBeginDocument{\let\flrow@raw@set\@firstofone}
+\def\flrow@RawFloats[#1][#2]{\flrow@RawFloats@[#1]#2,;}
+\def\flrow@RawFloats@[#1]#2,{%
+  \caption@ifinlist{#2}{float}{\flrow@raw@set
+        {\@namedef{#1}{\@float{#1}}}%
+  }{\caption@ifinlist{#2}{widefloat}{\flrow@raw@set%
+        {\@namedef{#1*}{\let\@xdblfloat\@xfloat\@dblfloat{#1}}}%
+  }{\caption@ifinlist{#2}{rotfloat}{%
+    \@ifundefined{@rotfloat}{}{\flrow@raw@set
+        {\@namedef{sideways#1}{\@rotfloat{#1}}}}%
+  }{\caption@ifinlist{#2}{widerotfloat}{%
+    \@ifundefined{@rotfloat}{}{\flrow@raw@set
+        {\@namedef{sideways#1*}{\@rotdblfloat{#1}}}}%
+  }{\caption@ifinlist{#2}{wrapfloat}{%
+    \@ifundefined{wrapfloat}{}{\flrow@raw@set
+        {\@namedef{wrap#1}{\wrapfloat{#1}}}}}%
+  }{\caption@ifinlist{#2}{all,allfloats}{%
+    \flrow@@RawFloats{#1}%
+  }{\flrow@error{Undefined float subtype `#2'}%
+  }}}}}\@ifnextchar;\@gobble{\flrow@RawFloats@[#1]}}
+\@ifdefinable\flrow@@RawFloats{}
+\def\flrow@@RawFloats#1,{%
+ \flrow@raw@set{\@namedef{#1}{\@float{#1}}%
+    \@namedef{#1*}{\let\@xdblfloat\@xfloat\@dblfloat{#1}}%
+  \@ifundefined{@rotfloat}{}{%
+    \@namedef{sideways#1}{\@rotfloat{#1}}%
+    \@namedef{sideways#1*}{\@rotdblfloat{#1}}%
+  }%
+  \@ifundefined{wrapfloat}{}{%
+    \@namedef{wrap#1}{\wrapfloat{#1}}}%
+  }\@ifnextchar;\@gobble\flrow@@RawFloats
+}
+\newcommand\flrow@Raw@restyle[1]{%
+    \@namedef{#1}{\@float{#1}}%
+    \@namedef{#1*}{\@dblfloat{#1}}%
+    \@namedef{end#1}{\end@float}%
+    \@namedef{end#1*}{\end@dblfloat}%
+  \@ifundefined{@rotfloat}{}{%
+    \@namedef{sideways#1}{\@rotfloat{#1}}%
+    \@namedef{sideways#1*}{\@rotdblfloat{#1}}%
+    \@namedef{endsideways#1}{\end@rotfloat}%
+    \@namedef{endsideways#1*}{\end@rotdblfloat}%
+  }%
+  \@ifundefined{wrapfloat}{}{%
+    \@namedef{wrap#1}{\wrapfloat{#1}}%
+    \@namedef{endwrap#1}{\endwrapfloat}%
+  }%
+ }
+\newcommand\RawCaption[1]{{\let\@makecaption\FR@makecaption #1}}
 \@ifdefinable\float@exts{\newtoks\float@exts}
 \newcommand\newfloat{\@ifstar{\flrow@restylefloat{no}\newfloat@}%
    {\flrow@restylefloat{yes}\newfloat@}}
@@ -252,11 +268,10 @@
   \@ifundefined{FloatHBarrier}{}\FloatHBarrier
   \expandafter\let\csname end#1\endcsname\float@endH
   \FR@ifdoubleaswide
-    \expandafter\let\csname end#1*\endcsname\float@endH
-  \fi
+   {\expandafter\let\csname end#1*\endcsname\float@endH}\relax
   \let\@currbox\float@box
   \flrow@setlist{{floatH}{#1H}}%
-  \def\@captype{#1}\setbox\@floatcapt=\vbox{}%
+  \def\@captype{#1}%\setbox\@floatcapt=\vbox{}%
   \setbox\@currbox\color@vbox\normalcolor
     \vbox\bgroup
       \hsize\columnwidth
@@ -266,7 +281,7 @@
   \ignorespaces}
 \newcommand\flrow@flboxreset{\FR@flboxreset
   \@ifundefined{capstart}{}{\capstart}%
-  \FB@facing\@tempswafalse\FBiffacing\@tempswatrue\fi
+  \FB@facing\@tempswafalse\FR@iffacing\@tempswatrue\relax
   \if@tempswa\FB@readaux{\relax}\fi
   \global\let\FBcheight\relax\global\let\FBoheight\relax
   \global\let\FBfheight\relax
@@ -284,7 +299,7 @@
   \adj@dim\@tempdima-\FBo@wadj={\global\FBo@wd}%
   \hsize\FBo@wd\linewidth\hsize
   \FBifcaptop
-    \ifnum\FPOScnt=0\columnwidth\hsize\else\columnwidth\FBc@wd\fi
+    \ifnum\FPOScnt=\z@\columnwidth\hsize\else\columnwidth\FBc@wd\fi
   \else
     \columnwidth\FBc@wd
   \fi}
@@ -297,7 +312,7 @@
   \FC@ifc@wd
      \ifx\FCwidth\relax
         \flrow@error{You didn't define width of caption\MessageBreak
-          for plain float environment.}%
+          for plain floating environment.}%
      \else
         \global\FBc@wd=\FCwidth
         \FC@ifo@fil\advance\@tempdima-\FBc@wd\fi
@@ -319,13 +334,13 @@
   \@parboxrestore\leftmargin\z@\rightmargin\z@
   \hbox to\@tempdima{\def\FB@zskip{\vskip\z@}%
   \FBleftmargin\flrow@FB@\FBrightmargin}%
-  \FBiffacing\FB@writeaux{\string\global\string\c@FBcnt\thepage}\fi
+  \FR@iffacing{\FB@writeaux{\string\global\string\c@FBcnt\thepage}}\relax
   \gdef\begin@FBBOX{\vbox\bgroup}\gdef\end@FBBOX{\egroup}%
   \vskip\FBbskip\gdef\FBaskip{\z@}\gdef\FBbskip{\z@}}}
 \newcommand\flrow@FC[1]{\vbox{\@tempdima=#1\@parboxrestore
   \leftmargin\z@\rightmargin\z@\flrow@FClist\vskip\FBaskip
   \hbox to\@tempdima{\FCleftmargin\flrow@FC@\FCrightmargin}%
-  \FBiffacing\FB@writeaux{\string\global\string\c@FBcnt\thepage}\fi
+  \FR@iffacing{\FB@writeaux{\string\global\string\c@FBcnt\thepage}}\relax
   \nocapbeside\global\let\FCwidth\relax
   \vskip\FBbskip\gdef\FBaskip{\z@}\gdef\FBbskip{\z@}}}
 \newcommand\FCc@box[1]{\def\@parboxto{}\FC@bbox#1\FC@ebox}
@@ -353,28 +368,30 @@
     \ifvoid\@floatcapt\else
       \FB@vbox\FBc@wd\FBcheight{\FBifCAPTOP\else\vfill\fi
         \unvbox\@floatcapt
-        \ifnum\FPOScnt=1\vbox{\FB@foot}\fi\vfil}%
+        \ifnum\FPOScnt=\@ne\vbox{\FB@foot}\fi\vfil}%
       \@@FBskip\hrule\@height\z@\@depth\z@
     \fi
     \vtop{\vskip\z@\FBo@frame{\FB@vtop\FBo@wd\FBoheight
       {\FBafil\unvbox\@currbox\FBbfil
       \vskip\z@
-      \ifnum\FPOScnt=0
+      \ifnum\FPOScnt=\z@
         \FB@vtop\FBo@wd\FBfheight{\FB@foot\vfil}\fi}}\par
       \par\vskip\z@
-      \ifnum\FPOScnt=2\vskip\z@
+      \ifnum\FPOScnt=\tw@\vskip\z@
         \FB@vtop\FBc@wd\FBfheight{\FB@foot\vfil}\fi}%
-  \else\ifnum\FPOScnt=0\FPOScnt=1\fi
+  \else\ifnum\FPOScnt=\z@\FPOScnt=\@ne\fi
     \FBo@frame{\FB@vbox\FBo@wd\FBoheight{\FBafil
        \unvbox\@currbox\FBbfil}}\par
     \ifvoid\@floatcapt\else
       \@@FBskip\hrule\@height\z@\@depth\z@
       \FB@vtop\FBc@wd\FBcheight{\hsize\columnwidth\unvbox\@floatcapt
-        \ifnum\FPOScnt=1\vtop{\FB@foot}\fi\par
+        \ifnum\FPOScnt=\@ne\vtop{\FB@foot}%
+    \fi\par
         \vfill\vskip\z@\vss
         \ifnum\FPOScnt=2\FB@vtop\FBc@wd\FBfheight{\FB@foot\vfil}\fi
         }\fi
-  \fi\@@FBbelow\FB@zskip\end@FBBOX}}
+  \fi\@@FBbelow\FB@zskip\end@FBBOX
+  \global\setbox\@floatcapt\box\voidb@x}}
 \newcommand\flrow@FC@{\global\let\flrow@typ@tmpset\undefined
  \FB@frame{\begin@FBBOX
    \adj@dim\FBo@wd+\FBo@wadj=\hsize
@@ -391,7 +408,8 @@
          \floatcapbesidesep\FCc@box{\FBw@box\FBc@wd
            \unvbox\@floatcapt\FB@foot}\fi
       }}\par\@@FBbelow\vskip\z@
-    \end@FBBOX}}
+    \end@FBBOX
+    \global\setbox\@floatcapt\box\voidb@x}}
 \newcommand\FB@foot{\let\FR@ifFOOT\iftrue\FB@putfoots\@@par\FB@putfnotes}
 \newcommand\FB@zskip{}
 \newcommand\float@end{\ifFBbuild\@endfloatbox
@@ -401,13 +419,13 @@
 \newcommand\floatHpenalties{}
 \newcommand\float@endH{\@endfloatbox\par
   \FR@iffloatHaslist
-    \floatHpenalties\relax
-    \addpenalty\@beginparpenalty
-  \fi
+   {\floatHpenalties\relax
+    \addpenalty\@beginparpenalty}\relax
   \vskip\intextsep
   \ifFBbuild\setbox\@currbox\float@makebox\columnwidth\fi
   \box\@currbox\par
-  \FR@iffloatHaslist\addpenalty\@endparpenalty\@endpetrue\fi
+  \FR@iffloatHaslist
+   {\addpenalty\@endparpenalty\@endpetrue}\relax
   \vskip\intextsep\relax}
 \newcommand\float@dblend{\ifFBbuild\@endfloatbox
     \global\setbox\@currbox\float@makebox\textwidth
@@ -416,7 +434,8 @@
 \newsavebox\@floatcapt
 \newcommand*{\listof}[2]{%
   \@ifundefined{ext@#1}{\flrow@error{Unknown float style `#1'}}{%
-    \@namedef{l@#1}{\@dottedtocline{1}{1.5em}{2.3em}}%
+    \expandafter\providecommand\csname l@#1\endcsname
+        {\@dottedtocline{1}{1.5em}{2.3em}}%
     \float@listhead{#2}%
     \begingroup\setlength{\parskip}{\z@}%
       \@starttoc{\@nameuse{ext@#1}}%
@@ -523,14 +542,18 @@
   \let\stepcounter\FR@loc@refcnt
   \let\refsteponlycounter\FR@loc@refcnt
   \let\cl@@ckpt\empty\let\addtocounter\FR@loc@addcnt
+  \let\caption@kernel@addcontentsline\@gobbletwo
+  \let\caption@addcontentsline\@gobbletwo
   \def\sf@updatecaptionlist##1##2##3##4{}}
-\def\FBtmp@cap#1[#2]#3{\sbox\@tempboxa
-  {\caption@@@make{\caption@lfmt{\@nameuse{\@captype name}}%
-              {\@nameuse{the\@captype}}\relax}{#3}}%
+\def\FBtmp@cap#1[#2]#3{\sbox\@tempboxa{\captionlabel{#3}}%
   \global\@tempdimb\wd\@tempboxa}
+\newcommand\captionlabel[1]{{\def\FR@tmp{\@captype}\ifnum\floatbox@depth>\@ne
+       \def\FR@tmp{sub\@captype}\caption@setsubtype*{\FR@tmp}\stepcounter{\FR@tmp}\fi
+   \caption@@@make{\caption@fnum\FR@tmp}{#1}}}
+\newcommand\subcaptionlabel[1]{{\floatbox@depth\tw@\captionlabel{#1}}}
 \newcommand\FBget@box[3]{%
-  \FBiffloatrow\else
-    \ifx\FBB@wd\relax
+  \FBiffloatrow\relax
+    {\ifx\FBB@wd\relax
       \ifdim\hsize=\z@
         \@ifundefined{wf@@caption}{}{\let\caption\wf@@caption}%
         \hsize.5\columnwidth\advance\hsize-.5\columnsep
@@ -539,21 +562,19 @@
       \fi
     \else
       \hsize\FBB@wd
-    \fi
-  \fi
+    \fi}%
   \adj@dim\hsize-\FB@wadj=\@tempdima
   \FBifcapbeside
     \FCget@@wd{#1}{#3}%
   \else
     \nofilFCOhsize
-    \FBiffloatrow\else
-      \settowidth\@tempdimb{{\FBleftmargin}{\FBrightmargin}}%
-      \advance\@tempdima-\@tempdimb
-    \fi
+    \FBiffloatrow\relax
+      {\settowidth\@tempdimb{{\FBleftmargin}{\FBrightmargin}}%
+      \advance\@tempdima-\@tempdimb}%
   \fi
   \FC@ifo@fil\@tempdima\FB@wd\else\FB@wd\@tempdima\fi
   \adj@dim\@tempdima-\FBo@wadj=\FBo@wd
-  \FBiffloatrow\else\hsize\FBo@wd\fi
+  \FBiffloatrow\relax{\hsize\FBo@wd}%
   \FBifcapbeside\hsize\FB@wd\fi
   \linewidth\hsize
   \def\reserved@a{#1}\ifx\reserved@a\empty
@@ -564,24 +585,24 @@
   \else
     \FBc@wd\FB@wd
   \fi
-  \setbox0\vbox{\FR@loc@\hsize\FBo@wd\linewidth\hsize
+  \setbox\z@\vbox{\FR@loc@\hsize\FBo@wd\linewidth\hsize
     \FBifcaptop
-      \ifnum\FPOScnt=0\columnwidth\hsize\else\columnwidth\FBc@wd\fi
+      \ifnum\FPOScnt=\z@\columnwidth\hsize\else\columnwidth\FBc@wd\fi
     \else
       \columnwidth\FBc@wd
     \fi
     #3}%
   \FBc@ht\ht\@floatcapt\advance\FBc@ht\dp\@floatcapt
-  \FBo@ht\ht0\advance\FBo@ht\dp0\let\FBheight\FBo@ht
-  \setbox2\vbox{\null\par\FB@foot\par}%
-  \FBf@ht\ht2\advance\FBf@ht\dp2%
+  \FBo@ht\ht\z@\advance\FBo@ht\dp\z@\let\FBheight\FBo@ht
+  \setbox\tw@\vbox{\null\par\FB@foot\par}%
+  \FBf@ht\ht\tw@\advance\FBf@ht\dp\tw@
   \FBiffloatrow
-    \ifdim\FBf@ht>\FBf@max\global\FBf@max\FBf@ht\fi
+    {\ifdim\FBf@ht>\FBf@max\global\FBf@max\FBf@ht\fi
     \ifCADJ
       \FBifcaptop
-        \ifnum\FPOScnt=1\global\advance\FBc@ht\FBf@ht\fi
+        \ifnum\FPOScnt=\@ne\global\advance\FBc@ht\FBf@ht\fi
       \else
-        \ifnum\FPOScnt=2
+        \ifnum\FPOScnt=\tw@
           \ifdim\FBf@ht>\FBf@max
             \global\advance\FBc@ht\FBf@ht
           \else
@@ -593,32 +614,30 @@
       \fi
       \ifdim\FBc@ht>\FBc@max\global\FBc@max\FBc@ht\fi
       \gdef\FBcheight{\FBc@ht}\gdef\FBfheight{\FBf@ht}%
-    \fi
-  \fi
+    \fi}\relax
   \def\reserved@a{#2}\ifx\reserved@a\empty
-    \FBiffloatrow\ifOADJ
+    \FBiffloatrow{\ifOADJ
       \ifdim\FBo@ht>\FBo@max\global\FBo@max\FBo@ht\fi
       \FBifcaptop
-        \ifnum\FPOScnt=0
+        \ifnum\FPOScnt=\z@
           \ifdim\FBf@ht>\FBf@max\global\FBf@max\FBf@ht\fi
         \fi
       \fi
       \gdef\FBoheight{\FBo@ht}\gdef\FBfheight{\FBf@ht}%
-    \fi\fi
+    \fi}\relax
   \else
-     \FBget@@ht{#2}%
+     \FBget@@ht{#2}{#3}%
   \fi}
 \newcommand\FCget@@wd[2]{\flrow@FClist
-  \FBiffloatrow\else
-    \settowidth\@tempdimb{{\FCleftmargin}{\FCrightmargin}}%
-    \advance\@tempdima-\@tempdimb\advance\hsize-\@tempdimb
-  \fi
+  \FBiffloatrow\relax
+    {\settowidth\@tempdimb{{\FCleftmargin}{\FCrightmargin}}%
+    \advance\@tempdima-\@tempdimb\advance\hsize-\@tempdimb}%
   \settowidth\@tempdimb{\floatcapbesidesep}\advance\@tempdima-\@tempdimb
   \FC@ifo@fil\FB@wd\@tempdima\fi
   \FC@ifc@wd
     \ifx\FCwidth\relax
-      \setbox1\vbox{\FR@loc@
-        \let\caption\FB@caption
+      \setbox\@ne\vbox{\FR@loc@
+        \let\caption\flrow@caption
         \let\@caption\FBtmp@cap
          #2}%
       \FBc@wd=\@tempdimb
@@ -635,8 +654,7 @@
     \setlength\dimen@{#1}\ifdim\dimen@<\z@\global\@tempswatrue\fi
   \endgroup
   \if@tempswa
-    \setbox0\hbox{\FR@loc@#2}\FBo@wd\wd0%
-    \let\FBwidth\FBo@wd
+    \setbox\z@\hbox{\FR@loc@#2}\FBo@wd\wd\z@\let\FBwidth\FBo@wd
     \setlength\FBo@wd{#1}%
     \advance\FBo@wd\leftskip\advance\FBo@wd\rightskip
     \adj@dim\FBo@wd+\FBo@wadj=\FB@wd
@@ -648,28 +666,30 @@
     \adj@dim\FB@wd-\FBo@wadj=\FBo@wd
     \let\FBwidth\FBo@wd
   \fi}
-\newcommand\FBget@@ht[1]{\@tempswafalse
+\newcommand\FBget@@ht[2]{\@tempswafalse
   \begingroup
     \@tempdimb-3000pt\let\FBheight\@tempdimb
     \setlength\dimen@{#1}\ifdim\dimen@<\z@
       \global\@tempswatrue\fi
   \endgroup
-  \setlength\FBo@ht{#1}%
   \if@tempswa
+    \setbox\z@\hbox{\FR@loc@#2}\FBo@ht\ht\z@\advance\FBo@ht\dp\z@
+    \let\FBheight\FBo@ht\setlength\FBo@ht{#1}%
     \adj@dim\FBo@ht+\FBo@hadj=\FBo@ht
-    \FBifcaptop\ifnum\FPOScnt=0\advance\FBo@ht\FBf@ht\fi\fi
+    \FBifcaptop\ifnum\FPOScnt=\z@\advance\FBo@ht\FBf@ht\fi\fi
   \else
+    \setlength\FBo@ht{#1}%
     \adj@dim\FBo@ht-\FBo@hadj=\FBo@ht
     \adj@dim\FBo@ht-\FB@hadj=\FBo@ht
-    \setbox0\vbox{\offinterlineskip\vbox{\@@FBabove}%
+    \setbox\z@\vbox{\offinterlineskip\vbox{\@@FBabove}%
       \FBifcapbeside\else\@@FBskip\hrule\@height\z@\@depth\z@\fi
       \vtop{\@@FBbelow}}%
-    \global\advance\FBo@ht-\ht0\global\advance\FBo@ht-\dp0%
+    \global\advance\FBo@ht-\ht\z@\global\advance\FBo@ht-\dp\z@
     \FBifcapbeside\else\FBget@@@ht\fi
-    \FBiffloatrow\ifOADJ
-      \ifdim\FBo@ht>\FBo@max\global\FBo@max\FBo@ht\fi
-    \fi\fi
   \fi
+  \FBiffloatrow{\ifOADJ
+    \ifdim\FBo@ht>\FBo@max\global\FBo@max\FBo@ht\fi
+  \fi}\relax
   \def\FBoheight{\FBo@ht}}
 \newcommand\FBget@@@ht{%
     \ifdim\FBc@ht>\FBc@max
@@ -677,7 +697,7 @@
     \else
       \global\advance\FBo@ht-\FBc@max
     \fi
-    \FBifcaptop\ifnum\FPOScnt=1\else
+    \FBifcaptop\ifnum\FPOScnt=\@ne\else
       \ifdim\FBf@ht>\FBf@max
         \global\advance\FBo@ht-\FBf@ht
       \else
@@ -697,7 +717,7 @@
   \@ifundefined{@@FBset@\romannumeral\the\c@FBl@b}%
     {#1}{\@nameuse{@@FBset@\romannumeral\the\c@FBl@b}}}
 \newcounter{FBl@b}
-\let\FC@ifFBOX\iffalse
+\let\FR@ifFCBOX\@secondoftwo
 \newcommand\FBs@raise{\raisebox{-\totalheight}}
 \newcommand\FBf@raise{}
 \newcommand\FCset@vpos{\@FC@vpos
@@ -708,12 +728,12 @@
     \gdef\FBs@raise{\raisebox{-.5\totalheight}}%
   \or\gdef\FC@bbox{\vtop\@parboxto\bgroup\vskip\z@}%
     \gdef\FC@ebox{\vskip\z@\egroup}%
-    \FC@ifFBOX\gdef\FBf@raise{\raisebox{-\height}}%
-    \else\gdef\FBf@raise{}\fi
+    \FR@ifFCBOX{\gdef\FBf@raise{\raisebox{-\height}}}%
+     {\gdef\FBf@raise{}}%
     \gdef\FBs@raise{\raisebox{-\totalheight}}%
   \or\gdef\FC@bbox{\vbox\@parboxto\bgroup}\gdef\FC@ebox{\vskip\z@\egroup}%
-    \FC@ifFBOX\gdef\FBf@raise{\raisebox{\depth}}%
-    \else\gdef\FBf@raise{}\fi
+    \FR@ifFCBOX{\gdef\FBf@raise{\raisebox{\depth}}}%
+     {\gdef\FBf@raise{}}%
     \gdef\FBs@raise{}\fi}
 \@ifdefinable\adj@dim{}
 \def\adj@dim#1#2#3=#4{\dimen@\z@#3\ifdim\dimen@=\z@#4#1\else
@@ -735,7 +755,8 @@
   \if@@FS\else\FR@redefs
     \ifcase\floatbox@depth\or
       \flrow@setlist{{\@captype}}\or
-      \flrow@setlist{{subfloat}{subtype}{sub\@captype}}\fi
+      \flrow@settype{subfloat}\flrow@settype{subtype}\flrow@settype{sub\@captype}%
+    \fi
     \FRifFBOX\@@setframe\fi\@@FStrue
   \fi
   \FB@tmpset
@@ -744,14 +765,14 @@
   \floatobjectset\floatfont
   \FBget@box{#1}{#2}{#4#5}%
   \FBifcapbeside\FCset@vpos\fi
-  \FBiffloatrow\FR@floatbox{\@ifundefined{capstart}{}{\capstart}#4#5}\else
-    \adj@dim\FB@wd+\FB@wadj=\hsize\linewidth\hsize
+  \FBiffloatrow{\FR@floatbox{\@ifundefined{capstart}{}{\capstart}#4#5}}%
+   {\adj@dim\FB@wd+\FB@wadj=\hsize\linewidth\hsize
     \ifx\FBB@wd\relax\edef\FBB@wd{\the\hsize}\fi
     \FBsetbox@obj{\@ifundefined{capstart}{}{\capstart}\let\FBB@wd\relax
     #4#5}\FBbuildtrue
     \FBifcapbeside\flrow@FC\FBB@wd\else\flrow@FB\FBB@wd\fi
     \global\FBbuildfalse
-  \fi\advance\floatbox@depth\m@ne
+   }\advance\floatbox@depth\m@ne
   \endgroup\ignorespaces}
 \newcommand\FR@floatbox[1]{\@tempswafalse
     \ifOADJ\@tempswatrue\fi\ifCADJ\@tempswatrue\fi
@@ -759,11 +780,15 @@
     \FBsetbox@obj{#1}\begin@FBBOX
       \FBifcapbeside\flrow@FC@\else\flrow@FB@\fi
     \end@FBBOX
-    \addtocounter{FRobj}{-1}%
-    \@tempswafalse\FBiffacing\@tempswatrue\fi
+    \addtocounter{FRobj}\m@ne
+    \@tempswafalse\FR@iffacing\@tempswatrue\relax
     \ifCADJ\@tempswatrue\fi\ifOADJ\@tempswatrue\fi
-    \ifnum\c@FRobj=0%
+    \advance\Xhsize-\FB@wd
+    \ifnum\c@FRobj=\z@
       \if@tempswa
+        \FBifcapbeside
+          \advance\Zhsize-\FBc@wd
+        \fi
         \FB@writeaux{\string\c@FBcnt\thepage
           \string\def\string\FB@@boxmax{%
           \ifOADJ\string\FBo@ht\the\FBo@max
@@ -771,63 +796,87 @@
           \ifCADJ\string\FBc@ht\the\FBc@max\fi}}\fi
       \global\FBbuildfalse
     \else
-      \advance\Xhsize-\FB@wd
-      \FBifcapbeside\advance\Xhsize-\FBc@wd
+      \FBifcapbeside
+        \advance\Xhsize-\FBc@wd
+        \advance\Zhsize-\FBc@wd
         \settowidth\@tempdimb{\floatcapbesidesep}%
-        \advance\Xhsize-\@tempdimb\fi
+        \advance\Xhsize-\@tempdimb
+        \advance\Zhsize-\@tempdimb\fi
       \floatrowsep
       \adj@dim\Xhsize-\FB@wadj={\global\Xhsize}%
+      \adj@dim\Zhsize-\FB@wadj={\global\Zhsize}%
     \fi}
 \newcommand\FBsetbox@obj[1]{%
   \setbox\float@box\color@vbox\normalcolor
   \FBifcaptop
      \FB@vtop\FBo@wd\FBoheight\bgroup\FBafil\floatobjectset\floatfont
-      \ifnum\FPOScnt=0\columnwidth\FBo@wd\else\columnwidth\FBc@wd\fi
+      \ifnum\FPOScnt=\z@\columnwidth\FBo@wd\else\columnwidth\FBc@wd\fi
   \else
      \FB@vbox\FBo@wd\FBoheight\bgroup\FBafil\floatobjectset\floatfont
       \columnwidth\FBc@wd
   \fi
   #1\FBbfil\egroup\color@endbox
   \let\@currbox\float@box}
-\let\FBiffloatrow\iffalse
+\let\FBiffloatrow\@secondoftwo
 \newcounter{FRobj}
+\newcounter{FRsobj}
 \newlength\Xhsize
-\newcommand\floatrow[1][2]{\setcounter{FRobj}{#1}\FB@facing
-  \@tempswafalse\FBiffacing\@tempswatrue\fi
+\newlength\sXhsize
+\newlength\Zhsize
+\newlength\sZhsize
+\newcommand\flrow@to{to\hsize}
+\newcommand\floatrow[1][2]{\c@FRobj=#1\relax
+  \ifnum\floatbox@depth>\z@
+    \flrow@settype{subfloat}\flrow@settype{subtype}\flrow@settype{sub\@captype}%
+  \fi
+  \FB@facing\@tempswafalse\FR@iffacing\@tempswatrue\relax
   \ifCADJ\@tempswatrue\fi\ifOADJ\@tempswatrue\fi
   \if@tempswa\FB@readaux{\relax}\fi
-  \ifx\FBB@wd\relax\edef\FBB@wd{\the\hsize}\fi
-  \vbox\bgroup\vskip\FBaskip\hsize\FBB@wd
-    \hb@xt@\hsize{\vbox{\settowidth\@tempdima{{\FRleftmargin}{\FRrightmargin}}{\advance\hsize-\@tempdima
-          \settowidth\leftskip\FRleftmargin\@@FRabove}}\hss}\unskip
-    \hb@xt@\hsize\bgroup\let\FBiffloatrow\iftrue\FRleftmargin\begingroup
-      \Xhsize\hsize\count@#1\advance\count@-1%
-      \settowidth\@tempdima{{\FRleftmargin}{\FRrightmargin}}%
-      \advance\Xhsize-\@tempdima
-      \settowidth\@tempdima{\floatrowsep}%
-      \advance\Xhsize-\count@\@tempdima
-      \@tempdimb\Xhsize\divide\@tempdimb#1%
-      \FB@wd\@tempdimb\hsize\@tempdimb\ignorespaces}
+  \ifx\flrow@to\empty\else\ifx\FBB@wd\relax\edef\FBB@wd{\the\hsize}\fi\fi
+  \vbox\bgroup\vskip\FBaskip\ifx\flrow@to\empty\else\hsize\FBB@wd\fi
+    \ifx\flrow@to\empty\else
+       \hb@xt@\hsize{\vbox{\settowidth\@tempdima
+            {{\FRleftmargin}{\FRrightmargin}}{\advance\hsize-\@tempdima
+             \settowidth\leftskip\FRleftmargin\@@FRabove}}\hss}\unskip
+    \fi
+    \hbox\flrow@to\bgroup\let\FBiffloatrow\@firstoftwo\FRleftmargin\begingroup
+      \Xhsize\hsize\count@#1\advance\count@\m@ne
+      \settowidth\@tempdima{{\FRleftmargin}{\FRrightmargin}}\advance\Xhsize-\@tempdima
+      \settowidth\@tempdima{\floatrowsep}\advance\Xhsize-\count@\@tempdima
+      \@tempdimb\Xhsize\Zhsize\Xhsize\divide\@tempdimb#1\relax\FB@wd\@tempdimb
+      \hsize\@tempdimb\ignorespaces}
 \def\endfloatrow{\ifdim\lastskip>\z@\unskip\fi
       \endgroup\FRrightmargin\egroup%h box
-    \global\let\FBiffloatrow\iffalse
-    \hb@xt@\hsize{\vbox{\settowidth\@tempdima{{\FRleftmargin}{\FRrightmargin}}{\advance\hsize-\@tempdima
-          \settowidth\leftskip\FRleftmargin\@@FRbelow}}\hss}%
+    \ifx\flrow@to\empty\else
+       \let\FBiffloatrow\@secondoftwo\relax
+       \hb@xt@\hsize{\vbox{\settowidth\@tempdima
+            {{\FRleftmargin}{\FRrightmargin}}{\advance\hsize-\@tempdima
+             \settowidth\leftskip\FRleftmargin\@@FRbelow}}\hss}%
+    \fi
     \vskip\FBbskip\gdef\FBaskip{\z@}\gdef\FBbskip{\z@}\egroup%v box
   \global\FBf@max\z@\global\FBo@max\z@\global\FBc@max\z@
   \gdef\begin@FBBOX{\vbox\bgroup}\gdef\end@FBBOX{\egroup}}
-\newcommand\subfloatrow[1][2]{\c@FRobj=#1%local
-  \ifdim\parindent<\z@\leavevmode\else\noindent\fi\hbox\bgroup
-    \let\FBiffloatrow\iftrue
-    \Xhsize\hsize\count@#1\advance\count@-1%
-    \settowidth\@tempdima{\subfloatrowsep}\let\floatrowsep\subfloatrowsep
-    \advance\Xhsize-\count@\@tempdima
-    \@tempdimb\Xhsize\divide\@tempdimb#1%
-    \hsize\@tempdimb\ignorespaces\killfloatstyle}
-\def\endsubfloatrow{\ifdim\lastskip>\z@\unskip\fi
-  \egroup\@ifundefined{adjustsubfloats}{}\adjustsubfloats
-  }
+\newenvironment{subfloatrow}{\captionsetup{subtype}\@nameuse{subfloatrow*}}{\@nameuse{endsubfloatrow*}}
+\newenvironment{subfloatrow*}[1][2]{\let\flrow@to\empty
+    \let\Xhsize\sXhsize\let\Zhsize\sZhsize\let\c@FRobj\c@FRsobj
+    \def\FRleftmargin{}\def\FRrightmargin{}\let\floatrowsep\subfloatrowsep
+    \floatrow[#1]\killfloatstyle}{\ifdim\lastskip>\z@\unskip\fi
+     \@ifundefined{adjustsubfloats}\relax\adjustsubfloats\endfloatrow}
 \newcommand\subfloatrowsep{\hskip\columnsep}
+\@ifdefinable\FR@ifuseCommonHeight{\let\FR@ifuseCommonHeight\@secondoftwo}
+\newcommand\CommonHeightRow[2]{\def\CommonHeight{#1}\setbox\z@\hbox{\FR@loc@#2}%
+    \ifcase\floatbox@depth\def\@tempa{\Xhsize}\def\@tempb{\Zhsize}\or
+        \def\@tempa{\sXhsize}\def\@tempb{\sZhsize}\fi
+    \FR@calc@CommonHeight#2}
+\newdimen\FR@Zunitlength
+\newcommand\FR@calc@CommonHeight{%
+    \@tempdima\@tempb\advance\@tempdima-\@tempa
+    \count@\@tempdima\relax\divide\count@131072\relax
+    \divide\@tempb\count@\relax\FR@Zunitlength\@tempb\relax
+    \@tempdima\CommonHeight\relax
+    \count@\@tempdima\relax\divide\count@131072\relax
+    \@tempdima\count@\FR@Zunitlength\relax
+    \edef\CommonHeight{\the\@tempdima}}
 \newcommand\begin@FBBOX{\vbox\bgroup}
 \def\end@FBBOX{\egroup}
 \newcommand\CenterFloatBoxes{\CADJfalse\OADJfalse
@@ -840,33 +889,30 @@
 \newcommand\PlainFloatBoxes{%
   \gdef\begin@FBBOX{\vbox\bgroup}\gdef\end@FBBOX{\egroup}}
 \newcommand\buildFBBOX[2]{\gdef\begin@FBBOX{#1}\gdef\end@FBBOX{#2}}
-\providecommand\newdimentocommand  [3]{%
+\def\newdimentocommand  #1#2#3{%
     #1\@tempdima{#3}\@ifdefinable#2{\xdef#2{\the\@tempdima}}}
-\providecommand\renewdimentocommand[3]{%
+\def\renewdimentocommand#1#2#3{%
     #1\@tempdima{#3}\xdef#2{\the\@tempdima}}
-\providecommand\newskiptocommand  [3]{%
+\def\newskiptocommand   #1#2#3{%
     #1\@tempskipa{#3}\@ifdefinable#2{\xdef#2{\the\@tempskipa}}}
-\providecommand\renewskiptocommand[3]{%
+\def\renewskiptocommand #1#2#3{%
     #1\@tempskipa{#3}\xdef#2{\the\@tempskipa}}
-\providecommand\newlengthtocommand{\newskiptocommand}
-\providecommand\renewlengthtocommand{\renewskiptocommand}
-\newcommand\flrow@setbool[2]{%
-  \caption@ifinlist{#2}{1,true,yes,on}{\let#1\iftrue
-  }{\caption@ifinlist{#2}{0,false,no,off}{\let#1\iffalse
-  }{\flrow@error{Undefined boolean value `#2'}%
-  }}}
+\def\newlengthtocommand{\newskiptocommand}
+\def\renewlengthtocommand{\renewskiptocommand}
+\newcommand*\flrow@setbool[1]{%
+  \expandafter\caption@set@bool\csname FR@if#1\endcsname}
 \def\floatsetup{\@ifnextchar[\flrow@setuptype\flrow@setup}
 \def\flrow@setuptype[#1]#2{%
   \@ifundefined{flrow@typ@#1}{\@namedef{flrow@typ@#1}{#2}}%
     {\expandafter\l@addto@macro\csname flrow@typ@#1\endcsname{,#2}}}
 \newcommand\thisfloatsetup{\floatsetup[tmpset]}
-    \def\flrow@setup{\caption@setkeys[floatrow]{floatrow}}
+\def\flrow@setup{\caption@setkeys[floatrow]{floatrow}}
 \def\flrow@esetup#1{%
   \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};%
-  \FR@ifCST\flrow@capsetup\fi\@cap@setlist#1;%
+  \FR@ifCST{\flrow@capsetup}\relax\@cap@setlist#1;%
   \caption@setposition{\FBifcaptop t\else b\fi}}
 \newcommand\@flrow@setlist[1]{\flrow@settype{#1}\@ifnextchar;\@gobble
   \@flrow@setlist}
@@ -883,12 +929,12 @@
   #1{\undefine@key{floatrow}{#2}}\define@key{floatrow}{#2}}
 \@onlypreamble\DeclareFROpt
 \@onlypreamble\flrow@declopt
-\let\FR@ifrawfloats\iffalse
-\DeclareFROpt*{rawfloats}[0]{\flrow@setbool{\FR@ifrawfloats}{#1}}
-\let\FR@ifdoubleaswide\iffalse
-\DeclareFROpt{doublefloataswide}[0]{\flrow@setbool{\FR@ifdoubleaswide}{#1}}
-\let\FR@iffloatHaslist\iffalse
-\DeclareFROpt{floatHaslist}[0]{\flrow@setbool{\FR@iffloatHaslist}{#1}}
+\let\FR@ifrawfloats\@secondoftwo
+\DeclareFROpt*{rawfloats}[0]{\flrow@setbool{rawfloats}{#1}}
+\let\FR@ifdoubleaswide\@secondoftwo
+\DeclareFROpt{doublefloataswide}[0]{\flrow@setbool{doubleaswide}{#1}}
+\let\FR@iffloatHaslist\@secondoftwo
+\DeclareFROpt{floatHaslist}[0]{\flrow@setbool{floatHaslist}{#1}}
 \newcommand*\DeclareFloatStyle[2]{%
   \global\@namedef{flrow@sty@#1}{#2}}
 \@onlypreamble\DeclareFloatStyle
@@ -911,9 +957,15 @@
 \DeclareFloatStyle{Boxed}{style=boxed,framefit=yes}
 \DeclareFloatStyle{BOXED}{framestyle=fbox,
   framefit=yes,heightadjust=all,framearound=all}
+\DeclareFloatStyle{default}{%
+     style=plain,captionskip=10pt,
+     margins=centering,objectset=centering,
+     capbesideposition=left,facing=no,
+     floatrowsep=columnsep,capbesidesep=columnsep,
+     font=default,footfont=footnotesize}
 \DeclareFROpt{style}{\flrow@setstyle{#1}}
-\let\FR@ifCST\iftrue
-\DeclareFROpt{relatedcapstyle}[0]{\flrow@setbool{\FR@ifCST}{#1}}
+\let\FR@ifCST\@firstoftwo
+\DeclareFROpt{relatedcapstyle}[0]{\flrow@setbool{CST}{#1}}
 \DeclareFROpt{font}{\flrow@setfont{font}{#1}}
 \DeclareFROpt{footfont}{\captionsetup[floatfoot]{font={#1}}}
 \DeclareCaptionOption{footfont}{\caption@setfont{footfont}{#1}}
@@ -941,7 +993,7 @@
 \let\FBifcapbeside\iffalse
 \newcommand\capbeside{\let\FBifcapbeside\iftrue}
 \newcommand\nocapbeside{\let\FBifcapbeside\iffalse}
-\DeclareFROpt{capbesideframe}[0]{\flrow@setbool{\FC@ifFBOX}{#1}}
+\DeclareFROpt{capbesideframe}[0]{\flrow@setbool{FCBOX}{#1}}
 \DeclareFROpt{capbesidewidth}[1]{\flrow@FCc@wd{#1}}
 \let\FC@ifc@wd\iffalse
 \newcommand\useFCwidth{\let\FC@ifc@wd\iftrue\let\FCwidth\relax}
@@ -957,17 +1009,19 @@
   \begingroup\caption@setkeys[floatrow]{flrow@scpos}{#1}\endgroup
   \FR@tmp}
 \@onlypreamble\DeclareSCPos
-\DeclareSCPos{left}{\def\@FC@hpos{\let\FBiffacing\iffalse\count@\@ne}}
-\DeclareSCPos{right}{\def\@FC@hpos{\let\FBiffacing\iffalse\count@\z@}}
-\DeclareSCPos{inside}{\def\@FC@hpos{\let\FBiffacing\iftrue
-  \count@\c@FBcnt}}
-\DeclareSCPos{outside}{\def\@FC@hpos{\let\FBiffacing\iftrue
-  \count@\c@FBcnt\advance\count@\@ne}}
+\DeclareSCPos{left}{\def\@FC@hpos{\let\FR@iffacing\@secondoftwo\count@\@ne}}
+\DeclareSCPos{right}{\def\@FC@hpos{\let\FR@iffacing\@secondoftwo\count@\z@}}
+\DeclareSCPos{inside}{\def\@FC@hpos{\let\FR@iffacing\@firstoftwo
+    \count@\c@FBcnt\ifnum\count@=\z@\count@\@ne\fi
+  }}
+\DeclareSCPos{outside}{\def\@FC@hpos{\let\FR@iffacing\@firstoftwo
+    \count@\c@FBcnt\ifnum\count@=\z@\else\advance\count@\@ne\fi
+  }}
 \DeclareSCPos{center}{\def\@FC@vpos{\count@\z@}}
 \DeclareSCPos{top}{\def\@FC@vpos{\count@\@ne}}
 \DeclareSCPos{bottom}{\def\@FC@vpos{\count@\tw@}}
 \newcommand*\@FC@vpos{\count@\tw@}
-\newcommand*\@FC@hpos{\let\FBiffacing\iftrue\count@\c@FBcnt}
+\newcommand*\@FC@hpos{\let\FR@iffacing\@secondoftwo\count@\@ne}
 \newcounter{FBcnt}
 \DeclareFROpt{footposition}{\flrow@ftpos{#1}}
 \newcommand\DeclareFtPos[2]{%
@@ -1000,11 +1054,13 @@
 \newcommand\@FB@vpos[1]{%
   \if#1t\def\FBafil{}\def\FBbfil{\vss}\else
      \if#1b\def\FBafil{\vss}\def\FBbfil{}\else
-        \if#1c\def\FBafil{\vskip0ptplus1fillminus1000pt}\def\FBbfil{\vskip0ptplus1fillminus1000pt}\else
-           \if#1s\def\FBafil{\vskip0ptminus1000pt}\def\FBbfil{\vskip0ptminus1000pt}%
+        \if#1c\def\FBafil{\vskip0ptplus1fillminus1000pt}%
+              \def\FBbfil{\vskip0ptplus1fillminus1000pt}\else
+           \if#1s\def\FBafil{\vskip0ptminus1000pt}%
+                 \def\FBbfil{\vskip0ptminus1000pt}%
   \fi\fi\fi\fi}
-\DeclareFROpt{facing}[1]{\flrow@setbool{\FBiffacing}{#1}}
-\let\FBiffacing\iffalse
+\let\FR@iffacing\@secondoftwo
+\DeclareFROpt{facing}[1]{\flrow@setbool{facing}{#1}}
 \newcommand\FB@facing{}
 \DeclareFROpt{margins}{\flrow@FBAlign{#1}}
 \newcommand*\flrow@FBAlign[1]{%
@@ -1024,17 +1080,13 @@
 \newcommand\flrow@mj@default{\flrow@mj@centering}
 \newcommand\floatfacing{\@ifstar
   {\@FC@hpos\floatfacing@}{\FB@facing\floatfacing@}}
-\newcommand\floatfacing@[2]{\@tempswafalse
-  \FBiffacing\@tempswatrue\fi\if@twoside\@tempswatrue\fi
-  \if@tempswa
-    \ifodd\count@#1\else#2\fi
-  \else#2\fi}
+\newcommand\floatfacing@[2]{\ifodd\count@#1\else#2\fi}
 \newcommand\floatboxmargins{\def\FR@tmp{FB}\FB@mset}
 \newcommand\floatrowmargins{\def\FR@tmp{FR}\FB@mset}
 \newcommand\floatcapbesidemargins{\def\FR@tmp{FC}\FB@mset}
 \newcommand\FB@mset{\@ifstar{\FB@mset@}{\FB@@mset}}
 \newcommand\FB@mset@[2]{%
-  \def\FB@facing{\let\FBiffacing\iftrue\count@\c@FBcnt}%
+  \def\FB@facing{\let\FR@iffacing\@firstoftwo\count@\c@FBcnt}%
   \@namedef{\FR@tmp leftmargin}{\floatfacing{#1}{#2}}%
   \@namedef{\FR@tmp rightmargin}{\floatfacing{#2}{#1}}}
 \newcommand\FB@@mset[2]{\def\FB@facing{}%
@@ -1089,9 +1141,6 @@
 \DeclareFROpt{rowpostcode}{\flrow@FRrule\@@FRbelow\@@FBbelow{#1}}
 \newcommand\DeclareFloatVCode[2]{\@namedef{flrow@FBr@#1}{#2}}
 \@onlypreamble\DeclareFloatVCode
-\newcommand\DeclareFloatPrecode{\DeclareFloatVCode}
-\newcommand\DeclareFloatMidcode{\DeclareFloatVCode}
-\newcommand\DeclareFloatPostcode{\DeclareFloatVCode}
 \newcommand*\flrow@FBrule[3]{%
   \@ifundefined{flrow@FBr@#3}%
     {\flrow@error{Undefined rule `#3'}}%
@@ -1100,7 +1149,7 @@
 \newcommand*\flrow@FRrule[3]{%
   \@ifundefined{flrow@FBr@#3}%
     {\flrow@error{Undefined rule `#3'}}%
-    {\def#2{\FBiffloatrow\else\@nameuse{flrow@FBr@#3}\fi}%
+    {\def#2{\FBiffloatrow\relax{\@nameuse{flrow@FBr@#3}}}%
      \expandafter\let\expandafter#1\csname flrow@FBr@#3\endcsname}}
 \newcommand*\flrow@FBskip[1]{%
   \@ifundefined{flrow@FBr@#1}%
@@ -1116,13 +1165,13 @@
   \def\@@FBabove{}\def\@@FBbelow{}%
   \def\FB@Bset{}\def\FB@frame{}\def\FBo@frame{}%
   \def\FBo@wadj{}\def\FBo@hadj{}\def\FB@wadj{}\def\FB@hadj{}}
-\newcommand\@@FRabove{}\newcommand\@@FRbelow{}
-\newcommand\@@FBabove{}\newcommand\@@FBbelow{}
 \newcommand\@@FBskip{\vskip\captionskip}
-\newcommand\FB@frame{}\newcommand\FBo@frame{}
-\newcommand\FBo@wadj{}\newcommand\FBo@hadj{}
-\newcommand\FB@wadj{}\newcommand\FB@hadj{}
-\newcommand\FB@Bset{}
+\@ifdefinable\@@FRabove{}\@ifdefinable\@@FRbelow{}
+\@ifdefinable\@@FBabove{}\@ifdefinable\@@FBbelow{}
+\@ifdefinable\FB@frame{}\@ifdefinable\FBo@frame{}
+\@ifdefinable\FBo@wadj{}\@ifdefinable\FBo@hadj{}
+\@ifdefinable\FB@wadj {}\@ifdefinable\FB@hadj{}
+\@ifdefinable\FB@Bset {}
 \DeclareFROpt{framestyle}{\@ifundefined{FB@#1@frame}%
   {\let\FRifFBOX\iffalse}{\let\FRifFBOX\iftrue\def\FB@B@{#1}}}
 \DeclareFROpt{framearound}{\flrow@fr@round{#1}}
@@ -1134,24 +1183,39 @@
   }{\caption@ifinlist{#1}{none}{\let\FRifFBOX\iffalse
   }{\flrow@error{Undefined framed object `#1'}%
   }}}}
-\DeclareFROpt{framefit}[0]{\flrow@setbool{\FRifFIT}{#1}}
+\let\FR@ifFIT\@secondoftwo
+\DeclareFROpt{framefit}[0]{\flrow@setbool{FIT}{#1}}
 \DeclareFROpt{frameset}{\def\FB@Bset{#1}}
-\let\FRifFIT\iffalse
 \newcommand\FB@BO@{FBo}\newcommand\FB@B@{}
 \newcommand\@@setframe{%
   \@namedef{\FB@BO@ @hadj}{\@nameuse{FB@\FB@B@ @reset}\FB@Bset
     \@nameuse{FB@\FB@B@ @adj}}%
-  \@namedef{\FB@BO@ @wadj}{\FRifFIT\@nameuse{FB@\FB@B@ @reset}\FB@Bset
-    \@nameuse{FB@\FB@B@ @adj}\fi}%
+  \@namedef{\FB@BO@ @wadj}{\FR@ifFIT{\@nameuse{FB@\FB@B@ @reset}\FB@Bset
+    \@nameuse{FB@\FB@B@ @adj}}\relax}%
   \@namedef{\FB@BO@ @frame}{\@nameuse{FB@\FB@B@ @reset}\FB@Bset
     \@nameuse{FB@\FB@B@ @frame}}}
 \let\FRifFBOX\iffalse
 \newcommand\FB@fbox@frame[1]{\hbox{%
-  \FRifFIT\else\kern-\fboxrule\kern-\fboxsep\fi
-  \fbox{#1}%
-  \FRifFIT\else\kern-\fboxrule\kern-\fboxsep\fi}\ignorespaces}
+  \FR@ifFIT\relax{\kern-\fboxrule\kern-\fboxsep}\fbox{#1}%
+  \FR@ifFIT\relax{\kern-\fboxrule\kern-\fboxsep}}\ignorespaces}
 \newcommand\FB@fbox@adj{\dimen@=2\fboxsep\advance\dimen@2\fboxrule}
 \newcommand\FB@fbox@reset{\fboxsep3\p@\fboxrule.4\p@}
+\newcommand\FB@colorbox@frame[1]{\hbox{%
+  \FR@ifFIT\relax{\kern-\fboxrule\kern-\fboxsep}\FB@fcolorbox{#1}%
+  \FR@ifFIT\relax{\kern-\fboxrule\kern-\fboxsep}}\ignorespaces}
+\@ifdefinable\FB@colorbox@adj{\let\FB@colorbox@adj\FB@fbox@adj}
+\newcommand\FB@colorbox@reset{\fboxsep3\p@\fboxrule.4\p@}
+\newcommand\FB@fcolorbox{\fbox}
+\DeclareFROpt{colorframeset}{\flrow@fcolorbox{#1}}
+\newcommand*\flrow@fcolorbox[1]{%
+  \@ifundefined{flrow@fcolorbox@#1}%
+    {\flrow@error{Undefined color box `#1'}}%
+    {\expandafter\let\expandafter\FB@fcolorbox
+     \csname flrow@fcolorbox@#1\endcsname}}
+\newcommand*\DeclareColorBox[2]{%
+  \@ifundefined{color}{\flrow@error
+    {For usage of colored frames\MessageBreak load color package}}%
+  {\long\@namedef{flrow@fcolorbox@#1}{#2}}}
 \DeclareFROpt{captionskip}{\def\captionskip{#1}%
   \setlength\abovecaptionskip{#1}}
 \DeclareFROpt{footskip}{\def\floatfootskip{#1}}
@@ -1179,30 +1243,27 @@
   \hrule\@width\hsize\kern2.6\p@}
 \DeclareFloatFootnoterule{none}{}
 \@ifdefinable\FBfootnoterule{\let\FBfootnoterule\footnoterule}
-\let\FR@iffancy\iffalse
-\DeclareFROpt{fancyboxes}{\flrow@setbool{\FR@iffancy}{#1}}
+\let\FR@iffancy\@secondoftwo
+\DeclareFROpt{fancyboxes}{\flrow@setbool{fancy}{#1}}
 \newcommand\DeclareFNOpt{%
    \@ifstar{\flrow@declfnopt\AtBeginDocument}
            {\flrow@declfnopt\@gobble}}
 \newcommand*\flrow@declfnopt[2]{%
    #1{\undefine@key{newfloat}{#2}}\define@key{newfloat}{#2}}
 \@onlypreamble\DeclareFNOpt
-\newcommand\flnew@setdefault{\caption@setkeys[floatrow]{newfloat}
-  {placement=tbp,fileext=lox}}
 \@ifdefinable\flrow@types{\newtoks\flrow@types}
 \newcommand\DeclareNewFloatType[2]{\def\FB@captype{#1}%
   \expandafter\edef\csname ftype@#1\endcsname{\the\c@float@type}%
   \addtocounter{float@type}{\value{float@type}}%
   \@namedef{#1name}{#1}\newcounter{#1}%
   \expandafter\edef\csname fnum@#1\endcsname
-    {\expandafter\noexpand\csname #1name\endcsname\
+    {\expandafter\noexpand\csname #1name\endcsname\nobreakspace
        \expandafter\noexpand\csname the#1\endcsname}%
-  \@namedef{the#1}{\arabic{#1}}%
-  \flnew@setdefault\caption@setkeys[floatrow]{newfloat}{#2}%
-  \let\FR@tmp=\relax
+  \@namedef{the#1}{\arabic{#1}}\flnew@ext{lo#1}\@namedef{fps@#1}{tbp}%
+  \@namedef{l@#1}{\@dottedtocline{1}{1.5em}{2.3em}}%
+  \caption@setkeys[floatrow]{newfloat}{#2}\let\FR@tmp=\relax
   \xdef\@tempa{\noexpand\flrow@types{\the\flrow@types \FR@tmp{#1}}}%
-  \@tempa
-  }
+  \@tempa}
 \@onlypreamble\DeclareNewFloatType
 \DeclareFNOpt*{placement}{\flnew@fps{#1}}
 \newcommand\flnew@fps[1]{\@namedef{fps@\FB@captype}{#1}}
@@ -1222,7 +1283,6 @@
       \expandafter\noexpand\csname
         the#1\endcsname.\noexpand\arabic{\FB@captype}}}
 \@onlypreamble\flnew@within
-\DeclareFNOpt*{relatedcapstyle}[0]{\flrow@setbool{\FR@ifCST}{#1}}
 \def\ProcessOptionsWithKV#1{%
   \let\@tempc\relax
   \let\FR@tmp\@empty
@@ -1249,16 +1309,14 @@
   \let\CurrentOption\@empty
   \AtEndOfPackage{\let\@unprocessedoptions\relax}}
 \ProcessOptionsWithKV{floatrow}
-\FR@iffancy\RequirePackage{fr-fancy}\fi
+\FR@iffancy{\RequirePackage{fr-fancy}}\relax
 \let\ProcessOptionsWithKV\undefined
 \AtBeginDocument{
  \FR@ifrawfloats
-    \let\FR@tmp\flrow@Raw@restyle
- \else
-    \flrow@restyle{table}\flrow@restyle{figure}%
-    \let\FR@tmp\flrow@restyle
- \fi
- \the\flrow@types
+  {\let\FR@tmp\flrow@Raw@restyle
+ }{\flrow@restyle{table}\flrow@restyle{figure}%
+   \let\FR@tmp\flrow@restyle
+  }\the\flrow@types
  \@onlypreamble\flrow@restyle\@onlypreamble\flrow@Raw@restyle
  \flrow@types={}}
 \AtBeginDocument{%
diff --git a/Master/texmf-dist/tex/latex/floatrow/fr-fancy.sty b/Master/texmf-dist/tex/latex/floatrow/fr-fancy.sty
index df0bf1f15be..1987f320e90 100644
--- a/Master/texmf-dist/tex/latex/floatrow/fr-fancy.sty
+++ b/Master/texmf-dist/tex/latex/floatrow/fr-fancy.sty
@@ -22,26 +22,9 @@
 %% in the same archive or directory.)
 \NeedsTeXFormat{LaTeX2e}[1995/06/01]
 \ProvidesPackage{fr-fancy}
-       [2005/05/24 v0.1h floatrow: fancy boxes]
+       [2007/11/28 v0.1i floatrow: fancy boxes]
+%%^^A|\newcommand\CenterFloatBoxes{\CADJfalse\OADJfalse|
 \RequirePackage{fancybox}
-\newcommand\FB@colorbox@frame[1]{\hbox{%
-  \FRifFIT\else\kern-\fboxrule\kern-\fboxsep\fi
-  \FB@fcolorbox{#1}%
-  \FRifFIT\else\kern-\fboxrule\kern-\fboxsep\fi}\ignorespaces}
-\@ifdefinable\FB@colorbox@adj{\let\FB@colorbox@adj\FB@fbox@adj}
-\newcommand\FB@colorbox@reset{\fboxsep3\p@\fboxrule.4\p@}
-\newcommand\FB@colorbox{\fbox}
-\newcommand\setcolorframe[1]{\def\FB@fcolorbox{#1}}
-\DeclareFROpt{colorframeset}{\flrow@fcolorbox{#1}}
-\newcommand*\flrow@fcolorbox[1]{%
-  \@ifundefined{flrow@fcolorbox@#1}%
-    {\flrow@error{Undefined color box `#1'}}%
-    {\expandafter\let\expandafter\FB@fcolorbox
-     \csname flrow@fcolorbox@#1\endcsname}}
-\newcommand*\DeclareColorBox[2]{%
-  \@ifundefined{color}{\flrow@error
-    {For usage of colored frames\MessageBreak load color package}}%
-  {\long\@namedef{flrow@fcolorbox@#1}{#2}}}
 \newcommand\wshadowbox{\VerbBox\@wshadowbox}
 \newcommand\@wshadowbox[1]{%
   \setbox\@fancybox\hbox{\fbox{#1}}%
@@ -55,22 +38,19 @@
       \hrule\@width\fboxrule\@height\shadowsize
       \hrule\@width\wd\@fancybox\@height\fboxrule}}}
 \newcommand\FB@shadowbox@frame[1]{\hbox{%
-  \FRifFIT\else\hskip-\fboxrule\hskip-\fboxsep\fi
-  \FBs@raise{\shadowbox{#1}}%
-  \FRifFIT\else\kern-\fboxrule\kern-\fboxsep\kern-\shadowsize\fi}}
+  \FR@ifFIT\relax{\hskip-\fboxrule\hskip-\fboxsep}\FBs@raise{\shadowbox{#1}}%
+  \FR@ifFIT\relax{\kern-\fboxrule\kern-\fboxsep\kern-\shadowsize}}}
 \newcommand\FB@shadowbox@adj{\dimen@=2\fboxsep
   \advance\dimen@2\fboxrule\advance\dimen@\shadowsize}
 \newcommand\FB@shadowbox@reset{\fboxsep3\p@\fboxrule.4\p@\shadowsize4\p@}
 \newcommand\FB@wshadowbox@frame[1]{\hbox{%
-  \FRifFIT\else\hskip-\fboxrule\hskip-\fboxsep\fi
-  \FBs@raise{\wshadowbox{#1}}%
-  \FRifFIT\else\kern-\fboxrule\kern-\fboxsep\kern-\shadowsize\fi}}
+  \FR@ifFIT\relax{\hskip-\fboxrule\hskip-\fboxsep}\FBs@raise{\wshadowbox{#1}}%
+  \FR@ifFIT\relax{\kern-\fboxrule\kern-\fboxsep\kern-\shadowsize}}}
 \@ifdefinable\FB@wshadowbox@adj{\let\FB@wshadowbox@adj\FB@shadowbox@adj}
 \newcommand\FB@wshadowbox@reset{\fboxsep3\p@\fboxrule.4\p@\shadowsize4\p@}
 \newcommand\FB@doublebox@frame[1]{\hbox{%
-  \FRifFIT\else\kern-4.75\fboxrule\kern-.5pt\kern-\fboxsep\fi
-  \doublebox{#1}%
-  \FRifFIT\else\kern-4.75\fboxrule\kern-.5pt\kern-\fboxsep\fi}}
+  \FR@ifFIT\relax{\kern-4.75\fboxrule\kern-.5pt\kern-\fboxsep}\doublebox{#1}%
+  \FR@ifFIT\relax{\kern-4.75\fboxrule\kern-.5pt\kern-\fboxsep}}}
 \newcommand\FB@doublebox@adj{\dimen@=2\fboxsep
   \advance\dimen@7.5\fboxrule\advance\dimen@\p@}
 \newcommand\FB@doublebox@reset{\fboxsep3\p@\fboxrule.4\p@}
diff --git a/Master/texmf-dist/tex/latex/floatrow/fr-longtable.sty b/Master/texmf-dist/tex/latex/floatrow/fr-longtable.sty
index 9229b7529df..f3a193e59d5 100644
--- a/Master/texmf-dist/tex/latex/floatrow/fr-longtable.sty
+++ b/Master/texmf-dist/tex/latex/floatrow/fr-longtable.sty
@@ -22,7 +22,8 @@
 %% in the same archive or directory.)
 \NeedsTeXFormat{LaTeX2e}[1995/06/01]
 \ProvidesPackage{fr-longtable}
-       [2007/05/24 v0.1a (beta) floatrow: additions for longtable]
+       [2007/11/28 v0.1b (beta) floatrow: additions for longtable]
+%%^^A|\newcommand\CenterFloatBoxes{\CADJfalse\OADJfalse|
 \RequirePackage{longtable}[2004/02/01]
 \let\flrow@oriLT@array\LT@array
 \renewcommand\LT@array{%
@@ -38,8 +39,8 @@
          \def\LT@entry####1####2{\advance\LTcapwidth####2}\LT@save@row\relax
          \ifdim\LTcapwidth=\z@\else\global\LTcapwidth\LTcapwidth\fi
        \endgroup\fi}}%
-   \def\floatfoot@{%\par\kern-\normalbaselineskip\kern-\normallineskip
-       \vskip\floatfootskip\def\@captype{table}\floatfoot@box}%
+   \def\floatfoot@{\vskip\floatfootskip
+       \def\@captype{table}\floatfoot@box}%
    \flrow@oriLT@array}
 \providecommand\floatfont{}
 \providecommand\floatfootskip{\skip\@mpfootins}
@@ -67,10 +68,11 @@
     {\let\FBifLTcapwidth\@gobble\setlength\LTcapwidth{#1}}}}
 \@ifpackageloaded{floatrow}
     {\DeclareFROpt{LTcapwidth}{\setLTcapwidth{#1}}
-     \DeclareOption{LTcapwidthtotable}{\setLTcapwidth{table}}
+     \DeclareOption{table}{\setLTcapwidth{table}}
      \ProcessOptions
       }
     {\DeclareOption{LTcapwidthtotable}{\setLTcapwidth{table}}
+     \DeclareOption{table}{\setLTcapwidth{table}}
      \ProcessOptions
      \let\flrow@setlist\@gobble}
 \newbox\flrow@LT@lasthead
@@ -91,7 +93,7 @@
      \fi
   \fi
   \ifvoid\flrow@LT@prelastfoot\else
-     \count@\flrow@LTlastpage\relax%\advance\count@\m@ne\relax
+     \count@\flrow@LTlastpage\relax
      \ifnum\value{FBLTpage}=\count@
         \let\LT@foot\flrow@LT@prelastfoot
      \fi
@@ -125,8 +127,8 @@
     \immediate\write\@auxout{%
       \gdef\expandafter\noexpand
         \csname FBLTpage@\romannumeral\c@LT@tables\endcsname
-          {\string\gdef\string\flrow@LTlastpage{\the\c@FBLTpage}}
-      }}
+          {\string\gdef\string\flrow@LTlastpage{\the\c@FBLTpage}}%
+      }}%
   \fi
   }
 \endinput
diff --git a/Master/texmf-dist/tex/latex/floatrow/fr-subfig.sty b/Master/texmf-dist/tex/latex/floatrow/fr-subfig.sty
index ce3ce4d6dc3..8694c82b9ee 100644
--- a/Master/texmf-dist/tex/latex/floatrow/fr-subfig.sty
+++ b/Master/texmf-dist/tex/latex/floatrow/fr-subfig.sty
@@ -22,7 +22,8 @@
 %% in the same archive or directory.)
 \NeedsTeXFormat{LaTeX2e}[1995/06/01]
 \ProvidesPackage{fr-subfig}
-       [2007/08/24 v0.1f (beta) floatrow: additions for subfig]
+       [2007/12/24 v0.1g (beta) floatrow: additions for subfig]
+%%^^A|\newcommand\CenterFloatBoxes{\CADJfalse\OADJfalse|
 \def\@tempb{2005/06/28 ver: 1.3 subfig package}
 \expandafter\let\csname @tempa\expandafter\endcsname
     \csname ver@subfig.\@pkgextension\endcsname
@@ -246,8 +247,14 @@
       {\flrow@@subfloatlabel[#1]}%
       {\subfloat[]{}\endgroup}}
 \@ifdefinable\flrow@@subfloatlabel{}
+\@ifundefined{newseparatedlabel}\@tempswatrue\@tempswafalse
+\if@tempswa
+    \def\FRsf@Flabel{\label}
+\else
+    \newseparatedlabel\FRsf@Flabel{\@captype}{sub\@captype}
+\fi
 \def\flrow@@subfloatlabel[#1][#2]{%
-    \subfloat[]{\label{#2}}\endgroup}
+    \subfloat[]{\FRsf@Flabel{#2}}\endgroup}
 \endinput
 %%
 %% End of file `fr-subfig.sty'.
diff --git a/Master/texmf-dist/tex/latex/floatrow/listpen.sty b/Master/texmf-dist/tex/latex/floatrow/listpen.sty
index ae28db02a9f..7925512793c 100644
--- a/Master/texmf-dist/tex/latex/floatrow/listpen.sty
+++ b/Master/texmf-dist/tex/latex/floatrow/listpen.sty
@@ -22,7 +22,8 @@
 %% in the same archive or directory.)
 \NeedsTeXFormat{LaTeX2e}[1995/06/01]
 \ProvidesPackage{listpen}
-       [2007/05/24 v0.1b list penalty managing]
+       [2007/10/28 v0.1d list penalty managing]
+%%^^A|\newcommand\CenterFloatBoxes{\CADJfalse\OADJfalse|
 \newcommand\allowprelistbreaks{\let\LP@penalty\@beginparpenalty
   \@testopt{\LP@setlistbreaks}{-1}}
 \newcommand\allowpostlistbreaks{\let\LP@penalty\@endparpenalty
@@ -40,7 +41,17 @@
              \or\LP@penalty#1\@highpenalty
                 \or\LP@penalty#1\@M
     \fi}
-\providecommand\RestoreSpaces{\@nobreakfalse}
+\newcommand\RestoreSpaces{\@nobreakfalse}
+\newcommand\RemoveSpaces {\@nobreaktrue}
+\newcommand\newseparatedlabel[3]{%
+    \@ifdefinable#1{%
+        \def#1##1{\protected@edef\@currentlabel{\string
+            \LP@label@sep {\csname the#3\endcsname}}\label{sub##1}%
+          \protected@edef\@currentlabel{\csname the#2\endcsname
+            \string\LP@label@sep {\csname the#3\endcsname}}\label{##1}}}}
+\newcommand\newseparatedref[2]{\@ifdefinable#1{\def#1##1{{\def\LP@label@sep{#2}\ref{##1}}}}}
+\@ifdefinable\LP@label@sep{}
+\newcommand\makelabelseparator[1]{\def\LP@label@sep{#1}}
 \endinput
 %%
 %% End of file `listpen.sty'.