From 976e180e5308c30a0c2f7be3980e589d4b82bb2a Mon Sep 17 00:00:00 2001 From: Frank Mittelbach Date: Sun, 1 Aug 2021 00:08:38 +0200 Subject: [PATCH] adding \showfloat --- base/changes.txt | 7 + base/doc/ltnews34.tex | 22 + base/ltoutput.dtx | 68 +- base/testfiles/github-0479-often.luatex.tlg | 2 + base/testfiles/github-0479-often.tlg | 2 + base/testfiles/github-0479-often.xetex.tlg | 2 + base/testfiles/tlb-fltrace-005.lvt | 55 ++ base/testfiles/tlb-fltrace-005.tlg | 677 ++++++++++++++++++ ...latexrelease-rollback-003-often.luatex.tlg | 4 + .../tlb-latexrelease-rollback-003-often.tlg | 4 + ...-latexrelease-rollback-003-often.xetex.tlg | 4 + .../tlb-rollback-004-often.luatex.tlg | 2 + base/testfiles/tlb-rollback-004-often.tlg | 2 + .../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 + 17 files changed, 838 insertions(+), 21 deletions(-) create mode 100644 base/testfiles/tlb-fltrace-005.lvt create mode 100644 base/testfiles/tlb-fltrace-005.tlg diff --git a/base/changes.txt b/base/changes.txt index a9537d56a..c86397dee 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 + + * 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 * ltsect.dtx (section| or |\caption|): diff --git a/base/doc/ltnews34.tex b/base/doc/ltnews34.tex index 1239d4e56..7e1888b7d 100644 --- a/base/doc/ltnews34.tex +++ b/base/doc/ltnews34.tex @@ -240,6 +240,28 @@ \subsection{New default for \cs{tracinglostchars}} + +\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@A}, \cs{bx@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 f59df49e8..413a60b12 100644 --- a/base/ltoutput.dtx +++ b/base/ltoutput.dtx @@ -30,7 +30,7 @@ %%% From File: ltoutput.dtx %\ProvidesPackage{flafter} %\ProvidesPackage{fltrace} -% [2021/05/07 v1.4e +% [2021/07/31 v1.4e % Standard LaTeX floats after reference (FMi)] % Tracing LaTeX floats algorithm (FMi)] % @@ -3945,10 +3945,55 @@ \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|latexrelease> +%\IncludeInRelease{2021/11/15}% +% {\showfloat}{Show float register contents}% +\def\showfloat#1{\begingroup + \tracefloats + \fl@trace{***Float #1 details:}% + \expandafter\fl@showfloat\csname bx@#1\endcsname + \endgroup +} +\def\fl@showfloat#1{% + \fl@traceval{\count#1}% % this here should be interpreted on day + \fl@traceval{\ht#1}% + \fl@traceval{\dp#1}% + \fl@traceval{\wd#1}% + {\tracingonline1\showboxbreadth10\showboxdepth3\showbox#1}% +} +% +%\EndIncludeInRelease +% \end{macrocode} +% +% \begin{macrocode} +%\IncludeInRelease{0000/00/00}% +% {\showfloat}{Show float register contents}% +% +%\let\fl@showfloat\@undefined +%\EndIncludeInRelease % \end{macrocode} % \end{macro} % +% +% +% % \subsubsection{Float control} % % This part implements controllable floats and other changes @@ -4029,7 +4074,7 @@ % 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/05/07}{Enable display when doing \cs{tracefloatvals}} +% \changes{v1.4e}{2021/07/31}{Enable display when doing \cs{tracefloatvals}} % \begin{macrocode} \tracefloats % \end{macrocode} @@ -4091,25 +4136,6 @@ % % % -% \begin{macro}{\showfloat} -% Give some information about the content of a float register. -% (No error recovery no anything if you specify something that -% isn't a float.) -% \begin{macrocode} -\def\showfloat#1{\begingroup - \tracefloats - \fl@trace{***Float #1 details:}% - \expandafter\fl@showfloat\csname bx@#1\endcsname - \endgroup -} -\def\fl@showfloat#1{% - \fl@traceval{\count#1}% % this here should be interpreted - \fl@traceval{\ht#1}% - \fl@traceval{\dp#1}% - {\tracingonline1\showboxbreadth10\showboxdepth3\showbox#1}% -} -% \end{macrocode} -% \end{macro} % % We need to make sure that \texttt{fltrace} comes before % \texttt{flafter} to make the tracing work. diff --git a/base/testfiles/github-0479-often.luatex.tlg b/base/testfiles/github-0479-often.luatex.tlg index 957577528..935eb6d3a 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 2bfb208a4..8e96a2eee 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 fe47cc4bd..c07cc78ce 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-005.lvt b/base/testfiles/tlb-fltrace-005.lvt new file mode 100644 index 000000000..8b1e7072d --- /dev/null +++ b/base/testfiles/tlb-fltrace-005.lvt @@ -0,0 +1,55 @@ +% \iffalse meta-comment +% +% \fi +% +\documentclass[twocolumn]{article} + +\usepackage{fltrace} +\tracefloats + +% Input the test macros for LaTeX2e +\input{test2e} + +\AUTHOR{Frank Mittelbach} + +% Declare the format used on the original run, as printed by +% LaTeX. +% + +\newcommand\astarfigure[2][tp]{\begin{figure*}[#1]figure(*) #2\end{figure*}} +\newcommand\afigure[2][tbp]{\begin{figure}[#1]figure #2\end{figure}} +\newcommand\atable[2][tbp]{\begin{table}[#1]table #2\end{table}} +\newcommand\sometext{A few words repeated all over again. } + +\begin{document} + +% Everything before this is ignored by the test system. + +\START + +\tracefloatvals + +\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-005.tlg b/base/testfiles/tlb-fltrace-005.tlg new file mode 100644 index 000000000..e5d684c86 --- /dev/null +++ b/base/testfiles/tlb-fltrace-005.tlg @@ -0,0 +1,677 @@ +This is a generated file for the LaTeX2e validation system. +Don't change this file in any respect. +LaTeX2e: ***Float placement parameters: +LaTeX2e: \@colnum = 3 +LaTeX2e: \@colroom = 550.0pt +LaTeX2e: \@topnum = 2 +LaTeX2e: \@toproom = 384.99832pt +LaTeX2e: \@botnum = 1 +LaTeX2e: \@botroom = 165.00168pt +LaTeX2e: \@fpmin = 275.0pt +LaTeX2e: \textfraction= .2 +LaTeX2e: \@dbltopnum = 2 +LaTeX2e: \@dbltoproom = 384.99832pt +LaTeX2e: \textfraction= .2 +LaTeX2e: toplist: +LaTeX2e: botlist: +LaTeX2e: midlist: +LaTeX2e: deferlist: +LaTeX2e: dbltoplist: +LaTeX2e: ***Start addtocurcol +LaTeX2e: (mod 32) fpstype: 26 +LaTeX2e: (mult of 32) currtype: 32 +LaTeX2e: ORD float +LaTeX2e: fpstype: 26(flsettextmin) +LaTeX2e: ORD textmin = 109.99832pt +LaTeX2e: textfloatsheight (before) = 0.0pt +LaTeX2e: textmin + textfloatsheight: 109.99832pt +LaTeX2e: page-so-far: 11.94444pt +LaTeX2e: ORD? textmin being used +LaTeX2e: float size = 10.0pt(addtocurcol) +LaTeX2e: colroom = 550.0pt(addtocurcol) +LaTeX2e: reqcolroom = 119.99832pt(addtocurcol) +LaTeX2e: fpstype: 26(flsetnum \@colnum) +LaTeX2e: \@colnum (before) = 3 +LaTeX2e: \@currbox double column float -- wrong +LaTeX2e: deferlist: : (addtocurcol-before) +LaTeX2e: type already on list: defer (addtocurcol) +LaTeX2e: put on deferlist (addtocurcol) +LaTeX2e: deferlist: \bx@A : (addtocurcol-after) +LaTeX2e: ***Start addtocurcol +LaTeX2e: (mod 32) fpstype: 30 +LaTeX2e: (mult of 32) currtype: 32 +LaTeX2e: ORD float +LaTeX2e: fpstype: 30(flsettextmin) +LaTeX2e: ORD textmin = 109.99832pt +LaTeX2e: textfloatsheight (before) = 0.0pt +LaTeX2e: textmin + textfloatsheight: 109.99832pt +LaTeX2e: page-so-far: 11.94444pt +LaTeX2e: ORD? textmin being used +LaTeX2e: float size = 8.88889pt(addtocurcol) +LaTeX2e: colroom = 550.0pt(addtocurcol) +LaTeX2e: reqcolroom = 118.8872pt(addtocurcol) +LaTeX2e: fpstype: 30(flsetnum \@colnum) +LaTeX2e: \@colnum (before) = 3 +LaTeX2e: \@currbox single column float -- ok +LaTeX2e: deferlist: \bx@A : (addtocurcol-before) +LaTeX2e: type already on list: defer (addtocurcol) +LaTeX2e: put on deferlist (addtocurcol) +LaTeX2e: deferlist: \bx@A \bx@B : (addtocurcol-after) +LaTeX2e: ***Start addtocurcol +LaTeX2e: (mod 32) fpstype: 18 +LaTeX2e: (mult of 32) currtype: 32 +LaTeX2e: ORD float +LaTeX2e: fpstype: 18(flsettextmin) +LaTeX2e: ORD textmin = 109.99832pt +LaTeX2e: textfloatsheight (before) = 0.0pt +LaTeX2e: textmin + textfloatsheight: 109.99832pt +LaTeX2e: page-so-far: 11.94444pt +LaTeX2e: ORD? textmin being used +LaTeX2e: float size = 8.88889pt(addtocurcol) +LaTeX2e: colroom = 550.0pt(addtocurcol) +LaTeX2e: reqcolroom = 118.8872pt(addtocurcol) +LaTeX2e: fpstype: 18(flsetnum \@colnum) +LaTeX2e: \@colnum (before) = 3 +LaTeX2e: \@currbox single column float -- ok +LaTeX2e: deferlist: \bx@A \bx@B : (addtocurcol-before) +LaTeX2e: type already on list: defer (addtocurcol) +LaTeX2e: put on deferlist (addtocurcol) +LaTeX2e: deferlist: \bx@A \bx@B \bx@C : (addtocurcol-after) +LaTeX2e: ***Start addtocurcol +LaTeX2e: (mod 32) fpstype: 30 +LaTeX2e: (mult of 32) currtype: 64 +LaTeX2e: ORD float +LaTeX2e: fpstype: 30(flsettextmin) +LaTeX2e: ORD textmin = 109.99832pt +LaTeX2e: textfloatsheight (before) = 0.0pt +LaTeX2e: textmin + textfloatsheight: 109.99832pt +LaTeX2e: page-so-far: 11.94444pt +LaTeX2e: ORD? textmin being used +LaTeX2e: float size = 6.94444pt(addtocurcol) +LaTeX2e: colroom = 550.0pt(addtocurcol) +LaTeX2e: reqcolroom = 116.94276pt(addtocurcol) +LaTeX2e: fpstype: 30(flsetnum \@colnum) +LaTeX2e: \@colnum (before) = 3 +LaTeX2e: \@currbox single column float -- ok +LaTeX2e: deferlist: \bx@A \bx@B \bx@C : (addtocurcol-before) +LaTeX2e: botlist: : (addtocurcol-before) +LaTeX2e: fpstype OK here: 30 +LaTeX2e: not here: sent to addtotoporbot +LaTeX2e: ***Start addtotoporbot +LaTeX2e: fpstype OK top: 30 +LaTeX2e: fpstype: 30(flsetnum \@topnum) +LaTeX2e: \@topnum (before) = 2 +LaTeX2e: colroom = 550.0pt(flcheckspace \@toproom \@toplist) +LaTeX2e: reqcolroom = 136.94276pt(flcheckspace \@toproom \@toplist) +LaTeX2e: Space OK: \@toproom = 384.99832pt > 6.94444pt(flcheckspace \@toproom \@toplist) +LaTeX2e: (mid+bot)list: , : (addtotoporbot-before) +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@F = 0 +LaTeX2e: \ht\bx@F = 6.83331pt +LaTeX2e: \dp\bx@F = 0.0pt +LaTeX2e: \wd\bx@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. + \bx@F +l. ...\showfloat{F} + \showfloat{G} % those should be the marginpars +LaTeX2e: ***Float G details: +LaTeX2e: \count\bx@G = -1 +LaTeX2e: \ht\bx@G = 6.83331pt +LaTeX2e: \dp\bx@G = 0.0pt +LaTeX2e: \wd\bx@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. + \bx@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 +LaTeX2e: WARNING: only h, fpstype = 17= 17? +LaTeX2e: ORD float +LaTeX2e: fpstype: 17(flsettextmin) +LaTeX2e: ORD textmin = 109.99832pt +LaTeX2e: textfloatsheight (before) = 0.0pt +LaTeX2e: textmin + textfloatsheight: 109.99832pt +LaTeX2e: page-so-far: 23.94444pt +LaTeX2e: ORD? textmin being used +LaTeX2e: float size = 6.94444pt(addtocurcol) +LaTeX2e: colroom = 523.05556pt(addtocurcol) +LaTeX2e: reqcolroom = 116.94276pt(addtocurcol) +LaTeX2e: fpstype: 17(flsetnum \@colnum) +LaTeX2e: \@colnum (before) = 2 +LaTeX2e: \@currbox single column float -- ok +LaTeX2e: deferlist: \bx@A \bx@B \bx@C : (addtocurcol-before) +LaTeX2e: botlist: : (addtocurcol-before) +LaTeX2e: fpstype OK here: 17 +LaTeX2e: ***Success: here +LaTeX2e: textfloatsheight (after-here) = 30.94444pt +LaTeX2e: colnum (after-here) = 1 +LaTeX2e: ***Start addtocurcol +LaTeX2e: (mod 32) fpstype: 24 +LaTeX2e: (mult of 32) currtype: 32 +LaTeX2e: ORD float +LaTeX2e: fpstype p only (addtocurcol): 24= 24? +LaTeX2e: put on deferlist (addtocurcol) +LaTeX2e: deferlist: \bx@A \bx@B \bx@C \bx@H : (addtocurcol-after) +LaTeX2e: ***Start addtocurcol +LaTeX2e: (mod 32) fpstype: 30 +LaTeX2e: (mult of 32) currtype: 64 +LaTeX2e: ORD float +LaTeX2e: fpstype: 30(flsettextmin) +LaTeX2e: ORD textmin = 109.99832pt +LaTeX2e: textfloatsheight (before) = 30.94444pt +LaTeX2e: textmin + textfloatsheight: 140.94276pt +LaTeX2e: page-so-far: 78.88889pt +LaTeX2e: ORD? textmin being used +LaTeX2e: float size = 6.94444pt(addtocurcol) +LaTeX2e: colroom = 523.05556pt(addtocurcol) +LaTeX2e: reqcolroom = 147.8872pt(addtocurcol) +LaTeX2e: fpstype: 30(flsetnum \@colnum) +LaTeX2e: \@colnum (before) = 1 +LaTeX2e: \@currbox single column float -- ok +LaTeX2e: deferlist: \bx@A \bx@B \bx@C \bx@H : (addtocurcol-before) +LaTeX2e: botlist: : (addtocurcol-before) +LaTeX2e: fpstype not here: 30 +LaTeX2e: not here: sent to addtotoporbot +LaTeX2e: ***Start addtotoporbot +LaTeX2e: fpstype OK top: 30 +LaTeX2e: fpstype: 30(flsetnum \@topnum) +LaTeX2e: \@topnum (before) = 1 +LaTeX2e: colroom = 523.05556pt(flcheckspace \@toproom \@toplist) +LaTeX2e: reqcolroom = 159.8872pt(flcheckspace \@toproom \@toplist) +LaTeX2e: Space OK: \@toproom = 358.05388pt > 6.94444pt(flcheckspace \@toproom \@toplist) +LaTeX2e: (mid+bot)list: \bx@E , : (addtotoporbot-before) +LaTeX2e: type already on list: mid or bot---sent to addtobot +LaTeX2e: sent to addtobot (addtotoporbot) +LaTeX2e: ***Start addtobot +LaTeX2e: fpstype OK bot: 30 +LaTeX2e: fpstype: 30(flsetnum \@botnum) +LaTeX2e: \@botnum (before) = 1 +LaTeX2e: colroom = 523.05556pt(flcheckspace \@botroom \@botlist) +LaTeX2e: reqcolroom = 179.8872pt(flcheckspace \@botroom \@botlist) +LaTeX2e: Space OK: \@botroom = 165.00168pt > 6.94444pt(flcheckspace \@botroom \@botlist) +LaTeX2e: colroom (after-bot) = 496.11111pt +LaTeX2e: colnum (after-bot) = 0 +LaTeX2e: botnum (after-bot) = 0 +LaTeX2e: ***Success: bot +LaTeX2e: ***Float placement parameters: +LaTeX2e: \@colnum = 3 +LaTeX2e: \@colroom = 496.11111pt +LaTeX2e: \@topnum = 2 +LaTeX2e: \@toproom = 384.99832pt +LaTeX2e: \@botnum = 1 +LaTeX2e: \@botroom = 165.00168pt +LaTeX2e: \@fpmin = 275.0pt +LaTeX2e: \textfraction= .2 +LaTeX2e: \@dbltopnum = 2 +LaTeX2e: \@dbltoproom = 384.99832pt +LaTeX2e: \textfraction= .2 +LaTeX2e: toplist: \bx@D +LaTeX2e: botlist: \bx@I +LaTeX2e: midlist: \bx@E +LaTeX2e: deferlist: \bx@A \bx@B \bx@C \bx@H +LaTeX2e: dbltoplist: +LaTeX2e: ***Float A details: +LaTeX2e: \count\bx@A = 58 +LaTeX2e: \ht\bx@A = 10.0pt +LaTeX2e: \dp\bx@A = 0.00002pt +LaTeX2e: \wd\bx@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. + \bx@A +l. ...\showfloat{A} +LaTeX2e: ***Float B details: +LaTeX2e: \count\bx@B = 62 +LaTeX2e: \ht\bx@B = 8.88889pt +LaTeX2e: \dp\bx@B = 0.0pt +LaTeX2e: \wd\bx@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. + \bx@B +l. ...\showfloat{B} +LaTeX2e: ***Float C details: +LaTeX2e: \count\bx@C = 50 +LaTeX2e: \ht\bx@C = 8.88889pt +LaTeX2e: \dp\bx@C = 0.0pt +LaTeX2e: \wd\bx@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. + \bx@C +l. ...\showfloat{C} +LaTeX2e: ***Float D details: +LaTeX2e: \count\bx@D = 94 +LaTeX2e: \ht\bx@D = 6.94444pt +LaTeX2e: \dp\bx@D = 0.0pt +LaTeX2e: \wd\bx@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. + \bx@D +l. ...\showfloat{D} +LaTeX2e: ***Float E details: +LaTeX2e: \count\bx@E = 81 +LaTeX2e: \ht\bx@E = 0.0pt +LaTeX2e: \dp\bx@E = 0.0pt +LaTeX2e: \wd\bx@E = 0.0pt +> \box...=void +! OK. + \bx@E +l. ...\showfloat{E} +LaTeX2e: ***Float F details: +LaTeX2e: \count\bx@F = 0 +LaTeX2e: \ht\bx@F = 0.0pt +LaTeX2e: \dp\bx@F = 0.0pt +LaTeX2e: \wd\bx@F = 0.0pt +> \box...=void +! OK. + \bx@F +l. ...\showfloat{F} +LaTeX2e: ***Float G details: +LaTeX2e: \count\bx@G = -1 +LaTeX2e: \ht\bx@G = 0.0pt +LaTeX2e: \dp\bx@G = 0.0pt +LaTeX2e: \wd\bx@G = 0.0pt +> \box...=void +! OK. + \bx@G +l. ...\showfloat{G} +LaTeX2e: ***Float H details: +LaTeX2e: \count\bx@H = 56 +LaTeX2e: \ht\bx@H = 8.88889pt +LaTeX2e: \dp\bx@H = 0.0pt +LaTeX2e: \wd\bx@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. + \bx@H +l. ...\showfloat{H} +LaTeX2e: ***Float I details: +LaTeX2e: \count\bx@I = 94 +LaTeX2e: \ht\bx@I = 6.94444pt +LaTeX2e: \dp\bx@I = 0.0pt +LaTeX2e: \wd\bx@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. + \bx@I +l. ...\showfloat{I} +LaTeX2e: ***Float J details: +LaTeX2e: \count\bx@J = 0 +LaTeX2e: \ht\bx@J = 0.0pt +LaTeX2e: \dp\bx@J = 0.0pt +LaTeX2e: \wd\bx@J = 0.0pt +> \box...=void +! OK. + \bx@J +l. ...\showfloat{J} +LaTeX2e: PAGE: first column boxed +LaTeX2e: PAGE: try float column/page---\@deferlist +LaTeX2e: ----- \@deferlist: \bx@A \bx@B \bx@C \bx@H +LaTeX2e: \bx@A double column float -- wrong +LaTeX2e: \bx@B single column float -- ok +LaTeX2e: \bx@C single column float -- ok +LaTeX2e: \bx@H single column float -- ok +LaTeX2e: ***Start addtonextcol +LaTeX2e: (mod 32) fpstype: 26 +LaTeX2e: (mult of 32) currtype: 32 +LaTeX2e: ORD float +LaTeX2e: fpstype: 26(flsettextmin) +LaTeX2e: ORD textmin = 109.99832pt +LaTeX2e: text-so-far: 0pt (top of col) +LaTeX2e: float size: 10.0pt(addtonextcol) +LaTeX2e: colroom = 550.0pt(addtonextcol) +LaTeX2e: reqcolroom = 119.99832pt(addtonextcol) +LaTeX2e: fpstype: 26(flsetnum \@colnum) +LaTeX2e: \@colnum (before) = 3 +LaTeX2e: deferlist: : (addtonextcol-before) +LaTeX2e: \@currbox double column float -- wrong +LaTeX2e: type already on list: defer (addtonextcol) +LaTeX2e: put back on deferlist (addtonextcol) +LaTeX2e: deferlist: \bx@A : (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: ***Start addtonextcol +LaTeX2e: (mod 32) fpstype: 30 +LaTeX2e: (mult of 32) currtype: 32 +LaTeX2e: ORD float +LaTeX2e: fpstype: 30(flsettextmin) +LaTeX2e: ORD textmin = 109.99832pt +LaTeX2e: text-so-far: 0pt (top of col) +LaTeX2e: float size: 8.88889pt(addtonextcol) +LaTeX2e: colroom = 550.0pt(addtonextcol) +LaTeX2e: reqcolroom = 118.8872pt(addtonextcol) +LaTeX2e: fpstype: 30(flsetnum \@colnum) +LaTeX2e: \@colnum (before) = 3 +LaTeX2e: deferlist: \bx@A : (addtonextcol-before) +LaTeX2e: \@currbox single column float -- ok +LaTeX2e: type already on list: defer (addtonextcol) +LaTeX2e: put back on deferlist (addtonextcol) +LaTeX2e: deferlist: \bx@A \bx@B : (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: ***Start addtonextcol +LaTeX2e: (mod 32) fpstype: 18 +LaTeX2e: (mult of 32) currtype: 32 +LaTeX2e: ORD float +LaTeX2e: fpstype: 18(flsettextmin) +LaTeX2e: ORD textmin = 109.99832pt +LaTeX2e: text-so-far: 0pt (top of col) +LaTeX2e: float size: 8.88889pt(addtonextcol) +LaTeX2e: colroom = 550.0pt(addtonextcol) +LaTeX2e: reqcolroom = 118.8872pt(addtonextcol) +LaTeX2e: fpstype: 18(flsetnum \@colnum) +LaTeX2e: \@colnum (before) = 3 +LaTeX2e: deferlist: \bx@A \bx@B : (addtonextcol-before) +LaTeX2e: \@currbox single column float -- ok +LaTeX2e: type already on list: defer (addtonextcol) +LaTeX2e: put back on deferlist (addtonextcol) +LaTeX2e: deferlist: \bx@A \bx@B \bx@C : (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: ***Start addtonextcol +LaTeX2e: (mod 32) fpstype: 24 +LaTeX2e: (mult of 32) currtype: 32 +LaTeX2e: ORD float +LaTeX2e: fpstype not curcol: 24= 24? +LaTeX2e: put back on deferlist (addtonextcol) +LaTeX2e: deferlist: \bx@A \bx@B \bx@C \bx@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@A \bx@B \bx@C \bx@H +LaTeX2e: \bx@A double column float -- wrong +LaTeX2e: \bx@B single column float -- ok +LaTeX2e: \bx@C single column float -- ok +LaTeX2e: \bx@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@A \bx@B \bx@C \bx@H +LaTeX2e: \bx@A double column float -- ok +LaTeX2e: \bx@B single column float -- wrong +LaTeX2e: \bx@C single column float -- wrong +LaTeX2e: \bx@H single column float -- wrong +LaTeX2e: \bx@B single column float -- wrong +LaTeX2e: \bx@C single column float -- wrong +LaTeX2e: \bx@H single column float -- wrong +LaTeX2e: ***Start addtodblcol +LaTeX2e: (mod 32) fpstype: 26 +LaTeX2e: (mult of 32) currtype: 32 +LaTeX2e: ORD float +LaTeX2e: fpstype OK dbltop: 26 +LaTeX2e: fpstype: 26(flsetnum \@dbltopnum) +LaTeX2e: \@dbltopnum (before) = 2 +LaTeX2e: Space OK: \@dbltoproom = 384.99832pt> 10.0pt(dbltoproom) +LaTeX2e: (dbl)deferlist: : (before) +LaTeX2e: \@currbox double column float -- ok +LaTeX2e: dbltopnum (after) = 1 +LaTeX2e: ***Success: dbltop +LaTeX2e: End of addtodblcol -- locally count: +LaTeX2e: dbltop: 1. +LaTeX2e: End of addtodblcol -- globally count: +LaTeX2e: dbltop: 1. +LaTeX2e: ***Start addtodblcol +LaTeX2e: (mod 32) fpstype: 30 +LaTeX2e: (mult of 32) currtype: 32 +LaTeX2e: ORD float +LaTeX2e: fpstype OK dbltop: 30 +LaTeX2e: fpstype: 30(flsetnum \@dbltopnum) +LaTeX2e: \@dbltopnum (before) = 1 +LaTeX2e: Space OK: \@dbltoproom = 354.99832pt> 8.88889pt(dbltoproom) +LaTeX2e: (dbl)deferlist: : (before) +LaTeX2e: \@currbox single column float -- wrong +LaTeX2e: type already on list: (dbl)defer +LaTeX2e: put on deferlist +LaTeX2e: (dbl)deferlist: \bx@B : (after) +LaTeX2e: End of addtodblcol -- locally count: +LaTeX2e: dbltop: 1. +LaTeX2e: End of addtodblcol -- globally count: +LaTeX2e: dbltop: 1. +LaTeX2e: ***Start addtodblcol +LaTeX2e: (mod 32) fpstype: 18 +LaTeX2e: (mult of 32) currtype: 32 +LaTeX2e: ORD float +LaTeX2e: fpstype OK dbltop: 18 +LaTeX2e: fpstype: 18(flsetnum \@dbltopnum) +LaTeX2e: \@dbltopnum (before) = 1 +LaTeX2e: Space OK: \@dbltoproom = 354.99832pt> 8.88889pt(dbltoproom) +LaTeX2e: (dbl)deferlist: \bx@B : (before) +LaTeX2e: \@currbox single column float -- wrong +LaTeX2e: type already on list: (dbl)defer +LaTeX2e: put on deferlist +LaTeX2e: (dbl)deferlist: \bx@B \bx@C : (after) +LaTeX2e: End of addtodblcol -- locally count: +LaTeX2e: dbltop: 1. +LaTeX2e: End of addtodblcol -- globally count: +LaTeX2e: dbltop: 1. +LaTeX2e: ***Start addtodblcol +LaTeX2e: (mod 32) fpstype: 24 +LaTeX2e: (mult of 32) currtype: 32 +LaTeX2e: ORD float +LaTeX2e: fpstype not dbltop: 24 +LaTeX2e: put on deferlist +LaTeX2e: (dbl)deferlist: \bx@B \bx@C \bx@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@B \bx@C \bx@H +LaTeX2e: \bx@B single column float -- ok +LaTeX2e: \bx@C single column float -- ok +LaTeX2e: \bx@H single column float -- ok +LaTeX2e: \bx@C single column float -- ok +LaTeX2e: \bx@H single column float -- ok +LaTeX2e: ***Start addtonextcol +LaTeX2e: (mod 32) fpstype: 30 +LaTeX2e: (mult of 32) currtype: 32 +LaTeX2e: ORD float +LaTeX2e: fpstype: 30(flsettextmin) +LaTeX2e: ORD textmin = 103.99841pt +LaTeX2e: text-so-far: 0pt (top of col) +LaTeX2e: float size: 8.88889pt(addtonextcol) +LaTeX2e: colroom = 520.0pt(addtonextcol) +LaTeX2e: reqcolroom = 112.8873pt(addtonextcol) +LaTeX2e: fpstype: 30(flsetnum \@colnum) +LaTeX2e: \@colnum (before) = 3 +LaTeX2e: deferlist: : (addtonextcol-before) +LaTeX2e: \@currbox single column float -- ok +LaTeX2e: sent to addtotoporbot (addtonextcol) +LaTeX2e: ***Start addtotoporbot +LaTeX2e: fpstype OK top: 30 +LaTeX2e: fpstype: 30(flsetnum \@topnum) +LaTeX2e: \@topnum (before) = 2 +LaTeX2e: colroom = 520.0pt(flcheckspace \@toproom \@toplist) +LaTeX2e: reqcolroom = 132.8873pt(flcheckspace \@toproom \@toplist) +LaTeX2e: Space OK: \@toproom = 363.99841pt > 8.88889pt(flcheckspace \@toproom \@toplist) +LaTeX2e: (mid+bot)list: , : (addtotoporbot-before) +LaTeX2e: colroom (after-top) = 491.11111pt +LaTeX2e: colnum (after-top) = 2 +LaTeX2e: topnum (after-top) = 1 +LaTeX2e: ***Success: top +LaTeX2e: End of addtonextcol -- locally counts: +LaTeX2e: col: 2. top: 1. bot: 1. +LaTeX2e: End of addtonextcol -- globally counts: +LaTeX2e: col: 2. top: 1. bot: 1. +LaTeX2e: ***Start addtonextcol +LaTeX2e: (mod 32) fpstype: 18 +LaTeX2e: (mult of 32) currtype: 32 +LaTeX2e: ORD float +LaTeX2e: fpstype: 18(flsettextmin) +LaTeX2e: ORD textmin = 103.99841pt +LaTeX2e: text-so-far: 0pt (top of col) +LaTeX2e: float size: 8.88889pt(addtonextcol) +LaTeX2e: colroom = 491.11111pt(addtonextcol) +LaTeX2e: reqcolroom = 112.8873pt(addtonextcol) +LaTeX2e: fpstype: 18(flsetnum \@colnum) +LaTeX2e: \@colnum (before) = 2 +LaTeX2e: deferlist: : (addtonextcol-before) +LaTeX2e: \@currbox single column float -- ok +LaTeX2e: sent to addtotoporbot (addtonextcol) +LaTeX2e: ***Start addtotoporbot +LaTeX2e: fpstype OK top: 18 +LaTeX2e: fpstype: 18(flsetnum \@topnum) +LaTeX2e: \@topnum (before) = 1 +LaTeX2e: colroom = 491.11111pt(flcheckspace \@toproom \@toplist) +LaTeX2e: reqcolroom = 124.8873pt(flcheckspace \@toproom \@toplist) +LaTeX2e: Space OK: \@toproom = 335.10953pt > 8.88889pt(flcheckspace \@toproom \@toplist) +LaTeX2e: (mid+bot)list: , : (addtotoporbot-before) +LaTeX2e: colroom (after-top) = 470.22223pt +LaTeX2e: colnum (after-top) = 1 +LaTeX2e: topnum (after-top) = 0 +LaTeX2e: ***Success: top +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: ***Start addtonextcol +LaTeX2e: (mod 32) fpstype: 24 +LaTeX2e: (mult of 32) currtype: 32 +LaTeX2e: ORD float +LaTeX2e: fpstype not curcol: 24= 24? +LaTeX2e: put back on deferlist (addtonextcol) +LaTeX2e: deferlist: \bx@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@B \bx@C \bx@H +LaTeX2e: \bx@B single column float -- ok +LaTeX2e: \bx@C single column float -- ok +LaTeX2e: \bx@H single column float -- ok +LaTeX2e: PAGE: in \clearpage---twocolumn--- +LaTeX2e: ----- float column/page completed from \@deferlist +LaTeX2e: PAGE: first column boxed +LaTeX2e: PAGE: second column also boxed +[2 +] +LaTeX2e: PAGE: two column page completed +(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 16e45b7f6..bd265781c 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 14dfe5097..c05b06d47 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 a756933dd..afbdbc67e 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 be0964c4f..425bb7f12 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 bb2049106..4877673e8 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 cb8f173ff..17af41da0 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 bf601f2d7..8685286b9 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 a8438c3ef..5db0e3066 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 6332a2609..bd63d4f75 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 ....