Merge branch 'main' into remove_aspect_ratio_warning

Author: teunbrand

NEWS.md

@@ -1,15 +1,29 @@
 # ggplot2 (development version)
 
-### Bug fixes
-
+* Fixed regression where `position_stack(vjust)` was ignored when there are
+  only single groups (#6692)
+* Fixed bug where `NA` handling in `geom_path()` was ignoring panels (@teunbrand, #6533)
+* Logical values for the linetype aesthetic will be interpreted numerically,
+  so that `linetype = FALSE` becomes 0/'blank' and `linetype = TRUE` becomes 
+  1/'solid' (@teunbrand, #6641)
+* Out-of-bounds datapoints used as padding by `stat_align()` now get removed
+  silently rather than verbosely (@teunbrand, #6667)
+* Fixed bug where `stat_bin(boundary)` was ignored (#6682).
+* `geom_text()` and `geom_label()` accept expressions as the `label` aesthetic 
+  (@teunbrand, #6638)
 * Fixed regression where `draw_key_rect()` stopped using `fill` colours 
   (@mitchelloharawild, #6609).
 * Fixed regression where `scale_{x,y}_*()` threw an error when an expression
   object is set to `labels` argument (@yutannihilation, #6617).
-
-
+* Improved palette fallback mechanism in scales (@teunbrand, #6669).
 * Allow `stat` in `geom_hline`, `geom_vline`, and `geom_abline`. (@sierrajohnson, #6559)
 * `stat_boxplot()` treats `width` as an optional aesthetic (@Yunuuuu, #6575)
+* Fixed regression where the first (unnamed) argument to colour/fill scales was 
+  not passed as the `name` argument (@teunbrand, #6623)
+* Fixed issue where vectorised `arrow()`s caused errors in drawing the 
+  legend glyphs (@teunbrand, #6594)
+* Fixed regression where `NULL`-aesthetics contributed to plot labels too 
+  insistently. Now they contribute only as fallback labels (@teunbrand, #6616)
 
 # ggplot2 4.0.0
 

R/aes-evaluation.R

@@ -346,26 +346,6 @@ strip_stage <- function(expr) {
   }
 }
 
-# Convert aesthetic mapping into text labels
-make_labels <- function(mapping) {
-  default_label <- function(aesthetic, mapping) {
-    # e.g., geom_smooth(aes(colour = "loess")) or aes(y = NULL)
-    if (is.null(mapping) || is.atomic(mapping)) {
-      return(aesthetic)
-    }
-    mapping <- strip_stage(mapping)
-    mapping <- strip_dots(mapping, strip_pronoun = TRUE)
-    if (is_quosure(mapping) && quo_is_symbol(mapping)) {
-      name <- as_string(quo_get_expr(mapping))
-    } else {
-      name <- quo_text(mapping)
-      name <- gsub("\n.*$", "...", name)
-    }
-    name
-  }
-  Map(default_label, names(mapping), mapping)
-}
-
 eval_aesthetics <- function(aesthetics, data, mask = NULL) {
 
   env <- child_env(base_env())

R/bin.R

@@ -105,7 +105,12 @@ bin_breaks_bins <- function(x_range, bins = 30, center = NULL,
   } else {
     width <- (x_range[2] - x_range[1]) / (bins - 1)
     if (is.null(center)) {
-      boundary <- boundary %||% x_range[1] - width / 2
+      boundary <- boundary %||% (x_range[1] - width / 2)
+    }
+    # If `x_range` coincides with boundary we should
+    # use exact `bins` instead of `bins - 1` to prevent misalignments.
+    if (!is.null(boundary) && any(x_range %% width == boundary %% width)) {
+      width <- (x_range[2] - x_range[1]) / bins
     }
   }
 

R/fortify-map.R

@@ -28,7 +28,7 @@
 #' }
 fortify.map <- function(model, data, ...) {
   lifecycle::deprecate_warn(
-    "3.6.0", I("`fortify(<map>)`"), "map_data()"
+    "4.0.0", I("`fortify(<map>)`"), "map_data()"
   )
   df <- data_frame0(
     long = model$x,

R/fortify-models.R

@@ -39,7 +39,7 @@
 #'   geom_point()
 fortify.lm <- function(model, data = model$model, ...) {
   lifecycle::deprecate_warn(
-    "3.6.0", I("`fortify(<lm>)`"), I("`broom::augment(<lm>)`")
+    "4.0.0", I("`fortify(<lm>)`"), I("`broom::augment(<lm>)`")
   )
   infl <- stats::influence(model, do.coef = FALSE)
   data$.hat <- infl$hat
@@ -102,7 +102,7 @@ NULL
 #' @export
 fortify.glht <- function(model, data, ...) {
   lifecycle::deprecate_warn(
-    "3.6.0", I("`fortify(<glht>)`"), I("`broom::tidy(<glht>)`")
+    "4.0.0", I("`fortify(<glht>)`"), I("`broom::tidy(<glht>)`")
   )
   base::data.frame(
     lhs = rownames(model$linfct),
@@ -118,7 +118,7 @@ fortify.glht <- function(model, data, ...) {
 #' @export
 fortify.confint.glht <- function(model, data, ...) {
   lifecycle::deprecate_warn(
-    "3.6.0", I("`fortify(<confint.glht>)`"), I("`broom::tidy(<confint.glht>)`")
+    "4.0.0", I("`fortify(<confint.glht>)`"), I("`broom::tidy(<confint.glht>)`")
   )
   coef <- model$confint
   colnames(coef) <- to_lower_ascii(colnames(coef))
@@ -137,7 +137,7 @@ fortify.confint.glht <- function(model, data, ...) {
 #' @export
 fortify.summary.glht <- function(model, data, ...) {
   lifecycle::deprecate_warn(
-    "3.6.0", I("`fortify(<summary.glht>)`"), I("`broom::tidy(<summary.glht>)`")
+    "4.0.0", I("`fortify(<summary.glht>)`"), I("`broom::tidy(<summary.glht>)`")
   )
   coef <- as.data.frame(
     model$test[c("coefficients", "sigma", "tstat", "pvalues")])
@@ -158,7 +158,7 @@ fortify.summary.glht <- function(model, data, ...) {
 #' @export
 fortify.cld <- function(model, data, ...) {
   lifecycle::deprecate_warn(
-    "3.6.0", I("`fortify(<summary.glht>)`"), I("`broom::tidy(<summary.glht>)`")
+    "4.0.0", I("`fortify(<summary.glht>)`"), I("`broom::tidy(<summary.glht>)`")
   )
   base::data.frame(
     lhs = names(model$mcletters$Letters),

R/geom-label.R

@@ -83,6 +83,7 @@ GeomLabel <- ggproto("GeomLabel", Geom,
     if (parse) {
       lab <- parse_safe(as.character(lab))
     }
+    lab <- validate_labels(lab)
 
     data <- coord$transform(data, panel_params)
     data$vjust <- compute_just(data$vjust, data$y, data$x, data$angle)

R/geom-path.R

@@ -19,7 +19,7 @@ GeomPath <- ggproto("GeomPath", Geom,
     # middle since you expect those to be shown by a break in the line
     aesthetics <- c(self$required_aes, self$non_missing_aes)
     complete <- stats::complete.cases(data[names(data) %in% aesthetics])
-    kept <- stats::ave(complete, data$group, FUN = keep_mid_true)
+    kept <- stats::ave(complete, data$group, data$PANEL, FUN = keep_mid_true)
     data <- data[kept, ]
 
     if (!all(kept) && !params$na.rm) {

R/geom-text.R

@@ -23,6 +23,7 @@ GeomText <- ggproto(
     if (parse) {
       lab <- parse_safe(as.character(lab))
     }
+    lab <- validate_labels(lab)
 
     data <- coord$transform(data, panel_params)
 

R/geom-violin.R

@@ -24,7 +24,8 @@
 #' @param quantile.colour,quantile.color,quantile.linewidth,quantile.linetype
 #'   Default aesthetics for the quantile lines. Set to `NULL` to inherit from
 #'   the data's aesthetics. By default, quantile lines are hidden and can be
-#'   turned on by changing `quantile.linetype`.
+#'   turned on by changing `quantile.linetype`. Quantile values can be set
+#'   using the `quantiles` argument when using `stat = "ydensity"` (default).
 #' @param draw_quantiles `r lifecycle::badge("deprecated")` Previous
 #'   specification of drawing quantiles.
 #' @export

R/guide-colorbar.R

@@ -45,6 +45,10 @@ NULL
 #' @param available_aes A vector of character strings listing the aesthetics
 #'   for which a colourbar can be drawn.
 #' @param ... ignored.
+#' @details
+#' The `legend.ticks.length` theme option can be set to a length 2 unit to
+#' control ticks at the right/bottom and left/top sides independently.
+#'
 #' @return A guide object
 #' @export
 #' @family guides