[latex3-commits] [git/LaTeX3-latex3-latex2e] develop: Tl21 2 fltrace (#635) (7d75d1d3)

GitHub noreply at github.com
Wed Aug 4 10:04:50 CEST 2021 

Repository : https://github.com/latex3/latex2e
On branch  : develop
Link       : https://github.com/latex3/latex2e/commit/7d75d1d3acba15e5452a5800cb0ba3251b3bca2e

>---------------------------------------------------------------

commit 7d75d1d3acba15e5452a5800cb0ba3251b3bca2e
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date:   Wed Aug 4 10:04:50 2021 +0200

    Tl21 2 fltrace (#635)
    
    * Adding first version of \showfloat in fltrace
    
    * adding \showfloat
    
    * lua wants its own test output as usual :-(
    
    * fix rollback


>---------------------------------------------------------------

7d75d1d3acba15e5452a5800cb0ba3251b3bca2e
 base/changes.txt                                   |   7 +
 base/doc/ltnews34.tex                              |  22 ++
 base/ltoutput.dtx                                  |  63 ++++-
 base/testfiles/github-0479-often.luatex.tlg        |   2 +
 base/testfiles/github-0479-often.tlg               |   2 +
 base/testfiles/github-0479-often.xetex.tlg         |   2 +
 ...ace-000-2015.tlg => tlb-fltrace-005.luatex.tlg} | 305 +++++++++++++++++++--
 ...lb-fltrace-000-2015.lvt => tlb-fltrace-005.lvt} |  15 +-
 ...ace-000-2015.luatex.tlg => tlb-fltrace-005.tlg} | 266 ++++++++++++++++--
 .../tlb-latexrelease-rollback-003-often.luatex.tlg |   4 +
 .../tlb-latexrelease-rollback-003-often.tlg        |   4 +
 .../tlb-latexrelease-rollback-003-often.xetex.tlg  |   4 +
 base/testfiles/tlb-rollback-004-often.luatex.tlg   |   2 +
 base/testfiles/tlb-rollback-004-often.tlg          |   2 +
 base/testfiles/tlb-rollback-004-often.xetex.tlg    |   2 +
 base/testfiles/tlb-rollback-005.luatex.tlg         |   2 +
 base/testfiles/tlb-rollback-005.tlg                |   2 +
 base/testfiles/tlb-rollback-005.xetex.tlg          |   2 +
 18 files changed, 663 insertions(+), 45 deletions(-)

diff --git a/base/changes.txt b/base/changes.txt
index 150149fe..204a51fb 100644
--- a/base/changes.txt
+++ b/base/changes.txt
@@ -6,6 +6,13 @@ completeness or accuracy and it contains some references to files that
 are not part of the distribution.
 ================================================================================
 
+2021-07-31  Frank Mittelbach  <Frank.Mittelbach at latex-project.org>
+
+	* ltoutput.dtx (subsubsection{Float control}):
+	Add \showfloat to fltrace.sty so that you can easily display the
+	contents of a float register, argument is just the uppercase
+	letter (or letters) denoting the register.
+
 2021-07-28  Frank Mittelbach  <Frank.Mittelbach at latex-project.org>
 
 	* ltsect.dtx (section| or |\caption|):
diff --git a/base/doc/ltnews34.tex b/base/doc/ltnews34.tex
index 0907b13f..723f3f15 100644
--- a/base/doc/ltnews34.tex
+++ b/base/doc/ltnews34.tex
@@ -240,6 +240,28 @@ error and should therefore be properly looked at.
 
 
 
+
+\subsection{New \cs{showfloat} command}
+
+The package \pkg{fltrace} offers a (fairly low-level but very
+detailed) way to trace \LaTeX's float mechanism. This can help to
+understand why a certain float is placed into a certain region or why
+it shows up unexpectedly on a later page.  \LaTeX{} stores floats in
+registers named \cs{bx at A}, \cs{bx at B}, etc., and these names show up in
+the tracing information.
+%
+To display their contents you can now say
+\verb=\showfloat{=\textit{uc-letter}\verb=}= where \textit{uc-letter}
+is the uppercase letter (or letters) after \texttt{bx@} in the
+register name shown in the tracing. The command is generally
+available, whether or not you have loaded \pkg{fltrace}, because it is
+also useful when interpreting the tracing output of the
+\pkg{fewerfloatpages} package.
+
+
+
+
+
 \subsection{???}
 
 %
diff --git a/base/ltoutput.dtx b/base/ltoutput.dtx
index b1b3a240..651bbccc 100644
--- a/base/ltoutput.dtx
+++ b/base/ltoutput.dtx
@@ -30,7 +30,7 @@
 %%% From File: ltoutput.dtx
 %<flafter>\ProvidesPackage{flafter}
 %<fltrace>\ProvidesPackage{fltrace}
-%<flafter,fltrace>       [2018/11/28 v1.4d
+%<flafter,fltrace>       [2021/07/31 v1.4e
 %<flafter>                  Standard LaTeX floats after reference (FMi)]
 %<fltrace>                  Tracing LaTeX floats algorithm (FMi)]
 %
@@ -3945,10 +3945,56 @@
      \fi
    \fi
 }
+%    \end{macrocode}
+%  \end{macro}
+%
+%
+%
+%
+%
+%  \begin{macro}{\showfloat}
+%    This command provides some information about the contenta of a
+%    float register.  Float registers are internally named
+%    \cs{bx@}\meta{Uppsercase-letter(s)} and you specify just this
+%    letter or letters as the argument, e.g., \verb=\showfloat{A}=.
+%    (No error recovery no anything if you specify something that
+%    isn't a float.)
+% \changes{v1.4e}{2021/07/31}{Macro added}
+%    \begin{macrocode}
 %</2ekernel>
+%<*2ekernel|latexrelease>
+%<latexrelease>\IncludeInRelease{2021/11/15}%
+%<latexrelease>                 {\showfloat}{Show float register contents}%
+\def\showfloat#1{\begingroup
+    \tracefloats
+    \fl at trace{***Float #1 details:}%
+    \expandafter\fl at showfloat\csname bx@#1\endcsname
+  \endgroup
+}
+\def\fl at showfloat#1{%
+  \fl at traceval{\count#1}%  % this here should be interpreted on day
+  \fl at traceval{\ht#1}%
+  \fl at traceval{\dp#1}%
+  \fl at traceval{\wd#1}%
+  {\tracingonline1\showboxbreadth10\showboxdepth3\showbox#1}%
+}
+%</2ekernel|latexrelease>
+%<latexrelease>\EndIncludeInRelease
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+%<latexrelease>\IncludeInRelease{0000/00/00}%
+%<latexrelease>                 {\showfloat}{Show float register contents}%
+%<latexrelease>
+%<latexrelease>\let\showfloat\@undefined
+%<latexrelease>\let\fl at showfloat\@undefined
+%<latexrelease>\EndIncludeInRelease
 %    \end{macrocode}
 %  \end{macro}
 %
+%
+%
+%
 % \subsubsection{Float control}
 %
 % This part implements controllable floats and other changes
@@ -4025,6 +4071,16 @@
 %   wrong value.\footnote{This is a somewhat questionable design.}
 %    \begin{macrocode}
  \begingroup
+%    \end{macrocode}
+%    When the user requests \cs{tracefloatvals} then they should show
+%    regardless of the tracing state, so locally we make sure that it
+%    is activated.
+% \changes{v1.4e}{2021/07/31}{Enable display when doing \cs{tracefloatvals}}
+%    \begin{macrocode}
+  \tracefloats
+%    \end{macrocode}
+%    
+%    \begin{macrocode}
   \@dblfloatplacement
   \@floatplacement
   \fl at trace{***Float placement parameters:}%
@@ -4052,6 +4108,7 @@
                           {trace float vals}%
 \def \tracefloatvals{%
  \begingroup
+  \tracefloats
   \@dblfloatplacement
   \@floatplacement
   \fl at trace{***Float placement parameters:}%
@@ -4077,6 +4134,10 @@
 }
 \EndIncludeInRelease
 %    \end{macrocode}
+%
+%
+%
+%
 %    We need to make sure that \texttt{fltrace} comes before
 %    \texttt{flafter} to make the tracing work.
 %    \begin{macrocode}
diff --git a/base/testfiles/github-0479-often.luatex.tlg b/base/testfiles/github-0479-often.luatex.tlg
index 95757752..935eb6d3 100644
--- a/base/testfiles/github-0479-often.luatex.tlg
+++ b/base/testfiles/github-0479-often.luatex.tlg
@@ -632,6 +632,8 @@ Applying: [....-..-..] float order in 2-column on input line ....
 Already applied: [....-..-..] float order in 2-column on input line ....
 Applying: [....-..-..] float order in 2-column on input line ....
 Already applied: [....-..-..] float order in 2-column on input line ....
+Skipping: [....-..-..] Show float register contents on input line ....
+Applying: [....-..-..] Show float register contents on input line ....
 Applying: [....-..-..] negative height floats on input line ....
 Already applied: [....-..-..] negative height floats on input line ....
 Applying: [....-..-..] 2 column marks on input line ....
diff --git a/base/testfiles/github-0479-often.tlg b/base/testfiles/github-0479-often.tlg
index 2bfb208a..8e96a2ee 100644
--- a/base/testfiles/github-0479-often.tlg
+++ b/base/testfiles/github-0479-often.tlg
@@ -620,6 +620,8 @@ Applying: [....-..-..] float order in 2-column on input line ....
 Already applied: [....-..-..] float order in 2-column on input line ....
 Applying: [....-..-..] float order in 2-column on input line ....
 Already applied: [....-..-..] float order in 2-column on input line ....
+Skipping: [....-..-..] Show float register contents on input line ....
+Applying: [....-..-..] Show float register contents on input line ....
 Applying: [....-..-..] negative height floats on input line ....
 Already applied: [....-..-..] negative height floats on input line ....
 Applying: [....-..-..] 2 column marks on input line ....
diff --git a/base/testfiles/github-0479-often.xetex.tlg b/base/testfiles/github-0479-often.xetex.tlg
index fe47cc4b..c07cc78c 100644
--- a/base/testfiles/github-0479-often.xetex.tlg
+++ b/base/testfiles/github-0479-often.xetex.tlg
@@ -621,6 +621,8 @@ Applying: [....-..-..] float order in 2-column on input line ....
 Already applied: [....-..-..] float order in 2-column on input line ....
 Applying: [....-..-..] float order in 2-column on input line ....
 Already applied: [....-..-..] float order in 2-column on input line ....
+Skipping: [....-..-..] Show float register contents on input line ....
+Applying: [....-..-..] Show float register contents on input line ....
 Applying: [....-..-..] negative height floats on input line ....
 Already applied: [....-..-..] negative height floats on input line ....
 Applying: [....-..-..] 2 column marks on input line ....
diff --git a/base/testfiles/tlb-fltrace-000-2015.tlg b/base/testfiles/tlb-fltrace-005.luatex.tlg
similarity index 67%
copy from base/testfiles/tlb-fltrace-000-2015.tlg
copy to base/testfiles/tlb-fltrace-005.luatex.tlg
index d9a1498b..975bc4ce 100644
--- a/base/testfiles/tlb-fltrace-000-2015.tlg
+++ b/base/testfiles/tlb-fltrace-005.luatex.tlg
@@ -109,6 +109,65 @@ LaTeX2e: colroom (after-top) = 523.05556pt
 LaTeX2e: colnum (after-top) = 2
 LaTeX2e: topnum (after-top) = 1
 LaTeX2e: ***Success: top
+Overfull \hbox (5.16669pt too wide) in paragraph at lines 35--35
+[]\OT1/cmr/m/n/10 M 
+\hbox(6.83331+0.0)x4.0, direction TLT
+.\localpar
+..\localinterlinepenalty=0
+..\localbrokenpenalty=0
+..\localleftbox=null
+..\localrightbox=null
+.\hbox(0.0+0.0)x0.0, direction TLT
+.\OT1/cmr/m/n/10 M
+.\penalty 10000
+.\glue(\parfillskip) 0.0 plus 1.0fil
+.\glue(\rightskip) 0.0
+LaTeX2e: ***Float F details:
+LaTeX2e: \count\bx at F  = 0
+LaTeX2e: \ht\bx at F  = 6.83331pt
+LaTeX2e: \dp\bx at F  = 0.0pt
+LaTeX2e: \wd\bx at F  = 4.0pt
+> \box...=
+\vbox(6.83331+0.0)x4.0, direction TLT
+.\vbox(6.83331+0.0)x4.0, direction TLT
+..\hbox(6.83331+0.0)x4.0, direction TLT
+...\localpar
+....\localinterlinepenalty=0
+....\localbrokenpenalty=0
+....\localleftbox=null
+....\localrightbox=null
+...\hbox(0.0+0.0)x0.0, direction TLT
+...\OT1/cmr/m/n/10 M
+...\penalty 10000
+...\glue(\parfillskip) 0.0 plus 1.0fil
+...\glue(\rightskip) 0.0
+! OK.
+<argument> \bx at F 
+l. ...\showfloat{F}
+                \showfloat{G}  % those should be the marginpars
+LaTeX2e: ***Float G details:
+LaTeX2e: \count\bx at G  = -1
+LaTeX2e: \ht\bx at G  = 6.83331pt
+LaTeX2e: \dp\bx at G  = 0.0pt
+LaTeX2e: \wd\bx at G  = 4.0pt
+> \box...=
+\vbox(6.83331+0.0)x4.0, direction TLT
+.\vbox(6.83331+0.0)x4.0, direction TLT
+..\hbox(6.83331+0.0)x4.0, direction TLT
+...\localpar
+....\localinterlinepenalty=0
+....\localbrokenpenalty=0
+....\localleftbox=null
+....\localrightbox=null
+...\hbox(0.0+0.0)x0.0, direction TLT
+...\OT1/cmr/m/n/10 M
+...\penalty 10000
+...\glue(\parfillskip) 0.0 plus 1.0fil
+...\glue(\rightskip) 0.0
+! OK.
+<argument> \bx at G 
+l. ...\showfloat{F}\showfloat{G}
+                               % those should be the marginpars
 LaTeX2e: ***Start addtocurcol
 LaTeX2e: (mod 32) fpstype: 17
 LaTeX2e: (mult of 32) currtype: 64
@@ -138,7 +197,7 @@ LaTeX2e: (mult of 32) currtype: 32
 LaTeX2e: ORD float
 LaTeX2e: fpstype p only (addtocurcol): 24= 24?
 LaTeX2e: put on deferlist (addtocurcol)
-LaTeX2e: deferlist: \bx at A \bx at B \bx at C \bx at F : (addtocurcol-after)
+LaTeX2e: deferlist: \bx at A \bx at B \bx at C \bx at H : (addtocurcol-after)
 LaTeX2e: ***Start addtocurcol
 LaTeX2e: (mod 32) fpstype: 30
 LaTeX2e: (mult of 32) currtype: 64
@@ -147,7 +206,7 @@ LaTeX2e: fpstype: 30(flsettextmin)
 LaTeX2e: ORD textmin = 109.99832pt
 LaTeX2e: textfloatsheight (before) = 30.94444pt
 LaTeX2e: textmin + textfloatsheight: 140.94276pt
-LaTeX2e: page-so-far: 54.88889pt
+LaTeX2e: page-so-far: 78.88889pt
 LaTeX2e: ORD? textmin being used
 LaTeX2e: float size = 6.94444pt(addtocurcol)
 LaTeX2e: colroom = 523.05556pt(addtocurcol)
@@ -155,7 +214,7 @@ LaTeX2e: reqcolroom = 147.8872pt(addtocurcol)
 LaTeX2e: fpstype: 30(flsetnum \@colnum)
 LaTeX2e: \@colnum  (before) = 1
 LaTeX2e: \@currbox single column float -- ok
-LaTeX2e: deferlist: \bx at A \bx at B \bx at C \bx at F : (addtocurcol-before)
+LaTeX2e: deferlist: \bx at A \bx at B \bx at C \bx at H : (addtocurcol-before)
 LaTeX2e: botlist: : (addtocurcol-before)
 LaTeX2e: fpstype not here: 30
 LaTeX2e: not here: sent to addtotoporbot
@@ -193,17 +252,221 @@ LaTeX2e: \@dbltopnum = 2
 LaTeX2e: \@dbltoproom = 384.99832pt
 LaTeX2e: \textfraction= .2
 LaTeX2e: toplist: \bx at D 
-LaTeX2e: botlist: \bx at G 
+LaTeX2e: botlist: \bx at I 
 LaTeX2e: midlist: \bx at E 
-LaTeX2e: deferlist: \bx at A \bx at B \bx at C \bx at F 
+LaTeX2e: deferlist: \bx at A \bx at B \bx at C \bx at H 
 LaTeX2e: dbltoplist: 
+LaTeX2e: ***Float A details:
+LaTeX2e: \count\bx at A  = 58
+LaTeX2e: \ht\bx at A  = 10.0pt
+LaTeX2e: \dp\bx at A  = 0.00002pt
+LaTeX2e: \wd\bx at A  = 469.0pt
+> \box...=
+\vbox(10.0+0.00002)x469.0, direction TLT
+.\vbox(10.0+0.0)x469.0, direction TLT
+..\hbox(7.5+2.5)x469.0, glue set 420.91656fil, direction TLT
+...\localpar
+....\localinterlinepenalty=0
+....\localbrokenpenalty=0
+....\localleftbox=null
+....\localrightbox=null
+...\hbox(0.0+0.0)x0.0, direction TLT
+...\OT1/cmr/m/n/10 ^^L (ligature fi)
+...\OT1/cmr/m/n/10 g
+...\discretionary (penalty 50) []
+...\OT1/cmr/m/n/10 u
+...\OT1/cmr/m/n/10 r
+...\OT1/cmr/m/n/10 e
+...\OT1/cmr/m/n/10 (
+...\OT1/cmr/m/n/10 *
+...etc.
+..\glue 0.0
+! OK.
+<argument> \bx at A 
+l. ...\showfloat{A}
+LaTeX2e: ***Float B details:
+LaTeX2e: \count\bx at B  = 62
+LaTeX2e: \ht\bx at B  = 8.88889pt
+LaTeX2e: \dp\bx at B  = 0.0pt
+LaTeX2e: \wd\bx at B  = 229.5pt
+> \box...=
+\vbox(8.88889+0.0)x229.5, direction TLT
+.\vbox(8.88889+0.0)x229.5, direction TLT
+..\hbox(6.94444+1.94444)x229.5, glue set 194.61104fil, direction TLT
+...\localpar
+....\localinterlinepenalty=0
+....\localbrokenpenalty=0
+....\localleftbox=null
+....\localrightbox=null
+...\hbox(0.0+0.0)x0.0, direction TLT
+...\OT1/cmr/m/n/10 ^^L (ligature fi)
+...\OT1/cmr/m/n/10 g
+...\discretionary (penalty 50) []
+...\OT1/cmr/m/n/10 u
+...\OT1/cmr/m/n/10 r
+...\OT1/cmr/m/n/10 e
+...\glue(\spaceskip) 3.33333 plus 1.66666 minus 1.11111
+...\OT1/cmr/m/n/10 B
+...etc.
+..\glue 0.0
+! OK.
+<argument> \bx at B 
+l. ...\showfloat{B}
+LaTeX2e: ***Float C details:
+LaTeX2e: \count\bx at C  = 50
+LaTeX2e: \ht\bx at C  = 8.88889pt
+LaTeX2e: \dp\bx at C  = 0.0pt
+LaTeX2e: \wd\bx at C  = 229.5pt
+> \box...=
+\vbox(8.88889+0.0)x229.5, direction TLT
+.\vbox(8.88889+0.0)x229.5, direction TLT
+..\hbox(6.94444+1.94444)x229.5, glue set 194.47217fil, direction TLT
+...\localpar
+....\localinterlinepenalty=0
+....\localbrokenpenalty=0
+....\localleftbox=null
+....\localrightbox=null
+...\hbox(0.0+0.0)x0.0, direction TLT
+...\OT1/cmr/m/n/10 ^^L (ligature fi)
+...\OT1/cmr/m/n/10 g
+...\discretionary (penalty 50) []
+...\OT1/cmr/m/n/10 u
+...\OT1/cmr/m/n/10 r
+...\OT1/cmr/m/n/10 e
+...\glue(\spaceskip) 3.33333 plus 1.66666 minus 1.11111
+...\OT1/cmr/m/n/10 C
+...etc.
+..\glue 0.0
+! OK.
+<argument> \bx at C 
+l. ...\showfloat{C}
+LaTeX2e: ***Float D details:
+LaTeX2e: \count\bx at D  = 94
+LaTeX2e: \ht\bx at D  = 6.94444pt
+LaTeX2e: \dp\bx at D  = 0.0pt
+LaTeX2e: \wd\bx at D  = 229.5pt
+> \box...=
+\vbox(6.94444+0.0)x229.5, direction TLT
+.\vbox(6.94444+0.0)x229.5, direction TLT
+..\hbox(6.94444+0.0)x229.5, glue set 196.86105fil, direction TLT
+...\localpar
+....\localinterlinepenalty=0
+....\localbrokenpenalty=0
+....\localleftbox=null
+....\localrightbox=null
+...\hbox(0.0+0.0)x0.0, direction TLT
+...\OT1/cmr/m/n/10 t
+...\OT1/cmr/m/n/10 a
+...\discretionary (penalty 50) []
+...\OT1/cmr/m/n/10 b
+...\OT1/cmr/m/n/10 l
+...\OT1/cmr/m/n/10 e
+...\glue(\spaceskip) 3.33333 plus 1.66666 minus 1.11111
+...\OT1/cmr/m/n/10 D
+...etc.
+..\glue 0.0
+! OK.
+<argument> \bx at D 
+l. ...\showfloat{D}
+LaTeX2e: ***Float E details:
+LaTeX2e: \count\bx at E  = 81
+LaTeX2e: \ht\bx at E  = 0.0pt
+LaTeX2e: \dp\bx at E  = 0.0pt
+LaTeX2e: \wd\bx at E  = 0.0pt
+> \box...=void
+! OK.
+<argument> \bx at E 
+l. ...\showfloat{E}
+LaTeX2e: ***Float F details:
+LaTeX2e: \count\bx at F  = 0
+LaTeX2e: \ht\bx at F  = 0.0pt
+LaTeX2e: \dp\bx at F  = 0.0pt
+LaTeX2e: \wd\bx at F  = 0.0pt
+> \box...=void
+! OK.
+<argument> \bx at F 
+l. ...\showfloat{F}
+LaTeX2e: ***Float G details:
+LaTeX2e: \count\bx at G  = -1
+LaTeX2e: \ht\bx at G  = 0.0pt
+LaTeX2e: \dp\bx at G  = 0.0pt
+LaTeX2e: \wd\bx at G  = 0.0pt
+> \box...=void
+! OK.
+<argument> \bx at G 
+l. ...\showfloat{G}
+LaTeX2e: ***Float H details:
+LaTeX2e: \count\bx at H  = 56
+LaTeX2e: \ht\bx at H  = 8.88889pt
+LaTeX2e: \dp\bx at H  = 0.0pt
+LaTeX2e: \wd\bx at H  = 229.5pt
+> \box...=
+\vbox(8.88889+0.0)x229.5, direction TLT
+.\vbox(8.88889+0.0)x229.5, direction TLT
+..\hbox(6.94444+1.94444)x229.5, glue set 195.1666fil, direction TLT
+...\localpar
+....\localinterlinepenalty=0
+....\localbrokenpenalty=0
+....\localleftbox=null
+....\localrightbox=null
+...\hbox(0.0+0.0)x0.0, direction TLT
+...\OT1/cmr/m/n/10 ^^L (ligature fi)
+...\OT1/cmr/m/n/10 g
+...\discretionary (penalty 50) []
+...\OT1/cmr/m/n/10 u
+...\OT1/cmr/m/n/10 r
+...\OT1/cmr/m/n/10 e
+...\glue(\spaceskip) 3.33333 plus 1.66666 minus 1.11111
+...\OT1/cmr/m/n/10 F
+...etc.
+..\glue 0.0
+! OK.
+<argument> \bx at H 
+l. ...\showfloat{H}
+LaTeX2e: ***Float I details:
+LaTeX2e: \count\bx at I  = 94
+LaTeX2e: \ht\bx at I  = 6.94444pt
+LaTeX2e: \dp\bx at I  = 0.0pt
+LaTeX2e: \wd\bx at I  = 229.5pt
+> \box...=
+\vbox(6.94444+0.0)x229.5, direction TLT
+.\vbox(6.94444+0.0)x229.5, direction TLT
+..\hbox(6.94444+0.0)x229.5, glue set 196.65273fil, direction TLT
+...\localpar
+....\localinterlinepenalty=0
+....\localbrokenpenalty=0
+....\localleftbox=null
+....\localrightbox=null
+...\hbox(0.0+0.0)x0.0, direction TLT
+...\OT1/cmr/m/n/10 t
+...\OT1/cmr/m/n/10 a
+...\discretionary (penalty 50) []
+...\OT1/cmr/m/n/10 b
+...\OT1/cmr/m/n/10 l
+...\OT1/cmr/m/n/10 e
+...\glue(\spaceskip) 3.33333 plus 1.66666 minus 1.11111
+...\OT1/cmr/m/n/10 G
+...etc.
+..\glue 0.0
+! OK.
+<argument> \bx at I 
+l. ...\showfloat{I}
+LaTeX2e: ***Float J details:
+LaTeX2e: \count\bx at J  = 0
+LaTeX2e: \ht\bx at J  = 0.0pt
+LaTeX2e: \dp\bx at J  = 0.0pt
+LaTeX2e: \wd\bx at J  = 0.0pt
+> \box...=void
+! OK.
+<argument> \bx at J 
+l. ...\showfloat{J}
 LaTeX2e: PAGE: first column boxed
 LaTeX2e: PAGE: try float column/page---\@deferlist
-LaTeX2e: ----- \@deferlist: \bx at A \bx at B \bx at C \bx at F 
+LaTeX2e: ----- \@deferlist: \bx at A \bx at B \bx at C \bx at H 
 LaTeX2e: \bx at A double column float -- wrong
 LaTeX2e: \bx at B single column float -- ok
 LaTeX2e: \bx at C single column float -- ok
-LaTeX2e: \bx at F single column float -- ok
+LaTeX2e: \bx at H single column float -- ok
 LaTeX2e: ***Start addtonextcol
 LaTeX2e: (mod 32) fpstype: 26
 LaTeX2e: (mult of 32) currtype: 32
@@ -273,30 +536,30 @@ LaTeX2e: (mult of 32) currtype: 32
 LaTeX2e: ORD float
 LaTeX2e: fpstype not curcol: 24= 24?
 LaTeX2e: put back on deferlist (addtonextcol)
-LaTeX2e: deferlist: \bx at A \bx at B \bx at C \bx at F : (addtonextcol-after)
+LaTeX2e: deferlist: \bx at A \bx at B \bx at C \bx at H : (addtonextcol-after)
 LaTeX2e: End of addtonextcol -- locally counts:
 LaTeX2e: col: 3. top: 2. bot: 1.
 LaTeX2e: End of addtonextcol -- globally counts:
 LaTeX2e: col: 3. top: 2. bot: 1.
 LaTeX2e: PAGE: try float column/page---\@deferlist
-LaTeX2e: ----- \@deferlist: \bx at A \bx at B \bx at C \bx at F 
+LaTeX2e: ----- \@deferlist: \bx at A \bx at B \bx at C \bx at H 
 LaTeX2e: \bx at A double column float -- wrong
 LaTeX2e: \bx at B single column float -- ok
 LaTeX2e: \bx at C single column float -- ok
-LaTeX2e: \bx at F single column float -- ok
+LaTeX2e: \bx at H single column float -- ok
 LaTeX2e: PAGE: second column also boxed
 [1
 ]
 LaTeX2e: PAGE: two column page completed
 LaTeX2e: PAGE: try float column/page---\@deferlist
-LaTeX2e: ----- \@deferlist: \bx at A \bx at B \bx at C \bx at F 
+LaTeX2e: ----- \@deferlist: \bx at A \bx at B \bx at C \bx at H 
 LaTeX2e: \bx at A double column float -- ok
 LaTeX2e: \bx at B single column float -- wrong
 LaTeX2e: \bx at C single column float -- wrong
-LaTeX2e: \bx at F single column float -- wrong
+LaTeX2e: \bx at H single column float -- wrong
 LaTeX2e: \bx at B single column float -- wrong
 LaTeX2e: \bx at C single column float -- wrong
-LaTeX2e: \bx at F single column float -- wrong
+LaTeX2e: \bx at H single column float -- wrong
 LaTeX2e: ***Start addtodblcol
 LaTeX2e: (mod 32) fpstype: 26
 LaTeX2e: (mult of 32) currtype: 32
@@ -353,18 +616,18 @@ LaTeX2e: (mult of 32) currtype: 32
 LaTeX2e: ORD float
 LaTeX2e: fpstype not dbltop: 24
 LaTeX2e: put on deferlist
-LaTeX2e: (dbl)deferlist: \bx at B \bx at C \bx at F : (after)
+LaTeX2e: (dbl)deferlist: \bx at B \bx at C \bx at H : (after)
 LaTeX2e: End of addtodblcol -- locally count:
 LaTeX2e:  dbltop: 1.
 LaTeX2e: End of addtodblcol -- globally count:
 LaTeX2e: dbltop: 1.
 LaTeX2e: PAGE: try float column/page---\@deferlist
-LaTeX2e: ----- \@deferlist: \bx at B \bx at C \bx at F 
+LaTeX2e: ----- \@deferlist: \bx at B \bx at C \bx at H 
 LaTeX2e: \bx at B single column float -- ok
 LaTeX2e: \bx at C single column float -- ok
-LaTeX2e: \bx at F single column float -- ok
+LaTeX2e: \bx at H single column float -- ok
 LaTeX2e: \bx at C single column float -- ok
-LaTeX2e: \bx at F single column float -- ok
+LaTeX2e: \bx at H single column float -- ok
 LaTeX2e: ***Start addtonextcol
 LaTeX2e: (mod 32) fpstype: 30
 LaTeX2e: (mult of 32) currtype: 32
@@ -433,16 +696,16 @@ LaTeX2e: (mult of 32) currtype: 32
 LaTeX2e: ORD float
 LaTeX2e: fpstype not curcol: 24= 24?
 LaTeX2e: put back on deferlist (addtonextcol)
-LaTeX2e: deferlist: \bx at F : (addtonextcol-after)
+LaTeX2e: deferlist: \bx at H : (addtonextcol-after)
 LaTeX2e: End of addtonextcol -- locally counts:
 LaTeX2e: col: 1. top: 0. bot: 1.
 LaTeX2e: End of addtonextcol -- globally counts:
 LaTeX2e: col: 1. top: 0. bot: 1.
 LaTeX2e: PAGE: try float column/page---\@deferlist
-LaTeX2e: ----- \@deferlist: \bx at B \bx at C \bx at F 
+LaTeX2e: ----- \@deferlist: \bx at B \bx at C \bx at H 
 LaTeX2e: \bx at B single column float -- ok
 LaTeX2e: \bx at C single column float -- ok
-LaTeX2e: \bx at F single column float -- ok
+LaTeX2e: \bx at H single column float -- ok
 LaTeX2e: PAGE: in \clearpage---twocolumn---
 LaTeX2e: ----- float column/page completed from \@deferlist
 LaTeX2e: PAGE: first column boxed
@@ -450,4 +713,4 @@ LaTeX2e: PAGE: second column also boxed
 [2
 ]
 LaTeX2e: PAGE: two column page completed
-(tlb-fltrace-000-2015.aux)
+(tlb-fltrace-005.aux)
diff --git a/base/testfiles/tlb-fltrace-000-2015.lvt b/base/testfiles/tlb-fltrace-005.lvt
similarity index 76%
copy from base/testfiles/tlb-fltrace-000-2015.lvt
copy to base/testfiles/tlb-fltrace-005.lvt
index a44680c5..8b1e7072 100644
--- a/base/testfiles/tlb-fltrace-000-2015.lvt
+++ b/base/testfiles/tlb-fltrace-005.lvt
@@ -2,7 +2,6 @@
 %
 % \fi
 %
-
 \documentclass[twocolumn]{article}
 
 \usepackage{fltrace}
@@ -16,7 +15,6 @@
 % Declare the format used on the original run, as printed by
 % LaTeX.
 %
-\FORMAT{LaTeX2e<2014/04/24>}
 
 \newcommand\astarfigure[2][tp]{\begin{figure*}[#1]figure(*) #2\end{figure*}}
 \newcommand\afigure[2][tbp]{\begin{figure}[#1]figure #2\end{figure}}
@@ -34,11 +32,24 @@
 \sometext \astarfigure{A}\afigure{B}\afigure[t]{C}\atable{D}
 
 \sometext \atable[h]{E}
+\sometext\marginpar{M} \sometext
+\showfloat{F}\showfloat{G}  % those should be the marginpars
 
 \afigure[p]{F}
 \atable{G}
 
 \tracefloatvals
 
+\showfloat{A}
+\showfloat{B}
+\showfloat{C}
+\showfloat{D}
+\showfloat{E}
+\showfloat{F}
+\showfloat{G}
+\showfloat{H}
+\showfloat{I}
+\showfloat{J}
+
 \end{document}
 
diff --git a/base/testfiles/tlb-fltrace-000-2015.luatex.tlg b/base/testfiles/tlb-fltrace-005.tlg
similarity index 72%
copy from base/testfiles/tlb-fltrace-000-2015.luatex.tlg
copy to base/testfiles/tlb-fltrace-005.tlg
index d9a1498b..e5d684c8 100644
--- a/base/testfiles/tlb-fltrace-000-2015.luatex.tlg
+++ b/base/testfiles/tlb-fltrace-005.tlg
@@ -109,6 +109,50 @@ LaTeX2e: colroom (after-top) = 523.05556pt
 LaTeX2e: colnum (after-top) = 2
 LaTeX2e: topnum (after-top) = 1
 LaTeX2e: ***Success: top
+Overfull \hbox (5.16669pt too wide) in paragraph at lines 35--35
+[]\OT1/cmr/m/n/10 M 
+\hbox(6.83331+0.0)x4.0
+.\hbox(0.0+0.0)x0.0
+.\OT1/cmr/m/n/10 M
+.\penalty 10000
+.\glue(\parfillskip) 0.0 plus 1.0fil
+.\glue(\rightskip) 0.0
+LaTeX2e: ***Float F details:
+LaTeX2e: \count\bx at F  = 0
+LaTeX2e: \ht\bx at F  = 6.83331pt
+LaTeX2e: \dp\bx at F  = 0.0pt
+LaTeX2e: \wd\bx at F  = 4.0pt
+> \box...=
+\vbox(6.83331+0.0)x4.0
+.\vbox(6.83331+0.0)x4.0
+..\hbox(6.83331+0.0)x4.0
+...\hbox(0.0+0.0)x0.0
+...\OT1/cmr/m/n/10 M
+...\penalty 10000
+...\glue(\parfillskip) 0.0 plus 1.0fil
+...\glue(\rightskip) 0.0
+! OK.
+<argument> \bx at F 
+l. ...\showfloat{F}
+                  \showfloat{G}  % those should be the marginpars
+LaTeX2e: ***Float G details:
+LaTeX2e: \count\bx at G  = -1
+LaTeX2e: \ht\bx at G  = 6.83331pt
+LaTeX2e: \dp\bx at G  = 0.0pt
+LaTeX2e: \wd\bx at G  = 4.0pt
+> \box...=
+\vbox(6.83331+0.0)x4.0
+.\vbox(6.83331+0.0)x4.0
+..\hbox(6.83331+0.0)x4.0
+...\hbox(0.0+0.0)x0.0
+...\OT1/cmr/m/n/10 M
+...\penalty 10000
+...\glue(\parfillskip) 0.0 plus 1.0fil
+...\glue(\rightskip) 0.0
+! OK.
+<argument> \bx at G 
+l. ...\showfloat{F}\showfloat{G}
+                                 % those should be the marginpars
 LaTeX2e: ***Start addtocurcol
 LaTeX2e: (mod 32) fpstype: 17
 LaTeX2e: (mult of 32) currtype: 64
@@ -138,7 +182,7 @@ LaTeX2e: (mult of 32) currtype: 32
 LaTeX2e: ORD float
 LaTeX2e: fpstype p only (addtocurcol): 24= 24?
 LaTeX2e: put on deferlist (addtocurcol)
-LaTeX2e: deferlist: \bx at A \bx at B \bx at C \bx at F : (addtocurcol-after)
+LaTeX2e: deferlist: \bx at A \bx at B \bx at C \bx at H : (addtocurcol-after)
 LaTeX2e: ***Start addtocurcol
 LaTeX2e: (mod 32) fpstype: 30
 LaTeX2e: (mult of 32) currtype: 64
@@ -147,7 +191,7 @@ LaTeX2e: fpstype: 30(flsettextmin)
 LaTeX2e: ORD textmin = 109.99832pt
 LaTeX2e: textfloatsheight (before) = 30.94444pt
 LaTeX2e: textmin + textfloatsheight: 140.94276pt
-LaTeX2e: page-so-far: 54.88889pt
+LaTeX2e: page-so-far: 78.88889pt
 LaTeX2e: ORD? textmin being used
 LaTeX2e: float size = 6.94444pt(addtocurcol)
 LaTeX2e: colroom = 523.05556pt(addtocurcol)
@@ -155,7 +199,7 @@ LaTeX2e: reqcolroom = 147.8872pt(addtocurcol)
 LaTeX2e: fpstype: 30(flsetnum \@colnum)
 LaTeX2e: \@colnum  (before) = 1
 LaTeX2e: \@currbox single column float -- ok
-LaTeX2e: deferlist: \bx at A \bx at B \bx at C \bx at F : (addtocurcol-before)
+LaTeX2e: deferlist: \bx at A \bx at B \bx at C \bx at H : (addtocurcol-before)
 LaTeX2e: botlist: : (addtocurcol-before)
 LaTeX2e: fpstype not here: 30
 LaTeX2e: not here: sent to addtotoporbot
@@ -193,17 +237,197 @@ LaTeX2e: \@dbltopnum = 2
 LaTeX2e: \@dbltoproom = 384.99832pt
 LaTeX2e: \textfraction= .2
 LaTeX2e: toplist: \bx at D 
-LaTeX2e: botlist: \bx at G 
+LaTeX2e: botlist: \bx at I 
 LaTeX2e: midlist: \bx at E 
-LaTeX2e: deferlist: \bx at A \bx at B \bx at C \bx at F 
+LaTeX2e: deferlist: \bx at A \bx at B \bx at C \bx at H 
 LaTeX2e: dbltoplist: 
+LaTeX2e: ***Float A details:
+LaTeX2e: \count\bx at A  = 58
+LaTeX2e: \ht\bx at A  = 10.0pt
+LaTeX2e: \dp\bx at A  = 0.00002pt
+LaTeX2e: \wd\bx at A  = 469.0pt
+> \box...=
+\vbox(10.0+0.00002)x469.0
+.\vbox(10.0+0.0)x469.0
+..\hbox(7.5+2.5)x469.0, glue set 420.91656fil
+...\hbox(0.0+0.0)x0.0
+...\OT1/cmr/m/n/10 ^^L (ligature fi)
+...\OT1/cmr/m/n/10 g
+...\OT1/cmr/m/n/10 u
+...\OT1/cmr/m/n/10 r
+...\OT1/cmr/m/n/10 e
+...\OT1/cmr/m/n/10 (
+...\OT1/cmr/m/n/10 *
+...\OT1/cmr/m/n/10 )
+...\glue 3.33333 plus 1.66666 minus 1.11111
+...etc.
+..\glue 0.0
+! OK.
+<argument> \bx at A 
+l. ...\showfloat{A}
+LaTeX2e: ***Float B details:
+LaTeX2e: \count\bx at B  = 62
+LaTeX2e: \ht\bx at B  = 8.88889pt
+LaTeX2e: \dp\bx at B  = 0.0pt
+LaTeX2e: \wd\bx at B  = 229.5pt
+> \box...=
+\vbox(8.88889+0.0)x229.5
+.\vbox(8.88889+0.0)x229.5
+..\hbox(6.94444+1.94444)x229.5, glue set 194.61104fil
+...\hbox(0.0+0.0)x0.0
+...\OT1/cmr/m/n/10 ^^L (ligature fi)
+...\OT1/cmr/m/n/10 g
+...\OT1/cmr/m/n/10 u
+...\OT1/cmr/m/n/10 r
+...\OT1/cmr/m/n/10 e
+...\glue 3.33333 plus 1.66666 minus 1.11111
+...\OT1/cmr/m/n/10 B
+...\penalty 10000
+...\glue(\parfillskip) 0.0 plus 1.0fil
+...etc.
+..\glue 0.0
+! OK.
+<argument> \bx at B 
+l. ...\showfloat{B}
+LaTeX2e: ***Float C details:
+LaTeX2e: \count\bx at C  = 50
+LaTeX2e: \ht\bx at C  = 8.88889pt
+LaTeX2e: \dp\bx at C  = 0.0pt
+LaTeX2e: \wd\bx at C  = 229.5pt
+> \box...=
+\vbox(8.88889+0.0)x229.5
+.\vbox(8.88889+0.0)x229.5
+..\hbox(6.94444+1.94444)x229.5, glue set 194.47217fil
+...\hbox(0.0+0.0)x0.0
+...\OT1/cmr/m/n/10 ^^L (ligature fi)
+...\OT1/cmr/m/n/10 g
+...\OT1/cmr/m/n/10 u
+...\OT1/cmr/m/n/10 r
+...\OT1/cmr/m/n/10 e
+...\glue 3.33333 plus 1.66666 minus 1.11111
+...\OT1/cmr/m/n/10 C
+...\penalty 10000
+...\glue(\parfillskip) 0.0 plus 1.0fil
+...etc.
+..\glue 0.0
+! OK.
+<argument> \bx at C 
+l. ...\showfloat{C}
+LaTeX2e: ***Float D details:
+LaTeX2e: \count\bx at D  = 94
+LaTeX2e: \ht\bx at D  = 6.94444pt
+LaTeX2e: \dp\bx at D  = 0.0pt
+LaTeX2e: \wd\bx at D  = 229.5pt
+> \box...=
+\vbox(6.94444+0.0)x229.5
+.\vbox(6.94444+0.0)x229.5
+..\hbox(6.94444+0.0)x229.5, glue set 196.86105fil
+...\hbox(0.0+0.0)x0.0
+...\OT1/cmr/m/n/10 t
+...\OT1/cmr/m/n/10 a
+...\OT1/cmr/m/n/10 b
+...\OT1/cmr/m/n/10 l
+...\OT1/cmr/m/n/10 e
+...\glue 3.33333 plus 1.66666 minus 1.11111
+...\OT1/cmr/m/n/10 D
+...\penalty 10000
+...\glue(\parfillskip) 0.0 plus 1.0fil
+...etc.
+..\glue 0.0
+! OK.
+<argument> \bx at D 
+l. ...\showfloat{D}
+LaTeX2e: ***Float E details:
+LaTeX2e: \count\bx at E  = 81
+LaTeX2e: \ht\bx at E  = 0.0pt
+LaTeX2e: \dp\bx at E  = 0.0pt
+LaTeX2e: \wd\bx at E  = 0.0pt
+> \box...=void
+! OK.
+<argument> \bx at E 
+l. ...\showfloat{E}
+LaTeX2e: ***Float F details:
+LaTeX2e: \count\bx at F  = 0
+LaTeX2e: \ht\bx at F  = 0.0pt
+LaTeX2e: \dp\bx at F  = 0.0pt
+LaTeX2e: \wd\bx at F  = 0.0pt
+> \box...=void
+! OK.
+<argument> \bx at F 
+l. ...\showfloat{F}
+LaTeX2e: ***Float G details:
+LaTeX2e: \count\bx at G  = -1
+LaTeX2e: \ht\bx at G  = 0.0pt
+LaTeX2e: \dp\bx at G  = 0.0pt
+LaTeX2e: \wd\bx at G  = 0.0pt
+> \box...=void
+! OK.
+<argument> \bx at G 
+l. ...\showfloat{G}
+LaTeX2e: ***Float H details:
+LaTeX2e: \count\bx at H  = 56
+LaTeX2e: \ht\bx at H  = 8.88889pt
+LaTeX2e: \dp\bx at H  = 0.0pt
+LaTeX2e: \wd\bx at H  = 229.5pt
+> \box...=
+\vbox(8.88889+0.0)x229.5
+.\vbox(8.88889+0.0)x229.5
+..\hbox(6.94444+1.94444)x229.5, glue set 195.1666fil
+...\hbox(0.0+0.0)x0.0
+...\OT1/cmr/m/n/10 ^^L (ligature fi)
+...\OT1/cmr/m/n/10 g
+...\OT1/cmr/m/n/10 u
+...\OT1/cmr/m/n/10 r
+...\OT1/cmr/m/n/10 e
+...\glue 3.33333 plus 1.66666 minus 1.11111
+...\OT1/cmr/m/n/10 F
+...\penalty 10000
+...\glue(\parfillskip) 0.0 plus 1.0fil
+...etc.
+..\glue 0.0
+! OK.
+<argument> \bx at H 
+l. ...\showfloat{H}
+LaTeX2e: ***Float I details:
+LaTeX2e: \count\bx at I  = 94
+LaTeX2e: \ht\bx at I  = 6.94444pt
+LaTeX2e: \dp\bx at I  = 0.0pt
+LaTeX2e: \wd\bx at I  = 229.5pt
+> \box...=
+\vbox(6.94444+0.0)x229.5
+.\vbox(6.94444+0.0)x229.5
+..\hbox(6.94444+0.0)x229.5, glue set 196.65273fil
+...\hbox(0.0+0.0)x0.0
+...\OT1/cmr/m/n/10 t
+...\OT1/cmr/m/n/10 a
+...\OT1/cmr/m/n/10 b
+...\OT1/cmr/m/n/10 l
+...\OT1/cmr/m/n/10 e
+...\glue 3.33333 plus 1.66666 minus 1.11111
+...\OT1/cmr/m/n/10 G
+...\penalty 10000
+...\glue(\parfillskip) 0.0 plus 1.0fil
+...etc.
+..\glue 0.0
+! OK.
+<argument> \bx at I 
+l. ...\showfloat{I}
+LaTeX2e: ***Float J details:
+LaTeX2e: \count\bx at J  = 0
+LaTeX2e: \ht\bx at J  = 0.0pt
+LaTeX2e: \dp\bx at J  = 0.0pt
+LaTeX2e: \wd\bx at J  = 0.0pt
+> \box...=void
+! OK.
+<argument> \bx at J 
+l. ...\showfloat{J}
 LaTeX2e: PAGE: first column boxed
 LaTeX2e: PAGE: try float column/page---\@deferlist
-LaTeX2e: ----- \@deferlist: \bx at A \bx at B \bx at C \bx at F 
+LaTeX2e: ----- \@deferlist: \bx at A \bx at B \bx at C \bx at H 
 LaTeX2e: \bx at A double column float -- wrong
 LaTeX2e: \bx at B single column float -- ok
 LaTeX2e: \bx at C single column float -- ok
-LaTeX2e: \bx at F single column float -- ok
+LaTeX2e: \bx at H single column float -- ok
 LaTeX2e: ***Start addtonextcol
 LaTeX2e: (mod 32) fpstype: 26
 LaTeX2e: (mult of 32) currtype: 32
@@ -273,30 +497,30 @@ LaTeX2e: (mult of 32) currtype: 32
 LaTeX2e: ORD float
 LaTeX2e: fpstype not curcol: 24= 24?
 LaTeX2e: put back on deferlist (addtonextcol)
-LaTeX2e: deferlist: \bx at A \bx at B \bx at C \bx at F : (addtonextcol-after)
+LaTeX2e: deferlist: \bx at A \bx at B \bx at C \bx at H : (addtonextcol-after)
 LaTeX2e: End of addtonextcol -- locally counts:
 LaTeX2e: col: 3. top: 2. bot: 1.
 LaTeX2e: End of addtonextcol -- globally counts:
 LaTeX2e: col: 3. top: 2. bot: 1.
 LaTeX2e: PAGE: try float column/page---\@deferlist
-LaTeX2e: ----- \@deferlist: \bx at A \bx at B \bx at C \bx at F 
+LaTeX2e: ----- \@deferlist: \bx at A \bx at B \bx at C \bx at H 
 LaTeX2e: \bx at A double column float -- wrong
 LaTeX2e: \bx at B single column float -- ok
 LaTeX2e: \bx at C single column float -- ok
-LaTeX2e: \bx at F single column float -- ok
+LaTeX2e: \bx at H single column float -- ok
 LaTeX2e: PAGE: second column also boxed
 [1
 ]
 LaTeX2e: PAGE: two column page completed
 LaTeX2e: PAGE: try float column/page---\@deferlist
-LaTeX2e: ----- \@deferlist: \bx at A \bx at B \bx at C \bx at F 
+LaTeX2e: ----- \@deferlist: \bx at A \bx at B \bx at C \bx at H 
 LaTeX2e: \bx at A double column float -- ok
 LaTeX2e: \bx at B single column float -- wrong
 LaTeX2e: \bx at C single column float -- wrong
-LaTeX2e: \bx at F single column float -- wrong
+LaTeX2e: \bx at H single column float -- wrong
 LaTeX2e: \bx at B single column float -- wrong
 LaTeX2e: \bx at C single column float -- wrong
-LaTeX2e: \bx at F single column float -- wrong
+LaTeX2e: \bx at H single column float -- wrong
 LaTeX2e: ***Start addtodblcol
 LaTeX2e: (mod 32) fpstype: 26
 LaTeX2e: (mult of 32) currtype: 32
@@ -353,18 +577,18 @@ LaTeX2e: (mult of 32) currtype: 32
 LaTeX2e: ORD float
 LaTeX2e: fpstype not dbltop: 24
 LaTeX2e: put on deferlist
-LaTeX2e: (dbl)deferlist: \bx at B \bx at C \bx at F : (after)
+LaTeX2e: (dbl)deferlist: \bx at B \bx at C \bx at H : (after)
 LaTeX2e: End of addtodblcol -- locally count:
 LaTeX2e:  dbltop: 1.
 LaTeX2e: End of addtodblcol -- globally count:
 LaTeX2e: dbltop: 1.
 LaTeX2e: PAGE: try float column/page---\@deferlist
-LaTeX2e: ----- \@deferlist: \bx at B \bx at C \bx at F 
+LaTeX2e: ----- \@deferlist: \bx at B \bx at C \bx at H 
 LaTeX2e: \bx at B single column float -- ok
 LaTeX2e: \bx at C single column float -- ok
-LaTeX2e: \bx at F single column float -- ok
+LaTeX2e: \bx at H single column float -- ok
 LaTeX2e: \bx at C single column float -- ok
-LaTeX2e: \bx at F single column float -- ok
+LaTeX2e: \bx at H single column float -- ok
 LaTeX2e: ***Start addtonextcol
 LaTeX2e: (mod 32) fpstype: 30
 LaTeX2e: (mult of 32) currtype: 32
@@ -433,16 +657,16 @@ LaTeX2e: (mult of 32) currtype: 32
 LaTeX2e: ORD float
 LaTeX2e: fpstype not curcol: 24= 24?
 LaTeX2e: put back on deferlist (addtonextcol)
-LaTeX2e: deferlist: \bx at F : (addtonextcol-after)
+LaTeX2e: deferlist: \bx at H : (addtonextcol-after)
 LaTeX2e: End of addtonextcol -- locally counts:
 LaTeX2e: col: 1. top: 0. bot: 1.
 LaTeX2e: End of addtonextcol -- globally counts:
 LaTeX2e: col: 1. top: 0. bot: 1.
 LaTeX2e: PAGE: try float column/page---\@deferlist
-LaTeX2e: ----- \@deferlist: \bx at B \bx at C \bx at F 
+LaTeX2e: ----- \@deferlist: \bx at B \bx at C \bx at H 
 LaTeX2e: \bx at B single column float -- ok
 LaTeX2e: \bx at C single column float -- ok
-LaTeX2e: \bx at F single column float -- ok
+LaTeX2e: \bx at H single column float -- ok
 LaTeX2e: PAGE: in \clearpage---twocolumn---
 LaTeX2e: ----- float column/page completed from \@deferlist
 LaTeX2e: PAGE: first column boxed
@@ -450,4 +674,4 @@ LaTeX2e: PAGE: second column also boxed
 [2
 ]
 LaTeX2e: PAGE: two column page completed
-(tlb-fltrace-000-2015.aux)
+(tlb-fltrace-005.aux)
diff --git a/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg b/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg
index 16e45b7f..bd265781 100644
--- a/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg
+++ b/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg
@@ -513,6 +513,8 @@ Skipping: [....-..-..] float order in 2-column on input line ....
 Applying: [....-..-..] float order in 2-column on input line ....
 Skipping: [....-..-..] float order in 2-column on input line ....
 Applying: [....-..-..] float order in 2-column on input line ....
+Skipping: [....-..-..] Show float register contents on input line ....
+Applying: [....-..-..] Show float register contents on input line ....
 Skipping: [....-..-..] negative height floats on input line ....
 Applying: [....-..-..] negative height floats on input line ....
 Skipping: [....-..-..] 2 column marks on input line ....
@@ -1136,6 +1138,8 @@ Applying: [....-..-..] float order in 2-column on input line ....
 Already applied: [....-..-..] float order in 2-column on input line ....
 Applying: [....-..-..] float order in 2-column on input line ....
 Already applied: [....-..-..] float order in 2-column on input line ....
+Skipping: [....-..-..] Show float register contents on input line ....
+Applying: [....-..-..] Show float register contents on input line ....
 Applying: [....-..-..] negative height floats on input line ....
 Already applied: [....-..-..] negative height floats on input line ....
 Applying: [....-..-..] 2 column marks on input line ....
diff --git a/base/testfiles/tlb-latexrelease-rollback-003-often.tlg b/base/testfiles/tlb-latexrelease-rollback-003-often.tlg
index 14dfe509..c05b06d4 100644
--- a/base/testfiles/tlb-latexrelease-rollback-003-often.tlg
+++ b/base/testfiles/tlb-latexrelease-rollback-003-often.tlg
@@ -507,6 +507,8 @@ Skipping: [....-..-..] float order in 2-column on input line ....
 Applying: [....-..-..] float order in 2-column on input line ....
 Skipping: [....-..-..] float order in 2-column on input line ....
 Applying: [....-..-..] float order in 2-column on input line ....
+Skipping: [....-..-..] Show float register contents on input line ....
+Applying: [....-..-..] Show float register contents on input line ....
 Skipping: [....-..-..] negative height floats on input line ....
 Applying: [....-..-..] negative height floats on input line ....
 Skipping: [....-..-..] 2 column marks on input line ....
@@ -1120,6 +1122,8 @@ Applying: [....-..-..] float order in 2-column on input line ....
 Already applied: [....-..-..] float order in 2-column on input line ....
 Applying: [....-..-..] float order in 2-column on input line ....
 Already applied: [....-..-..] float order in 2-column on input line ....
+Skipping: [....-..-..] Show float register contents on input line ....
+Applying: [....-..-..] Show float register contents on input line ....
 Applying: [....-..-..] negative height floats on input line ....
 Already applied: [....-..-..] negative height floats on input line ....
 Applying: [....-..-..] 2 column marks on input line ....
diff --git a/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg b/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg
index a756933d..afbdbc67 100644
--- a/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg
+++ b/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg
@@ -507,6 +507,8 @@ Skipping: [....-..-..] float order in 2-column on input line ....
 Applying: [....-..-..] float order in 2-column on input line ....
 Skipping: [....-..-..] float order in 2-column on input line ....
 Applying: [....-..-..] float order in 2-column on input line ....
+Skipping: [....-..-..] Show float register contents on input line ....
+Applying: [....-..-..] Show float register contents on input line ....
 Skipping: [....-..-..] negative height floats on input line ....
 Applying: [....-..-..] negative height floats on input line ....
 Skipping: [....-..-..] 2 column marks on input line ....
@@ -1129,6 +1131,8 @@ Applying: [....-..-..] float order in 2-column on input line ....
 Already applied: [....-..-..] float order in 2-column on input line ....
 Applying: [....-..-..] float order in 2-column on input line ....
 Already applied: [....-..-..] float order in 2-column on input line ....
+Skipping: [....-..-..] Show float register contents on input line ....
+Applying: [....-..-..] Show float register contents on input line ....
 Applying: [....-..-..] negative height floats on input line ....
 Already applied: [....-..-..] negative height floats on input line ....
 Applying: [....-..-..] 2 column marks on input line ....
diff --git a/base/testfiles/tlb-rollback-004-often.luatex.tlg b/base/testfiles/tlb-rollback-004-often.luatex.tlg
index be0964c4..425bb7f1 100644
--- a/base/testfiles/tlb-rollback-004-often.luatex.tlg
+++ b/base/testfiles/tlb-rollback-004-often.luatex.tlg
@@ -629,6 +629,8 @@ Applying: [....-..-..] float order in 2-column on input line ....
 Already applied: [....-..-..] float order in 2-column on input line ....
 Applying: [....-..-..] float order in 2-column on input line ....
 Already applied: [....-..-..] float order in 2-column on input line ....
+Skipping: [....-..-..] Show float register contents on input line ....
+Applying: [....-..-..] Show float register contents on input line ....
 Applying: [....-..-..] negative height floats on input line ....
 Already applied: [....-..-..] negative height floats on input line ....
 Applying: [....-..-..] 2 column marks on input line ....
diff --git a/base/testfiles/tlb-rollback-004-often.tlg b/base/testfiles/tlb-rollback-004-often.tlg
index bb204910..4877673e 100644
--- a/base/testfiles/tlb-rollback-004-often.tlg
+++ b/base/testfiles/tlb-rollback-004-often.tlg
@@ -617,6 +617,8 @@ Applying: [....-..-..] float order in 2-column on input line ....
 Already applied: [....-..-..] float order in 2-column on input line ....
 Applying: [....-..-..] float order in 2-column on input line ....
 Already applied: [....-..-..] float order in 2-column on input line ....
+Skipping: [....-..-..] Show float register contents on input line ....
+Applying: [....-..-..] Show float register contents on input line ....
 Applying: [....-..-..] negative height floats on input line ....
 Already applied: [....-..-..] negative height floats on input line ....
 Applying: [....-..-..] 2 column marks on input line ....
diff --git a/base/testfiles/tlb-rollback-004-often.xetex.tlg b/base/testfiles/tlb-rollback-004-often.xetex.tlg
index cb8f173f..17af41da 100644
--- a/base/testfiles/tlb-rollback-004-often.xetex.tlg
+++ b/base/testfiles/tlb-rollback-004-often.xetex.tlg
@@ -618,6 +618,8 @@ Applying: [....-..-..] float order in 2-column on input line ....
 Already applied: [....-..-..] float order in 2-column on input line ....
 Applying: [....-..-..] float order in 2-column on input line ....
 Already applied: [....-..-..] float order in 2-column on input line ....
+Skipping: [....-..-..] Show float register contents on input line ....
+Applying: [....-..-..] Show float register contents on input line ....
 Applying: [....-..-..] negative height floats on input line ....
 Already applied: [....-..-..] negative height floats on input line ....
 Applying: [....-..-..] 2 column marks on input line ....
diff --git a/base/testfiles/tlb-rollback-005.luatex.tlg b/base/testfiles/tlb-rollback-005.luatex.tlg
index bf601f2d..8685286b 100644
--- a/base/testfiles/tlb-rollback-005.luatex.tlg
+++ b/base/testfiles/tlb-rollback-005.luatex.tlg
@@ -636,6 +636,8 @@ Applying: [....-..-..] float order in 2-column on input line ....
 Already applied: [....-..-..] float order in 2-column on input line ....
 Applying: [....-..-..] float order in 2-column on input line ....
 Already applied: [....-..-..] float order in 2-column on input line ....
+Skipping: [....-..-..] Show float register contents on input line ....
+Applying: [....-..-..] Show float register contents on input line ....
 Applying: [....-..-..] negative height floats on input line ....
 Already applied: [....-..-..] negative height floats on input line ....
 Applying: [....-..-..] 2 column marks on input line ....
diff --git a/base/testfiles/tlb-rollback-005.tlg b/base/testfiles/tlb-rollback-005.tlg
index a8438c3e..5db0e306 100644
--- a/base/testfiles/tlb-rollback-005.tlg
+++ b/base/testfiles/tlb-rollback-005.tlg
@@ -624,6 +624,8 @@ Applying: [....-..-..] float order in 2-column on input line ....
 Already applied: [....-..-..] float order in 2-column on input line ....
 Applying: [....-..-..] float order in 2-column on input line ....
 Already applied: [....-..-..] float order in 2-column on input line ....
+Skipping: [....-..-..] Show float register contents on input line ....
+Applying: [....-..-..] Show float register contents on input line ....
 Applying: [....-..-..] negative height floats on input line ....
 Already applied: [....-..-..] negative height floats on input line ....
 Applying: [....-..-..] 2 column marks on input line ....
diff --git a/base/testfiles/tlb-rollback-005.xetex.tlg b/base/testfiles/tlb-rollback-005.xetex.tlg
index 6332a260..bd63d4f7 100644
--- a/base/testfiles/tlb-rollback-005.xetex.tlg
+++ b/base/testfiles/tlb-rollback-005.xetex.tlg
@@ -625,6 +625,8 @@ Applying: [....-..-..] float order in 2-column on input line ....
 Already applied: [....-..-..] float order in 2-column on input line ....
 Applying: [....-..-..] float order in 2-column on input line ....
 Already applied: [....-..-..] float order in 2-column on input line ....
+Skipping: [....-..-..] Show float register contents on input line ....
+Applying: [....-..-..] Show float register contents on input line ....
 Applying: [....-..-..] negative height floats on input line ....
 Already applied: [....-..-..] negative height floats on input line ....
 Applying: [....-..-..] 2 column marks on input line ....

More information about the latex3-commits mailing list.