mirror of https://github.com/mpastell/Weave.jl
parent
15d4cdf512
commit
6dc482d997
|
@ -33,15 +33,17 @@ function Base.display(report::Report, data)
|
||||||
for m in report.mimetypes
|
for m in report.mimetypes
|
||||||
if mimewritable(m, data)
|
if mimewritable(m, data)
|
||||||
try
|
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
|
catch e
|
||||||
warn("Failed to display data in \"$m\" format")
|
warn("Failed to display data in \"$m\" format")
|
||||||
continue
|
continue
|
||||||
end
|
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
|
break
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -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>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>
|
<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
|
````julia
|
||||||
m = Base.Markdown.parse("**Some Markdown**")
|
m = Base.Markdown.parse("**Some Markdown**")
|
||||||
m
|
m
|
||||||
|
|
|
@ -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>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>
|
<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> </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> </span><span class='hljl-n'>ca</span><span class='hljl-t'>
|
||||||
|
4-element Array{Char,1}:
|
||||||
|
'a'
|
||||||
|
'b'
|
||||||
|
'c'
|
||||||
|
'd'</span>
|
||||||
|
</pre>
|
||||||
|
|
||||||
|
|
||||||
<pre class='hljl'>
|
<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'>"**Some Markdown**"</span><span class='hljl-p'>)</span><span class='hljl-t'>
|
<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'>"**Some Markdown**"</span><span class='hljl-p'>)</span><span class='hljl-t'>
|
||||||
|
|
|
@ -66,6 +66,24 @@ display(x)
|
||||||
| 3 | 3 |
|
| 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}
|
~~~~{.julia}
|
||||||
m = Base.Markdown.parse("**Some Markdown**")
|
m = Base.Markdown.parse("**Some Markdown**")
|
||||||
m
|
m
|
||||||
|
|
|
@ -62,6 +62,22 @@ d & \\ \hline
|
||||||
3 & 3 & \\ \hline
|
3 & 3 & \\ \hline
|
||||||
\end{tabular
|
\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}
|
\begin{juliacode}
|
||||||
m = Base.Markdown.parse("**Some Markdown**")
|
m = Base.Markdown.parse("**Some Markdown**")
|
||||||
m
|
m
|
||||||
|
|
|
@ -45,6 +45,12 @@ display(ca)
|
||||||
display(x)
|
display(x)
|
||||||
```
|
```
|
||||||
|
|
||||||
|
```julia; term=true
|
||||||
|
x
|
||||||
|
ca
|
||||||
|
```
|
||||||
|
|
||||||
|
|
||||||
```julia
|
```julia
|
||||||
m = Base.Markdown.parse("**Some Markdown**")
|
m = Base.Markdown.parse("**Some Markdown**")
|
||||||
m
|
m
|
||||||
|
|
Loading…
Reference in New Issue