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

introduce common supertype for JMarkdown2tex and Tex

pull/350/head
Jonas Isensee 2020-05-24 14:13:47 +02:00 committed by Shuhei Kadowaki
parent 1e9ba19db4
commit e20042848d
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/format.jl
View File

@ -23,7 +23,7 @@ function format(doc, template = nothing, highlight_theme = nothing; css = nothin
body = join(lines, '\n')
return docformat isa JMarkdown2HTML ? render2html(body, doc, template, css, highlight_theme) :
docformat isa JMarkdown2tex ? render2tex(body, doc, template, highlight_theme) :
docformat isa TexFormat ? render2tex(body, doc, template, highlight_theme) :
body
end
@ -106,7 +106,7 @@ function format_inline(inline::InlineCode)
return inline.output
end
function format_chunk(chunk::DocChunk, docformat::JMarkdown2tex)
function format_chunk(chunk::DocChunk, docformat::TexFormat)
out = IOBuffer()
io = IOBuffer()
for inline in chunk.content
@ -227,7 +227,7 @@ format_output(result, docformat) = result
format_output(result, docformat::JMarkdown2HTML) = Markdown.htmlesc(result)
function format_output(result, docformat::JMarkdown2tex)
function format_output(result, docformat::TexFormat)
# Highligts has some extra escaping defined, eg of $, ", ...
result_escaped = sprint(
(io, x) ->
@ -241,7 +241,7 @@ end
format_code(code, docformat) = code
# return "\\begin{minted}[mathescape, fontsize=\\small, xleftmargin=0.5em]{julia}\n$result\n\\end{minted}\n"
function format_code(code, docformat::JMarkdown2tex)
function format_code(code, docformat::TexFormat)
ret = highlight_code(MIME("text/latex"), code, docformat.formatdict[:highlight_theme])
docformat.formatdict[:keep_unicode] || return uc2tex(ret)
return ret
@ -296,7 +296,7 @@ format_termchunk(chunk, docformat::Pandoc2HTML) =
should_render(chunk) ? highlight_term(MIME("text/html"), chunk.output, docformat.formatdict[:highlight_theme]) : ""
# return "\\begin{minted}[mathescape, fontsize=\\small, xleftmargin=0.5em]{julia}\n$result\n\\end{minted}\n"
format_termchunk(chunk, docformat::JMarkdown2tex) =
format_termchunk(chunk, docformat::TexFormat) =
should_render(chunk) ? highlight_term(MIME("text/latex"), chunk.output, docformat.formatdict[:highlight_theme]) : ""
should_render(chunk) = chunk.options[:echo] && chunk.options[:results] ≠ "hidden"

7
src/formatters.jl
View File

@ -2,8 +2,9 @@
using Printf
abstract type TexFormat end
struct Tex
struct Tex <: TexFormat
description::AbstractString
formatdict::Dict{Symbol,Any}
end
@ -172,7 +173,7 @@ const md2html = JMarkdown2HTML(
)
# Julia markdown
struct JMarkdown2tex
struct JMarkdown2tex <: TexFormat
description::AbstractString
formatdict::Dict{Symbol,Any}
end
@ -307,7 +308,7 @@ function md_length_to_latex(def, reference)
return def
end
function formatfigures(chunk, docformat::Union{Tex,JMarkdown2tex})
function formatfigures(chunk, docformat::TexFormat)
fignames = chunk.figures
caption = chunk.options[:fig_cap]
width = chunk.options[:out_width]