[latex3-commits] [l3svn] branch master updated: l3build: Retain spaces at start of lines

noreply at latex-project.org noreply at latex-project.org
Sun Jan 3 19:05:53 CET 2016


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

joseph pushed a commit to branch master
in repository l3svn.

The following commit(s) were added to refs/heads/master by this push:
       new  46c4ffd   l3build: Retain spaces at start of lines
46c4ffd is described below

commit 46c4ffd8a5e82ea79831ba11ea257ca75bed7550
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Sun Jan 3 17:37:34 2016 +0000

    l3build: Retain spaces at start of lines
    
    This will help with normalisation but does mean other .tlg
    files need rebuilding.
---
 l3build/l3build.lua                                |    9 +-
 l3build/testfiles/00-test-1.luatex.tlg             |    4 +-
 l3build/testfiles/00-test-1.tlg                    |    4 +-
 .../l3str/testfiles/m3regex005.luatex.tlg          |   14 +-
 l3experimental/l3str/testfiles/m3regex005.tlg      |   14 +-
 l3experimental/l3str/testfiles/m3regex007.tlg      |  398 ++++++++++----------
 l3experimental/l3str/testfiles/m3regex009.tlg      |    6 +-
 .../l3str/testfiles/m3regex010.luatex.tlg          |    4 +-
 l3experimental/l3str/testfiles/m3regex010.tlg      |    4 +-
 l3experimental/l3str/testfiles/m3str-format001.tlg |   16 +-
 .../xcoffins/testfiles/xcoffins002.luatex.tlg      |    4 +-
 .../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.luatex.tlg      |    8 +-
 .../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.luatex.tlg              |    8 +-
 l3kernel/testfiles/m3basics002.tlg                 |    2 +-
 l3kernel/testfiles/m3char001.luatex.tlg            |   24 +-
 l3kernel/testfiles/m3char001.tlg                   |   54 +--
 l3kernel/testfiles/m3char001.xetex.tlg             |   38 +-
 l3kernel/testfiles/m3compare001.tlg                |  128 +++----
 l3kernel/testfiles/m3expl001.luatex.tlg            |    4 +-
 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.luatex.tlg            |    2 +-
 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.luatex.tlg            |    4 +-
 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.luatex.tlg            |    2 +-
 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.luatex.tlg            |    2 +-
 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.luatex.tlg             |    6 +-
 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.luatex.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.luatex.tlg    |    6 +-
 l3trial/l3hooks/testfiles/m3hooks001.ptex.tlg      |    6 +-
 l3trial/l3hooks/testfiles/m3hooks001.tlg           |    6 +-
 l3trial/l3hooks/testfiles/m3hooks001.uptex.tlg     |    6 +-
 l3trial/l3hooks/testfiles/m3hooks002.luatex.tlg    |    2 +-
 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.luatex.tlg          |    6 +-
 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                 |  312 +++++++--------
 113 files changed, 1086 insertions(+), 1085 deletions(-)

diff --git a/l3build/l3build.lua b/l3build/l3build.lua
index edef15a..0eaf9c0 100644
--- a/l3build/l3build.lua
+++ b/l3build/l3build.lua
@@ -781,6 +781,8 @@ function formatlog(logfile, newfile, engine)
     end
     -- Zap map loading of map
     line = string.gsub(line, "%{%w?:?[%w/%-]*/pdftex%.map%}", "")
+    -- Deal with the fact that "(.aux)" may have still a leading space
+    line = string.gsub(line, "^ %(%.aux%)", "(.aux)")
     -- Merge all of .fd data into one line so will be removed later
     if string.match(line, "^ *%([%.%/%w]+%.fd[^%)]*$") then
       lastline = (lastline or "") .. line
@@ -801,9 +803,6 @@ function formatlog(logfile, newfile, engine)
     for i = 0, 31 do
       line = string.gsub(line, string.char(i), "^^" .. string.char(64 + i))
     end
-    -- Remove spaces at the start of lines: deals with the fact that LuaTeX
-    -- uses a different number to the other engines
-    line = string.gsub(line, "^%s+", "")
     -- Remove 'normal' direction information on boxes with (u)pTeX
     line = string.gsub(line, ",? yoko direction,?", "")
     -- A tidy-up to keep LuaTeX and other engines in sync
@@ -995,7 +994,9 @@ function formatlualog(logfile, newfile)
     elseif string.len(lastline) > maxprintline then
       return lastline .. line, ""
     end
-    return line, ""
+    -- Remove spaces at the start of lines: deals with the fact that LuaTeX
+    -- uses a different number to the other engines
+    return string.gsub(line, "^%s+", ""), ""
   end
   local newlog = ""
   local lastline = ""
diff --git a/l3build/testfiles/00-test-1.luatex.tlg b/l3build/testfiles/00-test-1.luatex.tlg
index 90f1670..8bf5b69 100644
--- a/l3build/testfiles/00-test-1.luatex.tlg
+++ b/l3build/testfiles/00-test-1.luatex.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> ...ef \y {world}}\foo } \x ={hello} \showthe \foo 
-\show \y 
+                                                  \show \y 
 l. ...}
 > \y=macro:
 ->world.
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.luatex.tlg b/l3experimental/l3str/testfiles/m3regex005.luatex.tlg
index 45b6a08..5bed59d 100644
--- a/l3experimental/l3str/testfiles/m3regex005.luatex.tlg
+++ b/l3experimental/l3str/testfiles/m3regex005.luatex.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/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.luatex.tlg b/l3experimental/l3str/testfiles/m3regex010.luatex.tlg
index 94ff33a..ad0a2c8 100644
--- a/l3experimental/l3str/testfiles/m3regex010.luatex.tlg
+++ b/l3experimental/l3str/testfiles/m3regex010.luatex.tlg
@@ -22,8 +22,8 @@ TEST 1: LuaTeX bug which leads to an l3regex bug
 ============================================================
 > Compiled regex {\\^^A}:
 +-branch
-char code 92
-char code 1.
+  char code 92
+  char code 1.
 <recently read> }
 l. ...  }
 ============================================================
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.luatex.tlg b/l3experimental/xcoffins/testfiles/xcoffins002.luatex.tlg
index 25e05b3..7fe1a14 100644
--- a/l3experimental/xcoffins/testfiles/xcoffins002.luatex.tlg
+++ b/l3experimental/xcoffins/testfiles/xcoffins002.luatex.tlg
@@ -49,7 +49,7 @@ TEST 2: 2: setting coffins
 .\pdfcolorstack 0 pop
 ! OK.
 <argument> \SetHorizontalCoffin \aaa {A}\showbox \aaa 
-\ShowCoffinStructure \aaa \SetVertic
+                                           \ShowCoffinStructure \aaa \SetVertic
 l. ...}
 Size of coffin \aaa:
 > ht = 6.83331pt
@@ -82,7 +82,7 @@ l. ...}
 ..\glue(\rightskip) 0.0
 ! OK.
 <argument> ... \SetVerticalCoffin \bbb {1cm}{A}\showbox \bbb 
-\ShowCoffinStructure \bbb 
+                                                  \ShowCoffinStructure \bbb 
 l. ...}
 Size of coffin \bbb:
 > ht = 6.83331pt
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.luatex.tlg b/l3experimental/xcoffins/testfiles/xcoffins003.luatex.tlg
index 04dce11..51db936 100644
--- a/l3experimental/xcoffins/testfiles/xcoffins003.luatex.tlg
+++ b/l3experimental/xcoffins/testfiles/xcoffins003.luatex.tlg
@@ -198,7 +198,7 @@ TEST 1: Test 1: rotation
 ..\mathoff
 ! OK.
 <argument> \showbox \aaa 
-x\fbox {\usebox \aaa }\RotateCoffin \aaa {45}\showbox \aaa x\fbox
+              x\fbox {\usebox \aaa }\RotateCoffin \aaa {45}\showbox \aaa x\fbox
 l. ...}
 > \box71=
 \hbox(0.0+0.0)x0.0, direction TLT
@@ -389,7 +389,7 @@ l. ...}
 .....\pdfrestore
 ! OK.
 <argument> ...box \aaa }\RotateCoffin \aaa {45}\showbox \aaa 
-x\fbox {\usebox \aaa }\Rot...
+                                                  x\fbox {\usebox \aaa }\Rot...
 l. ...}
 > \box71=
 \hbox(0.0+0.0)x0.0, direction TLT
@@ -591,7 +591,7 @@ l. ...}
 .....\pdfrestore
 ! OK.
 <argument> ...box \aaa }\RotateCoffin \aaa {45}\showbox \aaa 
-x\fbox {\usebox \aaa }
+                                                  x\fbox {\usebox \aaa }
 l. ...}
 ============================================================
 ============================================================
@@ -892,7 +892,7 @@ TEST 2: Test 2: rotation+alignment
 ...\pdfcolorstack 0 pop
 ! OK.
 <argument> ...s \aaa [b,l]\bbb [B,hc](30pt,0pt)\showbox \aaa 
-x\fbox {\usebox \aaa }x
+                                                  x\fbox {\usebox \aaa }x
 l. ...}
 ============================================================
 ============================================================
diff --git a/l3experimental/xcoffins/testfiles/xcoffins003.ptex.tlg b/l3experimental/xcoffins/testfiles/xcoffins003.ptex.tlg
index 0a1a915..fd6cc44 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. ...}
 ============================================================
 ============================================================
@@ -808,7 +808,7 @@ TEST 2: Test 2: rotation+alignment
 ...\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 0a1a915..fd6cc44 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. ...}
 ============================================================
 ============================================================
@@ -808,7 +808,7 @@ TEST 2: Test 2: rotation+alignment
 ...\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 0a1a915..fd6cc44 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. ...}
 ============================================================
 ============================================================
@@ -808,7 +808,7 @@ TEST 2: Test 2: rotation+alignment
 ...\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.luatex.tlg b/l3kernel/testfiles/d3dvips.luatex.tlg
index a4b6062..55d0d47 100644
--- a/l3kernel/testfiles/d3dvips.luatex.tlg
+++ b/l3kernel/testfiles/d3dvips.luatex.tlg
@@ -206,7 +206,7 @@ l. ...  }
 ..\hbox(6.94444+0.0)x50.02786, direction TLT
 ...\special{ps:gsave}
 ...\special{ps:currentpoint currentpoint translate -30 rotate neg exch neg exch
-t\ETC.}
+ t\ETC.}
 ...\hbox(6.94444+0.0)x50.02786, direction TLT
 ....\hbox(6.94444+0.0)x50.02786, direction TLT
 .....\OT1/cmr/m/n/10 H
@@ -232,7 +232,7 @@ l. ...  }
 ..\hbox(6.94444+0.0)x50.02786, direction TLT
 ...\special{ps:gsave}
 ...\special{ps:currentpoint currentpoint translate -45 rotate neg exch neg exch
-t\ETC.}
+ t\ETC.}
 ...\hbox(6.94444+0.0)x50.02786, direction TLT
 ....\hbox(6.94444+0.0)x50.02786, direction TLT
 .....\OT1/cmr/m/n/10 H
@@ -336,7 +336,7 @@ l. ...  }
 ..\hbox(40.2855+0.0)x40.2855, direction TLT
 ...\special{ps:gsave}
 ...\special{ps:currentpoint currentpoint translate -45 rotate neg exch neg exch
-t\ETC.}
+ t\ETC.}
 ...\hbox(40.2855+0.0)x40.2855, direction TLT
 ....\hbox(40.2855+0.0)x40.2855, direction TLT
 .....\hbox(40.2855+0.0)x40.2855, direction TLT
@@ -448,7 +448,7 @@ l. ...  }
 ..\hbox(2.31477+0.0)x50.02786, direction TLT
 ...\special{ps:gsave}
 ...\special{ps:currentpoint currentpoint translate 1 0.33333 scale neg exch neg
-e\ETC.}
+ e\ETC.}
 ...\hbox(6.94444+0.0)x0.0, glue set - 50.02786fil, direction TLT
 ....\hbox(6.94444+0.0)x50.02786, direction TLT
 .....\OT1/cmr/m/n/10 H
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.luatex.tlg b/l3kernel/testfiles/m3char001.luatex.tlg
index 7182c1c..58b6d50 100644
--- a/l3kernel/testfiles/m3char001.luatex.tlg
+++ b/l3kernel/testfiles/m3char001.luatex.tlg
@@ -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
diff --git a/l3kernel/testfiles/m3char001.tlg b/l3kernel/testfiles/m3char001.tlg
index 44481ff..42931c3 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
@@ -474,11 +474,11 @@ l. ...  }
 > \test:nn=\protected\long macro:
 #1#2->\tl_set:Nx \l_tmpa_tl {\char_generate:nn {#1}{#2}}\tl_show:N \l_tmpa_tl \exp_after:wN \tex_show:D \l_tmpa_tl .
 <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
@@ -490,7 +490,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
@@ -503,11 +503,11 @@ l. ...  }
 > \test:nn=\protected\long macro:
 #1#2->\tl_set:Nx \l_tmpa_tl {\char_generate:nn {#1}{#2}}\tl_show:N \l_tmpa_tl \exp_after:wN \tex_show:D \l_tmpa_tl .
 <argument> ...:n {1234}\test:nn {1234}{7}\test:nn 
-{1234}{8}\test:nn {1234}{1...
+                                                  {1234}{8}\test:nn {1234}{1...
 l. ...  }
 ! Undefined control sequence.
 <argument> \LaTeX3 error: 
-Charcode requested out of engine range.
+                           Charcode requested out of engine range.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -520,6 +520,6 @@ l. ...  }
 > \test:nn=\protected\long macro:
 #1#2->\tl_set:Nx \l_tmpa_tl {\char_generate:nn {#1}{#2}}\tl_show:N \l_tmpa_tl \exp_after:wN \tex_show:D \l_tmpa_tl .
 <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.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index fe6d43d..5d00a03 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -17,7 +17,7 @@ Don't change this file in any respect.
 %%   Right brace   \}     Tilde         \~}
 %%
 (expl3.sty
-(expl3-code.tex
+ (expl3-code.tex
 \ucharcat at table=\catcodetable5
 Defining \cs_set_nopar:cpn on line ...
 Defining \cs_set_nopar:cpx on line ...
@@ -4788,7 +4788,7 @@ Defining key expl/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.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.luatex.tlg b/l3kernel/testfiles/m3expl002.luatex.tlg
index 07f3423..2f31d92 100644
--- a/l3kernel/testfiles/m3expl002.luatex.tlg
+++ b/l3kernel/testfiles/m3expl002.luatex.tlg
@@ -17,7 +17,7 @@ Don't change this file in any respect.
 %%   Right brace   \}     Tilde         \~}
 %%
 (expl3.sty
-(expl3-code.tex
+ (expl3-code.tex
 \ucharcat at table=\catcodetable5
 \c_max_int=\count112
 \l_tmpa_int=\count113
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.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index 26e6a84..389aadc 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -17,7 +17,7 @@ Don't change this file in any respect.
 %%   Right brace   \}     Tilde         \~}
 %%
 (expl3.sty
-(expl3-code.tex
+ (expl3-code.tex
 \ucharcat at table=\catcodetable5
 Defining \cs_set_nopar:cpn on line ...
 Defining \cs_set_nopar:cpx on line ...
@@ -4789,7 +4789,7 @@ Defining key expl/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.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.luatex.tlg b/l3kernel/testfiles/m3expl004.luatex.tlg
index 07f3423..2f31d92 100644
--- a/l3kernel/testfiles/m3expl004.luatex.tlg
+++ b/l3kernel/testfiles/m3expl004.luatex.tlg
@@ -17,7 +17,7 @@ Don't change this file in any respect.
 %%   Right brace   \}     Tilde         \~}
 %%
 (expl3.sty
-(expl3-code.tex
+ (expl3-code.tex
 \ucharcat at table=\catcodetable5
 \c_max_int=\count112
 \l_tmpa_int=\count113
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.luatex.tlg b/l3kernel/testfiles/m3expl006.luatex.tlg
index fff1b10..af3fa28 100644
--- a/l3kernel/testfiles/m3expl006.luatex.tlg
+++ b/l3kernel/testfiles/m3expl006.luatex.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
 \ucharcat at table=\catcodetable5
 \c_max_int=\count112
 \l_tmpa_int=\count113
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.luatex.tlg b/l3kernel/testfiles/m3msg004.luatex.tlg
index 320700c..ad52fad 100644
--- a/l3kernel/testfiles/m3msg004.luatex.tlg
+++ b/l3kernel/testfiles/m3msg004.luatex.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:N \c_empty_tl 
+         ! foo: (\exp_not:n {\exp_not:N \c_empty_tl }) (\exp_not:N \c_empty_tl 
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -374,7 +374,7 @@ 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/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.luatex.tlg b/l3packages/xparse/testfiles/xparse002.luatex.tlg
index 3807ba7..4d0765c 100644
--- a/l3packages/xparse/testfiles/xparse002.luatex.tlg
+++ b/l3packages/xparse/testfiles/xparse002.luatex.tlg
@@ -210,7 +210,7 @@ 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> ...\foo {gom}{\TYPE {(##1)(##2)(##3)}}\foo {\par }
-bc\DeclareDocumentCommand ...
+                                                  bc\DeclareDocumentCommand ...
 l. ...}
 I've deleted a group-closing symbol because it seems to be
 spurious, as in `$x}$'. But perhaps the } is legitimate and
@@ -233,7 +233,7 @@ 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> ...efault}}{\TYPE {(##1)(##2)(##3)}}\foo de{\par }
-\DeclareDocumentCommand \f...
+                                                  \DeclareDocumentCommand \f...
 l. ...}
 I've deleted a group-closing symbol because it seems to be
 spurious, as in `$x}$'. But perhaps the } is legitimate and
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.luatex.tlg b/l3trial/l3hooks/testfiles/m3hooks001.luatex.tlg
index ce7f5ef..a9bbe56 100644
--- a/l3trial/l3hooks/testfiles/m3hooks001.luatex.tlg
+++ b/l3trial/l3hooks/testfiles/m3hooks001.luatex.tlg
@@ -105,7 +105,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
@@ -1199,7 +1199,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
@@ -1284,7 +1284,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.ptex.tlg b/l3trial/l3hooks/testfiles/m3hooks001.ptex.tlg
index a32e07a..cd1268d 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
@@ -1185,7 +1185,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
@@ -1259,7 +1259,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 b02217d..b3c145d 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
@@ -1177,7 +1177,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
@@ -1251,7 +1251,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 f26d421..d0056c7 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
@@ -1197,7 +1197,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
@@ -1271,7 +1271,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.luatex.tlg b/l3trial/l3hooks/testfiles/m3hooks002.luatex.tlg
index 2681861..9661c77 100644
--- a/l3trial/l3hooks/testfiles/m3hooks002.luatex.tlg
+++ b/l3trial/l3hooks/testfiles/m3hooks002.luatex.tlg
@@ -95,7 +95,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.ptex.tlg b/l3trial/l3hooks/testfiles/m3hooks002.ptex.tlg
index 87eba05..fbfbcdf 100644
--- a/l3trial/l3hooks/testfiles/m3hooks002.ptex.tlg
+++ b/l3trial/l3hooks/testfiles/m3hooks002.ptex.tlg
@@ -85,7 +85,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 5579084..7a8ac9e 100644
--- a/l3trial/l3hooks/testfiles/m3hooks002.tlg
+++ b/l3trial/l3hooks/testfiles/m3hooks002.tlg
@@ -77,7 +77,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 06c70e7..d6fdf19 100644
--- a/l3trial/l3hooks/testfiles/m3hooks002.uptex.tlg
+++ b/l3trial/l3hooks/testfiles/m3hooks002.uptex.tlg
@@ -93,7 +93,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 565b354..b4eb63a 100644
--- a/l3trial/l3kernel-extras/testfiles/m3kernel-extras006.luatex.tlg
+++ b/l3trial/l3kernel-extras/testfiles/m3kernel-extras006.luatex.tlg
@@ -33,7 +33,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> }
@@ -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
 > expansion factor 1000
 > tagcode 0.
 <recently read> }
@@ -59,7 +59,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 9487b86..b6404e6 100644
--- a/l3trial/l3kernel-extras/testfiles/m3kernel-extras006.tlg
+++ b/l3trial/l3kernel-extras/testfiles/m3kernel-extras006.tlg
@@ -33,7 +33,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> }
@@ -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
 > expansion factor 1000
 > tagcode 0.
 <recently read> }
@@ -59,7 +59,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 5c9a2ce..b6bc904 100644
--- a/l3trial/l3kernel-extras/testfiles/m3kernel-extras006.xetex.tlg
+++ b/l3trial/l3kernel-extras/testfiles/m3kernel-extras006.xetex.tlg
@@ -33,7 +33,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. ...  }
@@ -45,7 +45,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. ...  }
@@ -57,7 +57,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 f43a3e4..8275cfc 100644
--- a/l3trial/l3ldb/testfiles/m3ldb003.ptex.tlg
+++ b/l3trial/l3ldb/testfiles/m3ldb003.ptex.tlg
@@ -45,7 +45,7 @@ LDB: Set \UseInstanceValues with value item-label-text=\fbox {x} in <enumerate*<
 LDB: Set \UseInstanceValues with value item-label-text=(cont.) in itemize><itemize
 Dumping commands into (.dmp)
 \c_cs_dump_iow=\write3
-commands . . . . . . . . . . . . . . . . . . . . .  registers  finished
+ commands . . . . . . . . . . . . . . . . . . . . .  registers  finished
 LDB: 
 LDB: Begin Processing ***** list,itemize ***** on line ...
 LDB: ..... Change \UseInstanceName because of `<itemize':
diff --git a/l3trial/l3ldb/testfiles/m3ldb003.tlg b/l3trial/l3ldb/testfiles/m3ldb003.tlg
index 9a7ed7c..838685d 100644
--- a/l3trial/l3ldb/testfiles/m3ldb003.tlg
+++ b/l3trial/l3ldb/testfiles/m3ldb003.tlg
@@ -45,7 +45,7 @@ LDB: Set \UseInstanceValues with value item-label-text=\fbox {x} in <enumerate*<
 LDB: Set \UseInstanceValues with value item-label-text=(cont.) in itemize><itemize
 Dumping commands into (.dmp)
 \c_cs_dump_iow=\write3
-commands . . . . . . . . . . . . . . . . . . . . .  registers  finished
+ commands . . . . . . . . . . . . . . . . . . . . .  registers  finished
 LDB: 
 LDB: Begin Processing ***** list,itemize ***** on line ...
 LDB: ..... Change \UseInstanceName because of `<itemize':
diff --git a/l3trial/l3ldb/testfiles/m3ldb003.uptex.tlg b/l3trial/l3ldb/testfiles/m3ldb003.uptex.tlg
index 1a09403..25fbb2c 100644
--- a/l3trial/l3ldb/testfiles/m3ldb003.uptex.tlg
+++ b/l3trial/l3ldb/testfiles/m3ldb003.uptex.tlg
@@ -45,7 +45,7 @@ LDB: Set \UseInstanceValues with value item-label-text=\fbox {x} in <enumerate*<
 LDB: Set \UseInstanceValues with value item-label-text=(cont.) in itemize><itemize
 Dumping commands into (.dmp)
 \c_cs_dump_iow=\write3
-commands . . . . . . . . . . . . . . . . . . . . .  registers  finished
+ commands . . . . . . . . . . . . . . . . . . . . .  registers  finished
 LDB: 
 LDB: Begin Processing ***** list,itemize ***** on line ...
 LDB: ..... Change \UseInstanceName because of `<itemize':
diff --git a/l3trial/xbox/testfiles/xbox001.luatex.tlg b/l3trial/xbox/testfiles/xbox001.luatex.tlg
index d3b8fb4..4da10f5 100644
--- a/l3trial/xbox/testfiles/xbox001.luatex.tlg
+++ b/l3trial/xbox/testfiles/xbox001.luatex.tlg
@@ -24,17 +24,17 @@ Defining \myboxa on line ...
 \myboxa=\box72
 > \myboxa=\char"48.
 <argument> \newsavebox {\myboxa }\show \myboxa 
-\begingroup \newsavebox {\myboxb }\show \my
+                                    \begingroup \newsavebox {\myboxb }\show \my
 l. ...  }
 Defining \myboxb on line ...
 \myboxb=\box73
 > \myboxb=\char"49.
 <argument> ...begingroup \newsavebox {\myboxb }\show \myboxb 
-\endgroup \show \myboxb \n...
+                                                  \endgroup \show \myboxb \n...
 l. ...  }
 > \myboxb=\char"49.
 <argument> ...\myboxb }\show \myboxb \endgroup \show \myboxb 
-\newsavebox {\myboxa }\sho...
+                                                  \newsavebox {\myboxa }\sho...
 l. ...  }
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
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 0928e4e..2616c2c 100644
--- a/xpackages/xor/testfiles/xor001.tlg
+++ b/xpackages/xor/testfiles/xor001.tlg
@@ -199,7 +199,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
@@ -318,7 +318,7 @@ STATS: floats waiting = 0 () on page 2
 : -entering xor_trial_place_float_inner_loop:
 : -leaving xor_trial_place_float_inner_loop:
 : -entering xor_try_next_float:
-STATS: trials = 0
+ STATS: trials = 0
 : --entering xor_OR_best_cols_setup:
 : ---XX initial: \int_gset:Nn \g_xor_col_1_block_int {1}\int_gset:Nn \g_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
 : ---entering xor_initialize_page_footins_ftnright:
@@ -609,7 +609,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
@@ -911,7 +911,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_ht_col_2_1_dim {612.0pt}
 : ---entering xor_initialize_page_footins_ftnright:
@@ -1375,7 +1375,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
@@ -1786,21 +1786,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 ()
@@ -2024,7 +2024,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
@@ -2087,7 +2087,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 ()
@@ -2458,7 +2458,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:
@@ -2512,11 +2512,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_ht_col_2_1_dim {612.0pt}
 : ---entering xor_initialize_page_footins_ftnright:
@@ -2966,7 +2966,7 @@ Marks: queue for floats after: "3",
 : ---\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:
@@ -2987,17 +2987,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 ()
@@ -3022,7 +3022,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 {456.0pt}
 : -------entering xor_update_float_placement_data:
 : --------g_xor_curr_page_areas_closed_clist + ""
@@ -3035,14 +3035,14 @@ area trial: b11
 : ------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)
@@ -3149,7 +3149,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
@@ -3407,21 +3407,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 ()
@@ -3642,7 +3642,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_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {456.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
 : ----entering xor_update_float_placement_data:
 : -----g_xor_curr_page_areas_closed_clist + ""
@@ -3681,7 +3681,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_ht_col_2_1_dim {612.0pt}
 : ---entering xor_initialize_page_footins_ftnright:
@@ -4037,7 +4037,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
@@ -4329,7 +4329,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_ht_col_2_1_dim {612.0pt}
 : ---entering xor_initialize_page_footins_ftnright:
@@ -4759,7 +4759,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
@@ -5048,7 +5048,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_ht_col_2_1_dim {612.0pt}
 : ---entering xor_initialize_page_footins_ftnright:
@@ -5474,7 +5474,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
@@ -5730,21 +5730,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 ()
@@ -5846,7 +5846,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
@@ -5903,7 +5903,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 ()
@@ -6093,7 +6093,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:
@@ -6147,11 +6147,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_ht_col_2_1_dim {612.0pt}
 : ---entering xor_initialize_page_footins_ftnright:
@@ -6452,7 +6452,7 @@ Marks: queue for floats after: "3", "4",
 : ---\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:
@@ -6461,12 +6461,12 @@ STATS: floats waiting = 0 on page 9 (float page)
 : ----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)
@@ -6509,16 +6509,16 @@ Marks: set floats <- 5 on line ...
 Marks: Setting mark {leftmark=7}{rightmark=34}{floats=6}
 Overfull \hbox (42.44952pt too wide) in paragraph at lines 950--950
 []\OT1/pcr/m/n/8 =======================================================================[] 
-[]
+ []
 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 the algorithm}[] 
-[]
+ []
 Overfull \hbox (66.44954pt too wide) in paragraph at lines 950--950
 []\OT1/pcr/m/n/8 Float: \bx at F   {6}  {table} (floats)  {6}   {Running times of the algorithm}[] 
-[]
+ []
 : -{Progress output of the algorithm}{2}{tab:progress}{5}{t12,b12,t11,b11,t21,b21}{table}{5}
 : leaving float environment
 : entering xor_OR_collect:
@@ -6531,10 +6531,10 @@ Marks: Setting mark {leftmark=7}{rightmark=35}{floats=6}
 : Adding badly guarded penalty -10008 to MVL
 Underfull \hbox (badness 2302) in paragraph at lines 963--970
 \OT1/ptm/m/n/10 the com-mand []\OT1/pcr/m/n/10 \TextAlignGrid \OT1/ptm/m/n/10 which will align
-[]
+ []
 Underfull \hbox (badness 2903) in paragraph at lines 963--970
 \OT1/ptm/m/n/10 the cur-rent text line on the grid. By is-su-ing a
-[]
+ []
 : entering xor_OR_collect:
 : -output pen: -10008
 : -Forced break (-10008) seen on line ...
@@ -6561,10 +6561,10 @@ 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 ...
@@ -6602,7 +6602,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
@@ -6887,21 +6887,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 ()
@@ -7128,7 +7128,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_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {372.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
 : ----entering xor_update_float_placement_data:
 : -----g_xor_curr_page_areas_closed_clist + ""
@@ -7182,13 +7182,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)
@@ -7359,7 +7359,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_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {192.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {420.0pt}
 : ----entering xor_update_float_placement_data:
 : -----g_xor_curr_page_areas_closed_clist + ""
@@ -7412,7 +7412,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_ht_col_2_1_dim {420.0pt}
 : ---entering xor_initialize_page_footins_ftnright:
@@ -7679,10 +7679,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 ...
@@ -7708,7 +7708,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
@@ -8003,7 +8003,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_ht_col_2_1_dim {612.0pt}
 : ---entering xor_initialize_page_footins_ftnright:
@@ -8401,10 +8401,10 @@ Marks: set floats <- 6 on line ...
 Marks: Setting mark {leftmark=8}{rightmark=40}{floats=7}
 Overfull \hbox (47.24953pt too wide) in paragraph at lines 1181--1181
 []     \OT1/pcr/m/n/8 area-list                              = {t12,t11,b11,b12,t21,b21},[] 
-[]
+ []
 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 currently available keys}{2}{tab:pagesetup2}{6}{t12,b12,t11,b11,t21,b21}{table}{6}
 : leaving float environment
 : entering xor_OR_collect:
@@ -8425,36 +8425,36 @@ Overfull \hbox (47.24953pt too wide) in paragraph at lines 1181--1181
 : 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 flush-
-[]
+ []
 Underfull \hbox (badness 10000) in paragraph at lines 1210--1218
 \OT1/pcr/m/n/10 bottom-float-footnote-constraint \OT1/ptm/m/n/10 in
-[]
+ []
 : Add grid alignment point
 : Adding badly guarded penalty -10008 to MVL
 Underfull \hbox (badness 4229) in paragraph at lines 1221--1232
 \OT1/ptm/m/n/10 The key []\OT1/pcr/m/n/10 area-list \OT1/ptm/m/n/10 de-fines all float ar-eas that
-[]
+ []
 Underfull \hbox (badness 1163) in paragraph at lines 1221--1232
 \OT1/ptm/m/n/10 are al-lowed in this page lay-out as well as defin-ing
-[]
+ []
 Underfull \hbox (badness 1975) in paragraph at lines 1221--1232
 \OT1/ptm/m/n/10 the or-der in which the ar-eas are tried when plac-
-[]
+ []
 Underfull \hbox (badness 1087) in paragraph at lines 1221--1232
 \OT1/ptm/m/n/10 tions'' for the spe-cial area which re-ceives the floats
-[]
+ []
 Underfull \hbox (badness 2600) in paragraph at lines 1221--1232
 \OT1/ptm/m/n/10 tain class can't be placed then all ar-eas listed in
-[]
+ []
 : entering xor_OR_collect:
 : -output pen: -10008
 : -Forced break (-10008) seen on line ...
@@ -8480,7 +8480,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
@@ -8809,13 +8809,13 @@ Float: \bx at F
 : -- {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 ()
@@ -9024,7 +9024,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
@@ -9090,17 +9090,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
@@ -9110,11 +9110,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_ht_col_2_1_dim {612.0pt}
 : ---entering xor_initialize_page_footins_ftnright:
@@ -9485,7 +9485,7 @@ Marks: queue for floats after: "6",
 : ---\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:
@@ -9506,11 +9506,11 @@ Float: \bx at F
 : ----- {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 ()
@@ -9551,7 +9551,7 @@ area trial: b12
 : -----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:Nn \g_xor_ht_col_2_1_dim {288.0pt}
 : -------entering xor_update_float_placement_data:
 : --------g_xor_curr_page_areas_closed_clist + ""
@@ -9566,14 +9566,14 @@ area trial: b12
 : ------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)
@@ -9629,14 +9629,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:
@@ -9674,7 +9674,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
@@ -9913,13 +9913,13 @@ Float: \bx at F
 : -- {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 ()
@@ -10089,7 +10089,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_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {288.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {288.0pt}
 : ----entering xor_update_float_placement_data:
 : -----g_xor_curr_page_areas_closed_clist + ""
@@ -10139,7 +10139,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_ht_col_2_1_dim {288.0pt}
 : ---entering xor_initialize_page_footins_ftnright:
@@ -10390,22 +10390,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}{table}{7}
 : leaving float environment
 : entering float environment
@@ -10425,7 +10425,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)
@@ -10447,7 +10447,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
@@ -10706,21 +10706,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 ()
@@ -10844,7 +10844,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
@@ -10901,7 +10901,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 ()
@@ -11136,7 +11136,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:
@@ -11187,7 +11187,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:
@@ -11203,35 +11203,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
@@ -11241,11 +11241,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_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {612.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
 : ----entering xor_initialize_page_footins_ftnright:
@@ -11549,7 +11549,7 @@ Marks: queue for floats after: "8",
 : ---\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:
@@ -11570,17 +11570,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 ()
@@ -11605,7 +11605,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}
 : -------entering xor_update_float_placement_data:
 : --------g_xor_curr_page_areas_closed_clist + ""
@@ -11630,17 +11630,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)
@@ -11665,7 +11665,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}
 : ---------entering xor_update_float_placement_data:
 : ----------g_xor_curr_page_areas_closed_clist + ""
@@ -11678,7 +11678,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:
@@ -11687,7 +11687,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)
@@ -11763,7 +11763,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
@@ -11963,21 +11963,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 ()
@@ -12165,7 +12165,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_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {300.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {612.0pt}
 : ----entering xor_update_float_placement_data:
 : -----g_xor_curr_page_areas_closed_clist + ""
@@ -12210,30 +12210,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)
@@ -12424,7 +12424,7 @@ Marks: queue for floats after: "8",
 : ---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_xor_col_2_block_int {1}\dim_gset:Nn \g_xor_ht_col_1_1_dim {300.0pt}\dim_gset:Nn \g_xor_ht_col_2_1_dim {408.0pt}
 : ----entering xor_update_float_placement_data:
 : -----g_xor_curr_page_areas_closed_clist + ""
@@ -12434,7 +12434,7 @@ Marks: queue for floats after: "8",
 : -----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)
@@ -12458,7 +12458,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_ht_col_2_1_dim {408.0pt}
 : ---entering xor_initialize_page_footins_ftnright:

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


More information about the latex3-commits mailing list