diff options
author | Marius <mariausol@gmail.com> | 2012-11-29 17:00:15 +0200 |
---|---|---|
committer | Marius <mariausol@gmail.com> | 2012-11-29 17:00:15 +0200 |
commit | 5855e0bf17f2657517a87581aa1f02af0f78b020 (patch) | |
tree | 4eaf2e77fffdf58fa993b942f82d5f217a28ba9d /tex/context/base/mlib-run.lua | |
parent | 20cc4cdb29f371917fc6100ee07dada22187e260 (diff) | |
download | context-5855e0bf17f2657517a87581aa1f02af0f78b020.tar.gz |
beta 2012.11.29 15:40
Diffstat (limited to 'tex/context/base/mlib-run.lua')
-rw-r--r-- | tex/context/base/mlib-run.lua | 38 |
1 files changed, 31 insertions, 7 deletions
diff --git a/tex/context/base/mlib-run.lua b/tex/context/base/mlib-run.lua index bccca24eb..25e74790a 100644 --- a/tex/context/base/mlib-run.lua +++ b/tex/context/base/mlib-run.lua @@ -35,7 +35,8 @@ local concat = table.concat local emptystring = string.is_empty local lpegmatch, P = lpeg.match, lpeg.P -local trace_graphics = false trackers.register("metapost.graphics", function(v) trace_graphics = v end) +local trace_graphics = false trackers.register("metapost.graphics", function(v) trace_graphics = v end) +local trace_tracingall = false trackers.register("metapost.tracingall", function(v) trace_tracingall = v end) local report_metapost = logs.reporter("metapost") local texerrormessage = logs.texerrormessage @@ -394,14 +395,34 @@ function metapost.process(mpx, data, trialrun, flusher, multipass, isextrapass, mp_inp[mpx]:write(banner) mp_log[mpx]:write(banner) end - if metapost.collapse and type(data) == "table" then - if #data > 1 then - data = concat(data,"\n") - else - data = data[1] + if type(data) == "table" then + -- this hack is needed because the library currently barks on \n\n + local n = 0 + local nofsnippets = #data + for i=1,nofsnippets do + local d = data[i] + if d ~= "" then + n = n + 1 + data[n] = d + end + end + for i=nofsnippets,n+1,-1 do + data[i] = nil end + -- and this one because mp cannot handle snippets due to grouping issues + if metapost.collapse then + if #data > 1 then + data = concat(data,"\n") + else + data = data[1] + end + end + -- end of hacks end if type(data) == "table" then + if trace_tracingall then + mpx:execute("tracingall;") + end for i=1,#data do local d = data[i] if d then @@ -434,8 +455,11 @@ function metapost.process(mpx, data, trialrun, flusher, multipass, isextrapass, end end else + if trace_tracingall then + data = "tracingall;" .. data + end if trace_graphics then - mp_inp:write(data) + mp_inp[mpx]:write(data) end starttiming(metapost.exectime) result = mpx:execute(data) |