dblfloatfix (29jan13)

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

3 files changed, 13 insertions, 8 deletions

diff --git a/Master/texmf-dist/doc/latex/dblfloatfix/dblfloatfix.pdf b/Master/texmf-dist/doc/latex/dblfloatfix/dblfloatfix.pdf
index 7cb544cc16d..00e78675fdf 100644
--- a/Master/texmf-dist/doc/latex/dblfloatfix/dblfloatfix.pdf
+++ b/Master/texmf-dist/doc/latex/dblfloatfix/dblfloatfix.pdf
diff --git a/Master/texmf-dist/doc/latex/dblfloatfix/dblfloatfix.tex b/Master/texmf-dist/doc/latex/dblfloatfix/dblfloatfix.tex
index 7198c6acf97..7e4197fb51f 100644
--- a/Master/texmf-dist/doc/latex/dblfloatfix/dblfloatfix.tex
+++ b/Master/texmf-dist/doc/latex/dblfloatfix/dblfloatfix.tex
@@ -18,9 +18,12 @@
 
 \addtokomafont{title}{\rmfamily}
 
-\title{The \pkg{dblfloatfix} package\thanks{This manual corresponds to \pkg{dblfloatfix}~v1.0, dated~2003/11/18.}}
-\author{Morten Høgholm, \href{mailto:moho01ab@student.cbs.dk}{\texttt{<moho01ab@student.cbs.dk>}}}
-\date{2003/11/18}
+\title{The \pkg{dblfloatfix} package\thanks{This manual corresponds to \pkg{dblfloatfix}~v1.0a, dated~2012/12/31.}}
+\author{Morten Høgholm%
+  \thanks{Updated by Joseph Wright
+    \href{mailto:joseph.wright@morningstar2.co.uk}
+    {<joseph.wright@morningstar2.co.uk>}}}
+\date{2012/12/31}
 
 
 \begin{document}
@@ -38,7 +41,7 @@ This is the \LaTeX\ package \pkg{dblfloatfix} which solves two problems:
 \end{enumerate}
 %
 It may be distributed and/or modified under the
-conditions of the \LaTeX\ Project Public License, either version~1.2
+conditions of the \LaTeX\ Project Public License, either version~1.3c
 of this license or (at your option) any later version.
 The latest version of this license is in\\
 \url{http://www.latex-project.org/lppl.txt}
diff --git a/Master/texmf-dist/tex/latex/dblfloatfix/dblfloatfix.sty b/Master/texmf-dist/tex/latex/dblfloatfix/dblfloatfix.sty
index 1dbb8cb391f..63ae97d8668 100644
--- a/Master/texmf-dist/tex/latex/dblfloatfix/dblfloatfix.sty
+++ b/Master/texmf-dist/tex/latex/dblfloatfix/dblfloatfix.sty
@@ -3,11 +3,11 @@
 %%   b)~allowed float positions are now [tbp].
 %%
 %% It may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.2
+%% conditions of the LaTeX Project Public License, either version 1.3c
 %% of this license or (at your option) any later version.
 %% The latest version of this license is in
 %%    http://www.latex-project.org/lppl.txt
-\ProvidesPackage{dblfloatfix}[2003/11/18 v1.0 (MH)]
+\ProvidesPackage{dblfloatfix}[2012/12/31 v1.0a (JAW)]
 %%
 %% USAGE:
 %%
@@ -24,7 +24,7 @@
 %% If you're using the subfigure package this package will provide a
 %% fix for \end@dblfloat by Steven Cochran (the author of subfigure).
 %%
-%% Morten H\o gholm, <moho01ab@student.cbs.dk>
+%% Morten H\o gholm, <moho0...@student.cbs.dk>
 \RequirePackage{fixltx2e}
 %% An error message for those who didn't read the instructions.
 \newcommand*{\DBLFIXerrormessage}[1]{%
@@ -141,6 +141,8 @@
           \fi
           \if@tempswa
             \@bitor \@currtype \@deferlist
+	    % Test for twocolumn floats (2008/08/21 Mattias Nissler)
+            \@testwrongwidth\@currbox
             \if@test
             \else
               \@tempdima -\ht\@currbox
@@ -246,4 +248,4 @@
   \fi
 }
 
-\endinput
+\endinput
\ No newline at end of file