fix merge conflict

Merge branch 'main' into attr_stability

# Conflicts:
#	R/layer.R

Author: teunbrand

DESCRIPTION

@@ -254,6 +254,7 @@ Collate:
     'stat-ellipse.R'
     'stat-function.R'
     'stat-identity.R'
+    'stat-manual.R'
     'stat-qq-line.R'
     'stat-qq.R'
     'stat-quantilemethods.R'
@@ -273,6 +274,7 @@ Collate:
     'theme.R'
     'theme-defaults.R'
     'theme-current.R'
+    'theme-sub.R'
     'utilities-break.R'
     'utilities-grid.R'
     'utilities-help.R'

NAMESPACE

@@ -94,6 +94,7 @@ S3method(makeContext,dotstackGrob)
 S3method(merge_element,default)
 S3method(merge_element,element)
 S3method(merge_element,element_blank)
+S3method(merge_element,margin)
 S3method(pattern_alpha,GridPattern)
 S3method(pattern_alpha,GridTilingPattern)
 S3method(pattern_alpha,default)
@@ -264,6 +265,7 @@ export(StatEcdf)
 export(StatEllipse)
 export(StatFunction)
 export(StatIdentity)
+export(StatManual)
 export(StatQq)
 export(StatQqLine)
 export(StatQuantile)
@@ -494,6 +496,8 @@ export(layer_sf)
 export(lims)
 export(map_data)
 export(margin)
+export(margin_auto)
+export(margin_part)
 export(max_height)
 export(max_width)
 export(mean_cl_boot)
@@ -688,6 +692,7 @@ export(stat_ecdf)
 export(stat_ellipse)
 export(stat_function)
 export(stat_identity)
+export(stat_manual)
 export(stat_qq)
 export(stat_qq_line)
 export(stat_quantile)
@@ -720,6 +725,17 @@ export(theme_linedraw)
 export(theme_minimal)
 export(theme_replace)
 export(theme_set)
+export(theme_sub_axis)
+export(theme_sub_axis_bottom)
+export(theme_sub_axis_left)
+export(theme_sub_axis_right)
+export(theme_sub_axis_top)
+export(theme_sub_axis_x)
+export(theme_sub_axis_y)
+export(theme_sub_legend)
+export(theme_sub_panel)
+export(theme_sub_plot)
+export(theme_sub_strip)
 export(theme_test)
 export(theme_transparent)
 export(theme_update)

NEWS.md

@@ -2,6 +2,35 @@
 
 * (internal) layer data can be attenuated with parameter attributes 
   (@teunbrand, #3175).
+* Position adjustments can now have auxiliary aesthetics (@teunbrand).
+    * `position_nudge()` gains `nudge_x` and `nudge_y` aesthetics (#3026, #5445).
+    * `position_dodge()` gains `order` aesthetic (#3022, #3345)
+* More stability for vctrs-based palettes (@teunbrand, #6117).
+* Fixed regression in `guide_bins(reverse = TRUE)` (@teunbrand, #6183).
+* New function family for setting parts of a theme. For example, you can now use 
+  `theme_sub_axis(line, text, ticks, ticks.length, line)` as a substitute for
+  `theme(axis.line, axis.text, axis.ticks, axis.ticks.length, axis.line)`. This
+  should allow slightly terser and more organised theme declarations 
+  (@teunbrand, #5301).
+* `scale_{x/y}_discrete(continuous.limits)` is a new argument to control the
+  display range of discrete scales (@teunbrand, #4174, #6259).
+* `geom_ribbon()` now appropriately warns about, and removes, missing values 
+  (@teunbrand, #6243).
+* `guide_*()` can now accept two inside legend theme elements:
+  `legend.position.inside` and `legend.justification.inside`, allowing inside
+  legends to be placed at different positions. Only inside legends with the same
+  position and justification will be merged (@Yunuuuu, #6210).
+* New stat: `stat_manual()` for arbitrary computations (@teunbrand, #3501)
+* Reversal of a dimension, typically 'x' or 'y', is now controlled by the 
+  `reverse` argument in `coord_cartesian()`, `coord_fixed()`, `coord_radial()`
+  and `coord_sf()`. In `coord_radial()`, this replaces the older `direction` 
+  argument (#4021, @teunbrand).
+* `coord_radial()` displays minor gridlines now (@teunbrand).
+* (internal) `continuous_scale()` and `binned_scale()` sort the `limits` 
+  argument internally (@teunbrand).
+* Theme margins can have NA-units to inherit from parent elements. The new
+  function `margin_part()` has NA-units as default (@teunbrand, #6115)
+* New `margin_auto()` specification for theme margins.
 * New argument `labs(dictionary)` to label based on variable name rather than 
   based on aesthetic (@teunbrand, #5178)
 * Fixed bug in out-of-bounds binned breaks (@teunbrand, #6054)
@@ -29,6 +58,13 @@
   (@teunbrand, #4320)
 * `geom_boxplot()` gains additional arguments to style the colour, linetype and
   linewidths of the box, whiskers, median line and staples (@teunbrand, #5126)
+* `geom_violin()` gains additional arguments to style the colour, linetype and
+  linewidths of the quantiles, which replace the now-deprecated `draw_quantiles` 
+  argument (#5912).
+* (breaking) `geom_violin(quantiles)` now has actual quantiles based on
+  the data, rather than inferred quantiles based on the computed density. The
+  `quantiles` parameter that replaces `draw_quantiles` now belongs to 
+  `stat_ydensity()` instead of `geom_violin()` (@teunbrand, #4120).
 * (internal) Using `after_scale()` in the `Geom*$default_aes()` field is now
   evaluated in the context of data (@teunbrand, #6135)
 * Fixed bug where binned scales wouldn't simultaneously accept transformations
@@ -218,13 +254,22 @@
   `labs()` and several guides (@teunbrand, #3196).
 * `stat_summary_bin()` no longer ignores `width` parameter (@teunbrand, #4647).
 * Added `keep.zeroes` argument to `stat_bin()` (@teunbrand, #3449)
+* (internal) removed barriers for using 2D structures as aesthetics 
+  (@teunbrand, #4189).
 * `coord_sf()` no longer errors when dealing with empty graticules (@teunbrand, #6052)
 * Added `theme_transparent()` with transparent backgrounds (@topepo).
 * New theme elements `palette.{aes}.discrete` and `palette.{aes}.continuous`. 
   Theme palettes replace palettes in scales where `palette = NULL`, which is 
   the new default in many scales (@teunbrand, #4696).
 * `guide_axis()` no longer reserves space for blank ticks 
   (@teunbrand, #4722, #6069).
+* `geom_abline()` clips to the panel range in the vertical direction too
+  (@teunbrand, #6086).
+* Added `panel.widths` and `panel.heights` to `theme()` (#5338, @teunbrand).
+* Standardised the calculation of `width`, which are now implemented as
+  aesthetics (@teunbrand, #2800).
+* Stricter check on `register_theme_elements(element_tree)` (@teunbrand, #6162)
+* Added `weight` aesthetic for `stat_ellipse()` (@teunbrand, #5272)
 
 # ggplot2 3.5.1
 

R/aes.R

@@ -38,6 +38,13 @@ NULL
 #'
 #'   [Delayed evaluation][aes_eval] for working with computed variables.
 #'
+#' @note
+#' Using `I()` to create objects of class 'AsIs' causes scales to ignore the
+#' variable and assumes the wrapped variable is direct input for the grid
+#' package. Please be aware that variables are sometimes combined, like in
+#' some stats or position adjustments, that may yield unexpected results with
+#' 'AsIs' variables.
+#'
 #' @family aesthetics documentation
 #' @return A list with class `uneval`. Components of the list are either
 #'   quosures or constants.

R/coord-.R

@@ -59,6 +59,9 @@ Coord <- ggproto("Coord",
   # "on" = yes, "off" = no
   clip = "on",
 
+  # Should any of the scales be reversed?
+  reverse = "none",
+
   aspect = function(ranges) NULL,
 
   labels = function(self, labels, panel_params) {
@@ -185,11 +188,7 @@ Coord <- ggproto("Coord",
   is_free = function() FALSE,
 
   setup_params = function(self, data) {
-    list(
-      guide_default = guide_axis(),
-      guide_missing = guide_none(),
-      expand = parse_coord_expand(self$expand %||% TRUE)
-    )
+    list(expand = parse_coord_expand(self$expand %||% TRUE))
   },
 
   setup_data = function(data, params = list()) {

R/coord-cartesian-.R

@@ -25,6 +25,10 @@
 #'   limits are set via `xlim` and `ylim` and some data points fall outside those
 #'   limits, then those data points may show up in places such as the axes, the
 #'   legend, the plot title, or the plot margins.
+#' @param reverse A string giving which directions to reverse. `"none"`
+#'   (default) keeps directions as is. `"x"` and `"y"` can be used to reverse
+#'   their respective directions. `"xy"` can be used to reverse both
+#'   directions.
 #' @export
 #' @examples
 #' # There are two ways of zooming the plot display: with scales or
@@ -64,11 +68,12 @@
 #' # displayed bigger
 #' d + coord_cartesian(xlim = c(0, 1))
 coord_cartesian <- function(xlim = NULL, ylim = NULL, expand = TRUE,
-                            default = FALSE, clip = "on") {
+                            default = FALSE, clip = "on", reverse = "none") {
   check_coord_limits(xlim)
   check_coord_limits(ylim)
   ggproto(NULL, CoordCartesian,
     limits = list(x = xlim, y = ylim),
+    reverse = reverse,
     expand = expand,
     default = default,
     clip = clip
@@ -97,8 +102,11 @@ CoordCartesian <- ggproto("CoordCartesian", Coord,
     self$range(panel_params)
   },
 
-  transform = function(data, panel_params) {
-    data <- transform_position(data, panel_params$x$rescale, panel_params$y$rescale)
+  transform = function(self, data, panel_params) {
+    reverse <- self$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)
     transform_position(data, squish_infinite, squish_infinite)
   },
 
@@ -109,14 +117,8 @@ CoordCartesian <- ggproto("CoordCartesian", Coord,
     )
   },
 
-  render_bg = function(panel_params, theme) {
-    guide_grid(
-      theme,
-      panel_params$x$break_positions_minor(),
-      panel_params$x$break_positions(),
-      panel_params$y$break_positions_minor(),
-      panel_params$y$break_positions()
-    )
+  render_bg = function(self, panel_params, theme) {
+    guide_grid(theme, panel_params, self)
   },
 
   render_axis_h = function(panel_params, theme) {

R/coord-fixed.R

@@ -22,13 +22,15 @@
 #' p + coord_fixed(xlim = c(15, 30))
 #'
 #' # Resize the plot to see that the specified aspect ratio is maintained
-coord_fixed <- function(ratio = 1, xlim = NULL, ylim = NULL, expand = TRUE, clip = "on") {
+coord_fixed <- function(ratio = 1, xlim = NULL, ylim = NULL, expand = TRUE,
+                        clip = "on", reverse = "none") {
   check_coord_limits(xlim)
   check_coord_limits(ylim)
   ggproto(NULL, CoordFixed,
     limits = list(x = xlim, y = ylim),
     ratio = ratio,
     expand = expand,
+    reverse = reverse,
     clip = clip
   )
 }

R/coord-polar.R

@@ -20,7 +20,7 @@
 #' # to demonstrate how these common plots can be described in the
 #' # grammar.  Use with EXTREME caution.
 #'
-#' #' # A pie chart = stacked bar chart + polar coordinates
+#' # A pie chart = stacked bar chart + polar coordinates
 #' pie <- ggplot(mtcars, aes(x = factor(1), fill = factor(cyl))) +
 #'  geom_bar(width = 1)
 #' pie + coord_polar(theta = "y")