New mimetype tests for output

test/REQUIRE

@@ -3,6 +3,4 @@ Cairo
 Fontconfig
 Gadfly
 GR
-DSP
 Plots
-DataFrames 0.10.1 0.11-

test/documents/multimedia/rich_output.github.ref

@@ -0,0 +1,63 @@
+````julia
+import Base
+function Base.show(io::IO, m::MIME"text/html", x::Array)
+    print(io, "<table>")
+    for i in 1:size(x,1)
+        print(io, "<tr>")
+        [print(io, "<td>$r</td>") for r in x[i,:]]
+        print(io, "</tr>")
+    end
+    print(io, "</table>")
+end
+
+#This isn't valid latex, doesn't matter for the test
+function Base.show(io::IO, m::MIME"text/latex", x::Array)
+    println(io, "\\begin{tabular}")
+    for i in 1:size(x,1)
+        [print(io, "$r & ") for r in x[i,:]]
+        print(io,"\\\\")
+        println(io, " \\hline")
+    end
+    print(io, "\\end{tabular")
+end
+
+#This isn't valid markdown, doesn't matter for the test
+function Base.show(io::IO, m::MIME"text/markdown", x::Array)
+    println(io, "-----")
+    for i in 1:size(x,1)
+        print(io, "| ")
+        [print(io, "$r | ") for r in x[i,:]]
+        println(io, "")
+    end
+    print(io, "-----")
+end
+
+
+x = [collect(1:3) collect(1:3)]
+ca = collect('a':'d')
+ca
+````
+
+
+
+<table><tr><td>a</td></tr><tr><td>b</td></tr><tr><td>c</td></tr><tr><td>d</td></tr></table>
+
+````julia
+display(ca)
+display(x)
+````
+
+
+
+<table><tr><td>a</td></tr><tr><td>b</td></tr><tr><td>c</td></tr><tr><td>d</td></tr></table>
+<table><tr><td>1</td><td>1</td></tr><tr><td>2</td><td>2</td></tr><tr><td>3</td><td>3</td></tr></table>
+
+````julia
+m = Base.Markdown.parse("**Some Markdown**")
+m
+````
+
+
+
+<div class="markdown"><p><strong>Some Markdown</strong></p>
+</div>

test/documents/multimedia/rich_output.html.ref

@@ -0,0 +1,68 @@
+
+
+<pre class='hljl'>
+<span class='hljl-k'>import</span><span class='hljl-t'> </span><span class='hljl-n'>Base</span><span class='hljl-t'>
+</span><span class='hljl-k'>function</span><span class='hljl-t'> </span><span class='hljl-n'>Base</span><span class='hljl-oB'>.</span><span class='hljl-nf'>show</span><span class='hljl-p'>(</span><span class='hljl-n'>io</span><span class='hljl-oB'>::</span><span class='hljl-n'>IO</span><span class='hljl-p'>,</span><span class='hljl-t'> </span><span class='hljl-n'>m</span><span class='hljl-oB'>::</span><span class='hljl-so'>MIME&quot;text/html&quot;</span><span class='hljl-p'>,</span><span class='hljl-t'> </span><span class='hljl-n'>x</span><span class='hljl-oB'>::</span><span class='hljl-n'>Array</span><span class='hljl-p'>)</span><span class='hljl-t'>
+    </span><span class='hljl-nf'>print</span><span class='hljl-p'>(</span><span class='hljl-n'>io</span><span class='hljl-p'>,</span><span class='hljl-t'> </span><span class='hljl-s'>&quot;&lt;table&gt;&quot;</span><span class='hljl-p'>)</span><span class='hljl-t'>
+    </span><span class='hljl-k'>for</span><span class='hljl-t'> </span><span class='hljl-n'>i</span><span class='hljl-t'> </span><span class='hljl-kp'>in</span><span class='hljl-t'> </span><span class='hljl-ni'>1</span><span class='hljl-oB'>:</span><span class='hljl-nf'>size</span><span class='hljl-p'>(</span><span class='hljl-n'>x</span><span class='hljl-p'>,</span><span class='hljl-ni'>1</span><span class='hljl-p'>)</span><span class='hljl-t'>
+        </span><span class='hljl-nf'>print</span><span class='hljl-p'>(</span><span class='hljl-n'>io</span><span class='hljl-p'>,</span><span class='hljl-t'> </span><span class='hljl-s'>&quot;&lt;tr&gt;&quot;</span><span class='hljl-p'>)</span><span class='hljl-t'>
+        </span><span class='hljl-p'>[</span><span class='hljl-nf'>print</span><span class='hljl-p'>(</span><span class='hljl-n'>io</span><span class='hljl-p'>,</span><span class='hljl-t'> </span><span class='hljl-s'>&quot;&lt;td&gt;</span><span class='hljl-si'>$r</span><span class='hljl-s'>&lt;/td&gt;&quot;</span><span class='hljl-p'>)</span><span class='hljl-t'> </span><span class='hljl-k'>for</span><span class='hljl-t'> </span><span class='hljl-n'>r</span><span class='hljl-t'> </span><span class='hljl-kp'>in</span><span class='hljl-t'> </span><span class='hljl-n'>x</span><span class='hljl-p'>[</span><span class='hljl-n'>i</span><span class='hljl-p'>,</span><span class='hljl-oB'>:</span><span class='hljl-p'>]]</span><span class='hljl-t'>
+        </span><span class='hljl-nf'>print</span><span class='hljl-p'>(</span><span class='hljl-n'>io</span><span class='hljl-p'>,</span><span class='hljl-t'> </span><span class='hljl-s'>&quot;&lt;/tr&gt;&quot;</span><span class='hljl-p'>)</span><span class='hljl-t'>
+    </span><span class='hljl-k'>end</span><span class='hljl-t'>
+    </span><span class='hljl-nf'>print</span><span class='hljl-p'>(</span><span class='hljl-n'>io</span><span class='hljl-p'>,</span><span class='hljl-t'> </span><span class='hljl-s'>&quot;&lt;/table&gt;&quot;</span><span class='hljl-p'>)</span><span class='hljl-t'>
+</span><span class='hljl-k'>end</span><span class='hljl-t'>
+
+</span><span class='hljl-cs'>#This isn&#39;t valid latex, doesn&#39;t matter for the test</span><span class='hljl-t'>
+</span><span class='hljl-k'>function</span><span class='hljl-t'> </span><span class='hljl-n'>Base</span><span class='hljl-oB'>.</span><span class='hljl-nf'>show</span><span class='hljl-p'>(</span><span class='hljl-n'>io</span><span class='hljl-oB'>::</span><span class='hljl-n'>IO</span><span class='hljl-p'>,</span><span class='hljl-t'> </span><span class='hljl-n'>m</span><span class='hljl-oB'>::</span><span class='hljl-so'>MIME&quot;text/latex&quot;</span><span class='hljl-p'>,</span><span class='hljl-t'> </span><span class='hljl-n'>x</span><span class='hljl-oB'>::</span><span class='hljl-n'>Array</span><span class='hljl-p'>)</span><span class='hljl-t'>
+    </span><span class='hljl-nf'>println</span><span class='hljl-p'>(</span><span class='hljl-n'>io</span><span class='hljl-p'>,</span><span class='hljl-t'> </span><span class='hljl-s'>&quot;</span><span class='hljl-se'>\\</span><span class='hljl-s'>begin{tabular}&quot;</span><span class='hljl-p'>)</span><span class='hljl-t'>
+    </span><span class='hljl-k'>for</span><span class='hljl-t'> </span><span class='hljl-n'>i</span><span class='hljl-t'> </span><span class='hljl-kp'>in</span><span class='hljl-t'> </span><span class='hljl-ni'>1</span><span class='hljl-oB'>:</span><span class='hljl-nf'>size</span><span class='hljl-p'>(</span><span class='hljl-n'>x</span><span class='hljl-p'>,</span><span class='hljl-ni'>1</span><span class='hljl-p'>)</span><span class='hljl-t'>
+        </span><span class='hljl-p'>[</span><span class='hljl-nf'>print</span><span class='hljl-p'>(</span><span class='hljl-n'>io</span><span class='hljl-p'>,</span><span class='hljl-t'> </span><span class='hljl-s'>&quot;</span><span class='hljl-si'>$r</span><span class='hljl-s'> &amp; &quot;</span><span class='hljl-p'>)</span><span class='hljl-t'> </span><span class='hljl-k'>for</span><span class='hljl-t'> </span><span class='hljl-n'>r</span><span class='hljl-t'> </span><span class='hljl-kp'>in</span><span class='hljl-t'> </span><span class='hljl-n'>x</span><span class='hljl-p'>[</span><span class='hljl-n'>i</span><span class='hljl-p'>,</span><span class='hljl-oB'>:</span><span class='hljl-p'>]]</span><span class='hljl-t'>
+        </span><span class='hljl-nf'>print</span><span class='hljl-p'>(</span><span class='hljl-n'>io</span><span class='hljl-p'>,</span><span class='hljl-s'>&quot;</span><span class='hljl-se'>\\\\</span><span class='hljl-s'>&quot;</span><span class='hljl-p'>)</span><span class='hljl-t'>
+        </span><span class='hljl-nf'>println</span><span class='hljl-p'>(</span><span class='hljl-n'>io</span><span class='hljl-p'>,</span><span class='hljl-t'> </span><span class='hljl-s'>&quot; </span><span class='hljl-se'>\\</span><span class='hljl-s'>hline&quot;</span><span class='hljl-p'>)</span><span class='hljl-t'>
+    </span><span class='hljl-k'>end</span><span class='hljl-t'>
+    </span><span class='hljl-nf'>print</span><span class='hljl-p'>(</span><span class='hljl-n'>io</span><span class='hljl-p'>,</span><span class='hljl-t'> </span><span class='hljl-s'>&quot;</span><span class='hljl-se'>\\</span><span class='hljl-s'>end{tabular&quot;</span><span class='hljl-p'>)</span><span class='hljl-t'>
+</span><span class='hljl-k'>end</span><span class='hljl-t'>
+
+</span><span class='hljl-cs'>#This isn&#39;t valid markdown, doesn&#39;t matter for the test</span><span class='hljl-t'>
+</span><span class='hljl-k'>function</span><span class='hljl-t'> </span><span class='hljl-n'>Base</span><span class='hljl-oB'>.</span><span class='hljl-nf'>show</span><span class='hljl-p'>(</span><span class='hljl-n'>io</span><span class='hljl-oB'>::</span><span class='hljl-n'>IO</span><span class='hljl-p'>,</span><span class='hljl-t'> </span><span class='hljl-n'>m</span><span class='hljl-oB'>::</span><span class='hljl-so'>MIME&quot;text/markdown&quot;</span><span class='hljl-p'>,</span><span class='hljl-t'> </span><span class='hljl-n'>x</span><span class='hljl-oB'>::</span><span class='hljl-n'>Array</span><span class='hljl-p'>)</span><span class='hljl-t'>
+    </span><span class='hljl-nf'>println</span><span class='hljl-p'>(</span><span class='hljl-n'>io</span><span class='hljl-p'>,</span><span class='hljl-t'> </span><span class='hljl-s'>&quot;-----&quot;</span><span class='hljl-p'>)</span><span class='hljl-t'>
+    </span><span class='hljl-k'>for</span><span class='hljl-t'> </span><span class='hljl-n'>i</span><span class='hljl-t'> </span><span class='hljl-kp'>in</span><span class='hljl-t'> </span><span class='hljl-ni'>1</span><span class='hljl-oB'>:</span><span class='hljl-nf'>size</span><span class='hljl-p'>(</span><span class='hljl-n'>x</span><span class='hljl-p'>,</span><span class='hljl-ni'>1</span><span class='hljl-p'>)</span><span class='hljl-t'>
+        </span><span class='hljl-nf'>print</span><span class='hljl-p'>(</span><span class='hljl-n'>io</span><span class='hljl-p'>,</span><span class='hljl-t'> </span><span class='hljl-s'>&quot;| &quot;</span><span class='hljl-p'>)</span><span class='hljl-t'>
+        </span><span class='hljl-p'>[</span><span class='hljl-nf'>print</span><span class='hljl-p'>(</span><span class='hljl-n'>io</span><span class='hljl-p'>,</span><span class='hljl-t'> </span><span class='hljl-s'>&quot;</span><span class='hljl-si'>$r</span><span class='hljl-s'> | &quot;</span><span class='hljl-p'>)</span><span class='hljl-t'> </span><span class='hljl-k'>for</span><span class='hljl-t'> </span><span class='hljl-n'>r</span><span class='hljl-t'> </span><span class='hljl-kp'>in</span><span class='hljl-t'> </span><span class='hljl-n'>x</span><span class='hljl-p'>[</span><span class='hljl-n'>i</span><span class='hljl-p'>,</span><span class='hljl-oB'>:</span><span class='hljl-p'>]]</span><span class='hljl-t'>
+        </span><span class='hljl-nf'>println</span><span class='hljl-p'>(</span><span class='hljl-n'>io</span><span class='hljl-p'>,</span><span class='hljl-t'> </span><span class='hljl-s'>&quot;&quot;</span><span class='hljl-p'>)</span><span class='hljl-t'>
+    </span><span class='hljl-k'>end</span><span class='hljl-t'>
+    </span><span class='hljl-nf'>print</span><span class='hljl-p'>(</span><span class='hljl-n'>io</span><span class='hljl-p'>,</span><span class='hljl-t'> </span><span class='hljl-s'>&quot;-----&quot;</span><span class='hljl-p'>)</span><span class='hljl-t'>
+</span><span class='hljl-k'>end</span><span class='hljl-t'>
+
+
+</span><span class='hljl-n'>x</span><span class='hljl-t'> </span><span class='hljl-oB'>=</span><span class='hljl-t'> </span><span class='hljl-p'>[</span><span class='hljl-nf'>collect</span><span class='hljl-p'>(</span><span class='hljl-ni'>1</span><span class='hljl-oB'>:</span><span class='hljl-ni'>3</span><span class='hljl-p'>)</span><span class='hljl-t'> </span><span class='hljl-nf'>collect</span><span class='hljl-p'>(</span><span class='hljl-ni'>1</span><span class='hljl-oB'>:</span><span class='hljl-ni'>3</span><span class='hljl-p'>)]</span><span class='hljl-t'>
+</span><span class='hljl-n'>ca</span><span class='hljl-t'> </span><span class='hljl-oB'>=</span><span class='hljl-t'> </span><span class='hljl-nf'>collect</span><span class='hljl-p'>(</span><span class='hljl-sc'>&#39;a&#39;</span><span class='hljl-oB'>:</span><span class='hljl-sc'>&#39;d&#39;</span><span class='hljl-p'>)</span><span class='hljl-t'>
+</span><span class='hljl-n'>ca</span>
+</pre>
+
+
+
+<table><tr><td>a</td></tr><tr><td>b</td></tr><tr><td>c</td></tr><tr><td>d</td></tr></table>
+
+
+<pre class='hljl'>
+<span class='hljl-nf'>display</span><span class='hljl-p'>(</span><span class='hljl-n'>ca</span><span class='hljl-p'>)</span><span class='hljl-t'>
+</span><span class='hljl-nf'>display</span><span class='hljl-p'>(</span><span class='hljl-n'>x</span><span class='hljl-p'>)</span>
+</pre>
+
+
+
+<table><tr><td>a</td></tr><tr><td>b</td></tr><tr><td>c</td></tr><tr><td>d</td></tr></table>
+<table><tr><td>1</td><td>1</td></tr><tr><td>2</td><td>2</td></tr><tr><td>3</td><td>3</td></tr></table>
+
+
+<pre class='hljl'>
+<span class='hljl-n'>m</span><span class='hljl-t'> </span><span class='hljl-oB'>=</span><span class='hljl-t'> </span><span class='hljl-n'>Base</span><span class='hljl-oB'>.</span><span class='hljl-n'>Markdown</span><span class='hljl-oB'>.</span><span class='hljl-nf'>parse</span><span class='hljl-p'>(</span><span class='hljl-s'>&quot;**Some Markdown**&quot;</span><span class='hljl-p'>)</span><span class='hljl-t'>
+</span><span class='hljl-n'>m</span>
+</pre>
+
+
+
+<div class="markdown"><p><strong>Some Markdown</strong></p>
+</div>
+

test/documents/multimedia/rich_output.md.ref

@@ -0,0 +1,77 @@
+~~~~{.julia}
+import Base
+function Base.show(io::IO, m::MIME"text/html", x::Array)
+    print(io, "<table>")
+    for i in 1:size(x,1)
+        print(io, "<tr>")
+        [print(io, "<td>$r</td>") for r in x[i,:]]
+        print(io, "</tr>")
+    end
+    print(io, "</table>")
+end
+
+#This isn't valid latex, doesn't matter for the test
+function Base.show(io::IO, m::MIME"text/latex", x::Array)
+    println(io, "\\begin{tabular}")
+    for i in 1:size(x,1)
+        [print(io, "$r & ") for r in x[i,:]]
+        print(io,"\\\\")
+        println(io, " \\hline")
+    end
+    print(io, "\\end{tabular")
+end
+
+#This isn't valid markdown, doesn't matter for the test
+function Base.show(io::IO, m::MIME"text/markdown", x::Array)
+    println(io, "-----")
+    for i in 1:size(x,1)
+        print(io, "| ")
+        [print(io, "$r | ") for r in x[i,:]]
+        println(io, "")
+    end
+    print(io, "-----")
+end
+
+
+x = [collect(1:3) collect(1:3)]
+ca = collect('a':'d')
+ca
+~~~~~~~~~~~~~
+
+
+
+-----
+| a | 
+| b | 
+| c | 
+| d | 
+-----
+
+~~~~{.julia}
+display(ca)
+display(x)
+~~~~~~~~~~~~~
+
+
+
+-----
+| a | 
+| b | 
+| c | 
+| d | 
+-----
+-----
+| 1 | 1 | 
+| 2 | 2 | 
+| 3 | 3 | 
+-----
+
+~~~~{.julia}
+m = Base.Markdown.parse("**Some Markdown**")
+m
+~~~~~~~~~~~~~
+
+
+
+**Some Markdown**
+

test/documents/multimedia/rich_output.tex.ref

@@ -0,0 +1,72 @@
+\begin{juliacode}
+import Base
+function Base.show(io::IO, m::MIME"text/html", x::Array)
+    print(io, "<table>")
+    for i in 1:size(x,1)
+        print(io, "<tr>")
+        [print(io, "<td>$r</td>") for r in x[i,:]]
+        print(io, "</tr>")
+    end
+    print(io, "</table>")
+end
+
+#This isn't valid latex, doesn't matter for the test
+function Base.show(io::IO, m::MIME"text/latex", x::Array)
+    println(io, "\\begin{tabular}")
+    for i in 1:size(x,1)
+        [print(io, "$r & ") for r in x[i,:]]
+        print(io,"\\\\")
+        println(io, " \\hline")
+    end
+    print(io, "\\end{tabular")
+end
+
+#This isn't valid markdown, doesn't matter for the test
+function Base.show(io::IO, m::MIME"text/markdown", x::Array)
+    println(io, "-----")
+    for i in 1:size(x,1)
+        print(io, "| ")
+        [print(io, "$r | ") for r in x[i,:]]
+        println(io, "")
+    end
+    print(io, "-----")
+end
+
+
+x = [collect(1:3) collect(1:3)]
+ca = collect('a':'d')
+ca
+\end{juliacode}
+
+\begin{tabular}
+a & \\ \hline
+b & \\ \hline
+c & \\ \hline
+d & \\ \hline
+\end{tabular
+
+\begin{juliacode}
+display(ca)
+display(x)
+\end{juliacode}
+
+\begin{tabular}
+a & \\ \hline
+b & \\ \hline
+c & \\ \hline
+d & \\ \hline
+\end{tabular
+\begin{tabular}
+1 & 1 & \\ \hline
+2 & 2 & \\ \hline
+3 & 3 & \\ \hline
+\end{tabular
+
+\begin{juliacode}
+m = Base.Markdown.parse("**Some Markdown**")
+m
+\end{juliacode}
+
+\textbf{Some Markdown}
+
+

test/documents/rich_output.jmd

@@ -11,6 +11,30 @@ function Base.show(io::IO, m::MIME"text/html", x::Array)
     end
     print(io, "</table>")
 end
+
+#This isn't valid latex, doesn't matter for the test
+function Base.show(io::IO, m::MIME"text/latex", x::Array)
+    println(io, "\\begin{tabular}")
+    for i in 1:size(x,1)
+        [print(io, "$r & ") for r in x[i,:]]
+        print(io,"\\\\")
+        println(io, " \\hline")
+    end
+    print(io, "\\end{tabular")
+end
+
+#This isn't valid markdown, doesn't matter for the test
+function Base.show(io::IO, m::MIME"text/markdown", x::Array)
+    println(io, "-----")
+    for i in 1:size(x,1)
+        print(io, "| ")
+        [print(io, "$r | ") for r in x[i,:]]
+        println(io, "")
+    end
+    print(io, "-----")
+end
+
+
 x = [collect(1:3) collect(1:3)]
 ca = collect('a':'d')
 ca
@@ -21,10 +45,6 @@ display(ca)
 display(x)
 ```
 
-```julia; term=true
-ca
-```
-
 ```julia
 m = Base.Markdown.parse("**Some Markdown**")
 m

test/rich_output.jl

@@ -2,13 +2,15 @@ using Weave
 using Base.Test
 
 function mmtest(source, resfile, doctype)
-  VER = "$(VERSION.major).$(VERSION.minor)"
-  weave("documents/$source", out_path = "documents/multimedia/$resfile", doctype=doctype, plotlib=nothing)
+  weave("documents/$source", out_path = "documents/multimedia/$resfile", 
+    doctype=doctype, plotlib=nothing, template = "templates/mini.tpl")
   result =  readstring("documents/multimedia/$resfile")
-  ref =  readstring("documents/multimedia/$VER/$resfile.ref")
+  ref =  readstring("documents/multimedia/$resfile.ref")
   @test result == ref
   rm("documents/multimedia/$resfile")
 end
 
 mmtest("rich_output.jmd", "rich_output.md", "pandoc")
 mmtest("rich_output.jmd", "rich_output.tex", "tex")
+mmtest("rich_output.jmd", "rich_output.html", "md2html")
+mmtest("rich_output.jmd", "rich_output.github", "github")