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

Merge 42d928f9c2 into b1de7efede

pull/407/merge
achjaj 2021-04-06 19:03:38 +10:00 committed by GitHub
parent b1de7efede 42d928f9c2
commit 67acbea6ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/reader/markdown.jl
View File

@ -1,14 +1,16 @@
function parse_markdown(document_body; is_pandoc = false)
header_text, document_body, offset = separate_header_text(document_body)
header = parse_header(header_text)
code_start, code_end = if is_pandoc
code_start, code_end, code_script = if is_pandoc
r"^<<(?<options>.*?)>>=\s*$",
r"^@\s*$"
r"^@\s*$",
r"a^" # match nothing TODO
else
r"^[`~]{3}(\{?)julia\s*([;,]?)\s*(?<options>.*?)(\}|\s*)$",
r"^[`~]{3}\s*$"
r"^[`~]{3}\s*$",
r"^[`~]{1}(?<options>js\s.*?)[`~]{1}"
end
return header, parse_markdown_body(document_body, code_start, code_end, offset)
return header, parse_markdown_body(document_body, code_start, code_end, code_script, offset)
end
# headers
@ -46,7 +48,7 @@ end
# body
# ----
function parse_markdown_body(document_body, code_start, code_end, offset)
function parse_markdown_body(document_body, code_start, code_end, code_script, offset)
lines = split(document_body, '\n')
state = :doc
@ -61,6 +63,7 @@ function parse_markdown_body(document_body, code_start, code_end, offset)
chunks = WeaveChunk[]
for (line_no, line) in enumerate(lines)
m = match(code_start, line)
sm = match(code_script, line)
if !isnothing(m) && state === :doc
state = :code
@ -76,6 +79,26 @@ function parse_markdown_body(document_body, code_start, code_end, offset)
continue
end
if !isnothing(sm) && state === :doc
option_string = isnothing(sm[:options]) ? "" : strip(sm[:options])
options = parse_options(option_string)
haskey(options, :label) && (options[:name] = options[:label])
haskey(options, :name) || (options[:name] = nothing)
isempty(strip(content)) || push!(chunks, DocChunk(content, doc_no += 1, start_line))
script_path = abspath(options[:js].first)
script_lines = split(read(script_path, String), "\n")
indices = options[:js].second
content = join(script_lines[indices], "\n")
push!(chunks, CodeChunk(content, code_no += 1, start_line, option_string, options))
start_line = line_no + offset
content = ""
continue
end
if occursin(code_end, line) && state === :code
push!(chunks, CodeChunk(content, code_no += 1, start_line, option_string, options))