Merge pull request #77 from gforge/develop

Minor CRAN updates

NAMESPACE

@@ -17,6 +17,7 @@ S3method(txtRound,table)
 export(addHtmlTableStyle)
 export(concatHtmlTables)
 export(getHtmlTableTheme)
+export(hasHtmlTableStyle)
 export(htmlTable)
 export(htmlTableWidget)
 export(htmlTableWidgetOutput)

R/htmlTable_helpers_mergeClr.R

@@ -1,6 +1,6 @@
 #' Merges multiple colors
 #'
-#' Uses the \code{\link[grDevices]{colorRampPalette}} for merging colors.
+#' Uses the \code{\link[grDevices:colorRamp]{colorRampPalette}} for merging colors.
 #' \emph{Note:} When merging more than 2 colors the order in the color
 #' presentation matters. Each color is merged with its neigbors before
 #' merging with next. If there is an uneven number of colors the middle
@@ -33,4 +33,4 @@ prMergeClr <- function(clrs) {
   left <- prMergeClr(left)
   right <- prMergeClr(right)
   return(prMergeClr(c(left, right)))
-}
+}

R/htmlTable_style_handlers.R

@@ -179,6 +179,28 @@ appendHtmlTableStyle <- function(x,
   return(x)
 }
 
+#' Check if object has a style set to it
+#'
+#' If the attribute \code{htmlTable.style} is set it will check if
+#' the \code{style_name} exists and return a \code{logical}.
+#'
+#' @param x The object intended for \code{\link{htmlTable}}.
+#' @param style_name A string that contains the style name.
+#' @return \code{logical} \code{TRUE} if the attribute and style is not \code{NULL}
+#' @export
+hasHtmlTableStyle <- function(x, style_name) {
+  style <- attr(x, style_attribute_name, exact = TRUE)
+  if (is.null(style)) {
+    return(FALSE)
+  }
+
+  if (is.null(style[[style_name]])) {
+    return(FALSE)
+  }
+
+  return(TRUE)
+}
+
 style_attribute_name <- "htmlTable.style"
 
 prValidateAndMergeStyles <- function(org_style_list, styles_from_arguments, overwrite) {

R/htmlTable_theme.R

@@ -107,7 +107,7 @@ prGetArgumentList <- function(args, skip_elements) {
 
 #' Retrieve the \code{\link{htmlTable}} theme list
 #'
-#' A wrapper for a \code{\link[base]{getOption}("htmlTable.theme")} call that
+#' A wrapper for a \code{\link[base:options]{getOption}("htmlTable.theme")} call that
 #' returns the standard theme unless one is set.
 #'
 #' @return \code{list} with the styles to be applied to the table

R/tidyHtmlTable.R

@@ -58,18 +58,20 @@
 #'
 #' @section Simple tibble output:
 #'
-#'   The tibble discourages the use of row names. There is therefore a convenience
-#'   option for \code{tidyHtmlTable} where you can use the function just as you
-#'   would with \code{\link{htmlTable}} where \code{rnames} is populated with
-#'   the \code{rnames} argument provided using \code{tidyselect} syntax (defaults to
-#'   the "names" column if present int the input data).
+#'  The tibble discourages the use of row names. There is therefore a convenience
+#'  option for \code{tidyHtmlTable} where you can use the function just as you
+#'  would with \code{\link{htmlTable}} where \code{rnames} is populated with
+#'  the \code{rnames} argument provided using \code{tidyselect} syntax (defaults to
+#'  the "names" column if present int the input data).
 #'
 #' @section Additional dependencies:
 #'
-#'    In order to run this function you also must have \code{\link[dplyr]{dplyr}},
-#'    \code{\link[tidyr]{tidyr}}, \code{\link[tidyselect]{tidyselect}} and
-#'    \code{\link[purrr]{purrr}} packages installed. These have been removed due to
-#'    the additional 20 Mb that these dependencies added (issue #47).
+#'  In order to run this function you also must have \pkg{dplyr},
+#'  \pkg{tidyr}, \pkg{tidyselect} and \pkg{purrr}
+#'  packages installed. These have been removed due to
+#'  the additional 20 Mb that these dependencies added (issue #47).
+#'  \emph{Note:} if you use \pkg{tidyverse} it will already have
+#'  all of these and you do not need to worry.
 #'
 #' @param x Tidy data used to build the \code{htmlTable}
 #' @param value The column containing values filling individual cells of the

cran-comments.md

@@ -1,7 +1,5 @@
-Fix for R 4.0
-
 ## Test environments
-* Ubuntu install, R 3.6.1
+* Ubuntu install, R 4.0.1
 * Winbuilder
 
 ## R CMD check results