[latex3-commits] [l3svn] branch master updated: l3build: Normalise out some luaotfload paths

[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  1eab4c6   l3build: Normalise out some luaotfload paths
1eab4c6 is described below

commit 1eab4c6196a51d3ad7126d7f7b90d71a2d0ead28
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Tue Feb 7 21:32:56 2017 +0000

    l3build: Normalise out some luaotfload paths
---
 l3build/l3build.lua |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/l3build/l3build.lua b/l3build/l3build.lua
index af7756c..e4990f2 100644
--- a/l3build/l3build.lua
+++ b/l3build/l3build.lua
@@ -799,7 +799,12 @@ function formatlog(logfile, newfile, engine)
     line = string.gsub(line, "%(%.%/", "(")
     -- Zap paths if places other than 'here' are accessible
     if checksearch then
-      line = string.gsub(line, "%(.*/([%w-]+%.[%w-]+)%)?%s*$", "(../%1")
+      local pattern = "%w?:?/[^ ]*/([^/%(%)]*%.%w*)"
+      -- Files loaded from TeX: all start ( -- )
+      line = string.gsub(line, "%(" .. pattern, "(../%1")
+      -- luaotfload files start with keywords
+      line = string.gsub(line, "from " .. pattern .. "%(", "from. ./%1(")
+      line = string.gsub(line, ": " .. pattern .. "%)", ": ../%1)")
     end
     -- Deal with the fact that "(.aux)" may have still a leading space
     line = string.gsub(line, "^ %(%.aux%)", "(.aux)")

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