endfloat 2.5d (28dec11)

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

2 files changed, 13 insertions, 11 deletions

diff --git a/Master/texmf-dist/tex/latex/endfloat/efxmpl.cfg b/Master/texmf-dist/tex/latex/endfloat/efxmpl.cfg
index 9e595f90c14..7210866c4d7 100644
--- a/Master/texmf-dist/tex/latex/endfloat/efxmpl.cfg
+++ b/Master/texmf-dist/tex/latex/endfloat/efxmpl.cfg
@@ -19,8 +19,8 @@
 %% the blame; if you pass it on, pass on all present condiditions;
 %% 
 \def\filename{endfloat}
-\def\fileversion{v2.5c}
-\def\filedate{2011/12/23}
+\def\fileversion{v2.5d}
+\def\filedate{2011/12/25}
 \def\docdate{2011/12/05}
 %% \CharacterTable
 %%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
diff --git a/Master/texmf-dist/tex/latex/endfloat/endfloat.sty b/Master/texmf-dist/tex/latex/endfloat/endfloat.sty
index 78e8612712d..559cec7c14a 100644
--- a/Master/texmf-dist/tex/latex/endfloat/endfloat.sty
+++ b/Master/texmf-dist/tex/latex/endfloat/endfloat.sty
@@ -19,8 +19,8 @@
 %% the blame; if you pass it on, pass on all present condiditions;
 %% 
 \def\filename{endfloat}
-\def\fileversion{v2.5c}
-\def\filedate{2011/12/23}
+\def\fileversion{v2.5d}
+\def\filedate{2011/12/25}
 \def\docdate{2011/12/05}
 %% \CharacterTable
 %%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -202,14 +202,11 @@
          {You can't use \noexpand\DeclareDelayedFloatFlavor twice for a given environment.}%
      \fi}}
 \@onlypreamble\efloat@@declareflavor
-\@ifundefined{apa@startsection}{% defined by apa.cls
-  \@ifundefined{@noendfloatfig}{% defined by (old) apa6.cls
-    \newcommand*\efloat@AtBeginDocument{\AtBeginDocument}
-  }{%
-    \newcommand*\efloat@AtBeginDocument{\@iden}
-  }%
+\@ifpackageloaded{floatrow}{%
+  \PackageInfo{endfloat}{`floatrow' package detected, delaying redefinitions}
+  \providecommand*\efloat@AtBeginDocument{\AtBeginDocument}
 }{%
-  \newcommand*\efloat@AtBeginDocument{\@iden}
+  \providecommand*\efloat@AtBeginDocument{\@iden}
 }
 \newcommand*\efloat@restorefloats{}
 \newcommand*\efloat@SetOption[1]{%
@@ -253,6 +250,8 @@
 \DeclareOption*{%
    \PackageWarning{endfloat}{Unknown option `\CurrentOption'}}
 \ProcessOptions*
+\let\@bfig\figure             % bj
+\let\@btab\table              % bj
 \if@tablesfirst
   \ifefloat@tables
     \DeclareDelayedFloat{table}[ttt]{Tables}
@@ -342,9 +341,12 @@
     \markboth                                                          % bj
       {\expandafter\uppercase\expandafter{\csname #2section\endcsname}}% bj
       {\expandafter\uppercase\expandafter{\csname #2section\endcsname}}% bj
+    \def\efloat@type{#2}%
+    \processdelayedfloat@hook
     \@nameuse{process#2s@hook}%
     \@input{\jobname.#1}%
   }{}}
+\newcommand*\processdelayedfloat@hook{}
 \newcommand*\efloat@listof[1]{%
   \expandafter\providecommand\csname list#1name\endcsname
     {List of \@nameuse{#1section}}%