[latex3-commits] [l3svn] 02/02: l3build: Drop space-stripping at start of lines

noreply at latex-project.org noreply at latex-project.org
Fri Jan 1 16:51:24 CET 2016


This is an automated email from the git hooks/post-receive script.

joseph pushed a commit to branch master
in repository l3svn.

commit 061cd94d19378197b4581b4ec8578d727bf7d6d7
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Fri Jan 1 15:49:25 2016 +0000

    l3build: Drop space-stripping at start of lines
    
    The rational for stripping spaces is working with LuaTeX, but
    if turns out it is best to leave line lengths unaltered outside of
    the LuaTeX-specific code. (Upcoming commits will address LuaTeX.)
    As such, this commit moves the .tlg files closer to the raw .log
    file output.
    
    This is going to require many .tlg files are rebuilt: LaTeX2e
    checkin coming up for this.
---
 contrib/testfiles/chemformula001.ptex.tlg          |   10 +-
 contrib/testfiles/chemformula001.uptex.tlg         |   10 +-
 l3build/l3build.dtx                                |    5 +-
 l3build/l3build.lua                                |    3 -
 l3build/testfiles/00-test-1.tlg                    |    4 +-
 l3experimental/l3str/testfiles/m3regex005.tlg      |   14 +-
 l3experimental/l3str/testfiles/m3regex007.tlg      |  398 +++++++++---------
 l3experimental/l3str/testfiles/m3regex009.tlg      |    6 +-
 l3experimental/l3str/testfiles/m3regex010.tlg      |    4 +-
 l3experimental/l3str/testfiles/m3str-format001.tlg |   16 +-
 .../xcoffins/testfiles/xcoffins002.ptex.tlg        |    4 +-
 l3experimental/xcoffins/testfiles/xcoffins002.tlg  |    4 +-
 .../xcoffins/testfiles/xcoffins002.uptex.tlg       |    4 +-
 .../xcoffins/testfiles/xcoffins002.xetex.tlg       |    4 +-
 .../xcoffins/testfiles/xcoffins003.ptex.tlg        |    8 +-
 l3experimental/xcoffins/testfiles/xcoffins003.tlg  |    8 +-
 .../xcoffins/testfiles/xcoffins003.uptex.tlg       |    8 +-
 .../xcoffins/testfiles/xcoffins003.xetex.tlg       |    8 +-
 l3kernel/testfiles/d3dvips.tlg                     |    8 +-
 l3kernel/testfiles/d3pdfmode.ptex.tlg              |    8 +-
 l3kernel/testfiles/d3pdfmode.uptex.tlg             |    8 +-
 l3kernel/testfiles/d3xdvipdfmx.ptex.tlg            |    8 +-
 l3kernel/testfiles/d3xdvipdfmx.uptex.tlg           |    8 +-
 l3kernel/testfiles/m3basics002.tlg                 |    2 +-
 l3kernel/testfiles/m3char001.tlg                   |   54 +--
 l3kernel/testfiles/m3char001.xetex.tlg             |   38 +-
 l3kernel/testfiles/m3compare001.tlg                |  128 +++---
 l3kernel/testfiles/m3expl001.ptex.tlg              |    4 +-
 l3kernel/testfiles/m3expl001.tlg                   |    4 +-
 l3kernel/testfiles/m3expl001.uptex.tlg             |    4 +-
 l3kernel/testfiles/m3expl001.xetex.tlg             |    4 +-
 l3kernel/testfiles/m3expl002.ptex.tlg              |    2 +-
 l3kernel/testfiles/m3expl002.tlg                   |    2 +-
 l3kernel/testfiles/m3expl002.uptex.tlg             |    2 +-
 l3kernel/testfiles/m3expl002.xetex.tlg             |    2 +-
 l3kernel/testfiles/m3expl003.ptex.tlg              |    4 +-
 l3kernel/testfiles/m3expl003.tlg                   |    4 +-
 l3kernel/testfiles/m3expl003.uptex.tlg             |    4 +-
 l3kernel/testfiles/m3expl003.xetex.tlg             |    4 +-
 l3kernel/testfiles/m3expl004.ptex.tlg              |    2 +-
 l3kernel/testfiles/m3expl004.tlg                   |    2 +-
 l3kernel/testfiles/m3expl004.uptex.tlg             |    2 +-
 l3kernel/testfiles/m3expl004.xetex.tlg             |    2 +-
 l3kernel/testfiles/m3expl005.tlg                   |   42 +-
 l3kernel/testfiles/m3expl006.ptex.tlg              |    2 +-
 l3kernel/testfiles/m3expl006.tlg                   |    2 +-
 l3kernel/testfiles/m3expl006.uptex.tlg             |    2 +-
 l3kernel/testfiles/m3expl006.xetex.tlg             |    2 +-
 l3kernel/testfiles/m3file002.tlg                   |    8 +-
 l3kernel/testfiles/m3fp-assign001.tlg              |    4 +-
 l3kernel/testfiles/m3fp-basics001.tlg              |    8 +-
 l3kernel/testfiles/m3fp-basics002.tlg              |   16 +-
 l3kernel/testfiles/m3fp-basics003.tlg              |   16 +-
 l3kernel/testfiles/m3fp-basics005.tlg              |    8 +-
 l3kernel/testfiles/m3fp-convert001.tlg             |   14 +-
 l3kernel/testfiles/m3fp-convert003.tlg             |   80 ++--
 l3kernel/testfiles/m3fp-expo001.tlg                |   56 +--
 l3kernel/testfiles/m3fp-func001.tlg                |    2 +-
 l3kernel/testfiles/m3fp-logic001.tlg               |  258 ++++++------
 l3kernel/testfiles/m3fp-logic002.tlg               |   24 +-
 l3kernel/testfiles/m3fp-parse001.tlg               |   56 +--
 l3kernel/testfiles/m3fp-parse002.tlg               |   20 +-
 l3kernel/testfiles/m3fp-round002.tlg               |   28 +-
 l3kernel/testfiles/m3fp-traps001.tlg               |   24 +-
 l3kernel/testfiles/m3fp-trig001.tlg                |   24 +-
 l3kernel/testfiles/m3fp-trig002.tlg                |   28 +-
 l3kernel/testfiles/m3fp-trig003.tlg                |   24 +-
 l3kernel/testfiles/m3fp-trig004.tlg                |   28 +-
 l3kernel/testfiles/m3int001.tlg                    |    2 +-
 l3kernel/testfiles/m3int001.xetex.tlg              |    2 +-
 l3kernel/testfiles/m3int002.tlg                    |    2 +-
 l3kernel/testfiles/m3int002.uptex.tlg              |    2 +-
 l3kernel/testfiles/m3int002.xetex.tlg              |    2 +-
 l3kernel/testfiles/m3int003.tlg                    |    8 +-
 l3kernel/testfiles/m3msg002.tlg                    |   30 +-
 l3kernel/testfiles/m3msg004.tlg                    |    6 +-
 l3kernel/testfiles/m3prg001.tlg                    |    2 +-
 l3kernel/testfiles/m3skip001.tlg                   |   16 +-
 l3kernel/testfiles/m3skip002.tlg                   |    8 +-
 l3kernel/testfiles/m3skip004.tlg                   |   12 +-
 l3kernel/testfiles/m3tl001.tlg                     |    2 +-
 l3kernel/testfiles/m3tlist002.tlg                  |    4 +-
 l3kernel/testfiles/m3token002.tlg                  |    4 +-
 l3packages/xparse/testfiles/xparse002.tlg          |   20 +-
 l3packages/xparse/testfiles/xparse003.tlg          |    4 +-
 l3trial/l3fp-extras/testfiles/m3fp-symbolic001.tlg |    8 +-
 l3trial/l3hooks/testfiles/m3hooks001.ptex.tlg      |    6 +-
 l3trial/l3hooks/testfiles/m3hooks001.tlg           |    6 +-
 l3trial/l3hooks/testfiles/m3hooks001.uptex.tlg     |    6 +-
 l3trial/l3hooks/testfiles/m3hooks002.ptex.tlg      |    2 +-
 l3trial/l3hooks/testfiles/m3hooks002.tlg           |    2 +-
 l3trial/l3hooks/testfiles/m3hooks002.uptex.tlg     |    2 +-
 .../testfiles/m3kernel-extras006.luatex.tlg        |    6 +-
 .../testfiles/m3kernel-extras006.tlg               |    6 +-
 .../testfiles/m3kernel-extras006.xetex.tlg         |    6 +-
 .../testfiles/m3kernel-extras007.tlg               |    4 +-
 l3trial/l3ldb/testfiles/m3ldb003.ptex.tlg          |    2 +-
 l3trial/l3ldb/testfiles/m3ldb003.tlg               |    2 +-
 l3trial/l3ldb/testfiles/m3ldb003.uptex.tlg         |    2 +-
 l3trial/xbox/testfiles/xbox001.ptex.tlg            |    6 +-
 l3trial/xbox/testfiles/xbox001.tlg                 |    6 +-
 l3trial/xbox/testfiles/xbox001.uptex.tlg           |    6 +-
 l3trial/xbox/testfiles/xbox001.xetex.tlg           |    6 +-
 xpackages/xor/testfiles/xor001.tlg                 |  444 ++++++++++----------
 104 files changed, 1127 insertions(+), 1131 deletions(-)

diff --git a/contrib/testfiles/chemformula001.ptex.tlg b/contrib/testfiles/chemformula001.ptex.tlg
index 6cf0e3f..58dea77 100644
--- a/contrib/testfiles/chemformula001.ptex.tlg
+++ b/contrib/testfiles/chemformula001.ptex.tlg
@@ -20,9 +20,9 @@ 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.}
+ \ETC.}
 ..\special{! /pgfV{/pgfheight exch def 0.75 setlinewidth [] 0 setdash /pgfshade
-\ETC.}
+ \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
@@ -49,9 +49,9 @@ i\ETC.}
 ...\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.}
+ s\ETC.}
 ...\special{! /pgf3{gsave exec 1.0 pgfw [ ] 0.0 setdash 0.0 -5.00005 moveto 0.0
-5\ETC.}
+ 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
@@ -61,7 +61,7 @@ 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.}
+ 3\ETC.}
 ...\glue(\topskip) 3.16669
 ...\hbox(6.83331+2.05006)x345.0, glue set 200.34961fil
 ....\hbox(0.0+0.0)x15.0
diff --git a/contrib/testfiles/chemformula001.uptex.tlg b/contrib/testfiles/chemformula001.uptex.tlg
index 6cf0e3f..58dea77 100644
--- a/contrib/testfiles/chemformula001.uptex.tlg
+++ b/contrib/testfiles/chemformula001.uptex.tlg
@@ -20,9 +20,9 @@ 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.}
+ \ETC.}
 ..\special{! /pgfV{/pgfheight exch def 0.75 setlinewidth [] 0 setdash /pgfshade
-\ETC.}
+ \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
@@ -49,9 +49,9 @@ i\ETC.}
 ...\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.}
+ s\ETC.}
 ...\special{! /pgf3{gsave exec 1.0 pgfw [ ] 0.0 setdash 0.0 -5.00005 moveto 0.0
-5\ETC.}
+ 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
@@ -61,7 +61,7 @@ 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.}
+ 3\ETC.}
 ...\glue(\topskip) 3.16669
 ...\hbox(6.83331+2.05006)x345.0, glue set 200.34961fil
 ....\hbox(0.0+0.0)x15.0
diff --git a/l3build/l3build.dtx b/l3build/l3build.dtx
index 9ad1f80..d1b46b4 100644
--- a/l3build/l3build.dtx
+++ b/l3build/l3build.dtx
@@ -1,6 +1,6 @@
 % \iffalse
 %%
-%% File l3build.dtx (C) Copyright 2014-2015 The LaTeX3 Project
+%% File l3build.dtx (C) Copyright 2014-2016 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
@@ -637,7 +637,6 @@
 %   \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 +646,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
+%   \item Removal of |yoko direction| from boxes when (u)p\TeX{} is in use.
 % \end{itemize}
 %
 % \LuaTeX{} makes several additional changes to the log file. As normalising
diff --git a/l3build/l3build.lua b/l3build/l3build.lua
index 76a1495..af7433b 100644
--- a/l3build/l3build.lua
+++ b/l3build/l3build.lua
@@ -801,9 +801,6 @@ function formatlog(logfile, newfile, engine)
       "%.%.%.l%.%d+ ( *)%}$",
       "..." .. os_newline .. "l. ...%1}"
     )
-    -- 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+", "")
     -- Pick up cases where "yoko direction" or similar will have wrapped
     if string.len(line) == maxprintline          and
        string.match(line, "^%.+%\\hbox.*fil%, ") and
diff --git a/l3build/testfiles/00-test-1.tlg b/l3build/testfiles/00-test-1.tlg
index 0acc742..8dcfce2 100644
--- a/l3build/testfiles/00-test-1.tlg
+++ b/l3build/testfiles/00-test-1.tlg
@@ -19,13 +19,13 @@ Don't change this file in any respect.
 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.
diff --git a/l3experimental/l3str/testfiles/m3regex005.tlg b/l3experimental/l3str/testfiles/m3regex005.tlg
index 405d42e..09870f2 100644
--- a/l3experimental/l3str/testfiles/m3regex005.tlg
+++ b/l3experimental/l3str/testfiles/m3regex005.tlg
@@ -280,13 +280,13 @@ l. ...  }
 |...............................................
 > 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} 
diff --git a/l3experimental/l3str/testfiles/m3regex007.tlg b/l3experimental/l3str/testfiles/m3regex007.tlg
index e9e60c5..8669813 100644
--- a/l3experimental/l3str/testfiles/m3regex007.tlg
+++ b/l3experimental/l3str/testfiles/m3regex007.tlg
@@ -27,95 +27,95 @@ TEST 1: regex_show
 *************************************************
 > 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
+  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
 +-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
-+-branch
-char code 121, repeated 0 or more times, greedy.
+  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 @@ TEST 2: regex_show again
 ============================================================
 > 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 @@ l. ...  }
 |...............................................
 > 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 @@ l. ...  }
 |...............................................
 > 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 @@ TEST 3: all escaped sequences
 > 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 @@ l. ...  }
 > 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. ...  }
 ============================================================
diff --git a/l3experimental/l3str/testfiles/m3regex009.tlg b/l3experimental/l3str/testfiles/m3regex009.tlg
index fdc6958..c467ace 100644
--- a/l3experimental/l3str/testfiles/m3regex009.tlg
+++ b/l3experimental/l3str/testfiles/m3regex009.tlg
@@ -901,7 +901,7 @@ l. ...  }
 |...............................................
 ! 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 @@ and I'll forget about whatever was undefined.
 "\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 @@ l. ...  }
 |...............................................
 ! 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
diff --git a/l3experimental/l3str/testfiles/m3regex010.tlg b/l3experimental/l3str/testfiles/m3regex010.tlg
index c097424..bb81edb 100644
--- a/l3experimental/l3str/testfiles/m3regex010.tlg
+++ b/l3experimental/l3str/testfiles/m3regex010.tlg
@@ -22,8 +22,8 @@ TEST 1: LuaTeX bug which leads to an l3regex bug
 ============================================================
 > Compiled regex {\^^@\^^A}:
 +-branch
-char code 0
-char code 1.
+  char code 0
+  char code 1.
 <recently read> }
 l. ...  }
 ============================================================
diff --git a/l3experimental/l3str/testfiles/m3str-format001.tlg b/l3experimental/l3str/testfiles/m3str-format001.tlg
index d21cde3..3373075 100644
--- a/l3experimental/l3str/testfiles/m3str-format001.tlg
+++ b/l3experimental/l3str/testfiles/m3str-format001.tlg
@@ -56,7 +56,7 @@ TEST 3: Invalid formattings for token lists
 ============================================================
 ! 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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
diff --git a/l3experimental/xcoffins/testfiles/xcoffins002.ptex.tlg b/l3experimental/xcoffins/testfiles/xcoffins002.ptex.tlg
index 6a3f775..8e6f1f8 100644
--- a/l3experimental/xcoffins/testfiles/xcoffins002.ptex.tlg
+++ b/l3experimental/xcoffins/testfiles/xcoffins002.ptex.tlg
@@ -49,7 +49,7 @@ TEST 2: 2: setting coffins
 .\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 @@ l. ...}
 ..\glue(\rightskip) 0.0
 ! OK.
 <argument> ...alCoffin \bbb {1cm}{A}\showbox \bbb 
-\ShowCoffinStructure \bbb 
+                                                  \ShowCoffinStructure \bbb 
 l. ...}
 Size of coffin \bbb:
 > ht = 6.83331pt
diff --git a/l3experimental/xcoffins/testfiles/xcoffins002.tlg b/l3experimental/xcoffins/testfiles/xcoffins002.tlg
index 9f779fb..9de0e77 100644
--- a/l3experimental/xcoffins/testfiles/xcoffins002.tlg
+++ b/l3experimental/xcoffins/testfiles/xcoffins002.tlg
@@ -49,7 +49,7 @@ TEST 2: 2: setting coffins
 .\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 @@ l. ...}
 ..\glue(\rightskip) 0.0
 ! OK.
 <argument> ...alCoffin \bbb {1cm}{A}\showbox \bbb 
-\ShowCoffinStructure \bbb 
+                                                  \ShowCoffinStructure \bbb 
 l. ...}
 Size of coffin \bbb:
 > ht = 6.83331pt
diff --git a/l3experimental/xcoffins/testfiles/xcoffins002.uptex.tlg b/l3experimental/xcoffins/testfiles/xcoffins002.uptex.tlg
index 6a3f775..8e6f1f8 100644
--- a/l3experimental/xcoffins/testfiles/xcoffins002.uptex.tlg
+++ b/l3experimental/xcoffins/testfiles/xcoffins002.uptex.tlg
@@ -49,7 +49,7 @@ TEST 2: 2: setting coffins
 .\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 @@ l. ...}
 ..\glue(\rightskip) 0.0
 ! OK.
 <argument> ...alCoffin \bbb {1cm}{A}\showbox \bbb 
-\ShowCoffinStructure \bbb 
+                                                  \ShowCoffinStructure \bbb 
 l. ...}
 Size of coffin \bbb:
 > ht = 6.83331pt
diff --git a/l3experimental/xcoffins/testfiles/xcoffins002.xetex.tlg b/l3experimental/xcoffins/testfiles/xcoffins002.xetex.tlg
index 6a3f775..8e6f1f8 100644
--- a/l3experimental/xcoffins/testfiles/xcoffins002.xetex.tlg
+++ b/l3experimental/xcoffins/testfiles/xcoffins002.xetex.tlg
@@ -49,7 +49,7 @@ TEST 2: 2: setting coffins
 .\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 @@ l. ...}
 ..\glue(\rightskip) 0.0
 ! OK.
 <argument> ...alCoffin \bbb {1cm}{A}\showbox \bbb 
-\ShowCoffinStructure \bbb 
+                                                  \ShowCoffinStructure \bbb 
 l. ...}
 Size of coffin \bbb:
 > ht = 6.83331pt
diff --git a/l3experimental/xcoffins/testfiles/xcoffins003.ptex.tlg b/l3experimental/xcoffins/testfiles/xcoffins003.ptex.tlg
index 0b9ad2e..6d4e2af 100644
--- a/l3experimental/xcoffins/testfiles/xcoffins003.ptex.tlg
+++ b/l3experimental/xcoffins/testfiles/xcoffins003.ptex.tlg
@@ -178,7 +178,7 @@ TEST 1: Test 1: rotation
 ..\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 @@ l. ...}
 .....\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 @@ l. ...}
 .....\special{pdf:literal Q}
 ! OK.
 <argument> ...RotateCoffin \aaa {45}\showbox \aaa 
-x\fbox {\usebox \aaa }
+                                                  x\fbox {\usebox \aaa }
 l. ...}
 ============================================================
 ============================================================
@@ -809,7 +809,7 @@ m}
 ...\special{color pop}
 ! OK.
 <argument> ...]\bbb [B,hc](30pt,0pt)\showbox \aaa 
-x\fbox {\usebox \aaa }x
+                                                  x\fbox {\usebox \aaa }x
 l. ...}
 ============================================================
 ============================================================
diff --git a/l3experimental/xcoffins/testfiles/xcoffins003.tlg b/l3experimental/xcoffins/testfiles/xcoffins003.tlg
index 39531cd..c71c559 100644
--- a/l3experimental/xcoffins/testfiles/xcoffins003.tlg
+++ b/l3experimental/xcoffins/testfiles/xcoffins003.tlg
@@ -178,7 +178,7 @@ TEST 1: Test 1: rotation
 ..\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 @@ l. ...}
 .....\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 @@ l. ...}
 .....\pdfrestore
 ! OK.
 <argument> ...RotateCoffin \aaa {45}\showbox \aaa 
-x\fbox {\usebox \aaa }
+                                                  x\fbox {\usebox \aaa }
 l. ...}
 ============================================================
 ============================================================
@@ -808,7 +808,7 @@ TEST 2: Test 2: rotation+alignment
 ...\pdfcolorstack 0 pop
 ! OK.
 <argument> ...]\bbb [B,hc](30pt,0pt)\showbox \aaa 
-x\fbox {\usebox \aaa }x
+                                                  x\fbox {\usebox \aaa }x
 l. ...}
 ============================================================
 ============================================================
diff --git a/l3experimental/xcoffins/testfiles/xcoffins003.uptex.tlg b/l3experimental/xcoffins/testfiles/xcoffins003.uptex.tlg
index 0b9ad2e..6d4e2af 100644
--- a/l3experimental/xcoffins/testfiles/xcoffins003.uptex.tlg
+++ b/l3experimental/xcoffins/testfiles/xcoffins003.uptex.tlg
@@ -178,7 +178,7 @@ TEST 1: Test 1: rotation
 ..\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 @@ l. ...}
 .....\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 @@ l. ...}
 .....\special{pdf:literal Q}
 ! OK.
 <argument> ...RotateCoffin \aaa {45}\showbox \aaa 
-x\fbox {\usebox \aaa }
+                                                  x\fbox {\usebox \aaa }
 l. ...}
 ============================================================
 ============================================================
@@ -809,7 +809,7 @@ m}
 ...\special{color pop}
 ! OK.
 <argument> ...]\bbb [B,hc](30pt,0pt)\showbox \aaa 
-x\fbox {\usebox \aaa }x
+                                                  x\fbox {\usebox \aaa }x
 l. ...}
 ============================================================
 ============================================================
diff --git a/l3experimental/xcoffins/testfiles/xcoffins003.xetex.tlg b/l3experimental/xcoffins/testfiles/xcoffins003.xetex.tlg
index 0b9ad2e..6d4e2af 100644
--- a/l3experimental/xcoffins/testfiles/xcoffins003.xetex.tlg
+++ b/l3experimental/xcoffins/testfiles/xcoffins003.xetex.tlg
@@ -178,7 +178,7 @@ TEST 1: Test 1: rotation
 ..\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 @@ l. ...}
 .....\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 @@ l. ...}
 .....\special{pdf:literal Q}
 ! OK.
 <argument> ...RotateCoffin \aaa {45}\showbox \aaa 
-x\fbox {\usebox \aaa }
+                                                  x\fbox {\usebox \aaa }
 l. ...}
 ============================================================
 ============================================================
@@ -809,7 +809,7 @@ m}
 ...\special{color pop}
 ! OK.
 <argument> ...]\bbb [B,hc](30pt,0pt)\showbox \aaa 
-x\fbox {\usebox \aaa }x
+                                                  x\fbox {\usebox \aaa }x
 l. ...}
 ============================================================
 ============================================================
diff --git a/l3kernel/testfiles/d3dvips.tlg b/l3kernel/testfiles/d3dvips.tlg
index 9f1a34c..842ecdb 100644
--- a/l3kernel/testfiles/d3dvips.tlg
+++ b/l3kernel/testfiles/d3dvips.tlg
@@ -198,7 +198,7 @@ l. ...  }
 ..\hbox(6.94444+0.0)x50.02786
 ...\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
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
@@ -224,7 +224,7 @@ l. ...  }
 ..\hbox(6.94444+0.0)x50.02786
 ...\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
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
@@ -328,7 +328,7 @@ l. ...  }
 ..\hbox(40.2855+0.0)x40.2855
 ...\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
 ....\hbox(40.2855+0.0)x40.2855
 .....\hbox(40.2855+0.0)x40.2855
@@ -440,7 +440,7 @@ l. ...  }
 ..\hbox(2.31477+0.0)x50.02786
 ...\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
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
diff --git a/l3kernel/testfiles/d3pdfmode.ptex.tlg b/l3kernel/testfiles/d3pdfmode.ptex.tlg
index aaaff22..6221d90 100644
--- a/l3kernel/testfiles/d3pdfmode.ptex.tlg
+++ b/l3kernel/testfiles/d3pdfmode.ptex.tlg
@@ -198,7 +198,7 @@ l. ...  }
 ..\hbox(6.94444+0.0)x50.02786
 ...\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
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
@@ -224,7 +224,7 @@ l. ...  }
 ..\hbox(6.94444+0.0)x50.02786
 ...\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
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
@@ -328,7 +328,7 @@ l. ...  }
 ..\hbox(40.2855+0.0)x40.2855
 ...\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
 ....\hbox(40.2855+0.0)x40.2855
 .....\hbox(40.2855+0.0)x40.2855
@@ -440,7 +440,7 @@ l. ...  }
 ..\hbox(2.31477+0.0)x50.02786
 ...\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
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
diff --git a/l3kernel/testfiles/d3pdfmode.uptex.tlg b/l3kernel/testfiles/d3pdfmode.uptex.tlg
index aaaff22..6221d90 100644
--- a/l3kernel/testfiles/d3pdfmode.uptex.tlg
+++ b/l3kernel/testfiles/d3pdfmode.uptex.tlg
@@ -198,7 +198,7 @@ l. ...  }
 ..\hbox(6.94444+0.0)x50.02786
 ...\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
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
@@ -224,7 +224,7 @@ l. ...  }
 ..\hbox(6.94444+0.0)x50.02786
 ...\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
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
@@ -328,7 +328,7 @@ l. ...  }
 ..\hbox(40.2855+0.0)x40.2855
 ...\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
 ....\hbox(40.2855+0.0)x40.2855
 .....\hbox(40.2855+0.0)x40.2855
@@ -440,7 +440,7 @@ l. ...  }
 ..\hbox(2.31477+0.0)x50.02786
 ...\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
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
diff --git a/l3kernel/testfiles/d3xdvipdfmx.ptex.tlg b/l3kernel/testfiles/d3xdvipdfmx.ptex.tlg
index aaaff22..6221d90 100644
--- a/l3kernel/testfiles/d3xdvipdfmx.ptex.tlg
+++ b/l3kernel/testfiles/d3xdvipdfmx.ptex.tlg
@@ -198,7 +198,7 @@ l. ...  }
 ..\hbox(6.94444+0.0)x50.02786
 ...\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
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
@@ -224,7 +224,7 @@ l. ...  }
 ..\hbox(6.94444+0.0)x50.02786
 ...\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
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
@@ -328,7 +328,7 @@ l. ...  }
 ..\hbox(40.2855+0.0)x40.2855
 ...\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
 ....\hbox(40.2855+0.0)x40.2855
 .....\hbox(40.2855+0.0)x40.2855
@@ -440,7 +440,7 @@ l. ...  }
 ..\hbox(2.31477+0.0)x50.02786
 ...\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
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
diff --git a/l3kernel/testfiles/d3xdvipdfmx.uptex.tlg b/l3kernel/testfiles/d3xdvipdfmx.uptex.tlg
index aaaff22..6221d90 100644
--- a/l3kernel/testfiles/d3xdvipdfmx.uptex.tlg
+++ b/l3kernel/testfiles/d3xdvipdfmx.uptex.tlg
@@ -198,7 +198,7 @@ l. ...  }
 ..\hbox(6.94444+0.0)x50.02786
 ...\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
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
@@ -224,7 +224,7 @@ l. ...  }
 ..\hbox(6.94444+0.0)x50.02786
 ...\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
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
@@ -328,7 +328,7 @@ l. ...  }
 ..\hbox(40.2855+0.0)x40.2855
 ...\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
 ....\hbox(40.2855+0.0)x40.2855
 .....\hbox(40.2855+0.0)x40.2855
@@ -440,7 +440,7 @@ l. ...  }
 ..\hbox(2.31477+0.0)x50.02786
 ...\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
 ....\hbox(6.94444+0.0)x50.02786
 .....\OT1/cmr/m/n/10 H
diff --git a/l3kernel/testfiles/m3basics002.tlg b/l3kernel/testfiles/m3basics002.tlg
index d2cc03e..ed0065e 100644
--- a/l3kernel/testfiles/m3basics002.tlg
+++ b/l3kernel/testfiles/m3basics002.tlg
@@ -333,7 +333,7 @@ undefined
 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
diff --git a/l3kernel/testfiles/m3char001.tlg b/l3kernel/testfiles/m3char001.tlg
index 65c17e7..c7fe06f 100644
--- a/l3kernel/testfiles/m3char001.tlg
+++ b/l3kernel/testfiles/m3char001.tlg
@@ -264,7 +264,7 @@ l. ...  }
 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 @@ are all screwed up? I'm going to assume that you meant ##.
 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 @@ are all screwed up? I'm going to assume that you meant ##.
 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 @@ are all screwed up? I'm going to assume that you meant ##.
 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 @@ are all screwed up? I'm going to assume that you meant ##.
 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 @@ are all screwed up? I'm going to assume that you meant ##.
 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 @@ TEST 4: Errors
 ============================================================
 ! 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ TEST 5: Unicode range
 ============================================================
 ! 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ and I'll forget about whatever was undefined.
 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
@@ -475,11 +475,11 @@ l. ...  }
 #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 +491,7 @@ and I'll forget about whatever was undefined.
 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
@@ -505,11 +505,11 @@ l. ...  }
 #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
@@ -523,6 +523,6 @@ l. ...  }
 #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. ...  }
 ============================================================
diff --git a/l3kernel/testfiles/m3char001.xetex.tlg b/l3kernel/testfiles/m3char001.xetex.tlg
index 7182c1c..ee1816e 100644
--- a/l3kernel/testfiles/m3char001.xetex.tlg
+++ b/l3kernel/testfiles/m3char001.xetex.tlg
@@ -264,7 +264,7 @@ l. ...  }
 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 @@ are all screwed up? I'm going to assume that you meant ##.
 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 @@ are all screwed up? I'm going to assume that you meant ##.
 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 @@ are all screwed up? I'm going to assume that you meant ##.
 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 @@ are all screwed up? I'm going to assume that you meant ##.
 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 @@ are all screwed up? I'm going to assume that you meant ##.
 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 @@ TEST 4: Errors
 ============================================================
 ! 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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. ...  }
 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
diff --git a/l3kernel/testfiles/m3compare001.tlg b/l3kernel/testfiles/m3compare001.tlg
index 877fce5..de8d45a 100644
--- a/l3kernel/testfiles/m3compare001.tlg
+++ b/l3kernel/testfiles/m3compare001.tlg
@@ -66,348 +66,348 @@ TEST 2: Erroneous integer comparisons
 ============================================================
 ! 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 @@ TEST 3: Some more erroneous comparisons
 ============================================================
 ! 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ TEST 6: Erroneous dimension comparisons
 ============================================================
 ! 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!
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index 0e2b82a..2c51823 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -17,7 +17,7 @@ Don't change this file in any respect.
 %%   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/native-drivers/true on line ...
 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 ...
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index be34985..4b5d79c 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -17,7 +17,7 @@ Don't change this file in any respect.
 %%   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/native-drivers/true on line ...
 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 ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index 0e2b82a..2c51823 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -17,7 +17,7 @@ Don't change this file in any respect.
 %%   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/native-drivers/true on line ...
 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 ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index 0097264..a6ac7b3 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -17,7 +17,7 @@ Don't change this file in any respect.
 %%   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/native-drivers/true on line ...
 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 ...
diff --git a/l3kernel/testfiles/m3expl002.ptex.tlg b/l3kernel/testfiles/m3expl002.ptex.tlg
index 154ac07..637ecc6 100644
--- a/l3kernel/testfiles/m3expl002.ptex.tlg
+++ b/l3kernel/testfiles/m3expl002.ptex.tlg
@@ -17,7 +17,7 @@ Don't change this file in any respect.
 %%   Right brace   \}     Tilde         \~}
 %%
 (expl3.sty
-(expl3-code.tex
+ (expl3-code.tex
 \c_max_int=\count113
 \l_tmpa_int=\count114
 \l_tmpb_int=\count115
diff --git a/l3kernel/testfiles/m3expl002.tlg b/l3kernel/testfiles/m3expl002.tlg
index 3ead024..9f9de20 100644
--- a/l3kernel/testfiles/m3expl002.tlg
+++ b/l3kernel/testfiles/m3expl002.tlg
@@ -17,7 +17,7 @@ Don't change this file in any respect.
 %%   Right brace   \}     Tilde         \~}
 %%
 (expl3.sty
-(expl3-code.tex
+ (expl3-code.tex
 \c_max_int=\count112
 \l_tmpa_int=\count113
 \l_tmpb_int=\count114
diff --git a/l3kernel/testfiles/m3expl002.uptex.tlg b/l3kernel/testfiles/m3expl002.uptex.tlg
index 154ac07..637ecc6 100644
--- a/l3kernel/testfiles/m3expl002.uptex.tlg
+++ b/l3kernel/testfiles/m3expl002.uptex.tlg
@@ -17,7 +17,7 @@ Don't change this file in any respect.
 %%   Right brace   \}     Tilde         \~}
 %%
 (expl3.sty
-(expl3-code.tex
+ (expl3-code.tex
 \c_max_int=\count113
 \l_tmpa_int=\count114
 \l_tmpb_int=\count115
diff --git a/l3kernel/testfiles/m3expl002.xetex.tlg b/l3kernel/testfiles/m3expl002.xetex.tlg
index c7cce27..8526423 100644
--- a/l3kernel/testfiles/m3expl002.xetex.tlg
+++ b/l3kernel/testfiles/m3expl002.xetex.tlg
@@ -17,7 +17,7 @@ Don't change this file in any respect.
 %%   Right brace   \}     Tilde         \~}
 %%
 (expl3.sty
-(expl3-code.tex
+ (expl3-code.tex
 \c_max_int=\count112
 \l_tmpa_int=\count113
 \l_tmpb_int=\count114
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index ee02ca8..06291ae 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -17,7 +17,7 @@ Don't change this file in any respect.
 %%   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/native-drivers/true on line ...
 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 ...
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index ba571c3..8882391 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -17,7 +17,7 @@ Don't change this file in any respect.
 %%   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/native-drivers/true on line ...
 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 ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index ee02ca8..06291ae 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -17,7 +17,7 @@ Don't change this file in any respect.
 %%   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/native-drivers/true on line ...
 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 ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index b91fb63..8803cf5 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -17,7 +17,7 @@ Don't change this file in any respect.
 %%   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/native-drivers/true on line ...
 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 ...
diff --git a/l3kernel/testfiles/m3expl004.ptex.tlg b/l3kernel/testfiles/m3expl004.ptex.tlg
index 154ac07..637ecc6 100644
--- a/l3kernel/testfiles/m3expl004.ptex.tlg
+++ b/l3kernel/testfiles/m3expl004.ptex.tlg
@@ -17,7 +17,7 @@ Don't change this file in any respect.
 %%   Right brace   \}     Tilde         \~}
 %%
 (expl3.sty
-(expl3-code.tex
+ (expl3-code.tex
 \c_max_int=\count113
 \l_tmpa_int=\count114
 \l_tmpb_int=\count115
diff --git a/l3kernel/testfiles/m3expl004.tlg b/l3kernel/testfiles/m3expl004.tlg
index 3ead024..9f9de20 100644
--- a/l3kernel/testfiles/m3expl004.tlg
+++ b/l3kernel/testfiles/m3expl004.tlg
@@ -17,7 +17,7 @@ Don't change this file in any respect.
 %%   Right brace   \}     Tilde         \~}
 %%
 (expl3.sty
-(expl3-code.tex
+ (expl3-code.tex
 \c_max_int=\count112
 \l_tmpa_int=\count113
 \l_tmpb_int=\count114
diff --git a/l3kernel/testfiles/m3expl004.uptex.tlg b/l3kernel/testfiles/m3expl004.uptex.tlg
index 154ac07..637ecc6 100644
--- a/l3kernel/testfiles/m3expl004.uptex.tlg
+++ b/l3kernel/testfiles/m3expl004.uptex.tlg
@@ -17,7 +17,7 @@ Don't change this file in any respect.
 %%   Right brace   \}     Tilde         \~}
 %%
 (expl3.sty
-(expl3-code.tex
+ (expl3-code.tex
 \c_max_int=\count113
 \l_tmpa_int=\count114
 \l_tmpb_int=\count115
diff --git a/l3kernel/testfiles/m3expl004.xetex.tlg b/l3kernel/testfiles/m3expl004.xetex.tlg
index c7cce27..8526423 100644
--- a/l3kernel/testfiles/m3expl004.xetex.tlg
+++ b/l3kernel/testfiles/m3expl004.xetex.tlg
@@ -17,7 +17,7 @@ Don't change this file in any respect.
 %%   Right brace   \}     Tilde         \~}
 %%
 (expl3.sty
-(expl3-code.tex
+ (expl3-code.tex
 \c_max_int=\count112
 \l_tmpa_int=\count113
 \l_tmpb_int=\count114
diff --git a/l3kernel/testfiles/m3expl005.tlg b/l3kernel/testfiles/m3expl005.tlg
index 4b58da3..3d16a35 100644
--- a/l3kernel/testfiles/m3expl005.tlg
+++ b/l3kernel/testfiles/m3expl005.tlg
@@ -34,7 +34,7 @@ Don't change this file in any respect.
 ! 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 @@ If that doesn't work, type  X <return>  to quit.
 ! 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 @@ If that doesn't work, type  X <return>  to quit.
 ! 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 @@ If that doesn't work, type  X <return>  to quit.
 ! 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 @@ If that doesn't work, type  X <return>  to quit.
 ! 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 @@ If that doesn't work, type  X <return>  to quit.
 ! 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 @@ If that doesn't work, type  X <return>  to quit.
 ! 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 @@ If that doesn't work, type  X <return>  to quit.
 ! 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 @@ If that doesn't work, type  X <return>  to quit.
 ! 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 @@ If that doesn't work, type  X <return>  to quit.
 ! 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 @@ If that doesn't work, type  X <return>  to quit.
 ! 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 @@ If that doesn't work, type  X <return>  to quit.
 ! 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 @@ If that doesn't work, type  X <return>  to quit.
 ! 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 @@ If that doesn't work, type  X <return>  to quit.
 ! 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 @@ If that doesn't work, type  X <return>  to quit.
 ! 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 @@ If that doesn't work, type  X <return>  to quit.
 ! 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 @@ If that doesn't work, type  X <return>  to quit.
 ! 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 @@ If that doesn't work, type  X <return>  to quit.
 ! 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 @@ If that doesn't work, type  X <return>  to quit.
 ! 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 @@ If that doesn't work, type  X <return>  to quit.
 ! 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 @@ If that doesn't work, type  X <return>  to quit.
 ! 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.
diff --git a/l3kernel/testfiles/m3expl006.ptex.tlg b/l3kernel/testfiles/m3expl006.ptex.tlg
index 95c35c7..6cb916e 100644
--- a/l3kernel/testfiles/m3expl006.ptex.tlg
+++ b/l3kernel/testfiles/m3expl006.ptex.tlg
@@ -18,7 +18,7 @@ Don't change this file in any respect.
 %%
 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
diff --git a/l3kernel/testfiles/m3expl006.tlg b/l3kernel/testfiles/m3expl006.tlg
index 8c04626..3bf8e37 100644
--- a/l3kernel/testfiles/m3expl006.tlg
+++ b/l3kernel/testfiles/m3expl006.tlg
@@ -18,7 +18,7 @@ Don't change this file in any respect.
 %%
 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
diff --git a/l3kernel/testfiles/m3expl006.uptex.tlg b/l3kernel/testfiles/m3expl006.uptex.tlg
index 95c35c7..6cb916e 100644
--- a/l3kernel/testfiles/m3expl006.uptex.tlg
+++ b/l3kernel/testfiles/m3expl006.uptex.tlg
@@ -18,7 +18,7 @@ Don't change this file in any respect.
 %%
 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
diff --git a/l3kernel/testfiles/m3expl006.xetex.tlg b/l3kernel/testfiles/m3expl006.xetex.tlg
index 0378bbc..f3e8483 100644
--- a/l3kernel/testfiles/m3expl006.xetex.tlg
+++ b/l3kernel/testfiles/m3expl006.xetex.tlg
@@ -18,7 +18,7 @@ Don't change this file in any respect.
 %%
 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
diff --git a/l3kernel/testfiles/m3file002.tlg b/l3kernel/testfiles/m3file002.tlg
index c50c687..891de9b 100644
--- a/l3kernel/testfiles/m3file002.tlg
+++ b/l3kernel/testfiles/m3file002.tlg
@@ -25,9 +25,9 @@ TEST 1: Set tl from a file
 |\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 @@ TEST 2: Set tl from a file with expansion
 |\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 /
 |
diff --git a/l3kernel/testfiles/m3fp-assign001.tlg b/l3kernel/testfiles/m3fp-assign001.tlg
index 32f16f3..0602970 100644
--- a/l3kernel/testfiles/m3fp-assign001.tlg
+++ b/l3kernel/testfiles/m3fp-assign001.tlg
@@ -58,7 +58,7 @@ TEST 2: Set fp
 > \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 @@ and I'll forget about whatever was undefined.
 > \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
diff --git a/l3kernel/testfiles/m3fp-basics001.tlg b/l3kernel/testfiles/m3fp-basics001.tlg
index 5d8f47f..f247e98 100644
--- a/l3kernel/testfiles/m3fp-basics001.tlg
+++ b/l3kernel/testfiles/m3fp-basics001.tlg
@@ -22,7 +22,7 @@ TEST 1: Addition special cases
 ============================================================
 ! 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ TEST 5: Subtraction special cases
 ============================================================
 ! 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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
diff --git a/l3kernel/testfiles/m3fp-basics002.tlg b/l3kernel/testfiles/m3fp-basics002.tlg
index 9d23cdd..06bd67c 100644
--- a/l3kernel/testfiles/m3fp-basics002.tlg
+++ b/l3kernel/testfiles/m3fp-basics002.tlg
@@ -22,7 +22,7 @@ TEST 1: Multiplication special cases
 ============================================================
 ! 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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
diff --git a/l3kernel/testfiles/m3fp-basics003.tlg b/l3kernel/testfiles/m3fp-basics003.tlg
index d29f1d6..8e09986 100644
--- a/l3kernel/testfiles/m3fp-basics003.tlg
+++ b/l3kernel/testfiles/m3fp-basics003.tlg
@@ -22,7 +22,7 @@ TEST 1: Division special cases
 ============================================================
 ! 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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
diff --git a/l3kernel/testfiles/m3fp-basics005.tlg b/l3kernel/testfiles/m3fp-basics005.tlg
index 533b121..dc53301 100644
--- a/l3kernel/testfiles/m3fp-basics005.tlg
+++ b/l3kernel/testfiles/m3fp-basics005.tlg
@@ -24,7 +24,7 @@ TEST 1: sqrt()
 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 @@ nan
 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 @@ nan
 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 @@ nan
 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
diff --git a/l3kernel/testfiles/m3fp-convert001.tlg b/l3kernel/testfiles/m3fp-convert001.tlg
index 5cc815b..e6d27d2 100644
--- a/l3kernel/testfiles/m3fp-convert001.tlg
+++ b/l3kernel/testfiles/m3fp-convert001.tlg
@@ -48,7 +48,7 @@ TEST 4: Testing invalid input
 ============================================================
 ! 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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
diff --git a/l3kernel/testfiles/m3fp-convert003.tlg b/l3kernel/testfiles/m3fp-convert003.tlg
index d694094..e9ba634 100644
--- a/l3kernel/testfiles/m3fp-convert003.tlg
+++ b/l3kernel/testfiles/m3fp-convert003.tlg
@@ -32,7 +32,7 @@ TEST 1: fp_to_scientific catcodes
 |-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 @@ and I'll forget about whatever was undefined.
 |-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 @@ and I'll forget about whatever was undefined.
 |-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 @@ and I'll forget about whatever was undefined.
 |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 @@ and I'll forget about whatever was undefined.
 |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 @@ and I'll forget about whatever was undefined.
 |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 @@ TEST 2: fp_to_decimal catcodes
 |-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 @@ and I'll forget about whatever was undefined.
 |-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 @@ and I'll forget about whatever was undefined.
 |-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 @@ and I'll forget about whatever was undefined.
 |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 @@ and I'll forget about whatever was undefined.
 |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 @@ and I'll forget about whatever was undefined.
 |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 @@ TEST 4: fp_to_dim catcodes
 |-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 @@ and I'll forget about whatever was undefined.
 |-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 @@ and I'll forget about whatever was undefined.
 |-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 @@ and I'll forget about whatever was undefined.
 |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 @@ and I'll forget about whatever was undefined.
 |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 @@ and I'll forget about whatever was undefined.
 |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 @@ TEST 5: fp_to_int catcodes
 |-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 @@ and I'll forget about whatever was undefined.
 |-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 @@ and I'll forget about whatever was undefined.
 |-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 @@ and I'll forget about whatever was undefined.
 |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 @@ and I'll forget about whatever was undefined.
 |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 @@ and I'll forget about whatever was undefined.
 |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 @@ TEST 6: fp_use and fp_eval catcodes
 |-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 @@ and I'll forget about whatever was undefined.
 |-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 @@ and I'll forget about whatever was undefined.
 |-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 @@ and I'll forget about whatever was undefined.
 |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 @@ and I'll forget about whatever was undefined.
 |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 @@ and I'll forget about whatever was undefined.
 |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 @@ TEST 7: fp_abs catcodes
 |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 @@ and I'll forget about whatever was undefined.
 |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 @@ and I'll forget about whatever was undefined.
 |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 @@ TEST 8: fp_max and min
 |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 @@ and I'll forget about whatever was undefined.
 |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 @@ and I'll forget about whatever was undefined.
 |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 @@ and I'll forget about whatever was undefined.
 |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 @@ and I'll forget about whatever was undefined.
 |-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 @@ and I'll forget about whatever was undefined.
 |-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 @@ and I'll forget about whatever was undefined.
 |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
diff --git a/l3kernel/testfiles/m3fp-expo001.tlg b/l3kernel/testfiles/m3fp-expo001.tlg
index a128987..2254fa2 100644
--- a/l3kernel/testfiles/m3fp-expo001.tlg
+++ b/l3kernel/testfiles/m3fp-expo001.tlg
@@ -22,7 +22,7 @@ TEST 1: Logarithm
 ============================================================
 ! 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ TEST 3: Power special cases
 ============================================================
 ! 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ TEST 6: Exponential
 ============================================================
 ! 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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
diff --git a/l3kernel/testfiles/m3fp-func001.tlg b/l3kernel/testfiles/m3fp-func001.tlg
index c9d3a7e..8f5a3e9 100644
--- a/l3kernel/testfiles/m3fp-func001.tlg
+++ b/l3kernel/testfiles/m3fp-func001.tlg
@@ -22,7 +22,7 @@ TEST 1: fp_function:Nw
 ============================================================
 ! 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
diff --git a/l3kernel/testfiles/m3fp-logic001.tlg b/l3kernel/testfiles/m3fp-logic001.tlg
index 01e69fd..b0ecfa2 100644
--- a/l3kernel/testfiles/m3fp-logic001.tlg
+++ b/l3kernel/testfiles/m3fp-logic001.tlg
@@ -21,218 +21,218 @@ Author: Bruno Le Floch
 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 @@ FALSE FALSE FALSE FALSE  TRUE  TRUE  TRUE  TRUE
 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
 ============================================================
diff --git a/l3kernel/testfiles/m3fp-logic002.tlg b/l3kernel/testfiles/m3fp-logic002.tlg
index 3725883..e62fc76 100644
--- a/l3kernel/testfiles/m3fp-logic002.tlg
+++ b/l3kernel/testfiles/m3fp-logic002.tlg
@@ -48,7 +48,7 @@ TEST 4: With an error
 ============================================================
 ! 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 @@ TEST 6: Ternary operator invalid syntax
 ============================================================
 ! 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ TEST 11: Some more invalid syntax
 ============================================================
 ! 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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
diff --git a/l3kernel/testfiles/m3fp-parse001.tlg b/l3kernel/testfiles/m3fp-parse001.tlg
index 4aecb06..384290e 100644
--- a/l3kernel/testfiles/m3fp-parse001.tlg
+++ b/l3kernel/testfiles/m3fp-parse001.tlg
@@ -50,7 +50,7 @@ TEST 5: Various errors
 ============================================================
 ! 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ TEST 6: More errors
 ============================================================
 ! 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ TEST 7: Ignoring unknown symbols
 ============================================================
 ! 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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
diff --git a/l3kernel/testfiles/m3fp-parse002.tlg b/l3kernel/testfiles/m3fp-parse002.tlg
index 44d5024..2443547 100644
--- a/l3kernel/testfiles/m3fp-parse002.tlg
+++ b/l3kernel/testfiles/m3fp-parse002.tlg
@@ -22,7 +22,7 @@ TEST 1: Expansion
 ============================================================
 ! 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 @@ TEST 3: Wrong commas
 ============================================================
 ! 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ TEST 4: Weird juxtaposition
 ============================================================
 ! 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 @@ TEST 6: (amsmath) use of \sin instead of sin
 ============================================================
 ! 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ and I'll forget about whatever was undefined.
 > \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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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
diff --git a/l3kernel/testfiles/m3fp-round002.tlg b/l3kernel/testfiles/m3fp-round002.tlg
index 250756f..bcf8612 100644
--- a/l3kernel/testfiles/m3fp-round002.tlg
+++ b/l3kernel/testfiles/m3fp-round002.tlg
@@ -22,7 +22,7 @@ TEST 1: Rounding with errors
 ============================================================
 ! 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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
diff --git a/l3kernel/testfiles/m3fp-traps001.tlg b/l3kernel/testfiles/m3fp-traps001.tlg
index 50ceba0..e83df13 100644
--- a/l3kernel/testfiles/m3fp-traps001.tlg
+++ b/l3kernel/testfiles/m3fp-traps001.tlg
@@ -25,7 +25,7 @@ TRUE
 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 @@ TRUE
 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 @@ TEST 3: fp_trap:nn invalid operation
 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 @@ nan
 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 @@ nan
 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 @@ inf
 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 @@ inf
 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 @@ inf
 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 @@ inf
 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 @@ FALSE
 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
 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 @@ and I'll forget about whatever was undefined.
 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
diff --git a/l3kernel/testfiles/m3fp-trig001.tlg b/l3kernel/testfiles/m3fp-trig001.tlg
index 7b44bed..1270fb6 100644
--- a/l3kernel/testfiles/m3fp-trig001.tlg
+++ b/l3kernel/testfiles/m3fp-trig001.tlg
@@ -22,7 +22,7 @@ TEST 1: Sine
 ============================================================
 ! 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ TEST 2: Cosine
 ============================================================
 ! 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ TEST 3: Tangent
 ============================================================
 ! 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ TEST 4: Cotangent
 ============================================================
 ! 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ TEST 5: Secant
 ============================================================
 ! 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ TEST 6: Cosecant
 ============================================================
 ! 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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
diff --git a/l3kernel/testfiles/m3fp-trig002.tlg b/l3kernel/testfiles/m3fp-trig002.tlg
index 47329f8..b44e725 100644
--- a/l3kernel/testfiles/m3fp-trig002.tlg
+++ b/l3kernel/testfiles/m3fp-trig002.tlg
@@ -22,7 +22,7 @@ TEST 1: Arcsine
 ============================================================
 ! 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ TEST 2: Arccosine
 ============================================================
 ! 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ TEST 5: Arcsecant
 ============================================================
 ! 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ TEST 6: Arccosecant
 ============================================================
 ! 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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
diff --git a/l3kernel/testfiles/m3fp-trig003.tlg b/l3kernel/testfiles/m3fp-trig003.tlg
index 858b826..0a3e0d4 100644
--- a/l3kernel/testfiles/m3fp-trig003.tlg
+++ b/l3kernel/testfiles/m3fp-trig003.tlg
@@ -22,7 +22,7 @@ TEST 1: Sine in degrees
 ============================================================
 ! 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ TEST 2: Cosine in degrees
 ============================================================
 ! 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ TEST 3: Tangent in degrees
 ============================================================
 ! 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ TEST 4: Cotangent in degrees
 ============================================================
 ! 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ TEST 5: Secant in degrees
 ============================================================
 ! 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ TEST 6: Cosecant in degrees
 ============================================================
 ! 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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
diff --git a/l3kernel/testfiles/m3fp-trig004.tlg b/l3kernel/testfiles/m3fp-trig004.tlg
index b09a921..fb3ae68 100644
--- a/l3kernel/testfiles/m3fp-trig004.tlg
+++ b/l3kernel/testfiles/m3fp-trig004.tlg
@@ -22,7 +22,7 @@ TEST 1: Arcsine in degrees
 ============================================================
 ! 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ TEST 2: Arccosine in degrees
 ============================================================
 ! 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ TEST 5: Arcsecant in degrees
 ============================================================
 ! 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ TEST 6: Arccosecant in degrees
 ============================================================
 ! 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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
diff --git a/l3kernel/testfiles/m3int001.tlg b/l3kernel/testfiles/m3int001.tlg
index 01cfb16..bcb3302 100644
--- a/l3kernel/testfiles/m3int001.tlg
+++ b/l3kernel/testfiles/m3int001.tlg
@@ -112,7 +112,7 @@ TEST 7: trying invalid variables: expect errors
 ============================================================
 ! 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,
diff --git a/l3kernel/testfiles/m3int001.xetex.tlg b/l3kernel/testfiles/m3int001.xetex.tlg
index e3cd381..9b769f1 100644
--- a/l3kernel/testfiles/m3int001.xetex.tlg
+++ b/l3kernel/testfiles/m3int001.xetex.tlg
@@ -112,7 +112,7 @@ TEST 7: trying invalid variables: expect errors
 ============================================================
 ! 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,
diff --git a/l3kernel/testfiles/m3int002.tlg b/l3kernel/testfiles/m3int002.tlg
index 44cf881..1a469de 100644
--- a/l3kernel/testfiles/m3int002.tlg
+++ b/l3kernel/testfiles/m3int002.tlg
@@ -524,7 +524,7 @@ TEST 35: Integer conversion to Arabic
 ============================================================
 ! 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,
diff --git a/l3kernel/testfiles/m3int002.uptex.tlg b/l3kernel/testfiles/m3int002.uptex.tlg
index 2d9ad9c..ea33a80 100644
--- a/l3kernel/testfiles/m3int002.uptex.tlg
+++ b/l3kernel/testfiles/m3int002.uptex.tlg
@@ -524,7 +524,7 @@ TEST 35: Integer conversion to Arabic
 ============================================================
 ! 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,
diff --git a/l3kernel/testfiles/m3int002.xetex.tlg b/l3kernel/testfiles/m3int002.xetex.tlg
index 9cbcd33..bed6694 100644
--- a/l3kernel/testfiles/m3int002.xetex.tlg
+++ b/l3kernel/testfiles/m3int002.xetex.tlg
@@ -524,7 +524,7 @@ TEST 35: Integer conversion to Arabic
 ============================================================
 ! 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,
diff --git a/l3kernel/testfiles/m3int003.tlg b/l3kernel/testfiles/m3int003.tlg
index fd9fdcd..c2a2e2d 100644
--- a/l3kernel/testfiles/m3int003.tlg
+++ b/l3kernel/testfiles/m3int003.tlg
@@ -23,7 +23,7 @@ TEST 1: use
 ============================================================
 ! 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 @@ TEST 8: Stepwise
 ============================================================
 ! 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 @@ NO
 ============================================================
 ! 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 @@ NO
 ============================================================
 ! 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
diff --git a/l3kernel/testfiles/m3msg002.tlg b/l3kernel/testfiles/m3msg002.tlg
index 597e7b5..7f24f1a 100644
--- a/l3kernel/testfiles/m3msg002.tlg
+++ b/l3kernel/testfiles/m3msg002.tlg
@@ -22,7 +22,7 @@ TEST 1: Wrong v/V argument
 ============================================================
 ! 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ TEST 2: Wrong tl variable
 ============================================================
 ! 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 @@ TEST 5: msg_expandable_error
 ============================================================
 ! 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ and I'll forget about whatever was undefined.
 ============================================================
 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 @@ TEST 7: Misused indentation
 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 @@ and I'll forget about whatever was undefined.
 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 
 ============================================================
diff --git a/l3kernel/testfiles/m3msg004.tlg b/l3kernel/testfiles/m3msg004.tlg
index 44fca66..13537aa 100644
--- a/l3kernel/testfiles/m3msg004.tlg
+++ b/l3kernel/testfiles/m3msg004.tlg
@@ -228,7 +228,7 @@ l. ...  }
 |__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 @@ l. ...  }
 |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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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
diff --git a/l3kernel/testfiles/m3prg001.tlg b/l3kernel/testfiles/m3prg001.tlg
index 095c399..fad316e 100644
--- a/l3kernel/testfiles/m3prg001.tlg
+++ b/l3kernel/testfiles/m3prg001.tlg
@@ -54,7 +54,7 @@ TEST 5: Replication negative FAIL
 ============================================================
 ! 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
diff --git a/l3kernel/testfiles/m3skip001.tlg b/l3kernel/testfiles/m3skip001.tlg
index 321a127..3b5fe76 100644
--- a/l3kernel/testfiles/m3skip001.tlg
+++ b/l3kernel/testfiles/m3skip001.tlg
@@ -158,19 +158,19 @@ TEST 9: (SKIP) Overflow (BUT \maxdimen != maximum skip?!)
 -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 @@ TEST 10: (SKIP) Underflow
 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 @@ TEST 11: (DIM) Overflow (BUT \maxdimen != maximum dim?!)
 -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 @@ TEST 12: (DIM) Underflow
 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.
diff --git a/l3kernel/testfiles/m3skip002.tlg b/l3kernel/testfiles/m3skip002.tlg
index 230f4a3..2572a87 100644
--- a/l3kernel/testfiles/m3skip002.tlg
+++ b/l3kernel/testfiles/m3skip002.tlg
@@ -62,7 +62,7 @@ TEST 4: compare
 \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 @@ TEST 10: Dimension in points
 ============================================================
 ! 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 @@ TEST 11: Dimension in a unit
 ============================================================
 ! 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.
diff --git a/l3kernel/testfiles/m3skip004.tlg b/l3kernel/testfiles/m3skip004.tlg
index 4b0ed05..3f9e8f6 100644
--- a/l3kernel/testfiles/m3skip004.tlg
+++ b/l3kernel/testfiles/m3skip004.tlg
@@ -58,32 +58,32 @@ TEST 6: Bad conversions
 ============================================================
 ! 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.
diff --git a/l3kernel/testfiles/m3tl001.tlg b/l3kernel/testfiles/m3tl001.tlg
index 9d7c863..31edefd 100644
--- a/l3kernel/testfiles/m3tl001.tlg
+++ b/l3kernel/testfiles/m3tl001.tlg
@@ -34,7 +34,7 @@ Defining \l_tmpd_tl on line ...
 ============================================================
 TEST 2: use registers: expect " bar"
 ============================================================
-bar
+ bar
 ============================================================
 ============================================================
 TEST 3: testing clear and put_left: expect ZZbar ZZbarfoo
diff --git a/l3kernel/testfiles/m3tlist002.tlg b/l3kernel/testfiles/m3tlist002.tlg
index ad2134c..e8a6825 100644
--- a/l3kernel/testfiles/m3tlist002.tlg
+++ b/l3kernel/testfiles/m3tlist002.tlg
@@ -76,11 +76,11 @@ FALSE
 ============================================================
 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
diff --git a/l3kernel/testfiles/m3token002.tlg b/l3kernel/testfiles/m3token002.tlg
index 0e43d28..0dc9d9d 100644
--- a/l3kernel/testfiles/m3token002.tlg
+++ b/l3kernel/testfiles/m3token002.tlg
@@ -175,7 +175,7 @@ TEST 15: token if space TODO BROKEN!!!!
 ============================================================
 ! 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 @@ your `}' was spurious, just type `2' and it will go away.
 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?
diff --git a/l3packages/xparse/testfiles/xparse002.tlg b/l3packages/xparse/testfiles/xparse002.tlg
index c56e452..3e33eaa 100644
--- a/l3packages/xparse/testfiles/xparse002.tlg
+++ b/l3packages/xparse/testfiles/xparse002.tlg
@@ -111,7 +111,7 @@ TEST 3: Invalid arguments (types s, o m)
 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 @@ My plan is to forget the whole thing and hope for the best.
 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 @@ Runaway argument?
 [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 @@ Runaway argument?
 [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 @@ 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?
 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 @@ 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?
 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 @@ Runaway argument?
 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 @@ Runaway argument?
 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?
diff --git a/l3packages/xparse/testfiles/xparse003.tlg b/l3packages/xparse/testfiles/xparse003.tlg
index 3d2048b..5231cd0 100644
--- a/l3packages/xparse/testfiles/xparse003.tlg
+++ b/l3packages/xparse/testfiles/xparse003.tlg
@@ -139,7 +139,7 @@ I got '\foo--NoValue--{}
 ! 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 @@ I've got \foo--NoValue----NoValue--
 > ab.
 <recently read> }
 l. ...\halign{#\cr\foo&ab&
-\cr}
+                          \cr}
diff --git a/l3trial/l3fp-extras/testfiles/m3fp-symbolic001.tlg b/l3trial/l3fp-extras/testfiles/m3fp-symbolic001.tlg
index c8257cb..09b84d6 100644
--- a/l3trial/l3fp-extras/testfiles/m3fp-symbolic001.tlg
+++ b/l3trial/l3fp-extras/testfiles/m3fp-symbolic001.tlg
@@ -34,7 +34,7 @@ TEST 2: Conversions
 ============================================================
 ! 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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
diff --git a/l3trial/l3hooks/testfiles/m3hooks001.ptex.tlg b/l3trial/l3hooks/testfiles/m3hooks001.ptex.tlg
index 4a662a1..26bf0c3 100644
--- a/l3trial/l3hooks/testfiles/m3hooks001.ptex.tlg
+++ b/l3trial/l3hooks/testfiles/m3hooks001.ptex.tlg
@@ -90,7 +90,7 @@ LaTeX Font Info:    External font `cmex10' loaded for size
 \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
@@ -1186,7 +1186,7 @@ LaTeX Font Warning: Font shape `JY1/gt/m/it' undefined
 .\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
@@ -1261,7 +1261,7 @@ l. ...\showlists
 .\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
diff --git a/l3trial/l3hooks/testfiles/m3hooks001.tlg b/l3trial/l3hooks/testfiles/m3hooks001.tlg
index 2019e17..01e94e7 100644
--- a/l3trial/l3hooks/testfiles/m3hooks001.tlg
+++ b/l3trial/l3hooks/testfiles/m3hooks001.tlg
@@ -90,7 +90,7 @@ LaTeX Font Info:    External font `cmex10' loaded for size
 \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
@@ -1178,7 +1178,7 @@ LaTeX Font Info:    Font shape `OMS/cmr/m/n' in size <10> not available
 .\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
@@ -1253,7 +1253,7 @@ l. ...\showlists
 .\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
diff --git a/l3trial/l3hooks/testfiles/m3hooks001.uptex.tlg b/l3trial/l3hooks/testfiles/m3hooks001.uptex.tlg
index 9c8c40e..167277a 100644
--- a/l3trial/l3hooks/testfiles/m3hooks001.uptex.tlg
+++ b/l3trial/l3hooks/testfiles/m3hooks001.uptex.tlg
@@ -90,7 +90,7 @@ LaTeX Font Info:    External font `cmex10' loaded for size
 \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
@@ -1198,7 +1198,7 @@ LaTeX Font Warning: Font shape `JY2/gt/m/it' undefined
 .\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
@@ -1273,7 +1273,7 @@ l. ...\showlists
 .\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
diff --git a/l3trial/l3hooks/testfiles/m3hooks002.ptex.tlg b/l3trial/l3hooks/testfiles/m3hooks002.ptex.tlg
index cf1ddaa..6c9ef51 100644
--- a/l3trial/l3hooks/testfiles/m3hooks002.ptex.tlg
+++ b/l3trial/l3hooks/testfiles/m3hooks002.ptex.tlg
@@ -88,7 +88,7 @@ LaTeX Font Warning: Font shape `JY1/mc/bx/it' undefined
 \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
diff --git a/l3trial/l3hooks/testfiles/m3hooks002.tlg b/l3trial/l3hooks/testfiles/m3hooks002.tlg
index e6c71f5..891d4d4 100644
--- a/l3trial/l3hooks/testfiles/m3hooks002.tlg
+++ b/l3trial/l3hooks/testfiles/m3hooks002.tlg
@@ -80,7 +80,7 @@ Don't change this file in any respect.
 \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
diff --git a/l3trial/l3hooks/testfiles/m3hooks002.uptex.tlg b/l3trial/l3hooks/testfiles/m3hooks002.uptex.tlg
index f58a698..d814382 100644
--- a/l3trial/l3hooks/testfiles/m3hooks002.uptex.tlg
+++ b/l3trial/l3hooks/testfiles/m3hooks002.uptex.tlg
@@ -96,7 +96,7 @@ LaTeX Font Warning: Font shape `JY2/mc/bx/it' undefined
 \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
diff --git a/l3trial/l3kernel-extras/testfiles/m3kernel-extras006.luatex.tlg b/l3trial/l3kernel-extras/testfiles/m3kernel-extras006.luatex.tlg
index c4eca92..f74445d 100644
--- a/l3trial/l3kernel-extras/testfiles/m3kernel-extras006.luatex.tlg
+++ b/l3trial/l3kernel-extras/testfiles/m3kernel-extras006.luatex.tlg
@@ -34,7 +34,7 @@ The character 'a' has character code 97, and properties
 > 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 +47,7 @@ The character '.' has character code 46, and properties
 > 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 +60,7 @@ The character '(' has character code 40, and properties
 > 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> }
diff --git a/l3trial/l3kernel-extras/testfiles/m3kernel-extras006.tlg b/l3trial/l3kernel-extras/testfiles/m3kernel-extras006.tlg
index 38906f7..afb05f1 100644
--- a/l3trial/l3kernel-extras/testfiles/m3kernel-extras006.tlg
+++ b/l3trial/l3kernel-extras/testfiles/m3kernel-extras006.tlg
@@ -34,7 +34,7 @@ The character 'a' has character code 97, and properties
 > 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 +47,7 @@ The character '.' has character code 46, and properties
 > 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 +60,7 @@ The character '(' has character code 40, and properties
 > 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> }
diff --git a/l3trial/l3kernel-extras/testfiles/m3kernel-extras006.xetex.tlg b/l3trial/l3kernel-extras/testfiles/m3kernel-extras006.xetex.tlg
index da1ae58..7aed058 100644
--- a/l3trial/l3kernel-extras/testfiles/m3kernel-extras006.xetex.tlg
+++ b/l3trial/l3kernel-extras/testfiles/m3kernel-extras006.xetex.tlg
@@ -34,7 +34,7 @@ The character 'a' has character code 97, and properties
 > 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 +46,7 @@ The character '.' has character code 46, and properties
 > 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 +58,7 @@ The character '(' has character code 40, and properties
 > 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. ...  }
diff --git a/l3trial/l3kernel-extras/testfiles/m3kernel-extras007.tlg b/l3trial/l3kernel-extras/testfiles/m3kernel-extras007.tlg
index 2afb775..d0df1cc 100644
--- a/l3trial/l3kernel-extras/testfiles/m3kernel-extras007.tlg
+++ b/l3trial/l3kernel-extras/testfiles/m3kernel-extras007.tlg
@@ -28,7 +28,7 @@ l. ......g: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 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 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 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
diff --git a/l3trial/l3ldb/testfiles/m3ldb003.ptex.tlg b/l3trial/l3ldb/testfiles/m3ldb003.ptex.tlg
index 12e2928..7782870 100644
--- a/l3trial/l3ldb/testfiles/m3ldb003.ptex.tlg
+++ b/l3trial/l3ldb/testfiles/m3ldb003.ptex.tlg
@@ -52,7 +52,7 @@ LDB: Set \UseInstanceValues with value item-label-text=(cont.) in itemize><item
 ize
 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':
diff --git a/l3trial/l3ldb/testfiles/m3ldb003.tlg b/l3trial/l3ldb/testfiles/m3ldb003.tlg
index 330b820..b06bae7 100644
--- a/l3trial/l3ldb/testfiles/m3ldb003.tlg
+++ b/l3trial/l3ldb/testfiles/m3ldb003.tlg
@@ -52,7 +52,7 @@ LDB: Set \UseInstanceValues with value item-label-text=(cont.) in itemize><item
 ize
 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':
diff --git a/l3trial/l3ldb/testfiles/m3ldb003.uptex.tlg b/l3trial/l3ldb/testfiles/m3ldb003.uptex.tlg
index 98450f1..c7878f7 100644
--- a/l3trial/l3ldb/testfiles/m3ldb003.uptex.tlg
+++ b/l3trial/l3ldb/testfiles/m3ldb003.uptex.tlg
@@ -52,7 +52,7 @@ LDB: Set \UseInstanceValues with value item-label-text=(cont.) in itemize><item
 ize
 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':
diff --git a/l3trial/xbox/testfiles/xbox001.ptex.tlg b/l3trial/xbox/testfiles/xbox001.ptex.tlg
index dc241ce..5e379d3 100644
--- a/l3trial/xbox/testfiles/xbox001.ptex.tlg
+++ b/l3trial/xbox/testfiles/xbox001.ptex.tlg
@@ -24,17 +24,17 @@ Defining \myboxa on line ...
 \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. ...  }
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
diff --git a/l3trial/xbox/testfiles/xbox001.tlg b/l3trial/xbox/testfiles/xbox001.tlg
index 672f6c0..d008254 100644
--- a/l3trial/xbox/testfiles/xbox001.tlg
+++ b/l3trial/xbox/testfiles/xbox001.tlg
@@ -24,17 +24,17 @@ Defining \myboxa on line ...
 \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. ...  }
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
diff --git a/l3trial/xbox/testfiles/xbox001.uptex.tlg b/l3trial/xbox/testfiles/xbox001.uptex.tlg
index dc241ce..5e379d3 100644
--- a/l3trial/xbox/testfiles/xbox001.uptex.tlg
+++ b/l3trial/xbox/testfiles/xbox001.uptex.tlg
@@ -24,17 +24,17 @@ Defining \myboxa on line ...
 \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. ...  }
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
diff --git a/l3trial/xbox/testfiles/xbox001.xetex.tlg b/l3trial/xbox/testfiles/xbox001.xetex.tlg
index a06edb7..f3accf3 100644
--- a/l3trial/xbox/testfiles/xbox001.xetex.tlg
+++ b/l3trial/xbox/testfiles/xbox001.xetex.tlg
@@ -24,17 +24,17 @@ Defining \myboxa on line ...
 \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. ...  }
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
diff --git a/xpackages/xor/testfiles/xor001.tlg b/xpackages/xor/testfiles/xor001.tlg
index c47dd94..8e921a2 100644
--- a/xpackages/xor/testfiles/xor001.tlg
+++ b/xpackages/xor/testfiles/xor001.tlg
@@ -201,7 +201,7 @@ Underfull \hbox (badness 2173) in paragraph at lines 170--177
 : -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
@@ -322,7 +322,7 @@ t}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
 : -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
@@ -605,7 +605,7 @@ Marks: Setting mark {leftmark=5}{rightmark=9}{floats=2}
 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\
+  {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)
@@ -628,7 +628,7 @@ Marks: found 1 entries for floats (new 2; old 1)
 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
@@ -750,7 +750,7 @@ t}\dim_gset:Nn \g_xor_ht_col_2_1_dim {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\
+  {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)
@@ -759,7 +759,7 @@ 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
+ 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", "
@@ -902,7 +902,7 @@ 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", 
+ 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)
@@ -957,7 +957,7 @@ Marks: restoring botmark {leftmark=2}{rightmark=2}{floats=1}
 : -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
@@ -1056,7 +1056,7 @@ _gset:Nn \g_xor_ht_col_2_1_dim {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\
+  {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)
@@ -1065,7 +1065,7 @@ 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
+ 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", "
@@ -1211,7 +1211,7 @@ 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", 
+ 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)
@@ -1455,7 +1455,7 @@ ootnotes",
 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 ...
+ 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 +1463,7 @@ Marks: found 3 entries for floats (new 4; old 1)
 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
@@ -1539,7 +1539,7 @@ t}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
 : -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
+ - 60.0pt = 552.0pt) -> accepting here point
 : - at currbox: \bx at A 
 : -Here object structure:
 : - {Testing ``here'' floats}
@@ -1681,7 +1681,7 @@ t}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
 : -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
+ 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
@@ -1706,9 +1706,9 @@ ootnotes",
 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 ...
+ 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
+ 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: queue for floats before: "", "1", "2", "3", 
 Marks: picking up from output {leftmark=5}{rightmark=9}{floats=3}
@@ -1737,7 +1737,7 @@ Marks: queue for floats after: "2", "3",
 : -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
+ - 12.0pt = 600.0pt) -> accepting here point
 : - at currbox: \bx at B 
 : -Here object structure:
 : - {Testing ``here'' floats number 2}
@@ -1900,21 +1900,21 @@ Float: \bx at C
 : -- {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 ()
@@ -1996,7 +1996,7 @@ pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
 : -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
+ - 60.0pt = 396.0pt) -> accepting here point
 : - at currbox: \bx at A 
 : -Here object structure:
 : - {Testing ``here'' floats}
@@ -2136,9 +2136,9 @@ ootnotes",
 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 ...
+ 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
+ 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: queue for floats before: "", "1", "2", "3", 
 Marks: picking up from output {leftmark=5}{rightmark=9}{floats=2}
@@ -2154,7 +2154,7 @@ Marks: queue for floats after: "1", "2", "3",
 : --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 +2217,7 @@ Marks: restoring botmark {leftmark=5}{rightmark=6}{floats=1}
 : --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 ()
@@ -2298,7 +2298,7 @@ t}\dim_gset:Nn \g_xor_ht_col_2_1_dim {456.0pt}
 : -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
+ - 60.0pt = 552.0pt) -> accepting here point
 : - at currbox: \bx at A 
 : -Here object structure:
 : - {Testing ``here'' floats}
@@ -2443,7 +2443,7 @@ t}\dim_gset:Nn \g_xor_ht_col_2_1_dim {456.0pt}
 : -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
+ 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
@@ -2468,9 +2468,9 @@ ootnotes",
 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 ...
+ 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
+ 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: queue for floats before: "", "1", "2", "3", 
 Marks: picking up from output {leftmark=5}{rightmark=9}{floats=3}
@@ -2508,7 +2508,7 @@ Marks: queue for floats after: "2", "3",
 : -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
+ - 12.0pt = 444.0pt) -> accepting here point
 : - at currbox: \bx at B 
 : -Here object structure:
 : - {Testing ``here'' floats number 2}
@@ -2602,7 +2602,7 @@ 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", 
+ 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 +2615,7 @@ Marks: queue for floats after: "3",
 : --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,11 +2669,11 @@ Marks: restoring botmark {leftmark=5}{rightmark=6}{floats=1}
 : -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
@@ -2726,7 +2726,7 @@ _gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
 : -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
+ - 60.0pt = 552.0pt) -> accepting here point
 : - at currbox: \bx at A 
 : -Here object structure:
 : - {Testing ``here'' floats}
@@ -2866,7 +2866,7 @@ _gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
 : -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
+ 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
@@ -2891,9 +2891,9 @@ ootnotes",
 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 ...
+ 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
+ 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: queue for floats before: "", "1", "2", "3", 
 Marks: picking up from output {leftmark=5}{rightmark=9}{floats=3}
@@ -2925,7 +2925,7 @@ Underfull \vbox (badness 10000) has occurred while \output is active []
 : -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
+ - 12.0pt = 600.0pt) -> accepting here point
 : - at currbox: \bx at B 
 : -Here object structure:
 : - {Testing ``here'' floats number 2}
@@ -3153,7 +3153,7 @@ pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
 : ---\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:
@@ -3180,17 +3180,17 @@ Float: \bx at C
 : ----- {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 ()
@@ -3216,7 +3216,7 @@ t minus 8.0pt
 : -----leaving xor_try_this_area_relaxed:
 : -----entering xor_floatpage_pretests_success_action:
 : ------entering xor_update_best_trial:
--> accepted
+ -> 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}
@@ -3231,14 +3231,14 @@ n \g_xor_ht_col_2_1_dim {456.0pt}
 : ------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)
@@ -3361,7 +3361,7 @@ 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
@@ -3647,21 +3647,21 @@ Float: \bx at C
 : -- {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 ()
@@ -3912,7 +3912,7 @@ Marks: queue for floats after: "3",
 : --entering xor_evaluate_trial_results:
 : ---fail: false
 : ---entering xor_update_best_trial:
--> accepted
+ -> 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}
@@ -3953,7 +3953,7 @@ Marks: restoring botmark {leftmark=5}{rightmark=12}{floats=4}
 : -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
@@ -4356,7 +4356,7 @@ 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
@@ -4499,7 +4499,7 @@ Marks: in output: rightmark -> {4.2\hskip 1em\relax Float pages and columns}{4.
 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", 
+ 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)
@@ -4673,7 +4673,7 @@ Marks: restoring botmark {leftmark=6}{rightmark=17}{floats=4}
 : -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
@@ -4793,7 +4793,7 @@ Marks: in output: rightmark -> {4.2\hskip 1em\relax Float pages and columns}{4.
 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", 
+ 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)
@@ -5135,7 +5135,7 @@ p 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
+ 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''", 
@@ -5145,7 +5145,7 @@ 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
@@ -5282,7 +5282,7 @@ p 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
+ 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 `
@@ -5458,7 +5458,7 @@ Marks: restoring botmark {leftmark=6}{rightmark=23}{floats=4}
 : -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
@@ -5572,7 +5572,7 @@ p 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
+ 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 `
@@ -5928,7 +5928,7 @@ 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
@@ -6212,21 +6212,21 @@ Float: \bx at D
 : -- {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 ()
@@ -6347,7 +6347,7 @@ Marks: queue for floats after: "3", "4",
 : --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 +6404,7 @@ Marks: restoring botmark {leftmark=6}{rightmark=27}{floats=4}
 : --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 ()
@@ -6611,7 +6611,7 @@ 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", 
+ 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 +6624,7 @@ Marks: queue for floats after: "3", "4",
 : --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,11 +6678,11 @@ Marks: restoring botmark {leftmark=6}{rightmark=27}{floats=4}
 : -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
@@ -7015,7 +7015,7 @@ pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
 : ---\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:
@@ -7030,12 +7030,12 @@ DDD_float_seq {\s__seq }
 : ----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)
@@ -7072,7 +7072,7 @@ STATS: trials = 0
 : -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
+ line 925
 Marks: Setting mark {leftmark=7}{rightmark=34}{floats=5}
 : Add grid alignment point
 : Adding badly guarded penalty -10008 to MVL
@@ -7082,19 +7082,19 @@ 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 ==============================================================
 =========[] 
-[]
+ []
 Overfull \hbox (42.44952pt too wide) in paragraph at lines 950--950
 []\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}[] 
-[]
+ []
 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}
 : leaving float environment
@@ -7110,10 +7110,10 @@ Marks: Setting mark {leftmark=7}{rightmark=35}{floats=6}
 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
-[]
+ []
 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 ...
@@ -7141,11 +7141,11 @@ Marks: Setting mark {leftmark=8}{rightmark=37}{floats=6}
 : 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
 :
-[]
+ []
 : entering xor_OR_collect:
 : -output pen: -10008
 : -Forced break (-10008) seen on line ...
@@ -7173,7 +7173,7 @@ on}",
 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}}{\
+ 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}", 
@@ -7194,7 +7194,7 @@ 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
@@ -7297,7 +7297,7 @@ on}",
 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 
+ 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
@@ -7439,7 +7439,7 @@ on}",
 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}}{\
+ 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}", 
@@ -7501,21 +7501,21 @@ Float: \bx at D
 : -- {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 ()
@@ -7579,7 +7579,7 @@ on}",
 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 
+ 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
@@ -7732,7 +7732,7 @@ on}",
 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}}{\
+ 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}", 
@@ -7769,7 +7769,7 @@ Marks: queue for floats after: "5",
 : --entering xor_evaluate_trial_results:
 : ---fail: false
 : ---entering xor_update_best_trial:
--> accepted
+ -> 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}
@@ -7825,13 +7825,13 @@ Float: \bx at E
 : -- {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)
@@ -7911,7 +7911,7 @@ on}",
 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 
+ 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
@@ -7993,7 +7993,7 @@ on}",
 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 
+ 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
@@ -8032,7 +8032,7 @@ Marks: queue for floats after: "5",
 : --entering xor_evaluate_trial_results:
 : ---fail: false
 : ---entering xor_update_best_trial:
--> accepted
+ -> 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}
@@ -8087,7 +8087,7 @@ Marks: restoring botmark {leftmark=7}{rightmark=33}{floats=4}
 : -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
@@ -8121,7 +8121,7 @@ on}",
 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 
+ 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
@@ -8196,7 +8196,7 @@ on}",
 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 
+ 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
@@ -8388,10 +8388,10 @@ Marks: Setting mark {leftmark=8}{rightmark=38}{floats=6}
 : 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 ...
@@ -8407,12 +8407,12 @@ on}",
 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}}{\
+ 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
+ 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: picking up from output {leftmark=8}{rightmark=38}{floats=6}
@@ -8428,7 +8428,7 @@ 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
@@ -8603,12 +8603,12 @@ on}",
 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}}{\
+ 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
+ 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: picking up from output {leftmark=8}{rightmark=37}{floats=6}
@@ -8745,7 +8745,7 @@ Marks: restoring botmark {leftmark=7}{rightmark=34}{floats=6}
 : -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
@@ -8897,12 +8897,12 @@ on}",
 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}}{\
+ 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
+ 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: picking up from output {leftmark=8}{rightmark=37}{floats=6}
@@ -9141,7 +9141,7 @@ pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
 : -Forced break (-10008) seen on line ...
 : leaving xor_OR_collect:
 Marks: set rightmark <- 6.3\hskip 1em\relax Footnote formatting declarations on
-line 1110
+ line 1110
 Marks: Setting mark {leftmark=8}{rightmark=39}{floats=6}
 : Add grid alignment point
 : Adding badly guarded penalty -10008 to MVL
@@ -9172,11 +9172,11 @@ 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},[] 
-[]
+ []
 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}
 : leaving float environment
@@ -9198,39 +9198,39 @@ ntly available keys}{2}{tab:pagesetup2}{6}{t12,b12,t11,b11,t21,b21}{table}{6}
 : 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-
-[]
+ []
 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-
-[]
+ []
 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
-[]
+ []
 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 ...
@@ -9252,7 +9252,7 @@ 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", 
+ 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.
@@ -9266,7 +9266,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
@@ -9398,7 +9398,7 @@ 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", 
+ 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.
@@ -9617,13 +9617,13 @@ rently available keys}
 : -- {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 ()
@@ -9755,7 +9755,7 @@ 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", 
+ 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.
@@ -9834,7 +9834,7 @@ 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", 
+ 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.
@@ -9857,7 +9857,7 @@ Marks: queue for floats after: "5", "6",
 : --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 +9923,17 @@ Marks: restoring botmark {leftmark=8}{rightmark=38}{floats=6}
 : --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,11 +9943,11 @@ area trial: b21
 : -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
@@ -10056,7 +10056,7 @@ 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", 
+ 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.
@@ -10343,7 +10343,7 @@ pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
 : ---\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:
@@ -10371,11 +10371,11 @@ currently available keys}
 : ----- {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 ()
@@ -10418,7 +10418,7 @@ t minus 8.0pt
 : -----leaving xor_try_this_area_relaxed:
 : -----entering xor_floatpage_pretests_success_action:
 : ------entering xor_update_best_trial:
--> accepted
+ -> 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}
@@ -10435,14 +10435,14 @@ n \g_xor_ht_col_2_1_dim {288.0pt}
 : ------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)
@@ -10501,14 +10501,14 @@ Marks: Setting mark {leftmark=8}{rightmark=41}{floats=7}
 : 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:
@@ -10555,7 +10555,7 @@ Marks: found 0 entries for floats (new 7; old 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
@@ -10663,7 +10663,7 @@ 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}", 
+ 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}
@@ -10756,7 +10756,7 @@ 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}", 
+ 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}
@@ -10819,13 +10819,13 @@ rently available keys}
 : -- {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 ()
@@ -10933,7 +10933,7 @@ 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}", 
+ 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}
@@ -10989,7 +10989,7 @@ 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}", 
+ 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}
@@ -11021,7 +11021,7 @@ Marks: queue for floats after: "6",
 : --entering xor_evaluate_trial_results:
 : ---fail: false
 : ---entering xor_update_best_trial:
--> accepted
+ -> 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}
@@ -11073,7 +11073,7 @@ Marks: restoring botmark {leftmark=8}{rightmark=40}{floats=7}
 : -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
@@ -11135,7 +11135,7 @@ 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}", 
+ 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}
@@ -11184,7 +11184,7 @@ 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}", 
+ 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}
@@ -11352,22 +11352,22 @@ Marks: set floats <- 7 on line ...
 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}
 : leaving float environment
@@ -11390,7 +11390,7 @@ Marks: Setting mark {leftmark=10}{rightmark=43}{floats=9}
 : 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)
@@ -11420,7 +11420,7 @@ Marks: found 2 entries for floats (new 9; old 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
@@ -11551,7 +11551,7 @@ 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}", 
+ 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}
@@ -11701,21 +11701,21 @@ Float: \bx at G
 : -- {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 ()
@@ -11829,7 +11829,7 @@ 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}", 
+ 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}
@@ -11853,7 +11853,7 @@ Marks: queue for floats after: "6", "7", "8",
 : --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 +11910,7 @@ Marks: restoring botmark {leftmark=8}{rightmark=40}{floats=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 ()
@@ -12046,7 +12046,7 @@ 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}", 
+ 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}
@@ -12168,7 +12168,7 @@ Marks: queue for floats after: "6", "7", "8",
 : --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 +12219,7 @@ Marks: restoring botmark {leftmark=8}{rightmark=40}{floats=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 +12235,35 @@ Float: \bx at H
 : -- {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,11 +12273,11 @@ area trial: b21
 : --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
@@ -12386,7 +12386,7 @@ 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}", 
+ 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}
@@ -12607,7 +12607,7 @@ pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
 : ---\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:
@@ -12634,17 +12634,17 @@ Float: \bx at G
 : ----- {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 ()
@@ -12670,7 +12670,7 @@ t minus 8.0pt
 : -----leaving xor_try_this_area_relaxed:
 : -----entering xor_floatpage_pretests_success_action:
 : ------entering xor_update_best_trial:
--> accepted
+ -> 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}
@@ -12697,17 +12697,17 @@ Float: \bx at H
 : ------- {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,7 +12732,7 @@ area trial: b11
 : -------leaving xor_try_this_area_relaxed:
 : -------entering xor_floatpage_pretests_success_action:
 : --------entering xor_update_best_trial:
--> accepted
+ -> 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}
@@ -12747,7 +12747,7 @@ area trial: b11
 : --------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,7 +12756,7 @@ STATS: trials = 4
 : ----\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)
@@ -12840,7 +12840,7 @@ Marks: found 0 entries for floats (new 9; old 9)
 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
@@ -13003,7 +13003,7 @@ 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 ...
+ \MakeUppercase  {References}}{\protect \MakeUppercase  {References}} on line ...
 486
 Marks: queue for rightmark after: "\protect \MakeUppercase  {References}", 
 Marks: queue for floats before: "8", 
@@ -13052,21 +13052,21 @@ Float: \bx at G
 : -- {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 ()
@@ -13267,7 +13267,7 @@ Marks: queue for floats after: "8",
 : ---fail: false
 : ---g_xor_flush_max_classes_clist <- \s__seq f loats,
 : ---entering xor_update_best_trial:
--> accepted
+ -> 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}
@@ -13314,30 +13314,30 @@ Float: \bx at H
 : -- {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)
@@ -13542,7 +13542,7 @@ acement conditions again
 : ---flush: partly tighten placement conditions
 : ---g_xor_flush_max_classes_clist <- \s__seq f loats,
 : ---entering xor_update_best_trial:
--> accepted
+ -> 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}
@@ -13554,7 +13554,7 @@ g_xor_ht_col_2_1_dim {408.0pt}
 : -----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,7 +13578,7 @@ Marks: restoring botmark {leftmark=9}{rightmark=42}{floats=9}
 : -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

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the latex3-commits mailing list