resolve merge conflict

Merge branch 'main' into boilerplates

# Conflicts:
#	R/geom-bar.R
#	R/geom-bin2d.R
#	R/geom-col.R
#	R/geom-contour.R
#	R/geom-curve.R
#	R/geom-density.R
#	R/geom-errorbar.R
#	R/geom-function.R
#	R/geom-hex.R
#	R/geom-linerange.R
#	R/geom-path.R
#	R/geom-point.R
#	R/geom-pointrange.R
#	R/geom-quantile.R
#	R/geom-raster.R
#	R/geom-rect.R
#	R/geom-ribbon.R
#	R/geom-rug.R
#	R/geom-segment.R
#	R/geom-smooth.R
#	R/geom-spoke.R
#	R/geom-text.R
#	R/geom-tile.R
#	R/stat-align.R
#	R/stat-bin.R
#	R/stat-bin2d.R
#	R/stat-binhex.R
#	R/stat-boxplot.R
#	R/stat-connect.R
#	R/stat-contour.R
#	R/stat-count.R
#	R/stat-density-2d.R
#	R/stat-density.R
#	R/stat-ecdf.R
#	R/stat-ellipse.R
#	R/stat-function.R
#	R/stat-identity.R
#	R/stat-manual.R
#	R/stat-qq-line.R
#	R/stat-qq.R
#	R/stat-quantilemethods.R
#	R/stat-smooth.R
#	R/stat-sum.R
#	R/stat-summary-2d.R
#	R/stat-summary-hex.R
#	R/stat-unique.R
#	R/stat-ydensity.R
#	man/ggplot2-ggproto.Rd

Author: teunbrand

NAMESPACE

@@ -170,6 +170,7 @@ export(CoordQuickmap)
 export(CoordRadial)
 export(CoordSf)
 export(CoordTrans)
+export(CoordTransform)
 export(Facet)
 export(FacetGrid)
 export(FacetNull)
@@ -324,6 +325,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)

NEWS.md

@@ -1,5 +1,8 @@
 # ggplot2 (development version)
 
+* 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
@@ -280,6 +283,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/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)
 #'
@@ -123,7 +123,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