Merge branch 'master' into issue-3090-warn-data-hline-vline-abline

Author: paleolimbot

CONTRIBUTING.md

@@ -6,7 +6,7 @@ quickly as possible. The guide is divided into two main pieces:
 1. Filing a bug report or feature request in an issue.
 1. Suggesting a change via a pull request.
 
-Please note that ggplot2 is released with a [Contributor Code of Conduct](.github/CODE_OF_CONDUCT.md). By contributing to this project, 
+Please note that ggplot2 is released with a [Contributor Code of Conduct](CODE_OF_CONDUCT.md). By contributing to this project, 
 you agree to abide by its terms.
 
 ## Issues

DESCRIPTION

@@ -1,5 +1,5 @@
 Package: ggplot2
-Version: 3.1.1.9000
+Version: 3.2.0.9000
 Title: Create Elegant Data Visualisations Using the Grammar of Graphics
 Description: A system for 'declaratively' creating graphics,
     based on "The Grammar of Graphics". You provide the data, tell 'ggplot2'

NEWS.md

@@ -1,6 +1,4 @@
-# ggplot2 3.2.0.9000
-
-## Minor improvements and bug fixes
+# ggplot2 (development version)
 
 * `geom_abline()`, `geom_hline()`, and `geom_vline()` now issue 
   more informative warnings when supplied with set aesthetics
@@ -16,6 +14,21 @@ extension developers if they have relied on internals that have been changed.
 This release also sees the addition of Hiroaki Yutani (@yutannihilation) to the 
 core developer team.
 
+## Breaking changes
+
+* Two patches (#2996 and #3050) fixed minor rendering problems. In most cases,
+  the visual changes are so subtle that they are difficult to see with the naked
+  eye. However, these changes are detected by the vdiffr package, and therefore
+  any package developers who use vdiffr to test for visual correctness of ggplot2
+  plots will have to regenerate all reference images.
+  
+* In some cases, ggplot2 now produces a warning or an error for code that previously
+  produced plot output. In all these cases, the previous plot output was accidental,
+  and the plotting code uses the ggplot2 API in a way that would lead to undefined
+  behavior. Examples include a missing `group` aesthetic in `geom_boxplot()` (#3316),
+  annotations across multiple facets (#3305), and not using aesthetic mappings when
+  drawing ribbons with `geom_ribbon()` (#3318).
+
 ## New features
 
 * This release includes a range of internal changes that speeds up plot 

R/annotation.r

@@ -46,15 +46,22 @@ annotate <- function(geom, x = NULL, y = NULL, xmin = NULL, xmax = NULL,
 
   # Check that all aesthetic have compatible lengths
   lengths <- vapply(aesthetics, length, integer(1))
-  unequal <- length(unique(setdiff(lengths, 1L))) > 1L
-  if (unequal) {
+  n <- unique(lengths)
+
+  # if there is more than one unique length, ignore constants
+  if (length(n) > 1L) {
+    n <- setdiff(n, 1L)
+  }
+
+  # if there is still more than one unique length, we error out
+  if (length(n) > 1L) {
     bad <- lengths != 1L
     details <- paste(names(aesthetics)[bad], " (", lengths[bad], ")",
       sep = "", collapse = ", ")
     stop("Unequal parameter lengths: ", details, call. = FALSE)
   }
 
-  data <- new_data_frame(position, n = max(lengths))
+  data <- new_data_frame(position, n = n)
   layer(
     geom = geom,
     params = list(

R/geom-boxplot.r

@@ -159,7 +159,7 @@ geom_boxplot <- function(mapping = NULL, data = NULL,
 #' @export
 GeomBoxplot <- ggproto("GeomBoxplot", Geom,
 
-  # need to declare `width`` here in case this geom is used with a stat that
+  # need to declare `width` here in case this geom is used with a stat that
   # doesn't have a `width` parameter (e.g., `stat_identity`).
   extra_params = c("na.rm", "width"),
 
@@ -200,6 +200,14 @@ GeomBoxplot <- ggproto("GeomBoxplot", Geom,
                         outlier.alpha = NULL,
                         notch = FALSE, notchwidth = 0.5, varwidth = FALSE) {
 
+    # this may occur when using geom_boxplot(stat = "identity")
+    if (nrow(data) != 1) {
+      stop(
+        "Can't draw more than one boxplot per group. Did you forget aes(group = ...)?",
+        call. = FALSE
+      )
+    }
+
     common <- list(
       colour = data$colour,
       size = data$size,

R/performance.R

@@ -4,7 +4,7 @@ new_data_frame <- function(x = list(), n = NULL) {
   if (length(x) != 0 && is.null(names(x))) stop("Elements must be named", call. = FALSE)
   lengths <- vapply(x, length, integer(1))
   if (is.null(n)) {
-    n <- if (length(x) == 0) 0 else max(lengths)
+    n <- if (length(x) == 0 || min(lengths) == 0) 0 else max(lengths)
   }
   for (i in seq_along(x)) {
     if (lengths[i] == n) next
@@ -32,7 +32,7 @@ split_matrix <- function(x, col_names = colnames(x)) {
   if (!is.null(col_names)) names(x) <- col_names
   x
 }
-              
+
 mat_2_df <- function(x, col_names = colnames(x)) {
   new_data_frame(split_matrix(x, col_names))
 }

R/stat-smooth.r

@@ -1,9 +1,9 @@
 #' @param method Smoothing method (function) to use, accepts either a character vector,
 #'   e.g. `"auto"`, `"lm"`, `"glm"`, `"gam"`, `"loess"` or a function, e.g.
-#'   `MASS::rlm` or `mgcv::gam`, `base::lm`, or `base::loess`.
+#'   `MASS::rlm` or `mgcv::gam`, `stats::lm`, or `stats::loess`.
 #'
 #'   For `method = "auto"` the smoothing method is chosen based on the
-#'   size of the largest group (across all panels). [loess()] is
+#'   size of the largest group (across all panels). [stats::loess()] is
 #'   used for less than 1,000 observations; otherwise [mgcv::gam()] is
 #'   used with `formula = y ~ s(x, bs = "cs")`. Somewhat anecdotally,
 #'   `loess` gives a better appearance, but is \eqn{O(N^{2})}{O(N^2)} in memory,

R/zzz.r

@@ -16,9 +16,21 @@
   })
 }
 
+# Assigning pathGrob in .onLoad ensures that packages that subclass GeomPolygon
+# do not install with error `possible error in 'pathGrob(munched$x, munched$y, ':
+# unused argument (pathId = munched$group)` despite the fact that this is correct
+# usage
+pathGrob <- NULL
+
 .onLoad <- function(...) {
   backport_unit_methods()
 
+  if (getRversion() < as.numeric_version("3.6")) {
+    pathGrob <<- function(..., pathId.lengths) {
+      grid::pathGrob(...)
+    }
+  }
+
   .zeroGrob <<- grob(cl = "zeroGrob", name = "NULL")
 
   ggplot_global$theme_current <- theme_gray()

man/geom_smooth.Rd

@@ -47,6 +47,16 @@ test_that("boxes with variable widths do not overlap", {
   expect_false(any(duplicated(xid)))
 })
 
+test_that("boxplots with a group size >1 error", {
+  p <- ggplot(
+    data_frame(x = "one value", y = 3, value = 4:6),
+    aes(x, ymin = 0, lower = 1, middle = y, upper = value, ymax = 10)
+  ) +
+    geom_boxplot(stat = "identity")
+
+  expect_equal(nrow(layer_data(p, 1)), 3)
+  expect_error(layer_grob(p, 1), "Can't draw more than one boxplot")
+})
 
 # Visual tests ------------------------------------------------------------