[latex3-commits] [l3svn] 01/02: l3build: Wrap lines for yoko direction removal

[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.

commit c3ead3c4443763814494fd9104858db84efc6bd3
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Fri Jan 1 11:50:16 2016 +0000

    l3build: Wrap lines for yoko direction removal
    
    This still needs to happen even if other wrapping is dropped.
---
 l3build/l3build.lua                                |   17 ++++++++
 .../xcoffins/testfiles/xcoffins003.ptex.tlg        |   42 +++++++-------------
 .../xcoffins/testfiles/xcoffins003.uptex.tlg       |   42 +++++++-------------
 3 files changed, 45 insertions(+), 56 deletions(-)

diff --git a/l3build/l3build.lua b/l3build/l3build.lua
index 11383ed..50408df 100644
--- a/l3build/l3build.lua
+++ b/l3build/l3build.lua
@@ -726,6 +726,13 @@ end
 -- Convert the raw log file into one for comparison/storage: keeps only
 -- the 'business' part from the tests and removes system-dependent stuff
 function formatlog(logfile, newfile, engine)
+  -- Do this before using maxprintline to expoit scoping
+  local kpse = require("kpse")
+  kpse.set_program_name(engine)
+  local maxprintline = tonumber(kpse.expand_var("$max_print_line"))
+  if engine == "luatex" or engine == "luajittex" then
+    maxprintline = maxprintline + 1 -- Deal with an out-by-one error
+  end
   local function killcheck(line)
       -- Skip lines containing file dates
       if string.match(line, "[^<]%d%d%d%d/%d%d/%d%d") then
@@ -797,6 +804,16 @@ function formatlog(logfile, newfile, engine)
     -- Remove spaces at the start of lines: deals with the fact that LuaTeX
     -- uses a different number to the other engines
     line = string.gsub(line, "^%s+", "")
+    -- Pick up cases where "yoko direction" or similar will have wrapped
+    if string.len(line) == maxprintline          and
+       string.match(line, "^%.+%\\hbox.*fil%, ") and
+       not string.match(line, "n$")              then
+       lastline = line
+       return ""
+    elseif string.match(lastline, "^%.+%\\hbox.*fil%, ") then
+      line = lastline .. line
+      lastline = ""
+    end
     -- 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
diff --git a/l3experimental/xcoffins/testfiles/xcoffins003.ptex.tlg b/l3experimental/xcoffins/testfiles/xcoffins003.ptex.tlg
index 1155993..0b9ad2e 100644
--- a/l3experimental/xcoffins/testfiles/xcoffins003.ptex.tlg
+++ b/l3experimental/xcoffins/testfiles/xcoffins003.ptex.tlg
@@ -379,8 +379,7 @@ l. ...}
 ...............\rule(0.0+0.0)x62.2222
 ...............\hbox(8.39996+3.60004)x62.2222
 ................\glue(\tabskip) 0.0
-................\hbox(8.39996+3.60004)x62.2222, glue set 28.6111fil, yoko direc
-tion
+................\hbox(8.39996+3.60004)x62.2222, glue set 28.6111fil
 .................\rule(8.39996+3.60004)x0.0
 .................\glue 0.0
 .................\rule(*+*)x0.0
@@ -397,8 +396,7 @@ tion
 ...............\glue(\lineskip) 0.0
 ...............\hbox(8.39996+3.60004)x62.2222
 ................\glue(\tabskip) 0.0
-................\hbox(8.39996+3.60004)x62.2222, glue set 28.33331fil, yoko dire
-ction
+................\hbox(8.39996+3.60004)x62.2222, glue set 28.33331fil
 .................\rule(8.39996+3.60004)x0.0
 .................\glue 0.0
 .................\rule(*+*)x0.0
@@ -445,8 +443,7 @@ ction
 ...............\glue(\lineskip) 0.0
 ...............\hbox(8.39996+3.60004)x62.2222
 ................\glue(\tabskip) 0.0
-................\hbox(8.39996+3.60004)x62.2222, glue set 28.33331fil, yoko dire
-ction
+................\hbox(8.39996+3.60004)x62.2222, glue set 28.33331fil
 .................\rule(8.39996+3.60004)x0.0
 .................\glue 0.0
 .................\rule(*+*)x0.0
@@ -463,8 +460,7 @@ ction
 ...............\glue(\lineskip) 0.0
 ...............\hbox(8.39996+3.60004)x62.2222
 ................\glue(\tabskip) 0.0
-................\hbox(8.39996+3.60004)x62.2222, glue set 28.88889fil, yoko dire
-ction
+................\hbox(8.39996+3.60004)x62.2222, glue set 28.88889fil
 .................\rule(8.39996+3.60004)x0.0
 .................\glue 0.0
 .................\rule(*+*)x0.0
@@ -481,8 +477,7 @@ ction
 ...............\glue(\lineskip) 0.0
 ...............\hbox(8.39996+3.60004)x62.2222
 ................\glue(\tabskip) 0.0
-................\hbox(8.39996+3.60004)x62.2222, glue set 28.88889fil, yoko dire
-ction
+................\hbox(8.39996+3.60004)x62.2222, glue set 28.88889fil
 .................\rule(8.39996+3.60004)x0.0
 .................\glue 0.0
 .................\rule(*+*)x0.0
@@ -499,8 +494,7 @@ ction
 ...............\glue(\lineskip) 0.0
 ...............\hbox(8.39996+3.60004)x62.2222
 ................\glue(\tabskip) 0.0
-................\hbox(8.39996+3.60004)x62.2222, glue set 28.88889fil, yoko dire
-ction
+................\hbox(8.39996+3.60004)x62.2222, glue set 28.88889fil
 .................\rule(8.39996+3.60004)x0.0
 .................\glue 0.0
 .................\rule(*+*)x0.0
@@ -517,8 +511,7 @@ ction
 ...............\glue(\lineskip) 0.0
 ...............\hbox(8.39996+3.60004)x62.2222
 ................\glue(\tabskip) 0.0
-................\hbox(8.39996+3.60004)x62.2222, glue set 28.88889fil, yoko dire
-ction
+................\hbox(8.39996+3.60004)x62.2222, glue set 28.88889fil
 .................\rule(8.39996+3.60004)x0.0
 .................\glue 0.0
 .................\rule(*+*)x0.0
@@ -586,8 +579,7 @@ m}
 ........................\rule(0.0+0.0)x62.2222
 ........................\hbox(8.39996+3.60004)x62.2222
 .........................\glue(\tabskip) 0.0
-.........................\hbox(8.39996+3.60004)x62.2222, glue set 28.6111fil, y
-oko direction
+.........................\hbox(8.39996+3.60004)x62.2222, glue set 28.6111fil
 ..........................\rule(8.39996+3.60004)x0.0
 ..........................\glue 0.0
 ..........................\rule(*+*)x0.0
@@ -604,8 +596,7 @@ oko direction
 ........................\glue(\lineskip) 0.0
 ........................\hbox(8.39996+3.60004)x62.2222
 .........................\glue(\tabskip) 0.0
-.........................\hbox(8.39996+3.60004)x62.2222, glue set 28.33331fil, 
-yoko direction
+.........................\hbox(8.39996+3.60004)x62.2222, glue set 28.33331fil
 ..........................\rule(8.39996+3.60004)x0.0
 ..........................\glue 0.0
 ..........................\rule(*+*)x0.0
@@ -652,8 +643,7 @@ yoko direction
 ........................\glue(\lineskip) 0.0
 ........................\hbox(8.39996+3.60004)x62.2222
 .........................\glue(\tabskip) 0.0
-.........................\hbox(8.39996+3.60004)x62.2222, glue set 28.33331fil, 
-yoko direction
+.........................\hbox(8.39996+3.60004)x62.2222, glue set 28.33331fil
 ..........................\rule(8.39996+3.60004)x0.0
 ..........................\glue 0.0
 ..........................\rule(*+*)x0.0
@@ -670,8 +660,7 @@ yoko direction
 ........................\glue(\lineskip) 0.0
 ........................\hbox(8.39996+3.60004)x62.2222
 .........................\glue(\tabskip) 0.0
-.........................\hbox(8.39996+3.60004)x62.2222, glue set 28.88889fil, 
-yoko direction
+.........................\hbox(8.39996+3.60004)x62.2222, glue set 28.88889fil
 ..........................\rule(8.39996+3.60004)x0.0
 ..........................\glue 0.0
 ..........................\rule(*+*)x0.0
@@ -688,8 +677,7 @@ yoko direction
 ........................\glue(\lineskip) 0.0
 ........................\hbox(8.39996+3.60004)x62.2222
 .........................\glue(\tabskip) 0.0
-.........................\hbox(8.39996+3.60004)x62.2222, glue set 28.88889fil, 
-yoko direction
+.........................\hbox(8.39996+3.60004)x62.2222, glue set 28.88889fil
 ..........................\rule(8.39996+3.60004)x0.0
 ..........................\glue 0.0
 ..........................\rule(*+*)x0.0
@@ -706,8 +694,7 @@ yoko direction
 ........................\glue(\lineskip) 0.0
 ........................\hbox(8.39996+3.60004)x62.2222
 .........................\glue(\tabskip) 0.0
-.........................\hbox(8.39996+3.60004)x62.2222, glue set 28.88889fil, 
-yoko direction
+.........................\hbox(8.39996+3.60004)x62.2222, glue set 28.88889fil
 ..........................\rule(8.39996+3.60004)x0.0
 ..........................\glue 0.0
 ..........................\rule(*+*)x0.0
@@ -724,8 +711,7 @@ yoko direction
 ........................\glue(\lineskip) 0.0
 ........................\hbox(8.39996+3.60004)x62.2222
 .........................\glue(\tabskip) 0.0
-.........................\hbox(8.39996+3.60004)x62.2222, glue set 28.88889fil, 
-yoko direction
+.........................\hbox(8.39996+3.60004)x62.2222, glue set 28.88889fil
 ..........................\rule(8.39996+3.60004)x0.0
 ..........................\glue 0.0
 ..........................\rule(*+*)x0.0
diff --git a/l3experimental/xcoffins/testfiles/xcoffins003.uptex.tlg b/l3experimental/xcoffins/testfiles/xcoffins003.uptex.tlg
index 1155993..0b9ad2e 100644
--- a/l3experimental/xcoffins/testfiles/xcoffins003.uptex.tlg
+++ b/l3experimental/xcoffins/testfiles/xcoffins003.uptex.tlg
@@ -379,8 +379,7 @@ l. ...}
 ...............\rule(0.0+0.0)x62.2222
 ...............\hbox(8.39996+3.60004)x62.2222
 ................\glue(\tabskip) 0.0
-................\hbox(8.39996+3.60004)x62.2222, glue set 28.6111fil, yoko direc
-tion
+................\hbox(8.39996+3.60004)x62.2222, glue set 28.6111fil
 .................\rule(8.39996+3.60004)x0.0
 .................\glue 0.0
 .................\rule(*+*)x0.0
@@ -397,8 +396,7 @@ tion
 ...............\glue(\lineskip) 0.0
 ...............\hbox(8.39996+3.60004)x62.2222
 ................\glue(\tabskip) 0.0
-................\hbox(8.39996+3.60004)x62.2222, glue set 28.33331fil, yoko dire
-ction
+................\hbox(8.39996+3.60004)x62.2222, glue set 28.33331fil
 .................\rule(8.39996+3.60004)x0.0
 .................\glue 0.0
 .................\rule(*+*)x0.0
@@ -445,8 +443,7 @@ ction
 ...............\glue(\lineskip) 0.0
 ...............\hbox(8.39996+3.60004)x62.2222
 ................\glue(\tabskip) 0.0
-................\hbox(8.39996+3.60004)x62.2222, glue set 28.33331fil, yoko dire
-ction
+................\hbox(8.39996+3.60004)x62.2222, glue set 28.33331fil
 .................\rule(8.39996+3.60004)x0.0
 .................\glue 0.0
 .................\rule(*+*)x0.0
@@ -463,8 +460,7 @@ ction
 ...............\glue(\lineskip) 0.0
 ...............\hbox(8.39996+3.60004)x62.2222
 ................\glue(\tabskip) 0.0
-................\hbox(8.39996+3.60004)x62.2222, glue set 28.88889fil, yoko dire
-ction
+................\hbox(8.39996+3.60004)x62.2222, glue set 28.88889fil
 .................\rule(8.39996+3.60004)x0.0
 .................\glue 0.0
 .................\rule(*+*)x0.0
@@ -481,8 +477,7 @@ ction
 ...............\glue(\lineskip) 0.0
 ...............\hbox(8.39996+3.60004)x62.2222
 ................\glue(\tabskip) 0.0
-................\hbox(8.39996+3.60004)x62.2222, glue set 28.88889fil, yoko dire
-ction
+................\hbox(8.39996+3.60004)x62.2222, glue set 28.88889fil
 .................\rule(8.39996+3.60004)x0.0
 .................\glue 0.0
 .................\rule(*+*)x0.0
@@ -499,8 +494,7 @@ ction
 ...............\glue(\lineskip) 0.0
 ...............\hbox(8.39996+3.60004)x62.2222
 ................\glue(\tabskip) 0.0
-................\hbox(8.39996+3.60004)x62.2222, glue set 28.88889fil, yoko dire
-ction
+................\hbox(8.39996+3.60004)x62.2222, glue set 28.88889fil
 .................\rule(8.39996+3.60004)x0.0
 .................\glue 0.0
 .................\rule(*+*)x0.0
@@ -517,8 +511,7 @@ ction
 ...............\glue(\lineskip) 0.0
 ...............\hbox(8.39996+3.60004)x62.2222
 ................\glue(\tabskip) 0.0
-................\hbox(8.39996+3.60004)x62.2222, glue set 28.88889fil, yoko dire
-ction
+................\hbox(8.39996+3.60004)x62.2222, glue set 28.88889fil
 .................\rule(8.39996+3.60004)x0.0
 .................\glue 0.0
 .................\rule(*+*)x0.0
@@ -586,8 +579,7 @@ m}
 ........................\rule(0.0+0.0)x62.2222
 ........................\hbox(8.39996+3.60004)x62.2222
 .........................\glue(\tabskip) 0.0
-.........................\hbox(8.39996+3.60004)x62.2222, glue set 28.6111fil, y
-oko direction
+.........................\hbox(8.39996+3.60004)x62.2222, glue set 28.6111fil
 ..........................\rule(8.39996+3.60004)x0.0
 ..........................\glue 0.0
 ..........................\rule(*+*)x0.0
@@ -604,8 +596,7 @@ oko direction
 ........................\glue(\lineskip) 0.0
 ........................\hbox(8.39996+3.60004)x62.2222
 .........................\glue(\tabskip) 0.0
-.........................\hbox(8.39996+3.60004)x62.2222, glue set 28.33331fil, 
-yoko direction
+.........................\hbox(8.39996+3.60004)x62.2222, glue set 28.33331fil
 ..........................\rule(8.39996+3.60004)x0.0
 ..........................\glue 0.0
 ..........................\rule(*+*)x0.0
@@ -652,8 +643,7 @@ yoko direction
 ........................\glue(\lineskip) 0.0
 ........................\hbox(8.39996+3.60004)x62.2222
 .........................\glue(\tabskip) 0.0
-.........................\hbox(8.39996+3.60004)x62.2222, glue set 28.33331fil, 
-yoko direction
+.........................\hbox(8.39996+3.60004)x62.2222, glue set 28.33331fil
 ..........................\rule(8.39996+3.60004)x0.0
 ..........................\glue 0.0
 ..........................\rule(*+*)x0.0
@@ -670,8 +660,7 @@ yoko direction
 ........................\glue(\lineskip) 0.0
 ........................\hbox(8.39996+3.60004)x62.2222
 .........................\glue(\tabskip) 0.0
-.........................\hbox(8.39996+3.60004)x62.2222, glue set 28.88889fil, 
-yoko direction
+.........................\hbox(8.39996+3.60004)x62.2222, glue set 28.88889fil
 ..........................\rule(8.39996+3.60004)x0.0
 ..........................\glue 0.0
 ..........................\rule(*+*)x0.0
@@ -688,8 +677,7 @@ yoko direction
 ........................\glue(\lineskip) 0.0
 ........................\hbox(8.39996+3.60004)x62.2222
 .........................\glue(\tabskip) 0.0
-.........................\hbox(8.39996+3.60004)x62.2222, glue set 28.88889fil, 
-yoko direction
+.........................\hbox(8.39996+3.60004)x62.2222, glue set 28.88889fil
 ..........................\rule(8.39996+3.60004)x0.0
 ..........................\glue 0.0
 ..........................\rule(*+*)x0.0
@@ -706,8 +694,7 @@ yoko direction
 ........................\glue(\lineskip) 0.0
 ........................\hbox(8.39996+3.60004)x62.2222
 .........................\glue(\tabskip) 0.0
-.........................\hbox(8.39996+3.60004)x62.2222, glue set 28.88889fil, 
-yoko direction
+.........................\hbox(8.39996+3.60004)x62.2222, glue set 28.88889fil
 ..........................\rule(8.39996+3.60004)x0.0
 ..........................\glue 0.0
 ..........................\rule(*+*)x0.0
@@ -724,8 +711,7 @@ yoko direction
 ........................\glue(\lineskip) 0.0
 ........................\hbox(8.39996+3.60004)x62.2222
 .........................\glue(\tabskip) 0.0
-.........................\hbox(8.39996+3.60004)x62.2222, glue set 28.88889fil, 
-yoko direction
+.........................\hbox(8.39996+3.60004)x62.2222, glue set 28.88889fil
 ..........................\rule(8.39996+3.60004)x0.0
 ..........................\glue 0.0
 ..........................\rule(*+*)x0.0

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