Merge branch 'v3.3.0-rc' of https://github.com/tidyverse/ggplot2 into v3.3.0-rc

Author: thomasp85

NEWS.md

@@ -27,9 +27,9 @@ fail.
   (`NA`) rather than drawing a white one. (@annennenne, #3180)
 
 * `geom_ribbon()` now draws separate lines for the upper and lower intervals if
-  `colour` is mapped by default. Similarly, `geom_area()` now draws lines for
-  the upper in the same case by default. If you want old-style full stroking, 
-  use `outlier.type = "legacy"` (#3503, @yutannihilation).
+  `colour` is mapped. Similarly, `geom_area()` and `geom_density()` now draw
+  the upper lines only in the same case by default. If you want old-style full
+  stroking, use `outline.type = "full"` (@yutannihilation, #3503 / @thomasp85, #3708).
 
 ## New features
 

R/annotation-map.r

@@ -15,7 +15,7 @@ NULL
 #'
 #' seal.sub <- subset(seals, long > -130 & lat < 45 & lat > 40)
 #' ggplot(seal.sub, aes(x = long, y = lat)) +
-#'   annotation_map(usamap, fill = "NA", colour = "grey50") +
+#'   annotation_map(usamap, fill = NA, colour = "grey50") +
 #'   geom_segment(aes(xend = long + delta_long, yend = lat + delta_lat))
 #' }
 #'
@@ -25,7 +25,7 @@ NULL
 #'   longr = cut(long, 2))
 #'
 #' ggplot(seal2,  aes(x = long, y = lat)) +
-#'   annotation_map(usamap, fill = "NA", colour = "grey50") +
+#'   annotation_map(usamap, fill = NA, colour = "grey50") +
 #'   geom_segment(aes(xend = long + delta_long, yend = lat + delta_lat)) +
 #'   facet_grid(latr ~ longr, scales = "free", space = "free")
 #' }

R/geom-density.r

@@ -59,7 +59,7 @@ geom_density <- function(mapping = NULL, data = NULL,
                          show.legend = NA,
                          inherit.aes = TRUE,
                          outline.type = "upper") {
-  outline.type <- match.arg(outline.type, c("both", "upper", "lower", "legacy"))
+  outline.type <- match.arg(outline.type, c("both", "upper", "lower", "full"))
 
   layer(
     data = data,

R/geom-ribbon.r

@@ -23,7 +23,7 @@
 #' @inheritParams geom_bar
 #' @param outline.type Type of the outline of the area; `"both"` draws both the
 #'   upper and lower lines, `"upper"`/`"lower"` draws the either lines only.
-#'   `"legacy"` draws a closed polygon around the area.
+#'   `"full"` draws a closed polygon around the area.
 #' @export
 #' @examples
 #' # Generate data
@@ -49,7 +49,7 @@ geom_ribbon <- function(mapping = NULL, data = NULL,
                         show.legend = NA,
                         inherit.aes = TRUE,
                         outline.type = "both") {
-  outline.type <- match.arg(outline.type, c("both", "upper", "lower", "legacy"))
+  outline.type <- match.arg(outline.type, c("both", "upper", "lower", "full"))
 
   layer(
     data = data,
@@ -143,13 +143,11 @@ GeomRibbon <- ggproto("GeomRibbon", Geom,
       default.units = "native",
       gp = gpar(
         fill = alpha(aes$fill, aes$alpha),
-        col = if (identical(outline.type, "legacy")) aes$colour else NA
+        col = if (identical(outline.type, "full")) aes$colour else NA
       )
     )
 
-    if (identical(outline.type, "legacy")) {
-      warn(glue('outline.type = "legacy" is only for backward-compatibility ',
-                'and might be removed eventually'))
+    if (identical(outline.type, "full")) {
       return(ggname("geom_ribbon", g_poly))
     }
 
@@ -181,7 +179,7 @@ geom_area <- function(mapping = NULL, data = NULL, stat = "identity",
                       position = "stack", na.rm = FALSE, orientation = NA,
                       show.legend = NA, inherit.aes = TRUE, ...,
                       outline.type = "upper") {
-  outline.type <- match.arg(outline.type, c("both", "upper", "lower", "legacy"))
+  outline.type <- match.arg(outline.type, c("both", "upper", "lower", "full"))
 
   layer(
     data = data,

_pkgdown.yml

@@ -10,9 +10,9 @@ home:
   strip_header: true
   links:
   - text: Learn more
-    href: http://r4ds.had.co.nz/data-visualisation.html
+    href: https://r4ds.had.co.nz/data-visualisation.html
   - text: Extensions
-    href: http://www.ggplot2-exts.org/gallery/
+    href: https://www.ggplot2-exts.org/gallery/
 
 reference:
 - title: Plot basics
@@ -40,7 +40,7 @@ reference:
   desc: >
     A handful of layers are more easily specified with a `stat_` function,
     drawing attention to the statistical transformation rather than the visual
-    appearance. The computed variables can be mapped using `stat()`.
+    appearance. The computed variables can be mapped using `after_stat()`.
   contents:
   - stat_ecdf
   - stat_ellipse
@@ -50,7 +50,7 @@ reference:
   - stat_summary_bin
   - stat_unique
   - stat_sf_coordinates
-  - stat
+  - after_stat
 
 - title: "Layer: position adjustment"
   desc: >
@@ -103,10 +103,15 @@ reference:
     Guides are mostly controlled via the scale (e.g. with the `limits`,
     `breaks`, and `labels` arguments), but sometimes you will need additional
     control over guide appearance. Use `guides()` or the `guide` argument to
-    individual scales along with `guide_colourbar()` or `guide_legend()`.
+    individual scales along with `guide_*()` functions.
   contents:
+  - draw_key
   - guide_colourbar
   - guide_legend
+  - guide_axis
+  - guide_bins
+  - guide_coloursteps
+  - guide_none
   - guides
   - sec_axis
 
@@ -244,4 +249,4 @@ navbar:
         href: news/index.html
     extensions:
       text: Extensions
-      href: http://www.ggplot2-exts.org/gallery/
+      href: https://www.ggplot2-exts.org/gallery/