Skip to content

Commit

Permalink
update deps, [skip vbump] (#884)
Browse files Browse the repository at this point in the history
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
  • Loading branch information
shajoezhu and github-actions[bot] authored Jun 20, 2024
1 parent 96d1b39 commit 2ea0373
Show file tree
Hide file tree
Showing 17 changed files with 70 additions and 71 deletions.
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: rtables
Title: Reporting Tables
Version: 0.6.7.9007
Version: 0.6.8
Date: 2024-06-16
Authors@R: c(
person("Gabriel", "Becker", , "gabembecker@gmail.com", role = "aut",
Expand Down Expand Up @@ -29,7 +29,7 @@ URL: https://github.com/insightsengineering/rtables,
https://insightsengineering.github.io/rtables/
BugReports: https://github.com/insightsengineering/rtables/issues
Depends:
formatters (>= 0.5.7.9001),
formatters (>= 0.5.8),
magrittr (>= 1.5),
methods,
R (>= 2.10)
Expand Down
4 changes: 2 additions & 2 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## rtables 0.6.7.9007
## rtables 0.6.8
### New Features
* Add support for truetype fonts based on `formatters` version `>= 0.5.6.9007`. Nearly all functions related to pagination or export now accept `fontspec` argument and pass it around accordingly, by @gmbecker.
* Add support for `truetype` fonts based on `formatters` version `>= 0.5.8`. Nearly all functions related to pagination or export now accept `fontspec` argument and pass it around accordingly, by @gmbecker.
* Core splitting machinery can now be overridden in column space via `make_split_fun` provided that `core_split` associates the generated facets with subsetting expressions. Subsetting expressions remain unnecessary for splits in row space. By @gmbecker.
* ValueWrapper objects now carry around subsetting expressions for use during tabulation, by @gmbecker.
* `make_split_res`, `add_to_split_result` now accept a list of subsetting expressions which will be attached to the values, by @gmbecker.
Expand Down
10 changes: 5 additions & 5 deletions R/argument_conventions.R
Original file line number Diff line number Diff line change
Expand Up @@ -170,13 +170,13 @@ lyt_args <- function(lyt, var, vars, label, labels_var, varlabels, varnames, spl
#' if not specified.
#' @param lev (`integer(1)`)\cr nesting level (roughly, indentation level in practical terms).
#' @param main_footer (`character`)\cr a vector of strings to use as main global (non-referential) footer materials
#' ([main_footer()]), where every element is printed on a separate line.
#' ([formatters::main_footer()]), where every element is printed on a separate line.
#' @param page_title (`character`)\cr page-specific title(s).
#' @param prov_footer (`character`)\cr a vector of strings to use as provenance-related global footer materials
#' ([prov_footer()]), where every element is printed on a separate line.
#' @param subtitles (`character`)\cr a vector of strings to use as subtitles ([subtitles()]), where every element is
#' printed on a separate line. Ignored for subtables.
#' @param title (`string`)\cr single string to use as main title ([main_title()]). Ignored for subtables.
#' ([formatters::prov_footer()]), where every element is printed on a separate line.
#' @param subtitles (`character`)\cr a vector of strings to use as subtitles ([formatters::subtitles()]), where every
#' element is printed on a separate line. Ignored for subtables.
#' @param title (`string`)\cr single string to use as main title ([formatters::main_title()]). Ignored for subtables.
#' @param trailing_section_div (`string`)\cr string which will be used as a section divider after the printing
#' of the last row contained in this (sub)table, unless that row is also the last table row to be printed overall,
#' or `NA_character_` for none (the default). When generated via layouting, this would correspond to the
Expand Down
5 changes: 3 additions & 2 deletions R/colby_constructors.R
Original file line number Diff line number Diff line change
Expand Up @@ -2025,8 +2025,9 @@ list_wrap_df <- function(f) {
#' strange results, such as that individual arm columns and a combined "all patients" column all list "100%" as
#' their percentage, even though the individual arm columns represent strict subsets of the "all patients" column.
#'
#' - Note that subtitles ([subtitles()]) and footers ([main_footer()] and [prov_footer()]) that span more than one
#' line can be supplied as a character vector to maintain indentation on multiple lines.
#' - Note that subtitles ([formatters::subtitles()]) and footers ([formatters::main_footer()] and
#' [formatters::prov_footer()]) that span more than one line can be supplied as a character vector to maintain
#' indentation on multiple lines.
#'
#' @examples
#' lyt <- basic_table() %>%
Expand Down
3 changes: 0 additions & 3 deletions R/tree_accessors.R
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
## XXX Do we want add.labrows here or no?
## we have to choose one and stick to it.

#' Internal generics and methods
#'
#' These are internal methods that are documented only to satisfy `R CMD check`. End users should pay no
Expand Down
4 changes: 2 additions & 2 deletions R/tt_compatibility.R
Original file line number Diff line number Diff line change
Expand Up @@ -479,8 +479,8 @@ rbindl_rtables <- function(x, gap = lifecycle::deprecated(), check_headers = lif
#' @note
#' When objects are row-bound, titles and footer information is retained from the first object (if any exists) if all
#' other objects have no titles/footers or have identical titles/footers. Otherwise, all titles/footers are removed
#' and must be set for the bound table via the [main_title()], [subtitles()], [main_footer()], and [prov_footer()]
#' functions.
#' and must be set for the bound table via the [formatters::main_title()], [formatters::subtitles()],
#' [formatters::main_footer()], and [formatters::prov_footer()] functions.
#'
#' @examples
#' mtbl <- rtable(
Expand Down
12 changes: 6 additions & 6 deletions R/tt_export.R
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ formatters::export_as_txt
#' @return
#' * `as_result_df` returns a result `data.frame`.
#'
#' @seealso [df_to_tt()] when using `as_is = TRUE` and [make_row_df()] to have a comprehensive view of the
#' @seealso [df_to_tt()] when using `as_is = TRUE` and [formatters::make_row_df()] to have a comprehensive view of the
#' hierarchical structure of the rows.
#'
#' @examples
Expand Down Expand Up @@ -741,12 +741,12 @@ margins_landscape <- function() {
#' object to change its layout and style. If `NULL`, it will produce a table similar to `rtables` default. Defaults
#' to `theme_docx_default(tt)`.
#' @param border (`officer` border object)\cr defaults to `officer::fp_border(width = 0.5)`.
#' @param indent_size (`integer(1)`)\cr if `NULL`, the default indent size of the table (see [matrix_form()]
#' @param indent_size (`integer(1)`)\cr if `NULL`, the default indent size of the table (see [formatters::matrix_form()]
#' `indent_size`) is used. To work with `docx`, any size is multiplied by 2 mm (5.67 pt) by default.
#' @param titles_as_header (`flag`)\cr defaults to `TRUE` for [tt_to_flextable()], so the table is self-contained
#' as it makes additional header rows for [main_title()] string and [subtitles()] character vector (one per element).
#' `FALSE` is suggested for [export_as_docx()]. This adds titles and subtitles as a text paragraph above the table.
#' The same style is applied.
#' as it makes additional header rows for [formatters::main_title()] string and [formatters::subtitles()] character
#' vector (one per element). `FALSE` is suggested for [export_as_docx()]. This adds titles and subtitles as a text
#' paragraph above the table. The same style is applied.
#' @param footers_as_text (`flag`)\cr defaults to `FALSE` for [tt_to_flextable()], so the table is self-contained with
#' the `flextable` definition of footnotes. `TRUE` is used for [export_as_docx()] to add the footers as a new
#' paragraph after the table. The same style is applied, but with a smaller font.
Expand Down Expand Up @@ -974,7 +974,7 @@ tt_to_flextable <- function(tt,
#' @param font_size (`integer(1)`)\cr font size. Defaults to 9.
#' @param bold (`character`)\cr parts of the table text that should be in bold. Can be any combination of
#' `c("header", "content_rows", "label_rows")`. The first one renders all column names bold (not `topleft` content).
#' The second and third option use [rtables::make_row_df()] to render content or/and label rows as bold.
#' The second and third option use [formatters::make_row_df()] to render content or/and label rows as bold.
#' @param bold_manual (named `list` or `NULL`)\cr list of index lists. See example for needed structure. Accepted
#' groupings/names are `c("header", "body")`.
#'
Expand Down
16 changes: 8 additions & 8 deletions R/tt_sort.R
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,9 @@ cont_n_onecol <- function(j) {
#' that each child at that step will be *separately* sorted based on `scorefun` and the remaining `path` entries. This
#' can occur multiple times in a path.
#'
#' A list of valid (non-wildcard) paths can be seen in the `path` column of the `data.frame` created by [make_row_df()]
#' with the `visible_only` argument set to `FALSE`. It can also be inferred from the summary given by
#' [table_structure()].
#' A list of valid (non-wildcard) paths can be seen in the `path` column of the `data.frame` created by
#' [formatters::make_row_df()] with the `visible_only` argument set to `FALSE`. It can also be inferred from the
#' summary given by [table_structure()].
#'
#' Note that sorting needs a deeper understanding of table structure in `rtables`. Please consider reading the related
#' vignette
Expand All @@ -91,17 +91,17 @@ cont_n_onecol <- function(j) {
#' (coming from [summarize_row_groups()]) while a custom score function needs to be used on `DataRow`s. Here, some
#' useful descriptor and accessor functions (coming from related vignette):
#' - [cell_values()] - Retrieves a named list of a `TableRow` or `TableTree` object's values.
#' - [obj_name()] - Retrieves the name of an object. Note this can differ from the label that is displayed (if any is)
#' when printing.
#' - [obj_label()] - Retrieves the display label of an object. Note this can differ from the name that appears in the
#' path.
#' - [formatters::obj_name()] - Retrieves the name of an object. Note this can differ from the label that is
#' displayed (if any is) when printing.
#' - [formatters::obj_label()] - Retrieves the display label of an object. Note this can differ from the name that
#' appears in the path.
#' - [content_table()] - Retrieves a `TableTree` object's content table (which contains its summary rows).
#' - [tree_children()] - Retrieves a `TableTree` object's direct children (either subtables, rows or possibly a mix
#' thereof, though that should not happen in practice).
#'
#' @seealso
#' * Score functions [cont_n_allcols()] and [cont_n_onecol()].
#' * [make_row_df()] and [table_structure()] for pathing information.
#' * [formatters::make_row_df()] and [table_structure()] for pathing information.
#' * [tt_at_path()] to select a table's (sub)structure at a given path.
#'
#' @examples
Expand Down
15 changes: 8 additions & 7 deletions man/basic_table.Rd

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

10 changes: 5 additions & 5 deletions man/constr_args.Rd

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

2 changes: 1 addition & 1 deletion man/data.frame_export.Rd

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

6 changes: 3 additions & 3 deletions man/export_as_docx.Rd

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

10 changes: 5 additions & 5 deletions man/qtable_layout.Rd

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

4 changes: 2 additions & 2 deletions man/rbind.Rd

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

Loading

0 comments on commit 2ea0373

Please sign in to comment.