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

Fix more deprecations

pull/137/head
Matti Pastell 2018-07-23 19:35:15 +02:00
parent 83c506252d
commit 0956ce6dff
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/formatters.jl
View File

@ -434,7 +434,7 @@ function formatfigures(chunk, docformat::Hugo)
end end
"{{< figure src=\"$(joinpath(relpath, fig))\" $(title_spec) >}}" "{{< figure src=\"$(joinpath(relpath, fig))\" $(title_spec) >}}"
end end
mapreduce(format_shortcode, *, "", enumerate(chunk.figures)) mapreduce(format_shortcode, *, enumerate(chunk.figures), init="")
end end
function formatfigures(chunk, docformat::MultiMarkdown) function formatfigures(chunk, docformat::MultiMarkdown)

8
src/readers.jl
View File

@ -158,7 +158,7 @@ end
"""Parse .jl scripts with Weave.jl markup""" """Parse .jl scripts with Weave.jl markup"""
function parse_doc(document::AbstractString, format::ScriptInput) function parse_doc(document::AbstractString, format::ScriptInput)
document = replace(document, "\r\n", "\n") document = replace(document, "\r\n" => "\n")
lines = split(document, "\n") lines = split(document, "\n")
doc_line = format.doc_line doc_line = format.doc_line
@ -184,9 +184,9 @@ function parse_doc(document::AbstractString, format::ScriptInput)
for lineno in 1:length(lines) for lineno in 1:length(lines)
line = lines[lineno] line = lines[lineno]
if (m = match(doc_line, line)) != nothing && (m = match(opt_line, line)) == nothing if (m = match(doc_line, line)) != nothing && (m = match(opt_line, line)) == nothing
line = replace(line, doc_start, "", 1) line = replace(line, doc_start => "", count=1)
if startswith(line, " ") if startswith(line, " ")
line = replace(line, " ", "", 1) line = replace(line, " " => "", count=1)
end end
if state == "code" && strip(read) != "" if state == "code" && strip(read) != ""
chunk = CodeChunk("\n" * strip(read), codeno, start_line, optionString, options) chunk = CodeChunk("\n" * strip(read), codeno, start_line, optionString, options)
@ -212,7 +212,7 @@ function parse_doc(document::AbstractString, format::ScriptInput)
docno += 1 docno += 1
end end
optionString = replace(line, opt_start, "", 1) optionString = replace(line, opt_start => "", count=1)
#Get options #Get options
options = Dict{Symbol,Any}() options = Dict{Symbol,Any}()
if length(optionString) > 0 if length(optionString) > 0

2
src/run.jl
View File

@ -40,7 +40,7 @@ function Base.run(doc::WeaveDoc; doctype = :auto, plotlib=:auto,
cache == :off || @eval import FileIO, JLD2 cache == :off || @eval import FileIO, JLD2
#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, "\\", "/")) Sys.iswindows() && (fig_path = replace(fig_path, "\\" => "/"))
doc.fig_path = fig_path doc.fig_path = fig_path
set_rc_params(doc.format.formatdict, fig_path, fig_ext) set_rc_params(doc.format.formatdict, fig_path, fig_ext)