[latex3-commits] [l3svn] r6353 - l3build: Back out recent changes

noreply at latex-project.org noreply at latex-project.org
Sat Jan 2 22:13:12 CET 2016


Author: joseph
Date: 2016-01-02 22:13:11 +0100 (Sat, 02 Jan 2016)
New Revision: 6353

Removed:
   trunk/l3trial/l3ldb/testfiles/m3ldb003.luatex.tlg
Modified:
   trunk/contrib/testfiles/chemformula001.ptex.tlg
   trunk/contrib/testfiles/chemformula001.tlg
   trunk/contrib/testfiles/chemformula001.uptex.tlg
   trunk/contrib/testfiles/chemformula001.xetex.tlg
   trunk/contrib/testfiles/ctex002.luatex.tlg
   trunk/contrib/testfiles/ctex002.tlg
   trunk/contrib/testfiles/unicode-math001.luatex.tlg
   trunk/l3build/l3build.dtx
   trunk/l3build/l3build.lua
   trunk/l3build/testfiles/00-test-1.luatex.tlg
   trunk/l3build/testfiles/00-test-1.tlg
   trunk/l3experimental/l3sort/testfiles/m3sort001.luatex.tlg
   trunk/l3experimental/l3sort/testfiles/m3sort001.tlg
   trunk/l3experimental/l3sort/testfiles/m3sort002.tlg
   trunk/l3experimental/l3str/testfiles/m3regex005.luatex.tlg
   trunk/l3experimental/l3str/testfiles/m3regex005.tlg
   trunk/l3experimental/l3str/testfiles/m3regex007.tlg
   trunk/l3experimental/l3str/testfiles/m3regex009.tlg
   trunk/l3experimental/l3str/testfiles/m3regex010.luatex.tlg
   trunk/l3experimental/l3str/testfiles/m3regex010.tlg
   trunk/l3experimental/l3str/testfiles/m3str-format001.tlg
   trunk/l3experimental/xcoffins/testfiles/xcoffins002.luatex.tlg
   trunk/l3experimental/xcoffins/testfiles/xcoffins002.ptex.tlg
   trunk/l3experimental/xcoffins/testfiles/xcoffins002.tlg
   trunk/l3experimental/xcoffins/testfiles/xcoffins002.uptex.tlg
   trunk/l3experimental/xcoffins/testfiles/xcoffins002.xetex.tlg
   trunk/l3experimental/xcoffins/testfiles/xcoffins003.luatex.tlg
   trunk/l3experimental/xcoffins/testfiles/xcoffins003.ptex.tlg
   trunk/l3experimental/xcoffins/testfiles/xcoffins003.tlg
   trunk/l3experimental/xcoffins/testfiles/xcoffins003.uptex.tlg
   trunk/l3experimental/xcoffins/testfiles/xcoffins003.xetex.tlg
   trunk/l3kernel/testfiles/d3dvips.luatex.tlg
   trunk/l3kernel/testfiles/d3dvips.tlg
   trunk/l3kernel/testfiles/d3pdfmode.ptex.tlg
   trunk/l3kernel/testfiles/d3pdfmode.uptex.tlg
   trunk/l3kernel/testfiles/d3xdvipdfmx.ptex.tlg
   trunk/l3kernel/testfiles/d3xdvipdfmx.uptex.tlg
   trunk/l3kernel/testfiles/m3basics002.tlg
   trunk/l3kernel/testfiles/m3char001.luatex.tlg
   trunk/l3kernel/testfiles/m3char001.tlg
   trunk/l3kernel/testfiles/m3char001.xetex.tlg
   trunk/l3kernel/testfiles/m3compare001.tlg
   trunk/l3kernel/testfiles/m3expl001.luatex.tlg
   trunk/l3kernel/testfiles/m3expl001.ptex.tlg
   trunk/l3kernel/testfiles/m3expl001.tlg
   trunk/l3kernel/testfiles/m3expl001.uptex.tlg
   trunk/l3kernel/testfiles/m3expl001.xetex.tlg
   trunk/l3kernel/testfiles/m3expl002.luatex.tlg
   trunk/l3kernel/testfiles/m3expl002.ptex.tlg
   trunk/l3kernel/testfiles/m3expl002.tlg
   trunk/l3kernel/testfiles/m3expl002.uptex.tlg
   trunk/l3kernel/testfiles/m3expl002.xetex.tlg
   trunk/l3kernel/testfiles/m3expl003.luatex.tlg
   trunk/l3kernel/testfiles/m3expl003.ptex.tlg
   trunk/l3kernel/testfiles/m3expl003.tlg
   trunk/l3kernel/testfiles/m3expl003.uptex.tlg
   trunk/l3kernel/testfiles/m3expl003.xetex.tlg
   trunk/l3kernel/testfiles/m3expl004.luatex.tlg
   trunk/l3kernel/testfiles/m3expl004.ptex.tlg
   trunk/l3kernel/testfiles/m3expl004.tlg
   trunk/l3kernel/testfiles/m3expl004.uptex.tlg
   trunk/l3kernel/testfiles/m3expl004.xetex.tlg
   trunk/l3kernel/testfiles/m3expl005.tlg
   trunk/l3kernel/testfiles/m3expl006.luatex.tlg
   trunk/l3kernel/testfiles/m3expl006.ptex.tlg
   trunk/l3kernel/testfiles/m3expl006.tlg
   trunk/l3kernel/testfiles/m3expl006.uptex.tlg
   trunk/l3kernel/testfiles/m3expl006.xetex.tlg
   trunk/l3kernel/testfiles/m3file002.tlg
   trunk/l3kernel/testfiles/m3fp-assign001.tlg
   trunk/l3kernel/testfiles/m3fp-basics001.tlg
   trunk/l3kernel/testfiles/m3fp-basics002.tlg
   trunk/l3kernel/testfiles/m3fp-basics003.tlg
   trunk/l3kernel/testfiles/m3fp-basics005.tlg
   trunk/l3kernel/testfiles/m3fp-convert001.tlg
   trunk/l3kernel/testfiles/m3fp-convert003.tlg
   trunk/l3kernel/testfiles/m3fp-expo001.tlg
   trunk/l3kernel/testfiles/m3fp-func001.tlg
   trunk/l3kernel/testfiles/m3fp-logic001.tlg
   trunk/l3kernel/testfiles/m3fp-logic002.tlg
   trunk/l3kernel/testfiles/m3fp-parse001.tlg
   trunk/l3kernel/testfiles/m3fp-parse002.tlg
   trunk/l3kernel/testfiles/m3fp-round002.tlg
   trunk/l3kernel/testfiles/m3fp-traps001.tlg
   trunk/l3kernel/testfiles/m3fp-trig001.tlg
   trunk/l3kernel/testfiles/m3fp-trig002.tlg
   trunk/l3kernel/testfiles/m3fp-trig003.tlg
   trunk/l3kernel/testfiles/m3fp-trig004.tlg
   trunk/l3kernel/testfiles/m3int001.tlg
   trunk/l3kernel/testfiles/m3int001.xetex.tlg
   trunk/l3kernel/testfiles/m3int002.tlg
   trunk/l3kernel/testfiles/m3int002.uptex.tlg
   trunk/l3kernel/testfiles/m3int002.xetex.tlg
   trunk/l3kernel/testfiles/m3int003.tlg
   trunk/l3kernel/testfiles/m3msg002.tlg
   trunk/l3kernel/testfiles/m3msg004.luatex.tlg
   trunk/l3kernel/testfiles/m3msg004.tlg
   trunk/l3kernel/testfiles/m3prg001.tlg
   trunk/l3kernel/testfiles/m3show002.tlg
   trunk/l3kernel/testfiles/m3show003.tlg
   trunk/l3kernel/testfiles/m3skip001.tlg
   trunk/l3kernel/testfiles/m3skip002.tlg
   trunk/l3kernel/testfiles/m3skip004.tlg
   trunk/l3kernel/testfiles/m3tl001.tlg
   trunk/l3kernel/testfiles/m3tl013.tlg
   trunk/l3kernel/testfiles/m3tl013.uptex.tlg
   trunk/l3kernel/testfiles/m3tlist002.tlg
   trunk/l3kernel/testfiles/m3token002.tlg
   trunk/l3packages/xparse/testfiles/xparse002.luatex.tlg
   trunk/l3packages/xparse/testfiles/xparse002.tlg
   trunk/l3packages/xparse/testfiles/xparse003.tlg
   trunk/l3trial/l3bigint/testfiles/m3bigint001.tlg
   trunk/l3trial/l3fp-extras/testfiles/m3fp-symbolic001.tlg
   trunk/l3trial/l3hooks/testfiles/m3hooks001.luatex.tlg
   trunk/l3trial/l3hooks/testfiles/m3hooks001.ptex.tlg
   trunk/l3trial/l3hooks/testfiles/m3hooks001.tlg
   trunk/l3trial/l3hooks/testfiles/m3hooks001.uptex.tlg
   trunk/l3trial/l3hooks/testfiles/m3hooks002.luatex.tlg
   trunk/l3trial/l3hooks/testfiles/m3hooks002.ptex.tlg
   trunk/l3trial/l3hooks/testfiles/m3hooks002.tlg
   trunk/l3trial/l3hooks/testfiles/m3hooks002.uptex.tlg
   trunk/l3trial/l3kernel-extras/testfiles/m3kernel-extras006.luatex.tlg
   trunk/l3trial/l3kernel-extras/testfiles/m3kernel-extras006.tlg
   trunk/l3trial/l3kernel-extras/testfiles/m3kernel-extras006.xetex.tlg
   trunk/l3trial/l3kernel-extras/testfiles/m3kernel-extras007.tlg
   trunk/l3trial/l3ldb/testfiles/m3ldb002.ptex.tlg
   trunk/l3trial/l3ldb/testfiles/m3ldb002.tlg
   trunk/l3trial/l3ldb/testfiles/m3ldb002.uptex.tlg
   trunk/l3trial/l3ldb/testfiles/m3ldb003.ptex.tlg
   trunk/l3trial/l3ldb/testfiles/m3ldb003.tlg
   trunk/l3trial/l3ldb/testfiles/m3ldb003.uptex.tlg
   trunk/l3trial/xbox/testfiles/xbox001.luatex.tlg
   trunk/l3trial/xbox/testfiles/xbox001.ptex.tlg
   trunk/l3trial/xbox/testfiles/xbox001.tlg
   trunk/l3trial/xbox/testfiles/xbox001.uptex.tlg
   trunk/l3trial/xbox/testfiles/xbox001.xetex.tlg
   trunk/xpackages/xor/testfiles/xor001.tlg
Log:
l3build: Back out recent changes

This is providing trickier than expected: start again from a known
position!


Modified: trunk/contrib/testfiles/chemformula001.ptex.tlg
===================================================================
--- trunk/contrib/testfiles/chemformula001.ptex.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/contrib/testfiles/chemformula001.ptex.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -19,20 +19,13 @@
 Completed box being shipped out [1]
 \vbox(633.0+0.0)x407.0
 .\hbox(0.0+0.0)x0.0
-..\special{! /pgfH{/pgfheight exch def 0.75 setlinewidth [] 0 setdash /pgfshade
- \ETC.}
-..\special{! /pgfV{/pgfheight exch def 0.75 setlinewidth [] 0 setdash /pgfshade
- \ETC.}
-..\special{! /pgfA{ /pgfdiff 8 index round cvi 8 index round cvi sub 2 mul 1 ad
-d\ETC.}
-..\special{! /pgfR1{ newpath dup dup dup 0 360 arc clip newpath dup /pgfendx ex
-c\ETC.}
-..\special{! /pgfR2{ newpath 0.5 add pgfcircx pgfcircy 3 2 roll 0 360 arc setrg
-b\ETC.}
-..\special{! /pgfR{ /pgfdiff 8 index round cvi 8 index round cvi sub 4 mul 1 ad
-d\ETC.}
-..\special{!  /pgfsc{}bind def/pgffc{}bind def/pgfstr{stroke}bind def/pgffill{f
-i\ETC.}
+..\special{! /pgfH{/pgfheight exch def 0.75 setlinewidth [] 0 setdash /pgfshade \ETC.}
+..\special{! /pgfV{/pgfheight exch def 0.75 setlinewidth [] 0 setdash /pgfshade \ETC.}
+..\special{! /pgfA{ /pgfdiff 8 index round cvi 8 index round cvi sub 2 mul 1 add\ETC.}
+..\special{! /pgfR1{ newpath dup dup dup 0 360 arc clip newpath dup /pgfendx exc\ETC.}
+..\special{! /pgfR2{ newpath 0.5 add pgfcircx pgfcircy 3 2 roll 0 360 arc setrgb\ETC.}
+..\special{! /pgfR{ /pgfdiff 8 index round cvi 8 index round cvi sub 4 mul 1 add\ETC.}
+..\special{!  /pgfsc{}bind def/pgffc{}bind def/pgfstr{stroke}bind def/pgffill{fi\ETC.}
 .\glue 16.0
 .\vbox(617.0+0.0)x345.0, shifted 62.0
 ..\vbox(12.0+0.0)x345.0, glue set 12.0fil
@@ -46,22 +39,14 @@
 ..\vbox(550.0+0.0)x345.0, glue set 525.89377fil
 ...\write-{}
 ...\special{color push gray 0}
-...\special{! /pgf1{gsave exec 1.0 pgfw 2.00002 0.0 moveto -6.00006 4.00005 lin
-et\ETC.}
-...\special{! /pgf2{gsave exec 1.0 pgfw 0.8 pgfw [ ] 0.0 setdash 1 setlinecap 1
- s\ETC.}
-...\special{! /pgf3{gsave exec 1.0 pgfw [ ] 0.0 setdash 0.0 -5.00005 moveto 0.0
- 5\ETC.}
-...\special{! /pgf4{gsave exec 1.0 pgfw [ ] 0.0 setdash -3.00003 -5.00005 movet
-o \ETC.}
-...\special{! /pgf5{gsave exec 1.0 pgfw [ ] 0.0 setdash -2.00002 -5.00005 movet
-o \ETC.}
-...\special{! /pgf6{gsave exec 1.0 pgfw [ ] 0.0 setdash -4.50003 -5.00005 movet
-o \ETC.}
-...\special{! /pgf7{gsave exec 1.0 pgfw -2.50002 0.0 translate [ ] 0.0 setdash 
-3.\ETC.}
-...\special{! /pgf8{gsave exec 1.0 pgfw [ ] 0.0 setdash 1.0 0.0 moveto -5.00005
- 3\ETC.}
+...\special{! /pgf1{gsave exec 1.0 pgfw 2.00002 0.0 moveto -6.00006 4.00005 linet\ETC.}
+...\special{! /pgf2{gsave exec 1.0 pgfw 0.8 pgfw [ ] 0.0 setdash 1 setlinecap 1 s\ETC.}
+...\special{! /pgf3{gsave exec 1.0 pgfw [ ] 0.0 setdash 0.0 -5.00005 moveto 0.0 5\ETC.}
+...\special{! /pgf4{gsave exec 1.0 pgfw [ ] 0.0 setdash -3.00003 -5.00005 moveto \ETC.}
+...\special{! /pgf5{gsave exec 1.0 pgfw [ ] 0.0 setdash -2.00002 -5.00005 moveto \ETC.}
+...\special{! /pgf6{gsave exec 1.0 pgfw [ ] 0.0 setdash -4.50003 -5.00005 moveto \ETC.}
+...\special{! /pgf7{gsave exec 1.0 pgfw -2.50002 0.0 translate [ ] 0.0 setdash 3.\ETC.}
+...\special{! /pgf8{gsave exec 1.0 pgfw [ ] 0.0 setdash 1.0 0.0 moveto -5.00005 3\ETC.}
 ...\glue(\topskip) 3.16669
 ...\hbox(6.83331+2.05006)x345.0, glue set 200.34961fil
 ....\hbox(0.0+0.0)x15.0
@@ -211,8 +196,7 @@
 .......\special{ps:: pgfstr }
 .......\special{ps:: save }
 .......\special{ps:: [1.0 0.0 0.0 1.0 19.72627 3.41922 ] concat }
-.......\special{ps:: save [ ] 0.0 setdash 1 setlinejoin 1 setlinecap 0.0 0.0 mo
-veto -\ETC.}
+.......\special{ps:: save [ ] 0.0 setdash 1 setlinejoin 1 setlinecap 0.0 0.0 moveto -\ETC.}
 .......\special{ps:: restore }
 .......\special{ps:: restore }
 .......\glue 0.0 plus 1.0fil minus 1.0fil
@@ -411,8 +395,7 @@
 .......\special{ps:: pgfstr }
 .......\special{ps:: save }
 .......\special{ps:: [1.0 0.0 0.0 1.0 19.72627 3.41922 ] concat }
-.......\special{ps:: save [ ] 0.0 setdash 1 setlinejoin 1 setlinecap 0.0 0.0 mo
-veto -\ETC.}
+.......\special{ps:: save [ ] 0.0 setdash 1 setlinejoin 1 setlinecap 0.0 0.0 moveto -\ETC.}
 .......\special{ps:: restore }
 .......\special{ps:: restore }
 .......\glue 0.0 plus 1.0fil minus 1.0fil

Modified: trunk/contrib/testfiles/chemformula001.tlg
===================================================================
--- trunk/contrib/testfiles/chemformula001.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/contrib/testfiles/chemformula001.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -185,8 +185,7 @@
 .......\pdfliteral{S }
 .......\pdfliteral{q }
 .......\pdfliteral{1.0 0.0 0.0 1.0 19.72627 3.41922 cm }
-.......\pdfliteral{q [ ] 0.0 d 1 j 1 J 0.0 0.0 m -3.48695 1.04608 l -1.74347 0.
-0 l -3.48\ETC.}
+.......\pdfliteral{q [ ] 0.0 d 1 j 1 J 0.0 0.0 m -3.48695 1.04608 l -1.74347 0.0 l -3.48\ETC.}
 .......\pdfliteral{Q }
 .......\pdfliteral{Q }
 .......\glue 0.0 plus 1.0fil minus 1.0fil
@@ -387,8 +386,7 @@
 .......\pdfliteral{S }
 .......\pdfliteral{q }
 .......\pdfliteral{1.0 0.0 0.0 1.0 19.72627 3.41922 cm }
-.......\pdfliteral{q [ ] 0.0 d 1 j 1 J 0.0 0.0 m -3.48695 1.04608 l -1.74347 0.
-0 l -3.48\ETC.}
+.......\pdfliteral{q [ ] 0.0 d 1 j 1 J 0.0 0.0 m -3.48695 1.04608 l -1.74347 0.0 l -3.48\ETC.}
 .......\pdfliteral{Q }
 .......\pdfliteral{Q }
 .......\glue 0.0 plus 1.0fil minus 1.0fil

Modified: trunk/contrib/testfiles/chemformula001.uptex.tlg
===================================================================
--- trunk/contrib/testfiles/chemformula001.uptex.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/contrib/testfiles/chemformula001.uptex.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -19,20 +19,13 @@
 Completed box being shipped out [1]
 \vbox(633.0+0.0)x407.0
 .\hbox(0.0+0.0)x0.0
-..\special{! /pgfH{/pgfheight exch def 0.75 setlinewidth [] 0 setdash /pgfshade
- \ETC.}
-..\special{! /pgfV{/pgfheight exch def 0.75 setlinewidth [] 0 setdash /pgfshade
- \ETC.}
-..\special{! /pgfA{ /pgfdiff 8 index round cvi 8 index round cvi sub 2 mul 1 ad
-d\ETC.}
-..\special{! /pgfR1{ newpath dup dup dup 0 360 arc clip newpath dup /pgfendx ex
-c\ETC.}
-..\special{! /pgfR2{ newpath 0.5 add pgfcircx pgfcircy 3 2 roll 0 360 arc setrg
-b\ETC.}
-..\special{! /pgfR{ /pgfdiff 8 index round cvi 8 index round cvi sub 4 mul 1 ad
-d\ETC.}
-..\special{!  /pgfsc{}bind def/pgffc{}bind def/pgfstr{stroke}bind def/pgffill{f
-i\ETC.}
+..\special{! /pgfH{/pgfheight exch def 0.75 setlinewidth [] 0 setdash /pgfshade \ETC.}
+..\special{! /pgfV{/pgfheight exch def 0.75 setlinewidth [] 0 setdash /pgfshade \ETC.}
+..\special{! /pgfA{ /pgfdiff 8 index round cvi 8 index round cvi sub 2 mul 1 add\ETC.}
+..\special{! /pgfR1{ newpath dup dup dup 0 360 arc clip newpath dup /pgfendx exc\ETC.}
+..\special{! /pgfR2{ newpath 0.5 add pgfcircx pgfcircy 3 2 roll 0 360 arc setrgb\ETC.}
+..\special{! /pgfR{ /pgfdiff 8 index round cvi 8 index round cvi sub 4 mul 1 add\ETC.}
+..\special{!  /pgfsc{}bind def/pgffc{}bind def/pgfstr{stroke}bind def/pgffill{fi\ETC.}
 .\glue 16.0
 .\vbox(617.0+0.0)x345.0, shifted 62.0
 ..\vbox(12.0+0.0)x345.0, glue set 12.0fil
@@ -46,22 +39,14 @@
 ..\vbox(550.0+0.0)x345.0, glue set 525.89377fil
 ...\write-{}
 ...\special{color push gray 0}
-...\special{! /pgf1{gsave exec 1.0 pgfw 2.00002 0.0 moveto -6.00006 4.00005 lin
-et\ETC.}
-...\special{! /pgf2{gsave exec 1.0 pgfw 0.8 pgfw [ ] 0.0 setdash 1 setlinecap 1
- s\ETC.}
-...\special{! /pgf3{gsave exec 1.0 pgfw [ ] 0.0 setdash 0.0 -5.00005 moveto 0.0
- 5\ETC.}
-...\special{! /pgf4{gsave exec 1.0 pgfw [ ] 0.0 setdash -3.00003 -5.00005 movet
-o \ETC.}
-...\special{! /pgf5{gsave exec 1.0 pgfw [ ] 0.0 setdash -2.00002 -5.00005 movet
-o \ETC.}
-...\special{! /pgf6{gsave exec 1.0 pgfw [ ] 0.0 setdash -4.50003 -5.00005 movet
-o \ETC.}
-...\special{! /pgf7{gsave exec 1.0 pgfw -2.50002 0.0 translate [ ] 0.0 setdash 
-3.\ETC.}
-...\special{! /pgf8{gsave exec 1.0 pgfw [ ] 0.0 setdash 1.0 0.0 moveto -5.00005
- 3\ETC.}
+...\special{! /pgf1{gsave exec 1.0 pgfw 2.00002 0.0 moveto -6.00006 4.00005 linet\ETC.}
+...\special{! /pgf2{gsave exec 1.0 pgfw 0.8 pgfw [ ] 0.0 setdash 1 setlinecap 1 s\ETC.}
+...\special{! /pgf3{gsave exec 1.0 pgfw [ ] 0.0 setdash 0.0 -5.00005 moveto 0.0 5\ETC.}
+...\special{! /pgf4{gsave exec 1.0 pgfw [ ] 0.0 setdash -3.00003 -5.00005 moveto \ETC.}
+...\special{! /pgf5{gsave exec 1.0 pgfw [ ] 0.0 setdash -2.00002 -5.00005 moveto \ETC.}
+...\special{! /pgf6{gsave exec 1.0 pgfw [ ] 0.0 setdash -4.50003 -5.00005 moveto \ETC.}
+...\special{! /pgf7{gsave exec 1.0 pgfw -2.50002 0.0 translate [ ] 0.0 setdash 3.\ETC.}
+...\special{! /pgf8{gsave exec 1.0 pgfw [ ] 0.0 setdash 1.0 0.0 moveto -5.00005 3\ETC.}
 ...\glue(\topskip) 3.16669
 ...\hbox(6.83331+2.05006)x345.0, glue set 200.34961fil
 ....\hbox(0.0+0.0)x15.0
@@ -211,8 +196,7 @@
 .......\special{ps:: pgfstr }
 .......\special{ps:: save }
 .......\special{ps:: [1.0 0.0 0.0 1.0 19.72627 3.41922 ] concat }
-.......\special{ps:: save [ ] 0.0 setdash 1 setlinejoin 1 setlinecap 0.0 0.0 mo
-veto -\ETC.}
+.......\special{ps:: save [ ] 0.0 setdash 1 setlinejoin 1 setlinecap 0.0 0.0 moveto -\ETC.}
 .......\special{ps:: restore }
 .......\special{ps:: restore }
 .......\glue 0.0 plus 1.0fil minus 1.0fil
@@ -411,8 +395,7 @@
 .......\special{ps:: pgfstr }
 .......\special{ps:: save }
 .......\special{ps:: [1.0 0.0 0.0 1.0 19.72627 3.41922 ] concat }
-.......\special{ps:: save [ ] 0.0 setdash 1 setlinejoin 1 setlinecap 0.0 0.0 mo
-veto -\ETC.}
+.......\special{ps:: save [ ] 0.0 setdash 1 setlinejoin 1 setlinecap 0.0 0.0 moveto -\ETC.}
 .......\special{ps:: restore }
 .......\special{ps:: restore }
 .......\glue 0.0 plus 1.0fil minus 1.0fil

Modified: trunk/contrib/testfiles/chemformula001.xetex.tlg
===================================================================
--- trunk/contrib/testfiles/chemformula001.xetex.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/contrib/testfiles/chemformula001.xetex.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -204,8 +204,7 @@
 .......\special{pdf:code S }
 .......\special{pdf:code q }
 .......\special{pdf:code 1.0 0.0 0.0 1.0 19.72627 3.41922 cm }
-.......\special{pdf:code q [ ] 0.0 d 1 j 1 J 0.0 0.0 m -3.48695 1.04608 l -1.74
-347 0.\ETC.}
+.......\special{pdf:code q [ ] 0.0 d 1 j 1 J 0.0 0.0 m -3.48695 1.04608 l -1.74347 0.\ETC.}
 .......\special{pdf:code Q }
 .......\special{pdf:code Q }
 .......\glue 0.0 plus 1.0fil minus 1.0fil
@@ -424,8 +423,7 @@
 .......\special{pdf:code S }
 .......\special{pdf:code q }
 .......\special{pdf:code 1.0 0.0 0.0 1.0 19.72627 3.41922 cm }
-.......\special{pdf:code q [ ] 0.0 d 1 j 1 J 0.0 0.0 m -3.48695 1.04608 l -1.74
-347 0.\ETC.}
+.......\special{pdf:code q [ ] 0.0 d 1 j 1 J 0.0 0.0 m -3.48695 1.04608 l -1.74347 0.\ETC.}
 .......\special{pdf:code Q }
 .......\special{pdf:code Q }
 .......\glue 0.0 plus 1.0fil minus 1.0fil

Modified: trunk/contrib/testfiles/ctex002.luatex.tlg
===================================================================
--- trunk/contrib/testfiles/ctex002.luatex.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/contrib/testfiles/ctex002.luatex.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -16,12 +16,9 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 %%
-LaTeX Font Info:    Font shape `LTJY3/FandolSong-Regular(0)/m/sl' in size <10.53
-937> not available
-(Font)              Font shape `LTJY3/FandolSong-Regular(0)/m/it' tried instead 
-on input line ....
-luaotfload | load : path lookup of "FandolKai-Regular.otf" unsuccessful, falling
- back to file:
+LaTeX Font Info:    Font shape `LTJY3/FandolSong-Regular(0)/m/sl' in size <10.53937> not available
+(Font)              Font shape `LTJY3/FandolSong-Regular(0)/m/it' tried instead on input line ....
+luaotfload | load : path lookup of "FandolKai-Regular.otf" unsuccessful, falling back to file:
 Completed box being shipped out [1]
 \vbox(633.0+0.0)x407.0, direction TLT
 .\whatsit4=[]

Modified: trunk/contrib/testfiles/ctex002.tlg
===================================================================
--- trunk/contrib/testfiles/ctex002.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/contrib/testfiles/ctex002.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -18,8 +18,7 @@
 %%
 LaTeX Font Info:    Try loading font information for C70+rm on input line ....
 )
-Package CJKpunct Info: use punctuation spaces for family 'rm' with punctstyle (
-quanjiao) on input line ....
+Package CJKpunct Info: use punctuation spaces for family 'rm' with punctstyle (quanjiao) on input line ....
 Completed box being shipped out [1]
 \vbox(633.0+0.0)x407.0
 .\special{pdf:mapline gbk at UGBK@ UniGB-UTF16-H FandolSong-Regular.otf}
@@ -32,22 +31,14 @@
 .\special{pdf:mapline unikai at Unicode@ UniGB-UTF16-H FandolKai-Regular.otf}
 .\special{pdf:mapline unihei at Unicode@ UniGB-UTF16-H FandolHei-Regular.otf}
 .\special{pdf:mapline unifs at Unicode@ UniGB-UTF16-H FandolFang-Regular.otf}
-.\special{pdf:mapline gbksongsl at UGBK@ UniGB-UTF16-H FandolSong-Regular.otf -s .
-\ETC.}
-.\special{pdf:mapline gbkkaisl at UGBK@ UniGB-UTF16-H FandolKai-Regular.otf -s .16
-\ETC.}
-.\special{pdf:mapline gbkheisl at UGBK@ UniGB-UTF16-H FandolHei-Regular.otf -s .16
-\ETC.}
-.\special{pdf:mapline gbkfssl at UGBK@ UniGB-UTF16-H FandolFang-Regular.otf -s .16
-\ETC.}
-.\special{pdf:mapline unisongsl at Unicode@ UniGB-UTF16-H FandolSong-Regular.otf -
-\ETC.}
-.\special{pdf:mapline unikaisl at Unicode@ UniGB-UTF16-H FandolKai-Regular.otf -s 
-\ETC.}
-.\special{pdf:mapline uniheisl at Unicode@ UniGB-UTF16-H FandolHei-Regular.otf -s 
-\ETC.}
-.\special{pdf:mapline unifssl at Unicode@ UniGB-UTF16-H FandolFang-Regular.otf -s 
-\ETC.}
+.\special{pdf:mapline gbksongsl at UGBK@ UniGB-UTF16-H FandolSong-Regular.otf -s .\ETC.}
+.\special{pdf:mapline gbkkaisl at UGBK@ UniGB-UTF16-H FandolKai-Regular.otf -s .16\ETC.}
+.\special{pdf:mapline gbkheisl at UGBK@ UniGB-UTF16-H FandolHei-Regular.otf -s .16\ETC.}
+.\special{pdf:mapline gbkfssl at UGBK@ UniGB-UTF16-H FandolFang-Regular.otf -s .16\ETC.}
+.\special{pdf:mapline unisongsl at Unicode@ UniGB-UTF16-H FandolSong-Regular.otf -\ETC.}
+.\special{pdf:mapline unikaisl at Unicode@ UniGB-UTF16-H FandolKai-Regular.otf -s \ETC.}
+.\special{pdf:mapline uniheisl at Unicode@ UniGB-UTF16-H FandolHei-Regular.otf -s \ETC.}
+.\special{pdf:mapline unifssl at Unicode@ UniGB-UTF16-H FandolFang-Regular.otf -s \ETC.}
 .\glue 16.0
 .\vbox(617.0+0.0)x345.0, shifted 62.0
 ..\vbox(12.0+0.0)x345.0, glue set 5.20798fil

Modified: trunk/contrib/testfiles/unicode-math001.luatex.tlg
===================================================================
--- trunk/contrib/testfiles/unicode-math001.luatex.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/contrib/testfiles/unicode-math001.luatex.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -16,34 +16,26 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 %%
-luaotfload | load : path lookup of "latinmodern-math" unsuccessful, falling back
- to file:
-luaotfload | load : path lookup of "latinmodern-math" unsuccessful, falling back
- to file:
+luaotfload | load : path lookup of "latinmodern-math" unsuccessful, falling back to file:
+luaotfload | load : path lookup of "latinmodern-math" unsuccessful, falling back to file:
 LaTeX Font Info:    Font shape `EU2/latinmodern-math.otf(1)/m/n' will be
 (Font)              scaled to size 10.00015pt on input line ....
-luaotfload | load : path lookup of "latinmodern-math" unsuccessful, falling back
- to file:
+luaotfload | load : path lookup of "latinmodern-math" unsuccessful, falling back to file:
 LaTeX Font Info:    Font shape `EU2/latinmodern-math.otf(1)/m/n' will be
 (Font)              scaled to size 7.01247pt on input line ....
-luaotfload | load : path lookup of "latinmodern-math" unsuccessful, falling back
- to file:
+luaotfload | load : path lookup of "latinmodern-math" unsuccessful, falling back to file:
 LaTeX Font Info:    Font shape `EU2/latinmodern-math.otf(1)/m/n' will be
 (Font)              scaled to size 4.9808pt on input line ....
-luaotfload | load : path lookup of "latinmodern-math" unsuccessful, falling back
- to file:
+luaotfload | load : path lookup of "latinmodern-math" unsuccessful, falling back to file:
 LaTeX Font Info:    Font shape `EU2/latinmodern-math.otf(2)/m/n' will be
 (Font)              scaled to size 9.99985pt on input line ....
-luaotfload | load : path lookup of "latinmodern-math" unsuccessful, falling back
- to file:
+luaotfload | load : path lookup of "latinmodern-math" unsuccessful, falling back to file:
 LaTeX Font Info:    Font shape `EU2/latinmodern-math.otf(2)/m/n' will be
 (Font)              scaled to size 7.01224pt on input line ....
-luaotfload | load : path lookup of "latinmodern-math" unsuccessful, falling back
- to file:
+luaotfload | load : path lookup of "latinmodern-math" unsuccessful, falling back to file:
 LaTeX Font Info:    Font shape `EU2/latinmodern-math.otf(2)/m/n' will be
 (Font)              scaled to size 4.98067pt on input line ....
-luaotfload | load : path lookup of "latinmodern-math" unsuccessful, falling back
- to file:
+luaotfload | load : path lookup of "latinmodern-math" unsuccessful, falling back to file:
 Completed box being shipped out [1]
 \vbox(633.0+0.0)x407.0, direction TLT
 .\glue 16.0

Modified: trunk/l3build/l3build.dtx
===================================================================
--- trunk/l3build/l3build.dtx	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3build/l3build.dtx	2016-01-02 21:13:11 UTC (rev 6353)
@@ -1,6 +1,6 @@
 % \iffalse
 %%
-%% File l3build.dtx (C) Copyright 2014-2016 The LaTeX3 Project
+%% File l3build.dtx (C) Copyright 2014-2015 The LaTeX3 Project
 %%
 %% It may be distributed and/or modified under the conditions of the
 %% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -154,7 +154,6 @@
 \luavarseparator
 \luavarset{asciiengines}{\{"pdftex"\}}{Engines which should log as sure ASCII}
 \luavarset{checkruns}   {1}           {How many times to run a check file before comparing the log.}
-\luavarset{maxprintline}{79}          {Length of line to use in log files.}
 \luavarset{packtdszip}  {false}       {Build a TDS-style zip file for CTAN?}
 \luavarset{scriptname}  {"build.lua"} {Name of script used in dependencies.}
 \luavarset{typesetcmds} {""}          {Instructions to be passed to \TeX{} when doing typesetting.}
@@ -638,6 +637,7 @@
 %   \item Removal of the name of the test file itself.
 %   \item Removal of the |pdftex.map| load information given during
 %     first page shipout.
+%   \item Removal spaces at the start of lines.
 %   \item Removal of |./| at start of file names.
 %   \item Standardisation of the list of units known to \TeX{} (\pdfTeX{}
 %     and \LuaTeX{} add a small number of additional units which are not
@@ -647,7 +647,7 @@
 %     years due to a \TeX{} bug).
 %   \item Conversion of \texttt{on line \meta{number}} to \texttt{on line ...}
 %     to allow flexibility in changes to test files.
-%   \item Removal of |yoko direction| from boxes when (u)p\TeX{} is in use.
+%   \item
 % \end{itemize}
 %
 % \LuaTeX{} makes several additional changes to the log file. As normalising

Modified: trunk/l3build/l3build.lua
===================================================================
--- trunk/l3build/l3build.lua	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3build/l3build.lua	2016-01-02 21:13:11 UTC (rev 6353)
@@ -149,7 +149,6 @@
 -- Other required settings
 asciiengines = asciiengines or {"pdftex"}
 checkruns    = checkruns    or 1
-maxprintline = maxprintline or 79
 packtdszip   = packtdszip   or false -- Not actually needed but clearer
 scriptname   = scriptname   or "build.lua" -- Script used in each directory
 typesetcmds  = typesetcmds  or ""
@@ -728,7 +727,9 @@
 -- the 'business' part from the tests and removes system-dependent stuff
 function formatlog(logfile, newfile, engine)
   -- Do this before using maxprintline to expoit scoping
-  local maxprintline = maxprintline
+  local kpse = require("kpse")
+  kpse.set_program_name(engine)
+  local maxprintline = tonumber(kpse.expand_var("$max_print_line"))
   if engine == "luatex" or engine == "luajittex" then
     maxprintline = maxprintline + 1 -- Deal with an out-by-one error
   end
@@ -749,6 +750,11 @@
   end
     -- Substitutions to remove some non-useful changes
   local function normalize(line)
+    -- Allow for wrapped lines: preserve the content and wrap
+    if string.len(line) == maxprintline then
+      lastline = (lastline or "") .. line
+      return ""
+    end
     local line = (lastline or "") .. line
     lastline = ""
     -- Remove test file name from lines
@@ -771,9 +777,7 @@
       line = string.gsub(line, "%(.*/([%w-]+%.[%w-]+)%)?%s*$", "(../%1")
     end
     -- Zap map loading of map
-    line = string.gsub(line, "%{%w?:?[%w/%-]*/pdftex%.map%} *", "")
-    -- Deal with the fact that "(.aux)" may have still a leading space
-    line = string.gsub(line, "^ %(%.aux%)", "(.aux)")
+    line = string.gsub(line, "%{%w?:?[%w/%-]*/pdftex%.map%}", "")
     -- Merge all of .fd data into one line so will be removed later
     if string.match(line, "^ *%([%.%/%w]+%.fd[^%)]*$") then
       lastline = (lastline or "") .. line
@@ -802,21 +806,16 @@
       "%.%.%.l%.%d+ ( *)%}$",
       "..." .. os_newline .. "l. ...%1}"
     )
-    -- Pick up cases where "yoko direction" or similar will have wrapped
-    if string.len(line) == maxprintline          and
-       string.match(line, "^%.+%\\hbox.*fil%, ") and
-       not string.match(line, "n$")              then
-       lastline = line
-       return ""
-    elseif string.match(lastline, "^%.+%\\hbox.*fil%, ") then
-      line = lastline .. line
-      lastline = ""
-    end
+    -- Remove spaces at the start of lines: deals with the fact that LuaTeX
+    -- uses a different number to the other engines
+    line = string.gsub(line, "^%s+", "")
     -- Remove 'normal' direction information on boxes with (u)pTeX
     line = string.gsub(line, ",? yoko direction,?", "")
+    -- A tidy-up to keep LuaTeX and other engines in sync
+    local utf8_char = unicode.utf8.char
+    line = string.gsub(line, utf8_char(127), "^^?")
     -- Unicode engines display chars in the upper half of the 8-bit range:
     -- tidy up to match pdfTeX if an ASCII engine is in use
-    local utf8_char = unicode.utf8.char
     if next(asciiengines) then
       for i = 128, 255 do
         line = string.gsub(line, utf8_char(i), "^^" .. string.format("%02x", i))
@@ -851,7 +850,7 @@
 end
 
 -- Additional normalization for LuaTeX
-function formatlualog(logfile, newfile, engine)
+function formatlualog(logfile, newfile)
   local function normalize(line, lastline, dropping)
     -- Find \discretionary or \whatsit lines:
     -- These may come back later
@@ -897,8 +896,6 @@
     end
     -- LuaTeX writes ^^M as a new line, which we lose
     line = string.gsub(line, "%^%^M", "")
-    -- A tidy-up to keep LuaTeX and other engines in sync
-    line = string.gsub(line, unicode.utf8.char(127), "^^?")
     -- Remove U+ notation in the "Missing character" message
     line = string.gsub(
         line,
@@ -983,14 +980,14 @@
         return line, ""
       end
     end
-    -- Wrap some cases that can be picked out:
-    -- This deals with a few places that can be normalised plus
-    -- the 'out by one' issue that LuaTeX has for some cases
+    -- Wrap some cases that can be picked out
+    -- In some places LuaTeX does use max_print_line, then we
+    -- get into issues with different wrapping approaches
+    local kpse = require("kpse")
+    kpse.set_program_name("luatex")
+    local maxprintline = tonumber(kpse.expand_var("$max_print_line"))
     if string.len(line) == maxprintline then
-      return "", lastline .. line
-    -- Cover the out-by-one issue with LuaTeX
-    elseif string.len(line) == maxprintline + 1 and engine == "luatex" then
-      return "", lastline .. line
+      return "", line
     elseif string.len(lastline) == maxprintline then
       if string.match(line, "\\ETC%.%}$") then
         -- If the line wrapped at \ETC we might have lost a space
@@ -1002,13 +999,8 @@
       else
         return lastline .. os_newline .. line, ""
       end
-    -- Return all of the text for a wrapped (multi)line
-    elseif string.len(lastline) > maxprintline then
-      return lastline .. line, ""
     end
-    -- LuaTeX adds difference leading spaces to lines:
-    -- if we get this far, they need to be tided up
-    return string.gsub(line, "^%s+", ""), ""
+    return line, ""
   end
   local newlog = ""
   local lastline = ""
@@ -1101,15 +1093,15 @@
     -- Do additional log formatting if the engine is LuaTeX, there is no
     -- LuaTeX-specific .tlg file and the default engine is not LuaTeX
     if enginename == "luatex"
-      and not string.match(tlgfile, "%.luatex" .. "%" .. tlgext .. "$")
+      and tlgfile ~= name ..  ".luatex" .. tlgext
       and stdengine ~= "luatex"
       and stdengine ~= "luajittex" then
       local luatlgfile = testdir .. "/" .. name .. ".luatex" ..  tlgext
       if os_windows then
         luatlgfile = unix_to_win(luatlgfile)
       end
-      formatlualog(tlgfile, luatlgfile, stdengine)
-      formatlualog(newfile, newfile, "luatex")
+      formatlualog(tlgfile, luatlgfile)
+      formatlualog(newfile, newfile)
       errlevel = os.execute(
         os_diffexe .. " " .. luatlgfile .. " " .. newfile
           .. " > " .. difffile
@@ -1185,9 +1177,6 @@
       -- Avoid spurious output from (u)pTeX
       os_setenv .. " GUESS_INPUT_KANJI_ENCODING=0"
         .. os_concat ..
-      -- Ensure lines are of a known length
-      os_setenv .. " max_print_line=" .. maxprintline
-        .. os_concat ..
       realengine ..  format .. " "
         .. checkopts .. " " .. asciiopt .. lvtfile
         .. (hide and (" > " .. os_null) or "")

Modified: trunk/l3build/testfiles/00-test-1.luatex.tlg
===================================================================
--- trunk/l3build/testfiles/00-test-1.luatex.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3build/testfiles/00-test-1.luatex.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -19,13 +19,13 @@
 Format: latex2e
 Main Class: minimal
 Package: abc
-    Options: xyz
+Options: xyz
 ============================================================
 TEST 1: \afterassignment 
 ============================================================
 > hello.
 <argument> ...ef \y {world}}\foo } \x ={hello} \showthe \foo 
-                                                  \show \y 
+\show \y 
 l. ...}
 > \y=macro:
 ->world.

Modified: trunk/l3build/testfiles/00-test-1.tlg
===================================================================
--- trunk/l3build/testfiles/00-test-1.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3build/testfiles/00-test-1.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -19,13 +19,13 @@
 Format: latex2e
 Main Class: minimal
 Package: abc
-    Options: xyz
+Options: xyz
 ============================================================
 TEST 1: \afterassignment 
 ============================================================
 > hello.
 <argument> ...d}}\foo } \x ={hello} \showthe \foo 
-                                                  \show \y 
+\show \y 
 l. ...}
 > \y=macro:
 ->world.

Modified: trunk/l3experimental/l3sort/testfiles/m3sort001.luatex.tlg
===================================================================
--- trunk/l3experimental/l3sort/testfiles/m3sort001.luatex.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3experimental/l3sort/testfiles/m3sort001.luatex.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -24,11 +24,7 @@
 {a\par b}
 {0}{0}{1}{2}{2}{3}{3}{4}{4}{6}{7}{8}{8}
 8234610203748
-{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{1}{1}{1}{1}{1}{1}{1
-}{1}{1}{1}{2}{2}{2}{2}{2}{2}{2}{2}{2}{2}{2}{2}{2}{2}{2}{2}{2}{2}{2}{2}{3}{3}{3}{
-3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{4}{4}{4}{4}{4}{4}{4}{4}{4}{4}
-{4}{4}{4}{4}{4}{4}{4}{4}{4}{4}{6}{6}{6}{6}{6}{6}{6}{6}{6}{6}{7}{7}{7}{7}{7}{7}{7
-}{7}{7}{7}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}
+{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{1}{1}{1}{1}{1}{1}{1}{1}{1}{1}{2}{2}{2}{2}{2}{2}{2}{2}{2}{2}{2}{2}{2}{2}{2}{2}{2}{2}{2}{2}{3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{4}{4}{4}{4}{4}{4}{4}{4}{4}{4}{4}{4}{4}{4}{4}{4}{4}{4}{4}{4}{6}{6}{6}{6}{6}{6}{6}{6}{6}{6}{7}{7}{7}{7}{7}{7}{7}{7}{7}{7}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}
 ============================================================
 ============================================================
 TEST 2: Sort clist
@@ -37,10 +33,7 @@
 {a, }
 02,--3,03,3,4,7,8,23,48,61
 8,23,4,61,02,--3,03,7,3,48
-02,02,02,02,02,02,02,02,02,02,--3,03,3,--3,03,3,--3,03,3,--3,03,3,--3,03,3,--3,0
-3,3,--3,03,3,--3,03,3,--3,03,3,--3,03,3,4,4,4,4,4,4,4,4,4,4,7,7,7,7,7,7,7,7,7,7,
-8,8,8,8,8,8,8,8,8,8,23,23,23,23,23,23,23,23,23,23,48,48,48,48,48,48,48,48,48,48,
-61,61,61,61,61,61,61,61,61,61
+02,02,02,02,02,02,02,02,02,02,--3,03,3,--3,03,3,--3,03,3,--3,03,3,--3,03,3,--3,03,3,--3,03,3,--3,03,3,--3,03,3,--3,03,3,4,4,4,4,4,4,4,4,4,4,7,7,7,7,7,7,7,7,7,7,8,8,8,8,8,8,8,8,8,8,23,23,23,23,23,23,23,23,23,23,48,48,48,48,48,48,48,48,48,48,61,61,61,61,61,61,61,61,61,61
 ============================================================
 ============================================================
 TEST 3: Sort seq
@@ -48,9 +41,7 @@
 |\s__seq |
 \s__seq \__seq_item:n {a, }
 |\s__seq |
-\s__seq \__seq_item:n {02}\__seq_item:n {--3}\__seq_item:n {03}\__seq_item:n {3}
-\__seq_item:n {4}\__seq_item:n {7}\__seq_item:n {8}\__seq_item:n {23}\__seq_item
-:n {48}\__seq_item:n {61}
+\s__seq \__seq_item:n {02}\__seq_item:n {--3}\__seq_item:n {03}\__seq_item:n {3}\__seq_item:n {4}\__seq_item:n {7}\__seq_item:n {8}\__seq_item:n {23}\__seq_item:n {48}\__seq_item:n {61}
 ============================================================
 ============================================================
 TEST 4: sort too long

Modified: trunk/l3experimental/l3sort/testfiles/m3sort001.tlg
===================================================================
--- trunk/l3experimental/l3sort/testfiles/m3sort001.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3experimental/l3sort/testfiles/m3sort001.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -24,11 +24,7 @@
 {a\par b}
 {0}{0}{1}{2}{2}{3}{3}{4}{4}{6}{7}{8}{8}
 8234610203748
-{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{1}{1}{1}{1}{1}{1}{
-1}{1}{1}{1}{2}{2}{2}{2}{2}{2}{2}{2}{2}{2}{2}{2}{2}{2}{2}{2}{2}{2}{2}{2}{3}{3}{3
-}{3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{4}{4}{4}{4}{4}{4}{4}{4}{4}
-{4}{4}{4}{4}{4}{4}{4}{4}{4}{4}{4}{6}{6}{6}{6}{6}{6}{6}{6}{6}{6}{7}{7}{7}{7}{7}{
-7}{7}{7}{7}{7}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}
+{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{0}{1}{1}{1}{1}{1}{1}{1}{1}{1}{1}{2}{2}{2}{2}{2}{2}{2}{2}{2}{2}{2}{2}{2}{2}{2}{2}{2}{2}{2}{2}{3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{4}{4}{4}{4}{4}{4}{4}{4}{4}{4}{4}{4}{4}{4}{4}{4}{4}{4}{4}{4}{6}{6}{6}{6}{6}{6}{6}{6}{6}{6}{7}{7}{7}{7}{7}{7}{7}{7}{7}{7}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}
 ============================================================
 ============================================================
 TEST 2: Sort clist
@@ -37,10 +33,7 @@
 {a, }
 02,--3,03,3,4,7,8,23,48,61
 8,23,4,61,02,--3,03,7,3,48
-02,02,02,02,02,02,02,02,02,02,--3,03,3,--3,03,3,--3,03,3,--3,03,3,--3,03,3,--3,
-03,3,--3,03,3,--3,03,3,--3,03,3,--3,03,3,4,4,4,4,4,4,4,4,4,4,7,7,7,7,7,7,7,7,7,
-7,8,8,8,8,8,8,8,8,8,8,23,23,23,23,23,23,23,23,23,23,48,48,48,48,48,48,48,48,48,
-48,61,61,61,61,61,61,61,61,61,61
+02,02,02,02,02,02,02,02,02,02,--3,03,3,--3,03,3,--3,03,3,--3,03,3,--3,03,3,--3,03,3,--3,03,3,--3,03,3,--3,03,3,--3,03,3,4,4,4,4,4,4,4,4,4,4,7,7,7,7,7,7,7,7,7,7,8,8,8,8,8,8,8,8,8,8,23,23,23,23,23,23,23,23,23,23,48,48,48,48,48,48,48,48,48,48,61,61,61,61,61,61,61,61,61,61
 ============================================================
 ============================================================
 TEST 3: Sort seq
@@ -48,9 +41,7 @@
 |\s__seq |
 \s__seq \__seq_item:n {a, }
 |\s__seq |
-\s__seq \__seq_item:n {02}\__seq_item:n {--3}\__seq_item:n {03}\__seq_item:n {3
-}\__seq_item:n {4}\__seq_item:n {7}\__seq_item:n {8}\__seq_item:n {23}\__seq_it
-em:n {48}\__seq_item:n {61}
+\s__seq \__seq_item:n {02}\__seq_item:n {--3}\__seq_item:n {03}\__seq_item:n {3}\__seq_item:n {4}\__seq_item:n {7}\__seq_item:n {8}\__seq_item:n {23}\__seq_item:n {48}\__seq_item:n {61}
 ============================================================
 ============================================================
 TEST 4: sort too long

Modified: trunk/l3experimental/l3sort/testfiles/m3sort002.tlg
===================================================================
--- trunk/l3experimental/l3sort/testfiles/m3sort002.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3experimental/l3sort/testfiles/m3sort002.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -23,28 +23,10 @@
 ||
 {a\par b}
 {-0}{00}{1}{+2}{2}{3}{3}{4}{4}{6}{7}{8}{8}
-{-0}{00}{-0}{00}{-0}{00}{-0}{00}{-0}{00}{-0}{00}{-0}{00}{-0}{00}{-0}{00}{-0}{00
-}{1}{1}{1}{1}{1}{1}{1}{1}{1}{1}{+2}{2}{+2}{2}{+2}{2}{+2}{2}{+2}{2}{+2}{2}{+2}{2
-}{+2}{2}{+2}{2}{+2}{2}{3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{3}
-{3}{4}{4}{4}{4}{4}{4}{4}{4}{4}{4}{4}{4}{4}{4}{4}{4}{4}{4}{4}{4}{6}{6}{6}{6}{6}{
-6}{6}{6}{6}{6}{7}{7}{7}{7}{7}{7}{7}{7}{7}{7}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8
-}{8}{8}{8}{8}{8}{8}{8}{8}
+{-0}{00}{-0}{00}{-0}{00}{-0}{00}{-0}{00}{-0}{00}{-0}{00}{-0}{00}{-0}{00}{-0}{00}{1}{1}{1}{1}{1}{1}{1}{1}{1}{1}{+2}{2}{+2}{2}{+2}{2}{+2}{2}{+2}{2}{+2}{2}{+2}{2}{+2}{2}{+2}{2}{+2}{2}{3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{3}{4}{4}{4}{4}{4}{4}{4}{4}{4}{4}{4}{4}{4}{4}{4}{4}{4}{4}{4}{4}{6}{6}{6}{6}{6}{6}{6}{6}{6}{6}{7}{7}{7}{7}{7}{7}{7}{7}{7}{7}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}{8}
 ============================================================
 ============================================================
 TEST 2: More expandable sorting
 ============================================================
-{cc}{cccii}{cccl}{cccliii}{ccclix}{ccclvi}{ccclxii}{ccclxv}{ccclxviii}{ccclxxi}
-{ccclxxiv}{ccclxxvii}{ccclxxx}{ccclxxxiii}{ccclxxxix}{ccclxxxvi}{cccv}{cccviii}
-{cccxcii}{cccxcv}{cccxcviii}{cccxi}{cccxiv}{cccxli}{cccxliv}{cccxlvii}{cccxvii}
-{cccxx}{cccxxiii}{cccxxix}{cccxxvi}{cccxxxii}{cccxxxv}{cccxxxviii}{cciii}{ccix}
-{ccli}{ccliv}{cclvii}{cclx}{cclxiii}{cclxix}{cclxvi}{cclxxii}{cclxxv}{cclxxviii
-}{cclxxxi}{cclxxxiv}{cclxxxvii}{ccvi}{ccxc}{ccxciii}{ccxcix}{ccxcvi}{ccxii}{ccx
-lii}{ccxlv}{ccxlviii}{ccxv}{ccxviii}{ccxxi}{ccxxiv}{ccxxvii}{ccxxx}{ccxxxiii}{c
-cxxxix}{ccxxxvi}{cdi}{cdiv}{cdvii}{cdx}{cdxiii}{cdxix}{cdxvi}{cdxxii}{cdxxv}{cd
-xxviii}{cdxxxi}{ci}{civ}{clii}{clv}{clviii}{clxi}{clxiv}{clxvii}{clxx}{clxxiii}
-{clxxix}{clxxvi}{clxxxii}{clxxxv}{clxxxviii}{cvii}{cx}{cxci}{cxciv}{cxcvii}{cxi
-ii}{cxix}{cxl}{cxliii}{cxlix}{cxlvi}{cxvi}{cxxii}{cxxv}{cxxviii}{cxxxi}{cxxxiv}
-{cxxxvii}{l}{liii}{lix}{lvi}{lxii}{lxv}{lxviii}{lxxi}{lxxiv}{lxxvii}{lxxx}{lxxx
-iii}{lxxxix}{lxxxvi}{v}{viii}{xcii}{xcv}{xcviii}{xi}{xiv}{xli}{xliv}{xlvii}{xvi
-i}{xx}{xxiii}{xxix}{xxvi}{xxxii}{xxxv}{xxxviii}
+{cc}{cccii}{cccl}{cccliii}{ccclix}{ccclvi}{ccclxii}{ccclxv}{ccclxviii}{ccclxxi}{ccclxxiv}{ccclxxvii}{ccclxxx}{ccclxxxiii}{ccclxxxix}{ccclxxxvi}{cccv}{cccviii}{cccxcii}{cccxcv}{cccxcviii}{cccxi}{cccxiv}{cccxli}{cccxliv}{cccxlvii}{cccxvii}{cccxx}{cccxxiii}{cccxxix}{cccxxvi}{cccxxxii}{cccxxxv}{cccxxxviii}{cciii}{ccix}{ccli}{ccliv}{cclvii}{cclx}{cclxiii}{cclxix}{cclxvi}{cclxxii}{cclxxv}{cclxxviii}{cclxxxi}{cclxxxiv}{cclxxxvii}{ccvi}{ccxc}{ccxciii}{ccxcix}{ccxcvi}{ccxii}{ccxlii}{ccxlv}{ccxlviii}{ccxv}{ccxviii}{ccxxi}{ccxxiv}{ccxxvii}{ccxxx}{ccxxxiii}{ccxxxix}{ccxxxvi}{cdi}{cdiv}{cdvii}{cdx}{cdxiii}{cdxix}{cdxvi}{cdxxii}{cdxxv}{cdxxviii}{cdxxxi}{ci}{civ}{clii}{clv}{clviii}{clxi}{clxiv}{clxvii}{clxx}{clxxiii}{clxxix}{clxxvi}{clxxxii}{clxxxv}{clxxxviii}{cvii}{cx}{cxci}{cxciv}{cxcvii}{cxiii}{cxix}{cxl}{cxliii}{cxlix}{cxlvi}{cxvi}{cxxii}{cxxv}{cxxviii}{cxxxi}{cxxxiv}{cxxxvii}{l}{liii}{lix}{lvi}{lxii}{lxv}{lxviii}{lxxi}{lxxiv}{lxxvii}{lxxx}{lxxxiii}{lxxxix}{lxxxvi}{v}{viii}{xcii}{xcv}!
 {xcviii}{xi}{xiv}{xli}{xliv}{xlvii}{xvii}{xx}{xxiii}{xxix}{xxvi}{xxxii}{xxxv}{xxxviii}
 ============================================================

Modified: trunk/l3experimental/l3str/testfiles/m3regex005.luatex.tlg
===================================================================
--- trunk/l3experimental/l3str/testfiles/m3regex005.luatex.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3experimental/l3str/testfiles/m3regex005.luatex.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -280,13 +280,13 @@
 |...............................................
 > Compiled regex {\c {a|b\K }}:
 +-branch
-  Match
-    control sequence
-    +-branch
-      char code 97
-    +-branch
-      char code 98
-      char code 75.
+Match
+control sequence
++-branch
+char code 97
++-branch
+char code 98
+char code 75.
 <recently read> }
 l. ...  }
 {1} {a} 

Modified: trunk/l3experimental/l3str/testfiles/m3regex005.tlg
===================================================================
--- trunk/l3experimental/l3str/testfiles/m3regex005.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3experimental/l3str/testfiles/m3regex005.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -280,13 +280,13 @@
 |...............................................
 > Compiled regex {\c {a|b\K }}:
 +-branch
-  Match
-    control sequence
-    +-branch
-      char code 97
-    +-branch
-      char code 98
-      char code 75.
+Match
+control sequence
++-branch
+char code 97
++-branch
+char code 98
+char code 75.
 <recently read> }
 l. ...  }
 {1} {a} 

Modified: trunk/l3experimental/l3str/testfiles/m3regex007.tlg
===================================================================
--- trunk/l3experimental/l3str/testfiles/m3regex007.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3experimental/l3str/testfiles/m3regex007.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -27,95 +27,95 @@
 *************************************************
 > Compiled regex {a*|b??|(c{0}d{2,}e|[^fg\c [^BE][^\d ]\w ]){2,4}?)}:
 +-branch
-  char code 97, repeated 0 or more times, greedy
+char code 97, repeated 0 or more times, greedy
 +-branch
-  char code 98, repeated between 0 and 1 times, lazy
+char code 98, repeated between 0 and 1 times, lazy
 +-branch
-  ,-group begin
-  | char code 99, repeated 0 times
-  | char code 100, repeated 2 or more times, greedy
-  | char code 101
-  +-branch
-  | Don't match
-  |   char code 102
-  |   char code 103
-  |   categories CMTPUDSLOA, negative class
-  |     range [48,57]
-  |   range [97,122]
-  |   range [65,90]
-  |   range [48,57]
-  |   char code 95
-  `-group end, repeated between 2 and 4 times, lazy
-  char code 41.
+,-group begin
+| char code 99, repeated 0 times
+| char code 100, repeated 2 or more times, greedy
+| char code 101
++-branch
+| Don't match
+|   char code 102
+|   char code 103
+|   categories CMTPUDSLOA, negative class
+|     range [48,57]
+|   range [97,122]
+|   range [65,90]
+|   range [48,57]
+|   char code 95
+`-group end, repeated between 2 and 4 times, lazy
+char code 41.
 <recently read> }
 l. ...  }
 Defining \l_foo_regex on line ...
 > Compiled regex variable \l_foo_regex:
 +-branch
-  assertion: anchor at start (\A)
-  char code 97
+assertion: anchor at start (\A)
+char code 97
 +-branch
-  char code 98
+char code 98
 +-branch.
 <recently read> }
 l. ...  }
 > Compiled regex {a\c {bc}\u {c_space_tl}\c {\u {c_space_tl}|}}:
 +-branch
-  char code 97
-  Match
-    control sequence
-    +-branch
-      char code 98
-      char code 99
-  char 32, catcode 10
-  Match
-    control sequence
-    +-branch
-      char code 32
-    +-branch.
+char code 97
+Match
+control sequence
++-branch
+char code 98
+char code 99
+char 32, catcode 10
+Match
+control sequence
++-branch
+char code 32
++-branch.
 <recently read> }
 l. ...  }
 > Compiled regex {\u {l_tmpa_tl}*\c {\u {l_tmpa_tl}|x?}{3}|y*}:
 +-branch
-  control sequence \abc
-  char code 42
-  Match, repeated 3 times
-    control sequence
-    +-branch
-      char code 92
-      char code 97
-      char code 98
-      char code 99
-      char code 32
-    +-branch
-      char code 120, repeated between 0 and 1 times, greedy
+control sequence \abc
+char code 42
+Match, repeated 3 times
+control sequence
 +-branch
-  char code 121, repeated 0 or more times, greedy.
+char code 92
+char code 97
+char code 98
+char code 99
+char code 32
++-branch
+char code 120, repeated between 0 and 1 times, greedy
++-branch
+char code 121, repeated 0 or more times, greedy.
 <recently read> }
 l. ...  }
 > Compiled regex {a(?:bc(?|de|f){2}g|hi){3,4}?}:
 +-branch
-  char code 97
-  ,-group begin (no capture)
-  | char code 98
-  | char code 99
-  | ,-group begin (resetting)
-  | | char code 100
-  | | char code 101
-  | +-branch
-  | | char code 102
-  | `-group end, repeated 2 times
-  | char code 103
-  +-branch
-  | char code 104
-  | char code 105
-  `-group end, repeated between 3 and 4 times, lazy.
+char code 97
+,-group begin (no capture)
+| char code 98
+| char code 99
+| ,-group begin (resetting)
+| | char code 100
+| | char code 101
+| +-branch
+| | char code 102
+| `-group end, repeated 2 times
+| char code 103
++-branch
+| char code 104
+| char code 105
+`-group end, repeated between 3 and 4 times, lazy.
 <recently read> }
 l. ...  }
 Defining \l_bar_regex on line ...
 > Compiled regex variable \l_bar_regex:
 +-branch
-  Fail.
+Fail.
 <recently read> }
 l. ...  }
 ============================================================
@@ -124,33 +124,33 @@
 ============================================================
 > Compiled regex {[^\d \W \s ]*?[^a-z[:^cntrl:]A-Z]??}:
 +-branch
-  Don't match, repeated 0 or more times, lazy
-    range [48,57]
-    Reversed match
-      range [97,122]
-      range [65,90]
-      range [48,57]
-      char code 95
-    char code 32
-    char code 9
-    char code 10
-    char code 12
-    char code 13
-  Don't match, repeated between 0 and 1 times, lazy
-    range [97,122]
-    Reversed match
-      range [0,31]
-      char code 127
-    range [65,90].
+Don't match, repeated 0 or more times, lazy
+range [48,57]
+Reversed match
+range [97,122]
+range [65,90]
+range [48,57]
+char code 95
+char code 32
+char code 9
+char code 10
+char code 12
+char code 13
+Don't match, repeated between 0 and 1 times, lazy
+range [97,122]
+Reversed match
+range [0,31]
+char code 127
+range [65,90].
 <recently read> }
 l. ...  }
 > Compiled regex {[^\c [^L][^[:^alpha:]]]{2,}?}:
 +-branch
-  Don't match, repeated 2 or more times, lazy
-    categories CBEMTPUDSOA, negative class
-      Reversed match
-        range [97,122]
-        range [65,90].
+Don't match, repeated 2 or more times, lazy
+categories CBEMTPUDSOA, negative class
+Reversed match
+range [97,122]
+range [65,90].
 <recently read> }
 l. ...  }
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -185,14 +185,14 @@
 |...............................................
 > Compiled regex {(a(b|[^}:
 +-branch
-  ,-group begin
-  | char code 97
-  | ,-group begin
-  | | char code 98
-  | +-branch
-  | | Pass
-  | `-group end
-  `-group end.
+,-group begin
+| char code 97
+| ,-group begin
+| | char code 98
+| +-branch
+| | Pass
+| `-group end
+`-group end.
 <recently read> }
 l. ...  }
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -272,24 +272,24 @@
 |...............................................
 > Compiled regex {([\c {([}:
 +-branch
-  ,-group begin
-  | Match
-  |   control sequence
-  |   +-branch
-  |     ,-group begin
-  |     | Fail
-  |     `-group end
-  `-group end.
+,-group begin
+| Match
+|   control sequence
+|   +-branch
+|     ,-group begin
+|     | Fail
+|     `-group end
+`-group end.
 <recently read> }
 l. ...  }
 > Compiled regex {\c {[}{]}}:
 +-branch
-  Match
-    control sequence
-    +-branch
-      Match
-        char code 125
-        char code 123.
+Match
+control sequence
++-branch
+Match
+char code 125
+char code 123.
 <recently read> }
 l. ...  }
 ============================================================
@@ -299,52 +299,52 @@
 > Compiled regex {\A \B \C \D \E \F \G \H \I \J \K \L \M \N \O \P \Q \R \S \T
 \U \V \W \X \Y \Z }:
 +-branch
-  assertion: anchor at start (\A)
-  negative assertion: word boundary
-  char code 67
-  Match
-    Reversed match
-      range [48,57]
-  char code 69
-  char code 70
-  assertion: anchor at start of match (\G)
-  Match
-    Reversed match
-      char code 32
-      char code 9
-  char code 73
-  char code 74
-  reset match start (\K)
-  char code 76
-  char code 77
-  Match
-    Reversed match
-      char code 10
-  char code 79
-  char code 80
-  char code 81
-  char code 82
-  Match
-    Reversed match
-      char code 32
-      char code 9
-      char code 10
-      char code 12
-      char code 13
-  char code 84
-  char code 85
-  Match
-    Reversed match
-      range [10,13]
-  Match
-    Reversed match
-      range [97,122]
-      range [65,90]
-      range [48,57]
-      char code 95
-  char code 88
-  char code 89
-  assertion: anchor at end (\Z).
+assertion: anchor at start (\A)
+negative assertion: word boundary
+char code 67
+Match
+Reversed match
+range [48,57]
+char code 69
+char code 70
+assertion: anchor at start of match (\G)
+Match
+Reversed match
+char code 32
+char code 9
+char code 73
+char code 74
+reset match start (\K)
+char code 76
+char code 77
+Match
+Reversed match
+char code 10
+char code 79
+char code 80
+char code 81
+char code 82
+Match
+Reversed match
+char code 32
+char code 9
+char code 10
+char code 12
+char code 13
+char code 84
+char code 85
+Match
+Reversed match
+range [10,13]
+Match
+Reversed match
+range [97,122]
+range [65,90]
+range [48,57]
+char code 95
+char code 88
+char code 89
+assertion: anchor at end (\Z).
 <recently read> }
 l. ...  }
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -381,56 +381,56 @@
 > Compiled regex {\a \b \c \d \e \f \g \h \i \j \k \l \m \n \o \p \q \r \s \t
 \u \v \w \x \y \z }:
 +-branch
-  char code 7
-  assertion: word boundary
-  range [48,57]
-  char code 27
-  char code 12
-  char code 103
-  Match
-    char code 32
-    char code 9
-  char code 105
-  char code 106
-  char code 107
-  char code 108
-  char code 109
-  char code 10
-  char code 111
-  char code 112
-  char code 113
-  char code 13
-  Match
-    char code 32
-    char code 9
-    char code 10
-    char code 12
-    char code 13
-  char code 9
-  char code 117
-  range [10,13]
-  Match
-    range [97,122]
-    range [65,90]
-    range [48,57]
-    char code 95
-  char code 0
-  char code 121
-  assertion: anchor at end (\Z).
+char code 7
+assertion: word boundary
+range [48,57]
+char code 27
+char code 12
+char code 103
+Match
+char code 32
+char code 9
+char code 105
+char code 106
+char code 107
+char code 108
+char code 109
+char code 10
+char code 111
+char code 112
+char code 113
+char code 13
+Match
+char code 32
+char code 9
+char code 10
+char code 12
+char code 13
+char code 9
+char code 117
+range [10,13]
+Match
+range [97,122]
+range [65,90]
+range [48,57]
+char code 95
+char code 0
+char code 121
+assertion: anchor at end (\Z).
 <recently read> }
 l. ...  }
 > Compiled regex {\0\1\2\3\4\5\6\7\8\9}:
 +-branch
-  char code 48
-  char code 49
-  char code 50
-  char code 51
-  char code 52
-  char code 53
-  char code 54
-  char code 55
-  char code 56
-  char code 57.
+char code 48
+char code 49
+char code 50
+char code 51
+char code 52
+char code 53
+char code 54
+char code 55
+char code 56
+char code 57.
 <recently read> }
 l. ...  }
 ============================================================

Modified: trunk/l3experimental/l3str/testfiles/m3regex009.tlg
===================================================================
--- trunk/l3experimental/l3str/testfiles/m3regex009.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3experimental/l3str/testfiles/m3regex009.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -901,7 +901,7 @@
 |...............................................
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Erroneous variable \csname\endcsnameused!
+Erroneous variable \csname\endcsnameused!
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -911,7 +911,7 @@
 "\u{not_defined}"
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Erroneous variable \not_defined used!
+Erroneous variable \not_defined used!
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -990,7 +990,7 @@
 |...............................................
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Erroneous variable \csname\endcsnameused!
+Erroneous variable \csname\endcsnameused!
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have

Modified: trunk/l3experimental/l3str/testfiles/m3regex010.luatex.tlg
===================================================================
--- trunk/l3experimental/l3str/testfiles/m3regex010.luatex.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3experimental/l3str/testfiles/m3regex010.luatex.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -22,8 +22,8 @@
 ============================================================
 > Compiled regex {\\^^A}:
 +-branch
-  char code 92
-  char code 1.
+char code 92
+char code 1.
 <recently read> }
 l. ...  }
 ============================================================

Modified: trunk/l3experimental/l3str/testfiles/m3regex010.tlg
===================================================================
--- trunk/l3experimental/l3str/testfiles/m3regex010.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3experimental/l3str/testfiles/m3regex010.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -22,8 +22,8 @@
 ============================================================
 > Compiled regex {\^^@\^^A}:
 +-branch
-  char code 0
-  char code 1.
+char code 0
+char code 1.
 <recently read> }
 l. ...  }
 ============================================================

Modified: trunk/l3experimental/l3str/testfiles/m3str-format001.tlg
===================================================================
--- trunk/l3experimental/l3str/testfiles/m3str-format001.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3experimental/l3str/testfiles/m3str-format001.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -56,7 +56,7 @@
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid alignment '=' for type 'tl'.
+Invalid alignment '=' for type 'tl'.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -65,7 +65,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid sign '+' for type 'tl'.
+Invalid sign '+' for type 'tl'.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -74,7 +74,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid sign ' ' for type 'tl'.
+Invalid sign ' ' for type 'tl'.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -83,7 +83,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid sign '-' for type 'tl'.
+Invalid sign '-' for type 'tl'.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -92,7 +92,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid style '-' for type 'tl'.
+Invalid style '-' for type 'tl'.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -101,7 +101,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid style '.' for type 'tl'.
+Invalid style '.' for type 'tl'.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -110,7 +110,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid sign '+' for type 'tl'.
+Invalid sign '+' for type 'tl'.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -119,7 +119,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid style 't' for type 'tl'.
+Invalid style 't' for type 'tl'.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have

Modified: trunk/l3experimental/xcoffins/testfiles/xcoffins002.luatex.tlg
===================================================================
--- trunk/l3experimental/xcoffins/testfiles/xcoffins002.luatex.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3experimental/xcoffins/testfiles/xcoffins002.luatex.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -49,7 +49,7 @@
 .\pdfcolorstack 0 pop
 ! OK.
 <argument> \SetHorizontalCoffin \aaa {A}\showbox \aaa 
-                                           \ShowCoffinStructure \aaa \SetVertic
+\ShowCoffinStructure \aaa \SetVertic
 l. ...}
 Size of coffin \aaa:
 > ht = 6.83331pt
@@ -82,7 +82,7 @@
 ..\glue(\rightskip) 0.0
 ! OK.
 <argument> ... \SetVerticalCoffin \bbb {1cm}{A}\showbox \bbb 
-                                                  \ShowCoffinStructure \bbb 
+\ShowCoffinStructure \bbb 
 l. ...}
 Size of coffin \bbb:
 > ht = 6.83331pt

Modified: trunk/l3experimental/xcoffins/testfiles/xcoffins002.ptex.tlg
===================================================================
--- trunk/l3experimental/xcoffins/testfiles/xcoffins002.ptex.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3experimental/xcoffins/testfiles/xcoffins002.ptex.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -49,7 +49,7 @@
 .\special{color pop}
 ! OK.
 <argument> ...izontalCoffin \aaa {A}\showbox \aaa 
-                                                  \ShowCoffinStructure \aaa ...
+\ShowCoffinStructure \aaa ...
 l. ...}
 Size of coffin \aaa:
 > ht = 6.83331pt
@@ -77,7 +77,7 @@
 ..\glue(\rightskip) 0.0
 ! OK.
 <argument> ...alCoffin \bbb {1cm}{A}\showbox \bbb 
-                                                  \ShowCoffinStructure \bbb 
+\ShowCoffinStructure \bbb 
 l. ...}
 Size of coffin \bbb:
 > ht = 6.83331pt

Modified: trunk/l3experimental/xcoffins/testfiles/xcoffins002.tlg
===================================================================
--- trunk/l3experimental/xcoffins/testfiles/xcoffins002.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3experimental/xcoffins/testfiles/xcoffins002.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -49,7 +49,7 @@
 .\pdfcolorstack 0 pop
 ! OK.
 <argument> ...izontalCoffin \aaa {A}\showbox \aaa 
-                                                  \ShowCoffinStructure \aaa ...
+\ShowCoffinStructure \aaa ...
 l. ...}
 Size of coffin \aaa:
 > ht = 6.83331pt
@@ -77,7 +77,7 @@
 ..\glue(\rightskip) 0.0
 ! OK.
 <argument> ...alCoffin \bbb {1cm}{A}\showbox \bbb 
-                                                  \ShowCoffinStructure \bbb 
+\ShowCoffinStructure \bbb 
 l. ...}
 Size of coffin \bbb:
 > ht = 6.83331pt

Modified: trunk/l3experimental/xcoffins/testfiles/xcoffins002.uptex.tlg
===================================================================
--- trunk/l3experimental/xcoffins/testfiles/xcoffins002.uptex.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3experimental/xcoffins/testfiles/xcoffins002.uptex.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -49,7 +49,7 @@
 .\special{color pop}
 ! OK.
 <argument> ...izontalCoffin \aaa {A}\showbox \aaa 
-                                                  \ShowCoffinStructure \aaa ...
+\ShowCoffinStructure \aaa ...
 l. ...}
 Size of coffin \aaa:
 > ht = 6.83331pt
@@ -77,7 +77,7 @@
 ..\glue(\rightskip) 0.0
 ! OK.
 <argument> ...alCoffin \bbb {1cm}{A}\showbox \bbb 
-                                                  \ShowCoffinStructure \bbb 
+\ShowCoffinStructure \bbb 
 l. ...}
 Size of coffin \bbb:
 > ht = 6.83331pt

Modified: trunk/l3experimental/xcoffins/testfiles/xcoffins002.xetex.tlg
===================================================================
--- trunk/l3experimental/xcoffins/testfiles/xcoffins002.xetex.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3experimental/xcoffins/testfiles/xcoffins002.xetex.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -49,7 +49,7 @@
 .\special{color pop}
 ! OK.
 <argument> ...izontalCoffin \aaa {A}\showbox \aaa 
-                                                  \ShowCoffinStructure \aaa ...
+\ShowCoffinStructure \aaa ...
 l. ...}
 Size of coffin \aaa:
 > ht = 6.83331pt
@@ -77,7 +77,7 @@
 ..\glue(\rightskip) 0.0
 ! OK.
 <argument> ...alCoffin \bbb {1cm}{A}\showbox \bbb 
-                                                  \ShowCoffinStructure \bbb 
+\ShowCoffinStructure \bbb 
 l. ...}
 Size of coffin \bbb:
 > ht = 6.83331pt

Modified: trunk/l3experimental/xcoffins/testfiles/xcoffins003.luatex.tlg
===================================================================
--- trunk/l3experimental/xcoffins/testfiles/xcoffins003.luatex.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3experimental/xcoffins/testfiles/xcoffins003.luatex.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -198,7 +198,7 @@
 ..\mathoff
 ! OK.
 <argument> \showbox \aaa 
-              x\fbox {\usebox \aaa }\RotateCoffin \aaa {45}\showbox \aaa x\fbox
+x\fbox {\usebox \aaa }\RotateCoffin \aaa {45}\showbox \aaa x\fbox
 l. ...}
 > \box71=
 \hbox(0.0+0.0)x0.0, direction TLT
@@ -389,7 +389,7 @@
 .....\pdfrestore
 ! OK.
 <argument> ...box \aaa }\RotateCoffin \aaa {45}\showbox \aaa 
-                                                  x\fbox {\usebox \aaa }\Rot...
+x\fbox {\usebox \aaa }\Rot...
 l. ...}
 > \box71=
 \hbox(0.0+0.0)x0.0, direction TLT
@@ -591,7 +591,7 @@
 .....\pdfrestore
 ! OK.
 <argument> ...box \aaa }\RotateCoffin \aaa {45}\showbox \aaa 
-                                                  x\fbox {\usebox \aaa }
+x\fbox {\usebox \aaa }
 l. ...}
 ============================================================
 ============================================================
@@ -892,7 +892,7 @@
 ...\pdfcolorstack 0 pop
 ! OK.
 <argument> ...s \aaa [b,l]\bbb [B,hc](30pt,0pt)\showbox \aaa 
-                                                  x\fbox {\usebox \aaa }x
+x\fbox {\usebox \aaa }x
 l. ...}
 ============================================================
 ============================================================

Modified: trunk/l3experimental/xcoffins/testfiles/xcoffins003.ptex.tlg
===================================================================
--- trunk/l3experimental/xcoffins/testfiles/xcoffins003.ptex.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3experimental/xcoffins/testfiles/xcoffins003.ptex.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -178,7 +178,7 @@
 ..\mathoff
 ! OK.
 <argument> \showbox \aaa 
-                         x\fbox {\usebox \aaa }\RotateCoffin \aaa {45}\showb...
+x\fbox {\usebox \aaa }\RotateCoffin \aaa {45}\showb...
 l. ...}
 > \box71=
 \hbox(0.0+0.0)x0.0
@@ -349,7 +349,7 @@
 .....\special{pdf:literal Q}
 ! OK.
 <argument> ...RotateCoffin \aaa {45}\showbox \aaa 
-                                                  x\fbox {\usebox \aaa }\Rot...
+x\fbox {\usebox \aaa }\Rot...
 l. ...}
 > \box71=
 \hbox(0.0+0.0)x0.0
@@ -531,7 +531,7 @@
 .....\special{pdf:literal Q}
 ! OK.
 <argument> ...RotateCoffin \aaa {45}\showbox \aaa 
-                                                  x\fbox {\usebox \aaa }
+x\fbox {\usebox \aaa }
 l. ...}
 ============================================================
 ============================================================
@@ -569,8 +569,7 @@
 ...................\kern 35.7089
 ...................\hbox(50.5+45.5)x0.0
 ....................\special{pdf:literal q}
-....................\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 c
-m}
+....................\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
 ....................\hbox(50.5+45.5)x0.0
 .....................\hbox(50.5+45.5)x62.2222
 ......................\hbox(50.5+45.5)x62.2222
@@ -809,7 +808,7 @@
 ...\special{color pop}
 ! OK.
 <argument> ...]\bbb [B,hc](30pt,0pt)\showbox \aaa 
-                                                  x\fbox {\usebox \aaa }x
+x\fbox {\usebox \aaa }x
 l. ...}
 ============================================================
 ============================================================

Modified: trunk/l3experimental/xcoffins/testfiles/xcoffins003.tlg
===================================================================
--- trunk/l3experimental/xcoffins/testfiles/xcoffins003.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3experimental/xcoffins/testfiles/xcoffins003.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -178,7 +178,7 @@
 ..\mathoff
 ! OK.
 <argument> \showbox \aaa 
-                         x\fbox {\usebox \aaa }\RotateCoffin \aaa {45}\showb...
+x\fbox {\usebox \aaa }\RotateCoffin \aaa {45}\showb...
 l. ...}
 > \box71=
 \hbox(0.0+0.0)x0.0
@@ -349,7 +349,7 @@
 .....\pdfrestore
 ! OK.
 <argument> ...RotateCoffin \aaa {45}\showbox \aaa 
-                                                  x\fbox {\usebox \aaa }\Rot...
+x\fbox {\usebox \aaa }\Rot...
 l. ...}
 > \box71=
 \hbox(0.0+0.0)x0.0
@@ -531,7 +531,7 @@
 .....\pdfrestore
 ! OK.
 <argument> ...RotateCoffin \aaa {45}\showbox \aaa 
-                                                  x\fbox {\usebox \aaa }
+x\fbox {\usebox \aaa }
 l. ...}
 ============================================================
 ============================================================
@@ -808,7 +808,7 @@
 ...\pdfcolorstack 0 pop
 ! OK.
 <argument> ...]\bbb [B,hc](30pt,0pt)\showbox \aaa 
-                                                  x\fbox {\usebox \aaa }x
+x\fbox {\usebox \aaa }x
 l. ...}
 ============================================================
 ============================================================

Modified: trunk/l3experimental/xcoffins/testfiles/xcoffins003.uptex.tlg
===================================================================
--- trunk/l3experimental/xcoffins/testfiles/xcoffins003.uptex.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3experimental/xcoffins/testfiles/xcoffins003.uptex.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -178,7 +178,7 @@
 ..\mathoff
 ! OK.
 <argument> \showbox \aaa 
-                         x\fbox {\usebox \aaa }\RotateCoffin \aaa {45}\showb...
+x\fbox {\usebox \aaa }\RotateCoffin \aaa {45}\showb...
 l. ...}
 > \box71=
 \hbox(0.0+0.0)x0.0
@@ -349,7 +349,7 @@
 .....\special{pdf:literal Q}
 ! OK.
 <argument> ...RotateCoffin \aaa {45}\showbox \aaa 
-                                                  x\fbox {\usebox \aaa }\Rot...
+x\fbox {\usebox \aaa }\Rot...
 l. ...}
 > \box71=
 \hbox(0.0+0.0)x0.0
@@ -531,7 +531,7 @@
 .....\special{pdf:literal Q}
 ! OK.
 <argument> ...RotateCoffin \aaa {45}\showbox \aaa 
-                                                  x\fbox {\usebox \aaa }
+x\fbox {\usebox \aaa }
 l. ...}
 ============================================================
 ============================================================
@@ -569,8 +569,7 @@
 ...................\kern 35.7089
 ...................\hbox(50.5+45.5)x0.0
 ....................\special{pdf:literal q}
-....................\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 c
-m}
+....................\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
 ....................\hbox(50.5+45.5)x0.0
 .....................\hbox(50.5+45.5)x62.2222
 ......................\hbox(50.5+45.5)x62.2222
@@ -809,7 +808,7 @@
 ...\special{color pop}
 ! OK.
 <argument> ...]\bbb [B,hc](30pt,0pt)\showbox \aaa 
-                                                  x\fbox {\usebox \aaa }x
+x\fbox {\usebox \aaa }x
 l. ...}
 ============================================================
 ============================================================

Modified: trunk/l3experimental/xcoffins/testfiles/xcoffins003.xetex.tlg
===================================================================
--- trunk/l3experimental/xcoffins/testfiles/xcoffins003.xetex.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3experimental/xcoffins/testfiles/xcoffins003.xetex.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -178,7 +178,7 @@
 ..\mathoff
 ! OK.
 <argument> \showbox \aaa 
-                         x\fbox {\usebox \aaa }\RotateCoffin \aaa {45}\showb...
+x\fbox {\usebox \aaa }\RotateCoffin \aaa {45}\showb...
 l. ...}
 > \box71=
 \hbox(0.0+0.0)x0.0
@@ -349,7 +349,7 @@
 .....\special{pdf:literal Q}
 ! OK.
 <argument> ...RotateCoffin \aaa {45}\showbox \aaa 
-                                                  x\fbox {\usebox \aaa }\Rot...
+x\fbox {\usebox \aaa }\Rot...
 l. ...}
 > \box71=
 \hbox(0.0+0.0)x0.0
@@ -531,7 +531,7 @@
 .....\special{pdf:literal Q}
 ! OK.
 <argument> ...RotateCoffin \aaa {45}\showbox \aaa 
-                                                  x\fbox {\usebox \aaa }
+x\fbox {\usebox \aaa }
 l. ...}
 ============================================================
 ============================================================
@@ -569,8 +569,7 @@
 ...................\kern 35.7089
 ...................\hbox(50.5+45.5)x0.0
 ....................\special{pdf:literal q}
-....................\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 c
-m}
+....................\special{pdf:literal 0.70711 0.70711 -0.70711 0.70711 0 0 cm}
 ....................\hbox(50.5+45.5)x0.0
 .....................\hbox(50.5+45.5)x62.2222
 ......................\hbox(50.5+45.5)x62.2222
@@ -809,7 +808,7 @@
 ...\special{color pop}
 ! OK.
 <argument> ...]\bbb [B,hc](30pt,0pt)\showbox \aaa 
-                                                  x\fbox {\usebox \aaa }x
+x\fbox {\usebox \aaa }x
 l. ...}
 ============================================================
 ============================================================

Modified: trunk/l3kernel/testfiles/d3dvips.luatex.tlg
===================================================================
--- trunk/l3kernel/testfiles/d3dvips.luatex.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/d3dvips.luatex.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -206,7 +206,7 @@
 ..\hbox(6.94444+0.0)x50.02786, direction TLT
 ...\special{ps:gsave}
 ...\special{ps:currentpoint currentpoint translate -30 rotate neg exch neg exch
- t\ETC.}
+t\ETC.}
 ...\hbox(6.94444+0.0)x50.02786, direction TLT
 ....\hbox(6.94444+0.0)x50.02786, direction TLT
 .....\OT1/cmr/m/n/10 H
@@ -232,7 +232,7 @@
 ..\hbox(6.94444+0.0)x50.02786, direction TLT
 ...\special{ps:gsave}
 ...\special{ps:currentpoint currentpoint translate -45 rotate neg exch neg exch
- t\ETC.}
+t\ETC.}
 ...\hbox(6.94444+0.0)x50.02786, direction TLT
 ....\hbox(6.94444+0.0)x50.02786, direction TLT
 .....\OT1/cmr/m/n/10 H
@@ -336,7 +336,7 @@
 ..\hbox(40.2855+0.0)x40.2855, direction TLT
 ...\special{ps:gsave}
 ...\special{ps:currentpoint currentpoint translate -45 rotate neg exch neg exch
- t\ETC.}
+t\ETC.}
 ...\hbox(40.2855+0.0)x40.2855, direction TLT
 ....\hbox(40.2855+0.0)x40.2855, direction TLT
 .....\hbox(40.2855+0.0)x40.2855, direction TLT
@@ -448,7 +448,7 @@
 ..\hbox(2.31477+0.0)x50.02786, direction TLT
 ...\special{ps:gsave}
 ...\special{ps:currentpoint currentpoint translate 1 0.33333 scale neg exch neg
- e\ETC.}
+e\ETC.}
 ...\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil, direction TLT
 ....\hbox(6.94444+0.0)x50.02786, direction TLT
 .....\OT1/cmr/m/n/10 H

Modified: trunk/l3kernel/testfiles/d3dvips.tlg
===================================================================
--- trunk/l3kernel/testfiles/d3dvips.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/d3dvips.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -23,8 +23,7 @@
 > \box27=
 \hbox(6.94444+1.0)x86.45851
 .\special{ps:gsave}
-.\special{ps:currentpoint currentpoint translate /savedmatrix matrix currentmat
-\ETC.}
+.\special{ps:currentpoint currentpoint translate /savedmatrix matrix currentmat\ETC.}
 .\hbox(6.94444+1.0)x0.0, glue set - 86.45851fil
 ..\hbox(6.94444+1.0)x86.45851
 ...\OT1/cmr/m/n/10 G
@@ -54,8 +53,7 @@
 > \box27=
 \hbox(6.94444+0.0)x86.45851
 .\special{ps:gsave}
-.\special{ps:currentpoint currentpoint translate /savedmatrix matrix currentmat
-\ETC.}
+.\special{ps:currentpoint currentpoint translate /savedmatrix matrix currentmat\ETC.}
 .\hbox(6.94444+0.0)x0.0, glue set - 86.45851fil
 ..\hbox(6.94444+0.0)x86.45851
 ...\OT1/cmr/m/n/10 G
@@ -85,8 +83,7 @@
 > \box27=
 \hbox(6.94444+1.0)x86.45851
 .\special{ps:gsave}
-.\special{ps:currentpoint currentpoint translate /savedmatrix matrix currentmat
-\ETC.}
+.\special{ps:currentpoint currentpoint translate /savedmatrix matrix currentmat\ETC.}
 .\hbox(6.94444+1.0)x0.0, glue set - 86.45851fil
 ..\hbox(6.94444+1.0)x86.45851
 ...\OT1/cmr/m/n/10 G
@@ -116,8 +113,7 @@
 > \box27=
 \hbox(6.94444+1.94444)x20.0
 .\special{ps:gsave}
-.\special{ps:currentpoint currentpoint translate /savedmatrix matrix currentmat
-\ETC.}
+.\special{ps:currentpoint currentpoint translate /savedmatrix matrix currentmat\ETC.}
 .\hbox(6.94444+1.94444)x0.0, glue set - 20.0fil
 ..\hbox(6.94444+1.94444)x20.0
 ...\OT1/cmr/m/n/10 G
@@ -171,8 +167,7 @@
 ..\kern 0.0
 ..\hbox(6.94444+0.0)x50.02786
 ...\special{ps:gsave}
-...\special{ps:currentpoint currentpoint translate 0 rotate neg exch neg exch t
-ra\ETC.}
+...\special{ps:currentpoint currentpoint translate 0 rotate neg exch neg exch tra\ETC.}
 ...\hbox(6.94444+0.0)x50.02786
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
@@ -197,8 +192,7 @@
 ..\kern 3.47223
 ..\hbox(6.94444+0.0)x50.02786
 ...\special{ps:gsave}
-...\special{ps:currentpoint currentpoint translate -30 rotate neg exch neg exch
- t\ETC.}
+...\special{ps:currentpoint currentpoint translate -30 rotate neg exch neg exch t\ETC.}
 ...\hbox(6.94444+0.0)x50.02786
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
@@ -223,8 +217,7 @@
 ..\kern 4.91046
 ..\hbox(6.94444+0.0)x50.02786
 ...\special{ps:gsave}
-...\special{ps:currentpoint currentpoint translate -45 rotate neg exch neg exch
- t\ETC.}
+...\special{ps:currentpoint currentpoint translate -45 rotate neg exch neg exch t\ETC.}
 ...\hbox(6.94444+0.0)x50.02786
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
@@ -249,8 +242,7 @@
 ..\kern 40.2855
 ..\hbox(6.94444+0.0)x50.02786
 ...\special{ps:gsave}
-...\special{ps:currentpoint currentpoint translate -135 rotate neg exch neg exc
-h \ETC.}
+...\special{ps:currentpoint currentpoint translate -135 rotate neg exch neg exch \ETC.}
 ...\hbox(6.94444+0.0)x50.02786
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
@@ -275,8 +267,7 @@
 ..\kern 35.37505
 ..\hbox(6.94444+0.0)x50.02786
 ...\special{ps:gsave}
-...\special{ps:currentpoint currentpoint translate -225 rotate neg exch neg exc
-h \ETC.}
+...\special{ps:currentpoint currentpoint translate -225 rotate neg exch neg exch \ETC.}
 ...\hbox(6.94444+0.0)x50.02786
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
@@ -301,8 +292,7 @@
 ..\kern 0.0
 ..\hbox(6.94444+0.0)x50.02786
 ...\special{ps:gsave}
-...\special{ps:currentpoint currentpoint translate -315 rotate neg exch neg exc
-h \ETC.}
+...\special{ps:currentpoint currentpoint translate -315 rotate neg exch neg exch \ETC.}
 ...\hbox(6.94444+0.0)x50.02786
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
@@ -327,16 +317,14 @@
 ..\kern 28.48616
 ..\hbox(40.2855+0.0)x40.2855
 ...\special{ps:gsave}
-...\special{ps:currentpoint currentpoint translate -45 rotate neg exch neg exch
- t\ETC.}
+...\special{ps:currentpoint currentpoint translate -45 rotate neg exch neg exch t\ETC.}
 ...\hbox(40.2855+0.0)x40.2855
 ....\hbox(40.2855+0.0)x40.2855
 .....\hbox(40.2855+0.0)x40.2855
 ......\kern 4.91046
 ......\hbox(6.94444+0.0)x50.02786
 .......\special{ps:gsave}
-.......\special{ps:currentpoint currentpoint translate -45 rotate neg exch neg 
-exch t\ETC.}
+.......\special{ps:currentpoint currentpoint translate -45 rotate neg exch neg exch t\ETC.}
 .......\hbox(6.94444+0.0)x50.02786
 ........\hbox(6.94444+0.0)x50.02786
 .........\OT1/cmr/m/n/10 H
@@ -383,8 +371,7 @@
 ..\kern 0.0
 ..\hbox(6.94444+0.0)x50.02786
 ...\special{ps:gsave}
-...\special{ps:currentpoint currentpoint translate 1 1 scale neg exch neg exch 
-tr\ETC.}
+...\special{ps:currentpoint currentpoint translate 1 1 scale neg exch neg exch tr\ETC.}
 ...\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
@@ -411,8 +398,7 @@
 ..\kern 0.0
 ..\hbox(6.94444+0.0)x125.06966
 ...\special{ps:gsave}
-...\special{ps:currentpoint currentpoint translate 2.5 1 scale neg exch neg exc
-h \ETC.}
+...\special{ps:currentpoint currentpoint translate 2.5 1 scale neg exch neg exch \ETC.}
 ...\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
@@ -439,8 +425,7 @@
 ..\kern 0.0
 ..\hbox(2.31477+0.0)x50.02786
 ...\special{ps:gsave}
-...\special{ps:currentpoint currentpoint translate 1 0.33333 scale neg exch neg
- e\ETC.}
+...\special{ps:currentpoint currentpoint translate 1 0.33333 scale neg exch neg e\ETC.}
 ...\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
@@ -467,8 +452,7 @@
 ..\kern 0.0
 ..\hbox(6.94444+1.94444)x103.61133
 ...\special{ps:gsave}
-...\special{ps:currentpoint currentpoint translate 1 1 scale neg exch neg exch 
-tr\ETC.}
+...\special{ps:currentpoint currentpoint translate 1 1 scale neg exch neg exch tr\ETC.}
 ...\hbox(6.94444+1.94444)x0.0, glue set - 103.61133fil
 ....\hbox(6.94444+1.94444)x103.61133
 .....\OT1/cmr/m/n/10 T
@@ -506,8 +490,7 @@
 ..\kern 0.0
 ..\hbox(20.83333+5.83333)x310.83398
 ...\special{ps:gsave}
-...\special{ps:currentpoint currentpoint translate 3 3 scale neg exch neg exch 
-tr\ETC.}
+...\special{ps:currentpoint currentpoint translate 3 3 scale neg exch neg exch tr\ETC.}
 ...\hbox(6.94444+1.94444)x0.0, glue set - 103.61133fil
 ....\hbox(6.94444+1.94444)x103.61133
 .....\OT1/cmr/m/n/10 T
@@ -545,8 +528,7 @@
 ..\kern 310.83398
 ..\hbox(5.83333+20.83333)x0.0
 ...\special{ps:gsave}
-...\special{ps:currentpoint currentpoint translate -3 -3 scale neg exch neg exc
-h \ETC.}
+...\special{ps:currentpoint currentpoint translate -3 -3 scale neg exch neg exch \ETC.}
 ...\hbox(6.94444+1.94444)x0.0, glue set - 103.61133fil
 ....\hbox(6.94444+1.94444)x103.61133
 .....\OT1/cmr/m/n/10 T

Modified: trunk/l3kernel/testfiles/d3pdfmode.ptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/d3pdfmode.ptex.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/d3pdfmode.ptex.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -23,8 +23,7 @@
 > \box42=
 \hbox(6.94444+1.0)x86.45851
 .\special{ps:gsave}
-.\special{ps:currentpoint currentpoint translate /savedmatrix matrix currentmat
-\ETC.}
+.\special{ps:currentpoint currentpoint translate /savedmatrix matrix currentmat\ETC.}
 .\hbox(6.94444+1.0)x0.0, glue set - 86.45851fil
 ..\hbox(6.94444+1.0)x86.45851
 ...\OT1/cmr/m/n/10 G
@@ -54,8 +53,7 @@
 > \box42=
 \hbox(6.94444+0.0)x86.45851
 .\special{ps:gsave}
-.\special{ps:currentpoint currentpoint translate /savedmatrix matrix currentmat
-\ETC.}
+.\special{ps:currentpoint currentpoint translate /savedmatrix matrix currentmat\ETC.}
 .\hbox(6.94444+0.0)x0.0, glue set - 86.45851fil
 ..\hbox(6.94444+0.0)x86.45851
 ...\OT1/cmr/m/n/10 G
@@ -85,8 +83,7 @@
 > \box42=
 \hbox(6.94444+1.0)x86.45851
 .\special{ps:gsave}
-.\special{ps:currentpoint currentpoint translate /savedmatrix matrix currentmat
-\ETC.}
+.\special{ps:currentpoint currentpoint translate /savedmatrix matrix currentmat\ETC.}
 .\hbox(6.94444+1.0)x0.0, glue set - 86.45851fil
 ..\hbox(6.94444+1.0)x86.45851
 ...\OT1/cmr/m/n/10 G
@@ -116,8 +113,7 @@
 > \box42=
 \hbox(6.94444+1.94444)x20.0
 .\special{ps:gsave}
-.\special{ps:currentpoint currentpoint translate /savedmatrix matrix currentmat
-\ETC.}
+.\special{ps:currentpoint currentpoint translate /savedmatrix matrix currentmat\ETC.}
 .\hbox(6.94444+1.94444)x0.0, glue set - 20.0fil
 ..\hbox(6.94444+1.94444)x20.0
 ...\OT1/cmr/m/n/10 G
@@ -171,8 +167,7 @@
 ..\kern 0.0
 ..\hbox(6.94444+0.0)x50.02786
 ...\special{ps:gsave}
-...\special{ps:currentpoint currentpoint translate 0 rotate neg exch neg exch t
-ra\ETC.}
+...\special{ps:currentpoint currentpoint translate 0 rotate neg exch neg exch tra\ETC.}
 ...\hbox(6.94444+0.0)x50.02786
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
@@ -197,8 +192,7 @@
 ..\kern 3.47223
 ..\hbox(6.94444+0.0)x50.02786
 ...\special{ps:gsave}
-...\special{ps:currentpoint currentpoint translate -30 rotate neg exch neg exch
- t\ETC.}
+...\special{ps:currentpoint currentpoint translate -30 rotate neg exch neg exch t\ETC.}
 ...\hbox(6.94444+0.0)x50.02786
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
@@ -223,8 +217,7 @@
 ..\kern 4.91046
 ..\hbox(6.94444+0.0)x50.02786
 ...\special{ps:gsave}
-...\special{ps:currentpoint currentpoint translate -45 rotate neg exch neg exch
- t\ETC.}
+...\special{ps:currentpoint currentpoint translate -45 rotate neg exch neg exch t\ETC.}
 ...\hbox(6.94444+0.0)x50.02786
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
@@ -249,8 +242,7 @@
 ..\kern 40.2855
 ..\hbox(6.94444+0.0)x50.02786
 ...\special{ps:gsave}
-...\special{ps:currentpoint currentpoint translate -135 rotate neg exch neg exc
-h \ETC.}
+...\special{ps:currentpoint currentpoint translate -135 rotate neg exch neg exch \ETC.}
 ...\hbox(6.94444+0.0)x50.02786
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
@@ -275,8 +267,7 @@
 ..\kern 35.37505
 ..\hbox(6.94444+0.0)x50.02786
 ...\special{ps:gsave}
-...\special{ps:currentpoint currentpoint translate -225 rotate neg exch neg exc
-h \ETC.}
+...\special{ps:currentpoint currentpoint translate -225 rotate neg exch neg exch \ETC.}
 ...\hbox(6.94444+0.0)x50.02786
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
@@ -301,8 +292,7 @@
 ..\kern 0.0
 ..\hbox(6.94444+0.0)x50.02786
 ...\special{ps:gsave}
-...\special{ps:currentpoint currentpoint translate -315 rotate neg exch neg exc
-h \ETC.}
+...\special{ps:currentpoint currentpoint translate -315 rotate neg exch neg exch \ETC.}
 ...\hbox(6.94444+0.0)x50.02786
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
@@ -327,16 +317,14 @@
 ..\kern 28.48616
 ..\hbox(40.2855+0.0)x40.2855
 ...\special{ps:gsave}
-...\special{ps:currentpoint currentpoint translate -45 rotate neg exch neg exch
- t\ETC.}
+...\special{ps:currentpoint currentpoint translate -45 rotate neg exch neg exch t\ETC.}
 ...\hbox(40.2855+0.0)x40.2855
 ....\hbox(40.2855+0.0)x40.2855
 .....\hbox(40.2855+0.0)x40.2855
 ......\kern 4.91046
 ......\hbox(6.94444+0.0)x50.02786
 .......\special{ps:gsave}
-.......\special{ps:currentpoint currentpoint translate -45 rotate neg exch neg 
-exch t\ETC.}
+.......\special{ps:currentpoint currentpoint translate -45 rotate neg exch neg exch t\ETC.}
 .......\hbox(6.94444+0.0)x50.02786
 ........\hbox(6.94444+0.0)x50.02786
 .........\OT1/cmr/m/n/10 H
@@ -383,8 +371,7 @@
 ..\kern 0.0
 ..\hbox(6.94444+0.0)x50.02786
 ...\special{ps:gsave}
-...\special{ps:currentpoint currentpoint translate 1 1 scale neg exch neg exch 
-tr\ETC.}
+...\special{ps:currentpoint currentpoint translate 1 1 scale neg exch neg exch tr\ETC.}
 ...\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
@@ -411,8 +398,7 @@
 ..\kern 0.0
 ..\hbox(6.94444+0.0)x125.06966
 ...\special{ps:gsave}
-...\special{ps:currentpoint currentpoint translate 2.5 1 scale neg exch neg exc
-h \ETC.}
+...\special{ps:currentpoint currentpoint translate 2.5 1 scale neg exch neg exch \ETC.}
 ...\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
@@ -439,8 +425,7 @@
 ..\kern 0.0
 ..\hbox(2.31477+0.0)x50.02786
 ...\special{ps:gsave}
-...\special{ps:currentpoint currentpoint translate 1 0.33333 scale neg exch neg
- e\ETC.}
+...\special{ps:currentpoint currentpoint translate 1 0.33333 scale neg exch neg e\ETC.}
 ...\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
@@ -467,8 +452,7 @@
 ..\kern 0.0
 ..\hbox(6.94444+1.94444)x103.61133
 ...\special{ps:gsave}
-...\special{ps:currentpoint currentpoint translate 1 1 scale neg exch neg exch 
-tr\ETC.}
+...\special{ps:currentpoint currentpoint translate 1 1 scale neg exch neg exch tr\ETC.}
 ...\hbox(6.94444+1.94444)x0.0, glue set - 103.61133fil
 ....\hbox(6.94444+1.94444)x103.61133
 .....\OT1/cmr/m/n/10 T
@@ -506,8 +490,7 @@
 ..\kern 0.0
 ..\hbox(20.83333+5.83333)x310.83398
 ...\special{ps:gsave}
-...\special{ps:currentpoint currentpoint translate 3 3 scale neg exch neg exch 
-tr\ETC.}
+...\special{ps:currentpoint currentpoint translate 3 3 scale neg exch neg exch tr\ETC.}
 ...\hbox(6.94444+1.94444)x0.0, glue set - 103.61133fil
 ....\hbox(6.94444+1.94444)x103.61133
 .....\OT1/cmr/m/n/10 T
@@ -545,8 +528,7 @@
 ..\kern 310.83398
 ..\hbox(5.83333+20.83333)x0.0
 ...\special{ps:gsave}
-...\special{ps:currentpoint currentpoint translate -3 -3 scale neg exch neg exc
-h \ETC.}
+...\special{ps:currentpoint currentpoint translate -3 -3 scale neg exch neg exch \ETC.}
 ...\hbox(6.94444+1.94444)x0.0, glue set - 103.61133fil
 ....\hbox(6.94444+1.94444)x103.61133
 .....\OT1/cmr/m/n/10 T

Modified: trunk/l3kernel/testfiles/d3pdfmode.uptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/d3pdfmode.uptex.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/d3pdfmode.uptex.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -23,8 +23,7 @@
 > \box42=
 \hbox(6.94444+1.0)x86.45851
 .\special{ps:gsave}
-.\special{ps:currentpoint currentpoint translate /savedmatrix matrix currentmat
-\ETC.}
+.\special{ps:currentpoint currentpoint translate /savedmatrix matrix currentmat\ETC.}
 .\hbox(6.94444+1.0)x0.0, glue set - 86.45851fil
 ..\hbox(6.94444+1.0)x86.45851
 ...\OT1/cmr/m/n/10 G
@@ -54,8 +53,7 @@
 > \box42=
 \hbox(6.94444+0.0)x86.45851
 .\special{ps:gsave}
-.\special{ps:currentpoint currentpoint translate /savedmatrix matrix currentmat
-\ETC.}
+.\special{ps:currentpoint currentpoint translate /savedmatrix matrix currentmat\ETC.}
 .\hbox(6.94444+0.0)x0.0, glue set - 86.45851fil
 ..\hbox(6.94444+0.0)x86.45851
 ...\OT1/cmr/m/n/10 G
@@ -85,8 +83,7 @@
 > \box42=
 \hbox(6.94444+1.0)x86.45851
 .\special{ps:gsave}
-.\special{ps:currentpoint currentpoint translate /savedmatrix matrix currentmat
-\ETC.}
+.\special{ps:currentpoint currentpoint translate /savedmatrix matrix currentmat\ETC.}
 .\hbox(6.94444+1.0)x0.0, glue set - 86.45851fil
 ..\hbox(6.94444+1.0)x86.45851
 ...\OT1/cmr/m/n/10 G
@@ -116,8 +113,7 @@
 > \box42=
 \hbox(6.94444+1.94444)x20.0
 .\special{ps:gsave}
-.\special{ps:currentpoint currentpoint translate /savedmatrix matrix currentmat
-\ETC.}
+.\special{ps:currentpoint currentpoint translate /savedmatrix matrix currentmat\ETC.}
 .\hbox(6.94444+1.94444)x0.0, glue set - 20.0fil
 ..\hbox(6.94444+1.94444)x20.0
 ...\OT1/cmr/m/n/10 G
@@ -171,8 +167,7 @@
 ..\kern 0.0
 ..\hbox(6.94444+0.0)x50.02786
 ...\special{ps:gsave}
-...\special{ps:currentpoint currentpoint translate 0 rotate neg exch neg exch t
-ra\ETC.}
+...\special{ps:currentpoint currentpoint translate 0 rotate neg exch neg exch tra\ETC.}
 ...\hbox(6.94444+0.0)x50.02786
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
@@ -197,8 +192,7 @@
 ..\kern 3.47223
 ..\hbox(6.94444+0.0)x50.02786
 ...\special{ps:gsave}
-...\special{ps:currentpoint currentpoint translate -30 rotate neg exch neg exch
- t\ETC.}
+...\special{ps:currentpoint currentpoint translate -30 rotate neg exch neg exch t\ETC.}
 ...\hbox(6.94444+0.0)x50.02786
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
@@ -223,8 +217,7 @@
 ..\kern 4.91046
 ..\hbox(6.94444+0.0)x50.02786
 ...\special{ps:gsave}
-...\special{ps:currentpoint currentpoint translate -45 rotate neg exch neg exch
- t\ETC.}
+...\special{ps:currentpoint currentpoint translate -45 rotate neg exch neg exch t\ETC.}
 ...\hbox(6.94444+0.0)x50.02786
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
@@ -249,8 +242,7 @@
 ..\kern 40.2855
 ..\hbox(6.94444+0.0)x50.02786
 ...\special{ps:gsave}
-...\special{ps:currentpoint currentpoint translate -135 rotate neg exch neg exc
-h \ETC.}
+...\special{ps:currentpoint currentpoint translate -135 rotate neg exch neg exch \ETC.}
 ...\hbox(6.94444+0.0)x50.02786
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
@@ -275,8 +267,7 @@
 ..\kern 35.37505
 ..\hbox(6.94444+0.0)x50.02786
 ...\special{ps:gsave}
-...\special{ps:currentpoint currentpoint translate -225 rotate neg exch neg exc
-h \ETC.}
+...\special{ps:currentpoint currentpoint translate -225 rotate neg exch neg exch \ETC.}
 ...\hbox(6.94444+0.0)x50.02786
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
@@ -301,8 +292,7 @@
 ..\kern 0.0
 ..\hbox(6.94444+0.0)x50.02786
 ...\special{ps:gsave}
-...\special{ps:currentpoint currentpoint translate -315 rotate neg exch neg exc
-h \ETC.}
+...\special{ps:currentpoint currentpoint translate -315 rotate neg exch neg exch \ETC.}
 ...\hbox(6.94444+0.0)x50.02786
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
@@ -327,16 +317,14 @@
 ..\kern 28.48616
 ..\hbox(40.2855+0.0)x40.2855
 ...\special{ps:gsave}
-...\special{ps:currentpoint currentpoint translate -45 rotate neg exch neg exch
- t\ETC.}
+...\special{ps:currentpoint currentpoint translate -45 rotate neg exch neg exch t\ETC.}
 ...\hbox(40.2855+0.0)x40.2855
 ....\hbox(40.2855+0.0)x40.2855
 .....\hbox(40.2855+0.0)x40.2855
 ......\kern 4.91046
 ......\hbox(6.94444+0.0)x50.02786
 .......\special{ps:gsave}
-.......\special{ps:currentpoint currentpoint translate -45 rotate neg exch neg 
-exch t\ETC.}
+.......\special{ps:currentpoint currentpoint translate -45 rotate neg exch neg exch t\ETC.}
 .......\hbox(6.94444+0.0)x50.02786
 ........\hbox(6.94444+0.0)x50.02786
 .........\OT1/cmr/m/n/10 H
@@ -383,8 +371,7 @@
 ..\kern 0.0
 ..\hbox(6.94444+0.0)x50.02786
 ...\special{ps:gsave}
-...\special{ps:currentpoint currentpoint translate 1 1 scale neg exch neg exch 
-tr\ETC.}
+...\special{ps:currentpoint currentpoint translate 1 1 scale neg exch neg exch tr\ETC.}
 ...\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
@@ -411,8 +398,7 @@
 ..\kern 0.0
 ..\hbox(6.94444+0.0)x125.06966
 ...\special{ps:gsave}
-...\special{ps:currentpoint currentpoint translate 2.5 1 scale neg exch neg exc
-h \ETC.}
+...\special{ps:currentpoint currentpoint translate 2.5 1 scale neg exch neg exch \ETC.}
 ...\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
@@ -439,8 +425,7 @@
 ..\kern 0.0
 ..\hbox(2.31477+0.0)x50.02786
 ...\special{ps:gsave}
-...\special{ps:currentpoint currentpoint translate 1 0.33333 scale neg exch neg
- e\ETC.}
+...\special{ps:currentpoint currentpoint translate 1 0.33333 scale neg exch neg e\ETC.}
 ...\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
@@ -467,8 +452,7 @@
 ..\kern 0.0
 ..\hbox(6.94444+1.94444)x103.61133
 ...\special{ps:gsave}
-...\special{ps:currentpoint currentpoint translate 1 1 scale neg exch neg exch 
-tr\ETC.}
+...\special{ps:currentpoint currentpoint translate 1 1 scale neg exch neg exch tr\ETC.}
 ...\hbox(6.94444+1.94444)x0.0, glue set - 103.61133fil
 ....\hbox(6.94444+1.94444)x103.61133
 .....\OT1/cmr/m/n/10 T
@@ -506,8 +490,7 @@
 ..\kern 0.0
 ..\hbox(20.83333+5.83333)x310.83398
 ...\special{ps:gsave}
-...\special{ps:currentpoint currentpoint translate 3 3 scale neg exch neg exch 
-tr\ETC.}
+...\special{ps:currentpoint currentpoint translate 3 3 scale neg exch neg exch tr\ETC.}
 ...\hbox(6.94444+1.94444)x0.0, glue set - 103.61133fil
 ....\hbox(6.94444+1.94444)x103.61133
 .....\OT1/cmr/m/n/10 T
@@ -545,8 +528,7 @@
 ..\kern 310.83398
 ..\hbox(5.83333+20.83333)x0.0
 ...\special{ps:gsave}
-...\special{ps:currentpoint currentpoint translate -3 -3 scale neg exch neg exc
-h \ETC.}
+...\special{ps:currentpoint currentpoint translate -3 -3 scale neg exch neg exch \ETC.}
 ...\hbox(6.94444+1.94444)x0.0, glue set - 103.61133fil
 ....\hbox(6.94444+1.94444)x103.61133
 .....\OT1/cmr/m/n/10 T

Modified: trunk/l3kernel/testfiles/d3xdvipdfmx.ptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/d3xdvipdfmx.ptex.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/d3xdvipdfmx.ptex.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -23,8 +23,7 @@
 > \box42=
 \hbox(6.94444+1.0)x86.45851
 .\special{ps:gsave}
-.\special{ps:currentpoint currentpoint translate /savedmatrix matrix currentmat
-\ETC.}
+.\special{ps:currentpoint currentpoint translate /savedmatrix matrix currentmat\ETC.}
 .\hbox(6.94444+1.0)x0.0, glue set - 86.45851fil
 ..\hbox(6.94444+1.0)x86.45851
 ...\OT1/cmr/m/n/10 G
@@ -54,8 +53,7 @@
 > \box42=
 \hbox(6.94444+0.0)x86.45851
 .\special{ps:gsave}
-.\special{ps:currentpoint currentpoint translate /savedmatrix matrix currentmat
-\ETC.}
+.\special{ps:currentpoint currentpoint translate /savedmatrix matrix currentmat\ETC.}
 .\hbox(6.94444+0.0)x0.0, glue set - 86.45851fil
 ..\hbox(6.94444+0.0)x86.45851
 ...\OT1/cmr/m/n/10 G
@@ -85,8 +83,7 @@
 > \box42=
 \hbox(6.94444+1.0)x86.45851
 .\special{ps:gsave}
-.\special{ps:currentpoint currentpoint translate /savedmatrix matrix currentmat
-\ETC.}
+.\special{ps:currentpoint currentpoint translate /savedmatrix matrix currentmat\ETC.}
 .\hbox(6.94444+1.0)x0.0, glue set - 86.45851fil
 ..\hbox(6.94444+1.0)x86.45851
 ...\OT1/cmr/m/n/10 G
@@ -116,8 +113,7 @@
 > \box42=
 \hbox(6.94444+1.94444)x20.0
 .\special{ps:gsave}
-.\special{ps:currentpoint currentpoint translate /savedmatrix matrix currentmat
-\ETC.}
+.\special{ps:currentpoint currentpoint translate /savedmatrix matrix currentmat\ETC.}
 .\hbox(6.94444+1.94444)x0.0, glue set - 20.0fil
 ..\hbox(6.94444+1.94444)x20.0
 ...\OT1/cmr/m/n/10 G
@@ -171,8 +167,7 @@
 ..\kern 0.0
 ..\hbox(6.94444+0.0)x50.02786
 ...\special{ps:gsave}
-...\special{ps:currentpoint currentpoint translate 0 rotate neg exch neg exch t
-ra\ETC.}
+...\special{ps:currentpoint currentpoint translate 0 rotate neg exch neg exch tra\ETC.}
 ...\hbox(6.94444+0.0)x50.02786
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
@@ -197,8 +192,7 @@
 ..\kern 3.47223
 ..\hbox(6.94444+0.0)x50.02786
 ...\special{ps:gsave}
-...\special{ps:currentpoint currentpoint translate -30 rotate neg exch neg exch
- t\ETC.}
+...\special{ps:currentpoint currentpoint translate -30 rotate neg exch neg exch t\ETC.}
 ...\hbox(6.94444+0.0)x50.02786
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
@@ -223,8 +217,7 @@
 ..\kern 4.91046
 ..\hbox(6.94444+0.0)x50.02786
 ...\special{ps:gsave}
-...\special{ps:currentpoint currentpoint translate -45 rotate neg exch neg exch
- t\ETC.}
+...\special{ps:currentpoint currentpoint translate -45 rotate neg exch neg exch t\ETC.}
 ...\hbox(6.94444+0.0)x50.02786
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
@@ -249,8 +242,7 @@
 ..\kern 40.2855
 ..\hbox(6.94444+0.0)x50.02786
 ...\special{ps:gsave}
-...\special{ps:currentpoint currentpoint translate -135 rotate neg exch neg exc
-h \ETC.}
+...\special{ps:currentpoint currentpoint translate -135 rotate neg exch neg exch \ETC.}
 ...\hbox(6.94444+0.0)x50.02786
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
@@ -275,8 +267,7 @@
 ..\kern 35.37505
 ..\hbox(6.94444+0.0)x50.02786
 ...\special{ps:gsave}
-...\special{ps:currentpoint currentpoint translate -225 rotate neg exch neg exc
-h \ETC.}
+...\special{ps:currentpoint currentpoint translate -225 rotate neg exch neg exch \ETC.}
 ...\hbox(6.94444+0.0)x50.02786
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
@@ -301,8 +292,7 @@
 ..\kern 0.0
 ..\hbox(6.94444+0.0)x50.02786
 ...\special{ps:gsave}
-...\special{ps:currentpoint currentpoint translate -315 rotate neg exch neg exc
-h \ETC.}
+...\special{ps:currentpoint currentpoint translate -315 rotate neg exch neg exch \ETC.}
 ...\hbox(6.94444+0.0)x50.02786
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
@@ -327,16 +317,14 @@
 ..\kern 28.48616
 ..\hbox(40.2855+0.0)x40.2855
 ...\special{ps:gsave}
-...\special{ps:currentpoint currentpoint translate -45 rotate neg exch neg exch
- t\ETC.}
+...\special{ps:currentpoint currentpoint translate -45 rotate neg exch neg exch t\ETC.}
 ...\hbox(40.2855+0.0)x40.2855
 ....\hbox(40.2855+0.0)x40.2855
 .....\hbox(40.2855+0.0)x40.2855
 ......\kern 4.91046
 ......\hbox(6.94444+0.0)x50.02786
 .......\special{ps:gsave}
-.......\special{ps:currentpoint currentpoint translate -45 rotate neg exch neg 
-exch t\ETC.}
+.......\special{ps:currentpoint currentpoint translate -45 rotate neg exch neg exch t\ETC.}
 .......\hbox(6.94444+0.0)x50.02786
 ........\hbox(6.94444+0.0)x50.02786
 .........\OT1/cmr/m/n/10 H
@@ -383,8 +371,7 @@
 ..\kern 0.0
 ..\hbox(6.94444+0.0)x50.02786
 ...\special{ps:gsave}
-...\special{ps:currentpoint currentpoint translate 1 1 scale neg exch neg exch 
-tr\ETC.}
+...\special{ps:currentpoint currentpoint translate 1 1 scale neg exch neg exch tr\ETC.}
 ...\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
@@ -411,8 +398,7 @@
 ..\kern 0.0
 ..\hbox(6.94444+0.0)x125.06966
 ...\special{ps:gsave}
-...\special{ps:currentpoint currentpoint translate 2.5 1 scale neg exch neg exc
-h \ETC.}
+...\special{ps:currentpoint currentpoint translate 2.5 1 scale neg exch neg exch \ETC.}
 ...\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
@@ -439,8 +425,7 @@
 ..\kern 0.0
 ..\hbox(2.31477+0.0)x50.02786
 ...\special{ps:gsave}
-...\special{ps:currentpoint currentpoint translate 1 0.33333 scale neg exch neg
- e\ETC.}
+...\special{ps:currentpoint currentpoint translate 1 0.33333 scale neg exch neg e\ETC.}
 ...\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
@@ -467,8 +452,7 @@
 ..\kern 0.0
 ..\hbox(6.94444+1.94444)x103.61133
 ...\special{ps:gsave}
-...\special{ps:currentpoint currentpoint translate 1 1 scale neg exch neg exch 
-tr\ETC.}
+...\special{ps:currentpoint currentpoint translate 1 1 scale neg exch neg exch tr\ETC.}
 ...\hbox(6.94444+1.94444)x0.0, glue set - 103.61133fil
 ....\hbox(6.94444+1.94444)x103.61133
 .....\OT1/cmr/m/n/10 T
@@ -506,8 +490,7 @@
 ..\kern 0.0
 ..\hbox(20.83333+5.83333)x310.83398
 ...\special{ps:gsave}
-...\special{ps:currentpoint currentpoint translate 3 3 scale neg exch neg exch 
-tr\ETC.}
+...\special{ps:currentpoint currentpoint translate 3 3 scale neg exch neg exch tr\ETC.}
 ...\hbox(6.94444+1.94444)x0.0, glue set - 103.61133fil
 ....\hbox(6.94444+1.94444)x103.61133
 .....\OT1/cmr/m/n/10 T
@@ -545,8 +528,7 @@
 ..\kern 310.83398
 ..\hbox(5.83333+20.83333)x0.0
 ...\special{ps:gsave}
-...\special{ps:currentpoint currentpoint translate -3 -3 scale neg exch neg exc
-h \ETC.}
+...\special{ps:currentpoint currentpoint translate -3 -3 scale neg exch neg exch \ETC.}
 ...\hbox(6.94444+1.94444)x0.0, glue set - 103.61133fil
 ....\hbox(6.94444+1.94444)x103.61133
 .....\OT1/cmr/m/n/10 T

Modified: trunk/l3kernel/testfiles/d3xdvipdfmx.uptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/d3xdvipdfmx.uptex.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/d3xdvipdfmx.uptex.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -23,8 +23,7 @@
 > \box42=
 \hbox(6.94444+1.0)x86.45851
 .\special{ps:gsave}
-.\special{ps:currentpoint currentpoint translate /savedmatrix matrix currentmat
-\ETC.}
+.\special{ps:currentpoint currentpoint translate /savedmatrix matrix currentmat\ETC.}
 .\hbox(6.94444+1.0)x0.0, glue set - 86.45851fil
 ..\hbox(6.94444+1.0)x86.45851
 ...\OT1/cmr/m/n/10 G
@@ -54,8 +53,7 @@
 > \box42=
 \hbox(6.94444+0.0)x86.45851
 .\special{ps:gsave}
-.\special{ps:currentpoint currentpoint translate /savedmatrix matrix currentmat
-\ETC.}
+.\special{ps:currentpoint currentpoint translate /savedmatrix matrix currentmat\ETC.}
 .\hbox(6.94444+0.0)x0.0, glue set - 86.45851fil
 ..\hbox(6.94444+0.0)x86.45851
 ...\OT1/cmr/m/n/10 G
@@ -85,8 +83,7 @@
 > \box42=
 \hbox(6.94444+1.0)x86.45851
 .\special{ps:gsave}
-.\special{ps:currentpoint currentpoint translate /savedmatrix matrix currentmat
-\ETC.}
+.\special{ps:currentpoint currentpoint translate /savedmatrix matrix currentmat\ETC.}
 .\hbox(6.94444+1.0)x0.0, glue set - 86.45851fil
 ..\hbox(6.94444+1.0)x86.45851
 ...\OT1/cmr/m/n/10 G
@@ -116,8 +113,7 @@
 > \box42=
 \hbox(6.94444+1.94444)x20.0
 .\special{ps:gsave}
-.\special{ps:currentpoint currentpoint translate /savedmatrix matrix currentmat
-\ETC.}
+.\special{ps:currentpoint currentpoint translate /savedmatrix matrix currentmat\ETC.}
 .\hbox(6.94444+1.94444)x0.0, glue set - 20.0fil
 ..\hbox(6.94444+1.94444)x20.0
 ...\OT1/cmr/m/n/10 G
@@ -171,8 +167,7 @@
 ..\kern 0.0
 ..\hbox(6.94444+0.0)x50.02786
 ...\special{ps:gsave}
-...\special{ps:currentpoint currentpoint translate 0 rotate neg exch neg exch t
-ra\ETC.}
+...\special{ps:currentpoint currentpoint translate 0 rotate neg exch neg exch tra\ETC.}
 ...\hbox(6.94444+0.0)x50.02786
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
@@ -197,8 +192,7 @@
 ..\kern 3.47223
 ..\hbox(6.94444+0.0)x50.02786
 ...\special{ps:gsave}
-...\special{ps:currentpoint currentpoint translate -30 rotate neg exch neg exch
- t\ETC.}
+...\special{ps:currentpoint currentpoint translate -30 rotate neg exch neg exch t\ETC.}
 ...\hbox(6.94444+0.0)x50.02786
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
@@ -223,8 +217,7 @@
 ..\kern 4.91046
 ..\hbox(6.94444+0.0)x50.02786
 ...\special{ps:gsave}
-...\special{ps:currentpoint currentpoint translate -45 rotate neg exch neg exch
- t\ETC.}
+...\special{ps:currentpoint currentpoint translate -45 rotate neg exch neg exch t\ETC.}
 ...\hbox(6.94444+0.0)x50.02786
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
@@ -249,8 +242,7 @@
 ..\kern 40.2855
 ..\hbox(6.94444+0.0)x50.02786
 ...\special{ps:gsave}
-...\special{ps:currentpoint currentpoint translate -135 rotate neg exch neg exc
-h \ETC.}
+...\special{ps:currentpoint currentpoint translate -135 rotate neg exch neg exch \ETC.}
 ...\hbox(6.94444+0.0)x50.02786
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
@@ -275,8 +267,7 @@
 ..\kern 35.37505
 ..\hbox(6.94444+0.0)x50.02786
 ...\special{ps:gsave}
-...\special{ps:currentpoint currentpoint translate -225 rotate neg exch neg exc
-h \ETC.}
+...\special{ps:currentpoint currentpoint translate -225 rotate neg exch neg exch \ETC.}
 ...\hbox(6.94444+0.0)x50.02786
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
@@ -301,8 +292,7 @@
 ..\kern 0.0
 ..\hbox(6.94444+0.0)x50.02786
 ...\special{ps:gsave}
-...\special{ps:currentpoint currentpoint translate -315 rotate neg exch neg exc
-h \ETC.}
+...\special{ps:currentpoint currentpoint translate -315 rotate neg exch neg exch \ETC.}
 ...\hbox(6.94444+0.0)x50.02786
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
@@ -327,16 +317,14 @@
 ..\kern 28.48616
 ..\hbox(40.2855+0.0)x40.2855
 ...\special{ps:gsave}
-...\special{ps:currentpoint currentpoint translate -45 rotate neg exch neg exch
- t\ETC.}
+...\special{ps:currentpoint currentpoint translate -45 rotate neg exch neg exch t\ETC.}
 ...\hbox(40.2855+0.0)x40.2855
 ....\hbox(40.2855+0.0)x40.2855
 .....\hbox(40.2855+0.0)x40.2855
 ......\kern 4.91046
 ......\hbox(6.94444+0.0)x50.02786
 .......\special{ps:gsave}
-.......\special{ps:currentpoint currentpoint translate -45 rotate neg exch neg 
-exch t\ETC.}
+.......\special{ps:currentpoint currentpoint translate -45 rotate neg exch neg exch t\ETC.}
 .......\hbox(6.94444+0.0)x50.02786
 ........\hbox(6.94444+0.0)x50.02786
 .........\OT1/cmr/m/n/10 H
@@ -383,8 +371,7 @@
 ..\kern 0.0
 ..\hbox(6.94444+0.0)x50.02786
 ...\special{ps:gsave}
-...\special{ps:currentpoint currentpoint translate 1 1 scale neg exch neg exch 
-tr\ETC.}
+...\special{ps:currentpoint currentpoint translate 1 1 scale neg exch neg exch tr\ETC.}
 ...\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
@@ -411,8 +398,7 @@
 ..\kern 0.0
 ..\hbox(6.94444+0.0)x125.06966
 ...\special{ps:gsave}
-...\special{ps:currentpoint currentpoint translate 2.5 1 scale neg exch neg exc
-h \ETC.}
+...\special{ps:currentpoint currentpoint translate 2.5 1 scale neg exch neg exch \ETC.}
 ...\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
@@ -439,8 +425,7 @@
 ..\kern 0.0
 ..\hbox(2.31477+0.0)x50.02786
 ...\special{ps:gsave}
-...\special{ps:currentpoint currentpoint translate 1 0.33333 scale neg exch neg
- e\ETC.}
+...\special{ps:currentpoint currentpoint translate 1 0.33333 scale neg exch neg e\ETC.}
 ...\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
@@ -467,8 +452,7 @@
 ..\kern 0.0
 ..\hbox(6.94444+1.94444)x103.61133
 ...\special{ps:gsave}
-...\special{ps:currentpoint currentpoint translate 1 1 scale neg exch neg exch 
-tr\ETC.}
+...\special{ps:currentpoint currentpoint translate 1 1 scale neg exch neg exch tr\ETC.}
 ...\hbox(6.94444+1.94444)x0.0, glue set - 103.61133fil
 ....\hbox(6.94444+1.94444)x103.61133
 .....\OT1/cmr/m/n/10 T
@@ -506,8 +490,7 @@
 ..\kern 0.0
 ..\hbox(20.83333+5.83333)x310.83398
 ...\special{ps:gsave}
-...\special{ps:currentpoint currentpoint translate 3 3 scale neg exch neg exch 
-tr\ETC.}
+...\special{ps:currentpoint currentpoint translate 3 3 scale neg exch neg exch tr\ETC.}
 ...\hbox(6.94444+1.94444)x0.0, glue set - 103.61133fil
 ....\hbox(6.94444+1.94444)x103.61133
 .....\OT1/cmr/m/n/10 T
@@ -545,8 +528,7 @@
 ..\kern 310.83398
 ..\hbox(5.83333+20.83333)x0.0
 ...\special{ps:gsave}
-...\special{ps:currentpoint currentpoint translate -3 -3 scale neg exch neg exc
-h \ETC.}
+...\special{ps:currentpoint currentpoint translate -3 -3 scale neg exch neg exch \ETC.}
 ...\hbox(6.94444+1.94444)x0.0, glue set - 103.61133fil
 ....\hbox(6.94444+1.94444)x103.61133
 .....\OT1/cmr/m/n/10 T

Modified: trunk/l3kernel/testfiles/m3basics002.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3basics002.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/m3basics002.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -333,7 +333,7 @@
 Defining \bar:nn on line ...
 ! Illegal parameter number in definition of \bar:nn.
 <to be read again> 
-                   3
+3
 l. ...  }
 You meant to type ## instead of #, right?
 Or maybe a } was forgotten somewhere earlier, and things

Modified: trunk/l3kernel/testfiles/m3char001.luatex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3char001.luatex.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/m3char001.luatex.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -50,11 +50,11 @@
 > the letter P.
 \l_tmpa_tl ->P
 l. ...  }
-> \l_tmpa_tl=.
+> \l_tmpa_tl=^^?.
 <recently read> }
 l. ...  }
-> the letter .
-\l_tmpa_tl ->
+> the letter ^^?.
+\l_tmpa_tl ->^^?
 l. ...  }
 > \l_tmpa_tl=^^@.
 <recently read> }
@@ -86,11 +86,11 @@
 > the character P.
 \l_tmpa_tl ->P
 l. ...  }
-> \l_tmpa_tl=.
+> \l_tmpa_tl=^^?.
 <recently read> }
 l. ...  }
-> the character .
-\l_tmpa_tl ->
+> the character ^^?.
+\l_tmpa_tl ->^^?
 l. ...  }
 ============================================================
 ============================================================
@@ -126,11 +126,11 @@
 > math shift character P.
 \l_tmpa_tl ->P
 l. ...  }
-> \l_tmpa_tl=.
+> \l_tmpa_tl=^^?.
 <recently read> }
 l. ...  }
-> math shift character .
-\l_tmpa_tl ->
+> math shift character ^^?.
+\l_tmpa_tl ->^^?
 l. ...  }
 > \l_tmpa_tl=^^@.
 <recently read> }
@@ -162,11 +162,11 @@
 > alignment tab character P.
 \l_tmpa_tl ->P
 l. ...  }
-> \l_tmpa_tl=.
+> \l_tmpa_tl=^^?.
 <recently read> }
 l. ...  }
-> alignment tab character .
-\l_tmpa_tl ->
+> alignment tab character ^^?.
+\l_tmpa_tl ->^^?
 l. ...  }
 > \l_tmpa_tl=^^@.
 <recently read> }
@@ -198,11 +198,11 @@
 > superscript character P.
 \l_tmpa_tl ->P
 l. ...  }
-> \l_tmpa_tl=.
+> \l_tmpa_tl=^^?.
 <recently read> }
 l. ...  }
-> superscript character .
-\l_tmpa_tl ->
+> superscript character ^^?.
+\l_tmpa_tl ->^^?
 l. ...  }
 > \l_tmpa_tl=^^@.
 <recently read> }
@@ -234,11 +234,11 @@
 > subscript character P.
 \l_tmpa_tl ->P
 l. ...  }
-> \l_tmpa_tl=.
+> \l_tmpa_tl=^^?.
 <recently read> }
 l. ...  }
-> subscript character .
-\l_tmpa_tl ->
+> subscript character ^^?.
+\l_tmpa_tl ->^^?
 l. ...  }
 ============================================================
 ============================================================
@@ -259,7 +259,7 @@
 > \l_tmpa_tl=PP.
 <recently read> }
 l. ...  }
-> \l_tmpa_tl=.
+> \l_tmpa_tl=^^?^^?.
 <recently read> }
 l. ...  }
 ! Illegal parameter number in definition of \temp.
@@ -319,7 +319,7 @@
 You meant to type ## instead of #, right?
 Or maybe a } was forgotten somewhere earlier, and things
 are all screwed up? I'm going to assume that you meant ##.
-> \temp=\long macro:->.
+> \temp=\long macro:->^^?^^?.
 <recently read> }
 l. ...  }
 ============================================================
@@ -328,7 +328,7 @@
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                Charcode requested out of engine range.
+Charcode requested out of engine range.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -337,7 +337,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                Invalid catcode for char generation.
+Invalid catcode for char generation.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -346,7 +346,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                Invalid catcode for char generation.
+Invalid catcode for char generation.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -355,7 +355,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                Invalid catcode for char generation.
+Invalid catcode for char generation.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -364,7 +364,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                Invalid catcode for char generation.
+Invalid catcode for char generation.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -373,7 +373,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                Cannot generate space chars.
+Cannot generate space chars.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -382,7 +382,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                Cannot generate active chars.
+Cannot generate active chars.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -391,7 +391,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                Invalid catcode for char generation.
+Invalid catcode for char generation.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -400,7 +400,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                Invalid catcode for char generation.
+Invalid catcode for char generation.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -409,7 +409,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                Invalid catcode for char generation.
+Invalid catcode for char generation.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -418,7 +418,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                Invalid catcode for char generation.
+Invalid catcode for char generation.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -427,7 +427,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                Cannot generate null char as a space.
+Cannot generate null char as a space.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have

Modified: trunk/l3kernel/testfiles/m3char001.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3char001.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/m3char001.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -264,7 +264,7 @@
 l. ...  }
 ! Illegal parameter number in definition of \temp.
 <to be read again> 
-                   }
+}
 l. ...  }
 You meant to type ## instead of #, right?
 Or maybe a } was forgotten somewhere earlier, and things
@@ -274,7 +274,7 @@
 l. ...  }
 ! Illegal parameter number in definition of \temp.
 <to be read again> 
-                   }
+}
 l. ...  }
 You meant to type ## instead of #, right?
 Or maybe a } was forgotten somewhere earlier, and things
@@ -284,7 +284,7 @@
 l. ...  }
 ! Illegal parameter number in definition of \temp.
 <to be read again> 
-                   }
+}
 l. ...  }
 You meant to type ## instead of #, right?
 Or maybe a } was forgotten somewhere earlier, and things
@@ -294,7 +294,7 @@
 l. ...  }
 ! Illegal parameter number in definition of \temp.
 <to be read again> 
-                   }
+}
 l. ...  }
 You meant to type ## instead of #, right?
 Or maybe a } was forgotten somewhere earlier, and things
@@ -304,7 +304,7 @@
 l. ...  }
 ! Illegal parameter number in definition of \temp.
 <to be read again> 
-                   }
+}
 l. ...  }
 You meant to type ## instead of #, right?
 Or maybe a } was forgotten somewhere earlier, and things
@@ -314,7 +314,7 @@
 l. ...  }
 ! Illegal parameter number in definition of \temp.
 <to be read again> 
-                   }
+}
 l. ...  }
 You meant to type ## instead of #, right?
 Or maybe a } was forgotten somewhere earlier, and things
@@ -328,7 +328,7 @@
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Charcode requested out of engine range.
+Charcode requested out of engine range.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -337,7 +337,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid catcode for char generation.
+Invalid catcode for char generation.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -346,7 +346,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid catcode for char generation.
+Invalid catcode for char generation.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -355,7 +355,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid catcode for char generation.
+Invalid catcode for char generation.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -364,7 +364,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid catcode for char generation.
+Invalid catcode for char generation.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -373,7 +373,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Cannot generate space chars.
+Cannot generate space chars.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -382,7 +382,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Cannot generate active chars.
+Cannot generate active chars.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -391,7 +391,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid catcode for char generation.
+Invalid catcode for char generation.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -400,7 +400,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid catcode for char generation.
+Invalid catcode for char generation.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -409,7 +409,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid catcode for char generation.
+Invalid catcode for char generation.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -418,7 +418,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid catcode for char generation.
+Invalid catcode for char generation.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -427,7 +427,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Cannot generate null char as a space.
+Cannot generate null char as a space.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -440,7 +440,7 @@
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Charcode requested out of engine range.
+Charcode requested out of engine range.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -449,7 +449,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Charcode requested out of engine range.
+Charcode requested out of engine range.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -461,7 +461,7 @@
 l. ...  }
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Charcode requested out of engine range.
+Charcode requested out of engine range.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -472,14 +472,13 @@
 <recently read> }
 l. ...  }
 > \test:nn=\protected\long macro:
-#1#2->\tl_set:Nx \l_tmpa_tl {\char_generate:nn {#1}{#2}}\tl_show:N \l_tmpa_tl \
-exp_after:wN \tex_show:D \l_tmpa_tl .
+#1#2->\tl_set:Nx \l_tmpa_tl {\char_generate:nn {#1}{#2}}\tl_show:N \l_tmpa_tl \exp_after:wN \tex_show:D \l_tmpa_tl .
 <argument> ...:n {1234}\test:nn {1234}{3}\test:nn 
-                                                  {1234}{4}\test_parameter:n...
+{1234}{4}\test_parameter:n...
 l. ...  }
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Charcode requested out of engine range.
+Charcode requested out of engine range.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -491,7 +490,7 @@
 l. ...  }
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Charcode requested out of engine range.
+Charcode requested out of engine range.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -502,14 +501,13 @@
 <recently read> }
 l. ...  }
 > \test:nn=\protected\long macro:
-#1#2->\tl_set:Nx \l_tmpa_tl {\char_generate:nn {#1}{#2}}\tl_show:N \l_tmpa_tl \
-exp_after:wN \tex_show:D \l_tmpa_tl .
+#1#2->\tl_set:Nx \l_tmpa_tl {\char_generate:nn {#1}{#2}}\tl_show:N \l_tmpa_tl \exp_after:wN \tex_show:D \l_tmpa_tl .
 <argument> ...:n {1234}\test:nn {1234}{7}\test:nn 
-                                                  {1234}{8}\test:nn {1234}{1...
+{1234}{8}\test:nn {1234}{1...
 l. ...  }
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Charcode requested out of engine range.
+Charcode requested out of engine range.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -520,9 +518,8 @@
 <recently read> }
 l. ...  }
 > \test:nn=\protected\long macro:
-#1#2->\tl_set:Nx \l_tmpa_tl {\char_generate:nn {#1}{#2}}\tl_show:N \l_tmpa_tl \
-exp_after:wN \tex_show:D \l_tmpa_tl .
+#1#2->\tl_set:Nx \l_tmpa_tl {\char_generate:nn {#1}{#2}}\tl_show:N \l_tmpa_tl \exp_after:wN \tex_show:D \l_tmpa_tl .
 <argument> ...1234}{8}\test:nn {1234}{11}\test:nn 
-                                                  {1234}{12}
+{1234}{12}
 l. ...  }
 ============================================================

Modified: trunk/l3kernel/testfiles/m3char001.xetex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3char001.xetex.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/m3char001.xetex.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -264,7 +264,7 @@
 l. ...  }
 ! Illegal parameter number in definition of \temp.
 <to be read again> 
-                   }
+}
 l. ...  }
 You meant to type ## instead of #, right?
 Or maybe a } was forgotten somewhere earlier, and things
@@ -274,7 +274,7 @@
 l. ...  }
 ! Illegal parameter number in definition of \temp.
 <to be read again> 
-                   }
+}
 l. ...  }
 You meant to type ## instead of #, right?
 Or maybe a } was forgotten somewhere earlier, and things
@@ -284,7 +284,7 @@
 l. ...  }
 ! Illegal parameter number in definition of \temp.
 <to be read again> 
-                   }
+}
 l. ...  }
 You meant to type ## instead of #, right?
 Or maybe a } was forgotten somewhere earlier, and things
@@ -294,7 +294,7 @@
 l. ...  }
 ! Illegal parameter number in definition of \temp.
 <to be read again> 
-                   }
+}
 l. ...  }
 You meant to type ## instead of #, right?
 Or maybe a } was forgotten somewhere earlier, and things
@@ -304,7 +304,7 @@
 l. ...  }
 ! Illegal parameter number in definition of \temp.
 <to be read again> 
-                   }
+}
 l. ...  }
 You meant to type ## instead of #, right?
 Or maybe a } was forgotten somewhere earlier, and things
@@ -314,7 +314,7 @@
 l. ...  }
 ! Illegal parameter number in definition of \temp.
 <to be read again> 
-                   }
+}
 l. ...  }
 You meant to type ## instead of #, right?
 Or maybe a } was forgotten somewhere earlier, and things
@@ -328,7 +328,7 @@
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Charcode requested out of engine range.
+Charcode requested out of engine range.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -337,7 +337,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid catcode for char generation.
+Invalid catcode for char generation.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -346,7 +346,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid catcode for char generation.
+Invalid catcode for char generation.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -355,7 +355,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid catcode for char generation.
+Invalid catcode for char generation.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -364,7 +364,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid catcode for char generation.
+Invalid catcode for char generation.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -373,7 +373,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Cannot generate space chars.
+Cannot generate space chars.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -382,7 +382,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Cannot generate active chars.
+Cannot generate active chars.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -391,7 +391,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid catcode for char generation.
+Invalid catcode for char generation.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -400,7 +400,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid catcode for char generation.
+Invalid catcode for char generation.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -409,7 +409,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid catcode for char generation.
+Invalid catcode for char generation.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -418,7 +418,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid catcode for char generation.
+Invalid catcode for char generation.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -427,7 +427,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Cannot generate null char as a space.
+Cannot generate null char as a space.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -455,7 +455,7 @@
 l. ...  }
 ! Illegal parameter number in definition of \temp.
 <to be read again> 
-                   }
+}
 l. ...  }
 You meant to type ## instead of #, right?
 Or maybe a } was forgotten somewhere earlier, and things

Modified: trunk/l3kernel/testfiles/m3compare001.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3compare001.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/m3compare001.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -66,348 +66,348 @@
 ============================================================
 ! Missing ) inserted for expression.
 <to be read again> 
-                   \__int_eval_end: 
+\__int_eval_end: 
 l. ...  }
 I was expecting to see `+', `-', `*', `/', or `)'. Didn't.
 ! Missing ) inserted for expression.
 <to be read again> 
-                   =
+=
 l. ...  }
 I was expecting to see `+', `-', `*', `/', or `)'. Didn't.
 ! Missing ) inserted for expression.
 <to be read again> 
-                   =
+=
 l. ...  }
 I was expecting to see `+', `-', `*', `/', or `)'. Didn't.
 ! Missing ) inserted for expression.
 <to be read again> 
-                   =
+=
 l. ...  }
 I was expecting to see `+', `-', `*', `/', or `)'. Didn't.
 ! Missing ) inserted for expression.
 <to be read again> 
-                   =
+=
 l. ...  }
 I was expecting to see `+', `-', `*', `/', or `)'. Didn't.
 ! Missing ) inserted for expression.
 <to be read again> 
-                   >
+>
 l. ...  }
 I was expecting to see `+', `-', `*', `/', or `)'. Didn't.
 ! Missing ) inserted for expression.
 <to be read again> 
-                   >
+>
 l. ...  }
 I was expecting to see `+', `-', `*', `/', or `)'. Didn't.
 ! Missing ) inserted for expression.
 <to be read again> 
-                   >
+>
 l. ...  }
 I was expecting to see `+', `-', `*', `/', or `)'. Didn't.
 ! Missing ) inserted for expression.
 <to be read again> 
-                   >
+>
 l. ...  }
 I was expecting to see `+', `-', `*', `/', or `)'. Didn't.
 ! Missing ) inserted for expression.
 <to be read again> 
-                   <
+<
 l. ...  }
 I was expecting to see `+', `-', `*', `/', or `)'. Didn't.
 ! Missing ) inserted for expression.
 <to be read again> 
-                   <
+<
 l. ...  }
 I was expecting to see `+', `-', `*', `/', or `)'. Didn't.
 ! Missing ) inserted for expression.
 <to be read again> 
-                   <
+<
 l. ...  }
 I was expecting to see `+', `-', `*', `/', or `)'. Didn't.
 ! Missing ) inserted for expression.
 <to be read again> 
-                   <
+<
 l. ...  }
 I was expecting to see `+', `-', `*', `/', or `)'. Didn't.
 ! Missing ) inserted for expression.
 <to be read again> 
-                   =
+=
 l. ...  }
 I was expecting to see `+', `-', `*', `/', or `)'. Didn't.
 ! Missing ) inserted for expression.
 <to be read again> 
-                   =
+=
 l. ...  }
 I was expecting to see `+', `-', `*', `/', or `)'. Didn't.
 ! Missing ) inserted for expression.
 <to be read again> 
-                   =
+=
 l. ...  }
 I was expecting to see `+', `-', `*', `/', or `)'. Didn't.
 ! Missing ) inserted for expression.
 <to be read again> 
-                   =
+=
 l. ...  }
 I was expecting to see `+', `-', `*', `/', or `)'. Didn't.
 ! Missing ) inserted for expression.
 <to be read again> 
-                   !
+!
 l. ...  }
 I was expecting to see `+', `-', `*', `/', or `)'. Didn't.
 ! Missing ) inserted for expression.
 <to be read again> 
-                   !
+!
 l. ...  }
 I was expecting to see `+', `-', `*', `/', or `)'. Didn't.
 ! Missing ) inserted for expression.
 <to be read again> 
-                   !
+!
 l. ...  }
 I was expecting to see `+', `-', `*', `/', or `)'. Didn't.
 ! Missing ) inserted for expression.
 <to be read again> 
-                   !
+!
 l. ...  }
 I was expecting to see `+', `-', `*', `/', or `)'. Didn't.
 ! Missing ) inserted for expression.
 <to be read again> 
-                   <
+<
 l. ...  }
 I was expecting to see `+', `-', `*', `/', or `)'. Didn't.
 ! Missing ) inserted for expression.
 <to be read again> 
-                   <
+<
 l. ...  }
 I was expecting to see `+', `-', `*', `/', or `)'. Didn't.
 ! Missing ) inserted for expression.
 <to be read again> 
-                   <
+<
 l. ...  }
 I was expecting to see `+', `-', `*', `/', or `)'. Didn't.
 ! Missing ) inserted for expression.
 <to be read again> 
-                   <
+<
 l. ...  }
 I was expecting to see `+', `-', `*', `/', or `)'. Didn't.
 ! Missing ) inserted for expression.
 <to be read again> 
-                   >
+>
 l. ...  }
 I was expecting to see `+', `-', `*', `/', or `)'. Didn't.
 ! Missing ) inserted for expression.
 <to be read again> 
-                   >
+>
 l. ...  }
 I was expecting to see `+', `-', `*', `/', or `)'. Didn't.
 ! Missing ) inserted for expression.
 <to be read again> 
-                   >
+>
 l. ...  }
 I was expecting to see `+', `-', `*', `/', or `)'. Didn't.
 ! Missing ) inserted for expression.
 <to be read again> 
-                   >
+>
 l. ...  }
 I was expecting to see `+', `-', `*', `/', or `)'. Didn't.
 ! Missing number, treated as zero.
 <to be read again> 
-                   \__int_eval_end: 
+\__int_eval_end: 
 l. ...  }
 A number should have been here; I inserted `0'.
 (If you can't figure out why I needed to see a number,
 look up `weird error' in the index to The TeXbook.)
 ! Missing number, treated as zero.
 <to be read again> 
-                   =
+=
 l. ...  }
 A number should have been here; I inserted `0'.
 (If you can't figure out why I needed to see a number,
 look up `weird error' in the index to The TeXbook.)
 ! Missing number, treated as zero.
 <to be read again> 
-                   =
+=
 l. ...  }
 A number should have been here; I inserted `0'.
 (If you can't figure out why I needed to see a number,
 look up `weird error' in the index to The TeXbook.)
 ! Missing number, treated as zero.
 <to be read again> 
-                   =
+=
 l. ...  }
 A number should have been here; I inserted `0'.
 (If you can't figure out why I needed to see a number,
 look up `weird error' in the index to The TeXbook.)
 ! Missing number, treated as zero.
 <to be read again> 
-                   =
+=
 l. ...  }
 A number should have been here; I inserted `0'.
 (If you can't figure out why I needed to see a number,
 look up `weird error' in the index to The TeXbook.)
 ! Missing number, treated as zero.
 <to be read again> 
-                   >
+>
 l. ...  }
 A number should have been here; I inserted `0'.
 (If you can't figure out why I needed to see a number,
 look up `weird error' in the index to The TeXbook.)
 ! Missing number, treated as zero.
 <to be read again> 
-                   >
+>
 l. ...  }
 A number should have been here; I inserted `0'.
 (If you can't figure out why I needed to see a number,
 look up `weird error' in the index to The TeXbook.)
 ! Missing number, treated as zero.
 <to be read again> 
-                   >
+>
 l. ...  }
 A number should have been here; I inserted `0'.
 (If you can't figure out why I needed to see a number,
 look up `weird error' in the index to The TeXbook.)
 ! Missing number, treated as zero.
 <to be read again> 
-                   >
+>
 l. ...  }
 A number should have been here; I inserted `0'.
 (If you can't figure out why I needed to see a number,
 look up `weird error' in the index to The TeXbook.)
 ! Missing number, treated as zero.
 <to be read again> 
-                   <
+<
 l. ...  }
 A number should have been here; I inserted `0'.
 (If you can't figure out why I needed to see a number,
 look up `weird error' in the index to The TeXbook.)
 ! Missing number, treated as zero.
 <to be read again> 
-                   <
+<
 l. ...  }
 A number should have been here; I inserted `0'.
 (If you can't figure out why I needed to see a number,
 look up `weird error' in the index to The TeXbook.)
 ! Missing number, treated as zero.
 <to be read again> 
-                   <
+<
 l. ...  }
 A number should have been here; I inserted `0'.
 (If you can't figure out why I needed to see a number,
 look up `weird error' in the index to The TeXbook.)
 ! Missing number, treated as zero.
 <to be read again> 
-                   <
+<
 l. ...  }
 A number should have been here; I inserted `0'.
 (If you can't figure out why I needed to see a number,
 look up `weird error' in the index to The TeXbook.)
 ! Missing number, treated as zero.
 <to be read again> 
-                   =
+=
 l. ...  }
 A number should have been here; I inserted `0'.
 (If you can't figure out why I needed to see a number,
 look up `weird error' in the index to The TeXbook.)
 ! Missing number, treated as zero.
 <to be read again> 
-                   =
+=
 l. ...  }
 A number should have been here; I inserted `0'.
 (If you can't figure out why I needed to see a number,
 look up `weird error' in the index to The TeXbook.)
 ! Missing number, treated as zero.
 <to be read again> 
-                   =
+=
 l. ...  }
 A number should have been here; I inserted `0'.
 (If you can't figure out why I needed to see a number,
 look up `weird error' in the index to The TeXbook.)
 ! Missing number, treated as zero.
 <to be read again> 
-                   =
+=
 l. ...  }
 A number should have been here; I inserted `0'.
 (If you can't figure out why I needed to see a number,
 look up `weird error' in the index to The TeXbook.)
 ! Missing number, treated as zero.
 <to be read again> 
-                   !
+!
 l. ...  }
 A number should have been here; I inserted `0'.
 (If you can't figure out why I needed to see a number,
 look up `weird error' in the index to The TeXbook.)
 ! Missing number, treated as zero.
 <to be read again> 
-                   !
+!
 l. ...  }
 A number should have been here; I inserted `0'.
 (If you can't figure out why I needed to see a number,
 look up `weird error' in the index to The TeXbook.)
 ! Missing number, treated as zero.
 <to be read again> 
-                   !
+!
 l. ...  }
 A number should have been here; I inserted `0'.
 (If you can't figure out why I needed to see a number,
 look up `weird error' in the index to The TeXbook.)
 ! Missing number, treated as zero.
 <to be read again> 
-                   !
+!
 l. ...  }
 A number should have been here; I inserted `0'.
 (If you can't figure out why I needed to see a number,
 look up `weird error' in the index to The TeXbook.)
 ! Missing number, treated as zero.
 <to be read again> 
-                   <
+<
 l. ...  }
 A number should have been here; I inserted `0'.
 (If you can't figure out why I needed to see a number,
 look up `weird error' in the index to The TeXbook.)
 ! Missing number, treated as zero.
 <to be read again> 
-                   <
+<
 l. ...  }
 A number should have been here; I inserted `0'.
 (If you can't figure out why I needed to see a number,
 look up `weird error' in the index to The TeXbook.)
 ! Missing number, treated as zero.
 <to be read again> 
-                   <
+<
 l. ...  }
 A number should have been here; I inserted `0'.
 (If you can't figure out why I needed to see a number,
 look up `weird error' in the index to The TeXbook.)
 ! Missing number, treated as zero.
 <to be read again> 
-                   <
+<
 l. ...  }
 A number should have been here; I inserted `0'.
 (If you can't figure out why I needed to see a number,
 look up `weird error' in the index to The TeXbook.)
 ! Missing number, treated as zero.
 <to be read again> 
-                   >
+>
 l. ...  }
 A number should have been here; I inserted `0'.
 (If you can't figure out why I needed to see a number,
 look up `weird error' in the index to The TeXbook.)
 ! Missing number, treated as zero.
 <to be read again> 
-                   >
+>
 l. ...  }
 A number should have been here; I inserted `0'.
 (If you can't figure out why I needed to see a number,
 look up `weird error' in the index to The TeXbook.)
 ! Missing number, treated as zero.
 <to be read again> 
-                   >
+>
 l. ...  }
 A number should have been here; I inserted `0'.
 (If you can't figure out why I needed to see a number,
 look up `weird error' in the index to The TeXbook.)
 ! Missing number, treated as zero.
 <to be read again> 
-                   >
+>
 l. ...  }
 A number should have been here; I inserted `0'.
 (If you can't figure out why I needed to see a number,
@@ -434,7 +434,7 @@
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Relation ':' unknown: use =, <, >, ==, !=, <=, >=.
+Relation ':' unknown: use =, <, >, ==, !=, <=, >=.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -443,7 +443,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Relation ':' unknown: use =, <, >, ==, !=, <=, >=.
+Relation ':' unknown: use =, <, >, ==, !=, <=, >=.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -452,7 +452,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Relation '\?' unknown: use =, <, >, ==, !=, <=, >=.
+Relation '\?' unknown: use =, <, >, ==, !=, <=, >=.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -515,19 +515,19 @@
 ============================================================
 ! Missing = inserted for \ifdim.
 <to be read again> 
-                   :
+:
 l. ...  }
 I was expecting to see `<', `=', or `>'. Didn't.
 ! Missing number, treated as zero.
 <to be read again> 
-                   :
+:
 l. ...  }
 A number should have been here; I inserted `0'.
 (If you can't figure out why I needed to see a number,
 look up `weird error' in the index to The TeXbook.)
 ! Illegal unit of measure (pt inserted).
 <to be read again> 
-                   :
+:
 l. ...  }
 Dimensions can be in units of em, ex, in, pt, pc,
 cm, mm, dd, cc, nd, nc, bp, or sp; but yours is a new one!

Modified: trunk/l3kernel/testfiles/m3expl001.luatex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl001.luatex.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/m3expl001.luatex.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -17,7 +17,7 @@
 %%   Right brace   \}     Tilde         \~}
 %%
 (expl3.sty
- (expl3-code.tex
+(expl3-code.tex
 \ucharcat at table=\catcodetable5
 Defining \cs_set_nopar:cpn on line ...
 Defining \cs_set_nopar:cpx on line ...
@@ -4788,7 +4788,7 @@
 Defining key expl/check-declarations on line ...
 Defining key expl/log-functions on line ...
 Defining \c__expl_def_ext_tl on line ...
- (l3pdfmode.def
+(l3pdfmode.def
 Defining \__driver_state_save: on line ...
 Defining \__driver_state_restore: on line ...
 Defining \__driver_literal:n on line ...

Modified: trunk/l3kernel/testfiles/m3expl001.ptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl001.ptex.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/m3expl001.ptex.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -17,7 +17,7 @@
 %%   Right brace   \}     Tilde         \~}
 %%
 (expl3.sty
- (expl3-code.tex
+(expl3-code.tex
 Defining \cs_set_nopar:cpn on line ...
 Defining \cs_set_nopar:cpx on line ...
 Defining \cs_gset_nopar:cpn on line ...
@@ -4773,7 +4773,7 @@
 Defining key expl/check-declarations on line ...
 Defining key expl/log-functions on line ...
 Defining \c__expl_def_ext_tl on line ...
- (l3dvipdfmx.def
+(l3dvipdfmx.def
 Defining \__driver_state_save: on line ...
 Defining \__driver_state_restore: on line ...
 Defining \__driver_literal:n on line ...

Modified: trunk/l3kernel/testfiles/m3expl001.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl001.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/m3expl001.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -17,7 +17,7 @@
 %%   Right brace   \}     Tilde         \~}
 %%
 (expl3.sty
- (expl3-code.tex
+(expl3-code.tex
 Defining \cs_set_nopar:cpn on line ...
 Defining \cs_set_nopar:cpx on line ...
 Defining \cs_gset_nopar:cpn on line ...
@@ -4773,7 +4773,7 @@
 Defining key expl/check-declarations on line ...
 Defining key expl/log-functions on line ...
 Defining \c__expl_def_ext_tl on line ...
- (l3pdfmode.def
+(l3pdfmode.def
 Defining \__driver_state_save: on line ...
 Defining \__driver_state_restore: on line ...
 Defining \__driver_literal:n on line ...

Modified: trunk/l3kernel/testfiles/m3expl001.uptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl001.uptex.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/m3expl001.uptex.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -17,7 +17,7 @@
 %%   Right brace   \}     Tilde         \~}
 %%
 (expl3.sty
- (expl3-code.tex
+(expl3-code.tex
 Defining \cs_set_nopar:cpn on line ...
 Defining \cs_set_nopar:cpx on line ...
 Defining \cs_gset_nopar:cpn on line ...
@@ -4773,7 +4773,7 @@
 Defining key expl/check-declarations on line ...
 Defining key expl/log-functions on line ...
 Defining \c__expl_def_ext_tl on line ...
- (l3dvipdfmx.def
+(l3dvipdfmx.def
 Defining \__driver_state_save: on line ...
 Defining \__driver_state_restore: on line ...
 Defining \__driver_literal:n on line ...

Modified: trunk/l3kernel/testfiles/m3expl001.xetex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl001.xetex.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/m3expl001.xetex.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -17,7 +17,7 @@
 %%   Right brace   \}     Tilde         \~}
 %%
 (expl3.sty
- (expl3-code.tex
+(expl3-code.tex
 Defining \cs_set_nopar:cpn on line ...
 Defining \cs_set_nopar:cpx on line ...
 Defining \cs_gset_nopar:cpn on line ...
@@ -4786,7 +4786,7 @@
 Defining key expl/check-declarations on line ...
 Defining key expl/log-functions on line ...
 Defining \c__expl_def_ext_tl on line ...
- (l3xdvipdfmx.def
+(l3xdvipdfmx.def
 Defining \__driver_state_save: on line ...
 Defining \__driver_state_restore: on line ...
 Defining \__driver_literal:n on line ...

Modified: trunk/l3kernel/testfiles/m3expl002.luatex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl002.luatex.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/m3expl002.luatex.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -17,7 +17,7 @@
 %%   Right brace   \}     Tilde         \~}
 %%
 (expl3.sty
- (expl3-code.tex
+(expl3-code.tex
 \ucharcat at table=\catcodetable5
 \c_max_int=\count112
 \l_tmpa_int=\count113

Modified: trunk/l3kernel/testfiles/m3expl002.ptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl002.ptex.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/m3expl002.ptex.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -17,7 +17,7 @@
 %%   Right brace   \}     Tilde         \~}
 %%
 (expl3.sty
- (expl3-code.tex
+(expl3-code.tex
 \c_max_int=\count113
 \l_tmpa_int=\count114
 \l_tmpb_int=\count115

Modified: trunk/l3kernel/testfiles/m3expl002.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl002.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/m3expl002.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -17,7 +17,7 @@
 %%   Right brace   \}     Tilde         \~}
 %%
 (expl3.sty
- (expl3-code.tex
+(expl3-code.tex
 \c_max_int=\count112
 \l_tmpa_int=\count113
 \l_tmpb_int=\count114

Modified: trunk/l3kernel/testfiles/m3expl002.uptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl002.uptex.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/m3expl002.uptex.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -17,7 +17,7 @@
 %%   Right brace   \}     Tilde         \~}
 %%
 (expl3.sty
- (expl3-code.tex
+(expl3-code.tex
 \c_max_int=\count113
 \l_tmpa_int=\count114
 \l_tmpb_int=\count115

Modified: trunk/l3kernel/testfiles/m3expl002.xetex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl002.xetex.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/m3expl002.xetex.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -17,7 +17,7 @@
 %%   Right brace   \}     Tilde         \~}
 %%
 (expl3.sty
- (expl3-code.tex
+(expl3-code.tex
 \c_max_int=\count112
 \l_tmpa_int=\count113
 \l_tmpb_int=\count114

Modified: trunk/l3kernel/testfiles/m3expl003.luatex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl003.luatex.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/m3expl003.luatex.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -17,7 +17,7 @@
 %%   Right brace   \}     Tilde         \~}
 %%
 (expl3.sty
- (expl3-code.tex
+(expl3-code.tex
 \ucharcat at table=\catcodetable5
 Defining \cs_set_nopar:cpn on line ...
 Defining \cs_set_nopar:cpx on line ...
@@ -4789,7 +4789,7 @@
 Defining key expl/check-declarations on line ...
 Defining key expl/log-functions on line ...
 Defining \c__expl_def_ext_tl on line ...
- (l3pdfmode.def
+(l3pdfmode.def
 Defining \__driver_state_save: on line ...
 Defining \__driver_state_restore: on line ...
 Defining \__driver_literal:n on line ...

Modified: trunk/l3kernel/testfiles/m3expl003.ptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl003.ptex.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/m3expl003.ptex.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -17,7 +17,7 @@
 %%   Right brace   \}     Tilde         \~}
 %%
 (expl3.sty
- (expl3-code.tex
+(expl3-code.tex
 Defining \cs_set_nopar:cpn on line ...
 Defining \cs_set_nopar:cpx on line ...
 Defining \cs_gset_nopar:cpn on line ...
@@ -4774,7 +4774,7 @@
 Defining key expl/check-declarations on line ...
 Defining key expl/log-functions on line ...
 Defining \c__expl_def_ext_tl on line ...
- (l3dvipdfmx.def
+(l3dvipdfmx.def
 Defining \__driver_state_save: on line ...
 Defining \__driver_state_restore: on line ...
 Defining \__driver_literal:n on line ...

Modified: trunk/l3kernel/testfiles/m3expl003.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl003.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/m3expl003.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -17,7 +17,7 @@
 %%   Right brace   \}     Tilde         \~}
 %%
 (expl3.sty
- (expl3-code.tex
+(expl3-code.tex
 Defining \cs_set_nopar:cpn on line ...
 Defining \cs_set_nopar:cpx on line ...
 Defining \cs_gset_nopar:cpn on line ...
@@ -4774,7 +4774,7 @@
 Defining key expl/check-declarations on line ...
 Defining key expl/log-functions on line ...
 Defining \c__expl_def_ext_tl on line ...
- (l3pdfmode.def
+(l3pdfmode.def
 Defining \__driver_state_save: on line ...
 Defining \__driver_state_restore: on line ...
 Defining \__driver_literal:n on line ...

Modified: trunk/l3kernel/testfiles/m3expl003.uptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl003.uptex.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/m3expl003.uptex.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -17,7 +17,7 @@
 %%   Right brace   \}     Tilde         \~}
 %%
 (expl3.sty
- (expl3-code.tex
+(expl3-code.tex
 Defining \cs_set_nopar:cpn on line ...
 Defining \cs_set_nopar:cpx on line ...
 Defining \cs_gset_nopar:cpn on line ...
@@ -4774,7 +4774,7 @@
 Defining key expl/check-declarations on line ...
 Defining key expl/log-functions on line ...
 Defining \c__expl_def_ext_tl on line ...
- (l3dvipdfmx.def
+(l3dvipdfmx.def
 Defining \__driver_state_save: on line ...
 Defining \__driver_state_restore: on line ...
 Defining \__driver_literal:n on line ...

Modified: trunk/l3kernel/testfiles/m3expl003.xetex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl003.xetex.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/m3expl003.xetex.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -17,7 +17,7 @@
 %%   Right brace   \}     Tilde         \~}
 %%
 (expl3.sty
- (expl3-code.tex
+(expl3-code.tex
 Defining \cs_set_nopar:cpn on line ...
 Defining \cs_set_nopar:cpx on line ...
 Defining \cs_gset_nopar:cpn on line ...
@@ -4787,7 +4787,7 @@
 Defining key expl/check-declarations on line ...
 Defining key expl/log-functions on line ...
 Defining \c__expl_def_ext_tl on line ...
- (l3xdvipdfmx.def
+(l3xdvipdfmx.def
 Defining \__driver_state_save: on line ...
 Defining \__driver_state_restore: on line ...
 Defining \__driver_literal:n on line ...

Modified: trunk/l3kernel/testfiles/m3expl004.luatex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl004.luatex.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/m3expl004.luatex.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -17,7 +17,7 @@
 %%   Right brace   \}     Tilde         \~}
 %%
 (expl3.sty
- (expl3-code.tex
+(expl3-code.tex
 \ucharcat at table=\catcodetable5
 \c_max_int=\count112
 \l_tmpa_int=\count113

Modified: trunk/l3kernel/testfiles/m3expl004.ptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl004.ptex.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/m3expl004.ptex.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -17,7 +17,7 @@
 %%   Right brace   \}     Tilde         \~}
 %%
 (expl3.sty
- (expl3-code.tex
+(expl3-code.tex
 \c_max_int=\count113
 \l_tmpa_int=\count114
 \l_tmpb_int=\count115

Modified: trunk/l3kernel/testfiles/m3expl004.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl004.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/m3expl004.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -17,7 +17,7 @@
 %%   Right brace   \}     Tilde         \~}
 %%
 (expl3.sty
- (expl3-code.tex
+(expl3-code.tex
 \c_max_int=\count112
 \l_tmpa_int=\count113
 \l_tmpb_int=\count114

Modified: trunk/l3kernel/testfiles/m3expl004.uptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl004.uptex.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/m3expl004.uptex.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -17,7 +17,7 @@
 %%   Right brace   \}     Tilde         \~}
 %%
 (expl3.sty
- (expl3-code.tex
+(expl3-code.tex
 \c_max_int=\count113
 \l_tmpa_int=\count114
 \l_tmpb_int=\count115

Modified: trunk/l3kernel/testfiles/m3expl004.xetex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl004.xetex.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/m3expl004.xetex.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -17,7 +17,7 @@
 %%   Right brace   \}     Tilde         \~}
 %%
 (expl3.sty
- (expl3-code.tex
+(expl3-code.tex
 \c_max_int=\count112
 \l_tmpa_int=\count113
 \l_tmpb_int=\count114

Modified: trunk/l3kernel/testfiles/m3expl005.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl005.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/m3expl005.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -34,7 +34,7 @@
 ! Package l3basics Error: This package is obsolete --- use 'expl3' instead.
 See the l3basics package documentation for explanation.
 Type  H <return>  for immediate help.
- ...                                              
+...                                              
 l. ...   use 'expl3' instead}\@ehc
 Try typing  <return>  to proceed.
 If that doesn't work, type  X <return>  to quit.
@@ -57,7 +57,7 @@
 ! Package l3bootstrap Error: This package is obsolete --- use 'expl3' instead.
 See the l3bootstrap package documentation for explanation.
 Type  H <return>  for immediate help.
- ...                                              
+...                                              
 l. ...   use 'expl3' instead}\@ehc
 Try typing  <return>  to proceed.
 If that doesn't work, type  X <return>  to quit.
@@ -80,7 +80,7 @@
 ! Package l3box Error: This package is obsolete --- use 'expl3' instead.
 See the l3box package documentation for explanation.
 Type  H <return>  for immediate help.
- ...                                              
+...                                              
 l. ...   use 'expl3' instead}\@ehc
 Try typing  <return>  to proceed.
 If that doesn't work, type  X <return>  to quit.
@@ -103,7 +103,7 @@
 ! Package l3candidates Error: This package is obsolete --- use 'expl3' instead.
 See the l3candidates package documentation for explanation.
 Type  H <return>  for immediate help.
- ...                                              
+...                                              
 l. ...   use 'expl3' instead}\@ehc
 Try typing  <return>  to proceed.
 If that doesn't work, type  X <return>  to quit.
@@ -126,7 +126,7 @@
 ! Package l3clist Error: This package is obsolete --- use 'expl3' instead.
 See the l3clist package documentation for explanation.
 Type  H <return>  for immediate help.
- ...                                              
+...                                              
 l. ...   use 'expl3' instead}\@ehc
 Try typing  <return>  to proceed.
 If that doesn't work, type  X <return>  to quit.
@@ -149,7 +149,7 @@
 ! Package l3coffins Error: This package is obsolete --- use 'expl3' instead.
 See the l3coffins package documentation for explanation.
 Type  H <return>  for immediate help.
- ...                                              
+...                                              
 l. ...   use 'expl3' instead}\@ehc
 Try typing  <return>  to proceed.
 If that doesn't work, type  X <return>  to quit.
@@ -172,7 +172,7 @@
 ! Package l3color Error: This package is obsolete --- use 'expl3' instead.
 See the l3color package documentation for explanation.
 Type  H <return>  for immediate help.
- ...                                              
+...                                              
 l. ...   use 'expl3' instead}\@ehc
 Try typing  <return>  to proceed.
 If that doesn't work, type  X <return>  to quit.
@@ -195,7 +195,7 @@
 ! Package l3expan Error: This package is obsolete --- use 'expl3' instead.
 See the l3expan package documentation for explanation.
 Type  H <return>  for immediate help.
- ...                                              
+...                                              
 l. ...   use 'expl3' instead}\@ehc
 Try typing  <return>  to proceed.
 If that doesn't work, type  X <return>  to quit.
@@ -218,7 +218,7 @@
 ! Package l3file Error: This package is obsolete --- use 'expl3' instead.
 See the l3file package documentation for explanation.
 Type  H <return>  for immediate help.
- ...                                              
+...                                              
 l. ...   use 'expl3' instead}\@ehc
 Try typing  <return>  to proceed.
 If that doesn't work, type  X <return>  to quit.
@@ -241,7 +241,7 @@
 ! Package l3fp Error: This package is obsolete --- use 'expl3' instead.
 See the l3fp package documentation for explanation.
 Type  H <return>  for immediate help.
- ...                                              
+...                                              
 l. ...   use 'expl3' instead}\@ehc
 Try typing  <return>  to proceed.
 If that doesn't work, type  X <return>  to quit.
@@ -264,7 +264,7 @@
 ! Package l3int Error: This package is obsolete --- use 'expl3' instead.
 See the l3int package documentation for explanation.
 Type  H <return>  for immediate help.
- ...                                              
+...                                              
 l. ...   use 'expl3' instead}\@ehc
 Try typing  <return>  to proceed.
 If that doesn't work, type  X <return>  to quit.
@@ -287,7 +287,7 @@
 ! Package l3keys Error: This package is obsolete --- use 'expl3' instead.
 See the l3keys package documentation for explanation.
 Type  H <return>  for immediate help.
- ...                                              
+...                                              
 l. ...   use 'expl3' instead}\@ehc
 Try typing  <return>  to proceed.
 If that doesn't work, type  X <return>  to quit.
@@ -310,7 +310,7 @@
 ! Package l3msg Error: This package is obsolete --- use 'expl3' instead.
 See the l3msg package documentation for explanation.
 Type  H <return>  for immediate help.
- ...                                              
+...                                              
 l. ...   use 'expl3' instead}\@ehc
 Try typing  <return>  to proceed.
 If that doesn't work, type  X <return>  to quit.
@@ -333,7 +333,7 @@
 ! Package l3names Error: This package is obsolete --- use 'expl3' instead.
 See the l3names package documentation for explanation.
 Type  H <return>  for immediate help.
- ...                                              
+...                                              
 l. ...   use 'expl3' instead}\@ehc
 Try typing  <return>  to proceed.
 If that doesn't work, type  X <return>  to quit.
@@ -356,7 +356,7 @@
 ! Package l3prg Error: This package is obsolete --- use 'expl3' instead.
 See the l3prg package documentation for explanation.
 Type  H <return>  for immediate help.
- ...                                              
+...                                              
 l. ...   use 'expl3' instead}\@ehc
 Try typing  <return>  to proceed.
 If that doesn't work, type  X <return>  to quit.
@@ -379,7 +379,7 @@
 ! Package l3prop Error: This package is obsolete --- use 'expl3' instead.
 See the l3prop package documentation for explanation.
 Type  H <return>  for immediate help.
- ...                                              
+...                                              
 l. ...   use 'expl3' instead}\@ehc
 Try typing  <return>  to proceed.
 If that doesn't work, type  X <return>  to quit.
@@ -402,7 +402,7 @@
 ! Package l3quark Error: This package is obsolete --- use 'expl3' instead.
 See the l3quark package documentation for explanation.
 Type  H <return>  for immediate help.
- ...                                              
+...                                              
 l. ...   use 'expl3' instead}\@ehc
 Try typing  <return>  to proceed.
 If that doesn't work, type  X <return>  to quit.
@@ -425,7 +425,7 @@
 ! Package l3seq Error: This package is obsolete --- use 'expl3' instead.
 See the l3seq package documentation for explanation.
 Type  H <return>  for immediate help.
- ...                                              
+...                                              
 l. ...   use 'expl3' instead}\@ehc
 Try typing  <return>  to proceed.
 If that doesn't work, type  X <return>  to quit.
@@ -448,7 +448,7 @@
 ! Package l3skip Error: This package is obsolete --- use 'expl3' instead.
 See the l3skip package documentation for explanation.
 Type  H <return>  for immediate help.
- ...                                              
+...                                              
 l. ...   use 'expl3' instead}\@ehc
 Try typing  <return>  to proceed.
 If that doesn't work, type  X <return>  to quit.
@@ -471,7 +471,7 @@
 ! Package l3tl Error: This package is obsolete --- use 'expl3' instead.
 See the l3tl package documentation for explanation.
 Type  H <return>  for immediate help.
- ...                                              
+...                                              
 l. ...   use 'expl3' instead}\@ehc
 Try typing  <return>  to proceed.
 If that doesn't work, type  X <return>  to quit.
@@ -494,7 +494,7 @@
 ! Package l3token Error: This package is obsolete --- use 'expl3' instead.
 See the l3token package documentation for explanation.
 Type  H <return>  for immediate help.
- ...                                              
+...                                              
 l. ...   use 'expl3' instead}\@ehc
 Try typing  <return>  to proceed.
 If that doesn't work, type  X <return>  to quit.

Modified: trunk/l3kernel/testfiles/m3expl006.luatex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl006.luatex.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/m3expl006.luatex.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -18,7 +18,7 @@
 %%
 Author: Bruno Le Floch and Joseph Wright
 (expl3.sty
- (expl3-code.tex
+(expl3-code.tex
 \ucharcat at table=\catcodetable5
 \c_max_int=\count112
 \l_tmpa_int=\count113

Modified: trunk/l3kernel/testfiles/m3expl006.ptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl006.ptex.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/m3expl006.ptex.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -18,7 +18,7 @@
 %%
 Author: Bruno Le Floch and Joseph Wright
 (expl3.sty
- (expl3-code.tex
+(expl3-code.tex
 \c_max_int=\count113
 \l_tmpa_int=\count114
 \l_tmpb_int=\count115

Modified: trunk/l3kernel/testfiles/m3expl006.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl006.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/m3expl006.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -18,7 +18,7 @@
 %%
 Author: Bruno Le Floch and Joseph Wright
 (expl3.sty
- (expl3-code.tex
+(expl3-code.tex
 \c_max_int=\count112
 \l_tmpa_int=\count113
 \l_tmpb_int=\count114

Modified: trunk/l3kernel/testfiles/m3expl006.uptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl006.uptex.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/m3expl006.uptex.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -18,7 +18,7 @@
 %%
 Author: Bruno Le Floch and Joseph Wright
 (expl3.sty
- (expl3-code.tex
+(expl3-code.tex
 \c_max_int=\count113
 \l_tmpa_int=\count114
 \l_tmpb_int=\count115

Modified: trunk/l3kernel/testfiles/m3expl006.xetex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl006.xetex.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/m3expl006.xetex.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -18,7 +18,7 @@
 %%
 Author: Bruno Le Floch and Joseph Wright
 (expl3.sty
- (expl3-code.tex
+(expl3-code.tex
 \c_max_int=\count112
 \l_tmpa_int=\count113
 \l_tmpb_int=\count114

Modified: trunk/l3kernel/testfiles/m3file002.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3file002.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/m3file002.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -25,9 +25,9 @@
 |\ExplSyntaxOff Thisfileisneededbym3file001.lvt
 m3ior001.lvtandm3ior002.lvt:Pleaseleaveitalone!\ExplSyntaxOn |
 |\ExplSyntaxOff This file is needed by m3file001.lvt
- m3ior001.lvt and m3ior002.lvt: Please leave it alone! \ExplSyntaxOn |
+m3ior001.lvt and m3ior002.lvt: Please leave it alone! \ExplSyntaxOn |
 |\ExplSyntaxOff This file is needed by m3file001.lvt
- m3ior001.lvt and m3ior002.lvt:Please leave it alone!\ExplSyntaxOn |
+m3ior001.lvt and m3ior002.lvt:Please leave it alone!\ExplSyntaxOn |
 ============================================================
 ============================================================
 TEST 2: Set tl from a file with expansion
@@ -36,10 +36,10 @@
 |\ExplSyntaxOff Thisfileisneededbym3file001.lvt
 m3ior001.lvtandm3ior002.lvt:Pleaseleaveitalone!\ExplSyntaxOn |
 |\ExplSyntaxOff This file is needed by m3file001.lvt
- m3ior001.lvt and m3ior002.lvt: Please leave it alone! \ExplSyntaxOn |
+m3ior001.lvt and m3ior002.lvt: Please leave it alone! \ExplSyntaxOn |
 |\ExplSyntaxOff /
 This file is needed by m3file001.lvt
- m3ior001.lvt and m3ior002.lvt:/
+m3ior001.lvt and m3ior002.lvt:/
 Please leave it alone!/
 \ExplSyntaxOn /
 |

Modified: trunk/l3kernel/testfiles/m3fp-assign001.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3fp-assign001.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/m3fp-assign001.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -58,7 +58,7 @@
 > \g_B_fp=-0.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Premature end in fp expression.
+Premature end in fp expression.
 l. ...}
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -69,7 +69,7 @@
 > \l_B_fp=nan.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Premature end in fp expression.
+Premature end in fp expression.
 l. ...}
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have

Modified: trunk/l3kernel/testfiles/m3fp-basics001.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3fp-basics001.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/m3fp-basics001.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -22,7 +22,7 @@
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation (inf)+(-inf)
+Invalid operation (inf)+(-inf)
 l. ...}
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -31,7 +31,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation (-inf)+(inf)
+Invalid operation (-inf)+(inf)
 l. ...}
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -165,7 +165,7 @@
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation (inf)-(inf)
+Invalid operation (inf)-(inf)
 l. ...}
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -174,7 +174,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation (-inf)-(-inf)
+Invalid operation (-inf)-(-inf)
 l. ...}
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have

Modified: trunk/l3kernel/testfiles/m3fp-basics002.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3fp-basics002.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/m3fp-basics002.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -22,7 +22,7 @@
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation (inf)*(0)
+Invalid operation (inf)*(0)
 l. ...}
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -31,7 +31,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation (inf)*(-0)
+Invalid operation (inf)*(-0)
 l. ...}
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -40,7 +40,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation (-inf)*(0)
+Invalid operation (-inf)*(0)
 l. ...}
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -49,7 +49,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation (-inf)*(-0)
+Invalid operation (-inf)*(-0)
 l. ...}
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -58,7 +58,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation (0)*(inf)
+Invalid operation (0)*(inf)
 l. ...}
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -67,7 +67,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation (0)*(-inf)
+Invalid operation (0)*(-inf)
 l. ...}
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -76,7 +76,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation (-0)*(inf)
+Invalid operation (-0)*(inf)
 l. ...}
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -85,7 +85,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation (-0)*(-inf)
+Invalid operation (-0)*(-inf)
 l. ...}
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have

Modified: trunk/l3kernel/testfiles/m3fp-basics003.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3fp-basics003.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/m3fp-basics003.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -22,7 +22,7 @@
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation (inf)/(inf)
+Invalid operation (inf)/(inf)
 l. ...}
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -31,7 +31,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation (inf)/(-inf)
+Invalid operation (inf)/(-inf)
 l. ...}
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -40,7 +40,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation (-inf)/(inf)
+Invalid operation (-inf)/(inf)
 l. ...}
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -49,7 +49,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation (-inf)/(-inf)
+Invalid operation (-inf)/(-inf)
 l. ...}
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -58,7 +58,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation (0)/(0)
+Invalid operation (0)/(0)
 l. ...}
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -67,7 +67,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation (0)/(-0)
+Invalid operation (0)/(-0)
 l. ...}
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -76,7 +76,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation (-0)/(0)
+Invalid operation (-0)/(0)
 l. ...}
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -85,7 +85,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation (-0)/(-0)
+Invalid operation (-0)/(-0)
 l. ...}
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have

Modified: trunk/l3kernel/testfiles/m3fp-basics005.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3fp-basics005.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/m3fp-basics005.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -24,7 +24,7 @@
 0
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation sqrt(-1)
+Invalid operation sqrt(-1)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -35,7 +35,7 @@
 1
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation sqrt(-9.999999999999999e9999)
+Invalid operation sqrt(-9.999999999999999e9999)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -46,7 +46,7 @@
 9.999999999999999e4999
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation sqrt(-1e-10001)
+Invalid operation sqrt(-1e-10001)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -58,7 +58,7 @@
 inf
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation sqrt(-inf)
+Invalid operation sqrt(-inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have

Modified: trunk/l3kernel/testfiles/m3fp-convert001.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3fp-convert001.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/m3fp-convert001.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -48,7 +48,7 @@
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Missing * inserted.
+Missing * inserted.
 l. ...}
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -57,7 +57,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation (inf)*(0)
+Invalid operation (inf)*(0)
 l. ...}
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -66,7 +66,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Missing * inserted.
+Missing * inserted.
 l. ...}
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -75,7 +75,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Unknown fp word abc.
+Unknown fp word abc.
 l. ...}
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -84,7 +84,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Erroneous variable \relax used!
+Erroneous variable \relax used!
 l. ...}
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -93,7 +93,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Unknown fp word bla.
+Unknown fp word bla.
 l. ...}
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -102,7 +102,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Premature end in fp expression.
+Premature end in fp expression.
 l. ...}
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have

Modified: trunk/l3kernel/testfiles/m3fp-convert003.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3fp-convert003.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/m3fp-convert003.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -32,7 +32,7 @@
 |-1.2345e|
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation fp_to_scientific(-inf)
+Invalid operation fp_to_scientific(-inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -42,7 +42,7 @@
 |-1e10000|
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation fp_to_scientific(-inf)
+Invalid operation fp_to_scientific(-inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -52,7 +52,7 @@
 |-1e10000|
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation fp_to_scientific(inf)
+Invalid operation fp_to_scientific(inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -62,7 +62,7 @@
 |1e10000|
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation fp_to_scientific(inf)
+Invalid operation fp_to_scientific(inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -72,7 +72,7 @@
 |1e10000|
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation fp_to_scientific(nan)
+Invalid operation fp_to_scientific(nan)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -82,7 +82,7 @@
 |0|
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation fp_to_scientific(nan)
+Invalid operation fp_to_scientific(nan)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -106,7 +106,7 @@
 |-0.00000|
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation fp_to_decimal(-inf)
+Invalid operation fp_to_decimal(-inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -116,7 +116,7 @@
 |-1000000|
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation fp_to_decimal(-inf)
+Invalid operation fp_to_decimal(-inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -126,7 +126,7 @@
 |-1000000|
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation fp_to_decimal(inf)
+Invalid operation fp_to_decimal(inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -136,7 +136,7 @@
 |10000000|
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation fp_to_decimal(inf)
+Invalid operation fp_to_decimal(inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -146,7 +146,7 @@
 |10000000|
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation fp_to_decimal(nan)
+Invalid operation fp_to_decimal(nan)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -156,7 +156,7 @@
 |0|
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation fp_to_decimal(nan)
+Invalid operation fp_to_decimal(nan)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -200,7 +200,7 @@
 |-0.00000|
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation fp_to_decimal(-inf)
+Invalid operation fp_to_decimal(-inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -210,7 +210,7 @@
 |-1000000|
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation fp_to_decimal(-inf)
+Invalid operation fp_to_decimal(-inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -220,7 +220,7 @@
 |-1000000|
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation fp_to_decimal(inf)
+Invalid operation fp_to_decimal(inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -230,7 +230,7 @@
 |10000000|
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation fp_to_decimal(inf)
+Invalid operation fp_to_decimal(inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -240,7 +240,7 @@
 |10000000|
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation fp_to_decimal(nan)
+Invalid operation fp_to_decimal(nan)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -250,7 +250,7 @@
 |0pt|
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation fp_to_decimal(nan)
+Invalid operation fp_to_decimal(nan)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -274,7 +274,7 @@
 |-0|
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation fp_to_decimal(-inf)
+Invalid operation fp_to_decimal(-inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -284,7 +284,7 @@
 |-1000000|
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation fp_to_decimal(-inf)
+Invalid operation fp_to_decimal(-inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -294,7 +294,7 @@
 |-1000000|
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation fp_to_decimal(inf)
+Invalid operation fp_to_decimal(inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -304,7 +304,7 @@
 |10000000|
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation fp_to_decimal(inf)
+Invalid operation fp_to_decimal(inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -314,7 +314,7 @@
 |10000000|
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation fp_to_decimal(nan)
+Invalid operation fp_to_decimal(nan)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -324,7 +324,7 @@
 |0|
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation fp_to_decimal(nan)
+Invalid operation fp_to_decimal(nan)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -348,7 +348,7 @@
 |-0.00000|
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation fp_to_decimal(-inf)
+Invalid operation fp_to_decimal(-inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -358,7 +358,7 @@
 |-1000000|
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation fp_to_decimal(-inf)
+Invalid operation fp_to_decimal(-inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -368,7 +368,7 @@
 |-1000000|
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation fp_to_decimal(inf)
+Invalid operation fp_to_decimal(inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -378,7 +378,7 @@
 |10000000|
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation fp_to_decimal(inf)
+Invalid operation fp_to_decimal(inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -388,7 +388,7 @@
 |10000000|
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation fp_to_decimal(nan)
+Invalid operation fp_to_decimal(nan)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -398,7 +398,7 @@
 |0|
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation fp_to_decimal(nan)
+Invalid operation fp_to_decimal(nan)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -417,7 +417,7 @@
 |0.000001|
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation fp_to_decimal(inf)
+Invalid operation fp_to_decimal(inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -427,7 +427,7 @@
 |10000000|
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation fp_to_decimal(inf)
+Invalid operation fp_to_decimal(inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -437,7 +437,7 @@
 |10000000|
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation fp_to_decimal(nan)
+Invalid operation fp_to_decimal(nan)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -454,7 +454,7 @@
 |1234000|
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation fp_to_decimal(inf)
+Invalid operation fp_to_decimal(inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -465,7 +465,7 @@
 |10|
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation fp_to_decimal(inf)
+Invalid operation fp_to_decimal(inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -475,7 +475,7 @@
 |10000000|
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation fp_to_decimal(inf)
+Invalid operation fp_to_decimal(inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -485,7 +485,7 @@
 |10000000|
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation fp_to_decimal(nan)
+Invalid operation fp_to_decimal(nan)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -500,7 +500,7 @@
 |-0.00000|
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation fp_to_decimal(-inf)
+Invalid operation fp_to_decimal(-inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -510,7 +510,7 @@
 |-1000000|
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation fp_to_decimal(inf)
+Invalid operation fp_to_decimal(inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -520,7 +520,7 @@
 |10000000|
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation fp_to_decimal(nan)
+Invalid operation fp_to_decimal(nan)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have

Modified: trunk/l3kernel/testfiles/m3fp-expo001.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3fp-expo001.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/m3fp-expo001.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -22,7 +22,7 @@
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation ln(-inf)
+Invalid operation ln(-inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -31,7 +31,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Division by zero in ln(0)
+Division by zero in ln(0)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -40,7 +40,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation ln(-0)
+Invalid operation ln(-0)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -49,7 +49,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation ln(-1)
+Invalid operation ln(-1)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -112,7 +112,7 @@
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation (-inf)^(inf)
+Invalid operation (-inf)^(inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -121,7 +121,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation (-1)^(inf)
+Invalid operation (-1)^(inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -130,7 +130,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation (-1)^(-inf)
+Invalid operation (-1)^(-inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -139,7 +139,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Division by zero in (0)^(-inf)
+Division by zero in (0)^(-inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -148,7 +148,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Division by zero in (0)^(-1)
+Division by zero in (0)^(-1)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -157,7 +157,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Division by zero in (-0)^(-inf)
+Division by zero in (-0)^(-inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -166,7 +166,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation (-0)^(-inf)
+Invalid operation (-0)^(-inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -175,7 +175,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Division by zero in (-0)^(-1)
+Division by zero in (-0)^(-1)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -281,7 +281,7 @@
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation (inf)*(0)
+Invalid operation (inf)*(0)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -290,7 +290,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation (inf)*(0)
+Invalid operation (inf)*(0)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -299,7 +299,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation (inf)*(0)
+Invalid operation (inf)*(0)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -308,7 +308,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation (inf)*(0)
+Invalid operation (inf)*(0)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -317,7 +317,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation (inf)*(0)
+Invalid operation (inf)*(0)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -326,7 +326,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation (inf)*(0)
+Invalid operation (inf)*(0)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -335,7 +335,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation (inf)*(0)
+Invalid operation (inf)*(0)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -344,7 +344,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation (inf)*(0)
+Invalid operation (inf)*(0)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -353,7 +353,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation (0)*(inf)
+Invalid operation (0)*(inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -362,7 +362,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation (0)*(inf)
+Invalid operation (0)*(inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -371,7 +371,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation (0)*(inf)
+Invalid operation (0)*(inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -380,7 +380,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation (0)*(inf)
+Invalid operation (0)*(inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -389,7 +389,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation (0)*(inf)
+Invalid operation (0)*(inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -398,7 +398,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation (0)*(inf)
+Invalid operation (0)*(inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -407,7 +407,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation (0)*(inf)
+Invalid operation (0)*(inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -416,7 +416,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation (0)*(inf)
+Invalid operation (0)*(inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have

Modified: trunk/l3kernel/testfiles/m3fp-func001.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3fp-func001.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/m3fp-func001.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -22,7 +22,7 @@
 ============================================================
 ! Undefined control sequence.
 <argument> \ERROR 
-                  \c_nan_fp 
+\c_nan_fp 
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have

Modified: trunk/l3kernel/testfiles/m3fp-logic001.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3fp-logic001.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/m3fp-logic001.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -21,218 +21,218 @@
 TEST 1: Comparing special cases
 ============================================================
 nan and nan
-            ?    >     >?   =     = ?   =>    =>? 
-   FALSE  TRUE FALSE  TRUE FALSE  TRUE FALSE  TRUE
- < FALSE  TRUE FALSE  TRUE FALSE  TRUE FALSE  TRUE
+?    >     >?   =     = ?   =>    =>? 
+FALSE  TRUE FALSE  TRUE FALSE  TRUE FALSE  TRUE
+< FALSE  TRUE FALSE  TRUE FALSE  TRUE FALSE  TRUE
 !   TRUE FALSE  TRUE FALSE  TRUE FALSE  TRUE FALSE
 !<  TRUE FALSE  TRUE FALSE  TRUE FALSE  TRUE FALSE
 nan and inf
-            ?    >     >?   =     = ?   =>    =>? 
-   FALSE  TRUE FALSE  TRUE FALSE  TRUE FALSE  TRUE
- < FALSE  TRUE FALSE  TRUE FALSE  TRUE FALSE  TRUE
+?    >     >?   =     = ?   =>    =>? 
+FALSE  TRUE FALSE  TRUE FALSE  TRUE FALSE  TRUE
+< FALSE  TRUE FALSE  TRUE FALSE  TRUE FALSE  TRUE
 !   TRUE FALSE  TRUE FALSE  TRUE FALSE  TRUE FALSE
 !<  TRUE FALSE  TRUE FALSE  TRUE FALSE  TRUE FALSE
 nan and -inf
-            ?    >     >?   =     = ?   =>    =>? 
-   FALSE  TRUE FALSE  TRUE FALSE  TRUE FALSE  TRUE
- < FALSE  TRUE FALSE  TRUE FALSE  TRUE FALSE  TRUE
+?    >     >?   =     = ?   =>    =>? 
+FALSE  TRUE FALSE  TRUE FALSE  TRUE FALSE  TRUE
+< FALSE  TRUE FALSE  TRUE FALSE  TRUE FALSE  TRUE
 !   TRUE FALSE  TRUE FALSE  TRUE FALSE  TRUE FALSE
 !<  TRUE FALSE  TRUE FALSE  TRUE FALSE  TRUE FALSE
 nan and 1
-            ?    >     >?   =     = ?   =>    =>? 
-   FALSE  TRUE FALSE  TRUE FALSE  TRUE FALSE  TRUE
- < FALSE  TRUE FALSE  TRUE FALSE  TRUE FALSE  TRUE
+?    >     >?   =     = ?   =>    =>? 
+FALSE  TRUE FALSE  TRUE FALSE  TRUE FALSE  TRUE
+< FALSE  TRUE FALSE  TRUE FALSE  TRUE FALSE  TRUE
 !   TRUE FALSE  TRUE FALSE  TRUE FALSE  TRUE FALSE
 !<  TRUE FALSE  TRUE FALSE  TRUE FALSE  TRUE FALSE
 nan and 0
-            ?    >     >?   =     = ?   =>    =>? 
-   FALSE  TRUE FALSE  TRUE FALSE  TRUE FALSE  TRUE
- < FALSE  TRUE FALSE  TRUE FALSE  TRUE FALSE  TRUE
+?    >     >?   =     = ?   =>    =>? 
+FALSE  TRUE FALSE  TRUE FALSE  TRUE FALSE  TRUE
+< FALSE  TRUE FALSE  TRUE FALSE  TRUE FALSE  TRUE
 !   TRUE FALSE  TRUE FALSE  TRUE FALSE  TRUE FALSE
 !<  TRUE FALSE  TRUE FALSE  TRUE FALSE  TRUE FALSE
 nan and -0
-            ?    >     >?   =     = ?   =>    =>? 
-   FALSE  TRUE FALSE  TRUE FALSE  TRUE FALSE  TRUE
- < FALSE  TRUE FALSE  TRUE FALSE  TRUE FALSE  TRUE
+?    >     >?   =     = ?   =>    =>? 
+FALSE  TRUE FALSE  TRUE FALSE  TRUE FALSE  TRUE
+< FALSE  TRUE FALSE  TRUE FALSE  TRUE FALSE  TRUE
 !   TRUE FALSE  TRUE FALSE  TRUE FALSE  TRUE FALSE
 !<  TRUE FALSE  TRUE FALSE  TRUE FALSE  TRUE FALSE
 ============================================================
 inf and nan
-            ?    >     >?   =     = ?   =>    =>? 
-   FALSE  TRUE FALSE  TRUE FALSE  TRUE FALSE  TRUE
- < FALSE  TRUE FALSE  TRUE FALSE  TRUE FALSE  TRUE
+?    >     >?   =     = ?   =>    =>? 
+FALSE  TRUE FALSE  TRUE FALSE  TRUE FALSE  TRUE
+< FALSE  TRUE FALSE  TRUE FALSE  TRUE FALSE  TRUE
 !   TRUE FALSE  TRUE FALSE  TRUE FALSE  TRUE FALSE
 !<  TRUE FALSE  TRUE FALSE  TRUE FALSE  TRUE FALSE
 inf and inf
-            ?    >     >?   =     = ?   =>    =>? 
-   FALSE FALSE FALSE FALSE  TRUE  TRUE  TRUE  TRUE
- < FALSE FALSE FALSE FALSE  TRUE  TRUE  TRUE  TRUE
+?    >     >?   =     = ?   =>    =>? 
+FALSE FALSE FALSE FALSE  TRUE  TRUE  TRUE  TRUE
+< FALSE FALSE FALSE FALSE  TRUE  TRUE  TRUE  TRUE
 !   TRUE  TRUE  TRUE  TRUE FALSE FALSE FALSE FALSE
 !<  TRUE  TRUE  TRUE  TRUE FALSE FALSE FALSE FALSE
 inf and -inf
-            ?    >     >?   =     = ?   =>    =>? 
-   FALSE FALSE  TRUE  TRUE FALSE FALSE  TRUE  TRUE
- < FALSE FALSE  TRUE  TRUE FALSE FALSE  TRUE  TRUE
+?    >     >?   =     = ?   =>    =>? 
+FALSE FALSE  TRUE  TRUE FALSE FALSE  TRUE  TRUE
+< FALSE FALSE  TRUE  TRUE FALSE FALSE  TRUE  TRUE
 !   TRUE  TRUE FALSE FALSE  TRUE  TRUE FALSE FALSE
 !<  TRUE  TRUE FALSE FALSE  TRUE  TRUE FALSE FALSE
 inf and 1
-            ?    >     >?   =     = ?   =>    =>? 
-   FALSE FALSE  TRUE  TRUE FALSE FALSE  TRUE  TRUE
- < FALSE FALSE  TRUE  TRUE FALSE FALSE  TRUE  TRUE
+?    >     >?   =     = ?   =>    =>? 
+FALSE FALSE  TRUE  TRUE FALSE FALSE  TRUE  TRUE
+< FALSE FALSE  TRUE  TRUE FALSE FALSE  TRUE  TRUE
 !   TRUE  TRUE FALSE FALSE  TRUE  TRUE FALSE FALSE
 !<  TRUE  TRUE FALSE FALSE  TRUE  TRUE FALSE FALSE
 inf and 0
-            ?    >     >?   =     = ?   =>    =>? 
-   FALSE FALSE  TRUE  TRUE FALSE FALSE  TRUE  TRUE
- < FALSE FALSE  TRUE  TRUE FALSE FALSE  TRUE  TRUE
+?    >     >?   =     = ?   =>    =>? 
+FALSE FALSE  TRUE  TRUE FALSE FALSE  TRUE  TRUE
+< FALSE FALSE  TRUE  TRUE FALSE FALSE  TRUE  TRUE
 !   TRUE  TRUE FALSE FALSE  TRUE  TRUE FALSE FALSE
 !<  TRUE  TRUE FALSE FALSE  TRUE  TRUE FALSE FALSE
 inf and -0
-            ?    >     >?   =     = ?   =>    =>? 
-   FALSE FALSE  TRUE  TRUE FALSE FALSE  TRUE  TRUE
- < FALSE FALSE  TRUE  TRUE FALSE FALSE  TRUE  TRUE
+?    >     >?   =     = ?   =>    =>? 
+FALSE FALSE  TRUE  TRUE FALSE FALSE  TRUE  TRUE
+< FALSE FALSE  TRUE  TRUE FALSE FALSE  TRUE  TRUE
 !   TRUE  TRUE FALSE FALSE  TRUE  TRUE FALSE FALSE
 !<  TRUE  TRUE FALSE FALSE  TRUE  TRUE FALSE FALSE
 ============================================================
 -inf and nan
-            ?    >     >?   =     = ?   =>    =>? 
-   FALSE  TRUE FALSE  TRUE FALSE  TRUE FALSE  TRUE
- < FALSE  TRUE FALSE  TRUE FALSE  TRUE FALSE  TRUE
+?    >     >?   =     = ?   =>    =>? 
+FALSE  TRUE FALSE  TRUE FALSE  TRUE FALSE  TRUE
+< FALSE  TRUE FALSE  TRUE FALSE  TRUE FALSE  TRUE
 !   TRUE FALSE  TRUE FALSE  TRUE FALSE  TRUE FALSE
 !<  TRUE FALSE  TRUE FALSE  TRUE FALSE  TRUE FALSE
 -inf and inf
-            ?    >     >?   =     = ?   =>    =>? 
-   FALSE FALSE FALSE FALSE FALSE FALSE FALSE FALSE
- <  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE
+?    >     >?   =     = ?   =>    =>? 
+FALSE FALSE FALSE FALSE FALSE FALSE FALSE FALSE
+<  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE
 !   TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE
 !< FALSE FALSE FALSE FALSE FALSE FALSE FALSE FALSE
 -inf and -inf
-            ?    >     >?   =     = ?   =>    =>? 
-   FALSE FALSE FALSE FALSE  TRUE  TRUE  TRUE  TRUE
- < FALSE FALSE FALSE FALSE  TRUE  TRUE  TRUE  TRUE
+?    >     >?   =     = ?   =>    =>? 
+FALSE FALSE FALSE FALSE  TRUE  TRUE  TRUE  TRUE
+< FALSE FALSE FALSE FALSE  TRUE  TRUE  TRUE  TRUE
 !   TRUE  TRUE  TRUE  TRUE FALSE FALSE FALSE FALSE
 !<  TRUE  TRUE  TRUE  TRUE FALSE FALSE FALSE FALSE
 -inf and 1
-            ?    >     >?   =     = ?   =>    =>? 
-   FALSE FALSE FALSE FALSE FALSE FALSE FALSE FALSE
- <  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE
+?    >     >?   =     = ?   =>    =>? 
+FALSE FALSE FALSE FALSE FALSE FALSE FALSE FALSE
+<  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE
 !   TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE
 !< FALSE FALSE FALSE FALSE FALSE FALSE FALSE FALSE
 -inf and 0
-            ?    >     >?   =     = ?   =>    =>? 
-   FALSE FALSE FALSE FALSE FALSE FALSE FALSE FALSE
- <  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE
+?    >     >?   =     = ?   =>    =>? 
+FALSE FALSE FALSE FALSE FALSE FALSE FALSE FALSE
+<  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE
 !   TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE
 !< FALSE FALSE FALSE FALSE FALSE FALSE FALSE FALSE
 -inf and -0
-            ?    >     >?   =     = ?   =>    =>? 
-   FALSE FALSE FALSE FALSE FALSE FALSE FALSE FALSE
- <  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE
+?    >     >?   =     = ?   =>    =>? 
+FALSE FALSE FALSE FALSE FALSE FALSE FALSE FALSE
+<  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE
 !   TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE
 !< FALSE FALSE FALSE FALSE FALSE FALSE FALSE FALSE
 ============================================================
 1 and nan
-            ?    >     >?   =     = ?   =>    =>? 
-   FALSE  TRUE FALSE  TRUE FALSE  TRUE FALSE  TRUE
- < FALSE  TRUE FALSE  TRUE FALSE  TRUE FALSE  TRUE
+?    >     >?   =     = ?   =>    =>? 
+FALSE  TRUE FALSE  TRUE FALSE  TRUE FALSE  TRUE
+< FALSE  TRUE FALSE  TRUE FALSE  TRUE FALSE  TRUE
 !   TRUE FALSE  TRUE FALSE  TRUE FALSE  TRUE FALSE
 !<  TRUE FALSE  TRUE FALSE  TRUE FALSE  TRUE FALSE
 1 and inf
-            ?    >     >?   =     = ?   =>    =>? 
-   FALSE FALSE FALSE FALSE FALSE FALSE FALSE FALSE
- <  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE
+?    >     >?   =     = ?   =>    =>? 
+FALSE FALSE FALSE FALSE FALSE FALSE FALSE FALSE
+<  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE
 !   TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE
 !< FALSE FALSE FALSE FALSE FALSE FALSE FALSE FALSE
 1 and -inf
-            ?    >     >?   =     = ?   =>    =>? 
-   FALSE FALSE  TRUE  TRUE FALSE FALSE  TRUE  TRUE
- < FALSE FALSE  TRUE  TRUE FALSE FALSE  TRUE  TRUE
+?    >     >?   =     = ?   =>    =>? 
+FALSE FALSE  TRUE  TRUE FALSE FALSE  TRUE  TRUE
+< FALSE FALSE  TRUE  TRUE FALSE FALSE  TRUE  TRUE
 !   TRUE  TRUE FALSE FALSE  TRUE  TRUE FALSE FALSE
 !<  TRUE  TRUE FALSE FALSE  TRUE  TRUE FALSE FALSE
 1 and 0
-            ?    >     >?   =     = ?   =>    =>? 
-   FALSE FALSE  TRUE  TRUE FALSE FALSE  TRUE  TRUE
- < FALSE FALSE  TRUE  TRUE FALSE FALSE  TRUE  TRUE
+?    >     >?   =     = ?   =>    =>? 
+FALSE FALSE  TRUE  TRUE FALSE FALSE  TRUE  TRUE
+< FALSE FALSE  TRUE  TRUE FALSE FALSE  TRUE  TRUE
 !   TRUE  TRUE FALSE FALSE  TRUE  TRUE FALSE FALSE
 !<  TRUE  TRUE FALSE FALSE  TRUE  TRUE FALSE FALSE
 1 and -0
-            ?    >     >?   =     = ?   =>    =>? 
-   FALSE FALSE  TRUE  TRUE FALSE FALSE  TRUE  TRUE
- < FALSE FALSE  TRUE  TRUE FALSE FALSE  TRUE  TRUE
+?    >     >?   =     = ?   =>    =>? 
+FALSE FALSE  TRUE  TRUE FALSE FALSE  TRUE  TRUE
+< FALSE FALSE  TRUE  TRUE FALSE FALSE  TRUE  TRUE
 !   TRUE  TRUE FALSE FALSE  TRUE  TRUE FALSE FALSE
 !<  TRUE  TRUE FALSE FALSE  TRUE  TRUE FALSE FALSE
 ============================================================
 0 and nan
-            ?    >     >?   =     = ?   =>    =>? 
-   FALSE  TRUE FALSE  TRUE FALSE  TRUE FALSE  TRUE
- < FALSE  TRUE FALSE  TRUE FALSE  TRUE FALSE  TRUE
+?    >     >?   =     = ?   =>    =>? 
+FALSE  TRUE FALSE  TRUE FALSE  TRUE FALSE  TRUE
+< FALSE  TRUE FALSE  TRUE FALSE  TRUE FALSE  TRUE
 !   TRUE FALSE  TRUE FALSE  TRUE FALSE  TRUE FALSE
 !<  TRUE FALSE  TRUE FALSE  TRUE FALSE  TRUE FALSE
 0 and inf
-            ?    >     >?   =     = ?   =>    =>? 
-   FALSE FALSE FALSE FALSE FALSE FALSE FALSE FALSE
- <  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE
+?    >     >?   =     = ?   =>    =>? 
+FALSE FALSE FALSE FALSE FALSE FALSE FALSE FALSE
+<  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE
 !   TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE
 !< FALSE FALSE FALSE FALSE FALSE FALSE FALSE FALSE
 0 and -inf
-            ?    >     >?   =     = ?   =>    =>? 
-   FALSE FALSE  TRUE  TRUE FALSE FALSE  TRUE  TRUE
- < FALSE FALSE  TRUE  TRUE FALSE FALSE  TRUE  TRUE
+?    >     >?   =     = ?   =>    =>? 
+FALSE FALSE  TRUE  TRUE FALSE FALSE  TRUE  TRUE
+< FALSE FALSE  TRUE  TRUE FALSE FALSE  TRUE  TRUE
 !   TRUE  TRUE FALSE FALSE  TRUE  TRUE FALSE FALSE
 !<  TRUE  TRUE FALSE FALSE  TRUE  TRUE FALSE FALSE
 0 and 1
-            ?    >     >?   =     = ?   =>    =>? 
-   FALSE FALSE FALSE FALSE FALSE FALSE FALSE FALSE
- <  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE
+?    >     >?   =     = ?   =>    =>? 
+FALSE FALSE FALSE FALSE FALSE FALSE FALSE FALSE
+<  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE
 !   TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE
 !< FALSE FALSE FALSE FALSE FALSE FALSE FALSE FALSE
 0 and 0
-            ?    >     >?   =     = ?   =>    =>? 
-   FALSE FALSE FALSE FALSE  TRUE  TRUE  TRUE  TRUE
- < FALSE FALSE FALSE FALSE  TRUE  TRUE  TRUE  TRUE
+?    >     >?   =     = ?   =>    =>? 
+FALSE FALSE FALSE FALSE  TRUE  TRUE  TRUE  TRUE
+< FALSE FALSE FALSE FALSE  TRUE  TRUE  TRUE  TRUE
 !   TRUE  TRUE  TRUE  TRUE FALSE FALSE FALSE FALSE
 !<  TRUE  TRUE  TRUE  TRUE FALSE FALSE FALSE FALSE
 0 and -0
-            ?    >     >?   =     = ?   =>    =>? 
-   FALSE FALSE FALSE FALSE  TRUE  TRUE  TRUE  TRUE
- < FALSE FALSE FALSE FALSE  TRUE  TRUE  TRUE  TRUE
+?    >     >?   =     = ?   =>    =>? 
+FALSE FALSE FALSE FALSE  TRUE  TRUE  TRUE  TRUE
+< FALSE FALSE FALSE FALSE  TRUE  TRUE  TRUE  TRUE
 !   TRUE  TRUE  TRUE  TRUE FALSE FALSE FALSE FALSE
 !<  TRUE  TRUE  TRUE  TRUE FALSE FALSE FALSE FALSE
 ============================================================
 -0 and nan
-            ?    >     >?   =     = ?   =>    =>? 
-   FALSE  TRUE FALSE  TRUE FALSE  TRUE FALSE  TRUE
- < FALSE  TRUE FALSE  TRUE FALSE  TRUE FALSE  TRUE
+?    >     >?   =     = ?   =>    =>? 
+FALSE  TRUE FALSE  TRUE FALSE  TRUE FALSE  TRUE
+< FALSE  TRUE FALSE  TRUE FALSE  TRUE FALSE  TRUE
 !   TRUE FALSE  TRUE FALSE  TRUE FALSE  TRUE FALSE
 !<  TRUE FALSE  TRUE FALSE  TRUE FALSE  TRUE FALSE
 -0 and inf
-            ?    >     >?   =     = ?   =>    =>? 
-   FALSE FALSE FALSE FALSE FALSE FALSE FALSE FALSE
- <  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE
+?    >     >?   =     = ?   =>    =>? 
+FALSE FALSE FALSE FALSE FALSE FALSE FALSE FALSE
+<  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE
 !   TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE
 !< FALSE FALSE FALSE FALSE FALSE FALSE FALSE FALSE
 -0 and -inf
-            ?    >     >?   =     = ?   =>    =>? 
-   FALSE FALSE  TRUE  TRUE FALSE FALSE  TRUE  TRUE
- < FALSE FALSE  TRUE  TRUE FALSE FALSE  TRUE  TRUE
+?    >     >?   =     = ?   =>    =>? 
+FALSE FALSE  TRUE  TRUE FALSE FALSE  TRUE  TRUE
+< FALSE FALSE  TRUE  TRUE FALSE FALSE  TRUE  TRUE
 !   TRUE  TRUE FALSE FALSE  TRUE  TRUE FALSE FALSE
 !<  TRUE  TRUE FALSE FALSE  TRUE  TRUE FALSE FALSE
 -0 and 1
-            ?    >     >?   =     = ?   =>    =>? 
-   FALSE FALSE FALSE FALSE FALSE FALSE FALSE FALSE
- <  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE
+?    >     >?   =     = ?   =>    =>? 
+FALSE FALSE FALSE FALSE FALSE FALSE FALSE FALSE
+<  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE
 !   TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE
 !< FALSE FALSE FALSE FALSE FALSE FALSE FALSE FALSE
 -0 and 0
-            ?    >     >?   =     = ?   =>    =>? 
-   FALSE FALSE FALSE FALSE  TRUE  TRUE  TRUE  TRUE
- < FALSE FALSE FALSE FALSE  TRUE  TRUE  TRUE  TRUE
+?    >     >?   =     = ?   =>    =>? 
+FALSE FALSE FALSE FALSE  TRUE  TRUE  TRUE  TRUE
+< FALSE FALSE FALSE FALSE  TRUE  TRUE  TRUE  TRUE
 !   TRUE  TRUE  TRUE  TRUE FALSE FALSE FALSE FALSE
 !<  TRUE  TRUE  TRUE  TRUE FALSE FALSE FALSE FALSE
 -0 and -0
-            ?    >     >?   =     = ?   =>    =>? 
-   FALSE FALSE FALSE FALSE  TRUE  TRUE  TRUE  TRUE
- < FALSE FALSE FALSE FALSE  TRUE  TRUE  TRUE  TRUE
+?    >     >?   =     = ?   =>    =>? 
+FALSE FALSE FALSE FALSE  TRUE  TRUE  TRUE  TRUE
+< FALSE FALSE FALSE FALSE  TRUE  TRUE  TRUE  TRUE
 !   TRUE  TRUE  TRUE  TRUE FALSE FALSE FALSE FALSE
 !<  TRUE  TRUE  TRUE  TRUE FALSE FALSE FALSE FALSE
 ============================================================
@@ -240,51 +240,51 @@
 TEST 2: Comparing normal floating points
 ============================================================
 1 and 2
-            ?    >     >?   =     = ?   =>    =>? 
-   FALSE FALSE FALSE FALSE FALSE FALSE FALSE FALSE
- <  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE
+?    >     >?   =     = ?   =>    =>? 
+FALSE FALSE FALSE FALSE FALSE FALSE FALSE FALSE
+<  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE
 !   TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE
 !< FALSE FALSE FALSE FALSE FALSE FALSE FALSE FALSE
 1 and 1.000000000000001
-            ?    >     >?   =     = ?   =>    =>? 
-   FALSE FALSE FALSE FALSE FALSE FALSE FALSE FALSE
- <  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE
+?    >     >?   =     = ?   =>    =>? 
+FALSE FALSE FALSE FALSE FALSE FALSE FALSE FALSE
+<  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE
 !   TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE
 !< FALSE FALSE FALSE FALSE FALSE FALSE FALSE FALSE
 1 and 1
-            ?    >     >?   =     = ?   =>    =>? 
-   FALSE FALSE FALSE FALSE  TRUE  TRUE  TRUE  TRUE
- < FALSE FALSE FALSE FALSE  TRUE  TRUE  TRUE  TRUE
+?    >     >?   =     = ?   =>    =>? 
+FALSE FALSE FALSE FALSE  TRUE  TRUE  TRUE  TRUE
+< FALSE FALSE FALSE FALSE  TRUE  TRUE  TRUE  TRUE
 !   TRUE  TRUE  TRUE  TRUE FALSE FALSE FALSE FALSE
 !<  TRUE  TRUE  TRUE  TRUE FALSE FALSE FALSE FALSE
 1 and 0.999999999999999
-            ?    >     >?   =     = ?   =>    =>? 
-   FALSE FALSE  TRUE  TRUE FALSE FALSE  TRUE  TRUE
- < FALSE FALSE  TRUE  TRUE FALSE FALSE  TRUE  TRUE
+?    >     >?   =     = ?   =>    =>? 
+FALSE FALSE  TRUE  TRUE FALSE FALSE  TRUE  TRUE
+< FALSE FALSE  TRUE  TRUE FALSE FALSE  TRUE  TRUE
 !   TRUE  TRUE FALSE FALSE  TRUE  TRUE FALSE FALSE
 !<  TRUE  TRUE FALSE FALSE  TRUE  TRUE FALSE FALSE
 1e23 and 1e-23
-            ?    >     >?   =     = ?   =>    =>? 
-   FALSE FALSE  TRUE  TRUE FALSE FALSE  TRUE  TRUE
- < FALSE FALSE  TRUE  TRUE FALSE FALSE  TRUE  TRUE
+?    >     >?   =     = ?   =>    =>? 
+FALSE FALSE  TRUE  TRUE FALSE FALSE  TRUE  TRUE
+< FALSE FALSE  TRUE  TRUE FALSE FALSE  TRUE  TRUE
 !   TRUE  TRUE FALSE FALSE  TRUE  TRUE FALSE FALSE
 !<  TRUE  TRUE FALSE FALSE  TRUE  TRUE FALSE FALSE
 -1 and 1
-            ?    >     >?   =     = ?   =>    =>? 
-   FALSE FALSE FALSE FALSE FALSE FALSE FALSE FALSE
- <  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE
+?    >     >?   =     = ?   =>    =>? 
+FALSE FALSE FALSE FALSE FALSE FALSE FALSE FALSE
+<  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE
 !   TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE
 !< FALSE FALSE FALSE FALSE FALSE FALSE FALSE FALSE
 -2 and -1
-            ?    >     >?   =     = ?   =>    =>? 
-   FALSE FALSE FALSE FALSE FALSE FALSE FALSE FALSE
- <  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE
+?    >     >?   =     = ?   =>    =>? 
+FALSE FALSE FALSE FALSE FALSE FALSE FALSE FALSE
+<  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE
 !   TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE  TRUE
 !< FALSE FALSE FALSE FALSE FALSE FALSE FALSE FALSE
 1 and -1
-            ?    >     >?   =     = ?   =>    =>? 
-   FALSE FALSE  TRUE  TRUE FALSE FALSE  TRUE  TRUE
- < FALSE FALSE  TRUE  TRUE FALSE FALSE  TRUE  TRUE
+?    >     >?   =     = ?   =>    =>? 
+FALSE FALSE  TRUE  TRUE FALSE FALSE  TRUE  TRUE
+< FALSE FALSE  TRUE  TRUE FALSE FALSE  TRUE  TRUE
 !   TRUE  TRUE FALSE FALSE  TRUE  TRUE FALSE FALSE
 !<  TRUE  TRUE FALSE FALSE  TRUE  TRUE FALSE FALSE
 ============================================================

Modified: trunk/l3kernel/testfiles/m3fp-logic002.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3fp-logic002.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/m3fp-logic002.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -48,7 +48,7 @@
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation (-1)^(0.1)
+Invalid operation (-1)^(0.1)
 l. ...  { \fp_to_tl:n { -!(-1)**0.1 } \NEWLINE }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -70,7 +70,7 @@
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Missing ? inserted for ?:.
+Missing ? inserted for ?:.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -79,7 +79,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Missing ? inserted for ?:.
+Missing ? inserted for ?:.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -88,7 +88,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Missing : inserted for ?:.
+Missing : inserted for ?:.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -97,7 +97,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Missing ? inserted for ?:.
+Missing ? inserted for ?:.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -228,7 +228,7 @@
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Missing number before '&'.
+Missing number before '&'.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -237,7 +237,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Missing number before '|'.
+Missing number before '|'.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -246,7 +246,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Missing ? inserted for ?:.
+Missing ? inserted for ?:.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -255,7 +255,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Missing number before '?'.
+Missing number before '?'.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -264,7 +264,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Missing : inserted for ?:.
+Missing : inserted for ?:.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -273,7 +273,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Missing number before ':'.
+Missing number before ':'.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -282,7 +282,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Missing ? inserted for ?:.
+Missing ? inserted for ?:.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have

Modified: trunk/l3kernel/testfiles/m3fp-parse001.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3fp-parse001.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/m3fp-parse001.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -50,7 +50,7 @@
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Unknown fp word skjdhf.
+Unknown fp word skjdhf.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -59,7 +59,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Premature end in fp expression.
+Premature end in fp expression.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -68,7 +68,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Missing ) inserted.
+Missing ) inserted.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -77,7 +77,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Premature end in fp expression.
+Premature end in fp expression.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -86,7 +86,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Missing number before ')'.
+Missing number before ')'.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -95,7 +95,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Extra ) ignored.
+Extra ) ignored.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -104,7 +104,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Missing * inserted.
+Missing * inserted.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -123,7 +123,7 @@
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Missing number before '*'.
+Missing number before '*'.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -132,7 +132,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Premature end in fp expression.
+Premature end in fp expression.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -141,7 +141,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Missing number before '/'.
+Missing number before '/'.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -150,7 +150,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Missing number before '='.
+Missing number before '='.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -159,7 +159,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Unknown fp word e.
+Unknown fp word e.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -168,7 +168,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Missing * inserted.
+Missing * inserted.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -177,7 +177,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Erroneous variable \relax used!
+Erroneous variable \relax used!
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -186,7 +186,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Erroneous variable \l_undefined_int used!
+Erroneous variable \l_undefined_int used!
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -204,7 +204,7 @@
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Missing * inserted.
+Missing * inserted.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -213,7 +213,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Unknown symbol @ ignored.
+Unknown symbol @ ignored.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -222,7 +222,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Missing * inserted.
+Missing * inserted.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -231,7 +231,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Unknown symbol ## ignored.
+Unknown symbol ## ignored.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -240,7 +240,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Unknown symbol @ ignored.
+Unknown symbol @ ignored.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -249,7 +249,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Unknown symbol $ ignored.
+Unknown symbol $ ignored.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -258,7 +258,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Unknown symbol ' ignored.
+Unknown symbol ' ignored.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -267,7 +267,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Unknown symbol ; ignored.
+Unknown symbol ; ignored.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -276,7 +276,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Missing * inserted.
+Missing * inserted.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -285,7 +285,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Unknown symbol " ignored.
+Unknown symbol " ignored.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -294,7 +294,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Missing * inserted.
+Missing * inserted.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -303,7 +303,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Unknown symbol [ ignored.
+Unknown symbol [ ignored.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -312,7 +312,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Unknown symbol ] ignored.
+Unknown symbol ] ignored.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have

Modified: trunk/l3kernel/testfiles/m3fp-parse002.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3fp-parse002.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/m3fp-parse002.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -22,7 +22,7 @@
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Erroneous variable \relax used!
+Erroneous variable \relax used!
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -45,7 +45,7 @@
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Unexpected comma: extra arguments ignored.
+Unexpected comma: extra arguments ignored.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -54,7 +54,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Unexpected comma: extra arguments ignored.
+Unexpected comma: extra arguments ignored.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -69,7 +69,7 @@
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Unexpected comma: extra arguments ignored.
+Unexpected comma: extra arguments ignored.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -107,7 +107,7 @@
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Robust command \qopname  invalid in fp expression!
+Robust command \qopname  invalid in fp expression!
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -116,7 +116,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Erroneous variable \relax used!
+Erroneous variable \relax used!
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -125,7 +125,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Unknown fp word osin.
+Unknown fp word osin.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -135,7 +135,7 @@
 > \sin (3)=nan.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Robust command \qopname  invalid in fp expression!
+Robust command \qopname  invalid in fp expression!
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -144,7 +144,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Erroneous variable \relax used!
+Erroneous variable \relax used!
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -153,7 +153,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Unknown fp word osin.
+Unknown fp word osin.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have

Modified: trunk/l3kernel/testfiles/m3fp-round002.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3fp-round002.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/m3fp-round002.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -22,7 +22,7 @@
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Missing number before ')'.
+Missing number before ')'.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -31,7 +31,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation round(0.1, 1.2)
+Invalid operation round(0.1, 1.2)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -40,7 +40,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           round() expects between 1 and 3 arguments.
+round() expects between 1 and 3 arguments.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -49,7 +49,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           round() expects between 1 and 3 arguments.
+round() expects between 1 and 3 arguments.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -58,7 +58,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation round(1, nan)
+Invalid operation round(1, nan)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -67,7 +67,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Missing number before ')'.
+Missing number before ')'.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -76,7 +76,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation trunc(0.1, 1.2)
+Invalid operation trunc(0.1, 1.2)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -85,7 +85,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           trunc() expects between 1 and 2 arguments.
+trunc() expects between 1 and 2 arguments.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -94,7 +94,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Missing number before ')'.
+Missing number before ')'.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -103,7 +103,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation ceil(0.1, 1.2)
+Invalid operation ceil(0.1, 1.2)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -112,7 +112,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           ceil() expects between 1 and 2 arguments.
+ceil() expects between 1 and 2 arguments.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -121,7 +121,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Missing number before ')'.
+Missing number before ')'.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -130,7 +130,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation floor(0.1, 1.2)
+Invalid operation floor(0.1, 1.2)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -139,7 +139,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           floor() expects between 1 and 2 arguments.
+floor() expects between 1 and 2 arguments.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have

Modified: trunk/l3kernel/testfiles/m3fp-traps001.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3fp-traps001.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/m3fp-traps001.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -25,7 +25,7 @@
 FALSE
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation (0)*(inf)
+Invalid operation (0)*(inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -37,7 +37,7 @@
 FALSE
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation fp_to_decimal(nan)
+Invalid operation fp_to_decimal(nan)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -92,7 +92,7 @@
 FALSE
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation (0)*(inf)
+Invalid operation (0)*(inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -103,7 +103,7 @@
 TRUE
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation (0)*(inf)
+Invalid operation (0)*(inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -118,7 +118,7 @@
 FALSE
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation (0)*(inf)
+Invalid operation (0)*(inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -136,7 +136,7 @@
 TRUE
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Division by zero in (1)/(0)
+Division by zero in (1)/(0)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -163,7 +163,7 @@
 TRUE
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           1e19998 overflowed to inf.
+1e19998 overflowed to inf.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -178,7 +178,7 @@
 TRUE
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           1e19998 overflowed to inf.
+1e19998 overflowed to inf.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -189,7 +189,7 @@
 TRUE
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           1e19999 overflowed to inf.
+1e19999 overflowed to inf.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -210,7 +210,7 @@
 TRUE
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           1e-19998 underflowed to 0.
+1e-19998 underflowed to 0.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -225,7 +225,7 @@
 TRUE
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           1e-19998 underflowed to 0.
+1e-19998 underflowed to 0.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -236,7 +236,7 @@
 TRUE
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           1e-20001 underflowed to 0.
+1e-20001 underflowed to 0.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have

Modified: trunk/l3kernel/testfiles/m3fp-trig001.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3fp-trig001.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/m3fp-trig001.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -22,7 +22,7 @@
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation sin(inf)
+Invalid operation sin(inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -31,7 +31,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation sin(-inf)
+Invalid operation sin(-inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -76,7 +76,7 @@
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation cos(inf)
+Invalid operation cos(inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -85,7 +85,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation cos(-inf)
+Invalid operation cos(-inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -130,7 +130,7 @@
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation tan(inf)
+Invalid operation tan(inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -139,7 +139,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation tan(-inf)
+Invalid operation tan(-inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -184,7 +184,7 @@
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation cot(inf)
+Invalid operation cot(inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -193,7 +193,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation cot(-inf)
+Invalid operation cot(-inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -238,7 +238,7 @@
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation sec(inf)
+Invalid operation sec(inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -247,7 +247,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation sec(-inf)
+Invalid operation sec(-inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -292,7 +292,7 @@
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation csc(inf)
+Invalid operation csc(inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -301,7 +301,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation csc(-inf)
+Invalid operation csc(-inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have

Modified: trunk/l3kernel/testfiles/m3fp-trig002.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3fp-trig002.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/m3fp-trig002.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -22,7 +22,7 @@
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation asin(inf)
+Invalid operation asin(inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -31,7 +31,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation asin(-inf)
+Invalid operation asin(-inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -40,7 +40,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation asin(9.924e9999)
+Invalid operation asin(9.924e9999)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -88,7 +88,7 @@
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation acos(inf)
+Invalid operation acos(inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -97,7 +97,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation acos(-inf)
+Invalid operation acos(-inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -106,7 +106,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation acos(9.924e9999)
+Invalid operation acos(9.924e9999)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -228,7 +228,7 @@
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation asec(0)
+Invalid operation asec(0)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -237,7 +237,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation asec(-0)
+Invalid operation asec(-0)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -246,7 +246,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation asec(-1e-100)
+Invalid operation asec(-1e-100)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -255,7 +255,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation asec(0.1234567891234567)
+Invalid operation asec(0.1234567891234567)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -302,7 +302,7 @@
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation acsc(0)
+Invalid operation acsc(0)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -311,7 +311,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation acsc(-0)
+Invalid operation acsc(-0)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -320,7 +320,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation acsc(-1e-100)
+Invalid operation acsc(-1e-100)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -329,7 +329,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation acsc(0.1234567891234567)
+Invalid operation acsc(0.1234567891234567)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have

Modified: trunk/l3kernel/testfiles/m3fp-trig003.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3fp-trig003.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/m3fp-trig003.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -22,7 +22,7 @@
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation sind(inf)
+Invalid operation sind(inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -31,7 +31,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation sind(-inf)
+Invalid operation sind(-inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -70,7 +70,7 @@
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation cosd(inf)
+Invalid operation cosd(inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -79,7 +79,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation cosd(-inf)
+Invalid operation cosd(-inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -118,7 +118,7 @@
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation tand(inf)
+Invalid operation tand(inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -127,7 +127,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation tand(-inf)
+Invalid operation tand(-inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -166,7 +166,7 @@
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation cotd(inf)
+Invalid operation cotd(inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -175,7 +175,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation cotd(-inf)
+Invalid operation cotd(-inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -214,7 +214,7 @@
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation secd(inf)
+Invalid operation secd(inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -223,7 +223,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation secd(-inf)
+Invalid operation secd(-inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -262,7 +262,7 @@
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation cscd(inf)
+Invalid operation cscd(inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -271,7 +271,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation cscd(-inf)
+Invalid operation cscd(-inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have

Modified: trunk/l3kernel/testfiles/m3fp-trig004.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3fp-trig004.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/m3fp-trig004.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -22,7 +22,7 @@
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation asind(inf)
+Invalid operation asind(inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -31,7 +31,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation asind(-inf)
+Invalid operation asind(-inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -40,7 +40,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation asind(9.924e9999)
+Invalid operation asind(9.924e9999)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -88,7 +88,7 @@
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation acosd(inf)
+Invalid operation acosd(inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -97,7 +97,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation acosd(-inf)
+Invalid operation acosd(-inf)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -106,7 +106,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation acosd(9.924e9999)
+Invalid operation acosd(9.924e9999)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -228,7 +228,7 @@
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation asecd(0)
+Invalid operation asecd(0)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -237,7 +237,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation asecd(-0)
+Invalid operation asecd(-0)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -246,7 +246,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation asecd(-1e-100)
+Invalid operation asecd(-1e-100)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -255,7 +255,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation asecd(0.1234567891234567)
+Invalid operation asecd(0.1234567891234567)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -302,7 +302,7 @@
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation acscd(0)
+Invalid operation acscd(0)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -311,7 +311,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation acscd(-0)
+Invalid operation acscd(-0)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -320,7 +320,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation acscd(-1e-100)
+Invalid operation acscd(-1e-100)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -329,7 +329,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation acscd(0.1234567891234567)
+Invalid operation acscd(0.1234567891234567)
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have

Modified: trunk/l3kernel/testfiles/m3int001.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3int001.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/m3int001.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -112,7 +112,7 @@
 ============================================================
 ! Missing number, treated as zero.
 <to be read again> 
-                   \endgroup 
+\endgroup 
 l. ...  }
 A number should have been here; I inserted `0'.
 (If you can't figure out why I needed to see a number,

Modified: trunk/l3kernel/testfiles/m3int001.xetex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3int001.xetex.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/m3int001.xetex.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -112,7 +112,7 @@
 ============================================================
 ! Missing number, treated as zero.
 <to be read again> 
-                   \endgroup 
+\endgroup 
 l. ...  }
 A number should have been here; I inserted `0'.
 (If you can't figure out why I needed to see a number,

Modified: trunk/l3kernel/testfiles/m3int002.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3int002.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/m3int002.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -524,7 +524,7 @@
 ============================================================
 ! Missing number, treated as zero.
 <to be read again> 
-                   a
+a
 l. ...}
 A number should have been here; I inserted `0'.
 (If you can't figure out why I needed to see a number,

Modified: trunk/l3kernel/testfiles/m3int002.uptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3int002.uptex.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/m3int002.uptex.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -524,7 +524,7 @@
 ============================================================
 ! Missing number, treated as zero.
 <to be read again> 
-                   a
+a
 l. ...}
 A number should have been here; I inserted `0'.
 (If you can't figure out why I needed to see a number,

Modified: trunk/l3kernel/testfiles/m3int002.xetex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3int002.xetex.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/m3int002.xetex.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -524,7 +524,7 @@
 ============================================================
 ! Missing number, treated as zero.
 <to be read again> 
-                   a
+a
 l. ...}
 A number should have been here; I inserted `0'.
 (If you can't figure out why I needed to see a number,

Modified: trunk/l3kernel/testfiles/m3int003.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3int003.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/m3int003.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -23,7 +23,7 @@
 ============================================================
 ! Undefined control sequence.
 <write> \int_use:N \l_tmpz_int 
-                               .
+.
 l. ...}
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -128,7 +128,7 @@
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Zero step size for step function \myfunc .
+Zero step size for step function \myfunc .
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -167,7 +167,7 @@
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Zero step size for step function \__prg_map_1:w .
+Zero step size for step function \__prg_map_1:w .
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -199,7 +199,7 @@
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Zero step size for step function \__prg_map_1:w .
+Zero step size for step function \__prg_map_1:w .
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have

Modified: trunk/l3kernel/testfiles/m3msg002.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3msg002.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/m3msg002.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -22,7 +22,7 @@
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Erroneous variable \junk used!
+Erroneous variable \junk used!
 l. ...}
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -31,7 +31,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Erroneous variable \scan_stop: used!
+Erroneous variable \scan_stop: used!
 l. ...}
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -40,7 +40,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Erroneous variable \relax used!
+Erroneous variable \relax used!
 l. ...}
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -53,7 +53,7 @@
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Erroneous variable \junk used!
+Erroneous variable \junk used!
 l. ...}
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -122,7 +122,7 @@
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           The foobar \par  is blue, green and yellow.
+The foobar \par  is blue, green and yellow.
 l. ...}
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -131,7 +131,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           The foobar \par  is blue, green and .
+The foobar \par  is blue, green and .
 l. ...}
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -140,7 +140,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           The foobar \par  is blue,  and .
+The foobar \par  is blue,  and .
 l. ...}
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -149,7 +149,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           The foobar \par  is ,  and .
+The foobar \par  is ,  and .
 l. ...}
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -158,7 +158,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           The foobar  is ,  and .
+The foobar  is ,  and .
 l. ...}
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -167,7 +167,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Foo!
+Foo!
 l. ...}
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -178,10 +178,10 @@
 ============================================================
 TEST 6: Indentation
 ============================================================
-    foo foo foo foo foo foo foo foo foo foo foo foo foo foo foo foo foo foo
+foo foo foo foo foo foo foo foo foo foo foo foo foo foo foo foo foo foo
 !    foo foo foo foo foo foo foo foo foo foo foo foo foo foo foo foo foo foo
 !    foo foo foo foo foo foo foo foo foo foo foo foo foo foo 
-  foo foo foo foo foo foo foo foo foo foo foo foo foo foo foo foo foo foo foo
+foo foo foo foo foo foo foo foo foo foo foo foo foo foo foo foo foo foo foo
 !    foo foo foo foo foo foo foo foo foo foo foo foo foo foo foo foo foo foo
 !    foo foo foo foo foo foo foo foo foo foo foo foo foo 
 a foo foo foo foo foo foo foo foo foo foo foo foo foo foo foo foo foo foo foo
@@ -194,7 +194,7 @@
 1
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Only \iow_wrap:nnnN (arg 1) allows \iow_indent:n 
+Only \iow_wrap:nnnN (arg 1) allows \iow_indent:n 
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -204,14 +204,14 @@
 2
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Only \iow_wrap:nnnN (arg 1) allows \iow_indent:n 
+Only \iow_wrap:nnnN (arg 1) allows \iow_indent:n 
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
 misspelled it (e.g., `\hobx'), type `I' and the correct
 spelling (e.g., `I\hbox'). Otherwise just continue,
 and I'll forget about whatever was undefined.
-    works works works works works works works works works works works works
+works works works works works works works works works works works works
 3    works works works works works works works works works works works works
 3    works works works works works works 
 ============================================================

Modified: trunk/l3kernel/testfiles/m3msg004.luatex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3msg004.luatex.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/m3msg004.luatex.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -228,7 +228,7 @@
 |__msg_kernel_expandable_error:nnnnnn|
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                (\exp_not:n {}) (\exp_not:N .) (\c_empty_tl ) ()
+(\exp_not:n {}) (\exp_not:N .) (\c_empty_tl ) ()
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -365,7 +365,7 @@
 |msg_none:nnnnnn and msg_none:nnxxxx|
 ! Undefined control sequence.
 <argument> \::error 
-         ! foo: (\exp_not:n {\exp_not:N \c_empty_tl }) (\exp_not:N \c_empty_tl 
+! foo: (\exp_not:n {\exp_not:N \c_empty_tl }) (\exp_not:N \c_empty_tl 
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -374,7 +374,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \::error 
-         ! foo: (\c_empty_tl ) (\c_empty_tl ) () ()
+! foo: (\c_empty_tl ) (\c_empty_tl ) () ()
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have

Modified: trunk/l3kernel/testfiles/m3msg004.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3msg004.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/m3msg004.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -228,7 +228,7 @@
 |__msg_kernel_expandable_error:nnnnnn|
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           (\exp_not:n {}) (\exp_not:N .) (\c_empty_tl ) ()
+(\exp_not:n {}) (\exp_not:N .) (\c_empty_tl ) ()
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -365,7 +365,7 @@
 |msg_none:nnnnnn and msg_none:nnxxxx|
 ! Undefined control sequence.
 <argument> \::error 
-                    ! foo: (\exp_not:n {\exp_not:N \c_empty_tl }) (\exp_not:...
+! foo: (\exp_not:n {\exp_not:N \c_empty_tl }) (\exp_not:...
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -374,7 +374,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \::error 
-                    ! foo: (\c_empty_tl ) (\c_empty_tl ) () ()
+! foo: (\c_empty_tl ) (\c_empty_tl ) () ()
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have

Modified: trunk/l3kernel/testfiles/m3prg001.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3prg001.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/m3prg001.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -54,7 +54,7 @@
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Negative argument for \prg_replicate:nn .
+Negative argument for \prg_replicate:nn .
 l. ...}
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have

Modified: trunk/l3kernel/testfiles/m3show002.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3show002.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/m3show002.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -100,14 +100,12 @@
 <recently read> }
 l. ...  }
 > 
-\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa=alignme
-nt
+\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa=alignment
 tab character &.
 <recently read> }
 l. ...  }
 > 
-\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa=al
-ignment
+\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa=alignment
 tab character &.
 <recently read> }
 l. ...  }

Modified: trunk/l3kernel/testfiles/m3show003.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3show003.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/m3show003.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -140,12 +140,10 @@
 > \aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa=alignment
 tab character &.
 > 
-\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa=alignme
-nt
+\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa=alignment
 tab character &.
 > 
-\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa=al
-ignment
+\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa=alignment
 tab character &.
 > &=alignment tab character &.
 > \this_is_not_defined:=undefined.

Modified: trunk/l3kernel/testfiles/m3skip001.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3skip001.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/m3skip001.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -158,19 +158,19 @@
 -32767.00003pt plus -32767.00003pt minus -32767.00003pt (overflow by 1pt)
 ! Dimension too large.
 <to be read again> 
-                   p
+p
 l. ...}
 I can't work with sizes bigger than about 19 feet.
 Continue and I'll use the largest value I can.
 ! Dimension too large.
 <to be read again> 
-                   m
+m
 l. ...}
 I can't work with sizes bigger than about 19 feet.
 Continue and I'll use the largest value I can.
 ! Dimension too large.
 <to be read again> 
-                   \scan_stop: 
+\scan_stop: 
 l. ...}
 I can't work with sizes bigger than about 19 feet.
 Continue and I'll use the largest value I can.
@@ -185,19 +185,19 @@
 32767.00003pt plus 32767.00003pt minus 32767.00003pt (overflow by 1pt)
 ! Dimension too large.
 <to be read again> 
-                   p
+p
 l. ...}
 I can't work with sizes bigger than about 19 feet.
 Continue and I'll use the largest value I can.
 ! Dimension too large.
 <to be read again> 
-                   m
+m
 l. ...}
 I can't work with sizes bigger than about 19 feet.
 Continue and I'll use the largest value I can.
 ! Dimension too large.
 <to be read again> 
-                   \scan_stop: 
+\scan_stop: 
 l. ...}
 I can't work with sizes bigger than about 19 feet.
 Continue and I'll use the largest value I can.
@@ -212,7 +212,7 @@
 -32767.00003pt (overflow by 1pt)
 ! Dimension too large.
 <to be read again> 
-                   \__dim_eval_end: 
+\__dim_eval_end: 
 l. ...}
 I can't work with sizes bigger than about 19 feet.
 Continue and I'll use the largest value I can.
@@ -227,7 +227,7 @@
 32767.00003pt (overflow by 1pt)
 ! Dimension too large.
 <to be read again> 
-                   \__dim_eval_end: 
+\__dim_eval_end: 
 l. ...}
 I can't work with sizes bigger than about 19 feet.
 Continue and I'll use the largest value I can.

Modified: trunk/l3kernel/testfiles/m3skip002.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3skip002.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/m3skip002.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -62,7 +62,7 @@
 \c_false_bool  \c_false_bool  \c_false_bool  
 T T T F F F 
 T T T    
-   F F F 
+F F F 
 ============================================================
 ============================================================
 TEST 5: Dimension ratio
@@ -117,7 +117,7 @@
 ============================================================
 ! Missing ) inserted for expression.
 <to be read again> 
-                   p
+p
 l. ...}
 I was expecting to see `+', `-', `*', `/', or `)'. Didn't.
 142.26378
@@ -131,12 +131,12 @@
 ============================================================
 ! Missing ) inserted for expression.
 <to be read again> 
-                   p
+p
 l. ...}
 I was expecting to see `+', `-', `*', `/', or `)'. Didn't.
 ! Arithmetic overflow.
 <to be read again> 
-                   p
+p
 l. ...}
 I can't evaluate this expression,
 since the result is out of range.

Modified: trunk/l3kernel/testfiles/m3skip004.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3skip004.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/m3skip004.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -58,32 +58,32 @@
 ============================================================
 ! Missing ) inserted for expression.
 <to be read again> 
-                   p
+p
 l. ...  }
 I was expecting to see `+', `-', `*', `/', or `)'. Didn't.
 ! Missing ) inserted for expression.
 <to be read again> 
-                   p
+p
 l. ...  }
 I was expecting to see `+', `-', `*', `/', or `)'. Didn't.
 ! Missing ) inserted for expression.
 <to be read again> 
-                   p
+p
 l. ...  }
 I was expecting to see `+', `-', `*', `/', or `)'. Didn't.
 ! Missing ) inserted for expression.
 <to be read again> 
-                   p
+p
 l. ...  }
 I was expecting to see `+', `-', `*', `/', or `)'. Didn't.
 ! Missing ) inserted for expression.
 <to be read again> 
-                   p
+p
 l. ...  }
 I was expecting to see `+', `-', `*', `/', or `)'. Didn't.
 ! Arithmetic overflow.
 <to be read again> 
-                   p
+p
 l. ...  }
 I can't evaluate this expression,
 since the result is out of range.

Modified: trunk/l3kernel/testfiles/m3tl001.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3tl001.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/m3tl001.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -34,7 +34,7 @@
 ============================================================
 TEST 2: use registers: expect " bar"
 ============================================================
- bar
+bar
 ============================================================
 ============================================================
 TEST 3: testing clear and put_left: expect ZZbar ZZbarfoo

Modified: trunk/l3kernel/testfiles/m3tl013.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3tl013.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/m3tl013.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -77,21 +77,9 @@
 ============================================================
 TEST 8: The final sigma rule
 ============================================================
-^^e1^^bd^^88^^ce^^94^^ce^^a5^^ce^^a3^^ce^^a3^^ce^^95^^ce^^8e^^ce^^a3 (^^e1^^bd^
-^88^^ce^^94^^ce^^a5^^ce^^a3^^ce^^a3^^ce^^95^^ce^^8e^^ce^^a3) ^^e1^^bd^^88^^ce^^
-94^^ce^^a5^^ce^^a3^^ce^^a3^^ce^^95^^ce^^8e^^ce^^a3, ^^e1^^bd^^88^^ce^^94^^ce^^a
-5^^ce^^a3^^ce^^a3^^ce^^95^^ce^^8e^^ce^^a3{} ^^e1^^bd^^88^^ce^^94^^ce^^a5^^ce^^a
-3^^ce^^a3^^ce^^95^^ce^^8e^^ce^^a3\noop 
-^^e1^^bd^^88^^ce^^94^^ce^^a5^^ce^^a3^^ce^^a3^^ce^^95^^ce^^8e^^ce^^a3 (^^e1^^bd^
-^88^^ce^^94^^ce^^a5^^ce^^a3^^ce^^a3^^ce^^95^^ce^^8e^^ce^^a3) ^^e1^^bd^^88^^ce^^
-94^^ce^^a5^^ce^^a3^^ce^^a3^^ce^^95^^ce^^8e^^ce^^a3, ^^e1^^bd^^88^^ce^^94^^ce^^a
-5^^ce^^a3^^ce^^a3^^ce^^95^^ce^^8e^^ce^^a3{} ^^e1^^bd^^88^^ce^^94^^ce^^a5^^ce^^a
-3^^ce^^a3^^ce^^95^^ce^^8e^^ce^^a3\noop 
-^^e1^^bd^^88^^ce^^94^^ce^^a5^^ce^^a3^^ce^^a3^^ce^^95^^ce^^8e^^ce^^a3 (^^e1^^bd^
-^88^^ce^^94^^ce^^a5^^ce^^a3^^ce^^a3^^ce^^95^^ce^^8e^^ce^^a3) ^^e1^^bd^^88^^ce^^
-94^^ce^^a5^^ce^^a3^^ce^^a3^^ce^^95^^ce^^8e^^ce^^a3, ^^e1^^bd^^88^^ce^^94^^ce^^a
-5^^ce^^a3^^ce^^a3^^ce^^95^^ce^^8e^^ce^^a3{} ^^e1^^bd^^88^^ce^^94^^ce^^a5^^ce^^a
-3^^ce^^a3^^ce^^95^^ce^^8e^^ce^^a3\noop 
+^^e1^^bd^^88^^ce^^94^^ce^^a5^^ce^^a3^^ce^^a3^^ce^^95^^ce^^8e^^ce^^a3 (^^e1^^bd^^88^^ce^^94^^ce^^a5^^ce^^a3^^ce^^a3^^ce^^95^^ce^^8e^^ce^^a3) ^^e1^^bd^^88^^ce^^94^^ce^^a5^^ce^^a3^^ce^^a3^^ce^^95^^ce^^8e^^ce^^a3, ^^e1^^bd^^88^^ce^^94^^ce^^a5^^ce^^a3^^ce^^a3^^ce^^95^^ce^^8e^^ce^^a3{} ^^e1^^bd^^88^^ce^^94^^ce^^a5^^ce^^a3^^ce^^a3^^ce^^95^^ce^^8e^^ce^^a3\noop 
+^^e1^^bd^^88^^ce^^94^^ce^^a5^^ce^^a3^^ce^^a3^^ce^^95^^ce^^8e^^ce^^a3 (^^e1^^bd^^88^^ce^^94^^ce^^a5^^ce^^a3^^ce^^a3^^ce^^95^^ce^^8e^^ce^^a3) ^^e1^^bd^^88^^ce^^94^^ce^^a5^^ce^^a3^^ce^^a3^^ce^^95^^ce^^8e^^ce^^a3, ^^e1^^bd^^88^^ce^^94^^ce^^a5^^ce^^a3^^ce^^a3^^ce^^95^^ce^^8e^^ce^^a3{} ^^e1^^bd^^88^^ce^^94^^ce^^a5^^ce^^a3^^ce^^a3^^ce^^95^^ce^^8e^^ce^^a3\noop 
+^^e1^^bd^^88^^ce^^94^^ce^^a5^^ce^^a3^^ce^^a3^^ce^^95^^ce^^8e^^ce^^a3 (^^e1^^bd^^88^^ce^^94^^ce^^a5^^ce^^a3^^ce^^a3^^ce^^95^^ce^^8e^^ce^^a3) ^^e1^^bd^^88^^ce^^94^^ce^^a5^^ce^^a3^^ce^^a3^^ce^^95^^ce^^8e^^ce^^a3, ^^e1^^bd^^88^^ce^^94^^ce^^a5^^ce^^a3^^ce^^a3^^ce^^95^^ce^^8e^^ce^^a3{} ^^e1^^bd^^88^^ce^^94^^ce^^a5^^ce^^a3^^ce^^a3^^ce^^95^^ce^^8e^^ce^^a3\noop 
 ^^e1^^bd^^88^^ce^^94^^ce^^a5^^ce^^a3^^ce^^a3^^ce^^95^^ce^^8e^^ce^^a3
 ^^e1^^bd^^88^^ce^^94^^ce^^a5^^ce^^a3^^ce^^a3^^ce^^95^^ce^^8e^^ce^^a3
 ^^e1^^bd^^88^^ce^^94^^ce^^a5^^ce^^a3^^ce^^a3^^ce^^95^^ce^^8e^^ce^^a3
@@ -111,26 +99,12 @@
 ============================================================
 TEST 10: Lithuanian
 ============================================================
-^^c3^^8c^^c3^^8d^^c4^^a8i^^cc^^80i^^cc^^81i^^cc^^83j^^cc^^80j^^cc^^81j^^cc^^83^
-^c4^^ae^^cc^^80^^c4^^ae^^cc^^81^^c4^^ae^^cc^^83
-^^c3^^8c^^c3^^8d^^c4^^a8i^^cc^^80i^^cc^^81i^^cc^^83j^^cc^^80j^^cc^^81j^^cc^^83^
-^c4^^ae^^cc^^80^^c4^^ae^^cc^^81^^c4^^ae^^cc^^83
-I^^cc^^87^^cc^^80I^^cc^^87^^cc^^80I^^cc^^87^^cc^^83I^^cc^^87^^cc^^80I^^cc^^87^^
-cc^^81I^^cc^^87^^cc^^83J^^cc^^87^^cc^^80J^^cc^^87^^cc^^81J^^cc^^87^^cc^^83^^c4^
-^af^^cc^^87^^cc^^80^^c4^^af^^cc^^87^^cc^^81^^c4^^af^^cc^^87^^cc^^83
-I^^cc^^87^^cc^^80I^^cc^^87^^cc^^80I^^cc^^87^^cc^^83I^^cc^^87^^cc^^80I^^cc^^87^^
-cc^^81I^^cc^^87^^cc^^83J^^cc^^87^^cc^^80J^^cc^^87^^cc^^81J^^cc^^87^^cc^^83^^c4^
-^af^^cc^^87^^cc^^80^^c4^^af^^cc^^87^^cc^^81^^c4^^af^^cc^^87^^cc^^83
-I^^cc^^87^^cc^^80i^^cc^^87^^cc^^80i^^cc^^87^^cc^^83i^^cc^^87^^cc^^80i^^cc^^87^^
-cc^^81i^^cc^^87^^cc^^83j^^cc^^87^^cc^^80j^^cc^^87^^cc^^81j^^cc^^87^^cc^^83^^c4^
-^af^^cc^^87^^cc^^80^^c4^^af^^cc^^87^^cc^^81^^c4^^af^^cc^^87^^cc^^83^^c3^^8c^^c3
-^^8d^^c4^^a8i^^cc^^80i^^cc^^81i^^cc^^83j^^cc^^80j^^cc^^81j^^cc^^83^^c4^^ae^^cc^
-^80^^c4^^ae^^cc^^81^^c4^^ae^^cc^^83
-I^^cc^^87^^cc^^80i^^cc^^87^^cc^^80i^^cc^^87^^cc^^83i^^cc^^87^^cc^^80i^^cc^^87^^
-cc^^81i^^cc^^87^^cc^^83j^^cc^^87^^cc^^80j^^cc^^87^^cc^^81j^^cc^^87^^cc^^83^^c4^
-^af^^cc^^87^^cc^^80^^c4^^af^^cc^^87^^cc^^81^^c4^^af^^cc^^87^^cc^^83^^c3^^8c^^c3
-^^8d^^c4^^a8i^^cc^^80i^^cc^^81i^^cc^^83j^^cc^^80j^^cc^^81j^^cc^^83^^c4^^ae^^cc^
-^80^^c4^^ae^^cc^^81^^c4^^ae^^cc^^83
+^^c3^^8c^^c3^^8d^^c4^^a8i^^cc^^80i^^cc^^81i^^cc^^83j^^cc^^80j^^cc^^81j^^cc^^83^^c4^^ae^^cc^^80^^c4^^ae^^cc^^81^^c4^^ae^^cc^^83
+^^c3^^8c^^c3^^8d^^c4^^a8i^^cc^^80i^^cc^^81i^^cc^^83j^^cc^^80j^^cc^^81j^^cc^^83^^c4^^ae^^cc^^80^^c4^^ae^^cc^^81^^c4^^ae^^cc^^83
+I^^cc^^87^^cc^^80I^^cc^^87^^cc^^80I^^cc^^87^^cc^^83I^^cc^^87^^cc^^80I^^cc^^87^^cc^^81I^^cc^^87^^cc^^83J^^cc^^87^^cc^^80J^^cc^^87^^cc^^81J^^cc^^87^^cc^^83^^c4^^af^^cc^^87^^cc^^80^^c4^^af^^cc^^87^^cc^^81^^c4^^af^^cc^^87^^cc^^83
+I^^cc^^87^^cc^^80I^^cc^^87^^cc^^80I^^cc^^87^^cc^^83I^^cc^^87^^cc^^80I^^cc^^87^^cc^^81I^^cc^^87^^cc^^83J^^cc^^87^^cc^^80J^^cc^^87^^cc^^81J^^cc^^87^^cc^^83^^c4^^af^^cc^^87^^cc^^80^^c4^^af^^cc^^87^^cc^^81^^c4^^af^^cc^^87^^cc^^83
+I^^cc^^87^^cc^^80i^^cc^^87^^cc^^80i^^cc^^87^^cc^^83i^^cc^^87^^cc^^80i^^cc^^87^^cc^^81i^^cc^^87^^cc^^83j^^cc^^87^^cc^^80j^^cc^^87^^cc^^81j^^cc^^87^^cc^^83^^c4^^af^^cc^^87^^cc^^80^^c4^^af^^cc^^87^^cc^^81^^c4^^af^^cc^^87^^cc^^83^^c3^^8c^^c3^^8d^^c4^^a8i^^cc^^80i^^cc^^81i^^cc^^83j^^cc^^80j^^cc^^81j^^cc^^83^^c4^^ae^^cc^^80^^c4^^ae^^cc^^81^^c4^^ae^^cc^^83
+I^^cc^^87^^cc^^80i^^cc^^87^^cc^^80i^^cc^^87^^cc^^83i^^cc^^87^^cc^^80i^^cc^^87^^cc^^81i^^cc^^87^^cc^^83j^^cc^^87^^cc^^80j^^cc^^87^^cc^^81j^^cc^^87^^cc^^83^^c4^^af^^cc^^87^^cc^^80^^c4^^af^^cc^^87^^cc^^81^^c4^^af^^cc^^87^^cc^^83^^c3^^8c^^c3^^8d^^c4^^a8i^^cc^^80i^^cc^^81i^^cc^^83j^^cc^^80j^^cc^^81j^^cc^^83^^c4^^ae^^cc^^80^^c4^^ae^^cc^^81^^c4^^ae^^cc^^83
 ============================================================
 ============================================================
 TEST 11: Dutch

Modified: trunk/l3kernel/testfiles/m3tl013.uptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3tl013.uptex.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/m3tl013.uptex.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -106,10 +106,8 @@
 ^^cc^^cdĨìíĩj̀j́j̃Į̀Į́Į̃
 İ̀İ̀İ̃İ̀İ́İ̃J̇̀J̇́J̇̃į̇̀į̇́į̇̃
 İ̀İ̀İ̃İ̀İ́İ̃J̇̀J̇́J̇̃į̇̀į̇́į̇̃
-İ̀i̇̀i̇̃i̇̀i̇́i̇̃j̇̀j̇́j̇̃į̇̀į̇́į̇̃^^cc^^cdĨìíĩj
-̀j́j̃Į̀Į́Į̃
-İ̀i̇̀i̇̃i̇̀i̇́i̇̃j̇̀j̇́j̇̃į̇̀į̇́į̇̃^^cc^^cdĨìíĩj
-̀j́j̃Į̀Į́Į̃
+İ̀i̇̀i̇̃i̇̀i̇́i̇̃j̇̀j̇́j̇̃į̇̀į̇́į̇̃^^cc^^cdĨìíĩj̀j́j̃Į̀Į́Į̃
+İ̀i̇̀i̇̃i̇̀i̇́i̇̃j̇̀j̇́j̇̃į̇̀į̇́į̇̃^^cc^^cdĨìíĩj̀j́j̃Į̀Į́Į̃
 ============================================================
 ============================================================
 TEST 11: Dutch

Modified: trunk/l3kernel/testfiles/m3tlist002.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3tlist002.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/m3tlist002.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -76,11 +76,11 @@
 ============================================================
 TEST 5: if_blank (expect T/T/F repeated)
 ============================================================
- c_true_bool   c_true_bool   c_false_bool 
+c_true_bool   c_true_bool   c_false_bool 
 TRUE
 TRUE
 FALSE
- c_true_bool   c_true_bool   c_false_bool 
+c_true_bool   c_true_bool   c_false_bool 
 TRUE
 TRUE
 FALSE

Modified: trunk/l3kernel/testfiles/m3token002.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3token002.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3kernel/testfiles/m3token002.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -175,7 +175,7 @@
 ============================================================
 ! Argument of \use_i:nn has an extra }.
 <inserted text> 
-                \par 
+\par 
 l. ...}
 I've run across a `}' that doesn't seem to match anything.
 For example, `\def\a#1{...}' and `\a}' would produce
@@ -186,7 +186,7 @@
 Runaway argument?
 ! Paragraph ended before \use_i:nn was complete.
 <to be read again> 
-                   \par 
+\par 
 l. ...}
 I suspect you've forgotten a `}', causing me to apply this
 control sequence to too much text. How can we recover?

Modified: trunk/l3packages/xparse/testfiles/xparse002.luatex.tlg
===================================================================
--- trunk/l3packages/xparse/testfiles/xparse002.luatex.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3packages/xparse/testfiles/xparse002.luatex.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -210,7 +210,7 @@
 My plan is to forget the whole thing and hope for the best.
 ! Extra }, or forgotten \endgroup.
 <argument> ...\foo {gom}{\TYPE {(##1)(##2)(##3)}}\foo {\par }
-                                                  bc\DeclareDocumentCommand ...
+bc\DeclareDocumentCommand ...
 l. ...}
 I've deleted a group-closing symbol because it seems to be
 spurious, as in `$x}$'. But perhaps the } is legitimate and
@@ -233,7 +233,7 @@
 My plan is to forget the whole thing and hope for the best.
 ! Extra }, or forgotten \endgroup.
 <argument> ...efault}}{\TYPE {(##1)(##2)(##3)}}\foo de{\par }
-                                                  \DeclareDocumentCommand \f...
+\DeclareDocumentCommand \f...
 l. ...}
 I've deleted a group-closing symbol because it seems to be
 spurious, as in `$x}$'. But perhaps the } is legitimate and

Modified: trunk/l3packages/xparse/testfiles/xparse002.tlg
===================================================================
--- trunk/l3packages/xparse/testfiles/xparse002.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3packages/xparse/testfiles/xparse002.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -111,7 +111,7 @@
 Runaway argument?
 ! Paragraph ended before \foo was complete.
 <to be read again> 
-                   \par 
+\par 
 l. ...}
 I suspect you've forgotten a `}', causing me to apply this
 control sequence to too much text. How can we recover?
@@ -124,7 +124,7 @@
 Runaway argument?
 ! Paragraph ended before \foo  was complete.
 <to be read again> 
-                   \par 
+\par 
 l. ...}
 I suspect you've forgotten a `}', causing me to apply this
 control sequence to too much text. How can we recover?
@@ -138,7 +138,7 @@
 [ab
 ! Paragraph ended before \foo  was complete.
 <to be read again> 
-                   \par 
+\par 
 l. ...}
 I suspect you've forgotten a `}', causing me to apply this
 control sequence to too much text. How can we recover?
@@ -152,7 +152,7 @@
 [b
 ! Paragraph ended before \foo  was complete.
 <to be read again> 
-                   \par 
+\par 
 l. ...}
 I suspect you've forgotten a `}', causing me to apply this
 control sequence to too much text. How can we recover?
@@ -203,14 +203,14 @@
 {
 ! Paragraph ended before \foo  was complete.
 <to be read again> 
-                   \par 
+\par 
 l. ...}
 I suspect you've forgotten a `}', causing me to apply this
 control sequence to too much text. How can we recover?
 My plan is to forget the whole thing and hope for the best.
 ! Extra }, or forgotten \endgroup.
 <argument> ...\TYPE {(##1)(##2)(##3)}}\foo {\par }
-                                                  bc\DeclareDocumentCommand ...
+bc\DeclareDocumentCommand ...
 l. ...}
 I've deleted a group-closing symbol because it seems to be
 spurious, as in `$x}$'. But perhaps the } is legitimate and
@@ -226,14 +226,14 @@
 {
 ! Paragraph ended before \foo  was complete.
 <to be read again> 
-                   \par 
+\par 
 l. ...}
 I suspect you've forgotten a `}', causing me to apply this
 control sequence to too much text. How can we recover?
 My plan is to forget the whole thing and hope for the best.
 ! Extra }, or forgotten \endgroup.
 <argument> ...YPE {(##1)(##2)(##3)}}\foo de{\par }
-                                                  \DeclareDocumentCommand \f...
+\DeclareDocumentCommand \f...
 l. ...}
 I've deleted a group-closing symbol because it seems to be
 spurious, as in `$x}$'. But perhaps the } is legitimate and
@@ -249,7 +249,7 @@
 g hi
 ! Paragraph ended before \foo  was complete.
 <to be read again> 
-                   \par 
+\par 
 l. ...}
 I suspect you've forgotten a `}', causing me to apply this
 control sequence to too much text. How can we recover?
@@ -263,7 +263,7 @@
 j
 ! Paragraph ended before \foo  was complete.
 <to be read again> 
-                   \par 
+\par 
 l. ...}
 I suspect you've forgotten a `}', causing me to apply this
 control sequence to too much text. How can we recover?

Modified: trunk/l3packages/xparse/testfiles/xparse003.tlg
===================================================================
--- trunk/l3packages/xparse/testfiles/xparse003.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3packages/xparse/testfiles/xparse003.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -139,7 +139,7 @@
 ! For immediate help type H <return>.
 !...............................................  
 l. ...\foo#
-           {}
+{}
 |'''''''''''''''''''''''''''''''''''''''''''''''
 | The command '\foo ' takes a verbatim argument. It may not appear within the
 | argument of another function. It received an illegal token '##'.
@@ -212,4 +212,4 @@
 > ab.
 <recently read> }
 l. ...\halign{#\cr\foo&ab&
-                          \cr}
+\cr}

Modified: trunk/l3trial/l3bigint/testfiles/m3bigint001.tlg
===================================================================
--- trunk/l3trial/l3bigint/testfiles/m3bigint001.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3trial/l3bigint/testfiles/m3bigint001.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -142,58 +142,7 @@
 -14
 -1545602
 1219326311370217952237463801111263526900
-9877407481487654814851854321110419771606666827175310000123467887407691385187778
-0247148170372467061766670370728429632963283981453827642022226790567944448642382
-3703761734074629683955926444495020247592659265803111174080247518034575679777853
-0938278889605008586667543296304815654403711852653698775186148243219260185276552
-2153087493933343828197633343457789362974692518633344692481592603571950744457038
-2840740862975062925027174198889023470124777908654928592739520742185328409260666
-8060691373705259413595557074224706285234734584446086582732223827319635557321162
-9803720989370540757641876729648149987837055186987833201977271800019384642166685
-6808998518724711853889091378150148346768397222437058397185396317286035516071977
-5557790345701113308860334817173074097409728625948891171180271483926169160002407
-6469373901237123711136422271855580496306844470990296559285434703962988746765707
-4348175434815085212101442508670496666949410867000279040103407702498521444735831
-4843706578172870003037339536299296595091460049697562225345990154447531171383706
-9509407729661731592911142816691692625929247244477410691684950126901577811978716
-3889227194173333687689633148498800373852198516546852214850991259618554324552997
-5682753337049753123337012712082966802851890003802848185929688661767781704095100
-7446300173225649386753488929016346077817534824325967288074485226176926333373921
-5806704125968028889307449139959990166794444875351609222649425278222665476300704
-1432537080745095654366300815265477041518965476634864660540004605397576671235023
-1318565807185655602473815281527991506655603708506651899634395536698276531355604
-5727906111597579348148650667412407906222597556050264696481992643585333840791363
-0704790645731116309160545560716563831116432629682597877070422968206143264079482
-0210414868523877077397536383266721610420300054573341807463585852411166919148703
-7590963956333903760622963529686178477471663092222801292351445019810453037628454
-0799635506759317783613135862598593191417783741335861809679623517783864804998894
-9388748800062104963581543216037651913166321618581487766059321858099388444450679
-6370996359018630259322302124070431858012963024821012966238030729000060623358633
-3943270945482075368154111708701857852452671610778363021610815403762721958884008
-0304450210454378894691939105190827725982598272174131116823219808524074630920005
-5931531425538770877088943585728944499511687555609017704240794573296837091197235
-0926451904573185714867906551891409511333850669141000521039840593097581486556064
-2485236301416227210004963460543708704204988483951102517782654809925560469628056
-3010498593070418276407888937127309107454078753555602597309114489881099222268029
-2844111572885770667112390374852301279634148600923461148585229016741181525683441
-4025117326670951046956670988087357041197948190004197951894078305738312226296704
-9792633707827573790621247311150991654722262473170074112719926314853831074466706
-0224201296674111979111492630868034409913213555924728398778150654665778134603707
-2966568262999262898745713707185534602966481834603309136139540003395402503336765
-7763081514200815144477534185518551952494144476299494148180373605262741731469444
-4754352101889202500595852149412595592893857410444749175311518807436422666959288
-6449239210154348891691639534447284235608891568170397410123729657039788256815928
-5187790385211484123722042471617533358397580500025434652592616422148388913088852
-0963208476051666896319385037270393829516928416915777998787656555780269490963171
-6259280372494040762224381264217409407608662224259464218134321176562224135995081
-1130619245600017903037218536791963148166777679181498520234740758149901410993581
-8396666828411359666832115421037186434816333486435186740897427161889029643828592
-7370516064064395191371112432232112223580383860741938392604816049507420001270775
-3196307408530977789260419870294321987755565803506277788396135111120124370462972
-3466297259356727902037118526790963048156790999446920618000072846914333409884316
-1482086481487778419818525185863782721111629682721482037093832959506213584444876
-5876588893580728118521605259292596049740777781602864218520740975333335926197559
-24543220988889024706174444617302462222234570370740790129630370456800
+9877407481487654814851854321110419771606666827175310000123467887407691385187778024714817037246706176667037072842963296328398145382764202222679056794444864238237037617340746296839559264444950202475926592658031111740802475180345756797778530938278889605008586667543296304815654403711852653698775186148243219260185276552215308749393334382819763334345778936297469251863334469248159260357195074445703828407408629750629250271741988890234701247779086549285927395207421853284092606668060691373705259413595557074224706285234734584446086582732223827319635557321162980372098937054075764187672964814998783705518698783320197727180001938464216668568089985187247118538890913781501483467683972224370583971853963172860355160719775557790345701113308860334817173074097409728625948891171180271483926169160002407646937390123712371113642227185558049630684447099029655928543470396298874676570743481754348150852121014425086704966669494108670002790401034077024985214447358314843706578172870003037339536299296595091!
 4600496975622253459901544475311713837069509407729661731592911142816691692625929247244477410691684950126901577811978716388922719417333368768963314849880037385219851654685221485099125961855432455299756827533370497531233370127120829668028518900038028481859296886617677817040951007446300173225649386753488929016346077817534824325967288074485226176926333373921580670412596802888930744913995999016679444487535160922264942527822266547630070414325370807450956543663008152654770415189654766348646605400046053975766712350231318565807185655602473815281527991506655603708506651899634395536698276531355604572790611159757934814865066741240790622259755605026469648199264358533384079136307047906457311163091605455607165638311164326296825978770704229682061432640794820210414868523877077397536383266721610420300054573341807463585852411166919148703759096395633390376062296352968617847747166309222280129235144501981045303762845407996355067593177836131358625985931914177837413358618096796235177838648049988949!
 38874880006210496358154321603765191316632161858148776605932185!
 8099388444450679637099635901863025932230212407043185801296302482101296623803072900006062335863339432709454820753681541117087018578524526716107783630216108154037627219588840080304450210454378894691939105190827725982598272174131116823219808524074630920005593153142553877087708894358572894449951168755560901770424079457329683709119723509264519045731857148679065518914095113338506691410005210398405930975814865560642485236301416227210004963460543708704204988483951102517782654809925560469628056301049859307041827640788893712730910745407875355560259730911448988109922226802928441115728857706671123903748523012796341486009234611485852290167411815256834414025117326670951046956670988087357041197948190004197951894078305738312226296704979263370782757379062124731115099165472226247317007411271992631485383107446670602242012966741119791114926308680344099132135559247283987781506546657781346037072966568262999262898745713707185534602966481834603309136139540003395402503336765776308151420081514447753!
 4185518551952494144476299494148180373605262741731469444475435210188920250059585214941259559289385741044474917531151880743642266695928864492392101543488916916395344472842356088915681703974101237296570397882568159285187790385211484123722042471617533358397580500025434652592616422148388913088852096320847605166689631938503727039382951692841691577799878765655578026949096317162592803724940407622243812642174094076086622242594642181343211765622241359950811130619245600017903037218536791963148166777679181498520234740758149901410993581839666682841135966683211542103718643481633348643518674089742716188902964382859273705160640643951913711124322321122235803838607419383926048160495074200012707753196307408530977789260419870294321987755565803506277788396135111120124370462972346629725935672790203711852679096304815679099944692061800007284691433340988431614820864814877784198185251858637827211116296827214820370938329595062135844448765876588893580728118521605259292596049740777781602864218520740975!
 33333592619755924543220988889024706174444617302462222234570370740790129!
 630370456800
 ============================================================
 ============================================================
 TEST 12: if_odd/even/int

Modified: trunk/l3trial/l3fp-extras/testfiles/m3fp-symbolic001.tlg
===================================================================
--- trunk/l3trial/l3fp-extras/testfiles/m3fp-symbolic001.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3trial/l3fp-extras/testfiles/m3fp-symbolic001.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -34,7 +34,7 @@
 ============================================================
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation fp_to_decimal((A)+((B)^(2)))
+Invalid operation fp_to_decimal((A)+((B)^(2)))
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -43,7 +43,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation fp_to_decimal((A)+((B)^(2)))
+Invalid operation fp_to_decimal((A)+((B)^(2)))
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -52,7 +52,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation fp_to_int((A)+((B)^(2)))
+Invalid operation fp_to_int((A)+((B)^(2)))
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -61,7 +61,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           Invalid operation fp_to_scientific((A)+((B)^(2)))
+Invalid operation fp_to_scientific((A)+((B)^(2)))
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have

Modified: trunk/l3trial/l3hooks/testfiles/m3hooks001.luatex.tlg
===================================================================
--- trunk/l3trial/l3hooks/testfiles/m3hooks001.luatex.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3trial/l3hooks/testfiles/m3hooks001.luatex.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -105,7 +105,7 @@
 \penalty 0
 \glue(\belowdisplayskip) 10.0 plus 2.0 minus 5.0
 total height 56.77777 plus 6.0 minus 10.0
- goal height 550.0
+goal height 550.0
 prevdepth 1.94444, prevgraf 4 lines
 ! OK.
 l. ...\showlists
@@ -1199,7 +1199,7 @@
 .\glue(\parfillskip) 0.0 plus 1.0fil
 .\glue(\rightskip) 0.0
 total height 164.70274 plus 1.86108
- goal height 550.0
+goal height 550.0
 prevdepth 0.0, prevgraf 12 lines
 ! OK.
 l. ...\showlists
@@ -1284,7 +1284,7 @@
 .\glue(\parfillskip) 0.0 plus 1.0fil
 .\glue(\rightskip) 0.0
 total height 43.2472 plus 1.86108
- goal height 550.0
+goal height 550.0
 prevdepth 3.4, prevgraf 1 line
 ! OK.
 l. ...\showlists

Modified: trunk/l3trial/l3hooks/testfiles/m3hooks001.ptex.tlg
===================================================================
--- trunk/l3trial/l3hooks/testfiles/m3hooks001.ptex.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3trial/l3hooks/testfiles/m3hooks001.ptex.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -90,7 +90,7 @@
 \penalty 0
 \glue(\belowdisplayskip) 10.0 plus 2.0 minus 5.0
 total height 56.77777 plus 6.0 minus 10.0
- goal height 550.0
+goal height 550.0
 prevdepth 1.94444, prevgraf 4 lines
 ! OK.
 l. ...\showlists
@@ -139,8 +139,7 @@
 .\penalty 10000
 .\glue(\parfillskip) 0.0 plus 1.0fil
 .\glue(\rightskip) 0.0
-\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline 
-\ETC.}
+\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline \ETC.}
 \penalty 10000
 \glue 9.90276 plus 0.86108
 \glue(\parskip) 0.0 plus 1.0
@@ -1186,7 +1185,7 @@
 .\glue(\parfillskip) 0.0 plus 1.0fil
 .\glue(\rightskip) 0.0
 total height 164.70274 plus 1.86108
- goal height 550.0
+goal height 550.0
 prevdepth 0.0, prevgraf 12 lines
 ! OK.
 l. ...\showlists
@@ -1207,8 +1206,7 @@
 .\penalty 10000
 .\glue(\parfillskip) 0.0 plus 1.0fil
 .\glue(\rightskip) 0.0
-\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline 
-\ETC.}
+\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline \ETC.}
 \penalty 10000
 \glue 9.90276 plus 0.86108
 \glue(\parskip) 0.0 plus 1.0
@@ -1261,7 +1259,7 @@
 .\glue(\parfillskip) 0.0 plus 1.0fil
 .\glue(\rightskip) 0.0
 total height 43.2472 plus 1.86108
- goal height 550.0
+goal height 550.0
 prevdepth 3.4, prevgraf 1 line
 ! OK.
 l. ...\showlists

Modified: trunk/l3trial/l3hooks/testfiles/m3hooks001.tlg
===================================================================
--- trunk/l3trial/l3hooks/testfiles/m3hooks001.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3trial/l3hooks/testfiles/m3hooks001.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -90,7 +90,7 @@
 \penalty 0
 \glue(\belowdisplayskip) 10.0 plus 2.0 minus 5.0
 total height 56.77777 plus 6.0 minus 10.0
- goal height 550.0
+goal height 550.0
 prevdepth 1.94444, prevgraf 4 lines
 ! OK.
 l. ...\showlists
@@ -131,8 +131,7 @@
 .\penalty 10000
 .\glue(\parfillskip) 0.0 plus 1.0fil
 .\glue(\rightskip) 0.0
-\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline 
-\ETC.}
+\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline \ETC.}
 \penalty 10000
 \glue 9.90276 plus 0.86108
 \glue(\parskip) 0.0 plus 1.0
@@ -1178,7 +1177,7 @@
 .\glue(\parfillskip) 0.0 plus 1.0fil
 .\glue(\rightskip) 0.0
 total height 164.70274 plus 1.86108
- goal height 550.0
+goal height 550.0
 prevdepth 0.0, prevgraf 12 lines
 ! OK.
 l. ...\showlists
@@ -1199,8 +1198,7 @@
 .\penalty 10000
 .\glue(\parfillskip) 0.0 plus 1.0fil
 .\glue(\rightskip) 0.0
-\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline 
-\ETC.}
+\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline \ETC.}
 \penalty 10000
 \glue 9.90276 plus 0.86108
 \glue(\parskip) 0.0 plus 1.0
@@ -1253,7 +1251,7 @@
 .\glue(\parfillskip) 0.0 plus 1.0fil
 .\glue(\rightskip) 0.0
 total height 43.2472 plus 1.86108
- goal height 550.0
+goal height 550.0
 prevdepth 3.4, prevgraf 1 line
 ! OK.
 l. ...\showlists

Modified: trunk/l3trial/l3hooks/testfiles/m3hooks001.uptex.tlg
===================================================================
--- trunk/l3trial/l3hooks/testfiles/m3hooks001.uptex.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3trial/l3hooks/testfiles/m3hooks001.uptex.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -90,7 +90,7 @@
 \penalty 0
 \glue(\belowdisplayskip) 10.0 plus 2.0 minus 5.0
 total height 56.77777 plus 6.0 minus 10.0
- goal height 550.0
+goal height 550.0
 prevdepth 1.94444, prevgraf 4 lines
 ! OK.
 l. ...\showlists
@@ -151,8 +151,7 @@
 .\penalty 10000
 .\glue(\parfillskip) 0.0 plus 1.0fil
 .\glue(\rightskip) 0.0
-\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline 
-\ETC.}
+\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline \ETC.}
 \penalty 10000
 \glue 9.90276 plus 0.86108
 \glue(\parskip) 0.0 plus 1.0
@@ -1198,7 +1197,7 @@
 .\glue(\parfillskip) 0.0 plus 1.0fil
 .\glue(\rightskip) 0.0
 total height 164.70274 plus 1.86108
- goal height 550.0
+goal height 550.0
 prevdepth 0.0, prevgraf 12 lines
 ! OK.
 l. ...\showlists
@@ -1219,8 +1218,7 @@
 .\penalty 10000
 .\glue(\parfillskip) 0.0 plus 1.0fil
 .\glue(\rightskip) 0.0
-\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline 
-\ETC.}
+\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline \ETC.}
 \penalty 10000
 \glue 9.90276 plus 0.86108
 \glue(\parskip) 0.0 plus 1.0
@@ -1273,7 +1271,7 @@
 .\glue(\parfillskip) 0.0 plus 1.0fil
 .\glue(\rightskip) 0.0
 total height 43.2472 plus 1.86108
- goal height 550.0
+goal height 550.0
 prevdepth 3.4, prevgraf 1 line
 ! OK.
 l. ...\showlists

Modified: trunk/l3trial/l3hooks/testfiles/m3hooks002.luatex.tlg
===================================================================
--- trunk/l3trial/l3hooks/testfiles/m3hooks002.luatex.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3trial/l3hooks/testfiles/m3hooks002.luatex.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -95,7 +95,7 @@
 \penalty 10000
 \penalty 10000
 total height 66.6055 plus 3.72217
- goal height 550.0
+goal height 550.0
 ### recent contributions:
 \glue 9.90276 plus 0.86108
 prevdepth 0.0, prevgraf 1 line

Modified: trunk/l3trial/l3hooks/testfiles/m3hooks002.ptex.tlg
===================================================================
--- trunk/l3trial/l3hooks/testfiles/m3hooks002.ptex.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3trial/l3hooks/testfiles/m3hooks002.ptex.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -44,8 +44,7 @@
 .\penalty 10000
 .\glue(\parfillskip) 0.0 plus 1.0fil
 .\glue(\rightskip) 0.0
-\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline 
-\ETC.}
+\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline \ETC.}
 \penalty 10000
 \glue 9.90276 plus 0.86108
 \glue(\parskip) 0.0 plus 1.0
@@ -63,8 +62,7 @@
 .\penalty 10000
 .\glue(\parfillskip) 0.0 plus 1.0fil
 .\glue(\rightskip) 0.0
-\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline 
-\ETC.}
+\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline \ETC.}
 \penalty 10000
 \penalty 10000
 \glue 9.90276 plus 0.86108
@@ -83,12 +81,11 @@
 .\penalty 10000
 .\glue(\parfillskip) 0.0 plus 1.0fil
 .\glue(\rightskip) 0.0
-\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline 
-\ETC.}
+\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline \ETC.}
 \penalty 10000
 \penalty 10000
 total height 66.6055 plus 3.72217
- goal height 550.0
+goal height 550.0
 ### recent contributions:
 \glue 9.90276 plus 0.86108
 prevdepth 0.0, prevgraf 1 line

Modified: trunk/l3trial/l3hooks/testfiles/m3hooks002.tlg
===================================================================
--- trunk/l3trial/l3hooks/testfiles/m3hooks002.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3trial/l3hooks/testfiles/m3hooks002.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -36,8 +36,7 @@
 .\penalty 10000
 .\glue(\parfillskip) 0.0 plus 1.0fil
 .\glue(\rightskip) 0.0
-\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline 
-\ETC.}
+\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline \ETC.}
 \penalty 10000
 \glue 9.90276 plus 0.86108
 \glue(\parskip) 0.0 plus 1.0
@@ -55,8 +54,7 @@
 .\penalty 10000
 .\glue(\parfillskip) 0.0 plus 1.0fil
 .\glue(\rightskip) 0.0
-\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline 
-\ETC.}
+\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline \ETC.}
 \penalty 10000
 \penalty 10000
 \glue 9.90276 plus 0.86108
@@ -75,12 +73,11 @@
 .\penalty 10000
 .\glue(\parfillskip) 0.0 plus 1.0fil
 .\glue(\rightskip) 0.0
-\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline 
-\ETC.}
+\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline \ETC.}
 \penalty 10000
 \penalty 10000
 total height 66.6055 plus 3.72217
- goal height 550.0
+goal height 550.0
 ### recent contributions:
 \glue 9.90276 plus 0.86108
 prevdepth 0.0, prevgraf 1 line

Modified: trunk/l3trial/l3hooks/testfiles/m3hooks002.uptex.tlg
===================================================================
--- trunk/l3trial/l3hooks/testfiles/m3hooks002.uptex.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3trial/l3hooks/testfiles/m3hooks002.uptex.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -52,8 +52,7 @@
 .\penalty 10000
 .\glue(\parfillskip) 0.0 plus 1.0fil
 .\glue(\rightskip) 0.0
-\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline 
-\ETC.}
+\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline \ETC.}
 \penalty 10000
 \glue 9.90276 plus 0.86108
 \glue(\parskip) 0.0 plus 1.0
@@ -71,8 +70,7 @@
 .\penalty 10000
 .\glue(\parfillskip) 0.0 plus 1.0fil
 .\glue(\rightskip) 0.0
-\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline 
-\ETC.}
+\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline \ETC.}
 \penalty 10000
 \penalty 10000
 \glue 9.90276 plus 0.86108
@@ -91,12 +89,11 @@
 .\penalty 10000
 .\glue(\parfillskip) 0.0 plus 1.0fil
 .\glue(\rightskip) 0.0
-\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline 
-\ETC.}
+\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline \ETC.}
 \penalty 10000
 \penalty 10000
 total height 66.6055 plus 3.72217
- goal height 550.0
+goal height 550.0
 ### recent contributions:
 \glue 9.90276 plus 0.86108
 prevdepth 0.0, prevgraf 1 line

Modified: trunk/l3trial/l3kernel-extras/testfiles/m3kernel-extras006.luatex.tlg
===================================================================
--- trunk/l3trial/l3kernel-extras/testfiles/m3kernel-extras006.luatex.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3trial/l3kernel-extras/testfiles/m3kernel-extras006.luatex.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -20,8 +20,7 @@
 ============================================================
 TEST 1: char_category_name
 ============================================================
-escape, group_begin, group_end, math_toggle, alignment, end_line, parameter, mat
-h_superscript, letter, ignore, space, letter, other, active, comment, invalid, 
+escape, group_begin, group_end, math_toggle, alignment, end_line, parameter, math_superscript, letter, ignore, space, letter, other, active, comment, invalid, 
 ============================================================
 ============================================================
 TEST 2: char_show
@@ -34,7 +33,7 @@
 > math code "7161
 > not a delimiter
 > size in current font:
-    ht 4.30554pt, wd 5.00002pt, dp 0.0pt, ic 0.0pt
+ht 4.30554pt, wd 5.00002pt, dp 0.0pt, ic 0.0pt
 > expansion factor 1000
 > tagcode 1.
 <recently read> }
@@ -47,7 +46,7 @@
 > math code "13A
 > delimiter code "0
 > size in current font:
-    ht 1.05554pt, wd 2.77779pt, dp 0.0pt, ic 0.0pt
+ht 1.05554pt, wd 2.77779pt, dp 0.0pt, ic 0.0pt
 > expansion factor 1000
 > tagcode 0.
 <recently read> }
@@ -60,7 +59,7 @@
 > math code "4028
 > delimiter code "28300
 > size in current font:
-    ht 7.5pt, wd 3.8889pt, dp 2.5pt, ic 0.0pt
+ht 7.5pt, wd 3.8889pt, dp 2.5pt, ic 0.0pt
 > expansion factor 1000
 > tagcode 0.
 <recently read> }

Modified: trunk/l3trial/l3kernel-extras/testfiles/m3kernel-extras006.tlg
===================================================================
--- trunk/l3trial/l3kernel-extras/testfiles/m3kernel-extras006.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3trial/l3kernel-extras/testfiles/m3kernel-extras006.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -20,8 +20,7 @@
 ============================================================
 TEST 1: char_category_name
 ============================================================
-escape, group_begin, group_end, math_toggle, alignment, end_line, parameter, ma
-th_superscript, letter, ignore, space, letter, other, active, comment, invalid,
+escape, group_begin, group_end, math_toggle, alignment, end_line, parameter, math_superscript, letter, ignore, space, letter, other, active, comment, invalid, 
 ============================================================
 ============================================================
 TEST 2: char_show
@@ -34,7 +33,7 @@
 > math code "7161
 > not a delimiter
 > size in current font:
-    ht 4.30554pt, wd 5.00002pt, dp 0.0pt, ic 0.0pt
+ht 4.30554pt, wd 5.00002pt, dp 0.0pt, ic 0.0pt
 > expansion factor 1000
 > tagcode 1.
 <recently read> }
@@ -47,7 +46,7 @@
 > math code "13A
 > delimiter code "0
 > size in current font:
-    ht 1.05554pt, wd 2.77779pt, dp 0.0pt, ic 0.0pt
+ht 1.05554pt, wd 2.77779pt, dp 0.0pt, ic 0.0pt
 > expansion factor 1000
 > tagcode 0.
 <recently read> }
@@ -60,7 +59,7 @@
 > math code "4028
 > delimiter code "28300
 > size in current font:
-    ht 7.5pt, wd 3.8889pt, dp 2.5pt, ic 0.0pt
+ht 7.5pt, wd 3.8889pt, dp 2.5pt, ic 0.0pt
 > expansion factor 1000
 > tagcode 0.
 <recently read> }

Modified: trunk/l3trial/l3kernel-extras/testfiles/m3kernel-extras006.xetex.tlg
===================================================================
--- trunk/l3trial/l3kernel-extras/testfiles/m3kernel-extras006.xetex.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3trial/l3kernel-extras/testfiles/m3kernel-extras006.xetex.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -20,8 +20,7 @@
 ============================================================
 TEST 1: char_category_name
 ============================================================
-escape, group_begin, group_end, math_toggle, alignment, end_line, parameter, ma
-th_superscript, letter, ignore, space, letter, other, active, comment, invalid,
+escape, group_begin, group_end, math_toggle, alignment, end_line, parameter, math_superscript, letter, ignore, space, letter, other, active, comment, invalid, 
 ============================================================
 ============================================================
 TEST 2: char_show
@@ -34,7 +33,7 @@
 > math code "7161
 > not a delimiter
 > size in current font:
-    ht 4.30554pt, wd 5.00002pt, dp 0.0pt, ic 0.0pt
+ht 4.30554pt, wd 5.00002pt, dp 0.0pt, ic 0.0pt
 > tagcode 0.
 <recently read> }
 l. ...  }
@@ -46,7 +45,7 @@
 > math code "13A
 > delimiter code "0
 > size in current font:
-    ht 1.05554pt, wd 2.77779pt, dp 0.0pt, ic 0.0pt
+ht 1.05554pt, wd 2.77779pt, dp 0.0pt, ic 0.0pt
 > tagcode 0.
 <recently read> }
 l. ...  }
@@ -58,7 +57,7 @@
 > math code "4028
 > delimiter code "28300
 > size in current font:
-    ht 7.5pt, wd 3.8889pt, dp 2.5pt, ic 0.0pt
+ht 7.5pt, wd 3.8889pt, dp 2.5pt, ic 0.0pt
 > tagcode 0.
 <recently read> }
 l. ...  }

Modified: trunk/l3trial/l3kernel-extras/testfiles/m3kernel-extras007.tlg
===================================================================
--- trunk/l3trial/l3kernel-extras/testfiles/m3kernel-extras007.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3trial/l3kernel-extras/testfiles/m3kernel-extras007.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -28,7 +28,7 @@
 l. ...  }
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           a
+a
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -37,7 +37,7 @@
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-                           aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have

Modified: trunk/l3trial/l3ldb/testfiles/m3ldb002.ptex.tlg
===================================================================
--- trunk/l3trial/l3ldb/testfiles/m3ldb002.ptex.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3trial/l3ldb/testfiles/m3ldb002.ptex.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -27,8 +27,7 @@
 LDB: Set \@itemlabel with value \@Alph \c at enumi ) in <enumerate
 LDB: Set \@itemlabel with value \@Roman \c at enumii ) in <list.<enumerate
 LDB: Set \@itemlabel with value \@arabic \c at enumiii ) in <list.<list.<enumerate
-LDB: Set \@itemlabel with value \@roman \c at enumiv ) in <list.<list.<list.<enume
-rate
+LDB: Set \@itemlabel with value \@roman \c at enumiv ) in <list.<list.<list.<enumerate
 LDB: 
 LDB: Begin Processing ***** quote ***** (sequenced) on line ...
 LDB: ..... Change \parindent because of `<quote':

Modified: trunk/l3trial/l3ldb/testfiles/m3ldb002.tlg
===================================================================
--- trunk/l3trial/l3ldb/testfiles/m3ldb002.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3trial/l3ldb/testfiles/m3ldb002.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -27,8 +27,7 @@
 LDB: Set \@itemlabel with value \@Alph \c at enumi ) in <enumerate
 LDB: Set \@itemlabel with value \@Roman \c at enumii ) in <list.<enumerate
 LDB: Set \@itemlabel with value \@arabic \c at enumiii ) in <list.<list.<enumerate
-LDB: Set \@itemlabel with value \@roman \c at enumiv ) in <list.<list.<list.<enume
-rate
+LDB: Set \@itemlabel with value \@roman \c at enumiv ) in <list.<list.<list.<enumerate
 LDB: 
 LDB: Begin Processing ***** quote ***** (sequenced) on line ...
 LDB: ..... Change \parindent because of `<quote':

Modified: trunk/l3trial/l3ldb/testfiles/m3ldb002.uptex.tlg
===================================================================
--- trunk/l3trial/l3ldb/testfiles/m3ldb002.uptex.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3trial/l3ldb/testfiles/m3ldb002.uptex.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -27,8 +27,7 @@
 LDB: Set \@itemlabel with value \@Alph \c at enumi ) in <enumerate
 LDB: Set \@itemlabel with value \@Roman \c at enumii ) in <list.<enumerate
 LDB: Set \@itemlabel with value \@arabic \c at enumiii ) in <list.<list.<enumerate
-LDB: Set \@itemlabel with value \@roman \c at enumiv ) in <list.<list.<list.<enume
-rate
+LDB: Set \@itemlabel with value \@roman \c at enumiv ) in <list.<list.<list.<enumerate
 LDB: 
 LDB: Begin Processing ***** quote ***** (sequenced) on line ...
 LDB: ..... Change \parindent because of `<quote':

Deleted: trunk/l3trial/l3ldb/testfiles/m3ldb003.luatex.tlg
===================================================================
--- trunk/l3trial/l3ldb/testfiles/m3ldb003.luatex.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3trial/l3ldb/testfiles/m3ldb003.luatex.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -1,396 +0,0 @@
-This is a generated file for the LaTeX (2e + expl3) validation system.
-Don't change this file in any respect.
-%% \CharacterTable
-%%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%%   Lower-case    \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%%   Digits        \0\1\2\3\4\5\6\7\8\9
-%%   Exclamation   \!     Double quote  \"     Hash (number) \#
-%%   Dollar        \$     Percent       \%     Ampersand     \&
-%%   Acute accent  \'     Left paren    \(     Right paren   \)
-%%   Asterisk      \*     Plus          \+     Comma         \,
-%%   Minus         \-     Point         \.     Solidus       \/
-%%   Colon         \:     Semicolon     \;     Less than     \<
-%%   Equals        \=     Greater than  \>     Question mark \?
-%%   Commercial at \@     Left bracket  \[     Backslash     \\
-%%   Right bracket \]     Circumflex    \^     Underscore    \_
-%%   Grave accent  \`     Left brace    \{     Vertical bar  \|
-%%   Right brace   \}     Tilde         \~}
-%%
-Author: Frank Mittelbach
-.................................................
-. xtemplate info: "declare-object-type"
-. 
-. Declaring object type 'list' taking 0 argument(s) on line ....
-.................................................
-.................................................
-. xtemplate info: "declare-object-type"
-. 
-. Declaring object type 'listitem' taking 0 argument(s) on line ....
-.................................................
-LDB: Set \UseInstanceName with value itemize in <itemize
-LDB: Set \l_xtemplate_type_tl with value list in <itemize
-LDB: Set \UseInstanceName with value enumerate in <enumerate
-LDB: Set \l_xtemplate_type_tl with value list in <enumerate
-LDB: Set \UseInstanceName with value item in <item
-LDB: Set \l_xtemplate_type_tl with value listitem in <item
-LDB: Set \UseInstanceValues with value left-margin=20pt in <list*<list
-LDB: Set \UseInstanceValues with value left-margin=10pt in <list*<list*<list
-LDB: Set \UseInstanceValues with value left-margin=70pt in <list*<list*<itemize
-LDB: Set \UseInstanceValues with value item-label-text=\textbf {--}, make-label=
-\hss \llap {##1},text-font=\itshape  in <list*<itemize
-LDB: Set \UseInstanceValues with value item-label-text=\textbullet , text-font=\
-sffamily \slshape  in <list*<list*<itemize
-LDB: Set \UseInstanceValues with value item-label-text=??, text-font=\footnotesi
-ze \sffamily \slshape  in <list*<list*<list*<itemize
-LDB: Set \UseInstanceValues with value item-label-text=\alph {enumi}) in <enumer
-ate*<enumerate
-LDB: Set \UseInstanceName with value itemize in <enumerate*<enumerate*<enumerate
-LDB: Set \UseInstanceValues with value item-label-text=\fbox {x} in <enumerate*<
-enumerate*<enumerate
-LDB: Set \UseInstanceValues with value item-label-text=(cont.) in itemize><itemi
-ze
-Dumping commands into (.dmp)
-\c_cs_dump_iow=\write3
- commands . . . . . . . . . . . . . . . . . . . . .  registers  finished
-LDB: 
-LDB: Begin Processing ***** list,itemize ***** on line ...
-LDB: ..... Change \UseInstanceName because of `<itemize':
-LDB: ..........  -> itemize
-LDB: ..... Change \l_xtemplate_type_tl because of `<itemize':
-LDB: ..........  -> list
-LDB: 
-LDB: Begin Processing ***** ,item ***** (sequenced) on line ...
-LDB: ..... Change \UseInstanceName because of `<item':
-LDB: .......... itemize -> item
-LDB: ..... Change \l_xtemplate_type_tl because of `<item':
-LDB: .......... list -> listitem
-LaTeX Font Info:    External font `cmex10' loaded for size
-(Font)              <7> on input line ....
-LaTeX Font Info:    External font `cmex10' loaded for size
-(Font)              <5> on input line ....
-LDB: 
-LDB: End Processing ***** ,item ***** on line ...
-LDB: 
-LDB: Begin Processing ***** ,item ***** (sequenced) on line ...
-LDB: ..... Change \UseInstanceName because of `<item':
-LDB: .......... itemize -> item
-LDB: ..... Change \l_xtemplate_type_tl because of `<item':
-LDB: .......... list -> listitem
-LDB: 
-LDB: End Processing ***** ,item ***** on line ...
-LDB: 
-LDB: Begin Processing ***** ,item ***** (sequenced) on line ...
-LDB: ..... Change \UseInstanceName because of `<item':
-LDB: .......... itemize -> item
-LDB: ..... Change \l_xtemplate_type_tl because of `<item':
-LDB: .......... list -> listitem
-LDB: 
-LDB: Begin Processing ***** list,enumerate ***** on line ...
-LDB: ..... Change \UseInstanceName because of `<enumerate':
-LDB: .......... item -> enumerate
-LDB: ..... Change \l_xtemplate_type_tl because of `<enumerate':
-LDB: .......... listitem -> list
-LDB: ..... Execute function because of `<list*<list':
-LDB: ......=>.. \UseInstanceValues  {left-margin=20pt}
-LDB: 
-LDB: Begin Processing ***** ,item ***** (sequenced) on line ...
-LDB: ..... Change \UseInstanceName because of `<item':
-LDB: .......... enumerate -> item
-LDB: ..... Change \l_xtemplate_type_tl because of `<item':
-LDB: .......... list -> listitem
-LDB: 
-LDB: End Processing ***** ,item ***** on line ...
-LDB: 
-LDB: Begin Processing ***** ,item ***** (sequenced) on line ...
-LDB: ..... Change \UseInstanceName because of `<item':
-LDB: .......... enumerate -> item
-LDB: ..... Change \l_xtemplate_type_tl because of `<item':
-LDB: .......... list -> listitem
-LDB: 
-LDB: Begin Processing ***** list,enumerate ***** on line ...
-LDB: ..... Change \UseInstanceName because of `<enumerate':
-LDB: .......... item -> enumerate
-LDB: ..... Change \l_xtemplate_type_tl because of `<enumerate':
-LDB: .......... listitem -> list
-LDB: ..... Execute function because of `<list*<list':
-LDB: ......=>.. \UseInstanceValues  {left-margin=20pt}
-LDB: ..... Execute function because of `<list*<list*<list':
-LDB: ......=>.. \UseInstanceValues  {left-margin=10pt}
-LDB: ..... Execute function because of `<enumerate*<enumerate':
-LDB: ......=>.. \UseInstanceValues  {item-label-text=\alph {enumi})}
-LDB: 
-LDB: Begin Processing ***** ,item ***** (sequenced) on line ...
-LDB: ..... Change \UseInstanceName because of `<item':
-LDB: .......... enumerate -> item
-LDB: ..... Change \l_xtemplate_type_tl because of `<item':
-LDB: .......... list -> listitem
-LDB: 
-LDB: End Processing ***** ,item ***** on line ...
-LDB: 
-LDB: Begin Processing ***** ,item ***** (sequenced) on line ...
-LDB: ..... Change \UseInstanceName because of `<item':
-LDB: .......... enumerate -> item
-LDB: ..... Change \l_xtemplate_type_tl because of `<item':
-LDB: .......... list -> listitem
-LDB: 
-LDB: Begin Processing ***** list,enumerate ***** on line ...
-LDB: ..... Change \UseInstanceName because of `<enumerate':
-LDB: .......... item -> enumerate
-LDB: ..... Change \l_xtemplate_type_tl because of `<enumerate':
-LDB: .......... listitem -> list
-LDB: ..... Change \UseInstanceName because of `<enumerate*<enumerate*<enumerate'
-:
-LDB: .......... enumerate -> itemize
-LDB: ..... Execute function because of `<list*<list':
-LDB: ......=>.. \UseInstanceValues  {left-margin=20pt}
-LDB: ..... Execute function because of `<list*<list*<list':
-LDB: ......=>.. \UseInstanceValues  {left-margin=10pt}
-LDB: ..... Execute function because of `<enumerate*<enumerate':
-LDB: ......=>.. \UseInstanceValues  {item-label-text=\alph {enumi})}
-LDB: ..... Execute function because of `<enumerate*<enumerate*<enumerate':
-LDB: ......=>.. \UseInstanceValues  {item-label-text=\fbox {x}}
-LDB: 
-LDB: Begin Processing ***** ,item ***** (sequenced) on line ...
-LDB: ..... Change \UseInstanceName because of `<item':
-LDB: .......... itemize -> item
-LDB: ..... Change \l_xtemplate_type_tl because of `<item':
-LDB: .......... list -> listitem
-LDB: 
-LDB: End Processing ***** ,item ***** on line ...
-LDB: 
-LDB: Begin Processing ***** ,item ***** (sequenced) on line ...
-LDB: ..... Change \UseInstanceName because of `<item':
-LDB: .......... itemize -> item
-LDB: ..... Change \l_xtemplate_type_tl because of `<item':
-LDB: .......... list -> listitem
-LDB: 
-LDB: End Processing ***** ,item ***** on line ...
-LDB: 
-LDB: End Processing ***** list,enumerate ***** (sequenced) on line ...
-LDB: 
-LDB: End Processing ***** ,item ***** (sequenced) on line ...
-LDB: 
-LDB: End Processing ***** list,enumerate ***** (sequenced) on line ...
-LDB: 
-LDB: End Processing ***** ,item ***** (sequenced) on line ...
-LDB: 
-LDB: Begin Processing ***** ,item ***** (sequenced) on line ...
-LDB: ..... Change \UseInstanceName because of `<item':
-LDB: .......... enumerate -> item
-LDB: ..... Change \l_xtemplate_type_tl because of `<item':
-LDB: .......... list -> listitem
-LDB: 
-LDB: End Processing ***** ,item ***** on line ...
-LDB: 
-LDB: End Processing ***** list,enumerate ***** (sequenced) on line ...
-LDB: 
-LDB: Begin Processing ***** list,itemize ***** (sequenced) on line ...
-LDB: ..... Change \UseInstanceName because of `<itemize':
-LDB: .......... item -> itemize
-LDB: ..... Change \l_xtemplate_type_tl because of `<itemize':
-LDB: .......... listitem -> list
-LDB: ..... Execute function because of `<list*<list':
-LDB: ......=>.. \UseInstanceValues  {left-margin=20pt}
-LDB: ..... Execute function because of `<list*<itemize':
-LDB: ......=>.. \UseInstanceValues  {item-label-text=\textbf {--}, make-label=\h
-ss \llap {##1},text-font=\itshape }
-LDB: 
-LDB: Begin Processing ***** ,item ***** (sequenced) on line ...
-LDB: ..... Change \UseInstanceName because of `<item':
-LDB: .......... itemize -> item
-LDB: ..... Change \l_xtemplate_type_tl because of `<item':
-LDB: .......... list -> listitem
-LDB: 
-LDB: Begin Processing ***** list,enumerate ***** on line ...
-LDB: ..... Change \UseInstanceName because of `<enumerate':
-LDB: .......... item -> enumerate
-LDB: ..... Change \l_xtemplate_type_tl because of `<enumerate':
-LDB: .......... listitem -> list
-LDB: ..... Execute function because of `<list*<list':
-LDB: ......=>.. \UseInstanceValues  {left-margin=20pt}
-LDB: ..... Execute function because of `<list*<list*<list':
-LDB: ......=>.. \UseInstanceValues  {left-margin=10pt}
-LDB: 
-LDB: Begin Processing ***** ,item ***** (sequenced) on line ...
-LDB: ..... Change \UseInstanceName because of `<item':
-LDB: .......... enumerate -> item
-LDB: ..... Change \l_xtemplate_type_tl because of `<item':
-LDB: .......... list -> listitem
-LDB: 
-LDB: Begin Processing ***** list,itemize ***** on line ...
-LDB: ..... Change \UseInstanceName because of `<itemize':
-LDB: .......... item -> itemize
-LDB: ..... Change \l_xtemplate_type_tl because of `<itemize':
-LDB: .......... listitem -> list
-LDB: ..... Execute function because of `<list*<list':
-LDB: ......=>.. \UseInstanceValues  {left-margin=20pt}
-LDB: ..... Execute function because of `<list*<list*<list':
-LDB: ......=>.. \UseInstanceValues  {left-margin=10pt}
-LDB: ..... Execute function because of `<list*<itemize':
-LDB: ......=>.. \UseInstanceValues  {item-label-text=\textbf {--}, make-label=\h
-ss \llap {##1},text-font=\itshape }
-LDB: ..... Execute function because of `<list*<list*<itemize':
-LDB: ......=>.. \UseInstanceValues  {left-margin=70pt}
-LDB: ..... Execute function because of `<list*<list*<itemize':
-LDB: ......=>.. \UseInstanceValues  {item-label-text=\textbullet , text-font=\sf
-family \slshape }
-LDB: ..... Execute function because of `<list*<list*<list*<itemize':
-LDB: ......=>.. \UseInstanceValues  {item-label-text=??, text-font=\footnotesize
- \sffamily \slshape }
-LDB: 
-LDB: Begin Processing ***** ,item ***** (sequenced) on line ...
-LDB: ..... Change \UseInstanceName because of `<item':
-LDB: .......... itemize -> item
-LDB: ..... Change \l_xtemplate_type_tl because of `<item':
-LDB: .......... list -> listitem
-LDB: 
-LDB: End Processing ***** ,item ***** on line ...
-LDB: 
-LDB: Begin Processing ***** ,item ***** (sequenced) on line ...
-LDB: ..... Change \UseInstanceName because of `<item':
-LDB: .......... itemize -> item
-LDB: ..... Change \l_xtemplate_type_tl because of `<item':
-LDB: .......... list -> listitem
-LDB: 
-LDB: End Processing ***** ,item ***** on line ...
-LDB: 
-LDB: End Processing ***** list,itemize ***** (sequenced) on line ...
-LDB: 
-LDB: End Processing ***** ,item ***** (sequenced) on line ...
-LDB: 
-LDB: Begin Processing ***** ,item ***** (sequenced) on line ...
-LDB: ..... Change \UseInstanceName because of `<item':
-LDB: .......... enumerate -> item
-LDB: ..... Change \l_xtemplate_type_tl because of `<item':
-LDB: .......... list -> listitem
-LDB: 
-LDB: End Processing ***** ,item ***** on line ...
-LDB: 
-LDB: End Processing ***** list,enumerate ***** (sequenced) on line ...
-LDB: 
-LDB: Begin Processing ***** ,item ***** (sequenced) on line ...
-LDB: ..... Change \UseInstanceName because of `<item':
-LDB: .......... item -> item
-LDB: ..... Change \l_xtemplate_type_tl because of `<item':
-LDB: .......... listitem -> listitem
-LDB: 
-LDB: Begin Processing ***** list,itemize ***** on line ...
-LDB: ..... Change \UseInstanceName because of `<itemize':
-LDB: .......... item -> itemize
-LDB: ..... Change \l_xtemplate_type_tl because of `<itemize':
-LDB: .......... listitem -> list
-LDB: ..... Execute function because of `<list*<list':
-LDB: ......=>.. \UseInstanceValues  {left-margin=20pt}
-LDB: ..... Execute function because of `<list*<list*<list':
-LDB: ......=>.. \UseInstanceValues  {left-margin=10pt}
-LDB: ..... Execute function because of `<list*<itemize':
-LDB: ......=>.. \UseInstanceValues  {item-label-text=\textbf {--}, make-label=\h
-ss \llap {##1},text-font=\itshape }
-LDB: ..... Execute function because of `<list*<list*<itemize':
-LDB: ......=>.. \UseInstanceValues  {left-margin=70pt}
-LDB: ..... Execute function because of `<list*<list*<itemize':
-LDB: ......=>.. \UseInstanceValues  {item-label-text=\textbullet , text-font=\sf
-family \slshape }
-LaTeX Font Warning: Font shape `OT1/cmss/m/it' in size <10> not available
-(Font)              Font shape `OT1/cmss/m/sl' tried instead on input line ....
-LDB: 
-LDB: Begin Processing ***** ,item ***** (sequenced) on line ...
-LDB: ..... Change \UseInstanceName because of `<item':
-LDB: .......... itemize -> item
-LDB: ..... Change \l_xtemplate_type_tl because of `<item':
-LDB: .......... list -> listitem
-LaTeX Font Info:    Try loading font information for OMS+cmss on input line ....
-LaTeX Font Info:    No file OMScmss.fd. on input line ....
-LaTeX Font Warning: Font shape `OMS/cmss/m/sl' undefined
-(Font)              using `OMS/cmsy/m/n' instead
-(Font)              for symbol `textbullet' on input line ....
-LDB: 
-LDB: End Processing ***** ,item ***** on line ...
-LDB: 
-LDB: Begin Processing ***** ,item ***** (sequenced) on line ...
-LDB: ..... Change \UseInstanceName because of `<item':
-LDB: .......... itemize -> item
-LDB: ..... Change \l_xtemplate_type_tl because of `<item':
-LDB: .......... list -> listitem
-LDB: 
-LDB: End Processing ***** ,item ***** on line ...
-LDB: 
-LDB: End Processing ***** list,itemize ***** (sequenced) on line ...
-LDB: 
-LDB: End Processing ***** ,item ***** (sequenced) on line ...
-LDB: 
-LDB: End Processing ***** ,item ***** (sequenced) on line ...
-LDB: 
-LDB: End Processing ***** list,itemize ***** (sequenced) on line ...
-LDB: 
-LDB: Begin Processing ***** list,itemize ***** (sequenced) on line ...
-LDB: ..... Change \UseInstanceName because of `<itemize':
-LDB: .......... item -> itemize
-LDB: ..... Change \l_xtemplate_type_tl because of `<itemize':
-LDB: .......... listitem -> list
-LDB: ..... Execute function because of `<list*<list':
-LDB: ......=>.. \UseInstanceValues  {left-margin=20pt}
-LDB: ..... Execute function because of `<list*<itemize':
-LDB: ......=>.. \UseInstanceValues  {item-label-text=\textbf {--}, make-label=\h
-ss \llap {##1},text-font=\itshape }
-LDB: ..... Execute function because of `itemize><itemize':
-LDB: ......=>.. \UseInstanceValues  {item-label-text=(cont.)}
-LDB: 
-LDB: Begin Processing ***** ,item ***** (sequenced) on line ...
-LDB: ..... Change \UseInstanceName because of `<item':
-LDB: .......... itemize -> item
-LDB: ..... Change \l_xtemplate_type_tl because of `<item':
-LDB: .......... list -> listitem
-LDB: 
-LDB: End Processing ***** ,item ***** on line ...
-LDB: 
-LDB: Begin Processing ***** ,item ***** (sequenced) on line ...
-LDB: ..... Change \UseInstanceName because of `<item':
-LDB: .......... itemize -> item
-LDB: ..... Change \l_xtemplate_type_tl because of `<item':
-LDB: .......... list -> listitem
-LDB: 
-LDB: End Processing ***** ,item ***** on line ...
-LDB: 
-LDB: End Processing ***** list,itemize ***** (sequenced) on line ...
-LDB: 
-LDB: Begin Processing ***** list,itemize ***** on line ...
-LDB: ..... Change \UseInstanceName because of `<itemize':
-LDB: .......... item -> itemize
-LDB: ..... Change \l_xtemplate_type_tl because of `<itemize':
-LDB: .......... listitem -> list
-LDB: ..... Execute function because of `<list*<list':
-LDB: ......=>.. \UseInstanceValues  {left-margin=20pt}
-LDB: ..... Execute function because of `<list*<itemize':
-LDB: ......=>.. \UseInstanceValues  {item-label-text=\textbf {--}, make-label=\h
-ss \llap {##1},text-font=\itshape }
-LDB: 
-LDB: Begin Processing ***** ,item ***** (sequenced) on line ...
-LDB: ..... Change \UseInstanceName because of `<item':
-LDB: .......... itemize -> item
-LDB: ..... Change \l_xtemplate_type_tl because of `<item':
-LDB: .......... list -> listitem
-LDB: 
-LDB: End Processing ***** ,item ***** on line ...
-LDB: 
-LDB: Begin Processing ***** ,item ***** (sequenced) on line ...
-LDB: ..... Change \UseInstanceName because of `<item':
-LDB: .......... itemize -> item
-LDB: ..... Change \l_xtemplate_type_tl because of `<item':
-LDB: .......... list -> listitem
-LDB: 
-LDB: End Processing ***** ,item ***** on line ...
-LDB: 
-LDB: End Processing ***** list,itemize ***** (sequenced) on line ...
-LDB: 
-LDB: End Processing ***** ,item ***** (sequenced) on line ...
-LDB: 
-LDB: Begin Processing ***** ,item ***** (sequenced) on line ...
-LDB: ..... Change \UseInstanceName because of `<item':
-LDB: .......... itemize -> item
-LDB: ..... Change \l_xtemplate_type_tl because of `<item':
-LDB: .......... list -> listitem
-LDB: 
-LDB: End Processing ***** ,item ***** on line ...
-LDB: 
-LDB: End Processing ***** list,itemize ***** (sequenced) on line ...

Modified: trunk/l3trial/l3ldb/testfiles/m3ldb003.ptex.tlg
===================================================================
--- trunk/l3trial/l3ldb/testfiles/m3ldb003.ptex.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3trial/l3ldb/testfiles/m3ldb003.ptex.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -36,23 +36,16 @@
 LDB: Set \UseInstanceValues with value left-margin=20pt in <list*<list
 LDB: Set \UseInstanceValues with value left-margin=10pt in <list*<list*<list
 LDB: Set \UseInstanceValues with value left-margin=70pt in <list*<list*<itemize
-LDB: Set \UseInstanceValues with value item-label-text=\textbf {--}, make-label
-=\hss \llap {##1},text-font=\itshape  in <list*<itemize
-LDB: Set \UseInstanceValues with value item-label-text=\textbullet , text-font=
-\sffamily \slshape  in <list*<list*<itemize
-LDB: Set \UseInstanceValues with value item-label-text=??, text-font=\footnotes
-ize \sffamily \slshape  in <list*<list*<list*<itemize
-LDB: Set \UseInstanceValues with value item-label-text=\alph {enumi}) in <enume
-rate*<enumerate
-LDB: Set \UseInstanceName with value itemize in <enumerate*<enumerate*<enumerat
-e
-LDB: Set \UseInstanceValues with value item-label-text=\fbox {x} in <enumerate*
-<enumerate*<enumerate
-LDB: Set \UseInstanceValues with value item-label-text=(cont.) in itemize><item
-ize
+LDB: Set \UseInstanceValues with value item-label-text=\textbf {--}, make-label=\hss \llap {##1},text-font=\itshape  in <list*<itemize
+LDB: Set \UseInstanceValues with value item-label-text=\textbullet , text-font=\sffamily \slshape  in <list*<list*<itemize
+LDB: Set \UseInstanceValues with value item-label-text=??, text-font=\footnotesize \sffamily \slshape  in <list*<list*<list*<itemize
+LDB: Set \UseInstanceValues with value item-label-text=\alph {enumi}) in <enumerate*<enumerate
+LDB: Set \UseInstanceName with value itemize in <enumerate*<enumerate*<enumerate
+LDB: Set \UseInstanceValues with value item-label-text=\fbox {x} in <enumerate*<enumerate*<enumerate
+LDB: Set \UseInstanceValues with value item-label-text=(cont.) in itemize><itemize
 Dumping commands into (.dmp)
 \c_cs_dump_iow=\write3
- commands . . . . . . . . . . . . . . . . . . . . .  registers  finished
+commands . . . . . . . . . . . . . . . . . . . . .  registers  finished
 LDB: 
 LDB: Begin Processing ***** list,itemize ***** on line ...
 LDB: ..... Change \UseInstanceName because of `<itemize':
@@ -139,8 +132,7 @@
 LDB: .......... item -> enumerate
 LDB: ..... Change \l_xtemplate_type_tl because of `<enumerate':
 LDB: .......... listitem -> list
-LDB: ..... Change \UseInstanceName because of `<enumerate*<enumerate*<enumerate
-':
+LDB: ..... Change \UseInstanceName because of `<enumerate*<enumerate*<enumerate':
 LDB: .......... enumerate -> itemize
 LDB: ..... Execute function because of `<list*<list':
 LDB: ......=>.. \UseInstanceValues  {left-margin=20pt}
@@ -193,8 +185,7 @@
 LDB: ..... Execute function because of `<list*<list':
 LDB: ......=>.. \UseInstanceValues  {left-margin=20pt}
 LDB: ..... Execute function because of `<list*<itemize':
-LDB: ......=>.. \UseInstanceValues  {item-label-text=\textbf {--}, make-label=\
-hss \llap {##1},text-font=\itshape }
+LDB: ......=>.. \UseInstanceValues  {item-label-text=\textbf {--}, make-label=\hss \llap {##1},text-font=\itshape }
 LaTeX Font Warning: Font shape `JT1/mc/m/it' undefined
 (Font)              using `JT1/mc/m/n' instead on input line ....
 LaTeX Font Warning: Font shape `JY1/mc/m/it' undefined
@@ -240,16 +231,13 @@
 LDB: ..... Execute function because of `<list*<list*<list':
 LDB: ......=>.. \UseInstanceValues  {left-margin=10pt}
 LDB: ..... Execute function because of `<list*<itemize':
-LDB: ......=>.. \UseInstanceValues  {item-label-text=\textbf {--}, make-label=\
-hss \llap {##1},text-font=\itshape }
+LDB: ......=>.. \UseInstanceValues  {item-label-text=\textbf {--}, make-label=\hss \llap {##1},text-font=\itshape }
 LDB: ..... Execute function because of `<list*<list*<itemize':
 LDB: ......=>.. \UseInstanceValues  {left-margin=70pt}
 LDB: ..... Execute function because of `<list*<list*<itemize':
-LDB: ......=>.. \UseInstanceValues  {item-label-text=\textbullet , text-font=\s
-ffamily \slshape }
+LDB: ......=>.. \UseInstanceValues  {item-label-text=\textbullet , text-font=\sffamily \slshape }
 LDB: ..... Execute function because of `<list*<list*<list*<itemize':
-LDB: ......=>.. \UseInstanceValues  {item-label-text=??, text-font=\footnotesiz
-e \sffamily \slshape }
+LDB: ......=>.. \UseInstanceValues  {item-label-text=??, text-font=\footnotesize \sffamily \slshape }
 LaTeX Font Warning: Font shape `JT1/mc/m/sl' undefined
 (Font)              using `JT1/mc/m/n' instead on input line ....
 LaTeX Font Warning: Font shape `JY1/mc/m/sl' undefined
@@ -305,13 +293,11 @@
 LDB: ..... Execute function because of `<list*<list*<list':
 LDB: ......=>.. \UseInstanceValues  {left-margin=10pt}
 LDB: ..... Execute function because of `<list*<itemize':
-LDB: ......=>.. \UseInstanceValues  {item-label-text=\textbf {--}, make-label=\
-hss \llap {##1},text-font=\itshape }
+LDB: ......=>.. \UseInstanceValues  {item-label-text=\textbf {--}, make-label=\hss \llap {##1},text-font=\itshape }
 LDB: ..... Execute function because of `<list*<list*<itemize':
 LDB: ......=>.. \UseInstanceValues  {left-margin=70pt}
 LDB: ..... Execute function because of `<list*<list*<itemize':
-LDB: ......=>.. \UseInstanceValues  {item-label-text=\textbullet , text-font=\s
-ffamily \slshape }
+LDB: ......=>.. \UseInstanceValues  {item-label-text=\textbullet , text-font=\sffamily \slshape }
 LaTeX Font Warning: Font shape `OT1/cmss/m/it' in size <10> not available
 (Font)              Font shape `OT1/cmss/m/sl' tried instead on input line ....
 LDB: 
@@ -320,8 +306,7 @@
 LDB: .......... itemize -> item
 LDB: ..... Change \l_xtemplate_type_tl because of `<item':
 LDB: .......... list -> listitem
-LaTeX Font Info:    Try loading font information for OMS+cmss on input line ...
-.
+LaTeX Font Info:    Try loading font information for OMS+cmss on input line ....
 LaTeX Font Info:    No file OMScmss.fd. on input line ....
 LaTeX Font Warning: Font shape `OMS/cmss/m/sl' undefined
 (Font)              using `OMS/cmsy/m/n' instead
@@ -353,8 +338,7 @@
 LDB: ..... Execute function because of `<list*<list':
 LDB: ......=>.. \UseInstanceValues  {left-margin=20pt}
 LDB: ..... Execute function because of `<list*<itemize':
-LDB: ......=>.. \UseInstanceValues  {item-label-text=\textbf {--}, make-label=\
-hss \llap {##1},text-font=\itshape }
+LDB: ......=>.. \UseInstanceValues  {item-label-text=\textbf {--}, make-label=\hss \llap {##1},text-font=\itshape }
 LDB: ..... Execute function because of `itemize><itemize':
 LDB: ......=>.. \UseInstanceValues  {item-label-text=(cont.)}
 LDB: 
@@ -384,8 +368,7 @@
 LDB: ..... Execute function because of `<list*<list':
 LDB: ......=>.. \UseInstanceValues  {left-margin=20pt}
 LDB: ..... Execute function because of `<list*<itemize':
-LDB: ......=>.. \UseInstanceValues  {item-label-text=\textbf {--}, make-label=\
-hss \llap {##1},text-font=\itshape }
+LDB: ......=>.. \UseInstanceValues  {item-label-text=\textbf {--}, make-label=\hss \llap {##1},text-font=\itshape }
 LDB: 
 LDB: Begin Processing ***** ,item ***** (sequenced) on line ...
 LDB: ..... Change \UseInstanceName because of `<item':

Modified: trunk/l3trial/l3ldb/testfiles/m3ldb003.tlg
===================================================================
--- trunk/l3trial/l3ldb/testfiles/m3ldb003.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3trial/l3ldb/testfiles/m3ldb003.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -36,23 +36,16 @@
 LDB: Set \UseInstanceValues with value left-margin=20pt in <list*<list
 LDB: Set \UseInstanceValues with value left-margin=10pt in <list*<list*<list
 LDB: Set \UseInstanceValues with value left-margin=70pt in <list*<list*<itemize
-LDB: Set \UseInstanceValues with value item-label-text=\textbf {--}, make-label
-=\hss \llap {##1},text-font=\itshape  in <list*<itemize
-LDB: Set \UseInstanceValues with value item-label-text=\textbullet , text-font=
-\sffamily \slshape  in <list*<list*<itemize
-LDB: Set \UseInstanceValues with value item-label-text=??, text-font=\footnotes
-ize \sffamily \slshape  in <list*<list*<list*<itemize
-LDB: Set \UseInstanceValues with value item-label-text=\alph {enumi}) in <enume
-rate*<enumerate
-LDB: Set \UseInstanceName with value itemize in <enumerate*<enumerate*<enumerat
-e
-LDB: Set \UseInstanceValues with value item-label-text=\fbox {x} in <enumerate*
-<enumerate*<enumerate
-LDB: Set \UseInstanceValues with value item-label-text=(cont.) in itemize><item
-ize
+LDB: Set \UseInstanceValues with value item-label-text=\textbf {--}, make-label=\hss \llap {##1},text-font=\itshape  in <list*<itemize
+LDB: Set \UseInstanceValues with value item-label-text=\textbullet , text-font=\sffamily \slshape  in <list*<list*<itemize
+LDB: Set \UseInstanceValues with value item-label-text=??, text-font=\footnotesize \sffamily \slshape  in <list*<list*<list*<itemize
+LDB: Set \UseInstanceValues with value item-label-text=\alph {enumi}) in <enumerate*<enumerate
+LDB: Set \UseInstanceName with value itemize in <enumerate*<enumerate*<enumerate
+LDB: Set \UseInstanceValues with value item-label-text=\fbox {x} in <enumerate*<enumerate*<enumerate
+LDB: Set \UseInstanceValues with value item-label-text=(cont.) in itemize><itemize
 Dumping commands into (.dmp)
 \c_cs_dump_iow=\write3
- commands . . . . . . . . . . . . . . . . . . . . .  registers  finished
+commands . . . . . . . . . . . . . . . . . . . . .  registers  finished
 LDB: 
 LDB: Begin Processing ***** list,itemize ***** on line ...
 LDB: ..... Change \UseInstanceName because of `<itemize':
@@ -139,8 +132,7 @@
 LDB: .......... item -> enumerate
 LDB: ..... Change \l_xtemplate_type_tl because of `<enumerate':
 LDB: .......... listitem -> list
-LDB: ..... Change \UseInstanceName because of `<enumerate*<enumerate*<enumerate
-':
+LDB: ..... Change \UseInstanceName because of `<enumerate*<enumerate*<enumerate':
 LDB: .......... enumerate -> itemize
 LDB: ..... Execute function because of `<list*<list':
 LDB: ......=>.. \UseInstanceValues  {left-margin=20pt}
@@ -193,8 +185,7 @@
 LDB: ..... Execute function because of `<list*<list':
 LDB: ......=>.. \UseInstanceValues  {left-margin=20pt}
 LDB: ..... Execute function because of `<list*<itemize':
-LDB: ......=>.. \UseInstanceValues  {item-label-text=\textbf {--}, make-label=\
-hss \llap {##1},text-font=\itshape }
+LDB: ......=>.. \UseInstanceValues  {item-label-text=\textbf {--}, make-label=\hss \llap {##1},text-font=\itshape }
 LDB: 
 LDB: Begin Processing ***** ,item ***** (sequenced) on line ...
 LDB: ..... Change \UseInstanceName because of `<item':
@@ -228,16 +219,13 @@
 LDB: ..... Execute function because of `<list*<list*<list':
 LDB: ......=>.. \UseInstanceValues  {left-margin=10pt}
 LDB: ..... Execute function because of `<list*<itemize':
-LDB: ......=>.. \UseInstanceValues  {item-label-text=\textbf {--}, make-label=\
-hss \llap {##1},text-font=\itshape }
+LDB: ......=>.. \UseInstanceValues  {item-label-text=\textbf {--}, make-label=\hss \llap {##1},text-font=\itshape }
 LDB: ..... Execute function because of `<list*<list*<itemize':
 LDB: ......=>.. \UseInstanceValues  {left-margin=70pt}
 LDB: ..... Execute function because of `<list*<list*<itemize':
-LDB: ......=>.. \UseInstanceValues  {item-label-text=\textbullet , text-font=\s
-ffamily \slshape }
+LDB: ......=>.. \UseInstanceValues  {item-label-text=\textbullet , text-font=\sffamily \slshape }
 LDB: ..... Execute function because of `<list*<list*<list*<itemize':
-LDB: ......=>.. \UseInstanceValues  {item-label-text=??, text-font=\footnotesiz
-e \sffamily \slshape }
+LDB: ......=>.. \UseInstanceValues  {item-label-text=??, text-font=\footnotesize \sffamily \slshape }
 LDB: 
 LDB: Begin Processing ***** ,item ***** (sequenced) on line ...
 LDB: ..... Change \UseInstanceName because of `<item':
@@ -285,13 +273,11 @@
 LDB: ..... Execute function because of `<list*<list*<list':
 LDB: ......=>.. \UseInstanceValues  {left-margin=10pt}
 LDB: ..... Execute function because of `<list*<itemize':
-LDB: ......=>.. \UseInstanceValues  {item-label-text=\textbf {--}, make-label=\
-hss \llap {##1},text-font=\itshape }
+LDB: ......=>.. \UseInstanceValues  {item-label-text=\textbf {--}, make-label=\hss \llap {##1},text-font=\itshape }
 LDB: ..... Execute function because of `<list*<list*<itemize':
 LDB: ......=>.. \UseInstanceValues  {left-margin=70pt}
 LDB: ..... Execute function because of `<list*<list*<itemize':
-LDB: ......=>.. \UseInstanceValues  {item-label-text=\textbullet , text-font=\s
-ffamily \slshape }
+LDB: ......=>.. \UseInstanceValues  {item-label-text=\textbullet , text-font=\sffamily \slshape }
 LaTeX Font Warning: Font shape `OT1/cmss/m/it' in size <10> not available
 (Font)              Font shape `OT1/cmss/m/sl' tried instead on input line ....
 LDB: 
@@ -300,8 +286,7 @@
 LDB: .......... itemize -> item
 LDB: ..... Change \l_xtemplate_type_tl because of `<item':
 LDB: .......... list -> listitem
-LaTeX Font Info:    Try loading font information for OMS+cmss on input line ...
-.
+LaTeX Font Info:    Try loading font information for OMS+cmss on input line ....
 LaTeX Font Info:    No file OMScmss.fd. on input line ....
 LaTeX Font Warning: Font shape `OMS/cmss/m/sl' undefined
 (Font)              using `OMS/cmsy/m/n' instead
@@ -333,8 +318,7 @@
 LDB: ..... Execute function because of `<list*<list':
 LDB: ......=>.. \UseInstanceValues  {left-margin=20pt}
 LDB: ..... Execute function because of `<list*<itemize':
-LDB: ......=>.. \UseInstanceValues  {item-label-text=\textbf {--}, make-label=\
-hss \llap {##1},text-font=\itshape }
+LDB: ......=>.. \UseInstanceValues  {item-label-text=\textbf {--}, make-label=\hss \llap {##1},text-font=\itshape }
 LDB: ..... Execute function because of `itemize><itemize':
 LDB: ......=>.. \UseInstanceValues  {item-label-text=(cont.)}
 LDB: 
@@ -364,8 +348,7 @@
 LDB: ..... Execute function because of `<list*<list':
 LDB: ......=>.. \UseInstanceValues  {left-margin=20pt}
 LDB: ..... Execute function because of `<list*<itemize':
-LDB: ......=>.. \UseInstanceValues  {item-label-text=\textbf {--}, make-label=\
-hss \llap {##1},text-font=\itshape }
+LDB: ......=>.. \UseInstanceValues  {item-label-text=\textbf {--}, make-label=\hss \llap {##1},text-font=\itshape }
 LDB: 
 LDB: Begin Processing ***** ,item ***** (sequenced) on line ...
 LDB: ..... Change \UseInstanceName because of `<item':

Modified: trunk/l3trial/l3ldb/testfiles/m3ldb003.uptex.tlg
===================================================================
--- trunk/l3trial/l3ldb/testfiles/m3ldb003.uptex.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3trial/l3ldb/testfiles/m3ldb003.uptex.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -36,23 +36,16 @@
 LDB: Set \UseInstanceValues with value left-margin=20pt in <list*<list
 LDB: Set \UseInstanceValues with value left-margin=10pt in <list*<list*<list
 LDB: Set \UseInstanceValues with value left-margin=70pt in <list*<list*<itemize
-LDB: Set \UseInstanceValues with value item-label-text=\textbf {--}, make-label
-=\hss \llap {##1},text-font=\itshape  in <list*<itemize
-LDB: Set \UseInstanceValues with value item-label-text=\textbullet , text-font=
-\sffamily \slshape  in <list*<list*<itemize
-LDB: Set \UseInstanceValues with value item-label-text=??, text-font=\footnotes
-ize \sffamily \slshape  in <list*<list*<list*<itemize
-LDB: Set \UseInstanceValues with value item-label-text=\alph {enumi}) in <enume
-rate*<enumerate
-LDB: Set \UseInstanceName with value itemize in <enumerate*<enumerate*<enumerat
-e
-LDB: Set \UseInstanceValues with value item-label-text=\fbox {x} in <enumerate*
-<enumerate*<enumerate
-LDB: Set \UseInstanceValues with value item-label-text=(cont.) in itemize><item
-ize
+LDB: Set \UseInstanceValues with value item-label-text=\textbf {--}, make-label=\hss \llap {##1},text-font=\itshape  in <list*<itemize
+LDB: Set \UseInstanceValues with value item-label-text=\textbullet , text-font=\sffamily \slshape  in <list*<list*<itemize
+LDB: Set \UseInstanceValues with value item-label-text=??, text-font=\footnotesize \sffamily \slshape  in <list*<list*<list*<itemize
+LDB: Set \UseInstanceValues with value item-label-text=\alph {enumi}) in <enumerate*<enumerate
+LDB: Set \UseInstanceName with value itemize in <enumerate*<enumerate*<enumerate
+LDB: Set \UseInstanceValues with value item-label-text=\fbox {x} in <enumerate*<enumerate*<enumerate
+LDB: Set \UseInstanceValues with value item-label-text=(cont.) in itemize><itemize
 Dumping commands into (.dmp)
 \c_cs_dump_iow=\write3
- commands . . . . . . . . . . . . . . . . . . . . .  registers  finished
+commands . . . . . . . . . . . . . . . . . . . . .  registers  finished
 LDB: 
 LDB: Begin Processing ***** list,itemize ***** on line ...
 LDB: ..... Change \UseInstanceName because of `<itemize':
@@ -139,8 +132,7 @@
 LDB: .......... item -> enumerate
 LDB: ..... Change \l_xtemplate_type_tl because of `<enumerate':
 LDB: .......... listitem -> list
-LDB: ..... Change \UseInstanceName because of `<enumerate*<enumerate*<enumerate
-':
+LDB: ..... Change \UseInstanceName because of `<enumerate*<enumerate*<enumerate':
 LDB: .......... enumerate -> itemize
 LDB: ..... Execute function because of `<list*<list':
 LDB: ......=>.. \UseInstanceValues  {left-margin=20pt}
@@ -193,8 +185,7 @@
 LDB: ..... Execute function because of `<list*<list':
 LDB: ......=>.. \UseInstanceValues  {left-margin=20pt}
 LDB: ..... Execute function because of `<list*<itemize':
-LDB: ......=>.. \UseInstanceValues  {item-label-text=\textbf {--}, make-label=\
-hss \llap {##1},text-font=\itshape }
+LDB: ......=>.. \UseInstanceValues  {item-label-text=\textbf {--}, make-label=\hss \llap {##1},text-font=\itshape }
 LaTeX Font Warning: Font shape `JT2/mc/m/it' undefined
 (Font)              using `JT2/mc/m/n' instead on input line ....
 LaTeX Font Warning: Font shape `JY2/mc/m/it' undefined
@@ -244,16 +235,13 @@
 LDB: ..... Execute function because of `<list*<list*<list':
 LDB: ......=>.. \UseInstanceValues  {left-margin=10pt}
 LDB: ..... Execute function because of `<list*<itemize':
-LDB: ......=>.. \UseInstanceValues  {item-label-text=\textbf {--}, make-label=\
-hss \llap {##1},text-font=\itshape }
+LDB: ......=>.. \UseInstanceValues  {item-label-text=\textbf {--}, make-label=\hss \llap {##1},text-font=\itshape }
 LDB: ..... Execute function because of `<list*<list*<itemize':
 LDB: ......=>.. \UseInstanceValues  {left-margin=70pt}
 LDB: ..... Execute function because of `<list*<list*<itemize':
-LDB: ......=>.. \UseInstanceValues  {item-label-text=\textbullet , text-font=\s
-ffamily \slshape }
+LDB: ......=>.. \UseInstanceValues  {item-label-text=\textbullet , text-font=\sffamily \slshape }
 LDB: ..... Execute function because of `<list*<list*<list*<itemize':
-LDB: ......=>.. \UseInstanceValues  {item-label-text=??, text-font=\footnotesiz
-e \sffamily \slshape }
+LDB: ......=>.. \UseInstanceValues  {item-label-text=??, text-font=\footnotesize \sffamily \slshape }
 LaTeX Font Info:    Font shape `JT2/mc/m/n' will be
 (Font)              scaled to size 7.69775pt on input line ....
 LaTeX Font Info:    Font shape `JY2/mc/m/n' will be
@@ -317,13 +305,11 @@
 LDB: ..... Execute function because of `<list*<list*<list':
 LDB: ......=>.. \UseInstanceValues  {left-margin=10pt}
 LDB: ..... Execute function because of `<list*<itemize':
-LDB: ......=>.. \UseInstanceValues  {item-label-text=\textbf {--}, make-label=\
-hss \llap {##1},text-font=\itshape }
+LDB: ......=>.. \UseInstanceValues  {item-label-text=\textbf {--}, make-label=\hss \llap {##1},text-font=\itshape }
 LDB: ..... Execute function because of `<list*<list*<itemize':
 LDB: ......=>.. \UseInstanceValues  {left-margin=70pt}
 LDB: ..... Execute function because of `<list*<list*<itemize':
-LDB: ......=>.. \UseInstanceValues  {item-label-text=\textbullet , text-font=\s
-ffamily \slshape }
+LDB: ......=>.. \UseInstanceValues  {item-label-text=\textbullet , text-font=\sffamily \slshape }
 LaTeX Font Info:    Font shape `JT2/mc/m/it' will be
 (Font)              scaled to size 9.6222pt on input line ....
 LaTeX Font Info:    Font shape `JY2/mc/m/it' will be
@@ -340,8 +326,7 @@
 LDB: .......... itemize -> item
 LDB: ..... Change \l_xtemplate_type_tl because of `<item':
 LDB: .......... list -> listitem
-LaTeX Font Info:    Try loading font information for OMS+cmss on input line ...
-.
+LaTeX Font Info:    Try loading font information for OMS+cmss on input line ....
 LaTeX Font Info:    No file OMScmss.fd. on input line ....
 LaTeX Font Warning: Font shape `OMS/cmss/m/sl' undefined
 (Font)              using `OMS/cmsy/m/n' instead
@@ -373,8 +358,7 @@
 LDB: ..... Execute function because of `<list*<list':
 LDB: ......=>.. \UseInstanceValues  {left-margin=20pt}
 LDB: ..... Execute function because of `<list*<itemize':
-LDB: ......=>.. \UseInstanceValues  {item-label-text=\textbf {--}, make-label=\
-hss \llap {##1},text-font=\itshape }
+LDB: ......=>.. \UseInstanceValues  {item-label-text=\textbf {--}, make-label=\hss \llap {##1},text-font=\itshape }
 LDB: ..... Execute function because of `itemize><itemize':
 LDB: ......=>.. \UseInstanceValues  {item-label-text=(cont.)}
 LDB: 
@@ -404,8 +388,7 @@
 LDB: ..... Execute function because of `<list*<list':
 LDB: ......=>.. \UseInstanceValues  {left-margin=20pt}
 LDB: ..... Execute function because of `<list*<itemize':
-LDB: ......=>.. \UseInstanceValues  {item-label-text=\textbf {--}, make-label=\
-hss \llap {##1},text-font=\itshape }
+LDB: ......=>.. \UseInstanceValues  {item-label-text=\textbf {--}, make-label=\hss \llap {##1},text-font=\itshape }
 LDB: 
 LDB: Begin Processing ***** ,item ***** (sequenced) on line ...
 LDB: ..... Change \UseInstanceName because of `<item':

Modified: trunk/l3trial/xbox/testfiles/xbox001.luatex.tlg
===================================================================
--- trunk/l3trial/xbox/testfiles/xbox001.luatex.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3trial/xbox/testfiles/xbox001.luatex.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -24,17 +24,17 @@
 \myboxa=\box72
 > \myboxa=\char"48.
 <argument> \newsavebox {\myboxa }\show \myboxa 
-                                    \begingroup \newsavebox {\myboxb }\show \my
+\begingroup \newsavebox {\myboxb }\show \my
 l. ...  }
 Defining \myboxb on line ...
 \myboxb=\box73
 > \myboxb=\char"49.
 <argument> ...begingroup \newsavebox {\myboxb }\show \myboxb 
-                                                  \endgroup \show \myboxb \n...
+\endgroup \show \myboxb \n...
 l. ...  }
 > \myboxb=\char"49.
 <argument> ...\myboxb }\show \myboxb \endgroup \show \myboxb 
-                                                  \newsavebox {\myboxa }\sho...
+\newsavebox {\myboxa }\sho...
 l. ...  }
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !

Modified: trunk/l3trial/xbox/testfiles/xbox001.ptex.tlg
===================================================================
--- trunk/l3trial/xbox/testfiles/xbox001.ptex.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3trial/xbox/testfiles/xbox001.ptex.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -24,17 +24,17 @@
 \myboxa=\box72
 > \myboxa=\char"48.
 <argument> \newsavebox {\myboxa }\show \myboxa 
-                                               \begingroup \newsavebox {\myb...
+\begingroup \newsavebox {\myb...
 l. ...  }
 Defining \myboxb on line ...
 \myboxb=\box73
 > \myboxb=\char"49.
 <argument> ...\newsavebox {\myboxb }\show \myboxb 
-                                                  \endgroup \show \myboxb \n...
+\endgroup \show \myboxb \n...
 l. ...  }
 > \myboxb=\char"49.
 <argument> ...how \myboxb \endgroup \show \myboxb 
-                                                  \newsavebox {\myboxa }\sho...
+\newsavebox {\myboxa }\sho...
 l. ...  }
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !

Modified: trunk/l3trial/xbox/testfiles/xbox001.tlg
===================================================================
--- trunk/l3trial/xbox/testfiles/xbox001.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3trial/xbox/testfiles/xbox001.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -24,17 +24,17 @@
 \myboxa=\box72
 > \myboxa=\char"48.
 <argument> \newsavebox {\myboxa }\show \myboxa 
-                                               \begingroup \newsavebox {\myb...
+\begingroup \newsavebox {\myb...
 l. ...  }
 Defining \myboxb on line ...
 \myboxb=\box73
 > \myboxb=\char"49.
 <argument> ...\newsavebox {\myboxb }\show \myboxb 
-                                                  \endgroup \show \myboxb \n...
+\endgroup \show \myboxb \n...
 l. ...  }
 > \myboxb=\char"49.
 <argument> ...how \myboxb \endgroup \show \myboxb 
-                                                  \newsavebox {\myboxa }\sho...
+\newsavebox {\myboxa }\sho...
 l. ...  }
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !

Modified: trunk/l3trial/xbox/testfiles/xbox001.uptex.tlg
===================================================================
--- trunk/l3trial/xbox/testfiles/xbox001.uptex.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3trial/xbox/testfiles/xbox001.uptex.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -24,17 +24,17 @@
 \myboxa=\box72
 > \myboxa=\char"48.
 <argument> \newsavebox {\myboxa }\show \myboxa 
-                                               \begingroup \newsavebox {\myb...
+\begingroup \newsavebox {\myb...
 l. ...  }
 Defining \myboxb on line ...
 \myboxb=\box73
 > \myboxb=\char"49.
 <argument> ...\newsavebox {\myboxb }\show \myboxb 
-                                                  \endgroup \show \myboxb \n...
+\endgroup \show \myboxb \n...
 l. ...  }
 > \myboxb=\char"49.
 <argument> ...how \myboxb \endgroup \show \myboxb 
-                                                  \newsavebox {\myboxa }\sho...
+\newsavebox {\myboxa }\sho...
 l. ...  }
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !

Modified: trunk/l3trial/xbox/testfiles/xbox001.xetex.tlg
===================================================================
--- trunk/l3trial/xbox/testfiles/xbox001.xetex.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/l3trial/xbox/testfiles/xbox001.xetex.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -24,17 +24,17 @@
 \myboxa=\box72
 > \myboxa=\char"48.
 <argument> \newsavebox {\myboxa }\show \myboxa 
-                                               \begingroup \newsavebox {\myb...
+\begingroup \newsavebox {\myb...
 l. ...  }
 Defining \myboxb on line ...
 \myboxb=\box73
 > \myboxb=\char"49.
 <argument> ...\newsavebox {\myboxb }\show \myboxb 
-                                                  \endgroup \show \myboxb \n...
+\endgroup \show \myboxb \n...
 l. ...  }
 > \myboxb=\char"49.
 <argument> ...how \myboxb \endgroup \show \myboxb 
-                                                  \newsavebox {\myboxa }\sho...
+\newsavebox {\myboxa }\sho...
 l. ...  }
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !

Modified: trunk/xpackages/xor/testfiles/xor001.tlg
===================================================================
--- trunk/xpackages/xor/testfiles/xor001.tlg	2016-01-01 20:37:14 UTC (rev 6352)
+++ trunk/xpackages/xor/testfiles/xor001.tlg	2016-01-02 21:13:11 UTC (rev 6353)
@@ -22,9 +22,7 @@
 : ---\xor_curr_col_block::= 1_1
 : ---\xor_curr_col_block::= 2_1
 : ---Saving column (height) information:
-: ---\g_xor_best_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\in
-t_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt
-}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
+: ---\g_xor_best_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
 : --leaving xor_save_col_hts:N
 : -leaving xor_cols_setup:
 : -entering xor_initialize_flush_data:
@@ -201,7 +199,7 @@
 : -CHECK: Saving output penalty (-10000)
 : -Re-adding forced break(s) for splitting
 : -entering xor_trial_place_float_setup:
- STATS: floats waiting = 0 () on page 2
+STATS: floats waiting = 0 () on page 2
 =======================================================================
 : --flush: tighten placement conditions
 : --BALANCE: g_xor_trial_balance_done_int <- 0
@@ -224,9 +222,7 @@
 : ---\xor_curr_col_block::= 1_1
 : ---\xor_curr_col_block::= 2_1
 : ---Saving column (height) information:
-: ---\g_xor_saved_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\i
-nt_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0p
-t}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
+: ---\g_xor_saved_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
 : --leaving xor_save_col_hts:N
 : --entering xor_OR_trial_grab_balance_setup:
 : ---BALANCE: g_xor_trial_balance_seen_int <- 0
@@ -322,19 +318,15 @@
 : -entering xor_trial_place_float_inner_loop:
 : -leaving xor_trial_place_float_inner_loop:
 : -entering xor_try_next_float:
- STATS: trials = 0
+STATS: trials = 0
 : --entering xor_OR_best_cols_setup:
-: ---XX initial: \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col
-_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim_gset:Nn \g_xor
-_ht_col_2_1_dim {612.0pt}
+: ---XX initial: \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
 : ---entering xor_initialize_page_footins_ftnright:
 : ---leaving xor_initialize_page_footins_ftnright:
 : ---BALANCE: g_xor_trial_balance_seen_int <- 0
 : ---Setting up column heights:
 : ---BALANCE: working on new block
-: ---Setting up column heights: \int_gset:Nn \g_xor_col_1_block_int {1}\int_gse
-t:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim
-_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
+: ---Setting up column heights: \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
 : ---entering xor_OR_best_next_col_setup:
 : ----vsize <- 612.0pt
 : ----ftnspread: page= 2
@@ -488,9 +480,7 @@
 : -----\xor_curr_col_block::= 1_1
 : -----\xor_curr_col_block::= 2_1
 : -----Saving column (height) information:
-: -----\g_xor_best_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\
-int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0
-pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
+: -----\g_xor_best_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
 : ----leaving xor_save_col_hts:N
 : ---leaving xor_cols_setup:
 : ---entering xor_initialize_flush_data:
@@ -603,24 +593,15 @@
 : -CHECK: Saving output penalty (0)
 : -Re-adding forced break(s) for splitting
 Marks: saving state on line ...
-Marks: queue for leftmark before: "\protect \MakeUppercase  {Contents}", "\prot
-ect \MakeUppercase  {1\hskip 1em\relax Introduction}", "\protect \MakeUppercase
-  {2\hskip 1em\relax The document source model}", "\protect \MakeUppercase  {3\
-hskip 1em\relax The document layout model}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {Contents}", "\protect \MakeUppercase  {1\hskip 1em\relax Introduction}", "\protect \MakeUppercase  {2\hskip 1em\relax The document source model}", "\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}", 
 Marks: picking up from output {leftmark=5}{rightmark=9}{floats=2}
 Marks: found 3 entries for leftmark (new 5; old 2)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {Contents}}{\protect \M
-akeUppercase  {1\hskip 1em\relax Introduction}}{\protect \MakeUppercase  {3\hsk
-ip 1em\relax The document layout model}} on line ...
-Marks: queue for leftmark after: "\protect \MakeUppercase  {3\hskip 1em\relax T
-he document layout model}", 
-Marks: queue for rightmark before: "\protect \MakeUppercase  {Contents}", "", "
-", "", "3.1\hskip 1em\relax Page layout grid", "3.2\hskip 1em\relax Columns", "
-3.3\hskip 1em\relax Balanced columns", "3.4\hskip 1em\relax Float areas", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {Contents}}{\protect \MakeUppercase  {1\hskip 1em\relax Introduction}}{\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}", 
+Marks: queue for rightmark before: "\protect \MakeUppercase  {Contents}", "", "", "", "3.1\hskip 1em\relax Page layout grid", "3.2\hskip 1em\relax Columns", "3.3\hskip 1em\relax Balanced columns", "3.4\hskip 1em\relax Float areas", 
 Marks: picking up from output {leftmark=5}{rightmark=9}{floats=2}
 Marks: found 7 entries for rightmark (new 9; old 2)
-Marks: in output: rightmark -> {\protect \MakeUppercase  {Contents}}{}{3.4\hski
-p 1em\relax Float areas} on line ...
+Marks: in output: rightmark -> {\protect \MakeUppercase  {Contents}}{}{3.4\hskip 1em\relax Float areas} on line ...
 Marks: queue for rightmark after: "3.4\hskip 1em\relax Float areas", 
 Marks: queue for floats before: "", "1", 
 Marks: picking up from output {leftmark=5}{rightmark=9}{floats=2}
@@ -628,7 +609,7 @@
 Marks: in output: floats -> {}{1}{1} on line ...
 Marks: queue for floats after: "1", 
 : -entering xor_trial_place_float_setup:
- STATS: floats waiting = 0 () on page 3
+STATS: floats waiting = 0 () on page 3
 =======================================================================
 : --flush: tighten placement conditions
 : --BALANCE: g_xor_trial_balance_done_int <- 0
@@ -653,9 +634,7 @@
 : ---\xor_curr_col_block::= 1_1
 : ---\xor_curr_col_block::= 2_1
 : ---Saving column (height) information:
-: ---\g_xor_saved_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\i
-nt_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0p
-t}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
+: ---\g_xor_saved_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
 : --leaving xor_save_col_hts:N
 : --entering xor_OR_trial_grab_balance_setup:
 : ---BALANCE: g_xor_trial_balance_seen_int <- 0
@@ -748,29 +727,16 @@
 : -grab col: 1 of 2
 : -vsize: 612.0pt; pagegoal: 612.0pt
 : -entering xor_OR_trial_finish_block_or_col:
-Marks: queue for leftmark before: "\protect \MakeUppercase  {Contents}", "\prot
-ect \MakeUppercase  {1\hskip 1em\relax Introduction}", "\protect \MakeUppercase
-  {2\hskip 1em\relax The document source model}", "\protect \MakeUppercase  {3\
-hskip 1em\relax The document layout model}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {Contents}", "\protect \MakeUppercase  {1\hskip 1em\relax Introduction}", "\protect \MakeUppercase  {2\hskip 1em\relax The document source model}", "\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}", 
 Marks: picking up from output {leftmark=3}{rightmark=3}{floats=1}
 Marks: found 1 entries for leftmark (new 3; old 2)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {Contents}}{\protect \M
-akeUppercase  {1\hskip 1em\relax Introduction}}{\protect \MakeUppercase  {1\hsk
-ip 1em\relax Introduction}} on line ...
-Marks: queue for leftmark after: "\protect \MakeUppercase  {1\hskip 1em\relax I
-ntroduction}", "\protect \MakeUppercase  {2\hskip 1em\relax The document source
- model}", "\protect \MakeUppercase  {3\hskip 1em\relax The document layout mode
-l}", 
-Marks: queue for rightmark before: "\protect \MakeUppercase  {Contents}", "", "
-", "", "3.1\hskip 1em\relax Page layout grid", "3.2\hskip 1em\relax Columns", "
-3.3\hskip 1em\relax Balanced columns", "3.4\hskip 1em\relax Float areas", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {Contents}}{\protect \MakeUppercase  {1\hskip 1em\relax Introduction}}{\protect \MakeUppercase  {1\hskip 1em\relax Introduction}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {1\hskip 1em\relax Introduction}", "\protect \MakeUppercase  {2\hskip 1em\relax The document source model}", "\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}", 
+Marks: queue for rightmark before: "\protect \MakeUppercase  {Contents}", "", "", "", "3.1\hskip 1em\relax Page layout grid", "3.2\hskip 1em\relax Columns", "3.3\hskip 1em\relax Balanced columns", "3.4\hskip 1em\relax Float areas", 
 Marks: picking up from output {leftmark=3}{rightmark=3}{floats=1}
 Marks: found 1 entries for rightmark (new 3; old 2)
-Marks: in output: rightmark -> {\protect \MakeUppercase  {Contents}}{}{} on lin
-e 327
-Marks: queue for rightmark after: "", "", "", "3.1\hskip 1em\relax Page layout 
-grid", "3.2\hskip 1em\relax Columns", "3.3\hskip 1em\relax Balanced columns", "
-3.4\hskip 1em\relax Float areas", 
+Marks: in output: rightmark -> {\protect \MakeUppercase  {Contents}}{}{} on line ...
+Marks: queue for rightmark after: "", "", "", "3.1\hskip 1em\relax Page layout grid", "3.2\hskip 1em\relax Columns", "3.3\hskip 1em\relax Balanced columns", "3.4\hskip 1em\relax Float areas", 
 Marks: queue for floats before: "", "1", 
 Marks: picking up from output {leftmark=3}{rightmark=3}{floats=1}
 Marks: found 0 entries for floats (new 1; old 1)
@@ -889,28 +855,16 @@
 : -grab col: 2 of 2
 : -vsize: 612.0pt; pagegoal: 582.73473pt
 : -entering xor_OR_trial_finish_block_or_col:
-Marks: queue for leftmark before: "\protect \MakeUppercase  {1\hskip 1em\relax 
-Introduction}", "\protect \MakeUppercase  {2\hskip 1em\relax The document sourc
-e model}", "\protect \MakeUppercase  {3\hskip 1em\relax The document layout mod
-el}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {1\hskip 1em\relax Introduction}", "\protect \MakeUppercase  {2\hskip 1em\relax The document source model}", "\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}", 
 Marks: picking up from output {leftmark=5}{rightmark=6}{floats=1}
 Marks: found 2 entries for leftmark (new 5; old 3)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {1\hskip 1em\relax Intr
-oduction}}{\protect \MakeUppercase  {2\hskip 1em\relax The document source mode
-l}}{\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}} on 
-line 327
-Marks: queue for leftmark after: "\protect \MakeUppercase  {3\hskip 1em\relax T
-he document layout model}", 
-Marks: queue for rightmark before: "", "", "", "3.1\hskip 1em\relax Page layout
- grid", "3.2\hskip 1em\relax Columns", "3.3\hskip 1em\relax Balanced columns", 
-"3.4\hskip 1em\relax Float areas", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {1\hskip 1em\relax Introduction}}{\protect \MakeUppercase  {2\hskip 1em\relax The document source model}}{\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}", 
+Marks: queue for rightmark before: "", "", "", "3.1\hskip 1em\relax Page layout grid", "3.2\hskip 1em\relax Columns", "3.3\hskip 1em\relax Balanced columns", "3.4\hskip 1em\relax Float areas", 
 Marks: picking up from output {leftmark=5}{rightmark=6}{floats=1}
 Marks: found 3 entries for rightmark (new 6; old 3)
-Marks: in output: rightmark -> {}{}{3.1\hskip 1em\relax Page layout grid} on li
-ne 327
-Marks: queue for rightmark after: "3.1\hskip 1em\relax Page layout grid", "3.2\
-hskip 1em\relax Columns", "3.3\hskip 1em\relax Balanced columns", "3.4\hskip 1e
-m\relax Float areas", 
+Marks: in output: rightmark -> {}{}{3.1\hskip 1em\relax Page layout grid} on line ...
+Marks: queue for rightmark after: "3.1\hskip 1em\relax Page layout grid", "3.2\hskip 1em\relax Columns", "3.3\hskip 1em\relax Balanced columns", "3.4\hskip 1em\relax Float areas", 
 Marks: queue for floats before: "", "1", 
 Marks: picking up from output {leftmark=5}{rightmark=6}{floats=1}
 Marks: found 0 entries for floats (new 1; old 1)
@@ -957,19 +911,15 @@
 : -entering xor_trial_place_float_inner_loop:
 : -leaving xor_trial_place_float_inner_loop:
 : -entering xor_try_next_float:
- STATS: trials = 0
+STATS: trials = 0
 : --entering xor_OR_best_cols_setup:
-: ---XX initial: \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col
-_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim_gset:Nn \g_xor
-_ht_col_2_1_dim {612.0pt}
+: ---XX initial: \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
 : ---entering xor_initialize_page_footins_ftnright:
 : ---leaving xor_initialize_page_footins_ftnright:
 : ---BALANCE: g_xor_trial_balance_seen_int <- 0
 : ---Setting up column heights:
 : ---BALANCE: working on new block
-: ---Setting up column heights: \int_gset:Nn \g_xor_col_1_block_int {1}\int_gse
-t:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim
-_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
+: ---Setting up column heights: \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
 : ---entering xor_OR_best_next_col_setup:
 : ----vsize <- 612.0pt
 : ----ftnspread: page= 3
@@ -1054,29 +1004,16 @@
 : -best col: 1 of 2
 : -vsize: 612.0pt; pagegoal: 612.0pt
 : -entering xor_OR_best_finish_col_or_block:
-Marks: queue for leftmark before: "\protect \MakeUppercase  {Contents}", "\prot
-ect \MakeUppercase  {1\hskip 1em\relax Introduction}", "\protect \MakeUppercase
-  {2\hskip 1em\relax The document source model}", "\protect \MakeUppercase  {3\
-hskip 1em\relax The document layout model}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {Contents}", "\protect \MakeUppercase  {1\hskip 1em\relax Introduction}", "\protect \MakeUppercase  {2\hskip 1em\relax The document source model}", "\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}", 
 Marks: picking up from output {leftmark=3}{rightmark=3}{floats=1}
 Marks: found 1 entries for leftmark (new 3; old 2)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {Contents}}{\protect \M
-akeUppercase  {1\hskip 1em\relax Introduction}}{\protect \MakeUppercase  {1\hsk
-ip 1em\relax Introduction}} on line ...
-Marks: queue for leftmark after: "\protect \MakeUppercase  {1\hskip 1em\relax I
-ntroduction}", "\protect \MakeUppercase  {2\hskip 1em\relax The document source
- model}", "\protect \MakeUppercase  {3\hskip 1em\relax The document layout mode
-l}", 
-Marks: queue for rightmark before: "\protect \MakeUppercase  {Contents}", "", "
-", "", "3.1\hskip 1em\relax Page layout grid", "3.2\hskip 1em\relax Columns", "
-3.3\hskip 1em\relax Balanced columns", "3.4\hskip 1em\relax Float areas", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {Contents}}{\protect \MakeUppercase  {1\hskip 1em\relax Introduction}}{\protect \MakeUppercase  {1\hskip 1em\relax Introduction}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {1\hskip 1em\relax Introduction}", "\protect \MakeUppercase  {2\hskip 1em\relax The document source model}", "\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}", 
+Marks: queue for rightmark before: "\protect \MakeUppercase  {Contents}", "", "", "", "3.1\hskip 1em\relax Page layout grid", "3.2\hskip 1em\relax Columns", "3.3\hskip 1em\relax Balanced columns", "3.4\hskip 1em\relax Float areas", 
 Marks: picking up from output {leftmark=3}{rightmark=3}{floats=1}
 Marks: found 1 entries for rightmark (new 3; old 2)
-Marks: in output: rightmark -> {\protect \MakeUppercase  {Contents}}{}{} on lin
-e 327
-Marks: queue for rightmark after: "", "", "", "3.1\hskip 1em\relax Page layout 
-grid", "3.2\hskip 1em\relax Columns", "3.3\hskip 1em\relax Balanced columns", "
-3.4\hskip 1em\relax Float areas", 
+Marks: in output: rightmark -> {\protect \MakeUppercase  {Contents}}{}{} on line ...
+Marks: queue for rightmark after: "", "", "", "3.1\hskip 1em\relax Page layout grid", "3.2\hskip 1em\relax Columns", "3.3\hskip 1em\relax Balanced columns", "3.4\hskip 1em\relax Float areas", 
 Marks: queue for floats before: "", "1", 
 Marks: picking up from output {leftmark=3}{rightmark=3}{floats=1}
 Marks: found 0 entries for floats (new 1; old 1)
@@ -1198,28 +1135,16 @@
 : -best col: 2 of 2
 : -vsize: 612.0pt; pagegoal: 582.73473pt
 : -entering xor_OR_best_finish_col_or_block:
-Marks: queue for leftmark before: "\protect \MakeUppercase  {1\hskip 1em\relax 
-Introduction}", "\protect \MakeUppercase  {2\hskip 1em\relax The document sourc
-e model}", "\protect \MakeUppercase  {3\hskip 1em\relax The document layout mod
-el}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {1\hskip 1em\relax Introduction}", "\protect \MakeUppercase  {2\hskip 1em\relax The document source model}", "\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}", 
 Marks: picking up from output {leftmark=5}{rightmark=6}{floats=1}
 Marks: found 2 entries for leftmark (new 5; old 3)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {1\hskip 1em\relax Intr
-oduction}}{\protect \MakeUppercase  {2\hskip 1em\relax The document source mode
-l}}{\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}} on 
-line 327
-Marks: queue for leftmark after: "\protect \MakeUppercase  {3\hskip 1em\relax T
-he document layout model}", 
-Marks: queue for rightmark before: "", "", "", "3.1\hskip 1em\relax Page layout
- grid", "3.2\hskip 1em\relax Columns", "3.3\hskip 1em\relax Balanced columns", 
-"3.4\hskip 1em\relax Float areas", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {1\hskip 1em\relax Introduction}}{\protect \MakeUppercase  {2\hskip 1em\relax The document source model}}{\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}", 
+Marks: queue for rightmark before: "", "", "", "3.1\hskip 1em\relax Page layout grid", "3.2\hskip 1em\relax Columns", "3.3\hskip 1em\relax Balanced columns", "3.4\hskip 1em\relax Float areas", 
 Marks: picking up from output {leftmark=5}{rightmark=6}{floats=1}
 Marks: found 3 entries for rightmark (new 6; old 3)
-Marks: in output: rightmark -> {}{}{3.1\hskip 1em\relax Page layout grid} on li
-ne 327
-Marks: queue for rightmark after: "3.1\hskip 1em\relax Page layout grid", "3.2\
-hskip 1em\relax Columns", "3.3\hskip 1em\relax Balanced columns", "3.4\hskip 1e
-m\relax Float areas", 
+Marks: in output: rightmark -> {}{}{3.1\hskip 1em\relax Page layout grid} on line ...
+Marks: queue for rightmark after: "3.1\hskip 1em\relax Page layout grid", "3.2\hskip 1em\relax Columns", "3.3\hskip 1em\relax Balanced columns", "3.4\hskip 1em\relax Float areas", 
 Marks: queue for floats before: "", "1", 
 Marks: picking up from output {leftmark=5}{rightmark=6}{floats=1}
 Marks: found 0 entries for floats (new 1; old 1)
@@ -1316,9 +1241,7 @@
 : -----\xor_curr_col_block::= 1_1
 : -----\xor_curr_col_block::= 2_1
 : -----Saving column (height) information:
-: -----\g_xor_best_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\
-int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0
-pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
+: -----\g_xor_best_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
 : ----leaving xor_save_col_hts:N
 : ---leaving xor_cols_setup:
 : ---entering xor_initialize_flush_data:
@@ -1397,8 +1320,7 @@
 : entering float environment
 Marks: set floats <- 3 on line ...
 Marks: Setting mark {leftmark=5}{rightmark=9}{floats=4}
-: -{Overlapping float areas}{1}{fig:overlap}{3}{t12,b12,t11,b11,t21,b21}{figure
-}{3}
+: -{Overlapping float areas}{1}{fig:overlap}{3}{t12,b12,t11,b11,t21,b21}{figure}{3}
 : leaving float environment
 Marks: set rightmark <- 3.5\hskip 1em\relax Float pages and columns on line ...
 Marks: Setting mark {leftmark=5}{rightmark=10}{floats=4}
@@ -1437,25 +1359,15 @@
 : -CHECK: Saving output penalty (150)
 : -Re-adding forced break(s) for splitting
 Marks: saving state on line ...
-Marks: queue for leftmark before: "\protect \MakeUppercase  {3\hskip 1em\relax 
-The document layout model}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}", 
 Marks: picking up from output {leftmark=5}{rightmark=13}{floats=4}
 Marks: found 0 entries for leftmark (new 5; old 5)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {3\hskip 1em\relax The 
-document layout model}}{\protect \MakeUppercase  {3\hskip 1em\relax The documen
-t layout model}}{\protect \MakeUppercase  {3\hskip 1em\relax The document layou
-t model}} on line ...
-Marks: queue for leftmark after: "\protect \MakeUppercase  {3\hskip 1em\relax T
-he document layout model}", 
-Marks: queue for rightmark before: "3.1\hskip 1em\relax Page layout grid", "3.2
-\hskip 1em\relax Columns", "3.3\hskip 1em\relax Balanced columns", "3.4\hskip 1
-em\relax Float areas", "3.5\hskip 1em\relax Float pages and columns", "3.6\hski
-p 1em\relax Float types", "3.7\hskip 1em\relax Margins", "3.8\hskip 1em\relax F
-ootnotes", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}}{\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}}{\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}", 
+Marks: queue for rightmark before: "3.1\hskip 1em\relax Page layout grid", "3.2\hskip 1em\relax Columns", "3.3\hskip 1em\relax Balanced columns", "3.4\hskip 1em\relax Float areas", "3.5\hskip 1em\relax Float pages and columns", "3.6\hskip 1em\relax Float types", "3.7\hskip 1em\relax Margins", "3.8\hskip 1em\relax Footnotes", 
 Marks: picking up from output {leftmark=5}{rightmark=13}{floats=4}
 Marks: found 7 entries for rightmark (new 13; old 6)
-Marks: in output: rightmark -> {3.1\hskip 1em\relax Page layout grid}{3.2\hskip
- 1em\relax Columns}{3.8\hskip 1em\relax Footnotes} on line ...
+Marks: in output: rightmark -> {3.1\hskip 1em\relax Page layout grid}{3.2\hskip 1em\relax Columns}{3.8\hskip 1em\relax Footnotes} on line ...
 Marks: queue for rightmark after: "3.8\hskip 1em\relax Footnotes", 
 Marks: queue for floats before: "", "1", "2", "3", 
 Marks: picking up from output {leftmark=5}{rightmark=13}{floats=4}
@@ -1463,7 +1375,7 @@
 Marks: in output: floats -> {}{1}{3} on line ...
 Marks: queue for floats after: "3", 
 : -entering xor_trial_place_float_setup:
- STATS: floats waiting = 1 (\bx at C  ) on page 4
+STATS: floats waiting = 1 (\bx at C  ) on page 4
 =======================================================================
 : --flush: tighten placement conditions
 : --BALANCE: g_xor_trial_balance_done_int <- 0
@@ -1488,9 +1400,7 @@
 : ---\xor_curr_col_block::= 1_1
 : ---\xor_curr_col_block::= 2_1
 : ---Saving column (height) information:
-: ---\g_xor_saved_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\i
-nt_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0p
-t}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
+: ---\g_xor_saved_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
 : --leaving xor_save_col_hts:N
 : --entering xor_OR_trial_grab_balance_setup:
 : ---BALANCE: g_xor_trial_balance_seen_int <- 0
@@ -1538,8 +1448,7 @@
 : -grab col: 1 of 2
 : -vsize: 612.0pt; pagegoal: 612.0pt
 : -here penalty (1) reached
-: -g_xor_here_1_required_space_tl <= \pagegoal -\pagetotal  (99.25pt <= 612.0pt
- - 60.0pt = 552.0pt) -> accepting here point
+: -g_xor_here_1_required_space_tl <= \pagegoal -\pagetotal  (99.25pt <= 612.0pt - 60.0pt = 552.0pt) -> accepting here point
 : - at currbox: \bx at A 
 : -Here object structure:
 : - {Testing ``here'' floats}
@@ -1680,36 +1589,23 @@
 : -grab col: 1 of 2
 : -vsize: 612.0pt; pagegoal: 612.0pt
 : -here penalty (2) reached
-: -g_xor_here_2_required_space_tl > \pagegoal -\pagetotal  (99.25pt > 612.0pt -
- 612.0pt = 0.0pt) -> ending column
+: -g_xor_here_2_required_space_tl > \pagegoal -\pagetotal  (99.25pt > 612.0pt - 612.0pt = 0.0pt) -> ending column
 : -entering xor_split_off_last_line_from_clvv:
 : --goal: 612.0pt; total: 612.0pt; shrink: 0.0pt
 : --ht255: 612.0pt; dp255: 2.16492pt
 Underfull \vbox (badness 10000) has occurred while \output is active []
 : -leaving xor_split_off_last_line_from_clvv:
 : -entering xor_OR_trial_finish_block_or_col:
-Marks: queue for leftmark before: "\protect \MakeUppercase  {3\hskip 1em\relax 
-The document layout model}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}", 
 Marks: picking up from output {leftmark=5}{rightmark=9}{floats=3}
 Marks: found 0 entries for leftmark (new 5; old 5)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {3\hskip 1em\relax The 
-document layout model}}{\protect \MakeUppercase  {3\hskip 1em\relax The documen
-t layout model}}{\protect \MakeUppercase  {3\hskip 1em\relax The document layou
-t model}} on line ...
-Marks: queue for leftmark after: "\protect \MakeUppercase  {3\hskip 1em\relax T
-he document layout model}", 
-Marks: queue for rightmark before: "3.1\hskip 1em\relax Page layout grid", "3.2
-\hskip 1em\relax Columns", "3.3\hskip 1em\relax Balanced columns", "3.4\hskip 1
-em\relax Float areas", "3.5\hskip 1em\relax Float pages and columns", "3.6\hski
-p 1em\relax Float types", "3.7\hskip 1em\relax Margins", "3.8\hskip 1em\relax F
-ootnotes", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}}{\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}}{\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}", 
+Marks: queue for rightmark before: "3.1\hskip 1em\relax Page layout grid", "3.2\hskip 1em\relax Columns", "3.3\hskip 1em\relax Balanced columns", "3.4\hskip 1em\relax Float areas", "3.5\hskip 1em\relax Float pages and columns", "3.6\hskip 1em\relax Float types", "3.7\hskip 1em\relax Margins", "3.8\hskip 1em\relax Footnotes", 
 Marks: picking up from output {leftmark=5}{rightmark=9}{floats=3}
 Marks: found 3 entries for rightmark (new 9; old 6)
-Marks: in output: rightmark -> {3.1\hskip 1em\relax Page layout grid}{3.2\hskip
- 1em\relax Columns}{3.4\hskip 1em\relax Float areas} on line ...
-Marks: queue for rightmark after: "3.4\hskip 1em\relax Float areas", "3.5\hskip
- 1em\relax Float pages and columns", "3.6\hskip 1em\relax Float types", "3.7\hs
-kip 1em\relax Margins", "3.8\hskip 1em\relax Footnotes", 
+Marks: in output: rightmark -> {3.1\hskip 1em\relax Page layout grid}{3.2\hskip 1em\relax Columns}{3.4\hskip 1em\relax Float areas} on line ...
+Marks: queue for rightmark after: "3.4\hskip 1em\relax Float areas", "3.5\hskip 1em\relax Float pages and columns", "3.6\hskip 1em\relax Float types", "3.7\hskip 1em\relax Margins", "3.8\hskip 1em\relax Footnotes", 
 Marks: queue for floats before: "", "1", "2", "3", 
 Marks: picking up from output {leftmark=5}{rightmark=9}{floats=3}
 Marks: found 2 entries for floats (new 3; old 1)
@@ -1736,8 +1632,7 @@
 : -grab col: 2 of 2
 : -vsize: 612.0pt; pagegoal: 612.0pt
 : -here penalty (2) reached
-: -g_xor_here_2_required_space_tl <= \pagegoal -\pagetotal  (99.25pt <= 612.0pt
- - 12.0pt = 600.0pt) -> accepting here point
+: -g_xor_here_2_required_space_tl <= \pagegoal -\pagetotal  (99.25pt <= 612.0pt - 12.0pt = 600.0pt) -> accepting here point
 : - at currbox: \bx at B 
 : -Here object structure:
 : - {Testing ``here'' floats number 2}
@@ -1832,25 +1727,16 @@
 : -grab col: 2 of 2
 : -vsize: 612.0pt; pagegoal: 534.4389pt
 : -entering xor_OR_trial_finish_block_or_col:
-Marks: queue for leftmark before: "\protect \MakeUppercase  {3\hskip 1em\relax 
-The document layout model}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}", 
 Marks: picking up from output {leftmark=5}{rightmark=12}{floats=4}
 Marks: found 0 entries for leftmark (new 5; old 5)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {3\hskip 1em\relax The 
-document layout model}}{\protect \MakeUppercase  {3\hskip 1em\relax The documen
-t layout model}}{\protect \MakeUppercase  {3\hskip 1em\relax The document layou
-t model}} on line ...
-Marks: queue for leftmark after: "\protect \MakeUppercase  {3\hskip 1em\relax T
-he document layout model}", 
-Marks: queue for rightmark before: "3.4\hskip 1em\relax Float areas", "3.5\hski
-p 1em\relax Float pages and columns", "3.6\hskip 1em\relax Float types", "3.7\h
-skip 1em\relax Margins", "3.8\hskip 1em\relax Footnotes", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}}{\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}}{\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}", 
+Marks: queue for rightmark before: "3.4\hskip 1em\relax Float areas", "3.5\hskip 1em\relax Float pages and columns", "3.6\hskip 1em\relax Float types", "3.7\hskip 1em\relax Margins", "3.8\hskip 1em\relax Footnotes", 
 Marks: picking up from output {leftmark=5}{rightmark=12}{floats=4}
 Marks: found 3 entries for rightmark (new 12; old 9)
-Marks: in output: rightmark -> {3.4\hskip 1em\relax Float areas}{3.5\hskip 1em\
-relax Float pages and columns}{3.7\hskip 1em\relax Margins} on line ...
-Marks: queue for rightmark after: "3.7\hskip 1em\relax Margins", "3.8\hskip 1em
-\relax Footnotes", 
+Marks: in output: rightmark -> {3.4\hskip 1em\relax Float areas}{3.5\hskip 1em\relax Float pages and columns}{3.7\hskip 1em\relax Margins} on line ...
+Marks: queue for rightmark after: "3.7\hskip 1em\relax Margins", "3.8\hskip 1em\relax Footnotes", 
 Marks: queue for floats before: "2", "3", 
 Marks: picking up from output {leftmark=5}{rightmark=12}{floats=4}
 Marks: found 1 entries for floats (new 4; old 3)
@@ -1900,21 +1786,21 @@
 : -- {3}
 : -- g_xor_this_areas_open_clist <- b12,b11,b21
 : -- g_xor_this_areas_closed_clist <- 
- {3}  {figure} (floats)  {3}   {\g_xor_curr_float_box_tl }
+{3}  {figure} (floats)  {3}   {\g_xor_curr_float_box_tl }
 : --g_xor_saved_this_areas_open_clist (init):  := b12,b11,b21
 : --entering xor_try_this_area_std:
 : ---BALANCE: g_xor_trial_balance_done_int <- 0
 : ---(Re)initializing column heights ...
 : ---area trial: b12
- area trial: b12
+area trial: b12
 : ---span count unsuitable: b12 /= 1
- -> failed: span count b12 /= 1
+-> failed: span count b12 /= 1
 : --leaving xor_try_this_area_std:
 : --entering xor_try_this_area_std:
 : ---BALANCE: g_xor_trial_balance_done_int <- 0
 : ---(Re)initializing column heights ...
 : ---area trial: b11
- area trial: b11
+area trial: b11
 : ---span count okay: b11 = 1
 : ---area not closed for all types: not member of ()
 : ---area open for class floats; not member of ()
@@ -1922,8 +1808,7 @@
 : ----looking at column: 1
 : ----entering xor_construct_and_test_col_ht:nnn
 : -----col height before: 612.0pt (\g_xor_ht_col_1_1_dim)
-: -----first float in any b in column 1: adding \g_xor_float_text_skip=36.0pt m
-inus 8.0pt
+: -----first float in any b in column 1: adding \g_xor_float_text_skip=36.0pt minus 8.0pt
 : -----GRID: grid size used: 12.0pt
 : -----GRID: \g_xor_returned_lower_size_tl=144.0pt
 : -----GRID: \g_xor_returned_lower_delta_size_tl=11.9967pt
@@ -1944,9 +1829,7 @@
 : ----\xor_curr_col_block::= 1_1
 : ----\xor_curr_col_block::= 2_1
 : ----Saving column (height) information:
-: ----\g_xor_saved_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\
-int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {456.0
-pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
+: ----\g_xor_saved_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {456.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
 : ---leaving xor_save_col_hts:N
 : ---entering xor_OR_trial_grab_balance_setup:
 : ----BALANCE: g_xor_trial_balance_seen_int <- 0
@@ -1995,8 +1878,7 @@
 : -grab col: 1 of 2
 : -vsize: 456.0pt; pagegoal: 456.0pt
 : -here penalty (1) reached
-: -g_xor_here_1_required_space_tl <= \pagegoal -\pagetotal  (99.25pt <= 456.0pt
- - 60.0pt = 396.0pt) -> accepting here point
+: -g_xor_here_1_required_space_tl <= \pagegoal -\pagetotal  (99.25pt <= 456.0pt - 60.0pt = 396.0pt) -> accepting here point
 : - at currbox: \bx at A 
 : -Here object structure:
 : - {Testing ``here'' floats}
@@ -2118,28 +2000,16 @@
 : -grab col: 1 of 2
 : -vsize: 456.0pt; pagegoal: 456.0pt
 : -entering xor_OR_trial_finish_block_or_col:
-Marks: queue for leftmark before: "\protect \MakeUppercase  {3\hskip 1em\relax 
-The document layout model}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}", 
 Marks: picking up from output {leftmark=5}{rightmark=9}{floats=2}
 Marks: found 0 entries for leftmark (new 5; old 5)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {3\hskip 1em\relax The 
-document layout model}}{\protect \MakeUppercase  {3\hskip 1em\relax The documen
-t layout model}}{\protect \MakeUppercase  {3\hskip 1em\relax The document layou
-t model}} on line ...
-Marks: queue for leftmark after: "\protect \MakeUppercase  {3\hskip 1em\relax T
-he document layout model}", 
-Marks: queue for rightmark before: "3.1\hskip 1em\relax Page layout grid", "3.2
-\hskip 1em\relax Columns", "3.3\hskip 1em\relax Balanced columns", "3.4\hskip 1
-em\relax Float areas", "3.5\hskip 1em\relax Float pages and columns", "3.6\hski
-p 1em\relax Float types", "3.7\hskip 1em\relax Margins", "3.8\hskip 1em\relax F
-ootnotes", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}}{\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}}{\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}", 
+Marks: queue for rightmark before: "3.1\hskip 1em\relax Page layout grid", "3.2\hskip 1em\relax Columns", "3.3\hskip 1em\relax Balanced columns", "3.4\hskip 1em\relax Float areas", "3.5\hskip 1em\relax Float pages and columns", "3.6\hskip 1em\relax Float types", "3.7\hskip 1em\relax Margins", "3.8\hskip 1em\relax Footnotes", 
 Marks: picking up from output {leftmark=5}{rightmark=9}{floats=2}
 Marks: found 3 entries for rightmark (new 9; old 6)
-Marks: in output: rightmark -> {3.1\hskip 1em\relax Page layout grid}{3.2\hskip
- 1em\relax Columns}{3.4\hskip 1em\relax Float areas} on line ...
-Marks: queue for rightmark after: "3.4\hskip 1em\relax Float areas", "3.5\hskip
- 1em\relax Float pages and columns", "3.6\hskip 1em\relax Float types", "3.7\hs
-kip 1em\relax Margins", "3.8\hskip 1em\relax Footnotes", 
+Marks: in output: rightmark -> {3.1\hskip 1em\relax Page layout grid}{3.2\hskip 1em\relax Columns}{3.4\hskip 1em\relax Float areas} on line ...
+Marks: queue for rightmark after: "3.4\hskip 1em\relax Float areas", "3.5\hskip 1em\relax Float pages and columns", "3.6\hskip 1em\relax Float types", "3.7\hskip 1em\relax Margins", "3.8\hskip 1em\relax Footnotes", 
 Marks: queue for floats before: "", "1", "2", "3", 
 Marks: picking up from output {leftmark=5}{rightmark=9}{floats=2}
 Marks: found 1 entries for floats (new 2; old 1)
@@ -2154,7 +2024,7 @@
 : --entering xor_check_callout_after:n
 : ---entering xor_check_callout_column:n
 : ----Last callout (floats) = 1
- -> failed: last callout 1 < 3 last float placed in column 1
+-> failed: last callout 1 < 3 last float placed in column 1
 : ----Failed: (floats) last callout 1 < 3 last float placed
 : ---leaving xor_check_callout_column:n
 : --leaving xor_check_callout_after:n
@@ -2217,7 +2087,7 @@
 : --BALANCE: g_xor_trial_balance_done_int <- 0
 : --(Re)initializing column heights ...
 : --area trial: b21
- area trial: b21
+area trial: b21
 : --span count okay: b21 = 1
 : --area not closed for all types: not member of ()
 : --area open for class floats; not member of ()
@@ -2225,8 +2095,7 @@
 : ---looking at column: 2
 : ---entering xor_construct_and_test_col_ht:nnn
 : ----col height before: 612.0pt (\g_xor_ht_col_2_1_dim)
-: ----first float in any b in column 2: adding \g_xor_float_text_skip=36.0pt mi
-nus 8.0pt
+: ----first float in any b in column 2: adding \g_xor_float_text_skip=36.0pt minus 8.0pt
 : ----GRID: grid size used: 12.0pt
 : ----GRID: \g_xor_returned_lower_size_tl=144.0pt
 : ----GRID: \g_xor_returned_lower_delta_size_tl=11.9967pt
@@ -2247,9 +2116,7 @@
 : ---\xor_curr_col_block::= 1_1
 : ---\xor_curr_col_block::= 2_1
 : ---Saving column (height) information:
-: ---\g_xor_saved_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\i
-nt_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0p
-t}\dim_gset:Nn \g_xor_ht_col_2_1_dim {456.0pt}
+: ---\g_xor_saved_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {456.0pt}
 : --leaving xor_save_col_hts:N
 : --entering xor_OR_trial_grab_balance_setup:
 : ---BALANCE: g_xor_trial_balance_seen_int <- 0
@@ -2297,8 +2164,7 @@
 : -grab col: 1 of 2
 : -vsize: 612.0pt; pagegoal: 612.0pt
 : -here penalty (1) reached
-: -g_xor_here_1_required_space_tl <= \pagegoal -\pagetotal  (99.25pt <= 612.0pt
- - 60.0pt = 552.0pt) -> accepting here point
+: -g_xor_here_1_required_space_tl <= \pagegoal -\pagetotal  (99.25pt <= 612.0pt - 60.0pt = 552.0pt) -> accepting here point
 : - at currbox: \bx at A 
 : -Here object structure:
 : - {Testing ``here'' floats}
@@ -2442,36 +2308,23 @@
 : -grab col: 1 of 2
 : -vsize: 612.0pt; pagegoal: 612.0pt
 : -here penalty (2) reached
-: -g_xor_here_2_required_space_tl > \pagegoal -\pagetotal  (99.25pt > 612.0pt -
- 612.0pt = 0.0pt) -> ending column
+: -g_xor_here_2_required_space_tl > \pagegoal -\pagetotal  (99.25pt > 612.0pt - 612.0pt = 0.0pt) -> ending column
 : -entering xor_split_off_last_line_from_clvv:
 : --goal: 612.0pt; total: 612.0pt; shrink: 0.0pt
 : --ht255: 612.0pt; dp255: 2.16492pt
 Underfull \vbox (badness 10000) has occurred while \output is active []
 : -leaving xor_split_off_last_line_from_clvv:
 : -entering xor_OR_trial_finish_block_or_col:
-Marks: queue for leftmark before: "\protect \MakeUppercase  {3\hskip 1em\relax 
-The document layout model}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}", 
 Marks: picking up from output {leftmark=5}{rightmark=9}{floats=3}
 Marks: found 0 entries for leftmark (new 5; old 5)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {3\hskip 1em\relax The 
-document layout model}}{\protect \MakeUppercase  {3\hskip 1em\relax The documen
-t layout model}}{\protect \MakeUppercase  {3\hskip 1em\relax The document layou
-t model}} on line ...
-Marks: queue for leftmark after: "\protect \MakeUppercase  {3\hskip 1em\relax T
-he document layout model}", 
-Marks: queue for rightmark before: "3.1\hskip 1em\relax Page layout grid", "3.2
-\hskip 1em\relax Columns", "3.3\hskip 1em\relax Balanced columns", "3.4\hskip 1
-em\relax Float areas", "3.5\hskip 1em\relax Float pages and columns", "3.6\hski
-p 1em\relax Float types", "3.7\hskip 1em\relax Margins", "3.8\hskip 1em\relax F
-ootnotes", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}}{\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}}{\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}", 
+Marks: queue for rightmark before: "3.1\hskip 1em\relax Page layout grid", "3.2\hskip 1em\relax Columns", "3.3\hskip 1em\relax Balanced columns", "3.4\hskip 1em\relax Float areas", "3.5\hskip 1em\relax Float pages and columns", "3.6\hskip 1em\relax Float types", "3.7\hskip 1em\relax Margins", "3.8\hskip 1em\relax Footnotes", 
 Marks: picking up from output {leftmark=5}{rightmark=9}{floats=3}
 Marks: found 3 entries for rightmark (new 9; old 6)
-Marks: in output: rightmark -> {3.1\hskip 1em\relax Page layout grid}{3.2\hskip
- 1em\relax Columns}{3.4\hskip 1em\relax Float areas} on line ...
-Marks: queue for rightmark after: "3.4\hskip 1em\relax Float areas", "3.5\hskip
- 1em\relax Float pages and columns", "3.6\hskip 1em\relax Float types", "3.7\hs
-kip 1em\relax Margins", "3.8\hskip 1em\relax Footnotes", 
+Marks: in output: rightmark -> {3.1\hskip 1em\relax Page layout grid}{3.2\hskip 1em\relax Columns}{3.4\hskip 1em\relax Float areas} on line ...
+Marks: queue for rightmark after: "3.4\hskip 1em\relax Float areas", "3.5\hskip 1em\relax Float pages and columns", "3.6\hskip 1em\relax Float types", "3.7\hskip 1em\relax Margins", "3.8\hskip 1em\relax Footnotes", 
 Marks: queue for floats before: "", "1", "2", "3", 
 Marks: picking up from output {leftmark=5}{rightmark=9}{floats=3}
 Marks: found 2 entries for floats (new 3; old 1)
@@ -2507,8 +2360,7 @@
 : -grab col: 2 of 2
 : -vsize: 456.0pt; pagegoal: 456.0pt
 : -here penalty (2) reached
-: -g_xor_here_2_required_space_tl <= \pagegoal -\pagetotal  (99.25pt <= 456.0pt
- - 12.0pt = 444.0pt) -> accepting here point
+: -g_xor_here_2_required_space_tl <= \pagegoal -\pagetotal  (99.25pt <= 456.0pt - 12.0pt = 444.0pt) -> accepting here point
 : - at currbox: \bx at B 
 : -Here object structure:
 : - {Testing ``here'' floats number 2}
@@ -2584,25 +2436,16 @@
 : -grab col: 2 of 2
 : -vsize: 456.0pt; pagegoal: 388.20418pt
 : -entering xor_OR_trial_finish_block_or_col:
-Marks: queue for leftmark before: "\protect \MakeUppercase  {3\hskip 1em\relax 
-The document layout model}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}", 
 Marks: picking up from output {leftmark=5}{rightmark=11}{floats=4}
 Marks: found 0 entries for leftmark (new 5; old 5)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {3\hskip 1em\relax The 
-document layout model}}{\protect \MakeUppercase  {3\hskip 1em\relax The documen
-t layout model}}{\protect \MakeUppercase  {3\hskip 1em\relax The document layou
-t model}} on line ...
-Marks: queue for leftmark after: "\protect \MakeUppercase  {3\hskip 1em\relax T
-he document layout model}", 
-Marks: queue for rightmark before: "3.4\hskip 1em\relax Float areas", "3.5\hski
-p 1em\relax Float pages and columns", "3.6\hskip 1em\relax Float types", "3.7\h
-skip 1em\relax Margins", "3.8\hskip 1em\relax Footnotes", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}}{\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}}{\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}", 
+Marks: queue for rightmark before: "3.4\hskip 1em\relax Float areas", "3.5\hskip 1em\relax Float pages and columns", "3.6\hskip 1em\relax Float types", "3.7\hskip 1em\relax Margins", "3.8\hskip 1em\relax Footnotes", 
 Marks: picking up from output {leftmark=5}{rightmark=11}{floats=4}
 Marks: found 2 entries for rightmark (new 11; old 9)
-Marks: in output: rightmark -> {3.4\hskip 1em\relax Float areas}{3.5\hskip 1em\
-relax Float pages and columns}{3.6\hskip 1em\relax Float types} on line ...
-Marks: queue for rightmark after: "3.6\hskip 1em\relax Float types", "3.7\hskip
- 1em\relax Margins", "3.8\hskip 1em\relax Footnotes", 
+Marks: in output: rightmark -> {3.4\hskip 1em\relax Float areas}{3.5\hskip 1em\relax Float pages and columns}{3.6\hskip 1em\relax Float types} on line ...
+Marks: queue for rightmark after: "3.6\hskip 1em\relax Float types", "3.7\hskip 1em\relax Margins", "3.8\hskip 1em\relax Footnotes", 
 Marks: queue for floats before: "2", "3", 
 Marks: picking up from output {leftmark=5}{rightmark=11}{floats=4}
 Marks: found 1 entries for floats (new 4; old 3)
@@ -2615,7 +2458,7 @@
 : --entering xor_check_float_footnote_forbidden:
 : ---OK: no old bottom floats
 : ---this at area,column: b21, 2
- -> failed: column 2 contains footnotes and bottom floats
+-> failed: column 2 contains footnotes and bottom floats
 : ---Failed: column 2 contains footnotes and bottom floats
 : --leaving xor_check_float_footnote_forbidden:
 : --entering xor_evaluate_trial_results:
@@ -2669,23 +2512,19 @@
 : -entering xor_attempt_to_defer_and_try_next_float:
 : --flush: no flush point seen;defer
 : -leaving xor_attempt_to_defer_and_try_next_float:
- -> failed: --> defer
+-> failed: --> defer
 : -g_xor_curr_page_areas_closed_clist <- "" + ""
 : -g_xor_this_areas_closed_clist <- "b12,b11,b21" (all closed)
 : -entering xor_try_next_float:
- STATS: trials = 4
+STATS: trials = 4
 : --entering xor_OR_best_cols_setup:
-: ---XX initial: \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col
-_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim_gset:Nn \g_xor
-_ht_col_2_1_dim {612.0pt}
+: ---XX initial: \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
 : ---entering xor_initialize_page_footins_ftnright:
 : ---leaving xor_initialize_page_footins_ftnright:
 : ---BALANCE: g_xor_trial_balance_seen_int <- 0
 : ---Setting up column heights:
 : ---BALANCE: working on new block
-: ---Setting up column heights: \int_gset:Nn \g_xor_col_1_block_int {1}\int_gse
-t:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim
-_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
+: ---Setting up column heights: \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
 : ---entering xor_OR_best_next_col_setup:
 : ----vsize <- 612.0pt
 : ----ftnspread: page= 4
@@ -2725,8 +2564,7 @@
 : -best col: 1 of 2
 : -vsize: 612.0pt; pagegoal: 612.0pt
 : -here penalty (1) reached
-: -g_xor_here_1_required_space_tl <= \pagegoal -\pagetotal  (99.25pt <= 612.0pt
- - 60.0pt = 552.0pt) -> accepting here point
+: -g_xor_here_1_required_space_tl <= \pagegoal -\pagetotal  (99.25pt <= 612.0pt - 60.0pt = 552.0pt) -> accepting here point
 : - at currbox: \bx at A 
 : -Here object structure:
 : - {Testing ``here'' floats}
@@ -2865,36 +2703,23 @@
 : -best col: 1 of 2
 : -vsize: 612.0pt; pagegoal: 612.0pt
 : -here penalty (2) reached
-: -g_xor_here_2_required_space_tl > \pagegoal -\pagetotal  (99.25pt > 612.0pt -
- 612.0pt = 0.0pt) -> ending column
+: -g_xor_here_2_required_space_tl > \pagegoal -\pagetotal  (99.25pt > 612.0pt - 612.0pt = 0.0pt) -> ending column
 : -entering xor_split_off_last_line_from_clvv:
 : --goal: 612.0pt; total: 612.0pt; shrink: 0.0pt
 : --ht255: 612.0pt; dp255: 2.16492pt
 Underfull \vbox (badness 10000) has occurred while \output is active []
 : -leaving xor_split_off_last_line_from_clvv:
 : -entering xor_OR_best_finish_col_or_block:
-Marks: queue for leftmark before: "\protect \MakeUppercase  {3\hskip 1em\relax 
-The document layout model}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}", 
 Marks: picking up from output {leftmark=5}{rightmark=9}{floats=3}
 Marks: found 0 entries for leftmark (new 5; old 5)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {3\hskip 1em\relax The 
-document layout model}}{\protect \MakeUppercase  {3\hskip 1em\relax The documen
-t layout model}}{\protect \MakeUppercase  {3\hskip 1em\relax The document layou
-t model}} on line ...
-Marks: queue for leftmark after: "\protect \MakeUppercase  {3\hskip 1em\relax T
-he document layout model}", 
-Marks: queue for rightmark before: "3.1\hskip 1em\relax Page layout grid", "3.2
-\hskip 1em\relax Columns", "3.3\hskip 1em\relax Balanced columns", "3.4\hskip 1
-em\relax Float areas", "3.5\hskip 1em\relax Float pages and columns", "3.6\hski
-p 1em\relax Float types", "3.7\hskip 1em\relax Margins", "3.8\hskip 1em\relax F
-ootnotes", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}}{\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}}{\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}", 
+Marks: queue for rightmark before: "3.1\hskip 1em\relax Page layout grid", "3.2\hskip 1em\relax Columns", "3.3\hskip 1em\relax Balanced columns", "3.4\hskip 1em\relax Float areas", "3.5\hskip 1em\relax Float pages and columns", "3.6\hskip 1em\relax Float types", "3.7\hskip 1em\relax Margins", "3.8\hskip 1em\relax Footnotes", 
 Marks: picking up from output {leftmark=5}{rightmark=9}{floats=3}
 Marks: found 3 entries for rightmark (new 9; old 6)
-Marks: in output: rightmark -> {3.1\hskip 1em\relax Page layout grid}{3.2\hskip
- 1em\relax Columns}{3.4\hskip 1em\relax Float areas} on line ...
-Marks: queue for rightmark after: "3.4\hskip 1em\relax Float areas", "3.5\hskip
- 1em\relax Float pages and columns", "3.6\hskip 1em\relax Float types", "3.7\hs
-kip 1em\relax Margins", "3.8\hskip 1em\relax Footnotes", 
+Marks: in output: rightmark -> {3.1\hskip 1em\relax Page layout grid}{3.2\hskip 1em\relax Columns}{3.4\hskip 1em\relax Float areas} on line ...
+Marks: queue for rightmark after: "3.4\hskip 1em\relax Float areas", "3.5\hskip 1em\relax Float pages and columns", "3.6\hskip 1em\relax Float types", "3.7\hskip 1em\relax Margins", "3.8\hskip 1em\relax Footnotes", 
 Marks: queue for floats before: "", "1", "2", "3", 
 Marks: picking up from output {leftmark=5}{rightmark=9}{floats=3}
 Marks: found 2 entries for floats (new 3; old 1)
@@ -2924,8 +2749,7 @@
 : -best col: 2 of 2
 : -vsize: 612.0pt; pagegoal: 612.0pt
 : -here penalty (2) reached
-: -g_xor_here_2_required_space_tl <= \pagegoal -\pagetotal  (99.25pt <= 612.0pt
- - 12.0pt = 600.0pt) -> accepting here point
+: -g_xor_here_2_required_space_tl <= \pagegoal -\pagetotal  (99.25pt <= 612.0pt - 12.0pt = 600.0pt) -> accepting here point
 : - at currbox: \bx at B 
 : -Here object structure:
 : - {Testing ``here'' floats number 2}
@@ -3018,25 +2842,16 @@
 : -best col: 2 of 2
 : -vsize: 612.0pt; pagegoal: 534.4389pt
 : -entering xor_OR_best_finish_col_or_block:
-Marks: queue for leftmark before: "\protect \MakeUppercase  {3\hskip 1em\relax 
-The document layout model}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}", 
 Marks: picking up from output {leftmark=5}{rightmark=12}{floats=4}
 Marks: found 0 entries for leftmark (new 5; old 5)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {3\hskip 1em\relax The 
-document layout model}}{\protect \MakeUppercase  {3\hskip 1em\relax The documen
-t layout model}}{\protect \MakeUppercase  {3\hskip 1em\relax The document layou
-t model}} on line ...
-Marks: queue for leftmark after: "\protect \MakeUppercase  {3\hskip 1em\relax T
-he document layout model}", 
-Marks: queue for rightmark before: "3.4\hskip 1em\relax Float areas", "3.5\hski
-p 1em\relax Float pages and columns", "3.6\hskip 1em\relax Float types", "3.7\h
-skip 1em\relax Margins", "3.8\hskip 1em\relax Footnotes", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}}{\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}}{\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}", 
+Marks: queue for rightmark before: "3.4\hskip 1em\relax Float areas", "3.5\hskip 1em\relax Float pages and columns", "3.6\hskip 1em\relax Float types", "3.7\hskip 1em\relax Margins", "3.8\hskip 1em\relax Footnotes", 
 Marks: picking up from output {leftmark=5}{rightmark=12}{floats=4}
 Marks: found 3 entries for rightmark (new 12; old 9)
-Marks: in output: rightmark -> {3.4\hskip 1em\relax Float areas}{3.5\hskip 1em\
-relax Float pages and columns}{3.7\hskip 1em\relax Margins} on line ...
-Marks: queue for rightmark after: "3.7\hskip 1em\relax Margins", "3.8\hskip 1em
-\relax Footnotes", 
+Marks: in output: rightmark -> {3.4\hskip 1em\relax Float areas}{3.5\hskip 1em\relax Float pages and columns}{3.7\hskip 1em\relax Margins} on line ...
+Marks: queue for rightmark after: "3.7\hskip 1em\relax Margins", "3.8\hskip 1em\relax Footnotes", 
 Marks: queue for floats before: "2", "3", 
 Marks: picking up from output {leftmark=5}{rightmark=12}{floats=4}
 Marks: found 1 entries for floats (new 4; old 3)
@@ -3133,9 +2948,7 @@
 : -----\xor_curr_col_block::= 1_1
 : -----\xor_curr_col_block::= 2_1
 : -----Saving column (height) information:
-: -----\g_xor_best_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\
-int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0
-pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
+: -----\g_xor_best_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
 : ----leaving xor_save_col_hts:N
 : ---leaving xor_cols_setup:
 : ---entering xor_initialize_flush_data:
@@ -3153,17 +2966,11 @@
 : ---\bx at C : 3 ??? 3
 : ---\bx at C : callout has been typeset
 =======================================================================
- STATS: floats waiting = 1 on page 5 (float page)
+STATS: floats waiting = 1 on page 5 (float page)
 =======================================================================
 : ---entering xor_attempt_float_page:
 : ----entering xor_save_current_float_state:
-: -----saved: macro:->\cs_gset_nopar:Npn \g_xor_floats_active_seq {\s__seq \__s
-eq_item:n {\bx at C }}\dim_set:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim_set:Nn \g_xo
-r_ht_col_2_1_dim {612.0pt}\int_gset:cn {g_xor_area_b12_float_int}{0}\gdef \g_xo
-r_area_b12_float_seq {\s__seq }\int_gset:cn {g_xor_area_b11_float_int}{0}\gdef 
-\g_xor_area_b11_float_seq {\s__seq }\int_gset:cn {g_xor_area_b21_float_int}{0}\
-gdef \g_xor_area_b21_float_seq {\s__seq }\int_gset:cn {g_xor_area_DDD_float_int
-}{0}\gdef \g_xor_area_DDD_float_seq {\s__seq }
+: -----saved: macro:->\cs_gset_nopar:Npn \g_xor_floats_active_seq {\s__seq \__seq_item:n {\bx at C }}\dim_set:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim_set:Nn \g_xor_ht_col_2_1_dim {612.0pt}\int_gset:cn {g_xor_area_b12_float_int}{0}\gdef \g_xor_area_b12_float_seq {\s__seq }\int_gset:cn {g_xor_area_b11_float_int}{0}\gdef \g_xor_area_b11_float_seq {\s__seq }\int_gset:cn {g_xor_area_b21_float_int}{0}\gdef \g_xor_area_b21_float_seq {\s__seq }\int_gset:cn {g_xor_area_DDD_float_int}{0}\gdef \g_xor_area_DDD_float_seq {\s__seq }
 : ----leaving xor_save_current_float_state:
 : ----entering xor_trial_place_float_inner_loop:
 : ----leaving xor_trial_place_float_inner_loop:
@@ -3180,17 +2987,17 @@
 : ----- {3}
 : ----- g_xor_this_areas_open_clist <- b12,b11,b21
 : ----- g_xor_this_areas_closed_clist <- 
- {3}  {figure} (floats)  {3}   {\g_xor_curr_float_box_tl }
+{3}  {figure} (floats)  {3}   {\g_xor_curr_float_box_tl }
 : -----g_xor_saved_this_areas_open_clist (init): b12,b11,b21 := b12,b11,b21
 : -----entering xor_try_this_area_relaxed:
 : ------area trial: b12
- area trial: b12
+area trial: b12
 : ------span count unsuitable: b12 /= 1
- -> failed: span count b12 /= 1
+-> failed: span count b12 /= 1
 : -----leaving xor_try_this_area_relaxed:
 : -----entering xor_try_this_area_relaxed:
 : ------area trial: b11
- area trial: b11
+area trial: b11
 : ------span count okay: b11 = 1
 : ------area not closed for all types: not member of ()
 : ------area open for class floats; not member of ()
@@ -3198,8 +3005,7 @@
 : -------looking at column: 1
 : -------entering xor_construct_and_test_col_ht:nnn
 : --------col height before: 612.0pt (\g_xor_ht_col_1_1_dim)
-: --------first float in any b in column 1: adding \g_xor_float_text_skip=36.0p
-t minus 8.0pt
+: --------first float in any b in column 1: adding \g_xor_float_text_skip=36.0pt minus 8.0pt
 : --------GRID: grid size used: 12.0pt
 : --------GRID: \g_xor_returned_lower_size_tl=144.0pt
 : --------GRID: \g_xor_returned_lower_delta_size_tl=11.9967pt
@@ -3216,10 +3022,8 @@
 : -----leaving xor_try_this_area_relaxed:
 : -----entering xor_floatpage_pretests_success_action:
 : ------entering xor_update_best_trial:
- -> accepted
-: -------new best trial: \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g
-_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim_gset:N
-n \g_xor_ht_col_2_1_dim {456.0pt}
+-> accepted
+: -------new best trial: \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {456.0pt}
 : -------entering xor_update_float_placement_data:
 : --------g_xor_curr_page_areas_closed_clist + ""
 : --------g_xor_this_areas_closed_clist  + "t12,t11"
@@ -3231,23 +3035,21 @@
 : ------entering xor_trial_place_float_inner_loop:
 : ------leaving xor_trial_place_float_inner_loop:
 : ------entering xor_try_next_float:
- STATS: trials = 2
+STATS: trials = 2
 : ------leaving xor_try_next_float:
 : -----leaving xor_floatpage_pretests_success_action:
 : ----leaving xor_try_next_float:
 : ----\box_ht:N 1=456.0pt
 : ----\box_ht:N 2=612.0pt
 : ----float page failed
- -> failed: no float page made
+-> failed: no float page made
 : ----entering xor_next_page_setup:
 : -----entering xor_cols_setup:
 : ------entering xor_save_col_hts:N (\g_xor_best_trial_col_hts_tl)
 : -------\xor_curr_col_block::= 1_1
 : -------\xor_curr_col_block::= 2_1
 : -------Saving column (height) information:
-: -------\g_xor_best_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1
-}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612
-.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
+: -------\g_xor_best_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
 : ------leaving xor_save_col_hts:N
 : -----leaving xor_cols_setup:
 : -----entering xor_initialize_flush_data:
@@ -3286,13 +3088,11 @@
 : -output pen: -10008
 : -Forced break (-10008) seen on line ...
 : leaving xor_OR_collect:
-Marks: set leftmark <- \protect \MakeUppercase  {4\hskip 1em\relax The processi
-ng model} on line ...
+Marks: set leftmark <- \protect \MakeUppercase  {4\hskip 1em\relax The processing model} on line ...
 Marks: Setting mark {leftmark=6}{rightmark=14}{floats=4}
 Marks: set rightmark <-  on line ...
 Marks: Setting mark {leftmark=6}{rightmark=15}{floats=4}
 Marks: set rightmark <- 4.1\hskip 1em\relax Float placement concepts on line ...
-6
 Marks: Setting mark {leftmark=6}{rightmark=16}{floats=4}
 : Add grid alignment point
 : Adding badly guarded penalty -10008 to MVL
@@ -3333,35 +3133,23 @@
 : -CHECK: Saving output penalty (-300)
 : -Re-adding forced break(s) for splitting
 Marks: saving state on line ...
-Marks: queue for leftmark before: "\protect \MakeUppercase  {3\hskip 1em\relax 
-The document layout model}", "\protect \MakeUppercase  {4\hskip 1em\relax The p
-rocessing model}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}", "\protect \MakeUppercase  {4\hskip 1em\relax The processing model}", 
 Marks: picking up from output {leftmark=6}{rightmark=19}{floats=4}
 Marks: found 1 entries for leftmark (new 6; old 5)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {3\hskip 1em\relax The 
-document layout model}}{\protect \MakeUppercase  {4\hskip 1em\relax The process
-ing model}}{\protect \MakeUppercase  {4\hskip 1em\relax The processing model}} 
-on line ...
-Marks: queue for leftmark after: "\protect \MakeUppercase  {4\hskip 1em\relax T
-he processing model}", 
-Marks: queue for rightmark before: "3.7\hskip 1em\relax Margins", "3.8\hskip 1e
-m\relax Footnotes", "3.9\hskip 1em\relax Headers and footers", "", "4.1\hskip 1
-em\relax Float placement concepts", "4.2\hskip 1em\relax Float pages and column
-s", "4.3\hskip 1em\relax Float storage", "4.4\hskip 1em\relax Caption processin
-g", "4.5\hskip 1em\relax Flushing floats", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}}{\protect \MakeUppercase  {4\hskip 1em\relax The processing model}}{\protect \MakeUppercase  {4\hskip 1em\relax The processing model}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {4\hskip 1em\relax The processing model}", 
+Marks: queue for rightmark before: "3.7\hskip 1em\relax Margins", "3.8\hskip 1em\relax Footnotes", "3.9\hskip 1em\relax Headers and footers", "", "4.1\hskip 1em\relax Float placement concepts", "4.2\hskip 1em\relax Float pages and columns", "4.3\hskip 1em\relax Float storage", "4.4\hskip 1em\relax Caption processing", "4.5\hskip 1em\relax Flushing floats", 
 Marks: picking up from output {leftmark=6}{rightmark=19}{floats=4}
 Marks: found 7 entries for rightmark (new 19; old 12)
-Marks: in output: rightmark -> {3.7\hskip 1em\relax Margins}{3.8\hskip 1em\rela
-x Footnotes}{4.4\hskip 1em\relax Caption processing} on line ...
-Marks: queue for rightmark after: "4.4\hskip 1em\relax Caption processing", "4.
-5\hskip 1em\relax Flushing floats", 
+Marks: in output: rightmark -> {3.7\hskip 1em\relax Margins}{3.8\hskip 1em\relax Footnotes}{4.4\hskip 1em\relax Caption processing} on line ...
+Marks: queue for rightmark after: "4.4\hskip 1em\relax Caption processing", "4.5\hskip 1em\relax Flushing floats", 
 Marks: queue for floats before: "3", 
 Marks: picking up from output {leftmark=6}{rightmark=19}{floats=4}
 Marks: found 0 entries for floats (new 4; old 4)
 Marks: in output: floats -> {3}{3}{3} on line ...
 Marks: queue for floats after: "3", 
 : -entering xor_trial_place_float_setup:
- STATS: floats waiting = 1 (\bx at C  ) on page 5
+STATS: floats waiting = 1 (\bx at C  ) on page 5
 =======================================================================
 : --flush: tighten placement conditions
 : --BALANCE: g_xor_trial_balance_done_int <- 0
@@ -3386,9 +3174,7 @@
 : ---\xor_curr_col_block::= 1_1
 : ---\xor_curr_col_block::= 2_1
 : ---Saving column (height) information:
-: ---\g_xor_saved_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\i
-nt_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0p
-t}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
+: ---\g_xor_saved_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
 : --leaving xor_save_col_hts:N
 : --entering xor_OR_trial_grab_balance_setup:
 : ---BALANCE: g_xor_trial_balance_seen_int <- 0
@@ -3458,31 +3244,16 @@
 : -grab col: 1 of 2
 : -vsize: 612.0pt; pagegoal: 612.0pt
 : -entering xor_OR_trial_finish_block_or_col:
-Marks: queue for leftmark before: "\protect \MakeUppercase  {3\hskip 1em\relax 
-The document layout model}", "\protect \MakeUppercase  {4\hskip 1em\relax The p
-rocessing model}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}", "\protect \MakeUppercase  {4\hskip 1em\relax The processing model}", 
 Marks: picking up from output {leftmark=5}{rightmark=14}{floats=4}
 Marks: found 0 entries for leftmark (new 5; old 5)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {3\hskip 1em\relax The 
-document layout model}}{\protect \MakeUppercase  {3\hskip 1em\relax The documen
-t layout model}}{\protect \MakeUppercase  {3\hskip 1em\relax The document layou
-t model}} on line ...
-Marks: queue for leftmark after: "\protect \MakeUppercase  {3\hskip 1em\relax T
-he document layout model}", "\protect \MakeUppercase  {4\hskip 1em\relax The pr
-ocessing model}", 
-Marks: queue for rightmark before: "3.7\hskip 1em\relax Margins", "3.8\hskip 1e
-m\relax Footnotes", "3.9\hskip 1em\relax Headers and footers", "", "4.1\hskip 1
-em\relax Float placement concepts", "4.2\hskip 1em\relax Float pages and column
-s", "4.3\hskip 1em\relax Float storage", "4.4\hskip 1em\relax Caption processin
-g", "4.5\hskip 1em\relax Flushing floats", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}}{\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}}{\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}", "\protect \MakeUppercase  {4\hskip 1em\relax The processing model}", 
+Marks: queue for rightmark before: "3.7\hskip 1em\relax Margins", "3.8\hskip 1em\relax Footnotes", "3.9\hskip 1em\relax Headers and footers", "", "4.1\hskip 1em\relax Float placement concepts", "4.2\hskip 1em\relax Float pages and columns", "4.3\hskip 1em\relax Float storage", "4.4\hskip 1em\relax Caption processing", "4.5\hskip 1em\relax Flushing floats", 
 Marks: picking up from output {leftmark=5}{rightmark=14}{floats=4}
 Marks: found 2 entries for rightmark (new 14; old 12)
-Marks: in output: rightmark -> {3.7\hskip 1em\relax Margins}{3.8\hskip 1em\rela
-x Footnotes}{3.9\hskip 1em\relax Headers and footers} on line ...
-Marks: queue for rightmark after: "3.9\hskip 1em\relax Headers and footers", ""
-, "4.1\hskip 1em\relax Float placement concepts", "4.2\hskip 1em\relax Float pa
-ges and columns", "4.3\hskip 1em\relax Float storage", "4.4\hskip 1em\relax Cap
-tion processing", "4.5\hskip 1em\relax Flushing floats", 
+Marks: in output: rightmark -> {3.7\hskip 1em\relax Margins}{3.8\hskip 1em\relax Footnotes}{3.9\hskip 1em\relax Headers and footers} on line ...
+Marks: queue for rightmark after: "3.9\hskip 1em\relax Headers and footers", "", "4.1\hskip 1em\relax Float placement concepts", "4.2\hskip 1em\relax Float pages and columns", "4.3\hskip 1em\relax Float storage", "4.4\hskip 1em\relax Caption processing", "4.5\hskip 1em\relax Flushing floats", 
 Marks: queue for floats before: "3", 
 Marks: picking up from output {leftmark=5}{rightmark=14}{floats=4}
 Marks: found 0 entries for floats (new 4; old 4)
@@ -3578,27 +3349,16 @@
 : -grab col: 2 of 2
 : -vsize: 612.0pt; pagegoal: 612.0pt
 : -entering xor_OR_trial_finish_block_or_col:
-Marks: queue for leftmark before: "\protect \MakeUppercase  {3\hskip 1em\relax 
-The document layout model}", "\protect \MakeUppercase  {4\hskip 1em\relax The p
-rocessing model}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}", "\protect \MakeUppercase  {4\hskip 1em\relax The processing model}", 
 Marks: picking up from output {leftmark=6}{rightmark=18}{floats=4}
 Marks: found 1 entries for leftmark (new 6; old 5)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {3\hskip 1em\relax The 
-document layout model}}{\protect \MakeUppercase  {4\hskip 1em\relax The process
-ing model}}{\protect \MakeUppercase  {4\hskip 1em\relax The processing model}} 
-on line ...
-Marks: queue for leftmark after: "\protect \MakeUppercase  {4\hskip 1em\relax T
-he processing model}", 
-Marks: queue for rightmark before: "3.9\hskip 1em\relax Headers and footers", "
-", "4.1\hskip 1em\relax Float placement concepts", "4.2\hskip 1em\relax Float p
-ages and columns", "4.3\hskip 1em\relax Float storage", "4.4\hskip 1em\relax Ca
-ption processing", "4.5\hskip 1em\relax Flushing floats", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}}{\protect \MakeUppercase  {4\hskip 1em\relax The processing model}}{\protect \MakeUppercase  {4\hskip 1em\relax The processing model}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {4\hskip 1em\relax The processing model}", 
+Marks: queue for rightmark before: "3.9\hskip 1em\relax Headers and footers", "", "4.1\hskip 1em\relax Float placement concepts", "4.2\hskip 1em\relax Float pages and columns", "4.3\hskip 1em\relax Float storage", "4.4\hskip 1em\relax Caption processing", "4.5\hskip 1em\relax Flushing floats", 
 Marks: picking up from output {leftmark=6}{rightmark=18}{floats=4}
 Marks: found 4 entries for rightmark (new 18; old 14)
-Marks: in output: rightmark -> {3.9\hskip 1em\relax Headers and footers}{}{4.3\
-hskip 1em\relax Float storage} on line ...
-Marks: queue for rightmark after: "4.3\hskip 1em\relax Float storage", "4.4\hsk
-ip 1em\relax Caption processing", "4.5\hskip 1em\relax Flushing floats", 
+Marks: in output: rightmark -> {3.9\hskip 1em\relax Headers and footers}{}{4.3\hskip 1em\relax Float storage} on line ...
+Marks: queue for rightmark after: "4.3\hskip 1em\relax Float storage", "4.4\hskip 1em\relax Caption processing", "4.5\hskip 1em\relax Flushing floats", 
 Marks: queue for floats before: "3", 
 Marks: picking up from output {leftmark=6}{rightmark=18}{floats=4}
 Marks: found 0 entries for floats (new 4; old 4)
@@ -3647,21 +3407,21 @@
 : -- {3}
 : -- g_xor_this_areas_open_clist <- b12,b11,b21
 : -- g_xor_this_areas_closed_clist <- 
- {3}  {figure} (floats)  {3}   {\g_xor_curr_float_box_tl }
+{3}  {figure} (floats)  {3}   {\g_xor_curr_float_box_tl }
 : --g_xor_saved_this_areas_open_clist (init): b12,b11,b21 := b12,b11,b21
 : --entering xor_try_this_area_std:
 : ---BALANCE: g_xor_trial_balance_done_int <- 0
 : ---(Re)initializing column heights ...
 : ---area trial: b12
- area trial: b12
+area trial: b12
 : ---span count unsuitable: b12 /= 1
- -> failed: span count b12 /= 1
+-> failed: span count b12 /= 1
 : --leaving xor_try_this_area_std:
 : --entering xor_try_this_area_std:
 : ---BALANCE: g_xor_trial_balance_done_int <- 0
 : ---(Re)initializing column heights ...
 : ---area trial: b11
- area trial: b11
+area trial: b11
 : ---span count okay: b11 = 1
 : ---area not closed for all types: not member of ()
 : ---area open for class floats; not member of ()
@@ -3669,8 +3429,7 @@
 : ----looking at column: 1
 : ----entering xor_construct_and_test_col_ht:nnn
 : -----col height before: 612.0pt (\g_xor_ht_col_1_1_dim)
-: -----first float in any b in column 1: adding \g_xor_float_text_skip=36.0pt m
-inus 8.0pt
+: -----first float in any b in column 1: adding \g_xor_float_text_skip=36.0pt minus 8.0pt
 : -----GRID: grid size used: 12.0pt
 : -----GRID: \g_xor_returned_lower_size_tl=144.0pt
 : -----GRID: \g_xor_returned_lower_delta_size_tl=11.9967pt
@@ -3691,9 +3450,7 @@
 : ----\xor_curr_col_block::= 1_1
 : ----\xor_curr_col_block::= 2_1
 : ----Saving column (height) information:
-: ----\g_xor_saved_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\
-int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {456.0
-pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
+: ----\g_xor_saved_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {456.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
 : ---leaving xor_save_col_hts:N
 : ---entering xor_OR_trial_grab_balance_setup:
 : ----BALANCE: g_xor_trial_balance_seen_int <- 0
@@ -3764,31 +3521,16 @@
 : -grab col: 1 of 2
 : -vsize: 456.0pt; pagegoal: 456.0pt
 : -entering xor_OR_trial_finish_block_or_col:
-Marks: queue for leftmark before: "\protect \MakeUppercase  {3\hskip 1em\relax 
-The document layout model}", "\protect \MakeUppercase  {4\hskip 1em\relax The p
-rocessing model}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}", "\protect \MakeUppercase  {4\hskip 1em\relax The processing model}", 
 Marks: picking up from output {leftmark=5}{rightmark=14}{floats=4}
 Marks: found 0 entries for leftmark (new 5; old 5)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {3\hskip 1em\relax The 
-document layout model}}{\protect \MakeUppercase  {3\hskip 1em\relax The documen
-t layout model}}{\protect \MakeUppercase  {3\hskip 1em\relax The document layou
-t model}} on line ...
-Marks: queue for leftmark after: "\protect \MakeUppercase  {3\hskip 1em\relax T
-he document layout model}", "\protect \MakeUppercase  {4\hskip 1em\relax The pr
-ocessing model}", 
-Marks: queue for rightmark before: "3.7\hskip 1em\relax Margins", "3.8\hskip 1e
-m\relax Footnotes", "3.9\hskip 1em\relax Headers and footers", "", "4.1\hskip 1
-em\relax Float placement concepts", "4.2\hskip 1em\relax Float pages and column
-s", "4.3\hskip 1em\relax Float storage", "4.4\hskip 1em\relax Caption processin
-g", "4.5\hskip 1em\relax Flushing floats", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}}{\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}}{\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}", "\protect \MakeUppercase  {4\hskip 1em\relax The processing model}", 
+Marks: queue for rightmark before: "3.7\hskip 1em\relax Margins", "3.8\hskip 1em\relax Footnotes", "3.9\hskip 1em\relax Headers and footers", "", "4.1\hskip 1em\relax Float placement concepts", "4.2\hskip 1em\relax Float pages and columns", "4.3\hskip 1em\relax Float storage", "4.4\hskip 1em\relax Caption processing", "4.5\hskip 1em\relax Flushing floats", 
 Marks: picking up from output {leftmark=5}{rightmark=14}{floats=4}
 Marks: found 2 entries for rightmark (new 14; old 12)
-Marks: in output: rightmark -> {3.7\hskip 1em\relax Margins}{3.8\hskip 1em\rela
-x Footnotes}{3.9\hskip 1em\relax Headers and footers} on line ...
-Marks: queue for rightmark after: "3.9\hskip 1em\relax Headers and footers", ""
-, "4.1\hskip 1em\relax Float placement concepts", "4.2\hskip 1em\relax Float pa
-ges and columns", "4.3\hskip 1em\relax Float storage", "4.4\hskip 1em\relax Cap
-tion processing", "4.5\hskip 1em\relax Flushing floats", 
+Marks: in output: rightmark -> {3.7\hskip 1em\relax Margins}{3.8\hskip 1em\relax Footnotes}{3.9\hskip 1em\relax Headers and footers} on line ...
+Marks: queue for rightmark after: "3.9\hskip 1em\relax Headers and footers", "", "4.1\hskip 1em\relax Float placement concepts", "4.2\hskip 1em\relax Float pages and columns", "4.3\hskip 1em\relax Float storage", "4.4\hskip 1em\relax Caption processing", "4.5\hskip 1em\relax Flushing floats", 
 Marks: queue for floats before: "3", 
 Marks: picking up from output {leftmark=5}{rightmark=14}{floats=4}
 Marks: found 0 entries for floats (new 4; old 4)
@@ -3870,28 +3612,16 @@
 : -grab col: 2 of 2
 : -vsize: 612.0pt; pagegoal: 612.0pt
 : -entering xor_OR_trial_finish_block_or_col:
-Marks: queue for leftmark before: "\protect \MakeUppercase  {3\hskip 1em\relax 
-The document layout model}", "\protect \MakeUppercase  {4\hskip 1em\relax The p
-rocessing model}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}", "\protect \MakeUppercase  {4\hskip 1em\relax The processing model}", 
 Marks: picking up from output {leftmark=6}{rightmark=17}{floats=4}
 Marks: found 1 entries for leftmark (new 6; old 5)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {3\hskip 1em\relax The 
-document layout model}}{\protect \MakeUppercase  {4\hskip 1em\relax The process
-ing model}}{\protect \MakeUppercase  {4\hskip 1em\relax The processing model}} 
-on line ...
-Marks: queue for leftmark after: "\protect \MakeUppercase  {4\hskip 1em\relax T
-he processing model}", 
-Marks: queue for rightmark before: "3.9\hskip 1em\relax Headers and footers", "
-", "4.1\hskip 1em\relax Float placement concepts", "4.2\hskip 1em\relax Float p
-ages and columns", "4.3\hskip 1em\relax Float storage", "4.4\hskip 1em\relax Ca
-ption processing", "4.5\hskip 1em\relax Flushing floats", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}}{\protect \MakeUppercase  {4\hskip 1em\relax The processing model}}{\protect \MakeUppercase  {4\hskip 1em\relax The processing model}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {4\hskip 1em\relax The processing model}", 
+Marks: queue for rightmark before: "3.9\hskip 1em\relax Headers and footers", "", "4.1\hskip 1em\relax Float placement concepts", "4.2\hskip 1em\relax Float pages and columns", "4.3\hskip 1em\relax Float storage", "4.4\hskip 1em\relax Caption processing", "4.5\hskip 1em\relax Flushing floats", 
 Marks: picking up from output {leftmark=6}{rightmark=17}{floats=4}
 Marks: found 3 entries for rightmark (new 17; old 14)
-Marks: in output: rightmark -> {3.9\hskip 1em\relax Headers and footers}{}{4.2\
-hskip 1em\relax Float pages and columns} on line ...
-Marks: queue for rightmark after: "4.2\hskip 1em\relax Float pages and columns"
-, "4.3\hskip 1em\relax Float storage", "4.4\hskip 1em\relax Caption processing"
-, "4.5\hskip 1em\relax Flushing floats", 
+Marks: in output: rightmark -> {3.9\hskip 1em\relax Headers and footers}{}{4.2\hskip 1em\relax Float pages and columns} on line ...
+Marks: queue for rightmark after: "4.2\hskip 1em\relax Float pages and columns", "4.3\hskip 1em\relax Float storage", "4.4\hskip 1em\relax Caption processing", "4.5\hskip 1em\relax Flushing floats", 
 Marks: queue for floats before: "3", 
 Marks: picking up from output {leftmark=6}{rightmark=17}{floats=4}
 Marks: found 0 entries for floats (new 4; old 4)
@@ -3912,10 +3642,8 @@
 : --entering xor_evaluate_trial_results:
 : ---fail: false
 : ---entering xor_update_best_trial:
- -> accepted
-: ----new best trial: \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xo
-r_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {456.0pt}\dim_gset:Nn \
-g_xor_ht_col_2_1_dim {612.0pt}
+-> accepted
+: ----new best trial: \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {456.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
 : ----entering xor_update_float_placement_data:
 : -----g_xor_curr_page_areas_closed_clist + ""
 : -----g_xor_this_areas_closed_clist  + "t12,t11"
@@ -3953,19 +3681,15 @@
 : -entering xor_trial_place_float_inner_loop:
 : -leaving xor_trial_place_float_inner_loop:
 : -entering xor_try_next_float:
- STATS: trials = 2
+STATS: trials = 2
 : --entering xor_OR_best_cols_setup:
-: ---XX initial: \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col
-_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {456.0pt}\dim_gset:Nn \g_xor
-_ht_col_2_1_dim {612.0pt}
+: ---XX initial: \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {456.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
 : ---entering xor_initialize_page_footins_ftnright:
 : ---leaving xor_initialize_page_footins_ftnright:
 : ---BALANCE: g_xor_trial_balance_seen_int <- 0
 : ---Setting up column heights:
 : ---BALANCE: working on new block
-: ---Setting up column heights: \int_gset:Nn \g_xor_col_1_block_int {1}\int_gse
-t:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {456.0pt}\dim
-_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
+: ---Setting up column heights: \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {456.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
 : ---entering xor_OR_best_next_col_setup:
 : ----vsize <- 456.0pt
 : ----ftnspread: page= 5
@@ -4027,31 +3751,16 @@
 : -best col: 1 of 2
 : -vsize: 456.0pt; pagegoal: 456.0pt
 : -entering xor_OR_best_finish_col_or_block:
-Marks: queue for leftmark before: "\protect \MakeUppercase  {3\hskip 1em\relax 
-The document layout model}", "\protect \MakeUppercase  {4\hskip 1em\relax The p
-rocessing model}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}", "\protect \MakeUppercase  {4\hskip 1em\relax The processing model}", 
 Marks: picking up from output {leftmark=5}{rightmark=14}{floats=4}
 Marks: found 0 entries for leftmark (new 5; old 5)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {3\hskip 1em\relax The 
-document layout model}}{\protect \MakeUppercase  {3\hskip 1em\relax The documen
-t layout model}}{\protect \MakeUppercase  {3\hskip 1em\relax The document layou
-t model}} on line ...
-Marks: queue for leftmark after: "\protect \MakeUppercase  {3\hskip 1em\relax T
-he document layout model}", "\protect \MakeUppercase  {4\hskip 1em\relax The pr
-ocessing model}", 
-Marks: queue for rightmark before: "3.7\hskip 1em\relax Margins", "3.8\hskip 1e
-m\relax Footnotes", "3.9\hskip 1em\relax Headers and footers", "", "4.1\hskip 1
-em\relax Float placement concepts", "4.2\hskip 1em\relax Float pages and column
-s", "4.3\hskip 1em\relax Float storage", "4.4\hskip 1em\relax Caption processin
-g", "4.5\hskip 1em\relax Flushing floats", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}}{\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}}{\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}", "\protect \MakeUppercase  {4\hskip 1em\relax The processing model}", 
+Marks: queue for rightmark before: "3.7\hskip 1em\relax Margins", "3.8\hskip 1em\relax Footnotes", "3.9\hskip 1em\relax Headers and footers", "", "4.1\hskip 1em\relax Float placement concepts", "4.2\hskip 1em\relax Float pages and columns", "4.3\hskip 1em\relax Float storage", "4.4\hskip 1em\relax Caption processing", "4.5\hskip 1em\relax Flushing floats", 
 Marks: picking up from output {leftmark=5}{rightmark=14}{floats=4}
 Marks: found 2 entries for rightmark (new 14; old 12)
-Marks: in output: rightmark -> {3.7\hskip 1em\relax Margins}{3.8\hskip 1em\rela
-x Footnotes}{3.9\hskip 1em\relax Headers and footers} on line ...
-Marks: queue for rightmark after: "3.9\hskip 1em\relax Headers and footers", ""
-, "4.1\hskip 1em\relax Float placement concepts", "4.2\hskip 1em\relax Float pa
-ges and columns", "4.3\hskip 1em\relax Float storage", "4.4\hskip 1em\relax Cap
-tion processing", "4.5\hskip 1em\relax Flushing floats", 
+Marks: in output: rightmark -> {3.7\hskip 1em\relax Margins}{3.8\hskip 1em\relax Footnotes}{3.9\hskip 1em\relax Headers and footers} on line ...
+Marks: queue for rightmark after: "3.9\hskip 1em\relax Headers and footers", "", "4.1\hskip 1em\relax Float placement concepts", "4.2\hskip 1em\relax Float pages and columns", "4.3\hskip 1em\relax Float storage", "4.4\hskip 1em\relax Caption processing", "4.5\hskip 1em\relax Flushing floats", 
 Marks: queue for floats before: "3", 
 Marks: picking up from output {leftmark=5}{rightmark=14}{floats=4}
 Marks: found 0 entries for floats (new 4; old 4)
@@ -4126,28 +3835,16 @@
 : -best col: 2 of 2
 : -vsize: 612.0pt; pagegoal: 612.0pt
 : -entering xor_OR_best_finish_col_or_block:
-Marks: queue for leftmark before: "\protect \MakeUppercase  {3\hskip 1em\relax 
-The document layout model}", "\protect \MakeUppercase  {4\hskip 1em\relax The p
-rocessing model}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}", "\protect \MakeUppercase  {4\hskip 1em\relax The processing model}", 
 Marks: picking up from output {leftmark=6}{rightmark=17}{floats=4}
 Marks: found 1 entries for leftmark (new 6; old 5)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {3\hskip 1em\relax The 
-document layout model}}{\protect \MakeUppercase  {4\hskip 1em\relax The process
-ing model}}{\protect \MakeUppercase  {4\hskip 1em\relax The processing model}} 
-on line ...
-Marks: queue for leftmark after: "\protect \MakeUppercase  {4\hskip 1em\relax T
-he processing model}", 
-Marks: queue for rightmark before: "3.9\hskip 1em\relax Headers and footers", "
-", "4.1\hskip 1em\relax Float placement concepts", "4.2\hskip 1em\relax Float p
-ages and columns", "4.3\hskip 1em\relax Float storage", "4.4\hskip 1em\relax Ca
-ption processing", "4.5\hskip 1em\relax Flushing floats", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {3\hskip 1em\relax The document layout model}}{\protect \MakeUppercase  {4\hskip 1em\relax The processing model}}{\protect \MakeUppercase  {4\hskip 1em\relax The processing model}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {4\hskip 1em\relax The processing model}", 
+Marks: queue for rightmark before: "3.9\hskip 1em\relax Headers and footers", "", "4.1\hskip 1em\relax Float placement concepts", "4.2\hskip 1em\relax Float pages and columns", "4.3\hskip 1em\relax Float storage", "4.4\hskip 1em\relax Caption processing", "4.5\hskip 1em\relax Flushing floats", 
 Marks: picking up from output {leftmark=6}{rightmark=17}{floats=4}
 Marks: found 3 entries for rightmark (new 17; old 14)
-Marks: in output: rightmark -> {3.9\hskip 1em\relax Headers and footers}{}{4.2\
-hskip 1em\relax Float pages and columns} on line ...
-Marks: queue for rightmark after: "4.2\hskip 1em\relax Float pages and columns"
-, "4.3\hskip 1em\relax Float storage", "4.4\hskip 1em\relax Caption processing"
-, "4.5\hskip 1em\relax Flushing floats", 
+Marks: in output: rightmark -> {3.9\hskip 1em\relax Headers and footers}{}{4.2\hskip 1em\relax Float pages and columns} on line ...
+Marks: queue for rightmark after: "4.2\hskip 1em\relax Float pages and columns", "4.3\hskip 1em\relax Float storage", "4.4\hskip 1em\relax Caption processing", "4.5\hskip 1em\relax Flushing floats", 
 Marks: queue for floats before: "3", 
 Marks: picking up from output {leftmark=6}{rightmark=17}{floats=4}
 Marks: found 0 entries for floats (new 4; old 4)
@@ -4249,9 +3946,7 @@
 : -----\xor_curr_col_block::= 1_1
 : -----\xor_curr_col_block::= 2_1
 : -----Saving column (height) information:
-: -----\g_xor_best_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\
-int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0
-pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
+: -----\g_xor_best_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
 : ----leaving xor_save_col_hts:N
 : ---leaving xor_cols_setup:
 : ---entering xor_initialize_flush_data:
@@ -4299,8 +3994,7 @@
 : -output pen: -10008
 : -Forced break (-10008) seen on line ...
 : leaving xor_OR_collect:
-Marks: set rightmark <- 4.7\hskip 1em\relax Float and call-out relations on lin
-e 612
+Marks: set rightmark <- 4.7\hskip 1em\relax Float and call-out relations on line ...
 Marks: Setting mark {leftmark=6}{rightmark=22}{floats=4}
 : Add grid alignment point
 : Adding badly guarded penalty -10008 to MVL
@@ -4314,8 +4008,7 @@
 : -output pen: -10008
 : -Forced break (-10008) seen on line ...
 : leaving xor_OR_collect:
-Marks: set rightmark <- 4.8\hskip 1em\relax Spanning float and call-out relatio
-ns on line ...
+Marks: set rightmark <- 4.8\hskip 1em\relax Spanning float and call-out relations on line ...
 Marks: Setting mark {leftmark=6}{rightmark=23}{floats=4}
 : Add grid alignment point
 : Adding badly guarded penalty -10008 to MVL
@@ -4328,35 +4021,23 @@
 : -CHECK: Saving output penalty (150)
 : -Re-adding forced break(s) for splitting
 Marks: saving state on line ...
-Marks: queue for leftmark before: "\protect \MakeUppercase  {4\hskip 1em\relax 
-The processing model}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {4\hskip 1em\relax The processing model}", 
 Marks: picking up from output {leftmark=6}{rightmark=23}{floats=4}
 Marks: found 0 entries for leftmark (new 6; old 6)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {4\hskip 1em\relax The 
-processing model}}{\protect \MakeUppercase  {4\hskip 1em\relax The processing m
-odel}}{\protect \MakeUppercase  {4\hskip 1em\relax The processing model}} on li
-ne 653
-Marks: queue for leftmark after: "\protect \MakeUppercase  {4\hskip 1em\relax T
-he processing model}", 
-Marks: queue for rightmark before: "4.2\hskip 1em\relax Float pages and columns
-", "4.3\hskip 1em\relax Float storage", "4.4\hskip 1em\relax Caption processing
-", "4.5\hskip 1em\relax Flushing floats", "4.6\hskip 1em\relax Float sequence c
-lasses", "4.7\hskip 1em\relax Float and call-out relations", "4.8\hskip 1em\rel
-ax Spanning float and call-out relations", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {4\hskip 1em\relax The processing model}}{\protect \MakeUppercase  {4\hskip 1em\relax The processing model}}{\protect \MakeUppercase  {4\hskip 1em\relax The processing model}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {4\hskip 1em\relax The processing model}", 
+Marks: queue for rightmark before: "4.2\hskip 1em\relax Float pages and columns", "4.3\hskip 1em\relax Float storage", "4.4\hskip 1em\relax Caption processing", "4.5\hskip 1em\relax Flushing floats", "4.6\hskip 1em\relax Float sequence classes", "4.7\hskip 1em\relax Float and call-out relations", "4.8\hskip 1em\relax Spanning float and call-out relations", 
 Marks: picking up from output {leftmark=6}{rightmark=23}{floats=4}
 Marks: found 6 entries for rightmark (new 23; old 17)
-Marks: in output: rightmark -> {4.2\hskip 1em\relax Float pages and columns}{4.
-3\hskip 1em\relax Float storage}{4.8\hskip 1em\relax Spanning float and call-ou
-t relations} on line ...
-Marks: queue for rightmark after: "4.8\hskip 1em\relax Spanning float and call-
-out relations", 
+Marks: in output: rightmark -> {4.2\hskip 1em\relax Float pages and columns}{4.3\hskip 1em\relax Float storage}{4.8\hskip 1em\relax Spanning float and call-out relations} on line ...
+Marks: queue for rightmark after: "4.8\hskip 1em\relax Spanning float and call-out relations", 
 Marks: queue for floats before: "3", 
 Marks: picking up from output {leftmark=6}{rightmark=23}{floats=4}
 Marks: found 0 entries for floats (new 4; old 4)
 Marks: in output: floats -> {3}{3}{3} on line ...
 Marks: queue for floats after: "3", 
 : -entering xor_trial_place_float_setup:
- STATS: floats waiting = 0 () on page 6
+STATS: floats waiting = 0 () on page 6
 =======================================================================
 : --flush: tighten placement conditions
 : --BALANCE: g_xor_trial_balance_done_int <- 0
@@ -4381,9 +4062,7 @@
 : ---\xor_curr_col_block::= 1_1
 : ---\xor_curr_col_block::= 2_1
 : ---Saving column (height) information:
-: ---\g_xor_saved_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\i
-nt_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0p
-t}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
+: ---\g_xor_saved_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
 : --leaving xor_save_col_hts:N
 : --entering xor_OR_trial_grab_balance_setup:
 : ---BALANCE: g_xor_trial_balance_seen_int <- 0
@@ -4477,29 +4156,16 @@
 : -grab col: 1 of 2
 : -vsize: 612.0pt; pagegoal: 612.0pt
 : -entering xor_OR_trial_finish_block_or_col:
-Marks: queue for leftmark before: "\protect \MakeUppercase  {4\hskip 1em\relax 
-The processing model}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {4\hskip 1em\relax The processing model}", 
 Marks: picking up from output {leftmark=6}{rightmark=20}{floats=4}
 Marks: found 0 entries for leftmark (new 6; old 6)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {4\hskip 1em\relax The 
-processing model}}{\protect \MakeUppercase  {4\hskip 1em\relax The processing m
-odel}}{\protect \MakeUppercase  {4\hskip 1em\relax The processing model}} on li
-ne 653
-Marks: queue for leftmark after: "\protect \MakeUppercase  {4\hskip 1em\relax T
-he processing model}", 
-Marks: queue for rightmark before: "4.2\hskip 1em\relax Float pages and columns
-", "4.3\hskip 1em\relax Float storage", "4.4\hskip 1em\relax Caption processing
-", "4.5\hskip 1em\relax Flushing floats", "4.6\hskip 1em\relax Float sequence c
-lasses", "4.7\hskip 1em\relax Float and call-out relations", "4.8\hskip 1em\rel
-ax Spanning float and call-out relations", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {4\hskip 1em\relax The processing model}}{\protect \MakeUppercase  {4\hskip 1em\relax The processing model}}{\protect \MakeUppercase  {4\hskip 1em\relax The processing model}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {4\hskip 1em\relax The processing model}", 
+Marks: queue for rightmark before: "4.2\hskip 1em\relax Float pages and columns", "4.3\hskip 1em\relax Float storage", "4.4\hskip 1em\relax Caption processing", "4.5\hskip 1em\relax Flushing floats", "4.6\hskip 1em\relax Float sequence classes", "4.7\hskip 1em\relax Float and call-out relations", "4.8\hskip 1em\relax Spanning float and call-out relations", 
 Marks: picking up from output {leftmark=6}{rightmark=20}{floats=4}
 Marks: found 3 entries for rightmark (new 20; old 17)
-Marks: in output: rightmark -> {4.2\hskip 1em\relax Float pages and columns}{4.
-3\hskip 1em\relax Float storage}{4.5\hskip 1em\relax Flushing floats} on line ...
-53
-Marks: queue for rightmark after: "4.5\hskip 1em\relax Flushing floats", "4.6\h
-skip 1em\relax Float sequence classes", "4.7\hskip 1em\relax Float and call-out
- relations", "4.8\hskip 1em\relax Spanning float and call-out relations", 
+Marks: in output: rightmark -> {4.2\hskip 1em\relax Float pages and columns}{4.3\hskip 1em\relax Float storage}{4.5\hskip 1em\relax Flushing floats} on line ...
+Marks: queue for rightmark after: "4.5\hskip 1em\relax Flushing floats", "4.6\hskip 1em\relax Float sequence classes", "4.7\hskip 1em\relax Float and call-out relations", "4.8\hskip 1em\relax Spanning float and call-out relations", 
 Marks: queue for floats before: "3", 
 Marks: picking up from output {leftmark=6}{rightmark=20}{floats=4}
 Marks: found 0 entries for floats (new 4; old 4)
@@ -4619,26 +4285,16 @@
 : -grab col: 2 of 2
 : -vsize: 612.0pt; pagegoal: 592.23473pt
 : -entering xor_OR_trial_finish_block_or_col:
-Marks: queue for leftmark before: "\protect \MakeUppercase  {4\hskip 1em\relax 
-The processing model}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {4\hskip 1em\relax The processing model}", 
 Marks: picking up from output {leftmark=6}{rightmark=23}{floats=4}
 Marks: found 0 entries for leftmark (new 6; old 6)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {4\hskip 1em\relax The 
-processing model}}{\protect \MakeUppercase  {4\hskip 1em\relax The processing m
-odel}}{\protect \MakeUppercase  {4\hskip 1em\relax The processing model}} on li
-ne 653
-Marks: queue for leftmark after: "\protect \MakeUppercase  {4\hskip 1em\relax T
-he processing model}", 
-Marks: queue for rightmark before: "4.5\hskip 1em\relax Flushing floats", "4.6\
-hskip 1em\relax Float sequence classes", "4.7\hskip 1em\relax Float and call-ou
-t relations", "4.8\hskip 1em\relax Spanning float and call-out relations", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {4\hskip 1em\relax The processing model}}{\protect \MakeUppercase  {4\hskip 1em\relax The processing model}}{\protect \MakeUppercase  {4\hskip 1em\relax The processing model}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {4\hskip 1em\relax The processing model}", 
+Marks: queue for rightmark before: "4.5\hskip 1em\relax Flushing floats", "4.6\hskip 1em\relax Float sequence classes", "4.7\hskip 1em\relax Float and call-out relations", "4.8\hskip 1em\relax Spanning float and call-out relations", 
 Marks: picking up from output {leftmark=6}{rightmark=23}{floats=4}
 Marks: found 3 entries for rightmark (new 23; old 20)
-Marks: in output: rightmark -> {4.5\hskip 1em\relax Flushing floats}{4.6\hskip 
-1em\relax Float sequence classes}{4.8\hskip 1em\relax Spanning float and call-o
-ut relations} on line ...
-Marks: queue for rightmark after: "4.8\hskip 1em\relax Spanning float and call-
-out relations", 
+Marks: in output: rightmark -> {4.5\hskip 1em\relax Flushing floats}{4.6\hskip 1em\relax Float sequence classes}{4.8\hskip 1em\relax Spanning float and call-out relations} on line ...
+Marks: queue for rightmark after: "4.8\hskip 1em\relax Spanning float and call-out relations", 
 Marks: queue for floats before: "3", 
 Marks: picking up from output {leftmark=6}{rightmark=23}{floats=4}
 Marks: found 0 entries for floats (new 4; old 4)
@@ -4673,19 +4329,15 @@
 : -entering xor_trial_place_float_inner_loop:
 : -leaving xor_trial_place_float_inner_loop:
 : -entering xor_try_next_float:
- STATS: trials = 0
+STATS: trials = 0
 : --entering xor_OR_best_cols_setup:
-: ---XX initial: \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col
-_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim_gset:Nn \g_xor
-_ht_col_2_1_dim {612.0pt}
+: ---XX initial: \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
 : ---entering xor_initialize_page_footins_ftnright:
 : ---leaving xor_initialize_page_footins_ftnright:
 : ---BALANCE: g_xor_trial_balance_seen_int <- 0
 : ---Setting up column heights:
 : ---BALANCE: working on new block
-: ---Setting up column heights: \int_gset:Nn \g_xor_col_1_block_int {1}\int_gse
-t:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim
-_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
+: ---Setting up column heights: \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
 : ---entering xor_OR_best_next_col_setup:
 : ----vsize <- 612.0pt
 : ----ftnspread: page= 6
@@ -4771,29 +4423,16 @@
 : -best col: 1 of 2
 : -vsize: 612.0pt; pagegoal: 612.0pt
 : -entering xor_OR_best_finish_col_or_block:
-Marks: queue for leftmark before: "\protect \MakeUppercase  {4\hskip 1em\relax 
-The processing model}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {4\hskip 1em\relax The processing model}", 
 Marks: picking up from output {leftmark=6}{rightmark=20}{floats=4}
 Marks: found 0 entries for leftmark (new 6; old 6)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {4\hskip 1em\relax The 
-processing model}}{\protect \MakeUppercase  {4\hskip 1em\relax The processing m
-odel}}{\protect \MakeUppercase  {4\hskip 1em\relax The processing model}} on li
-ne 653
-Marks: queue for leftmark after: "\protect \MakeUppercase  {4\hskip 1em\relax T
-he processing model}", 
-Marks: queue for rightmark before: "4.2\hskip 1em\relax Float pages and columns
-", "4.3\hskip 1em\relax Float storage", "4.4\hskip 1em\relax Caption processing
-", "4.5\hskip 1em\relax Flushing floats", "4.6\hskip 1em\relax Float sequence c
-lasses", "4.7\hskip 1em\relax Float and call-out relations", "4.8\hskip 1em\rel
-ax Spanning float and call-out relations", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {4\hskip 1em\relax The processing model}}{\protect \MakeUppercase  {4\hskip 1em\relax The processing model}}{\protect \MakeUppercase  {4\hskip 1em\relax The processing model}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {4\hskip 1em\relax The processing model}", 
+Marks: queue for rightmark before: "4.2\hskip 1em\relax Float pages and columns", "4.3\hskip 1em\relax Float storage", "4.4\hskip 1em\relax Caption processing", "4.5\hskip 1em\relax Flushing floats", "4.6\hskip 1em\relax Float sequence classes", "4.7\hskip 1em\relax Float and call-out relations", "4.8\hskip 1em\relax Spanning float and call-out relations", 
 Marks: picking up from output {leftmark=6}{rightmark=20}{floats=4}
 Marks: found 3 entries for rightmark (new 20; old 17)
-Marks: in output: rightmark -> {4.2\hskip 1em\relax Float pages and columns}{4.
-3\hskip 1em\relax Float storage}{4.5\hskip 1em\relax Flushing floats} on line ...
-53
-Marks: queue for rightmark after: "4.5\hskip 1em\relax Flushing floats", "4.6\h
-skip 1em\relax Float sequence classes", "4.7\hskip 1em\relax Float and call-out
- relations", "4.8\hskip 1em\relax Spanning float and call-out relations", 
+Marks: in output: rightmark -> {4.2\hskip 1em\relax Float pages and columns}{4.3\hskip 1em\relax Float storage}{4.5\hskip 1em\relax Flushing floats} on line ...
+Marks: queue for rightmark after: "4.5\hskip 1em\relax Flushing floats", "4.6\hskip 1em\relax Float sequence classes", "4.7\hskip 1em\relax Float and call-out relations", "4.8\hskip 1em\relax Spanning float and call-out relations", 
 Marks: queue for floats before: "3", 
 Marks: picking up from output {leftmark=6}{rightmark=20}{floats=4}
 Marks: found 0 entries for floats (new 4; old 4)
@@ -4915,26 +4554,16 @@
 : -best col: 2 of 2
 : -vsize: 612.0pt; pagegoal: 592.23473pt
 : -entering xor_OR_best_finish_col_or_block:
-Marks: queue for leftmark before: "\protect \MakeUppercase  {4\hskip 1em\relax 
-The processing model}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {4\hskip 1em\relax The processing model}", 
 Marks: picking up from output {leftmark=6}{rightmark=23}{floats=4}
 Marks: found 0 entries for leftmark (new 6; old 6)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {4\hskip 1em\relax The 
-processing model}}{\protect \MakeUppercase  {4\hskip 1em\relax The processing m
-odel}}{\protect \MakeUppercase  {4\hskip 1em\relax The processing model}} on li
-ne 653
-Marks: queue for leftmark after: "\protect \MakeUppercase  {4\hskip 1em\relax T
-he processing model}", 
-Marks: queue for rightmark before: "4.5\hskip 1em\relax Flushing floats", "4.6\
-hskip 1em\relax Float sequence classes", "4.7\hskip 1em\relax Float and call-ou
-t relations", "4.8\hskip 1em\relax Spanning float and call-out relations", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {4\hskip 1em\relax The processing model}}{\protect \MakeUppercase  {4\hskip 1em\relax The processing model}}{\protect \MakeUppercase  {4\hskip 1em\relax The processing model}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {4\hskip 1em\relax The processing model}", 
+Marks: queue for rightmark before: "4.5\hskip 1em\relax Flushing floats", "4.6\hskip 1em\relax Float sequence classes", "4.7\hskip 1em\relax Float and call-out relations", "4.8\hskip 1em\relax Spanning float and call-out relations", 
 Marks: picking up from output {leftmark=6}{rightmark=23}{floats=4}
 Marks: found 3 entries for rightmark (new 23; old 20)
-Marks: in output: rightmark -> {4.5\hskip 1em\relax Flushing floats}{4.6\hskip 
-1em\relax Float sequence classes}{4.8\hskip 1em\relax Spanning float and call-o
-ut relations} on line ...
-Marks: queue for rightmark after: "4.8\hskip 1em\relax Spanning float and call-
-out relations", 
+Marks: in output: rightmark -> {4.5\hskip 1em\relax Flushing floats}{4.6\hskip 1em\relax Float sequence classes}{4.8\hskip 1em\relax Spanning float and call-out relations} on line ...
+Marks: queue for rightmark after: "4.8\hskip 1em\relax Spanning float and call-out relations", 
 Marks: queue for floats before: "3", 
 Marks: picking up from output {leftmark=6}{rightmark=23}{floats=4}
 Marks: found 0 entries for floats (new 4; old 4)
@@ -5031,9 +4660,7 @@
 : -----\xor_curr_col_block::= 1_1
 : -----\xor_curr_col_block::= 2_1
 : -----Saving column (height) information:
-: -----\g_xor_best_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\
-int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0
-pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
+: -----\g_xor_best_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
 : ----leaving xor_save_col_hts:N
 : ---leaving xor_cols_setup:
 : ---entering xor_initialize_flush_data:
@@ -5067,8 +4694,7 @@
 : -output pen: -10008
 : -Forced break (-10008) seen on line ...
 : leaving xor_OR_collect:
-Marks: set rightmark <- 4.9\hskip 1em\relax Float and footnote relations on lin
-e 658
+Marks: set rightmark <- 4.9\hskip 1em\relax Float and footnote relations on line ...
 Marks: Setting mark {leftmark=6}{rightmark=24}{floats=4}
 : Add grid alignment point
 : Adding badly guarded penalty -10008 to MVL
@@ -5104,8 +4730,7 @@
 : -output pen: -10008
 : -Forced break (-10008) seen on line ...
 : leaving xor_OR_collect:
-Marks: set rightmark <- 4.12\hskip 1em\relax To ``Here'' or not to ``Here'' on 
-line 735
+Marks: set rightmark <- 4.12\hskip 1em\relax To ``Here'' or not to ``Here'' on line ...
 Marks: Setting mark {leftmark=6}{rightmark=27}{floats=4}
 : Add grid alignment point
 : Adding badly guarded penalty -10008 to MVL
@@ -5118,34 +4743,23 @@
 : -CHECK: Saving output penalty (10000)
 : -Re-adding forced break(s) for splitting
 Marks: saving state on line ...
-Marks: queue for leftmark before: "\protect \MakeUppercase  {4\hskip 1em\relax 
-The processing model}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {4\hskip 1em\relax The processing model}", 
 Marks: picking up from output {leftmark=6}{rightmark=27}{floats=4}
 Marks: found 0 entries for leftmark (new 6; old 6)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {4\hskip 1em\relax The 
-processing model}}{\protect \MakeUppercase  {4\hskip 1em\relax The processing m
-odel}}{\protect \MakeUppercase  {4\hskip 1em\relax The processing model}} on li
-ne 766
-Marks: queue for leftmark after: "\protect \MakeUppercase  {4\hskip 1em\relax T
-he processing model}", 
-Marks: queue for rightmark before: "4.8\hskip 1em\relax Spanning float and call
--out relations", "4.9\hskip 1em\relax Float and footnote relations", "4.10\hski
-p 1em\relax Area statuses", "4.11\hskip 1em\relax Area constraints", "4.12\hski
-p 1em\relax To ``Here'' or not to ``Here''", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {4\hskip 1em\relax The processing model}}{\protect \MakeUppercase  {4\hskip 1em\relax The processing model}}{\protect \MakeUppercase  {4\hskip 1em\relax The processing model}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {4\hskip 1em\relax The processing model}", 
+Marks: queue for rightmark before: "4.8\hskip 1em\relax Spanning float and call-out relations", "4.9\hskip 1em\relax Float and footnote relations", "4.10\hskip 1em\relax Area statuses", "4.11\hskip 1em\relax Area constraints", "4.12\hskip 1em\relax To ``Here'' or not to ``Here''", 
 Marks: picking up from output {leftmark=6}{rightmark=27}{floats=4}
 Marks: found 4 entries for rightmark (new 27; old 23)
-Marks: in output: rightmark -> {4.8\hskip 1em\relax Spanning float and call-out
- relations}{4.9\hskip 1em\relax Float and footnote relations}{4.12\hskip 1em\re
-lax To ``Here'' or not to ``Here''} on line ...
-Marks: queue for rightmark after: "4.12\hskip 1em\relax To ``Here'' or not to `
-`Here''", 
+Marks: in output: rightmark -> {4.8\hskip 1em\relax Spanning float and call-out relations}{4.9\hskip 1em\relax Float and footnote relations}{4.12\hskip 1em\relax To ``Here'' or not to ``Here''} on line ...
+Marks: queue for rightmark after: "4.12\hskip 1em\relax To ``Here'' or not to ``Here''", 
 Marks: queue for floats before: "3", 
 Marks: picking up from output {leftmark=6}{rightmark=27}{floats=4}
 Marks: found 0 entries for floats (new 4; old 4)
 Marks: in output: floats -> {3}{3}{3} on line ...
 Marks: queue for floats after: "3", 
 : -entering xor_trial_place_float_setup:
- STATS: floats waiting = 0 () on page 7
+STATS: floats waiting = 0 () on page 7
 =======================================================================
 : --flush: tighten placement conditions
 : --BALANCE: g_xor_trial_balance_done_int <- 0
@@ -5170,9 +4784,7 @@
 : ---\xor_curr_col_block::= 1_1
 : ---\xor_curr_col_block::= 2_1
 : ---Saving column (height) information:
-: ---\g_xor_saved_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\i
-nt_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0p
-t}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
+: ---\g_xor_saved_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
 : --leaving xor_save_col_hts:N
 : --entering xor_OR_trial_grab_balance_setup:
 : ---BALANCE: g_xor_trial_balance_seen_int <- 0
@@ -5265,28 +4877,16 @@
 : -grab col: 1 of 2
 : -vsize: 612.0pt; pagegoal: 612.0pt
 : -entering xor_OR_trial_finish_block_or_col:
-Marks: queue for leftmark before: "\protect \MakeUppercase  {4\hskip 1em\relax 
-The processing model}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {4\hskip 1em\relax The processing model}", 
 Marks: picking up from output {leftmark=6}{rightmark=25}{floats=4}
 Marks: found 0 entries for leftmark (new 6; old 6)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {4\hskip 1em\relax The 
-processing model}}{\protect \MakeUppercase  {4\hskip 1em\relax The processing m
-odel}}{\protect \MakeUppercase  {4\hskip 1em\relax The processing model}} on li
-ne 766
-Marks: queue for leftmark after: "\protect \MakeUppercase  {4\hskip 1em\relax T
-he processing model}", 
-Marks: queue for rightmark before: "4.8\hskip 1em\relax Spanning float and call
--out relations", "4.9\hskip 1em\relax Float and footnote relations", "4.10\hski
-p 1em\relax Area statuses", "4.11\hskip 1em\relax Area constraints", "4.12\hski
-p 1em\relax To ``Here'' or not to ``Here''", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {4\hskip 1em\relax The processing model}}{\protect \MakeUppercase  {4\hskip 1em\relax The processing model}}{\protect \MakeUppercase  {4\hskip 1em\relax The processing model}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {4\hskip 1em\relax The processing model}", 
+Marks: queue for rightmark before: "4.8\hskip 1em\relax Spanning float and call-out relations", "4.9\hskip 1em\relax Float and footnote relations", "4.10\hskip 1em\relax Area statuses", "4.11\hskip 1em\relax Area constraints", "4.12\hskip 1em\relax To ``Here'' or not to ``Here''", 
 Marks: picking up from output {leftmark=6}{rightmark=25}{floats=4}
 Marks: found 2 entries for rightmark (new 25; old 23)
-Marks: in output: rightmark -> {4.8\hskip 1em\relax Spanning float and call-out
- relations}{4.9\hskip 1em\relax Float and footnote relations}{4.10\hskip 1em\re
-lax Area statuses} on line ...
-Marks: queue for rightmark after: "4.10\hskip 1em\relax Area statuses", "4.11\h
-skip 1em\relax Area constraints", "4.12\hskip 1em\relax To ``Here'' or not to `
-`Here''", 
+Marks: in output: rightmark -> {4.8\hskip 1em\relax Spanning float and call-out relations}{4.9\hskip 1em\relax Float and footnote relations}{4.10\hskip 1em\relax Area statuses} on line ...
+Marks: queue for rightmark after: "4.10\hskip 1em\relax Area statuses", "4.11\hskip 1em\relax Area constraints", "4.12\hskip 1em\relax To ``Here'' or not to ``Here''", 
 Marks: queue for floats before: "3", 
 Marks: picking up from output {leftmark=6}{rightmark=25}{floats=4}
 Marks: found 0 entries for floats (new 4; old 4)
@@ -5405,26 +5005,16 @@
 : -grab col: 2 of 2
 : -vsize: 612.0pt; pagegoal: 593.43674pt
 : -entering xor_OR_trial_finish_block_or_col:
-Marks: queue for leftmark before: "\protect \MakeUppercase  {4\hskip 1em\relax 
-The processing model}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {4\hskip 1em\relax The processing model}", 
 Marks: picking up from output {leftmark=6}{rightmark=27}{floats=4}
 Marks: found 0 entries for leftmark (new 6; old 6)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {4\hskip 1em\relax The 
-processing model}}{\protect \MakeUppercase  {4\hskip 1em\relax The processing m
-odel}}{\protect \MakeUppercase  {4\hskip 1em\relax The processing model}} on li
-ne 766
-Marks: queue for leftmark after: "\protect \MakeUppercase  {4\hskip 1em\relax T
-he processing model}", 
-Marks: queue for rightmark before: "4.10\hskip 1em\relax Area statuses", "4.11\
-hskip 1em\relax Area constraints", "4.12\hskip 1em\relax To ``Here'' or not to 
-``Here''", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {4\hskip 1em\relax The processing model}}{\protect \MakeUppercase  {4\hskip 1em\relax The processing model}}{\protect \MakeUppercase  {4\hskip 1em\relax The processing model}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {4\hskip 1em\relax The processing model}", 
+Marks: queue for rightmark before: "4.10\hskip 1em\relax Area statuses", "4.11\hskip 1em\relax Area constraints", "4.12\hskip 1em\relax To ``Here'' or not to ``Here''", 
 Marks: picking up from output {leftmark=6}{rightmark=27}{floats=4}
 Marks: found 2 entries for rightmark (new 27; old 25)
-Marks: in output: rightmark -> {4.10\hskip 1em\relax Area statuses}{4.11\hskip 
-1em\relax Area constraints}{4.12\hskip 1em\relax To ``Here'' or not to ``Here''
-} on line ...
-Marks: queue for rightmark after: "4.12\hskip 1em\relax To ``Here'' or not to `
-`Here''", 
+Marks: in output: rightmark -> {4.10\hskip 1em\relax Area statuses}{4.11\hskip 1em\relax Area constraints}{4.12\hskip 1em\relax To ``Here'' or not to ``Here''} on line ...
+Marks: queue for rightmark after: "4.12\hskip 1em\relax To ``Here'' or not to ``Here''", 
 Marks: queue for floats before: "3", 
 Marks: picking up from output {leftmark=6}{rightmark=27}{floats=4}
 Marks: found 0 entries for floats (new 4; old 4)
@@ -5458,19 +5048,15 @@
 : -entering xor_trial_place_float_inner_loop:
 : -leaving xor_trial_place_float_inner_loop:
 : -entering xor_try_next_float:
- STATS: trials = 0
+STATS: trials = 0
 : --entering xor_OR_best_cols_setup:
-: ---XX initial: \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col
-_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim_gset:Nn \g_xor
-_ht_col_2_1_dim {612.0pt}
+: ---XX initial: \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
 : ---entering xor_initialize_page_footins_ftnright:
 : ---leaving xor_initialize_page_footins_ftnright:
 : ---BALANCE: g_xor_trial_balance_seen_int <- 0
 : ---Setting up column heights:
 : ---BALANCE: working on new block
-: ---Setting up column heights: \int_gset:Nn \g_xor_col_1_block_int {1}\int_gse
-t:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim
-_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
+: ---Setting up column heights: \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
 : ---entering xor_OR_best_next_col_setup:
 : ----vsize <- 612.0pt
 : ----ftnspread: page= 7
@@ -5555,28 +5141,16 @@
 : -best col: 1 of 2
 : -vsize: 612.0pt; pagegoal: 612.0pt
 : -entering xor_OR_best_finish_col_or_block:
-Marks: queue for leftmark before: "\protect \MakeUppercase  {4\hskip 1em\relax 
-The processing model}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {4\hskip 1em\relax The processing model}", 
 Marks: picking up from output {leftmark=6}{rightmark=25}{floats=4}
 Marks: found 0 entries for leftmark (new 6; old 6)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {4\hskip 1em\relax The 
-processing model}}{\protect \MakeUppercase  {4\hskip 1em\relax The processing m
-odel}}{\protect \MakeUppercase  {4\hskip 1em\relax The processing model}} on li
-ne 766
-Marks: queue for leftmark after: "\protect \MakeUppercase  {4\hskip 1em\relax T
-he processing model}", 
-Marks: queue for rightmark before: "4.8\hskip 1em\relax Spanning float and call
--out relations", "4.9\hskip 1em\relax Float and footnote relations", "4.10\hski
-p 1em\relax Area statuses", "4.11\hskip 1em\relax Area constraints", "4.12\hski
-p 1em\relax To ``Here'' or not to ``Here''", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {4\hskip 1em\relax The processing model}}{\protect \MakeUppercase  {4\hskip 1em\relax The processing model}}{\protect \MakeUppercase  {4\hskip 1em\relax The processing model}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {4\hskip 1em\relax The processing model}", 
+Marks: queue for rightmark before: "4.8\hskip 1em\relax Spanning float and call-out relations", "4.9\hskip 1em\relax Float and footnote relations", "4.10\hskip 1em\relax Area statuses", "4.11\hskip 1em\relax Area constraints", "4.12\hskip 1em\relax To ``Here'' or not to ``Here''", 
 Marks: picking up from output {leftmark=6}{rightmark=25}{floats=4}
 Marks: found 2 entries for rightmark (new 25; old 23)
-Marks: in output: rightmark -> {4.8\hskip 1em\relax Spanning float and call-out
- relations}{4.9\hskip 1em\relax Float and footnote relations}{4.10\hskip 1em\re
-lax Area statuses} on line ...
-Marks: queue for rightmark after: "4.10\hskip 1em\relax Area statuses", "4.11\h
-skip 1em\relax Area constraints", "4.12\hskip 1em\relax To ``Here'' or not to `
-`Here''", 
+Marks: in output: rightmark -> {4.8\hskip 1em\relax Spanning float and call-out relations}{4.9\hskip 1em\relax Float and footnote relations}{4.10\hskip 1em\relax Area statuses} on line ...
+Marks: queue for rightmark after: "4.10\hskip 1em\relax Area statuses", "4.11\hskip 1em\relax Area constraints", "4.12\hskip 1em\relax To ``Here'' or not to ``Here''", 
 Marks: queue for floats before: "3", 
 Marks: picking up from output {leftmark=6}{rightmark=25}{floats=4}
 Marks: found 0 entries for floats (new 4; old 4)
@@ -5697,26 +5271,16 @@
 : -best col: 2 of 2
 : -vsize: 612.0pt; pagegoal: 593.43674pt
 : -entering xor_OR_best_finish_col_or_block:
-Marks: queue for leftmark before: "\protect \MakeUppercase  {4\hskip 1em\relax 
-The processing model}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {4\hskip 1em\relax The processing model}", 
 Marks: picking up from output {leftmark=6}{rightmark=27}{floats=4}
 Marks: found 0 entries for leftmark (new 6; old 6)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {4\hskip 1em\relax The 
-processing model}}{\protect \MakeUppercase  {4\hskip 1em\relax The processing m
-odel}}{\protect \MakeUppercase  {4\hskip 1em\relax The processing model}} on li
-ne 766
-Marks: queue for leftmark after: "\protect \MakeUppercase  {4\hskip 1em\relax T
-he processing model}", 
-Marks: queue for rightmark before: "4.10\hskip 1em\relax Area statuses", "4.11\
-hskip 1em\relax Area constraints", "4.12\hskip 1em\relax To ``Here'' or not to 
-``Here''", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {4\hskip 1em\relax The processing model}}{\protect \MakeUppercase  {4\hskip 1em\relax The processing model}}{\protect \MakeUppercase  {4\hskip 1em\relax The processing model}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {4\hskip 1em\relax The processing model}", 
+Marks: queue for rightmark before: "4.10\hskip 1em\relax Area statuses", "4.11\hskip 1em\relax Area constraints", "4.12\hskip 1em\relax To ``Here'' or not to ``Here''", 
 Marks: picking up from output {leftmark=6}{rightmark=27}{floats=4}
 Marks: found 2 entries for rightmark (new 27; old 25)
-Marks: in output: rightmark -> {4.10\hskip 1em\relax Area statuses}{4.11\hskip 
-1em\relax Area constraints}{4.12\hskip 1em\relax To ``Here'' or not to ``Here''
-} on line ...
-Marks: queue for rightmark after: "4.12\hskip 1em\relax To ``Here'' or not to `
-`Here''", 
+Marks: in output: rightmark -> {4.10\hskip 1em\relax Area statuses}{4.11\hskip 1em\relax Area constraints}{4.12\hskip 1em\relax To ``Here'' or not to ``Here''} on line ...
+Marks: queue for rightmark after: "4.12\hskip 1em\relax To ``Here'' or not to ``Here''", 
 Marks: queue for floats before: "3", 
 Marks: picking up from output {leftmark=6}{rightmark=27}{floats=4}
 Marks: found 0 entries for floats (new 4; old 4)
@@ -5812,9 +5376,7 @@
 : -----\xor_curr_col_block::= 1_1
 : -----\xor_curr_col_block::= 2_1
 : -----Saving column (height) information:
-: -----\g_xor_best_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\
-int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0
-pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
+: -----\g_xor_best_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
 : ----leaving xor_save_col_hts:N
 : ---leaving xor_cols_setup:
 : ---entering xor_initialize_flush_data:
@@ -5850,8 +5412,7 @@
 : -output pen: -10008
 : -Forced break (-10008) seen on line ...
 : leaving xor_OR_collect:
-Marks: set leftmark <- \protect \MakeUppercase  {5\hskip 1em\relax User control
-} on line ...
+Marks: set leftmark <- \protect \MakeUppercase  {5\hskip 1em\relax User control} on line ...
 Marks: Setting mark {leftmark=7}{rightmark=28}{floats=4}
 Marks: set rightmark <-  on line ...
 Marks: Setting mark {leftmark=7}{rightmark=29}{floats=4}
@@ -5872,7 +5433,6 @@
 : -Forced break (-10008) seen on line ...
 : leaving xor_OR_collect:
 Marks: set rightmark <- 5.3\hskip 1em\relax Specifying preferred areas on line ...
-836
 Marks: Setting mark {leftmark=7}{rightmark=32}{floats=4}
 : Add grid alignment point
 : Adding badly guarded penalty -10008 to MVL
@@ -5880,8 +5440,7 @@
 : -output pen: -10008
 : -Forced break (-10008) seen on line ...
 : leaving xor_OR_collect:
-Marks: set rightmark <- 5.4\hskip 1em\relax Manually position all floats on lin
-e 848
+Marks: set rightmark <- 5.4\hskip 1em\relax Manually position all floats on line ...
 Marks: Setting mark {leftmark=7}{rightmark=33}{floats=4}
 : Add grid alignment point
 : Adding badly guarded penalty -10008 to MVL
@@ -5892,43 +5451,30 @@
 : entering float environment
 Marks: set floats <- 4 on line ...
 Marks: Setting mark {leftmark=7}{rightmark=33}{floats=5}
-: -{An example \texttt {fpl} file}{1}{fig:fpl}{4}{t12,b12,t11,b11,t21,b21}{tabl
-e}{4}
+: -{An example \texttt {fpl} file}{1}{fig:fpl}{4}{t12,b12,t11,b11,t21,b21}{table}{4}
 : leaving float environment
 : entering xor_OR_collect:
 : -output pen: 10000
 : -CHECK: Saving output penalty (10000)
 : -Re-adding forced break(s) for splitting
 Marks: saving state on line ...
-Marks: queue for leftmark before: "\protect \MakeUppercase  {4\hskip 1em\relax 
-The processing model}", "\protect \MakeUppercase  {5\hskip 1em\relax User contr
-ol}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {4\hskip 1em\relax The processing model}", "\protect \MakeUppercase  {5\hskip 1em\relax User control}", 
 Marks: picking up from output {leftmark=7}{rightmark=33}{floats=5}
 Marks: found 1 entries for leftmark (new 7; old 6)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {4\hskip 1em\relax The 
-processing model}}{\protect \MakeUppercase  {5\hskip 1em\relax User control}}{\
-protect \MakeUppercase  {5\hskip 1em\relax User control}} on line ...
-Marks: queue for leftmark after: "\protect \MakeUppercase  {5\hskip 1em\relax U
-ser control}", 
-Marks: queue for rightmark before: "4.12\hskip 1em\relax To ``Here'' or not to 
-``Here''", "4.13\hskip 1em\relax Grid layout", "", "5.1\hskip 1em\relax Column 
-and page breaks", "5.2\hskip 1em\relax Manual float flushing", "5.3\hskip 1em\r
-elax Specifying preferred areas", "5.4\hskip 1em\relax Manually position all fl
-oats", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {4\hskip 1em\relax The processing model}}{\protect \MakeUppercase  {5\hskip 1em\relax User control}}{\protect \MakeUppercase  {5\hskip 1em\relax User control}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {5\hskip 1em\relax User control}", 
+Marks: queue for rightmark before: "4.12\hskip 1em\relax To ``Here'' or not to ``Here''", "4.13\hskip 1em\relax Grid layout", "", "5.1\hskip 1em\relax Column and page breaks", "5.2\hskip 1em\relax Manual float flushing", "5.3\hskip 1em\relax Specifying preferred areas", "5.4\hskip 1em\relax Manually position all floats", 
 Marks: picking up from output {leftmark=7}{rightmark=33}{floats=5}
 Marks: found 6 entries for rightmark (new 33; old 27)
-Marks: in output: rightmark -> {4.12\hskip 1em\relax To ``Here'' or not to ``He
-re''}{4.13\hskip 1em\relax Grid layout}{5.4\hskip 1em\relax Manually position a
-ll floats} on line ...
-Marks: queue for rightmark after: "5.4\hskip 1em\relax Manually position all fl
-oats", 
+Marks: in output: rightmark -> {4.12\hskip 1em\relax To ``Here'' or not to ``Here''}{4.13\hskip 1em\relax Grid layout}{5.4\hskip 1em\relax Manually position all floats} on line ...
+Marks: queue for rightmark after: "5.4\hskip 1em\relax Manually position all floats", 
 Marks: queue for floats before: "3", "4", 
 Marks: picking up from output {leftmark=7}{rightmark=33}{floats=5}
 Marks: found 1 entries for floats (new 5; old 4)
 Marks: in output: floats -> {3}{4}{4} on line ...
 Marks: queue for floats after: "4", 
 : -entering xor_trial_place_float_setup:
- STATS: floats waiting = 1 (\bx at D  ) on page 8
+STATS: floats waiting = 1 (\bx at D  ) on page 8
 =======================================================================
 : --flush: tighten placement conditions
 : --BALANCE: g_xor_trial_balance_done_int <- 0
@@ -5953,9 +5499,7 @@
 : ---\xor_curr_col_block::= 1_1
 : ---\xor_curr_col_block::= 2_1
 : ---Saving column (height) information:
-: ---\g_xor_saved_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\i
-nt_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0p
-t}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
+: ---\g_xor_saved_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
 : --leaving xor_save_col_hts:N
 : --entering xor_OR_trial_grab_balance_setup:
 : ---BALANCE: g_xor_trial_balance_seen_int <- 0
@@ -6002,32 +5546,16 @@
 : -grab col: 1 of 2
 : -vsize: 612.0pt; pagegoal: 612.0pt
 : -entering xor_OR_trial_finish_block_or_col:
-Marks: queue for leftmark before: "\protect \MakeUppercase  {4\hskip 1em\relax 
-The processing model}", "\protect \MakeUppercase  {5\hskip 1em\relax User contr
-ol}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {4\hskip 1em\relax The processing model}", "\protect \MakeUppercase  {5\hskip 1em\relax User control}", 
 Marks: picking up from output {leftmark=6}{rightmark=28}{floats=4}
 Marks: found 0 entries for leftmark (new 6; old 6)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {4\hskip 1em\relax The 
-processing model}}{\protect \MakeUppercase  {4\hskip 1em\relax The processing m
-odel}}{\protect \MakeUppercase  {4\hskip 1em\relax The processing model}} on li
-ne 912
-Marks: queue for leftmark after: "\protect \MakeUppercase  {4\hskip 1em\relax T
-he processing model}", "\protect \MakeUppercase  {5\hskip 1em\relax User contro
-l}", 
-Marks: queue for rightmark before: "4.12\hskip 1em\relax To ``Here'' or not to 
-``Here''", "4.13\hskip 1em\relax Grid layout", "", "5.1\hskip 1em\relax Column 
-and page breaks", "5.2\hskip 1em\relax Manual float flushing", "5.3\hskip 1em\r
-elax Specifying preferred areas", "5.4\hskip 1em\relax Manually position all fl
-oats", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {4\hskip 1em\relax The processing model}}{\protect \MakeUppercase  {4\hskip 1em\relax The processing model}}{\protect \MakeUppercase  {4\hskip 1em\relax The processing model}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {4\hskip 1em\relax The processing model}", "\protect \MakeUppercase  {5\hskip 1em\relax User control}", 
+Marks: queue for rightmark before: "4.12\hskip 1em\relax To ``Here'' or not to ``Here''", "4.13\hskip 1em\relax Grid layout", "", "5.1\hskip 1em\relax Column and page breaks", "5.2\hskip 1em\relax Manual float flushing", "5.3\hskip 1em\relax Specifying preferred areas", "5.4\hskip 1em\relax Manually position all floats", 
 Marks: picking up from output {leftmark=6}{rightmark=28}{floats=4}
 Marks: found 1 entries for rightmark (new 28; old 27)
-Marks: in output: rightmark -> {4.12\hskip 1em\relax To ``Here'' or not to ``He
-re''}{4.13\hskip 1em\relax Grid layout}{4.13\hskip 1em\relax Grid layout} on li
-ne 912
-Marks: queue for rightmark after: "4.13\hskip 1em\relax Grid layout", "", "5.1\
-hskip 1em\relax Column and page breaks", "5.2\hskip 1em\relax Manual float flus
-hing", "5.3\hskip 1em\relax Specifying preferred areas", "5.4\hskip 1em\relax M
-anually position all floats", 
+Marks: in output: rightmark -> {4.12\hskip 1em\relax To ``Here'' or not to ``Here''}{4.13\hskip 1em\relax Grid layout}{4.13\hskip 1em\relax Grid layout} on line ...
+Marks: queue for rightmark after: "4.13\hskip 1em\relax Grid layout", "", "5.1\hskip 1em\relax Column and page breaks", "5.2\hskip 1em\relax Manual float flushing", "5.3\hskip 1em\relax Specifying preferred areas", "5.4\hskip 1em\relax Manually position all floats", 
 Marks: queue for floats before: "3", "4", 
 Marks: picking up from output {leftmark=6}{rightmark=28}{floats=4}
 Marks: found 0 entries for floats (new 4; old 4)
@@ -6146,26 +5674,16 @@
 : -grab col: 2 of 2
 : -vsize: 612.0pt; pagegoal: 496.52283pt
 : -entering xor_OR_trial_finish_block_or_col:
-Marks: queue for leftmark before: "\protect \MakeUppercase  {4\hskip 1em\relax 
-The processing model}", "\protect \MakeUppercase  {5\hskip 1em\relax User contr
-ol}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {4\hskip 1em\relax The processing model}", "\protect \MakeUppercase  {5\hskip 1em\relax User control}", 
 Marks: picking up from output {leftmark=7}{rightmark=33}{floats=4}
 Marks: found 1 entries for leftmark (new 7; old 6)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {4\hskip 1em\relax The 
-processing model}}{\protect \MakeUppercase  {5\hskip 1em\relax User control}}{\
-protect \MakeUppercase  {5\hskip 1em\relax User control}} on line ...
-Marks: queue for leftmark after: "\protect \MakeUppercase  {5\hskip 1em\relax U
-ser control}", 
-Marks: queue for rightmark before: "4.13\hskip 1em\relax Grid layout", "", "5.1
-\hskip 1em\relax Column and page breaks", "5.2\hskip 1em\relax Manual float flu
-shing", "5.3\hskip 1em\relax Specifying preferred areas", "5.4\hskip 1em\relax 
-Manually position all floats", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {4\hskip 1em\relax The processing model}}{\protect \MakeUppercase  {5\hskip 1em\relax User control}}{\protect \MakeUppercase  {5\hskip 1em\relax User control}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {5\hskip 1em\relax User control}", 
+Marks: queue for rightmark before: "4.13\hskip 1em\relax Grid layout", "", "5.1\hskip 1em\relax Column and page breaks", "5.2\hskip 1em\relax Manual float flushing", "5.3\hskip 1em\relax Specifying preferred areas", "5.4\hskip 1em\relax Manually position all floats", 
 Marks: picking up from output {leftmark=7}{rightmark=33}{floats=4}
 Marks: found 5 entries for rightmark (new 33; old 28)
-Marks: in output: rightmark -> {4.13\hskip 1em\relax Grid layout}{}{5.4\hskip 1
-em\relax Manually position all floats} on line ...
-Marks: queue for rightmark after: "5.4\hskip 1em\relax Manually position all fl
-oats", 
+Marks: in output: rightmark -> {4.13\hskip 1em\relax Grid layout}{}{5.4\hskip 1em\relax Manually position all floats} on line ...
+Marks: queue for rightmark after: "5.4\hskip 1em\relax Manually position all floats", 
 Marks: queue for floats before: "3", "4", 
 Marks: picking up from output {leftmark=7}{rightmark=33}{floats=4}
 Marks: found 0 entries for floats (new 4; old 4)
@@ -6212,21 +5730,21 @@
 : -- {4}
 : -- g_xor_this_areas_open_clist <- b12,b11,b21
 : -- g_xor_this_areas_closed_clist <- 
- {4}  {table} (floats)  {4}   {\g_xor_curr_float_box_tl }
+{4}  {table} (floats)  {4}   {\g_xor_curr_float_box_tl }
 : --g_xor_saved_this_areas_open_clist (init): b12,b11,b21 := b12,b11,b21
 : --entering xor_try_this_area_std:
 : ---BALANCE: g_xor_trial_balance_done_int <- 0
 : ---(Re)initializing column heights ...
 : ---area trial: b12
- area trial: b12
+area trial: b12
 : ---span count unsuitable: b12 /= 1
- -> failed: span count b12 /= 1
+-> failed: span count b12 /= 1
 : --leaving xor_try_this_area_std:
 : --entering xor_try_this_area_std:
 : ---BALANCE: g_xor_trial_balance_done_int <- 0
 : ---(Re)initializing column heights ...
 : ---area trial: b11
- area trial: b11
+area trial: b11
 : ---span count okay: b11 = 1
 : ---area not closed for all types: not member of ()
 : ---area open for class floats; not member of ()
@@ -6234,8 +5752,7 @@
 : ----looking at column: 1
 : ----entering xor_construct_and_test_col_ht:nnn
 : -----col height before: 612.0pt (\g_xor_ht_col_1_1_dim)
-: -----first float in any b in column 1: adding \g_xor_float_text_skip=36.0pt m
-inus 8.0pt
+: -----first float in any b in column 1: adding \g_xor_float_text_skip=36.0pt minus 8.0pt
 : -----GRID: grid size used: 12.0pt
 : -----GRID: \g_xor_returned_lower_size_tl=240.0pt
 : -----GRID: \g_xor_returned_lower_delta_size_tl=2.65271pt
@@ -6257,9 +5774,7 @@
 : ----\xor_curr_col_block::= 1_1
 : ----\xor_curr_col_block::= 2_1
 : ----Saving column (height) information:
-: ----\g_xor_saved_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\
-int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {372.0
-pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
+: ----\g_xor_saved_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {372.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
 : ---leaving xor_save_col_hts:N
 : ---entering xor_OR_trial_grab_balance_setup:
 : ----BALANCE: g_xor_trial_balance_seen_int <- 0
@@ -6307,32 +5822,16 @@
 : -grab col: 1 of 2
 : -vsize: 372.0pt; pagegoal: 372.0pt
 : -entering xor_OR_trial_finish_block_or_col:
-Marks: queue for leftmark before: "\protect \MakeUppercase  {4\hskip 1em\relax 
-The processing model}", "\protect \MakeUppercase  {5\hskip 1em\relax User contr
-ol}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {4\hskip 1em\relax The processing model}", "\protect \MakeUppercase  {5\hskip 1em\relax User control}", 
 Marks: picking up from output {leftmark=6}{rightmark=28}{floats=4}
 Marks: found 0 entries for leftmark (new 6; old 6)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {4\hskip 1em\relax The 
-processing model}}{\protect \MakeUppercase  {4\hskip 1em\relax The processing m
-odel}}{\protect \MakeUppercase  {4\hskip 1em\relax The processing model}} on li
-ne 912
-Marks: queue for leftmark after: "\protect \MakeUppercase  {4\hskip 1em\relax T
-he processing model}", "\protect \MakeUppercase  {5\hskip 1em\relax User contro
-l}", 
-Marks: queue for rightmark before: "4.12\hskip 1em\relax To ``Here'' or not to 
-``Here''", "4.13\hskip 1em\relax Grid layout", "", "5.1\hskip 1em\relax Column 
-and page breaks", "5.2\hskip 1em\relax Manual float flushing", "5.3\hskip 1em\r
-elax Specifying preferred areas", "5.4\hskip 1em\relax Manually position all fl
-oats", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {4\hskip 1em\relax The processing model}}{\protect \MakeUppercase  {4\hskip 1em\relax The processing model}}{\protect \MakeUppercase  {4\hskip 1em\relax The processing model}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {4\hskip 1em\relax The processing model}", "\protect \MakeUppercase  {5\hskip 1em\relax User control}", 
+Marks: queue for rightmark before: "4.12\hskip 1em\relax To ``Here'' or not to ``Here''", "4.13\hskip 1em\relax Grid layout", "", "5.1\hskip 1em\relax Column and page breaks", "5.2\hskip 1em\relax Manual float flushing", "5.3\hskip 1em\relax Specifying preferred areas", "5.4\hskip 1em\relax Manually position all floats", 
 Marks: picking up from output {leftmark=6}{rightmark=28}{floats=4}
 Marks: found 1 entries for rightmark (new 28; old 27)
-Marks: in output: rightmark -> {4.12\hskip 1em\relax To ``Here'' or not to ``He
-re''}{4.13\hskip 1em\relax Grid layout}{4.13\hskip 1em\relax Grid layout} on li
-ne 912
-Marks: queue for rightmark after: "4.13\hskip 1em\relax Grid layout", "", "5.1\
-hskip 1em\relax Column and page breaks", "5.2\hskip 1em\relax Manual float flus
-hing", "5.3\hskip 1em\relax Specifying preferred areas", "5.4\hskip 1em\relax M
-anually position all floats", 
+Marks: in output: rightmark -> {4.12\hskip 1em\relax To ``Here'' or not to ``Here''}{4.13\hskip 1em\relax Grid layout}{4.13\hskip 1em\relax Grid layout} on line ...
+Marks: queue for rightmark after: "4.13\hskip 1em\relax Grid layout", "", "5.1\hskip 1em\relax Column and page breaks", "5.2\hskip 1em\relax Manual float flushing", "5.3\hskip 1em\relax Specifying preferred areas", "5.4\hskip 1em\relax Manually position all floats", 
 Marks: queue for floats before: "3", "4", 
 Marks: picking up from output {leftmark=6}{rightmark=28}{floats=4}
 Marks: found 0 entries for floats (new 4; old 4)
@@ -6347,7 +5846,7 @@
 : --entering xor_check_callout_after:n
 : ---entering xor_check_callout_column:n
 : ----Last callout (floats) = 3
- -> failed: last callout 3 < 4 last float placed in column 1
+-> failed: last callout 3 < 4 last float placed in column 1
 : ----Failed: (floats) last callout 3 < 4 last float placed
 : ---leaving xor_check_callout_column:n
 : --leaving xor_check_callout_after:n
@@ -6404,7 +5903,7 @@
 : --BALANCE: g_xor_trial_balance_done_int <- 0
 : --(Re)initializing column heights ...
 : --area trial: b21
- area trial: b21
+area trial: b21
 : --span count okay: b21 = 1
 : --area not closed for all types: not member of ()
 : --area open for class floats; not member of ()
@@ -6412,8 +5911,7 @@
 : ---looking at column: 2
 : ---entering xor_construct_and_test_col_ht:nnn
 : ----col height before: 612.0pt (\g_xor_ht_col_2_1_dim)
-: ----first float in any b in column 2: adding \g_xor_float_text_skip=36.0pt mi
-nus 8.0pt
+: ----first float in any b in column 2: adding \g_xor_float_text_skip=36.0pt minus 8.0pt
 : ----GRID: grid size used: 12.0pt
 : ----GRID: \g_xor_returned_lower_size_tl=240.0pt
 : ----GRID: \g_xor_returned_lower_delta_size_tl=2.65271pt
@@ -6435,9 +5933,7 @@
 : ---\xor_curr_col_block::= 1_1
 : ---\xor_curr_col_block::= 2_1
 : ---Saving column (height) information:
-: ---\g_xor_saved_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\i
-nt_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0p
-t}\dim_gset:Nn \g_xor_ht_col_2_1_dim {372.0pt}
+: ---\g_xor_saved_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {372.0pt}
 : --leaving xor_save_col_hts:N
 : --entering xor_OR_trial_grab_balance_setup:
 : ---BALANCE: g_xor_trial_balance_seen_int <- 0
@@ -6484,32 +5980,16 @@
 : -grab col: 1 of 2
 : -vsize: 612.0pt; pagegoal: 612.0pt
 : -entering xor_OR_trial_finish_block_or_col:
-Marks: queue for leftmark before: "\protect \MakeUppercase  {4\hskip 1em\relax 
-The processing model}", "\protect \MakeUppercase  {5\hskip 1em\relax User contr
-ol}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {4\hskip 1em\relax The processing model}", "\protect \MakeUppercase  {5\hskip 1em\relax User control}", 
 Marks: picking up from output {leftmark=6}{rightmark=28}{floats=4}
 Marks: found 0 entries for leftmark (new 6; old 6)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {4\hskip 1em\relax The 
-processing model}}{\protect \MakeUppercase  {4\hskip 1em\relax The processing m
-odel}}{\protect \MakeUppercase  {4\hskip 1em\relax The processing model}} on li
-ne 912
-Marks: queue for leftmark after: "\protect \MakeUppercase  {4\hskip 1em\relax T
-he processing model}", "\protect \MakeUppercase  {5\hskip 1em\relax User contro
-l}", 
-Marks: queue for rightmark before: "4.12\hskip 1em\relax To ``Here'' or not to 
-``Here''", "4.13\hskip 1em\relax Grid layout", "", "5.1\hskip 1em\relax Column 
-and page breaks", "5.2\hskip 1em\relax Manual float flushing", "5.3\hskip 1em\r
-elax Specifying preferred areas", "5.4\hskip 1em\relax Manually position all fl
-oats", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {4\hskip 1em\relax The processing model}}{\protect \MakeUppercase  {4\hskip 1em\relax The processing model}}{\protect \MakeUppercase  {4\hskip 1em\relax The processing model}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {4\hskip 1em\relax The processing model}", "\protect \MakeUppercase  {5\hskip 1em\relax User control}", 
+Marks: queue for rightmark before: "4.12\hskip 1em\relax To ``Here'' or not to ``Here''", "4.13\hskip 1em\relax Grid layout", "", "5.1\hskip 1em\relax Column and page breaks", "5.2\hskip 1em\relax Manual float flushing", "5.3\hskip 1em\relax Specifying preferred areas", "5.4\hskip 1em\relax Manually position all floats", 
 Marks: picking up from output {leftmark=6}{rightmark=28}{floats=4}
 Marks: found 1 entries for rightmark (new 28; old 27)
-Marks: in output: rightmark -> {4.12\hskip 1em\relax To ``Here'' or not to ``He
-re''}{4.13\hskip 1em\relax Grid layout}{4.13\hskip 1em\relax Grid layout} on li
-ne 912
-Marks: queue for rightmark after: "4.13\hskip 1em\relax Grid layout", "", "5.1\
-hskip 1em\relax Column and page breaks", "5.2\hskip 1em\relax Manual float flus
-hing", "5.3\hskip 1em\relax Specifying preferred areas", "5.4\hskip 1em\relax M
-anually position all floats", 
+Marks: in output: rightmark -> {4.12\hskip 1em\relax To ``Here'' or not to ``Here''}{4.13\hskip 1em\relax Grid layout}{4.13\hskip 1em\relax Grid layout} on line ...
+Marks: queue for rightmark after: "4.13\hskip 1em\relax Grid layout", "", "5.1\hskip 1em\relax Column and page breaks", "5.2\hskip 1em\relax Manual float flushing", "5.3\hskip 1em\relax Specifying preferred areas", "5.4\hskip 1em\relax Manually position all floats", 
 Marks: queue for floats before: "3", "4", 
 Marks: picking up from output {leftmark=6}{rightmark=28}{floats=4}
 Marks: found 0 entries for floats (new 4; old 4)
@@ -6591,27 +6071,16 @@
 : -grab col: 2 of 2
 : -vsize: 372.0pt; pagegoal: 256.52283pt
 : -entering xor_OR_trial_finish_block_or_col:
-Marks: queue for leftmark before: "\protect \MakeUppercase  {4\hskip 1em\relax 
-The processing model}", "\protect \MakeUppercase  {5\hskip 1em\relax User contr
-ol}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {4\hskip 1em\relax The processing model}", "\protect \MakeUppercase  {5\hskip 1em\relax User control}", 
 Marks: picking up from output {leftmark=7}{rightmark=31}{floats=4}
 Marks: found 1 entries for leftmark (new 7; old 6)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {4\hskip 1em\relax The 
-processing model}}{\protect \MakeUppercase  {5\hskip 1em\relax User control}}{\
-protect \MakeUppercase  {5\hskip 1em\relax User control}} on line ...
-Marks: queue for leftmark after: "\protect \MakeUppercase  {5\hskip 1em\relax U
-ser control}", 
-Marks: queue for rightmark before: "4.13\hskip 1em\relax Grid layout", "", "5.1
-\hskip 1em\relax Column and page breaks", "5.2\hskip 1em\relax Manual float flu
-shing", "5.3\hskip 1em\relax Specifying preferred areas", "5.4\hskip 1em\relax 
-Manually position all floats", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {4\hskip 1em\relax The processing model}}{\protect \MakeUppercase  {5\hskip 1em\relax User control}}{\protect \MakeUppercase  {5\hskip 1em\relax User control}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {5\hskip 1em\relax User control}", 
+Marks: queue for rightmark before: "4.13\hskip 1em\relax Grid layout", "", "5.1\hskip 1em\relax Column and page breaks", "5.2\hskip 1em\relax Manual float flushing", "5.3\hskip 1em\relax Specifying preferred areas", "5.4\hskip 1em\relax Manually position all floats", 
 Marks: picking up from output {leftmark=7}{rightmark=31}{floats=4}
 Marks: found 3 entries for rightmark (new 31; old 28)
-Marks: in output: rightmark -> {4.13\hskip 1em\relax Grid layout}{}{5.2\hskip 1
-em\relax Manual float flushing} on line ...
-Marks: queue for rightmark after: "5.2\hskip 1em\relax Manual float flushing", 
-"5.3\hskip 1em\relax Specifying preferred areas", "5.4\hskip 1em\relax Manually
- position all floats", 
+Marks: in output: rightmark -> {4.13\hskip 1em\relax Grid layout}{}{5.2\hskip 1em\relax Manual float flushing} on line ...
+Marks: queue for rightmark after: "5.2\hskip 1em\relax Manual float flushing", "5.3\hskip 1em\relax Specifying preferred areas", "5.4\hskip 1em\relax Manually position all floats", 
 Marks: queue for floats before: "3", "4", 
 Marks: picking up from output {leftmark=7}{rightmark=31}{floats=4}
 Marks: found 0 entries for floats (new 4; old 4)
@@ -6624,7 +6093,7 @@
 : --entering xor_check_float_footnote_forbidden:
 : ---OK: no old bottom floats
 : ---this at area,column: b21, 2
- -> failed: column 2 contains footnotes and bottom floats
+-> failed: column 2 contains footnotes and bottom floats
 : ---Failed: column 2 contains footnotes and bottom floats
 : --leaving xor_check_float_footnote_forbidden:
 : --entering xor_evaluate_trial_results:
@@ -6678,23 +6147,19 @@
 : -entering xor_attempt_to_defer_and_try_next_float:
 : --flush: no flush point seen;defer
 : -leaving xor_attempt_to_defer_and_try_next_float:
- -> failed: --> defer
+-> failed: --> defer
 : -g_xor_curr_page_areas_closed_clist <- "" + ""
 : -g_xor_this_areas_closed_clist <- "b12,b11,b21" (all closed)
 : -entering xor_try_next_float:
- STATS: trials = 4
+STATS: trials = 4
 : --entering xor_OR_best_cols_setup:
-: ---XX initial: \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col
-_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim_gset:Nn \g_xor
-_ht_col_2_1_dim {612.0pt}
+: ---XX initial: \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
 : ---entering xor_initialize_page_footins_ftnright:
 : ---leaving xor_initialize_page_footins_ftnright:
 : ---BALANCE: g_xor_trial_balance_seen_int <- 0
 : ---Setting up column heights:
 : ---BALANCE: working on new block
-: ---Setting up column heights: \int_gset:Nn \g_xor_col_1_block_int {1}\int_gse
-t:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim
-_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
+: ---Setting up column heights: \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
 : ---entering xor_OR_best_next_col_setup:
 : ----vsize <- 612.0pt
 : ----ftnspread: page= 8
@@ -6733,32 +6198,16 @@
 : -best col: 1 of 2
 : -vsize: 612.0pt; pagegoal: 612.0pt
 : -entering xor_OR_best_finish_col_or_block:
-Marks: queue for leftmark before: "\protect \MakeUppercase  {4\hskip 1em\relax 
-The processing model}", "\protect \MakeUppercase  {5\hskip 1em\relax User contr
-ol}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {4\hskip 1em\relax The processing model}", "\protect \MakeUppercase  {5\hskip 1em\relax User control}", 
 Marks: picking up from output {leftmark=6}{rightmark=28}{floats=4}
 Marks: found 0 entries for leftmark (new 6; old 6)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {4\hskip 1em\relax The 
-processing model}}{\protect \MakeUppercase  {4\hskip 1em\relax The processing m
-odel}}{\protect \MakeUppercase  {4\hskip 1em\relax The processing model}} on li
-ne 912
-Marks: queue for leftmark after: "\protect \MakeUppercase  {4\hskip 1em\relax T
-he processing model}", "\protect \MakeUppercase  {5\hskip 1em\relax User contro
-l}", 
-Marks: queue for rightmark before: "4.12\hskip 1em\relax To ``Here'' or not to 
-``Here''", "4.13\hskip 1em\relax Grid layout", "", "5.1\hskip 1em\relax Column 
-and page breaks", "5.2\hskip 1em\relax Manual float flushing", "5.3\hskip 1em\r
-elax Specifying preferred areas", "5.4\hskip 1em\relax Manually position all fl
-oats", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {4\hskip 1em\relax The processing model}}{\protect \MakeUppercase  {4\hskip 1em\relax The processing model}}{\protect \MakeUppercase  {4\hskip 1em\relax The processing model}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {4\hskip 1em\relax The processing model}", "\protect \MakeUppercase  {5\hskip 1em\relax User control}", 
+Marks: queue for rightmark before: "4.12\hskip 1em\relax To ``Here'' or not to ``Here''", "4.13\hskip 1em\relax Grid layout", "", "5.1\hskip 1em\relax Column and page breaks", "5.2\hskip 1em\relax Manual float flushing", "5.3\hskip 1em\relax Specifying preferred areas", "5.4\hskip 1em\relax Manually position all floats", 
 Marks: picking up from output {leftmark=6}{rightmark=28}{floats=4}
 Marks: found 1 entries for rightmark (new 28; old 27)
-Marks: in output: rightmark -> {4.12\hskip 1em\relax To ``Here'' or not to ``He
-re''}{4.13\hskip 1em\relax Grid layout}{4.13\hskip 1em\relax Grid layout} on li
-ne 912
-Marks: queue for rightmark after: "4.13\hskip 1em\relax Grid layout", "", "5.1\
-hskip 1em\relax Column and page breaks", "5.2\hskip 1em\relax Manual float flus
-hing", "5.3\hskip 1em\relax Specifying preferred areas", "5.4\hskip 1em\relax M
-anually position all floats", 
+Marks: in output: rightmark -> {4.12\hskip 1em\relax To ``Here'' or not to ``Here''}{4.13\hskip 1em\relax Grid layout}{4.13\hskip 1em\relax Grid layout} on line ...
+Marks: queue for rightmark after: "4.13\hskip 1em\relax Grid layout", "", "5.1\hskip 1em\relax Column and page breaks", "5.2\hskip 1em\relax Manual float flushing", "5.3\hskip 1em\relax Specifying preferred areas", "5.4\hskip 1em\relax Manually position all floats", 
 Marks: queue for floats before: "3", "4", 
 Marks: picking up from output {leftmark=6}{rightmark=28}{floats=4}
 Marks: found 0 entries for floats (new 4; old 4)
@@ -6879,26 +6328,16 @@
 : -best col: 2 of 2
 : -vsize: 612.0pt; pagegoal: 496.52283pt
 : -entering xor_OR_best_finish_col_or_block:
-Marks: queue for leftmark before: "\protect \MakeUppercase  {4\hskip 1em\relax 
-The processing model}", "\protect \MakeUppercase  {5\hskip 1em\relax User contr
-ol}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {4\hskip 1em\relax The processing model}", "\protect \MakeUppercase  {5\hskip 1em\relax User control}", 
 Marks: picking up from output {leftmark=7}{rightmark=33}{floats=4}
 Marks: found 1 entries for leftmark (new 7; old 6)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {4\hskip 1em\relax The 
-processing model}}{\protect \MakeUppercase  {5\hskip 1em\relax User control}}{\
-protect \MakeUppercase  {5\hskip 1em\relax User control}} on line ...
-Marks: queue for leftmark after: "\protect \MakeUppercase  {5\hskip 1em\relax U
-ser control}", 
-Marks: queue for rightmark before: "4.13\hskip 1em\relax Grid layout", "", "5.1
-\hskip 1em\relax Column and page breaks", "5.2\hskip 1em\relax Manual float flu
-shing", "5.3\hskip 1em\relax Specifying preferred areas", "5.4\hskip 1em\relax 
-Manually position all floats", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {4\hskip 1em\relax The processing model}}{\protect \MakeUppercase  {5\hskip 1em\relax User control}}{\protect \MakeUppercase  {5\hskip 1em\relax User control}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {5\hskip 1em\relax User control}", 
+Marks: queue for rightmark before: "4.13\hskip 1em\relax Grid layout", "", "5.1\hskip 1em\relax Column and page breaks", "5.2\hskip 1em\relax Manual float flushing", "5.3\hskip 1em\relax Specifying preferred areas", "5.4\hskip 1em\relax Manually position all floats", 
 Marks: picking up from output {leftmark=7}{rightmark=33}{floats=4}
 Marks: found 5 entries for rightmark (new 33; old 28)
-Marks: in output: rightmark -> {4.13\hskip 1em\relax Grid layout}{}{5.4\hskip 1
-em\relax Manually position all floats} on line ...
-Marks: queue for rightmark after: "5.4\hskip 1em\relax Manually position all fl
-oats", 
+Marks: in output: rightmark -> {4.13\hskip 1em\relax Grid layout}{}{5.4\hskip 1em\relax Manually position all floats} on line ...
+Marks: queue for rightmark after: "5.4\hskip 1em\relax Manually position all floats", 
 Marks: queue for floats before: "3", "4", 
 Marks: picking up from output {leftmark=7}{rightmark=33}{floats=4}
 Marks: found 0 entries for floats (new 4; old 4)
@@ -6995,9 +6434,7 @@
 : -----\xor_curr_col_block::= 1_1
 : -----\xor_curr_col_block::= 2_1
 : -----Saving column (height) information:
-: -----\g_xor_best_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\
-int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0
-pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
+: -----\g_xor_best_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
 : ----leaving xor_save_col_hts:N
 : ---leaving xor_cols_setup:
 : ---entering xor_initialize_flush_data:
@@ -7015,36 +6452,28 @@
 : ---\bx at D : 3 ??? 4
 : ---\bx at D : not really deferred
 =======================================================================
- STATS: floats waiting = 0 on page 9 (float page)
+STATS: floats waiting = 0 on page 9 (float page)
 =======================================================================
 : ---entering xor_attempt_float_page:
 : ----entering xor_save_current_float_state:
-: -----saved: macro:->\cs_gset_nopar:Npn \g_xor_floats_active_seq {\s__seq }\di
-m_set:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim_set:Nn \g_xor_ht_col_2_1_dim {612.
-0pt}\int_gset:cn {g_xor_area_b12_float_int}{0}\gdef \g_xor_area_b12_float_seq {
-\s__seq }\int_gset:cn {g_xor_area_b11_float_int}{0}\gdef \g_xor_area_b11_float_
-seq {\s__seq }\int_gset:cn {g_xor_area_b21_float_int}{0}\gdef \g_xor_area_b21_f
-loat_seq {\s__seq }\int_gset:cn {g_xor_area_DDD_float_int}{0}\gdef \g_xor_area_
-DDD_float_seq {\s__seq }
+: -----saved: macro:->\cs_gset_nopar:Npn \g_xor_floats_active_seq {\s__seq }\dim_set:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim_set:Nn \g_xor_ht_col_2_1_dim {612.0pt}\int_gset:cn {g_xor_area_b12_float_int}{0}\gdef \g_xor_area_b12_float_seq {\s__seq }\int_gset:cn {g_xor_area_b11_float_int}{0}\gdef \g_xor_area_b11_float_seq {\s__seq }\int_gset:cn {g_xor_area_b21_float_int}{0}\gdef \g_xor_area_b21_float_seq {\s__seq }\int_gset:cn {g_xor_area_DDD_float_int}{0}\gdef \g_xor_area_DDD_float_seq {\s__seq }
 : ----leaving xor_save_current_float_state:
 : ----entering xor_trial_place_float_inner_loop:
 : ----leaving xor_trial_place_float_inner_loop:
 : ----entering xor_try_next_float:
- STATS: trials = 0
+STATS: trials = 0
 : ----leaving xor_try_next_float:
 : ----\box_ht:N 1=612.0pt
 : ----\box_ht:N 2=612.0pt
 : ----float page failed
- -> failed: no float page made
+-> failed: no float page made
 : ----entering xor_next_page_setup:
 : -----entering xor_cols_setup:
 : ------entering xor_save_col_hts:N (\g_xor_best_trial_col_hts_tl)
 : -------\xor_curr_col_block::= 1_1
 : -------\xor_curr_col_block::= 2_1
 : -------Saving column (height) information:
-: -------\g_xor_best_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1
-}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612
-.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
+: -------\g_xor_best_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
 : ------leaving xor_save_col_hts:N
 : -----leaving xor_cols_setup:
 : -----entering xor_initialize_flush_data:
@@ -7071,8 +6500,7 @@
 : -output pen: -20202
 : -reinsert penalty: 10000 (unless 10000 or < -9999)
 : leaving xor_OR_collect:
-Marks: set rightmark <- 5.5\hskip 1em\relax Tracing the algorithm's behavior on
- line 925
+Marks: set rightmark <- 5.5\hskip 1em\relax Tracing the algorithm's behavior on line ...
 Marks: Setting mark {leftmark=7}{rightmark=34}{floats=5}
 : Add grid alignment point
 : Adding badly guarded penalty -10008 to MVL
@@ -7080,46 +6508,38 @@
 Marks: set floats <- 5 on line ...
 Marks: Setting mark {leftmark=7}{rightmark=34}{floats=6}
 Overfull \hbox (42.44952pt too wide) in paragraph at lines 950--950
-[]\OT1/pcr/m/n/8 ==============================================================
-=========[] 
- []
+[]\OT1/pcr/m/n/8 =======================================================================[] 
+[]
 Overfull \hbox (42.44952pt too wide) in paragraph at lines 950--950
-[]\OT1/pcr/m/n/8 ==============================================================
-=========[] 
- []
+[]\OT1/pcr/m/n/8 =======================================================================[] 
+[]
 Overfull \hbox (61.64954pt too wide) in paragraph at lines 950--950
-[]\OT1/pcr/m/n/8 Float: \bx at E   {5}  {table} (floats)  {5}   {Statistics from t
-he algorithm}[] 
- []
+[]\OT1/pcr/m/n/8 Float: \bx at E   {5}  {table} (floats)  {5}   {Statistics from the algorithm}[] 
+[]
 Overfull \hbox (66.44954pt too wide) in paragraph at lines 950--950
-[]\OT1/pcr/m/n/8 Float: \bx at F   {6}  {table} (floats)  {6}   {Running times of 
-the algorithm}[] 
- []
-: -{Progress output of the algorithm}{2}{tab:progress}{5}{t12,b12,t11,b11,t21,b
-21}{table}{5}
+[]\OT1/pcr/m/n/8 Float: \bx at F   {6}  {table} (floats)  {6}   {Running times of the algorithm}[] 
+[]
+: -{Progress output of the algorithm}{2}{tab:progress}{5}{t12,b12,t11,b11,t21,b21}{table}{5}
 : leaving float environment
 : entering xor_OR_collect:
 : -output pen: -10008
 : -Forced break (-10008) seen on line ...
 : leaving xor_OR_collect:
-Marks: set rightmark <- 5.6\hskip 1em\relax Manually aligning text in grid layo
-ut on line ...
+Marks: set rightmark <- 5.6\hskip 1em\relax Manually aligning text in grid layout on line ...
 Marks: Setting mark {leftmark=7}{rightmark=35}{floats=6}
 : Add grid alignment point
 : Adding badly guarded penalty -10008 to MVL
 Underfull \hbox (badness 2302) in paragraph at lines 963--970
-\OT1/ptm/m/n/10 the com-mand []\OT1/pcr/m/n/10 \TextAlignGrid \OT1/ptm/m/n/10 w
-hich will align
- []
+\OT1/ptm/m/n/10 the com-mand []\OT1/pcr/m/n/10 \TextAlignGrid \OT1/ptm/m/n/10 which will align
+[]
 Underfull \hbox (badness 2903) in paragraph at lines 963--970
 \OT1/ptm/m/n/10 the cur-rent text line on the grid. By is-su-ing a
- []
+[]
 : entering xor_OR_collect:
 : -output pen: -10008
 : -Forced break (-10008) seen on line ...
 : leaving xor_OR_collect:
-Marks: set leftmark <- \protect \MakeUppercase  {6\hskip 1em\relax Layout Speci
-fication} on line ...
+Marks: set leftmark <- \protect \MakeUppercase  {6\hskip 1em\relax Layout Specification} on line ...
 Marks: Setting mark {leftmark=8}{rightmark=35}{floats=6}
 Marks: set rightmark <-  on line ...
 Marks: Setting mark {leftmark=8}{rightmark=36}{floats=6}
@@ -7141,11 +6561,10 @@
 : Adding badly guarded penalty -10008 to MVL
 Underfull \hbox (badness 10000) in paragraph at lines 995--999
 \OT1/ptm/m/n/10 Float types are de-clared us-ing the com-mand
- []
+[]
 Underfull \hbox (badness 1122) in paragraph at lines 995--999
-[]\OT1/pcr/m/n/10 \DeclareFloatType \OT1/ptm/m/n/10 which takes two ar-gu-ments
-:
- []
+[]\OT1/pcr/m/n/10 \DeclareFloatType \OT1/ptm/m/n/10 which takes two ar-gu-ments:
+[]
 : entering xor_OR_collect:
 : -output pen: -10008
 : -Forced break (-10008) seen on line ...
@@ -7167,34 +6586,23 @@
 : -CHECK: Saving output penalty (10000)
 : -Re-adding forced break(s) for splitting
 Marks: saving state on line ...
-Marks: queue for leftmark before: "\protect \MakeUppercase  {5\hskip 1em\relax 
-User control}", "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specificati
-on}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {5\hskip 1em\relax User control}", "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}", 
 Marks: picking up from output {leftmark=8}{rightmark=37}{floats=6}
 Marks: found 1 entries for leftmark (new 8; old 7)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {5\hskip 1em\relax User
- control}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}}{\
-protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}} on line ...
-Marks: queue for leftmark after: "\protect \MakeUppercase  {6\hskip 1em\relax L
-ayout Specification}", 
-Marks: queue for rightmark before: "5.4\hskip 1em\relax Manually position all f
-loats", "5.5\hskip 1em\relax Tracing the algorithm's behavior", "5.6\hskip 1em\
-relax Manually aligning text in grid layout", "", "6.1\hskip 1em\relax Float ty
-pe declarations", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {5\hskip 1em\relax User control}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}", 
+Marks: queue for rightmark before: "5.4\hskip 1em\relax Manually position all floats", "5.5\hskip 1em\relax Tracing the algorithm's behavior", "5.6\hskip 1em\relax Manually aligning text in grid layout", "", "6.1\hskip 1em\relax Float type declarations", 
 Marks: picking up from output {leftmark=8}{rightmark=37}{floats=6}
 Marks: found 4 entries for rightmark (new 37; old 33)
-Marks: in output: rightmark -> {5.4\hskip 1em\relax Manually position all float
-s}{5.5\hskip 1em\relax Tracing the algorithm's behavior}{6.1\hskip 1em\relax Fl
-oat type declarations} on line ...
-Marks: queue for rightmark after: "6.1\hskip 1em\relax Float type declarations"
-, 
+Marks: in output: rightmark -> {5.4\hskip 1em\relax Manually position all floats}{5.5\hskip 1em\relax Tracing the algorithm's behavior}{6.1\hskip 1em\relax Float type declarations} on line ...
+Marks: queue for rightmark after: "6.1\hskip 1em\relax Float type declarations", 
 Marks: queue for floats before: "3", "4", "5", 
 Marks: picking up from output {leftmark=8}{rightmark=37}{floats=6}
 Marks: found 2 entries for floats (new 6; old 4)
 Marks: in output: floats -> {3}{4}{5} on line ...
 Marks: queue for floats after: "5", 
 : -entering xor_trial_place_float_setup:
- STATS: floats waiting = 2 (\bx at D  \bx at E  ) on page 9
+STATS: floats waiting = 2 (\bx at D  \bx at E  ) on page 9
 =======================================================================
 : --flush: tighten placement conditions
 : --BALANCE: g_xor_trial_balance_done_int <- 0
@@ -7219,9 +6627,7 @@
 : ---\xor_curr_col_block::= 1_1
 : ---\xor_curr_col_block::= 2_1
 : ---Saving column (height) information:
-: ---\g_xor_saved_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\i
-nt_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0p
-t}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
+: ---\g_xor_saved_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
 : --leaving xor_save_col_hts:N
 : --entering xor_OR_trial_grab_balance_setup:
 : ---BALANCE: g_xor_trial_balance_seen_int <- 0
@@ -7291,28 +6697,16 @@
 : -grab col: 1 of 2
 : -vsize: 612.0pt; pagegoal: 612.0pt
 : -entering xor_OR_trial_finish_block_or_col:
-Marks: queue for leftmark before: "\protect \MakeUppercase  {5\hskip 1em\relax 
-User control}", "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specificati
-on}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {5\hskip 1em\relax User control}", "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}", 
 Marks: picking up from output {leftmark=7}{rightmark=35}{floats=6}
 Marks: found 0 entries for leftmark (new 7; old 7)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {5\hskip 1em\relax User
- control}}{\protect \MakeUppercase  {5\hskip 1em\relax User control}}{\protect 
-\MakeUppercase  {5\hskip 1em\relax User control}} on line ...
-Marks: queue for leftmark after: "\protect \MakeUppercase  {5\hskip 1em\relax U
-ser control}", "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specificatio
-n}", 
-Marks: queue for rightmark before: "5.4\hskip 1em\relax Manually position all f
-loats", "5.5\hskip 1em\relax Tracing the algorithm's behavior", "5.6\hskip 1em\
-relax Manually aligning text in grid layout", "", "6.1\hskip 1em\relax Float ty
-pe declarations", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {5\hskip 1em\relax User control}}{\protect \MakeUppercase  {5\hskip 1em\relax User control}}{\protect \MakeUppercase  {5\hskip 1em\relax User control}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {5\hskip 1em\relax User control}", "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}", 
+Marks: queue for rightmark before: "5.4\hskip 1em\relax Manually position all floats", "5.5\hskip 1em\relax Tracing the algorithm's behavior", "5.6\hskip 1em\relax Manually aligning text in grid layout", "", "6.1\hskip 1em\relax Float type declarations", 
 Marks: picking up from output {leftmark=7}{rightmark=35}{floats=6}
 Marks: found 2 entries for rightmark (new 35; old 33)
-Marks: in output: rightmark -> {5.4\hskip 1em\relax Manually position all float
-s}{5.5\hskip 1em\relax Tracing the algorithm's behavior}{5.6\hskip 1em\relax Ma
-nually aligning text in grid layout} on line ...
-Marks: queue for rightmark after: "5.6\hskip 1em\relax Manually aligning text i
-n grid layout", "", "6.1\hskip 1em\relax Float type declarations", 
+Marks: in output: rightmark -> {5.4\hskip 1em\relax Manually position all floats}{5.5\hskip 1em\relax Tracing the algorithm's behavior}{5.6\hskip 1em\relax Manually aligning text in grid layout} on line ...
+Marks: queue for rightmark after: "5.6\hskip 1em\relax Manually aligning text in grid layout", "", "6.1\hskip 1em\relax Float type declarations", 
 Marks: queue for floats before: "3", "4", "5", 
 Marks: picking up from output {leftmark=7}{rightmark=35}{floats=6}
 Marks: found 2 entries for floats (new 6; old 4)
@@ -7433,24 +6827,16 @@
 : -grab col: 2 of 2
 : -vsize: 612.0pt; pagegoal: 536.08754pt
 : -entering xor_OR_trial_finish_block_or_col:
-Marks: queue for leftmark before: "\protect \MakeUppercase  {5\hskip 1em\relax 
-User control}", "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specificati
-on}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {5\hskip 1em\relax User control}", "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}", 
 Marks: picking up from output {leftmark=8}{rightmark=37}{floats=6}
 Marks: found 1 entries for leftmark (new 8; old 7)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {5\hskip 1em\relax User
- control}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}}{\
-protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}} on line ...
-Marks: queue for leftmark after: "\protect \MakeUppercase  {6\hskip 1em\relax L
-ayout Specification}", 
-Marks: queue for rightmark before: "5.6\hskip 1em\relax Manually aligning text 
-in grid layout", "", "6.1\hskip 1em\relax Float type declarations", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {5\hskip 1em\relax User control}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}", 
+Marks: queue for rightmark before: "5.6\hskip 1em\relax Manually aligning text in grid layout", "", "6.1\hskip 1em\relax Float type declarations", 
 Marks: picking up from output {leftmark=8}{rightmark=37}{floats=6}
 Marks: found 2 entries for rightmark (new 37; old 35)
-Marks: in output: rightmark -> {5.6\hskip 1em\relax Manually aligning text in g
-rid layout}{}{6.1\hskip 1em\relax Float type declarations} on line ...
-Marks: queue for rightmark after: "6.1\hskip 1em\relax Float type declarations"
-, 
+Marks: in output: rightmark -> {5.6\hskip 1em\relax Manually aligning text in grid layout}{}{6.1\hskip 1em\relax Float type declarations} on line ...
+Marks: queue for rightmark after: "6.1\hskip 1em\relax Float type declarations", 
 Marks: queue for floats before: "5", 
 Marks: picking up from output {leftmark=8}{rightmark=37}{floats=6}
 Marks: found 0 entries for floats (new 6; old 6)
@@ -7501,21 +6887,21 @@
 : -- {4}
 : -- g_xor_this_areas_open_clist <- b12,b11,b21
 : -- g_xor_this_areas_closed_clist <- 
- {4}  {table} (floats)  {4}   {\g_xor_curr_float_box_tl }
+{4}  {table} (floats)  {4}   {\g_xor_curr_float_box_tl }
 : --g_xor_saved_this_areas_open_clist (init): b12,b11,b21 := b12,b11,b21
 : --entering xor_try_this_area_std:
 : ---BALANCE: g_xor_trial_balance_done_int <- 0
 : ---(Re)initializing column heights ...
 : ---area trial: b12
- area trial: b12
+area trial: b12
 : ---span count unsuitable: b12 /= 1
- -> failed: span count b12 /= 1
+-> failed: span count b12 /= 1
 : --leaving xor_try_this_area_std:
 : --entering xor_try_this_area_std:
 : ---BALANCE: g_xor_trial_balance_done_int <- 0
 : ---(Re)initializing column heights ...
 : ---area trial: b11
- area trial: b11
+area trial: b11
 : ---span count okay: b11 = 1
 : ---area not closed for all types: not member of ()
 : ---area open for class floats; not member of ()
@@ -7523,8 +6909,7 @@
 : ----looking at column: 1
 : ----entering xor_construct_and_test_col_ht:nnn
 : -----col height before: 612.0pt (\g_xor_ht_col_1_1_dim)
-: -----first float in any b in column 1: adding \g_xor_float_text_skip=36.0pt m
-inus 8.0pt
+: -----first float in any b in column 1: adding \g_xor_float_text_skip=36.0pt minus 8.0pt
 : -----GRID: grid size used: 12.0pt
 : -----GRID: \g_xor_returned_lower_size_tl=240.0pt
 : -----GRID: \g_xor_returned_lower_delta_size_tl=2.65271pt
@@ -7546,9 +6931,7 @@
 : ----\xor_curr_col_block::= 1_1
 : ----\xor_curr_col_block::= 2_1
 : ----Saving column (height) information:
-: ----\g_xor_saved_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\
-int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {372.0
-pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
+: ----\g_xor_saved_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {372.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
 : ---leaving xor_save_col_hts:N
 : ---entering xor_OR_trial_grab_balance_setup:
 : ----BALANCE: g_xor_trial_balance_seen_int <- 0
@@ -7573,30 +6956,16 @@
 : -grab col: 1 of 2
 : -vsize: 372.0pt; pagegoal: 372.0pt
 : -entering xor_OR_trial_finish_block_or_col:
-Marks: queue for leftmark before: "\protect \MakeUppercase  {5\hskip 1em\relax 
-User control}", "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specificati
-on}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {5\hskip 1em\relax User control}", "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}", 
 Marks: picking up from output {leftmark=7}{rightmark=33}{floats=5}
 Marks: found 0 entries for leftmark (new 7; old 7)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {5\hskip 1em\relax User
- control}}{\protect \MakeUppercase  {5\hskip 1em\relax User control}}{\protect 
-\MakeUppercase  {5\hskip 1em\relax User control}} on line ...
-Marks: queue for leftmark after: "\protect \MakeUppercase  {5\hskip 1em\relax U
-ser control}", "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specificatio
-n}", 
-Marks: queue for rightmark before: "5.4\hskip 1em\relax Manually position all f
-loats", "5.5\hskip 1em\relax Tracing the algorithm's behavior", "5.6\hskip 1em\
-relax Manually aligning text in grid layout", "", "6.1\hskip 1em\relax Float ty
-pe declarations", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {5\hskip 1em\relax User control}}{\protect \MakeUppercase  {5\hskip 1em\relax User control}}{\protect \MakeUppercase  {5\hskip 1em\relax User control}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {5\hskip 1em\relax User control}", "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}", 
+Marks: queue for rightmark before: "5.4\hskip 1em\relax Manually position all floats", "5.5\hskip 1em\relax Tracing the algorithm's behavior", "5.6\hskip 1em\relax Manually aligning text in grid layout", "", "6.1\hskip 1em\relax Float type declarations", 
 Marks: picking up from output {leftmark=7}{rightmark=33}{floats=5}
 Marks: found 0 entries for rightmark (new 33; old 33)
-Marks: in output: rightmark -> {5.4\hskip 1em\relax Manually position all float
-s}{5.4\hskip 1em\relax Manually position all floats}{5.4\hskip 1em\relax Manual
-ly position all floats} on line ...
-Marks: queue for rightmark after: "5.4\hskip 1em\relax Manually position all fl
-oats", "5.5\hskip 1em\relax Tracing the algorithm's behavior", "5.6\hskip 1em\r
-elax Manually aligning text in grid layout", "", "6.1\hskip 1em\relax Float typ
-e declarations", 
+Marks: in output: rightmark -> {5.4\hskip 1em\relax Manually position all floats}{5.4\hskip 1em\relax Manually position all floats}{5.4\hskip 1em\relax Manually position all floats} on line ...
+Marks: queue for rightmark after: "5.4\hskip 1em\relax Manually position all floats", "5.5\hskip 1em\relax Tracing the algorithm's behavior", "5.6\hskip 1em\relax Manually aligning text in grid layout", "", "6.1\hskip 1em\relax Float type declarations", 
 Marks: queue for floats before: "3", "4", "5", 
 Marks: picking up from output {leftmark=7}{rightmark=33}{floats=5}
 Marks: found 1 entries for floats (new 5; old 4)
@@ -7726,26 +7095,16 @@
 : -grab col: 2 of 2
 : -vsize: 612.0pt; pagegoal: 525.46945pt
 : -entering xor_OR_trial_finish_block_or_col:
-Marks: queue for leftmark before: "\protect \MakeUppercase  {5\hskip 1em\relax 
-User control}", "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specificati
-on}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {5\hskip 1em\relax User control}", "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}", 
 Marks: picking up from output {leftmark=8}{rightmark=36}{floats=6}
 Marks: found 1 entries for leftmark (new 8; old 7)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {5\hskip 1em\relax User
- control}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}}{\
-protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}} on line ...
-Marks: queue for leftmark after: "\protect \MakeUppercase  {6\hskip 1em\relax L
-ayout Specification}", 
-Marks: queue for rightmark before: "5.4\hskip 1em\relax Manually position all f
-loats", "5.5\hskip 1em\relax Tracing the algorithm's behavior", "5.6\hskip 1em\
-relax Manually aligning text in grid layout", "", "6.1\hskip 1em\relax Float ty
-pe declarations", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {5\hskip 1em\relax User control}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}", 
+Marks: queue for rightmark before: "5.4\hskip 1em\relax Manually position all floats", "5.5\hskip 1em\relax Tracing the algorithm's behavior", "5.6\hskip 1em\relax Manually aligning text in grid layout", "", "6.1\hskip 1em\relax Float type declarations", 
 Marks: picking up from output {leftmark=8}{rightmark=36}{floats=6}
 Marks: found 3 entries for rightmark (new 36; old 33)
-Marks: in output: rightmark -> {5.4\hskip 1em\relax Manually position all float
-s}{5.5\hskip 1em\relax Tracing the algorithm's behavior}{} on line ...
-Marks: queue for rightmark after: "", "6.1\hskip 1em\relax Float type declarati
-ons", 
+Marks: in output: rightmark -> {5.4\hskip 1em\relax Manually position all floats}{5.5\hskip 1em\relax Tracing the algorithm's behavior}{} on line ...
+Marks: queue for rightmark after: "", "6.1\hskip 1em\relax Float type declarations", 
 Marks: queue for floats before: "4", "5", 
 Marks: picking up from output {leftmark=8}{rightmark=36}{floats=6}
 Marks: found 1 entries for floats (new 6; old 5)
@@ -7769,10 +7128,8 @@
 : --entering xor_evaluate_trial_results:
 : ---fail: false
 : ---entering xor_update_best_trial:
- -> accepted
-: ----new best trial: \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xo
-r_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {372.0pt}\dim_gset:Nn \
-g_xor_ht_col_2_1_dim {612.0pt}
+-> accepted
+: ----new best trial: \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {372.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
 : ----entering xor_update_float_placement_data:
 : -----g_xor_curr_page_areas_closed_clist + ""
 : -----g_xor_this_areas_closed_clist  + "t12,t11"
@@ -7825,13 +7182,13 @@
 : -- {5}
 : -- g_xor_this_areas_open_clist <- b12,b11,b21
 : -- g_xor_this_areas_closed_clist <- t12,t11
- {5}  {table} (floats)  {5}   {\g_xor_curr_float_box_tl }
+{5}  {table} (floats)  {5}   {\g_xor_curr_float_box_tl }
 : --g_xor_saved_this_areas_open_clist (init): b12,b11,b21 := b12,b11,b21
 : --entering xor_try_this_area_std:
 : ---BALANCE: g_xor_trial_balance_done_int <- 0
 : ---(Re)initializing column heights ...
 : ---area trial: b12
- area trial: b12
+area trial: b12
 : ---span count okay: b12 = 2
 : ---area not closed for all types: not member of ()
 : ---area open for class floats; not member of (t12,t11)
@@ -7839,8 +7196,7 @@
 : ----looking at column: 2
 : ----entering xor_construct_and_test_col_ht:nnn
 : -----col height before: 612.0pt (\g_xor_ht_col_2_1_dim)
-: -----first float in any b in column 2: adding \g_xor_float_text_skip=36.0pt m
-inus 8.0pt
+: -----first float in any b in column 2: adding \g_xor_float_text_skip=36.0pt minus 8.0pt
 : -----GRID: grid size used: 12.0pt
 : -----GRID: \g_xor_returned_lower_size_tl=192.0pt
 : -----GRID: \g_xor_returned_lower_delta_size_tl=0.1807pt
@@ -7878,9 +7234,7 @@
 : ----\xor_curr_col_block::= 1_1
 : ----\xor_curr_col_block::= 2_1
 : ----Saving column (height) information:
-: ----\g_xor_saved_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\
-int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {192.0
-pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {420.0pt}
+: ----\g_xor_saved_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {192.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {420.0pt}
 : ---leaving xor_save_col_hts:N
 : ---entering xor_OR_trial_grab_balance_setup:
 : ----BALANCE: g_xor_trial_balance_seen_int <- 0
@@ -7905,30 +7259,16 @@
 : -grab col: 1 of 2
 : -vsize: 192.0pt; pagegoal: 192.0pt
 : -entering xor_OR_trial_finish_block_or_col:
-Marks: queue for leftmark before: "\protect \MakeUppercase  {5\hskip 1em\relax 
-User control}", "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specificati
-on}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {5\hskip 1em\relax User control}", "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}", 
 Marks: picking up from output {leftmark=7}{rightmark=33}{floats=5}
 Marks: found 0 entries for leftmark (new 7; old 7)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {5\hskip 1em\relax User
- control}}{\protect \MakeUppercase  {5\hskip 1em\relax User control}}{\protect 
-\MakeUppercase  {5\hskip 1em\relax User control}} on line ...
-Marks: queue for leftmark after: "\protect \MakeUppercase  {5\hskip 1em\relax U
-ser control}", "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specificatio
-n}", 
-Marks: queue for rightmark before: "5.4\hskip 1em\relax Manually position all f
-loats", "5.5\hskip 1em\relax Tracing the algorithm's behavior", "5.6\hskip 1em\
-relax Manually aligning text in grid layout", "", "6.1\hskip 1em\relax Float ty
-pe declarations", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {5\hskip 1em\relax User control}}{\protect \MakeUppercase  {5\hskip 1em\relax User control}}{\protect \MakeUppercase  {5\hskip 1em\relax User control}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {5\hskip 1em\relax User control}", "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}", 
+Marks: queue for rightmark before: "5.4\hskip 1em\relax Manually position all floats", "5.5\hskip 1em\relax Tracing the algorithm's behavior", "5.6\hskip 1em\relax Manually aligning text in grid layout", "", "6.1\hskip 1em\relax Float type declarations", 
 Marks: picking up from output {leftmark=7}{rightmark=33}{floats=5}
 Marks: found 0 entries for rightmark (new 33; old 33)
-Marks: in output: rightmark -> {5.4\hskip 1em\relax Manually position all float
-s}{5.4\hskip 1em\relax Manually position all floats}{5.4\hskip 1em\relax Manual
-ly position all floats} on line ...
-Marks: queue for rightmark after: "5.4\hskip 1em\relax Manually position all fl
-oats", "5.5\hskip 1em\relax Tracing the algorithm's behavior", "5.6\hskip 1em\r
-elax Manually aligning text in grid layout", "", "6.1\hskip 1em\relax Float typ
-e declarations", 
+Marks: in output: rightmark -> {5.4\hskip 1em\relax Manually position all floats}{5.4\hskip 1em\relax Manually position all floats}{5.4\hskip 1em\relax Manually position all floats} on line ...
+Marks: queue for rightmark after: "5.4\hskip 1em\relax Manually position all floats", "5.5\hskip 1em\relax Tracing the algorithm's behavior", "5.6\hskip 1em\relax Manually aligning text in grid layout", "", "6.1\hskip 1em\relax Float type declarations", 
 Marks: queue for floats before: "3", "4", "5", 
 Marks: picking up from output {leftmark=7}{rightmark=33}{floats=5}
 Marks: found 1 entries for floats (new 5; old 4)
@@ -7987,29 +7327,16 @@
 : -grab col: 2 of 2
 : -vsize: 420.0pt; pagegoal: 333.46945pt
 : -entering xor_OR_trial_finish_block_or_col:
-Marks: queue for leftmark before: "\protect \MakeUppercase  {5\hskip 1em\relax 
-User control}", "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specificati
-on}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {5\hskip 1em\relax User control}", "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}", 
 Marks: picking up from output {leftmark=7}{rightmark=34}{floats=6}
 Marks: found 0 entries for leftmark (new 7; old 7)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {5\hskip 1em\relax User
- control}}{\protect \MakeUppercase  {5\hskip 1em\relax User control}}{\protect 
-\MakeUppercase  {5\hskip 1em\relax User control}} on line ...
-Marks: queue for leftmark after: "\protect \MakeUppercase  {5\hskip 1em\relax U
-ser control}", "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specificatio
-n}", 
-Marks: queue for rightmark before: "5.4\hskip 1em\relax Manually position all f
-loats", "5.5\hskip 1em\relax Tracing the algorithm's behavior", "5.6\hskip 1em\
-relax Manually aligning text in grid layout", "", "6.1\hskip 1em\relax Float ty
-pe declarations", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {5\hskip 1em\relax User control}}{\protect \MakeUppercase  {5\hskip 1em\relax User control}}{\protect \MakeUppercase  {5\hskip 1em\relax User control}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {5\hskip 1em\relax User control}", "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}", 
+Marks: queue for rightmark before: "5.4\hskip 1em\relax Manually position all floats", "5.5\hskip 1em\relax Tracing the algorithm's behavior", "5.6\hskip 1em\relax Manually aligning text in grid layout", "", "6.1\hskip 1em\relax Float type declarations", 
 Marks: picking up from output {leftmark=7}{rightmark=34}{floats=6}
 Marks: found 1 entries for rightmark (new 34; old 33)
-Marks: in output: rightmark -> {5.4\hskip 1em\relax Manually position all float
-s}{5.5\hskip 1em\relax Tracing the algorithm's behavior}{5.5\hskip 1em\relax Tr
-acing the algorithm's behavior} on line ...
-Marks: queue for rightmark after: "5.5\hskip 1em\relax Tracing the algorithm's 
-behavior", "5.6\hskip 1em\relax Manually aligning text in grid layout", "", "6.
-1\hskip 1em\relax Float type declarations", 
+Marks: in output: rightmark -> {5.4\hskip 1em\relax Manually position all floats}{5.5\hskip 1em\relax Tracing the algorithm's behavior}{5.5\hskip 1em\relax Tracing the algorithm's behavior} on line ...
+Marks: queue for rightmark after: "5.5\hskip 1em\relax Tracing the algorithm's behavior", "5.6\hskip 1em\relax Manually aligning text in grid layout", "", "6.1\hskip 1em\relax Float type declarations", 
 Marks: queue for floats before: "4", "5", 
 Marks: picking up from output {leftmark=7}{rightmark=34}{floats=6}
 Marks: found 1 entries for floats (new 6; old 5)
@@ -8032,10 +7359,8 @@
 : --entering xor_evaluate_trial_results:
 : ---fail: false
 : ---entering xor_update_best_trial:
- -> accepted
-: ----new best trial: \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xo
-r_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {192.0pt}\dim_gset:Nn \
-g_xor_ht_col_2_1_dim {420.0pt}
+-> accepted
+: ----new best trial: \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {192.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {420.0pt}
 : ----entering xor_update_float_placement_data:
 : -----g_xor_curr_page_areas_closed_clist + ""
 : -----g_xor_this_areas_closed_clist t12,t11 + "t12,t11,b11"
@@ -8087,19 +7412,15 @@
 : -entering xor_trial_place_float_inner_loop:
 : -leaving xor_trial_place_float_inner_loop:
 : -entering xor_try_next_float:
- STATS: trials = 3
+STATS: trials = 3
 : --entering xor_OR_best_cols_setup:
-: ---XX initial: \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col
-_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {192.0pt}\dim_gset:Nn \g_xor
-_ht_col_2_1_dim {420.0pt}
+: ---XX initial: \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {192.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {420.0pt}
 : ---entering xor_initialize_page_footins_ftnright:
 : ---leaving xor_initialize_page_footins_ftnright:
 : ---BALANCE: g_xor_trial_balance_seen_int <- 0
 : ---Setting up column heights:
 : ---BALANCE: working on new block
-: ---Setting up column heights: \int_gset:Nn \g_xor_col_1_block_int {1}\int_gse
-t:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {192.0pt}\dim
-_gset:Nn \g_xor_ht_col_2_1_dim {420.0pt}
+: ---Setting up column heights: \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {192.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {420.0pt}
 : ---entering xor_OR_best_next_col_setup:
 : ----vsize <- 192.0pt
 : ----ftnspread: page= 9
@@ -8115,30 +7436,16 @@
 : -best col: 1 of 2
 : -vsize: 192.0pt; pagegoal: 192.0pt
 : -entering xor_OR_best_finish_col_or_block:
-Marks: queue for leftmark before: "\protect \MakeUppercase  {5\hskip 1em\relax 
-User control}", "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specificati
-on}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {5\hskip 1em\relax User control}", "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}", 
 Marks: picking up from output {leftmark=7}{rightmark=33}{floats=5}
 Marks: found 0 entries for leftmark (new 7; old 7)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {5\hskip 1em\relax User
- control}}{\protect \MakeUppercase  {5\hskip 1em\relax User control}}{\protect 
-\MakeUppercase  {5\hskip 1em\relax User control}} on line ...
-Marks: queue for leftmark after: "\protect \MakeUppercase  {5\hskip 1em\relax U
-ser control}", "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specificatio
-n}", 
-Marks: queue for rightmark before: "5.4\hskip 1em\relax Manually position all f
-loats", "5.5\hskip 1em\relax Tracing the algorithm's behavior", "5.6\hskip 1em\
-relax Manually aligning text in grid layout", "", "6.1\hskip 1em\relax Float ty
-pe declarations", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {5\hskip 1em\relax User control}}{\protect \MakeUppercase  {5\hskip 1em\relax User control}}{\protect \MakeUppercase  {5\hskip 1em\relax User control}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {5\hskip 1em\relax User control}", "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}", 
+Marks: queue for rightmark before: "5.4\hskip 1em\relax Manually position all floats", "5.5\hskip 1em\relax Tracing the algorithm's behavior", "5.6\hskip 1em\relax Manually aligning text in grid layout", "", "6.1\hskip 1em\relax Float type declarations", 
 Marks: picking up from output {leftmark=7}{rightmark=33}{floats=5}
 Marks: found 0 entries for rightmark (new 33; old 33)
-Marks: in output: rightmark -> {5.4\hskip 1em\relax Manually position all float
-s}{5.4\hskip 1em\relax Manually position all floats}{5.4\hskip 1em\relax Manual
-ly position all floats} on line ...
-Marks: queue for rightmark after: "5.4\hskip 1em\relax Manually position all fl
-oats", "5.5\hskip 1em\relax Tracing the algorithm's behavior", "5.6\hskip 1em\r
-elax Manually aligning text in grid layout", "", "6.1\hskip 1em\relax Float typ
-e declarations", 
+Marks: in output: rightmark -> {5.4\hskip 1em\relax Manually position all floats}{5.4\hskip 1em\relax Manually position all floats}{5.4\hskip 1em\relax Manually position all floats} on line ...
+Marks: queue for rightmark after: "5.4\hskip 1em\relax Manually position all floats", "5.5\hskip 1em\relax Tracing the algorithm's behavior", "5.6\hskip 1em\relax Manually aligning text in grid layout", "", "6.1\hskip 1em\relax Float type declarations", 
 Marks: queue for floats before: "3", "4", "5", 
 Marks: picking up from output {leftmark=7}{rightmark=33}{floats=5}
 Marks: found 1 entries for floats (new 5; old 4)
@@ -8190,29 +7497,16 @@
 : -best col: 2 of 2
 : -vsize: 420.0pt; pagegoal: 333.46945pt
 : -entering xor_OR_best_finish_col_or_block:
-Marks: queue for leftmark before: "\protect \MakeUppercase  {5\hskip 1em\relax 
-User control}", "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specificati
-on}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {5\hskip 1em\relax User control}", "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}", 
 Marks: picking up from output {leftmark=7}{rightmark=34}{floats=6}
 Marks: found 0 entries for leftmark (new 7; old 7)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {5\hskip 1em\relax User
- control}}{\protect \MakeUppercase  {5\hskip 1em\relax User control}}{\protect 
-\MakeUppercase  {5\hskip 1em\relax User control}} on line ...
-Marks: queue for leftmark after: "\protect \MakeUppercase  {5\hskip 1em\relax U
-ser control}", "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specificatio
-n}", 
-Marks: queue for rightmark before: "5.4\hskip 1em\relax Manually position all f
-loats", "5.5\hskip 1em\relax Tracing the algorithm's behavior", "5.6\hskip 1em\
-relax Manually aligning text in grid layout", "", "6.1\hskip 1em\relax Float ty
-pe declarations", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {5\hskip 1em\relax User control}}{\protect \MakeUppercase  {5\hskip 1em\relax User control}}{\protect \MakeUppercase  {5\hskip 1em\relax User control}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {5\hskip 1em\relax User control}", "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}", 
+Marks: queue for rightmark before: "5.4\hskip 1em\relax Manually position all floats", "5.5\hskip 1em\relax Tracing the algorithm's behavior", "5.6\hskip 1em\relax Manually aligning text in grid layout", "", "6.1\hskip 1em\relax Float type declarations", 
 Marks: picking up from output {leftmark=7}{rightmark=34}{floats=6}
 Marks: found 1 entries for rightmark (new 34; old 33)
-Marks: in output: rightmark -> {5.4\hskip 1em\relax Manually position all float
-s}{5.5\hskip 1em\relax Tracing the algorithm's behavior}{5.5\hskip 1em\relax Tr
-acing the algorithm's behavior} on line ...
-Marks: queue for rightmark after: "5.5\hskip 1em\relax Tracing the algorithm's 
-behavior", "5.6\hskip 1em\relax Manually aligning text in grid layout", "", "6.
-1\hskip 1em\relax Float type declarations", 
+Marks: in output: rightmark -> {5.4\hskip 1em\relax Manually position all floats}{5.5\hskip 1em\relax Tracing the algorithm's behavior}{5.5\hskip 1em\relax Tracing the algorithm's behavior} on line ...
+Marks: queue for rightmark after: "5.5\hskip 1em\relax Tracing the algorithm's behavior", "5.6\hskip 1em\relax Manually aligning text in grid layout", "", "6.1\hskip 1em\relax Float type declarations", 
 Marks: queue for floats before: "4", "5", 
 Marks: picking up from output {leftmark=7}{rightmark=34}{floats=6}
 Marks: found 1 entries for floats (new 6; old 5)
@@ -8321,9 +7615,7 @@
 : -----\xor_curr_col_block::= 1_1
 : -----\xor_curr_col_block::= 2_1
 : -----Saving column (height) information:
-: -----\g_xor_best_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\
-int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0
-pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
+: -----\g_xor_best_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
 : ----leaving xor_save_col_hts:N
 : ---leaving xor_cols_setup:
 : ---entering xor_initialize_flush_data:
@@ -8376,7 +7668,6 @@
 : -reinsert penalty: 10000 (unless 10000 or < -9999)
 : leaving xor_OR_collect:
 Marks: set rightmark <- 6.2\hskip 1em\relax Float area declarations on line ...
-6
 Marks: Setting mark {leftmark=8}{rightmark=38}{floats=6}
 : Add grid alignment point
 : Adding badly guarded penalty -10008 to MVL
@@ -8388,10 +7679,10 @@
 : Adding badly guarded penalty -10008 to MVL
 Underfull \hbox (badness 3281) in paragraph at lines 1072--1082
 \OT1/ptm/m/n/10 As of to-day an area is char-ac-ter-ized through the
- []
+[]
 Underfull \hbox (badness 1337) in paragraph at lines 1072--1082
 \OT1/ptm/m/n/10 max-i-mum num-ber of floats it is al-lowed to re-ceive
- []
+[]
 : entering xor_OR_collect:
 : -output pen: -10008
 : -Forced break (-10008) seen on line ...
@@ -8401,34 +7692,23 @@
 : -CHECK: Saving output penalty (100)
 : -Re-adding forced break(s) for splitting
 Marks: saving state on line ...
-Marks: queue for leftmark before: "\protect \MakeUppercase  {5\hskip 1em\relax 
-User control}", "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specificati
-on}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {5\hskip 1em\relax User control}", "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}", 
 Marks: picking up from output {leftmark=8}{rightmark=38}{floats=6}
 Marks: found 1 entries for leftmark (new 8; old 7)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {5\hskip 1em\relax User
- control}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}}{\
-protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}} on line ...
-Marks: queue for leftmark after: "\protect \MakeUppercase  {6\hskip 1em\relax L
-ayout Specification}", 
-Marks: queue for rightmark before: "5.5\hskip 1em\relax Tracing the algorithm's
- behavior", "5.6\hskip 1em\relax Manually aligning text in grid layout", "", "6
-.1\hskip 1em\relax Float type declarations", "6.2\hskip 1em\relax Float area de
-clarations", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {5\hskip 1em\relax User control}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}", 
+Marks: queue for rightmark before: "5.5\hskip 1em\relax Tracing the algorithm's behavior", "5.6\hskip 1em\relax Manually aligning text in grid layout", "", "6.1\hskip 1em\relax Float type declarations", "6.2\hskip 1em\relax Float area declarations", 
 Marks: picking up from output {leftmark=8}{rightmark=38}{floats=6}
 Marks: found 4 entries for rightmark (new 38; old 34)
-Marks: in output: rightmark -> {5.5\hskip 1em\relax Tracing the algorithm's beh
-avior}{5.6\hskip 1em\relax Manually aligning text in grid layout}{6.2\hskip 1em
-\relax Float area declarations} on line ...
-Marks: queue for rightmark after: "6.2\hskip 1em\relax Float area declarations"
-, 
+Marks: in output: rightmark -> {5.5\hskip 1em\relax Tracing the algorithm's behavior}{5.6\hskip 1em\relax Manually aligning text in grid layout}{6.2\hskip 1em\relax Float area declarations} on line ...
+Marks: queue for rightmark after: "6.2\hskip 1em\relax Float area declarations", 
 Marks: queue for floats before: "5", 
 Marks: picking up from output {leftmark=8}{rightmark=38}{floats=6}
 Marks: found 0 entries for floats (new 6; old 6)
 Marks: in output: floats -> {5}{5}{5} on line ...
 Marks: queue for floats after: "5", 
 : -entering xor_trial_place_float_setup:
- STATS: floats waiting = 0 () on page 10
+STATS: floats waiting = 0 () on page 10
 =======================================================================
 : --flush: tighten placement conditions
 : --BALANCE: g_xor_trial_balance_done_int <- 0
@@ -8453,9 +7733,7 @@
 : ---\xor_curr_col_block::= 1_1
 : ---\xor_curr_col_block::= 2_1
 : ---Saving column (height) information:
-: ---\g_xor_saved_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\i
-nt_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0p
-t}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
+: ---\g_xor_saved_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
 : --leaving xor_save_col_hts:N
 : --entering xor_OR_trial_grab_balance_setup:
 : ---BALANCE: g_xor_trial_balance_seen_int <- 0
@@ -8597,27 +7875,16 @@
 : -grab col: 1 of 2
 : -vsize: 612.0pt; pagegoal: 612.0pt
 : -entering xor_OR_trial_finish_block_or_col:
-Marks: queue for leftmark before: "\protect \MakeUppercase  {5\hskip 1em\relax 
-User control}", "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specificati
-on}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {5\hskip 1em\relax User control}", "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}", 
 Marks: picking up from output {leftmark=8}{rightmark=37}{floats=6}
 Marks: found 1 entries for leftmark (new 8; old 7)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {5\hskip 1em\relax User
- control}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}}{\
-protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}} on line ...
-Marks: queue for leftmark after: "\protect \MakeUppercase  {6\hskip 1em\relax L
-ayout Specification}", 
-Marks: queue for rightmark before: "5.5\hskip 1em\relax Tracing the algorithm's
- behavior", "5.6\hskip 1em\relax Manually aligning text in grid layout", "", "6
-.1\hskip 1em\relax Float type declarations", "6.2\hskip 1em\relax Float area de
-clarations", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {5\hskip 1em\relax User control}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}", 
+Marks: queue for rightmark before: "5.5\hskip 1em\relax Tracing the algorithm's behavior", "5.6\hskip 1em\relax Manually aligning text in grid layout", "", "6.1\hskip 1em\relax Float type declarations", "6.2\hskip 1em\relax Float area declarations", 
 Marks: picking up from output {leftmark=8}{rightmark=37}{floats=6}
 Marks: found 3 entries for rightmark (new 37; old 34)
-Marks: in output: rightmark -> {5.5\hskip 1em\relax Tracing the algorithm's beh
-avior}{5.6\hskip 1em\relax Manually aligning text in grid layout}{6.1\hskip 1em
-\relax Float type declarations} on line ...
-Marks: queue for rightmark after: "6.1\hskip 1em\relax Float type declarations"
-, "6.2\hskip 1em\relax Float area declarations", 
+Marks: in output: rightmark -> {5.5\hskip 1em\relax Tracing the algorithm's behavior}{5.6\hskip 1em\relax Manually aligning text in grid layout}{6.1\hskip 1em\relax Float type declarations} on line ...
+Marks: queue for rightmark after: "6.1\hskip 1em\relax Float type declarations", "6.2\hskip 1em\relax Float area declarations", 
 Marks: queue for floats before: "5", 
 Marks: picking up from output {leftmark=8}{rightmark=37}{floats=6}
 Marks: found 0 entries for floats (new 6; old 6)
@@ -8690,25 +7957,16 @@
 : -grab col: 2 of 2
 : -vsize: 612.0pt; pagegoal: 612.0pt
 : -entering xor_OR_trial_finish_block_or_col:
-Marks: queue for leftmark before: "\protect \MakeUppercase  {6\hskip 1em\relax 
-Layout Specification}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}", 
 Marks: picking up from output {leftmark=8}{rightmark=38}{floats=6}
 Marks: found 0 entries for leftmark (new 8; old 8)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {6\hskip 1em\relax Layo
-ut Specification}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specifica
-tion}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}} on li
-ne 1082
-Marks: queue for leftmark after: "\protect \MakeUppercase  {6\hskip 1em\relax L
-ayout Specification}", 
-Marks: queue for rightmark before: "6.1\hskip 1em\relax Float type declarations
-", "6.2\hskip 1em\relax Float area declarations", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}", 
+Marks: queue for rightmark before: "6.1\hskip 1em\relax Float type declarations", "6.2\hskip 1em\relax Float area declarations", 
 Marks: picking up from output {leftmark=8}{rightmark=38}{floats=6}
 Marks: found 1 entries for rightmark (new 38; old 37)
-Marks: in output: rightmark -> {6.1\hskip 1em\relax Float type declarations}{6.
-2\hskip 1em\relax Float area declarations}{6.2\hskip 1em\relax Float area decla
-rations} on line ...
-Marks: queue for rightmark after: "6.2\hskip 1em\relax Float area declarations"
-, 
+Marks: in output: rightmark -> {6.1\hskip 1em\relax Float type declarations}{6.2\hskip 1em\relax Float area declarations}{6.2\hskip 1em\relax Float area declarations} on line ...
+Marks: queue for rightmark after: "6.2\hskip 1em\relax Float area declarations", 
 Marks: queue for floats before: "5", 
 Marks: picking up from output {leftmark=8}{rightmark=38}{floats=6}
 Marks: found 0 entries for floats (new 6; old 6)
@@ -8745,19 +8003,15 @@
 : -entering xor_trial_place_float_inner_loop:
 : -leaving xor_trial_place_float_inner_loop:
 : -entering xor_try_next_float:
- STATS: trials = 0
+STATS: trials = 0
 : --entering xor_OR_best_cols_setup:
-: ---XX initial: \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col
-_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim_gset:Nn \g_xor
-_ht_col_2_1_dim {612.0pt}
+: ---XX initial: \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
 : ---entering xor_initialize_page_footins_ftnright:
 : ---leaving xor_initialize_page_footins_ftnright:
 : ---BALANCE: g_xor_trial_balance_seen_int <- 0
 : ---Setting up column heights:
 : ---BALANCE: working on new block
-: ---Setting up column heights: \int_gset:Nn \g_xor_col_1_block_int {1}\int_gse
-t:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim
-_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
+: ---Setting up column heights: \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
 : ---entering xor_OR_best_next_col_setup:
 : ----vsize <- 612.0pt
 : ----ftnspread: page= 10
@@ -8891,27 +8145,16 @@
 : -best col: 1 of 2
 : -vsize: 612.0pt; pagegoal: 612.0pt
 : -entering xor_OR_best_finish_col_or_block:
-Marks: queue for leftmark before: "\protect \MakeUppercase  {5\hskip 1em\relax 
-User control}", "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specificati
-on}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {5\hskip 1em\relax User control}", "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}", 
 Marks: picking up from output {leftmark=8}{rightmark=37}{floats=6}
 Marks: found 1 entries for leftmark (new 8; old 7)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {5\hskip 1em\relax User
- control}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}}{\
-protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}} on line ...
-Marks: queue for leftmark after: "\protect \MakeUppercase  {6\hskip 1em\relax L
-ayout Specification}", 
-Marks: queue for rightmark before: "5.5\hskip 1em\relax Tracing the algorithm's
- behavior", "5.6\hskip 1em\relax Manually aligning text in grid layout", "", "6
-.1\hskip 1em\relax Float type declarations", "6.2\hskip 1em\relax Float area de
-clarations", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {5\hskip 1em\relax User control}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}", 
+Marks: queue for rightmark before: "5.5\hskip 1em\relax Tracing the algorithm's behavior", "5.6\hskip 1em\relax Manually aligning text in grid layout", "", "6.1\hskip 1em\relax Float type declarations", "6.2\hskip 1em\relax Float area declarations", 
 Marks: picking up from output {leftmark=8}{rightmark=37}{floats=6}
 Marks: found 3 entries for rightmark (new 37; old 34)
-Marks: in output: rightmark -> {5.5\hskip 1em\relax Tracing the algorithm's beh
-avior}{5.6\hskip 1em\relax Manually aligning text in grid layout}{6.1\hskip 1em
-\relax Float type declarations} on line ...
-Marks: queue for rightmark after: "6.1\hskip 1em\relax Float type declarations"
-, "6.2\hskip 1em\relax Float area declarations", 
+Marks: in output: rightmark -> {5.5\hskip 1em\relax Tracing the algorithm's behavior}{5.6\hskip 1em\relax Manually aligning text in grid layout}{6.1\hskip 1em\relax Float type declarations} on line ...
+Marks: queue for rightmark after: "6.1\hskip 1em\relax Float type declarations", "6.2\hskip 1em\relax Float area declarations", 
 Marks: queue for floats before: "5", 
 Marks: picking up from output {leftmark=8}{rightmark=37}{floats=6}
 Marks: found 0 entries for floats (new 6; old 6)
@@ -8986,25 +8229,16 @@
 : -best col: 2 of 2
 : -vsize: 612.0pt; pagegoal: 612.0pt
 : -entering xor_OR_best_finish_col_or_block:
-Marks: queue for leftmark before: "\protect \MakeUppercase  {6\hskip 1em\relax 
-Layout Specification}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}", 
 Marks: picking up from output {leftmark=8}{rightmark=38}{floats=6}
 Marks: found 0 entries for leftmark (new 8; old 8)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {6\hskip 1em\relax Layo
-ut Specification}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specifica
-tion}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}} on li
-ne 1082
-Marks: queue for leftmark after: "\protect \MakeUppercase  {6\hskip 1em\relax L
-ayout Specification}", 
-Marks: queue for rightmark before: "6.1\hskip 1em\relax Float type declarations
-", "6.2\hskip 1em\relax Float area declarations", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}", 
+Marks: queue for rightmark before: "6.1\hskip 1em\relax Float type declarations", "6.2\hskip 1em\relax Float area declarations", 
 Marks: picking up from output {leftmark=8}{rightmark=38}{floats=6}
 Marks: found 1 entries for rightmark (new 38; old 37)
-Marks: in output: rightmark -> {6.1\hskip 1em\relax Float type declarations}{6.
-2\hskip 1em\relax Float area declarations}{6.2\hskip 1em\relax Float area decla
-rations} on line ...
-Marks: queue for rightmark after: "6.2\hskip 1em\relax Float area declarations"
-, 
+Marks: in output: rightmark -> {6.1\hskip 1em\relax Float type declarations}{6.2\hskip 1em\relax Float area declarations}{6.2\hskip 1em\relax Float area declarations} on line ...
+Marks: queue for rightmark after: "6.2\hskip 1em\relax Float area declarations", 
 Marks: queue for floats before: "5", 
 Marks: picking up from output {leftmark=8}{rightmark=38}{floats=6}
 Marks: found 0 entries for floats (new 6; old 6)
@@ -9100,9 +8334,7 @@
 : -----\xor_curr_col_block::= 1_1
 : -----\xor_curr_col_block::= 2_1
 : -----Saving column (height) information:
-: -----\g_xor_best_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\
-int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0
-pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
+: -----\g_xor_best_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
 : ----leaving xor_save_col_hts:N
 : ---leaving xor_cols_setup:
 : ---entering xor_initialize_flush_data:
@@ -9140,8 +8372,7 @@
 : -output pen: -10008
 : -Forced break (-10008) seen on line ...
 : leaving xor_OR_collect:
-Marks: set rightmark <- 6.3\hskip 1em\relax Footnote formatting declarations on
- line 1110
+Marks: set rightmark <- 6.3\hskip 1em\relax Footnote formatting declarations on line ...
 Marks: Setting mark {leftmark=8}{rightmark=39}{floats=6}
 : Add grid alignment point
 : Adding badly guarded penalty -10008 to MVL
@@ -9162,7 +8393,6 @@
 : -Forced break (-10008) seen on line ...
 : leaving xor_OR_collect:
 Marks: set rightmark <- 6.4\hskip 1em\relax Page setup declarations on line ...
-1
 Marks: Setting mark {leftmark=8}{rightmark=40}{floats=6}
 : Add grid alignment point
 : Adding badly guarded penalty -10008 to MVL
@@ -9170,15 +8400,12 @@
 Marks: set floats <- 6 on line ...
 Marks: Setting mark {leftmark=8}{rightmark=40}{floats=7}
 Overfull \hbox (47.24953pt too wide) in paragraph at lines 1181--1181
-[]     \OT1/pcr/m/n/8 area-list                              = {t12,t11,b11,b12
-,t21,b21},[] 
- []
+[]     \OT1/pcr/m/n/8 area-list                              = {t12,t11,b11,b12,t21,b21},[] 
+[]
 Overfull \hbox (47.24953pt too wide) in paragraph at lines 1181--1181
-[]     \OT1/pcr/m/n/8 defer-class-close-list                 = {t12,t11,b11,b12
-,t21,b21},[] 
- []
-: -{Example declaration for the \texttt {pagesetup2} template showing all curre
-ntly available keys}{2}{tab:pagesetup2}{6}{t12,b12,t11,b11,t21,b21}{table}{6}
+[]     \OT1/pcr/m/n/8 defer-class-close-list                 = {t12,t11,b11,b12,t21,b21},[] 
+[]
+: -{Example declaration for the \texttt {pagesetup2} template showing all currently available keys}{2}{tab:pagesetup2}{6}{t12,b12,t11,b11,t21,b21}{table}{6}
 : leaving float environment
 : entering xor_OR_collect:
 : -output pen: -10008
@@ -9198,39 +8425,36 @@
 : leaving xor_OR_collect:
 Underfull \hbox (badness 10000) in paragraph at lines 1204--1209
 []\OT1/pcr/m/n/10 float-callout-span-constraint \OT1/ptm/m/n/10 han-dles
- []
+[]
 Underfull \hbox (badness 2884) in paragraph at lines 1204--1209
 \OT1/ptm/m/n/10 on[] on page 6[][], and \OT1/pcr/m/n/10 bottom-float-footnote-
- []
+[]
 Underfull \hbox (badness 10000) in paragraph at lines 1210--1218
-\OT1/pcr/m/n/10 float-callout-constraint\OT1/ptm/m/n/10 , \OT1/pcr/m/n/10 flush
--float-
- []
+\OT1/pcr/m/n/10 float-callout-constraint\OT1/ptm/m/n/10 , \OT1/pcr/m/n/10 flush-float-
+[]
 Underfull \hbox (badness 10000) in paragraph at lines 1210--1218
-\OT1/pcr/m/n/10 callout-span-constraint\OT1/ptm/m/n/10 , and \OT1/pcr/m/n/10 fl
-ush-
- []
+\OT1/pcr/m/n/10 callout-span-constraint\OT1/ptm/m/n/10 , and \OT1/pcr/m/n/10 flush-
+[]
 Underfull \hbox (badness 10000) in paragraph at lines 1210--1218
 \OT1/pcr/m/n/10 bottom-float-footnote-constraint \OT1/ptm/m/n/10 in
- []
+[]
 : Add grid alignment point
 : Adding badly guarded penalty -10008 to MVL
 Underfull \hbox (badness 4229) in paragraph at lines 1221--1232
-\OT1/ptm/m/n/10 The key []\OT1/pcr/m/n/10 area-list \OT1/ptm/m/n/10 de-fines al
-l float ar-eas that
- []
+\OT1/ptm/m/n/10 The key []\OT1/pcr/m/n/10 area-list \OT1/ptm/m/n/10 de-fines all float ar-eas that
+[]
 Underfull \hbox (badness 1163) in paragraph at lines 1221--1232
 \OT1/ptm/m/n/10 are al-lowed in this page lay-out as well as defin-ing
- []
+[]
 Underfull \hbox (badness 1975) in paragraph at lines 1221--1232
 \OT1/ptm/m/n/10 the or-der in which the ar-eas are tried when plac-
- []
+[]
 Underfull \hbox (badness 1087) in paragraph at lines 1221--1232
 \OT1/ptm/m/n/10 tions'' for the spe-cial area which re-ceives the floats
- []
+[]
 Underfull \hbox (badness 2600) in paragraph at lines 1221--1232
 \OT1/ptm/m/n/10 tain class can't be placed then all ar-eas listed in
- []
+[]
 : entering xor_OR_collect:
 : -output pen: -10008
 : -Forced break (-10008) seen on line ...
@@ -9240,33 +8464,23 @@
 : -CHECK: Saving output penalty (10000)
 : -Re-adding forced break(s) for splitting
 Marks: saving state on line ...
-Marks: queue for leftmark before: "\protect \MakeUppercase  {6\hskip 1em\relax 
-Layout Specification}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}", 
 Marks: picking up from output {leftmark=8}{rightmark=40}{floats=7}
 Marks: found 0 entries for leftmark (new 8; old 8)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {6\hskip 1em\relax Layo
-ut Specification}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specifica
-tion}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}} on li
-ne 1232
-Marks: queue for leftmark after: "\protect \MakeUppercase  {6\hskip 1em\relax L
-ayout Specification}", 
-Marks: queue for rightmark before: "6.2\hskip 1em\relax Float area declarations
-", "6.3\hskip 1em\relax Footnote formatting declarations", "6.4\hskip 1em\relax
- Page setup declarations", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}", 
+Marks: queue for rightmark before: "6.2\hskip 1em\relax Float area declarations", "6.3\hskip 1em\relax Footnote formatting declarations", "6.4\hskip 1em\relax Page setup declarations", 
 Marks: picking up from output {leftmark=8}{rightmark=40}{floats=7}
 Marks: found 2 entries for rightmark (new 40; old 38)
-Marks: in output: rightmark -> {6.2\hskip 1em\relax Float area declarations}{6.
-3\hskip 1em\relax Footnote formatting declarations}{6.4\hskip 1em\relax Page se
-tup declarations} on line ...
-Marks: queue for rightmark after: "6.4\hskip 1em\relax Page setup declarations"
-, 
+Marks: in output: rightmark -> {6.2\hskip 1em\relax Float area declarations}{6.3\hskip 1em\relax Footnote formatting declarations}{6.4\hskip 1em\relax Page setup declarations} on line ...
+Marks: queue for rightmark after: "6.4\hskip 1em\relax Page setup declarations", 
 Marks: queue for floats before: "5", "6", 
 Marks: picking up from output {leftmark=8}{rightmark=40}{floats=7}
 Marks: found 1 entries for floats (new 7; old 6)
 Marks: in output: floats -> {5}{6}{6} on line ...
 Marks: queue for floats after: "6", 
 : -entering xor_trial_place_float_setup:
- STATS: floats waiting = 1 (\bx at F  ) on page 11
+STATS: floats waiting = 1 (\bx at F  ) on page 11
 =======================================================================
 : --flush: tighten placement conditions
 : --BALANCE: g_xor_trial_balance_done_int <- 0
@@ -9291,9 +8505,7 @@
 : ---\xor_curr_col_block::= 1_1
 : ---\xor_curr_col_block::= 2_1
 : ---Saving column (height) information:
-: ---\g_xor_saved_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\i
-nt_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0p
-t}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
+: ---\g_xor_saved_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
 : --leaving xor_save_col_hts:N
 : --entering xor_OR_trial_grab_balance_setup:
 : ---BALANCE: g_xor_trial_balance_seen_int <- 0
@@ -9386,26 +8598,16 @@
 : -grab col: 1 of 2
 : -vsize: 612.0pt; pagegoal: 612.0pt
 : -entering xor_OR_trial_finish_block_or_col:
-Marks: queue for leftmark before: "\protect \MakeUppercase  {6\hskip 1em\relax 
-Layout Specification}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}", 
 Marks: picking up from output {leftmark=8}{rightmark=39}{floats=6}
 Marks: found 0 entries for leftmark (new 8; old 8)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {6\hskip 1em\relax Layo
-ut Specification}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specifica
-tion}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}} on li
-ne 1232
-Marks: queue for leftmark after: "\protect \MakeUppercase  {6\hskip 1em\relax L
-ayout Specification}", 
-Marks: queue for rightmark before: "6.2\hskip 1em\relax Float area declarations
-", "6.3\hskip 1em\relax Footnote formatting declarations", "6.4\hskip 1em\relax
- Page setup declarations", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}", 
+Marks: queue for rightmark before: "6.2\hskip 1em\relax Float area declarations", "6.3\hskip 1em\relax Footnote formatting declarations", "6.4\hskip 1em\relax Page setup declarations", 
 Marks: picking up from output {leftmark=8}{rightmark=39}{floats=6}
 Marks: found 1 entries for rightmark (new 39; old 38)
-Marks: in output: rightmark -> {6.2\hskip 1em\relax Float area declarations}{6.
-3\hskip 1em\relax Footnote formatting declarations}{6.3\hskip 1em\relax Footnot
-e formatting declarations} on line ...
-Marks: queue for rightmark after: "6.3\hskip 1em\relax Footnote formatting decl
-arations", "6.4\hskip 1em\relax Page setup declarations", 
+Marks: in output: rightmark -> {6.2\hskip 1em\relax Float area declarations}{6.3\hskip 1em\relax Footnote formatting declarations}{6.3\hskip 1em\relax Footnote formatting declarations} on line ...
+Marks: queue for rightmark after: "6.3\hskip 1em\relax Footnote formatting declarations", "6.4\hskip 1em\relax Page setup declarations", 
 Marks: queue for floats before: "5", "6", 
 Marks: picking up from output {leftmark=8}{rightmark=39}{floats=6}
 Marks: found 0 entries for floats (new 6; old 6)
@@ -9548,25 +8750,16 @@
 : -grab col: 2 of 2
 : -vsize: 612.0pt; pagegoal: 553.96945pt
 : -entering xor_OR_trial_finish_block_or_col:
-Marks: queue for leftmark before: "\protect \MakeUppercase  {6\hskip 1em\relax 
-Layout Specification}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}", 
 Marks: picking up from output {leftmark=8}{rightmark=40}{floats=7}
 Marks: found 0 entries for leftmark (new 8; old 8)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {6\hskip 1em\relax Layo
-ut Specification}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specifica
-tion}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}} on li
-ne 1232
-Marks: queue for leftmark after: "\protect \MakeUppercase  {6\hskip 1em\relax L
-ayout Specification}", 
-Marks: queue for rightmark before: "6.3\hskip 1em\relax Footnote formatting dec
-larations", "6.4\hskip 1em\relax Page setup declarations", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}", 
+Marks: queue for rightmark before: "6.3\hskip 1em\relax Footnote formatting declarations", "6.4\hskip 1em\relax Page setup declarations", 
 Marks: picking up from output {leftmark=8}{rightmark=40}{floats=7}
 Marks: found 1 entries for rightmark (new 40; old 39)
-Marks: in output: rightmark -> {6.3\hskip 1em\relax Footnote formatting declara
-tions}{6.4\hskip 1em\relax Page setup declarations}{6.4\hskip 1em\relax Page se
-tup declarations} on line ...
-Marks: queue for rightmark after: "6.4\hskip 1em\relax Page setup declarations"
-, 
+Marks: in output: rightmark -> {6.3\hskip 1em\relax Footnote formatting declarations}{6.4\hskip 1em\relax Page setup declarations}{6.4\hskip 1em\relax Page setup declarations} on line ...
+Marks: queue for rightmark after: "6.4\hskip 1em\relax Page setup declarations", 
 Marks: queue for floats before: "5", "6", 
 Marks: picking up from output {leftmark=8}{rightmark=40}{floats=7}
 Marks: found 1 entries for floats (new 7; old 6)
@@ -9607,8 +8800,7 @@
 : --currbox: \bx at F 
 Float: \bx at F 
 : --This float structure:
-: -- {Example declaration for the \texttt {pagesetup2} template showing all cur
-rently available keys}
+: -- {Example declaration for the \texttt {pagesetup2} template showing all currently available keys}
 : -- {2}
 : -- {tab:pagesetup2}
 : -- {6}
@@ -9617,13 +8809,13 @@
 : -- {6}
 : -- g_xor_this_areas_open_clist <- b12,b11,b21
 : -- g_xor_this_areas_closed_clist <- 
- {6}  {table} (floats)  {6}   {\g_xor_curr_float_box_tl }
+{6}  {table} (floats)  {6}   {\g_xor_curr_float_box_tl }
 : --g_xor_saved_this_areas_open_clist (init): b12,b11,b21 := b12,b11,b21
 : --entering xor_try_this_area_std:
 : ---BALANCE: g_xor_trial_balance_done_int <- 0
 : ---(Re)initializing column heights ...
 : ---area trial: b12
- area trial: b12
+area trial: b12
 : ---span count okay: b12 = 2
 : ---area not closed for all types: not member of ()
 : ---area open for class floats; not member of ()
@@ -9631,8 +8823,7 @@
 : ----looking at column: 2
 : ----entering xor_construct_and_test_col_ht:nnn
 : -----col height before: 612.0pt (\g_xor_ht_col_2_1_dim)
-: -----first float in any b in column 2: adding \g_xor_float_text_skip=36.0pt m
-inus 8.0pt
+: -----first float in any b in column 2: adding \g_xor_float_text_skip=36.0pt minus 8.0pt
 : -----GRID: grid size used: 12.0pt
 : -----GRID: \g_xor_returned_lower_size_tl=312.0pt
 : -----GRID: \g_xor_returned_lower_delta_size_tl=6.66873pt
@@ -9648,8 +8839,7 @@
 : ----looking at column: 1
 : ----entering xor_construct_and_test_col_ht:nnn
 : -----col height before: 612.0pt (\g_xor_ht_col_1_1_dim)
-: -----first float in any b in column 1: adding \g_xor_float_text_skip=36.0pt m
-inus 8.0pt
+: -----first float in any b in column 1: adding \g_xor_float_text_skip=36.0pt minus 8.0pt
 : -----GRID: grid size used: 12.0pt
 : -----GRID: \g_xor_returned_lower_size_tl=312.0pt
 : -----GRID: \g_xor_returned_lower_delta_size_tl=6.66873pt
@@ -9670,9 +8860,7 @@
 : ----\xor_curr_col_block::= 1_1
 : ----\xor_curr_col_block::= 2_1
 : ----Saving column (height) information:
-: ----\g_xor_saved_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\
-int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {288.0
-pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {288.0pt}
+: ----\g_xor_saved_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {288.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {288.0pt}
 : ---leaving xor_save_col_hts:N
 : ---entering xor_OR_trial_grab_balance_setup:
 : ----BALANCE: g_xor_trial_balance_seen_int <- 0
@@ -9743,27 +8931,16 @@
 : -grab col: 1 of 2
 : -vsize: 288.0pt; pagegoal: 288.0pt
 : -entering xor_OR_trial_finish_block_or_col:
-Marks: queue for leftmark before: "\protect \MakeUppercase  {6\hskip 1em\relax 
-Layout Specification}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}", 
 Marks: picking up from output {leftmark=8}{rightmark=38}{floats=6}
 Marks: found 0 entries for leftmark (new 8; old 8)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {6\hskip 1em\relax Layo
-ut Specification}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specifica
-tion}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}} on li
-ne 1232
-Marks: queue for leftmark after: "\protect \MakeUppercase  {6\hskip 1em\relax L
-ayout Specification}", 
-Marks: queue for rightmark before: "6.2\hskip 1em\relax Float area declarations
-", "6.3\hskip 1em\relax Footnote formatting declarations", "6.4\hskip 1em\relax
- Page setup declarations", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}", 
+Marks: queue for rightmark before: "6.2\hskip 1em\relax Float area declarations", "6.3\hskip 1em\relax Footnote formatting declarations", "6.4\hskip 1em\relax Page setup declarations", 
 Marks: picking up from output {leftmark=8}{rightmark=38}{floats=6}
 Marks: found 0 entries for rightmark (new 38; old 38)
-Marks: in output: rightmark -> {6.2\hskip 1em\relax Float area declarations}{6.
-2\hskip 1em\relax Float area declarations}{6.2\hskip 1em\relax Float area decla
-rations} on line ...
-Marks: queue for rightmark after: "6.2\hskip 1em\relax Float area declarations"
-, "6.3\hskip 1em\relax Footnote formatting declarations", "6.4\hskip 1em\relax 
-Page setup declarations", 
+Marks: in output: rightmark -> {6.2\hskip 1em\relax Float area declarations}{6.2\hskip 1em\relax Float area declarations}{6.2\hskip 1em\relax Float area declarations} on line ...
+Marks: queue for rightmark after: "6.2\hskip 1em\relax Float area declarations", "6.3\hskip 1em\relax Footnote formatting declarations", "6.4\hskip 1em\relax Page setup declarations", 
 Marks: queue for floats before: "5", "6", 
 Marks: picking up from output {leftmark=8}{rightmark=38}{floats=6}
 Marks: found 0 entries for floats (new 6; old 6)
@@ -9822,26 +8999,16 @@
 : -grab col: 2 of 2
 : -vsize: 288.0pt; pagegoal: 249.23473pt
 : -entering xor_OR_trial_finish_block_or_col:
-Marks: queue for leftmark before: "\protect \MakeUppercase  {6\hskip 1em\relax 
-Layout Specification}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}", 
 Marks: picking up from output {leftmark=8}{rightmark=39}{floats=6}
 Marks: found 0 entries for leftmark (new 8; old 8)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {6\hskip 1em\relax Layo
-ut Specification}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specifica
-tion}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}} on li
-ne 1232
-Marks: queue for leftmark after: "\protect \MakeUppercase  {6\hskip 1em\relax L
-ayout Specification}", 
-Marks: queue for rightmark before: "6.2\hskip 1em\relax Float area declarations
-", "6.3\hskip 1em\relax Footnote formatting declarations", "6.4\hskip 1em\relax
- Page setup declarations", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}", 
+Marks: queue for rightmark before: "6.2\hskip 1em\relax Float area declarations", "6.3\hskip 1em\relax Footnote formatting declarations", "6.4\hskip 1em\relax Page setup declarations", 
 Marks: picking up from output {leftmark=8}{rightmark=39}{floats=6}
 Marks: found 1 entries for rightmark (new 39; old 38)
-Marks: in output: rightmark -> {6.2\hskip 1em\relax Float area declarations}{6.
-3\hskip 1em\relax Footnote formatting declarations}{6.3\hskip 1em\relax Footnot
-e formatting declarations} on line ...
-Marks: queue for rightmark after: "6.3\hskip 1em\relax Footnote formatting decl
-arations", "6.4\hskip 1em\relax Page setup declarations", 
+Marks: in output: rightmark -> {6.2\hskip 1em\relax Float area declarations}{6.3\hskip 1em\relax Footnote formatting declarations}{6.3\hskip 1em\relax Footnote formatting declarations} on line ...
+Marks: queue for rightmark after: "6.3\hskip 1em\relax Footnote formatting declarations", "6.4\hskip 1em\relax Page setup declarations", 
 Marks: queue for floats before: "5", "6", 
 Marks: picking up from output {leftmark=8}{rightmark=39}{floats=6}
 Marks: found 0 entries for floats (new 6; old 6)
@@ -9857,7 +9024,7 @@
 : --entering xor_check_callout_after:n
 : ---entering xor_check_callout_column:n
 : ----Last callout (floats) = 5
- -> failed: last callout 5 < 6 last float placed in column 2
+-> failed: last callout 5 < 6 last float placed in column 2
 : ----Failed: (floats) last callout 5 < 6 last float placed
 : ---leaving xor_check_callout_column:n
 : --leaving xor_check_callout_after:n
@@ -9923,17 +9090,17 @@
 : --BALANCE: g_xor_trial_balance_done_int <- 0
 : --(Re)initializing column heights ...
 : --area trial: b11
- area trial: b11
+area trial: b11
 : --span count unsuitable: b11 /= 2
- -> failed: span count b11 /= 2
+-> failed: span count b11 /= 2
 : -leaving xor_try_this_area_std:
 : -entering xor_try_this_area_std:
 : --BALANCE: g_xor_trial_balance_done_int <- 0
 : --(Re)initializing column heights ...
 : --area trial: b21
- area trial: b21
+area trial: b21
 : --span count unsuitable: b21 /= 2
- -> failed: span count b21 /= 2
+-> failed: span count b21 /= 2
 : -leaving xor_try_this_area_std:
 : -entering xor_try_this_area_std:
 : --BALANCE: g_xor_trial_balance_done_int <- 0
@@ -9943,23 +9110,19 @@
 : -entering xor_attempt_to_defer_and_try_next_float:
 : --flush: no flush point seen;defer
 : -leaving xor_attempt_to_defer_and_try_next_float:
- -> failed: --> defer
+-> failed: --> defer
 : -g_xor_curr_page_areas_closed_clist <- "" + ""
 : -g_xor_this_areas_closed_clist <- "b12,b11,b21" (all closed)
 : -entering xor_try_next_float:
- STATS: trials = 4
+STATS: trials = 4
 : --entering xor_OR_best_cols_setup:
-: ---XX initial: \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col
-_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim_gset:Nn \g_xor
-_ht_col_2_1_dim {612.0pt}
+: ---XX initial: \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
 : ---entering xor_initialize_page_footins_ftnright:
 : ---leaving xor_initialize_page_footins_ftnright:
 : ---BALANCE: g_xor_trial_balance_seen_int <- 0
 : ---Setting up column heights:
 : ---BALANCE: working on new block
-: ---Setting up column heights: \int_gset:Nn \g_xor_col_1_block_int {1}\int_gse
-t:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim
-_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
+: ---Setting up column heights: \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
 : ---entering xor_OR_best_next_col_setup:
 : ----vsize <- 612.0pt
 : ----ftnspread: page= 11
@@ -10044,26 +9207,16 @@
 : -best col: 1 of 2
 : -vsize: 612.0pt; pagegoal: 612.0pt
 : -entering xor_OR_best_finish_col_or_block:
-Marks: queue for leftmark before: "\protect \MakeUppercase  {6\hskip 1em\relax 
-Layout Specification}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}", 
 Marks: picking up from output {leftmark=8}{rightmark=39}{floats=6}
 Marks: found 0 entries for leftmark (new 8; old 8)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {6\hskip 1em\relax Layo
-ut Specification}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specifica
-tion}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}} on li
-ne 1232
-Marks: queue for leftmark after: "\protect \MakeUppercase  {6\hskip 1em\relax L
-ayout Specification}", 
-Marks: queue for rightmark before: "6.2\hskip 1em\relax Float area declarations
-", "6.3\hskip 1em\relax Footnote formatting declarations", "6.4\hskip 1em\relax
- Page setup declarations", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}", 
+Marks: queue for rightmark before: "6.2\hskip 1em\relax Float area declarations", "6.3\hskip 1em\relax Footnote formatting declarations", "6.4\hskip 1em\relax Page setup declarations", 
 Marks: picking up from output {leftmark=8}{rightmark=39}{floats=6}
 Marks: found 1 entries for rightmark (new 39; old 38)
-Marks: in output: rightmark -> {6.2\hskip 1em\relax Float area declarations}{6.
-3\hskip 1em\relax Footnote formatting declarations}{6.3\hskip 1em\relax Footnot
-e formatting declarations} on line ...
-Marks: queue for rightmark after: "6.3\hskip 1em\relax Footnote formatting decl
-arations", "6.4\hskip 1em\relax Page setup declarations", 
+Marks: in output: rightmark -> {6.2\hskip 1em\relax Float area declarations}{6.3\hskip 1em\relax Footnote formatting declarations}{6.3\hskip 1em\relax Footnote formatting declarations} on line ...
+Marks: queue for rightmark after: "6.3\hskip 1em\relax Footnote formatting declarations", "6.4\hskip 1em\relax Page setup declarations", 
 Marks: queue for floats before: "5", "6", 
 Marks: picking up from output {leftmark=8}{rightmark=39}{floats=6}
 Marks: found 0 entries for floats (new 6; old 6)
@@ -10208,25 +9361,16 @@
 : -best col: 2 of 2
 : -vsize: 612.0pt; pagegoal: 553.96945pt
 : -entering xor_OR_best_finish_col_or_block:
-Marks: queue for leftmark before: "\protect \MakeUppercase  {6\hskip 1em\relax 
-Layout Specification}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}", 
 Marks: picking up from output {leftmark=8}{rightmark=40}{floats=7}
 Marks: found 0 entries for leftmark (new 8; old 8)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {6\hskip 1em\relax Layo
-ut Specification}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specifica
-tion}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}} on li
-ne 1232
-Marks: queue for leftmark after: "\protect \MakeUppercase  {6\hskip 1em\relax L
-ayout Specification}", 
-Marks: queue for rightmark before: "6.3\hskip 1em\relax Footnote formatting dec
-larations", "6.4\hskip 1em\relax Page setup declarations", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}", 
+Marks: queue for rightmark before: "6.3\hskip 1em\relax Footnote formatting declarations", "6.4\hskip 1em\relax Page setup declarations", 
 Marks: picking up from output {leftmark=8}{rightmark=40}{floats=7}
 Marks: found 1 entries for rightmark (new 40; old 39)
-Marks: in output: rightmark -> {6.3\hskip 1em\relax Footnote formatting declara
-tions}{6.4\hskip 1em\relax Page setup declarations}{6.4\hskip 1em\relax Page se
-tup declarations} on line ...
-Marks: queue for rightmark after: "6.4\hskip 1em\relax Page setup declarations"
-, 
+Marks: in output: rightmark -> {6.3\hskip 1em\relax Footnote formatting declarations}{6.4\hskip 1em\relax Page setup declarations}{6.4\hskip 1em\relax Page setup declarations} on line ...
+Marks: queue for rightmark after: "6.4\hskip 1em\relax Page setup declarations", 
 Marks: queue for floats before: "5", "6", 
 Marks: picking up from output {leftmark=8}{rightmark=40}{floats=7}
 Marks: found 1 entries for floats (new 7; old 6)
@@ -10323,9 +9467,7 @@
 : -----\xor_curr_col_block::= 1_1
 : -----\xor_curr_col_block::= 2_1
 : -----Saving column (height) information:
-: -----\g_xor_best_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\
-int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0
-pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
+: -----\g_xor_best_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
 : ----leaving xor_save_col_hts:N
 : ---leaving xor_cols_setup:
 : ---entering xor_initialize_flush_data:
@@ -10343,17 +9485,11 @@
 : ---\bx at F : 6 ??? 6
 : ---\bx at F : callout has been typeset
 =======================================================================
- STATS: floats waiting = 1 on page 12 (float page)
+STATS: floats waiting = 1 on page 12 (float page)
 =======================================================================
 : ---entering xor_attempt_float_page:
 : ----entering xor_save_current_float_state:
-: -----saved: macro:->\cs_gset_nopar:Npn \g_xor_floats_active_seq {\s__seq \__s
-eq_item:n {\bx at F }}\dim_set:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim_set:Nn \g_xo
-r_ht_col_2_1_dim {612.0pt}\int_gset:cn {g_xor_area_b12_float_int}{0}\gdef \g_xo
-r_area_b12_float_seq {\s__seq }\int_gset:cn {g_xor_area_b11_float_int}{0}\gdef 
-\g_xor_area_b11_float_seq {\s__seq }\int_gset:cn {g_xor_area_b21_float_int}{0}\
-gdef \g_xor_area_b21_float_seq {\s__seq }\int_gset:cn {g_xor_area_DDD_float_int
-}{0}\gdef \g_xor_area_DDD_float_seq {\s__seq }
+: -----saved: macro:->\cs_gset_nopar:Npn \g_xor_floats_active_seq {\s__seq \__seq_item:n {\bx at F }}\dim_set:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim_set:Nn \g_xor_ht_col_2_1_dim {612.0pt}\int_gset:cn {g_xor_area_b12_float_int}{0}\gdef \g_xor_area_b12_float_seq {\s__seq }\int_gset:cn {g_xor_area_b11_float_int}{0}\gdef \g_xor_area_b11_float_seq {\s__seq }\int_gset:cn {g_xor_area_b21_float_int}{0}\gdef \g_xor_area_b21_float_seq {\s__seq }\int_gset:cn {g_xor_area_DDD_float_int}{0}\gdef \g_xor_area_DDD_float_seq {\s__seq }
 : ----leaving xor_save_current_float_state:
 : ----entering xor_trial_place_float_inner_loop:
 : ----leaving xor_trial_place_float_inner_loop:
@@ -10361,8 +9497,7 @@
 : -----currbox: \bx at F 
 Float: \bx at F 
 : -----This float structure:
-: ----- {Example declaration for the \texttt {pagesetup2} template showing all 
-currently available keys}
+: ----- {Example declaration for the \texttt {pagesetup2} template showing all currently available keys}
 : ----- {2}
 : ----- {tab:pagesetup2}
 : ----- {6}
@@ -10371,11 +9506,11 @@
 : ----- {6}
 : ----- g_xor_this_areas_open_clist <- b12,b11,b21
 : ----- g_xor_this_areas_closed_clist <- 
- {6}  {table} (floats)  {6}   {\g_xor_curr_float_box_tl }
+{6}  {table} (floats)  {6}   {\g_xor_curr_float_box_tl }
 : -----g_xor_saved_this_areas_open_clist (init): b12,b11,b21 := b12,b11,b21
 : -----entering xor_try_this_area_relaxed:
 : ------area trial: b12
- area trial: b12
+area trial: b12
 : ------span count okay: b12 = 2
 : ------area not closed for all types: not member of ()
 : ------area open for class floats; not member of ()
@@ -10383,8 +9518,7 @@
 : -------looking at column: 2
 : -------entering xor_construct_and_test_col_ht:nnn
 : --------col height before: 612.0pt (\g_xor_ht_col_2_1_dim)
-: --------first float in any b in column 2: adding \g_xor_float_text_skip=36.0p
-t minus 8.0pt
+: --------first float in any b in column 2: adding \g_xor_float_text_skip=36.0pt minus 8.0pt
 : --------GRID: grid size used: 12.0pt
 : --------GRID: \g_xor_returned_lower_size_tl=312.0pt
 : --------GRID: \g_xor_returned_lower_delta_size_tl=6.66873pt
@@ -10400,8 +9534,7 @@
 : -------looking at column: 1
 : -------entering xor_construct_and_test_col_ht:nnn
 : --------col height before: 612.0pt (\g_xor_ht_col_1_1_dim)
-: --------first float in any b in column 1: adding \g_xor_float_text_skip=36.0p
-t minus 8.0pt
+: --------first float in any b in column 1: adding \g_xor_float_text_skip=36.0pt minus 8.0pt
 : --------GRID: grid size used: 12.0pt
 : --------GRID: \g_xor_returned_lower_size_tl=312.0pt
 : --------GRID: \g_xor_returned_lower_delta_size_tl=6.66873pt
@@ -10418,10 +9551,8 @@
 : -----leaving xor_try_this_area_relaxed:
 : -----entering xor_floatpage_pretests_success_action:
 : ------entering xor_update_best_trial:
- -> accepted
-: -------new best trial: \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g
-_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {288.0pt}\dim_gset:N
-n \g_xor_ht_col_2_1_dim {288.0pt}
+-> accepted
+: -------new best trial: \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {288.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {288.0pt}
 : -------entering xor_update_float_placement_data:
 : --------g_xor_curr_page_areas_closed_clist + ""
 : --------g_xor_this_areas_closed_clist  + "t12,t11,b11"
@@ -10435,23 +9566,21 @@
 : ------entering xor_trial_place_float_inner_loop:
 : ------leaving xor_trial_place_float_inner_loop:
 : ------entering xor_try_next_float:
- STATS: trials = 1
+STATS: trials = 1
 : ------leaving xor_try_next_float:
 : -----leaving xor_floatpage_pretests_success_action:
 : ----leaving xor_try_next_float:
 : ----\box_ht:N 1=288.0pt
 : ----\box_ht:N 2=288.0pt
 : ----float page failed
- -> failed: no float page made
+-> failed: no float page made
 : ----entering xor_next_page_setup:
 : -----entering xor_cols_setup:
 : ------entering xor_save_col_hts:N (\g_xor_best_trial_col_hts_tl)
 : -------\xor_curr_col_block::= 1_1
 : -------\xor_curr_col_block::= 2_1
 : -------Saving column (height) information:
-: -------\g_xor_best_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1
-}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612
-.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
+: -------\g_xor_best_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
 : ------leaving xor_save_col_hts:N
 : -----leaving xor_cols_setup:
 : -----entering xor_initialize_flush_data:
@@ -10494,29 +9623,27 @@
 : -output pen: -10008
 : -Forced break (-10008) seen on line ...
 : leaving xor_OR_collect:
-Marks: set rightmark <- 6.5\hskip 1em\relax Float formatting declarations on li
-ne 1301
+Marks: set rightmark <- 6.5\hskip 1em\relax Float formatting declarations on line ...
 Marks: Setting mark {leftmark=8}{rightmark=41}{floats=7}
 : Add grid alignment point
 : Adding badly guarded penalty -10008 to MVL
 Underfull \hbox (badness 2680) in paragraph at lines 1303--1310
 \OT1/ptm/m/n/10 For the at-tach-ment of cap-tions to floats there ex-
- []
+[]
 : entering xor_OR_collect:
 : -output pen: -10008
 : -Forced break (-10008) seen on line ...
 : leaving xor_OR_collect:
 Overfull \hbox (4.5pt too wide) in paragraph at lines 1327--1327
 []  \OT1/pcr/m/n/10 \DeclareInstance{buildfloat}{default}[] 
- []
+[]
 : Add grid alignment point
 : Adding badly guarded penalty -10008 to MVL
 : entering xor_OR_collect:
 : -output pen: -10008
 : -Forced break (-10008) seen on line ...
 : leaving xor_OR_collect:
-Marks: set leftmark <- \protect \MakeUppercase  {7\hskip 1em\relax Performance 
-of the algorithm} on line ...
+Marks: set leftmark <- \protect \MakeUppercase  {7\hskip 1em\relax Performance of the algorithm} on line ...
 Marks: Setting mark {leftmark=9}{rightmark=41}{floats=7}
 Marks: set rightmark <-  on line ...
 Marks: Setting mark {leftmark=9}{rightmark=42}{floats=7}
@@ -10531,23 +9658,15 @@
 : -CHECK: Saving output penalty (10000)
 : -Re-adding forced break(s) for splitting
 Marks: saving state on line ...
-Marks: queue for leftmark before: "\protect \MakeUppercase  {6\hskip 1em\relax 
-Layout Specification}", "\protect \MakeUppercase  {7\hskip 1em\relax Performanc
-e of the algorithm}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}", "\protect \MakeUppercase  {7\hskip 1em\relax Performance of the algorithm}", 
 Marks: picking up from output {leftmark=9}{rightmark=42}{floats=7}
 Marks: found 1 entries for leftmark (new 9; old 8)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {6\hskip 1em\relax Layo
-ut Specification}}{\protect \MakeUppercase  {7\hskip 1em\relax Performance of t
-he algorithm}}{\protect \MakeUppercase  {7\hskip 1em\relax Performance of the a
-lgorithm}} on line ...
-Marks: queue for leftmark after: "\protect \MakeUppercase  {7\hskip 1em\relax P
-erformance of the algorithm}", 
-Marks: queue for rightmark before: "6.4\hskip 1em\relax Page setup declarations
-", "6.5\hskip 1em\relax Float formatting declarations", "", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}}{\protect \MakeUppercase  {7\hskip 1em\relax Performance of the algorithm}}{\protect \MakeUppercase  {7\hskip 1em\relax Performance of the algorithm}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {7\hskip 1em\relax Performance of the algorithm}", 
+Marks: queue for rightmark before: "6.4\hskip 1em\relax Page setup declarations", "6.5\hskip 1em\relax Float formatting declarations", "", 
 Marks: picking up from output {leftmark=9}{rightmark=42}{floats=7}
 Marks: found 2 entries for rightmark (new 42; old 40)
-Marks: in output: rightmark -> {6.4\hskip 1em\relax Page setup declarations}{6.
-5\hskip 1em\relax Float formatting declarations}{} on line ...
+Marks: in output: rightmark -> {6.4\hskip 1em\relax Page setup declarations}{6.5\hskip 1em\relax Float formatting declarations}{} on line ...
 Marks: queue for rightmark after: "", 
 Marks: queue for floats before: "6", 
 Marks: picking up from output {leftmark=9}{rightmark=42}{floats=7}
@@ -10555,7 +9674,7 @@
 Marks: in output: floats -> {6}{6}{6} on line ...
 Marks: queue for floats after: "6", 
 : -entering xor_trial_place_float_setup:
- STATS: floats waiting = 1 (\bx at F  ) on page 12
+STATS: floats waiting = 1 (\bx at F  ) on page 12
 =======================================================================
 : --flush: tighten placement conditions
 : --BALANCE: g_xor_trial_balance_done_int <- 0
@@ -10580,9 +9699,7 @@
 : ---\xor_curr_col_block::= 1_1
 : ---\xor_curr_col_block::= 2_1
 : ---Saving column (height) information:
-: ---\g_xor_saved_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\i
-nt_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0p
-t}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
+: ---\g_xor_saved_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
 : --leaving xor_save_col_hts:N
 : --entering xor_OR_trial_grab_balance_setup:
 : ---BALANCE: g_xor_trial_balance_seen_int <- 0
@@ -10652,27 +9769,16 @@
 : -grab col: 1 of 2
 : -vsize: 612.0pt; pagegoal: 612.0pt
 : -entering xor_OR_trial_finish_block_or_col:
-Marks: queue for leftmark before: "\protect \MakeUppercase  {6\hskip 1em\relax 
-Layout Specification}", "\protect \MakeUppercase  {7\hskip 1em\relax Performanc
-e of the algorithm}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}", "\protect \MakeUppercase  {7\hskip 1em\relax Performance of the algorithm}", 
 Marks: picking up from output {leftmark=8}{rightmark=40}{floats=7}
 Marks: found 0 entries for leftmark (new 8; old 8)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {6\hskip 1em\relax Layo
-ut Specification}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specifica
-tion}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}} on li
-ne 1346
-Marks: queue for leftmark after: "\protect \MakeUppercase  {6\hskip 1em\relax L
-ayout Specification}", "\protect \MakeUppercase  {7\hskip 1em\relax Performance
- of the algorithm}", 
-Marks: queue for rightmark before: "6.4\hskip 1em\relax Page setup declarations
-", "6.5\hskip 1em\relax Float formatting declarations", "", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}", "\protect \MakeUppercase  {7\hskip 1em\relax Performance of the algorithm}", 
+Marks: queue for rightmark before: "6.4\hskip 1em\relax Page setup declarations", "6.5\hskip 1em\relax Float formatting declarations", "", 
 Marks: picking up from output {leftmark=8}{rightmark=40}{floats=7}
 Marks: found 0 entries for rightmark (new 40; old 40)
-Marks: in output: rightmark -> {6.4\hskip 1em\relax Page setup declarations}{6.
-4\hskip 1em\relax Page setup declarations}{6.4\hskip 1em\relax Page setup decla
-rations} on line ...
-Marks: queue for rightmark after: "6.4\hskip 1em\relax Page setup declarations"
-, "6.5\hskip 1em\relax Float formatting declarations", "", 
+Marks: in output: rightmark -> {6.4\hskip 1em\relax Page setup declarations}{6.4\hskip 1em\relax Page setup declarations}{6.4\hskip 1em\relax Page setup declarations} on line ...
+Marks: queue for rightmark after: "6.4\hskip 1em\relax Page setup declarations", "6.5\hskip 1em\relax Float formatting declarations", "", 
 Marks: queue for floats before: "6", 
 Marks: picking up from output {leftmark=8}{rightmark=40}{floats=7}
 Marks: found 0 entries for floats (new 7; old 7)
@@ -10745,27 +9851,16 @@
 : -grab col: 2 of 2
 : -vsize: 612.0pt; pagegoal: 544.46945pt
 : -entering xor_OR_trial_finish_block_or_col:
-Marks: queue for leftmark before: "\protect \MakeUppercase  {6\hskip 1em\relax 
-Layout Specification}", "\protect \MakeUppercase  {7\hskip 1em\relax Performanc
-e of the algorithm}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}", "\protect \MakeUppercase  {7\hskip 1em\relax Performance of the algorithm}", 
 Marks: picking up from output {leftmark=8}{rightmark=41}{floats=7}
 Marks: found 0 entries for leftmark (new 8; old 8)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {6\hskip 1em\relax Layo
-ut Specification}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specifica
-tion}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}} on li
-ne 1346
-Marks: queue for leftmark after: "\protect \MakeUppercase  {6\hskip 1em\relax L
-ayout Specification}", "\protect \MakeUppercase  {7\hskip 1em\relax Performance
- of the algorithm}", 
-Marks: queue for rightmark before: "6.4\hskip 1em\relax Page setup declarations
-", "6.5\hskip 1em\relax Float formatting declarations", "", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}", "\protect \MakeUppercase  {7\hskip 1em\relax Performance of the algorithm}", 
+Marks: queue for rightmark before: "6.4\hskip 1em\relax Page setup declarations", "6.5\hskip 1em\relax Float formatting declarations", "", 
 Marks: picking up from output {leftmark=8}{rightmark=41}{floats=7}
 Marks: found 1 entries for rightmark (new 41; old 40)
-Marks: in output: rightmark -> {6.4\hskip 1em\relax Page setup declarations}{6.
-5\hskip 1em\relax Float formatting declarations}{6.5\hskip 1em\relax Float form
-atting declarations} on line ...
-Marks: queue for rightmark after: "6.5\hskip 1em\relax Float formatting declara
-tions", "", 
+Marks: in output: rightmark -> {6.4\hskip 1em\relax Page setup declarations}{6.5\hskip 1em\relax Float formatting declarations}{6.5\hskip 1em\relax Float formatting declarations} on line ...
+Marks: queue for rightmark after: "6.5\hskip 1em\relax Float formatting declarations", "", 
 Marks: queue for floats before: "6", 
 Marks: picking up from output {leftmark=8}{rightmark=41}{floats=7}
 Marks: found 0 entries for floats (new 7; old 7)
@@ -10809,8 +9904,7 @@
 : --currbox: \bx at F 
 Float: \bx at F 
 : --This float structure:
-: -- {Example declaration for the \texttt {pagesetup2} template showing all cur
-rently available keys}
+: -- {Example declaration for the \texttt {pagesetup2} template showing all currently available keys}
 : -- {2}
 : -- {tab:pagesetup2}
 : -- {6}
@@ -10819,13 +9913,13 @@
 : -- {6}
 : -- g_xor_this_areas_open_clist <- b12,b11,b21
 : -- g_xor_this_areas_closed_clist <- 
- {6}  {table} (floats)  {6}   {\g_xor_curr_float_box_tl }
+{6}  {table} (floats)  {6}   {\g_xor_curr_float_box_tl }
 : --g_xor_saved_this_areas_open_clist (init): b12,b11,b21 := b12,b11,b21
 : --entering xor_try_this_area_std:
 : ---BALANCE: g_xor_trial_balance_done_int <- 0
 : ---(Re)initializing column heights ...
 : ---area trial: b12
- area trial: b12
+area trial: b12
 : ---span count okay: b12 = 2
 : ---area not closed for all types: not member of ()
 : ---area open for class floats; not member of ()
@@ -10833,8 +9927,7 @@
 : ----looking at column: 2
 : ----entering xor_construct_and_test_col_ht:nnn
 : -----col height before: 612.0pt (\g_xor_ht_col_2_1_dim)
-: -----first float in any b in column 2: adding \g_xor_float_text_skip=36.0pt m
-inus 8.0pt
+: -----first float in any b in column 2: adding \g_xor_float_text_skip=36.0pt minus 8.0pt
 : -----GRID: grid size used: 12.0pt
 : -----GRID: \g_xor_returned_lower_size_tl=312.0pt
 : -----GRID: \g_xor_returned_lower_delta_size_tl=6.66873pt
@@ -10850,8 +9943,7 @@
 : ----looking at column: 1
 : ----entering xor_construct_and_test_col_ht:nnn
 : -----col height before: 612.0pt (\g_xor_ht_col_1_1_dim)
-: -----first float in any b in column 1: adding \g_xor_float_text_skip=36.0pt m
-inus 8.0pt
+: -----first float in any b in column 1: adding \g_xor_float_text_skip=36.0pt minus 8.0pt
 : -----GRID: grid size used: 12.0pt
 : -----GRID: \g_xor_returned_lower_size_tl=312.0pt
 : -----GRID: \g_xor_returned_lower_delta_size_tl=6.66873pt
@@ -10872,9 +9964,7 @@
 : ----\xor_curr_col_block::= 1_1
 : ----\xor_curr_col_block::= 2_1
 : ----Saving column (height) information:
-: ----\g_xor_saved_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\
-int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {288.0
-pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {288.0pt}
+: ----\g_xor_saved_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {288.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {288.0pt}
 : ---leaving xor_save_col_hts:N
 : ---entering xor_OR_trial_grab_balance_setup:
 : ----BALANCE: g_xor_trial_balance_seen_int <- 0
@@ -10922,27 +10012,16 @@
 : -grab col: 1 of 2
 : -vsize: 288.0pt; pagegoal: 288.0pt
 : -entering xor_OR_trial_finish_block_or_col:
-Marks: queue for leftmark before: "\protect \MakeUppercase  {6\hskip 1em\relax 
-Layout Specification}", "\protect \MakeUppercase  {7\hskip 1em\relax Performanc
-e of the algorithm}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}", "\protect \MakeUppercase  {7\hskip 1em\relax Performance of the algorithm}", 
 Marks: picking up from output {leftmark=8}{rightmark=40}{floats=7}
 Marks: found 0 entries for leftmark (new 8; old 8)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {6\hskip 1em\relax Layo
-ut Specification}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specifica
-tion}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}} on li
-ne 1346
-Marks: queue for leftmark after: "\protect \MakeUppercase  {6\hskip 1em\relax L
-ayout Specification}", "\protect \MakeUppercase  {7\hskip 1em\relax Performance
- of the algorithm}", 
-Marks: queue for rightmark before: "6.4\hskip 1em\relax Page setup declarations
-", "6.5\hskip 1em\relax Float formatting declarations", "", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}", "\protect \MakeUppercase  {7\hskip 1em\relax Performance of the algorithm}", 
+Marks: queue for rightmark before: "6.4\hskip 1em\relax Page setup declarations", "6.5\hskip 1em\relax Float formatting declarations", "", 
 Marks: picking up from output {leftmark=8}{rightmark=40}{floats=7}
 Marks: found 0 entries for rightmark (new 40; old 40)
-Marks: in output: rightmark -> {6.4\hskip 1em\relax Page setup declarations}{6.
-4\hskip 1em\relax Page setup declarations}{6.4\hskip 1em\relax Page setup decla
-rations} on line ...
-Marks: queue for rightmark after: "6.4\hskip 1em\relax Page setup declarations"
-, "6.5\hskip 1em\relax Float formatting declarations", "", 
+Marks: in output: rightmark -> {6.4\hskip 1em\relax Page setup declarations}{6.4\hskip 1em\relax Page setup declarations}{6.4\hskip 1em\relax Page setup declarations} on line ...
+Marks: queue for rightmark after: "6.4\hskip 1em\relax Page setup declarations", "6.5\hskip 1em\relax Float formatting declarations", "", 
 Marks: queue for floats before: "6", 
 Marks: picking up from output {leftmark=8}{rightmark=40}{floats=7}
 Marks: found 0 entries for floats (new 7; old 7)
@@ -10978,27 +10057,16 @@
 : -grab col: 2 of 2
 : -vsize: 288.0pt; pagegoal: 258.73473pt
 : -entering xor_OR_trial_finish_block_or_col:
-Marks: queue for leftmark before: "\protect \MakeUppercase  {6\hskip 1em\relax 
-Layout Specification}", "\protect \MakeUppercase  {7\hskip 1em\relax Performanc
-e of the algorithm}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}", "\protect \MakeUppercase  {7\hskip 1em\relax Performance of the algorithm}", 
 Marks: picking up from output {leftmark=8}{rightmark=40}{floats=7}
 Marks: found 0 entries for leftmark (new 8; old 8)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {6\hskip 1em\relax Layo
-ut Specification}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specifica
-tion}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}} on li
-ne 1346
-Marks: queue for leftmark after: "\protect \MakeUppercase  {6\hskip 1em\relax L
-ayout Specification}", "\protect \MakeUppercase  {7\hskip 1em\relax Performance
- of the algorithm}", 
-Marks: queue for rightmark before: "6.4\hskip 1em\relax Page setup declarations
-", "6.5\hskip 1em\relax Float formatting declarations", "", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}", "\protect \MakeUppercase  {7\hskip 1em\relax Performance of the algorithm}", 
+Marks: queue for rightmark before: "6.4\hskip 1em\relax Page setup declarations", "6.5\hskip 1em\relax Float formatting declarations", "", 
 Marks: picking up from output {leftmark=8}{rightmark=40}{floats=7}
 Marks: found 0 entries for rightmark (new 40; old 40)
-Marks: in output: rightmark -> {6.4\hskip 1em\relax Page setup declarations}{6.
-4\hskip 1em\relax Page setup declarations}{6.4\hskip 1em\relax Page setup decla
-rations} on line ...
-Marks: queue for rightmark after: "6.4\hskip 1em\relax Page setup declarations"
-, "6.5\hskip 1em\relax Float formatting declarations", "", 
+Marks: in output: rightmark -> {6.4\hskip 1em\relax Page setup declarations}{6.4\hskip 1em\relax Page setup declarations}{6.4\hskip 1em\relax Page setup declarations} on line ...
+Marks: queue for rightmark after: "6.4\hskip 1em\relax Page setup declarations", "6.5\hskip 1em\relax Float formatting declarations", "", 
 Marks: queue for floats before: "6", 
 Marks: picking up from output {leftmark=8}{rightmark=40}{floats=7}
 Marks: found 0 entries for floats (new 7; old 7)
@@ -11021,10 +10089,8 @@
 : --entering xor_evaluate_trial_results:
 : ---fail: false
 : ---entering xor_update_best_trial:
- -> accepted
-: ----new best trial: \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xo
-r_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {288.0pt}\dim_gset:Nn \
-g_xor_ht_col_2_1_dim {288.0pt}
+-> accepted
+: ----new best trial: \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {288.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {288.0pt}
 : ----entering xor_update_float_placement_data:
 : -----g_xor_curr_page_areas_closed_clist + ""
 : -----g_xor_this_areas_closed_clist  + "t12,t11,b11"
@@ -11073,19 +10139,15 @@
 : -entering xor_trial_place_float_inner_loop:
 : -leaving xor_trial_place_float_inner_loop:
 : -entering xor_try_next_float:
- STATS: trials = 1
+STATS: trials = 1
 : --entering xor_OR_best_cols_setup:
-: ---XX initial: \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col
-_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {288.0pt}\dim_gset:Nn \g_xor
-_ht_col_2_1_dim {288.0pt}
+: ---XX initial: \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {288.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {288.0pt}
 : ---entering xor_initialize_page_footins_ftnright:
 : ---leaving xor_initialize_page_footins_ftnright:
 : ---BALANCE: g_xor_trial_balance_seen_int <- 0
 : ---Setting up column heights:
 : ---BALANCE: working on new block
-: ---Setting up column heights: \int_gset:Nn \g_xor_col_1_block_int {1}\int_gse
-t:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {288.0pt}\dim
-_gset:Nn \g_xor_ht_col_2_1_dim {288.0pt}
+: ---Setting up column heights: \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {288.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {288.0pt}
 : ---entering xor_OR_best_next_col_setup:
 : ----vsize <- 288.0pt
 : ----ftnspread: page= 12
@@ -11124,27 +10186,16 @@
 : -best col: 1 of 2
 : -vsize: 288.0pt; pagegoal: 288.0pt
 : -entering xor_OR_best_finish_col_or_block:
-Marks: queue for leftmark before: "\protect \MakeUppercase  {6\hskip 1em\relax 
-Layout Specification}", "\protect \MakeUppercase  {7\hskip 1em\relax Performanc
-e of the algorithm}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}", "\protect \MakeUppercase  {7\hskip 1em\relax Performance of the algorithm}", 
 Marks: picking up from output {leftmark=8}{rightmark=40}{floats=7}
 Marks: found 0 entries for leftmark (new 8; old 8)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {6\hskip 1em\relax Layo
-ut Specification}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specifica
-tion}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}} on li
-ne 1346
-Marks: queue for leftmark after: "\protect \MakeUppercase  {6\hskip 1em\relax L
-ayout Specification}", "\protect \MakeUppercase  {7\hskip 1em\relax Performance
- of the algorithm}", 
-Marks: queue for rightmark before: "6.4\hskip 1em\relax Page setup declarations
-", "6.5\hskip 1em\relax Float formatting declarations", "", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}", "\protect \MakeUppercase  {7\hskip 1em\relax Performance of the algorithm}", 
+Marks: queue for rightmark before: "6.4\hskip 1em\relax Page setup declarations", "6.5\hskip 1em\relax Float formatting declarations", "", 
 Marks: picking up from output {leftmark=8}{rightmark=40}{floats=7}
 Marks: found 0 entries for rightmark (new 40; old 40)
-Marks: in output: rightmark -> {6.4\hskip 1em\relax Page setup declarations}{6.
-4\hskip 1em\relax Page setup declarations}{6.4\hskip 1em\relax Page setup decla
-rations} on line ...
-Marks: queue for rightmark after: "6.4\hskip 1em\relax Page setup declarations"
-, "6.5\hskip 1em\relax Float formatting declarations", "", 
+Marks: in output: rightmark -> {6.4\hskip 1em\relax Page setup declarations}{6.4\hskip 1em\relax Page setup declarations}{6.4\hskip 1em\relax Page setup declarations} on line ...
+Marks: queue for rightmark after: "6.4\hskip 1em\relax Page setup declarations", "6.5\hskip 1em\relax Float formatting declarations", "", 
 Marks: queue for floats before: "6", 
 Marks: picking up from output {leftmark=8}{rightmark=40}{floats=7}
 Marks: found 0 entries for floats (new 7; old 7)
@@ -11173,27 +10224,16 @@
 : -best col: 2 of 2
 : -vsize: 288.0pt; pagegoal: 258.73473pt
 : -entering xor_OR_best_finish_col_or_block:
-Marks: queue for leftmark before: "\protect \MakeUppercase  {6\hskip 1em\relax 
-Layout Specification}", "\protect \MakeUppercase  {7\hskip 1em\relax Performanc
-e of the algorithm}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}", "\protect \MakeUppercase  {7\hskip 1em\relax Performance of the algorithm}", 
 Marks: picking up from output {leftmark=8}{rightmark=40}{floats=7}
 Marks: found 0 entries for leftmark (new 8; old 8)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {6\hskip 1em\relax Layo
-ut Specification}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specifica
-tion}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}} on li
-ne 1346
-Marks: queue for leftmark after: "\protect \MakeUppercase  {6\hskip 1em\relax L
-ayout Specification}", "\protect \MakeUppercase  {7\hskip 1em\relax Performance
- of the algorithm}", 
-Marks: queue for rightmark before: "6.4\hskip 1em\relax Page setup declarations
-", "6.5\hskip 1em\relax Float formatting declarations", "", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}", "\protect \MakeUppercase  {7\hskip 1em\relax Performance of the algorithm}", 
+Marks: queue for rightmark before: "6.4\hskip 1em\relax Page setup declarations", "6.5\hskip 1em\relax Float formatting declarations", "", 
 Marks: picking up from output {leftmark=8}{rightmark=40}{floats=7}
 Marks: found 0 entries for rightmark (new 40; old 40)
-Marks: in output: rightmark -> {6.4\hskip 1em\relax Page setup declarations}{6.
-4\hskip 1em\relax Page setup declarations}{6.4\hskip 1em\relax Page setup decla
-rations} on line ...
-Marks: queue for rightmark after: "6.4\hskip 1em\relax Page setup declarations"
-, "6.5\hskip 1em\relax Float formatting declarations", "", 
+Marks: in output: rightmark -> {6.4\hskip 1em\relax Page setup declarations}{6.4\hskip 1em\relax Page setup declarations}{6.4\hskip 1em\relax Page setup declarations} on line ...
+Marks: queue for rightmark after: "6.4\hskip 1em\relax Page setup declarations", "6.5\hskip 1em\relax Float formatting declarations", "", 
 Marks: queue for floats before: "6", 
 Marks: picking up from output {leftmark=8}{rightmark=40}{floats=7}
 Marks: found 0 entries for floats (new 7; old 7)
@@ -11297,9 +10337,7 @@
 : -----\xor_curr_col_block::= 1_1
 : -----\xor_curr_col_block::= 2_1
 : -----Saving column (height) information:
-: -----\g_xor_best_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\
-int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0
-pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
+: -----\g_xor_best_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
 : ----leaving xor_save_col_hts:N
 : ---leaving xor_cols_setup:
 : ---entering xor_initialize_flush_data:
@@ -11352,33 +10390,30 @@
 Marks: Setting mark {leftmark=9}{rightmark=42}{floats=8}
 Overfull \hbox (10.50015pt too wide) in paragraph at lines 1386--1386
 [] \OT1/pcr/m/n/8 STATS: floats waiting = 19 on page 2 (float page)[] 
- []
+[]
 Overfull \hbox (10.50015pt too wide) in paragraph at lines 1386--1386
 [] \OT1/pcr/m/n/8 STATS: floats waiting = 19 on page 3 (float page)[] 
- []
+[]
 Overfull \hbox (5.70015pt too wide) in paragraph at lines 1386--1386
 [] \OT1/pcr/m/n/8 STATS: floats waiting = 7 on page 4 (float page)[] 
- []
+[]
 Overfull \hbox (5.70015pt too wide) in paragraph at lines 1386--1386
 [] \OT1/pcr/m/n/8 STATS: floats waiting = 5 on page 5 (float page)[] 
- []
+[]
 Overfull \hbox (5.70015pt too wide) in paragraph at lines 1386--1386
 [] \OT1/pcr/m/n/8 STATS: floats waiting = 0 on page 6 (float page)[] 
- []
+[]
 Overfull \hbox (10.50015pt too wide) in paragraph at lines 1386--1386
 [] \OT1/pcr/m/n/8 STATS: floats waiting = 6 on page 12 (float page)[] 
- []
-: -{Statistics from the algorithm}{1}{tab:stats}{7}{t12,b12,t11,b11,t21,b21}{ta
-ble}{7}
+[]
+: -{Statistics from the algorithm}{1}{tab:stats}{7}{t12,b12,t11,b11,t21,b21}{table}{7}
 : leaving float environment
 : entering float environment
 Marks: set floats <- 8 on line ...
 Marks: Setting mark {leftmark=9}{rightmark=42}{floats=9}
-: -{Running times of the algorithm}{1}{tab:runs}{8}{t12,b12,t11,b11,t21,b21}{ta
-ble}{8}
+: -{Running times of the algorithm}{1}{tab:runs}{8}{t12,b12,t11,b11,t21,b21}{table}{8}
 : leaving float environment
-Marks: set leftmark <- \protect \MakeUppercase  {8\hskip 1em\relax Outlook} on 
-line 1432
+Marks: set leftmark <- \protect \MakeUppercase  {8\hskip 1em\relax Outlook} on line ...
 Marks: Setting mark {leftmark=10}{rightmark=42}{floats=9}
 Marks: set rightmark <-  on line ...
 Marks: Setting mark {leftmark=10}{rightmark=43}{floats=9}
@@ -11390,29 +10425,21 @@
 : leaving xor_OR_collect:
 Underfull \hbox (badness 2865) in paragraph at lines 1444--1448
 []\OT1/ptm/m/n/10 We in-tend to pro-vide more con-trol over the
- []
+[]
 : entering xor_OR_collect:
 : -output pen: 10000
 : -CHECK: Saving output penalty (10000)
 : -Re-adding forced break(s) for splitting
 Marks: saving state on line ...
-Marks: queue for leftmark before: "\protect \MakeUppercase  {6\hskip 1em\relax 
-Layout Specification}", "\protect \MakeUppercase  {7\hskip 1em\relax Performanc
-e of the algorithm}", "\protect \MakeUppercase  {8\hskip 1em\relax Outlook}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}", "\protect \MakeUppercase  {7\hskip 1em\relax Performance of the algorithm}", "\protect \MakeUppercase  {8\hskip 1em\relax Outlook}", 
 Marks: picking up from output {leftmark=10}{rightmark=43}{floats=9}
 Marks: found 2 entries for leftmark (new 10; old 8)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {6\hskip 1em\relax Layo
-ut Specification}}{\protect \MakeUppercase  {7\hskip 1em\relax Performance of t
-he algorithm}}{\protect \MakeUppercase  {8\hskip 1em\relax Outlook}} on line ...
-48
-Marks: queue for leftmark after: "\protect \MakeUppercase  {8\hskip 1em\relax O
-utlook}", 
-Marks: queue for rightmark before: "6.4\hskip 1em\relax Page setup declarations
-", "6.5\hskip 1em\relax Float formatting declarations", "", "", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}}{\protect \MakeUppercase  {7\hskip 1em\relax Performance of the algorithm}}{\protect \MakeUppercase  {8\hskip 1em\relax Outlook}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {8\hskip 1em\relax Outlook}", 
+Marks: queue for rightmark before: "6.4\hskip 1em\relax Page setup declarations", "6.5\hskip 1em\relax Float formatting declarations", "", "", 
 Marks: picking up from output {leftmark=10}{rightmark=43}{floats=9}
 Marks: found 3 entries for rightmark (new 43; old 40)
-Marks: in output: rightmark -> {6.4\hskip 1em\relax Page setup declarations}{6.
-5\hskip 1em\relax Float formatting declarations}{} on line ...
+Marks: in output: rightmark -> {6.4\hskip 1em\relax Page setup declarations}{6.5\hskip 1em\relax Float formatting declarations}{} on line ...
 Marks: queue for rightmark after: "", 
 Marks: queue for floats before: "6", "7", "8", 
 Marks: picking up from output {leftmark=10}{rightmark=43}{floats=9}
@@ -11420,7 +10447,7 @@
 Marks: in output: floats -> {6}{7}{8} on line ...
 Marks: queue for floats after: "8", 
 : -entering xor_trial_place_float_setup:
- STATS: floats waiting = 2 (\bx at G  \bx at H  ) on page 13
+STATS: floats waiting = 2 (\bx at G  \bx at H  ) on page 13
 =======================================================================
 : --flush: tighten placement conditions
 : --BALANCE: g_xor_trial_balance_done_int <- 0
@@ -11445,9 +10472,7 @@
 : ---\xor_curr_col_block::= 1_1
 : ---\xor_curr_col_block::= 2_1
 : ---Saving column (height) information:
-: ---\g_xor_saved_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\i
-nt_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0p
-t}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
+: ---\g_xor_saved_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
 : --leaving xor_save_col_hts:N
 : --entering xor_OR_trial_grab_balance_setup:
 : ---BALANCE: g_xor_trial_balance_seen_int <- 0
@@ -11540,27 +10565,16 @@
 : -grab col: 1 of 2
 : -vsize: 612.0pt; pagegoal: 612.0pt
 : -entering xor_OR_trial_finish_block_or_col:
-Marks: queue for leftmark before: "\protect \MakeUppercase  {6\hskip 1em\relax 
-Layout Specification}", "\protect \MakeUppercase  {7\hskip 1em\relax Performanc
-e of the algorithm}", "\protect \MakeUppercase  {8\hskip 1em\relax Outlook}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}", "\protect \MakeUppercase  {7\hskip 1em\relax Performance of the algorithm}", "\protect \MakeUppercase  {8\hskip 1em\relax Outlook}", 
 Marks: picking up from output {leftmark=8}{rightmark=41}{floats=7}
 Marks: found 0 entries for leftmark (new 8; old 8)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {6\hskip 1em\relax Layo
-ut Specification}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specifica
-tion}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}} on li
-ne 1448
-Marks: queue for leftmark after: "\protect \MakeUppercase  {6\hskip 1em\relax L
-ayout Specification}", "\protect \MakeUppercase  {7\hskip 1em\relax Performance
- of the algorithm}", "\protect \MakeUppercase  {8\hskip 1em\relax Outlook}", 
-Marks: queue for rightmark before: "6.4\hskip 1em\relax Page setup declarations
-", "6.5\hskip 1em\relax Float formatting declarations", "", "", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}", "\protect \MakeUppercase  {7\hskip 1em\relax Performance of the algorithm}", "\protect \MakeUppercase  {8\hskip 1em\relax Outlook}", 
+Marks: queue for rightmark before: "6.4\hskip 1em\relax Page setup declarations", "6.5\hskip 1em\relax Float formatting declarations", "", "", 
 Marks: picking up from output {leftmark=8}{rightmark=41}{floats=7}
 Marks: found 1 entries for rightmark (new 41; old 40)
-Marks: in output: rightmark -> {6.4\hskip 1em\relax Page setup declarations}{6.
-5\hskip 1em\relax Float formatting declarations}{6.5\hskip 1em\relax Float form
-atting declarations} on line ...
-Marks: queue for rightmark after: "6.5\hskip 1em\relax Float formatting declara
-tions", "", "", 
+Marks: in output: rightmark -> {6.4\hskip 1em\relax Page setup declarations}{6.5\hskip 1em\relax Float formatting declarations}{6.5\hskip 1em\relax Float formatting declarations} on line ...
+Marks: queue for rightmark after: "6.5\hskip 1em\relax Float formatting declarations", "", "", 
 Marks: queue for floats before: "6", "7", "8", 
 Marks: picking up from output {leftmark=8}{rightmark=41}{floats=7}
 Marks: found 0 entries for floats (new 7; old 7)
@@ -11633,24 +10647,15 @@
 : -grab col: 2 of 2
 : -vsize: 612.0pt; pagegoal: 563.73473pt
 : -entering xor_OR_trial_finish_block_or_col:
-Marks: queue for leftmark before: "\protect \MakeUppercase  {6\hskip 1em\relax 
-Layout Specification}", "\protect \MakeUppercase  {7\hskip 1em\relax Performanc
-e of the algorithm}", "\protect \MakeUppercase  {8\hskip 1em\relax Outlook}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}", "\protect \MakeUppercase  {7\hskip 1em\relax Performance of the algorithm}", "\protect \MakeUppercase  {8\hskip 1em\relax Outlook}", 
 Marks: picking up from output {leftmark=9}{rightmark=42}{floats=9}
 Marks: found 1 entries for leftmark (new 9; old 8)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {6\hskip 1em\relax Layo
-ut Specification}}{\protect \MakeUppercase  {7\hskip 1em\relax Performance of t
-he algorithm}}{\protect \MakeUppercase  {7\hskip 1em\relax Performance of the a
-lgorithm}} on line ...
-Marks: queue for leftmark after: "\protect \MakeUppercase  {7\hskip 1em\relax P
-erformance of the algorithm}", "\protect \MakeUppercase  {8\hskip 1em\relax Out
-look}", 
-Marks: queue for rightmark before: "6.5\hskip 1em\relax Float formatting declar
-ations", "", "", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}}{\protect \MakeUppercase  {7\hskip 1em\relax Performance of the algorithm}}{\protect \MakeUppercase  {7\hskip 1em\relax Performance of the algorithm}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {7\hskip 1em\relax Performance of the algorithm}", "\protect \MakeUppercase  {8\hskip 1em\relax Outlook}", 
+Marks: queue for rightmark before: "6.5\hskip 1em\relax Float formatting declarations", "", "", 
 Marks: picking up from output {leftmark=9}{rightmark=42}{floats=9}
 Marks: found 1 entries for rightmark (new 42; old 41)
-Marks: in output: rightmark -> {6.5\hskip 1em\relax Float formatting declaratio
-ns}{}{} on line ...
+Marks: in output: rightmark -> {6.5\hskip 1em\relax Float formatting declarations}{}{} on line ...
 Marks: queue for rightmark after: "", "", 
 Marks: queue for floats before: "6", "7", "8", 
 Marks: picking up from output {leftmark=9}{rightmark=42}{floats=9}
@@ -11701,21 +10706,21 @@
 : -- {7}
 : -- g_xor_this_areas_open_clist <- b12,b11,b21
 : -- g_xor_this_areas_closed_clist <- 
- {7}  {table} (floats)  {7}   {\g_xor_curr_float_box_tl }
+{7}  {table} (floats)  {7}   {\g_xor_curr_float_box_tl }
 : --g_xor_saved_this_areas_open_clist (init): b12,b11,b21 := b12,b11,b21
 : --entering xor_try_this_area_std:
 : ---BALANCE: g_xor_trial_balance_done_int <- 0
 : ---(Re)initializing column heights ...
 : ---area trial: b12
- area trial: b12
+area trial: b12
 : ---span count unsuitable: b12 /= 1
- -> failed: span count b12 /= 1
+-> failed: span count b12 /= 1
 : --leaving xor_try_this_area_std:
 : --entering xor_try_this_area_std:
 : ---BALANCE: g_xor_trial_balance_done_int <- 0
 : ---(Re)initializing column heights ...
 : ---area trial: b11
- area trial: b11
+area trial: b11
 : ---span count okay: b11 = 1
 : ---area not closed for all types: not member of ()
 : ---area open for class floats; not member of ()
@@ -11723,8 +10728,7 @@
 : ----looking at column: 1
 : ----entering xor_construct_and_test_col_ht:nnn
 : -----col height before: 612.0pt (\g_xor_ht_col_1_1_dim)
-: -----first float in any b in column 1: adding \g_xor_float_text_skip=36.0pt m
-inus 8.0pt
+: -----first float in any b in column 1: adding \g_xor_float_text_skip=36.0pt minus 8.0pt
 : -----GRID: grid size used: 12.0pt
 : -----GRID: \g_xor_returned_lower_size_tl=300.0pt
 : -----GRID: \g_xor_returned_lower_delta_size_tl=8.4407pt
@@ -11745,9 +10749,7 @@
 : ----\xor_curr_col_block::= 1_1
 : ----\xor_curr_col_block::= 2_1
 : ----Saving column (height) information:
-: ----\g_xor_saved_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\
-int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {300.0
-pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
+: ----\g_xor_saved_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {300.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
 : ---leaving xor_save_col_hts:N
 : ---entering xor_OR_trial_grab_balance_setup:
 : ----BALANCE: g_xor_trial_balance_seen_int <- 0
@@ -11818,27 +10820,16 @@
 : -grab col: 1 of 2
 : -vsize: 300.0pt; pagegoal: 300.0pt
 : -entering xor_OR_trial_finish_block_or_col:
-Marks: queue for leftmark before: "\protect \MakeUppercase  {6\hskip 1em\relax 
-Layout Specification}", "\protect \MakeUppercase  {7\hskip 1em\relax Performanc
-e of the algorithm}", "\protect \MakeUppercase  {8\hskip 1em\relax Outlook}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}", "\protect \MakeUppercase  {7\hskip 1em\relax Performance of the algorithm}", "\protect \MakeUppercase  {8\hskip 1em\relax Outlook}", 
 Marks: picking up from output {leftmark=8}{rightmark=40}{floats=7}
 Marks: found 0 entries for leftmark (new 8; old 8)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {6\hskip 1em\relax Layo
-ut Specification}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specifica
-tion}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}} on li
-ne 1448
-Marks: queue for leftmark after: "\protect \MakeUppercase  {6\hskip 1em\relax L
-ayout Specification}", "\protect \MakeUppercase  {7\hskip 1em\relax Performance
- of the algorithm}", "\protect \MakeUppercase  {8\hskip 1em\relax Outlook}", 
-Marks: queue for rightmark before: "6.4\hskip 1em\relax Page setup declarations
-", "6.5\hskip 1em\relax Float formatting declarations", "", "", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}", "\protect \MakeUppercase  {7\hskip 1em\relax Performance of the algorithm}", "\protect \MakeUppercase  {8\hskip 1em\relax Outlook}", 
+Marks: queue for rightmark before: "6.4\hskip 1em\relax Page setup declarations", "6.5\hskip 1em\relax Float formatting declarations", "", "", 
 Marks: picking up from output {leftmark=8}{rightmark=40}{floats=7}
 Marks: found 0 entries for rightmark (new 40; old 40)
-Marks: in output: rightmark -> {6.4\hskip 1em\relax Page setup declarations}{6.
-4\hskip 1em\relax Page setup declarations}{6.4\hskip 1em\relax Page setup decla
-rations} on line ...
-Marks: queue for rightmark after: "6.4\hskip 1em\relax Page setup declarations"
-, "6.5\hskip 1em\relax Float formatting declarations", "", "", 
+Marks: in output: rightmark -> {6.4\hskip 1em\relax Page setup declarations}{6.4\hskip 1em\relax Page setup declarations}{6.4\hskip 1em\relax Page setup declarations} on line ...
+Marks: queue for rightmark after: "6.4\hskip 1em\relax Page setup declarations", "6.5\hskip 1em\relax Float formatting declarations", "", "", 
 Marks: queue for floats before: "6", "7", "8", 
 Marks: picking up from output {leftmark=8}{rightmark=40}{floats=7}
 Marks: found 0 entries for floats (new 7; old 7)
@@ -11853,7 +10844,7 @@
 : --entering xor_check_callout_after:n
 : ---entering xor_check_callout_column:n
 : ----Last callout (floats) = 6
- -> failed: last callout 6 < 7 last float placed in column 1
+-> failed: last callout 6 < 7 last float placed in column 1
 : ----Failed: (floats) last callout 6 < 7 last float placed
 : ---leaving xor_check_callout_column:n
 : --leaving xor_check_callout_after:n
@@ -11910,7 +10901,7 @@
 : --BALANCE: g_xor_trial_balance_done_int <- 0
 : --(Re)initializing column heights ...
 : --area trial: b21
- area trial: b21
+area trial: b21
 : --span count okay: b21 = 1
 : --area not closed for all types: not member of ()
 : --area open for class floats; not member of ()
@@ -11918,8 +10909,7 @@
 : ---looking at column: 2
 : ---entering xor_construct_and_test_col_ht:nnn
 : ----col height before: 612.0pt (\g_xor_ht_col_2_1_dim)
-: ----first float in any b in column 2: adding \g_xor_float_text_skip=36.0pt mi
-nus 8.0pt
+: ----first float in any b in column 2: adding \g_xor_float_text_skip=36.0pt minus 8.0pt
 : ----GRID: grid size used: 12.0pt
 : ----GRID: \g_xor_returned_lower_size_tl=300.0pt
 : ----GRID: \g_xor_returned_lower_delta_size_tl=8.4407pt
@@ -11940,9 +10930,7 @@
 : ---\xor_curr_col_block::= 1_1
 : ---\xor_curr_col_block::= 2_1
 : ---Saving column (height) information:
-: ---\g_xor_saved_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\i
-nt_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0p
-t}\dim_gset:Nn \g_xor_ht_col_2_1_dim {300.0pt}
+: ---\g_xor_saved_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {300.0pt}
 : --leaving xor_save_col_hts:N
 : --entering xor_OR_trial_grab_balance_setup:
 : ---BALANCE: g_xor_trial_balance_seen_int <- 0
@@ -12035,27 +11023,16 @@
 : -grab col: 1 of 2
 : -vsize: 612.0pt; pagegoal: 612.0pt
 : -entering xor_OR_trial_finish_block_or_col:
-Marks: queue for leftmark before: "\protect \MakeUppercase  {6\hskip 1em\relax 
-Layout Specification}", "\protect \MakeUppercase  {7\hskip 1em\relax Performanc
-e of the algorithm}", "\protect \MakeUppercase  {8\hskip 1em\relax Outlook}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}", "\protect \MakeUppercase  {7\hskip 1em\relax Performance of the algorithm}", "\protect \MakeUppercase  {8\hskip 1em\relax Outlook}", 
 Marks: picking up from output {leftmark=8}{rightmark=41}{floats=7}
 Marks: found 0 entries for leftmark (new 8; old 8)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {6\hskip 1em\relax Layo
-ut Specification}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specifica
-tion}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}} on li
-ne 1448
-Marks: queue for leftmark after: "\protect \MakeUppercase  {6\hskip 1em\relax L
-ayout Specification}", "\protect \MakeUppercase  {7\hskip 1em\relax Performance
- of the algorithm}", "\protect \MakeUppercase  {8\hskip 1em\relax Outlook}", 
-Marks: queue for rightmark before: "6.4\hskip 1em\relax Page setup declarations
-", "6.5\hskip 1em\relax Float formatting declarations", "", "", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}", "\protect \MakeUppercase  {7\hskip 1em\relax Performance of the algorithm}", "\protect \MakeUppercase  {8\hskip 1em\relax Outlook}", 
+Marks: queue for rightmark before: "6.4\hskip 1em\relax Page setup declarations", "6.5\hskip 1em\relax Float formatting declarations", "", "", 
 Marks: picking up from output {leftmark=8}{rightmark=41}{floats=7}
 Marks: found 1 entries for rightmark (new 41; old 40)
-Marks: in output: rightmark -> {6.4\hskip 1em\relax Page setup declarations}{6.
-5\hskip 1em\relax Float formatting declarations}{6.5\hskip 1em\relax Float form
-atting declarations} on line ...
-Marks: queue for rightmark after: "6.5\hskip 1em\relax Float formatting declara
-tions", "", "", 
+Marks: in output: rightmark -> {6.4\hskip 1em\relax Page setup declarations}{6.5\hskip 1em\relax Float formatting declarations}{6.5\hskip 1em\relax Float formatting declarations} on line ...
+Marks: queue for rightmark after: "6.5\hskip 1em\relax Float formatting declarations", "", "", 
 Marks: queue for floats before: "6", "7", "8", 
 Marks: picking up from output {leftmark=8}{rightmark=41}{floats=7}
 Marks: found 0 entries for floats (new 7; old 7)
@@ -12137,24 +11114,15 @@
 : -grab col: 2 of 2
 : -vsize: 300.0pt; pagegoal: 251.73473pt
 : -entering xor_OR_trial_finish_block_or_col:
-Marks: queue for leftmark before: "\protect \MakeUppercase  {6\hskip 1em\relax 
-Layout Specification}", "\protect \MakeUppercase  {7\hskip 1em\relax Performanc
-e of the algorithm}", "\protect \MakeUppercase  {8\hskip 1em\relax Outlook}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}", "\protect \MakeUppercase  {7\hskip 1em\relax Performance of the algorithm}", "\protect \MakeUppercase  {8\hskip 1em\relax Outlook}", 
 Marks: picking up from output {leftmark=9}{rightmark=42}{floats=7}
 Marks: found 1 entries for leftmark (new 9; old 8)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {6\hskip 1em\relax Layo
-ut Specification}}{\protect \MakeUppercase  {7\hskip 1em\relax Performance of t
-he algorithm}}{\protect \MakeUppercase  {7\hskip 1em\relax Performance of the a
-lgorithm}} on line ...
-Marks: queue for leftmark after: "\protect \MakeUppercase  {7\hskip 1em\relax P
-erformance of the algorithm}", "\protect \MakeUppercase  {8\hskip 1em\relax Out
-look}", 
-Marks: queue for rightmark before: "6.5\hskip 1em\relax Float formatting declar
-ations", "", "", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}}{\protect \MakeUppercase  {7\hskip 1em\relax Performance of the algorithm}}{\protect \MakeUppercase  {7\hskip 1em\relax Performance of the algorithm}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {7\hskip 1em\relax Performance of the algorithm}", "\protect \MakeUppercase  {8\hskip 1em\relax Outlook}", 
+Marks: queue for rightmark before: "6.5\hskip 1em\relax Float formatting declarations", "", "", 
 Marks: picking up from output {leftmark=9}{rightmark=42}{floats=7}
 Marks: found 1 entries for rightmark (new 42; old 41)
-Marks: in output: rightmark -> {6.5\hskip 1em\relax Float formatting declaratio
-ns}{}{} on line ...
+Marks: in output: rightmark -> {6.5\hskip 1em\relax Float formatting declarations}{}{} on line ...
 Marks: queue for rightmark after: "", "", 
 Marks: queue for floats before: "6", "7", "8", 
 Marks: picking up from output {leftmark=9}{rightmark=42}{floats=7}
@@ -12168,7 +11136,7 @@
 : --entering xor_check_float_footnote_forbidden:
 : ---OK: no old bottom floats
 : ---this at area,column: b21, 2
- -> failed: column 2 contains footnotes and bottom floats
+-> failed: column 2 contains footnotes and bottom floats
 : ---Failed: column 2 contains footnotes and bottom floats
 : --leaving xor_check_float_footnote_forbidden:
 : --entering xor_evaluate_trial_results:
@@ -12219,7 +11187,7 @@
 : -entering xor_attempt_to_defer_and_try_next_float:
 : --flush: no flush point seen;defer
 : -leaving xor_attempt_to_defer_and_try_next_float:
- -> failed: --> defer
+-> failed: --> defer
 : -g_xor_curr_page_areas_closed_clist <- "" + ""
 : -g_xor_this_areas_closed_clist <- "b12,b11,b21" (all closed)
 : -entering xor_try_next_float:
@@ -12235,35 +11203,35 @@
 : -- {8}
 : -- g_xor_this_areas_open_clist <- b12,b11,b21
 : -- g_xor_this_areas_closed_clist <- b12,b11,b21
- {8}  {table} (floats)  {8}   {\g_xor_curr_float_box_tl }
+{8}  {table} (floats)  {8}   {\g_xor_curr_float_box_tl }
 : --g_xor_saved_this_areas_open_clist (init): b12,b11,b21 := b12,b11,b21
 : --entering xor_try_this_area_std:
 : ---BALANCE: g_xor_trial_balance_done_int <- 0
 : ---(Re)initializing column heights ...
 : ---area trial: b12
- area trial: b12
+area trial: b12
 : ---span count unsuitable: b12 /= 1
- -> failed: span count b12 /= 1
+-> failed: span count b12 /= 1
 : --leaving xor_try_this_area_std:
 : --entering xor_try_this_area_std:
 : ---BALANCE: g_xor_trial_balance_done_int <- 0
 : ---(Re)initializing column heights ...
 : ---area trial: b11
- area trial: b11
+area trial: b11
 : ---span count okay: b11 = 1
 : ---area not closed for all types: not member of ()
 : ---area closed for class floats; member of (b12,b11,b21)
- -> failed: area closed for class floats
+-> failed: area closed for class floats
 : --leaving xor_try_this_area_std:
 : --entering xor_try_this_area_std:
 : ---BALANCE: g_xor_trial_balance_done_int <- 0
 : ---(Re)initializing column heights ...
 : ---area trial: b21
- area trial: b21
+area trial: b21
 : ---span count okay: b21 = 1
 : ---area not closed for all types: not member of ()
 : ---area closed for class floats; member of (b12,b11,b21)
- -> failed: area closed for class floats
+-> failed: area closed for class floats
 : --leaving xor_try_this_area_std:
 : --entering xor_try_this_area_std:
 : ---BALANCE: g_xor_trial_balance_done_int <- 0
@@ -12273,23 +11241,19 @@
 : --entering xor_attempt_to_defer_and_try_next_float:
 : ---flush: no flush point seen;defer
 : --leaving xor_attempt_to_defer_and_try_next_float:
- -> failed: --> defer
+-> failed: --> defer
 : --g_xor_curr_page_areas_closed_clist <- "" + ""
 : --g_xor_this_areas_closed_clist <- "b12,b11,b21" (all closed)
 : --entering xor_try_next_float:
- STATS: trials = 8
+STATS: trials = 8
 : ---entering xor_OR_best_cols_setup:
-: ----XX initial: \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_co
-l_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim_gset:Nn \g_xo
-r_ht_col_2_1_dim {612.0pt}
+: ----XX initial: \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
 : ----entering xor_initialize_page_footins_ftnright:
 : ----leaving xor_initialize_page_footins_ftnright:
 : ----BALANCE: g_xor_trial_balance_seen_int <- 0
 : ----Setting up column heights:
 : ----BALANCE: working on new block
-: ----Setting up column heights: \int_gset:Nn \g_xor_col_1_block_int {1}\int_gs
-et:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\di
-m_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
+: ----Setting up column heights: \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
 : ----entering xor_OR_best_next_col_setup:
 : -----vsize <- 612.0pt
 : -----ftnspread: page= 13
@@ -12375,27 +11339,16 @@
 : -best col: 1 of 2
 : -vsize: 612.0pt; pagegoal: 612.0pt
 : -entering xor_OR_best_finish_col_or_block:
-Marks: queue for leftmark before: "\protect \MakeUppercase  {6\hskip 1em\relax 
-Layout Specification}", "\protect \MakeUppercase  {7\hskip 1em\relax Performanc
-e of the algorithm}", "\protect \MakeUppercase  {8\hskip 1em\relax Outlook}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}", "\protect \MakeUppercase  {7\hskip 1em\relax Performance of the algorithm}", "\protect \MakeUppercase  {8\hskip 1em\relax Outlook}", 
 Marks: picking up from output {leftmark=8}{rightmark=41}{floats=7}
 Marks: found 0 entries for leftmark (new 8; old 8)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {6\hskip 1em\relax Layo
-ut Specification}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specifica
-tion}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}} on li
-ne 1448
-Marks: queue for leftmark after: "\protect \MakeUppercase  {6\hskip 1em\relax L
-ayout Specification}", "\protect \MakeUppercase  {7\hskip 1em\relax Performance
- of the algorithm}", "\protect \MakeUppercase  {8\hskip 1em\relax Outlook}", 
-Marks: queue for rightmark before: "6.4\hskip 1em\relax Page setup declarations
-", "6.5\hskip 1em\relax Float formatting declarations", "", "", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}}{\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}", "\protect \MakeUppercase  {7\hskip 1em\relax Performance of the algorithm}", "\protect \MakeUppercase  {8\hskip 1em\relax Outlook}", 
+Marks: queue for rightmark before: "6.4\hskip 1em\relax Page setup declarations", "6.5\hskip 1em\relax Float formatting declarations", "", "", 
 Marks: picking up from output {leftmark=8}{rightmark=41}{floats=7}
 Marks: found 1 entries for rightmark (new 41; old 40)
-Marks: in output: rightmark -> {6.4\hskip 1em\relax Page setup declarations}{6.
-5\hskip 1em\relax Float formatting declarations}{6.5\hskip 1em\relax Float form
-atting declarations} on line ...
-Marks: queue for rightmark after: "6.5\hskip 1em\relax Float formatting declara
-tions", "", "", 
+Marks: in output: rightmark -> {6.4\hskip 1em\relax Page setup declarations}{6.5\hskip 1em\relax Float formatting declarations}{6.5\hskip 1em\relax Float formatting declarations} on line ...
+Marks: queue for rightmark after: "6.5\hskip 1em\relax Float formatting declarations", "", "", 
 Marks: queue for floats before: "6", "7", "8", 
 Marks: picking up from output {leftmark=8}{rightmark=41}{floats=7}
 Marks: found 0 entries for floats (new 7; old 7)
@@ -12470,24 +11423,15 @@
 : -best col: 2 of 2
 : -vsize: 612.0pt; pagegoal: 563.73473pt
 : -entering xor_OR_best_finish_col_or_block:
-Marks: queue for leftmark before: "\protect \MakeUppercase  {6\hskip 1em\relax 
-Layout Specification}", "\protect \MakeUppercase  {7\hskip 1em\relax Performanc
-e of the algorithm}", "\protect \MakeUppercase  {8\hskip 1em\relax Outlook}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}", "\protect \MakeUppercase  {7\hskip 1em\relax Performance of the algorithm}", "\protect \MakeUppercase  {8\hskip 1em\relax Outlook}", 
 Marks: picking up from output {leftmark=9}{rightmark=42}{floats=9}
 Marks: found 1 entries for leftmark (new 9; old 8)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {6\hskip 1em\relax Layo
-ut Specification}}{\protect \MakeUppercase  {7\hskip 1em\relax Performance of t
-he algorithm}}{\protect \MakeUppercase  {7\hskip 1em\relax Performance of the a
-lgorithm}} on line ...
-Marks: queue for leftmark after: "\protect \MakeUppercase  {7\hskip 1em\relax P
-erformance of the algorithm}", "\protect \MakeUppercase  {8\hskip 1em\relax Out
-look}", 
-Marks: queue for rightmark before: "6.5\hskip 1em\relax Float formatting declar
-ations", "", "", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {6\hskip 1em\relax Layout Specification}}{\protect \MakeUppercase  {7\hskip 1em\relax Performance of the algorithm}}{\protect \MakeUppercase  {7\hskip 1em\relax Performance of the algorithm}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {7\hskip 1em\relax Performance of the algorithm}", "\protect \MakeUppercase  {8\hskip 1em\relax Outlook}", 
+Marks: queue for rightmark before: "6.5\hskip 1em\relax Float formatting declarations", "", "", 
 Marks: picking up from output {leftmark=9}{rightmark=42}{floats=9}
 Marks: found 1 entries for rightmark (new 42; old 41)
-Marks: in output: rightmark -> {6.5\hskip 1em\relax Float formatting declaratio
-ns}{}{} on line ...
+Marks: in output: rightmark -> {6.5\hskip 1em\relax Float formatting declarations}{}{} on line ...
 Marks: queue for rightmark after: "", "", 
 Marks: queue for floats before: "6", "7", "8", 
 Marks: picking up from output {leftmark=9}{rightmark=42}{floats=9}
@@ -12585,9 +11529,7 @@
 : -----\xor_curr_col_block::= 1_1
 : -----\xor_curr_col_block::= 2_1
 : -----Saving column (height) information:
-: -----\g_xor_best_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\
-int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0
-pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
+: -----\g_xor_best_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
 : ----leaving xor_save_col_hts:N
 : ---leaving xor_cols_setup:
 : ---entering xor_initialize_flush_data:
@@ -12607,17 +11549,11 @@
 : ---\bx at H : 8 ??? 8
 : ---\bx at H : callout has been typeset
 =======================================================================
- STATS: floats waiting = 2 on page 14 (float page)
+STATS: floats waiting = 2 on page 14 (float page)
 =======================================================================
 : ---entering xor_attempt_float_page:
 : ----entering xor_save_current_float_state:
-: -----saved: macro:->\cs_gset_nopar:Npn \g_xor_floats_active_seq {\s__seq \__s
-eq_item:n {\bx at G }\__seq_item:n {\bx at H }}\dim_set:Nn \g_xor_ht_col_1_1_dim {612
-.0pt}\dim_set:Nn \g_xor_ht_col_2_1_dim {612.0pt}\int_gset:cn {g_xor_area_b12_fl
-oat_int}{0}\gdef \g_xor_area_b12_float_seq {\s__seq }\int_gset:cn {g_xor_area_b
-11_float_int}{0}\gdef \g_xor_area_b11_float_seq {\s__seq }\int_gset:cn {g_xor_a
-rea_b21_float_int}{0}\gdef \g_xor_area_b21_float_seq {\s__seq }\int_gset:cn {g_
-xor_area_DDD_float_int}{0}\gdef \g_xor_area_DDD_float_seq {\s__seq }
+: -----saved: macro:->\cs_gset_nopar:Npn \g_xor_floats_active_seq {\s__seq \__seq_item:n {\bx at G }\__seq_item:n {\bx at H }}\dim_set:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim_set:Nn \g_xor_ht_col_2_1_dim {612.0pt}\int_gset:cn {g_xor_area_b12_float_int}{0}\gdef \g_xor_area_b12_float_seq {\s__seq }\int_gset:cn {g_xor_area_b11_float_int}{0}\gdef \g_xor_area_b11_float_seq {\s__seq }\int_gset:cn {g_xor_area_b21_float_int}{0}\gdef \g_xor_area_b21_float_seq {\s__seq }\int_gset:cn {g_xor_area_DDD_float_int}{0}\gdef \g_xor_area_DDD_float_seq {\s__seq }
 : ----leaving xor_save_current_float_state:
 : ----entering xor_trial_place_float_inner_loop:
 : ----leaving xor_trial_place_float_inner_loop:
@@ -12634,17 +11570,17 @@
 : ----- {7}
 : ----- g_xor_this_areas_open_clist <- b12,b11,b21
 : ----- g_xor_this_areas_closed_clist <- 
- {7}  {table} (floats)  {7}   {\g_xor_curr_float_box_tl }
+{7}  {table} (floats)  {7}   {\g_xor_curr_float_box_tl }
 : -----g_xor_saved_this_areas_open_clist (init): b12,b11,b21 := b12,b11,b21
 : -----entering xor_try_this_area_relaxed:
 : ------area trial: b12
- area trial: b12
+area trial: b12
 : ------span count unsuitable: b12 /= 1
- -> failed: span count b12 /= 1
+-> failed: span count b12 /= 1
 : -----leaving xor_try_this_area_relaxed:
 : -----entering xor_try_this_area_relaxed:
 : ------area trial: b11
- area trial: b11
+area trial: b11
 : ------span count okay: b11 = 1
 : ------area not closed for all types: not member of ()
 : ------area open for class floats; not member of ()
@@ -12652,8 +11588,7 @@
 : -------looking at column: 1
 : -------entering xor_construct_and_test_col_ht:nnn
 : --------col height before: 612.0pt (\g_xor_ht_col_1_1_dim)
-: --------first float in any b in column 1: adding \g_xor_float_text_skip=36.0p
-t minus 8.0pt
+: --------first float in any b in column 1: adding \g_xor_float_text_skip=36.0pt minus 8.0pt
 : --------GRID: grid size used: 12.0pt
 : --------GRID: \g_xor_returned_lower_size_tl=300.0pt
 : --------GRID: \g_xor_returned_lower_delta_size_tl=8.4407pt
@@ -12670,10 +11605,8 @@
 : -----leaving xor_try_this_area_relaxed:
 : -----entering xor_floatpage_pretests_success_action:
 : ------entering xor_update_best_trial:
- -> accepted
-: -------new best trial: \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g
-_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim_gset:N
-n \g_xor_ht_col_2_1_dim {300.0pt}
+-> accepted
+: -------new best trial: \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {300.0pt}
 : -------entering xor_update_float_placement_data:
 : --------g_xor_curr_page_areas_closed_clist + ""
 : --------g_xor_this_areas_closed_clist  + "t12,t11"
@@ -12697,17 +11630,17 @@
 : ------- {8}
 : ------- g_xor_this_areas_open_clist <- b12,b11,b21
 : ------- g_xor_this_areas_closed_clist <- t12,t11
- {8}  {table} (floats)  {8}   {\g_xor_curr_float_box_tl }
+{8}  {table} (floats)  {8}   {\g_xor_curr_float_box_tl }
 : -------g_xor_saved_this_areas_open_clist (init): b12,b11,b21 := b12,b11,b21
 : -------entering xor_try_this_area_relaxed:
 : --------area trial: b12
- area trial: b12
+area trial: b12
 : --------span count unsuitable: b12 /= 1
- -> failed: span count b12 /= 1
+-> failed: span count b12 /= 1
 : -------leaving xor_try_this_area_relaxed:
 : -------entering xor_try_this_area_relaxed:
 : --------area trial: b11
- area trial: b11
+area trial: b11
 : --------span count okay: b11 = 1
 : --------area not closed for all types: not member of ()
 : --------area open for class floats; not member of (t12,t11)
@@ -12732,10 +11665,8 @@
 : -------leaving xor_try_this_area_relaxed:
 : -------entering xor_floatpage_pretests_success_action:
 : --------entering xor_update_best_trial:
- -> accepted
-: ---------new best trial: \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn 
-\g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim_gset
-:Nn \g_xor_ht_col_2_1_dim {300.0pt}
+-> accepted
+: ---------new best trial: \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {300.0pt}
 : ---------entering xor_update_float_placement_data:
 : ----------g_xor_curr_page_areas_closed_clist + ""
 : ----------g_xor_this_areas_closed_clist t12,t11 + "t12,t11"
@@ -12747,7 +11678,7 @@
 : --------entering xor_trial_place_float_inner_loop:
 : --------leaving xor_trial_place_float_inner_loop:
 : --------entering xor_try_next_float:
- STATS: trials = 4
+STATS: trials = 4
 : --------leaving xor_try_next_float:
 : -------leaving xor_floatpage_pretests_success_action:
 : ------leaving xor_try_next_float:
@@ -12756,16 +11687,14 @@
 : ----\box_ht:N 1=108.0pt
 : ----\box_ht:N 2=612.0pt
 : ----float page failed
- -> failed: no float page made
+-> failed: no float page made
 : ----entering xor_next_page_setup:
 : -----entering xor_cols_setup:
 : ------entering xor_save_col_hts:N (\g_xor_best_trial_col_hts_tl)
 : -------\xor_curr_col_block::= 1_1
 : -------\xor_curr_col_block::= 2_1
 : -------Saving column (height) information:
-: -------\g_xor_best_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1
-}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612
-.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
+: -------\g_xor_best_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
 : ------leaving xor_save_col_hts:N
 : -----leaving xor_cols_setup:
 : -----entering xor_initialize_flush_data:
@@ -12818,21 +11747,15 @@
 : -CHECK: Saving output penalty (-10000)
 : -Re-adding forced break(s) for splitting
 Marks: saving state on line ...
-Marks: queue for leftmark before: "\protect \MakeUppercase  {7\hskip 1em\relax 
-Performance of the algorithm}", "\protect \MakeUppercase  {8\hskip 1em\relax Ou
-tlook}", "\protect \MakeUppercase  {References}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {7\hskip 1em\relax Performance of the algorithm}", "\protect \MakeUppercase  {8\hskip 1em\relax Outlook}", "\protect \MakeUppercase  {References}", 
 Marks: picking up from output {leftmark=11}{rightmark=44}{floats=9}
 Marks: found 2 entries for leftmark (new 11; old 9)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {7\hskip 1em\relax Perf
-ormance of the algorithm}}{\protect \MakeUppercase  {8\hskip 1em\relax Outlook}
-}{\protect \MakeUppercase  {References}} on line ...
+Marks: in output: leftmark -> {\protect \MakeUppercase  {7\hskip 1em\relax Performance of the algorithm}}{\protect \MakeUppercase  {8\hskip 1em\relax Outlook}}{\protect \MakeUppercase  {References}} on line ...
 Marks: queue for leftmark after: "\protect \MakeUppercase  {References}", 
-Marks: queue for rightmark before: "", "", "\protect \MakeUppercase  {Reference
-s}", 
+Marks: queue for rightmark before: "", "", "\protect \MakeUppercase  {References}", 
 Marks: picking up from output {leftmark=11}{rightmark=44}{floats=9}
 Marks: found 2 entries for rightmark (new 44; old 42)
-Marks: in output: rightmark -> {}{}{\protect \MakeUppercase  {References}} on l
-ine 1486
+Marks: in output: rightmark -> {}{}{\protect \MakeUppercase  {References}} on line ...
 Marks: queue for rightmark after: "\protect \MakeUppercase  {References}", 
 Marks: queue for floats before: "8", 
 Marks: picking up from output {leftmark=11}{rightmark=44}{floats=9}
@@ -12840,7 +11763,7 @@
 Marks: in output: floats -> {8}{8}{8} on line ...
 Marks: queue for floats after: "8", 
 : -entering xor_trial_place_float_setup:
- STATS: floats waiting = 2 (\bx at G  \bx at H  ) on page 14
+STATS: floats waiting = 2 (\bx at G  \bx at H  ) on page 14
 =======================================================================
 : --flush: tighten placement conditions
 : --BALANCE: g_xor_trial_balance_done_int <- 0
@@ -12866,9 +11789,7 @@
 : ---\xor_curr_col_block::= 1_1
 : ---\xor_curr_col_block::= 2_1
 : ---Saving column (height) information:
-: ---\g_xor_saved_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\i
-nt_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0p
-t}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
+: ---\g_xor_saved_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
 : --leaving xor_save_col_hts:N
 : --entering xor_OR_trial_grab_balance_setup:
 : ---BALANCE: g_xor_trial_balance_seen_int <- 0
@@ -12939,21 +11860,15 @@
 : -grab col: 1 of 2
 : -vsize: 612.0pt; pagegoal: 612.0pt
 : -entering xor_OR_trial_finish_block_or_col:
-Marks: queue for leftmark before: "\protect \MakeUppercase  {7\hskip 1em\relax 
-Performance of the algorithm}", "\protect \MakeUppercase  {8\hskip 1em\relax Ou
-tlook}", "\protect \MakeUppercase  {References}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {7\hskip 1em\relax Performance of the algorithm}", "\protect \MakeUppercase  {8\hskip 1em\relax Outlook}", "\protect \MakeUppercase  {References}", 
 Marks: picking up from output {leftmark=11}{rightmark=44}{floats=9}
 Marks: found 2 entries for leftmark (new 11; old 9)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {7\hskip 1em\relax Perf
-ormance of the algorithm}}{\protect \MakeUppercase  {8\hskip 1em\relax Outlook}
-}{\protect \MakeUppercase  {References}} on line ...
+Marks: in output: leftmark -> {\protect \MakeUppercase  {7\hskip 1em\relax Performance of the algorithm}}{\protect \MakeUppercase  {8\hskip 1em\relax Outlook}}{\protect \MakeUppercase  {References}} on line ...
 Marks: queue for leftmark after: "\protect \MakeUppercase  {References}", 
-Marks: queue for rightmark before: "", "", "\protect \MakeUppercase  {Reference
-s}", 
+Marks: queue for rightmark before: "", "", "\protect \MakeUppercase  {References}", 
 Marks: picking up from output {leftmark=11}{rightmark=44}{floats=9}
 Marks: found 2 entries for rightmark (new 44; old 42)
-Marks: in output: rightmark -> {}{}{\protect \MakeUppercase  {References}} on l
-ine 1486
+Marks: in output: rightmark -> {}{}{\protect \MakeUppercase  {References}} on line ...
 Marks: queue for rightmark after: "\protect \MakeUppercase  {References}", 
 Marks: queue for floats before: "8", 
 Marks: picking up from output {leftmark=11}{rightmark=44}{floats=9}
@@ -12995,16 +11910,12 @@
 Marks: queue for leftmark before: "\protect \MakeUppercase  {References}", 
 Marks: picking up from output {leftmark=11}{rightmark=44}{floats=9}
 Marks: found 0 entries for leftmark (new 11; old 11)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {References}}{\protect 
-\MakeUppercase  {References}}{\protect \MakeUppercase  {References}} on line ...
-86
+Marks: in output: leftmark -> {\protect \MakeUppercase  {References}}{\protect \MakeUppercase  {References}}{\protect \MakeUppercase  {References}} on line ...
 Marks: queue for leftmark after: "\protect \MakeUppercase  {References}", 
 Marks: queue for rightmark before: "\protect \MakeUppercase  {References}", 
 Marks: picking up from output {leftmark=11}{rightmark=44}{floats=9}
 Marks: found 0 entries for rightmark (new 44; old 44)
-Marks: in output: rightmark -> {\protect \MakeUppercase  {References}}{\protect
- \MakeUppercase  {References}}{\protect \MakeUppercase  {References}} on line ...
-486
+Marks: in output: rightmark -> {\protect \MakeUppercase  {References}}{\protect \MakeUppercase  {References}}{\protect \MakeUppercase  {References}} on line ...
 Marks: queue for rightmark after: "\protect \MakeUppercase  {References}", 
 Marks: queue for floats before: "8", 
 Marks: picking up from output {leftmark=11}{rightmark=44}{floats=9}
@@ -13052,21 +11963,21 @@
 : -- {7}
 : -- g_xor_this_areas_open_clist <- b12,b11,b21
 : -- g_xor_this_areas_closed_clist <- 
- {7}  {table} (floats)  {7}   {\g_xor_curr_float_box_tl }
+{7}  {table} (floats)  {7}   {\g_xor_curr_float_box_tl }
 : --g_xor_saved_this_areas_open_clist (init): b12,b11,b21 := b12,b11,b21
 : --entering xor_try_this_area_std:
 : ---BALANCE: g_xor_trial_balance_done_int <- 0
 : ---(Re)initializing column heights ...
 : ---area trial: b12
- area trial: b12
+area trial: b12
 : ---span count unsuitable: b12 /= 1
- -> failed: span count b12 /= 1
+-> failed: span count b12 /= 1
 : --leaving xor_try_this_area_std:
 : --entering xor_try_this_area_std:
 : ---BALANCE: g_xor_trial_balance_done_int <- 0
 : ---(Re)initializing column heights ...
 : ---area trial: b11
- area trial: b11
+area trial: b11
 : ---span count okay: b11 = 1
 : ---area not closed for all types: not member of ()
 : ---area open for class floats; not member of ()
@@ -13074,8 +11985,7 @@
 : ----looking at column: 1
 : ----entering xor_construct_and_test_col_ht:nnn
 : -----col height before: 612.0pt (\g_xor_ht_col_1_1_dim)
-: -----first float in any b in column 1: adding \g_xor_float_text_skip=36.0pt m
-inus 8.0pt
+: -----first float in any b in column 1: adding \g_xor_float_text_skip=36.0pt minus 8.0pt
 : -----GRID: grid size used: 12.0pt
 : -----GRID: \g_xor_returned_lower_size_tl=300.0pt
 : -----GRID: \g_xor_returned_lower_delta_size_tl=8.4407pt
@@ -13097,9 +12007,7 @@
 : ----\xor_curr_col_block::= 1_1
 : ----\xor_curr_col_block::= 2_1
 : ----Saving column (height) information:
-: ----\g_xor_saved_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\
-int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {300.0
-pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
+: ----\g_xor_saved_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {300.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
 : ---leaving xor_save_col_hts:N
 : ---entering xor_OR_trial_grab_balance_setup:
 : ----BALANCE: g_xor_trial_balance_seen_int <- 0
@@ -13147,18 +12055,12 @@
 : -grab col: 1 of 2
 : -vsize: 300.0pt; pagegoal: 300.0pt
 : -entering xor_OR_trial_finish_block_or_col:
-Marks: queue for leftmark before: "\protect \MakeUppercase  {7\hskip 1em\relax 
-Performance of the algorithm}", "\protect \MakeUppercase  {8\hskip 1em\relax Ou
-tlook}", "\protect \MakeUppercase  {References}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {7\hskip 1em\relax Performance of the algorithm}", "\protect \MakeUppercase  {8\hskip 1em\relax Outlook}", "\protect \MakeUppercase  {References}", 
 Marks: picking up from output {leftmark=10}{rightmark=43}{floats=9}
 Marks: found 1 entries for leftmark (new 10; old 9)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {7\hskip 1em\relax Perf
-ormance of the algorithm}}{\protect \MakeUppercase  {8\hskip 1em\relax Outlook}
-}{\protect \MakeUppercase  {8\hskip 1em\relax Outlook}} on line ...
-Marks: queue for leftmark after: "\protect \MakeUppercase  {8\hskip 1em\relax O
-utlook}", "\protect \MakeUppercase  {References}", 
-Marks: queue for rightmark before: "", "", "\protect \MakeUppercase  {Reference
-s}", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {7\hskip 1em\relax Performance of the algorithm}}{\protect \MakeUppercase  {8\hskip 1em\relax Outlook}}{\protect \MakeUppercase  {8\hskip 1em\relax Outlook}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {8\hskip 1em\relax Outlook}", "\protect \MakeUppercase  {References}", 
+Marks: queue for rightmark before: "", "", "\protect \MakeUppercase  {References}", 
 Marks: picking up from output {leftmark=10}{rightmark=43}{floats=9}
 Marks: found 1 entries for rightmark (new 43; old 42)
 Marks: in output: rightmark -> {}{}{} on line ...
@@ -13232,19 +12134,15 @@
 : -vsize: 612.0pt; pagegoal: 612.0pt
 : -CHECK Handle premature ending
 : -entering xor_OR_trial_finish_block_or_col:
-Marks: queue for leftmark before: "\protect \MakeUppercase  {8\hskip 1em\relax 
-Outlook}", "\protect \MakeUppercase  {References}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {8\hskip 1em\relax Outlook}", "\protect \MakeUppercase  {References}", 
 Marks: picking up from output {leftmark=11}{rightmark=44}{floats=9}
 Marks: found 1 entries for leftmark (new 11; old 10)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {8\hskip 1em\relax Outl
-ook}}{\protect \MakeUppercase  {References}}{\protect \MakeUppercase  {Referenc
-es}} on line ...
+Marks: in output: leftmark -> {\protect \MakeUppercase  {8\hskip 1em\relax Outlook}}{\protect \MakeUppercase  {References}}{\protect \MakeUppercase  {References}} on line ...
 Marks: queue for leftmark after: "\protect \MakeUppercase  {References}", 
-Marks: queue for rightmark before: "", "\protect \MakeUppercase  {References}",
+Marks: queue for rightmark before: "", "\protect \MakeUppercase  {References}", 
 Marks: picking up from output {leftmark=11}{rightmark=44}{floats=9}
 Marks: found 1 entries for rightmark (new 44; old 43)
-Marks: in output: rightmark -> {}{\protect \MakeUppercase  {References}}{\prote
-ct \MakeUppercase  {References}} on line ...
+Marks: in output: rightmark -> {}{\protect \MakeUppercase  {References}}{\protect \MakeUppercase  {References}} on line ...
 Marks: queue for rightmark after: "\protect \MakeUppercase  {References}", 
 Marks: queue for floats before: "8", 
 Marks: picking up from output {leftmark=11}{rightmark=44}{floats=9}
@@ -13267,10 +12165,8 @@
 : ---fail: false
 : ---g_xor_flush_max_classes_clist <- \s__seq f loats,
 : ---entering xor_update_best_trial:
- -> accepted
-: ----new best trial: \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xo
-r_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {300.0pt}\dim_gset:Nn \
-g_xor_ht_col_2_1_dim {612.0pt}
+-> accepted
+: ----new best trial: \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {300.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
 : ----entering xor_update_float_placement_data:
 : -----g_xor_curr_page_areas_closed_clist + ""
 : -----g_xor_this_areas_closed_clist  + "t12,t11"
@@ -13314,30 +12210,30 @@
 : -- {8}
 : -- g_xor_this_areas_open_clist <- b12,b11,b21
 : -- g_xor_this_areas_closed_clist <- t12,t11
- {8}  {table} (floats)  {8}   {\g_xor_curr_float_box_tl }
+{8}  {table} (floats)  {8}   {\g_xor_curr_float_box_tl }
 : --g_xor_saved_this_areas_open_clist (init): b12,b11,b21 := b12,b11,b21
 : --entering xor_try_this_area_std:
 : ---BALANCE: g_xor_trial_balance_done_int <- 0
 : ---(Re)initializing column heights ...
 : ---area trial: b12
- area trial: b12
+area trial: b12
 : ---span count unsuitable: b12 /= 1
- -> failed: span count b12 /= 1
+-> failed: span count b12 /= 1
 : --leaving xor_try_this_area_std:
 : --entering xor_try_this_area_std:
 : ---BALANCE: g_xor_trial_balance_done_int <- 0
 : ---(Re)initializing column heights ...
 : ---area trial: b11
- area trial: b11
+area trial: b11
 : ---span count okay: b11 = 1
 : ---close area: b11 float num reached (1)
- -> failed: b11 float num reached (1)
+-> failed: b11 float num reached (1)
 : --leaving xor_try_this_area_std:
 : --entering xor_try_this_area_std:
 : ---BALANCE: g_xor_trial_balance_done_int <- 0
 : ---(Re)initializing column heights ...
 : ---area trial: b21
- area trial: b21
+area trial: b21
 : ---span count okay: b21 = 1
 : ---area not closed for all types: not member of ()
 : ---area open for class floats; not member of (t12,t11)
@@ -13345,8 +12241,7 @@
 : ----looking at column: 2
 : ----entering xor_construct_and_test_col_ht:nnn
 : -----col height before: 612.0pt (\g_xor_ht_col_2_1_dim)
-: -----first float in any b in column 2: adding \g_xor_float_text_skip=36.0pt m
-inus 8.0pt
+: -----first float in any b in column 2: adding \g_xor_float_text_skip=36.0pt minus 8.0pt
 : -----GRID: grid size used: 12.0pt
 : -----GRID: \g_xor_returned_lower_size_tl=204.0pt
 : -----GRID: \g_xor_returned_lower_delta_size_tl=5.4846pt
@@ -13369,9 +12264,7 @@
 : ----\xor_curr_col_block::= 1_1
 : ----\xor_curr_col_block::= 2_1
 : ----Saving column (height) information:
-: ----\g_xor_saved_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\
-int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {300.0
-pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {408.0pt}
+: ----\g_xor_saved_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {300.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {408.0pt}
 : ---leaving xor_save_col_hts:N
 : ---entering xor_OR_trial_grab_balance_setup:
 : ----BALANCE: g_xor_trial_balance_seen_int <- 0
@@ -13419,18 +12312,12 @@
 : -grab col: 1 of 2
 : -vsize: 300.0pt; pagegoal: 300.0pt
 : -entering xor_OR_trial_finish_block_or_col:
-Marks: queue for leftmark before: "\protect \MakeUppercase  {7\hskip 1em\relax 
-Performance of the algorithm}", "\protect \MakeUppercase  {8\hskip 1em\relax Ou
-tlook}", "\protect \MakeUppercase  {References}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {7\hskip 1em\relax Performance of the algorithm}", "\protect \MakeUppercase  {8\hskip 1em\relax Outlook}", "\protect \MakeUppercase  {References}", 
 Marks: picking up from output {leftmark=10}{rightmark=43}{floats=9}
 Marks: found 1 entries for leftmark (new 10; old 9)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {7\hskip 1em\relax Perf
-ormance of the algorithm}}{\protect \MakeUppercase  {8\hskip 1em\relax Outlook}
-}{\protect \MakeUppercase  {8\hskip 1em\relax Outlook}} on line ...
-Marks: queue for leftmark after: "\protect \MakeUppercase  {8\hskip 1em\relax O
-utlook}", "\protect \MakeUppercase  {References}", 
-Marks: queue for rightmark before: "", "", "\protect \MakeUppercase  {Reference
-s}", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {7\hskip 1em\relax Performance of the algorithm}}{\protect \MakeUppercase  {8\hskip 1em\relax Outlook}}{\protect \MakeUppercase  {8\hskip 1em\relax Outlook}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {8\hskip 1em\relax Outlook}", "\protect \MakeUppercase  {References}", 
+Marks: queue for rightmark before: "", "", "\protect \MakeUppercase  {References}", 
 Marks: picking up from output {leftmark=10}{rightmark=43}{floats=9}
 Marks: found 1 entries for rightmark (new 43; old 42)
 Marks: in output: rightmark -> {}{}{} on line ...
@@ -13504,19 +12391,15 @@
 : -vsize: 408.0pt; pagegoal: 408.0pt
 : -CHECK Handle premature ending
 : -entering xor_OR_trial_finish_block_or_col:
-Marks: queue for leftmark before: "\protect \MakeUppercase  {8\hskip 1em\relax 
-Outlook}", "\protect \MakeUppercase  {References}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {8\hskip 1em\relax Outlook}", "\protect \MakeUppercase  {References}", 
 Marks: picking up from output {leftmark=11}{rightmark=44}{floats=9}
 Marks: found 1 entries for leftmark (new 11; old 10)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {8\hskip 1em\relax Outl
-ook}}{\protect \MakeUppercase  {References}}{\protect \MakeUppercase  {Referenc
-es}} on line ...
+Marks: in output: leftmark -> {\protect \MakeUppercase  {8\hskip 1em\relax Outlook}}{\protect \MakeUppercase  {References}}{\protect \MakeUppercase  {References}} on line ...
 Marks: queue for leftmark after: "\protect \MakeUppercase  {References}", 
-Marks: queue for rightmark before: "", "\protect \MakeUppercase  {References}",
+Marks: queue for rightmark before: "", "\protect \MakeUppercase  {References}", 
 Marks: picking up from output {leftmark=11}{rightmark=44}{floats=9}
 Marks: found 1 entries for rightmark (new 44; old 43)
-Marks: in output: rightmark -> {}{\protect \MakeUppercase  {References}}{\prote
-ct \MakeUppercase  {References}} on line ...
+Marks: in output: rightmark -> {}{\protect \MakeUppercase  {References}}{\protect \MakeUppercase  {References}} on line ...
 Marks: queue for rightmark after: "\protect \MakeUppercase  {References}", 
 Marks: queue for floats before: "8", 
 Marks: picking up from output {leftmark=11}{rightmark=44}{floats=9}
@@ -13537,15 +12420,12 @@
 : --leaving xor_check_callout_after:n
 : --entering xor_evaluate_trial_results:
 : ---fail: false
-: ---flush: last float affected by flush point 1 placed -> use partly normal pl
-acement conditions again
+: ---flush: last float affected by flush point 1 placed -> use partly normal placement conditions again
 : ---flush: partly tighten placement conditions
 : ---g_xor_flush_max_classes_clist <- \s__seq f loats,
 : ---entering xor_update_best_trial:
- -> accepted
-: ----new best trial: \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xo
-r_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {300.0pt}\dim_gset:Nn \
-g_xor_ht_col_2_1_dim {408.0pt}
+-> accepted
+: ----new best trial: \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {300.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {408.0pt}
 : ----entering xor_update_float_placement_data:
 : -----g_xor_curr_page_areas_closed_clist + ""
 : -----g_xor_this_areas_closed_clist t12,t11 + "t12,t11,b11"
@@ -13554,7 +12434,7 @@
 : -----area: b21 \s__seq \bx at H  
 : ----leaving xor_update_float_placement_data:
 : ---leaving xor_update_best_trial:
- -> past flush point: --> tighten conditions again
+-> past flush point: --> tighten conditions again
 : --leaving xor_evaluate_trial_results:
 : -leaving xor_OR_trial_finish_block_or_col:
 : leaving xor_OR_grab_some_cols: (grab)
@@ -13578,19 +12458,15 @@
 : -entering xor_trial_place_float_inner_loop:
 : -leaving xor_trial_place_float_inner_loop:
 : -entering xor_try_next_float:
- STATS: trials = 5
+STATS: trials = 5
 : --entering xor_OR_best_cols_setup:
-: ---XX initial: \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col
-_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {300.0pt}\dim_gset:Nn \g_xor
-_ht_col_2_1_dim {408.0pt}
+: ---XX initial: \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {300.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {408.0pt}
 : ---entering xor_initialize_page_footins_ftnright:
 : ---leaving xor_initialize_page_footins_ftnright:
 : ---BALANCE: g_xor_trial_balance_seen_int <- 0
 : ---Setting up column heights:
 : ---BALANCE: working on new block
-: ---Setting up column heights: \int_gset:Nn \g_xor_col_1_block_int {1}\int_gse
-t:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {300.0pt}\dim
-_gset:Nn \g_xor_ht_col_2_1_dim {408.0pt}
+: ---Setting up column heights: \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {300.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {408.0pt}
 : ---entering xor_OR_best_next_col_setup:
 : ----vsize <- 300.0pt
 : ----ftnspread: page= 14
@@ -13629,18 +12505,12 @@
 : -best col: 1 of 2
 : -vsize: 300.0pt; pagegoal: 300.0pt
 : -entering xor_OR_best_finish_col_or_block:
-Marks: queue for leftmark before: "\protect \MakeUppercase  {7\hskip 1em\relax 
-Performance of the algorithm}", "\protect \MakeUppercase  {8\hskip 1em\relax Ou
-tlook}", "\protect \MakeUppercase  {References}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {7\hskip 1em\relax Performance of the algorithm}", "\protect \MakeUppercase  {8\hskip 1em\relax Outlook}", "\protect \MakeUppercase  {References}", 
 Marks: picking up from output {leftmark=10}{rightmark=43}{floats=9}
 Marks: found 1 entries for leftmark (new 10; old 9)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {7\hskip 1em\relax Perf
-ormance of the algorithm}}{\protect \MakeUppercase  {8\hskip 1em\relax Outlook}
-}{\protect \MakeUppercase  {8\hskip 1em\relax Outlook}} on line ...
-Marks: queue for leftmark after: "\protect \MakeUppercase  {8\hskip 1em\relax O
-utlook}", "\protect \MakeUppercase  {References}", 
-Marks: queue for rightmark before: "", "", "\protect \MakeUppercase  {Reference
-s}", 
+Marks: in output: leftmark -> {\protect \MakeUppercase  {7\hskip 1em\relax Performance of the algorithm}}{\protect \MakeUppercase  {8\hskip 1em\relax Outlook}}{\protect \MakeUppercase  {8\hskip 1em\relax Outlook}} on line ...
+Marks: queue for leftmark after: "\protect \MakeUppercase  {8\hskip 1em\relax Outlook}", "\protect \MakeUppercase  {References}", 
+Marks: queue for rightmark before: "", "", "\protect \MakeUppercase  {References}", 
 Marks: picking up from output {leftmark=10}{rightmark=43}{floats=9}
 Marks: found 1 entries for rightmark (new 43; old 42)
 Marks: in output: rightmark -> {}{}{} on line ...
@@ -13704,19 +12574,15 @@
 : -vsize: 408.0pt; pagegoal: 408.0pt
 : -CHECK Handle premature ending
 : -entering xor_OR_best_finish_col_or_block:
-Marks: queue for leftmark before: "\protect \MakeUppercase  {8\hskip 1em\relax 
-Outlook}", "\protect \MakeUppercase  {References}", 
+Marks: queue for leftmark before: "\protect \MakeUppercase  {8\hskip 1em\relax Outlook}", "\protect \MakeUppercase  {References}", 
 Marks: picking up from output {leftmark=11}{rightmark=44}{floats=9}
 Marks: found 1 entries for leftmark (new 11; old 10)
-Marks: in output: leftmark -> {\protect \MakeUppercase  {8\hskip 1em\relax Outl
-ook}}{\protect \MakeUppercase  {References}}{\protect \MakeUppercase  {Referenc
-es}} on line ...
+Marks: in output: leftmark -> {\protect \MakeUppercase  {8\hskip 1em\relax Outlook}}{\protect \MakeUppercase  {References}}{\protect \MakeUppercase  {References}} on line ...
 Marks: queue for leftmark after: "\protect \MakeUppercase  {References}", 
-Marks: queue for rightmark before: "", "\protect \MakeUppercase  {References}",
+Marks: queue for rightmark before: "", "\protect \MakeUppercase  {References}", 
 Marks: picking up from output {leftmark=11}{rightmark=44}{floats=9}
 Marks: found 1 entries for rightmark (new 44; old 43)
-Marks: in output: rightmark -> {}{\protect \MakeUppercase  {References}}{\prote
-ct \MakeUppercase  {References}} on line ...
+Marks: in output: rightmark -> {}{\protect \MakeUppercase  {References}}{\protect \MakeUppercase  {References}} on line ...
 Marks: queue for rightmark after: "\protect \MakeUppercase  {References}", 
 Marks: queue for floats before: "8", 
 Marks: picking up from output {leftmark=11}{rightmark=44}{floats=9}
@@ -13823,9 +12689,7 @@
 : -----\xor_curr_col_block::= 1_1
 : -----\xor_curr_col_block::= 2_1
 : -----Saving column (height) information:
-: -----\g_xor_best_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\
-int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0
-pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
+: -----\g_xor_best_trial_col_hts_tl := \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
 : ----leaving xor_save_col_hts:N
 : ---leaving xor_cols_setup:
 : ---entering xor_initialize_flush_data:



More information about the latex3-commits mailing list