From 1b7fcad42c974921263b844067274921f2ddd689 Mon Sep 17 00:00:00 2001 From: Tamas Date: Thu, 20 Sep 2018 13:09:46 -0700 Subject: [PATCH] undo regression in pre-2.0 pandoc support fixes #146 --- src/pandoc.jl | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/pandoc.jl b/src/pandoc.jl index f4b5fdb7..aef99103 100644 --- a/src/pandoc.jl +++ b/src/pandoc.jl @@ -88,7 +88,8 @@ function pandoc2pdf(formatted::AbstractString, doc::WeaveDoc, outname::AbstractS @info("Done executing code. Running xelatex") try - cmd = `pandoc -f markdown+raw_tex -s --pdf-engine=xelatex --highlight-style=tango + engine_cmd = get_pandoc_version() > "2.0.0.0" ? "--pdf-engine" : "--latex-engine" + cmd = `pandoc -f markdown+raw_tex -s $engine_cmd=xelatex --highlight-style=tango $filt $citeproc $pandoc_options --include-in-header=$header_template -V fontsize=12pt -o $outname` @@ -124,3 +125,12 @@ function run_latex(doc::WeaveDoc, outname, latex_cmd = "xelatex") return false end end + +""" +`get_pandoc_version()` + +Returns a string containing pandoc's version number +""" +function get_pandoc_version() + match(r"pandoc (?[\d.]+)\n", read(`pandoc --version`, String))["version"] +end \ No newline at end of file