diff --git a/src/config.jl b/src/config.jl index 2d82ef3..16b342d 100644 --- a/src/config.jl +++ b/src/config.jl @@ -78,7 +78,7 @@ function combine_args(args, doctype) common = Dict() specific = Dict() for key in keys(args) - if key ∈ keys(Weave.formats) + if key in keys(Weave.formats) specific[key] = args[key] else common[key] = args[key] diff --git a/src/run.jl b/src/run.jl index 0d2d33c..f388a37 100644 --- a/src/run.jl +++ b/src/run.jl @@ -64,7 +64,7 @@ function run_doc( cache === :off || @eval import Serialization # XXX: evaluate in a more sensible module # 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 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) pushdisplay(report) - try if cache !== :off && cache !== :refresh cached = read_cache(doc, cache_path)