Add markdown flavor for improved math support. Closes #182

src/Weave.jl

@@ -213,6 +213,7 @@ pop_postexecute_hook(f::Function) = splice!(postexecute_hooks, findfirst(postexe
 
 include("config.jl")
 include("chunks.jl")
+include("WeaveMarkdown/markdown.jl")
 include("display_methods.jl")
 include("readers.jl")
 include("run.jl")
@@ -224,7 +225,6 @@ include("pandoc.jl")
 include("writers.jl")
 
 
-
 export weave, list_out_formats, tangle, convert_doc, notebook,
         set_chunk_defaults, get_chunk_defaults, restore_chunk_defaults,
         include_weave

src/WeaveMarkdown/markdown.jl

@@ -0,0 +1,37 @@
+#This module extends the julia markdown parser to improve compatibility with Jupyter, Pandoc etc.
+module WeaveMarkdown
+using Markdown
+import Markdown: @trigger, @breaking, Code, MD, withstream, startswith, LaTeX
+
+@breaking true ->
+function dollarmath(stream::IO, block::MD)
+    withstream(stream) do
+        str = Markdown.startswith(stream, r"^\$\$$"m)
+        isempty(str) && return false
+        trailing = strip(readline(stream))
+        buffer = IOBuffer()
+        while !eof(stream)
+            line_start = position(stream)
+            estr = Markdown.startswith(stream, r"^\$\$$"m)
+            if !isempty(estr)
+                estr = Markdown.startswith(stream, r"^\$\$$"m)
+                if isempty(estr)
+                    push!(block, LaTeX(String(take!(buffer)) |> chomp))
+                end
+                return true
+            else
+                seek(stream, line_start)
+            end
+            write(buffer, readline(stream, keep=true))
+        end
+        return false
+    end
+end
+
+# Create own flavor and copy all the features from julia flavor
+Markdown.@flavor weavemd [dollarmath]
+weavemd.breaking = [weavemd.breaking; Markdown.julia.breaking]
+weavemd.regular = Markdown.julia.regular
+weavemd.inner = Markdown.julia.inner
+
+end

src/display_methods.jl

@@ -1,5 +1,6 @@
 using Compat
 using Markdown
+import .WeaveMarkdown
 
 #Contains report global properties
 mutable struct Report <: AbstractDisplay
@@ -109,7 +110,7 @@ function Base.display(report::Report, m::MIME"text/markdown", data)
     # Convert to "richer" type of possible
     for m in report.mimetypes
         if m == "text/html" || m == "text/latex"
-            display(Markdown.parse(s))
+            display(Markdown.parse(s, flavor=WeaveMarkdown.weavemd))
             break
         elseif m == "text/markdown"
             report.rich_output *= "\n" * s

src/format.jl

@@ -1,5 +1,6 @@
 import Mustache, Highlights
 import .Markdown2HTML
+import .WeaveMarkdown
 using Compat
 using Dates
 using Markdown
@@ -127,14 +128,14 @@ function format_chunk(chunk::DocChunk, formatdict, docformat::JMarkdown2HTML)
     text = format_chunk(chunk, formatdict, nothing)
     #invokelatest seems to be needed here
     #to fix "invalid age range" on 0.6 #21653
-    m = Compat.invokelatest(Markdown.parse, text)
-
+    #m = Compat.invokelatest(Markdown.parse, text)
+    m = Markdown.parse(text, flavor=WeaveMarkdown.weavemd)
     return string(Markdown2HTML.html(m))
 end
 
 function format_chunk(chunk::DocChunk, formatdict, docformat::JMarkdown2tex)
     text = format_chunk(chunk, formatdict, nothing)
-    m = Markdown.parse(text)
+    m = Markdown.parse(text, flavor=WeaveMarkdown.weavemd)
     return uc2tex(Markdown.latex(m))
 end