From d5aaae43fc91159fd7eea48b79649ceb43536b8c Mon Sep 17 00:00:00 2001
From: Matti Pastell <matti.pastell@helsinki.fi>
Date: Fri, 22 Apr 2016 20:59:13 +0300
Subject: [PATCH] Added multimarkdown formatter, #34

---
 src/formatters.jl | 85 ++++++++++++++++++++++++++++++++++-------------
 1 file changed, 62 insertions(+), 23 deletions(-)

diff --git a/src/formatters.jl b/src/formatters.jl
index 2f0198c..9573100 100644
--- a/src/formatters.jl
+++ b/src/formatters.jl
@@ -216,7 +216,6 @@ type Markdown
    formatdict::Dict{Symbol,Any}
 end
 
-
 const github = Markdown("Github markdown",
                         @compat Dict{Symbol,Any}(
                                 :codestart => "````julia",
@@ -228,6 +227,22 @@ const github = Markdown("Github markdown",
                                 :doctype=> "github"
                                                ))
 
+type MultiMarkdown
+  description::AbstractString
+  formatdict::Dict{Symbol,Any}
+end
+
+const multimarkdown = MultiMarkdown("MultiMarkdown",
+                        @compat Dict{Symbol,Any}(
+                                :codestart => "````julia",
+                                :codeend=> "````\n\n",
+                                :outputstart=> "````julia",
+                                :outputend=> "````\n\n",
+                                :fig_ext=> ".png",
+                                :extension=> "md",
+                                :doctype=> "github"
+                                               ))
+
 
 type Rest
     description::AbstractString
@@ -312,28 +327,6 @@ function formatfigures(chunk, docformat::Tex)
    return result
 end
 
-function formatfigures(chunk, docformat::Markdown)
-    fignames = chunk.figures
-    caption = chunk.options[:fig_cap]
-    result = ""
-    figstring = ""
-
-    length(fignames) > 0 || (return "")
-
-    if caption != nothing
-        result *= "![$caption]($(fignames[1]))\n"
-        for fig = fignames[2:end]
-            result *= "![]($fig)\n"
-            println("Warning, only the first figure gets a caption\n")
-        end
-    else
-        for fig in fignames
-            result *= "![]($fig)\n"
-        end
-    end
-    return result
-end
-
 function formatfigures(chunk, docformat::Pandoc)
     fignames = chunk.figures
     caption = chunk.options[:fig_cap]
@@ -356,8 +349,53 @@ function formatfigures(chunk, docformat::Pandoc)
     return result
 end
 
+function formatfigures(chunk, docformat::Markdown)
+    fignames = chunk.figures
+    caption = chunk.options[:fig_cap]
+    result = ""
+    figstring = ""
 
+    length(fignames) > 0 || (return "")
 
+    if caption != nothing
+        result *= "![$caption]($(fignames[1]))\n"
+        for fig = fignames[2:end]
+            result *= "![]($fig)\n"
+            println("Warning, only the first figure gets a caption\n")
+        end
+    else
+        for fig in fignames
+            result *= "![]($fig)\n"
+        end
+    end
+    return result
+end
+
+function formatfigures(chunk, docformat::MultiMarkdown)
+    fignames = chunk.figures
+    caption = chunk.options[:fig_cap]
+    result = ""
+    figstring = ""
+    width = "width=$(chunk.options[:out_width])"
+
+    length(fignames) > 0 || (return "")
+
+    if caption != nothing
+       result *= "![$caption][$(fignames[1])]\n\n"
+       result *= "[$(fignames[1])]: $(fignames[1]) $width\n"
+        for fig = fignames[2:end]
+          result *= "![][$fig]\n\n"
+          result *= "[$fig]: $fig $width\n"
+          println("Warning, only the first figure gets a caption\n")
+        end
+    else
+        for fig in fignames
+          result *= "![][$fig]\n\n"
+          result *= "[$fig]: $fig $width\n"
+        end
+    end
+    return result
+end
 
 
 function formatfigures(chunk, docformat::Rest)
@@ -413,6 +451,7 @@ const formats = @compat Dict{AbstractString, Any}("tex" => tex,
                                           "md2html" => md2html,
                                           "md2pdf" => md2pdf,
                                           "github" => github,
+                                          "multimarkdown" => multimarkdown,
                                           "rst" => rst,
                                           "asciidoc" => adoc
                                           )