diff --git a/DESCRIPTION b/DESCRIPTION index 21458585..75dd0962 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: reporter Type: Package Title: Creates Statistical Reports -Version: 1.4.2 +Version: 1.4.3 Authors@R: c( person("David", "Bosak", email = "dbosak01@gmail.com", role = c("aut", "cre")), person("Kevin", "Kramer", email = "kkrame02@amgen.com", role = "ctb"), diff --git a/NEWS.md b/NEWS.md index 9edb99c2..517b6e1f 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,8 @@ +# reporter 1.4.3 + +* Fix dedupe functionality on `define()` function when values are not unique. +* Fixes for CRAN. + # reporter 1.4.2 * Added example for page breaking. diff --git a/R/utilities.R b/R/utilities.R index 5fbe413c..45334f62 100644 --- a/R/utilities.R +++ b/R/utilities.R @@ -891,11 +891,11 @@ dedupe_pages <- function(pgs, defs) { w <- min(nchar(dat[[def$var_c]])) # Take min to exclude label row v <- paste0(rep(" ", times = w), collapse = "") - # dat[[def$var_c]] <- ifelse(changed(dat[[def$var_c]]), - # dat[[def$var_c]], v) + dat[[def$var_c]] <- ifelse(changed(dat[[def$var_c]]), + dat[[def$var_c]], v) - dat[[def$var_c]] <- ifelse(!duplicated(dat[[def$var_c]]), - dat[[def$var_c]], v) + # dat[[def$var_c]] <- ifelse(!duplicated(dat[[def$var_c]]), + # dat[[def$var_c]], v) } } } diff --git a/docs/404.html b/docs/404.html index 9283b891..d7849c9d 100644 --- a/docs/404.html +++ b/docs/404.html @@ -39,7 +39,7 @@ reporter - 1.4.2 + 1.4.3 diff --git a/docs/LICENSE.html b/docs/LICENSE.html index c85b0437..64a764da 100644 --- a/docs/LICENSE.html +++ b/docs/LICENSE.html @@ -17,7 +17,7 @@ reporter - 1.4.2 + 1.4.3 diff --git a/docs/articles/index.html b/docs/articles/index.html index e62c2235..ffdfbdc8 100644 --- a/docs/articles/index.html +++ b/docs/articles/index.html @@ -17,7 +17,7 @@ reporter - 1.4.2 + 1.4.3 diff --git a/docs/articles/reporter-break.html b/docs/articles/reporter-break.html index 09ac737d..5c7647b1 100644 --- a/docs/articles/reporter-break.html +++ b/docs/articles/reporter-break.html @@ -40,7 +40,7 @@ reporter - 1.4.2 + 1.4.3 diff --git a/docs/articles/reporter-faq.html b/docs/articles/reporter-faq.html index d8ae7de8..00ea15c0 100644 --- a/docs/articles/reporter-faq.html +++ b/docs/articles/reporter-faq.html @@ -40,7 +40,7 @@ reporter - 1.4.2 + 1.4.3 diff --git a/docs/articles/reporter-figure.html b/docs/articles/reporter-figure.html index 30aa42af..b794d4f6 100644 --- a/docs/articles/reporter-figure.html +++ b/docs/articles/reporter-figure.html @@ -40,7 +40,7 @@ reporter - 1.4.2 + 1.4.3 diff --git a/docs/articles/reporter-fonts.html b/docs/articles/reporter-fonts.html index fd0fcaa0..b17dd534 100644 --- a/docs/articles/reporter-fonts.html +++ b/docs/articles/reporter-fonts.html @@ -40,7 +40,7 @@ reporter - 1.4.2 + 1.4.3 diff --git a/docs/articles/reporter-listing.html b/docs/articles/reporter-listing.html index acb50667..885d43c3 100644 --- a/docs/articles/reporter-listing.html +++ b/docs/articles/reporter-listing.html @@ -40,7 +40,7 @@ reporter - 1.4.2 + 1.4.3 diff --git a/docs/articles/reporter-more.html b/docs/articles/reporter-more.html index 0ba97b55..eb890c67 100644 --- a/docs/articles/reporter-more.html +++ b/docs/articles/reporter-more.html @@ -40,7 +40,7 @@ reporter - 1.4.2 + 1.4.3 diff --git a/docs/articles/reporter-pageby.html b/docs/articles/reporter-pageby.html index 8fdaa607..33ac9d77 100644 --- a/docs/articles/reporter-pageby.html +++ b/docs/articles/reporter-pageby.html @@ -40,7 +40,7 @@ reporter - 1.4.2 + 1.4.3 diff --git a/docs/articles/reporter-rtf.html b/docs/articles/reporter-rtf.html index ac9bd489..6e0a3882 100644 --- a/docs/articles/reporter-rtf.html +++ b/docs/articles/reporter-rtf.html @@ -40,7 +40,7 @@ reporter - 1.4.2 + 1.4.3 diff --git a/docs/articles/reporter-spanning.html b/docs/articles/reporter-spanning.html index 4ec0753b..08906ff3 100644 --- a/docs/articles/reporter-spanning.html +++ b/docs/articles/reporter-spanning.html @@ -40,7 +40,7 @@ reporter - 1.4.2 + 1.4.3 diff --git a/docs/articles/reporter-stub.html b/docs/articles/reporter-stub.html index e93f91bb..578320d4 100644 --- a/docs/articles/reporter-stub.html +++ b/docs/articles/reporter-stub.html @@ -40,7 +40,7 @@ reporter - 1.4.2 + 1.4.3 diff --git a/docs/articles/reporter-styles.html b/docs/articles/reporter-styles.html index 9f0aa9c5..9d754e86 100644 --- a/docs/articles/reporter-styles.html +++ b/docs/articles/reporter-styles.html @@ -40,7 +40,7 @@ reporter - 1.4.2 + 1.4.3 diff --git a/docs/articles/reporter-super.html b/docs/articles/reporter-super.html index 028e5b3a..15417671 100644 --- a/docs/articles/reporter-super.html +++ b/docs/articles/reporter-super.html @@ -40,7 +40,7 @@ reporter - 1.4.2 + 1.4.3 diff --git a/docs/articles/reporter-table.html b/docs/articles/reporter-table.html index 8f2b02fa..121b9fe5 100644 --- a/docs/articles/reporter-table.html +++ b/docs/articles/reporter-table.html @@ -40,7 +40,7 @@ reporter - 1.4.2 + 1.4.3 diff --git a/docs/articles/reporter-text.html b/docs/articles/reporter-text.html index 2ff5baee..edd5aaf5 100644 --- a/docs/articles/reporter-text.html +++ b/docs/articles/reporter-text.html @@ -40,7 +40,7 @@ reporter - 1.4.2 + 1.4.3 diff --git a/docs/articles/reporter-title_header.html b/docs/articles/reporter-title_header.html index d06c68be..00a71602 100644 --- a/docs/articles/reporter-title_header.html +++ b/docs/articles/reporter-title_header.html @@ -40,7 +40,7 @@ reporter - 1.4.2 + 1.4.3 diff --git a/docs/articles/reporter-wrap.html b/docs/articles/reporter-wrap.html index 96e30318..55247f34 100644 --- a/docs/articles/reporter-wrap.html +++ b/docs/articles/reporter-wrap.html @@ -40,7 +40,7 @@ reporter - 1.4.2 + 1.4.3 diff --git a/docs/articles/reporter.html b/docs/articles/reporter.html index 3e1ccc5b..455f0a3f 100644 --- a/docs/articles/reporter.html +++ b/docs/articles/reporter.html @@ -40,7 +40,7 @@ reporter - 1.4.2 + 1.4.3 diff --git a/docs/authors.html b/docs/authors.html index 82b4f8a4..6e8c6b03 100644 --- a/docs/authors.html +++ b/docs/authors.html @@ -17,7 +17,7 @@ reporter - 1.4.2 + 1.4.3 @@ -140,13 +140,13 @@

Citation

Bosak D (2023). reporter: Creates Statistical Reports. -R package version 1.4.2, https://reporter.r-sassy.org. +R package version 1.4.3, https://reporter.r-sassy.org. 

@Manual{,
   title = {reporter: Creates Statistical Reports},
   author = {David Bosak},
   year = {2023},
-  note = {R package version 1.4.2},
+  note = {R package version 1.4.3},
   url = {https://reporter.r-sassy.org},
 }
diff --git a/docs/index.html b/docs/index.html index 583798e9..bea95e84 100644 --- a/docs/index.html +++ b/docs/index.html @@ -50,7 +50,7 @@ reporter - 1.4.2 + 1.4.3 diff --git a/docs/news/index.html b/docs/news/index.html index 0dcb9850..ddb912ca 100644 --- a/docs/news/index.html +++ b/docs/news/index.html @@ -17,7 +17,7 @@ reporter - 1.4.2 + 1.4.3 @@ -109,7 +109,12 @@

Changelog

-

reporter 1.4.2

+

reporter 1.4.3

+
+
+

reporter 1.4.22023-09-30

diff --git a/docs/reference/add_content.html b/docs/reference/add_content.html index dd8f8828..5ebb6d50 100644 --- a/docs/reference/add_content.html +++ b/docs/reference/add_content.html @@ -20,7 +20,7 @@ reporter - 1.4.2 + 1.4.3 diff --git a/docs/reference/add_style.html b/docs/reference/add_style.html index 089e6a2b..aa56f827 100644 --- a/docs/reference/add_style.html +++ b/docs/reference/add_style.html @@ -19,7 +19,7 @@ reporter - 1.4.2 + 1.4.3 diff --git a/docs/reference/cell_style.html b/docs/reference/cell_style.html index 46454d48..d5f5d0ae 100644 --- a/docs/reference/cell_style.html +++ b/docs/reference/cell_style.html @@ -24,7 +24,7 @@ reporter - 1.4.2 + 1.4.3 diff --git a/docs/reference/column_defaults.html b/docs/reference/column_defaults.html index ce7521a4..c083d20d 100644 --- a/docs/reference/column_defaults.html +++ b/docs/reference/column_defaults.html @@ -22,7 +22,7 @@ reporter - 1.4.2 + 1.4.3 diff --git a/docs/reference/create_plot.html b/docs/reference/create_plot.html index 588a3f82..8eecb6e9 100644 --- a/docs/reference/create_plot.html +++ b/docs/reference/create_plot.html @@ -23,7 +23,7 @@ reporter - 1.4.2 + 1.4.3 diff --git a/docs/reference/create_report.html b/docs/reference/create_report.html index 2a5517c7..71d726a3 100644 --- a/docs/reference/create_report.html +++ b/docs/reference/create_report.html @@ -17,7 +17,7 @@ reporter - 1.4.2 + 1.4.3 diff --git a/docs/reference/create_style.html b/docs/reference/create_style.html index bcfd430d..0dc42119 100644 --- a/docs/reference/create_style.html +++ b/docs/reference/create_style.html @@ -20,7 +20,7 @@ reporter - 1.4.2 + 1.4.3 diff --git a/docs/reference/create_table.html b/docs/reference/create_table.html index 557db6aa..61a331b5 100644 --- a/docs/reference/create_table.html +++ b/docs/reference/create_table.html @@ -20,7 +20,7 @@ reporter - 1.4.2 + 1.4.3 diff --git a/docs/reference/create_text.html b/docs/reference/create_text.html index 1ca13984..2763dfe1 100644 --- a/docs/reference/create_text.html +++ b/docs/reference/create_text.html @@ -20,7 +20,7 @@ reporter - 1.4.2 + 1.4.3 diff --git a/docs/reference/define.html b/docs/reference/define.html index be702d02..e0d76080 100644 --- a/docs/reference/define.html +++ b/docs/reference/define.html @@ -21,7 +21,7 @@ reporter - 1.4.2 + 1.4.3 diff --git a/docs/reference/footnotes.html b/docs/reference/footnotes.html index ca66d59d..6651e1ef 100644 --- a/docs/reference/footnotes.html +++ b/docs/reference/footnotes.html @@ -20,7 +20,7 @@ reporter - 1.4.2 + 1.4.3 diff --git a/docs/reference/ftn.html b/docs/reference/ftn.html index 1c058f71..21aab19f 100644 --- a/docs/reference/ftn.html +++ b/docs/reference/ftn.html @@ -20,7 +20,7 @@ reporter - 1.4.2 + 1.4.3 diff --git a/docs/reference/get_theme.html b/docs/reference/get_theme.html index 608e7dd4..a7d562bf 100644 --- a/docs/reference/get_theme.html +++ b/docs/reference/get_theme.html @@ -19,7 +19,7 @@ reporter - 1.4.2 + 1.4.3 diff --git a/docs/reference/index.html b/docs/reference/index.html index 6eb15359..09453b9c 100644 --- a/docs/reference/index.html +++ b/docs/reference/index.html @@ -17,7 +17,7 @@ reporter - 1.4.2 + 1.4.3 diff --git a/docs/reference/lowcase_parens.html b/docs/reference/lowcase_parens.html index 525f7cc5..4604bba1 100644 --- a/docs/reference/lowcase_parens.html +++ b/docs/reference/lowcase_parens.html @@ -18,7 +18,7 @@ reporter - 1.4.2 + 1.4.3 diff --git a/docs/reference/options_fixed.html b/docs/reference/options_fixed.html index 55398cd1..9d3554c2 100644 --- a/docs/reference/options_fixed.html +++ b/docs/reference/options_fixed.html @@ -18,7 +18,7 @@ reporter - 1.4.2 + 1.4.3 diff --git a/docs/reference/page_by.html b/docs/reference/page_by.html index d9a6f4a7..f9fc4bb0 100644 --- a/docs/reference/page_by.html +++ b/docs/reference/page_by.html @@ -22,7 +22,7 @@ reporter - 1.4.2 + 1.4.3 diff --git a/docs/reference/page_footer.html b/docs/reference/page_footer.html index 4ccd488d..143bf0c0 100644 --- a/docs/reference/page_footer.html +++ b/docs/reference/page_footer.html @@ -20,7 +20,7 @@ reporter - 1.4.2 + 1.4.3 diff --git a/docs/reference/page_header.html b/docs/reference/page_header.html index 68725853..310b906c 100644 --- a/docs/reference/page_header.html +++ b/docs/reference/page_header.html @@ -18,7 +18,7 @@ reporter - 1.4.2 + 1.4.3 diff --git a/docs/reference/print.plot_spec.html b/docs/reference/print.plot_spec.html index cd37e26d..2e177bf7 100644 --- a/docs/reference/print.plot_spec.html +++ b/docs/reference/print.plot_spec.html @@ -19,7 +19,7 @@ reporter - 1.4.2 + 1.4.3 diff --git a/docs/reference/print.report_spec.html b/docs/reference/print.report_spec.html index 74f4e6d2..d3533b82 100644 --- a/docs/reference/print.report_spec.html +++ b/docs/reference/print.report_spec.html @@ -20,7 +20,7 @@ reporter - 1.4.2 + 1.4.3 diff --git a/docs/reference/print.style_spec.html b/docs/reference/print.style_spec.html index 4ee247fa..26252f7c 100644 --- a/docs/reference/print.style_spec.html +++ b/docs/reference/print.style_spec.html @@ -19,7 +19,7 @@ reporter - 1.4.2 + 1.4.3 diff --git a/docs/reference/print.table_spec.html b/docs/reference/print.table_spec.html index 2b1b8c16..eeaf2316 100644 --- a/docs/reference/print.table_spec.html +++ b/docs/reference/print.table_spec.html @@ -19,7 +19,7 @@ reporter - 1.4.2 + 1.4.3 diff --git a/docs/reference/print.text_spec.html b/docs/reference/print.text_spec.html index d5b058a4..260835ae 100644 --- a/docs/reference/print.text_spec.html +++ b/docs/reference/print.text_spec.html @@ -19,7 +19,7 @@ reporter - 1.4.2 + 1.4.3 diff --git a/docs/reference/reporter.html b/docs/reference/reporter.html index 38467618..c880c5bd 100644 --- a/docs/reference/reporter.html +++ b/docs/reference/reporter.html @@ -22,7 +22,7 @@ reporter - 1.4.2 + 1.4.3 diff --git a/docs/reference/set_margins.html b/docs/reference/set_margins.html index f20080fa..3d06f239 100644 --- a/docs/reference/set_margins.html +++ b/docs/reference/set_margins.html @@ -19,7 +19,7 @@ reporter - 1.4.2 + 1.4.3 diff --git a/docs/reference/span.html b/docs/reference/span.html index 280298a5..02ed016f 100644 --- a/docs/reference/span.html +++ b/docs/reference/span.html @@ -20,7 +20,7 @@ reporter - 1.4.2 + 1.4.3 diff --git a/docs/reference/spanning_header.html b/docs/reference/spanning_header.html index 140a14e9..677f12e0 100644 --- a/docs/reference/spanning_header.html +++ b/docs/reference/spanning_header.html @@ -19,7 +19,7 @@ reporter - 1.4.2 + 1.4.3 diff --git a/docs/reference/stub.html b/docs/reference/stub.html index 362935ea..ce8509c8 100644 --- a/docs/reference/stub.html +++ b/docs/reference/stub.html @@ -22,7 +22,7 @@ reporter - 1.4.2 + 1.4.3 diff --git a/docs/reference/title_header.html b/docs/reference/title_header.html index cdb6222b..8bd5ccfb 100644 --- a/docs/reference/title_header.html +++ b/docs/reference/title_header.html @@ -19,7 +19,7 @@ reporter - 1.4.2 + 1.4.3 diff --git a/docs/reference/titles.html b/docs/reference/titles.html index 19d7d2de..d51cd620 100644 --- a/docs/reference/titles.html +++ b/docs/reference/titles.html @@ -21,7 +21,7 @@ reporter - 1.4.2 + 1.4.3 diff --git a/docs/reference/ttl.html b/docs/reference/ttl.html index a58fc452..6bdd5d21 100644 --- a/docs/reference/ttl.html +++ b/docs/reference/ttl.html @@ -19,7 +19,7 @@ reporter - 1.4.2 + 1.4.3 diff --git a/docs/reference/write_registration_file.html b/docs/reference/write_registration_file.html index 4e496814..c3581c42 100644 --- a/docs/reference/write_registration_file.html +++ b/docs/reference/write_registration_file.html @@ -18,7 +18,7 @@ reporter - 1.4.2 + 1.4.3 diff --git a/docs/reference/write_report.html b/docs/reference/write_report.html index 558cbce5..d1e3e7e2 100644 --- a/docs/reference/write_report.html +++ b/docs/reference/write_report.html @@ -18,7 +18,7 @@ reporter - 1.4.2 + 1.4.3 diff --git a/tests/testthat/Rplots.pdf b/tests/testthat/Rplots.pdf index e7c5254a..c198b6ca 100644 Binary files a/tests/testthat/Rplots.pdf and b/tests/testthat/Rplots.pdf differ diff --git a/tests/testthat/docx/test50.docx b/tests/testthat/docx/test50.docx new file mode 100644 index 00000000..fc87b8c6 Binary files /dev/null and b/tests/testthat/docx/test50.docx differ diff --git a/tests/testthat/docx/test51.docx b/tests/testthat/docx/test51.docx new file mode 100644 index 00000000..9925db5f Binary files /dev/null and b/tests/testthat/docx/test51.docx differ diff --git a/tests/testthat/docx/test53.docx b/tests/testthat/docx/test53.docx new file mode 100644 index 00000000..97695db3 Binary files /dev/null and b/tests/testthat/docx/test53.docx differ diff --git a/tests/testthat/pdf2/test58.pdf b/tests/testthat/pdf2/test58.pdf new file mode 100644 index 00000000..49c0d366 Binary files /dev/null and b/tests/testthat/pdf2/test58.pdf differ diff --git a/tests/testthat/test-docx.R b/tests/testthat/test-docx.R index 5b2328e8..63bd404a 100644 --- a/tests/testthat/test-docx.R +++ b/tests/testthat/test-docx.R @@ -1796,7 +1796,7 @@ test_that("docx50: Page by with wrap works as expected.", { }) -test_that("docx51: Page by with wrap works as expected.", { +test_that("docx51: Page by with format works as expected.", { fp <- file.path(base_path, "docx/test51.docx") @@ -1878,6 +1878,40 @@ test_that("docx52: Borders work as expected.", { }) +test_that("docx53: Page by with wrap on report works as expected.", { + + + fp <- file.path(base_path, "docx/test53.docx") + + dat <- iris + dat$Pgby <- as.character(dat$Species) + dat$Pgby <- paste0("Flower Type\n", dat$Pgby) + + + tbl <- create_table(dat, borders = "none") %>% + titles("Table 1.0", "My Nice Report with a Page By", borders = "none") %>% + define(Pgby, visible = FALSE) + + rpt <- create_report(fp, output_type = "DOCX", font = fnt, + font_size = fsz, orientation = "landscape") %>% + set_margins(top = 1, bottom = 1) %>% + add_content(tbl) %>% + page_by(Pgby, label = "Species: ", align = "right", borders = "none") %>% + page_header("Left", "Right") %>% + page_footer("Left1", "Center1", "Right1") %>% + footnotes("My footnote 1", "My footnote 2", borders = "none") + + res <- write_report(rpt) + res + res$column_widths + + expect_equal(file.exists(fp), TRUE) + expect_equal(res$pages, 9) + expect_equal(length(res$column_widths[[1]]), 5) + + +}) + # User Tests -------------------------------------------------------------- diff --git a/tests/testthat/test-pdf2.R b/tests/testthat/test-pdf2.R index 3da469c5..f7c69a49 100644 --- a/tests/testthat/test-pdf2.R +++ b/tests/testthat/test-pdf2.R @@ -2171,31 +2171,38 @@ test_that("pdf2-57: Page header width works.", { test_that("pdf2-58: Glue feature works.", { - library(common) - - fp <- file.path(base_path, "pdf2/test58.pdf") - - tbl <- create_table(mtcars[1:10, ], borders = "outside") %>% - spanning_header(1, 4, label = "My span{subsc('4')}") %>% - define(mpg, label = "Mpg{subsc('3')}") - - myvar <- "23" - - rpt <- create_report(fp, output_type = "PDF", font = "Courier") %>% - page_header(c("Left {supsc('2')}really long left ", - "cell text to put it{supsc('3')} and more and more"), - "Right{supsc('x')}") %>% - add_content(tbl) %>% - page_footer(c("left1{supsc('5')}", "left2{supsc('6')}"), "", - "right{supsc('7')}") %>% - titles("Table 1.0{supsc('1')}", "IRIS Data Frame{{myvar}}", - blank_row = "below") %>% - footnotes("Here is a footnote{subsc('a')}", "And another{subsc('9')}") - - - res <- write_report(rpt) + if (dev) { + library(common) + + fp <- file.path(base_path, "pdf2/test58.pdf") + + tbl <- create_table(mtcars[1:10, ], borders = "outside") %>% + spanning_header(1, 4, label = "My span{subsc('4')}") %>% + define(mpg, label = "Mpg{subsc('3')}") + + myvar <- "23" + + rpt <- create_report(fp, output_type = "PDF", font = "Courier") %>% + page_header(c("Left {supsc('2')}really long left ", + "cell text to put it{supsc('3')} and more and more"), + "Right{supsc('x')}") %>% + add_content(tbl) %>% + page_footer(c("left1{supsc('5')}", "left2{supsc('6')}"), "", + "right{supsc('7')}") %>% + titles("Table 1.0{supsc('1')}", "IRIS Data Frame{{myvar}}", + blank_row = "below") %>% + footnotes("Here is a footnote{subsc('a')}", "And another{subsc('9')}") + + + res <- write_report(rpt) + + expect_equal(file.exists(fp), TRUE) - expect_equal(file.exists(fp), TRUE) + } else { + + expect_equal(TRUE, TRUE) + + }