Skip to content

Commit

Permalink
Merge pull request #101 from atusy/support-flextable-0-9-5
Browse files Browse the repository at this point in the history
fix(colformat_md): follow internal change of flextable data structure
  • Loading branch information
atusy authored Mar 31, 2024
2 parents 862c502 + 236f205 commit 30d5d70
Show file tree
Hide file tree
Showing 16 changed files with 448 additions and 439 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ BugReports: https://github.com/atusy/ftExtra/issues
Imports:
dplyr (>= 1.0.0),
jsonlite,
flextable (>= 0.8.3),
flextable (>= 0.9.5),
tidyr,
purrr (>= 1.0.0),
magrittr,
Expand Down
4 changes: 4 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# ftExtra 0.6.2

* Require **flextable**>=0.9.5 to fix broken `colformat_md` (#101)

# ftExtra 0.6.1

* Deprecated functions masking the corresponding ones from the **flextable** package (#95)
Expand Down
4 changes: 2 additions & 2 deletions R/colformat.R
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ colformat_md <- function(x,
}

dataset <- x[[part]]$dataset
content <- x[[part]][["content"]][["content"]][["data"]]
content <- x[[part]][["content"]][["data"]]
nm <- colnames(content)
col <- tidyselect::eval_select(rlang::expr(c(!!.j)), dataset[nm])

Expand All @@ -63,7 +63,7 @@ colformat_md <- function(x,

# Must evaluate outside add_footnotes due to lazy evaluation of arguments
ft <- flextable::compose(x,
i = seq(nrow(dataset)), j = col, part = part,
i = seq_len(nrow(dataset)), j = col, part = part,
value = as_paragraph_md(
texts,
auto_color_link = auto_color_link,
Expand Down
204 changes: 102 additions & 102 deletions docs/articles/format_columns.html

Large diffs are not rendered by default.

458 changes: 229 additions & 229 deletions docs/articles/group-rows.html

Large diffs are not rendered by default.

172 changes: 86 additions & 86 deletions docs/articles/transform-headers.html

Large diffs are not rendered by default.

9 changes: 5 additions & 4 deletions docs/authors.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion docs/news/index.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions docs/pkgdown.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
pandoc: 3.1.8
pandoc: 3.1.11.1
pkgdown: 2.0.7
pkgdown_sha: ~
articles:
format_columns: format_columns.html
group-rows: group-rows.html
transform-headers: transform-headers.html
last_built: 2023-09-29T00:04Z
last_built: 2024-03-31T12:21Z

10 changes: 5 additions & 5 deletions docs/reference/as_flextable_methods.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/reference/as_paragraph_md.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/reference/colformat_md.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 30d5d70

Please sign in to comment.