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

No need to patch latex writer in 0.6

pull/71/merge v0.4.0
Matti Pastell 2017-01-04 19:56:28 +02:00
parent f1b42156e1
commit 6c2f0a7bb5
1 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/format.jl
View File

@ -115,7 +115,7 @@ function format_chunk(chunk::DocChunk, formatdict, docformat)
return join([format_inline(c) for c in chunk.content], "") return join([format_inline(c) for c in chunk.content], "")
end end
function format_inline(inline::InlineText) function format_inline(inline::InlineText)
return inline.content return inline.content
end end
@ -126,35 +126,37 @@ function format_inline(inline::InlineCode)
end end
function format_chunk(chunk::DocChunk, formatdict, docformat::JMarkdown2HTML) function format_chunk(chunk::DocChunk, formatdict, docformat::JMarkdown2HTML)
text = format_chunk(chunk, formatdict, nothing) text = format_chunk(chunk, formatdict, nothing)
m = Base.Markdown.parse(text) m = Base.Markdown.parse(text)
return string(Documenter.Writers.HTMLWriter.mdconvert(m)) return string(Documenter.Writers.HTMLWriter.mdconvert(m))
end end
if VERSION < v"v0.6.0-362b271"
#Fixes to Base latex writer #Fixes to Base latex writer
function Base.Markdown.latex(io::IO, md::Base.Markdown.Paragraph) function Base.Markdown.latex(io::IO, md::Base.Markdown.Paragraph)
println(io) println(io)
for md in md.content for md in md.content
Base.Markdown.latexinline(io, md) Base.Markdown.latexinline(io, md)
end end
println(io) println(io)
end end
function wrapverb(f, io, cmd) function wrapverb(f, io, cmd)
print(io, "\\", cmd, "|") print(io, "\\", cmd, "|")
f() f()
print(io, "|") print(io, "|")
end end
function Base.Markdown.latexinline(io::IO, code::Base.Markdown.Code) function Base.Markdown.latexinline(io::IO, code::Base.Markdown.Code)
wrapverb(io, "verb") do wrapverb(io, "verb") do
print(io, code.code) print(io, code.code)
end end
end
end end
function format_chunk(chunk::DocChunk, formatdict, docformat::JMarkdown2tex) function format_chunk(chunk::DocChunk, formatdict, docformat::JMarkdown2tex)
text = format_chunk(chunk, formatdict, nothing) text = format_chunk(chunk, formatdict, nothing)
m = Base.Markdown.parse(text) m = Base.Markdown.parse(text)
return Base.Markdown.latex(m) return Base.Markdown.latex(m)
end end