diff --git a/cran-comments.md b/cran-comments.md index 4e03f3e..05f550c 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -9,8 +9,8 @@ http://r-pkgs.had.co.nz/ ## Test environments -* local OS (windows) install, R 4.0.4 -* Ubuntu 16.04.6 LTS LTS (on travis-ci), R 4.0.2. +* local OS (windows/Ubuntu 20.04), R 4.0.5 +* Windows latest, macOS-latest, Ubuntu 20.04 release+devel (via github actions), R 4.0.5. * win-builder, R-devel ## R CMD check results diff --git a/man/BasicTable.Rd b/man/BasicTable.Rd index 51aa2df..fe0addf 100644 --- a/man/BasicTable.Rd +++ b/man/BasicTable.Rd @@ -1102,6 +1102,7 @@ the specified row-column location. topRowNumber = NULL, leftMostColumnNumber = NULL, outputValuesAs = "rawValue", + useFormattedValueIfRawValueIsNull = TRUE, applyStyles = TRUE, mapStylesFromCSS = TRUE )}\if{html}{\out{}} @@ -1126,6 +1127,10 @@ in the Excel worksheet to write the table.} "formattedValueAsText" or "formattedValueAsNumber" to specify how cell values are written into the Excel sheet.} +\item{\code{useFormattedValueIfRawValueIsNull}}{`TRUE` to use the formatted cell value +instead of the raw cell value if the raw value is `NULL`. +`FALSE` to always use the raw value. Default `TRUE`.} + \item{\code{applyStyles}}{Default `TRUE` to write styling information to the cell.} \item{\code{mapStylesFromCSS}}{Default `TRUE` to automatically convert CSS style diff --git a/man/TableOpenXlsxRenderer.Rd b/man/TableOpenXlsxRenderer.Rd index 7329664..092c451 100644 --- a/man/TableOpenXlsxRenderer.Rd +++ b/man/TableOpenXlsxRenderer.Rd @@ -129,6 +129,7 @@ Write a table to an Excel worksheet. topRowNumber = NULL, leftMostColumnNumber = NULL, outputValuesAs = "rawValue", + useFormattedValueIfRawValueIsNull = TRUE, applyStyles = TRUE, mapStylesFromCSS = TRUE )}\if{html}{\out{}} @@ -151,6 +152,10 @@ the table is to be written.} be written to the worksheet. Value must be one of "rawValue", "formattedValueAsText", "formattedValueAsNumber".} +\item{\code{useFormattedValueIfRawValueIsNull}}{`TRUE` to use the formatted cell value +instead of the raw cell value if the raw value is `NULL`. +`FALSE` to always use the raw value. Default `TRUE`.} + \item{\code{applyStyles}}{`TRUE` (default) to also set the styling of the cells, `FALSE` to only write the value.} diff --git a/man/getBlankTblTheme.Rd b/man/getBlankTblTheme.Rd index 3c5f4ee..dc5a30a 100644 --- a/man/getBlankTblTheme.Rd +++ b/man/getBlankTblTheme.Rd @@ -1,5 +1,5 @@ % Generated by roxygen2: do not edit by hand -% Please edit documentation in R/tableThemes.R +% Please edit documentation in R/TableThemes.R \name{getBlankTblTheme} \alias{getBlankTblTheme} \title{Get an empty theme for applying no styling to a table.} diff --git a/man/getCompactTblTheme.Rd b/man/getCompactTblTheme.Rd index 91447dc..df0e587 100644 --- a/man/getCompactTblTheme.Rd +++ b/man/getCompactTblTheme.Rd @@ -1,5 +1,5 @@ % Generated by roxygen2: do not edit by hand -% Please edit documentation in R/tableThemes.R +% Please edit documentation in R/TableThemes.R \name{getCompactTblTheme} \alias{getCompactTblTheme} \title{Get the compact theme for styling a table.} diff --git a/man/getDefaultTblTheme.Rd b/man/getDefaultTblTheme.Rd index a166881..c02174c 100644 --- a/man/getDefaultTblTheme.Rd +++ b/man/getDefaultTblTheme.Rd @@ -1,5 +1,5 @@ % Generated by roxygen2: do not edit by hand -% Please edit documentation in R/tableThemes.R +% Please edit documentation in R/TableThemes.R \name{getDefaultTblTheme} \alias{getDefaultTblTheme} \title{Get the default theme for styling a table.} diff --git a/man/getLargePlainTblTheme.Rd b/man/getLargePlainTblTheme.Rd index 0b911b3..61cedbb 100644 --- a/man/getLargePlainTblTheme.Rd +++ b/man/getLargePlainTblTheme.Rd @@ -1,5 +1,5 @@ % Generated by roxygen2: do not edit by hand -% Please edit documentation in R/tableThemes.R +% Please edit documentation in R/TableThemes.R \name{getLargePlainTblTheme} \alias{getLargePlainTblTheme} \title{Get the large plain theme for styling a table.} diff --git a/man/getSimpleColoredTblTheme.Rd b/man/getSimpleColoredTblTheme.Rd index 5c59a5e..29c1ccd 100644 --- a/man/getSimpleColoredTblTheme.Rd +++ b/man/getSimpleColoredTblTheme.Rd @@ -1,5 +1,5 @@ % Generated by roxygen2: do not edit by hand -% Please edit documentation in R/tableThemes.R +% Please edit documentation in R/TableThemes.R \name{getSimpleColoredTblTheme} \alias{getSimpleColoredTblTheme} \title{Get a simple coloured theme.} diff --git a/man/getTblTheme.Rd b/man/getTblTheme.Rd index 2ab0cb7..3ffd60b 100644 --- a/man/getTblTheme.Rd +++ b/man/getTblTheme.Rd @@ -1,5 +1,5 @@ % Generated by roxygen2: do not edit by hand -% Please edit documentation in R/tableThemes.R +% Please edit documentation in R/TableThemes.R \name{getTblTheme} \alias{getTblTheme} \title{Get a built-in theme for styling a table.}