Merge branch 'main' into ordered_vec_rbind0

Author: teunbrand

NAMESPACE

@@ -582,6 +582,8 @@ export(scale_linewidth_continuous)
 export(scale_linewidth_date)
 export(scale_linewidth_datetime)
 export(scale_linewidth_discrete)
+export(scale_linewidth_identity)
+export(scale_linewidth_manual)
 export(scale_linewidth_ordinal)
 export(scale_radius)
 export(scale_shape)

NEWS.md

@@ -3,12 +3,20 @@
 * Using two ordered factors as facetting variables in 
   `facet_grid(..., as.table = FALSE)` now throws a warning instead of an
   error (@teunbrand, #5109).
+* Added `scale_linewidth_manual()` and `scale_linewidth_identity()` to support
+  the `linewidth` aesthetic (@teunbrand, #5050).
+* Automatic breaks in `scale_*_binned()` should no longer be out-of-bounds,
+  and automatic limits expand to include these (@teunbrand, #5095, #5100).
+* Renamed computed aesthetic in `stat_ecdf()` to `ecdf`, to prevent incorrect
+  scale transformations (@teunbrand, #5113 and #5112).
+* Fixed misbehaviour of `draw_key_boxplot()` and `draw_key_crossbar()` with 
+  skewed key aspect ratio (@teunbrand, #5082).
 * `scale_*_binned()` handles zero-range limits more gracefully (@teunbrand, 
   #5066)
 * Binned scales are now compatible with `trans = "date"` and `trans = "time"` 
   (@teunbrand, #4217).
 * `ggsave()` warns when multiple `filename`s are given, and only writes to the
-  first file (@teunbrand, #5114).
+  first file (@teunbrand, #5114)
 * Fixed a regression in `geom_hex()` where aesthetics were replicated across 
   bins (@thomasp85, #5037 and #5044)
 * Fixed spurious warning when `weight` aesthetic was used in `stat_smooth()` 

R/geom-ribbon.r

@@ -10,7 +10,10 @@
 #' whole varies over the range of x. Choosing the order in which different
 #' components is stacked is very important, as it becomes increasing hard to
 #' see the individual pattern as you move up the stack. See
-#' [position_stack()] for the details of stacking algorithm.
+#' [position_stack()] for the details of stacking algorithm. To facilitate
+#' stacking, the default `stat = "align"` interpolates groups to a common set
+#' of x-coordinates. To turn off this interpolation, `stat = "identity"` can
+#' be used instead.
 #'
 #' @eval rd_orientation()
 #'
@@ -57,6 +60,10 @@
 #' # stat_align() interpolates and aligns the value so that the areas can stack
 #' # properly.
 #' a + geom_point(stat = "align", position = "stack", size = 8)
+#'
+#' # To turn off the alignment, the stat can be set to "identity"
+#' ggplot(df, aes(x, y, fill = g)) +
+#'   geom_area(stat = "identity")
 geom_ribbon <- function(mapping = NULL, data = NULL,
                         stat = "identity", position = "identity",
                         ...,

R/legend-draw.r

@@ -98,39 +98,58 @@ draw_key_blank <- function(data, params, size) {
 #' @export
 #' @rdname draw_key
 draw_key_boxplot <- function(data, params, size) {
-  grobTree(
-    linesGrob(0.5, c(0.1, 0.25)),
-    linesGrob(0.5, c(0.75, 0.9)),
-    rectGrob(height = 0.5, width = 0.75),
-    linesGrob(c(0.125, 0.875), 0.5),
-    gp = gpar(
-      col = data$colour %||% "grey20",
-      fill = alpha(data$fill %||% "white", data$alpha),
-      lwd = (data$linewidth %||% 0.5) * .pt,
-      lty = data$linetype %||% 1,
-      lineend = params$lineend %||% "butt",
-      linejoin = params$linejoin %||% "mitre"
-    ),
-    vp = if (isTRUE(params$flipped_aes)) viewport(angle = -90)
+  gp <- gpar(
+    col = data$colour %||% "grey20",
+    fill = alpha(data$fill %||% "white", data$alpha),
+    lwd = (data$linewidth %||% 0.5) * .pt,
+    lty = data$linetype %||% 1,
+    lineend = params$lineend %||% "butt",
+    linejoin = params$linejoin %||% "mitre"
   )
+
+  if (isTRUE(params$flipped_aes)) {
+    grobTree(
+      linesGrob(c(0.1, 0.25), 0.5),
+      linesGrob(c(0.75, 0.9), 0.5),
+      rectGrob(width = 0.5, height = 0.75),
+      linesGrob(0.5, c(0.125, 0.875)),
+      gp = gp
+    )
+  } else {
+    grobTree(
+      linesGrob(0.5, c(0.1, 0.25)),
+      linesGrob(0.5, c(0.75, 0.9)),
+      rectGrob(height = 0.5, width = 0.75),
+      linesGrob(c(0.125, 0.875), 0.5),
+      gp = gp
+    )
+  }
 }
 
 #' @export
 #' @rdname draw_key
 draw_key_crossbar <- function(data, params, size) {
-  grobTree(
-    rectGrob(height = 0.5, width = 0.75),
-    linesGrob(c(0.125, 0.875), 0.5),
-    gp = gpar(
-      col = data$colour %||% "grey20",
-      fill = alpha(data$fill %||% "white", data$alpha),
-      lwd = (data$linewidth %||% 0.5) * .pt,
-      lty = data$linetype %||% 1,
-      lineend = params$lineend %||% "butt",
-      linejoin = params$linejoin %||% "mitre"
-    ),
-    vp = if (isTRUE(params$flipped_aes)) viewport(angle = -90)
+  gp <- gpar(
+    col = data$colour %||% "grey20",
+    fill = alpha(data$fill %||% "white", data$alpha),
+    lwd = (data$linewidth %||% 0.5) * .pt,
+    lty = data$linetype %||% 1,
+    lineend = params$lineend %||% "butt",
+    linejoin = params$linejoin %||% "mitre"
   )
+  if (isTRUE(params$flipped_aes)) {
+    grobTree(
+      rectGrob(height = 0.75, width = 0.5),
+      linesGrob(0.5, c(0.125, 0.875)),
+      gp = gp
+    )
+  } else {
+    grobTree(
+      rectGrob(height = 0.5, width = 0.75),
+      linesGrob(c(0.125, 0.875), 0.5),
+      gp = gp
+    )
+  }
 }
 
 #' @export

R/scale-.r

@@ -237,8 +237,11 @@ discrete_scale <- function(aesthetics, scale_name, palette, name = waiver(),
 #'   the scale will ask the transformation object to create breaks, and this
 #'   may result in a different number of breaks than requested. Ignored if
 #'   breaks are given explicitly.
-#' @param right Should values on the border between bins be part of the right
-#'   (upper) bin?
+#' @param right Should the intervals be closed on the right (`TRUE`, default) or
+#'   should the intervals be closed on the left (`FALSE`)? 'Closed on the right'
+#'   means that values at break positions are part of the lower bin (open on the
+#'   left), whereas they are part of the upper bin when intervals are closed on
+#'   the left (open on the right).
 #' @param show.limits should the limits of the scale appear as ticks
 #' @keywords internal
 binned_scale <- function(aesthetics, scale_name, palette, name = waiver(),
@@ -1077,6 +1080,7 @@ ScaleBinned <- ggproto("ScaleBinned", Scale,
         breaks <- seq(limits[1], limits[2], length.out = n.breaks + 2)
         breaks <- breaks[-c(1, length(breaks))]
       }
+      breaks <- oob_discard(breaks, limits)
 
       # Ensure terminal bins are same width if limits not set
       if (is.null(self$limits)) {

R/scale-binned.R

@@ -70,6 +70,7 @@ ScaleBinnedPosition <- ggproto("ScaleBinnedPosition", ScaleBinned,
 
   map = function(self, x, limits = self$get_limits()) {
     breaks <- self$get_breaks(limits)
+    limits <- self$get_limits() # get_breaks() may have updated this
     all_breaks <- unique0(sort(c(limits[1], breaks, limits[2])))
 
     if (self$after.stat) {

R/scale-identity.r

@@ -95,6 +95,15 @@ scale_linetype_identity <- function(..., guide = "none") {
   sc
 }
 
+#' @rdname scale_identity
+#' @export
+scale_linewidth_identity <- function(..., guide = "none") {
+  sc <- continuous_scale("linewidth", "identity", identity_pal(), ...,
+                         guide = guide, super = ScaleContinuousIdentity)
+
+  sc
+}
+
 #' @rdname scale_identity
 #' @export
 scale_alpha_identity <- function(..., guide = "none") {

R/scale-manual.r

@@ -110,6 +110,12 @@ scale_linetype_manual <- function(..., values, breaks = waiver(), na.value = "bl
   manual_scale("linetype", values, breaks, ..., na.value = na.value)
 }
 
+#' @rdname scale_manual
+#' @export
+scale_linewidth_manual <- function(..., values, breaks = waiver(), na.value = NA) {
+  manual_scale("linewidth", values, breaks, ..., na.value = na.value)
+}
+
 #' @rdname scale_manual
 #' @export
 scale_alpha_manual <- function(..., values, breaks = waiver(), na.value = NA) {
@@ -122,7 +128,6 @@ scale_discrete_manual <- function(aesthetics, ..., values, breaks = waiver()) {
   manual_scale(aesthetics, values, breaks, ...)
 }
 
-
 manual_scale <- function(aesthetic, values = NULL, breaks = waiver(), ..., limits = NULL) {
   # check for missing `values` parameter, in lieu of providing
   # a default to all the different scale_*_manual() functions

R/stat-bin.r

@@ -123,9 +123,6 @@ StatBin <- ggproto("StatBin", Stat,
       params$closed <- if (params$right) "right" else "left"
       params$right <- NULL
     }
-    if (!is.null(params$width)) {
-      deprecate_warn0("2.1.0", "stat_bin(width)", "geom_bar()")
-    }
     if (!is.null(params$boundary) && !is.null(params$center)) {
       cli::cli_abort("Only one of {.arg boundary} and {.arg center} may be specified in {.fn {snake_class(self)}}.")
     }
@@ -146,8 +143,7 @@ StatBin <- ggproto("StatBin", Stat,
                            breaks = NULL, flipped_aes = FALSE,
                            # The following arguments are not used, but must
                            # be listed so parameters are computed correctly
-                           origin = NULL, right = NULL, drop = NULL,
-                           width = NULL) {
+                           origin = NULL, right = NULL, drop = NULL) {
     x <- flipped_names(flipped_aes)$x
     if (!is.null(breaks)) {
       if (!scales[[x]]$is_discrete()) {

R/stat-ecdf.r

@@ -21,7 +21,7 @@
 #' @param pad If `TRUE`, pad the ecdf with additional points (-Inf, 0)
 #'   and (Inf, 1)
 #' @eval rd_computed_vars(
-#'   y = "Cumulative density corresponding to `x`."
+#'   ecdf = "Cumulative density corresponding to `x`."
 #' )
 #' @export
 #' @examples
@@ -73,7 +73,7 @@ stat_ecdf <- function(mapping = NULL, data = NULL,
 StatEcdf <- ggproto("StatEcdf", Stat,
   required_aes = c("x|y"),
 
-  default_aes = aes(y = after_stat(y)),
+  default_aes = aes(x = after_stat(ecdf), y = after_stat(ecdf)),
 
   setup_params = function(self, data, params) {
     params$flipped_aes <- has_flipped_aes(data, params, main_is_orthogonal = FALSE, main_is_continuous = TRUE)
@@ -103,7 +103,7 @@ StatEcdf <- ggproto("StatEcdf", Stat,
 
     df_ecdf <- data_frame0(
       x = x,
-      y = data_ecdf,
+      ecdf = data_ecdf,
       .size = length(x)
     )
     df_ecdf$flipped_aes <- flipped_aes