resolve merge conflict

Merge branch 'main' into S7_objects

# Conflicts:
#	R/guides-.R

Author: teunbrand

R/coord-cartesian-.R

@@ -97,8 +97,14 @@ coord_cartesian <- function(xlim = NULL, ylim = NULL, expand = TRUE,
 #' @export
 CoordCartesian <- ggproto("CoordCartesian", Coord,
 
-  is_linear = function() TRUE,
-  is_free = function(self) is.null(self$ratio),
+  is_linear = function() {
+    TRUE
+  },
+
+  is_free = function(self) {
+    is.null(self$ratio)
+  },
+
   aspect = function(self, ranges) {
     if (is.null(self$ratio)) {
       return(NULL)

R/coord-fixed.R

@@ -37,7 +37,9 @@ coord_equal <- coord_fixed
 #' @usage NULL
 #' @export
 CoordFixed <- ggproto("CoordFixed", CoordCartesian,
-  is_free = function() FALSE,
+  is_free = function() {
+    FALSE
+  },
 
   aspect = function(self, ranges) {
     diff(ranges$y.range) / diff(ranges$x.range) * self$ratio

R/coord-polar.R

@@ -20,9 +20,13 @@ coord_polar <- function(theta = "x", start = 0, direction = 1, clip = "on") {
 #' @export
 CoordPolar <- ggproto("CoordPolar", Coord,
 
-  aspect = function(details) 1,
+  aspect = function(details) {
+    1
+  },
 
-  is_free = function() TRUE,
+  is_free = function() {
+    TRUE
+  },
 
   distance = function(self, x, y, details, boost = 0.75) {
     arc <- self$start + c(0, 2 * pi)

R/coord-radial.R

@@ -199,7 +199,9 @@ CoordRadial <- ggproto("CoordRadial", Coord,
     diff(details$bbox$y) / diff(details$bbox$x)
   },
 
-  is_free = function() TRUE,
+  is_free = function() {
+    TRUE
+  },
 
   distance = function(self, x, y, details, boost = 0.75) {
     arc <- details$arc %||% c(0, 2 * pi)

R/coord-sf.R

@@ -303,11 +303,15 @@ CoordSf <- ggproto("CoordSf", CoordCartesian,
   },
 
   # CoordSf enforces a fixed aspect ratio -> axes cannot be changed freely under faceting
-  is_free = function() FALSE,
+  is_free = function() {
+    FALSE
+  },
 
   # for regular geoms (such as geom_path, geom_polygon, etc.), CoordSf is non-linear
   # if the default_crs option is being used, i.e., not set to NULL
-  is_linear = function(self) is.null(self$get_default_crs()),
+  is_linear = function(self) {
+    is.null(self$get_default_crs())
+  },
 
   distance = function(self, x, y, panel_params) {
     d <- self$backtransform_range(panel_params)
@@ -328,7 +332,9 @@ CoordSf <- ggproto("CoordSf", CoordCartesian,
     diff(panel_params$y_range) / diff(panel_params$x_range) / ratio
   },
 
-  labels = function(labels, panel_params) labels,
+  labels = function(labels, panel_params) {
+    labels
+  },
 
   render_bg = function(self, panel_params, theme) {
     el <- calc_element("panel.grid.major", theme)

R/coord-transform.R

@@ -126,7 +126,11 @@ coord_trans <- function(...) {
 #' @export
 CoordTransform <- ggproto(
   "CoordTransform", Coord,
-  is_free = function() TRUE,
+
+  is_free = function() {
+    TRUE
+  },
+
   distance = function(self, x, y, panel_params) {
     max_dist <- dist_euclidean(panel_params$x.range, panel_params$y.range)
     dist_euclidean(self$trans$x$transform(x), self$trans$y$transform(y)) / max_dist

R/geom-blank.R

@@ -35,7 +35,11 @@ geom_blank <- function(mapping = NULL, data = NULL,
 #' @export
 GeomBlank <- ggproto("GeomBlank", Geom,
   default_aes = aes(),
-  handle_na = function(data, params) data,
+  handle_na = function(data, params) {
+    data
+  },
   check_constant_aes = FALSE,
-  draw_panel = function(...) nullGrob()
+  draw_panel = function(...) {
+    nullGrob()
+  }
 )

R/guide-colorbar.R

@@ -291,10 +291,10 @@ GuideColourbar <- ggproto(
     # We set the defaults in `theme` so that the `params$theme` can still
     # overrule defaults given here
     if (params$direction == "horizontal") {
-      theme$legend.key.width <- rel(5)
+      theme$legend.key.width <- (theme$legend.key.width %||% rel(1)) * 5
       valid_position <- c("bottom", "top")
     } else {
-      theme$legend.key.height <- rel(5)
+      theme$legend.key.height <- (theme$legend.key.height %||% rel(1)) * 5
       valid_position <- c("right", "left")
     }
 

R/labels.R

@@ -81,10 +81,17 @@ setup_plot_labels <- function(plot, layers, data) {
   extra_labels <- setdiff(names(plot_labels), known_labels)
 
   if (length(extra_labels) > 0) {
-    extra_labels <- paste0(
-      "{.code ", extra_labels, " = \"", plot_labels[extra_labels], "\"}"
+
+    warn_labels <- plot_labels[extra_labels]
+    warn_labels <- ifelse(
+      vapply(warn_labels, is.function, logical(1)),
+      "{.cls function}",
+      paste0("{.val ", warn_labels, "}")
     )
+
+    extra_labels <- paste0("{.field ", extra_labels, "} : ", warn_labels)
     names(extra_labels) <- rep("*", length(extra_labels))
+
     cli::cli_warn(c(
       "Ignoring unknown labels:",
       extra_labels

R/layer.R

@@ -181,6 +181,7 @@ layer <- function(geom = NULL, stat = NULL,
   geom <- set_draw_key(geom, key_glyph %||% params$key_glyph)
 
   fr_call <- layer_class$constructor %||% frame_call(call_env) %||% current_call()
+  attr(fr_call, "srcref") <- NULL
 
   ggproto("LayerInstance", layer_class,
     constructor = fr_call,