summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/base/ltoutput.dtx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-01-22 23:37:33 +0000
committerKarl Berry <karl@freefriends.org>2017-01-22 23:37:33 +0000
commitb2ba0afced5c10391750914c16a2aa06cfaa6a96 (patch)
tree8a87b0b92f0038639e1078486bb4c2a56bcea2d3 /Master/texmf-dist/source/latex/base/ltoutput.dtx
parentbc46c8f4627710df445115626d25161dcb2df985 (diff)
latex2e (22jan17)
git-svn-id: svn://tug.org/texlive/trunk@43024 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/base/ltoutput.dtx')
-rw-r--r--Master/texmf-dist/source/latex/base/ltoutput.dtx40
1 files changed, 35 insertions, 5 deletions
diff --git a/Master/texmf-dist/source/latex/base/ltoutput.dtx b/Master/texmf-dist/source/latex/base/ltoutput.dtx
index 8c716bb5c96..df2d7233e23 100644
--- a/Master/texmf-dist/source/latex/base/ltoutput.dtx
+++ b/Master/texmf-dist/source/latex/base/ltoutput.dtx
@@ -30,14 +30,14 @@
%%% From File: ltoutput.dtx
%<flafter>\ProvidesPackage{flafter}
%<fltrace>\ProvidesPackage{fltrace}
-%<flafter,fltrace> [2015/09/05 v1.3a
+%<flafter,fltrace> [2016/10/04 v1.3b
%<flafter> Standard LaTeX floats after reference (FMi)]
%<fltrace> Tracing LaTeX floats algorithm (FMi)]
%
%<*driver>
% \fi
\ProvidesFile{ltoutput.dtx}
- [2015/09/05 v1.3a LaTeX Kernel (Output Routine)]
+ [2016/10/04 v1.3b LaTeX Kernel (Output Routine)]
% \iffalse
\documentclass{ltxdoc}
\GetFileInfo{ltoutput.dtx}
@@ -4468,10 +4468,18 @@
% Only tracing has been added to these.
%
% \begin{macrocode}
-%<*2ekernel|fltrace>
+%<latexrelease|fltrace>\IncludeInRelease{2017/01/01}%
+%<latexrelease|fltrace> {\@makefcolumn}{negative height floats}%
+%<*2ekernel|fltrace|latexrelease>
\def\@makefcolumn #1{%
\begingroup
- \@fpmin \z@
+% \end{macrocode}
+% \changes{v1.3b}{2017/01/01}{make fpmin negative so ignored even if float height is negative}
+% \begin{macrocode}
+ \@fpmin -\maxdimen
+% \end{macrocode}
+%
+% \begin{macrocode}
\let \@testfp \@gobble
\@tryfcolumn #1%
\endgroup
@@ -4484,6 +4492,29 @@
%</trace>
}
% \end{macrocode}
+%
+% \begin{macrocode}
+%<latexrelease|fltrace>\EndIncludeInRelease
+%<latexrelease|fltrace>\IncludeInRelease{0000/00/00}%
+%<latexrelease|fltrace> {\@makefcolumn}{negative height floats}%
+%<latexrelease|fltrace>\def\@makefcolumn #1{%
+%<latexrelease|fltrace> \begingroup
+%<latexrelease|fltrace> \@fpmin \z@
+%<latexrelease|fltrace> \let \@testfp \@gobble
+%<latexrelease|fltrace> \@tryfcolumn #1%
+%<latexrelease|fltrace> \endgroup
+%<*trace>
+%<latexrelease|fltrace> \if@fcolmade
+%<latexrelease|fltrace> \fl@trace{PAGE: in \string\clearpage
+%<latexrelease|fltrace> \if@twocolumn ---twocolumn\fi---}%
+%<latexrelease|fltrace> \fl@trace{----- float column/page completed
+%<latexrelease|fltrace> from \string#1}%
+%<latexrelease|fltrace> \fi
+%</trace>
+%<latexrelease|fltrace>}
+%<latexrelease|fltrace>\EndIncludeInRelease
+%</2ekernel|fltrace|latexrelease>
+% \end{macrocode}
% This will line up the last baselines in the two
% columns provided they are constructed in the normal way: \ie ending
% in a skip of minus the original depth, with |\@textbottom| adding
@@ -4493,7 +4524,6 @@
% \changes{1.2g}{2000/07/12}{Ensure that rule is in \cs{normalcolor}}
% \changes{v1.2m}{2014/12/30}{Command updated (latexrelease)}
% \begin{macrocode}
-%</2ekernel|fltrace>
%<latexrelease|fltrace>\IncludeInRelease{2015/01/01}%
%<latexrelease|fltrace> {\@outputdblcol}{2 column marks}%
%<*2ekernel|fltrace|latexrelease>