It's really ready this time. I promise. (finished cran comments)

nutterb · Apr 17, 2016 · 4bd2b7f · 4bd2b7f
1 parent 2e2fd3a
commit 4bd2b7f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/R/medley_all_borders.R b/R/medley_all_borders.R
@@ -53,7 +53,7 @@ medley_all_borders <- function(x, rows=NULL, cols=NULL,
       if (horizontal)
       {
         x <- sprinkle(x,
-                      rows = head(part_rows, 1),
+                      rows = utils::head(part_rows, 1),
                       cols = part_cols,
                       border = "top",
                       part = p)
@@ -62,7 +62,7 @@ medley_all_borders <- function(x, rows=NULL, cols=NULL,
       {
         x <- sprinkle(x,
                       rows = part_rows,
-                      cols = tail(part_cols, 1),
+                      cols = utils::tail(part_cols, 1),
                       border = "right",
                       part = p)
       }

diff --git a/R/sprinkle.R b/R/sprinkle.R
@@ -1101,7 +1101,7 @@ color_sprinkles <- function(sprinkles, coll)
   sprinkles <- sprinkles[!vapply(sprinkles, is.null, logical(1))]
   for (i in seq_along(sprinkles))
   {
-    is_color <- tolower(sprinkles[[i]]) %in% tolower(colors())
+    is_color <- tolower(sprinkles[[i]]) %in% tolower(grDevices::colors())
     is_rgb <- grepl("^rgb[(]\\d{1,3},\\d{1,3},\\d{1,3}[)]",sprinkles[[i]]) | 
               grepl("^rgba[(]\\d{1,3},\\d{1,3},\\d{1,3},(\\d{1,4}|)[.]\\d{1,9}[)]$", sprinkles[[i]]) 
     is_hex <- grepl("^#[0-9,A-F,a-f][0-9,A-F,a-f][0-9,A-F,a-f][0-9,A-F,a-f][0-9,A-F,a-f][0-9,A-F,a-f]$", sprinkles[[i]]) | 
@@ -1120,7 +1120,7 @@ color_sprinkles <- function(sprinkles, coll)
       vapply(sprinkles[[i]][is_color | is_hex],
              function(x)
              {
-               col2rgb(x, alpha = TRUE) %>%
+               grDevices::col2rgb(x, alpha = TRUE) %>%
                paste0(., collapse = ",") %>%
                sprintf(fmt = "rgba(%s)",
                        .)

diff --git a/cran-comments.md b/cran-comments.md
@@ -1,7 +1,7 @@
 ## Test environments
 * local Windows install (R-3.2.4)
 * x86_64-pc-linux-gnu (64-bit) (on travis-ci), R 3.2.4
-* win-builder (devel and release)
+* win-builder (devel 3.3.0 and release 3.2.5)
 
 ## R CMD check results
 There were no ERRORS or WARNINGS in any of the checks.
@@ -20,3 +20,6 @@ later this month.
 `tadaatoolbox` checks return the NOTE "Note: found 1 marked UTF-8 string",
 which is also found in its check results on CRAN.  `tadaatoolbox` otherwise
 passes all checks.
+
+Thanks,
+Benjamin