[latex3-commits] [l3svn] branch master updated: l3build: Zap line numbers 'early'

[noreply at latex-project.org]

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  b527c08   l3build: Zap line numbers 'early'
b527c08 is described below

commit b527c08ba5504b05e495e2236be4da7972dba0d3
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Sun Jan 3 11:56:02 2016 +0000

    l3build: Zap line numbers 'early'
    
    This avoids any line numbers being affected by wrapping and
    avoids wrapping deliberately truncated lines.
---
 l3build/l3build.lua |   15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/l3build/l3build.lua b/l3build/l3build.lua
index 462e71d..edef15a 100644
--- a/l3build/l3build.lua
+++ b/l3build/l3build.lua
@@ -748,8 +748,13 @@ function formatlog(logfile, newfile, engine)
   end
     -- Substitutions to remove some non-useful changes
   local function normalize(line)
+    -- Zap line numbers from \show, \showbox, \box_show and the like:
+    -- do this before wrapping lines
+    line = string.gsub(line, "^l%.%d+ ", "l. ...")
     -- Allow for wrapped lines: preserve the content and wrap
-    if string.len(line) == maxprintline then
+    -- Skip lines that have an explicit marker for truncation
+    if string.len(line) == maxprintline  and
+       not string.match(line, "%.%.%.$") then
       lastline = (lastline or "") .. line
       return ""
     end
@@ -796,14 +801,6 @@ function formatlog(logfile, newfile, engine)
     for i = 0, 31 do
       line = string.gsub(line, string.char(i), "^^" .. string.char(64 + i))
     end
-    -- Zap line numbers from \show, \showbox, \box_show and the like
-    -- Two stages as line wrapping alters some of them and restore the break
-    line = string.gsub(line, "^l%.%d+ ", "l. ...")
-    line = string.gsub(
-      line,
-      "%.%.%.l%.%d+ ( *)%}$",
-      "..." .. os_newline .. "l. ...%1}"
-    )
     -- Remove spaces at the start of lines: deals with the fact that LuaTeX
     -- uses a different number to the other engines
     line = string.gsub(line, "^%s+", "")

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