Adding support for rich display of Markdown cells

Project.toml

@@ -9,6 +9,7 @@ DataAPI = "9a962f9c-6df0-11e9-0e5d-c546b8b5ee8a"
 Future = "9fa8497b-333b-5362-9e8d-4d0656e87820"
 InvertedIndices = "41ab1584-1d38-5bbf-9106-f11c6c58b48f"
 IteratorInterfaceExtensions = "82899510-4779-5014-852e-03e436cf321d"
+Markdown = "d6f4376e-aef5-505a-96c1-9c027394607a"
 Missings = "e1d29d7a-bbdc-5cf2-9ac0-f12de2c33e28"
 PooledArrays = "2dfb63ee-cc39-5dd5-95bd-886bf059d720"
 Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"

src/DataFrames.jl

@@ -5,6 +5,7 @@ using Reexport, SortingAlgorithms, Compat, Unicode, PooledArrays
 @reexport using CategoricalArrays, Missings, InvertedIndices
 using Base.Sort, Base.Order, Base.Iterators
 using TableTraits, IteratorInterfaceExtensions
+using Markdown
 
 import DataAPI,
        DataAPI.All,

src/abstractdataframe/io.jl

@@ -142,6 +142,10 @@ function _show(io::IO, ::MIME"text/html", df::AbstractDataFrame;
                 cell_val = df[row, column_name]
                 if ismissing(cell_val)
                     write(io, "<td><em>missing</em></td>")
+                elseif cell_val isa Markdown.MD
+                    write(io, "<td>")
+                    show(io, "text/html", cell_val)
+                    write(io, "</td>")
                 elseif cell_val isa SHOW_TABULAR_TYPES
                     write(io, "<td><em>")
                     cell = sprint(ourshow, cell_val)
@@ -303,6 +307,8 @@ function _show(io::IO, ::MIME"text/latex", df::AbstractDataFrame;
                 cell = df[row,col]
                 if ismissing(cell)
                     print(io, "\\emph{missing}")
+                elseif cell isa Markdown.MD
+                    show(io, "text/latex", cell)
                 elseif cell isa SHOW_TABULAR_TYPES
                     print(io, "\\emph{")
                     print(io, latex_escape(sprint(ourshow, cell, context=io)))
@@ -417,7 +423,9 @@ function printtable(io::IO,
             elseif isnothing(df[i, j])
                 print(io, nothingstring)
             else
-                if ! (etypes[j] <: Real)
+                if etypes[j] isa Markdown.MD
+                    show(io, "text/plain", df[i,j])
+                elseif ! (etypes[j] <: Real)
                     print(io, quotemark)
                     escapedprint(io, df[i, j], quotestr)
                     print(io, quotemark)

test/io.jl

@@ -1,6 +1,6 @@
 module TestIO
 
-using Test, DataFrames, CategoricalArrays, Dates
+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)
+                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 = """
-        \\begin{tabular}{r|cccccc}
-        \t& A & B & C & D & E & F\\\\
-        \t\\hline
-        \t& $(Int) & String & String & Float64? & Cat…? & String\\\\
-        \t\\hline
-        \t1 & 1 & \\\$10.0 & A & 1.0 & a & \\emph{\\#undef} \\\\
-        \t2 & 2 & M\\&F & B & 2.0 & \\emph{missing} & \\emph{\\#undef} \\\\
-        \t3 & 3 & A\\textasciitilde{}B & C & \\emph{missing} & c & \\emph{\\#undef} \\\\
-        \t4 & 4 & \\textbackslash{}\\textbackslash{}alpha & S & 3.0 & d & \\emph{\\#undef} \\\\
-        \\end{tabular}
-        """
+    str =
+        "\\begin{tabular}{r|ccccccc}\n" *
+        "\t& A & B & C & D & E & F & G\\\\\n" *
+        "\t\\hline\n\t& Int64 & 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=[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) ==
+        "<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>&#36;\\frac&#123;A&#125;&#123;B&#125;&#36;</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