From d27c8e4ff321716155a6ef39d2d386955f1500d3 Mon Sep 17 00:00:00 2001 From: tlienart <tlienart@me.com> Date: Thu, 27 Apr 2023 11:08:19 +0200 Subject: [PATCH 1/3] fix for table demo --- demos/index.md | 3 ++- demos/utils.jl | 10 +++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/demos/index.md b/demos/index.md index 5a2f22235..00baa1605 100644 --- a/demos/index.md +++ b/demos/index.md @@ -2,6 +2,7 @@ title = "Franklin FAQ" tags = ["index"] auto_code_path = true +has_math = true +++ # Franklin Demos @@ -250,7 +251,7 @@ and that's it 🏁. ## (009) custom environment for TikzCD -> TikzCDs is currently too disfunctional so the demo is commented out for now. +> TikzCDs is currently too disfunctional so the demo is commented out for now. Like TikzPicture, it's possible to make it work with Tectonic but Tectonic doesn't work on M* macs. <!-- diff --git a/demos/utils.jl b/demos/utils.jl index ffeef32f1..4b47bdbc8 100644 --- a/demos/utils.jl +++ b/demos/utils.jl @@ -124,20 +124,24 @@ end ########### ### 019 ### ########### - + function hfun_render_table() val = rand(1:10, 5) tag = rand('A':'Z', 5) math = rand(["\$a + b\$", "\$\\frac{1}{2}\$", "\$\\sqrt{2\\pi}\$"], 5) website = rand(["[Franklin home page](https://franklinjl.org)", "[Franklin Github](https://github.com/tlienart/Franklin.jl)"], 5) df = DataFrame(; val, tag, math, website) - pretty_table( + s = pretty_table( String, # export table as a String df; nosubheader = true, # Remove the type from the column names tf = tf_html_default, # Use the default HTML rendered alignment = :c, # Center alignment - formatters = ((x, i, j) -> string(x), (x, i, j) -> Franklin.fd2html(x, nop = true)), # Convert every inner cell to html + formatters = ( # Convert every inner cell to html + (x, _, _) -> Franklin.fd2html(string(x), internal = true, nop = true), + (x, _, _) -> strip(x), + ), allow_html_in_cells = true, # needed given the previous rendering ) + return replace(s, raw"\\\\" => raw"\\") end From fa61e0cf78434c79e5155084cdb91d4196b4936e Mon Sep 17 00:00:00 2001 From: tlienart <tlienart@me.com> Date: Thu, 27 Apr 2023 11:09:40 +0200 Subject: [PATCH 2/3] CI on nightly --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 07291e727..ca17acb7f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,8 +17,8 @@ jobs: fail-fast: false matrix: version: - - '1.3' - '1' + - 'nightly' os: - ubuntu-latest arch: From 29c42a791be14769481befa50d0055791f85a3f0 Mon Sep 17 00:00:00 2001 From: tlienart <tlienart@me.com> Date: Thu, 27 Apr 2023 12:51:20 +0200 Subject: [PATCH 3/3] drop nightly --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ca17acb7f..b2feae794 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,6 @@ jobs: matrix: version: - '1' - - 'nightly' os: - ubuntu-latest arch: