diff options
author | Karl Berry <karl@freefriends.org> | 2014-05-08 23:19:57 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2014-05-08 23:19:57 +0000 |
commit | af776e075b6577fb69fc6de4a8f98574850429c5 (patch) | |
tree | 852adf62233aaf11c780a3a236196f6fd68550a4 /Master/texmf-dist/tex/latex/base/flafter.sty | |
parent | e09ba5b0f951c4bbfb7b4e1ca46360ef26b56885 (diff) |
revert partial latex update, a subsequent update is coming today/tomorrow
git-svn-id: svn://tug.org/texlive/trunk@33923 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/base/flafter.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/base/flafter.sty | 43 |
1 files changed, 4 insertions, 39 deletions
diff --git a/Master/texmf-dist/tex/latex/base/flafter.sty b/Master/texmf-dist/tex/latex/base/flafter.sty index da966a59269..9f5d509a55a 100644 --- a/Master/texmf-dist/tex/latex/base/flafter.sty +++ b/Master/texmf-dist/tex/latex/base/flafter.sty @@ -4,11 +4,11 @@ %% %% The original source files were: %% -%% ltoutput.dtx (with options: `flafter,trace') +%% ltoutput.dtx (with options: `flafter') %% %% This is a generated file. %% -%% Copyright 1993-2014 +%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 %% The LaTeX3 Project and any individual authors listed elsewhere %% in this file. %% @@ -38,48 +38,32 @@ %% extension .ins) which are part of the distribution. %%% From File: ltoutput.dtx \ProvidesPackage{flafter} - [2014/04/24 v1.2n + [2000/07/23 v1.2i Standard LaTeX floats after reference (FMi)] \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 @@ -87,10 +71,6 @@ \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 @@ -105,40 +85,25 @@ \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 } -\providecommand\fl@trace[1]{} +\providecommand\tr@ce[1]{} \endinput %% %% End of file `flafter.sty'. |