summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/base/flafter.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/base/flafter.sty')
-rw-r--r--Master/texmf-dist/tex/latex/base/flafter.sty145
1 files changed, 138 insertions, 7 deletions
diff --git a/Master/texmf-dist/tex/latex/base/flafter.sty b/Master/texmf-dist/tex/latex/base/flafter.sty
index da966a59269..a1f16091269 100644
--- a/Master/texmf-dist/tex/latex/base/flafter.sty
+++ b/Master/texmf-dist/tex/latex/base/flafter.sty
@@ -8,7 +8,12 @@
%%
%% This is a generated file.
%%
-%% Copyright 1993-2014
+%% The source is maintained by the LaTeX Project team and bug
+%% reports for it can be opened at http://latex-project.org/bugs.html
+%% (but please observe conditions on bug reports sent to that address!)
+%%
+%%
+%% Copyright 1993-2015
%% The LaTeX3 Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -38,8 +43,10 @@
%% extension .ins) which are part of the distribution.
%%% From File: ltoutput.dtx
\ProvidesPackage{flafter}
- [2014/04/24 v1.2n
+ [2015/03/12 v1.2m
Standard LaTeX floats after reference (FMi)]
+\IncludeInRelease{2015/01/01}%
+ {\@addtocurcol}{float order in 2-column}%
\def \@addtocurcol {%
\fl@trace{***Start addtocurcol}%
\@insertfalse
@@ -68,6 +75,7 @@
\@flsetnum \@colnum
\ifnum \@colnum>\z@
\@bitor\@currtype\@deferlist
+ \@testwrongwidth\@currbox
\fl@trace{deferlist: \@deferlist: (addtocurcol-before)}%
\if@test
\fl@trace{type already on list: defer (addtocurcol)}%
@@ -87,10 +95,10 @@
\global \advance \@textfloatsheight \ht\@currbox
\global \advance \@textfloatsheight 2\intextsep
\@cons \@midlist \@currbox
- \fl@trace{***Success: here}%
- \fl@trace{textfloatsheight (after-here) =
- \the \@textfloatsheight}%
- \fl@trace{colnum (after-here) = \the \@colnum}%
+ \fl@trace{***Success: here}%
+ \fl@trace{textfloatsheight (after-here) =
+ \the \@textfloatsheight}%
+ \fl@trace{colnum (after-here) = \the \@colnum}%
\if@nobreak
\nobreak
\@nobreakfalse
@@ -137,7 +145,130 @@
\@cons\@deferlist\@currbox
\fl@trace{deferlist: \@deferlist: (addtocurcol-after)}%
\fi
-}
+}%
+\EndIncludeInRelease
+\IncludeInRelease{0000/00/00}%
+ {\@addtocurcol}{float order in 2-column}%
+\def \@addtocurcol {%
+ \fl@trace{***Start addtocurcol}%
+ \@insertfalse
+ \@setfloattypecounts
+ \ifnum \@fpstype=8
+ \fl@trace{fpstype !p only (addtocurcol):
+ \the \@fpstype = 8?}%
+ \else
+ \ifnum \@fpstype=24
+ \fl@trace{fpstype p only (addtocurcol):
+ \the \@fpstype = 24?}%
+ \else
+ \@flsettextmin
+ \fl@trace{textfloatsheight (before) =
+ \the \@textfloatsheight}%
+ \advance \@textmin \@textfloatsheight
+ \@reqcolroom \@pageht
+ \fl@trace{textmin + textfloatsheight:
+ \the \@textmin}%
+ \fl@trace{page-so-far: \the \@reqcolroom}%
+
+ \ifdim \@textmin>\@reqcolroom
+ \@reqcolroom \@textmin
+ \fl@trace{ORD? textmin being used}%
+ \fi
+ \advance \@reqcolroom \ht\@currbox
+ \fl@trace{float size =
+ \the \ht \@currbox (addtocurcol)}%
+ \fl@trace{colroom =
+ \the \@colroom (addtocurcol)}%
+ \fl@trace{reqcolroom =
+ \the \@reqcolroom (addtocurcol)}%
+ \ifdim \@colroom>\@reqcolroom
+ \@flsetnum \@colnum
+ \ifnum \@colnum>\z@
+ \@bitor\@currtype\@deferlist
+ \fl@trace{deferlist:
+ \@deferlist: (addtocurcol-before)}%
+ \if@test
+ \fl@trace{type already on list:
+ defer (addtocurcol)}%
+ \else
+ \@bitor\@currtype\@botlist
+ \fl@trace{botlist: \@botlist:
+ (addtocurcol-before)}%
+ \if@test
+ \fl@trace{type already on list:
+ bot---sent to addtobot}%
+ \@addtobot
+ \else
+ \fl@trace{fpstype
+ \ifodd \@tempcnta OK \else not \fi
+ here: \the \@fpstype}%
+ \ifodd \count\@currbox
+ \advance \@reqcolroom \intextsep
+ \ifdim \@colroom>\@reqcolroom
+ \global \advance \@colnum \m@ne
+ \global \advance
+ \@textfloatsheight\ht\@currbox
+ \global \advance
+ \@textfloatsheight 2\intextsep
+ \@cons \@midlist \@currbox
+ \fl@trace{***Success: here}%
+ \fl@trace{textfloatsheight
+ (after-here) =
+ \the \@textfloatsheight}%
+ \fl@trace{colnum (after-here) =
+ \the \@colnum}%
+ \if@nobreak
+ \nobreak
+ \@nobreakfalse
+ \everypar{}%
+ \else
+ \addpenalty\interlinepenalty
+ \fi
+ \vskip \intextsep
+ \box\@currbox
+ \penalty\interlinepenalty
+ \vskip\intextsep
+ \ifnum\outputpenalty
+ <-\@Mii \vskip
+ -\parskip\fi
+ \outputpenalty \z@
+ \@inserttrue
+ \else
+ \fl@trace{Fail---no room at 2nd test of colroom
+ (addtocorcol \string\intextsep)}%
+ \fi
+ \fi
+ \if@insert
+ \else
+ \fl@trace{not here: sent to addtobot}%
+ \@addtobot
+ \fi
+ \fi
+ \fi
+ \else
+ \fl@trace{Fail: colnum = \the \@colnum:
+ fpstype \the \@fpstype=ORD?}%
+ \ifnum \@fpstype<\sixt@@n
+ \fl@trace{ERROR: BANG float not successful
+ (addtocurcol)}%
+ \fi
+ \fi
+ \else
+ \fl@trace{Fail---no room: fl box ht:
+ \the \ht \@currbox (addtocurcol)}%
+ \fi
+ \fi
+ \fi
+ \if@insert
+ \else
+ \@resethfps
+ \fl@trace{put on deferlist (addtocurcol)}%
+ \@cons\@deferlist\@currbox
+ \fl@trace{deferlist: \@deferlist:
+ (addtocurcol-after)}%
+ \fi
+ }%
+\EndIncludeInRelease
\providecommand\fl@trace[1]{}
\endinput
%%