From 8a512294d0960dd133d486855637d34465545080 Mon Sep 17 00:00:00 2001 From: Joe Zhu Date: Mon, 24 Nov 2025 11:03:11 +0800 Subject: [PATCH 01/12] Update DESCRIPTION Signed-off-by: Joe Zhu --- DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index f48836d01..f237e5121 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -29,7 +29,7 @@ Depends: Imports: checkmate (>= 2.1.0), grid, - htmltools (>= 0.5.3), + htmltools (>= 0.5.8.1), lifecycle (>= 0.2.0), stringi (>= 1.7.12) Suggests: From 6f6710ab6a79413012d651633cbd5764ea2e56e1 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 24 Nov 2025 03:07:07 +0000 Subject: [PATCH 02/12] [skip roxygen] [skip vbump] Roxygen Man Pages Auto Update --- DESCRIPTION | 2 +- man/test_matrix_form.Rd | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index f237e5121..7241001b8 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -53,7 +53,7 @@ Encoding: UTF-8 Language: en-US LazyData: true Roxygen: list(markdown = TRUE) -RoxygenNote: 7.3.2 +RoxygenNote: 7.3.3 Collate: 'data.R' 'format_value.R' diff --git a/man/test_matrix_form.Rd b/man/test_matrix_form.Rd index eec95db01..7431af406 100644 --- a/man/test_matrix_form.Rd +++ b/man/test_matrix_form.Rd @@ -86,7 +86,7 @@ respects the default formats for a listing object. mform <- basic_matrix_form(mtcars) cat(toString(mform)) -\dontshow{if (require("dplyr")) (if (getRversion() >= "3.4") withAutoprint else force)(\{ # examplesIf} +\dontshow{if (require("dplyr")) withAutoprint(\{ # examplesIf} # Advanced test case with label rows library(dplyr) iris_output <- iris \%>\% From c117e00647730797cbe2b73254d6bdd7b80db244 Mon Sep 17 00:00:00 2001 From: Joe Zhu Date: Mon, 24 Nov 2025 11:12:10 +0800 Subject: [PATCH 03/12] Add digest package as a suggested dependency Signed-off-by: Joe Zhu --- DESCRIPTION | 1 + 1 file changed, 1 insertion(+) diff --git a/DESCRIPTION b/DESCRIPTION index 7241001b8..716d61a7f 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -33,6 +33,7 @@ Imports: lifecycle (>= 0.2.0), stringi (>= 1.7.12) Suggests: + digest (>= 0.6.37), dplyr (>= 1.0.9), gt (>= 0.10.0), huxtable (>= 2.0.0), From d681fa21992b01189e365705911aaca17510330d Mon Sep 17 00:00:00 2001 From: Joe Zhu Date: Mon, 24 Nov 2025 11:33:37 +0800 Subject: [PATCH 04/12] Add processx dependency version 3.8.4 Signed-off-by: Joe Zhu --- DESCRIPTION | 1 + 1 file changed, 1 insertion(+) diff --git a/DESCRIPTION b/DESCRIPTION index 716d61a7f..b60d49593 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -38,6 +38,7 @@ Suggests: gt (>= 0.10.0), huxtable (>= 2.0.0), knitr (>= 1.42), + processx (>= 3.8.4), r2rtf (>= 0.3.2), rmarkdown (>= 2.23), testthat (>= 3.0.4), From b96f3a14c75f1eb4801d38eb6b7567581d64fc6d Mon Sep 17 00:00:00 2001 From: Joe Zhu Date: Mon, 24 Nov 2025 12:02:31 +0800 Subject: [PATCH 05/12] Update testthat version requirement to 3.2.1.1 Signed-off-by: Joe Zhu --- DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index b60d49593..438b7090f 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -41,7 +41,7 @@ Suggests: processx (>= 3.8.4), r2rtf (>= 0.3.2), rmarkdown (>= 2.23), - testthat (>= 3.0.4), + testthat (>= 3.2.1.1), withr (>= 2.0.0) VignetteBuilder: knitr, From 468e3c5daef0ebc36cd4309b0bead330f56d4870 Mon Sep 17 00:00:00 2001 From: Joe Zhu Date: Mon, 24 Nov 2025 12:12:41 +0800 Subject: [PATCH 06/12] Update DESCRIPTION Signed-off-by: Joe Zhu --- DESCRIPTION | 1 + 1 file changed, 1 insertion(+) diff --git a/DESCRIPTION b/DESCRIPTION index 438b7090f..0fe5f808d 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -41,6 +41,7 @@ Suggests: processx (>= 3.8.4), r2rtf (>= 0.3.2), rmarkdown (>= 2.23), + sass (>= 0.4.9), testthat (>= 3.2.1.1), withr (>= 2.0.0) VignetteBuilder: From 9ccbc3063a099a7dfd0e6853f974bb85cb3147a3 Mon Sep 17 00:00:00 2001 From: Joe Zhu Date: Mon, 24 Nov 2025 13:14:33 +0800 Subject: [PATCH 07/12] Modify knitr options and include dependencies Updated knitr chunk options and added suggested dependent packages. Signed-off-by: Joe Zhu --- vignettes/formatters.Rmd | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/vignettes/formatters.Rmd b/vignettes/formatters.Rmd index 066d7ca09..d9888fd7e 100644 --- a/vignettes/formatters.Rmd +++ b/vignettes/formatters.Rmd @@ -13,8 +13,22 @@ editor_options: wrap: 72 --- -```{r, echo=FALSE} -knitr::opts_chunk$set(comment = "") +```{r, include = FALSE} +suggested_dependent_pkgs <- c("dplyr") +knitr::opts_chunk$set( + collapse = TRUE, + comment = "#>", + eval = all(vapply( + suggested_dependent_pkgs, + requireNamespace, + logical(1), + quietly = TRUE + )) +) +``` + +```{r, echo=FALSE, message=FALSE} +knitr::opts_chunk$set(comment = "#") library(formatters) ``` From a3e49254dd2979f1fd4b5f4d8565e02893a389d1 Mon Sep 17 00:00:00 2001 From: Joe Zhu Date: Mon, 24 Nov 2025 13:14:51 +0800 Subject: [PATCH 08/12] Clear suggested_dependent_pkgs initialization Signed-off-by: Joe Zhu --- vignettes/formatters.Rmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vignettes/formatters.Rmd b/vignettes/formatters.Rmd index d9888fd7e..6c0eee786 100644 --- a/vignettes/formatters.Rmd +++ b/vignettes/formatters.Rmd @@ -14,7 +14,7 @@ editor_options: --- ```{r, include = FALSE} -suggested_dependent_pkgs <- c("dplyr") +suggested_dependent_pkgs <- c("") knitr::opts_chunk$set( collapse = TRUE, comment = "#>", From a47adb566419f1828674bc0753ebf09ad46750b3 Mon Sep 17 00:00:00 2001 From: Joe Zhu Date: Mon, 24 Nov 2025 13:25:28 +0800 Subject: [PATCH 09/12] Change suggested_dependent_pkgs to an empty vector Updated suggested_dependent_pkgs to use an empty vector. Signed-off-by: Joe Zhu --- vignettes/formatters.Rmd | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vignettes/formatters.Rmd b/vignettes/formatters.Rmd index 6c0eee786..f6cec33d6 100644 --- a/vignettes/formatters.Rmd +++ b/vignettes/formatters.Rmd @@ -14,7 +14,8 @@ editor_options: --- ```{r, include = FALSE} -suggested_dependent_pkgs <- c("") +# Change: suggested_dependent_pkgs <- c("") +suggested_dependent_pkgs <- character(0) # Use an empty vector knitr::opts_chunk$set( collapse = TRUE, comment = "#>", From 770df33a5870ce32e29776bee47e6380e404a6b3 Mon Sep 17 00:00:00 2001 From: Joe Zhu Date: Mon, 24 Nov 2025 16:52:25 +0800 Subject: [PATCH 10/12] Update formatters.Rmd test Signed-off-by: Joe Zhu --- vignettes/formatters.Rmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vignettes/formatters.Rmd b/vignettes/formatters.Rmd index f6cec33d6..8f5e0630a 100644 --- a/vignettes/formatters.Rmd +++ b/vignettes/formatters.Rmd @@ -157,5 +157,5 @@ matrix_form.data.frame <- function(df) { ) } -cat(toString(matrix_form.data.frame(mtcars))) +print(matrix_form.data.frame(mtcars)) ``` From d0ae5c67186ada03fe6bf9256aec7d8fbe29c917 Mon Sep 17 00:00:00 2001 From: Joe Zhu Date: Mon, 24 Nov 2025 17:14:06 +0800 Subject: [PATCH 11/12] Update knitr and rmarkdown version requirements Updated package version requirements for knitr and rmarkdown. Signed-off-by: Joe Zhu --- DESCRIPTION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 0fe5f808d..d6bdad676 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -37,10 +37,10 @@ Suggests: dplyr (>= 1.0.9), gt (>= 0.10.0), huxtable (>= 2.0.0), - knitr (>= 1.42), + knitr (>= 1.50), processx (>= 3.8.4), r2rtf (>= 0.3.2), - rmarkdown (>= 2.23), + rmarkdown (>= 2.28), sass (>= 0.4.9), testthat (>= 3.2.1.1), withr (>= 2.0.0) From 194e794001929205171bf2678c373234a3680b58 Mon Sep 17 00:00:00 2001 From: Joe Zhu Date: Mon, 24 Nov 2025 17:24:06 +0800 Subject: [PATCH 12/12] Refactor R Markdown formatters.Rmd Removed unused chunk for suggested dependent packages and updated chunk options. Signed-off-by: Joe Zhu --- vignettes/formatters.Rmd | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/vignettes/formatters.Rmd b/vignettes/formatters.Rmd index 8f5e0630a..066d7ca09 100644 --- a/vignettes/formatters.Rmd +++ b/vignettes/formatters.Rmd @@ -13,23 +13,8 @@ editor_options: wrap: 72 --- -```{r, include = FALSE} -# Change: suggested_dependent_pkgs <- c("") -suggested_dependent_pkgs <- character(0) # Use an empty vector -knitr::opts_chunk$set( - collapse = TRUE, - comment = "#>", - eval = all(vapply( - suggested_dependent_pkgs, - requireNamespace, - logical(1), - quietly = TRUE - )) -) -``` - -```{r, echo=FALSE, message=FALSE} -knitr::opts_chunk$set(comment = "#") +```{r, echo=FALSE} +knitr::opts_chunk$set(comment = "") library(formatters) ``` @@ -157,5 +142,5 @@ matrix_form.data.frame <- function(df) { ) } -print(matrix_form.data.frame(mtcars)) +cat(toString(matrix_form.data.frame(mtcars))) ```