[latex3-commits] [l3svn] 01/02: l3build: Load pdftex.map before \START

[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 9126094fe28225cb99110141c203552acc4b7522
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Thu Nov 17 20:35:40 2016 +0000

    l3build: Load pdftex.map before \START
---
 l3build/l3build.dtx |   15 +++++++++++++++
 l3build/l3build.lua |   12 ------------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/l3build/l3build.dtx b/l3build/l3build.dtx
index 5f1f5fb..4092b33 100644
--- a/l3build/l3build.dtx
+++ b/l3build/l3build.dtx
@@ -1342,6 +1342,21 @@
 \TIMO
 %    \end{macrocode}
 %
+% Load the map file early so it does not appear in the log.
+%    \begin{macrocode}
+\ifdefined\pdfoutput
+  \ifnum\pdfoutput>0 %
+    \pdfmapfile{pdftex.map}%
+  \fi
+\else
+  \ifdefined\outputmode
+  \ifnum\outputmode>0 %
+    \pdfextension mapfile{pdftex.map}%
+  \fi
+  \fi
+\fi
+%    \end{macrocode}
+%
 % \subsection{Formatting the \texttt{.log} file}
 %
 % We are not starved for space in the log file output, so let's make it as
diff --git a/l3build/l3build.lua b/l3build/l3build.lua
index aa65b14..e330e54 100644
--- a/l3build/l3build.lua
+++ b/l3build/l3build.lua
@@ -792,18 +792,6 @@ function formatlog(logfile, newfile, engine)
     if checksearch then
       line = string.gsub(line, "%(.*/([%w-]+%.[%w-]+)%)?%s*$", "(../%1")
     end
-    -- Deal with the map line: some wrapping then a zap
-    if string.match(lastline, "*pdftex%.map") then
-      line = lastline .. line
-      lastline = ""
-    end
-    if string.match(line, "%{[^%}]*pdftex%.map%}") then
-      if string.match(line, "pdftex%.map%}%s*%(") and
-        not string.match(line, "%)%s*$") then
-        return "", line
-      end
-    end
-    line = string.gsub(line, "%{[^%}]*/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

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