mirror of https://github.com/mpastell/Weave.jl
small updates
parent
ca42e09f8d
commit
68f72bdfb3
|
@ -78,7 +78,7 @@ function combine_args(args, doctype)
|
||||||
common = Dict()
|
common = Dict()
|
||||||
specific = Dict()
|
specific = Dict()
|
||||||
for key in keys(args)
|
for key in keys(args)
|
||||||
if key ∈ keys(Weave.formats)
|
if key in keys(Weave.formats)
|
||||||
specific[key] = args[key]
|
specific[key] = args[key]
|
||||||
else
|
else
|
||||||
common[key] = args[key]
|
common[key] = args[key]
|
||||||
|
|
|
@ -64,7 +64,7 @@ function run_doc(
|
||||||
cache === :off || @eval import Serialization # XXX: evaluate in a more sensible module
|
cache === :off || @eval import Serialization # XXX: evaluate in a more sensible module
|
||||||
|
|
||||||
# This is needed for latex and should work on all output formats
|
# This is needed for latex and should work on all output formats
|
||||||
Sys.iswindows() && (fig_path = replace(fig_path, "\\" => "/"))
|
@static Sys.iswindows() && (fig_path = replace(fig_path, "\\" => "/"))
|
||||||
|
|
||||||
doc.fig_path = fig_path
|
doc.fig_path = fig_path
|
||||||
set_rc_params(doc, fig_path, fig_ext)
|
set_rc_params(doc, fig_path, fig_ext)
|
||||||
|
@ -81,7 +81,6 @@ function run_doc(
|
||||||
|
|
||||||
report = Report(doc.cwd, doc.basename, doc.format.formatdict, mimetypes, throw_errors)
|
report = Report(doc.cwd, doc.basename, doc.format.formatdict, mimetypes, throw_errors)
|
||||||
pushdisplay(report)
|
pushdisplay(report)
|
||||||
|
|
||||||
try
|
try
|
||||||
if cache !== :off && cache !== :refresh
|
if cache !== :off && cache !== :refresh
|
||||||
cached = read_cache(doc, cache_path)
|
cached = read_cache(doc, cache_path)
|
||||||
|
|
Loading…
Reference in New Issue