Adding support for rich display of Markdown cells #2346
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -54,6 +54,11 @@ ourshow(io::IO, x::Symbol) = ourshow(io, string(x)) | |||||
| ourshow(io::IO, x::Nothing; styled::Bool=false) = ourshow(io, "", styled=styled) | ||||||
| ourshow(io::IO, x::SHOW_TABULAR_TYPES; styled::Bool=false) = | ||||||
| ourshow(io, summary(x), styled=styled) | ||||||
| function ourshow(io::IO, x::Markdown.MD) | ||||||
| r = repr(x) | ||||||
| len = min(length(r, 1, something(findfirst(c->c=='\n', r), lastindex(r)+1)-1), 50) | ||||||
bkamins marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
| return print(io, len < length(r) - 1 ? first(r, len)*"…" : first(r, len)) | ||||||
bkamins marked this conversation as resolved.
Show resolved
Hide resolved
There was a problem hiding this comment. Using chars should give a slightly more efficient code:
Suggested change
|
||||||
| end | ||||||
|
|
||||||
| # AbstractChar: https://github.com/JuliaLang/julia/pull/34730 (1.5.0-DEV.261) | ||||||
| # Irrational: https://github.com/JuliaLang/julia/pull/34741 (1.5.0-DEV.266) | ||||||
|
|
||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| module TestIO | ||
|
|
||
| using Test, DataFrames, CategoricalArrays, Dates, Markdown | ||
|
|
||
| # Test LaTeX export | ||
| @testset "LaTeX export" begin | ||
|
|
@@ -9,20 +9,21 @@ using Test, DataFrames, CategoricalArrays, Dates | |
| C = ["A", "B", "C", "S"], | ||
| D = [1.0, 2.0, missing, 3.0], | ||
| E = CategoricalArray(["a", missing, "c", "d"]), | ||
| F = Vector{String}(undef, 4), | ||
| G = [ md"[DataFrames.jl](http://juliadata.github.io/DataFrames.jl)", md"###A", md"``\frac{A}{B}``", md"*A*b**A**"] | ||
| ) | ||
| str = | ||
|
There was a problem hiding this comment. Can you keep the triple quoted form? It's more readable. Same below. |
||
| "\\begin{tabular}{r|ccccccc}\n" * | ||
| "\t& A & B & C & D & E & F & G\\\\\n" * | ||
| "\t\\hline\n\t& "*repr(Int)*" & String & String & Float64? & Cat…? & String & MD…\\\\\n" * | ||
| "\t\\hline\n" * | ||
| "\t1 & 1 & \\\$10.0 & A & 1.0 & a & \\emph{\\#undef} & \\href{http://juliadata.github.io/DataFrames.jl}{DataFrames.jl}\n\n \\\\\n" * | ||
| "\t2 & 2 & M\\&F & B & 2.0 & \\emph{missing} & \\emph{\\#undef} & \\#\\#\\#A\n\n \\\\\n" * | ||
| "\t3 & 3 & A\\textasciitilde{}B & C & \\emph{missing} & c & \\emph{\\#undef} & \$\\frac{A}{B}\$\n\n \\\\\n" * | ||
| "\t4 & 4 & \\textbackslash{}\\textbackslash{}alpha & S & 3.0 & d & \\emph{\\#undef} & \\emph{A}b\\textbf{A}\n\n \\\\\n" * | ||
| "\\end{tabular}\n" | ||
|
|
||
|
|
||
| @test repr(MIME("text/latex"), df) == str | ||
| @test repr(MIME("text/latex"), eachcol(df)) == str | ||
| @test repr(MIME("text/latex"), eachrow(df)) == str | ||
|
|
@@ -130,6 +131,27 @@ end | |
|
|
||
| @test_throws ArgumentError DataFrames._show(stdout, MIME("text/html"), | ||
| DataFrame(ones(2,2)), rowid=10) | ||
|
|
||
| df = DataFrame( | ||
| A=Int64[1,4,9,16], | ||
| B = [ | ||
| md"[DataFrames.jl](http://juliadata.github.io/DataFrames.jl)", | ||
| md"###A", | ||
| md"``\frac{A}{B}``", | ||
| md"*A*b**A**" ] | ||
| ) | ||
|
|
||
| @test repr(MIME("text/html"), df) == | ||
NicholasWMRitchie marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| "<table class=\"data-frame\"><thead><tr><th></th><th>A</th><th>B</th></tr><tr><th></th>" * | ||
| "<th>Int64</th><th>MD…</th></tr></thead><tbody><p>4 rows × 2 columns</p><tr><th>1</th>" * | ||
| "<td>1</td><td><div class=\"markdown\">" * | ||
| "<p><a href=\"http://juliadata.github.io/DataFrames.jl\">DataFrames.jl</a>" * | ||
| "</p>\n</div></td></tr><tr><th>2</th><td>4</td><td><div class=\"markdown\">" * | ||
| "<p>###A</p>\n</div></td></tr><tr><th>3</th><td>9</td><td><div class=\"markdown\">" * | ||
| "<p>$\\frac{A}{B}$</p>\n</div></td></tr><tr><th>4</th>" * | ||
| "<td>16</td><td><div class=\"markdown\"><p><em>A</em>b<strong>A</strong></p>"* | ||
| "\n</div></td></tr></tbody></table>" | ||
|
|
||
| end | ||
|
|
||
| # test limit attribute of IOContext is used | ||
|
|
@@ -180,6 +202,101 @@ end | |
| end | ||
| end | ||
|
|
||
| @testset "Markdown as text/plain and as text/csv" begin | ||
| df = DataFrame( | ||
| A=Int64[1,4,9,16,25,36,49,64], | ||
| B = [ | ||
| md"[DataFrames.jl](http://juliadata.github.io/DataFrames.jl)", | ||
| md"``\frac{x^2}{x^2+y^2}``", | ||
| md"# Header", | ||
| md"This is *very*, **very**, very, very, very, very, very, very, very long line" , | ||
| md"", | ||
| Markdown.parse("∫αγ∞1∫αγ∞2∫αγ∞3∫αγ∞4∫αγ∞5∫αγ∞6∫αγ∞7∫αγ∞8∫αγ∞9∫αγ∞0" * | ||
| "∫αγ∞1∫αγ∞2∫αγ∞3∫αγ∞4∫αγ∞5∫αγ∞6∫αγ∞7∫αγ∞8∫αγ∞9∫αγ∞0"), | ||
| Markdown.parse("∫αγ∞1∫αγ∞2∫αγ∞3∫αγ∞4∫αγ∞5∫αγ∞6∫αγ\n"* | ||
| " * ∞7∫αγ\n"* | ||
| " * ∞8∫αγ\n"* | ||
| " * ∞9∫αγ∞0∫α\nγ∞1∫αγ∞2∫αγ∞3∫αγ∞4∫αγ∞5∫αγ∞6∫αγ∞7∫αγ∞8∫αγ∞9∫αγ∞0"), | ||
| Markdown.parse("∫αγ∞1∫αγ∞2∫αγ∞3∫αγ∞4∫αγ∞5∫αγ∞6∫αγ∞7∫αγ∞8∫αγ∞9∫αγ∞0∫α\n"* | ||
| " * γ∞1∫α\n"* | ||
| " * γ∞2∫αγ∞3∫αγ∞4∫αγ∞5∫αγ∞6∫αγ∞7∫αγ∞8∫αγ∞9∫αγ∞0"), | ||
| ] | ||
| ) | ||
| @test sprint(show, "text/plain", df) == """ | ||
| 8×2 DataFrame | ||
|
There was a problem hiding this comment. Add 8-characters indentation. Same below. |
||
| │ Row │ A │ B │ | ||
| │ │ Int64 │ Markdown.MD │ | ||
| ├─────┼───────┼─────────────────────────────────────────────────────┤ | ||
| │ 1 │ 1 │ [DataFrames.jl](http://juliadata.github.io/DataFra… │ | ||
| │ 2 │ 4 │ \$\\frac{x^2}{x^2+y^2}\$ │ | ||
| │ 3 │ 9 │ # Header │ | ||
| │ 4 │ 16 │ This is *very*, **very**, very, very, very, very, … │ | ||
| │ 5 │ 25 │ │ | ||
| │ 6 │ 36 │ ∫αγ∞1∫αγ∞2∫αγ∞3∫αγ∞4∫αγ∞5∫αγ∞6∫αγ∞7∫αγ∞8∫αγ∞9∫αγ∞0… │ | ||
| │ 7 │ 49 │ ∫αγ∞1∫αγ∞2∫αγ∞3∫αγ∞4∫αγ∞5∫αγ∞6∫αγ… │ | ||
| │ 8 │ 64 │ ∫αγ∞1∫αγ∞2∫αγ∞3∫αγ∞4∫αγ∞5∫αγ∞6∫αγ∞7∫αγ∞8∫αγ∞9∫αγ∞0… │""" | ||
|
|
||
| @test sprint(show, "text/csv", df) == """ | ||
| \"A\",\"B\" | ||
| 1,\"[DataFrames.jl](http://juliadata.github.io/DataFrames.jl)\" | ||
| 4,\"\$\\\\frac{x^2}{x^2+y^2}\$\" | ||
| 9,\"# Header\" | ||
| 16,\"This is *very*, **very**, very, very, very, very, very, very, very long line\" | ||
| 25,\"\" | ||
| 36,\"∫αγ∞1∫αγ∞2∫αγ∞3∫αγ∞4∫αγ∞5∫αγ∞6∫αγ∞7∫αγ∞8∫αγ∞9∫αγ∞0∫αγ∞1∫αγ∞2∫αγ∞3∫αγ∞4∫αγ∞5∫αγ∞6∫αγ∞7∫αγ∞8∫αγ∞9∫αγ∞0\" | ||
| 49,\"∫αγ∞1∫αγ∞2∫αγ∞3∫αγ∞4∫αγ∞5∫αγ∞6∫αγ\\n\\n * ∞7∫αγ\\n * ∞8∫αγ\\n * ∞9∫αγ∞0∫α\\n\\nγ∞1∫αγ∞2∫αγ∞3∫αγ∞4∫αγ∞5∫αγ∞6∫αγ∞7∫αγ∞8∫αγ∞9∫αγ∞0\" | ||
| 64,\"∫αγ∞1∫αγ∞2∫αγ∞3∫αγ∞4∫αγ∞5∫αγ∞6∫αγ∞7∫αγ∞8∫αγ∞9∫αγ∞0∫α\\n\\n * γ∞1∫α\\n * γ∞2∫αγ∞3∫αγ∞4∫αγ∞5∫αγ∞6∫αγ∞7∫αγ∞8∫αγ∞9∫αγ∞0\" | ||
| """ | ||
| end | ||
|
|
||
| @testset "Markdown as HTML" begin | ||
| df = DataFrame( | ||
| A=Int64[1,4,9,16,25,36,49,64], | ||
| B = [ | ||
| md"[DataFrames.jl](http://juliadata.github.io/DataFrames.jl)", | ||
| md"``\frac{x^2}{x^2+y^2}``", | ||
| md"# Header", | ||
| md"This is *very*, **very**, very, very, very, very, very, very, very long line" , | ||
| md"", | ||
| Markdown.parse("∫αγ∞1∫αγ∞2∫αγ∞3∫αγ∞4∫αγ∞5∫αγ∞6∫αγ∞7∫αγ∞8∫αγ∞9∫αγ∞0" * | ||
| "∫αγ∞1∫αγ∞2∫αγ∞3∫αγ∞4∫αγ∞5∫αγ∞6∫αγ∞7∫αγ∞8∫αγ∞9∫αγ∞0"), | ||
| Markdown.parse("∫αγ∞1∫αγ∞2∫αγ∞3∫αγ∞4∫αγ∞5∫αγ∞6∫αγ\n"* | ||
| " * ∞7∫αγ\n"* | ||
| " * ∞8∫αγ\n"* | ||
| " * ∞9∫αγ∞0∫α\nγ∞1∫αγ∞2∫αγ∞3∫αγ∞4∫αγ∞5∫αγ∞6∫αγ∞7∫αγ∞8∫αγ∞9∫αγ∞0"), | ||
| Markdown.parse("∫αγ∞1∫αγ∞2∫αγ∞3∫αγ∞4∫αγ∞5∫αγ∞6∫αγ∞7∫αγ∞8∫αγ∞9∫αγ∞0∫α\n"* | ||
| " * γ∞1∫α\n"* | ||
| " * γ∞2∫αγ∞3∫αγ∞4∫αγ∞5∫αγ∞6∫αγ∞7∫αγ∞8∫αγ∞9∫αγ∞0"), | ||
| ] | ||
| ) | ||
| @test sprint(show,"text/html",df) == | ||
| "<table class=\"data-frame\"><thead>" * | ||
| "<tr><th></th><th>A</th><th>B</th></tr>" * | ||
| "<tr><th></th><th>Int64</th><th>MD…</th></tr>" * | ||
| "</thead>" * | ||
| "<tbody>" * "<p>8 rows × 2 columns</p>" * | ||
| "<tr><th>1</th><td>1</td><td><div class=\"markdown\">" * | ||
| "<p><a href=\"http://juliadata.github.io/DataFrames.jl\">DataFrames.jl</a></p>\n</div></td></tr>" * | ||
| "<tr><th>2</th><td>4</td><td><div class=\"markdown\"><p>$\\frac{x^2}{x^2+y^2}$</p>\n</div></td></tr>" * | ||
| "<tr><th>3</th><td>9</td><td><div class=\"markdown\"><h1>Header</h1>\n</div></td></tr>" * | ||
| "<tr><th>4</th><td>16</td><td><div class=\"markdown\">" * | ||
| "<p>This is <em>very</em>, <strong>very</strong>, very, very, very, very, very, very, very long line</p>\n" * | ||
| "</div></td></tr>" * | ||
| "<tr><th>5</th><td>25</td><td><div class=\"markdown\"></div></td></tr>" * | ||
| "<tr><th>6</th><td>36</td><td><div class=\"markdown\">" * | ||
| "<p>∫αγ∞1∫αγ∞2∫αγ∞3∫αγ∞4∫αγ∞5∫αγ∞6∫αγ∞7∫αγ∞8∫αγ∞9∫αγ∞0∫αγ∞1∫αγ∞2∫αγ∞3∫αγ∞4∫αγ∞5∫αγ∞6∫αγ∞7∫αγ∞8∫αγ∞9∫αγ∞0</p>\n" * | ||
| "</div></td></tr>" * | ||
| "<tr><th>7</th><td>49</td><td><div class=\"markdown\">" * | ||
| "<p>∫αγ∞1∫αγ∞2∫αγ∞3∫αγ∞4∫αγ∞5∫αγ∞6∫αγ</p>\n<ul>\n<li><p>∞7∫αγ</p>\n</li>\n<li><p>∞8∫αγ</p>\n</li>\n<li><p>∞9∫αγ∞0∫α</p>\n</li>\n</ul>\n<p>γ∞1∫αγ∞2∫αγ∞3∫αγ∞4∫αγ∞5∫αγ∞6∫αγ∞7∫αγ∞8∫αγ∞9∫αγ∞0</p>\n" * | ||
| "</div></td></tr>" * | ||
| "<tr><th>8</th><td>64</td><td><div class=\"markdown\">" * | ||
| "<p>∫αγ∞1∫αγ∞2∫αγ∞3∫αγ∞4∫αγ∞5∫αγ∞6∫αγ∞7∫αγ∞8∫αγ∞9∫αγ∞0∫α</p>" * | ||
| "\n<ul>\n" * | ||
| "<li><p>γ∞1∫α</p>\n</li>\n" * | ||
| "<li><p>γ∞2∫αγ∞3∫αγ∞4∫αγ∞5∫αγ∞6∫αγ∞7∫αγ∞8∫αγ∞9∫αγ∞0</p>\n</li>\n" * | ||
| "</ul>\n" * "</div></td></tr></tbody></table>" | ||
| end | ||
|
|
||
| @testset "empty data frame and DataFrameRow" begin | ||
| df = DataFrame(a = [1,2], b = [1.0, 2.0]) | ||
|
|
||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since accessing
df[i, j]is relatively slow, better store it incell = df[i, j]and use that afterwards as in the HTML method (not sure why we didn't do this here).There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't see it, nor the other changes you mention below. :-)