diff options
author | Karl Berry <karl@freefriends.org> | 2009-08-05 13:29:06 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2009-08-05 13:29:06 +0000 |
commit | 150c17a368ab6cf13dad8ccedf13a0bd4dd4ac25 (patch) | |
tree | 7a55f2c74e1b3e44df86ffdcb48238d0a3c51940 /Master/texmf-dist/tex/latex/floatrow/floatrow.sty | |
parent | ee03b9da50173f49e8224ca79e2e6a99db620923 (diff) |
float 0.3b (3aug09)
git-svn-id: svn://tug.org/texlive/trunk@14535 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/floatrow/floatrow.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/floatrow/floatrow.sty | 46 |
1 files changed, 15 insertions, 31 deletions
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 |