Fix term=true in "rich outputs", closes #113

src/display_methods.jl

@@ -33,15 +33,17 @@ function Base.display(report::Report, data)
     for m in report.mimetypes
         if mimewritable(m, data)
             try
-                Compat.invokelatest(display, report, m, data)
+                if !istextmime(m)
+                    Compat.invokelatest(display, report, m, data)   
+                elseif report.cur_chunk.options[:term]
+                    display(report, "text/plain", data)
+                else   
+                    Compat.invokelatest(display, report, m, data)
+                end
             catch e
                 warn("Failed to display data in \"$m\" format")
                 continue
             end
-            #Always show plain text as well for term mode
-            #if m ≠ "text/plain" && report.cur_chunk.options[:term]
-            #    display(report, "text/plain", data)
-            #end
             break
         end
     end

test/documents/multimedia/rich_output.github.ref

@@ -52,6 +52,24 @@ 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
+julia> x
+3×2 Array{Int64,2}:
+ 1  1
+ 2  2
+ 3  3
+
+julia> ca
+4-element Array{Char,1}:
+ 'a'
+ 'b'
+ 'c'
+ 'd'
+
+````
+
+
+
 ````julia
 m = Base.Markdown.parse("**Some Markdown**")
 m

test/documents/multimedia/rich_output.html.ref

@@ -55,6 +55,21 @@
 <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-nB'>julia&gt; </span><span class='hljl-n'>x</span><span class='hljl-t'>
+3×2 Array{Int64,2}:
+ 1  1
+ 2  2
+ 3  3
+
+</span><span class='hljl-nB'>julia&gt; </span><span class='hljl-n'>ca</span><span class='hljl-t'>
+4-element Array{Char,1}:
+ &#39;a&#39;
+ &#39;b&#39;
+ &#39;c&#39;
+ &#39;d&#39;</span>
+</pre>
+
 
 <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'>

test/documents/multimedia/rich_output.md.ref

@@ -66,6 +66,24 @@ display(x)
 | 3 | 3 | 
 -----
 
+~~~~{.julia}
+julia> x
+3×2 Array{Int64,2}:
+ 1  1
+ 2  2
+ 3  3
+
+julia> ca
+4-element Array{Char,1}:
+ 'a'
+ 'b'
+ 'c'
+ 'd'
+
+~~~~~~~~~~~~~
+
+
+
 ~~~~{.julia}
 m = Base.Markdown.parse("**Some Markdown**")
 m

test/documents/multimedia/rich_output.tex.ref

@@ -62,6 +62,22 @@ d & \\ \hline
 3 & 3 & \\ \hline
 \end{tabular
 
+\begin{juliaterm}
+julia> x
+3×2 Array{Int64,2}:
+ 1  1
+ 2  2
+ 3  3
+
+julia> ca
+4-element Array{Char,1}:
+ 'a'
+ 'b'
+ 'c'
+ 'd'
+
+\end{juliaterm}
+
 \begin{juliacode}
 m = Base.Markdown.parse("**Some Markdown**")
 m

test/documents/rich_output.jmd

@@ -45,6 +45,12 @@ display(ca)
 display(x)
 ```
 
+```julia; term=true
+x
+ca
+```
+
+
 ```julia
 m = Base.Markdown.parse("**Some Markdown**")
 m