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

Adding and implementing display chunk option

pull/41/head
Giuseppe Ragusa 2016-04-30 23:59:12 +02:00
parent bc1d88c8d3
commit 7a0958cf13
3 changed files with 40 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/chunks.jl
View File

@ -44,6 +44,9 @@ type DocChunk
start_line::Int
end
type DispResult
end
type TermResult
end

1
src/config.jl
View File

@ -22,6 +22,7 @@ const defaultParams =
:fig_path=> "figures",
:dpi => 96,
:term=> false,
:display => false,
:name=> nothing,
:wrap=> true,
:line_width => 75,

39
src/run.jl
View File

@ -128,7 +128,7 @@ function run_code(chunk::CodeChunk, report::Report, SandBox::Module)
reset_report(report)
lastline = (result_no == N)
(obj, out) = capture_output(expr, SandBox, chunk.options[:term],
rcParams[:plotlib], lastline)
chunk.options[:display], rcParams[:plotlib], lastline)
figures = report.figures #Captured figures
result = ChunkOutput(str_expr, out, report.cur_result, report.rich_output, figures)
report.rich_output = ""
@ -144,14 +144,15 @@ function run_code(chunk::CodeChunk, report::Report, SandBox::Module)
return results
end
function capture_output(expr, SandBox::Module, term, plotlib, lastline)
function capture_output(expr, SandBox::Module, term, disp, plotlib,
lastline)
oldSTDOUT = STDOUT
out = nothing
obj = nothing
rw, wr = redirect_stdout()
try
obj = eval(SandBox, expr)
if term
if term || disp
obj != nothing && display(obj)
elseif typeof(expr) == Symbol
display(obj)
@ -208,6 +209,8 @@ function eval_chunk(chunk::CodeChunk, report::Report, SandBox::Module)
chunk.result = run_code(chunk, report, SandBox)
if chunk.options[:term]
chunks = collect_results(chunk, TermResult())
elseif chunk.options[:display] && !chunk.options[:term]
chunks = collect_results(chunk, DispResult())
elseif chunk.options[:hold]
chunks = collect_results(chunk, CollectResult())
else
@ -352,6 +355,36 @@ function collect_results(chunk::CodeChunk, fmt::ScriptResult)
return result_chunks
end
function collect_results(chunk::CodeChunk, fmt::DispResult)
content = ""
result_no = 1
result_chunks = CodeChunk[ ]
for r = chunk.result
#Check if there is any output from chunk
if strip(r.stdout) == "" && isempty(r.figures) && strip(r.rich_output) == ""
content *= r.code
else
content = "\n" * content * r.code
rchunk = CodeChunk(content, chunk.number, chunk.start_line, chunk.optionstring, copy(chunk.options))
content = ""
rchunk.result_no = result_no
result_no *=1
rchunk.figures = r.figures
rchunk.output = r.stdout * r.displayed
rchunk.rich_output = r.rich_output
push!(result_chunks, rchunk)
end
end
if content != ""
startswith(content, "\n") || (content = "\n" * content)
rchunk = CodeChunk(content, chunk.number, chunk.start_line, chunk.optionstring, copy(chunk.options))
push!(result_chunks, rchunk)
end
return result_chunks
end
function collect_results(chunk::CodeChunk, fmt::TermResult)
output = ""
result_no = 1