prepare for resubmit

.Rbuildignore

@@ -4,4 +4,6 @@
 ^README\.Rmd$
 ^cover.jpg$
 ^\.github$
-^cran-comments.md$
+^cran-comments\.md$
+^tests/optim\.R$
+^CRAN-RELEASE$

CRAN-RELEASE

@@ -0,0 +1,2 @@
+This package was submitted to CRAN on 2021-05-12.
+Once it is accepted, delete this file and tag the release (commit 0339320).

NAMESPACE

@@ -4,7 +4,6 @@ S3method(plot,palette)
 S3method(print,palette)
 export(pal_functions)
 export(pal_vector)
-export(palette_html)
 export(scale_color_wa_b)
 export(scale_color_wa_c)
 export(scale_color_wa_d)

NEWS.md

@@ -1,3 +1,9 @@
+# wacolors 0.2.1
+
+* Improve documentation
+* Slight modifications to existing palettes
+* New `skagit` palette
+
 # wacolors 0.2.0
 
 * New, perceptually uniform palettes

R/codegen.R

@@ -6,6 +6,8 @@
 #'
 #' @inheritParams wa_pal
 #'
+#' @return The generated code, invisibly, as a character vector.
+#'
 #' @examples
 #' pal_vector("rainier", 4)
 #'
@@ -19,6 +21,7 @@ pal_vector = function(palette, n, which=NULL,
     code = paste0(strwrap(code, 76, indent=0, exdent=nchar(varname) + 5),
                   collapse="\n")
     code_output(code)
+    invisible(code)
 }
 
 #' Output a character vector containing code for a `ggplot2` scale
@@ -35,6 +38,8 @@ pal_vector = function(palette, n, which=NULL,
 #'   are not supported (see [scale_fill_wa_c()]).
 #' @param reverse `TRUE` if the colors should be reversed.
 #'
+#' @return The generated code, invisibly, as a character vector.
+#'
 #' @examples
 #' pal_functions("rainier")
 #'
@@ -109,5 +114,6 @@ pal_functions = function(palette, which=NULL, type=c("discrete", "continuous"),
     }
 
     code_output(code)
+    invisible(code)
 }
 

R/colors.R

@@ -29,66 +29,68 @@ wacolors = list(
     rainier = c(lake="#465177", ragwort="#E4C22B", lodge="#965127",
                trees="#29483A", ground="#759C44", winter_sky="#9FB6DA",
                paintbrush="#DF3383"),
-    forest = c(trees="#254029", stream="#1E212F", fern="#516F25",
-               bark="#3A270A", mountains="#40666F"),
     washington_pass = c(trees="#31543B", stone="#48628A", tips="#94AA3D",
                         road="#7F9CB1", sunbreak="#D9D1BE", stump="#3E3C3A"),
-    palouse = c(snake="#2B3F4C", wheat="#C0A43D", fallow="#8A627C",
-                scrub="#7C8455", canyon="#D1BD98", sky="#69A2E4"),
-    uw = c(purple="#483778", gold="#D5C58D", brick="#7E4837", cherry="#E08E9A",
-           stone="#737C78"),
-    larch = c(larch="#D7A141", shrub="#333F2F", rock="#808A8D",
-              moss="#7C6D3D", sky="#73A0E4", dirt="#C7B3A9"),
-    fort_worden = c(sea="#4D5370", shrub="#2A3B19", lighthouse="#A6B7C6",
-                    rust="#8F6D3F"),
+    palouse = c(snake="#2D3F4A", wheat="#C0A43D", fallow="#8A6172",
+                hills="#748A52", canyon="#CCBA98", sky="#69A2E4"),
+    forest = c(trees="#254029", stream="#1E212F", fern="#516F25",
+               bark="#3A270A", mountains="#40666F"),
+    larch = c(larch="#D2A554", shrub="#626B5D", rock="#8C8F9E",
+              moss="#858753", sky="#A4BADF", dirt="#D3BEAF"),
     coast = c(surf="#7BAEA0", sea="#386276", rocks="#3A4332", sand="#7A7D6F",
               sunset="#D9B96E", sky="#BED4F0"),
-    flag = c(green="#247F5B", yellow="#E2CB30", blue="#5DB3DB", tan="#FFDCCD"),
+    uw = c(purple="#483778", gold="#D2C28B", brick="#7E4837", cherry="#D48792",
+           stone="#6B7471"),
+    fort_worden = c(sea="#4D5370", shrub="#263C19", lighthouse="#A6B7C6",
+                    rust="#8F6D3F"),
+    skagit = c(red="#B51829", yellow="#EFC519", violet="#831285",
+               orange="#CC7810", purple="#C886E8", mountains="#3E6E94"),
+    flag = c(green="#247F5B", yellow="#E2CD70", blue="#5DB3DB", tan="#FFDCCD"),
     # CONTINUOUS
-    sound_sunset = c("#001B38", "#1B234C", "#3B295E", "#56316A", "#69406C",
-                     "#7A5072", "#8A6078", "#9B7080", "#C67387", "#DC8386",
-                     "#EE9581", "#FCAA79", "#FFC071", "#FFD86B", "#FFF075"),
+    sound_sunset = c("#001E36", "#0F2649", "#352C5A", "#533369", "#6E3D71",
+                     "#814C74", "#925C78", "#A26D7C", "#BC7A7D", "#D08B79",
+                     "#DE9F71", "#E7B565", "#EBCC5C", "#E7E55C", "#DCFF6C"),
     ferries = c("#241E33", "#1E2C54", "#003F69", "#005373", "#006372",
                 "#007273", "#008174", "#349075", "#579E78", "#77AB7E",
                 "#97B788", "#B3C493", "#CFD28F", "#F2DE83", "#FFE66C"),
     forest_fire = c("#2C0915", "#40111D", "#551A23", "#6A2626", "#7E3225",
                     "#92401D", "#A64F00", "#B96000", "#CB7100", "#DB8300",
                     "#E69800", "#EDAD00", "#F3C307", "#FAD753", "#FFEC7A"),
-    sea = c("#070610", "#0E143A", "#002351", "#003466", "#004676", "#005577",
-            "#1E647D", "#3B7385", "#52838E", "#66939A", "#79A3A6", "#8BB4B3",
-            "#9DC5C1", "#AFD6CF", "#C1E8DE"),
+    sea = c("#1C1B23", "#222541", "#1F325A", "#094270", "#005282", "#0B6184",
+            "#2F6F89", "#457D90", "#598C99", "#6B9AA3", "#7CA9AE", "#8DB9B9",
+            "#9DC8C5", "#ADD8D2", "#BEE8DF"),
     sea_star = c("#4B0049", "#5D014F", "#700853", "#821554", "#932252",
                  "#963D4E", "#985350", "#95675B", "#B16D51", "#C3774D",
                  "#D48349", "#E48F43", "#F29C3B", "#FFAA3B", "#FFBA54"),
     volcano = c("#29272C", "#323335", "#3E3F3F", "#4A4B4B", "#555857",
                 "#626561", "#71726B", "#837E77", "#8C8D87", "#989B98",
                 "#A7A8A8", "#B5B7B7", "#C2C5C8", "#D3D3D9", "#E7E0E8"),
-    baker = c("#8091B1", "#9495B8", "#A599BC", "#B59EBF", "#C2A3C0", "#CCAAC1",
-              "#D4B2C1", "#DBBAC2", "#DFC3C4", "#E3CCC7", "#E5D5CD", "#E8DED4",
-              "#EBE7DE", "#EFEFE9", "#F6F7F4"),
-    diablo = c("#0F2B14", "#003916", "#00471E", "#00542A", "#006238",
-               "#006F48", "#007D59", "#00896B", "#00957D", "#00A28F",
-               "#0FAFA0", "#33BBB2", "#4AC8C4", "#5FD5D6", "#72E3E8"),
-    mountains = c("#002240", "#002B4C", "#00355A", "#003F6A", "#13487A",
-                  "#2C528B", "#415C9C", "#5566AE", "#6A71BB", "#7F7CC2",
-                  "#9289CA", "#A495D2", "#B4A2DA", "#C4B0E2", "#D4BEEB"),
-    gorge = c("#003121", "#003B27", "#00462B", "#00512F", "#005C33", "#006835",
-              "#0A7337", "#247E37", "#378A37", "#499536", "#5CA035", "#6EAB33",
-              "#81B632", "#94C137", "#A9CB4A"),
-    foothills_winter = c("#171200", "#1E2100", "#242F00", "#2C3E15", "#374C30",
-                         "#445A46", "#53695A", "#63786D", "#758780", "#869792",
-                         "#99A6A4", "#ABB6B6", "#BEC7C8", "#D0D8DA", "#E3E9EC"),
+    baker = c("#7487A9", "#888BAF", "#9A8FB4", "#A994B7", "#B69AB9", "#C1A0BA",
+              "#CAA8BB", "#D0B0BC", "#D6B9BE", "#DAC2C2", "#DDCBC8", "#E0D5CF",
+              "#E3DDD8", "#E7E6E4", "#EFEEE7"),
+    diablo = c("#172512", "#0E320C", "#003F0F", "#004C1A", "#005929",
+               "#00663C", "#007051", "#007B63", "#008575", "#279085",
+               "#3E9B96", "#51A6A6", "#63B2B7", "#75BDC7", "#87C8D8"),
+    mountains = c("#002733", "#003141", "#003B50", "#004661", "#005172",
+                  "#005C84", "#006797", "#0071AA", "#3A7BB5", "#5E85BE",
+                  "#7990C7", "#8F9CCF", "#A4A8D8", "#B7B4E1", "#C8C2EA"),
+    gorge = c("#00352A", "#00402F", "#004C33", "#005736", "#076338", "#236E38",
+              "#387937", "#4D8434", "#658E3C", "#7C984D", "#91A15E", "#A5AB70",
+              "#B7B583", "#C8C095", "#D9CBA7"),
+    foothills = c("#171200", "#1E2100", "#242F00", "#2C3E15", "#374C30",
+                  "#445A46", "#53695A", "#63786D", "#758780", "#869792",
+                  "#99A6A4", "#ABB6B6", "#BEC7C8", "#D0D8DA", "#E3E9EC"),
     olympic = c("#2B213A", "#3C3A61", "#415988", "#577898", "#7A97A8",
                 "#A1B4BB", "#CAD2D3", "#F1F1F1", "#C9D2D1", "#9CB6B0",
                 "#6C9C8D", "#338367", "#006741", "#174729", "#192A1A"),
     vantage = c("#502C62", "#524F79", "#566E8E", "#638D9F", "#7BAAB0",
-                "#9DC7C1", "#C4E2D6", "#EAFFEE", "#B6EAA5", "#AACA68",
-                "#A5A82B", "#9B8614", "#8C660C", "#784810", "#632B13")
+                "#9DC7C1", "#C4E2D6", "#EAFFEE", "#BAE8AB", "#ACC975",
+                "#A4A83B", "#9A8621", "#8B6714", "#784812", "#632B13")
 )
 
 cont_pal = c("sound_sunset", "ferries", "forest_fire", "sea_star", "sea",
              "volcano", "baker", "diablo", "mountains", "gorge",
-             "foothills_winter", "olympic", "vantage")
+             "foothills", "olympic", "vantage")
 
 
 #' Washington State Color Palette Generator
@@ -104,7 +106,8 @@ cont_pal = c("sound_sunset", "ferries", "forest_fire", "sea_star", "sea",
 #'   to automatically interpolate between colors.
 #' @param reverse `TRUE` if palette should be reversed.
 #'
-#' @return A vector of colors of type `palette`
+#' @return A vector of colors of type `palette`. If printed to the console, will
+#' plot the palette as well.
 #'
 #' @examples
 #' wa_pal("rainier")
@@ -127,7 +130,7 @@ wa_pal = function(palette, n, which=NULL,
     if (missing(n))
         n = length(pal)
 
-    if (n > length(pal))
+    if (name %in% cont_pal || n > length(pal))
         type="continuous"
     type = match.arg(type)
 

R/scales.R

@@ -4,6 +4,9 @@
 #' @param reverse whether to reverse
 #'
 #' @importFrom grDevices colorRampPalette
+#'
+#' @keywords internal
+#' @noRd
 discr_pal = function(pal, reverse=FALSE) {
     n_col = length(pal)
     names(pal) = NULL
@@ -29,6 +32,8 @@ discr_pal = function(pal, reverse=FALSE) {
 #'   name, limits, breaks, labels and so forth.
 #' @param reverse `TRUE` if the colors should be reversed.
 #'
+#' @return A [ggplot2::Scale] object.
+#'
 #' @examples
 #' library(ggplot2)
 #'

R/util.R

@@ -1,5 +1,8 @@
 #' Takes name of palette or palette itself and returns palette + name
 #' @param name the name of the palette or the palette itself
+#'
+#' @keywords internal
+#' @noRd
 match_pal = function(name) {
     found_name = pmatch(name, names(wacolors))
     if (length(found_name) > 0 && !any(is.na(found_name))) {
@@ -17,29 +20,6 @@ match_pal = function(name) {
     list(pal=pal, name=name)
 }
 
-#' Create HTML code to view palette
-#'
-#' @param x the `palette` object
-#' @param maxwidth the maximum width of the output, in CSS units
-#' @param height the height width of the output, in CSS units
-#'
-#' @export
-palette_html = function(x, maxwidth="30em", height="1em") {
-    n <- length(x)
-
-    cat('<div class="color-palette">',
-        '<span style="text-weight: bold">', attr(x, "name"), '</span>',
-        '<div style="display: flex; flex-direction: row; width: 100%; ',
-            'height: ', height, '; max-width: ', maxwidth, ';">',
-            paste0('<div style="flex-grow: 1; background: ', x,
-                   ';"></div>', collapse=""),
-        '</div>',
-        '</div>', sep="")
-
-    invisible(x)
-}
-
-
 # `print.palette` modified from that in `wesanderson` (c) 2016 Karthik Ram
 #' @export
 #' @importFrom graphics rect par image text
@@ -81,6 +61,7 @@ plot.palette = function(x, ...) {
 
 #' Paste-to-hex
 #' @keywords internal
+#' @noRd
 pth = function(x) {
     rgb = as.list(as.integer(strsplit(x, "\\s")[[1]]) / 256)
     col = do.call(colorspace::sRGB, rgb)

README.Rmd

@@ -94,7 +94,7 @@ pal_functions("palouse")
 ```{r cont-palettes, echo=F, fig.height=1, out.width=NULL}
 cont_pal = c("sound_sunset", "ferries", "forest_fire", "sea_star", "sea",
              "volcano", "baker", "diablo", "mountains", "gorge",
-             "foothills_winter", "olympic", "vantage")
+             "foothills", "olympic", "vantage")
 
 for (pal in cont_pal) {
     plot(wa_pal(pal, 256))

README.md

@@ -10,7 +10,7 @@
 
 ![Mt. Rainier](cover.jpg)
 
-The `wacolor` package contains 22 color palettes taken from the
+The `wacolor` package contains 23 color palettes taken from the
 landscapes and cities of Washington state. Colors were extracted from a
 set of photographs, and then combined to form a set of continuous and
 discrete palettes. Continuous palettes were designed to be perceptually
@@ -45,12 +45,12 @@ library(ggplot2)
 
 # See all palettes
 names(wacolors)
-#>  [1] "rainier"          "forest"           "washington_pass"  "palouse"         
-#>  [5] "uw"               "larch"            "fort_worden"      "coast"           
-#>  [9] "flag"             "sound_sunset"     "ferries"          "forest_fire"     
-#> [13] "sea"              "sea_star"         "volcano"          "baker"           
-#> [17] "diablo"           "mountains"        "gorge"            "foothills_winter"
-#> [21] "olympic"          "vantage"
+#>  [1] "rainier"         "washington_pass" "palouse"         "forest"         
+#>  [5] "larch"           "coast"           "uw"              "fort_worden"    
+#>  [9] "skagit"          "flag"            "sound_sunset"    "ferries"        
+#> [13] "forest_fire"     "sea"             "sea_star"        "volcano"        
+#> [17] "baker"           "diablo"          "mountains"       "gorge"          
+#> [21] "foothills"       "olympic"         "vantage"
 
 # See one palette
 wacolors$rainier
@@ -103,21 +103,21 @@ code will be loaded, ready to copy, at the console prompt.
 
 ``` r
 pal_vector("sound_sunset", 15)
-#> PAL_SOUND_SUNSET = c("#001B38", "#1B234C", "#3B295E", "#56316A", "#69406C",
-#>                      "#7A5072", "#8A6078", "#9B7080", "#C67387", "#DC8386",
-#>                      "#EE9581", "#FCAA79", "#FFC071", "#FFD86B", "#FFF075")
+#> PAL_SOUND_SUNSET = c("#001E35", "#0E2648", "#342C59", "#523368", "#6D3D71",
+#>                      "#804C73", "#925B78", "#A16C7B", "#BB797D", "#D08B79",
+#>                      "#DE9F71", "#E6B465", "#EBCC5B", "#E6E55B", "#DCFF6C")
 
 pal_functions("palouse")
 #> scale_color_palouse_d = function(...) {
-#>   pal_cols = c("#2B3F4C", "#C0A43D", "#8A627C", "#7C8455", "#D1BD98",
+#>   pal_cols = c("#2D3F4A", "#C0A43D", "#8A6172", "#748A52", "#CCBA98",
 #>                "#69A2E4")
 #>   n_col = length(pal_cols)
 #>   ramp = grDevices::colorRampPalette(pal_cols)
 #>   pal_fun = function(n) if (n <= n_col) pal_cols[1:n] else ramp(n)
 #>   discrete_scale("color", "palouse", palette=pal_fun, ...)
 #> }
 #> scale_fill_palouse_d = function(...) {
-#>   pal_cols = c("#2B3F4C", "#C0A43D", "#8A627C", "#7C8455", "#D1BD98",
+#>   pal_cols = c("#2D3F4A", "#C0A43D", "#8A6172", "#748A52", "#CCBA98",
 #>                "#69A2E4")
 #>   n_col = length(pal_cols)
 #>   ramp = grDevices::colorRampPalette(pal_cols)
@@ -126,12 +126,12 @@ pal_functions("palouse")
 #> }
 #> 
 #> scale_color_palouse_c = function(...) {
-#>   scale_color_gradientn(..., colours=c("#2B3F4C", "#C0A43D", "#8A627C",
-#>                         "#7C8455", "#D1BD98", "#69A2E4"))
+#>   scale_color_gradientn(..., colours=c("#2D3F4A", "#C0A43D", "#8A6172",
+#>                         "#748A52", "#CCBA98", "#69A2E4"))
 #> }
 #> scale_fill_palouse_c = function(...) {
-#>   scale_fill_gradientn(..., colours=c("#2B3F4C", "#C0A43D", "#8A627C",
-#>                        "#7C8455", "#D1BD98", "#69A2E4"))
+#>   scale_fill_gradientn(..., colours=c("#2D3F4A", "#C0A43D", "#8A6172",
+#>                        "#748A52", "#CCBA98", "#69A2E4"))
 #> }
 #> 
 #> 
@@ -145,4 +145,4 @@ pal_functions("palouse")
 
 ### Discrete Palettes
 
-![](man/figures/README-disc-palettes-1.png)<!-- -->![](man/figures/README-disc-palettes-2.png)<!-- -->![](man/figures/README-disc-palettes-3.png)<!-- -->![](man/figures/README-disc-palettes-4.png)<!-- -->![](man/figures/README-disc-palettes-5.png)<!-- -->![](man/figures/README-disc-palettes-6.png)<!-- -->![](man/figures/README-disc-palettes-7.png)<!-- -->![](man/figures/README-disc-palettes-8.png)<!-- -->![](man/figures/README-disc-palettes-9.png)<!-- -->
+![](man/figures/README-disc-palettes-1.png)<!-- -->![](man/figures/README-disc-palettes-2.png)<!-- -->![](man/figures/README-disc-palettes-3.png)<!-- -->![](man/figures/README-disc-palettes-4.png)<!-- -->![](man/figures/README-disc-palettes-5.png)<!-- -->![](man/figures/README-disc-palettes-6.png)<!-- -->![](man/figures/README-disc-palettes-7.png)<!-- -->![](man/figures/README-disc-palettes-8.png)<!-- -->![](man/figures/README-disc-palettes-9.png)<!-- -->![](man/figures/README-disc-palettes-10.png)<!-- -->

cran-comments.md

@@ -1,3 +1,9 @@
+## Resubmission
+This is a resubmission. In this version I have:
+
+* Removed .Rd files for internal functions.
+* For the remaining functions, added \value lines describing the return type.
+
 ## Test environments
 * local OS X install, R 4.0.3
 * latest OS X (on gh-actions), (release)