resolve merge conflict

Merge branch 'main' into upkeep-2025-04

# Conflicts:
#	R/geom-histogram.R

Author: teunbrand

DESCRIPTION

@@ -40,7 +40,7 @@ Imports:
     isoband,
     lifecycle (> 1.0.1),
     rlang (>= 1.1.0),
-    scales (>= 1.3.0),
+    scales (>= 1.4.0),
     stats,
     vctrs (>= 0.6.0),
     withr (>= 2.5.0)
@@ -64,6 +64,7 @@ Suggests:
     ragg (>= 1.2.6),
     RColorBrewer,
     rmarkdown,
+    roxygen2,
     rpart,
     sf (>= 0.7-3),
     svglite (>= 2.1.2),
@@ -94,11 +95,15 @@ Collate:
     'compat-plyr.R'
     'utilities.R'
     'aes.R'
+    'annotation-borders.R'
     'utilities-checks.R'
     'legend-draw.R'
     'geom-.R'
     'annotation-custom.R'
     'annotation-logticks.R'
+    'scale-type.R'
+    'layer.R'
+    'make-constructor.R'
     'geom-polygon.R'
     'geom-map.R'
     'annotation-map.R'
@@ -143,6 +148,7 @@ Collate:
     'geom-col.R'
     'geom-path.R'
     'geom-contour.R'
+    'geom-point.R'
     'geom-count.R'
     'geom-crossbar.R'
     'geom-segment.R'
@@ -161,7 +167,6 @@ Collate:
     'geom-jitter.R'
     'geom-label.R'
     'geom-linerange.R'
-    'geom-point.R'
     'geom-pointrange.R'
     'geom-quantile.R'
     'geom-rug.R'
@@ -187,7 +192,6 @@ Collate:
     'guide-colorbar.R'
     'guide-colorsteps.R'
     'guide-custom.R'
-    'layer.R'
     'guide-none.R'
     'guide-old.R'
     'guides-.R'
@@ -237,7 +241,6 @@ Collate:
     'scale-shape.R'
     'scale-size.R'
     'scale-steps.R'
-    'scale-type.R'
     'scale-view.R'
     'scale-viridis.R'
     'scales-.R'

NAMESPACE

@@ -28,6 +28,7 @@ S3method(element_grob,element_rect)
 S3method(element_grob,element_text)
 S3method(format,ggproto)
 S3method(format,ggproto_method)
+S3method(format,rd_section_aesthetics)
 S3method(fortify,"NULL")
 S3method(fortify,"function")
 S3method(fortify,Line)
@@ -95,6 +96,8 @@ S3method(limits,character)
 S3method(limits,factor)
 S3method(limits,numeric)
 S3method(makeContext,dotstackGrob)
+S3method(make_constructor,Geom)
+S3method(make_constructor,Stat)
 S3method(merge_element,default)
 S3method(merge_element,element)
 S3method(merge_element,element_blank)
@@ -168,6 +171,7 @@ export(CoordQuickmap)
 export(CoordRadial)
 export(CoordSf)
 export(CoordTrans)
+export(CoordTransform)
 export(Facet)
 export(FacetGrid)
 export(FacetNull)
@@ -294,6 +298,7 @@ export(after_scale)
 export(after_stat)
 export(alpha)
 export(annotate)
+export(annotation_borders)
 export(annotation_custom)
 export(annotation_logticks)
 export(annotation_map)
@@ -322,6 +327,7 @@ export(coord_quickmap)
 export(coord_radial)
 export(coord_sf)
 export(coord_trans)
+export(coord_transform)
 export(cut_interval)
 export(cut_number)
 export(cut_width)
@@ -474,7 +480,6 @@ export(is.facet)
 export(is.ggplot)
 export(is.ggproto)
 export(is.theme)
-export(is.waiver)
 export(is_coord)
 export(is_facet)
 export(is_geom)
@@ -490,6 +495,7 @@ export(is_scale)
 export(is_stat)
 export(is_theme)
 export(is_theme_element)
+export(is_waiver)
 export(label_both)
 export(label_bquote)
 export(label_context)
@@ -505,6 +511,7 @@ export(layer_grob)
 export(layer_scales)
 export(layer_sf)
 export(lims)
+export(make_constructor)
 export(map_data)
 export(margin)
 export(margin_auto)

NEWS.md

@@ -1,5 +1,16 @@
 # ggplot2 (development version)
 
+* New roxygen tag `@aesthetics` that takes a Geom, Stat or Position class and
+  generates an 'Aesthetics' section.
+* `annotation_borders()` replaces the now-deprecated `borders()` 
+  (@teunbrand, #6392)
+* New `make_constructor()` function that builds a standard constructor for
+  Geom and Stat classes (@teunbrand, #6142).
+* In continuous scales, when `breaks` is a function and `n.breaks` is set, the 
+  `n.breaks` will be passed to the `breaks` function. Previously, `n.breaks` 
+  only applied to the default break calculation (@teunbrand, #5972)
+* (internal) New `Facet$draw_panel_content()` method for delegating panel 
+  assembly (@Yunuuuu, #6406).
 * Facet gains a new method `setup_panel_params` to interact with the
   panel_params setted by Coord object (@Yunuuuu, #6397, #6380)
 * `position_fill()` avoids stacking observations of zero (@teunbrand, #6338)
@@ -87,7 +98,7 @@
   @yutannihilation's prior work, #3120)
 * When discrete breaks have names, they'll be used as labels by default
   (@teunbrand, #6147).
-* The helper function `is.waiver()` is now exported to help extensions to work
+* The helper function `is_waiver()` is now exported to help extensions to work
   with `waiver()` objects (@arcresu, #6173).
 * Date(time) scales now throw appropriate errors when `date_breaks`,
   `date_minor_breaks` or `date_labels` are not strings (@RodDalBen, #5880)
@@ -278,6 +289,7 @@
   (@teunbrand, #5938, #4327).
 * Fixed bug where empty discrete scales weren't recognised as such
   (@teunbrand, #5945).
+* `coord_trans()` renamed to `coord_transform()` (@nmercadeb, #5825).
 * (internal) The summary function of `stat_summary()` and `stat_summary_bin()`
   is setup once in total instead of once per group (@teunbrand, #5971)
 * `facet_grid(space = "free")` can now be combined with `coord_fixed()`

R/aes.R

@@ -302,7 +302,7 @@ aes_ <- function(x, y, ...) {
   caller_env <- parent.frame()
 
   as_quosure_aes <- function(x) {
-    if (is.formula(x) && length(x) == 2) {
+    if (is_formula(x) && length(x) == 2) {
       as_quosure(x)
     } else if (is.null(x) || is.call(x) || is.name(x) || is.atomic(x)) {
       new_aesthetic(x, caller_env)

R/annotation-borders.R

@@ -0,0 +1,51 @@
+#' Create a layer of map borders
+#'
+#' This is a quick and dirty way to get map data (from the \pkg{maps} package)
+#' onto your plot. This is a good place to start if you need some crude
+#' reference lines, but you'll typically want something more sophisticated
+#' for communication graphics.
+#'
+#' @param database map data, see [maps::map()] for details
+#' @param regions map region
+#' @param fill fill colour
+#' @param colour border colour
+#' @param xlim,ylim latitudinal and longitudinal ranges for extracting map
+#'   polygons, see [maps::map()] for details.
+#' @inheritDotParams geom_polygon
+#' @export
+#' @examples
+#' if (require("maps")) {
+#' data(us.cities)
+#' capitals <- subset(us.cities, capital == 2)
+#' ggplot(capitals, aes(long, lat)) +
+#'   annotation_borders("state") +
+#'   geom_point(aes(size = pop)) +
+#'   scale_size_area() +
+#'   coord_quickmap()
+#' }
+#'
+#' if (require("maps")) {
+#' # Same map, with some world context
+#' ggplot(capitals, aes(long, lat)) +
+#'   annotation_borders("world", xlim = c(-130, -60), ylim = c(20, 50)) +
+#'   geom_point(aes(size = pop)) +
+#'   scale_size_area() +
+#'   coord_quickmap()
+#' }
+annotation_borders <- function(database = "world", regions = ".", fill = NA,
+                               colour = "grey50", xlim = NULL, ylim = NULL, ...) {
+  df <- map_data(database, regions, xlim = xlim, ylim = ylim)
+  annotate(
+    geom = "polygon",
+    x = df$long, y = df$lat, group = df$group,
+    fill = fill, colour = colour, ...
+  )
+}
+
+#' @export
+#' @rdname annotation_borders
+#' @usage borders(...) # Deprecated
+borders <- function(...) {
+  deprecate_soft0("4.0.0", "borders()", "annotation_borders()")
+  annotation_borders(...)
+}

R/annotation-custom.R

@@ -58,7 +58,7 @@ annotation_custom <- function(grob, xmin = -Inf, xmax = Inf, ymin = -Inf, ymax =
   )
 }
 
-#' @rdname ggplot2-ggproto
+#' @rdname Geom
 #' @format NULL
 #' @usage NULL
 #' @export

R/annotation-logticks.R

@@ -24,7 +24,7 @@
 #' @param scaled is the data already log-scaled? This should be `TRUE`
 #'   (default) when the data is already transformed with `log10()` or when
 #'   using `scale_y_log10()`. It should be `FALSE` when using
-#'   `coord_trans(y = "log10")`.
+#'   `coord_transform(y = "log10")`.
 #' @param colour Colour of the tick marks.
 #' @param linewidth Thickness of tick marks, in mm.
 #' @param linetype Linetype of tick marks (`solid`, `dashed`, etc.)
@@ -36,7 +36,7 @@
 #' @export
 #' @seealso [scale_y_continuous()], [scale_y_log10()] for log scale
 #'   transformations.
-#' @seealso [coord_trans()] for log coordinate transformations.
+#' @seealso [coord_transform()] for log coordinate transformations.
 #'
 #' @examples
 #' # Make a log-log plot (without log ticks)
@@ -75,7 +75,7 @@
 #' # Using a coordinate transform requires scaled = FALSE
 #' t <- ggplot(msleep, aes(bodywt, brainwt)) +
 #'   geom_point() +
-#'   coord_trans(x = "log10", y = "log10") +
+#'   coord_transform(x = "log10", y = "log10") +
 #'   theme_bw()
 #' t + annotation_logticks(scaled = FALSE)
 #'
@@ -93,6 +93,8 @@ annotation_logticks <- function(base = 10, sides = "bl", outside = FALSE, scaled
   if (!is.null(color))
     colour <- color
 
+  lifecycle::signal_stage("superseded", "annotation_logticks()", "guide_axis_logticks()")
+
   if (lifecycle::is_present(size)) {
     deprecate_soft0("3.5.0", I("Using the `size` aesthetic in this geom"), I("`linewidth`"))
     linewidth <- linewidth %||% size
@@ -123,7 +125,7 @@ annotation_logticks <- function(base = 10, sides = "bl", outside = FALSE, scaled
   )
 }
 
-#' @rdname ggplot2-ggproto
+#' @rdname Geom
 #' @format NULL
 #' @usage NULL
 #' @export

R/annotation-map.R

@@ -76,7 +76,7 @@ annotation_map <- function(map, ...) {
   )
 }
 
-#' @rdname ggplot2-ggproto
+#' @rdname Geom
 #' @format NULL
 #' @usage NULL
 #' @export

R/annotation-raster.R

@@ -61,7 +61,7 @@ annotation_raster <- function(raster, xmin, xmax, ymin, ymax,
 
 }
 
-#' @rdname ggplot2-ggproto
+#' @rdname Geom
 #' @format NULL
 #' @usage NULL
 #' @export

R/axis-secondary.R

@@ -124,19 +124,19 @@ dup_axis <- function(transform = identity, name = derive(), breaks = derive(),
   sec_axis(transform, trans = trans, name, breaks, labels, guide)
 }
 
-is.sec_axis <- function(x) {
+is_sec_axis <- function(x) {
   inherits(x, "AxisSecondary")
 }
 
 set_sec_axis <- function(sec.axis, scale) {
-  if (!is.waiver(sec.axis)) {
+  if (!is_waiver(sec.axis)) {
     if (scale$is_discrete()) {
       if (!identical(.subset2(sec.axis, "trans"), identity)) {
         cli::cli_abort("Discrete secondary axes must have the {.fn identity} transformation.")
       }
     }
-    if (is.formula(sec.axis)) sec.axis <- sec_axis(sec.axis)
-    if (!is.sec_axis(sec.axis)) {
+    if (is_formula(sec.axis)) sec.axis <- sec_axis(sec.axis)
+    if (!is_sec_axis(sec.axis)) {
       cli::cli_abort("Secondary axes must be specified using {.fn sec_axis}.")
     }
     scale$secondary.axis <- sec.axis
@@ -150,7 +150,7 @@ set_sec_axis <- function(sec.axis, scale) {
 derive <- function() {
   structure(list(), class = "derived")
 }
-is.derived <- function(x) {
+is_derived <- function(x) {
   inherits(x, "derived")
 }
 #' @rdname ggplot2-ggproto
@@ -182,9 +182,9 @@ AxisSecondary <- ggproto("AxisSecondary", NULL,
     if (!is.function(transform)) {
       cli::cli_abort("Transformation for secondary axes must be a function.")
     }
-    if (is.derived(self$name) && !is.waiver(scale$name)) self$name <- scale$name
-    if (is.derived(self$breaks)) self$breaks <- scale$breaks
-    if (is.waiver(self$breaks)) {
+    if (is_derived(self$name) && !is_waiver(scale$name)) self$name <- scale$name
+    if (is_derived(self$breaks)) self$breaks <- scale$breaks
+    if (is_waiver(self$breaks)) {
       if (scale$is_discrete()) {
         self$breaks <- setNames(nm = scale$get_breaks())
       } else {
@@ -197,8 +197,8 @@ AxisSecondary <- ggproto("AxisSecondary", NULL,
         }
       }
     }
-    if (is.derived(self$labels)) self$labels <- scale$labels
-    if (is.derived(self$guide)) self$guide <- scale$guide
+    if (is_derived(self$labels)) self$labels <- scale$labels
+    if (is_derived(self$guide)) self$guide <- scale$guide
   },
 
   transform_range = function(self, range) {