[latex3-commits] [l3svn] branch master updated: l3build: Normalise out paths for images

[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  7955152   l3build: Normalise out paths for images
7955152 is described below

commit 7955152a5b58cb8b188cc88c5fcbee0c32c1d39f
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Tue Jun 13 22:50:54 2017 +0100

    l3build: Normalise out paths for images
    
    The <...> format is now covered.
---
 l3build/l3build.lua |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/l3build/l3build.lua b/l3build/l3build.lua
index b1d9303..952884e 100644
--- a/l3build/l3build.lua
+++ b/l3build/l3build.lua
@@ -818,9 +818,13 @@ local function formatlog(logfile, newfile, engine)
     line = gsub(line, "%(%.%/", "(")
     -- Zap paths if places other than 'here' are accessible
     if checksearch then
-      local pattern = "%w?:?/[^ ]*/([^/%(%)]*%.%w*)"
+      -- The pattern excludes < and > as the image part can have
+      -- several entries on one line
+      local pattern = "%w?:?/[^ %<%>]*/([^/%(%)]*%.%w*)"
       -- Files loaded from TeX: all start ( -- )
       line = gsub(line, "%(" .. pattern, "(../%1")
+      -- Images
+      line = gsub(line, "<" .. pattern .. ">", "<../%1>")
       -- luaotfload files start with keywords
       line = gsub(line, "from " .. pattern .. "%(", "from. ./%1(")
       line = gsub(line, ": " .. pattern .. "%)", ": ../%1)")

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