resolve merge conflict

Merge branch 'main' into fancy_ggproto_docs

# Conflicts:
#	R/coord-.R
#	R/scale-.R
#	man/ggplot2-ggproto.Rd

Author: teunbrand

NAMESPACE

@@ -168,6 +168,7 @@ export(CoordQuickmap)
 export(CoordRadial)
 export(CoordSf)
 export(CoordTrans)
+export(CoordTransform)
 export(Facet)
 export(FacetGrid)
 export(FacetNull)
@@ -322,6 +323,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-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)
 #'

R/coord-.R

@@ -1,8 +1,8 @@
 #' Coords
 #'
 #' @description
-#' All `coord_*()` functions (like `coord_trans()`) return a `Coord*` object
-#' (like `CoordTrans`). These objects contain methods that support the
+#' All `coord_*()` functions (like `coord_transform()`) return a `Coord*` object
+#' (like `CoordTransform`). These objects contain methods that support the
 #' coordinate systems in ggplot2.
 #'
 #' @details
@@ -422,7 +422,7 @@ Coord <- ggproto("Coord",
   #' transformed. It is used in `coord_munch()` to ensure limits are in data
   #' coordinates.
   #'
-  #' The back-transformation may be needed for coords such as `coord_trans()`,
+  #' The back-transformation may be needed for coords such as `coord_transform()`,
   #' where the range in the transformed coordinates differs from the range in
   #' the untransformed coordinates.
   #'

R/coord-cartesian-.R

@@ -102,8 +102,8 @@ CoordCartesian <- ggproto("CoordCartesian", Coord,
     self$range(panel_params)
   },
 
-  transform = function(self, data, panel_params) {
-    reverse <- self$reverse %||% "none"
+  transform = function(data, panel_params) {
+    reverse <- panel_params$reverse %||% "none"
     x <- panel_params$x[[switch(reverse, xy = , x = "reverse", "rescale")]]
     y <- panel_params$y[[switch(reverse, xy = , y = "reverse", "rescale")]]
     data <- transform_position(data, x, y)
@@ -113,7 +113,8 @@ CoordCartesian <- ggproto("CoordCartesian", Coord,
   setup_panel_params = function(self, scale_x, scale_y, params = list()) {
     c(
       view_scales_from_scale(scale_x, self$limits$x, params$expand[c(4, 2)]),
-      view_scales_from_scale(scale_y, self$limits$y, params$expand[c(3, 1)])
+      view_scales_from_scale(scale_y, self$limits$y, params$expand[c(3, 1)]),
+      reverse = self$reverse %||% "none"
     )
   },
 

R/coord-radial.R

@@ -524,6 +524,7 @@ polar_bbox <- function(arc, margin = c(0.05, 0.05, 0.05, 0.05),
     return(list(x = c(0, 1), y = c(0, 1)))
   }
   arc <- sort(arc)
+  inner_radius <- sort(inner_radius)
 
   # X and Y position of the sector arc ends
   xmax <- 0.5 * sin(arc) + 0.5

R/coord-sf.R

@@ -86,7 +86,7 @@ CoordSf <- ggproto("CoordSf", CoordCartesian,
     target_crs <- panel_params$crs
 
     # CoordSf doesn't use the viewscale rescaling, so we just flip ranges
-    reverse <- self$reverse %||% "none"
+    reverse <- panel_params$reverse %||% "none"
     x_range <- switch(reverse, xy = , x = rev, identity)(panel_params$x_range)
     y_range <- switch(reverse, xy = , y = rev, identity)(panel_params$y_range)
 
@@ -268,7 +268,8 @@ CoordSf <- ggproto("CoordSf", CoordCartesian,
       y_range = y_range,
       crs = params$crs,
       default_crs = params$default_crs,
-      !!!viewscales
+      !!!viewscales,
+      reverse = self$reverse %||% "none"
     )
 
     # Rescale graticule for panel grid

R/coord-transform.R

@@ -1,16 +1,19 @@
 #' Transformed Cartesian coordinate system
 #'
-#' `coord_trans()` is different to scale transformations in that it occurs after
+#' `coord_transform()` is different to scale transformations in that it occurs after
 #' statistical transformation and will affect the visual appearance of geoms - there is
 #' no guarantee that straight lines will continue to be straight.
 #'
 #' Transformations only work with continuous values: see
 #' [scales::new_transform()] for list of transformations, and instructions
 #' on how to create your own.
 #'
+#' The `coord_trans()` function is deprecated in favour of `coord_transform()`.
+#'
 #' @inheritParams coord_cartesian
 #' @param x,y Transformers for x and y axes or their names.
 #' @param limx,limy `r lifecycle::badge("deprecated")` use `xlim` and `ylim` instead.
+#' @param ... Arguments forwarded to `coord_transform()`.
 #' @seealso
 #' The `r link_book("coord transformations section", "coord#transformations-with-coord_trans")`
 #' @export
@@ -30,7 +33,7 @@
 #' #  * by transforming the coordinate system:
 #' ggplot(diamonds, aes(carat, price)) +
 #'   geom_point() +
-#'   coord_trans(x = "log10", y = "log10")
+#'   coord_transform(x = "log10", y = "log10")
 #'
 #' # The difference between transforming the scales and
 #' # transforming the coordinate system is that scale
@@ -49,7 +52,7 @@
 #' ggplot(d, aes(carat, price)) +
 #'   geom_point() +
 #'   geom_smooth(method = "lm") +
-#'   coord_trans(x = "log10", y = "log10")
+#'   coord_transform(x = "log10", y = "log10")
 #'
 #' # Here I used a subset of diamonds so that the smoothed line didn't
 #' # drop below zero, which obviously causes problems on the log-transformed
@@ -62,7 +65,7 @@
 #'   geom_smooth(method = "lm") +
 #'   scale_x_log10() +
 #'   scale_y_log10() +
-#'   coord_trans(x = scales::transform_exp(10), y = scales::transform_exp(10))
+#'   coord_transform(x = scales::transform_exp(10), y = scales::transform_exp(10))
 #'
 #' # cf.
 #' ggplot(diamonds, aes(carat, price)) +
@@ -74,18 +77,18 @@
 #' df <- data.frame(a = abs(rnorm(26)),letters)
 #' plot <- ggplot(df,aes(a,letters)) + geom_point()
 #'
-#' plot + coord_trans(x = "log10")
-#' plot + coord_trans(x = "sqrt")
+#' plot + coord_transform(x = "log10")
+#' plot + coord_transform(x = "sqrt")
 #' }
-coord_trans <- function(x = "identity", y = "identity", xlim = NULL, ylim = NULL,
-                        limx = deprecated(), limy = deprecated(), clip = "on",
-                        expand = TRUE, reverse = "none") {
+coord_transform <- function(x = "identity", y = "identity", xlim = NULL, ylim = NULL,
+                            limx = deprecated(), limy = deprecated(), clip = "on",
+                            expand = TRUE, reverse = "none") {
   if (lifecycle::is_present(limx)) {
-    deprecate_warn0("3.3.0", "coord_trans(limx)", "coord_trans(xlim)")
+    deprecate_warn0("3.3.0", "coord_transform(limx)", "coord_transform(xlim)")
     xlim <- limx
   }
   if (lifecycle::is_present(limy)) {
-    deprecate_warn0("3.3.0", "coord_trans(limy)", "coord_trans(ylim)")
+    deprecate_warn0("3.3.0", "coord_transform(limy)", "coord_transform(ylim)")
     ylim <- limy
   }
 
@@ -96,7 +99,8 @@ coord_trans <- function(x = "identity", y = "identity", xlim = NULL, ylim = NULL
   if (is.character(x)) x <- as.transform(x)
   if (is.character(y)) y <- as.transform(y)
 
-  ggproto(NULL, CoordTrans,
+  ggproto(
+    NULL, CoordTransform,
     trans = list(x = x, y = y),
     limits = list(x = xlim, y = ylim),
     expand = expand,
@@ -105,12 +109,23 @@ coord_trans <- function(x = "identity", y = "identity", xlim = NULL, ylim = NULL
   )
 }
 
+#' @rdname coord_transform
+#' @export
+coord_trans <- function(...) {
+  deprecate_soft0(
+    "3.5.2",
+    "coord_trans()",
+    "coord_transform()"
+  )
+  coord_transform(...)
+}
 
 #' @rdname Coord
 #' @format NULL
 #' @usage NULL
 #' @export
-CoordTrans <- ggproto("CoordTrans", Coord,
+CoordTransform <- ggproto(
+  "CoordTransform", Coord,
   is_free = function() TRUE,
   distance = function(self, x, y, panel_params) {
     max_dist <- dist_euclidean(panel_params$x.range, panel_params$y.range)
@@ -134,7 +149,7 @@ CoordTrans <- ggproto("CoordTrans", Coord,
   transform = function(self, data, panel_params) {
     # trans_x() and trans_y() needs to keep Inf values because this can be called
     # in guide_transform.axis()
-    reverse <- self$reverse %||% "none"
+    reverse <- panel_params$reverse %||% "none"
     x_range <- switch(reverse, xy = , x = rev, identity)(panel_params$x.range)
     y_range <- switch(reverse, xy = , y = rev, identity)(panel_params$y.range)
     trans_x <- function(data) {
@@ -159,7 +174,8 @@ CoordTrans <- ggproto("CoordTrans", Coord,
   setup_panel_params = function(self, scale_x, scale_y, params = list()) {
     c(
       view_scales_from_scale_with_coord_trans(scale_x, self$limits$x, self$trans$x, params$expand[c(4, 2)]),
-      view_scales_from_scale_with_coord_trans(scale_y, self$limits$y, self$trans$y, params$expand[c(3, 1)])
+      view_scales_from_scale_with_coord_trans(scale_y, self$limits$y, self$trans$y, params$expand[c(3, 1)]),
+      reverse = self$reverse %||% "none"
     )
   },
 
@@ -182,6 +198,13 @@ CoordTrans <- ggproto("CoordTrans", Coord,
   }
 )
 
+# TODO: deprecate this some time in the future
+#' @rdname ggplot2-ggproto
+#' @format NULL
+#' @usage NULL
+#' @export
+CoordTrans <- ggproto("CoordTrans", CoordTransform)
+
 transform_value <- function(trans, value, range) {
   if (is.null(value))
     return(value)
@@ -257,3 +280,4 @@ warn_new_infinites <- function(old_values, new_values, axis, call = caller_env()
     cli::cli_warn("Transformation introduced infinite values in {axis}-axis", call = call)
   }
 }
+

R/geom-contour.R

@@ -9,7 +9,7 @@
 #' once. Missing values of `z` are allowed, but contouring will only work for
 #' grid points where all four corners are non-missing. If you have irregular
 #' data, you'll need to first interpolate on to a grid before visualising,
-#' using [interp::interp()], [akima::bilinear()], or similar.
+#' using `interp::interp()`, `akima::bilinear()`, or similar.
 #'
 #' @eval rd_aesthetics("geom", "contour")
 #' @eval rd_aesthetics("geom", "contour_filled")

R/geom-histogram.R

@@ -113,11 +113,11 @@
 #' # no observations have 0 ratings.
 #' m +
 #'   geom_histogram(boundary = 0) +
-#'   coord_trans(x = "log10")
+#'   coord_transform(x = "log10")
 #' # Use boundary = 0, to make sure we don't take sqrt of negative values
 #' m +
 #'   geom_histogram(boundary = 0) +
-#'   coord_trans(x = "sqrt")
+#'   coord_transform(x = "sqrt")
 #'
 #' # You can also transform the y axis.  Remember that the base of the bars
 #' # has value 0, so log transformations are not appropriate