apply colformat_md on content rather than dataset (#72)

Solves #61, #71 * apply colformat_md on content rather than dataset * update NEWS * update documents * build documents
atusy · Apr 19, 2022 · ce79e40 · ce79e40
1 parent f3776a0
commit ce79e40
Show file tree

Hide file tree

Showing 8 changed files with 555 additions and 475 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -1,6 +1,7 @@
 # ftExtra 0.3.0.9999
 
 * `as_paragraph_md` supports empty string, `""`, as an input (#68).
+* `colformat_md` applies on actual content of flextable rather than input dataset (#72).
 * Improved support for the underline syntax in Pandoc's Markdown (#73).
 
 # ftExtra 0.3.0

diff --git a/R/colformat.R b/R/colformat.R
@@ -48,13 +48,15 @@ colformat_md <- function(x,
   }
 
   dataset <- x[[part]]$dataset
-  col <- names(tidyselect::eval_select(rlang::expr(c(!!.j)), dataset))
+  content <- x[[part]][["content"]][["content"]][["data"]]
+  nm <- colnames(content)
+  col <- tidyselect::eval_select(rlang::expr(c(!!.j)), dataset[nm])
 
   if (length(col) == 0) {
     return(x)
   }
 
-  texts <- unlist(dataset[col], use.names = FALSE)
+  texts <- purrr::map_chr(content[, col], paragraph2txt)
 
   # Must evaluate outside add_footnotes due to lazy evaluation of arguments
   ft <- flextable::compose(x,
@@ -80,3 +82,14 @@ colformat_md <- function(x,
 where <- function(...) {
   tidyselect::vars_select_helpers$where(...)
 }
+
+paragraph2txt <- function(x) {
+  if (all(is.na(x$txt))) return(NA_character_)
+
+  txt <- x[["txt"]]
+  img <- x[["img_data"]]
+  has_img <- !purrr::map_lgl(img, is.null) & !is.na(img)
+  txt[has_img] <- sprintf("![](%s)", img[has_img])
+
+  paste(txt[!is.na(txt)], collapse = "")
+}
diff --git a/docs/articles/format_columns.html b/docs/articles/format_columns.html
diff --git a/docs/articles/group-rows.html b/docs/articles/group-rows.html
diff --git a/docs/articles/transform-headers.html b/docs/articles/transform-headers.html
diff --git a/docs/news/index.html b/docs/news/index.html
diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml
@@ -5,5 +5,5 @@ articles:
   format_columns: format_columns.html
   group-rows: group-rows.html
   transform-headers: transform-headers.html
-last_built: 2022-04-18T10:41Z
+last_built: 2022-04-18T11:47Z
 
diff --git a/docs/sitemap.xml b/docs/sitemap.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
+  <url>
+    <loc>/404.html</loc>
+  </url>
+  <url>
+    <loc>/LICENSE-text.html</loc>
+  </url>
+  <url>
+    <loc>/LICENSE.html</loc>
+  </url>
+  <url>
+    <loc>/articles/format_columns.html</loc>
+  </url>
+  <url>
+    <loc>/articles/group-rows.html</loc>
+  </url>
+  <url>
+    <loc>/articles/index.html</loc>
+  </url>
+  <url>
+    <loc>/articles/transform-headers.html</loc>
+  </url>
+  <url>
+    <loc>/authors.html</loc>
+  </url>
+  <url>
+    <loc>/format_columns.html</loc>
+  </url>
+  <url>
+    <loc>/index.html</loc>
+  </url>
+  <url>
+    <loc>/news/index.html</loc>
+  </url>
+  <url>
+    <loc>/reference/as_flextable_methods.html</loc>
+  </url>
+  <url>
+    <loc>/reference/as_paragraph_md.html</loc>
+  </url>
+  <url>
+    <loc>/reference/colformat_md.html</loc>
+  </url>
+  <url>
+    <loc>/reference/footnote_options.html</loc>
+  </url>
+  <url>
+    <loc>/reference/index.html</loc>
+  </url>
+  <url>
+    <loc>/reference/reexports.html</loc>
+  </url>
+  <url>
+    <loc>/reference/separate_header.html</loc>
+  </url>
+  <url>
+    <loc>/reference/span_header.html</loc>
+  </url>
+  <url>
+    <loc>/reference/with_blanks.html</loc>
+  </url>
+</urlset>