Export formats as wrapper

src/rendering/exportformat.jl

@@ -0,0 +1,24 @@
+abstract type ExportFormat <: WeaveFormat end
+
+function Base.getproperty(sf::T, s::Symbol) where {T<:ExportFormat}
+    hasfield(T, s) && return getfield(sf, s)
+    return getproperty(sf.primaryformat, s)
+end
+function Base.setproperty!(sf::T, s::Symbol, v) where {T<:ExportFormat}
+    if hasfield(T, s)
+        setfield!(sf, s, v)
+    else
+        setproperty!(sf.primaryformat, s, v)
+    end
+end
+function Base.hasproperty(sf::T, s::Symbol) where {T<:ExportFormat}
+    hasfield(T, s) || hasproperty(sf.primaryformat, s)
+end
+
+render_doc(df::ExportFormat, body, doc) = render_doc(df.primaryformat, body, doc)
+
+render_chunk(df::ExportFormat, chunk) = render_chunk(df.primaryformat, chunk)
+# Need to define these to avoid ambiguities
+render_chunk(df::ExportFormat, chunk::DocChunk) = render_chunk(df.primaryformat, chunk)
+render_chunk(df::ExportFormat, chunk::CodeChunk) = render_chunk(df.primaryformat, chunk)
+render_output(df::ExportFormat, output) = render_output(df.primaryformat, output)

src/rendering/htmlformats.jl

@@ -124,23 +124,9 @@ end
 # Pandoc
 # ------
 
-Base.@kwdef mutable struct Pandoc2HTML <: HTMLFormat
+Base.@kwdef mutable struct Pandoc2HTML <: ExportFormat
     description = "HTML via intermediate Pandoc Markdown (requires Pandoc 2)"
-    extension = "md"
-    codestart = '\n'
-    codeend = '\n'
-    termstart = codestart
-    termend = codeend
-    outputstart = '\n'
-    outputend = '\n'
-    mimetypes = ["image/png", "image/svg+xml", "image/jpg", "text/html", "text/markdown", "text/plain"]
-    fig_ext = ".png"
-    out_width = nothing
-    out_height = nothing
-    fig_pos = nothing
-    fig_env = nothing
-    # specials
-    preserve_header = true
+    primaryformat = Pandoc()
     template_path = nothing
     stylesheet_path = nothing
     highlight_theme = nothing

src/rendering/pandocformats.jl

@@ -54,28 +54,14 @@ Base.@kwdef mutable struct Pandoc <: PandocFormat
 end
 register_format!("pandoc", Pandoc())
 
+
 const DEFAULT_PANDOC_OPTIONS = String[]
 
-Base.@kwdef mutable struct Pandoc2PDF <: PandocFormat
+Base.@kwdef mutable struct Pandoc2PDF <: ExportFormat
     description = "PDF via intermediate Pandoc Markdown"
-    extension = "md"
-    codestart = "~~~~{.julia}"
-    codeend = "~~~~~~~~~~~~~\n"
-    termstart = codestart
-    termend = codeend
-    outputstart = "~~~~"
-    outputend = "~~~~\n\n"
-    # Prefer png figures for markdown conversion, svg doesn't work with latex
-    mimetypes = ["image/png", "image/jpg", "image/svg+xml", "text/markdown", "text/plain"]
-    fig_ext = ".png"
-    out_width = nothing
-    out_height = nothing
-    fig_pos = nothing
-    fig_env = nothing
-    # specials
-    preserve_header = true
-    header_template = normpath(TEMPLATE_DIR, "pandoc2pdf_header.txt")
+    primaryformat = Pandoc()
     pandoc_options = DEFAULT_PANDOC_OPTIONS
+    header_template = normpath(TEMPLATE_DIR, "pandoc2pdf_header.txt")
 end
 register_format!("pandoc2pdf", Pandoc2PDF())
 

src/rendering/rendering.jl

@@ -23,9 +23,9 @@ function render_doc(doc::WeaveDoc)
     return render_doc(docformat, body, doc)
 end
 
-
+include("exportformat.jl")
 include("common.jl")
+include("pandocformats.jl")
 include("htmlformats.jl")
 include("texformats.jl")
-include("pandocformats.jl")
 include("miscformats.jl")

src/rendering/texformats.jl

@@ -34,7 +34,10 @@ render_output(docformat::LaTeXFormat, output) = unicode2latex(docformat, output,
 
 render_code(docformat::LaTeXFormat, code) = unicode2latex(docformat, code, true)
 
-render_termchunk(docformat::LaTeXFormat, chunk) = string(docformat.termstart, chunk.output, docformat.termend, "\n")
+render_termchunk(docformat::LaTeXFormat, chunk) =
+    string(docformat.termstart,
+            unicode2latex(docformat, chunk.output, true),
+            docformat.termend, "\n")
 
 # from julia symbols (e.g. "\bfhoge") to valid latex
 const UNICODE2LATEX = let
@@ -198,8 +201,14 @@ function render_code(docformat::WeaveLaTeXFormat, code)
     unicode2latex(docformat, ret, false)
 end
 
-render_termchunk(docformat::WeaveLaTeXFormat, chunk) =
-    should_render(chunk) ? highlight_term(MIME("text/latex"), chunk.output, docformat.highlight_theme) : ""
+function render_termchunk(docformat::WeaveLaTeXFormat, chunk)
+    if should_render(chunk)
+        ret = highlight_term(MIME("text/latex"), chunk.output, docformat.highlight_theme)
+        unicode2latex(docformat, ret, true)
+    else
+        ""
+    end
+end
 
 function render_doc(docformat::WeaveLaTeXFormat, body, doc)
     return Mustache.render(
@@ -233,44 +242,23 @@ Base.@kwdef mutable struct WeaveLaTeX <: WeaveLaTeXFormat
     tex_deps = ""
     # how to escape latex in verbatim/code environment
     escape_starter = "(*@"
-    escape_closer = reverse(escape_starter)
+    escape_closer = "@*)"
 end
 register_format!("md2tex", WeaveLaTeX())
 
 # will be used by `write_doc`
 const DEFAULT_LATEX_CMD = ["xelatex", "-shell-escape", "-halt-on-error"]
 
-Base.@kwdef mutable struct WeaveLaTeX2PDF <: WeaveLaTeXFormat
-    description = "PDF via Weave-styled LaTeX"
-    extension = "tex"
-    codestart = ""
-    codeend = ""
-    termstart = codestart
-    termend = codeend
-    outputstart = "\\begin{lstlisting}"
-    outputend = "\\end{lstlisting}\n"
-    mimetypes = ["application/pdf", "image/png", "image/jpg", "text/latex", "text/markdown", "text/plain"]
-    fig_ext = ".pdf"
-    out_width = "\\linewidth"
-    out_height = nothing
-    fig_pos = nothing
-    fig_env = nothing
-    # specials
-    highlight_theme = nothing
-    template = nothing
-    keep_unicode = false
-    tex_deps = ""
+
+Base.@kwdef mutable struct LaTeX2PDF <: ExportFormat
+    primaryformat = WeaveLaTeX()
+    description = "PDF via LaTeX"
     latex_cmd = DEFAULT_LATEX_CMD
-    # how to escape latex in verbatim/code environment
-    escape_starter = "(*@"
-    escape_closer = reverse(escape_starter)
 end
-register_format!("md2pdf", WeaveLaTeX2PDF())
+register_format!("md2pdf", LaTeX2PDF())
+register_format!("minted2pdf", LaTeX2PDF(primaryformat=LaTeXMinted()))
 
-function set_format_options!(docformat::WeaveLaTeX2PDF; template = nothing, highlight_theme = nothing, keep_unicode = false, latex_cmd = DEFAULT_LATEX_CMD, _kwargs...)
-    docformat.template =
-        get_mustache_template(isnothing(template) ? normpath(TEMPLATE_DIR, "md2pdf.tpl") : template)
-    docformat.highlight_theme = get_highlight_theme(highlight_theme)
-    docformat.keep_unicode |= keep_unicode
+function set_format_options!(docformat::LaTeX2PDF; latex_cmd = DEFAULT_LATEX_CMD, _kwargs...)
     docformat.latex_cmd = latex_cmd
+    set_format_options!(docformat.primaryformat; _kwargs...)
 end

src/writer/latex.jl

@@ -1,4 +1,4 @@
-function write_doc(docformat::WeaveLaTeX2PDF, doc, rendered, out_path)
+function write_doc(docformat::LaTeX2PDF, doc, rendered, out_path)
     cd_back = let d = pwd(); () -> cd(d); end
     cd(doc.cwd)
     try

test/end2end/test_simple.jl

@@ -3,7 +3,7 @@ using Weave.Dates
 
 test_doctypes = filter(first.(Weave.list_out_formats())) do doctype
     # don't test doctypes which need external programs
-    doctype ∉ ("pandoc2html", "pandoc2pdf", "md2pdf")
+    doctype ∉ ("pandoc2html", "pandoc2pdf", "md2pdf", "minted2pdf")
 end
 
 function test_func(body)
@@ -24,7 +24,6 @@ using Dates
 Date(now())
 ```
 """
-
 for doctype in test_doctypes
     test_mock_weave(test_func, julia_markdown_body; informat = "markdown", doctype = doctype)
 end