mirrors
/
Weave.jl
mirror of https://github.com/mpastell/Weave.jl
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix weave messages

pull/80/head
Matti Pastell 2016-12-26 21:28:57 +02:00
parent a4cfebcc17
commit e10f27b26f
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/run.jl
View File

@ -119,6 +119,7 @@ end
function run_chunk(chunk::CodeChunk, report::Report, SandBox::Module)
info("Weaving chunk $(chunk.number) from line $(chunk.start_line)")
result_chunks = eval_chunk(chunk, report, SandBox)
contains(report.formatdict[:doctype], "2html") && (result_chunks = embed_figures(result_chunks, report.cwd))
return result_chunks
@ -168,7 +169,10 @@ function run_inline(inline::InlineCode, report::Report, SandBox::Module)
chunk = CodeChunk(inline.content, 0, 0, "", Dict(:hold => true, :wrap => false))
options = merge(rcParams[:chunk_defaults], chunk.options)
merge!(chunk.options, options)
chunks = run_chunk(chunk, report, SandBox)
chunks = eval_chunk(chunk, report, SandBox)
contains(report.formatdict[:doctype], "2html") && (chunks = embed_figures(chunks, report.cwd))
output = chunks[1].output
startswith(output, "\n") && (output = replace(output, "\n", "", 1))
inline.output = output
@ -263,7 +267,7 @@ end
function eval_chunk(chunk::CodeChunk, report::Report, SandBox::Module)
info("Weaving chunk $(chunk.number) from line $(chunk.start_line)")
if !chunk.options[:eval]
chunk.output = ""