From 98a5c33900b7cb77cfa489da2d476b1ca8f722db Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Sat, 18 Jun 2022 15:07:37 +0200
Subject: [PATCH 001/111] Allow Guide ggproto as valid guide

---
 R/guides-.r | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/R/guides-.r b/R/guides-.r
index 058ea6038b..cf91855f86 100644
--- a/R/guides-.r
+++ b/R/guides-.r
@@ -173,15 +173,20 @@ resolve_guide <- function(aesthetic, scale, guides, default = "none", null = "no
 }
 
 # validate guide object
+# TODO: when done converting to ggproto, remove "guide" class?
 validate_guide <- function(guide) {
   # if guide is specified by character, then find the corresponding guide
-  # when guides are officially extensible, this should use find_global()
-  if (is.character(guide))
-    match.fun(paste("guide_", guide, sep = ""))()
-  else if (inherits(guide, "guide"))
+  if (is.character(guide)) {
+    find_global(paste0("guide_", guide), mode = "function")()
+  } else if (inherits(guide, "guide")) {
     guide
-  else
-    abort(glue("Unknown guide: {guide}"))
+  } else if (inherits(guide, "Guide")) {
+    # ggproto guides need to be cloned because they may have been defined
+    # outside the plot.
+    guide$clone()
+  } else {
+    cli::cli_abort("Unknown guide: {guide}")
+  }
 }
 
 # train each scale in scales and generate the definition of guide

From 30d73820235ab811d803c31702092afb11ea5d4b Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Sat, 18 Jun 2022 18:30:15 +0200
Subject: [PATCH 002/111] The parent Guide ggproto

---
 DESCRIPTION |   1 +
 R/guide-.r  | 350 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 351 insertions(+)
 create mode 100644 R/guide-.r

diff --git a/DESCRIPTION b/DESCRIPTION
index ae611679df..cee4b13646 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -174,6 +174,7 @@ Collate:
     'grob-dotstack.r'
     'grob-null.r'
     'grouping.r'
+    'guide-.r'
     'guide-bins.R'
     'guide-colorbar.r'
     'guide-colorsteps.R'
diff --git a/R/guide-.r b/R/guide-.r
new file mode 100644
index 0000000000..efccb44213
--- /dev/null
+++ b/R/guide-.r
@@ -0,0 +1,350 @@
+#' @section Guides:
+#'
+#' The `guide_*()` functions, such as `guide_legend()` return an object that
+#' is responsible for displaying how objects in the plotting panel are related
+#' to actual values.
+#'
+#' Each of the `Guide*` object is a [ggproto()] object, descended from the
+#' top-level `Guide`, and each implements their own methods for drawing.
+#'
+#' To create a new type of Guide object, you typically will want to override
+#' one or more of the following:
+#'
+#'  TODO: Fill this in properly
+#' @rdname ggplot2-ggproto
+#' @format NULL
+#' @usage NULL
+#' @export
+Guide <- ggproto(
+  "Guide",
+
+  # Counter to ggplot wisdom, there are 4 stateful fields in the `Guide` class.
+  # These are (i) the `params` parameters which may carry user-input, the
+  # (ii) `key` data.frame, which carries information from the scale and (iii)
+  # the `elements` list that can carry user-supplied theme elements, and (iv)
+  # the `decor` which carries information from layers or scales.
+
+  # `params` is a mutable list of guide parameters, part of which may be
+  # provided by the user. The following lists parameters that the `guides_*`
+  # family of functions may expect to be present.
+  params = list(
+    title     = waiver(),
+    name      = character(),
+    position  = waiver(),
+    direction = NULL,
+    order     = 0,
+    hash      = character()
+  ),
+
+  # The `key` is a data.frame describing the information acquired from a scale
+  # that is used to train the guide.
+  key = vctrs::data_frame(
+    aesthetic = numeric(), .value = numeric(), .label = character(),
+    .size = 0, .name_repair = "minimal"
+  ),
+
+  # The `decor` is used for useful components extracted from the scale or
+  # layers.
+  decor = NULL,
+
+  # A list of theme elements that should be calculated
+  elements = list(),
+
+  available_aes = character(),
+
+  # The `hashables` are the parameters of the guide that are used to generate a
+  # unique hash that determines whether other guides are compatible.
+  hashables = exprs(params$title, params$name),
+
+  # The following functions are simple setters/getters
+  get_hash = function(self) {
+    self$params$hash
+  },
+  set_title = function(self, title) {
+    self$params$title <- self$params$title %|W|% title
+    return(invisible())
+  },
+  set_direction = function(self, direction) {
+    self$params$direction <- self$params$direction %||% direction
+    return(invisible())
+  },
+  set_position = function(self, position) {
+    self$params$position <- self$params$position %|W|% position
+    return(invisible())
+  },
+
+  # We need a clone function that is called in validate_guide because a guide
+  # can be created outside the plot, which would mean that important parameters
+  # such as direction are being assigned to the environment of multiple
+  # Guide ggprotos. This could have gotten hairy in a situation like the
+  # following, where the y-guide would get `direction = "horizontal"`.
+  #
+  # g <- guide_axis(title = "My axis")
+  # ggplot(mpg, aes(displ, hwy)) +
+  #  geom_point() +
+  #  guides(x = g, y = g)
+  clone = function(self) {
+    ggproto(NULL, self)
+  },
+
+  # Training has several tasks:
+  # 1. Check if scale and guide are compatible
+  # 2. Extract a key from the scale
+  # 3. (Optionally) extract further decor from the scale
+  # 4. Name the guide
+  # 5. Make a hash for the guide
+  train = function(self, scale, aesthetic = NULL, params = self$params) {
+    # Resolve aesthetic
+    aesthetic <- aesthetic %||% scale$aesthetics[1]
+
+    # Check if scale-guide match is appropriate
+    aes_intersect <- intersect(scale$aesthetics, self$available_aes)
+    if (!("any" %in% self$available_aes) && length(aes_intersect) == 0) {
+      key <- NULL # Set key as missing
+      cli::cli_warn(c(
+        "{.fn {snake_class(self)}} lacks appropriate scales.",
+        i = "Use {?one of} {.or {.field {self$available_aes}}} instead."
+      ))
+
+    } else {
+      # Forward params as arguments to `extract_key()`
+      key <- inject(self$extract_key(scale, aesthetic, !!!params))
+    }
+    # Draw empty guide if key is missing
+    if (is.null(key)) {
+      return(guide_none())
+    }
+
+    # Forward params as arguments to `extract_decor()`
+    decor <- inject(self$extract_decor(scale, aesthetic, !!!params))
+
+    # Assign key, decor, name and hash to current guide
+    self$key   <- key
+    self$decor <- decor
+    self$params$name <- paste0(params$name, "_", aesthetic)
+    self$params$hash <- hash(lapply(self$hashables, eval_tidy, data = self))
+
+    return(self)
+  },
+
+  # Function for generating a `key` data.frame from the scale
+  extract_key = function(scale, aesthetic, ...) {
+    breaks <- scale$get_breaks()
+    if (length(breaks) == 0) {
+      return(NULL)
+    }
+
+    values <- scale$map(breaks)
+    labels <- scale$get_labels(breaks)
+
+    key <- vctrs::new_data_frame(list2(
+      !!aesthetic := breaks,
+      .value       = values,
+      .label       = labels
+    ))
+    key[is.finite(key[[aesthetic]]), , drop = FALSE]
+  },
+
+  # Function for extracting decoration from the scale.
+  # This is for `guide_colourbar` to extract the bar as well as the key,
+  # and might be a good extension point.
+  extract_decor = function(scale, aesthetic, ...) {
+    return(invisible()) # By default, nothing else needs to be extracted
+  },
+
+  # Function for merging multiple guides.
+  # Mostly applies to `guide_legend()` and `guide_binned()`.
+  merge = function(self, new_guide) {
+    return(self)
+  },
+
+  # Function for applying coord-transformation.
+  # Mostly applied to position guides, such as `guide_axis()`.
+  transform = function(self, coord, ...) {
+    return(self)
+  },
+
+  # Function for extracting information from the layers.
+  # Mostly applies to `guide_legend()` and `guide_binned()`
+  # TODO: Consider renaming this to a more informative name.
+  geom = function(self, layers, default_mapping) {
+    return(self)
+  },
+
+  # Called at start of the `draw` method. Typically used to either overrule
+  # user-specified parameters or populate extra parameters derived from
+  # the guide's direction or position.
+  setup_params = function(params) {
+    params
+  },
+
+  # Converts the `elements` field to proper elements to be accepted by
+  # `element_grob()`. String-interpolates aesthetic/position dependent elements.
+  setup_elements = function(params, elements, theme) {
+    is_char  <- vapply(elements, is.character, logical(1))
+    elements[is_char] <- lapply(elements[is_char], glue,
+                                .envir = params[c("aes", "position")])
+    elements[is_char] <- lapply(elements[is_char], calc_element, theme = theme)
+    elements
+  },
+
+  # Called after `setup_elements` to overrule any element defaults descended
+  # from the theme.
+  override_elements = function(params, elements, theme) {
+    elements
+  },
+
+  # Main drawing function that organises more specialised aspects of guide
+  # drawing.
+  draw = function(self, theme, params = self$params, key = self$key) {
+
+    # Setup parameters and theme
+    params <- self$setup_params(params)
+    elems  <- self$setup_elements(params, self$elements, theme)
+    elems  <- self$override_elements(params, elems, theme)
+
+    # Allow early exit when key is empty
+    if (prod(dim(key)) == 0) {
+      out <- self$draw_early_exit(params, elems)
+      return(out)
+    }
+
+    # Build grobs
+    grob_title  <- self$build_title(params$title, elems, params)
+    grob_labels <- self$build_labels(key, elems, params)
+    grob_ticks  <- self$build_ticks(key, elems, params)
+    grob_decor  <- self$build_decor(self$decor, grob_ticks, elems, params)
+    grobs <- list(
+      title = grob_title,
+      label = grob_labels,
+      ticks = grob_ticks,
+      decor = grob_decor
+    )
+
+    # Arrange and assemble grobs
+    sizes  <- self$measure_grobs(grobs, params, elems)
+    layout <- self$arrange_layout(key, sizes, params)
+    self$assemble_drawing(grobs, layout, sizes, params)
+  },
+
+  # Makes measurements of grobs that can be used in the layout or assembly
+  # stages of guide drawing.
+  measure_grobs = function(grobs, params) {
+    return(invisible())
+  },
+
+  # Takes care of where grobs should be added to the output gtable.
+  arrange_layout = function(key, sizes, params) {
+    return(invisible())
+  },
+
+  # Combines grobs into a single gtable.
+  assemble_drawing = function(grobs, layout, sizes, params) {
+    zeroGrob()
+  },
+
+  # Renders the guide title
+  build_title = function(label, elements, params) {
+    ggname(
+      element_grob(
+        elements$title,
+        label    = label,
+        margin_x = TRUE,
+        margin_y = TRUE
+      ),
+      "guide.title"
+    )
+  },
+
+  # Renders the guide labels
+  # TODO: See if we can generalise label drawing for many guides
+  build_labels = function(key, elements, params) {
+    zeroGrob()
+  },
+
+  # Renders 'decor', which can have different meanings for different guides.
+  # Ticks are provided because they may need to be combined with decor.
+  build_decor = function(decor, ticks, elements, params) {
+    zeroGrob()
+  },
+
+  # Renders tickmarks
+  build_ticks = function(key, elements, params, position = params$position) {
+    breaks   <- key[[params$aes]] %||% key
+    n_breaks <- length(breaks)
+
+    # Early exit if there are no breaks
+    if (n_breaks < 1) {
+      return(zeroGrob())
+    }
+
+    tick_len <- rep(elements$ticks_length %||% unit(0.2, "npc"),
+                    length.out = n_breaks)
+
+    # Resolve mark
+    mark <- unit(rep(breaks, each = 2), "npc")
+
+    # Resolve ticks
+    pos <- unname(c(top = 1, bottom = 0, left = 0, right = 1)[position])
+    dir <- -2 * pos + 1
+    pos <- unit(rep(pos, 2 * n_breaks), "npc")
+    dir <- rep(vctrs::vec_interleave(0, dir), n_breaks) * tick_len
+    tick <- pos + dir
+
+    # Build grob
+    bidi_element_grob(
+      elements$ticks,
+      x = tick, y = mark,
+      id.lengths = rep(2, n_breaks),
+      flip = position %in% c("top", "bottom")
+    )
+  },
+
+  early_exit = function(params, elements) {
+    zeroGrob()
+  }
+)
+
+# Helper function that may facilitate bidirectional theme elements by
+# flipping x/y related arguments to `element_grob()`
+bidi_element_grob = function(..., flip = FALSE) {
+  if (!flip) {
+    ans <- element_grob(...)
+    return(ans)
+  }
+  args <- list(...)
+  translate <- names(args) %in% names(bidi_names)
+  names(args)[translate] <- bidi_names[names(args)[translate]]
+  do.call(element_grob, args)
+}
+
+# The flippable arguments for `bidi_element_grob()`.
+bidi_names = c(
+  "x"        = "y",
+  "y"        = "x",
+  "width"    = "height",
+  "height"   = "width",
+  "hjust"    = "vjust",
+  "vjust"    = "hjust",
+  "margin_x" = "margin_y",
+  "margin_y" = "margin_x"
+)
+
+# Helper function that facilitates adding grobs to a gtable bidirectionally.
+bidi_add_grob = function(x, grobs, t, l, b = t, r = l, z = Inf, clip = "on",
+                         name = x$name, flip = FALSE) {
+  if (flip) {
+    # Swap trbl for lbrt
+    gtable_add_grob(
+      x = x, grobs = grobs,
+      t = l, l = t, b = r, r = b, z = z,
+      clip = clip, name = name
+    )
+  } else {
+    gtable_add_grob(
+      x = x, grobs = grobs,
+      t = t, l = l, b = b, r = r, z = z,
+      clip = clip, name = name
+    )
+  }
+}

From 2d871e86cff2298230371154a0cfd9d8633b79e9 Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Sat, 18 Jun 2022 20:54:16 +0200
Subject: [PATCH 003/111] Add guide constructor

---
 R/guide-.r | 78 +++++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 59 insertions(+), 19 deletions(-)

diff --git a/R/guide-.r b/R/guide-.r
index efccb44213..406c36d9dc 100644
--- a/R/guide-.r
+++ b/R/guide-.r
@@ -1,3 +1,61 @@
+#' Guide constructor
+#'
+#' A constructor function for guides, which performs some standard compatability
+#' checks between the guide and provided arguments.
+#'
+#' @param ... Named arguments that match the parameters of `super$params` or
+#'   the theme elements in `super$elements`.
+#' @param available_aes A vector of character strings listing the aesthetics
+#'   for which the guide can be drawn.
+#' @param super The super class to use for the constructed guide. Should be a
+#'   Guide class object.
+#'
+#' @return A `Guide` ggproto object.
+#' @export
+new_guide <- function(..., available_aes = "any", super) {
+
+  super <- check_subclass(super, "Guide", env = parent.frame())
+
+  args <- list2(...)
+
+  # Set parameters
+  param_names <- names(super$params)
+  params <- intersect(names(args), param_names)
+  params <- defaults(args[params], super$params)
+
+  # Set elements
+  elems_names <- names(super$elements)
+  elems  <- intersect(names(args), elems_names)
+  elems  <- defaults(args[elems], super$elements)
+
+  # Warn about extra arguments
+  extra_args <- setdiff(names(args), union(param_names, elems_names))
+  if (length(extra_args) > 0) {
+    cli::cli_warn(paste0(
+      "Ignoring unknown {cli::qty(extra_args)} argument{?s} to ",
+      "{.fn {snake_class(super)}}: {.arg {extra_args}}."
+    ))
+  }
+
+  # Stop when some required parameters are missing.
+  # This should only happen with mis-constructed guides
+  required_params <- names(Guide$params)
+  missing_params  <- setdiff(required_params, names(params))
+  if (length(missing_params) > 0) {
+    cli::cli_abort(paste0(
+      "The following parameter{?s} {?is/are} required for setting up a guide, ",
+      "but are missing: {.field {missing_params}}"
+    ))
+  }
+
+  ggproto(
+    NULL, super,
+    params   = params,
+    elements = elems,
+    available_aes = available_aes
+  )
+}
+
 #' @section Guides:
 #'
 #' The `guide_*()` functions, such as `guide_legend()` return an object that
@@ -300,7 +358,7 @@ Guide <- ggproto(
     )
   },
 
-  early_exit = function(params, elements) {
+  draw_early_exit = function(self, params, elements) {
     zeroGrob()
   }
 )
@@ -330,21 +388,3 @@ bidi_names = c(
   "margin_y" = "margin_x"
 )
 
-# Helper function that facilitates adding grobs to a gtable bidirectionally.
-bidi_add_grob = function(x, grobs, t, l, b = t, r = l, z = Inf, clip = "on",
-                         name = x$name, flip = FALSE) {
-  if (flip) {
-    # Swap trbl for lbrt
-    gtable_add_grob(
-      x = x, grobs = grobs,
-      t = l, l = t, b = r, r = b, z = z,
-      clip = clip, name = name
-    )
-  } else {
-    gtable_add_grob(
-      x = x, grobs = grobs,
-      t = t, l = l, b = b, r = r, z = z,
-      clip = clip, name = name
-    )
-  }
-}

From afbf086570c091928d4f110bc53a449c7af9aefb Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Sat, 18 Jun 2022 23:08:55 +0200
Subject: [PATCH 004/111] Small tweaks

---
 NAMESPACE   | 2 ++
 R/guide-.r  | 5 +++--
 R/guides-.r | 3 ++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/NAMESPACE b/NAMESPACE
index a931b99665..5388f157ef 100644
--- a/NAMESPACE
+++ b/NAMESPACE
@@ -209,6 +209,7 @@ export(GeomText)
 export(GeomTile)
 export(GeomViolin)
 export(GeomVline)
+export(Guide)
 export(Layout)
 export(Position)
 export(PositionDodge)
@@ -451,6 +452,7 @@ export(mean_sdl)
 export(mean_se)
 export(median_hilow)
 export(merge_element)
+export(new_guide)
 export(panel_cols)
 export(panel_rows)
 export(position_dodge)
diff --git a/R/guide-.r b/R/guide-.r
index 406c36d9dc..13c9bfb73b 100644
--- a/R/guide-.r
+++ b/R/guide-.r
@@ -180,7 +180,8 @@ Guide <- ggproto(
     self$key   <- key
     self$decor <- decor
     self$params$name <- paste0(params$name, "_", aesthetic)
-    self$params$hash <- hash(lapply(self$hashables, eval_tidy, data = self))
+    mask <- new_data_mask(self)
+    self$params$hash <- hash(lapply(self$hashables, eval_tidy, data = mask))
 
     return(self)
   },
@@ -200,7 +201,7 @@ Guide <- ggproto(
       .value       = values,
       .label       = labels
     ))
-    key[is.finite(key[[aesthetic]]), , drop = FALSE]
+    key[is.finite(key[[".value"]]), , drop = FALSE]
   },
 
   # Function for extracting decoration from the scale.
diff --git a/R/guides-.r b/R/guides-.r
index cf91855f86..eb12fac33c 100644
--- a/R/guides-.r
+++ b/R/guides-.r
@@ -177,7 +177,8 @@ resolve_guide <- function(aesthetic, scale, guides, default = "none", null = "no
 validate_guide <- function(guide) {
   # if guide is specified by character, then find the corresponding guide
   if (is.character(guide)) {
-    find_global(paste0("guide_", guide), mode = "function")()
+    find_global(paste0("guide_", guide), env = global_env(),
+                mode = "function")()
   } else if (inherits(guide, "guide")) {
     guide
   } else if (inherits(guide, "Guide")) {

From 3a286f3d00b9f426a249e9ce6b17e4626031f07b Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Sat, 18 Jun 2022 23:10:17 +0200
Subject: [PATCH 005/111] Convert guide_none to ggproto

---
 NAMESPACE       |  6 +-----
 R/guides-none.r | 50 +++++++++++++++++++++++--------------------------
 2 files changed, 24 insertions(+), 32 deletions(-)

diff --git a/NAMESPACE b/NAMESPACE
index 5388f157ef..819ae59c50 100644
--- a/NAMESPACE
+++ b/NAMESPACE
@@ -78,27 +78,22 @@ S3method(grobY,absoluteGrob)
 S3method(guide_gengrob,axis)
 S3method(guide_gengrob,bins)
 S3method(guide_gengrob,colorbar)
-S3method(guide_gengrob,guide_none)
 S3method(guide_gengrob,legend)
 S3method(guide_geom,axis)
 S3method(guide_geom,bins)
 S3method(guide_geom,colorbar)
-S3method(guide_geom,guide_none)
 S3method(guide_geom,legend)
 S3method(guide_merge,axis)
 S3method(guide_merge,bins)
 S3method(guide_merge,colorbar)
-S3method(guide_merge,guide_none)
 S3method(guide_merge,legend)
 S3method(guide_train,axis)
 S3method(guide_train,bins)
 S3method(guide_train,colorbar)
 S3method(guide_train,colorsteps)
-S3method(guide_train,guide_none)
 S3method(guide_train,legend)
 S3method(guide_transform,axis)
 S3method(guide_transform,default)
-S3method(guide_transform,guide_none)
 S3method(heightDetails,titleGrob)
 S3method(heightDetails,zeroGrob)
 S3method(interleave,default)
@@ -210,6 +205,7 @@ export(GeomTile)
 export(GeomViolin)
 export(GeomVline)
 export(Guide)
+export(GuideNone)
 export(Layout)
 export(Position)
 export(PositionDodge)
diff --git a/R/guides-none.r b/R/guides-none.r
index e27b6e9892..17e5126628 100644
--- a/R/guides-none.r
+++ b/R/guides-none.r
@@ -8,37 +8,33 @@
 #' @export
 #'
 guide_none <- function(title = waiver(), position = waiver()) {
-  structure(
-    list(
-      title = title,
-      position = position,
-      available_aes = "any"
-    ),
-    class = c("guide", "guide_none")
+  new_guide(
+    title = title,
+    position = position,
+    available_aes = "any",
+    super = GuideNone
   )
 }
 
+#' @rdname ggplot2-ggproto
+#' @format NULL
+#' @usage NULL
 #' @export
-guide_train.guide_none <- function(guide, scale, aesthetic = NULL) {
-  guide
-}
+GuideNone <- ggproto(
+  "GuideNone", Guide,
 
-#' @export
-guide_merge.guide_none <- function(guide, new_guide) {
-  new_guide
-}
-
-#' @export
-guide_geom.guide_none <- function(guide, layers, default_mapping) {
-  guide
-}
+  # Perform no training
+  train = function(self, scale, aesthetic = NULL) {
+    self
+  },
 
-#' @export
-guide_transform.guide_none <- function(guide, coord, panel_params) {
-  guide
-}
+  # Defaults to returning the *other* guide
+  merge = function(self, new_guide) {
+    new_guide
+  },
 
-#' @export
-guide_gengrob.guide_none <- function(guide, theme, ...) {
-  zeroGrob()
-}
+  # Draw nothing
+  draw = function(self, params, theme) {
+    zeroGrob()
+  }
+)

From 870221ca531324c668776b154c0580b6d89e1340 Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Sat, 18 Jun 2022 23:11:21 +0200
Subject: [PATCH 006/111] Accommodate Guide in cartesian coords

---
 R/coord-cartesian-.r | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/R/coord-cartesian-.r b/R/coord-cartesian-.r
index d36a49674a..e1a2519239 100644
--- a/R/coord-cartesian-.r
+++ b/R/coord-cartesian-.r
@@ -118,7 +118,7 @@ CoordCartesian <- ggproto("CoordCartesian", Coord,
       )
     })
 
-    # resolve the guide definition as a "guide" S3
+    # resolve the guide definition as a "Guide"
     guides <- lapply(guides, validate_guide)
 
     # if there is an "position" specification in the scale, pass this on to the guide
@@ -127,7 +127,8 @@ CoordCartesian <- ggproto("CoordCartesian", Coord,
       guide <- guides[[aesthetic]]
       scale <- panel_params[[aesthetic]]
       # position could be NULL here for an empty scale
-      guide$position <- guide$position %|W|% scale$position
+
+      guide$set_position(scale$position)
       guide
     })
 
@@ -142,9 +143,10 @@ CoordCartesian <- ggproto("CoordCartesian", Coord,
     panel_params$guides <- lapply(aesthetics, function(aesthetic) {
       axis <- substr(aesthetic, 1, 1)
       guide <- panel_params$guides[[aesthetic]]
-      guide <- guide_train(guide, panel_params[[aesthetic]])
-      guide <- guide_transform(guide, self, panel_params)
-      guide <- guide_geom(guide, layers, default_mapping)
+      guide$train(panel_params[[aesthetic]])
+      guide$transform(self, panel_params)
+      guide$geom(layers, default_mapping)
+
       guide
     })
 
@@ -216,22 +218,24 @@ view_scales_from_scale <- function(scale, coord_limits = NULL, expand = TRUE) {
 
 panel_guide_label <- function(guides, position, default_label) {
   guide <- guide_for_position(guides, position) %||% guide_none(title = NULL)
-  guide$title %|W|% default_label
+  guide$params$title %|W|% default_label
 }
 
 panel_guides_grob <- function(guides, position, theme) {
   guide <- guide_for_position(guides, position) %||% guide_none()
-  guide_gengrob(guide, theme)
+  guide$draw(theme)
 }
 
 guide_for_position <- function(guides, position) {
   has_position <- vapply(
     guides,
-    function(guide) identical(guide$position, position),
+    function(guide) identical(guide$params$position, position),
     logical(1)
   )
 
   guides <- guides[has_position]
-  guides_order <- vapply(guides, function(guide) as.numeric(guide$order)[1], numeric(1))
-  Reduce(guide_merge, guides[order(guides_order)])
+  guides_order <- vapply(guides, function(guide) {
+    as.numeric(guide$params$order)
+  }, numeric(1))
+  Reduce(function(old, new) {old$merge(new)}, guides[order(guides_order)])
 }

From 12fc4160cebe1e6a9be024b3e0ca7682ecdbccb4 Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Sat, 18 Jun 2022 23:12:19 +0200
Subject: [PATCH 007/111] Bifurcate guides_train (for now)

---
 R/guides-.r | 36 +++++++++++++++++++++++++-----------
 1 file changed, 25 insertions(+), 11 deletions(-)

diff --git a/R/guides-.r b/R/guides-.r
index eb12fac33c..6a795b09eb 100644
--- a/R/guides-.r
+++ b/R/guides-.r
@@ -203,7 +203,8 @@ guides_train <- function(scales, theme, guides, labels) {
       #   + guides(XXX) > + scale_ZZZ(guide=XXX) > default(i.e., legend)
       guide <- resolve_guide(output, scale, guides)
 
-      if (identical(guide, "none") || inherits(guide, "guide_none")) next
+      # TODO: Revisit after implementing guides in ggproto
+      if (identical(guide, "none") || inherits(guide, c("guide_none", "GuideNone"))) next
 
       if (isFALSE(guide)) {
         # lifecycle currently doesn't support function name placeholders.
@@ -218,20 +219,33 @@ guides_train <- function(scales, theme, guides, labels) {
       # if guide is character, then find the guide object
       guide <- validate_guide(guide)
 
-      # check the consistency of the guide and scale.
-      if (!identical(guide$available_aes, "any") && !any(scale$aesthetics %in% guide$available_aes)) {
-        abort(glue("Guide '{guide$name}' cannot be used for '{scale$aesthetics}'."))
-      }
+      # # check the consistency of the guide and scale.
+      if (inherits(guide, "guide")) {
+        if (!identical(guide$available_aes, "any") &&
+            !any(scale$aesthetics %in% guide$available_aes)) {
+          abort(glue(
+            "Guide '{guide$name}' cannot be used for '{scale$aesthetics}'."
+          ))
+        }
+        guide$title <- scale$make_title(guide$title %|W|% scale$name %|W|% labels[[output]])
+
+        # direction of this grob
+        guide$direction <- guide$direction %||% theme$legend.direction
 
-      guide$title <- scale$make_title(guide$title %|W|% scale$name %|W|% labels[[output]])
+        # each guide object trains scale within the object,
+        # so Guides (i.e., the container of guides) need not to know about them
+        guide <- guide_train(guide, scale, output)
 
-      # direction of this grob
-      guide$direction <- guide$direction %||% theme$legend.direction
+      } else if (inherits(guide, "Guide")) {
+        guide$set_title(scale$make_title(scale$name %|W|% labels[[output]]))
 
-      # each guide object trains scale within the object,
-      # so Guides (i.e., the container of guides) need not to know about them
-      guide <- guide_train(guide, scale, output)
+        # direction of this grob
+        guide$set_direction(theme$legend.direction)
 
+        # each guide object trains scale within the object,
+        # so Guides (i.e., the container of guides) need not to know about them
+        guide <- guide$train(scale, output)
+      }
       if (!is.null(guide)) gdefs[[length(gdefs) + 1]] <- guide
     }
   }

From 23d2f76e6118dc0c6abbc98e0e19ccd456ba291e Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Sat, 18 Jun 2022 23:14:26 +0200
Subject: [PATCH 008/111] Convert guide_axis to ggproto

---
 NAMESPACE              |   6 +-
 R/guides-axis.r        | 550 ++++++++++++++++++++++-------------------
 man/ggplot2-ggproto.Rd |  42 +++-
 man/guide_axis.Rd      |   2 -
 man/new_guide.Rd       |  25 ++
 5 files changed, 349 insertions(+), 276 deletions(-)
 create mode 100644 man/new_guide.Rd

diff --git a/NAMESPACE b/NAMESPACE
index 819ae59c50..02aa996fce 100644
--- a/NAMESPACE
+++ b/NAMESPACE
@@ -75,24 +75,19 @@ S3method(grobWidth,absoluteGrob)
 S3method(grobWidth,zeroGrob)
 S3method(grobX,absoluteGrob)
 S3method(grobY,absoluteGrob)
-S3method(guide_gengrob,axis)
 S3method(guide_gengrob,bins)
 S3method(guide_gengrob,colorbar)
 S3method(guide_gengrob,legend)
-S3method(guide_geom,axis)
 S3method(guide_geom,bins)
 S3method(guide_geom,colorbar)
 S3method(guide_geom,legend)
-S3method(guide_merge,axis)
 S3method(guide_merge,bins)
 S3method(guide_merge,colorbar)
 S3method(guide_merge,legend)
-S3method(guide_train,axis)
 S3method(guide_train,bins)
 S3method(guide_train,colorbar)
 S3method(guide_train,colorsteps)
 S3method(guide_train,legend)
-S3method(guide_transform,axis)
 S3method(guide_transform,default)
 S3method(heightDetails,titleGrob)
 S3method(heightDetails,zeroGrob)
@@ -205,6 +200,7 @@ export(GeomTile)
 export(GeomViolin)
 export(GeomVline)
 export(Guide)
+export(GuideAxis)
 export(GuideNone)
 export(Layout)
 export(Position)
diff --git a/R/guides-axis.r b/R/guides-axis.r
index 07b4da19a9..1a04e00ab4 100644
--- a/R/guides-axis.r
+++ b/R/guides-axis.r
@@ -34,119 +34,305 @@
 #'
 #' # can also be used to add a duplicate guide
 #' p + guides(x = guide_axis(n.dodge = 2), y.sec = guide_axis())
-#'
-#'
-guide_axis <- function(title = waiver(), check.overlap = FALSE, angle = NULL, n.dodge = 1,
-                       order = 0, position = waiver()) {
-  structure(
-    list(
-      title = title,
-
-      # customizations
-      check.overlap = check.overlap,
-      angle = angle,
-      n.dodge = n.dodge,
-
-      # general
-      order = order,
-      position = position,
-
-      # parameter
-      available_aes = c("x", "y"),
-
-      name = "axis"
-    ),
-    class = c("guide", "axis")
+guide_axis <- function(title = waiver(), check.overlap = FALSE, angle = NULL,
+                       n.dodge = 1, order = 0, position = waiver()) {
+  new_guide(
+    title = title,
+
+    # customisations
+    check.overlap = check.overlap,
+    angle = angle,
+    n.dodge = n.dodge,
+
+    # parameter
+    available_aes = c("x", "y"),
+
+    # general
+    order = order,
+    position = position,
+    name = "axis",
+    super = GuideAxis
   )
 }
 
+#' @rdname ggplot2-ggproto
+#' @format NULL
+#' @usage NULL
 #' @export
-guide_train.axis <- function(guide, scale, aesthetic = NULL) {
+GuideAxis <- ggproto(
+  "GuideAxis", Guide,
+
+  params = list(
+    title     = waiver(),
+    name      = "axis",
+    hash      = character(),
+    position  = waiver(),
+    direction = NULL,
+    angle     = NULL,
+    n.dodge   = 1,
+    order     = 0,
+    check.overlap = FALSE
+  ),
+
+  available_aes = c("x", "y"),
+
+  hashables = quos(params$title, key$.value, key$.label, params$name),
+
+  transform = function(self, coord, panel_params) {
+    key <- self$key
+    position <- self$params$position
+
+    if (is.null(position) || nrow(key) == 0) {
+      return(self)
+    }
 
-  aesthetic <- aesthetic %||% scale$aesthetics[1]
-  breaks <- scale$get_breaks()
+    aesthetics <- names(key)[!grepl("^\\.", names(key))]
+    if (!all(c("x", "y") %in% aesthetics)) {
+      other_aesthetic <- setdiff(c("x", "y"), aesthetics)
+      override_value <- if (position %in% c("bottom", "left")) -Inf else Inf
+      key[[other_aesthetic]] <- override_value
+    }
+    key <- coord$transform(key, panel_params)
+    self$key <- key
+
+    # Ported over from `warn_for_position_guide`
+    # This is trying to catch when a user specifies a position perpendicular
+    # to the direction of the axis (e.g., a "y" axis on "top").
+    # The strategy is to check that two or more unique breaks are mapped
+    # to the same value along the axis.
+    breaks_are_unique <- !duplicated(key$.value)
+    if (empty(key) || sum(breaks_are_unique) == 1) {
+      return(self)
+    }
 
-  empty_ticks <- new_data_frame(
-    list(aesthetic = numeric(0), .value = numeric(0), .label = character(0))
-  )
-  names(empty_ticks) <- c(aesthetic, ".value", ".label")
-
-  if (length(intersect(scale$aesthetics, guide$available_aes)) == 0) {
-    warn(glue(
-      "axis guide needs appropriate scales: ",
-      glue_collapse(guide$available_aes, ", ", last = " or ")
-    ))
-    guide$key <- empty_ticks
-  } else if (length(breaks) == 0) {
-    guide$key <- empty_ticks
-  } else {
-    mapped_breaks <- if (scale$is_discrete()) scale$map(breaks) else breaks
-    ticks <- new_data_frame(setNames(list(mapped_breaks), aesthetic))
-    ticks$.value <- breaks
-    ticks$.label <- scale$get_labels(breaks)
+    if (position %in% c("top", "bottom")) {
+      position_aes <- "x"
+    } else if (position %in% c("left", "right")) {
+      position_aes <- "y"
+    } else {
+      return(self)
+    }
 
-    guide$key <- ticks[is.finite(ticks[[aesthetic]]), ]
-  }
+    if (length(unique(key[[position_aes]][breaks_are_unique])) == 1) {
+      cli::cli_warn(c(
+        "Position guide is perpendicular to the intended axis.",
+        "i" = "Did you mean to specify a different guide {.arg position}?"
+      ))
+    }
 
-  guide$name <- paste0(guide$name, "_", aesthetic)
-  guide$hash <- digest::digest(list(guide$title, guide$key$.value, guide$key$.label, guide$name))
-  guide
-}
+    return(self)
+  },
 
-#' @export
-guide_transform.axis <- function(guide, coord, panel_params) {
-  if (is.null(guide$position) || nrow(guide$key) == 0) {
-    return(guide)
-  }
+  merge = function(self, new_guide) {
+    if (!inherits(new_guide, "GuideNone")) {
+      cli::cli_warn(c(
+        "{.fn {snake_class(self)}}: Discarding guide on merge.",
+        "i" = "Do you have more than one guide with the same {.arg position}?"
+      ))
+    }
+    return(self)
+  },
+
+  elements = list(
+    line  = "axis.line.{aes}.{position}",
+    text  = "axis.text.{aes}.{position}",
+    ticks = "axis.ticks.{aes}.{position}",
+    ticks_length = "axis.ticks.length.{aes}.{position}"
+  ),
+
+  override_elements = function(params, elements, theme) {
+    label <- elements$text
+    if (!inherits(label, "element_text")) {
+      return(elements)
+    }
+    label_overrides <- axis_label_element_overrides(
+      params$position, params$angle
+    )
+    # label_overrides is an element_text, but label_element may not be;
+    # to merge the two elements, we just copy angle, hjust, and vjust
+    # unless their values are NULL
+    label$angle <- label_overrides$angle %||% label$angle
+    label$hjust <- label_overrides$hjust %||% label$hjust
+    label$vjust <- label_overrides$vjust %||% label$vjust
+
+    elements$text <- label
+    return(elements)
+  },
+
+  setup_params = function(params) {
+    all_pos   <- c("left", "top", "bottom", "right")
+    position  <- arg_match0(params$position, all_pos)
+    direction <- if (position %in% c("left", "right")) "vertical" else "horizontal"
+
+    # TODO: delete following comment at some point:
+    # I found the 'position_*'/'non-position_*' and '*_dim' names confusing.
+    # For my own understanding, these have been renamed as follows:
+    # * 'aes' and 'orth_aes' for the aesthetic direction and the direction
+    #   orthogonal to the aesthetic direction, respectively.
+    # * 'para_sizes' and 'orth_size(s)' for the dimension parallel to the
+    #   aesthetic and orthogonal to the aesthetic respectively.
+    # I also tried to trim down the verbosity of the variable names a bit
+
+    new_params <- c("aes", "orth_aes", "para_sizes", "orth_size", "orth_sizes",
+                    "vertical", "measure_gtable", "measure_text")
+    if (direction == "vertical") {
+      params[new_params] <- list(
+        "y", "x", "heights", "width", "widths",
+        TRUE, gtable_width, grobWidth
+      )
+    } else {
+      params[new_params] <- list(
+        "x", "y", "widths", "height", "heights",
+        FALSE, gtable_height, grobHeight
+      )
+    }
 
-  aesthetics <- names(guide$key)[!grepl("^\\.", names(guide$key))]
+    new_params <- list(
+      opposite  = unname(setNames(all_pos, rev(all_pos))[position]),
+      secondary = position %in% c("top", "right"),
+      lab_first = position %in% c("top", "left"),
+      orth_side = if (position %in% c("top", "right")) 0 else 1,
+      direction = direction,
+      position  = position
+    )
+    c(params, new_params)
+  },
+
+  build_title = function(label, elements, params) {
+    zeroGrob()
+  },
+
+  # The decor in the axis guide is the axis line
+  build_decor = function(decor, ticks, elements, params) {
+    exec(
+      element_grob,
+      element = elements$line,
+      !!params$aes := unit(c(0, 1), "npc"),
+      !!params$orth_aes := unit(rep(params$orth_side, 2), "npc")
+    )
+  },
 
-  if (all(c("x", "y") %in% aesthetics)) {
-    guide$key <- coord$transform(guide$key, panel_params)
-  } else {
-    other_aesthetic <- setdiff(c("x", "y"), aesthetics)
-    override_value <- if (guide$position %in% c("bottom", "left")) -Inf else Inf
-    guide$key[[other_aesthetic]] <- override_value
+  build_labels = function(key, elements, params) {
+    labels <- key$.label
+    n_labels <- length(labels)
 
-    guide$key <- coord$transform(guide$key, panel_params)
+    if (n_labels < 1) {
+      return(list(zeroGrob()))
+    }
 
-    warn_for_guide_position(guide)
-  }
+    pos    <- key[[params$aes]]
 
-  guide
-}
+    if (is.list(labels)) {
+      if (any(vapply(labels, is.language, logical(1)))) {
+        labels <- do.call(expression, labels)
+      } else {
+        labels <- unlist(labels)
+      }
+    }
 
-# discards the new guide with a warning
-#' @export
-guide_merge.axis <- function(guide, new_guide) {
-  if (!inherits(new_guide, "guide_none")) {
-    warn("guide_axis(): Discarding guide on merge. Do you have more than one guide with the same position?")
-  }
 
-  guide
-}
+    dodge_pos     <- rep(seq_len(params$n.dodge %||% 1), length.out = n_labels)
+    dodge_indices <- unname(split(seq_len(n_labels), dodge_pos))
 
-# axis guides don't care which geometry uses these aesthetics
-#' @export
-guide_geom.axis <- function(guide, layers, default_mapping) {
-  guide
-}
+    lapply(dodge_indices, function(indices) {
+      draw_axis_labels(
+        break_positions = pos[indices],
+        break_labels    = labels[indices],
+        label_element   = elements$text,
+        is_vertical     = params$vertical,
+        check.overlap   = params$check.overlap %||% FALSE
+      )
+    })
+  },
 
-#' @export
-guide_gengrob.axis <- function(guide, theme) {
-  aesthetic <- names(guide$key)[!grepl("^\\.", names(guide$key))][1]
-
-  draw_axis(
-    break_positions = guide$key[[aesthetic]],
-    break_labels = guide$key$.label,
-    axis_position = guide$position,
-    theme = theme,
-    check.overlap = guide$check.overlap,
-    angle = guide$angle,
-    n.dodge = guide$n.dodge
-  )
-}
+  measure_grobs = function(grobs, params, elements) {
+
+    # Below, we include a spacer measurement. This measurement is used
+    # to offset subsequent rows/columns in the gtable in case the tick length is
+    # negative. This causes the text to align nicely at panel borders.
+    # In case tick length is positive, this will just be a 0-size empty row
+    # or column.
+
+    measure <- params$measure_text
+
+    length <- elements$ticks_length
+    spacer <- max(unit(0, "pt"), -1 * length)
+    labels <- do.call(unit.c, lapply(grobs$label, measure))
+    title  <- measure(grobs$title)
+
+    sizes <- unit.c(length, spacer, labels, title)
+    if (params$lab_first) {
+      sizes <- rev(sizes)
+    }
+    sizes
+  },
+
+  arrange_layout = function(key, sizes, params) {
+    layout <- seq_along(sizes)
+
+    if (params$lab_first) {
+      layout <- rev(layout)
+    }
+    # Set gap for spacer
+    layout <- layout[-2]
+
+    layout <- list(1, -1, layout, layout)
+    nms <- if (params$vertical) c("t", "b", "l", "r") else c("l", "r", "t", "b")
+    setNames(layout, nms)
+  },
+
+  assemble_drawing = function(grobs, layout, sizes, params) {
+
+    axis_line <- grobs$decor
 
+    # Unlist the 'label' grobs
+    grobs  <- c(list(grobs$ticks), grobs$label, list(grobs$title))
+
+    # Initialise empty gtable
+    gt <- exec(
+      gtable,
+      !!params$orth_sizes := sizes,
+      !!params$para_sizes := unit(1, "npc"),
+      name = "axis"
+    )
+
+    # Add grobs
+    gt <- gtable_add_grob(
+      gt, grobs,
+      t = layout$t, b = layout$b, l = layout$l, r = layout$r,
+      clip = "off"
+    )
+
+    # Set justification viewport
+    vp <- exec(
+      viewport,
+      !!params$orth_aes := unit(params$orth_side, "npc"),
+      !!params$orth_size := params$measure_gtable(gt),
+      just = params$opposite
+    )
+
+    # Assemble with axis line
+    absoluteGrob(
+      gList(axis_line, gt),
+      width  = gtable_width(gt),
+      height = gtable_height(gt),
+      vp = vp
+    )
+  },
+
+  draw_early_exit = function(self, params, elements) {
+    line <- self$build_decor(elements = elements, params = params)
+    absoluteGrob(
+      gList(line),
+      width  = grobWidth(line),
+      height = grobHeight(line)
+    )
+  }
+)
+
+# TODO: If #3972 gets implemented, reconsider the usefulness of this function.
+# We still need the `draw_axis` function because most coords other than
+# `coord_cartesian()` ignore guides. See #3972
 
 #' Grob for axes
 #'
@@ -167,147 +353,18 @@ guide_gengrob.axis <- function(guide, theme) {
 #'
 draw_axis <- function(break_positions, break_labels, axis_position, theme,
                       check.overlap = FALSE, angle = NULL, n.dodge = 1) {
-  axis_position <- arg_match0(axis_position, c("top", "bottom", "right", "left"))
-  aesthetic <- if (axis_position %in% c("top", "bottom")) "x" else "y"
-
-  # resolve elements
-  line_element_name <- paste0("axis.line.", aesthetic, ".", axis_position)
-  tick_element_name <- paste0("axis.ticks.", aesthetic, ".", axis_position)
-  tick_length_element_name <- paste0("axis.ticks.length.", aesthetic, ".", axis_position)
-  label_element_name <- paste0("axis.text.", aesthetic, ".", axis_position)
-
-  line_element <- calc_element(line_element_name, theme)
-  tick_element <- calc_element(tick_element_name, theme)
-  tick_length <- calc_element(tick_length_element_name, theme)
-  label_element <- calc_element(label_element_name, theme)
-
-  # override label element parameters for rotation
-  if (inherits(label_element, "element_text")) {
-    label_overrides <- axis_label_element_overrides(axis_position, angle)
-    # label_overrides is an element_text, but label_element may not be;
-    # to merge the two elements, we just copy angle, hjust, and vjust
-    # unless their values are NULL
-    if (!is.null(label_overrides$angle)) {
-      label_element$angle <- label_overrides$angle
-    }
-    if (!is.null(label_overrides$hjust)) {
-      label_element$hjust <- label_overrides$hjust
-    }
-    if (!is.null(label_overrides$vjust)) {
-      label_element$vjust <- label_overrides$vjust
-    }
-  }
-
-  # conditionally set parameters that depend on axis orientation
-  is_vertical <- axis_position %in% c("left",  "right")
-
-  position_dim <- if (is_vertical) "y" else "x"
-  non_position_dim <- if (is_vertical) "x" else "y"
-  position_size <- if (is_vertical) "height" else "width"
-  non_position_size <- if (is_vertical) "width" else "height"
-  gtable_element <- if (is_vertical) gtable_row else gtable_col
-  measure_gtable <- if (is_vertical) gtable_width else gtable_height
-  measure_labels_non_pos <- if (is_vertical) grobWidth else grobHeight
-
-  # conditionally set parameters that depend on which side of the panel
-  # the axis is on
-  is_second <- axis_position %in% c("right", "top")
-
-  tick_direction <- if (is_second) 1 else -1
-  non_position_panel <- if (is_second) unit(0, "npc") else unit(1, "npc")
-  tick_coordinate_order <- if (is_second) c(2, 1) else c(1, 2)
-
-  # conditionally set the gtable ordering
-  labels_first_gtable <- axis_position %in% c("left", "top") # refers to position in gtable
-
-  # set common parameters
-  n_breaks <- length(break_positions)
-  opposite_positions <- c("top" = "bottom", "bottom" = "top", "right" = "left", "left" = "right")
-  axis_position_opposite <- unname(opposite_positions[axis_position])
-
-  # draw elements
-  line_grob <- exec(
-    element_grob, line_element,
-    !!position_dim := unit(c(0, 1), "npc"),
-    !!non_position_dim := unit.c(non_position_panel, non_position_panel)
-  )
-
-  if (n_breaks == 0) {
-    return(
-      absoluteGrob(
-        gList(line_grob),
-        width = grobWidth(line_grob),
-        height = grobHeight(line_grob)
-      )
-    )
-  }
-
-  # break_labels can be a list() of language objects
-  if (is.list(break_labels)) {
-    if (any(vapply(break_labels, is.language, logical(1)))) {
-      break_labels <- do.call(expression, break_labels)
-    } else {
-      break_labels <- unlist(break_labels)
-    }
-  }
-
-  # calculate multiple rows/columns of labels (which is usually 1)
-  dodge_pos <- rep(seq_len(n.dodge), length.out = n_breaks)
-  dodge_indices <- split(seq_len(n_breaks), dodge_pos)
-
-  label_grobs <- lapply(dodge_indices, function(indices) {
-    draw_axis_labels(
-      break_positions = break_positions[indices],
-      break_labels = break_labels[indices],
-      label_element = label_element,
-      is_vertical = is_vertical,
-      check.overlap = check.overlap
-    )
-  })
-
-  ticks_grob <- exec(
-    element_grob, tick_element,
-    !!position_dim := rep(unit(break_positions, "native"), each = 2),
-    !!non_position_dim := rep(
-      unit.c(non_position_panel + (tick_direction * tick_length), non_position_panel)[tick_coordinate_order],
-      times = n_breaks
-    ),
-    id.lengths = rep(2, times = n_breaks)
-  )
-
-  # create gtable
-  non_position_sizes <- paste0(non_position_size, "s")
-  label_dims <- do.call(unit.c, lapply(label_grobs, measure_labels_non_pos))
-  grobs <- c(list(ticks_grob), label_grobs)
-  grob_dims <- unit.c(max(tick_length, unit(0, "pt")), label_dims)
-
-  if (labels_first_gtable) {
-    grobs <- rev(grobs)
-    grob_dims <- rev(grob_dims)
-  }
-
-  gt <- exec(
-    gtable_element,
-    name = "axis",
-    grobs = grobs,
-    !!non_position_sizes := grob_dims,
-    !!position_size := unit(1, "npc")
-  )
-
-  # create viewport
-  justvp <- exec(
-    viewport,
-    !!non_position_dim := non_position_panel,
-    !!non_position_size := measure_gtable(gt),
-    just = axis_position_opposite
-  )
-
-  absoluteGrob(
-    gList(line_grob, gt),
-    width = gtable_width(gt),
-    height = gtable_height(gt),
-    vp = justvp
-  )
+  guide <- guide_axis(check.overlap = check.overlap,
+                      angle = angle,
+                      n.dodge = n.dodge)
+  guide$set_position(axis_position)
+  aes <- if (axis_position %in% c("top", "bottom")) "x" else "y"
+  key <- vctrs::new_data_frame(list2(
+    !!aes := break_positions,
+    .value = break_positions,
+    .label = break_labels
+  ))
+  guide$key <- key
+  guide$draw(theme)
 }
 
 draw_axis_labels <- function(break_positions, break_labels, label_element, is_vertical,
@@ -412,26 +469,3 @@ axis_label_element_overrides <- function(axis_position, angle = NULL) {
     abort(glue("Unrecognized position: '{axis_position}'"))
   }
 }
-
-warn_for_guide_position <- function(guide) {
-  # This is trying to catch when a user specifies a position perpendicular
-  # to the direction of the axis (e.g., a "y" axis on "top").
-  # The strategy is to check that two or more unique breaks are mapped
-  # to the same value along the axis.
-  breaks_are_unique <- !duplicated(guide$key$.value)
-  if (empty(guide$key) || sum(breaks_are_unique) == 1) {
-    return()
-  }
-
-  if (guide$position %in% c("top", "bottom")) {
-    position_aes <- "x"
-  } else if(guide$position %in% c("left", "right")) {
-    position_aes <- "y"
-  } else {
-    return()
-  }
-
-  if (length(unique(guide$key[[position_aes]][breaks_are_unique])) == 1) {
-    warn("Position guide is perpendicular to the intended axis. Did you mean to specify a different guide `position`?")
-  }
-}
diff --git a/man/ggplot2-ggproto.Rd b/man/ggplot2-ggproto.Rd
index 7e9cf6e132..7c6e9da90b 100644
--- a/man/ggplot2-ggproto.Rd
+++ b/man/ggplot2-ggproto.Rd
@@ -12,17 +12,18 @@
 %   R/geom-hex.r, R/geom-hline.r, R/geom-label.R, R/geom-linerange.r,
 %   R/geom-point.r, R/geom-pointrange.r, R/geom-quantile.r, R/geom-rug.r,
 %   R/geom-smooth.r, R/geom-spoke.r, R/geom-text.r, R/geom-tile.r,
-%   R/geom-violin.r, R/geom-vline.r, R/layout.R, R/position-.r,
-%   R/position-dodge.r, R/position-dodge2.r, R/position-identity.r,
-%   R/position-jitter.r, R/position-jitterdodge.R, R/position-nudge.R,
-%   R/position-stack.r, R/scale-.r, R/scale-binned.R, R/scale-continuous.r,
-%   R/scale-date.r, R/scale-discrete-.r, R/scale-identity.r, R/stat-bin.r,
-%   R/stat-bin2d.r, R/stat-bindot.r, R/stat-binhex.r, R/stat-boxplot.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-qq-line.R, R/stat-qq.r, R/stat-quantile.r, R/stat-smooth.r,
-%   R/stat-sum.r, R/stat-summary-2d.r, R/stat-summary-bin.R,
-%   R/stat-summary-hex.r, R/stat-summary.r, R/stat-unique.r, R/stat-ydensity.r
+%   R/geom-violin.r, R/geom-vline.r, R/guide-.r, R/guides-axis.r,
+%   R/guides-none.r, R/layout.R, R/position-.r, R/position-dodge.r,
+%   R/position-dodge2.r, R/position-identity.r, R/position-jitter.r,
+%   R/position-jitterdodge.R, R/position-nudge.R, R/position-stack.r,
+%   R/scale-.r, R/scale-binned.R, R/scale-continuous.r, R/scale-date.r,
+%   R/scale-discrete-.r, R/scale-identity.r, R/stat-bin.r, R/stat-bin2d.r,
+%   R/stat-bindot.r, R/stat-binhex.r, R/stat-boxplot.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-qq-line.R,
+%   R/stat-qq.r, R/stat-quantile.r, R/stat-smooth.r, R/stat-sum.r,
+%   R/stat-summary-2d.r, R/stat-summary-bin.R, R/stat-summary-hex.r,
+%   R/stat-summary.r, R/stat-unique.r, R/stat-ydensity.r
 \docType{data}
 \name{ggplot2-ggproto}
 \alias{ggplot2-ggproto}
@@ -85,6 +86,9 @@
 \alias{GeomTile}
 \alias{GeomViolin}
 \alias{GeomVline}
+\alias{Guide}
+\alias{GuideAxis}
+\alias{GuideNone}
 \alias{Layout}
 \alias{Position}
 \alias{PositionDodge}
@@ -360,6 +364,22 @@ default values for aesthetics.
 }
 }
 
+\section{Guides}{
+
+
+The \verb{guide_*()} functions, such as \code{guide_legend()} return an object that
+is responsible for displaying how objects in the plotting panel are related
+to actual values.
+
+Each of the \verb{Guide*} object is a \code{\link[=ggproto]{ggproto()}} object, descended from the
+top-level \code{Guide}, and each implements their own methods for drawing.
+
+To create a new type of Guide object, you typically will want to override
+one or more of the following:
+
+TODO: Fill this in properly
+}
+
 \section{Positions}{
 
 
diff --git a/man/guide_axis.Rd b/man/guide_axis.Rd
index 019f661a51..4400c60a57 100644
--- a/man/guide_axis.Rd
+++ b/man/guide_axis.Rd
@@ -54,6 +54,4 @@ p + guides(x = guide_axis(angle = 90))
 
 # can also be used to add a duplicate guide
 p + guides(x = guide_axis(n.dodge = 2), y.sec = guide_axis())
-
-
 }
diff --git a/man/new_guide.Rd b/man/new_guide.Rd
new file mode 100644
index 0000000000..a470e0f91d
--- /dev/null
+++ b/man/new_guide.Rd
@@ -0,0 +1,25 @@
+% Generated by roxygen2: do not edit by hand
+% Please edit documentation in R/guide-.r
+\name{new_guide}
+\alias{new_guide}
+\title{Guide constructor}
+\usage{
+new_guide(..., available_aes = "any", super)
+}
+\arguments{
+\item{...}{Named arguments that match the parameters of \code{super$params} or
+the theme elements in \code{super$elements}.}
+
+\item{available_aes}{A vector of character strings listing the aesthetics
+for which the guide can be drawn.}
+
+\item{super}{The super class to use for the constructed guide. Should be a
+Guide class object.}
+}
+\value{
+A \code{Guide} ggproto object.
+}
+\description{
+A constructor function for guides, which performs some standard compatability
+checks between the guide and provided arguments.
+}

From 7c12fda6df7e811ce7c036bf2ff4271cc9e53738 Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Mon, 8 Aug 2022 20:07:33 +0200
Subject: [PATCH 009/111] revert scale$map() logic

---
 R/guide-.r | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/R/guide-.r b/R/guide-.r
index 13c9bfb73b..7db499445f 100644
--- a/R/guide-.r
+++ b/R/guide-.r
@@ -193,15 +193,15 @@ Guide <- ggproto(
       return(NULL)
     }
 
-    values <- scale$map(breaks)
+    mapped <- if (scale$is_discrete()) scale$map(breaks) else breaks
     labels <- scale$get_labels(breaks)
 
-    key <- vctrs::new_data_frame(list2(
-      !!aesthetic := breaks,
-      .value       = values,
-      .label       = labels
-    ))
-    key[is.finite(key[[".value"]]), , drop = FALSE]
+    key <- data_frame(
+      mapped, breaks, labels,
+      .name_repair = ~ c(aesthetic, ".value", ".label")
+    )
+
+    key[is.finite(key[[aesthetic]]), , drop = FALSE]
   },
 
   # Function for extracting decoration from the scale.

From 570aba0ecc537b4b46676fc20475d83a5cda8d7c Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Mon, 8 Aug 2022 20:11:42 +0200
Subject: [PATCH 010/111] Adress some minor comments

---
 R/guide-.r | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/R/guide-.r b/R/guide-.r
index 7db499445f..8fdd3d54fa 100644
--- a/R/guide-.r
+++ b/R/guide-.r
@@ -11,6 +11,7 @@
 #'   Guide class object.
 #'
 #' @return A `Guide` ggproto object.
+#' @keywords internal
 #' @export
 new_guide <- function(..., available_aes = "any", super) {
 
@@ -96,9 +97,9 @@ Guide <- ggproto(
 
   # The `key` is a data.frame describing the information acquired from a scale
   # that is used to train the guide.
-  key = vctrs::data_frame(
+  key = data_frame0(
     aesthetic = numeric(), .value = numeric(), .label = character(),
-    .size = 0, .name_repair = "minimal"
+    .size = 0
   ),
 
   # The `decor` is used for useful components extracted from the scale or
@@ -347,11 +348,11 @@ Guide <- ggproto(
     pos <- unname(c(top = 1, bottom = 0, left = 0, right = 1)[position])
     dir <- -2 * pos + 1
     pos <- unit(rep(pos, 2 * n_breaks), "npc")
-    dir <- rep(vctrs::vec_interleave(0, dir), n_breaks) * tick_len
+    dir <- rep(vec_interleave(0, dir), n_breaks) * tick_len
     tick <- pos + dir
 
     # Build grob
-    bidi_element_grob(
+    flip_element_grob(
       elements$ticks,
       x = tick, y = mark,
       id.lengths = rep(2, n_breaks),
@@ -364,21 +365,21 @@ Guide <- ggproto(
   }
 )
 
-# Helper function that may facilitate bidirectional theme elements by
-# flipping x/y related arguments to `element_grob()`
-bidi_element_grob = function(..., flip = FALSE) {
+# Helper function that may facilitate flipping theme elements by
+# swapping x/y related arguments to `element_grob()`
+flip_element_grob = function(..., flip = FALSE) {
   if (!flip) {
     ans <- element_grob(...)
     return(ans)
   }
   args <- list(...)
-  translate <- names(args) %in% names(bidi_names)
-  names(args)[translate] <- bidi_names[names(args)[translate]]
+  translate <- names(args) %in% names(flip_names)
+  names(args)[translate] <- flip_names[names(args)[translate]]
   do.call(element_grob, args)
 }
 
-# The flippable arguments for `bidi_element_grob()`.
-bidi_names = c(
+# The flippable arguments for `flip_element_grob()`.
+flip_names = c(
   "x"        = "y",
   "y"        = "x",
   "width"    = "height",

From 9c27d3e9162200edf75caecfc3141c01af8eaa0d Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Thu, 11 Aug 2022 21:02:33 +0200
Subject: [PATCH 011/111] Better warning when guide function not found

---
 R/guides-.r | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/R/guides-.r b/R/guides-.r
index a3f3ba992d..435022502c 100644
--- a/R/guides-.r
+++ b/R/guides-.r
@@ -177,9 +177,13 @@ resolve_guide <- function(aesthetic, scale, guides, default = "none", null = "no
 validate_guide <- function(guide) {
   # if guide is specified by character, then find the corresponding guide
   if (is.character(guide)) {
-    find_global(paste0("guide_", guide), env = global_env(),
-                mode = "function")()
-  } else if (inherits(guide, "guide")) {
+    guide <- find_global(paste0("guide_", guide), env = global_env(),
+                         mode = "function")
+    if (is.function(guide)) {
+      return(guide())
+    }
+  }
+  if (inherits(guide, "guide")) {
     guide
   } else if (inherits(guide, "Guide")) {
     # ggproto guides need to be cloned because they may have been defined

From 058f0cfc619a594ee4e3508993b346a3c183efdc Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Thu, 11 Aug 2022 21:03:14 +0200
Subject: [PATCH 012/111] move guide position specification from setup to
 training

---
 R/coord-.r | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/R/coord-.r b/R/coord-.r
index 6c02a3217b..aa8e1064fe 100644
--- a/R/coord-.r
+++ b/R/coord-.r
@@ -135,17 +135,6 @@ Coord <- ggproto("Coord",
     # resolve the guide definition as a "Guide"
     guides <- lapply(guides, validate_guide)
 
-    # if there is an "position" specification in the scale, pass this on to the guide
-    # ideally, this should be specified in the guide
-    guides <- lapply(aesthetics, function(aesthetic) {
-      guide <- guides[[aesthetic]]
-      scale <- panel_params[[aesthetic]]
-      # position could be NULL here for an empty scale
-
-      guide$set_position(scale$position)
-      guide
-    })
-
     panel_params$guides <- guides
     panel_params
   },
@@ -159,6 +148,9 @@ Coord <- ggproto("Coord",
     panel_params$guides <- lapply(aesthetics, function(aesthetic) {
       axis <- substr(aesthetic, 1, 1)
       guide <- panel_params$guides[[aesthetic]]
+      # if there is an "position" specification in the scale, pass this on to the guide
+      # ideally, this should be specified in the guide
+      guide$set_position(panel_params[[aesthetic]]$position)
       guide$train(panel_params[[aesthetic]])
       guide$transform(self, panel_params)
       guide$geom(layers, default_mapping)

From fb323082d43724a4419713d5ccd837eaa100a20c Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Sat, 13 Aug 2022 17:15:11 +0200
Subject: [PATCH 013/111] Stop if guide has no valid function

---
 R/guides-.r | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/R/guides-.r b/R/guides-.r
index 435022502c..3b440eb910 100644
--- a/R/guides-.r
+++ b/R/guides-.r
@@ -177,18 +177,14 @@ resolve_guide <- function(aesthetic, scale, guides, default = "none", null = "no
 validate_guide <- function(guide) {
   # if guide is specified by character, then find the corresponding guide
   if (is.character(guide)) {
-    guide <- find_global(paste0("guide_", guide), env = global_env(),
+    fun <- find_global(paste0("guide_", guide), env = global_env(),
                          mode = "function")
-    if (is.function(guide)) {
-      return(guide())
+    if (is.function(fun)) {
+      return(fun())
     }
   }
-  if (inherits(guide, "guide")) {
+  if (inherits(guide, c("guide", "Guide"))) {
     guide
-  } else if (inherits(guide, "Guide")) {
-    # ggproto guides need to be cloned because they may have been defined
-    # outside the plot.
-    guide$clone()
   } else {
     cli::cli_abort("Unknown guide: {guide}")
   }

From 9b95e22fbf5265e1c569ddaa2378a2fc08c5f5ae Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Sat, 13 Aug 2022 17:15:43 +0200
Subject: [PATCH 014/111] Make a GuidesList class

---
 R/guides-.r | 165 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 165 insertions(+)

diff --git a/R/guides-.r b/R/guides-.r
index 3b440eb910..146c56907d 100644
--- a/R/guides-.r
+++ b/R/guides-.r
@@ -443,3 +443,168 @@ include_layer_in_guide <- function(layer, matched) {
   # Default is to exclude it, except if it is explicitly turned on
   isTRUE(layer$show.legend)
 }
+
+# Class -------------------------------------------------------------------
+
+# Guides object encapsulates multiple guides and their state.
+# TODO: incorporate in non-position branch of guides
+# TODO: fill in other `guides_*` methods when non-position guides are done
+guides_list <- function(guides) {
+  ggproto(NULL, GuidesList, guides = guides)
+}
+
+GuidesList <- ggproto(
+  "GuidesList", NULL,
+
+  # A list of guides to be updated by 'add' or populated upon construction.
+  guides = list(),
+
+  # An index parallel to `guides` for matching guides with scales
+  # Currently not used, but should be useful for non-position training etc.
+  scale_index = integer(),
+
+  # A vector of aesthetics parallel to `guides` tracking which guide belongs to
+  # which aesthetic. Used in `get_guide()` and `get_params()` method
+  aesthetics = character(),
+
+  # Updates the parameters of the guides. NULL parameters indicate switch to
+  # `guide_none()`.
+  update_params = function(self, params) {
+    if (length(params) != length(self$params)) {
+      cli::cli_abort(paste0(
+        "Cannot update {length(self$params)} guide{?s} with a list of ",
+        "parameter{?s} of length {length(params)}."
+      ))
+    }
+    # Find empty parameters
+    is_empty <- vapply(params, is.null, logical(1))
+    # Do parameter update
+    self$params[!is_empty] <- params[!is_empty]
+
+    # Set empty parameter guides to `guide_none`. Don't overwrite parameters,
+    # because things like 'position' are relevant.
+    self$guides[is_empty] <- list(guide_none())
+    return(NULL)
+  },
+
+  # Function for adding new guides
+  add = function(self, guides) {
+    if (is.null(guide)) {
+      return()
+    }
+    if (inherits(guides, "GuidesList")) {
+      guides <- guides$guides
+    }
+    self$guides <- defaults(guides, self$guides)
+    return()
+  },
+
+  # Function for retrieving guides by index or aesthetic
+  get_guide = function(self, index) {
+    if (is.character(index)) {
+      index <- match(index, self$aesthetics)
+    }
+    if (any(is.na(index)) || length(index) == 0) {
+      return(NULL)
+    }
+    if (length(index) == 1) {
+      self$guides[[index]]
+    } else {
+      self$guides[index]
+    }
+  },
+
+  # Function for retrieving parameters by guide or aesthetic
+  get_params = function(self, index) {
+    if (is.character(index)) {
+      index <- match(index, self$aesthetics)
+    }
+    if (any(is.na(index)) || length(index) == 0) {
+      return(NULL)
+    }
+    if (length(index) == 1) {
+      self$params[[index]]
+    } else {
+      self$params[index]
+    }
+  },
+
+  # Setup routine for resolving and validating guides based on paired scales.
+  setup = function(
+    self, scales, aesthetics = NULL,
+    default = "none", keep_none = TRUE
+  ) {
+
+    if (is.null(aesthetics)) {
+      # Aesthetics from scale, as in non-position guides
+      aesthetics <- lapply(scales, `[[`, aesthetics)
+      scale_idx  <- rep(seq_along(scales), lengths(aesthetics))
+      aesthetics <- unlist(aesthetics, FALSE, FALSE)
+    } else {
+      # Scale based on aesthetics, as in position guides
+      scale_idx  <- seq_along(scales)[match(aesthetics, names(scales))]
+    }
+
+    guides <- self$guides
+
+    new_guides <- lapply(seq_along(scale_idx), function(i) {
+      idx <- scale_idx[i]
+
+      guide <- resolve_guide(
+        aesthetic = aesthetics[i],
+        scale     = scales[[idx]],
+        guides    = guides,
+        default   = default,
+        null      = guide_none()
+      )
+
+      if (isFALSE(guide)) {
+        # TODO: update to lifecycle after next lifecycle release
+        cli::cli_warn(c(
+          "{.code guide = FALSE} is deprecated",
+          "i" = 'Please use {.code guide = "none"} instead.'
+        ))
+        guide <- "none"
+      }
+
+      guide <- validate_guide(guide)
+
+      if (inherits(guide, "GuideNone")) {
+        return(guide)
+      }
+
+      scale_aes <- scales[[idx]]$aesthetics
+      if (!any(c("x", "y") %in% scale_aes)) scale_aes <- c(scale_aes, "any")
+      if (!any(scale_aes %in% guide$available_aes)) {
+        warn_aes <- guide$available_aes
+        warn_aes[warn_aes == "any"] <- "any non position aesthetic"
+        cli::cli_warn(c(
+          paste0("{.fn {snake_class(guide)}} cannot be used for ",
+                 "{.or {.field {head(scales[[idx]]$aesthetics, 4)}}}."),
+          i = "Use {?one of} {.or {.field {warn_aes}}} instead."
+        ))
+        guide <- guide_none()
+      }
+
+      guide
+    })
+
+    # Non-position guides drop `GuideNone`
+    if (!keep_none) {
+      is_none <- vapply(new_guides, inherits, logical(1), what = "GuideNone")
+      new_guides <- new_guides[!is_none]
+      scale_idx  <- scale_idx[!is_none]
+      aesthetics <- aesthetics[!is_none]
+    }
+
+    params <- lapply(new_guides, `[[`, "params")
+
+    ggproto(
+      NULL, self,
+      guides      = new_guides,
+      scale_index = scale_idx,
+      aesthetics  = aesthetics,
+      params      = params
+    )
+  }
+)

From a0f6a2db374e3b2c2ea5a04aa525515a8170f762 Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Sat, 13 Aug 2022 17:17:47 +0200
Subject: [PATCH 015/111] Coord uses GuidesList

---
 R/coord-.r           | 68 ++++++++++++++++++++++++++++----------------
 R/coord-cartesian-.r |  7 +++--
 2 files changed, 48 insertions(+), 27 deletions(-)

diff --git a/R/coord-.r b/R/coord-.r
index aa8e1064fe..977b7825c5 100644
--- a/R/coord-.r
+++ b/R/coord-.r
@@ -120,43 +120,63 @@ Coord <- ggproto("Coord",
   setup_panel_guides = function(self, panel_params, guides, params = list()) {
     aesthetics <- c("x", "y", "x.sec", "y.sec")
     names(aesthetics) <- aesthetics
+    is_sec <- grepl("sec$", aesthetics)
 
-    # resolve the specified guide from the scale and/or guides
-    guides <- lapply(aesthetics, function(aesthetic) {
-      resolve_guide(
-        aesthetic,
-        panel_params[[aesthetic]],
-        guides,
-        default = guide_axis(),
-        null = guide_none()
-      )
-    })
+    # TODO: This should ideally happen in the `guides()` function or earlier.
+    if (!inherits(guides, "GuidesList")) {
+      guides <- guides_list(guides)
+    }
 
-    # resolve the guide definition as a "Guide"
-    guides <- lapply(guides, validate_guide)
+    # Do guide setup
+    guides <- guides$setup(panel_params, aesthetics, default = guide_axis())
+    guide_params <- guides$get_params(aesthetics)
+
+    # Resolve positions
+    scale_position <- lapply(panel_params[aesthetics], `[[`, "position")
+    guide_position <- lapply(guide_params, `[[`, "position")
+    guide_position[!is_sec] <- Map(
+      `%|W|%`, guide_position[!is_sec], scale_position[!is_sec]
+    )
+    opposite <- c(
+      "top"  = "bottom", "bottom" = "top",
+      "left" = "right",   "right" = "left"
+    )
+    guide_position[is_sec] <- Map(
+      function(sec, prim) sec %|W|% unname(opposite[prim]),
+      sec  = guide_position[is_sec],
+      prim = guide_position[!is_sec]
+    )
+    guide_params <- Map(
+      `[[<-`, x = guide_params, value = "position", i = guide_position
+    )
+
+    # Update positions
+    guides$update_params(guide_params)
 
     panel_params$guides <- guides
     panel_params
   },
 
   train_panel_guides = function(self, panel_params, layers, default_mapping, params = list()) {
+
     aesthetics <- c("x", "y", "x.sec", "y.sec")
     names(aesthetics) <- aesthetics
     # If the panel_params doesn't contain the scale, there's no guide for the aesthetic
-    aesthetics <- intersect(aesthetics, names(panel_params$guides))
-
-    panel_params$guides <- lapply(aesthetics, function(aesthetic) {
-      axis <- substr(aesthetic, 1, 1)
-      guide <- panel_params$guides[[aesthetic]]
-      # if there is an "position" specification in the scale, pass this on to the guide
-      # ideally, this should be specified in the guide
-      guide$set_position(panel_params[[aesthetic]]$position)
-      guide$train(panel_params[[aesthetic]])
-      guide$transform(self, panel_params)
-      guide$geom(layers, default_mapping)
-      guide
+    aesthetics <- intersect(aesthetics, names(panel_params$guides$aesthetics))
+
+    guide_params <- lapply(aesthetics, function(aesthetic) {
+
+      guide  <- panel_params$guides$get_guide(aesthetic)
+      params <- panel_params$guides$get_params(aesthetic)
+
+      params <- guide$train(params, panel_params[[aesthetic]])
+      params <- guide$transform(params, self, panel_params)
+      params <- guide$geom(params, layers, default_mapping)
+      params
     })
 
+    panel_params$guides$update_params(guide_params)
+
     panel_params
   },
 
diff --git a/R/coord-cartesian-.r b/R/coord-cartesian-.r
index 7cc26d4e98..5f54e79c4a 100644
--- a/R/coord-cartesian-.r
+++ b/R/coord-cartesian-.r
@@ -145,13 +145,14 @@ view_scales_from_scale <- function(scale, coord_limits = NULL, expand = TRUE) {
 }
 
 panel_guide_label <- function(guides, position, default_label) {
-  guide <- guide_for_position(guides, position) %||% guide_none(title = waiver())
+  guide <- guide_for_position(guides, position) %||%
+    list(params = list(title = waiver()))
   guide$params$title %|W|% default_label
 }
 
 panel_guides_grob <- function(guides, position, theme) {
-  guide <- guide_for_position(guides, position) %||% guide_none()
-  guide$draw(theme)
+  guide <- guide_for_position(guides, position) %||% list(guide = guide_none())
+  guide$guide$draw(theme, guide$params)
 }
 
 guide_for_position <- function(guides, position) {

From ed1f3927ce1d7861ba3d23c8051a4d0ecb9b5733 Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Sat, 13 Aug 2022 17:18:46 +0200
Subject: [PATCH 016/111] Invalid guide throws warning instead of error

---
 tests/testthat/test-guides.R | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/testthat/test-guides.R b/tests/testthat/test-guides.R
index 1b1c43de5d..16dbc81830 100644
--- a/tests/testthat/test-guides.R
+++ b/tests/testthat/test-guides.R
@@ -132,7 +132,7 @@ test_that("Using non-position guides for position scales results in an informati
     scale_x_continuous(guide = guide_legend())
 
   built <- ggplot_build(p)
-  expect_snapshot_error(ggplot_gtable(built))
+  expect_snapshot_warning(ggplot_gtable(built))
 })
 
 test_that("guide merging for guide_legend() works as expected", {

From aabc1123a08478d70dfbe88b1fd8a6a86cf577fe Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Sat, 13 Aug 2022 18:09:11 +0200
Subject: [PATCH 017/111] Update axis merge method

---
 R/coord-cartesian-.r | 39 +++++++++++++++++++++++++++++++--------
 1 file changed, 31 insertions(+), 8 deletions(-)

diff --git a/R/coord-cartesian-.r b/R/coord-cartesian-.r
index 5f54e79c4a..bbec5d2354 100644
--- a/R/coord-cartesian-.r
+++ b/R/coord-cartesian-.r
@@ -156,15 +156,38 @@ panel_guides_grob <- function(guides, position, theme) {
 }
 
 guide_for_position <- function(guides, position) {
+  params <- guides$params
   has_position <- vapply(
-    guides,
-    function(guide) identical(guide$params$position, position),
-    logical(1)
+    params, function(p) identical(p$position, position), logical(1)
   )
 
-  guides <- guides[has_position]
-  guides_order <- vapply(guides, function(guide) {
-    as.numeric(guide$params$order)
-  }, numeric(1))
-  Reduce(function(old, new) {old$merge(new)}, guides[order(guides_order)])
+  if (sum(has_position) == 0) {
+    return(NULL)
+  }
+
+  # Subset guides and parameters
+  guides <- guides$get_guide(has_position)
+  params <- params[has_position]
+  # Pair up guides with parameters
+  pairs <- Map(list, guide = guides, params = params)
+
+  # Early exit, nothing to merge
+  if (length(pairs) == 1) {
+    return(pairs[[1]])
+  }
+
+  # TODO: There must be a smarter way to merge these
+  order <- order(vapply(params, function(p) as.numeric(p$order), numeric(1)))
+  Reduce(
+    function(old, new) {
+      old$guide$merge(old$params, new$guide, new$params)
+    },
+    pairs[order]
+  )
+
+  # guides <- guides[has_position]
+  # guides_order <- vapply(guides, function(guide) {
+  #   as.numeric(guide$params$order)
+  # }, numeric(1))
+  # Reduce(function(old, new) {old$merge(new)}, guides[order(guides_order)])
 }

From 1ca3f06b9284b2280fe37dea99eabc0bc947d706 Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Sat, 13 Aug 2022 18:10:16 +0200
Subject: [PATCH 018/111] Trim guide methods, return params

---
 R/guide-.r      | 138 ++++++++++++++----------------------------------
 R/guides-axis.r |  40 +++++++-------
 R/guides-none.r |   9 +---
 3 files changed, 63 insertions(+), 124 deletions(-)

diff --git a/R/guide-.r b/R/guide-.r
index 8fdd3d54fa..32326a9bde 100644
--- a/R/guide-.r
+++ b/R/guide-.r
@@ -77,15 +77,9 @@ new_guide <- function(..., available_aes = "any", super) {
 Guide <- ggproto(
   "Guide",
 
-  # Counter to ggplot wisdom, there are 4 stateful fields in the `Guide` class.
-  # These are (i) the `params` parameters which may carry user-input, the
-  # (ii) `key` data.frame, which carries information from the scale and (iii)
-  # the `elements` list that can carry user-supplied theme elements, and (iv)
-  # the `decor` which carries information from layers or scales.
-
-  # `params` is a mutable list of guide parameters, part of which may be
-  # provided by the user. The following lists parameters that the `guides_*`
-  # family of functions may expect to be present.
+  # `params` is a list of initial parameters that gets updated upon
+  #  construction. After construction, parameters are manged by the
+  #  `GuidesList` class.
   params = list(
     title     = waiver(),
     name      = character(),
@@ -95,96 +89,42 @@ Guide <- ggproto(
     hash      = character()
   ),
 
-  # The `key` is a data.frame describing the information acquired from a scale
-  # that is used to train the guide.
-  key = data_frame0(
-    aesthetic = numeric(), .value = numeric(), .label = character(),
-    .size = 0
-  ),
-
-  # The `decor` is used for useful components extracted from the scale or
-  # layers.
-  decor = NULL,
-
   # A list of theme elements that should be calculated
   elements = list(),
 
+  # The aesthetics for which this guide is appropriate
   available_aes = character(),
 
   # The `hashables` are the parameters of the guide that are used to generate a
   # unique hash that determines whether other guides are compatible.
-  hashables = exprs(params$title, params$name),
-
-  # The following functions are simple setters/getters
-  get_hash = function(self) {
-    self$params$hash
-  },
-  set_title = function(self, title) {
-    self$params$title <- self$params$title %|W|% title
-    return(invisible())
-  },
-  set_direction = function(self, direction) {
-    self$params$direction <- self$params$direction %||% direction
-    return(invisible())
-  },
-  set_position = function(self, position) {
-    self$params$position <- self$params$position %|W|% position
-    return(invisible())
-  },
-
-  # We need a clone function that is called in validate_guide because a guide
-  # can be created outside the plot, which would mean that important parameters
-  # such as direction are being assigned to the environment of multiple
-  # Guide ggprotos. This could have gotten hairy in a situation like the
-  # following, where the y-guide would get `direction = "horizontal"`.
-  #
-  # g <- guide_axis(title = "My axis")
-  # ggplot(mpg, aes(displ, hwy)) +
-  #  geom_point() +
-  #  guides(x = g, y = g)
-  clone = function(self) {
-    ggproto(NULL, self)
-  },
-
-  # Training has several tasks:
-  # 1. Check if scale and guide are compatible
-  # 2. Extract a key from the scale
-  # 3. (Optionally) extract further decor from the scale
-  # 4. Name the guide
-  # 5. Make a hash for the guide
-  train = function(self, scale, aesthetic = NULL, params = self$params) {
-    # Resolve aesthetic
-    aesthetic <- aesthetic %||% scale$aesthetics[1]
-
-    # Check if scale-guide match is appropriate
-    aes_intersect <- intersect(scale$aesthetics, self$available_aes)
-    if (!("any" %in% self$available_aes) && length(aes_intersect) == 0) {
-      key <- NULL # Set key as missing
-      cli::cli_warn(c(
-        "{.fn {snake_class(self)}} lacks appropriate scales.",
-        i = "Use {?one of} {.or {.field {self$available_aes}}} instead."
-      ))
-
-    } else {
-      # Forward params as arguments to `extract_key()`
-      key <- inject(self$extract_key(scale, aesthetic, !!!params))
-    }
-    # Draw empty guide if key is missing
-    if (is.null(key)) {
-      return(guide_none())
+  hashables = exprs(title, name),
+
+  # Training has the task of updating parameters based the scale.
+  # There are 3 sub-tasks:
+  # 1. Extract a key from the scale
+  # 2. (Optionally) extract further decoration from the scale (e.g. the
+  #    colour bar).
+  # 3. Extract further parameters
+  train = function(self, params = self$params, scale, aesthetic = NULL) {
+    params$aesthetic <- aesthetic %||% scale$aesthetics[1]
+    params$key   <- inject(self$extract_key(scale, !!!params))
+    if (is.null(params$key)) {
+      return(params$key)
     }
+    params$decor <- inject(self$extract_decor(scale, !!!params))
+    inject(self$extract_params(scale, params, self$hashables))
+  },
 
-    # Forward params as arguments to `extract_decor()`
-    decor <- inject(self$extract_decor(scale, aesthetic, !!!params))
-
-    # Assign key, decor, name and hash to current guide
-    self$key   <- key
-    self$decor <- decor
-    self$params$name <- paste0(params$name, "_", aesthetic)
-    mask <- new_data_mask(self)
-    self$params$hash <- hash(lapply(self$hashables, eval_tidy, data = mask))
+  # Setup parameters that are only available after training
+  # TODO: Maybe we only need the hash on demand during merging?
+  extract_params = function(scale, params, hashables) {
+    # Make name
+    params$name <- paste0(params$name, "_", params$aesthetic)
 
-    return(self)
+    # Make hash
+    mask <- new_data_mask(as_environment(params))
+    params$hash <- hash(lapply(hashables, eval_tidy, data = mask))
+    params
   },
 
   # Function for generating a `key` data.frame from the scale
@@ -214,21 +154,23 @@ Guide <- ggproto(
 
   # Function for merging multiple guides.
   # Mostly applies to `guide_legend()` and `guide_binned()`.
-  merge = function(self, new_guide) {
-    return(self)
+  # Defaults to returning the *other* guide, because this parent class is
+  # mostly a virtual class and children should implement their own merges.
+  merge = function(self, params, new_guide, new_params) {
+    return(list(guide = new_guide, params = new_params))
   },
 
   # Function for applying coord-transformation.
   # Mostly applied to position guides, such as `guide_axis()`.
-  transform = function(self, coord, ...) {
-    return(self)
+  transform = function(params, coord, ...) {
+    return(params)
   },
 
   # Function for extracting information from the layers.
   # Mostly applies to `guide_legend()` and `guide_binned()`
   # TODO: Consider renaming this to a more informative name.
-  geom = function(self, layers, default_mapping) {
-    return(self)
+  geom = function(params, layers, default_mapping) {
+    return(params)
   },
 
   # Called at start of the `draw` method. Typically used to either overrule
@@ -256,7 +198,9 @@ Guide <- ggproto(
 
   # Main drawing function that organises more specialised aspects of guide
   # drawing.
-  draw = function(self, theme, params = self$params, key = self$key) {
+  draw = function(self, theme, params = self$params) {
+
+    key <- params$key
 
     # Setup parameters and theme
     params <- self$setup_params(params)
@@ -273,7 +217,7 @@ Guide <- ggproto(
     grob_title  <- self$build_title(params$title, elems, params)
     grob_labels <- self$build_labels(key, elems, params)
     grob_ticks  <- self$build_ticks(key, elems, params)
-    grob_decor  <- self$build_decor(self$decor, grob_ticks, elems, params)
+    grob_decor  <- self$build_decor(params$decor, grob_ticks, elems, params)
     grobs <- list(
       title = grob_title,
       label = grob_labels,
diff --git a/R/guides-axis.r b/R/guides-axis.r
index fbacafc59a..e9fafbab1a 100644
--- a/R/guides-axis.r
+++ b/R/guides-axis.r
@@ -76,14 +76,14 @@ GuideAxis <- ggproto(
 
   available_aes = c("x", "y"),
 
-  hashables = quos(params$title, key$.value, key$.label, params$name),
+  hashables = quos(title, key$.value, key$.label, name),
 
-  transform = function(self, coord, panel_params) {
-    key <- self$key
-    position <- self$params$position
+  transform = function(params, coord, panel_params) {
+    key <- params$key
+    position <- params$position
 
     if (is.null(position) || nrow(key) == 0) {
-      return(self)
+      return(params)
     }
 
     aesthetics <- names(key)[!grepl("^\\.", names(key))]
@@ -93,7 +93,7 @@ GuideAxis <- ggproto(
       key[[other_aesthetic]] <- override_value
     }
     key <- coord$transform(key, panel_params)
-    self$key <- key
+    params$key <- key
 
     # Ported over from `warn_for_position_guide`
     # This is trying to catch when a user specifies a position perpendicular
@@ -102,7 +102,7 @@ GuideAxis <- ggproto(
     # to the same value along the axis.
     breaks_are_unique <- !duplicated(key$.value)
     if (empty(key) || sum(breaks_are_unique) == 1) {
-      return(self)
+      return(params)
     }
 
     if (position %in% c("top", "bottom")) {
@@ -110,7 +110,7 @@ GuideAxis <- ggproto(
     } else if (position %in% c("left", "right")) {
       position_aes <- "y"
     } else {
-      return(self)
+      return(params)
     }
 
     if (length(unique(key[[position_aes]][breaks_are_unique])) == 1) {
@@ -120,17 +120,17 @@ GuideAxis <- ggproto(
       ))
     }
 
-    return(self)
+    return(params)
   },
 
-  merge = function(self, new_guide) {
+  merge = function(self, params, new_guide, new_params) {
     if (!inherits(new_guide, "GuideNone")) {
       cli::cli_warn(c(
         "{.fn {snake_class(self)}}: Discarding guide on merge.",
         "i" = "Do you have more than one guide with the same {.arg position}?"
       ))
     }
-    return(self)
+    return(list(guide = self, params = params))
   },
 
   elements = list(
@@ -354,16 +354,16 @@ draw_axis <- function(break_positions, break_labels, axis_position, theme,
                       check.overlap = FALSE, angle = NULL, n.dodge = 1) {
   guide <- guide_axis(check.overlap = check.overlap,
                       angle = angle,
-                      n.dodge = n.dodge)
-  guide$set_position(axis_position)
+                      n.dodge = n.dodge,
+                      position = axis_position)
+  params <- guide$params
   aes <- if (axis_position %in% c("top", "bottom")) "x" else "y"
-  key <- vctrs::new_data_frame(list2(
-    !!aes := break_positions,
-    .value = break_positions,
-    .label = break_labels
-  ))
-  guide$key <- key
-  guide$draw(theme)
+  key <- data_frame(
+    break_positions, break_positions, break_labels,
+    .name_repair = ~ c(aes, ".value", ".label")
+  )
+  params$key <- key
+  guide$draw(theme, params)
 }
 
 draw_axis_labels <- function(break_positions, break_labels, label_element, is_vertical,
diff --git a/R/guides-none.r b/R/guides-none.r
index 17e5126628..1d0a2760ab 100644
--- a/R/guides-none.r
+++ b/R/guides-none.r
@@ -24,13 +24,8 @@ GuideNone <- ggproto(
   "GuideNone", Guide,
 
   # Perform no training
-  train = function(self, scale, aesthetic = NULL) {
-    self
-  },
-
-  # Defaults to returning the *other* guide
-  merge = function(self, new_guide) {
-    new_guide
+  train = function(self, params = self$params, scale, aesthetic = NULL) {
+    params
   },
 
   # Draw nothing

From 4f7492d9483b940d77b0434b1c41c741737ebc15 Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Sat, 13 Aug 2022 20:27:48 +0200
Subject: [PATCH 019/111] CoordPolar doesn't use guides

---
 R/coord-polar.r | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/R/coord-polar.r b/R/coord-polar.r
index 61d74e31ab..f9bb6395da 100644
--- a/R/coord-polar.r
+++ b/R/coord-polar.r
@@ -154,6 +154,14 @@ CoordPolar <- ggproto("CoordPolar", Coord,
     details
   },
 
+  setup_panel_guides = function(self, panel_params, guides, params = list()) {
+    panel_params
+  },
+
+  train_panel_guides = function(self, panel_params, layers, default_mapping, params = list()) {
+    panel_params
+  },
+
   transform = function(self, data, panel_params) {
     data <- rename_data(self, data)
 

From 9ab5ffb1bea9e7af0af4d5831b93086aa10630ea Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Sat, 13 Aug 2022 20:34:45 +0200
Subject: [PATCH 020/111] Consider guide titles earlier

---
 R/coord-.r           | 26 +----------------------
 R/coord-cartesian-.r | 15 +-------------
 R/layout.R           | 49 ++++++++++++++++++++++++--------------------
 3 files changed, 29 insertions(+), 61 deletions(-)

diff --git a/R/coord-.r b/R/coord-.r
index 977b7825c5..10031a40c7 100644
--- a/R/coord-.r
+++ b/R/coord-.r
@@ -60,31 +60,7 @@ Coord <- ggproto("Coord",
   aspect = function(ranges) NULL,
 
   labels = function(self, labels, panel_params) {
-    # If panel params contains guides information, use it.
-    # Otherwise use the labels as is, for backward-compatibility
-    if (is.null(panel_params$guide)) {
-      return(labels)
-    }
-
-    positions_x <- c("top", "bottom")
-    positions_y <- c("left", "right")
-
-    list(
-      x = lapply(c(1, 2), function(i) {
-        panel_guide_label(
-          panel_params$guides,
-          position = positions_x[[i]],
-          default_label = labels$x[[i]]
-        )
-      }),
-      y = lapply(c(1, 2), function(i) {
-        panel_guide_label(
-          panel_params$guides,
-          position = positions_y[[i]],
-          default_label = labels$y[[i]]
-        )
-      })
-    )
+    labels
   },
 
   render_fg = function(panel_params, theme) element_render(theme, "panel.border"),
diff --git a/R/coord-cartesian-.r b/R/coord-cartesian-.r
index bbec5d2354..0320088a14 100644
--- a/R/coord-cartesian-.r
+++ b/R/coord-cartesian-.r
@@ -144,12 +144,6 @@ view_scales_from_scale <- function(scale, coord_limits = NULL, expand = TRUE) {
   view_scales
 }
 
-panel_guide_label <- function(guides, position, default_label) {
-  guide <- guide_for_position(guides, position) %||%
-    list(params = list(title = waiver()))
-  guide$params$title %|W|% default_label
-}
-
 panel_guides_grob <- function(guides, position, theme) {
   guide <- guide_for_position(guides, position) %||% list(guide = guide_none())
   guide$guide$draw(theme, guide$params)
@@ -160,8 +154,7 @@ guide_for_position <- function(guides, position) {
   has_position <- vapply(
     params, function(p) identical(p$position, position), logical(1)
   )
-
-  if (sum(has_position) == 0) {
+  if (!any(has_position)) {
     return(NULL)
   }
 
@@ -184,10 +177,4 @@ guide_for_position <- function(guides, position) {
     },
     pairs[order]
   )
-
-  # guides <- guides[has_position]
-  # guides_order <- vapply(guides, function(guide) {
-  #   as.numeric(guide$params$order)
-  # }, numeric(1))
-  # Reduce(function(old, new) {old$merge(new)}, guides[order(guides_order)])
 }
diff --git a/R/layout.R b/R/layout.R
index 3808e9f5ce..f2b6101c19 100644
--- a/R/layout.R
+++ b/R/layout.R
@@ -106,8 +106,8 @@ Layout <- ggproto("Layout", NULL,
     # Draw individual labels, then add to gtable
     labels <- self$coord$labels(
       list(
-        x = self$xlabel(labels),
-        y = self$ylabel(labels)
+        x = self$resolve_label(self$panel_scales_x[[1]], labels),
+        y = self$resolve_label(self$panel_scales_y[[1]], labels)
       ),
       self$panel_params[[1]]
     )
@@ -231,30 +231,35 @@ Layout <- ggproto("Layout", NULL,
     invisible()
   },
 
-  xlabel = function(self, labels) {
-    primary <- self$panel_scales_x[[1]]$name %|W|% labels$x
-    primary <- self$panel_scales_x[[1]]$make_title(primary)
-    secondary <- if (is.null(self$panel_scales_x[[1]]$secondary.axis)) {
+  resolve_label = function(self, scale, labels) {
+    # General order is: guide title > scale name > labels
+    aes       <- scale$aesthetics[[1]]
+    primary   <- scale$name %|W|% labels[[aes]]
+    secondary <- if (is.null(scale$secondary.axis)) {
       waiver()
     } else {
-      self$panel_scales_x[[1]]$sec_name()
-    } %|W|% labels$sec.x
+      scale$sec_name()
+    } %|W|% labels[[paste0("sec.", aes)]]
     if (is.derived(secondary)) secondary <- primary
-    secondary <- self$panel_scales_x[[1]]$make_sec_title(secondary)
-    list(primary = primary, secondary = secondary)[self$panel_scales_x[[1]]$axis_order()]
-  },
+    order <- scale$axis_order()
 
-  ylabel = function(self, labels) {
-    primary <- self$panel_scales_y[[1]]$name %|W|% labels$y
-    primary <- self$panel_scales_y[[1]]$make_title(primary)
-    secondary <- if (is.null(self$panel_scales_y[[1]]$secondary.axis)) {
-      waiver()
-    } else {
-      self$panel_scales_y[[1]]$sec_name()
-    } %|W|% labels$sec.y
-    if (is.derived(secondary)) secondary <- primary
-    secondary <- self$panel_scales_y[[1]]$make_sec_title(secondary)
-    list(primary = primary, secondary = secondary)[self$panel_scales_y[[1]]$axis_order()]
+    if (!is.null(self$panel_params[[1]]$guides)) {
+      if ((scale$position) %in% c("left", "right")) {
+        guides <- c("y", "y.sec")
+      } else {
+        guides <- c("x", "x.sec")
+      }
+      params    <- self$panel_params[[1]]$guides$get_params(guides)
+      primary   <- params[[1]]$title %|W|% primary
+      secondary <- params[[2]]$title %|W|% secondary
+      position  <- params[[1]]$position %||% scale$position
+      if (position != scale$position) {
+        order <- rev(order)
+      }
+    }
+    primary   <- scale$make_title(primary)
+    secondary <- scale$make_sec_title(secondary)
+    list(primary = primary, secondary = secondary)[order]
   },
 
   render_labels = function(self, labels, theme) {

From bbb4f0077c9c611102be065d5467cb73dfbc0887 Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Sat, 13 Aug 2022 20:35:31 +0200
Subject: [PATCH 021/111] expand tests on label hierarchy

---
 tests/testthat/test-labels.r | 133 +++++++++++++++++++++++++++++++++++
 tests/testthat/test-scales.r |  11 ---
 2 files changed, 133 insertions(+), 11 deletions(-)

diff --git a/tests/testthat/test-labels.r b/tests/testthat/test-labels.r
index 0e866fa2a4..84ed4e2cfa 100644
--- a/tests/testthat/test-labels.r
+++ b/tests/testthat/test-labels.r
@@ -69,6 +69,139 @@ test_that("alt text is returned", {
   expect_equal(get_alt_text(p), "An alt text")
 })
 
+test_that("position axis label hierarchy works as intended", {
+  df <- data_frame(foo = c(1e1, 1e5), bar = c(0, 100))
+
+  p <- ggplot(df, aes(foo, bar)) +
+    geom_point(size = 5)
+
+  p <- ggplot_build(p)
+
+  # In absence of explicit title, get title from mapping
+  expect_identical(
+    p$layout$resolve_label(p$layout$panel_scales_x[[1]], p$plot$labels),
+    list(secondary = NULL, primary = "foo")
+  )
+  expect_identical(
+    p$layout$resolve_label(p$layout$panel_scales_y[[1]], p$plot$labels),
+    list(primary = "bar", secondary = NULL)
+  )
+
+  # Scale name overrules mapping label
+  expect_identical(
+    p$layout$resolve_label(scale_x_continuous("Baz"), p$plot$labels),
+    list(secondary = NULL, primary = "Baz")
+  )
+  expect_identical(
+    p$layout$resolve_label(scale_y_continuous("Qux"), p$plot$labels),
+    list(primary = "Qux", secondary = NULL)
+  )
+
+  # Guide titles overrule scale names
+  p$layout$setup_panel_guides(
+    guides_list(list(x = guide_axis("quuX"), y = guide_axis("corgE"))),
+    p$plot$layers, p$plot$mapping
+  )
+  expect_identical(
+    p$layout$resolve_label(scale_x_continuous("Baz"), p$plot$labels),
+    list(secondary = NULL, primary = "quuX")
+  )
+  expect_identical(
+    p$layout$resolve_label(scale_y_continuous("Qux"), p$plot$labels),
+    list(primary = "corgE", secondary = NULL)
+  )
+
+  # Secondary axis names work
+  xsec <- scale_x_continuous("Baz", sec.axis = dup_axis(name = "grault"))
+  expect_identical(
+    p$layout$resolve_label(xsec, p$plot$labels),
+    list(secondary = "grault", primary = "quuX")
+  )
+  ysec <- scale_y_continuous("Qux", sec.axis = dup_axis(name = "garply"))
+  expect_identical(
+    p$layout$resolve_label(ysec, p$plot$labels),
+    list(primary = "corgE", secondary = "garply")
+  )
+
+  # Secondary guide titles override secondary axis names
+  p$layout$setup_panel_guides(
+    guides_list(list(x = guide_axis("quuX"), y = guide_axis("corgE"),
+                     x.sec = guide_axis("waldo"), y.sec = guide_axis("fred"))),
+    p$plot$layers, p$plot$mapping
+  )
+  expect_identical(
+    p$layout$resolve_label(xsec, p$plot$labels),
+    list(secondary = "waldo", primary = "quuX")
+  )
+  ysec <- scale_y_continuous("Qux", sec.axis = dup_axis(name = "garply"))
+  expect_identical(
+    p$layout$resolve_label(ysec, p$plot$labels),
+    list(primary = "corgE", secondary = "fred")
+  )
+})
+
+test_that("moving guide positions lets titles follow", {
+  df <- data_frame(foo = c(1e1, 1e5), bar = c(0, 100))
+
+  p <- ggplot(df, aes(foo, bar)) +
+    geom_point(size = 5)
+
+  p <- ggplot_build(p)
+
+  # Default guide positions
+  p$layout$setup_panel_guides(
+    guides_list(
+      list(x = guide_axis("baz", position = "bottom"),
+           y = guide_axis("qux", position = "left"))
+    ),
+    p$plot$layers, p$plot$mapping
+  )
+  expect_identical(
+    p$layout$resolve_label(p$layout$panel_scales_x[[1]], p$plot$labels),
+    list(secondary = NULL, primary = "baz")
+  )
+  expect_identical(
+    p$layout$resolve_label(p$layout$panel_scales_y[[1]], p$plot$labels),
+    list(primary = "qux", secondary = NULL)
+  )
+
+  # Guides at secondary positions (changes order of primary/secondary)
+  p$layout$setup_panel_guides(
+    guides_list(
+      list(x = guide_axis("baz", position = "top"),
+           y = guide_axis("qux", position = "right"))
+    ),
+    p$plot$layers, p$plot$mapping
+  )
+  expect_identical(
+    p$layout$resolve_label(p$layout$panel_scales_x[[1]], p$plot$labels),
+    list(primary = "baz", secondary = NULL)
+  )
+  expect_identical(
+    p$layout$resolve_label(p$layout$panel_scales_y[[1]], p$plot$labels),
+    list(secondary = NULL, primary = "qux")
+  )
+
+  # Primary guides at secondary positions with
+  # secondary guides at primary positions
+  p$layout$setup_panel_guides(
+    guides_list(
+      list(x = guide_axis("baz", position = "top"),
+           y = guide_axis("qux", position = "right"),
+           x.sec = guide_axis("quux"),
+           y.sec = guide_axis("corge"))
+    ),
+    p$plot$layers, p$plot$mapping
+  )
+  expect_identical(
+    p$layout$resolve_label(p$layout$panel_scales_x[[1]], p$plot$labels),
+    list(primary = "baz", secondary = "quux")
+  )
+  expect_identical(
+    p$layout$resolve_label(p$layout$panel_scales_y[[1]], p$plot$labels),
+    list(secondary = "corge", primary = "qux")
+  )
+})
 
 # Visual tests ------------------------------------------------------------
 
diff --git a/tests/testthat/test-scales.r b/tests/testthat/test-scales.r
index ecf9da336a..2bb523b1aa 100644
--- a/tests/testthat/test-scales.r
+++ b/tests/testthat/test-scales.r
@@ -200,17 +200,6 @@ test_that("scales warn when transforms introduces non-finite values", {
   expect_warning(ggplot_build(p), "Transformation introduced infinite values")
 })
 
-test_that("scales get their correct titles through layout", {
-  df <- data_frame(x = c(1e1, 1e5), y = c(0, 100))
-
-  p <- ggplot(df, aes(x, y)) +
-    geom_point(size = 5)
-
-  p <- ggplot_build(p)
-  expect_identical(p$layout$xlabel(p$plot$labels)$primary, "x")
-  expect_identical(p$layout$ylabel(p$plot$labels)$primary, "y")
-})
-
 test_that("size and alpha scales throw appropriate warnings for factors", {
   df <- data_frame(
     x = 1:3,

From d0fbdc26ab2ee40a7ced9a2fc7af0c0dc44273e8 Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Sat, 13 Aug 2022 20:36:14 +0200
Subject: [PATCH 022/111] roxygenate

---
 man/new_guide.Rd | 1 +
 1 file changed, 1 insertion(+)

diff --git a/man/new_guide.Rd b/man/new_guide.Rd
index a470e0f91d..9883251030 100644
--- a/man/new_guide.Rd
+++ b/man/new_guide.Rd
@@ -23,3 +23,4 @@ A \code{Guide} ggproto object.
 A constructor function for guides, which performs some standard compatability
 checks between the guide and provided arguments.
 }
+\keyword{internal}

From bfa93a47abd7873006adad29b1f910ce67c9980d Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Sat, 3 Sep 2022 14:34:46 +0200
Subject: [PATCH 023/111] Fix #4958

---
 R/guide-.r | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/R/guide-.r b/R/guide-.r
index 32326a9bde..0647f0e9d7 100644
--- a/R/guide-.r
+++ b/R/guide-.r
@@ -15,7 +15,8 @@
 #' @export
 new_guide <- function(..., available_aes = "any", super) {
 
-  super <- check_subclass(super, "Guide", env = parent.frame())
+  pf <- parent.frame()
+  super <- check_subclass(super, "Guide", env = pf)
 
   args <- list2(...)
 
@@ -49,6 +50,10 @@ new_guide <- function(..., available_aes = "any", super) {
     ))
   }
 
+  # Ensure 'order' is length 1 integer
+  params$order <- vec_cast(params$order, 0L, x_arg = "order", call = pf)
+  vec_assert(params$order, 0L, size = 1L, arg = "order", call = pf)
+
   ggproto(
     NULL, super,
     params   = params,

From c652cd33fe74d8a4769c91122f0e26c7391e918a Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Sun, 4 Sep 2022 09:55:47 +0200
Subject: [PATCH 024/111] Default guide$transform() throws error

---
 R/guide-.r      | 7 +++++--
 R/guides-axis.r | 1 +
 R/guides-none.r | 4 ++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/R/guide-.r b/R/guide-.r
index 0647f0e9d7..d31ccd0e5d 100644
--- a/R/guide-.r
+++ b/R/guide-.r
@@ -167,8 +167,11 @@ Guide <- ggproto(
 
   # Function for applying coord-transformation.
   # Mostly applied to position guides, such as `guide_axis()`.
-  transform = function(params, coord, ...) {
-    return(params)
+  transform = function(self, params, coord, ...) {
+    cli::cli_abort(c(
+      "{.fn {snake_class(self)}} does not implement a {.fn transform} method.",
+      "i" = "Did you mean to use {.fn guide_axis}?"
+    ))
   },
 
   # Function for extracting information from the layers.
diff --git a/R/guides-axis.r b/R/guides-axis.r
index e9fafbab1a..d5e964773e 100644
--- a/R/guides-axis.r
+++ b/R/guides-axis.r
@@ -79,6 +79,7 @@ GuideAxis <- ggproto(
   hashables = quos(title, key$.value, key$.label, name),
 
   transform = function(params, coord, panel_params) {
+  transform = function(self, params, coord, panel_params) {
     key <- params$key
     position <- params$position
 
diff --git a/R/guides-none.r b/R/guides-none.r
index 1d0a2760ab..a76b954a2c 100644
--- a/R/guides-none.r
+++ b/R/guides-none.r
@@ -28,6 +28,10 @@ GuideNone <- ggproto(
     params
   },
 
+  transform = function(self, params, coord, ...) {
+    params
+  },
+
   # Draw nothing
   draw = function(self, params, theme) {
     zeroGrob()

From 855cca3abda3ef2896a7a14d025c60b812d4ffd1 Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Sun, 4 Sep 2022 10:00:28 +0200
Subject: [PATCH 025/111] guide$train() gets ellipses to pass to
 guide$extract_params()

---
 R/guide-.r      | 6 +++---
 R/guides-none.r | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/R/guide-.r b/R/guide-.r
index d31ccd0e5d..188a7b75a0 100644
--- a/R/guide-.r
+++ b/R/guide-.r
@@ -110,19 +110,19 @@ Guide <- ggproto(
   # 2. (Optionally) extract further decoration from the scale (e.g. the
   #    colour bar).
   # 3. Extract further parameters
-  train = function(self, params = self$params, scale, aesthetic = NULL) {
+  train = function(self, params = self$params, scale, aesthetic = NULL, ...) {
     params$aesthetic <- aesthetic %||% scale$aesthetics[1]
     params$key   <- inject(self$extract_key(scale, !!!params))
     if (is.null(params$key)) {
       return(params$key)
     }
     params$decor <- inject(self$extract_decor(scale, !!!params))
-    inject(self$extract_params(scale, params, self$hashables))
+    self$extract_params(scale, params, self$hashables, ...)
   },
 
   # Setup parameters that are only available after training
   # TODO: Maybe we only need the hash on demand during merging?
-  extract_params = function(scale, params, hashables) {
+  extract_params = function(scale, params, hashables, ...) {
     # Make name
     params$name <- paste0(params$name, "_", params$aesthetic)
 
diff --git a/R/guides-none.r b/R/guides-none.r
index a76b954a2c..5a46430496 100644
--- a/R/guides-none.r
+++ b/R/guides-none.r
@@ -24,7 +24,7 @@ GuideNone <- ggproto(
   "GuideNone", Guide,
 
   # Perform no training
-  train = function(self, params = self$params, scale, aesthetic = NULL) {
+  train = function(self, params = self$params, scale, aesthetic = NULL, ...) {
     params
   },
 

From aaba2989518b71ae49a71693f88732c65af66c23 Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Sun, 4 Sep 2022 10:02:31 +0200
Subject: [PATCH 026/111] Decoration 'name' is an axis thing

---
 R/guide-.r      | 3 ---
 R/guides-axis.r | 5 +++++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/R/guide-.r b/R/guide-.r
index 188a7b75a0..62bea9cbe0 100644
--- a/R/guide-.r
+++ b/R/guide-.r
@@ -123,9 +123,6 @@ Guide <- ggproto(
   # Setup parameters that are only available after training
   # TODO: Maybe we only need the hash on demand during merging?
   extract_params = function(scale, params, hashables, ...) {
-    # Make name
-    params$name <- paste0(params$name, "_", params$aesthetic)
-
     # Make hash
     mask <- new_data_mask(as_environment(params))
     params$hash <- hash(lapply(hashables, eval_tidy, data = mask))
diff --git a/R/guides-axis.r b/R/guides-axis.r
index d5e964773e..6e34801412 100644
--- a/R/guides-axis.r
+++ b/R/guides-axis.r
@@ -79,6 +79,11 @@ GuideAxis <- ggproto(
   hashables = quos(title, key$.value, key$.label, name),
 
   transform = function(params, coord, panel_params) {
+  extract_params = function(scale, params, hashables, ...) {
+    params$name <- paste0(params$name, "_", params$aesthetic)
+    Guide$extract_params(scale, params, hashables)
+  },
+
   transform = function(self, params, coord, panel_params) {
     key <- params$key
     position <- params$position

From 7e6752c3a04a21bdfdf8805908bd1b039c268ce0 Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Sun, 4 Sep 2022 10:08:08 +0200
Subject: [PATCH 027/111] guide$assemble_drawing() knows about elements

---
 R/guide-.r      | 18 +++++++-----------
 R/guides-axis.r |  2 +-
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/R/guide-.r b/R/guide-.r
index 62bea9cbe0..0bf2d91651 100644
--- a/R/guide-.r
+++ b/R/guide-.r
@@ -219,26 +219,22 @@ Guide <- ggproto(
     }
 
     # Build grobs
-    grob_title  <- self$build_title(params$title, elems, params)
-    grob_labels <- self$build_labels(key, elems, params)
-    grob_ticks  <- self$build_ticks(key, elems, params)
-    grob_decor  <- self$build_decor(params$decor, grob_ticks, elems, params)
     grobs <- list(
-      title = grob_title,
-      label = grob_labels,
-      ticks = grob_ticks,
-      decor = grob_decor
+      title  = self$build_title(params$title, elems, params),
+      labels = self$build_labels(key, elems, params),
+      ticks  = self$build_ticks(key, elems, params),
+      decor  = self$build_decor(params$decor, grob_ticks, elems, params)
     )
 
     # Arrange and assemble grobs
     sizes  <- self$measure_grobs(grobs, params, elems)
     layout <- self$arrange_layout(key, sizes, params)
-    self$assemble_drawing(grobs, layout, sizes, params)
+    self$assemble_drawing(grobs, layout, sizes, params, elems)
   },
 
   # Makes measurements of grobs that can be used in the layout or assembly
   # stages of guide drawing.
-  measure_grobs = function(grobs, params) {
+  measure_grobs = function(grobs, params, elements) {
     return(invisible())
   },
 
@@ -248,7 +244,7 @@ Guide <- ggproto(
   },
 
   # Combines grobs into a single gtable.
-  assemble_drawing = function(grobs, layout, sizes, params) {
+  assemble_drawing = function(grobs, layout, sizes, params, elements) {
     zeroGrob()
   },
 
diff --git a/R/guides-axis.r b/R/guides-axis.r
index 6e34801412..1c6ed65c24 100644
--- a/R/guides-axis.r
+++ b/R/guides-axis.r
@@ -286,7 +286,7 @@ GuideAxis <- ggproto(
     setNames(layout, nms)
   },
 
-  assemble_drawing = function(grobs, layout, sizes, params) {
+  assemble_drawing = function(grobs, layout, sizes, params, elements) {
 
     axis_line <- grobs$decor
 

From 43b24a197df8e3df7887c9d3c86e78f1beb29103 Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Sun, 4 Sep 2022 10:08:57 +0200
Subject: [PATCH 028/111] re-doc `guide_axis()`'s order argument

---
 R/guides-axis.r | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/R/guides-axis.r b/R/guides-axis.r
index 1c6ed65c24..d60fd73fea 100644
--- a/R/guides-axis.r
+++ b/R/guides-axis.r
@@ -14,8 +14,10 @@
 #' @param n.dodge The number of rows (for vertical axes) or columns (for
 #'   horizontal axes) that should be used to render the labels. This is
 #'   useful for displaying labels that would otherwise overlap.
-#' @param order Used to determine the order of the guides (left-to-right,
-#'   top-to-bottom), if more than one  guide must be drawn at the same location.
+#' @param order A positive `integer` of length 1 that specifies the order of
+#'   this guide among multiple guides. This controls in which order guides are
+#'   merged if there are multiple guides for the same position. If 0 (default),
+#'   the order is determined by a secret algorithm.
 #' @param position Where this guide should be drawn: one of top, bottom,
 #'   left, or right.
 #'
@@ -78,7 +80,13 @@ GuideAxis <- ggproto(
 
   hashables = quos(title, key$.value, key$.label, name),
 
-  transform = function(params, coord, panel_params) {
+  elements = list(
+    line  = "axis.line.{aes}.{position}",
+    text  = "axis.text.{aes}.{position}",
+    ticks = "axis.ticks.{aes}.{position}",
+    ticks_length = "axis.ticks.length.{aes}.{position}"
+  ),
+
   extract_params = function(scale, params, hashables, ...) {
     params$name <- paste0(params$name, "_", params$aesthetic)
     Guide$extract_params(scale, params, hashables)
@@ -139,13 +147,6 @@ GuideAxis <- ggproto(
     return(list(guide = self, params = params))
   },
 
-  elements = list(
-    line  = "axis.line.{aes}.{position}",
-    text  = "axis.text.{aes}.{position}",
-    ticks = "axis.ticks.{aes}.{position}",
-    ticks_length = "axis.ticks.length.{aes}.{position}"
-  ),
-
   override_elements = function(params, elements, theme) {
     label <- elements$text
     if (!inherits(label, "element_text")) {

From b933ff4ca52fef0a0ecac74fcc3d48966ba91c82 Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Sun, 4 Sep 2022 10:25:23 +0200
Subject: [PATCH 029/111] Use .trbl helper vector

---
 R/guide-.r      |  3 +++
 R/guides-axis.r | 11 +++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/R/guide-.r b/R/guide-.r
index 0bf2d91651..cae14c9199 100644
--- a/R/guide-.r
+++ b/R/guide-.r
@@ -335,3 +335,6 @@ flip_names = c(
   "margin_y" = "margin_x"
 )
 
+# Shortcut for position argument matching
+.trbl <- c("top", "right", "bottom", "left")
+
diff --git a/R/guides-axis.r b/R/guides-axis.r
index d60fd73fea..407a5a5ab7 100644
--- a/R/guides-axis.r
+++ b/R/guides-axis.r
@@ -167,9 +167,12 @@ GuideAxis <- ggproto(
   },
 
   setup_params = function(params) {
-    all_pos   <- c("left", "top", "bottom", "right")
-    position  <- arg_match0(params$position, all_pos)
-    direction <- if (position %in% c("left", "right")) "vertical" else "horizontal"
+    position  <- arg_match0(params$position, .trbl)
+    direction <- if (position %in% c("left", "right")) {
+      "vertical"
+    } else {
+      "horizontal"
+    }
 
     # TODO: delete following comment at some point:
     # I found the 'position_*'/'non-position_*' and '*_dim' names confusing.
@@ -195,7 +198,7 @@ GuideAxis <- ggproto(
     }
 
     new_params <- list(
-      opposite  = unname(setNames(all_pos, rev(all_pos))[position]),
+      opposite  = unname(setNames(.trbl, .trbl[c(3,4,1,2)])[position]),
       secondary = position %in% c("top", "right"),
       lab_first = position %in% c("top", "left"),
       orth_side = if (position %in% c("top", "right")) 0 else 1,

From 71d7ee025fc0e8ae769fdc1185a90f19ad2f7c34 Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Sun, 4 Sep 2022 12:09:50 +0200
Subject: [PATCH 030/111] Fix few mistakes

---
 R/guide-.r | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/R/guide-.r b/R/guide-.r
index cae14c9199..79e6589312 100644
--- a/R/guide-.r
+++ b/R/guide-.r
@@ -136,7 +136,7 @@ Guide <- ggproto(
       return(NULL)
     }
 
-    mapped <- if (scale$is_discrete()) scale$map(breaks) else breaks
+    mapped <- scale$map(breaks)
     labels <- scale$get_labels(breaks)
 
     key <- data_frame(
@@ -144,7 +144,11 @@ Guide <- ggproto(
       .name_repair = ~ c(aesthetic, ".value", ".label")
     )
 
-    key[is.finite(key[[aesthetic]]), , drop = FALSE]
+    if (is.numeric(key$.value)) {
+      key[is.finite(key$.value), , drop = FALSE]
+    } else {
+      key
+    }
   },
 
   # Function for extracting decoration from the scale.
@@ -251,13 +255,13 @@ Guide <- ggproto(
   # Renders the guide title
   build_title = function(label, elements, params) {
     ggname(
+      "guide.title",
       element_grob(
         elements$title,
         label    = label,
         margin_x = TRUE,
         margin_y = TRUE
-      ),
-      "guide.title"
+      )
     )
   },
 

From 3bbaf26651d1716a1ae5b05587d87ddf9b9631d7 Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Sun, 4 Sep 2022 12:11:13 +0200
Subject: [PATCH 031/111] rename GuidesList class to Guides

---
 R/coord-.r  |  2 +-
 R/guides-.r | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/R/coord-.r b/R/coord-.r
index 10031a40c7..34393f6627 100644
--- a/R/coord-.r
+++ b/R/coord-.r
@@ -99,7 +99,7 @@ Coord <- ggproto("Coord",
     is_sec <- grepl("sec$", aesthetics)
 
     # TODO: This should ideally happen in the `guides()` function or earlier.
-    if (!inherits(guides, "GuidesList")) {
+    if (!inherits(guides, "Guides")) {
       guides <- guides_list(guides)
     }
 
diff --git a/R/guides-.r b/R/guides-.r
index 146c56907d..a76a6ba109 100644
--- a/R/guides-.r
+++ b/R/guides-.r
@@ -450,11 +450,11 @@ include_layer_in_guide <- function(layer, matched) {
 # TODO: incorporate in non-position branch of guides
 # TODO: fill in other `guides_*` methods when non-position guides are done
 guides_list <- function(guides) {
-  ggproto(NULL, GuidesList, guides = guides)
+  ggproto(NULL, Guides, guides = guides)
 }
 
-GuidesList <- ggproto(
-  "GuidesList", NULL,
+Guides <- ggproto(
+  "Guides", NULL,
 
   # A list of guides to be updated by 'add' or populated upon construction.
   guides = list(),
@@ -489,10 +489,10 @@ GuidesList <- ggproto(
 
   # Function for adding new guides
   add = function(self, guides) {
-    if (is.null(guide)) {
+    if (is.null(guides)) {
       return()
     }
-    if (inherits(guides, "GuidesList")) {
+    if (inherits(guides, "Guides")) {
       guides <- guides$guides
     }
     self$guides <- defaults(guides, self$guides)

From 1c6d103d648ee00f1ceeece199379ecbb786f27c Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Sun, 4 Sep 2022 12:13:29 +0200
Subject: [PATCH 032/111] Move guide training to from guides_train() to
 Guides$train()

---
 R/guides-.r | 79 ++++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 66 insertions(+), 13 deletions(-)

diff --git a/R/guides-.r b/R/guides-.r
index a76a6ba109..1ae6753335 100644
--- a/R/guides-.r
+++ b/R/guides-.r
@@ -109,7 +109,7 @@ update_guides <- function(p, guides) {
 #      arrange all ggrobs
 
 build_guides <- function(scales, layers, default_mapping, position, theme, guides, labels) {
-  theme$legend.key.width <- theme$legend.key.width %||% theme$legend.key.size
+  theme$legend.key.width  <- theme$legend.key.width %||% theme$legend.key.size
   theme$legend.key.height <- theme$legend.key.height %||% theme$legend.key.size
 
   # Layout of legends depends on their overall location
@@ -128,15 +128,19 @@ build_guides <- function(scales, layers, default_mapping, position, theme, guide
     theme$legend.box.just <- theme$legend.box.just %||% c("center", "top")
   }
 
-  # scales -> data for guides
-  gdefs <- guides_train(
-    scales = scales$non_position_scales(),
-    theme = theme,
-    guides = guides,
-    labels = labels
-  )
+  if (!inherits(guides, "Guides")) {
+    guides <- guides_list(guides)
+  }
 
-  if (length(gdefs) == 0) return(zeroGrob())
+  no_guides <- zeroGrob()
+
+  scales <- scales$non_position_scales()$scales
+  if (length(scales) == 0) return(no_guides)
+
+  guides <- guides$setup(scales, keep_none = FALSE)
+
+  guides$train(scales, theme$legend.direction, labels)
+  if (length(guides$guides) == 0) return(no_guides)
 
   # merge overlay guides
   gdefs <- guides_merge(gdefs)
@@ -537,7 +541,7 @@ Guides <- ggproto(
 
     if (is.null(aesthetics)) {
       # Aesthetics from scale, as in non-position guides
-      aesthetics <- lapply(scales, `[[`, aesthetics)
+      aesthetics <- lapply(scales, `[[`, "aesthetics")
       scale_idx  <- rep(seq_along(scales), lengths(aesthetics))
       aesthetics <- unlist(aesthetics, FALSE, FALSE)
     } else {
@@ -547,9 +551,13 @@ Guides <- ggproto(
 
     guides <- self$guides
 
+    # For every aesthetic-scale combination, find and validate guide
     new_guides <- lapply(seq_along(scale_idx), function(i) {
       idx <- scale_idx[i]
 
+      # Find guide for aesthetic-scale combination
+      # Hierarchy is in the order:
+      # plot + guides(XXX) + scale_ZZZ(guide = XXX) > default(i.e., legend)
       guide <- resolve_guide(
         aesthetic = aesthetics[i],
         scale     = scales[[idx]],
@@ -567,12 +575,16 @@ Guides <- ggproto(
         guide <- "none"
       }
 
+      # Instantiate all guides, e.g. go from "legend" character to
+      # GuideLegend class object
       guide <- validate_guide(guide)
 
       if (inherits(guide, "GuideNone")) {
         return(guide)
       }
 
+      # Check compatibility of scale and guide, e.g. you cannot use GuideAxis
+      # to display the "colour" aesthetic.
       scale_aes <- scales[[idx]]$aesthetics
       if (!any(c("x", "y") %in% scale_aes)) scale_aes <- c(scale_aes, "any")
       if (!any(scale_aes %in% guide$available_aes)) {
@@ -597,14 +609,55 @@ Guides <- ggproto(
       aesthetics <- aesthetics[!is_none]
     }
 
-    params <- lapply(new_guides, `[[`, "params")
-
+    # Create updated child
     ggproto(
       NULL, self,
       guides      = new_guides,
       scale_index = scale_idx,
       aesthetics  = aesthetics,
-      params      = params
+      params      = lapply(new_guides, `[[`, "params")
+    )
+  },
+
+  # Function for dropping GuideNone objects from the Guides object
+  drop_none = function(self) {
+    is_none <- vapply(self$guides, inherits, logical(1), what = "GuideNone")
+    self$guides      <- self$guides[!is_none]
+    self$scale_index <- self$scale_index[!is_none]
+    self$aesthetics  <- self$aesthetics[!is_none]
+    self$params      <- self$params[!is_none]
+    return()
+  },
+
+  # Loop over every guide-scale combination to perform training
+  train = function(self, scales, direction, labels) {
+
+    params <- Map(
+      function(guide, param, scale, aes) {
+        # TODO: delete old branch when all guides are ported to ggproto
+        if (inherits(guide, "guide")) {
+          guide$title <- scale$make_title(
+            guide$title %|W|% scale$name %|W|% labels[[aes]]
+          )
+          guide$direction <- guide$direction %||% direction
+          guide_train(guide, scale, aes)
+        } else {
+          guide$train(
+            param, scale, aes,
+            title = labels[[aes]],
+            direction = direction
+          )
+        }
+      },
+      guide = self$guides,
+      param = self$params,
+      aes   = self$aesthetics,
+      scale = scales[self$scale_index]
+    )
+    self$update_params(params)
+    self$drop_none()
+  },
+
     )
   }
 )

From cabc4625e30721cc86bd04bd8a4e8add093b684c Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Sun, 4 Sep 2022 12:14:31 +0200
Subject: [PATCH 033/111] Move guide merging from guides_merge() to
 Guides$merge()

---
 R/guides-.r | 41 ++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 40 insertions(+), 1 deletion(-)

diff --git a/R/guides-.r b/R/guides-.r
index 1ae6753335..cdd7c159d3 100644
--- a/R/guides-.r
+++ b/R/guides-.r
@@ -143,7 +143,7 @@ build_guides <- function(scales, layers, default_mapping, position, theme, guide
   if (length(guides$guides) == 0) return(no_guides)
 
   # merge overlay guides
-  gdefs <- guides_merge(gdefs)
+  guides$merge()
 
   # process layer information
   gdefs <- guides_geom(gdefs, layers, default_mapping)
@@ -658,6 +658,45 @@ Guides <- ggproto(
     self$drop_none()
   },
 
+  # Function to merge guides that encode the same information
+  merge = function(self) {
+    # Bundle together guides and their parameters
+    pairs <- Map(list, guide = self$guides, params = self$params)
+
+    # If there is only one guide, we can exit early, because nothing to merge
+    if (length(pairs) == 1) {
+      return()
+    }
+
+    # The `{order}_{hash}` combination determines groups of guides
+    orders <- vapply(self$params, `[[`, 0, "order")
+    orders[orders == 0] <- 99
+    orders <- sprintf("%02d", orders)
+    hashes <- vapply(self$params, `[[`, "", "hash")
+    hashes <- paste(orders, hashes, sep = "_")
+
+    # Split by hashes
+    indices <- split(seq_along(pairs), hashes)
+    indices <- vapply(indices, `[[`, 0L, 1L, USE.NAMES = FALSE) # First index
+    groups  <- unname(split(pairs, hashes))
+    lens    <- lengths(groups)
+
+    # Merge groups with >1 member
+    groups[lens > 1] <- lapply(groups[lens > 1], function(group) {
+      Reduce(function(old, new) {
+        old$guide$merge(old$params, new$guide, new$params)
+      }, group)
+    })
+    groups[lens == 1] <- unlist(groups[lens == 1], FALSE)
+
+    # Update the Guides object
+    self$guides <- lapply(groups, `[[`, "guide")
+    self$params <- lapply(groups, `[[`, "params")
+    self$aesthetics  <- self$aesthetics[indices]
+    self$scale_index <- self$scale_index[indices]
+    return()
+  },
+
     )
   }
 )

From b9d2a620a4914288c0c9cef97fd188e5302e4f5b Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Sun, 4 Sep 2022 12:15:31 +0200
Subject: [PATCH 034/111] Move guides_geom() to Guides$process_layers()

---
 R/guides-.r | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/R/guides-.r b/R/guides-.r
index cdd7c159d3..99907e4d00 100644
--- a/R/guides-.r
+++ b/R/guides-.r
@@ -146,8 +146,8 @@ build_guides <- function(scales, layers, default_mapping, position, theme, guide
   guides$merge()
 
   # process layer information
-  gdefs <- guides_geom(gdefs, layers, default_mapping)
-  if (length(gdefs) == 0) return(zeroGrob())
+  guides$process_layers(layers, default_mapping)
+  if (length(guides$guides) == 0) return(no_guides)
 
   # generate grob of each guides
   ggrobs <- guides_gengrob(gdefs, theme)
@@ -697,6 +697,26 @@ Guides <- ggproto(
     return()
   },
 
+  # Loop over guides to let them extract information from layers
+  process_layers = function(self, layers, default_mapping) {
+    params <- Map(
+      function(guide, param) {
+        if (inherits(param, "guide")) {
+          guide_geom(param, layers, default_mapping)
+        } else {
+          guide$geom(param, layers, default_mapping)
+        }
+      },
+      guide = self$guides,
+      param = self$params
+    )
+    keep <- !vapply(params, is.null, logical(1))
+    self$guides <- self$guides[keep]
+    self$params <- params[keep]
+    self$aesthetics <- self$aesthetics[keep]
+    self$scale_index <- self$scale_index[keep]
+    return()
+  },
     )
   }
 )

From c72ffa6b691995ff4389804feec552e5af2b2a83 Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Sun, 4 Sep 2022 12:16:14 +0200
Subject: [PATCH 035/111] Move guides_gengrob() to Guides$draw()

---
 R/guides-.r | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/R/guides-.r b/R/guides-.r
index 99907e4d00..6c2c756213 100644
--- a/R/guides-.r
+++ b/R/guides-.r
@@ -149,8 +149,8 @@ build_guides <- function(scales, layers, default_mapping, position, theme, guide
   guides$process_layers(layers, default_mapping)
   if (length(guides$guides) == 0) return(no_guides)
 
-  # generate grob of each guides
-  ggrobs <- guides_gengrob(gdefs, theme)
+  # generate grob of each guide
+  guide_grobs <- guides$draw(theme)
 
   # build up guides
   grobs <- guides_build(ggrobs, theme)
@@ -717,6 +717,26 @@ Guides <- ggproto(
     self$scale_index <- self$scale_index[keep]
     return()
   },
+
+  # Loop over every guide, let them draw their grobs
+  draw = function(self, theme) {
+    Map(
+      function(guide, params) {
+        # TODO: Remove old branch when done
+        if (inherits(params, "guide")) {
+          params$title.position <- params$title.position %||% switch(
+            params$direction, vertical = "top", horizontal = "bottom"
+          )
+          guide_gengrob(params, theme)
+        } else {
+          guide$draw(theme, params)
+        }
+      },
+      guide  = self$guides,
+      params = self$params
+    )
+  },
+
     )
   }
 )

From ee5a5a4756f02ee2f1878808d114765ae315334b Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Sun, 4 Sep 2022 12:16:53 +0200
Subject: [PATCH 036/111] Move guides_build() to Guides$assemble()

---
 R/guides-.r | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 72 insertions(+), 3 deletions(-)

diff --git a/R/guides-.r b/R/guides-.r
index 6c2c756213..689aab8d7d 100644
--- a/R/guides-.r
+++ b/R/guides-.r
@@ -153,9 +153,7 @@ build_guides <- function(scales, layers, default_mapping, position, theme, guide
   guide_grobs <- guides$draw(theme)
 
   # build up guides
-  grobs <- guides_build(ggrobs, theme)
-
-  grobs
+  guides$assemble(guide_grobs, theme)
 }
 
 # Simplify legend position to one of horizontal/vertical/inside
@@ -737,6 +735,77 @@ Guides <- ggproto(
     )
   },
 
+  assemble = function(grobs, theme) {
+    # Set spacing
+    theme$legend.spacing   <- theme$legend.spacing    %||% unit(0.5, "lines")
+    theme$legend.spacing.y <- theme$legend.spacing.y  %||% theme$legend.spacing
+    theme$legend.spacing.x <- theme$legend.spacing.x  %||% theme$legend.spacing
+
+    # Measure guides
+    widths  <- lapply(grobs, function(g) sum(g$widths))
+    widths  <- inject(unit.c(!!!widths))
+    heights <- lapply(grobs, function(g) sum(g$heights))
+    heights <- inject(unit.c(!!!heights))
+
+    # Set the justification of each legend within the legend box
+    # First value is xjust, second value is yjust
+    just <- valid.just(theme$legend.box.just)
+    xjust <- just[1]
+    yjust <- just[2]
+
+    # setting that is different for vertical and horizontal guide-boxes.
+    if (identical(theme$legend.box, "horizontal")) {
+      # Set justification for each legend
+      for (i in seq_along(grobs)) {
+        ggrobs[[i]] <- editGrob(
+          ggrobs[[i]],
+          vp = viewport(x = xjust, y = yjust, just = c(xjust, yjust),
+                        height = heightDetails(grobs[[i]]))
+        )
+      }
+
+      guides <- gtable_row(name = "guides",
+                           grobs = ggrobs,
+                           widths = widths, height = max(heights))
+
+      # add space between the guide-boxes
+      guides <- gtable_add_col_space(guides, theme$legend.spacing.x)
+
+    } else { # theme$legend.box == "vertical"
+      # Set justification for each legend
+      for (i in seq_along(grobs)) {
+        ggrobs[[i]] <- editGrob(
+          ggrobs[[i]],
+          vp = viewport(x = xjust, y = yjust, just = c(xjust, yjust),
+                        width = widthDetails(grobs[[i]]))
+        )
+      }
+
+      guides <- gtable_col(name = "guides",
+                           grobs = ggrobs,
+                           width = max(widths), heights = heights)
+
+      # add space between the guide-boxes
+      guides <- gtable_add_row_space(guides, theme$legend.spacing.y)
+    }
+
+    # Add margins around the guide-boxes.
+    margin <- theme$legend.box.margin %||% margin()
+    guides <- gtable_add_cols(guides, margin[4], pos = 0)
+    guides <- gtable_add_cols(guides, margin[2], pos = ncol(guides))
+    guides <- gtable_add_rows(guides, margin[1], pos = 0)
+    guides <- gtable_add_rows(guides, margin[3], pos = nrow(guides))
+
+    # Add legend box background
+    background <- element_grob(theme$legend.box.background %||% element_blank())
+
+    guides <- gtable_add_grob(
+      guides, background,
+      t = 1, l = 1, b = -1, r = -1,
+      z = -Inf, clip = "off",
+      name = "legend.box.background"
     )
+    guides$name <- "guide-box"
+    guides
   }
 )

From f77a3c4af90167c77a8f3d0df3667774915ee352 Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Sun, 4 Sep 2022 12:31:21 +0200
Subject: [PATCH 037/111] Update test to use Guides

---
 tests/testthat/test-guides.R | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tests/testthat/test-guides.R b/tests/testthat/test-guides.R
index 16dbc81830..5c3b4e283a 100644
--- a/tests/testthat/test-guides.R
+++ b/tests/testthat/test-guides.R
@@ -144,8 +144,11 @@ test_that("guide merging for guide_legend() works as expected", {
     scales$add(scale1)
     scales$add(scale2)
 
-    guide_list <- guides_train(scales, theme = theme_gray(), labels = labs(), guides = guides())
-    guides_merge(guide_list)
+    guides <- guides_list(NULL)
+    guides <- guides$setup(scales$scales, keep_none = FALSE)
+    guides$train(scales$scales, "vertical", labs())
+    guides$merge()
+    guides$params
   }
 
   different_limits <- merge_test_guides(

From 1b63262ac71eb988d58a6556927a5b253b12c8c9 Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Sun, 4 Sep 2022 12:37:04 +0200
Subject: [PATCH 038/111] Clean up the guides_*() function family

---
 R/guides-.r | 207 ++++++----------------------------------------------
 1 file changed, 22 insertions(+), 185 deletions(-)

diff --git a/R/guides-.r b/R/guides-.r
index 689aab8d7d..e42678d3bf 100644
--- a/R/guides-.r
+++ b/R/guides-.r
@@ -64,6 +64,7 @@
 #'  )
 #' }
 guides <- function(...) {
+  # TODO: Somehow unify the `guides_list()` function with this one
   args <- list2(...)
   if (length(args) > 0) {
     if (is.list(args[[1]]) && !inherits(args[[1]], "guide")) args <- args[[1]]
@@ -90,26 +91,29 @@ update_guides <- function(p, guides) {
 #
 # the procedure is as follows:
 #
-# 1. guides_train()
+# 1. guides$setup()
+#      generates a guide object for every scale-aesthetic pair
+#
+# 2. guides$train()
 #      train each scale and generate guide definition for all guides
-#      here, one gdef for one scale
+#      here, one guide object for one scale
 #
-# 2. guides_merge()
-#      merge gdefs if they are overlayed
-#      number of gdefs may be less than number of scales
+# 2. guides$merge()
+#      merge guide objects if they are overlayed
+#      number of guide objects may be less than number of scales
 #
-# 3. guides_geom()
+# 3. guides$process_layers()
 #      process layer information and generate geom info.
 #
-# 4. guides_gengrob()
-#      generate ggrob from each gdef
-#      one ggrob for one gdef
+# 4. guides$draw()
+#      generate guide grob from each guide object
+#      one guide grob for one guide object
 #
-# 5. guides_build()
-#      arrange all ggrobs
+# 5. guides$assemble()
+#      arrange all guide grobs
 
 build_guides <- function(scales, layers, default_mapping, position, theme, guides, labels) {
-  theme$legend.key.width  <- theme$legend.key.width %||% theme$legend.key.size
+  theme$legend.key.width  <- theme$legend.key.width  %||% theme$legend.key.size
   theme$legend.key.height <- theme$legend.key.height %||% theme$legend.key.size
 
   # Layout of legends depends on their overall location
@@ -192,173 +196,6 @@ validate_guide <- function(guide) {
   }
 }
 
-# train each scale in scales and generate the definition of guide
-guides_train <- function(scales, theme, guides, labels) {
-
-  gdefs <- list()
-  for (scale in scales$scales) {
-    for (output in scale$aesthetics) {
-
-      # guides(XXX) is stored in guides[[XXX]],
-      # which is prior to scale_ZZZ(guide=XXX)
-      # guide is determined in order of:
-      #   + guides(XXX) > + scale_ZZZ(guide=XXX) > default(i.e., legend)
-      guide <- resolve_guide(output, scale, guides)
-
-      # TODO: Revisit after implementing guides in ggproto
-      if (identical(guide, "none") || inherits(guide, c("guide_none", "GuideNone"))) next
-
-      if (isFALSE(guide)) {
-        # lifecycle currently doesn't support function name placeholders.
-        # the below gives us the correct behaviour but is too brittle and hacky
-        # lifecycle::deprecate_warn("3.3.4", "`scale_*()`(guide = 'cannot be `FALSE`. Use \"none\" instead')")
-        # TODO: update to lifecycle after next lifecycle release
-        cli::cli_warn(c(
-           "{.code guide = FALSE} is deprecated",
-           "i" = 'Please use {.code guide = "none"} instead.'
-        ))
-        next
-      }
-
-      # check the validity of guide.
-      # if guide is character, then find the guide object
-      guide <- validate_guide(guide)
-
-      # check the consistency of the guide and scale.
-      if (inherits(guide, "guide")) {
-        if (!identical(guide$available_aes, "any") &&
-            !any(scale$aesthetics %in% guide$available_aes)) {
-          cli::cli_abort("Guide {.var {guide$name}} cannot be used for {.field {scale$aesthetics}}.")
-        }
-        guide$title <- scale$make_title(guide$title %|W|% scale$name %|W|% labels[[output]])
-
-        # direction of this grob
-        guide$direction <- guide$direction %||% theme$legend.direction
-
-        # each guide object trains scale within the object,
-        # so Guides (i.e., the container of guides) need not to know about them
-        guide <- guide_train(guide, scale, output)
-
-      } else if (inherits(guide, "Guide")) {
-        guide$set_title(scale$make_title(scale$name %|W|% labels[[output]]))
-
-        # direction of this grob
-        guide$set_direction(theme$legend.direction)
-
-        # each guide object trains scale within the object,
-        # so Guides (i.e., the container of guides) need not to know about them
-        guide <- guide$train(scale, output)
-      }
-      if (!is.null(guide)) gdefs[[length(gdefs) + 1]] <- guide
-    }
-  }
-  gdefs
-}
-
-# merge overlapped guides
-guides_merge <- function(gdefs) {
-  # split gdefs based on hash, and apply Reduce (guide_merge) to each gdef group.
-  gdefs <- lapply(gdefs, function(g) {
-    if (g$order == 0) {
-      order <- "99"
-    } else {
-      order <- sprintf("%02d", g$order)
-    }
-    g$hash <- paste(order, g$hash, sep = "_")
-    g
-  })
-  tapply(gdefs, sapply(gdefs, function(g)g$hash), function(gs)Reduce(guide_merge, gs))
-}
-
-# process layer information
-# TODO: `default_mapping` is unused internally but kept for backwards compitability until guide rewrite
-guides_geom <- function(gdefs, layers, default_mapping) {
-  compact(lapply(gdefs, guide_geom, layers, default_mapping))
-}
-
-# generate grob from each gdef (needs to write this function?)
-guides_gengrob <- function(gdefs, theme) {
-  # common drawing process for all guides
-  gdefs <- lapply(gdefs,
-    function(g) {
-      g$title.position <- g$title.position %||% switch(g$direction, vertical = "top", horizontal = "left")
-      if (!g$title.position %in% c("top", "bottom", "left", "right")) {
-        cli::cli_abort(c(
-          "Title position {.val {g$title.position}} is invalid",
-          "i" = "Use one of {.val top}, {.val bottom}, {.val left}, or {.val right}"
-        ))
-      }
-      g
-    })
-
-  lapply(gdefs, guide_gengrob, theme)
-}
-
-# build up all guide boxes into one guide-boxes.
-guides_build <- function(ggrobs, theme) {
-  theme$legend.spacing <- theme$legend.spacing %||% unit(0.5, "lines")
-  theme$legend.spacing.y <- theme$legend.spacing.y  %||% theme$legend.spacing
-  theme$legend.spacing.x <- theme$legend.spacing.x  %||% theme$legend.spacing
-
-  widths <- lapply(ggrobs, function(g) sum(g$widths))
-  widths <- inject(unit.c(!!!widths))
-  heights <- lapply(ggrobs, function(g) sum(g$heights))
-  heights <- inject(unit.c(!!!heights))
-
-  # Set the justification of each legend within the legend box
-  # First value is xjust, second value is yjust
-  just <- valid.just(theme$legend.box.just)
-  xjust <- just[1]
-  yjust <- just[2]
-
-  # setting that is different for vertical and horizontal guide-boxes.
-  if (identical(theme$legend.box, "horizontal")) {
-    # Set justification for each legend
-    for (i in seq_along(ggrobs)) {
-      ggrobs[[i]] <- editGrob(ggrobs[[i]],
-        vp = viewport(x = xjust, y = yjust, just = c(xjust, yjust),
-          height = heightDetails(ggrobs[[i]])))
-    }
-
-    guides <- gtable_row(name = "guides",
-      grobs = ggrobs,
-      widths = widths, height = max(heights))
-
-    # add space between the guide-boxes
-    guides <- gtable_add_col_space(guides, theme$legend.spacing.x)
-
-  } else { # theme$legend.box == "vertical"
-    # Set justification for each legend
-    for (i in seq_along(ggrobs)) {
-      ggrobs[[i]] <- editGrob(ggrobs[[i]],
-        vp = viewport(x = xjust, y = yjust, just = c(xjust, yjust),
-          width = widthDetails(ggrobs[[i]])))
-    }
-
-    guides <- gtable_col(name = "guides",
-      grobs = ggrobs,
-      width = max(widths), heights = heights)
-
-    # add space between the guide-boxes
-    guides <- gtable_add_row_space(guides, theme$legend.spacing.y)
-  }
-
-  # Add margins around the guide-boxes.
-  theme$legend.box.margin <- theme$legend.box.margin %||% margin()
-  guides <- gtable_add_cols(guides, theme$legend.box.margin[4], pos = 0)
-  guides <- gtable_add_cols(guides, theme$legend.box.margin[2], pos = ncol(guides))
-  guides <- gtable_add_rows(guides, theme$legend.box.margin[1], pos = 0)
-  guides <- gtable_add_rows(guides, theme$legend.box.margin[3], pos = nrow(guides))
-
-  # Add legend box background
-  background <- element_grob(theme$legend.box.background %||% element_blank())
-
-  guides <- gtable_add_grob(guides, background, t = 1, l = 1,
-    b = -1, r = -1, z = -Inf, clip = "off", name = "legend.box.background")
-  guides$name <- "guide-box"
-  guides
-}
-
 # Generics ----------------------------------------------------------------
 
 #' S3 generics for guides.
@@ -757,15 +594,15 @@ Guides <- ggproto(
     if (identical(theme$legend.box, "horizontal")) {
       # Set justification for each legend
       for (i in seq_along(grobs)) {
-        ggrobs[[i]] <- editGrob(
-          ggrobs[[i]],
+        grobs[[i]] <- editGrob(
+          grobs[[i]],
           vp = viewport(x = xjust, y = yjust, just = c(xjust, yjust),
                         height = heightDetails(grobs[[i]]))
         )
       }
 
       guides <- gtable_row(name = "guides",
-                           grobs = ggrobs,
+                           grobs = grobs,
                            widths = widths, height = max(heights))
 
       # add space between the guide-boxes
@@ -774,15 +611,15 @@ Guides <- ggproto(
     } else { # theme$legend.box == "vertical"
       # Set justification for each legend
       for (i in seq_along(grobs)) {
-        ggrobs[[i]] <- editGrob(
-          ggrobs[[i]],
+        grobs[[i]] <- editGrob(
+          grobs[[i]],
           vp = viewport(x = xjust, y = yjust, just = c(xjust, yjust),
                         width = widthDetails(grobs[[i]]))
         )
       }
 
       guides <- gtable_col(name = "guides",
-                           grobs = ggrobs,
+                           grobs = grobs,
                            width = max(widths), heights = heights)
 
       # add space between the guide-boxes

From 271b285f48de454710d602a473a227d84b39036c Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Sun, 4 Sep 2022 12:53:28 +0200
Subject: [PATCH 039/111] Convert guide_legend() to ggproto

---
 R/guide-legend.r | 1070 ++++++++++++++++++++++------------------------
 R/guides-.r      |    2 -
 2 files changed, 511 insertions(+), 561 deletions(-)

diff --git a/R/guide-legend.r b/R/guide-legend.r
index 37f0071d35..22650b87ff 100644
--- a/R/guide-legend.r
+++ b/R/guide-legend.r
@@ -125,624 +125,576 @@
 #' # reversed order legend
 #' p + guides(col = guide_legend(reverse = TRUE))
 #' }
-guide_legend <- function(# title
-                         title = waiver(),
-                         title.position = NULL,
-                         title.theme = NULL,
-                         title.hjust = NULL,
-                         title.vjust = NULL,
-
-                         # label
-                         label = TRUE,
-                         label.position = NULL,
-                         label.theme = NULL,
-                         label.hjust = NULL,
-                         label.vjust = NULL,
-
-                         # key
-                         keywidth = NULL,
-                         keyheight = NULL,
-
-                         # general
-                         direction = NULL,
-                         default.unit = "line",
-                         override.aes = list(),
-                         nrow = NULL,
-                         ncol = NULL,
-                         byrow = FALSE,
-                         reverse = FALSE,
-                         order = 0,
-                         ...) {
-
-  if (!is.null(keywidth) && !is.unit(keywidth)) {
+guide_legend <- function(
+  # Title
+  title          = waiver(),
+  title.position = NULL,
+  title.theme    = NULL,
+  title.hjust    = NULL,
+  title.vjust    = NULL,
+
+  # Label
+  label          = TRUE,
+  label.position = NULL,
+  label.theme    = NULL,
+  label.hjust    = NULL,
+  label.vjust    = NULL,
+
+  # Key size
+  keywidth  = NULL,
+  keyheight = NULL,
+
+  # General
+  direction    = NULL,
+  default.unit = "line",
+  override.aes = list(),
+  nrow         = NULL,
+  ncol         = NULL,
+  byrow        = FALSE,
+  reverse      = FALSE,
+  order        = 0,
+  ...
+) {
+  # Resolve key sizes
+  if (!inherits(keywidth, c("NULL", "unit"))) {
     keywidth <- unit(keywidth, default.unit)
   }
-  if (!is.null(keyheight) && !is.unit(keyheight)) {
+  if (!inherits(keyheight, c("NULL", "unit"))) {
     keyheight <- unit(keyheight, default.unit)
   }
-
-  structure(
-    list2(
-      # title
-      title = title,
-      title.position = title.position,
-      title.theme = title.theme,
-      title.hjust = title.hjust,
-      title.vjust = title.vjust,
-
-      # label
-      label = label,
-      label.position = label.position,
-      label.theme = label.theme,
-      label.hjust = label.hjust,
-      label.vjust = label.vjust,
-
-      # size of key
-      keywidth = keywidth,
-      keyheight = keyheight,
-
-      # general
-      direction = direction,
-      override.aes = rename_aes(override.aes),
-      nrow = nrow,
-      ncol = ncol,
-      byrow = byrow,
-      reverse = reverse,
-      order = order,
-
-      # parameter
-      available_aes = c("any"),
-      ...,
-      name = "legend"
-    ),
-    class = c("guide", "legend")
-  )
-}
-
-#' @export
-guide_train.legend <- function(guide, scale, aesthetic = NULL) {
-  breaks <- scale$get_breaks()
-  if (length(breaks) == 0 || all(is.na(breaks))) {
-    return()
+  if (!is.null(title.position)) {
+    title.position <- arg_match0(title.position, .trbl)
   }
-
-  # in the key data frame, use either the aesthetic provided as
-  # argument to this function or, as a fall back, the first in the vector
-  # of possible aesthetics handled by the scale
-  aes_column_name <- aesthetic %||% scale$aesthetics[1]
-  key <- data_frame(scale$map(breaks), .name_repair = ~ aes_column_name)
-  key$.label <- scale$get_labels(breaks)
-
-  # Drop out-of-range values for continuous scale
-  # (should use scale$oob?)
-  if (!scale$is_discrete()) {
-    limits <- scale$get_limits()
-    noob <- !is.na(breaks) & limits[1] <= breaks & breaks <= limits[2]
-    key <- key[noob, , drop = FALSE]
+  if (!is.null(label.position)) {
+    label.position <- arg_match0(label.position, .trbl)
   }
 
-
-  if (guide$reverse) key <- key[nrow(key):1, ]
-
-  guide$key <- key
-  guide$hash <- with(
-    guide,
-    hash(list(title, key$.label, direction, name))
+  new_guide(
+    # Title
+    title = title,
+    title.position = title.position,
+    title.theme = title.theme,
+    title.hjust = title.hjust,
+    title.vjust = title.vjust,
+
+    # Label
+    label = label,
+    label.position = label.position,
+    label.theme = label.theme,
+    label.hjust = label.hjust,
+    label.vjust = label.vjust,
+
+    # Key size
+    keywidth  = keywidth,
+    keyheight = keyheight,
+
+    # General
+    direction = direction,
+    override.aes = rename_aes(override.aes),
+    nrow = nrow,
+    ncol = ncol,
+    byrow = byrow,
+    reverse = reverse,
+    order = order,
+
+    # Fixed parameters
+    available_aes = "any",
+    name  = "legend",
+    super = GuideLegend
   )
-  guide
 }
 
+#' @rdname ggplot2-ggproto
+#' @format NULL
+#' @usage NULL
 #' @export
-guide_merge.legend <- function(guide, new_guide) {
-  new_guide$key$.label <- NULL
-  guide$key <- vec_cbind(guide$key, new_guide$key)
-  guide$override.aes <- c(guide$override.aes, new_guide$override.aes)
-  if (any(duplicated(names(guide$override.aes)))) {
-    cli::cli_warn("Duplicated {.arg override.aes} is ignored.")
-  }
-  guide$override.aes <- guide$override.aes[!duplicated(names(guide$override.aes))]
-  guide
-}
+GuideLegend <- ggproto(
+  "GuideLegend", Guide,
+
+  params = list(
+    title = waiver(),
+    title.position = NULL,
+    title.theme = NULL,
+    title.hjust = NULL,
+    title.vjust = NULL,
+
+    label = TRUE,
+    label.position = NULL,
+    label.theme = NULL,
+    label.hjust = NULL,
+    label.vjust = NULL,
+
+    keywidth  = NULL,
+    keyheight = NULL,
+
+    # General
+    direction = NULL,
+    override.aes = list(),
+    nrow = NULL,
+    ncol = NULL,
+    byrow = FALSE,
+    reverse = FALSE,
+    order = 0,
+
+    name  = "legend",
+    hash  = character(),
+    position = NULL,
+    direction = NULL
+  ),
+
+  available_aes = "any",
+
+  hashables = quos(title, key$.label, direction, name),
+
+  elements = list(
+    background  = "legend.background",
+    margin      = "legend.margin",
+    spacing     = "legend.spacing",
+    spacing.x   = "legend.spacing.x",
+    spacing.y   = "legend.spacing.y",
+    key         = "legend.key",
+    key.height  = "legend.key.height",
+    key.width   = "legend.key.width",
+    text        = "legend.text",
+    text.align  = "legend.text.align",
+    theme.title = "legend.title",
+    title.align = "legend.title.align"
+  ),
+
+  extract_params = function(scale, params, hashables,
+                            title = waiver(), direction = NULL) {
+    params$title <- scale$make_title(
+      params$title %|W|% scale$name %|W|% title
+    )
+    params$direction <- arg_match0(
+      params$direction %||% direction,
+      c("horizontal", "vertical"), arg_nm = "direction"
+    )
 
-#' @export
-guide_geom.legend <- function(guide, layers, default_mapping) {
-  # arrange common data for vertical and horizontal guide
-  guide$geoms <- lapply(layers, function(layer) {
-    matched <- matched_aes(layer, guide)
+    Guide$extract_params(scale, params, hashables)
+  },
 
-    # check if this layer should be included
-    include <- include_layer_in_guide(layer, matched)
+  merge = function(self, params, new_guide, new_params) {
+    # Combine keys
+    new_params$key$.label <- new_params$key$.value <- NULL
+    params$key <- vec_cbind(params$key, new_params$key)
 
-    if (!include) {
-      return(NULL)
+    # Combine override.aes
+    params$override.aes <- c(params$override.aes, new_params$override.aes)
+    nms <- names(params$override.aes)
+    if (anyDuplicated(nms)) {
+      cli::cli_warn("Duplicated {.arg override.aes} is ignored.")
     }
+    params$override.aes <- params$override.aes[!duplicated(nms)]
+
+    list(guide = self, params = params)
+  },
+
+  # Arrange common data for vertical and horizontal legends
+  geom = function(params, layers, default_mapping) {
+
+    decor <- lapply(layers, function(layer) {
+      # Previously `matched_aes()`
+      all_aes  <- names(c(layer$computed_mapping, layer$stat$default_aes))
+      geom_aes <- c(layer$geom$required_aes, names(layer$geom$default_aes))
+
+      if (layer$geom$rename_size &&
+          "size" %in% all_aes && !"linewidth" %in% all_aes) {
+        geom_aes <- c(geom_aes, size)
+      }
+
+      matched_aes <- intersect(intersect(all_aes, geom_aes), names(params$key))
+      matched_aes <- setdiff(matched_aes, names(layer$computed_geom_params))
+      matched_aes <- setdiff(matched_aes, names(layer$aes_params))
+
+      # Check if this layer should be included
+      if (!include_layer_in_guide(layer, matched_aes)) {
+        return(NULL)
+      }
+
+      if (length(matched_aes) > 0) {
+        # Filter out aesthetics that can't be applied to the legend
+        n <- lengths(layer$aes_params, use.names = FALSE)
+        layer_params <- layer$aes_params[n == 1]
+
+        aesthetics  <- layer$computed_mapping
+        is_modified <- is_scaled_aes(aesthetics) | is_staged_aes(aesthetics)
+        modifiers   <- aesthetics[is_modified]
+
+        data <- try_fetch(
+          layer$geom$use_defaults(params$key[matched_aes],
+                                  layer_params, modifiers),
+          error = function(cnd) {
+            cli::cli_warn(
+              "Failed to apply {.fn after_scale} modifications to legend",
+              parent = cnd
+            )
+            layer$geom$use_defaults(params$key[matched], layer_params, list())
+          }
+        )
+      } else {
+        reps <- rep(1, nrow(params$key))
+        data <- layer$geom$use_defaults(NULL, layer$aes_params)[reps, ]
+      }
 
-    if (length(matched) > 0) {
-      # Filter out set aesthetics that can't be applied to the legend
-      n <- vapply(layer$aes_params, length, integer(1))
-      params <- layer$aes_params[n == 1]
+      data <- modify_list(data, params$override.aes)
 
-      aesthetics <- layer$computed_mapping
-      modifiers <- aesthetics[is_scaled_aes(aesthetics) | is_staged_aes(aesthetics)]
+      if (!is.null(data$size)) {
+        data$size[is.na(data$size)] <- 0
+      }
 
-      data <- try_fetch(
-        layer$geom$use_defaults(guide$key[matched], params, modifiers),
-        error = function(cnd) {
-          cli::cli_warn("Failed to apply {.fn after_scale} modifications to legend", parent = cnd)
-          layer$geom$use_defaults(guide$key[matched], params, list())
-        }
+      list(
+        draw_key = layer$geom$draw_key,
+        data     = data,
+        params   = c(layer$computed_geom_params, layer$computed_stat_params)
       )
-    } else {
-      data <- layer$geom$use_defaults(NULL, layer$aes_params)[rep(1, nrow(guide$key)), ]
-    }
+    })
 
-    # override.aes in guide_legend manually changes the geom
-    data <- modify_list(data, guide$override.aes)
+    # Remove NULL geoms
+    params$decor <- compact(decor)
 
-    if (!is.null(data$size)) {
-      data$size[is.na(data$size)] <- 0
+    if (length(params$decor) == 0) {
+      return(NULL)
     }
+    return(params)
+  },
+
+  setup_params = function(params) {
+    params$title.position <- arg_match0(
+      params$title.position %||%
+        switch(params$direction, vertical = "top", horizontal = "left"),
+      .trbl, arg_nm = "title.position"
+    )
+    params$label.position <- arg_match0(
+      params$label.position %||% "right",
+      .trbl, arg_nm = "label.position"
+    )
+    params$n_breaks <- n_breaks <- nrow(params$key)
+    params$n_key_layers <- length(params$decor) + 1 # +1 is key background
+
+    # Resolve shape
+    if (!is.null(params$nrow) && !is.null(params$ncol) &&
+        params$nrow * params$ncol < n_breaks) {
+      cli::cli_abort(paste0(
+        "{.arg nrow} * {.arg ncol} needs to be larger than the number of ",
+        "breaks ({n_breaks})"
+      ))
+    }
+    if (is.null(params$nrow) && is.null(params$ncol)) {
+      if (params$direction == "horizontal") {
+        params$nrow <- ceiling(n_breaks / 5)
+      } else {
+        params$ncol <- ceiling(n_breaks / 20)
+      }
+    }
+    params$nrow <- params$nrow %||% ceiling(n_breaks / params$ncol)
+    params$ncol <- params$ncol %||% ceiling(n_breaks / params$nrow)
+    params
+  },
+
+  override_elements = function(params, elements, theme) {
+
+    # Title
+    title <- combine_elements(params$title.theme, elements$theme.title)
+    title$hjust <- params$title.hjust %||% elements$title.align %||%
+      title$hjust %||% 0
+    title$vjust <- params$title.vjust %||% title$vjust %||% 0.5
+    elements$title <- title
+
+    # Labels
+    label <- combine_elements(params$label.theme, elements$text)
+    if (!params$label || is.null(params$key$.label)) {
+      label <- element_blank()
+    } else {
+      hjust <- unname(label_hjust_defaults[params$label.position])
+      vjust <- unname(label_vjust_defaults[params$label.position])
+      # Expressions default to right-justified
+      if (hjust == 0 && any(is.expression(params$key$.label))) {
+        hjust <- 1
+      }
+      # Breaking justification inheritance for intuition purposes.
+      if (is.null(params$label.theme$hjust) &&
+          is.null(theme$legend.text$hjust)) {
+        label$hjust <- NULL
+      }
+      if (is.null(params$label.theme$vjust) &&
+          is.null(theme$legend.text$vjust)) {
+        label$vjust <- NULL
+      }
+      label$hjust <- params$label.hjust %||% elements$text.align %||%
+        label$hjust %||% hjust
+      label$vjust <- params$label.vjust %||% label$vjust %||% vjust
+    }
+    elements$text <- label
+
+    # Keys
+    elements$key.width  <- width_cm( params$keywidth  %||% elements$key.width)
+    elements$key.height <- height_cm(params$keyheight %||% elements$key.height)
+
+
+    # Spacing
+    gap <- title$size %||% elements$theme.title$size %||%
+      elements$text$size  %||% 11
+    gap <- unit(gap * 0.5, "pt")
+    # Should maybe be elements$spacing.{x/y} instead of the theme's spacing?
+    elements$hgap <- width_cm( theme$legend.spacing.x %||% gap)
+    elements$vgap <- height_cm(theme$legend.spacing.y %||% gap)
+    elements$padding <- convertUnit(
+      elements$margin %||% margin(),
+      "cm", valueOnly = TRUE
+    )
 
-    list(
-      draw_key = layer$geom$draw_key,
-      data = data,
-      params = c(layer$computed_geom_params, layer$computed_stat_params)
+    # Evaluate backgrounds early
+    elements$background <- ggname(
+      "legend.background", element_grob(elements$background)
+    )
+    elements$key <- ggname(
+      "legend.key", element_grob(elements$key)
     )
-  })
 
-  # remove null geom
-  guide$geoms <- compact(guide$geoms)
+    elements
+  },
 
-  # Finally, remove this guide if no layer is drawn
-  if (length(guide$geoms) == 0) guide <- NULL
-  guide
-}
+  build_ticks = function(...) {
+    zeroGrob()
+  },
 
-#' @export
-guide_gengrob.legend <- function(guide, theme) {
-
-  # default setting
-  label.position <- guide$label.position %||% "right"
-  if (!label.position %in% c("top", "bottom", "left", "right"))
-    cli::cli_abort("label position {.var {label.position}} is invalid")
-
-  nbreak <- nrow(guide$key)
-
-  # obtain the theme for the legend title. We need this both for the title grob
-  # and to obtain the title fontsize.
-  title.theme <- guide$title.theme %||% calc_element("legend.title", theme)
-
-  title.hjust <- guide$title.hjust %||% theme$legend.title.align %||% title.theme$hjust %||% 0
-  title.vjust <- guide$title.vjust %||% title.theme$vjust %||% 0.5
-
-  grob.title <- ggname("guide.title",
-    element_grob(
-      title.theme,
-      label = guide$title,
-      hjust = title.hjust,
-      vjust = title.vjust,
-      margin_x = TRUE,
-      margin_y = TRUE
-    )
-  )
+  build_decor = function(decor, ticks, elements, params) {
+
+    key_size <- c(elements$key.width, elements$key.height) * 10
 
-  title_width <- width_cm(grob.title)
-  title_height <- height_cm(grob.title)
-  title_fontsize <- title.theme$size %||% calc_element("legend.title", theme)$size %||%
-    calc_element("text", theme)$size %||% 11
-
-  # gap between keys etc
-  # the default horizontal and vertical gap need to be the same to avoid strange
-  # effects for certain guide layouts
-  hgap <- width_cm(theme$legend.spacing.x  %||% (0.5 * unit(title_fontsize, "pt")))
-  vgap <- height_cm(theme$legend.spacing.y %||% (0.5 * unit(title_fontsize, "pt")))
-
-  # Labels
-
-  # first get the label theme, we need it below even when there are no labels
-  label.theme <- guide$label.theme %||% calc_element("legend.text", theme)
-
-  if (!guide$label || is.null(guide$key$.label)) {
-    grob.labels <- rep(list(zeroGrob()), nrow(guide$key))
-  } else {
-    # get the defaults for label justification. The defaults are complicated and depend
-    # on the direction of the legend and on label placement
-    just_defaults <- label_just_defaults.legend(guide$direction, label.position)
-    # don't set expressions left-justified
-    if (just_defaults$hjust == 0 && any(is.expression(guide$key$.label))) just_defaults$hjust <- 1
-
-    # We break inheritance for hjust and vjust, because that's more intuitive here; it still allows manual
-    # setting of hjust and vjust if desired. The alternative is to ignore hjust and vjust altogether, which
-    # seems worse
-    if (is.null(guide$label.theme$hjust) && is.null(theme$legend.text$hjust)) label.theme$hjust <- NULL
-    if (is.null(guide$label.theme$vjust) && is.null(theme$legend.text$vjust)) label.theme$vjust <- NULL
-
-    # label.theme in param of guide_legend() > theme$legend.text.align > default
-    hjust <- guide$label.hjust %||% theme$legend.text.align %||% label.theme$hjust %||%
-      just_defaults$hjust
-    vjust <- guide$label.vjust %||% label.theme$vjust %||%
-      just_defaults$vjust
-
-    grob.labels <- lapply(guide$key$.label, function(label, ...) {
-      g <- element_grob(
-        element = label.theme,
-        label = label,
-        hjust = hjust,
-        vjust = vjust,
-        margin_x = TRUE,
-        margin_y = TRUE
+    draw <- function(i) {
+      bg <- elements$key
+      keys <- lapply(decor, function(g) {
+        g$draw_key(vec_slice(g$data, i), g$params, key_size)
+      })
+      c(list(bg), keys)
+    }
+    unlist(lapply(seq_len(params$n_breaks), draw), FALSE)
+  },
+
+  build_labels = function(key, elements, params) {
+    lapply(key$.label, function(lab) {
+      ggname(
+        "guide.label",
+        element_grob(
+          elements$text,
+          label    = lab,
+          margin_x = TRUE,
+          margin_y = TRUE
+        )
       )
-      ggname("guide.label", g)
     })
-  }
-
-  label_widths <- width_cm(grob.labels)
-  label_heights <- height_cm(grob.labels)
+  },
+
+  measure_grobs = function(grobs, params, elements) {
+    dim <- c(params$nrow, params$ncol)
+    zeroes <- rep(0, prod(dim) - params$n_breaks) # size vector padding
+
+    # For every key position, find the maximum size among the keys coming from
+    # different geom-layers
+    key_size_mat <- lapply(params$decor, function(g) {g$data$size / 10})
+    key_size_mat <- inject(cbind(!!!key_size_mat))
+    if (any(dim(key_size_mat) == 0)) {
+      key_size_mat <- matrix(0, ncol = 1, nrow = params$n_breaks)
+    }
+    key_sizes <- apply(key_size_mat, 1, max)
 
-  # Keys
-  key_width <- width_cm(
-    guide$keywidth %||% theme$legend.key.width %||% theme$legend.key.size
-  )
-  key_height <- height_cm(
-    guide$keyheight %||% theme$legend.key.height %||% theme$legend.key.size
-  )
+    # Arrange sizes as in eventual layout, take row/column-wise maxima.
+    key_sizes <- matrix(
+      c(key_sizes, zeroes),
+      nrow = dim[1], ncol = dim[2], byrow = params$byrow
+    )
+    widths  <- pmax(elements$key.width,  apply(key_sizes, 2, max))
+    heights <- pmax(elements$key.height, apply(key_sizes, 1, max))
+
+    # Measure label sizes
+    label_widths  <- apply(matrix(
+      c(width_cm(grobs$label), zeroes),
+      nrow = dim[1], ncol = dim[2], byrow = params$byrow
+    ), 2, max)
+    label_heights <- apply(matrix(
+      c(height_cm(grobs$label), zeroes),
+      nrow = dim[1], ncol = dim[2], byrow = params$byrow
+    ), 1, max)
+
+    # Interleave gaps between keys and labels, which depends on the label
+    # position. For unclear reasons, we need to adjust some gaps based on the
+    # `byrow` parameter (see also #4352).
+    hgap <- elements$hgap
+    widths <- switch(
+      params$label.position,
+      "left"   = list(label_widths, hgap, widths, hgap),
+      "right"  = list(widths, hgap, label_widths, hgap),
+      list(pmax(label_widths, widths), hgap * (!params$byrow))
+    )
+    widths  <- head(vec_interleave(!!!widths),  -1)
+
+    vgap <- elements$vgap
+    heights <- switch(
+      params$label.position,
+      "top"    = list(label_heights, vgap, heights, vgap),
+      "bottom" = list(heights, vgap, label_heights, vgap),
+      list(pmax(label_heights, heights), vgap * (params$byrow))
+    )
+    heights <- head(vec_interleave(!!!heights), -1)
+
+    # Measure title
+    title_width  <- width_cm(grobs$title)
+    title_height <- height_cm(grobs$title)
+
+    # Combine title with rest of the sizes based on its position
+    widths <- switch(
+      params$title.position,
+      "left"  = c(title_width, hgap, widths),
+      "right" = c(widths, hgap, title_width),
+      c(widths, max(0, title_width - sum(widths)))
+    )
+    heights <- switch(
+      params$title.position,
+      "top"    = c(title_height, vgap, heights),
+      "bottom" = c(heights, vgap, title_height),
+      c(heights, max(0, title_height - sum(heights)))
+    )
 
-  key_size <- lapply(guide$geoms, function(g) g$data$size / 10)
-  key_size_mat <- inject(cbind(!!!key_size))
+    list(
+      widths  = widths,
+      heights = heights,
+      padding = elements$padding
+    )
+  },
 
-  if (nrow(key_size_mat) == 0 || ncol(key_size_mat) == 0) {
-    key_size_mat <- matrix(0, ncol = 1, nrow = nbreak)
-  }
-  key_sizes <- apply(key_size_mat, 1, max)
+  arrange_layout = function(key, sizes, params) {
 
-  if (!is.null(guide$nrow) && !is.null(guide$ncol) &&
-      guide$nrow * guide$ncol < nbreak) {
-    cli::cli_abort("{.arg nrow} * {.arg ncol} needs to be larger than the number of breaks ({nbreak})")
-  }
+    break_seq <- seq_len(params$n_breaks)
+    dim <- c(params$nrow, params$ncol)
 
-  # If neither nrow/ncol specified, guess with "reasonable" values
-  if (is.null(guide$nrow) && is.null(guide$ncol)) {
-    if (guide$direction == "horizontal") {
-      guide$nrow <- ceiling(nbreak / 5)
+    # Find rows / columns of legend items
+    if (params$byrow) {
+      df <- data_frame0(
+        R = ceiling(break_seq / params$ncol),
+        C = (break_seq - 1) %% params$ncol + 1
+      )
     } else {
-      guide$ncol <- ceiling(nbreak / 20)
+      df <- mat_2_df(arrayInd(break_seq, dim), c("R", "C"))
     }
-  }
-  legend.nrow <- guide$nrow %||% ceiling(nbreak / guide$ncol)
-  legend.ncol <- guide$ncol %||% ceiling(nbreak / guide$nrow)
-
-  key_sizes <- matrix(
-    c(key_sizes, rep(0, legend.nrow * legend.ncol - nbreak)),
-    legend.nrow,
-    legend.ncol,
-    byrow = guide$byrow
-  )
+    # Make spacing for padding / gaps. For example: because first gtable cell
+    # will be padding, first item will be at [2, 2] position. Then the
+    # second item-row will be [4, 2] because [3, 2] will be a gap cell.
+    key_row <- label_row <- df$R * 2
+    key_col <- label_col <- df$C * 2
 
-  key_widths <- pmax(key_width, apply(key_sizes, 2, max))
-  key_heights <- pmax(key_height, apply(key_sizes, 1, max))
-
-  label_widths <- apply(
-    matrix(
-      c(label_widths, rep(0, legend.nrow * legend.ncol - nbreak)),
-      legend.nrow,
-      legend.ncol,
-      byrow = guide$byrow
-    ),
-    2,
-    max
-  )
-  label_heights <- apply(
-    matrix(
-      c(label_heights, rep(0, legend.nrow * legend.ncol - nbreak)),
-      legend.nrow,
-      legend.ncol,
-      byrow = guide$byrow
-    ),
-    1,
-    max
-  )
-
-  if (guide$byrow) {
-    vps <- data_frame0(
-      R = ceiling(seq(nbreak) / legend.ncol),
-      C = (seq(nbreak) - 1) %% legend.ncol + 1
-    )
-  } else {
-    vps <- mat_2_df(arrayInd(seq(nbreak), dim(key_sizes)), c("R", "C"))
-  }
-
-  # layout of key-label depends on the direction of the guide
-  if (guide$byrow == TRUE) {
+    # Make gaps for key-label spacing depending on label position
     switch(
-      label.position,
+      params$label.position,
       "top" = {
-        kl_widths <- pmax(label_widths, key_widths)
-        kl_heights <- utils::head(
-          interleave(label_heights, vgap, key_heights, vgap),
-          -1
-        )
-        vps <- transform(
-          vps,
-          key.row = R * 4 - 1,
-          key.col = C,
-          label.row = R * 4 - 3,
-          label.col = C
-        )
+        key_row   <- key_row   * 2
+        label_row <- label_row * 2 - 2
       },
       "bottom" = {
-        kl_widths <- pmax(label_widths, key_widths)
-        kl_heights <- utils::head(
-          interleave(key_heights, vgap, label_heights, vgap),
-          -1
-        )
-        vps <- transform(
-          vps,
-          key.row = R * 4 - 3,
-          key.col = C,
-          label.row = R * 4 - 1,
-          label.col = C
-        )
+        key_row   <- key_row   * 2 - 2
+        label_row <- label_row * 2
       },
       "left" = {
-        kl_widths <- utils::head(
-          interleave(label_widths, hgap, key_widths, hgap),
-          -1
-        )
-        kl_heights <- utils::head(
-          interleave(pmax(label_heights, key_heights), vgap),
-          -1
-        )
-        vps <- transform(
-          vps,
-          key.row = R * 2 - 1,
-          key.col = C * 4 - 1,
-          label.row = R * 2 - 1,
-          label.col = C * 4 - 3
-        )
+        key_col   <- key_col   * 2
+        label_col <- label_col * 2 - 2
       },
       "right" = {
-        kl_widths <- utils::head(
-          interleave(key_widths, hgap, label_widths, hgap),
-          -1
-        )
-        kl_heights <- utils::head(
-          interleave(pmax(label_heights, key_heights), vgap),
-          -1
-        )
-        vps <- transform(
-          vps,
-          key.row = R * 2 - 1,
-          key.col = C * 4 - 3,
-          label.row = R * 2 - 1,
-          label.col = C * 4 - 1
-        )
-      })
-  } else {
+        key_col   <- key_col   * 2 - 2
+        label_col <- label_col * 2
+      }
+    )
+
+    # Offset layout based on title position
     switch(
-      label.position,
+      params$title.position,
       "top" = {
-        kl_widths <- utils::head(
-          interleave(pmax(label_widths, key_widths), hgap),
-          -1
-        )
-        kl_heights <- utils::head(
-          interleave(label_heights, vgap, key_heights, vgap),
-          -1
-        )
-        vps <- transform(
-          vps,
-          key.row = R * 4 - 1,
-          key.col = C * 2 - 1,
-          label.row = R * 4 - 3,
-          label.col = C * 2 - 1
-        )
+        key_row   <- key_row   + 2
+        label_row <- label_row + 2
+        title_row <- 2
+        title_col <- seq_along(sizes$widths) + 1
       },
       "bottom" = {
-        kl_widths <- utils::head(
-          interleave(pmax(label_widths, key_widths), hgap),
-          -1
-        )
-        kl_heights <- utils::head(
-          interleave(key_heights, vgap, label_heights, vgap),
-          -1
-        )
-        vps <- transform(
-          vps,
-          key.row = R * 4 - 3,
-          key.col = C * 2 - 1,
-          label.row = R * 4 - 1,
-          label.col = C * 2 - 1
-        )
+        title_row <- length(sizes$heights)   + 1
+        title_col <- seq_along(sizes$widths) + 1
       },
       "left" = {
-        kl_widths <- utils::head(
-          interleave(label_widths, hgap, key_widths, hgap),
-          -1
-        )
-        kl_heights <- pmax(key_heights, label_heights)
-        vps <- transform(
-          vps,
-          key.row = R,
-          key.col = C * 4 - 1,
-          label.row = R,
-          label.col = C * 4 - 3
-        )
+        key_col   <- key_col   + 2
+        label_col <- label_col + 2
+        title_row <- seq_along(sizes$heights) + 1
+        title_col <- 2
       },
       "right" = {
-        kl_widths <- utils::head(
-          interleave(key_widths, hgap, label_widths, hgap),
-          -1
-        )
-        kl_heights <- pmax(key_heights, label_heights)
-        vps <- transform(
-          vps,
-          key.row = R,
-          key.col = C * 4 - 3,
-          label.row = R,
-          label.col = C * 4 - 1
-        )
-      })
-  }
+        title_row <- seq_along(sizes$heights) + 1
+        title_col <- length(sizes$widths)     + 1
+      }
+    )
 
-  # layout the title over key-label
-  switch(guide$title.position,
-         "top" = {
-           widths <- c(kl_widths, max(0, title_width - sum(kl_widths)))
-           heights <- c(title_height, vgap, kl_heights)
-           vps <- transform(
-             vps,
-             key.row = key.row + 2,
-             key.col = key.col,
-             label.row = label.row + 2,
-             label.col = label.col
-           )
-           vps.title.row = 1; vps.title.col = 1:length(widths)
-         },
-         "bottom" = {
-           widths <- c(kl_widths, max(0, title_width - sum(kl_widths)))
-           heights <- c(kl_heights, vgap, title_height)
-           vps <- transform(
-             vps,
-             key.row = key.row,
-             key.col = key.col,
-             label.row = label.row,
-             label.col = label.col
-           )
-           vps.title.row = length(heights); vps.title.col = 1:length(widths)
-         },
-         "left" = {
-           widths <- c(title_width, hgap, kl_widths)
-           heights <- c(kl_heights, max(0, title_height - sum(kl_heights)))
-           vps <- transform(
-             vps,
-             key.row = key.row,
-             key.col = key.col + 2,
-             label.row = label.row,
-             label.col = label.col + 2
-           )
-           vps.title.row = 1:length(heights); vps.title.col = 1
-         },
-         "right" = {
-           widths <- c(kl_widths, hgap, title_width)
-           heights <- c(kl_heights, max(0, title_height - sum(kl_heights)))
-           vps <- transform(
-             vps,
-             key.row = key.row,
-             key.col = key.col,
-             label.row = label.row,
-             label.col = label.col
-           )
-           vps.title.row = 1:length(heights); vps.title.col = length(widths)
-         })
-
-  # grob for key
-  key_size <- c(key_width, key_height) * 10
-
-  draw_key <- function(i) {
-    bg <- element_render(theme, "legend.key")
-    keys <- lapply(guide$geoms, function(g) {
-      g$draw_key(g$data[i, , drop = FALSE], g$params, key_size)
-    })
-    c(list(bg), keys)
-  }
-  grob.keys <- unlist(lapply(seq_len(nbreak), draw_key), recursive = FALSE)
-
-  # background
-  grob.background <- element_render(theme, "legend.background")
-
-  ngeom <- length(guide$geoms) + 1
-  kcols <- rep(vps$key.col, each = ngeom)
-  krows <- rep(vps$key.row, each = ngeom)
-
-  # padding
-  padding <- convertUnit(theme$legend.margin %||% margin(), "cm", valueOnly = TRUE)
-  widths <- c(padding[4], widths, padding[2])
-  heights <- c(padding[1], heights, padding[3])
-
-  # Create the gtable for the legend
-  gt <- gtable(widths = unit(widths, "cm"), heights = unit(heights, "cm"))
-  gt <- gtable_add_grob(
-    gt,
-    grob.background,
-    name = "background",
-    clip = "off",
-    t = 1,
-    r = -1,
-    b = -1,
-    l = 1
-  )
-  gt <- gtable_add_grob(
-    gt,
-    justify_grobs(
-      grob.title,
-      hjust = title.hjust,
-      vjust = title.vjust,
-      int_angle = title.theme$angle,
-      debug = title.theme$debug
-    ),
-    name = "title",
-    clip = "off",
-    t = 1 + min(vps.title.row),
-    r = 1 + max(vps.title.col),
-    b = 1 + max(vps.title.row),
-    l = 1 + min(vps.title.col)
-  )
-  gt <- gtable_add_grob(
-    gt,
-    grob.keys,
-    name = paste("key", krows, kcols, c("bg", seq(ngeom - 1)), sep = "-"),
-    clip = "off",
-    t = 1 + krows,
-    r = 1 + kcols,
-    b = 1 + krows,
-    l = 1 + kcols
-  )
-  gt <- gtable_add_grob(
-    gt,
-    justify_grobs(
-      grob.labels,
-      hjust = hjust,
-      vjust = vjust,
-      int_angle = label.theme$angle,
-      debug = label.theme$debug
-    ),
-    name = paste("label", vps$label.row, vps$label.col, sep = "-"),
-    clip = "off",
-    t = 1 + vps$label.row,
-    r = 1 + vps$label.col,
-    b = 1 + vps$label.row,
-    l = 1 + vps$label.col
-  )
-  gt
-}
+    df <- cbind(df, key_row, key_col, label_row, label_col)
 
+    list(layout = df, title_row = title_row, title_col = title_col)
+  },
 
-#' Calculate the default hjust and vjust settings depending on legend
-#' direction and position.
-#'
-#' @noRd
-label_just_defaults.legend <- function(direction, position) {
-  if (direction == "horizontal") {
-    switch(
-      position,
-      "top" = list(hjust = 0.5, vjust = 0),
-      "bottom" = list(hjust = 0.5, vjust = 1),
-      "left" = list(hjust = 1, vjust = 0.5),
-      list(hjust = 0, vjust = 0.5)
-    )
-  }
-  else {
-    switch(
-      position,
-      "top" = list(hjust = 0.5, vjust = 0),
-      "bottom" = list(hjust = 0.5, vjust = 1),
-      "left" = list(hjust = 1, vjust = 0.5),
-      list(hjust = 0, vjust = 0.5)
+  assemble_drawing = function(grobs, layout, sizes, params, elements) {
+
+    gt <- gtable(
+      widths  = unit(c(sizes$padding[4], sizes$widths, sizes$padding[2]), "cm"),
+      heights = unit(c(sizes$padding[1], sizes$heights, sizes$padding[3]), "cm")
     )
 
-  }
+    # Add background
+    gt <- gtable_add_grob(
+      gt, elements$background,
+      name = "background", clip = "off",
+      t = 1, r = -1, b = -1, l =1
+    )
 
-}
+    # Add title
+    gt <- gtable_add_grob(
+      gt,
+      justify_grobs(
+        grobs$title,
+        hjust = elements$title$hjust,
+        vjust = elements$title$vjust,
+        int_angle = elements$title$angle,
+        debug = elements$title$debug
+      ),
+      name = "title", clip = "off",
+      t = min(layout$title_row), r = max(layout$title_col),
+      b = max(layout$title_row), l = min(layout$title_col)
+    )
 
+    # Extract appropriate part of layout
+    layout   <- layout$layout
+    key_cols <- rep(layout$key_col, each = params$n_key_layers)
+    key_rows <- rep(layout$key_row, each = params$n_key_layers)
+
+    # Add keys
+    gt <- gtable_add_grob(
+      gt, grobs$decor,
+      name = paste("key", key_rows, key_cols,
+                   c("bg", seq(params$n_key_layers - 1)), sep = "-"),
+      clip = "off",
+      t = key_rows, r = key_cols, b = key_rows, l = key_cols
+    )
+    # Add labels
+    gt <- gtable_add_grob(
+      gt,
+      justify_grobs(
+        grobs$labels,
+        hjust = elements$text$hjust,
+        vjust = elements$text$vjust,
+        int_angle = elements$title$angle,
+        debug = elements$text$debug
+      ),
+      name = paste("label", layout$label_row, layout$label_col, sep = "-"),
+      clip = "off",
+      t = layout$label_row, r = layout$label_col,
+      b = layout$label_row, l = layout$label_col
+    )
+    gt
+  }
+)
 
-utils::globalVariables(c("C", "R", "key.row", "key.col", "label.row", "label.col"))
+label_hjust_defaults <- c(top = 0.5, bottom = 0.5, left = 1,   right = 0)
+label_vjust_defaults <- c(top = 0,   bottom = 1,   left = 0.5, right = 0.5)
diff --git a/R/guides-.r b/R/guides-.r
index e42678d3bf..c31632aab3 100644
--- a/R/guides-.r
+++ b/R/guides-.r
@@ -286,8 +286,6 @@ include_layer_in_guide <- function(layer, matched) {
 # Class -------------------------------------------------------------------
 
 # Guides object encapsulates multiple guides and their state.
-# TODO: incorporate in non-position branch of guides
-# TODO: fill in other `guides_*` methods when non-position guides are done
 guides_list <- function(guides) {
   ggproto(NULL, Guides, guides = guides)
 }

From 8b1ba23ae42322273e124a2a1ee6be53e3dc7fa1 Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Sun, 4 Sep 2022 12:58:39 +0200
Subject: [PATCH 040/111] Re-oxygenate

---
 NAMESPACE              |  5 +----
 man/ggplot2-ggproto.Rd | 21 +++++++++++----------
 man/guide_axis.Rd      |  6 ++++--
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/NAMESPACE b/NAMESPACE
index aca1f74dee..1ce88fae80 100644
--- a/NAMESPACE
+++ b/NAMESPACE
@@ -74,17 +74,13 @@ S3method(grobX,absoluteGrob)
 S3method(grobY,absoluteGrob)
 S3method(guide_gengrob,bins)
 S3method(guide_gengrob,colorbar)
-S3method(guide_gengrob,legend)
 S3method(guide_geom,bins)
 S3method(guide_geom,colorbar)
-S3method(guide_geom,legend)
 S3method(guide_merge,bins)
 S3method(guide_merge,colorbar)
-S3method(guide_merge,legend)
 S3method(guide_train,bins)
 S3method(guide_train,colorbar)
 S3method(guide_train,colorsteps)
-S3method(guide_train,legend)
 S3method(guide_transform,default)
 S3method(heightDetails,titleGrob)
 S3method(heightDetails,zeroGrob)
@@ -222,6 +218,7 @@ export(GeomViolin)
 export(GeomVline)
 export(Guide)
 export(GuideAxis)
+export(GuideLegend)
 export(GuideNone)
 export(Layout)
 export(Position)
diff --git a/man/ggplot2-ggproto.Rd b/man/ggplot2-ggproto.Rd
index e37827b7c3..c845c45184 100644
--- a/man/ggplot2-ggproto.Rd
+++ b/man/ggplot2-ggproto.Rd
@@ -4,16 +4,16 @@
 %   R/geom-raster.r, R/annotation-raster.r, R/axis-secondary.R, R/coord-.r,
 %   R/coord-cartesian-.r, R/coord-fixed.r, R/coord-flip.r, R/coord-map.r,
 %   R/coord-polar.r, R/coord-quickmap.R, R/coord-transform.r, R/facet-.r,
-%   R/facet-grid-.r, R/facet-null.r, R/facet-wrap.r, R/stat-.r,
-%   R/geom-abline.r, R/geom-rect.r, R/geom-bar.r, R/geom-blank.r,
-%   R/geom-boxplot.r, R/geom-col.r, R/geom-path.r, R/geom-contour.r,
-%   R/geom-crossbar.r, R/geom-segment.r, R/geom-curve.r, R/geom-ribbon.r,
-%   R/geom-density.r, R/geom-density2d.r, R/geom-dotplot.r, R/geom-errorbar.r,
-%   R/geom-errorbarh.r, R/geom-function.R, R/geom-hex.r, R/geom-hline.r,
-%   R/geom-label.R, R/geom-linerange.r, R/geom-point.r, R/geom-pointrange.r,
-%   R/geom-quantile.r, R/geom-rug.r, R/geom-smooth.r, R/geom-spoke.r,
-%   R/geom-text.r, R/geom-tile.r, R/geom-violin.r, R/geom-vline.r,
-%   R/guide-.r, R/guides-axis.r, R/guides-none.r, R/layout.R, R/position-.r,
+%   R/facet-grid-.r, R/facet-null.r, R/facet-wrap.r, R/stat-.r, R/geom-abline.r,
+%   R/geom-rect.r, R/geom-bar.r, R/geom-blank.r, R/geom-boxplot.r, R/geom-col.r,
+%   R/geom-path.r, R/geom-contour.r, R/geom-crossbar.r, R/geom-segment.r,
+%   R/geom-curve.r, R/geom-ribbon.r, R/geom-density.r, R/geom-density2d.r,
+%   R/geom-dotplot.r, R/geom-errorbar.r, R/geom-errorbarh.r, R/geom-function.R,
+%   R/geom-hex.r, R/geom-hline.r, R/geom-label.R, R/geom-linerange.r,
+%   R/geom-point.r, R/geom-pointrange.r, R/geom-quantile.r, R/geom-rug.r,
+%   R/geom-smooth.r, R/geom-spoke.r, R/geom-text.r, R/geom-tile.r,
+%   R/geom-violin.r, R/geom-vline.r, R/guide-.r, R/guide-legend.r,
+%   R/guides-axis.r, R/guides-none.r, R/layout.R, R/position-.r,
 %   R/position-dodge.r, R/position-dodge2.r, R/position-identity.r,
 %   R/position-jitter.r, R/position-jitterdodge.R, R/position-nudge.R,
 %   R/position-stack.r, R/scale-.r, R/scale-binned.R, R/scale-continuous.r,
@@ -87,6 +87,7 @@
 \alias{GeomViolin}
 \alias{GeomVline}
 \alias{Guide}
+\alias{GuideLegend}
 \alias{GuideAxis}
 \alias{GuideNone}
 \alias{Layout}
diff --git a/man/guide_axis.Rd b/man/guide_axis.Rd
index 4400c60a57..96716cabe2 100644
--- a/man/guide_axis.Rd
+++ b/man/guide_axis.Rd
@@ -30,8 +30,10 @@ you probably want.}
 horizontal axes) that should be used to render the labels. This is
 useful for displaying labels that would otherwise overlap.}
 
-\item{order}{Used to determine the order of the guides (left-to-right,
-top-to-bottom), if more than one  guide must be drawn at the same location.}
+\item{order}{A positive \code{integer} of length 1 that specifies the order of
+this guide among multiple guides. This controls in which order guides are
+merged if there are multiple guides for the same position. If 0 (default),
+the order is determined by a secret algorithm.}
 
 \item{position}{Where this guide should be drawn: one of top, bottom,
 left, or right.}

From 7a5d734f7e35f69f41af6df8c20ee866fb5888da Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Sun, 4 Sep 2022 15:50:15 +0200
Subject: [PATCH 041/111] Forgot about `reverse` argument

---
 R/guide-legend.r             |  3 +++
 tests/testthat/test-guides.R | 19 +++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/R/guide-legend.r b/R/guide-legend.r
index 22650b87ff..d744756bb3 100644
--- a/R/guide-legend.r
+++ b/R/guide-legend.r
@@ -270,6 +270,9 @@ GuideLegend <- ggproto(
       params$direction %||% direction,
       c("horizontal", "vertical"), arg_nm = "direction"
     )
+    if (isTRUE(params$reverse %||% FALSE)) {
+      params$key <- params$key[nrow(params$key):1, , drop = FALSE]
+    }
 
     Guide$extract_params(scale, params, hashables)
   },
diff --git a/tests/testthat/test-guides.R b/tests/testthat/test-guides.R
index 5c3b4e283a..6619db871e 100644
--- a/tests/testthat/test-guides.R
+++ b/tests/testthat/test-guides.R
@@ -243,6 +243,25 @@ test_that("colorsteps and bins checks the breaks format", {
   expect_snapshot_error(suppressWarnings(ggplotGrob(p)))
 })
 
+test_that("legend reverse argument reverses the key", {
+
+  scale <- scale_colour_discrete()
+  scale$train(LETTERS[1:4])
+
+  guides <- guides_list(NULL)
+  guides <- guides$setup(list(scale))
+
+  guides$params[[1]]$reverse <- FALSE
+  guides$train(list(scale), "horizontal", labels = labs())
+  fwd <- guides$get_params(1)$key
+
+  guides$params[[1]]$reverse <- TRUE
+  guides$train(list(scale), "horizontal", labels = labs())
+  rev <- guides$get_params(1)$key
+
+  expect_equal(fwd$colour, rev(rev$colour))
+})
+
 # Visual tests ------------------------------------------------------------
 
 test_that("axis guides are drawn correctly", {

From 661755804b91ff6b60967103788b6e484464fba6 Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Wed, 7 Sep 2022 12:49:57 +0200
Subject: [PATCH 042/111] Move label justification to GuideLegend$build_labels

---
 R/guide-legend.r | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/R/guide-legend.r b/R/guide-legend.r
index d744756bb3..d60ef52a44 100644
--- a/R/guide-legend.r
+++ b/R/guide-legend.r
@@ -477,7 +477,7 @@ GuideLegend <- ggproto(
   },
 
   build_labels = function(key, elements, params) {
-    lapply(key$.label, function(lab) {
+    labels <- lapply(key$.label, function(lab) {
       ggname(
         "guide.label",
         element_grob(
@@ -488,6 +488,11 @@ GuideLegend <- ggproto(
         )
       )
     })
+    justify_grobs(
+      labels,
+      hjust = elements$text$hjust, vjust = elements$text$vjust,
+      int_angle = elements$text$angle, debug = elements$text$debug
+    )
   },
 
   measure_grobs = function(grobs, params, elements) {
@@ -682,14 +687,7 @@ GuideLegend <- ggproto(
     )
     # Add labels
     gt <- gtable_add_grob(
-      gt,
-      justify_grobs(
-        grobs$labels,
-        hjust = elements$text$hjust,
-        vjust = elements$text$vjust,
-        int_angle = elements$title$angle,
-        debug = elements$text$debug
-      ),
+      gt, grobs$labels,
       name = paste("label", layout$label_row, layout$label_col, sep = "-"),
       clip = "off",
       t = layout$label_row, r = layout$label_col,

From 82cbc157f0fc43421bfe8e4c59379cf7fb02f7d2 Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Fri, 9 Sep 2022 13:48:13 +0200
Subject: [PATCH 043/111] Accommodate NULL labels

---
 R/guide-.r | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/R/guide-.r b/R/guide-.r
index 79e6589312..098473ab89 100644
--- a/R/guide-.r
+++ b/R/guide-.r
@@ -139,10 +139,9 @@ Guide <- ggproto(
     mapped <- scale$map(breaks)
     labels <- scale$get_labels(breaks)
 
-    key <- data_frame(
-      mapped, breaks, labels,
-      .name_repair = ~ c(aesthetic, ".value", ".label")
-    )
+    key <- data_frame(mapped, .name_repair = ~ aesthetic)
+    key$.value <- breaks
+    key$.label <- labels
 
     if (is.numeric(key$.value)) {
       key[is.finite(key$.value), , drop = FALSE]

From 6ef1267868fed6ac0a31adcabea58d0cde4f0ca8 Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Fri, 9 Sep 2022 13:49:24 +0200
Subject: [PATCH 044/111] `Guide$build_ticks()` can take key as vector.

---
 R/guide-.r | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/R/guide-.r b/R/guide-.r
index 098473ab89..1e1b4dccee 100644
--- a/R/guide-.r
+++ b/R/guide-.r
@@ -278,7 +278,12 @@ Guide <- ggproto(
 
   # Renders tickmarks
   build_ticks = function(key, elements, params, position = params$position) {
-    breaks   <- key[[params$aes]] %||% key
+
+    if (!is.list(key)) {
+      breaks <- key
+    } else {
+      breaks <- key[[params$aes]]
+    }
     n_breaks <- length(breaks)
 
     # Early exit if there are no breaks

From 00ca023a5395860d6d762bb3d28749d0f3a06ccc Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Fri, 9 Sep 2022 13:50:01 +0200
Subject: [PATCH 045/111] Properly pass ticks to `Guide$build_decor()`

---
 R/guide-.r | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/R/guide-.r b/R/guide-.r
index 1e1b4dccee..7a9fd30679 100644
--- a/R/guide-.r
+++ b/R/guide-.r
@@ -225,9 +225,9 @@ Guide <- ggproto(
     grobs <- list(
       title  = self$build_title(params$title, elems, params),
       labels = self$build_labels(key, elems, params),
-      ticks  = self$build_ticks(key, elems, params),
-      decor  = self$build_decor(params$decor, grob_ticks, elems, params)
+      ticks  = self$build_ticks(key, elems, params)
     )
+    grobs$decor <- self$build_decor(params$decor, grobs$ticks, elems, params)
 
     # Arrange and assemble grobs
     sizes  <- self$measure_grobs(grobs, params, elems)

From 21dbd8a0c9d30b5472169d7908ab07eb33c0f7fb Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Fri, 9 Sep 2022 13:52:35 +0200
Subject: [PATCH 046/111] GuideLegend children can opt-out of label
 re-justification

---
 R/guide-legend.r | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/R/guide-legend.r b/R/guide-legend.r
index d60ef52a44..b3d6b8488d 100644
--- a/R/guide-legend.r
+++ b/R/guide-legend.r
@@ -372,6 +372,7 @@ GuideLegend <- ggproto(
       params$label.position %||% "right",
       .trbl, arg_nm = "label.position"
     )
+    params$rejust_labels <- TRUE
     params$n_breaks <- n_breaks <- nrow(params$key)
     params$n_key_layers <- length(params$decor) + 1 # +1 is key background
 
@@ -477,7 +478,7 @@ GuideLegend <- ggproto(
   },
 
   build_labels = function(key, elements, params) {
-    labels <- lapply(key$.label, function(lab) {
+    lapply(key$.label, function(lab) {
       ggname(
         "guide.label",
         element_grob(
@@ -488,11 +489,6 @@ GuideLegend <- ggproto(
         )
       )
     })
-    justify_grobs(
-      labels,
-      hjust = elements$text$hjust, vjust = elements$text$vjust,
-      int_angle = elements$text$angle, debug = elements$text$debug
-    )
   },
 
   measure_grobs = function(grobs, params, elements) {
@@ -518,11 +514,11 @@ GuideLegend <- ggproto(
 
     # Measure label sizes
     label_widths  <- apply(matrix(
-      c(width_cm(grobs$label), zeroes),
+      c(width_cm(grobs$labels), zeroes),
       nrow = dim[1], ncol = dim[2], byrow = params$byrow
     ), 2, max)
     label_heights <- apply(matrix(
-      c(height_cm(grobs$label), zeroes),
+      c(height_cm(grobs$labels), zeroes),
       nrow = dim[1], ncol = dim[2], byrow = params$byrow
     ), 1, max)
 
@@ -680,14 +676,24 @@ GuideLegend <- ggproto(
     # Add keys
     gt <- gtable_add_grob(
       gt, grobs$decor,
-      name = paste("key", key_rows, key_cols,
-                   c("bg", seq(params$n_key_layers - 1)), sep = "-"),
+      name = names(grobs$decor) %||% paste("key", key_rows, key_cols,
+                   c("bg", seq_len(params$n_key_layers - 1)), sep = "-"),
       clip = "off",
       t = key_rows, r = key_cols, b = key_rows, l = key_cols
     )
-    # Add labels
+
+    labels <- if (params$rejust_labels %||% TRUE) {
+      justify_grobs(
+        grobs$labels,
+        hjust = elements$text$hjust, vjust = elements$text$vjust,
+        int_angle = elements$text$angle, debug = elements$text$debug
+      )
+    } else {
+      grobs$labels
+    }
+
     gt <- gtable_add_grob(
-      gt, grobs$labels,
+      gt, labels,
       name = paste("label", layout$label_row, layout$label_col, sep = "-"),
       clip = "off",
       t = layout$label_row, r = layout$label_col,

From 0e0962a359ac16168ba36e439a680f275244e6cc Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Tue, 13 Sep 2022 10:34:04 +0200
Subject: [PATCH 047/111] Simplify key measuring logic

---
 R/guide-legend.r | 67 ++++++++++++++++++++++++++++++++----------------
 1 file changed, 45 insertions(+), 22 deletions(-)

diff --git a/R/guide-legend.r b/R/guide-legend.r
index b3d6b8488d..d421acff5d 100644
--- a/R/guide-legend.r
+++ b/R/guide-legend.r
@@ -492,34 +492,29 @@ GuideLegend <- ggproto(
   },
 
   measure_grobs = function(grobs, params, elements) {
-    dim <- c(params$nrow, params$ncol)
-    zeroes <- rep(0, prod(dim) - params$n_breaks) # size vector padding
-
-    # For every key position, find the maximum size among the keys coming from
-    # different geom-layers
-    key_size_mat <- lapply(params$decor, function(g) {g$data$size / 10})
-    key_size_mat <- inject(cbind(!!!key_size_mat))
-    if (any(dim(key_size_mat) == 0)) {
-      key_size_mat <- matrix(0, ncol = 1, nrow = params$n_breaks)
-    }
-    key_sizes <- apply(key_size_mat, 1, max)
-
-    # Arrange sizes as in eventual layout, take row/column-wise maxima.
-    key_sizes <- matrix(
-      c(key_sizes, zeroes),
-      nrow = dim[1], ncol = dim[2], byrow = params$byrow
+    byrow    <- params$byrow    %||% FALSE
+    n_breaks <- params$n_breaks %||% 1L
+    dim      <- c(params$nrow %||% 1L, params$ncol %||% 1L)
+
+    # A guide may have already specified the size of the decoration, only
+    # measure when it hasn't already.
+    sizes <- params$sizes %||% measure_legend_keys(
+      params$decor, n = n_breaks, dim = dim, byrow = byrow,
+      default_width  = elements$key.width,
+      default_height = elements$key.height
     )
-    widths  <- pmax(elements$key.width,  apply(key_sizes, 2, max))
-    heights <- pmax(elements$key.height, apply(key_sizes, 1, max))
+    widths  <- sizes$widths
+    heights <- sizes$heights
 
     # Measure label sizes
+    zeroes   <- rep(0, prod(dim) - n_breaks) # size vector padding
     label_widths  <- apply(matrix(
       c(width_cm(grobs$labels), zeroes),
-      nrow = dim[1], ncol = dim[2], byrow = params$byrow
+      nrow = dim[1], ncol = dim[2], byrow = byrow
     ), 2, max)
     label_heights <- apply(matrix(
       c(height_cm(grobs$labels), zeroes),
-      nrow = dim[1], ncol = dim[2], byrow = params$byrow
+      nrow = dim[1], ncol = dim[2], byrow = byrow
     ), 1, max)
 
     # Interleave gaps between keys and labels, which depends on the label
@@ -530,7 +525,7 @@ GuideLegend <- ggproto(
       params$label.position,
       "left"   = list(label_widths, hgap, widths, hgap),
       "right"  = list(widths, hgap, label_widths, hgap),
-      list(pmax(label_widths, widths), hgap * (!params$byrow))
+      list(pmax(label_widths, widths), hgap * (!byrow))
     )
     widths  <- head(vec_interleave(!!!widths),  -1)
 
@@ -539,7 +534,7 @@ GuideLegend <- ggproto(
       params$label.position,
       "top"    = list(label_heights, vgap, heights, vgap),
       "bottom" = list(heights, vgap, label_heights, vgap),
-      list(pmax(label_heights, heights), vgap * (params$byrow))
+      list(pmax(label_heights, heights), vgap * (byrow))
     )
     heights <- head(vec_interleave(!!!heights), -1)
 
@@ -705,3 +700,31 @@ GuideLegend <- ggproto(
 
 label_hjust_defaults <- c(top = 0.5, bottom = 0.5, left = 1,   right = 0)
 label_vjust_defaults <- c(top = 0,   bottom = 1,   left = 0.5, right = 0.5)
+
+measure_legend_keys <- function(decor, n, dim, byrow = FALSE,
+                                default_width = 1, default_height = 1) {
+  # Vector padding in case rows * cols > keys
+  zeroes <- rep(0, prod(dim) - n)
+
+  # For every layer, extract the size in cm
+  size <- lapply(decor, function(g) g$data$size / 10) # mm to cm
+  size <- inject(cbind(!!!size))
+
+  # Guard against layers with no size aesthetic
+  if (any(dim(size) == 0)) {
+    size <- matrix(0, ncol = 1, nrow = n)
+  } else {
+    size <- size[seq_len(n), , drop = FALSE]
+  }
+
+  # For every key, find maximum across all layers
+  size <- apply(size, 1, max)
+
+  # Apply legend layout
+  size <- matrix(c(size, zeroes), nrow = dim[1], ncol = dim[2], byrow = byrow)
+
+  list(
+    widths  = pmax(default_width,  apply(size, 2, max)),
+    heights = pmax(default_height, apply(size, 1, max))
+  )
+}

From 94d7c0705c0a5ff7363c5939f2e700133ccbd5d0 Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Tue, 13 Sep 2022 10:35:10 +0200
Subject: [PATCH 048/111] Add sensible defaults for some parameters

---
 R/guide-legend.r | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/R/guide-legend.r b/R/guide-legend.r
index d421acff5d..b54e6f0702 100644
--- a/R/guide-legend.r
+++ b/R/guide-legend.r
@@ -262,7 +262,7 @@ GuideLegend <- ggproto(
   ),
 
   extract_params = function(scale, params, hashables,
-                            title = waiver(), direction = NULL) {
+                            title = waiver(), direction = NULL, ...) {
     params$title <- scale$make_title(
       params$title %|W|% scale$name %|W|% title
     )
@@ -565,14 +565,14 @@ GuideLegend <- ggproto(
 
   arrange_layout = function(key, sizes, params) {
 
-    break_seq <- seq_len(params$n_breaks)
-    dim <- c(params$nrow, params$ncol)
+    break_seq <- seq_len(params$n_breaks %||% 1L)
+    dim <- c(params$nrow %||% 1L, params$ncol %||% 1L)
 
     # Find rows / columns of legend items
-    if (params$byrow) {
+    if (params$byrow %||% FALSE) {
       df <- data_frame0(
-        R = ceiling(break_seq / params$ncol),
-        C = (break_seq - 1) %% params$ncol + 1
+        R = ceiling(break_seq / dim[2]),
+        C = (break_seq - 1) %% dim[2] + 1
       )
     } else {
       df <- mat_2_df(arrayInd(break_seq, dim), c("R", "C"))
@@ -665,14 +665,16 @@ GuideLegend <- ggproto(
 
     # Extract appropriate part of layout
     layout   <- layout$layout
-    key_cols <- rep(layout$key_col, each = params$n_key_layers)
-    key_rows <- rep(layout$key_row, each = params$n_key_layers)
+    n_key_layers <- params$n_key_layers %||% 1L
+    key_cols <- rep(layout$key_col, each = n_key_layers)
+    key_rows <- rep(layout$key_row, each = n_key_layers)
 
     # Add keys
     gt <- gtable_add_grob(
       gt, grobs$decor,
-      name = names(grobs$decor) %||% paste("key", key_rows, key_cols,
-                   c("bg", seq_len(params$n_key_layers - 1)), sep = "-"),
+      name = names(grobs$decor) %||%
+        paste("key", key_rows, key_cols, c("bg", seq_len(n_key_layers - 1)),
+              sep = "-"),
       clip = "off",
       t = key_rows, r = key_cols, b = key_rows, l = key_cols
     )
@@ -689,7 +691,8 @@ GuideLegend <- ggproto(
 
     gt <- gtable_add_grob(
       gt, labels,
-      name = paste("label", layout$label_row, layout$label_col, sep = "-"),
+      name = names(labels) %||%
+        paste("label", layout$label_row, layout$label_col, sep = "-"),
       clip = "off",
       t = layout$label_row, r = layout$label_col,
       b = layout$label_row, l = layout$label_col

From 2cfc27cb2a7585a7134f4cca06348bf10f615ea8 Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Tue, 13 Sep 2022 10:37:08 +0200
Subject: [PATCH 049/111] Convert guide_colourbar

---
 R/guide-colorbar.r | 677 ++++++++++++++++++++-------------------------
 1 file changed, 307 insertions(+), 370 deletions(-)

diff --git a/R/guide-colorbar.r b/R/guide-colorbar.r
index 6f11a92727..3fdf0c3e26 100644
--- a/R/guide-colorbar.r
+++ b/R/guide-colorbar.r
@@ -1,3 +1,6 @@
+#' @include guide-legend.r
+NULL
+
 #' Continuous colour bar guide
 #'
 #' Colour bar guide shows continuous colour scales mapped onto values.
@@ -125,15 +128,17 @@ guide_colourbar <- function(
   raster = TRUE,
 
   # frame
+  frame = element_blank(),
   frame.colour = NULL,
-  frame.linewidth = 0.5 / .pt,
-  frame.linetype = 1,
+  frame.linewidth = NULL,
+  frame.linetype = NULL,
 
   # ticks
-  ticks = TRUE,
-  ticks.colour = "white",
-  ticks.linewidth = 0.5 / .pt,
-  draw.ulim= TRUE,
+  ticks = element_line(),
+  ticks.colour = NULL,
+  ticks.linewidth = NULL,
+  ticks.length = unit(0.2, "npc"),
+  draw.ulim = TRUE,
   draw.llim = TRUE,
 
   # general
@@ -142,13 +147,62 @@ guide_colourbar <- function(
   reverse = FALSE,
   order = 0,
   available_aes = c("colour", "color", "fill"),
+  ...
+) {
+  if (!inherits(barwidth, c("NULL", "unit"))) {
+    barwidth <- unit(barwidth, default.unit)
+  }
+  if (!inherits(barheight, c("NULL", "unit"))) {
+    barheight <- unit(barheight, default.unit)
+  }
+  if (!inherits(ticks.length, "unit")) {
+    ticks.length <- unit(ticks.length, default.unit)
+  }
+
+  if (!is.null(title.position)) {
+    title.position <- arg_match0(title.position, .trbl)
+  }
+  if (!is.null(direction)) {
+    direction <- arg_match0(direction, c("horizontal", "vertical"))
+  }
+  if (!is.null(label.position)) {
+    label.position <- arg_match0(label.position, .trbl)
+  }
+
+  if (!is.null(frame.colour) && !inherits(frame, "element_rect")) {
+    # For backward compatibility, frame should not be element_blank when
+    # colour is not NULL
+    cli::cli_inform(c(paste0(
+      "If {.arg frame.colour} is set, {.arg frame} should not be ",
+      "{.cls {class(frame)[[1]]}}."
+    ), "i" = "{.arg frame} has been converted to {.cls element_rect}."))
+    frame <- element_rect()
+  }
+  if (inherits(frame, "element_rect")) {
+    frame$colour    <- frame.colour    %||% frame$colour
+    frame$size      <- frame.linewidth %||% frame$size      %||% (0.5 / .pt)
+    frame$linetype  <- frame.linetype  %||% frame$linetype  %||% 1
+  } else {
+    frame <- element_blank()
+  }
 
-  ...) {
+  if (is.logical(ticks)) {
+    # Also for backward compatibility. `ticks = FALSE` used to mean: don't draw
+    # the ticks
+    ticks <- if (ticks) element_line() else element_blank()
+  }
+  if (!inherits(ticks, "element_blank")) {
+    ticks$colour    <- ticks.colour    %||% ticks$colour %||% "white"
+    ticks$size      <- ticks.linewidth %||% ticks$size   %||% (0.5 / .pt)
+    ticks$lineend   <- ticks$lineend   %||% "butt"
+  }
 
-  if (!is.null(barwidth) && !is.unit(barwidth)) barwidth <- unit(barwidth, default.unit)
-  if (!is.null(barheight) && !is.unit(barheight)) barheight <- unit(barheight, default.unit)
+  # Trick to re-use this constructor in `guide_coloursteps()`.
+  args  <- list2(...)
+  super <- args$super %||% GuideColourbar
+  args$super <- NULL
 
-  structure(list2(
+  new_guide(
     # title
     title = title,
     title.position = title.position,
@@ -164,410 +218,293 @@ guide_colourbar <- function(
     label.vjust = label.vjust,
 
     # bar
-    barwidth = barwidth,
-    barheight = barheight,
+    keywidth = barwidth,
+    keyheight = barheight,
     nbin = nbin,
     raster = raster,
 
     # frame
-    frame.colour = frame.colour,
-    frame.linewidth = frame.linewidth,
-    frame.linetype = frame.linetype,
+    frame = frame,
 
     # ticks
     ticks = ticks,
-    ticks.colour = ticks.colour,
-    ticks.linewidth = ticks.linewidth,
-    draw.ulim = draw.ulim,
-    draw.llim = draw.llim,
+    ticks.length = ticks.length,
+    draw_lim = c(isTRUE(draw.llim), isTRUE(draw.ulim)),
 
     # general
     direction = direction,
-    default.unit = default.unit,
     reverse = reverse,
     order = order,
 
     # parameter
     available_aes = available_aes,
-    ...,
-    name = "colorbar"),
-    class = c("guide", "colorbar")
+    name = "colourbar",
+    !!!args,
+    super = super
   )
 }
 
 #' @export
-guide_train.colorbar <- function(guide, scale, aesthetic = NULL) {
+#' @rdname guide_colourbar
+guide_colorbar <- guide_colourbar
 
-  # do nothing if scale are inappropriate
-  if (length(intersect(scale$aesthetics, guide$available_aes)) == 0) {
-    cli::cli_warn("colourbar guide needs appropriate scales: {.or {.field {guide$available_aes}}}")
-    return(NULL)
-  }
-  if (scale$is_discrete()) {
-    cli::cli_warn("colourbar guide needs continuous scales.")
-    return(NULL)
-  }
+GuideColourbar <- ggproto(
+  "GuideColourbar", GuideLegend,
 
+  params = list(
+    # title
+    title = waiver(),
+    title.position = NULL,
+    title.theme = NULL,
+    title.hjust = NULL,
+    title.vjust = NULL,
 
-  # create data frame for tick display
-  breaks <- scale$get_breaks()
-  if (length(breaks) == 0 || all(is.na(breaks)))
-    return()
+    # label
+    label = TRUE,
+    label.position = NULL,
+    label.theme = NULL,
+    label.hjust = NULL,
+    label.vjust = NULL,
 
-  ticks <- data_frame(scale$map(breaks), .name_repair = ~ aesthetic %||% scale$aesthetics[1])
-  ticks$.value <- breaks
-  ticks$.label <- scale$get_labels(breaks)
+    # bar
+    keywidth  = NULL,
+    keyheight = NULL,
+    nbin = 300,
+    raster = TRUE,
 
-  guide$key <- ticks
+    # frame
+    frame = NULL,
 
-  # bar specification (number of divs etc)
-  .limits <- scale$get_limits()
-  .bar <- seq(.limits[1], .limits[2], length.out = guide$nbin)
-  if (length(.bar) == 0) {
-    .bar = unique0(.limits)
-  }
-  guide$bar <- data_frame0(
-    colour = scale$map(.bar),
-    value = .bar,
-    .size = length(.bar)
-  )
-  if (guide$reverse) {
-    guide$key <- guide$key[nrow(guide$key):1, ]
-    guide$bar <- guide$bar[nrow(guide$bar):1, ]
-  }
-  guide$hash <- with(guide, hash(list(title, key$.label, bar, name)))
-  guide
-}
+    # ticks
+    ticks = NULL,
+    ticks.length = unit(0.2, "npc"),
+    draw_lim = c(TRUE, TRUE),
 
-# simply discards the new guide
-#' @export
-guide_merge.colorbar <- function(guide, new_guide) {
-  guide
-}
+    # general
+    direction = NULL,
+    reverse = FALSE,
+    order = 0,
 
-# this guide is not geom-based.
-#' @export
-guide_geom.colorbar <- function(guide, layers, default_mapping) {
-  # Layers that use this guide
-  guide_layers <- lapply(layers, function(layer) {
-    matched <- matched_aes(layer, guide)
+    # parameter
+    name = "colourbar",
+    hash = character(),
+    position = NULL
+  ),
 
-    if (length(matched) == 0) {
-      # This layer does not use this guide
-      return(NULL)
-    }
+  available_aes = c("colour", "color", "fill"),
 
-    # check if this layer should be included
-    if (include_layer_in_guide(layer, matched)) {
-      layer
-    } else {
-      NULL
+  hashables = quos(title, key$.label, decor, name),
+
+  elements = list(
+    frame       = "rect",
+    ticks       = "line",
+    ticks_length = unit(0.2, "npc"),
+    background  = "legend.background",
+    margin      = "legend.margin",
+    spacing     = "legend.spacing",
+    spacing.x   = "legend.spacing.x",
+    spacing.y   = "legend.spacing.y",
+    key         = "legend.key",
+    key.height  = "legend.key.height",
+    key.width   = "legend.key.width",
+    text        = "legend.text",
+    text.align  = "legend.text.align",
+    theme.title = "legend.title",
+    title.align = "legend.title.align"
+  ),
+
+  extract_decor = function(scale, aesthetic, nbin = 300, reverse = FALSE, ...) {
+
+    limits <- scale$get_limits()
+    bar <- seq(limits[1], limits[2], length.out = nbin)
+    if (length(bar) == 0) {
+      bar <- unique0(limits)
     }
-  })
-
-  # Remove this guide if no layer uses it
-  if (length(compact(guide_layers)) == 0) guide <- NULL
-
-  guide
-}
-
-#' @export
-guide_gengrob.colorbar <- function(guide, theme) {
-
-  # settings of location and size
-  if (guide$direction == "horizontal") {
-    label.position <- guide$label.position %||% "bottom"
-    if (!label.position %in% c("top", "bottom")) {
-      cli::cli_abort(c(
-        "label position {.val {label.position}} is invalid",
-        "i" = "use either {.val 'top'} or {.val 'bottom'}"
-      ))
+    bar <- data_frame0(
+      colour = scale$map(bar),
+      value  = bar,
+      .size  = length(bar)
+    )
+    if (reverse) {
+      bar <- bar[nrow(bar):1, , drop = FALSE]
     }
+    return(bar)
+  },
 
-    barwidth <- width_cm(guide$barwidth %||% (theme$legend.key.width * 5))
-    barheight <- height_cm(guide$barheight %||% theme$legend.key.height)
-  } else { # guide$direction == "vertical"
-    label.position <- guide$label.position %||% "right"
-    if (!label.position %in% c("left", "right")) {
-      cli::cli_abort(c(
-        "label position {.val {label.position}} is invalid",
-        "i" = "use either {.val 'left'} or {.val 'right'}"
+  extract_params = function(scale, params, hashables,
+                            title  = waiver(), direction = "vertical", ...) {
+    params$title <- scale$make_title(
+      params$title %|W|% scale$name %|W|% title
+    )
+    params$direction <- arg_match0(
+      params$direction %||% direction,
+      c("horizontal", "vertical"), arg_nm = "direction"
+    )
+    valid_label_pos <- switch(
+      params$direction,
+      "horizontal" = c("bottom", "top"),
+      "vertical"   = c("right", "left")
+    )
+    params$label.position <- params$label.position %||% valid_label_pos[1]
+    if (!params$label.position %in% valid_label_pos) {
+      cli::cli_abort(paste0(
+        "When {.arg direction} is {.val {params$direction}}, ",
+        "{.arg label.position} must be one of {.or {.val {valid_label_pos}}}, ",
+        "not {.val {params$label.position}}."
       ))
     }
 
-    barwidth <- width_cm(guide$barwidth %||% theme$legend.key.width)
-    barheight <- height_cm(guide$barheight %||% (theme$legend.key.height * 5))
-  }
-
-  barlength <- switch(guide$direction, "horizontal" = barwidth, "vertical" = barheight)
-  nbreak <- nrow(guide$key)
+    limits <- c(params$decor$value[1], params$decor$value[nrow(params$decor)])
+    params$key$.value <- rescale(
+      params$key$.value,
+      c(0.5, params$nbin - 0.5) / params$nbin,
+      limits
+    )
+    Guide$extract_params(scale, params, hashables)
+  },
+
+  merge = function(self, params, new_guide, new_params) {
+    return(list(guide = self, params = params))
+  },
+
+  geom = function(params, layers, default_mapping) {
+
+    guide_layers <- lapply(layers, function(layer) {
+      # Previously `matched_aes()`
+      all_aes  <- names(c(layer$computed_mapping, layer$stat$default_aes))
+      geom_aes <- c(layer$geom$required_aes, names(layer$geom$default_aes))
+
+      if (layer$geom$rename_size &&
+          "size" %in% all_aes && !"linewidth" %in% all_aes) {
+        geom_aes <- c(geom_aes, size)
+      }
+
+      matched_aes <- intersect(intersect(all_aes, geom_aes), names(params$key))
+      matched_aes <- setdiff(matched_aes, names(layer$computed_geom_params))
+      matched_aes <- setdiff(matched_aes, names(layer$aes_params))
+
+      # Check if this layer should be included
+      if (include_layer_in_guide(layer, matched_aes)) {
+        layer
+      } else {
+        NULL
+      }
+    })
 
-  # make the bar grob (`grob.bar`)
-  if (guide$raster) {
-    image <- switch(guide$direction, horizontal = t(guide$bar$colour), vertical = rev(guide$bar$colour))
-    grob.bar <-rasterGrob(image = image, width = barwidth, height = barheight, default.units = "cm", gp = gpar(col = NA), interpolate = TRUE)
-  } else {
-    if (guide$direction == "horizontal") {
-      bw <- barwidth / nrow(guide$bar)
-      bx <- (seq(nrow(guide$bar)) - 1) * bw
-      grob.bar <-rectGrob(x = bx, y = 0, vjust = 0, hjust = 0, width = bw, height = barheight, default.units = "cm",
-                          gp = gpar(col = NA, fill = guide$bar$colour))
-    } else { # guide$direction == "vertical"
-      bh <- barheight / nrow(guide$bar)
-      by <- (seq(nrow(guide$bar)) - 1) * bh
-      grob.bar <-rectGrob(x = 0, y = by, vjust = 0, hjust = 0, width = barwidth, height = bh, default.units = "cm",
-                          gp = gpar(col = NA, fill = guide$bar$colour))
+    if (length(compact(guide_layers)) == 0) {
+      return(NULL)
     }
-  }
-
-  # make frame around color bar if requested (colour is not NULL)
-  if (!is.null(guide$frame.colour)) {
-    grob.bar <- grobTree(
-                  grob.bar,
-                  rectGrob(
-                    width = barwidth,
-                    height = barheight,
-                    default.units = "cm",
-                    gp = gpar(
-                      col = guide$frame.colour,
-                      lwd = guide$frame.linewidth * .pt,
-                      lty = guide$frame.linetype,
-                      fill = NA)
-                    )
-                  )
-  }
-
-  # tick and label position
-  tick_pos <- rescale(guide$key$.value, c(0.5, guide$nbin - 0.5), guide$bar$value[c(1, nrow(guide$bar))]) * barlength / guide$nbin
-  label_pos <- unit(tick_pos, "cm")
-  if (!guide$draw.ulim) tick_pos <- tick_pos[-1]
-  if (!guide$draw.llim) tick_pos <- tick_pos[-length(tick_pos)]
-
-  # title
-
-  # obtain the theme for the legend title. We need this both for the title grob
-  # and to obtain the title fontsize.
-  title.theme <- guide$title.theme %||% calc_element("legend.title", theme)
-
-  title.hjust <- guide$title.hjust %||% theme$legend.title.align %||% title.theme$hjust %||% 0
-  title.vjust <- guide$title.vjust %||% title.theme$vjust %||% 0.5
-
-  grob.title <- ggname("guide.title",
-    element_grob(
-      title.theme,
-      label = guide$title,
-      hjust = title.hjust,
-      vjust = title.vjust,
-      margin_x = TRUE,
-      margin_y = TRUE
+    return(params)
+  },
+
+  setup_params = function(params) {
+    params$title.position <- arg_match0(
+      params$title.position %||%
+        switch(params$direction, vertical = "top", horizontal = "left"),
+      .trbl, arg_nm = "title.position"
     )
-  )
-
-  title_width <- width_cm(grob.title)
-  title_height <- height_cm(grob.title)
-  title_fontsize <- title.theme$size %||% calc_element("legend.title", theme)$size %||%
-    calc_element("text", theme)$size %||% 11
-
-  # gap between keys etc
-  # the default horizontal and vertical gap need to be the same to avoid strange
-  # effects for certain guide layouts
-  hgap <- width_cm(theme$legend.spacing.x  %||% (0.5 * unit(title_fontsize, "pt")))
-  vgap <- height_cm(theme$legend.spacing.y %||% (0.5 * unit(title_fontsize, "pt")))
-
-  # Labels
-
-  # get the defaults for label justification. The defaults are complicated and depend
-  # on the direction of the legend and on label placement
-  just_defaults <- label_just_defaults.colorbar(guide$direction, label.position)
-  # don't set expressions left-justified
-  if (just_defaults$hjust == 0 && any(is.expression(guide$key$.label))) just_defaults$hjust <- 1
-
-  # get the label theme
-  label.theme <- guide$label.theme %||% calc_element("legend.text", theme)
-
-  # We break inheritance for hjust and vjust, because that's more intuitive here; it still allows manual
-  # setting of hjust and vjust if desired. The alternative is to ignore hjust and vjust altogether, which
-  # seems worse
-  if (is.null(guide$label.theme$hjust) && is.null(theme$legend.text$hjust)) label.theme$hjust <- NULL
-  if (is.null(guide$label.theme$vjust) && is.null(theme$legend.text$vjust)) label.theme$vjust <- NULL
-
-  # label.theme in param of guide_legend() > theme$legend.text.align > default
-  hjust <- guide$label.hjust %||% theme$legend.text.align %||% label.theme$hjust %||%
-    just_defaults$hjust
-  vjust <- guide$label.vjust %||% label.theme$vjust %||%
-    just_defaults$vjust
-
-  # make the label grob (`grob.label`)
-  if (!guide$label)
-    grob.label <- zeroGrob()
-  else {
-    if (guide$direction == "horizontal") {
-      x <- label_pos
-      y <- rep(vjust, length(label_pos))
-      margin_x <- FALSE
-      margin_y <- TRUE
-    } else { # guide$direction == "vertical"
-      x <- rep(hjust, length(label_pos))
-      y <- label_pos
-      margin_x <- TRUE
-      margin_y <- FALSE
+    params$rejust_labels <- FALSE
+    params
+  },
+
+  override_elements = function(params, elements, theme) {
+    # These key sizes are the defaults, the GuideLegend method may overrule this
+    if (params$direction == "horizontal") {
+      elements$key.width <- elements$key.width * 5
+    } else {
+      elements$key.height <- elements$key.height * 5
     }
-    label <- guide$key$.label
-
-    # If any of the labels are quoted language objects, convert them
-    # to expressions. Labels from formatter functions can return these
-    if (any(vapply(label, is.call, logical(1)))) {
-      label <- as.expression(label)
+    elements$ticks <- combine_elements(params$ticks, elements$ticks)
+    elements$frame <- combine_elements(params$frame, elements$frame)
+    elements$ticks_length <- params$ticks.length
+    GuideLegend$override_elements(params, elements, theme)
+  },
+
+  build_labels = function(key, elements, params) {
+    just <- if (params$direction == "horizontal") {
+      elements$text$vjust
+    } else {
+      elements$text$hjust
     }
-    grob.label <- element_grob(
-      element = label.theme,
-      label = label,
-      x = x,
-      y = y,
-      hjust = hjust,
-      vjust = vjust,
-      margin_x = margin_x,
-      margin_y = margin_y
-    )
-    grob.label <- ggname("guide.label", grob.label)
-  }
 
-  label_width <- width_cm(grob.label)
-  label_height <- height_cm(grob.label)
-
-  # make the ticks grob (`grob.ticks`)
-  if (!guide$ticks)
-    grob.ticks <-zeroGrob()
-  else {
-    if (guide$direction == "horizontal") {
-      x0 <- rep(tick_pos, 2)
-      y0 <- c(rep(0, nbreak), rep(barheight * (4/5), nbreak))
-      x1 <- rep(tick_pos, 2)
-      y1 <- c(rep(barheight * (1/5), nbreak), rep(barheight, nbreak))
-    } else { # guide$direction == "vertical"
-      x0 <- c(rep(0, nbreak), rep(barwidth * (4/5), nbreak))
-      y0 <- rep(tick_pos, 2)
-      x1 <- c(rep(barwidth * (1/5), nbreak), rep(barwidth, nbreak))
-      y1 <- rep(tick_pos, 2)
-    }
-    grob.ticks <- segmentsGrob(
-      x0 = x0, y0 = y0, x1 = x1, y1 = y1,
-      default.units = "cm",
-      gp = gpar(
-        col = guide$ticks.colour,
-        lwd = guide$ticks.linewidth * .pt,
-        lineend = "butt"
-      )
+    list(flip_element_grob(
+      elements$text,
+      label = key$.label,
+      x = unit(key$.value, "npc"),
+      y = rep(just, nrow(key)),
+      margin_x = FALSE,
+      margin_y = TRUE,
+      flip = params$direction == "vertical"
+    ))
+  },
+
+  build_ticks = function(key, elements, params, position = params$position) {
+    pos <- key$.value
+    if (!params$draw_lim[1]) pos <- pos[-1]
+    if (!params$draw_lim[2]) pos <- pos[-length(pos)]
+    position <- switch(
+      params$direction,
+      "horizontal" = c("bottom", "top"),
+      "vertical"   = c("right", "left")
     )
-  }
-
-  # layout of bar and label
-  if (guide$direction == "horizontal") {
-    if (label.position == "top") {
-      bl_widths <- barwidth
-      bl_heights <- c(label_height, vgap, barheight)
-      vps <- list(bar.row = 3, bar.col = 1,
-                  label.row = 1, label.col = 1)
-    } else { # label.position == "bottom" or other
-      bl_widths <- barwidth
-      bl_heights <- c(barheight, vgap, label_height)
-      vps <- list(bar.row = 1, bar.col = 1,
-                  label.row = 3, label.col = 1)
-    }
-  } else { # guide$direction == "vertical"
-    if (label.position == "left") {
-      bl_widths <- c(label_width, hgap, barwidth)
-      bl_heights <- barheight
-      vps <- list(bar.row = 1, bar.col = 3,
-                  label.row = 1, label.col = 1)
-    } else { # label.position == "right" or other
-      bl_widths <- c(barwidth, hgap, label_width)
-      bl_heights <- barheight
-      vps <- list(bar.row = 1, bar.col = 1,
-                  label.row = 1, label.col = 3)
-    }
-  }
+    elements$ticks_length <- rep(elements$ticks_length, length.out = 2)
+    elem1 <- elem2 <- elements
+    elem1$ticks_length <- elements$ticks_length[2]
+    elem2$ticks_length <- elements$ticks_length[1]
+
+    grobTree(
+      Guide$build_ticks(pos, elem1, params, position[1]),
+      Guide$build_ticks(pos, elem2, params, position[2])
+    )
+  },
 
-  # layout of title and bar+label
-  switch(guide$title.position,
-    "top" = {
-      widths <- c(bl_widths, max(0, title_width - sum(bl_widths)))
-      heights <- c(title_height, vgap, bl_heights)
-      vps <- with(vps,
-                  list(bar.row = bar.row + 2, bar.col = bar.col,
-                       label.row = label.row + 2, label.col = label.col,
-                       title.row = 1, title.col = 1:length(widths)))
-    },
-    "bottom" = {
-      widths <- c(bl_widths, max(0, title_width - sum(bl_widths)))
-      heights <- c(bl_heights, vgap, title_height)
-      vps <- with(vps,
-                  list(bar.row = bar.row, bar.col = bar.col,
-                       label.row = label.row, label.col = label.col,
-                       title.row = length(heights), title.col = 1:length(widths)))
-    },
-    "left" = {
-      widths <- c(title_width, hgap, bl_widths)
-      heights <- c(bl_heights, max(0, title_height - sum(bl_heights)))
-      vps <- with(vps,
-                  list(bar.row = bar.row, bar.col = bar.col + 2,
-                       label.row = label.row, label.col = label.col + 2,
-                       title.row = 1:length(heights), title.col = 1))
-    },
-    "right" = {
-      widths <- c(bl_widths, hgap, title_width)
-      heights <- c(bl_heights, max(0, title_height - sum(bl_heights)))
-      vps <- with(vps,
-                  list(bar.row = bar.row, bar.col = bar.col,
-                       label.row = label.row, label.col = label.col,
-                       title.row = 1:length(heights), title.col = length(widths)))
-    })
+  build_decor = function(decor, ticks, elements, params) {
 
-  # background
-  grob.background <- element_render(theme, "legend.background")
-
-  # padding
-  padding <- convertUnit(theme$legend.margin %||% margin(), "cm", valueOnly = TRUE)
-  widths <- c(padding[4], widths, padding[2])
-  heights <- c(padding[1], heights, padding[3])
-
-  gt <- gtable(widths = unit(widths, "cm"), heights = unit(heights, "cm"))
-  gt <- gtable_add_grob(gt, grob.background, name = "background", clip = "off",
-    t = 1, r = -1, b = -1, l = 1)
-  gt <- gtable_add_grob(gt, grob.bar, name = "bar", clip = "off",
-    t = 1 + min(vps$bar.row), r = 1 + max(vps$bar.col),
-    b = 1 + max(vps$bar.row), l = 1 + min(vps$bar.col))
-  gt <- gtable_add_grob(
-    gt,
-    grob.label,
-    name = "label",
-    clip = "off",
-    t = 1 + min(vps$label.row), r = 1 + max(vps$label.col),
-    b = 1 + max(vps$label.row), l = 1 + min(vps$label.col)
-  )
-  gt <- gtable_add_grob(
-    gt,
-    justify_grobs(
-      grob.title,
-      hjust = title.hjust,
-      vjust = title.vjust,
-      int_angle = title.theme$angle,
-      debug = title.theme$debug
-    ),
-    name = "title",
-    clip = "off",
-    t = 1 + min(vps$title.row), r = 1 + max(vps$title.col),
-    b = 1 + max(vps$title.row), l = 1 + min(vps$title.col)
-  )
+    if (params$raster) {
+      image <- switch(
+        params$direction,
+        "horizontal" = t(decor$colour),
+        "vertical"   = rev(decor$colour)
+      )
+      grob <- rasterGrob(
+        image  = image,
+        width  = elements$key.width,
+        height = elements$key.height,
+        default.units = "cm",
+        gp = gpar(col = NA),
+        interpolate = TRUE
+      )
+    } else{
+      if (params$direction == "horizontal") {
+        width  <- elements$key.width / nrow(decor)
+        height <- elements$key.height
+        x <- (seq(nrow(decor)) - 1) * width
+        y <- 0
+      } else {
+        width  <- elements$key.width
+        height <- elements$key.height / nrow(decor)
+        y <- (seq(nrow(decor)) - 1) * height
+        x <- 0
+      }
+      grob <- rectGrob(
+        x = x, y = y,
+        vjust = 0, hjust = 0,
+        width = width, height = height,
+        default.units = "cm",
+        gp = gpar(col = NA, fill = decor$colour)
+      )
+    }
 
-  gt <- gtable_add_grob(gt, grob.ticks, name = "ticks", clip = "off",
-    t = 1 + min(vps$bar.row), r = 1 + max(vps$bar.col),
-    b = 1 + max(vps$bar.row), l = 1 + min(vps$bar.col)
-  )
+    frame <- element_grob(elements$frame, fill = NA)
 
-  gt
-}
+    list(bar = grob, frame = frame, ticks = ticks)
+  },
 
-#' @export
-#' @rdname guide_colourbar
-guide_colorbar <- guide_colourbar
+  measure_grobs = function(grobs, params, elements) {
+    params$sizes <- list(
+      widths  = elements$key.width,
+      heights = elements$key.height
+    )
+    GuideLegend$measure_grobs(grobs, params, elements)
+  }
+)

From f29996342b996839bebd33e8ce80e7e871936e7a Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Tue, 13 Sep 2022 10:58:09 +0200
Subject: [PATCH 050/111] More use theme elements more consistently

---
 R/guide-colorbar.r | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/R/guide-colorbar.r b/R/guide-colorbar.r
index 3fdf0c3e26..ad447f6559 100644
--- a/R/guide-colorbar.r
+++ b/R/guide-colorbar.r
@@ -194,7 +194,6 @@ guide_colourbar <- function(
   if (!inherits(ticks, "element_blank")) {
     ticks$colour    <- ticks.colour    %||% ticks$colour %||% "white"
     ticks$size      <- ticks.linewidth %||% ticks$size   %||% (0.5 / .pt)
-    ticks$lineend   <- ticks$lineend   %||% "butt"
   }
 
   # Trick to re-use this constructor in `guide_coloursteps()`.
@@ -228,7 +227,7 @@ guide_colourbar <- function(
 
     # ticks
     ticks = ticks,
-    ticks.length = ticks.length,
+    ticks_length = ticks.length,
     draw_lim = c(isTRUE(draw.llim), isTRUE(draw.ulim)),
 
     # general
@@ -272,12 +271,6 @@ GuideColourbar <- ggproto(
     nbin = 300,
     raster = TRUE,
 
-    # frame
-    frame = NULL,
-
-    # ticks
-    ticks = NULL,
-    ticks.length = unit(0.2, "npc"),
     draw_lim = c(TRUE, TRUE),
 
     # general
@@ -414,9 +407,8 @@ GuideColourbar <- ggproto(
     } else {
       elements$key.height <- elements$key.height * 5
     }
-    elements$ticks <- combine_elements(params$ticks, elements$ticks)
-    elements$frame <- combine_elements(params$frame, elements$frame)
-    elements$ticks_length <- params$ticks.length
+    elements$ticks <- combine_elements(elements$ticks, theme$line)
+    elements$frame <- combine_elements(elements$frame, theme$rect)
     GuideLegend$override_elements(params, elements, theme)
   },
 

From 184774b29962bd8d91983f095bb256bab091c149 Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Tue, 13 Sep 2022 11:44:44 +0200
Subject: [PATCH 051/111] Document alternate use for `frame` and `ticks` in
 GuideColourbar

---
 R/guide-colorbar.r | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/R/guide-colorbar.r b/R/guide-colorbar.r
index ad447f6559..a7bab3ad40 100644
--- a/R/guide-colorbar.r
+++ b/R/guide-colorbar.r
@@ -21,8 +21,12 @@ NULL
 #' @param barheight A numeric or a [grid::unit()] object specifying
 #'   the height of the colourbar. Default value is `legend.key.height` or
 #'   `legend.key.size` in [theme()] or theme.
+#' @param frame A theme object for rendering a frame drawn around the bar.
+#'   Usually, the object of `element_rect()` is expected. If `element_blank()`
+#'   (default), no frame is drawn.
 #' @param frame.colour A string specifying the colour of the frame
-#'   drawn around the bar. If `NULL` (the default), no frame is drawn.
+#'   drawn around the bar. For backward compatibility, if this argument is
+#'   not `NULL`, the `frame` argument will be set to `element_rect()`.
 #' @param frame.linewidth A numeric specifying the width of the frame
 #'   drawn around the bar in millimetres.
 #' @param frame.linetype A numeric specifying the linetype of the frame
@@ -33,11 +37,16 @@ NULL
 #'   raster object. If `FALSE` then the colourbar is rendered as a set of
 #'   rectangles. Note that not all graphics devices are capable of rendering
 #'   raster image.
-#' @param ticks A logical specifying if tick marks on the colourbar should be
-#'   visible.
+#' @param ticks A theme object for rendering tick marks at the colourbar.
+#'   Usually, the object of `element_line()` is expected (default). If
+#'   `element_blank()`, no tick marks are drawn. For backward compatibility,
+#'   can also be a logical which translates `TRUE` to `element_line()` and
+#'   `FALSE` to `element_blank()`.
 #' @param ticks.colour A string specifying the colour of the tick marks.
 #' @param ticks.linewidth A numeric specifying the width of the tick marks in
 #'   millimetres.
+#' @param ticks.length A numeric or a [grid::unit()] object specifying the
+#'   length of tick marks at the colourbar.
 #' @param draw.ulim A logical specifying if the upper limit tick marks should
 #'   be visible.
 #' @param draw.llim A logical specifying if the lower limit tick marks should
@@ -247,6 +256,10 @@ guide_colourbar <- function(
 #' @rdname guide_colourbar
 guide_colorbar <- guide_colourbar
 
+#' @rdname ggplot2-ggproto
+#' @format NULL
+#' @usage NULL
+#' @export
 GuideColourbar <- ggproto(
   "GuideColourbar", GuideLegend,
 
@@ -419,7 +432,7 @@ GuideColourbar <- ggproto(
       elements$text$hjust
     }
 
-    list(flip_element_grob(
+    list(labels = flip_element_grob(
       elements$text,
       label = key$.label,
       x = unit(key$.value, "npc"),

From e9c24ec808283c428b931ddd98a04ac2e494f671 Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Tue, 13 Sep 2022 11:55:37 +0200
Subject: [PATCH 052/111] Convert `guide_bins()` to ggproto

---
 R/guide-bins.R | 805 +++++++++++++++++++------------------------------
 1 file changed, 305 insertions(+), 500 deletions(-)

diff --git a/R/guide-bins.R b/R/guide-bins.R
index 047db20166..cd33ab2664 100644
--- a/R/guide-bins.R
+++ b/R/guide-bins.R
@@ -1,3 +1,6 @@
+#' @include guide-legend.r
+NULL
+
 #' A binned version of guide_legend
 #'
 #' This guide is a version of the [guide_legend()] guide for binned scales. It
@@ -8,7 +11,11 @@
 #' guide if they are mapped in the same way.
 #'
 #' @inheritParams guide_legend
-#' @param axis Logical. Should a small axis be drawn along the guide
+#' @param axis A theme object for rendering a small axis along the guide.
+#'   Usually, the object of `element_line()` is expected (default). If
+#'   `element_blank()`, no axis is drawn. For backward compatibility, can also
+#'   be a logical which translates `TRUE` to `element_line()` and `FALSE` to
+#'   `element_blank()`.
 #' @param axis.colour,axis.linewidth Graphic specifications for the look of the
 #'   axis.
 #' @param axis.arrow A call to `arrow()` to specify arrows at the end of the
@@ -18,6 +25,12 @@
 #'   scale. This argument is ignored if `labels` is given as a vector of
 #'   values. If one or both of the limits is also given in `breaks` it will be
 #'   shown irrespective of the value of `show.limits`.
+#' @param ticks A theme object for rendering tick marks at the colourbar.
+#'   Usually, the object of `element_line()` is expected. If `element_blank()`,
+#'   no tick marks are drawn. If `NULL` (default), the `axis` argument is
+#'   re-used as `ticks` argument (without arrow).
+#' @param ticks.length A numeric or a [grid::unit()] object specifying the
+#'   length of tick marks between the keys.
 #'
 #' @section Use with discrete scale:
 #' This guide is intended to show binned data and work together with ggplot2's
@@ -62,37 +75,76 @@ guide_bins <- function(
   # title
   title = waiver(),
   title.position = NULL,
-  title.theme = NULL,
-  title.hjust = NULL,
-  title.vjust = NULL,
+  title.theme    = NULL,
+  title.hjust    = NULL,
+  title.vjust    = NULL,
 
   # label
-  label = TRUE,
+  label          = TRUE,
   label.position = NULL,
-  label.theme = NULL,
-  label.hjust = NULL,
-  label.vjust = NULL,
+  label.theme    = NULL,
+  label.hjust    = NULL,
+  label.vjust    = NULL,
 
   # key
-  keywidth = NULL,
+  keywidth  = NULL,
   keyheight = NULL,
 
   # ticks
-  axis = TRUE,
-  axis.colour = "black",
-  axis.linewidth = 0.5,
-  axis.arrow = NULL,
+  axis           = TRUE,
+  axis.colour    = "black",
+  axis.linewidth = NULL,
+  axis.arrow     = NULL,
+
+  ticks        = NULL,
+  ticks.length = unit(0.2, "npc"),
 
   # general
-  direction = NULL,
+  direction    = NULL,
   default.unit = "line",
   override.aes = list(),
-  reverse = FALSE,
-  order = 0,
-  show.limits = NULL,
-  ...) {
+  reverse      = FALSE,
+  order        = 0,
+  show.limits  = NULL,
+  ...
+) {
+
+  if (!inherits(keywidth, c("NULL", "unit"))) {
+    keywidth <- unit(keywidth, default.unit)
+  }
+  if (!inherits(keyheight, c("NULL", "unit"))) {
+    keyheight <- unit(keyheight, default.unit)
+  }
+  if (!inherits(ticks.length, "unit")) {
+    ticks.length <- unit(ticks.length, default.unit)
+  }
+  if (!is.null(title.position)) {
+    title.position <- arg_match0(title.position, .trbl)
+  }
+  if (!is.null(direction)) {
+    direction <- arg_match0(direction, c("horizontal", "vertical"))
+  }
+  if (!is.null(label.position)) {
+    label.position <- arg_match0(label.position, .trbl)
+  }
 
-  structure(list2(
+  if (is.logical(axis)) {
+    axis <- if (axis) element_line() else element_rect()
+  }
+  if (inherits(axis, "element_line")) {
+    axis$colour   <- axis.colour    %||% axis$colour %||% "black"
+    axis$size     <- axis.linewidth %||% axis$size   %||% (0.5 / .pt)
+    axis$arrow    <- axis.arrow     %||% axis$arrow
+  } else {
+    axis <- element_blank()
+  }
+
+  if (is.null(ticks)) {
+    ticks <- axis
+    ticks$arrow <- NULL
+  }
+
+  new_guide(
     # title
     title = title,
     title.position = title.position,
@@ -108,19 +160,17 @@ guide_bins <- function(
     label.vjust = label.vjust,
 
     # key
-    keywidth = keywidth,
+    keywidth  = keywidth,
     keyheight = keyheight,
 
     # ticks
-    axis = axis,
-    axis.colour = axis.colour,
-    axis.linewidth = axis.linewidth,
-    axis.arrow = axis.arrow,
+    line  = axis,
+    ticks = ticks,
+    ticks_length = ticks.length,
 
     # general
     direction = direction,
     override.aes = rename_aes(override.aes),
-    default.unit = default.unit,
     reverse = reverse,
     order = order,
     show.limits = show.limits,
@@ -128,520 +178,275 @@ guide_bins <- function(
     # parameter
     available_aes = c("any"),
     ...,
-    name = "bins"),
-    class = c("guide", "bins")
+    name = "bins",
+    super = GuideBins
   )
 }
 
+#' @rdname ggplot2-ggproto
+#' @format NULL
+#' @usage NULL
 #' @export
-guide_train.bins <- function(guide, scale, aesthetic = NULL) {
-  breaks <- scale$get_breaks()
-  breaks <- breaks[!is.na(breaks)]
-  if (length(breaks) == 0 || all(is.na(breaks))) {
-    return()
-  }
-  show_limits <- guide$show.limits %||% scale$show.limits %||% FALSE
-  if (show_limits && (is.character(scale$labels) || is.numeric(scale$labels))) {
-    cli::cli_warn(c(
-      "{.arg show.limits} is ignored when {.arg labels} are given as a character vector",
-      "i" = "Either add the limits to {.arg breaks} or provide a function for {.arg labels}"
-    ))
-    show_limits <- FALSE
-  }
-  # in the key data frame, use either the aesthetic provided as
-  # argument to this function or, as a fall back, the first in the vector
-  # of possible aesthetics handled by the scale
-  aes_column_name <- aesthetic %||% scale$aesthetics[1]
-
-  if (is.numeric(breaks)) {
-    limits <- scale$get_limits()
-    if (!is.numeric(scale$breaks)) {
-      breaks <- breaks[!breaks %in% limits]
-    }
-    all_breaks <- unique0(c(limits[1], breaks, limits[2]))
-    bin_at <- all_breaks[-1] - diff(all_breaks) / 2
-  } else {
-    # If the breaks are not numeric it is used with a discrete scale. We check
-    # if the breaks follow the allowed format "(<lower>, <upper>]", and if it
-    # does we convert it into bin specs
-    bin_at <- breaks
-    breaks <- as.character(breaks)
-    breaks <- strsplit(gsub("\\(|\\)|\\[|\\]", "", breaks), ",\\s?")
-    breaks <- as.numeric(unlist(breaks))
-    if (anyNA(breaks)) {
-      cli::cli_abort(c(
-        "Breaks not formatted correctly for a bin legend.",
-        "i" = "Use {.code (<lower>, <upper>]} format to indicate bins"
-      ))
-    }
-    all_breaks <- breaks[c(1, seq_along(bin_at) * 2)]
-    limits <- all_breaks[c(1, length(all_breaks))]
-    breaks <- all_breaks[-c(1, length(all_breaks))]
-  }
-  key <- data_frame(c(scale$map(bin_at), NA), .name_repair = ~ aes_column_name)
-  labels <- scale$get_labels(breaks)
-  show_limits <- rep(show_limits, 2)
-  if (is.character(scale$labels) || is.numeric(scale$labels)) {
-    limit_lab <- c(NA, NA)
-  } else {
-    limit_lab <- scale$get_labels(limits)
-  }
-  if (!breaks[1] %in% limits) {
-    labels <- c(limit_lab[1], labels)
-  } else {
-    show_limits[1] <- TRUE
-  }
-  if (!breaks[length(breaks)] %in% limits) {
-    labels <- c(labels, limit_lab[2])
-  } else {
-    show_limits[2] <- TRUE
-  }
-  key$.label <- labels
-  guide$show.limits <- show_limits
-
-  if (guide$reverse) {
-    key <- key[rev(seq_len(nrow(key))), ]
-    # Move last row back to last
-    aesthetics <- setdiff(names(key), ".label")
-    key[, aesthetics] <- key[c(seq_len(nrow(key))[-1], 1), aesthetics]
-  }
-
-  guide$key <- key
-  guide$hash <- with(
-    guide,
-    hash(list(title, key$.label, direction, name))
-  )
-  guide
-}
+GuideBins <- ggproto(
+  "GuideBins", GuideLegend,
+
+  params = list(
+    title = waiver(),
+    title.position = NULL,
+    title.theme = NULL,
+    title.hjust = NULL,
+    title.vjust = NULL,
+
+    label = TRUE,
+    label.position = NULL,
+    label.theme = NULL,
+    label.hjust = NULL,
+    label.vjust = NULL,
+
+    keywidth  = NULL,
+    keyheight = NULL,
+
+    direction = NULL,
+    override.aes = list(),
+    reverse = FALSE,
+    order = 0,
+    show.limits = FALSE,
+
+    name = "bins",
+    hash = character(),
+    position = NULL,
+    direction = NULL
+  ),
+
+  elements = c(
+    GuideLegend$elements,
+    list(
+      line  = "line",
+      ticks = "line",
+      ticks_length = unit(0.2, "npc")
+    )
+  ),
 
-#' @export
-guide_merge.bins <- function(guide, new_guide) {
-  guide$key <- merge(guide$key, new_guide$key, sort = FALSE)
-  guide$override.aes <- c(guide$override.aes, new_guide$override.aes)
-  if (any(duplicated(names(guide$override.aes)))) {
-    cli::cli_warn("Duplicated {.arg override.aes} is ignored.")
-  }
-  guide$override.aes <- guide$override.aes[!duplicated(names(guide$override.aes))]
-  guide
-}
+  extract_key = function(scale, aesthetic, show.limits = FALSE,
+                         reverse = FALSE, ...) {
 
-#' @export
-guide_geom.bins <- function(guide, layers, default_mapping) {
-  # arrange common data for vertical and horizontal guide
-  guide$geoms <- lapply(layers, function(layer) {
-    matched <- matched_aes(layer, guide)
+    breaks <- scale$get_breaks()
 
-    # check if this layer should be included
-    include <- include_layer_in_guide(layer, matched)
-
-    if (!include) {
-      return(NULL)
+    parsed <- parse_binned_breaks(scale, breaks)
+    if (is.null(parsed)) {
+      return(parsed)
     }
+    limits <- parsed$limits
+    breaks <- parsed$breaks
+
+    key <- data_frame(c(scale$map(parsed$bin_at), NA),
+                      .name_repair = ~ aesthetic)
+    key$.value <- (seq_along(key[[1]]) - 1) / (nrow(key) - 1)
+    key$.show  <- NA
 
-    if (length(matched) > 0) {
-      # Filter out set aesthetics that can't be applied to the legend
-      n <- vapply(layer$aes_params, length, integer(1))
-      params <- layer$aes_params[n == 1]
-
-      aesthetics <- layer$computed_mapping
-      modifiers <- aesthetics[is_scaled_aes(aesthetics) | is_staged_aes(aesthetics)]
-
-      data <- try_fetch(
-        layer$geom$use_defaults(guide$key[matched], params, modifiers),
-        error = function(cnd) {
-          cli::cli_warn("Failed to apply {.fn after_scale} modifications to legend", parent = cnd)
-          layer$geom$use_defaults(guide$key[matched], params, list())
-        }
-      )
+    labels <- scale$get_labels(breaks)
+    if (is.character(scale$labels) || is.numeric(scale$labels)) {
+      limit_lab <- c(NA, NA)
     } else {
-      data <- layer$geom$use_defaults(NULL, layer$aes_params)[rep(1, nrow(guide$key)), ]
+      limit_lab <- scale$get_labels(limits)
     }
-
-    # override.aes in guide_legend manually changes the geom
-    data <- modify_list(data, guide$override.aes)
-
-    list(
-      draw_key = layer$geom$draw_key,
-      data = data,
-      params = c(layer$computed_geom_params, layer$computed_stat_params)
-    )
-  })
-
-  # remove null geom
-  guide$geoms <- compact(guide$geoms)
-
-  # Finally, remove this guide if no layer is drawn
-  if (length(guide$geoms) == 0) guide <- NULL
-  guide
-}
-
-#' @export
-guide_gengrob.bins <- function(guide, theme) {
-  guide$key$.label[c(1, nrow(guide$key))[!guide$show.limits]] <- NA
-
-  # default setting
-  if (guide$direction == "horizontal") {
-    label.position <- guide$label.position %||% "bottom"
-    if (!label.position %in% c("top", "bottom")) {
-      cli::cli_warn("Ignoring invalid {.arg label.position}")
-      label.position <- "bottom"
+    if (!breaks[1] %in% limits) {
+      labels <- c(limit_lab[1], labels)
+    } else {
+      key$.show[1] <- TRUE
     }
-  } else {
-    label.position <- guide$label.position %||% "right"
-    if (!label.position %in% c("left", "right")) {
-      cli::cli_warn("Ignoring invalid {.arg label.position}")
-      label.position <- "right"
+    if (!breaks[length(breaks)] %in% limits) {
+      labels <- c(labels, limit_lab[2])
+    } else {
+      key$.show[nrow(key)] <- TRUE
     }
-  }
 
-  n_keys <- nrow(guide$key) - 1
+    key$.label <- labels
 
-  # obtain the theme for the legend title. We need this both for the title grob
-  # and to obtain the title fontsize.
-  title.theme <- guide$title.theme %||% calc_element("legend.title", theme)
+    return(key)
+  },
 
-  title.hjust <- guide$title.hjust %||% theme$legend.title.align %||% title.theme$hjust %||% 0
-  title.vjust <- guide$title.vjust %||% title.theme$vjust %||% 0.5
+  extract_params = function(scale, params, hashables,
+                            title = waiver(), direction = NULL, ...) {
 
-  grob.title <- ggname("guide.title",
-                       element_grob(
-                         title.theme,
-                         label = guide$title,
-                         hjust = title.hjust,
-                         vjust = title.vjust,
-                         margin_x = TRUE,
-                         margin_y = TRUE
-                       )
-  )
-
-  title_width <- width_cm(grob.title)
-  title_height <- height_cm(grob.title)
-  title_fontsize <- title.theme$size %||% calc_element("legend.title", theme)$size %||%
-    calc_element("text", theme)$size %||% 11
+    show.limits <- params$show.limits %||% scale$show.limits %||% FALSE
 
-  # gap between keys etc
-  # the default horizontal and vertical gap need to be the same to avoid strange
-  # effects for certain guide layouts
-  hgap <- width_cm(theme$legend.spacing.x  %||% (0.5 * unit(title_fontsize, "pt")))
-  vgap <- height_cm(theme$legend.spacing.y %||% (0.5 * unit(title_fontsize, "pt")))
+    if (show.limits &&
+        (is.character(scale$labels) || is.numeric(scale$labels))) {
+      cli::cli_warn(c(paste0(
+        "{.arg show.limits} is ignored when {.arg labels} are given as a ",
+        "character vector."
+      ), "i" = paste0(
+        "Either add the limits to {.arg breaks} or provide a function for ",
+        "{.arg labels}."
+      )))
+      show.limits <- FALSE
+    }
+    show.limits <- rep(show.limits, length.out = 2)
 
-  # Labels
+    key <- params$key
+    show <- key$.show[c(1, nrow(key))]
+    show.limits <- ifelse(is.na(show), show.limits, show)
+    key$.show <- NULL
+    params$show.limits <- show.limits
 
-  # first get the label theme, we need it below even when there are no labels
-  label.theme <- guide$label.theme %||% calc_element("legend.text", theme)
+    if (params$reverse) {
+      key <- key[rev(seq_len(nrow(key))), , drop = FALSE]
+      key$.value <- 1 - key$.value
+    }
 
-  if (!guide$label || is.null(guide$key$.label)) {
-    grob.labels <- rep(list(zeroGrob()), nrow(guide$key))
-  } else {
-    # get the defaults for label justification. The defaults are complicated and depend
-    # on the direction of the legend and on label placement
-    just_defaults <- label_just_defaults.bins(guide$direction, label.position)
-    # don't set expressions left-justified
-    if (just_defaults$hjust == 0 && any(is.expression(guide$key$.label))) just_defaults$hjust <- 1
-
-    # We break inheritance for hjust and vjust, because that's more intuitive here; it still allows manual
-    # setting of hjust and vjust if desired. The alternative is to ignore hjust and vjust altogether, which
-    # seems worse
-    if (is.null(guide$label.theme$hjust) && is.null(theme$legend.text$hjust)) label.theme$hjust <- NULL
-    if (is.null(guide$label.theme$vjust) && is.null(theme$legend.text$vjust)) label.theme$vjust <- NULL
-
-    # label.theme in param of guide_legend() > theme$legend.text.align > default
-    hjust <- guide$label.hjust %||% theme$legend.text.align %||% label.theme$hjust %||%
-      just_defaults$hjust
-    vjust <- guide$label.vjust %||% label.theme$vjust %||%
-      just_defaults$vjust
-
-    grob.labels <- lapply(guide$key$.label, function(label, ...) {
-      g <- element_grob(
-        element = label.theme,
-        label = label,
-        hjust = hjust,
-        vjust = vjust,
-        margin_x = TRUE,
-        margin_y = TRUE
-      )
-      ggname("guide.label", g)
-    })
-    grob.labels[c(1, length(grob.labels))[!guide$show.limits]] <- list(zeroGrob())
-  }
+    params$title <- scale$make_title(
+      params$title %|W|% scale$name %|W|% title
+    )
+    params$direction <- arg_match0(
+      params$direction %||% direction,
+      c("horizontal", "vertical"), arg_nm = "direction"
+    )
+    if (params$direction == "vertical") {
+      key$.value <- 1 - key$.value
+    }
 
-  label_widths <- width_cm(grob.labels)
-  label_heights <- height_cm(grob.labels)
+    params$key <- key
+    valid_label_pos <- switch(
+      params$direction,
+      "horizontal" = c("bottom", "top"),
+      "vertical"   = c("right",  "left")
+    )
+    params$label.position <- params$label.position %||% valid_label_pos[1]
+    if (!params$label.position %in% valid_label_pos) {
+      cli::cli_abort(paste0(
+        "When {.arg direction} is {.val {params$direction}}, ",
+        "{.arg label.position} must be one of {.or {.val {valid_label_pos}}}, ",
+        "not {.val {params$label.position}}."
+      ))
+    }
 
-  # Keys
-  key_width <- width_cm(
-    guide$keywidth %||% theme$legend.key.width %||% theme$legend.key.size
-  )
-  key_height <- height_cm(
-    guide$keyheight %||% theme$legend.key.height %||% theme$legend.key.size
-  )
+    Guide$extract_params(scale, params, hashables)
+  },
 
-  key_size <- lapply(guide$geoms, function(g) g$data$size / 10)
-  key_size_mat <- inject(cbind(!!!key_size))
+  setup_params = function(params) {
+    params <- GuideLegend$setup_params(params)
+    params$byrow <- FALSE
+    params$rejust_labels <- FALSE
+    params$nrow <- params$ncol <- params$n_breaks <- params$n_key_layers <- 1
+    params$multikey_decor <- FALSE
+    params
+  },
 
-  # key_size_mat can be an empty matrix (e.g. the data doesn't contain size
-  # column), so subset it only when it has any rows and columns.
-  if (nrow(key_size_mat) == 0 || ncol(key_size_mat) == 0) {
-    key_size_mat <- matrix(0, ncol = 1, nrow = n_keys)
-  } else {
-    key_size_mat <- key_size_mat[seq_len(n_keys), , drop = FALSE]
-  }
-  key_sizes <- apply(key_size_mat, 1, max)
+  build_labels = function(key, elements, params) {
+    key$.label[c(1, nrow(key))[!params$show.limits]] <- ""
 
-  if (guide$direction == "horizontal") {
-    key.nrow <- 1
-    key.ncol <- n_keys
-    label.nrow <- 1
-    label.ncol <- n_keys + 1
-  } else {
-    key.nrow <- n_keys
-    key.ncol <- 1
-    label.nrow <- n_keys + 1
-    label.ncol <- 1
-  }
+    just <- if (params$direction == "horizontal") {
+      elements$text$vjust
+    } else {
+      elements$text$hjust
+    }
 
-  key_sizes <- matrix(key_sizes, key.nrow, key.ncol)
-  label_sizes <- matrix(label_widths, label.nrow, label.ncol)
+    list(labels = flip_element_grob(
+      elements$text,
+      label = key$.label,
+      x = unit(key$.value, "npc"),
+      y = rep(just, nrow(key)),
+      margin_x = FALSE,
+      margin_y = TRUE,
+      flip = params$direction == "vertical"
+    ))
+  },
 
-  key_widths <- max(key_width, apply(key_sizes, 2, max))
-  key_heights <- max(key_height, apply(key_sizes, 1, max))
+  build_ticks = function(key, elements, params, position = params$position) {
+    key$.value[c(1, nrow(key))[!params$show.limits]] <- NA
+    Guide$build_ticks(key$.value, elements, params, params$label.position)
+  },
 
-  label_widths <- max(apply(label_sizes, 2, max))
-  label_heights <- max(apply(label_sizes, 1, max))
+  build_decor = function(decor, ticks, elements, params) {
+    params$n_breaks <- nkeys <- nrow(params$key) - 1
 
-  key_loc <- data_frame0(
-    R = seq(2, by = 2, length.out = n_keys),
-    C = if (label.position %in% c("right", "bottom")) 1 else 3
-  )
-  label_loc <- data_frame0(
-    R = seq(1, by = 2, length.out = n_keys + 1),
-    C = if (label.position %in% c("right", "bottom")) 3 else 1
-  )
-  tick_loc <- label_loc
-  tick_loc$C <- if (label.position %in% c("right", "bottom")) 1 else 3
-
-  widths <- c(key_widths, hgap, label_widths)
-  if (label.position != "right") widths <- rev(widths)
-  heights <- c(interleave(rep(0, n_keys), key_heights), 0)
-  if (guide$direction == "horizontal") {
-    names(key_loc) <- c("C", "R")
-    names(label_loc) <- c("C", "R")
-    names(tick_loc) <- c("C", "R")
-    heights <- c(key_heights, vgap, label_heights)
-    if (label.position != "bottom") heights <- rev(heights)
-    widths <- c(interleave(rep(0, n_keys), key_widths), 0)
-  }
+    dim <- if (params$direction == "vertical") c(nkeys, 1) else c(1, nkeys)
 
-  # layout the title over key-label
-  switch(guide$title.position,
-    "top" = {
-      widths <- c(widths, max(0, title_width - sum(widths)))
-      heights <- c(title_height, vgap, heights)
-      key_loc$R <- key_loc$R + 2
-      label_loc$R <- label_loc$R + 2
-      tick_loc$R <- tick_loc$R + 2
-      title_row = 1
-      title_col = seq_along(widths)
-    },
-    "bottom" = {
-      widths <- c(widths, max(0, title_width - sum(widths)))
-      heights <- c(heights, vgap, title_height)
-      title_row = length(heights)
-      title_col = seq_along(widths)
-    },
-    "left" = {
-      widths <- c(title_width, hgap, widths)
-      heights <- c(heights, max(0, title_height - sum(heights)))
-      key_loc$C <- key_loc$C + 2
-      label_loc$C <- label_loc$C + 2
-      tick_loc$C <- tick_loc$C + 2
-      title_row = seq_along(heights)
-      title_col = 1
-    },
-    "right" = {
-      widths <- c(widths, hgap, title_width)
-      heights <- c(heights, max(0, title_height - sum(heights)))
-      title_row = seq_along(heights)
-      title_col = length(widths)
+    sizes <- measure_legend_keys(
+      params$decor, nkeys, dim, byrow = FALSE,
+      default_width  = elements$key.width,
+      default_height = elements$key.height
+    )
+    sizes <- lapply(sizes, function(x) rep_len(max(x), length(x)))
+
+    decor <- GuideLegend$build_decor(decor, ticks, elements, params)
+    n_layers <- length(decor) / nkeys
+    key_id <- rep(seq_len(nkeys), each = n_layers)
+    key_nm <- paste("key", key_id, c("bg", seq_len(n_layers - 1)))
+    if (params$direction == "vertical") {
+      top  <- key_id
+      left <- 1
+    } else {
+      top  <- 1
+      left <- key_id
     }
-  )
+    gt <- gtable(
+      widths  = unit(sizes$widths,  "cm"),
+      heights = unit(sizes$heights, "cm")
+    )
+    gt <- gtable_add_grob(gt, decor, t = top, l = left, name = key_nm)
+
+    axis <- switch(
+      params$label.position,
+      "top"    = list(x = c(0, 1), y = c(1, 1)),
+      "bottom" = list(x = c(0, 1), y = c(0, 0)),
+      "left"   = list(x = c(0, 0), y = c(0, 1)),
+      "right"  = list(x = c(1, 1), y = c(0, 1))
+    )
+    axis <- element_grob(elements$line, x = axis$x, y = axis$y)
 
-  # grob for key
-  key_size <- c(key_width, key_height) * 10
+    list(keys = gt, axis_line = axis, ticks = ticks)
+  },
 
-  draw_key <- function(i) {
-    bg <- element_render(theme, "legend.key")
-    keys <- lapply(guide$geoms, function(g) {
-      g$draw_key(g$data[i, ], g$params, key_size)
-    })
-    c(list(bg), keys)
+  measure_grobs = function(grobs, params, elements) {
+    params$sizes <- list(
+      widths  = sum( width_cm(grobs$decor$keys)),
+      heights = sum(height_cm(grobs$decor$keys))
+    )
+    GuideLegend$measure_grobs(grobs, params, elements)
   }
-  grob.keys <- unlist(lapply(seq_len(n_keys), draw_key), recursive = FALSE)
-
-  # background
-  grob.background <- element_render(theme, "legend.background")
+)
 
-  ngeom <- length(guide$geoms) + 1
-  kcols <- rep(key_loc$C, each = ngeom)
-  krows <- rep(key_loc$R, each = ngeom)
+parse_binned_breaks = function(scale, breaks = scale$get_breaks(),
+                               even.steps = TRUE) {
 
-  # padding
-  padding <- convertUnit(theme$legend.margin %||% margin(), "cm", valueOnly = TRUE)
-  widths <- c(padding[4], widths, padding[2])
-  heights <- c(padding[1], heights, padding[3])
-
-  # make the ticks grob (`grob.ticks`)
-  if (!guide$axis) {
-    grob.ticks <- zeroGrob()
-    grob.axis <- zeroGrob()
+  breaks <- breaks[!is.na(breaks)]
+  if (length(breaks) == 0) {
+    return(NULL)
+  }
+  if (is.numeric(breaks)) {
+    limits <- scale$get_limits()
+    if (!is.numeric(scale$breaks)) {
+      breaks <- breaks[!breaks %in% limits]
+    }
+    all_breaks <- unique0(c(limits[1], breaks, limits[2]))
+    bin_at <- all_breaks[-1] - diff(all_breaks) / 2
   } else {
-    if (guide$direction == "horizontal") {
-      x0 <- 0.5
-      y0 <- 0
-      x1 <- 0.5
-      y1 <- 1/5
-      axis_x <- c(0, 1)
-      axis_y <- c(0, 0)
-      if (label.position == "top") {
-        y0 <- 4/5
-        y1 <- 1
-        axis_y <- c(1, 1)
-      }
-    } else { # guide$direction == "vertical"
-      y0 <- 0.5
-      x0 <- 4/5
-      y1 <- 0.5
-      x1 <- 1
-      axis_x <- c(1, 1)
-      axis_y <- c(0, 1)
-      if (label.position == "left") {
-        x0 <- 0
-        x1 <- 1/5
-        axis_x <- c(0, 0)
-      }
+    if (isFALSE(even.steps)) {
+      cli::cli_warn(paste0(
+        "{.code even.steps = FALSE} is not supported when used with a ",
+        "discrete scale."
+      ))
     }
-    grob.ticks <- segmentsGrob(
-      x0 = x0, y0 = y0, x1 = x1, y1 = y1,
-      default.units = "npc",
-      gp = gpar(
-        col = guide$axis.colour,
-        lwd = guide$axis.linewidth,
-        lineend = "butt"
-      )
-    )
-    grob.axis <- segmentsGrob(
-      x0 = axis_x[1], y0 = axis_y[1], x1 = axis_x[2], y1 = axis_y[2],
-      default.units = "npc",
-      arrow = guide$axis.arrow,
-      gp = gpar(
-        col = guide$axis.colour,
-        lwd = guide$axis.linewidth,
-        lineend = if (is.null(guide$axis.arrow)) "square" else "round"
-      )
-    )
-  }
-  grob.ticks <- rep_len(list(grob.ticks), length(grob.labels))
-  grob.ticks[c(1, length(grob.ticks))[!guide$show.limits]] <- list(zeroGrob())
-
-  # Create the gtable for the legend
-  gt <- gtable(widths = unit(widths, "cm"), heights = unit(heights, "cm"))
-  gt <- gtable_add_grob(
-    gt,
-    grob.background,
-    name = "background",
-    clip = "off",
-    t = 1,
-    r = -1,
-    b = -1,
-    l = 1
-  )
-  gt <- gtable_add_grob(
-    gt,
-    justify_grobs(
-      grob.title,
-      hjust = title.hjust,
-      vjust = title.vjust,
-      int_angle = title.theme$angle,
-      debug = title.theme$debug
-    ),
-    name = "title",
-    clip = "off",
-    t = 1 + min(title_row),
-    r = 1 + max(title_col),
-    b = 1 + max(title_row),
-    l = 1 + min(title_col)
-  )
-  gt <- gtable_add_grob(
-    gt,
-    grob.keys,
-    name = paste("key", krows, kcols, c("bg", seq(ngeom - 1)), sep = "-"),
-    clip = "off",
-    t = 1 + krows,
-    r = 1 + kcols,
-    b = 1 + krows,
-    l = 1 + kcols
-  )
-  gt <- gtable_add_grob(
-    gt,
-    grob.ticks,
-    name = paste("tick", tick_loc$R, tick_loc$C, sep = "-"),
-    clip = "off",
-    t = 1 + tick_loc$R,
-    r = 1 + tick_loc$C,
-    b = 1 + tick_loc$R,
-    l = 1 + tick_loc$C
-  )
-  gt <- gtable_add_grob(
-    gt,
-    grob.axis,
-    name = "axis",
-    clip = "off",
-    t = min(1 + tick_loc$R),
-    r = min(1 + tick_loc$C),
-    b = max(1 + tick_loc$R),
-    l = max(1 + tick_loc$C)
-  )
-  gt <- gtable_add_grob(
-    gt,
-    justify_grobs(
-      grob.labels,
-      hjust = hjust,
-      vjust = vjust,
-      int_angle = label.theme$angle,
-      debug = label.theme$debug
-    ),
-    name = paste("label", label_loc$R, label_loc$C, sep = "-"),
-    clip = "off",
-    t = 1 + label_loc$R,
-    r = 1 + label_loc$C,
-    b = 1 + label_loc$R,
-    l = 1 + label_loc$C
-  )
-  gt
-}
-
-#' Calculate the default hjust and vjust settings depending on legend
-#' direction and position.
-#'
-#' @noRd
-label_just_defaults.bins <- function(direction, position) {
-  if (direction == "horizontal") {
-    switch(
-      position,
-      "top" = list(hjust = 0.5, vjust = 0),
-      "bottom" = list(hjust = 0.5, vjust = 1),
-      "left" = list(hjust = 1, vjust = 0.5),
-      list(hjust = 0.5, vjust = 0.5)
-    )
-  }
-  else {
-    switch(
-      position,
-      "top" = list(hjust = 0.5, vjust = 0),
-      "bottom" = list(hjust = 0.5, vjust = 1),
-      "left" = list(hjust = 1, vjust = 0.5),
-      list(hjust = 0, vjust = 0.5)
-    )
+    bin_at <- breaks
+    nums   <- as.character(breaks)
+    nums   <- strsplit(gsub("\\(|\\)|\\[|\\]", "", nums), ",\\s?")
+    nums   <- as.numeric(unlist(nums, FALSE, FALSE))
 
+    if (anyNA(nums)) {
+      cli::cli_abort(c(
+        "Breaks are not formatted correctly for a bin legend.",
+        "i" = "Use {.code (<lower>, <upper>]} format to indicate bins."
+      ))
+    }
+    all_breaks <- nums[c(1, seq_along(breaks) * 2)]
+    limits     <- all_breaks[ c(1, length(all_breaks))]
+    breaks     <- all_breaks[-c(1, length(all_breaks))]
   }
+  list(
+    breaks = breaks,
+    limits = limits,
+    bin_at = bin_at
+  )
 }

From e0112c4c358687b484d0fc8dba8ce392b97c42b6 Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Tue, 13 Sep 2022 11:56:07 +0200
Subject: [PATCH 053/111] Convert `guide_coloursteps()` to ggproto

---
 R/guide-colorsteps.R | 223 +++++++++++++++++++++++--------------------
 1 file changed, 117 insertions(+), 106 deletions(-)

diff --git a/R/guide-colorsteps.R b/R/guide-colorsteps.R
index e23b6d899b..26aac440bf 100644
--- a/R/guide-colorsteps.R
+++ b/R/guide-colorsteps.R
@@ -11,8 +11,11 @@
 #'   scale. This argument is ignored if `labels` is given as a vector of
 #'   values. If one or both of the limits is also given in `breaks` it will be
 #'   shown irrespective of the value of `show.limits`.
-#' @param ticks A logical specifying if tick marks on the colourbar should be
-#'   visible.
+#' @param ticks A theme object for rendering tick marks at the colourbar.
+#'   Usually, the object of `element_line()` is expected. If `element_blank()`
+#'   (default), no tick marks are drawn. For backward compatability, can also
+#'   be a logical which translates `TRUE` to `element_line()` and `FALSE` to
+#'   `element_blank()`.
 #' @inheritDotParams guide_colourbar -nbin -raster -ticks -available_aes
 #'
 #' @inheritSection guide_bins Use with discrete scale
@@ -45,127 +48,135 @@
 #'
 #' # (can also be set in the scale)
 #' p + scale_fill_binned(show.limits = TRUE)
-#'
-guide_coloursteps <- function(even.steps = TRUE, show.limits = NULL, ticks = FALSE, ...) {
-  guide <- guide_colourbar(raster = FALSE, ticks = ticks, nbin = 100, ...)
-  guide$even.steps <- even.steps
-  guide$show.limits <- show.limits
-  class(guide) <- c('colorsteps', class(guide))
-  guide
+guide_coloursteps <- function(
+  even.steps  = TRUE,
+  show.limits = NULL,
+  ticks       = element_blank(),
+  ...
+) {
+  guide_colourbar(
+    even.steps  = even.steps,
+    show.limits = show.limits,
+    raster      = FALSE,
+    ticks       = ticks,
+    nbin        = 100,
+    ...,
+    super       = GuideColoursteps
+  )
 }
+
 #' @export
 #' @rdname guide_coloursteps
 guide_colorsteps <- guide_coloursteps
 
+#' @rdname ggplot2-ggproto
+#' @format NULL
+#' @usage NULL
 #' @export
-guide_train.colorsteps <- function(guide, scale, aesthetic = NULL) {
-  breaks <- scale$get_breaks()
-  breaks <- breaks[!is.na(breaks)]
-  show_limits <- guide$show.limits %||% scale$show.limits %||% FALSE
-  if (show_limits && (is.character(scale$labels) || is.numeric(scale$labels))) {
-    cli::cli_warn(c(
-      "{.arg show.limits} is ignored when {.arg labels} are given as a character vector",
-      "i" = "Either add the limits to {.arg breaks} or provide a function for {.arg labels}"
-    ))
-    show_limits <- FALSE
-  }
-  if (guide$even.steps || !is.numeric(breaks)) {
-    if (length(breaks) == 0 || all(is.na(breaks))) {
-      return()
+GuideColoursteps <- ggproto(
+  NULL, GuideColourbar,
+
+  params = c(
+    list(even.steps = TRUE, show.limits = NULL),
+    GuideColourbar$params
+  ),
+
+  extract_key = function(scale, aesthetic, even.steps, ...) {
+
+    breaks <- scale$get_breaks()
+
+    if (!(even.steps || !is.numeric(breaks))) {
+      return(Guide$extract_key(scale, aesthetic))
     }
-    if (is.numeric(breaks)) {
-      limits <- scale$get_limits()
-      if (!is.numeric(scale$breaks)) {
-        breaks <- breaks[!breaks %in% limits]
-      }
-      all_breaks <- unique0(c(limits[1], breaks, limits[2]))
-      bin_at <- all_breaks[-1] - diff(all_breaks) / 2
-    } else {
-      # If the breaks are not numeric it is used with a discrete scale. We check
-      # if the breaks follow the allowed format "(<lower>, <upper>]", and if it
-      # does we convert it into bin specs
-      if (!guide$even.steps) {
-        cli::cli_warn("{.code even.steps = FALSE} is not supported when used with a discrete scale")
-      }
-      bin_at <- breaks
-      breaks_num <- as.character(breaks)
-      breaks_num <- strsplit(gsub("\\(|\\)|\\[|\\]", "", breaks_num), ",\\s?")
-      breaks_num <- as.numeric(unlist(breaks_num))
-      if (anyNA(breaks_num)) {
-        cli::cli_abort(c(
-          "Breaks not formatted correctly for a bin legend.",
-          "i" = "Use {.code (<lower>, <upper>]} format to indicate bins"
-        ))
-      }
-      all_breaks <- breaks_num[c(1, seq_along(breaks) * 2)]
-      limits <- all_breaks[c(1, length(all_breaks))]
-      breaks <- all_breaks[-c(1, length(all_breaks))]
+
+    parsed <- parse_binned_breaks(scale, breaks, even.steps)
+    if (is.null(parsed)) {
+      return(parsed)
     }
-    ticks <- data_frame(
-      scale$map(breaks),
-      .name_repair = ~ aesthetic %||% scale$aesthetics[1]
-    )
-    ticks$.value <- seq_along(breaks) - 0.5
-    ticks$.label <- scale$get_labels(breaks)
-    guide$nbin <- length(breaks) + 1L
+    limits <- parsed$limits
+    breaks <- parsed$breaks
+
+    key <- data_frame(scale$map(breaks), .name_repair = ~ aesthetic)
+    key$.value <- seq_along(breaks) - 0.5
+    key$.label <- scale$get_labels(breaks)
+
     if (breaks[1] %in% limits) {
-      ticks$.value <- ticks$.value - 1L
-      ticks[[1]][1] <- NA
-      guide$nbin <- guide$nbin - 1L
+      key$.value  <- key$.value - 1L
+      key[[1]][1] <- NA
     }
     if (breaks[length(breaks)] %in% limits) {
-      ticks[[1]][nrow(ticks)] <- NA
-      guide$nbin <- guide$nbin - 1L
+      key[[1]][nrow(key)] <- NA
+    }
+    # To avoid having to recalculate these variables in other methods, we
+    # attach these as attributes. It might not be very elegant, but it works.
+    attr(key, "limits") <- parsed$limits
+    attr(key, "bin_at") <- parsed$bin_at
+    return(key)
+  },
+
+  extract_decor = function(scale, aesthetic, key,
+                           reverse = FALSE, even.steps = TRUE,
+                           nbin = 100, ...) {
+    if (!(even.steps || !is.numeric(scale$get_breaks()))) {
+      return(GuideColourbar$extract_decor(scale, aesthetic, reverse = reverse,
+                                          nbin = nbin))
     }
-    guide$key <- ticks
-    guide$bar <- data_frame0(
+
+    bin_at <- attr(key, "bin_at", TRUE)
+
+    bar <- data_frame0(
       colour = scale$map(bin_at),
-      value = seq_along(bin_at) - 1,
-      .size = length(bin_at)
+      value  = seq_along(bin_at) - 1,
+      .size  = length(bin_at)
     )
+    if (reverse) {
+      bar <- bar[nrow(bar):1, , drop = FALSE]
+    }
+    return(bar)
+  },
+
+  extract_params = function(scale, params, hashables, ...) {
 
-    if (guide$reverse) {
-      guide$key <- guide$key[nrow(guide$key):1, ]
-      guide$bar <- guide$bar[nrow(guide$bar):1, ]
+    if (params$even.steps) {
+      params$nbin <- nbin <- sum(!is.na(params$key[[1]])) + 1
+    } else {
+      nbin <- params$nbin
     }
-    guide$hash <- with(guide, hash(list(title, key$.label, bar, name)))
-  } else {
-    guide <- NextMethod()
-    limits <- scale$get_limits()
-  }
-  if (show_limits) {
-    edges <- rescale(c(0, 1), to = guide$bar$value[c(1, nrow(guide$bar))], from = c(0.5, guide$nbin - 0.5) / guide$nbin)
-    if (guide$reverse) edges <- rev(edges)
-    guide$key <- guide$key[c(NA, seq_len(nrow(guide$key)), NA), , drop = FALSE]
-    guide$key$.value[c(1, nrow(guide$key))] <- edges
-    guide$key$.label[c(1, nrow(guide$key))] <- scale$get_labels(limits)
-    if (guide$key$.value[1] == guide$key$.value[2]) {
-      guide$key <- guide$key[-1,]
+
+    show.limits <- params$show.limits %||% scale$show.limits %||% FALSE
+
+    if (show.limits &&
+        (is.character(scale$labels) || is.numeric(scale$labels))) {
+      cli::cli_warn(c(paste0(
+        "{.arg show.limits} is ignored when {.arg labels} are given as a ",
+        "character vector."
+      ), "i" = paste0(
+        "Either add the limits to {.arg breaks} or provide a function for ",
+        "{.arg labels}."
+      )))
+      show.limits <- FALSE
     }
-    if (guide$key$.value[nrow(guide$key)-1] == guide$key$.value[nrow(guide$key)]) {
-      guide$key <- guide$key[-nrow(guide$key),]
+
+    if (show.limits) {
+      edges <- rescale(
+        c(0, 1),
+        to   = params$decor$value[c(1, nrow(params$decor))],
+        from = c(0.5, nbin - 0.5) / nbin
+      )
+      key <- params$key
+      limits <- attr(key, "limits", TRUE)
+      key <- key[c(NA, seq_len(nrow(key)), NA), , drop = FALSE]
+      key$.value[c(1, nrow(key))] <- edges
+      key$.label[c(1, nrow(key))] <- scale$get_labels(limits)
+      if (key$.value[1] == key$.value[2]) {
+        key <- key[-1, , drop = FALSE]
+      }
+      if (key$.value[nrow(key) - 1] == key$.value[nrow(key)]) {
+        key <- key[-nrow(key), , drop = FALSE]
+      }
+      params$key <- key
     }
-  }
-  guide
-}
 
-#' Calculate the default hjust and vjust settings depending on legend
-#' direction and position.
-#'
-#' @noRd
-label_just_defaults.colorbar <- function(direction, position) {
-  if (direction == "horizontal") {
-    switch(
-      position,
-      "top" = list(hjust = 0.5, vjust = 0),
-      list(hjust = 0.5, vjust = 1)
-    )
-  }
-  else {
-    switch(
-      position,
-      "left" = list(hjust = 1, vjust = 0.5),
-      list(hjust = 0, vjust = 0.5)
-    )
+    GuideColourbar$extract_params(scale, params, hashables, ...)
   }
-}
+)

From f88db51337ffaef2a027b7705ae0ce959c41c62a Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Tue, 13 Sep 2022 11:58:18 +0200
Subject: [PATCH 054/111] Update guide tests

---
 tests/testthat/test-guides.R | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/tests/testthat/test-guides.R b/tests/testthat/test-guides.R
index 6619db871e..894826fe2c 100644
--- a/tests/testthat/test-guides.R
+++ b/tests/testthat/test-guides.R
@@ -4,7 +4,7 @@ test_that("colourbar trains without labels", {
   g <- guide_colorbar()
   sc <- scale_colour_continuous(limits = c(0, 4), labels = NULL)
 
-  out <- guide_train(g, sc)
+  out <- g$train(scale = sc)
   expect_equal(names(out$key), c("colour", ".value"))
 })
 
@@ -205,27 +205,22 @@ test_that("guide specifications are properly checked", {
     geom_point(aes(mpg, disp, shape = factor(gear))) +
     guides(shape = "colourbar")
 
-  expect_snapshot_error(ggplotGrob(p))
-
-  p <- p + guides(shape = guide_legend(title.position = "leftish"))
+  expect_snapshot_warning(ggplotGrob(p))
 
-  expect_snapshot_error(ggplotGrob(p))
+  expect_snapshot_error(guide_legend(title.position = "leftish"))
 
-  expect_snapshot_error(guide_transform(guide_colorbar()))
+  expect_snapshot_error(guide_colourbar()$transform())
 
   p <- ggplot(mtcars) +
     geom_point(aes(mpg, disp, colour = gear)) +
-    guides(colour = guide_colorbar(label.position = "top"))
+    guides(colour = guide_colourbar(label.position = "top"))
   expect_snapshot_error(ggplotGrob(p))
   p <- ggplot(mtcars) +
     geom_point(aes(mpg, disp, colour = gear)) +
-    guides(colour = guide_colorbar(direction = "horizontal", label.position = "left"))
+    guides(colour = guide_colourbar(direction = "horizontal", label.position = "left"))
   expect_snapshot_error(ggplotGrob(p))
 
-  p <- ggplot(mtcars) +
-    geom_point(aes(mpg, disp, colour = gear)) +
-    guides(colour = guide_legend(label.position = "test"))
-  expect_snapshot_error(ggplotGrob(p))
+  expect_snapshot_error(guide_legend(label.position = "test"))
   p <- ggplot(mtcars) +
     geom_point(aes(mpg, disp, colour = gear)) +
     guides(colour = guide_legend(nrow = 2, ncol = 2))
@@ -571,7 +566,7 @@ test_that("colorbar can be styled", {
     p + scale_color_gradient(
           low = 'white', high = 'red',
           guide = guide_colorbar(
-            frame.colour = "green",
+            frame = element_rect(colour = "green"),
             frame.linewidth = 1.5 / .pt,
             ticks.colour = "black",
             ticks.linewidth = 2.5 / .pt

From 96e811b479832e37c4b5a02e91756f55a75329c2 Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Tue, 13 Sep 2022 11:59:04 +0200
Subject: [PATCH 055/111] Remove branches for old guides from Guides methods

---
 R/guides-.r | 42 ++++++++----------------------------------
 1 file changed, 8 insertions(+), 34 deletions(-)

diff --git a/R/guides-.r b/R/guides-.r
index c31632aab3..6ae3d61c49 100644
--- a/R/guides-.r
+++ b/R/guides-.r
@@ -179,7 +179,6 @@ resolve_guide <- function(aesthetic, scale, guides, default = "none", null = "no
 }
 
 # validate guide object
-# TODO: when done converting to ggproto, remove "guide" class?
 validate_guide <- function(guide) {
   # if guide is specified by character, then find the corresponding guide
   if (is.character(guide)) {
@@ -189,7 +188,7 @@ validate_guide <- function(guide) {
       return(fun())
     }
   }
-  if (inherits(guide, c("guide", "Guide"))) {
+  if (inherits(guide, "Guide")) {
     guide
   } else {
     cli::cli_abort("Unknown guide: {guide}")
@@ -467,20 +466,11 @@ Guides <- ggproto(
 
     params <- Map(
       function(guide, param, scale, aes) {
-        # TODO: delete old branch when all guides are ported to ggproto
-        if (inherits(guide, "guide")) {
-          guide$title <- scale$make_title(
-            guide$title %|W|% scale$name %|W|% labels[[aes]]
-          )
-          guide$direction <- guide$direction %||% direction
-          guide_train(guide, scale, aes)
-        } else {
-          guide$train(
-            param, scale, aes,
-            title = labels[[aes]],
-            direction = direction
-          )
-        }
+        guide$train(
+          param, scale, aes,
+          title = labels[[aes]],
+          direction = direction
+        )
       },
       guide = self$guides,
       param = self$params,
@@ -533,13 +523,7 @@ Guides <- ggproto(
   # Loop over guides to let them extract information from layers
   process_layers = function(self, layers, default_mapping) {
     params <- Map(
-      function(guide, param) {
-        if (inherits(param, "guide")) {
-          guide_geom(param, layers, default_mapping)
-        } else {
-          guide$geom(param, layers, default_mapping)
-        }
-      },
+      function(guide, param) guide$geom(param, layers, default_mapping),
       guide = self$guides,
       param = self$params
     )
@@ -554,17 +538,7 @@ Guides <- ggproto(
   # Loop over every guide, let them draw their grobs
   draw = function(self, theme) {
     Map(
-      function(guide, params) {
-        # TODO: Remove old branch when done
-        if (inherits(params, "guide")) {
-          params$title.position <- params$title.position %||% switch(
-            params$direction, vertical = "top", horizontal = "bottom"
-          )
-          guide_gengrob(params, theme)
-        } else {
-          guide$draw(theme, params)
-        }
-      },
+      function(guide, params) guide$draw(theme, params),
       guide  = self$guides,
       params = self$params
     )

From ff7695eb8930ade8fdce3a554169bd59418ef838 Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Tue, 13 Sep 2022 12:13:47 +0200
Subject: [PATCH 056/111] Go back to `matched_aes()` instead of manual
 calculation

---
 DESCRIPTION        |  2 +-
 R/guide-colorbar.r | 12 +-----------
 R/guide-legend.r   | 12 +-----------
 3 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/DESCRIPTION b/DESCRIPTION
index 19fafc6b21..42d5de2669 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -175,10 +175,10 @@ Collate:
     'grob-null.r'
     'grouping.r'
     'guide-.r'
+    'guide-legend.r'
     'guide-bins.R'
     'guide-colorbar.r'
     'guide-colorsteps.R'
-    'guide-legend.r'
     'guides-.r'
     'guides-axis.r'
     'guides-grid.r'
diff --git a/R/guide-colorbar.r b/R/guide-colorbar.r
index a7bab3ad40..4194ca4a98 100644
--- a/R/guide-colorbar.r
+++ b/R/guide-colorbar.r
@@ -376,18 +376,8 @@ GuideColourbar <- ggproto(
   geom = function(params, layers, default_mapping) {
 
     guide_layers <- lapply(layers, function(layer) {
-      # Previously `matched_aes()`
-      all_aes  <- names(c(layer$computed_mapping, layer$stat$default_aes))
-      geom_aes <- c(layer$geom$required_aes, names(layer$geom$default_aes))
 
-      if (layer$geom$rename_size &&
-          "size" %in% all_aes && !"linewidth" %in% all_aes) {
-        geom_aes <- c(geom_aes, size)
-      }
-
-      matched_aes <- intersect(intersect(all_aes, geom_aes), names(params$key))
-      matched_aes <- setdiff(matched_aes, names(layer$computed_geom_params))
-      matched_aes <- setdiff(matched_aes, names(layer$aes_params))
+      matched_aes <- matched_aes(layer, params)
 
       # Check if this layer should be included
       if (include_layer_in_guide(layer, matched_aes)) {
diff --git a/R/guide-legend.r b/R/guide-legend.r
index b54e6f0702..9af0f2a5dc 100644
--- a/R/guide-legend.r
+++ b/R/guide-legend.r
@@ -297,18 +297,8 @@ GuideLegend <- ggproto(
   geom = function(params, layers, default_mapping) {
 
     decor <- lapply(layers, function(layer) {
-      # Previously `matched_aes()`
-      all_aes  <- names(c(layer$computed_mapping, layer$stat$default_aes))
-      geom_aes <- c(layer$geom$required_aes, names(layer$geom$default_aes))
 
-      if (layer$geom$rename_size &&
-          "size" %in% all_aes && !"linewidth" %in% all_aes) {
-        geom_aes <- c(geom_aes, size)
-      }
-
-      matched_aes <- intersect(intersect(all_aes, geom_aes), names(params$key))
-      matched_aes <- setdiff(matched_aes, names(layer$computed_geom_params))
-      matched_aes <- setdiff(matched_aes, names(layer$aes_params))
+      matched_aes <- matched_aes(layer, params)
 
       # Check if this layer should be included
       if (!include_layer_in_guide(layer, matched_aes)) {

From 0fdd7a05c4f6d1e5b9da05d91b56eaed783d756c Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Tue, 13 Sep 2022 12:14:33 +0200
Subject: [PATCH 057/111] Remove old S3 generics

---
 R/guides-.r | 42 ------------------------------------------
 1 file changed, 42 deletions(-)

diff --git a/R/guides-.r b/R/guides-.r
index 6ae3d61c49..2bf1565bd5 100644
--- a/R/guides-.r
+++ b/R/guides-.r
@@ -195,48 +195,6 @@ validate_guide <- function(guide) {
   }
 }
 
-# Generics ----------------------------------------------------------------
-
-#' S3 generics for guides.
-#'
-#' You will need to provide methods for these S3 generics if you want to
-#' create your own guide object. They are currently undocumented; use at
-#' your own risk!
-#'
-#' @param guide The guide object
-#' @keywords internal
-#' @name guide-exts
-NULL
-
-#' @export
-#' @rdname guide-exts
-guide_train <- function(guide, scale, aesthetic = NULL) UseMethod("guide_train")
-
-#' @export
-#' @rdname guide-exts
-guide_merge <- function(guide, new_guide) UseMethod("guide_merge")
-
-#' @export
-#' @rdname guide-exts
-guide_geom <- function(guide, layers, default_mapping) UseMethod("guide_geom")
-
-#' @export
-#' @rdname guide-exts
-guide_transform <- function(guide, coord, panel_params) UseMethod("guide_transform")
-
-#' @export
-guide_transform.default <- function(guide, coord, panel_params) {
-  cli::cli_abort(c(
-    "Guide with class {.cls {class(guide)}} does not implement {.fn guide_transform}",
-    "i" = "Did you mean to use {.fn guide_axis}?"
-  ))
-}
-
-#' @export
-#' @rdname guide-exts
-guide_gengrob <- function(guide, theme) UseMethod("guide_gengrob")
-
-
 # Helpers -----------------------------------------------------------------
 
 matched_aes <- function(layer, guide) {

From f9dcb5dd74855879b9afee3ba5189e1a92f95ca1 Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Tue, 13 Sep 2022 12:15:33 +0200
Subject: [PATCH 058/111] Re-oxygenate

---
 NAMESPACE                | 18 +++---------------
 man/ggplot2-ggproto.Rd   | 22 ++++++++++++---------
 man/guide-exts.Rd        | 30 -----------------------------
 man/guide_bins.Rd        | 18 ++++++++++++++++--
 man/guide_colourbar.Rd   | 41 +++++++++++++++++++++++++++-------------
 man/guide_coloursteps.Rd | 30 +++++++++++++++++++++++------
 6 files changed, 84 insertions(+), 75 deletions(-)
 delete mode 100644 man/guide-exts.Rd

diff --git a/NAMESPACE b/NAMESPACE
index 1ce88fae80..487f0cf707 100644
--- a/NAMESPACE
+++ b/NAMESPACE
@@ -72,16 +72,6 @@ S3method(grobWidth,absoluteGrob)
 S3method(grobWidth,zeroGrob)
 S3method(grobX,absoluteGrob)
 S3method(grobY,absoluteGrob)
-S3method(guide_gengrob,bins)
-S3method(guide_gengrob,colorbar)
-S3method(guide_geom,bins)
-S3method(guide_geom,colorbar)
-S3method(guide_merge,bins)
-S3method(guide_merge,colorbar)
-S3method(guide_train,bins)
-S3method(guide_train,colorbar)
-S3method(guide_train,colorsteps)
-S3method(guide_transform,default)
 S3method(heightDetails,titleGrob)
 S3method(heightDetails,zeroGrob)
 S3method(interleave,default)
@@ -218,6 +208,9 @@ export(GeomViolin)
 export(GeomVline)
 export(Guide)
 export(GuideAxis)
+export(GuideBins)
+export(GuideColourbar)
+export(GuideColoursteps)
 export(GuideLegend)
 export(GuideNone)
 export(Layout)
@@ -424,13 +417,8 @@ export(guide_colorbar)
 export(guide_colorsteps)
 export(guide_colourbar)
 export(guide_coloursteps)
-export(guide_gengrob)
-export(guide_geom)
 export(guide_legend)
-export(guide_merge)
 export(guide_none)
-export(guide_train)
-export(guide_transform)
 export(guides)
 export(has_flipped_aes)
 export(is.Coord)
diff --git a/man/ggplot2-ggproto.Rd b/man/ggplot2-ggproto.Rd
index c845c45184..c61fd662fd 100644
--- a/man/ggplot2-ggproto.Rd
+++ b/man/ggplot2-ggproto.Rd
@@ -4,15 +4,16 @@
 %   R/geom-raster.r, R/annotation-raster.r, R/axis-secondary.R, R/coord-.r,
 %   R/coord-cartesian-.r, R/coord-fixed.r, R/coord-flip.r, R/coord-map.r,
 %   R/coord-polar.r, R/coord-quickmap.R, R/coord-transform.r, R/facet-.r,
-%   R/facet-grid-.r, R/facet-null.r, R/facet-wrap.r, R/stat-.r, R/geom-abline.r,
-%   R/geom-rect.r, R/geom-bar.r, R/geom-blank.r, R/geom-boxplot.r, R/geom-col.r,
-%   R/geom-path.r, R/geom-contour.r, R/geom-crossbar.r, R/geom-segment.r,
-%   R/geom-curve.r, R/geom-ribbon.r, R/geom-density.r, R/geom-density2d.r,
-%   R/geom-dotplot.r, R/geom-errorbar.r, R/geom-errorbarh.r, R/geom-function.R,
-%   R/geom-hex.r, R/geom-hline.r, R/geom-label.R, R/geom-linerange.r,
-%   R/geom-point.r, R/geom-pointrange.r, R/geom-quantile.r, R/geom-rug.r,
-%   R/geom-smooth.r, R/geom-spoke.r, R/geom-text.r, R/geom-tile.r,
-%   R/geom-violin.r, R/geom-vline.r, R/guide-.r, R/guide-legend.r,
+%   R/facet-grid-.r, R/facet-null.r, R/facet-wrap.r, R/stat-.r,
+%   R/geom-abline.r, R/geom-rect.r, R/geom-bar.r, R/geom-blank.r,
+%   R/geom-boxplot.r, R/geom-col.r, R/geom-path.r, R/geom-contour.r,
+%   R/geom-crossbar.r, R/geom-segment.r, R/geom-curve.r, R/geom-ribbon.r,
+%   R/geom-density.r, R/geom-density2d.r, R/geom-dotplot.r, R/geom-errorbar.r,
+%   R/geom-errorbarh.r, R/geom-function.R, R/geom-hex.r, R/geom-hline.r,
+%   R/geom-label.R, R/geom-linerange.r, R/geom-point.r, R/geom-pointrange.r,
+%   R/geom-quantile.r, R/geom-rug.r, R/geom-smooth.r, R/geom-spoke.r,
+%   R/geom-text.r, R/geom-tile.r, R/geom-violin.r, R/geom-vline.r, R/guide-.r,
+%   R/guide-legend.r, R/guide-bins.R, R/guide-colorbar.r, R/guide-colorsteps.R,
 %   R/guides-axis.r, R/guides-none.r, R/layout.R, R/position-.r,
 %   R/position-dodge.r, R/position-dodge2.r, R/position-identity.r,
 %   R/position-jitter.r, R/position-jitterdodge.R, R/position-nudge.R,
@@ -88,6 +89,9 @@
 \alias{GeomVline}
 \alias{Guide}
 \alias{GuideLegend}
+\alias{GuideBins}
+\alias{GuideColourbar}
+\alias{GuideColoursteps}
 \alias{GuideAxis}
 \alias{GuideNone}
 \alias{Layout}
diff --git a/man/guide-exts.Rd b/man/guide-exts.Rd
deleted file mode 100644
index 17c1591cb6..0000000000
--- a/man/guide-exts.Rd
+++ /dev/null
@@ -1,30 +0,0 @@
-% Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/guides-.r
-\name{guide-exts}
-\alias{guide-exts}
-\alias{guide_train}
-\alias{guide_merge}
-\alias{guide_geom}
-\alias{guide_transform}
-\alias{guide_gengrob}
-\title{S3 generics for guides.}
-\usage{
-guide_train(guide, scale, aesthetic = NULL)
-
-guide_merge(guide, new_guide)
-
-guide_geom(guide, layers, default_mapping)
-
-guide_transform(guide, coord, panel_params)
-
-guide_gengrob(guide, theme)
-}
-\arguments{
-\item{guide}{The guide object}
-}
-\description{
-You will need to provide methods for these S3 generics if you want to
-create your own guide object. They are currently undocumented; use at
-your own risk!
-}
-\keyword{internal}
diff --git a/man/guide_bins.Rd b/man/guide_bins.Rd
index 80746cad25..6eeada9598 100644
--- a/man/guide_bins.Rd
+++ b/man/guide_bins.Rd
@@ -19,8 +19,10 @@ guide_bins(
   keyheight = NULL,
   axis = TRUE,
   axis.colour = "black",
-  axis.linewidth = 0.5,
+  axis.linewidth = NULL,
   axis.arrow = NULL,
+  ticks = NULL,
+  ticks.length = unit(0.2, "npc"),
   direction = NULL,
   default.unit = "line",
   override.aes = list(),
@@ -76,7 +78,11 @@ the width of the legend key. Default value is \code{legend.key.width} or
 the height of the legend key. Default value is \code{legend.key.height} or
 \code{legend.key.size} in \code{\link[=theme]{theme()}}.}
 
-\item{axis}{Logical. Should a small axis be drawn along the guide}
+\item{axis}{A theme object for rendering a small axis along the guide.
+Usually, the object of \code{element_line()} is expected (default). If
+\code{element_blank()}, no axis is drawn. For backward compatibility, can also
+be a logical which translates \code{TRUE} to \code{element_line()} and \code{FALSE} to
+\code{element_blank()}.}
 
 \item{axis.colour, axis.linewidth}{Graphic specifications for the look of the
 axis.}
@@ -84,6 +90,14 @@ axis.}
 \item{axis.arrow}{A call to \code{arrow()} to specify arrows at the end of the
 axis line, thus showing an open interval.}
 
+\item{ticks}{A theme object for rendering tick marks at the colourbar.
+Usually, the object of \code{element_line()} is expected. If \code{element_blank()},
+no tick marks are drawn. If \code{NULL} (default), the \code{axis} argument is
+re-used as \code{ticks} argument (without arrow).}
+
+\item{ticks.length}{A numeric or a \code{\link[grid:unit]{grid::unit()}} object specifying the
+length of tick marks between the keys.}
+
 \item{direction}{A character string indicating the direction of the guide.
 One of "horizontal" or "vertical."}
 
diff --git a/man/guide_colourbar.Rd b/man/guide_colourbar.Rd
index 8400b50e3d..da9e02faa2 100644
--- a/man/guide_colourbar.Rd
+++ b/man/guide_colourbar.Rd
@@ -20,12 +20,14 @@ guide_colourbar(
   barheight = NULL,
   nbin = 300,
   raster = TRUE,
+  frame = element_blank(),
   frame.colour = NULL,
-  frame.linewidth = 0.5/.pt,
-  frame.linetype = 1,
-  ticks = TRUE,
-  ticks.colour = "white",
-  ticks.linewidth = 0.5/.pt,
+  frame.linewidth = NULL,
+  frame.linetype = NULL,
+  ticks = element_line(),
+  ticks.colour = NULL,
+  ticks.linewidth = NULL,
+  ticks.length = unit(0.2, "npc"),
   draw.ulim = TRUE,
   draw.llim = TRUE,
   direction = NULL,
@@ -51,12 +53,14 @@ guide_colorbar(
   barheight = NULL,
   nbin = 300,
   raster = TRUE,
+  frame = element_blank(),
   frame.colour = NULL,
-  frame.linewidth = 0.5/.pt,
-  frame.linetype = 1,
-  ticks = TRUE,
-  ticks.colour = "white",
-  ticks.linewidth = 0.5/.pt,
+  frame.linewidth = NULL,
+  frame.linetype = NULL,
+  ticks = element_line(),
+  ticks.colour = NULL,
+  ticks.linewidth = NULL,
+  ticks.length = unit(0.2, "npc"),
   draw.ulim = TRUE,
   draw.llim = TRUE,
   direction = NULL,
@@ -121,8 +125,13 @@ raster object. If \code{FALSE} then the colourbar is rendered as a set of
 rectangles. Note that not all graphics devices are capable of rendering
 raster image.}
 
+\item{frame}{A theme object for rendering a frame drawn around the bar.
+Usually, the object of \code{element_rect()} is expected. If \code{element_blank()}
+(default), no frame is drawn.}
+
 \item{frame.colour}{A string specifying the colour of the frame
-drawn around the bar. If \code{NULL} (the default), no frame is drawn.}
+drawn around the bar. For backward compatibility, if this argument is
+not \code{NULL}, the \code{frame} argument will be set to \code{element_rect()}.}
 
 \item{frame.linewidth}{A numeric specifying the width of the frame
 drawn around the bar in millimetres.}
@@ -130,14 +139,20 @@ drawn around the bar in millimetres.}
 \item{frame.linetype}{A numeric specifying the linetype of the frame
 drawn around the bar.}
 
-\item{ticks}{A logical specifying if tick marks on the colourbar should be
-visible.}
+\item{ticks}{A theme object for rendering tick marks at the colourbar.
+Usually, the object of \code{element_line()} is expected (default). If
+\code{element_blank()}, no tick marks are drawn. For backward compatibility,
+can also be a logical which translates \code{TRUE} to \code{element_line()} and
+\code{FALSE} to \code{element_blank()}.}
 
 \item{ticks.colour}{A string specifying the colour of the tick marks.}
 
 \item{ticks.linewidth}{A numeric specifying the width of the tick marks in
 millimetres.}
 
+\item{ticks.length}{A numeric or a \code{\link[grid:unit]{grid::unit()}} object specifying the
+length of tick marks at the colourbar.}
+
 \item{draw.ulim}{A logical specifying if the upper limit tick marks should
 be visible.}
 
diff --git a/man/guide_coloursteps.Rd b/man/guide_coloursteps.Rd
index 55f9c895ae..38771cb472 100644
--- a/man/guide_coloursteps.Rd
+++ b/man/guide_coloursteps.Rd
@@ -5,9 +5,19 @@
 \alias{guide_colorsteps}
 \title{Discretized colourbar guide}
 \usage{
-guide_coloursteps(even.steps = TRUE, show.limits = NULL, ticks = FALSE, ...)
+guide_coloursteps(
+  even.steps = TRUE,
+  show.limits = NULL,
+  ticks = element_blank(),
+  ...
+)
 
-guide_colorsteps(even.steps = TRUE, show.limits = NULL, ticks = FALSE, ...)
+guide_colorsteps(
+  even.steps = TRUE,
+  show.limits = NULL,
+  ticks = element_blank(),
+  ...
+)
 }
 \arguments{
 \item{even.steps}{Should the rendered size of the bins be equal, or should
@@ -19,8 +29,11 @@ scale. This argument is ignored if \code{labels} is given as a vector of
 values. If one or both of the limits is also given in \code{breaks} it will be
 shown irrespective of the value of \code{show.limits}.}
 
-\item{ticks}{A logical specifying if tick marks on the colourbar should be
-visible.}
+\item{ticks}{A theme object for rendering tick marks at the colourbar.
+Usually, the object of \code{element_line()} is expected. If \code{element_blank()}
+(default), no tick marks are drawn. For backward compatability, can also
+be a logical which translates \code{TRUE} to \code{element_line()} and \code{FALSE} to
+\code{element_blank()}.}
 
 \item{...}{
   Arguments passed on to \code{\link[=guide_colourbar]{guide_colourbar}}
@@ -31,8 +44,12 @@ the width of the colourbar. Default value is \code{legend.key.width} or
     \item{\code{barheight}}{A numeric or a \code{\link[grid:unit]{grid::unit()}} object specifying
 the height of the colourbar. Default value is \code{legend.key.height} or
 \code{legend.key.size} in \code{\link[=theme]{theme()}} or theme.}
+    \item{\code{frame}}{A theme object for rendering a frame drawn around the bar.
+Usually, the object of \code{element_rect()} is expected. If \code{element_blank()}
+(default), no frame is drawn.}
     \item{\code{frame.colour}}{A string specifying the colour of the frame
-drawn around the bar. If \code{NULL} (the default), no frame is drawn.}
+drawn around the bar. For backward compatibility, if this argument is
+not \code{NULL}, the \code{frame} argument will be set to \code{element_rect()}.}
     \item{\code{frame.linewidth}}{A numeric specifying the width of the frame
 drawn around the bar in millimetres.}
     \item{\code{frame.linetype}}{A numeric specifying the linetype of the frame
@@ -40,6 +57,8 @@ drawn around the bar.}
     \item{\code{ticks.colour}}{A string specifying the colour of the tick marks.}
     \item{\code{ticks.linewidth}}{A numeric specifying the width of the tick marks in
 millimetres.}
+    \item{\code{ticks.length}}{A numeric or a \code{\link[grid:unit]{grid::unit()}} object specifying the
+length of tick marks at the colourbar.}
     \item{\code{draw.ulim}}{A logical specifying if the upper limit tick marks should
 be visible.}
     \item{\code{draw.llim}}{A logical specifying if the lower limit tick marks should
@@ -129,7 +148,6 @@ p + scale_fill_binned(guide = guide_coloursteps(show.limits = TRUE))
 
 # (can also be set in the scale)
 p + scale_fill_binned(show.limits = TRUE)
-
 }
 \seealso{
 Other guides: 

From f946c575fd92fb2b3a78a028f0fd23fce85081c7 Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Tue, 13 Sep 2022 13:11:15 +0200
Subject: [PATCH 059/111] Rename guides-{axis/none}.r to guide-{axis/none}.r
 for consistency

---
 DESCRIPTION                       | 4 ++--
 R/{guides-axis.r => guide-axis.r} | 0
 R/{guides-none.r => guide-none.r} | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename R/{guides-axis.r => guide-axis.r} (100%)
 rename R/{guides-none.r => guide-none.r} (100%)

diff --git a/DESCRIPTION b/DESCRIPTION
index 42d5de2669..c131ce7540 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -175,14 +175,14 @@ Collate:
     'grob-null.r'
     'grouping.r'
     'guide-.r'
+    'guide-axis.r'
     'guide-legend.r'
     'guide-bins.R'
     'guide-colorbar.r'
     'guide-colorsteps.R'
+    'guide-none.r'
     'guides-.r'
-    'guides-axis.r'
     'guides-grid.r'
-    'guides-none.r'
     'hexbin.R'
     'labeller.r'
     'labels.r'
diff --git a/R/guides-axis.r b/R/guide-axis.r
similarity index 100%
rename from R/guides-axis.r
rename to R/guide-axis.r
diff --git a/R/guides-none.r b/R/guide-none.r
similarity index 100%
rename from R/guides-none.r
rename to R/guide-none.r

From b23146ad59ed46834909e133d7d6f499414f1343 Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Tue, 13 Sep 2022 13:12:23 +0200
Subject: [PATCH 060/111] Commit man pages

---
 man/ggplot2-ggproto.Rd | 6 +++---
 man/guide_axis.Rd      | 2 +-
 man/guide_none.Rd      | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/man/ggplot2-ggproto.Rd b/man/ggplot2-ggproto.Rd
index c61fd662fd..e33fb52fd0 100644
--- a/man/ggplot2-ggproto.Rd
+++ b/man/ggplot2-ggproto.Rd
@@ -13,8 +13,8 @@
 %   R/geom-label.R, R/geom-linerange.r, R/geom-point.r, R/geom-pointrange.r,
 %   R/geom-quantile.r, R/geom-rug.r, R/geom-smooth.r, R/geom-spoke.r,
 %   R/geom-text.r, R/geom-tile.r, R/geom-violin.r, R/geom-vline.r, R/guide-.r,
-%   R/guide-legend.r, R/guide-bins.R, R/guide-colorbar.r, R/guide-colorsteps.R,
-%   R/guides-axis.r, R/guides-none.r, R/layout.R, R/position-.r,
+%   R/guide-axis.r, R/guide-legend.r, R/guide-bins.R, R/guide-colorbar.r,
+%   R/guide-colorsteps.R, R/guide-none.r, R/layout.R, R/position-.r,
 %   R/position-dodge.r, R/position-dodge2.r, R/position-identity.r,
 %   R/position-jitter.r, R/position-jitterdodge.R, R/position-nudge.R,
 %   R/position-stack.r, R/scale-.r, R/scale-binned.R, R/scale-continuous.r,
@@ -88,11 +88,11 @@
 \alias{GeomViolin}
 \alias{GeomVline}
 \alias{Guide}
+\alias{GuideAxis}
 \alias{GuideLegend}
 \alias{GuideBins}
 \alias{GuideColourbar}
 \alias{GuideColoursteps}
-\alias{GuideAxis}
 \alias{GuideNone}
 \alias{Layout}
 \alias{Position}
diff --git a/man/guide_axis.Rd b/man/guide_axis.Rd
index 96716cabe2..3190ddbd11 100644
--- a/man/guide_axis.Rd
+++ b/man/guide_axis.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/guides-axis.r
+% Please edit documentation in R/guide-axis.r
 \name{guide_axis}
 \alias{guide_axis}
 \title{Axis guide}
diff --git a/man/guide_none.Rd b/man/guide_none.Rd
index 514784d7c9..0946082b4f 100644
--- a/man/guide_none.Rd
+++ b/man/guide_none.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/guides-none.r
+% Please edit documentation in R/guide-none.r
 \name{guide_none}
 \alias{guide_none}
 \title{Empty guide}

From 1a53626fa193c9fb5cf6848b4c777e4116929859 Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Tue, 13 Sep 2022 17:21:39 +0200
Subject: [PATCH 061/111] Avoid spurious order mixing

---
 R/guide-.r | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/R/guide-.r b/R/guide-.r
index 7a9fd30679..2d6b7be385 100644
--- a/R/guide-.r
+++ b/R/guide-.r
@@ -125,7 +125,7 @@ Guide <- ggproto(
   extract_params = function(scale, params, hashables, ...) {
     # Make hash
     mask <- new_data_mask(as_environment(params))
-    params$hash <- hash(lapply(hashables, eval_tidy, data = mask))
+    params$hash <- hash(lapply(unname(hashables), eval_tidy, data = mask))
     params
   },
 

From 7178e300c7be3335e650a8e24d68c7137887f597 Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Tue, 13 Sep 2022 17:22:18 +0200
Subject: [PATCH 062/111] Avoid some spurious axis rearrangements

---
 R/guide-axis.r | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/R/guide-axis.r b/R/guide-axis.r
index 407a5a5ab7..b9d9d47be5 100644
--- a/R/guide-axis.r
+++ b/R/guide-axis.r
@@ -277,6 +277,7 @@ GuideAxis <- ggproto(
   },
 
   arrange_layout = function(key, sizes, params) {
+
     layout <- seq_along(sizes)
 
     if (params$lab_first) {
@@ -295,6 +296,8 @@ GuideAxis <- ggproto(
     axis_line <- grobs$decor
 
     # Unlist the 'label' grobs
+    z <- if (params$position == "left") c(2, 1, 3) else 1:3
+    z <- rep(z, c(1, length(grobs$label), 1))
     grobs  <- c(list(grobs$ticks), grobs$label, list(grobs$title))
 
     # Initialise empty gtable
@@ -309,7 +312,7 @@ GuideAxis <- ggproto(
     gt <- gtable_add_grob(
       gt, grobs,
       t = layout$t, b = layout$b, l = layout$l, r = layout$r,
-      clip = "off"
+      clip = "off", z = z
     )
 
     # Set justification viewport

From 62b300be7ed0d0e8f3db6971f453da8053c78760 Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Tue, 13 Sep 2022 17:23:03 +0200
Subject: [PATCH 063/111] size --> linewidth

---
 R/guide-bins.R     | 12 +++++++++---
 R/guide-colorbar.r |  6 +++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/R/guide-bins.R b/R/guide-bins.R
index cd33ab2664..59023962d4 100644
--- a/R/guide-bins.R
+++ b/R/guide-bins.R
@@ -132,9 +132,9 @@ guide_bins <- function(
     axis <- if (axis) element_line() else element_rect()
   }
   if (inherits(axis, "element_line")) {
-    axis$colour   <- axis.colour    %||% axis$colour %||% "black"
-    axis$size     <- axis.linewidth %||% axis$size   %||% (0.5 / .pt)
-    axis$arrow    <- axis.arrow     %||% axis$arrow
+    axis$colour    <- axis.colour    %||% axis$colour      %||% "black"
+    axis$linewidth <- axis.linewidth %||% axis$linewidth   %||% (0.5 / .pt)
+    axis$arrow     <- axis.arrow     %||% axis$arrow
   } else {
     axis <- element_blank()
   }
@@ -333,6 +333,12 @@ GuideBins <- ggproto(
     params
   },
 
+  override_elements = function(params, elements, theme) {
+    elements$ticks <- combine_elements(elements$ticks, theme$line)
+    elements$line  <- combine_elements(elements$line,  theme$line)
+    GuideLegend$override_elements(params, elements, theme)
+  },
+
   build_labels = function(key, elements, params) {
     key$.label[c(1, nrow(key))[!params$show.limits]] <- ""
 
diff --git a/R/guide-colorbar.r b/R/guide-colorbar.r
index 4194ca4a98..ff093cc92e 100644
--- a/R/guide-colorbar.r
+++ b/R/guide-colorbar.r
@@ -189,7 +189,7 @@ guide_colourbar <- function(
   }
   if (inherits(frame, "element_rect")) {
     frame$colour    <- frame.colour    %||% frame$colour
-    frame$size      <- frame.linewidth %||% frame$size      %||% (0.5 / .pt)
+    frame$linewidth <- frame.linewidth %||% frame$linewidth %||% (0.5 / .pt)
     frame$linetype  <- frame.linetype  %||% frame$linetype  %||% 1
   } else {
     frame <- element_blank()
@@ -201,8 +201,8 @@ guide_colourbar <- function(
     ticks <- if (ticks) element_line() else element_blank()
   }
   if (!inherits(ticks, "element_blank")) {
-    ticks$colour    <- ticks.colour    %||% ticks$colour %||% "white"
-    ticks$size      <- ticks.linewidth %||% ticks$size   %||% (0.5 / .pt)
+    ticks$colour    <- ticks.colour    %||% ticks$colour    %||% "white"
+    ticks$linewidth <- ticks.linewidth %||% ticks$linewidth %||% (0.5 / .pt)
   }
 
   # Trick to re-use this constructor in `guide_coloursteps()`.

From 0f88e75efd4adaecafec58ff968f8859d8c1d914 Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Tue, 13 Sep 2022 17:23:22 +0200
Subject: [PATCH 064/111] Don't clip `guide_bins()`

---
 R/guide-bins.R | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/R/guide-bins.R b/R/guide-bins.R
index 59023962d4..b7d81bb07c 100644
--- a/R/guide-bins.R
+++ b/R/guide-bins.R
@@ -391,7 +391,8 @@ GuideBins <- ggproto(
       widths  = unit(sizes$widths,  "cm"),
       heights = unit(sizes$heights, "cm")
     )
-    gt <- gtable_add_grob(gt, decor, t = top, l = left, name = key_nm)
+    gt <- gtable_add_grob(gt, decor, t = top, l = left,
+                          name = key_nm, clip = "off")
 
     axis <- switch(
       params$label.position,

From 981103bad6a68e6b3192e04eae8217fb2ee30e6f Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Tue, 13 Sep 2022 17:25:31 +0200
Subject: [PATCH 065/111] Convert hash items quos to exprs

---
 R/guide-axis.r     | 2 +-
 R/guide-colorbar.r | 2 +-
 R/guide-legend.r   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/R/guide-axis.r b/R/guide-axis.r
index b9d9d47be5..67972d7c3e 100644
--- a/R/guide-axis.r
+++ b/R/guide-axis.r
@@ -78,7 +78,7 @@ GuideAxis <- ggproto(
 
   available_aes = c("x", "y"),
 
-  hashables = quos(title, key$.value, key$.label, name),
+  hashables = exprs(title, key$.value, key$.label, name),
 
   elements = list(
     line  = "axis.line.{aes}.{position}",
diff --git a/R/guide-colorbar.r b/R/guide-colorbar.r
index ff093cc92e..a5fe17e834 100644
--- a/R/guide-colorbar.r
+++ b/R/guide-colorbar.r
@@ -299,7 +299,7 @@ GuideColourbar <- ggproto(
 
   available_aes = c("colour", "color", "fill"),
 
-  hashables = quos(title, key$.label, decor, name),
+  hashables = exprs(title, key$.label, decor, name),
 
   elements = list(
     frame       = "rect",
diff --git a/R/guide-legend.r b/R/guide-legend.r
index 9af0f2a5dc..8be06b7978 100644
--- a/R/guide-legend.r
+++ b/R/guide-legend.r
@@ -244,7 +244,7 @@ GuideLegend <- ggproto(
 
   available_aes = "any",
 
-  hashables = quos(title, key$.label, direction, name),
+  hashables = exprs(title, key$.label, direction, name),
 
   elements = list(
     background  = "legend.background",

From de7330d12fd519c2b2def059c545409d30f6436d Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Tue, 13 Sep 2022 17:26:12 +0200
Subject: [PATCH 066/111] Approve visual change in horizontal guide_bins

---
 .../guides/guide-bins-work-horizontally.svg   | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/tests/testthat/_snaps/guides/guide-bins-work-horizontally.svg b/tests/testthat/_snaps/guides/guide-bins-work-horizontally.svg
index 92e45677ae..3bddc3b3cb 100644
--- a/tests/testthat/_snaps/guides/guide-bins-work-horizontally.svg
+++ b/tests/testthat/_snaps/guides/guide-bins-work-horizontally.svg
@@ -55,23 +55,23 @@
 <text x='596.72' y='556.10' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>3.0</text>
 <text x='329.35' y='568.24' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>x</text>
 <text transform='translate(13.05,283.95) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>y</text>
-<rect x='634.42' y='266.45' width='80.10' height='34.99' style='stroke-width: 1.07; stroke: none; fill: #FFFFFF;' />
+<rect x='634.42' y='268.63' width='80.10' height='30.64' style='stroke-width: 1.07; stroke: none; fill: #FFFFFF;' />
 <text x='634.42' y='287.73' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>x</text>
-<rect x='645.40' y='266.45' width='17.28' height='17.28' style='stroke-width: 1.07; stroke: none; fill: #FFFFFF;' />
-<circle cx='654.04' cy='275.09' r='3.31' style='stroke-width: 0.71; fill: #000000;' />
-<rect x='662.68' y='266.45' width='17.28' height='17.28' style='stroke-width: 1.07; stroke: none; fill: #FFFFFF;' />
-<circle cx='671.32' cy='275.09' r='4.69' style='stroke-width: 0.71; fill: #000000;' />
-<rect x='679.96' y='266.45' width='17.28' height='17.28' style='stroke-width: 1.07; stroke: none; fill: #FFFFFF;' />
-<circle cx='688.60' cy='275.09' r='5.64' style='stroke-width: 0.71; fill: #000000;' />
-<rect x='697.24' y='266.45' width='17.28' height='17.28' style='stroke-width: 1.07; stroke: none; fill: #FFFFFF;' />
-<circle cx='705.88' cy='275.09' r='6.41' style='stroke-width: 0.71; fill: #000000;' />
-<line x1='662.68' y1='283.73' x2='662.68' y2='280.28' style='stroke-width: 0.38; stroke-linecap: butt;' />
-<line x1='679.96' y1='283.73' x2='679.96' y2='280.28' style='stroke-width: 0.38; stroke-linecap: butt;' />
-<line x1='697.24' y1='283.73' x2='697.24' y2='280.28' style='stroke-width: 0.38; stroke-linecap: butt;' />
-<line x1='645.40' y1='283.73' x2='714.52' y2='283.73' style='stroke-width: 0.38; stroke-linecap: square;' />
-<text x='662.68' y='295.27' text-anchor='middle' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>1.5</text>
-<text x='679.96' y='295.27' text-anchor='middle' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>2.0</text>
-<text x='697.24' y='295.27' text-anchor='middle' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>2.5</text>
+<rect x='645.40' y='268.63' width='17.28' height='17.28' style='stroke-width: 1.07; stroke: none; fill: #FFFFFF;' />
+<circle cx='654.04' cy='277.27' r='3.31' style='stroke-width: 0.71; fill: #000000;' />
+<rect x='662.68' y='268.63' width='17.28' height='17.28' style='stroke-width: 1.07; stroke: none; fill: #FFFFFF;' />
+<circle cx='671.32' cy='277.27' r='4.69' style='stroke-width: 0.71; fill: #000000;' />
+<rect x='679.96' y='268.63' width='17.28' height='17.28' style='stroke-width: 1.07; stroke: none; fill: #FFFFFF;' />
+<circle cx='688.60' cy='277.27' r='5.64' style='stroke-width: 0.71; fill: #000000;' />
+<rect x='697.24' y='268.63' width='17.28' height='17.28' style='stroke-width: 1.07; stroke: none; fill: #FFFFFF;' />
+<circle cx='705.88' cy='277.27' r='6.41' style='stroke-width: 0.71; fill: #000000;' />
+<polyline points='645.40,285.91 714.52,285.91 ' style='stroke-width: 0.38; stroke-linecap: butt;' />
+<polyline points='662.68,285.91 662.68,282.45 ' style='stroke-width: 0.38; stroke-linecap: butt;' />
+<polyline points='679.96,285.91 679.96,282.45 ' style='stroke-width: 0.38; stroke-linecap: butt;' />
+<polyline points='697.24,285.91 697.24,282.45 ' style='stroke-width: 0.38; stroke-linecap: butt;' />
+<text x='662.68' y='297.44' text-anchor='middle' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>1.5</text>
+<text x='679.96' y='297.44' text-anchor='middle' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>2.0</text>
+<text x='697.24' y='297.44' text-anchor='middle' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>2.5</text>
 <text x='35.24' y='14.56' style='font-size: 13.20px; font-family: sans;' textLength='165.84px' lengthAdjust='spacingAndGlyphs'>guide_bins work horizontally</text>
 </g>
 </svg>

From 65a7195ecaa0637477f5c682f7cd93f3cb80452a Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Tue, 13 Sep 2022 17:52:00 +0200
Subject: [PATCH 067/111] Approve invisible visible changes

---
 ...ng-off-secondary-title-with-coord-flip.svg | 12 +--
 .../coord-map-switched-scale-position.svg     | 18 ++---
 .../secondary-axis-ticks-and-labels.svg       | 10 +--
 .../sec-axis-with-coord-trans.svg             | 22 ++---
 .../hex-bin-plot-in-polar-coordinates.svg     | 18 ++---
 .../hex-bin-plot-with-sqrt-transformed-y.svg  | 18 ++---
 ...e-hex-bin-with-width-and-height-of-0-1.svg |  6 +-
 .../_snaps/geom-raster/1-x-3-just-0-0.svg     | 22 ++---
 .../_snaps/geom-raster/1-x-3-set-limits.svg   | 22 ++---
 tests/testthat/_snaps/geom-raster/1-x-3.svg   | 22 ++---
 .../_snaps/geom-raster/3-x-1-just-0-0.svg     | 22 ++---
 .../_snaps/geom-raster/3-x-1-set-limits.svg   | 22 ++---
 tests/testthat/_snaps/geom-raster/3-x-1.svg   | 22 ++---
 .../_snaps/geom-raster/3-x-2-just-0-0.svg     | 26 +++---
 .../_snaps/geom-raster/3-x-2-set-limits.svg   | 26 +++---
 tests/testthat/_snaps/geom-raster/3-x-2.svg   | 26 +++---
 tests/testthat/_snaps/guides.md               | 39 +++++----
 .../_snaps/guides/axis-guides-basic.svg       | 12 +--
 .../guides/axis-guides-check-overlap.svg      | 80 +++++++++----------
 .../guides/axis-guides-negative-rotation.svg  | 40 +++++-----
 .../guides/axis-guides-positive-rotation.svg  | 40 +++++-----
 ...axis-guides-text-dodged-into-rows-cols.svg | 60 +++++++-------
 ...axis-guides-vertical-negative-rotation.svg | 40 +++++-----
 .../guides/axis-guides-vertical-rotation.svg  | 40 +++++-----
 .../guides/axis-guides-zero-rotation.svg      | 40 +++++-----
 .../guides/guide-axis-customization.svg       |  8 +-
 .../guides/guide-bins-can-show-arrows.svg     | 12 +--
 .../guides/guide-bins-can-show-limits.svg     | 12 +--
 .../guides/guide-bins-can-show-ticks.svg      | 14 ++--
 .../guides/guide-bins-looks-as-it-should.svg  |  8 +-
 ...s-sets-labels-when-limits-is-in-breaks.svg | 12 +--
 ...derstands-coinciding-limits-and-bins-2.svg | 12 +--
 ...derstands-coinciding-limits-and-bins-3.svg | 14 ++--
 ...understands-coinciding-limits-and-bins.svg | 12 +--
 ...s-sets-labels-when-limits-is-in-breaks.svg |  2 +-
 ...derstands-coinciding-limits-and-bins-2.svg |  2 +-
 ...derstands-coinciding-limits-and-bins-3.svg |  2 +-
 ...understands-coinciding-limits-and-bins.svg |  2 +-
 ...teps-can-have-bins-relative-to-binsize.svg |  2 +-
 .../guide-coloursteps-can-show-limits.svg     |  2 +-
 .../guide-coloursteps-looks-as-it-should.svg  |  2 +-
 ...t-positioning-and-alignment-via-themes.svg | 18 ++---
 .../guides/guide-titles-with-coord-trans.svg  | 20 ++---
 .../guides/guides-specified-in-guides.svg     | 28 +++----
 ...ap-of-1cm-between-guide-and-guide-text.svg | 22 ++---
 ...e-plot-bottom-left-of-legend-at-center.svg | 22 ++---
 .../guides/legend-inside-plot-bottom-left.svg | 22 ++---
 .../guides/legend-inside-plot-centered.svg    | 22 ++---
 .../guides/legend-inside-plot-top-right.svg   | 22 ++---
 .../guides/multi-line-guide-title-works.svg   | 26 +++---
 ...olorbar-for-colour-and-fill-aesthetics.svg | 30 +++----
 .../_snaps/guides/padding-in-legend-box.svg   | 22 ++---
 .../rotated-guide-titles-and-labels.svg       | 22 ++---
 ...p-of-1cm-between-guide-title-and-guide.svg | 22 ++---
 ...colorbar-thick-black-ticks-green-frame.svg | 22 ++---
 ...e-to-red-colorbar-white-ticks-no-frame.svg | 22 ++---
 .../sec-axis/sec-axis-custom-transform.svg    | 18 ++---
 .../sec-axis/sec-axis-datetime-scale.svg      | 26 +++---
 .../sec-axis-independent-transformations.svg  | 10 +--
 .../sec-axis/sec-axis-monotonicity-test.svg   |  8 +-
 .../sec-axis/sec-axis-sec-power-transform.svg | 12 +--
 .../sec-axis/sec-axis-skewed-transform.svg    | 10 +--
 .../sec-axis/sec-axis-with-division.svg       |  6 +-
 tests/testthat/_snaps/theme/axes-styling.svg  | 16 ++--
 tests/testthat/_snaps/theme/ticks-length.svg  | 16 ++--
 65 files changed, 643 insertions(+), 644 deletions(-)

diff --git a/tests/testthat/_snaps/coord-flip/turning-off-secondary-title-with-coord-flip.svg b/tests/testthat/_snaps/coord-flip/turning-off-secondary-title-with-coord-flip.svg
index a67dbd8469..ffb66ff639 100644
--- a/tests/testthat/_snaps/coord-flip/turning-off-secondary-title-with-coord-flip.svg
+++ b/tests/testthat/_snaps/coord-flip/turning-off-secondary-title-with-coord-flip.svg
@@ -74,12 +74,12 @@
 <polyline points='30.05,226.36 32.79,226.36 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='30.05,125.33 32.79,125.33 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='30.05,24.30 32.79,24.30 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='699.80,529.45 702.54,529.45 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='699.80,428.42 702.54,428.42 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='699.80,327.39 702.54,327.39 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='699.80,226.36 702.54,226.36 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='699.80,125.33 702.54,125.33 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='699.80,24.30 702.54,24.30 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='702.54,529.45 699.80,529.45 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='702.54,428.42 699.80,428.42 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='702.54,327.39 699.80,327.39 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='702.54,226.36 699.80,226.36 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='702.54,125.33 699.80,125.33 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='702.54,24.30 699.80,24.30 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <text x='704.73' y='532.48' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='9.79px' lengthAdjust='spacingAndGlyphs'>10</text>
 <text x='704.73' y='431.45' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='9.79px' lengthAdjust='spacingAndGlyphs'>15</text>
 <text x='704.73' y='330.42' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='9.79px' lengthAdjust='spacingAndGlyphs'>20</text>
diff --git a/tests/testthat/_snaps/coord-map/coord-map-switched-scale-position.svg b/tests/testthat/_snaps/coord-map/coord-map-switched-scale-position.svg
index 3d5fa0b240..7a7cf9889c 100644
--- a/tests/testthat/_snaps/coord-map/coord-map-switched-scale-position.svg
+++ b/tests/testthat/_snaps/coord-map/coord-map-switched-scale-position.svg
@@ -49,18 +49,18 @@
 <rect x='5.48' y='125.62' width='681.73' height='367.47' style='stroke-width: 1.07; stroke: #333333;' />
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+<polyline points='86.77,122.88 86.77,125.62 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='301.69,122.88 301.69,125.62 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='516.60,122.88 516.60,125.62 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <text x='86.77' y='120.69' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='17.61px' lengthAdjust='spacingAndGlyphs'>-120</text>
 <text x='301.69' y='120.69' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='17.61px' lengthAdjust='spacingAndGlyphs'>-100</text>
 <text x='516.60' y='120.69' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='12.72px' lengthAdjust='spacingAndGlyphs'>-80</text>
-<polyline points='86.77,125.62 86.77,122.88 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='301.69,125.62 301.69,122.88 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='516.60,125.62 516.60,122.88 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='687.21,480.31 689.95,480.31 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='687.21,419.71 689.95,419.71 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='687.21,355.97 689.95,355.97 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='687.21,288.19 689.95,288.19 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='687.21,215.26 689.95,215.26 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='687.21,135.64 689.95,135.64 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='689.95,480.31 687.21,480.31 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='689.95,419.71 687.21,419.71 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='689.95,355.97 687.21,355.97 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='689.95,288.19 687.21,288.19 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='689.95,215.26 687.21,215.26 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='689.95,135.64 687.21,135.64 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <text x='692.14' y='483.34' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='9.79px' lengthAdjust='spacingAndGlyphs'>25</text>
 <text x='692.14' y='422.74' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='9.79px' lengthAdjust='spacingAndGlyphs'>30</text>
 <text x='692.14' y='358.99' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='9.79px' lengthAdjust='spacingAndGlyphs'>35</text>
diff --git a/tests/testthat/_snaps/coord-polar/secondary-axis-ticks-and-labels.svg b/tests/testthat/_snaps/coord-polar/secondary-axis-ticks-and-labels.svg
index abfad410e5..3e0228e8dc 100644
--- a/tests/testthat/_snaps/coord-polar/secondary-axis-ticks-and-labels.svg
+++ b/tests/testthat/_snaps/coord-polar/secondary-axis-ticks-and-labels.svg
@@ -49,11 +49,11 @@
 <polyline points='88.61,182.50 91.35,182.50 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='88.61,129.26 91.35,129.26 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='88.61,76.02 91.35,76.02 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='623.75,288.99 626.49,288.99 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='623.75,235.74 626.49,235.74 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='623.75,182.50 626.49,182.50 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='623.75,129.26 626.49,129.26 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='623.75,76.02 626.49,76.02 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='626.49,288.99 623.75,288.99 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='626.49,235.74 623.75,235.74 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='626.49,182.50 623.75,182.50 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='626.49,129.26 623.75,129.26 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='626.49,76.02 623.75,76.02 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <text x='628.69' y='292.01' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='17.13px' lengthAdjust='spacingAndGlyphs'>0.10</text>
 <text x='628.69' y='238.77' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='17.13px' lengthAdjust='spacingAndGlyphs'>0.15</text>
 <text x='628.69' y='185.53' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='17.13px' lengthAdjust='spacingAndGlyphs'>0.20</text>
diff --git a/tests/testthat/_snaps/coord-transform/sec-axis-with-coord-trans.svg b/tests/testthat/_snaps/coord-transform/sec-axis-with-coord-trans.svg
index 01f5766194..ec428f81e0 100644
--- a/tests/testthat/_snaps/coord-transform/sec-axis-with-coord-trans.svg
+++ b/tests/testthat/_snaps/coord-transform/sec-axis-with-coord-trans.svg
@@ -264,18 +264,18 @@
 <rect x='59.71' y='48.19' width='625.05' height='496.92' style='stroke-width: 1.07; stroke: #333333;' />
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+<polyline points='109.98,45.45 109.98,48.19 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='219.25,45.45 219.25,48.19 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='328.53,45.45 328.53,48.19 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='437.80,45.45 437.80,48.19 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='547.08,45.45 547.08,48.19 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='656.35,45.45 656.35,48.19 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <text x='109.98' y='43.26' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='9.79px' lengthAdjust='spacingAndGlyphs'>10</text>
 <text x='219.25' y='43.26' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='9.79px' lengthAdjust='spacingAndGlyphs'>15</text>
 <text x='328.53' y='43.26' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='9.79px' lengthAdjust='spacingAndGlyphs'>20</text>
 <text x='437.80' y='43.26' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='9.79px' lengthAdjust='spacingAndGlyphs'>25</text>
 <text x='547.08' y='43.26' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='9.79px' lengthAdjust='spacingAndGlyphs'>30</text>
 <text x='656.35' y='43.26' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='9.79px' lengthAdjust='spacingAndGlyphs'>35</text>
-<polyline points='109.98,48.19 109.98,45.45 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='219.25,48.19 219.25,45.45 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='328.53,48.19 328.53,45.45 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='437.80,48.19 437.80,45.45 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='547.08,48.19 547.08,45.45 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='656.35,48.19 656.35,45.45 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <text x='54.78' y='546.03' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='36.71px' lengthAdjust='spacingAndGlyphs'>11.31371</text>
 <text x='54.78' y='425.53' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='36.71px' lengthAdjust='spacingAndGlyphs'>16.00000</text>
 <text x='54.78' y='305.03' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='36.71px' lengthAdjust='spacingAndGlyphs'>22.62742</text>
@@ -286,11 +286,11 @@
 <polyline points='56.97,302.00 59.71,302.00 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='56.97,181.50 59.71,181.50 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='56.97,61.00 59.71,61.00 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='684.76,543.00 687.50,543.00 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='684.76,422.50 687.50,422.50 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='684.76,302.00 687.50,302.00 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='684.76,181.50 687.50,181.50 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='684.76,61.00 687.50,61.00 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='687.50,543.00 684.76,543.00 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='687.50,422.50 684.76,422.50 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='687.50,302.00 684.76,302.00 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='687.50,181.50 684.76,181.50 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='687.50,61.00 684.76,61.00 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <text x='689.69' y='546.03' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>3.5</text>
 <text x='689.69' y='425.53' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>4.0</text>
 <text x='689.69' y='305.03' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>4.5</text>
diff --git a/tests/testthat/_snaps/geom-hex/hex-bin-plot-in-polar-coordinates.svg b/tests/testthat/_snaps/geom-hex/hex-bin-plot-in-polar-coordinates.svg
index 34bc427bd8..684f55a820 100644
--- a/tests/testthat/_snaps/geom-hex/hex-bin-plot-in-polar-coordinates.svg
+++ b/tests/testthat/_snaps/geom-hex/hex-bin-plot-in-polar-coordinates.svg
@@ -164,20 +164,20 @@
 <text x='348.23' y='568.24' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='22.62px' lengthAdjust='spacingAndGlyphs'>displ</text>
 <text transform='translate(64.30,286.98) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='19.57px' lengthAdjust='spacingAndGlyphs'>hwy</text>
 <rect x='623.39' y='236.11' width='39.89' height='101.73' style='stroke-width: 1.07; stroke: none; fill: #FFFFFF;' />
+<text x='623.39' y='244.82' style='font-size: 11.00px; font-family: sans;' textLength='26.91px' lengthAdjust='spacingAndGlyphs'>count</text>
 <image width='17.28' height='86.40' x='623.39' y='251.44' preserveAspectRatio='none' xlink:href='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAEsCAYAAAACUNnVAAAAmElEQVQ4ja2UQRLDMAgDd3hk/tnX5agcknFaCoa0vnkMCEnGsL12GQhDYDpPwoDrpBFlRDWi/9Wu6AHC9FkLYLrzlhD3oJ3mDvRHRYy7IC8A7bCK8gpWKYDzeQVArDcDyD2YAnSofZvzaOA6Q7Oahp/dmRuVTQ0xU5TGP2o8Waool1obVuv1q8qP9xPvg633XlGLDtfIhNUBcBeA5ss0BXMAAAAASUVORK5CYII='/>
+<polyline points='640.67,323.35 637.21,323.35 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='640.67,299.43 637.21,299.43 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='640.67,275.51 637.21,275.51 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='640.67,251.59 637.21,251.59 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='623.39,323.35 626.84,323.35 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='623.39,299.43 626.84,299.43 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='623.39,275.51 626.84,275.51 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='623.39,251.59 626.84,251.59 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
 <text x='646.14' y='326.37' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>2.5</text>
 <text x='646.14' y='302.45' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>5.0</text>
 <text x='646.14' y='278.53' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>7.5</text>
 <text x='646.14' y='254.61' style='font-size: 8.80px; font-family: sans;' textLength='17.13px' lengthAdjust='spacingAndGlyphs'>10.0</text>
-<text x='623.39' y='244.82' style='font-size: 11.00px; font-family: sans;' textLength='26.91px' lengthAdjust='spacingAndGlyphs'>count</text>
-<line x1='623.39' y1='323.35' x2='626.84' y2='323.35' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='623.39' y1='299.43' x2='626.84' y2='299.43' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='623.39' y1='275.51' x2='626.84' y2='275.51' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='623.39' y1='251.59' x2='626.84' y2='251.59' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='637.21' y1='323.35' x2='640.67' y2='323.35' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='637.21' y1='299.43' x2='640.67' y2='299.43' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='637.21' y1='275.51' x2='640.67' y2='275.51' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='637.21' y1='251.59' x2='640.67' y2='251.59' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
 <text x='84.04' y='14.56' style='font-size: 13.20px; font-family: sans;' textLength='186.40px' lengthAdjust='spacingAndGlyphs'>hex bin plot in polar coordinates</text>
 </g>
 </svg>
diff --git a/tests/testthat/_snaps/geom-hex/hex-bin-plot-with-sqrt-transformed-y.svg b/tests/testthat/_snaps/geom-hex/hex-bin-plot-with-sqrt-transformed-y.svg
index 82486696e1..ad7a7f2b44 100644
--- a/tests/testthat/_snaps/geom-hex/hex-bin-plot-with-sqrt-transformed-y.svg
+++ b/tests/testthat/_snaps/geom-hex/hex-bin-plot-with-sqrt-transformed-y.svg
@@ -162,20 +162,20 @@
 <text x='348.23' y='568.24' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='22.62px' lengthAdjust='spacingAndGlyphs'>displ</text>
 <text transform='translate(13.05,283.95) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='19.57px' lengthAdjust='spacingAndGlyphs'>hwy</text>
 <rect x='674.63' y='233.08' width='39.89' height='101.73' style='stroke-width: 1.07; stroke: none; fill: #FFFFFF;' />
+<text x='674.63' y='241.79' style='font-size: 11.00px; font-family: sans;' textLength='26.91px' lengthAdjust='spacingAndGlyphs'>count</text>
 <image width='17.28' height='86.40' x='674.63' y='248.41' preserveAspectRatio='none' xlink:href='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAEsCAYAAAACUNnVAAAAmElEQVQ4ja2UQRLDMAgDd3hk/tnX5agcknFaCoa0vnkMCEnGsL12GQhDYDpPwoDrpBFlRDWi/9Wu6AHC9FkLYLrzlhD3oJ3mDvRHRYy7IC8A7bCK8gpWKYDzeQVArDcDyD2YAnSofZvzaOA6Q7Oahp/dmRuVTQ0xU5TGP2o8Waool1obVuv1q8qP9xPvg633XlGLDtfIhNUBcBeA5ss0BXMAAAAASUVORK5CYII='/>
+<polyline points='691.91,320.32 688.46,320.32 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='691.91,296.40 688.46,296.40 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='691.91,272.48 688.46,272.48 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='691.91,248.56 688.46,248.56 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='674.63,320.32 678.09,320.32 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='674.63,296.40 678.09,296.40 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='674.63,272.48 678.09,272.48 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='674.63,248.56 678.09,248.56 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
 <text x='697.39' y='323.35' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>2.5</text>
 <text x='697.39' y='299.43' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>5.0</text>
 <text x='697.39' y='275.51' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>7.5</text>
 <text x='697.39' y='251.59' style='font-size: 8.80px; font-family: sans;' textLength='17.13px' lengthAdjust='spacingAndGlyphs'>10.0</text>
-<text x='674.63' y='241.79' style='font-size: 11.00px; font-family: sans;' textLength='26.91px' lengthAdjust='spacingAndGlyphs'>count</text>
-<line x1='674.63' y1='320.32' x2='678.09' y2='320.32' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='674.63' y1='296.40' x2='678.09' y2='296.40' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='674.63' y1='272.48' x2='678.09' y2='272.48' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='674.63' y1='248.56' x2='678.09' y2='248.56' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='688.46' y1='320.32' x2='691.91' y2='320.32' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='688.46' y1='296.40' x2='691.91' y2='296.40' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='688.46' y1='272.48' x2='691.91' y2='272.48' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='688.46' y1='248.56' x2='691.91' y2='248.56' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
 <text x='32.79' y='14.56' style='font-size: 13.20px; font-family: sans;' textLength='205.44px' lengthAdjust='spacingAndGlyphs'>hex bin plot with sqrt-transformed y</text>
 </g>
 </svg>
diff --git a/tests/testthat/_snaps/geom-hex/single-hex-bin-with-width-and-height-of-0-1.svg b/tests/testthat/_snaps/geom-hex/single-hex-bin-with-width-and-height-of-0-1.svg
index ec51b6ab15..152b823d80 100644
--- a/tests/testthat/_snaps/geom-hex/single-hex-bin-with-width-and-height-of-0-1.svg
+++ b/tests/testthat/_snaps/geom-hex/single-hex-bin-with-width-and-height-of-0-1.svg
@@ -54,11 +54,11 @@
 <text x='357.04' y='568.24' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>x</text>
 <text transform='translate(13.05,283.95) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>y</text>
 <rect x='686.87' y='233.08' width='27.65' height='101.73' style='stroke-width: 1.07; stroke: none; fill: #FFFFFF;' />
+<text x='686.87' y='241.79' style='font-size: 11.00px; font-family: sans;' textLength='26.91px' lengthAdjust='spacingAndGlyphs'>count</text>
 <image width='17.28' height='86.40' x='686.87' y='248.41' preserveAspectRatio='none' xlink:href='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAEsCAYAAAACUNnVAAAAHUlEQVQ4jWMwzprxn4mBgYFhlBglRolRYpQYLgQAwNIEi4uZL9UAAAAASUVORK5CYII='/>
+<polyline points='704.15,291.61 700.69,291.61 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='686.87,291.61 690.32,291.61 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
 <text x='709.63' y='294.64' style='font-size: 8.80px; font-family: sans;' textLength='4.89px' lengthAdjust='spacingAndGlyphs'>1</text>
-<text x='686.87' y='241.79' style='font-size: 11.00px; font-family: sans;' textLength='26.91px' lengthAdjust='spacingAndGlyphs'>count</text>
-<line x1='686.87' y1='291.61' x2='690.32' y2='291.61' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='700.69' y1='291.61' x2='704.15' y2='291.61' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
 <text x='38.17' y='14.56' style='font-size: 13.20px; font-family: sans;' textLength='244.37px' lengthAdjust='spacingAndGlyphs'>single hex bin with width and height of 0.1</text>
 </g>
 </svg>
diff --git a/tests/testthat/_snaps/geom-raster/1-x-3-just-0-0.svg b/tests/testthat/_snaps/geom-raster/1-x-3-just-0-0.svg
index ce0763cff1..d6925d5277 100644
--- a/tests/testthat/_snaps/geom-raster/1-x-3-just-0-0.svg
+++ b/tests/testthat/_snaps/geom-raster/1-x-3-just-0-0.svg
@@ -55,23 +55,23 @@
 <text x='355.82' y='568.24' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>x</text>
 <text transform='translate(13.05,283.95) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>y</text>
 <rect x='679.53' y='233.08' width='34.99' height='101.73' style='stroke-width: 1.07; stroke: none; fill: #FFFFFF;' />
+<text x='679.53' y='241.79' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>z</text>
 <image width='17.28' height='86.40' x='679.53' y='248.41' preserveAspectRatio='none' xlink:href='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAEsCAYAAAACUNnVAAAAmElEQVQ4ja2UQRLDMAgDd3hk/tnX5agcknFaCoa0vnkMCEnGsL12GQhDYDpPwoDrpBFlRDWi/9Wu6AHC9FkLYLrzlhD3oJ3mDvRHRYy7IC8A7bCK8gpWKYDzeQVArDcDyD2YAnSofZvzaOA6Q7Oahp/dmRuVTQ0xU5TGP2o8Waool1obVuv1q8qP9xPvg633XlGLDtfIhNUBcBeA5ss0BXMAAAAASUVORK5CYII='/>
+<polyline points='696.81,334.67 693.35,334.67 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='696.81,313.14 693.35,313.14 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='696.81,291.61 693.35,291.61 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='696.81,270.09 693.35,270.09 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='696.81,248.56 693.35,248.56 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='679.53,334.67 682.98,334.67 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='679.53,313.14 682.98,313.14 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='679.53,291.61 682.98,291.61 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='679.53,270.09 682.98,270.09 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='679.53,248.56 682.98,248.56 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
 <text x='702.29' y='337.70' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>1.0</text>
 <text x='702.29' y='316.17' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>1.5</text>
 <text x='702.29' y='294.64' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>2.0</text>
 <text x='702.29' y='273.11' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>2.5</text>
 <text x='702.29' y='251.59' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>3.0</text>
-<text x='679.53' y='241.79' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>z</text>
-<line x1='679.53' y1='334.67' x2='682.98' y2='334.67' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='679.53' y1='313.14' x2='682.98' y2='313.14' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='679.53' y1='291.61' x2='682.98' y2='291.61' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='679.53' y1='270.09' x2='682.98' y2='270.09' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='679.53' y1='248.56' x2='682.98' y2='248.56' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='693.35' y1='334.67' x2='696.81' y2='334.67' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='693.35' y1='313.14' x2='696.81' y2='313.14' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='693.35' y1='291.61' x2='696.81' y2='291.61' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='693.35' y1='270.09' x2='696.81' y2='270.09' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='693.35' y1='248.56' x2='696.81' y2='248.56' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
 <text x='43.06' y='14.56' style='font-size: 13.20px; font-family: sans;' textLength='102.36px' lengthAdjust='spacingAndGlyphs'>1 x 3, just = (0, 0)</text>
 </g>
 </svg>
diff --git a/tests/testthat/_snaps/geom-raster/1-x-3-set-limits.svg b/tests/testthat/_snaps/geom-raster/1-x-3-set-limits.svg
index 8d30468d6d..0d7aa1e7e9 100644
--- a/tests/testthat/_snaps/geom-raster/1-x-3-set-limits.svg
+++ b/tests/testthat/_snaps/geom-raster/1-x-3-set-limits.svg
@@ -57,23 +57,23 @@
 <text x='349.70' y='568.24' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>x</text>
 <text transform='translate(13.05,283.95) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>y</text>
 <rect x='679.53' y='233.08' width='34.99' height='101.73' style='stroke-width: 1.07; stroke: none; fill: #FFFFFF;' />
+<text x='679.53' y='241.79' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>z</text>
 <image width='17.28' height='86.40' x='679.53' y='248.41' preserveAspectRatio='none' xlink:href='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAEsCAYAAAACUNnVAAAAmElEQVQ4ja2UQRLDMAgDd3hk/tnX5agcknFaCoa0vnkMCEnGsL12GQhDYDpPwoDrpBFlRDWi/9Wu6AHC9FkLYLrzlhD3oJ3mDvRHRYy7IC8A7bCK8gpWKYDzeQVArDcDyD2YAnSofZvzaOA6Q7Oahp/dmRuVTQ0xU5TGP2o8Waool1obVuv1q8qP9xPvg633XlGLDtfIhNUBcBeA5ss0BXMAAAAASUVORK5CYII='/>
+<polyline points='696.81,334.67 693.35,334.67 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='696.81,313.14 693.35,313.14 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='696.81,291.61 693.35,291.61 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='696.81,270.09 693.35,270.09 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='696.81,248.56 693.35,248.56 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='679.53,334.67 682.98,334.67 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='679.53,313.14 682.98,313.14 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='679.53,291.61 682.98,291.61 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='679.53,270.09 682.98,270.09 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='679.53,248.56 682.98,248.56 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
 <text x='702.29' y='337.70' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>1.0</text>
 <text x='702.29' y='316.17' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>1.5</text>
 <text x='702.29' y='294.64' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>2.0</text>
 <text x='702.29' y='273.11' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>2.5</text>
 <text x='702.29' y='251.59' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>3.0</text>
-<text x='679.53' y='241.79' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>z</text>
-<line x1='679.53' y1='334.67' x2='682.98' y2='334.67' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='679.53' y1='313.14' x2='682.98' y2='313.14' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='679.53' y1='291.61' x2='682.98' y2='291.61' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='679.53' y1='270.09' x2='682.98' y2='270.09' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='679.53' y1='248.56' x2='682.98' y2='248.56' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='693.35' y1='334.67' x2='696.81' y2='334.67' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='693.35' y1='313.14' x2='696.81' y2='313.14' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='693.35' y1='291.61' x2='696.81' y2='291.61' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='693.35' y1='270.09' x2='696.81' y2='270.09' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='693.35' y1='248.56' x2='696.81' y2='248.56' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
 <text x='30.83' y='14.56' style='font-size: 13.20px; font-family: sans;' textLength='87.30px' lengthAdjust='spacingAndGlyphs'>1 x 3, set limits</text>
 </g>
 </svg>
diff --git a/tests/testthat/_snaps/geom-raster/1-x-3.svg b/tests/testthat/_snaps/geom-raster/1-x-3.svg
index cb1b36f7a1..f5cf7f593a 100644
--- a/tests/testthat/_snaps/geom-raster/1-x-3.svg
+++ b/tests/testthat/_snaps/geom-raster/1-x-3.svg
@@ -53,23 +53,23 @@
 <text x='355.82' y='568.24' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>x</text>
 <text transform='translate(13.05,283.95) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>y</text>
 <rect x='679.53' y='233.08' width='34.99' height='101.73' style='stroke-width: 1.07; stroke: none; fill: #FFFFFF;' />
+<text x='679.53' y='241.79' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>z</text>
 <image width='17.28' height='86.40' x='679.53' y='248.41' preserveAspectRatio='none' xlink:href='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAEsCAYAAAACUNnVAAAAmElEQVQ4ja2UQRLDMAgDd3hk/tnX5agcknFaCoa0vnkMCEnGsL12GQhDYDpPwoDrpBFlRDWi/9Wu6AHC9FkLYLrzlhD3oJ3mDvRHRYy7IC8A7bCK8gpWKYDzeQVArDcDyD2YAnSofZvzaOA6Q7Oahp/dmRuVTQ0xU5TGP2o8Waool1obVuv1q8qP9xPvg633XlGLDtfIhNUBcBeA5ss0BXMAAAAASUVORK5CYII='/>
+<polyline points='696.81,334.67 693.35,334.67 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='696.81,313.14 693.35,313.14 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='696.81,291.61 693.35,291.61 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='696.81,270.09 693.35,270.09 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='696.81,248.56 693.35,248.56 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='679.53,334.67 682.98,334.67 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='679.53,313.14 682.98,313.14 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='679.53,291.61 682.98,291.61 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='679.53,270.09 682.98,270.09 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='679.53,248.56 682.98,248.56 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
 <text x='702.29' y='337.70' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>1.0</text>
 <text x='702.29' y='316.17' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>1.5</text>
 <text x='702.29' y='294.64' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>2.0</text>
 <text x='702.29' y='273.11' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>2.5</text>
 <text x='702.29' y='251.59' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>3.0</text>
-<text x='679.53' y='241.79' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>z</text>
-<line x1='679.53' y1='334.67' x2='682.98' y2='334.67' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='679.53' y1='313.14' x2='682.98' y2='313.14' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='679.53' y1='291.61' x2='682.98' y2='291.61' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='679.53' y1='270.09' x2='682.98' y2='270.09' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='679.53' y1='248.56' x2='682.98' y2='248.56' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='693.35' y1='334.67' x2='696.81' y2='334.67' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='693.35' y1='313.14' x2='696.81' y2='313.14' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='693.35' y1='291.61' x2='696.81' y2='291.61' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='693.35' y1='270.09' x2='696.81' y2='270.09' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='693.35' y1='248.56' x2='696.81' y2='248.56' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
 <text x='43.06' y='14.56' style='font-size: 13.20px; font-family: sans;' textLength='28.62px' lengthAdjust='spacingAndGlyphs'>1 x 3</text>
 </g>
 </svg>
diff --git a/tests/testthat/_snaps/geom-raster/3-x-1-just-0-0.svg b/tests/testthat/_snaps/geom-raster/3-x-1-just-0-0.svg
index 28f62d9499..090bf3e379 100644
--- a/tests/testthat/_snaps/geom-raster/3-x-1-just-0-0.svg
+++ b/tests/testthat/_snaps/geom-raster/3-x-1-just-0-0.svg
@@ -55,23 +55,23 @@
 <text x='349.70' y='568.24' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>x</text>
 <text transform='translate(13.05,283.95) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>y</text>
 <rect x='679.53' y='233.08' width='34.99' height='101.73' style='stroke-width: 1.07; stroke: none; fill: #FFFFFF;' />
+<text x='679.53' y='241.79' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>z</text>
 <image width='17.28' height='86.40' x='679.53' y='248.41' preserveAspectRatio='none' xlink:href='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAEsCAYAAAACUNnVAAAAmElEQVQ4ja2UQRLDMAgDd3hk/tnX5agcknFaCoa0vnkMCEnGsL12GQhDYDpPwoDrpBFlRDWi/9Wu6AHC9FkLYLrzlhD3oJ3mDvRHRYy7IC8A7bCK8gpWKYDzeQVArDcDyD2YAnSofZvzaOA6Q7Oahp/dmRuVTQ0xU5TGP2o8Waool1obVuv1q8qP9xPvg633XlGLDtfIhNUBcBeA5ss0BXMAAAAASUVORK5CYII='/>
+<polyline points='696.81,334.67 693.35,334.67 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='696.81,313.14 693.35,313.14 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='696.81,291.61 693.35,291.61 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='696.81,270.09 693.35,270.09 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='696.81,248.56 693.35,248.56 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='679.53,334.67 682.98,334.67 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='679.53,313.14 682.98,313.14 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='679.53,291.61 682.98,291.61 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='679.53,270.09 682.98,270.09 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='679.53,248.56 682.98,248.56 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
 <text x='702.29' y='337.70' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>1.0</text>
 <text x='702.29' y='316.17' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>1.5</text>
 <text x='702.29' y='294.64' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>2.0</text>
 <text x='702.29' y='273.11' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>2.5</text>
 <text x='702.29' y='251.59' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>3.0</text>
-<text x='679.53' y='241.79' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>z</text>
-<line x1='679.53' y1='334.67' x2='682.98' y2='334.67' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='679.53' y1='313.14' x2='682.98' y2='313.14' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='679.53' y1='291.61' x2='682.98' y2='291.61' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='679.53' y1='270.09' x2='682.98' y2='270.09' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='679.53' y1='248.56' x2='682.98' y2='248.56' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='693.35' y1='334.67' x2='696.81' y2='334.67' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='693.35' y1='313.14' x2='696.81' y2='313.14' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='693.35' y1='291.61' x2='696.81' y2='291.61' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='693.35' y1='270.09' x2='696.81' y2='270.09' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='693.35' y1='248.56' x2='696.81' y2='248.56' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
 <text x='30.83' y='14.56' style='font-size: 13.20px; font-family: sans;' textLength='102.36px' lengthAdjust='spacingAndGlyphs'>3 x 1, just = (0, 0)</text>
 </g>
 </svg>
diff --git a/tests/testthat/_snaps/geom-raster/3-x-1-set-limits.svg b/tests/testthat/_snaps/geom-raster/3-x-1-set-limits.svg
index 8f0ea47377..f1493847f4 100644
--- a/tests/testthat/_snaps/geom-raster/3-x-1-set-limits.svg
+++ b/tests/testthat/_snaps/geom-raster/3-x-1-set-limits.svg
@@ -57,23 +57,23 @@
 <text x='349.70' y='568.24' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>x</text>
 <text transform='translate(13.05,283.95) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>y</text>
 <rect x='679.53' y='233.08' width='34.99' height='101.73' style='stroke-width: 1.07; stroke: none; fill: #FFFFFF;' />
+<text x='679.53' y='241.79' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>z</text>
 <image width='17.28' height='86.40' x='679.53' y='248.41' preserveAspectRatio='none' xlink:href='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAEsCAYAAAACUNnVAAAAmElEQVQ4ja2UQRLDMAgDd3hk/tnX5agcknFaCoa0vnkMCEnGsL12GQhDYDpPwoDrpBFlRDWi/9Wu6AHC9FkLYLrzlhD3oJ3mDvRHRYy7IC8A7bCK8gpWKYDzeQVArDcDyD2YAnSofZvzaOA6Q7Oahp/dmRuVTQ0xU5TGP2o8Waool1obVuv1q8qP9xPvg633XlGLDtfIhNUBcBeA5ss0BXMAAAAASUVORK5CYII='/>
+<polyline points='696.81,334.67 693.35,334.67 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='696.81,313.14 693.35,313.14 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='696.81,291.61 693.35,291.61 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='696.81,270.09 693.35,270.09 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='696.81,248.56 693.35,248.56 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='679.53,334.67 682.98,334.67 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='679.53,313.14 682.98,313.14 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='679.53,291.61 682.98,291.61 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='679.53,270.09 682.98,270.09 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='679.53,248.56 682.98,248.56 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
 <text x='702.29' y='337.70' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>1.0</text>
 <text x='702.29' y='316.17' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>1.5</text>
 <text x='702.29' y='294.64' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>2.0</text>
 <text x='702.29' y='273.11' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>2.5</text>
 <text x='702.29' y='251.59' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>3.0</text>
-<text x='679.53' y='241.79' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>z</text>
-<line x1='679.53' y1='334.67' x2='682.98' y2='334.67' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='679.53' y1='313.14' x2='682.98' y2='313.14' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='679.53' y1='291.61' x2='682.98' y2='291.61' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='679.53' y1='270.09' x2='682.98' y2='270.09' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='679.53' y1='248.56' x2='682.98' y2='248.56' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='693.35' y1='334.67' x2='696.81' y2='334.67' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='693.35' y1='313.14' x2='696.81' y2='313.14' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='693.35' y1='291.61' x2='696.81' y2='291.61' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='693.35' y1='270.09' x2='696.81' y2='270.09' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='693.35' y1='248.56' x2='696.81' y2='248.56' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
 <text x='30.83' y='14.56' style='font-size: 13.20px; font-family: sans;' textLength='87.30px' lengthAdjust='spacingAndGlyphs'>3 x 1, set limits</text>
 </g>
 </svg>
diff --git a/tests/testthat/_snaps/geom-raster/3-x-1.svg b/tests/testthat/_snaps/geom-raster/3-x-1.svg
index bc44868920..81c8824ccb 100644
--- a/tests/testthat/_snaps/geom-raster/3-x-1.svg
+++ b/tests/testthat/_snaps/geom-raster/3-x-1.svg
@@ -53,23 +53,23 @@
 <text x='349.70' y='568.24' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>x</text>
 <text transform='translate(13.05,283.95) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>y</text>
 <rect x='679.53' y='233.08' width='34.99' height='101.73' style='stroke-width: 1.07; stroke: none; fill: #FFFFFF;' />
+<text x='679.53' y='241.79' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>z</text>
 <image width='17.28' height='86.40' x='679.53' y='248.41' preserveAspectRatio='none' xlink:href='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAEsCAYAAAACUNnVAAAAmElEQVQ4ja2UQRLDMAgDd3hk/tnX5agcknFaCoa0vnkMCEnGsL12GQhDYDpPwoDrpBFlRDWi/9Wu6AHC9FkLYLrzlhD3oJ3mDvRHRYy7IC8A7bCK8gpWKYDzeQVArDcDyD2YAnSofZvzaOA6Q7Oahp/dmRuVTQ0xU5TGP2o8Waool1obVuv1q8qP9xPvg633XlGLDtfIhNUBcBeA5ss0BXMAAAAASUVORK5CYII='/>
+<polyline points='696.81,334.67 693.35,334.67 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='696.81,313.14 693.35,313.14 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='696.81,291.61 693.35,291.61 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='696.81,270.09 693.35,270.09 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='696.81,248.56 693.35,248.56 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='679.53,334.67 682.98,334.67 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='679.53,313.14 682.98,313.14 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='679.53,291.61 682.98,291.61 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='679.53,270.09 682.98,270.09 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='679.53,248.56 682.98,248.56 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
 <text x='702.29' y='337.70' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>1.0</text>
 <text x='702.29' y='316.17' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>1.5</text>
 <text x='702.29' y='294.64' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>2.0</text>
 <text x='702.29' y='273.11' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>2.5</text>
 <text x='702.29' y='251.59' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>3.0</text>
-<text x='679.53' y='241.79' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>z</text>
-<line x1='679.53' y1='334.67' x2='682.98' y2='334.67' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='679.53' y1='313.14' x2='682.98' y2='313.14' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='679.53' y1='291.61' x2='682.98' y2='291.61' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='679.53' y1='270.09' x2='682.98' y2='270.09' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='679.53' y1='248.56' x2='682.98' y2='248.56' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='693.35' y1='334.67' x2='696.81' y2='334.67' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='693.35' y1='313.14' x2='696.81' y2='313.14' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='693.35' y1='291.61' x2='696.81' y2='291.61' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='693.35' y1='270.09' x2='696.81' y2='270.09' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='693.35' y1='248.56' x2='696.81' y2='248.56' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
 <text x='30.83' y='14.56' style='font-size: 13.20px; font-family: sans;' textLength='28.62px' lengthAdjust='spacingAndGlyphs'>3 x 1</text>
 </g>
 </svg>
diff --git a/tests/testthat/_snaps/geom-raster/3-x-2-just-0-0.svg b/tests/testthat/_snaps/geom-raster/3-x-2-just-0-0.svg
index 10dc0076d0..9c47db029b 100644
--- a/tests/testthat/_snaps/geom-raster/3-x-2-just-0-0.svg
+++ b/tests/testthat/_snaps/geom-raster/3-x-2-just-0-0.svg
@@ -58,26 +58,26 @@
 <text x='353.37' y='568.24' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>x</text>
 <text transform='translate(13.05,283.95) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>y</text>
 <rect x='686.87' y='233.08' width='27.65' height='101.73' style='stroke-width: 1.07; stroke: none; fill: #FFFFFF;' />
+<text x='686.87' y='241.79' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>z</text>
 <image width='17.28' height='86.40' x='686.87' y='248.41' preserveAspectRatio='none' xlink:href='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAEsCAYAAAACUNnVAAAAmElEQVQ4ja2UQRLDMAgDd3hk/tnX5agcknFaCoa0vnkMCEnGsL12GQhDYDpPwoDrpBFlRDWi/9Wu6AHC9FkLYLrzlhD3oJ3mDvRHRYy7IC8A7bCK8gpWKYDzeQVArDcDyD2YAnSofZvzaOA6Q7Oahp/dmRuVTQ0xU5TGP2o8Waool1obVuv1q8qP9xPvg633XlGLDtfIhNUBcBeA5ss0BXMAAAAASUVORK5CYII='/>
+<polyline points='704.15,334.67 700.69,334.67 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='704.15,317.45 700.69,317.45 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='704.15,300.23 700.69,300.23 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='704.15,283.00 700.69,283.00 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='704.15,265.78 700.69,265.78 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='704.15,248.56 700.69,248.56 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='686.87,334.67 690.32,334.67 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='686.87,317.45 690.32,317.45 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='686.87,300.23 690.32,300.23 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='686.87,283.00 690.32,283.00 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='686.87,265.78 690.32,265.78 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='686.87,248.56 690.32,248.56 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
 <text x='709.63' y='337.70' style='font-size: 8.80px; font-family: sans;' textLength='4.89px' lengthAdjust='spacingAndGlyphs'>1</text>
 <text x='709.63' y='320.48' style='font-size: 8.80px; font-family: sans;' textLength='4.89px' lengthAdjust='spacingAndGlyphs'>2</text>
 <text x='709.63' y='303.25' style='font-size: 8.80px; font-family: sans;' textLength='4.89px' lengthAdjust='spacingAndGlyphs'>3</text>
 <text x='709.63' y='286.03' style='font-size: 8.80px; font-family: sans;' textLength='4.89px' lengthAdjust='spacingAndGlyphs'>4</text>
 <text x='709.63' y='268.81' style='font-size: 8.80px; font-family: sans;' textLength='4.89px' lengthAdjust='spacingAndGlyphs'>5</text>
 <text x='709.63' y='251.59' style='font-size: 8.80px; font-family: sans;' textLength='4.89px' lengthAdjust='spacingAndGlyphs'>6</text>
-<text x='686.87' y='241.79' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>z</text>
-<line x1='686.87' y1='334.67' x2='690.32' y2='334.67' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='686.87' y1='317.45' x2='690.32' y2='317.45' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='686.87' y1='300.23' x2='690.32' y2='300.23' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='686.87' y1='283.00' x2='690.32' y2='283.00' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='686.87' y1='265.78' x2='690.32' y2='265.78' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='686.87' y1='248.56' x2='690.32' y2='248.56' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='700.69' y1='334.67' x2='704.15' y2='334.67' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='700.69' y1='317.45' x2='704.15' y2='317.45' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='700.69' y1='300.23' x2='704.15' y2='300.23' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='700.69' y1='283.00' x2='704.15' y2='283.00' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='700.69' y1='265.78' x2='704.15' y2='265.78' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='700.69' y1='248.56' x2='704.15' y2='248.56' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
 <text x='30.83' y='14.56' style='font-size: 13.20px; font-family: sans;' textLength='102.36px' lengthAdjust='spacingAndGlyphs'>3 x 2, just = (0, 0)</text>
 </g>
 </svg>
diff --git a/tests/testthat/_snaps/geom-raster/3-x-2-set-limits.svg b/tests/testthat/_snaps/geom-raster/3-x-2-set-limits.svg
index 049016291e..87dbec7788 100644
--- a/tests/testthat/_snaps/geom-raster/3-x-2-set-limits.svg
+++ b/tests/testthat/_snaps/geom-raster/3-x-2-set-limits.svg
@@ -60,26 +60,26 @@
 <text x='353.37' y='568.24' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>x</text>
 <text transform='translate(13.05,283.95) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>y</text>
 <rect x='686.87' y='233.08' width='27.65' height='101.73' style='stroke-width: 1.07; stroke: none; fill: #FFFFFF;' />
+<text x='686.87' y='241.79' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>z</text>
 <image width='17.28' height='86.40' x='686.87' y='248.41' preserveAspectRatio='none' xlink:href='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAEsCAYAAAACUNnVAAAAmElEQVQ4ja2UQRLDMAgDd3hk/tnX5agcknFaCoa0vnkMCEnGsL12GQhDYDpPwoDrpBFlRDWi/9Wu6AHC9FkLYLrzlhD3oJ3mDvRHRYy7IC8A7bCK8gpWKYDzeQVArDcDyD2YAnSofZvzaOA6Q7Oahp/dmRuVTQ0xU5TGP2o8Waool1obVuv1q8qP9xPvg633XlGLDtfIhNUBcBeA5ss0BXMAAAAASUVORK5CYII='/>
+<polyline points='704.15,334.67 700.69,334.67 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='704.15,317.45 700.69,317.45 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='704.15,300.23 700.69,300.23 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='704.15,283.00 700.69,283.00 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='704.15,265.78 700.69,265.78 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='704.15,248.56 700.69,248.56 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='686.87,334.67 690.32,334.67 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='686.87,317.45 690.32,317.45 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='686.87,300.23 690.32,300.23 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='686.87,283.00 690.32,283.00 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='686.87,265.78 690.32,265.78 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='686.87,248.56 690.32,248.56 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
 <text x='709.63' y='337.70' style='font-size: 8.80px; font-family: sans;' textLength='4.89px' lengthAdjust='spacingAndGlyphs'>1</text>
 <text x='709.63' y='320.48' style='font-size: 8.80px; font-family: sans;' textLength='4.89px' lengthAdjust='spacingAndGlyphs'>2</text>
 <text x='709.63' y='303.25' style='font-size: 8.80px; font-family: sans;' textLength='4.89px' lengthAdjust='spacingAndGlyphs'>3</text>
 <text x='709.63' y='286.03' style='font-size: 8.80px; font-family: sans;' textLength='4.89px' lengthAdjust='spacingAndGlyphs'>4</text>
 <text x='709.63' y='268.81' style='font-size: 8.80px; font-family: sans;' textLength='4.89px' lengthAdjust='spacingAndGlyphs'>5</text>
 <text x='709.63' y='251.59' style='font-size: 8.80px; font-family: sans;' textLength='4.89px' lengthAdjust='spacingAndGlyphs'>6</text>
-<text x='686.87' y='241.79' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>z</text>
-<line x1='686.87' y1='334.67' x2='690.32' y2='334.67' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='686.87' y1='317.45' x2='690.32' y2='317.45' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='686.87' y1='300.23' x2='690.32' y2='300.23' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='686.87' y1='283.00' x2='690.32' y2='283.00' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='686.87' y1='265.78' x2='690.32' y2='265.78' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='686.87' y1='248.56' x2='690.32' y2='248.56' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='700.69' y1='334.67' x2='704.15' y2='334.67' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='700.69' y1='317.45' x2='704.15' y2='317.45' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='700.69' y1='300.23' x2='704.15' y2='300.23' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='700.69' y1='283.00' x2='704.15' y2='283.00' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='700.69' y1='265.78' x2='704.15' y2='265.78' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='700.69' y1='248.56' x2='704.15' y2='248.56' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
 <text x='30.83' y='14.56' style='font-size: 13.20px; font-family: sans;' textLength='87.30px' lengthAdjust='spacingAndGlyphs'>3 x 2, set limits</text>
 </g>
 </svg>
diff --git a/tests/testthat/_snaps/geom-raster/3-x-2.svg b/tests/testthat/_snaps/geom-raster/3-x-2.svg
index a2a9405c1f..3662119bd7 100644
--- a/tests/testthat/_snaps/geom-raster/3-x-2.svg
+++ b/tests/testthat/_snaps/geom-raster/3-x-2.svg
@@ -56,26 +56,26 @@
 <text x='353.37' y='568.24' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>x</text>
 <text transform='translate(13.05,283.95) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>y</text>
 <rect x='686.87' y='233.08' width='27.65' height='101.73' style='stroke-width: 1.07; stroke: none; fill: #FFFFFF;' />
+<text x='686.87' y='241.79' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>z</text>
 <image width='17.28' height='86.40' x='686.87' y='248.41' preserveAspectRatio='none' xlink:href='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAEsCAYAAAACUNnVAAAAmElEQVQ4ja2UQRLDMAgDd3hk/tnX5agcknFaCoa0vnkMCEnGsL12GQhDYDpPwoDrpBFlRDWi/9Wu6AHC9FkLYLrzlhD3oJ3mDvRHRYy7IC8A7bCK8gpWKYDzeQVArDcDyD2YAnSofZvzaOA6Q7Oahp/dmRuVTQ0xU5TGP2o8Waool1obVuv1q8qP9xPvg633XlGLDtfIhNUBcBeA5ss0BXMAAAAASUVORK5CYII='/>
+<polyline points='704.15,334.67 700.69,334.67 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='704.15,317.45 700.69,317.45 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='704.15,300.23 700.69,300.23 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='704.15,283.00 700.69,283.00 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='704.15,265.78 700.69,265.78 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='704.15,248.56 700.69,248.56 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='686.87,334.67 690.32,334.67 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='686.87,317.45 690.32,317.45 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='686.87,300.23 690.32,300.23 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='686.87,283.00 690.32,283.00 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='686.87,265.78 690.32,265.78 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='686.87,248.56 690.32,248.56 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
 <text x='709.63' y='337.70' style='font-size: 8.80px; font-family: sans;' textLength='4.89px' lengthAdjust='spacingAndGlyphs'>1</text>
 <text x='709.63' y='320.48' style='font-size: 8.80px; font-family: sans;' textLength='4.89px' lengthAdjust='spacingAndGlyphs'>2</text>
 <text x='709.63' y='303.25' style='font-size: 8.80px; font-family: sans;' textLength='4.89px' lengthAdjust='spacingAndGlyphs'>3</text>
 <text x='709.63' y='286.03' style='font-size: 8.80px; font-family: sans;' textLength='4.89px' lengthAdjust='spacingAndGlyphs'>4</text>
 <text x='709.63' y='268.81' style='font-size: 8.80px; font-family: sans;' textLength='4.89px' lengthAdjust='spacingAndGlyphs'>5</text>
 <text x='709.63' y='251.59' style='font-size: 8.80px; font-family: sans;' textLength='4.89px' lengthAdjust='spacingAndGlyphs'>6</text>
-<text x='686.87' y='241.79' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>z</text>
-<line x1='686.87' y1='334.67' x2='690.32' y2='334.67' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='686.87' y1='317.45' x2='690.32' y2='317.45' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='686.87' y1='300.23' x2='690.32' y2='300.23' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='686.87' y1='283.00' x2='690.32' y2='283.00' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='686.87' y1='265.78' x2='690.32' y2='265.78' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='686.87' y1='248.56' x2='690.32' y2='248.56' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='700.69' y1='334.67' x2='704.15' y2='334.67' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='700.69' y1='317.45' x2='704.15' y2='317.45' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='700.69' y1='300.23' x2='704.15' y2='300.23' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='700.69' y1='283.00' x2='704.15' y2='283.00' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='700.69' y1='265.78' x2='704.15' y2='265.78' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='700.69' y1='248.56' x2='704.15' y2='248.56' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
 <text x='30.83' y='14.56' style='font-size: 13.20px; font-family: sans;' textLength='28.62px' lengthAdjust='spacingAndGlyphs'>3 x 2</text>
 </g>
 </svg>
diff --git a/tests/testthat/_snaps/guides.md b/tests/testthat/_snaps/guides.md
index 88a8a97b71..43c678c37b 100644
--- a/tests/testthat/_snaps/guides.md
+++ b/tests/testthat/_snaps/guides.md
@@ -5,12 +5,12 @@
 
 # Using non-position guides for position scales results in an informative error
 
-    Guide with class <guide/legend> does not implement `guide_transform()`
-    i Did you mean to use `guide_axis()`?
+    `guide_legend()` cannot be used for x, xmin, xmax, or xend.
+    i Use any non position aesthetic instead.
 
 # guide specifications are properly checked
 
-    object 'guide_test' of mode 'function' was not found
+    Unknown guide: test
 
 ---
 
@@ -18,31 +18,30 @@
 
 ---
 
-    Guide `colorbar` cannot be used for shape.
+    `guide_colourbar()` cannot be used for shape.
+    i Use one of colour, color, or fill instead.
 
 ---
 
-    Title position "leftish" is invalid
-    i Use one of "top", "bottom", "left", or "right"
+    `title.position` must be one of "top", "right", "bottom", or "left", not "leftish".
 
 ---
 
-    Guide with class <guide/colorbar> does not implement `guide_transform()`
+    `guide_colourbar()` does not implement a `transform()` method.
     i Did you mean to use `guide_axis()`?
 
 ---
 
-    label position "top" is invalid
-    i use either "'left'" or "'right'"
+    When `direction` is "vertical", `label.position` must be one of "right" or "left", not "top".
 
 ---
 
-    label position "left" is invalid
-    i use either "'top'" or "'bottom'"
+    When `direction` is "horizontal", `label.position` must be one of "bottom" or "top", not "left".
 
 ---
 
-    label position `test` is invalid
+    `label.position` must be one of "top", "right", "bottom", or "left", not "test".
+    i Did you mean "left"?
 
 ---
 
@@ -50,23 +49,23 @@
 
 # colorsteps and bins checks the breaks format
 
-    Breaks not formatted correctly for a bin legend.
-    i Use `(<lower>, <upper>]` format to indicate bins
+    Breaks are not formatted correctly for a bin legend.
+    i Use `(<lower>, <upper>]` format to indicate bins.
 
 ---
 
-    Breaks not formatted correctly for a bin legend.
-    i Use `(<lower>, <upper>]` format to indicate bins
+    Breaks are not formatted correctly for a bin legend.
+    i Use `(<lower>, <upper>]` format to indicate bins.
 
 # binning scales understand the different combinations of limits, breaks, labels, and show.limits
 
-    `show.limits` is ignored when `labels` are given as a character vector
-    i Either add the limits to `breaks` or provide a function for `labels`
+    `show.limits` is ignored when `labels` are given as a character vector.
+    i Either add the limits to `breaks` or provide a function for `labels`.
 
 ---
 
-    `show.limits` is ignored when `labels` are given as a character vector
-    i Either add the limits to `breaks` or provide a function for `labels`
+    `show.limits` is ignored when `labels` are given as a character vector.
+    i Either add the limits to `breaks` or provide a function for `labels`.
 
 # a warning is generated when guides(<scale> = FALSE) is specified
 
diff --git a/tests/testthat/_snaps/guides/axis-guides-basic.svg b/tests/testthat/_snaps/guides/axis-guides-basic.svg
index fd0aa28b32..ae2a74c24d 100644
--- a/tests/testthat/_snaps/guides/axis-guides-basic.svg
+++ b/tests/testthat/_snaps/guides/axis-guides-basic.svg
@@ -60,16 +60,16 @@
 <line x1='0.00' y1='30.32' x2='720.00' y2='30.32' style='stroke-width: 0.75; stroke: #FFFFFF;' />
 <line x1='0.00' y1='0.00' x2='720.00' y2='0.00' style='stroke-width: 0.75; stroke: #FFFFFF;' />
 <polyline points='36.00,547.20 684.00,547.20 ' style='stroke-width: 1.07; stroke-linecap: butt;' />
+<polyline points='198.00,544.46 198.00,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='360.00,544.46 360.00,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='522.00,544.46 522.00,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <text x='198.00' y='542.27' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='4.89px' lengthAdjust='spacingAndGlyphs'>1</text>
 <text x='360.00' y='542.27' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='4.89px' lengthAdjust='spacingAndGlyphs'>2</text>
 <text x='522.00' y='542.27' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='4.89px' lengthAdjust='spacingAndGlyphs'>3</text>
-<polyline points='198.00,547.20 198.00,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='360.00,547.20 360.00,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='522.00,547.20 522.00,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='36.00,547.20 36.00,28.80 ' style='stroke-width: 1.07; stroke-linecap: butt;' />
-<polyline points='36.00,417.60 38.74,417.60 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='36.00,288.00 38.74,288.00 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='36.00,158.40 38.74,158.40 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,417.60 36.00,417.60 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,288.00 36.00,288.00 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,158.40 36.00,158.40 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <text x='40.93' y='420.63' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='4.89px' lengthAdjust='spacingAndGlyphs'>1</text>
 <text x='40.93' y='291.03' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='4.89px' lengthAdjust='spacingAndGlyphs'>2</text>
 <text x='40.93' y='161.43' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='4.89px' lengthAdjust='spacingAndGlyphs'>3</text>
diff --git a/tests/testthat/_snaps/guides/axis-guides-check-overlap.svg b/tests/testthat/_snaps/guides/axis-guides-check-overlap.svg
index ca5e199e8e..cf2312f98c 100644
--- a/tests/testthat/_snaps/guides/axis-guides-check-overlap.svg
+++ b/tests/testthat/_snaps/guides/axis-guides-check-overlap.svg
@@ -60,6 +60,26 @@
 <line x1='0.00' y1='30.32' x2='720.00' y2='30.32' style='stroke-width: 0.75; stroke: #FFFFFF;' />
 <line x1='0.00' y1='0.00' x2='720.00' y2='0.00' style='stroke-width: 0.75; stroke: #FFFFFF;' />
 <polyline points='36.00,547.20 684.00,547.20 ' style='stroke-width: 1.07; stroke-linecap: butt;' />
+<polyline points='66.86,544.46 66.86,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='97.71,544.46 97.71,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='128.57,544.46 128.57,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='159.43,544.46 159.43,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='190.29,544.46 190.29,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='221.14,544.46 221.14,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='252.00,544.46 252.00,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='282.86,544.46 282.86,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='313.71,544.46 313.71,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='344.57,544.46 344.57,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='375.43,544.46 375.43,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='406.29,544.46 406.29,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='437.14,544.46 437.14,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='468.00,544.46 468.00,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='498.86,544.46 498.86,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='529.71,544.46 529.71,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='560.57,544.46 560.57,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='591.43,544.46 591.43,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='622.29,544.46 622.29,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='653.14,544.46 653.14,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <text x='66.86' y='542.27' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='56.28px' lengthAdjust='spacingAndGlyphs'>1,000,000,000</text>
 <text x='653.14' y='542.27' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='61.17px' lengthAdjust='spacingAndGlyphs'>20,000,000,000</text>
 <text x='344.57' y='542.27' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='61.17px' lengthAdjust='spacingAndGlyphs'>10,000,000,000</text>
@@ -69,47 +89,27 @@
 <text x='498.86' y='542.27' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='61.17px' lengthAdjust='spacingAndGlyphs'>15,000,000,000</text>
 <text x='406.29' y='542.27' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='61.17px' lengthAdjust='spacingAndGlyphs'>12,000,000,000</text>
 <text x='560.57' y='542.27' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='61.17px' lengthAdjust='spacingAndGlyphs'>17,000,000,000</text>
-<polyline points='66.86,547.20 66.86,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='97.71,547.20 97.71,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='128.57,547.20 128.57,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='159.43,547.20 159.43,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='190.29,547.20 190.29,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='221.14,547.20 221.14,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='252.00,547.20 252.00,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='282.86,547.20 282.86,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='313.71,547.20 313.71,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='344.57,547.20 344.57,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='375.43,547.20 375.43,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='406.29,547.20 406.29,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='437.14,547.20 437.14,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='468.00,547.20 468.00,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='498.86,547.20 498.86,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='529.71,547.20 529.71,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='560.57,547.20 560.57,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='591.43,547.20 591.43,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='622.29,547.20 622.29,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='653.14,547.20 653.14,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='36.00,547.20 36.00,28.80 ' style='stroke-width: 1.07; stroke-linecap: butt;' />
-<polyline points='36.00,522.51 38.74,522.51 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='36.00,497.83 38.74,497.83 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='36.00,473.14 38.74,473.14 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='36.00,448.46 38.74,448.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='36.00,423.77 38.74,423.77 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='36.00,399.09 38.74,399.09 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='36.00,374.40 38.74,374.40 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='36.00,349.71 38.74,349.71 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='36.00,325.03 38.74,325.03 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='36.00,300.34 38.74,300.34 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='36.00,275.66 38.74,275.66 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='36.00,250.97 38.74,250.97 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='36.00,226.29 38.74,226.29 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='36.00,201.60 38.74,201.60 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='36.00,176.91 38.74,176.91 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='36.00,152.23 38.74,152.23 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='36.00,127.54 38.74,127.54 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='36.00,102.86 38.74,102.86 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='36.00,78.17 38.74,78.17 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='36.00,53.49 38.74,53.49 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,522.51 36.00,522.51 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,497.83 36.00,497.83 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,473.14 36.00,473.14 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,448.46 36.00,448.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,423.77 36.00,423.77 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,399.09 36.00,399.09 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,374.40 36.00,374.40 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,349.71 36.00,349.71 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,325.03 36.00,325.03 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,300.34 36.00,300.34 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,275.66 36.00,275.66 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,250.97 36.00,250.97 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,226.29 36.00,226.29 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,201.60 36.00,201.60 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,176.91 36.00,176.91 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,152.23 36.00,152.23 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,127.54 36.00,127.54 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,102.86 36.00,102.86 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,78.17 36.00,78.17 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,53.49 36.00,53.49 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <text x='40.93' y='525.54' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='56.28px' lengthAdjust='spacingAndGlyphs'>1,000,000,000</text>
 <text x='40.93' y='56.51' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='61.17px' lengthAdjust='spacingAndGlyphs'>20,000,000,000</text>
 <text x='40.93' y='303.37' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='61.17px' lengthAdjust='spacingAndGlyphs'>10,000,000,000</text>
diff --git a/tests/testthat/_snaps/guides/axis-guides-negative-rotation.svg b/tests/testthat/_snaps/guides/axis-guides-negative-rotation.svg
index f4999ff374..8902fa04cd 100644
--- a/tests/testthat/_snaps/guides/axis-guides-negative-rotation.svg
+++ b/tests/testthat/_snaps/guides/axis-guides-negative-rotation.svg
@@ -60,6 +60,16 @@
 <line x1='0.00' y1='30.32' x2='720.00' y2='30.32' style='stroke-width: 0.75; stroke: #FFFFFF;' />
 <line x1='0.00' y1='0.00' x2='720.00' y2='0.00' style='stroke-width: 0.75; stroke: #FFFFFF;' />
 <polyline points='36.00,547.20 684.00,547.20 ' style='stroke-width: 1.07; stroke-linecap: butt;' />
+<polyline points='94.91,544.46 94.91,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='153.82,544.46 153.82,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='212.73,544.46 212.73,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='271.64,544.46 271.64,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='330.55,544.46 330.55,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='389.45,544.46 389.45,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='448.36,544.46 448.36,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='507.27,544.46 507.27,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='566.18,544.46 566.18,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='625.09,544.46 625.09,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <text transform='translate(94.91,542.27) rotate(45)' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='22.02px' lengthAdjust='spacingAndGlyphs'>1,000</text>
 <text transform='translate(153.82,542.27) rotate(45)' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='22.02px' lengthAdjust='spacingAndGlyphs'>2,000</text>
 <text transform='translate(212.73,542.27) rotate(45)' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='22.02px' lengthAdjust='spacingAndGlyphs'>3,000</text>
@@ -70,27 +80,17 @@
 <text transform='translate(507.27,542.27) rotate(45)' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='22.02px' lengthAdjust='spacingAndGlyphs'>8,000</text>
 <text transform='translate(566.18,542.27) rotate(45)' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='22.02px' lengthAdjust='spacingAndGlyphs'>9,000</text>
 <text transform='translate(625.09,542.27) rotate(45)' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='26.92px' lengthAdjust='spacingAndGlyphs'>10,000</text>
-<polyline points='94.91,547.20 94.91,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='153.82,547.20 153.82,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='212.73,547.20 212.73,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='271.64,547.20 271.64,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='330.55,547.20 330.55,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='389.45,547.20 389.45,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='448.36,547.20 448.36,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='507.27,547.20 507.27,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='566.18,547.20 566.18,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='625.09,547.20 625.09,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='36.00,547.20 36.00,28.80 ' style='stroke-width: 1.07; stroke-linecap: butt;' />
-<polyline points='36.00,500.07 38.74,500.07 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='36.00,452.95 38.74,452.95 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='36.00,405.82 38.74,405.82 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='36.00,358.69 38.74,358.69 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='36.00,311.56 38.74,311.56 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='36.00,264.44 38.74,264.44 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='36.00,217.31 38.74,217.31 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='36.00,170.18 38.74,170.18 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='36.00,123.05 38.74,123.05 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='36.00,75.93 38.74,75.93 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,500.07 36.00,500.07 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,452.95 36.00,452.95 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,405.82 36.00,405.82 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,358.69 36.00,358.69 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,311.56 36.00,311.56 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,264.44 36.00,264.44 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,217.31 36.00,217.31 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,170.18 36.00,170.18 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,123.05 36.00,123.05 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,75.93 36.00,75.93 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <text transform='translate(40.93,500.07) rotate(45)' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='22.02px' lengthAdjust='spacingAndGlyphs'>1,000</text>
 <text transform='translate(40.93,452.95) rotate(45)' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='22.02px' lengthAdjust='spacingAndGlyphs'>2,000</text>
 <text transform='translate(40.93,405.82) rotate(45)' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='22.02px' lengthAdjust='spacingAndGlyphs'>3,000</text>
diff --git a/tests/testthat/_snaps/guides/axis-guides-positive-rotation.svg b/tests/testthat/_snaps/guides/axis-guides-positive-rotation.svg
index cd88e34aeb..e1cd91eb77 100644
--- a/tests/testthat/_snaps/guides/axis-guides-positive-rotation.svg
+++ b/tests/testthat/_snaps/guides/axis-guides-positive-rotation.svg
@@ -60,6 +60,16 @@
 <line x1='0.00' y1='30.32' x2='720.00' y2='30.32' style='stroke-width: 0.75; stroke: #FFFFFF;' />
 <line x1='0.00' y1='0.00' x2='720.00' y2='0.00' style='stroke-width: 0.75; stroke: #FFFFFF;' />
 <polyline points='36.00,547.20 684.00,547.20 ' style='stroke-width: 1.07; stroke-linecap: butt;' />
+<polyline points='94.91,544.46 94.91,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='153.82,544.46 153.82,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='212.73,544.46 212.73,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='271.64,544.46 271.64,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='330.55,544.46 330.55,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='389.45,544.46 389.45,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='448.36,544.46 448.36,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='507.27,544.46 507.27,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='566.18,544.46 566.18,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='625.09,544.46 625.09,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <text transform='translate(94.91,542.27) rotate(-45)' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='22.02px' lengthAdjust='spacingAndGlyphs'>1,000</text>
 <text transform='translate(153.82,542.27) rotate(-45)' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='22.02px' lengthAdjust='spacingAndGlyphs'>2,000</text>
 <text transform='translate(212.73,542.27) rotate(-45)' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='22.02px' lengthAdjust='spacingAndGlyphs'>3,000</text>
@@ -70,27 +80,17 @@
 <text transform='translate(507.27,542.27) rotate(-45)' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='22.02px' lengthAdjust='spacingAndGlyphs'>8,000</text>
 <text transform='translate(566.18,542.27) rotate(-45)' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='22.02px' lengthAdjust='spacingAndGlyphs'>9,000</text>
 <text transform='translate(625.09,542.27) rotate(-45)' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='26.92px' lengthAdjust='spacingAndGlyphs'>10,000</text>
-<polyline points='94.91,547.20 94.91,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='153.82,547.20 153.82,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='212.73,547.20 212.73,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='271.64,547.20 271.64,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='330.55,547.20 330.55,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='389.45,547.20 389.45,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='448.36,547.20 448.36,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='507.27,547.20 507.27,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='566.18,547.20 566.18,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='625.09,547.20 625.09,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='36.00,547.20 36.00,28.80 ' style='stroke-width: 1.07; stroke-linecap: butt;' />
-<polyline points='36.00,500.07 38.74,500.07 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='36.00,452.95 38.74,452.95 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='36.00,405.82 38.74,405.82 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='36.00,358.69 38.74,358.69 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='36.00,311.56 38.74,311.56 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='36.00,264.44 38.74,264.44 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='36.00,217.31 38.74,217.31 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='36.00,170.18 38.74,170.18 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='36.00,123.05 38.74,123.05 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='36.00,75.93 38.74,75.93 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,500.07 36.00,500.07 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,452.95 36.00,452.95 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,405.82 36.00,405.82 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,358.69 36.00,358.69 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,311.56 36.00,311.56 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,264.44 36.00,264.44 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,217.31 36.00,217.31 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,170.18 36.00,170.18 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,123.05 36.00,123.05 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,75.93 36.00,75.93 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <text transform='translate(45.21,504.36) rotate(-45)' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='22.02px' lengthAdjust='spacingAndGlyphs'>1,000</text>
 <text transform='translate(45.21,457.23) rotate(-45)' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='22.02px' lengthAdjust='spacingAndGlyphs'>2,000</text>
 <text transform='translate(45.21,410.10) rotate(-45)' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='22.02px' lengthAdjust='spacingAndGlyphs'>3,000</text>
diff --git a/tests/testthat/_snaps/guides/axis-guides-text-dodged-into-rows-cols.svg b/tests/testthat/_snaps/guides/axis-guides-text-dodged-into-rows-cols.svg
index 404aaa6f45..79e94af549 100644
--- a/tests/testthat/_snaps/guides/axis-guides-text-dodged-into-rows-cols.svg
+++ b/tests/testthat/_snaps/guides/axis-guides-text-dodged-into-rows-cols.svg
@@ -60,37 +60,37 @@
 <line x1='0.00' y1='30.32' x2='720.00' y2='30.32' style='stroke-width: 0.75; stroke: #FFFFFF;' />
 <line x1='0.00' y1='0.00' x2='720.00' y2='0.00' style='stroke-width: 0.75; stroke: #FFFFFF;' />
 <polyline points='36.00,547.20 684.00,547.20 ' style='stroke-width: 1.07; stroke-linecap: butt;' />
-<text x='153.82' y='532.19' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='56.28px' lengthAdjust='spacingAndGlyphs'>2,000,000,000</text>
-<text x='271.64' y='532.19' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='56.28px' lengthAdjust='spacingAndGlyphs'>4,000,000,000</text>
-<text x='389.45' y='532.19' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='56.28px' lengthAdjust='spacingAndGlyphs'>6,000,000,000</text>
-<text x='507.27' y='532.19' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='56.28px' lengthAdjust='spacingAndGlyphs'>8,000,000,000</text>
-<text x='625.09' y='532.19' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='61.17px' lengthAdjust='spacingAndGlyphs'>10,000,000,000</text>
+<polyline points='94.91,544.46 94.91,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='153.82,544.46 153.82,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='212.73,544.46 212.73,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='271.64,544.46 271.64,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='330.55,544.46 330.55,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='389.45,544.46 389.45,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='448.36,544.46 448.36,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='507.27,544.46 507.27,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='566.18,544.46 566.18,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='625.09,544.46 625.09,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <text x='94.91' y='542.27' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='56.28px' lengthAdjust='spacingAndGlyphs'>1,000,000,000</text>
 <text x='212.73' y='542.27' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='56.28px' lengthAdjust='spacingAndGlyphs'>3,000,000,000</text>
 <text x='330.55' y='542.27' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='56.28px' lengthAdjust='spacingAndGlyphs'>5,000,000,000</text>
 <text x='448.36' y='542.27' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='56.28px' lengthAdjust='spacingAndGlyphs'>7,000,000,000</text>
 <text x='566.18' y='542.27' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='56.28px' lengthAdjust='spacingAndGlyphs'>9,000,000,000</text>
-<polyline points='94.91,547.20 94.91,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='153.82,547.20 153.82,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='212.73,547.20 212.73,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='271.64,547.20 271.64,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='330.55,547.20 330.55,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='389.45,547.20 389.45,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='448.36,547.20 448.36,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='507.27,547.20 507.27,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='566.18,547.20 566.18,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='625.09,547.20 625.09,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<text x='153.82' y='532.19' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='56.28px' lengthAdjust='spacingAndGlyphs'>2,000,000,000</text>
+<text x='271.64' y='532.19' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='56.28px' lengthAdjust='spacingAndGlyphs'>4,000,000,000</text>
+<text x='389.45' y='532.19' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='56.28px' lengthAdjust='spacingAndGlyphs'>6,000,000,000</text>
+<text x='507.27' y='532.19' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='56.28px' lengthAdjust='spacingAndGlyphs'>8,000,000,000</text>
+<text x='625.09' y='532.19' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='61.17px' lengthAdjust='spacingAndGlyphs'>10,000,000,000</text>
 <polyline points='36.00,547.20 36.00,28.80 ' style='stroke-width: 1.07; stroke-linecap: butt;' />
-<polyline points='36.00,500.07 38.74,500.07 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='36.00,452.95 38.74,452.95 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='36.00,405.82 38.74,405.82 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='36.00,358.69 38.74,358.69 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='36.00,311.56 38.74,311.56 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='36.00,264.44 38.74,264.44 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='36.00,217.31 38.74,217.31 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='36.00,170.18 38.74,170.18 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='36.00,123.05 38.74,123.05 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='36.00,75.93 38.74,75.93 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,500.07 36.00,500.07 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,452.95 36.00,452.95 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,405.82 36.00,405.82 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,358.69 36.00,358.69 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,311.56 36.00,311.56 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,264.44 36.00,264.44 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,217.31 36.00,217.31 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,170.18 36.00,170.18 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,123.05 36.00,123.05 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,75.93 36.00,75.93 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <text x='40.93' y='503.10' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='56.28px' lengthAdjust='spacingAndGlyphs'>1,000,000,000</text>
 <text x='40.93' y='408.85' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='56.28px' lengthAdjust='spacingAndGlyphs'>3,000,000,000</text>
 <text x='40.93' y='314.59' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='56.28px' lengthAdjust='spacingAndGlyphs'>5,000,000,000</text>
@@ -123,16 +123,16 @@
 <text x='507.27' y='49.86' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='56.28px' lengthAdjust='spacingAndGlyphs'>8,000,000,000</text>
 <text x='625.09' y='49.86' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='61.17px' lengthAdjust='spacingAndGlyphs'>10,000,000,000</text>
 <polyline points='684.00,547.20 684.00,28.80 ' style='stroke-width: 1.07; stroke-linecap: butt;' />
-<text x='620.60' y='455.97' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='56.28px' lengthAdjust='spacingAndGlyphs'>2,000,000,000</text>
-<text x='620.60' y='361.72' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='56.28px' lengthAdjust='spacingAndGlyphs'>4,000,000,000</text>
-<text x='620.60' y='267.46' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='56.28px' lengthAdjust='spacingAndGlyphs'>6,000,000,000</text>
-<text x='620.60' y='173.21' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='56.28px' lengthAdjust='spacingAndGlyphs'>8,000,000,000</text>
-<text x='620.60' y='78.96' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='61.17px' lengthAdjust='spacingAndGlyphs'>10,000,000,000</text>
 <text x='679.07' y='503.10' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='56.28px' lengthAdjust='spacingAndGlyphs'>1,000,000,000</text>
 <text x='679.07' y='408.85' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='56.28px' lengthAdjust='spacingAndGlyphs'>3,000,000,000</text>
 <text x='679.07' y='314.59' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='56.28px' lengthAdjust='spacingAndGlyphs'>5,000,000,000</text>
 <text x='679.07' y='220.34' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='56.28px' lengthAdjust='spacingAndGlyphs'>7,000,000,000</text>
 <text x='679.07' y='126.08' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='56.28px' lengthAdjust='spacingAndGlyphs'>9,000,000,000</text>
+<text x='620.60' y='455.97' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='56.28px' lengthAdjust='spacingAndGlyphs'>2,000,000,000</text>
+<text x='620.60' y='361.72' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='56.28px' lengthAdjust='spacingAndGlyphs'>4,000,000,000</text>
+<text x='620.60' y='267.46' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='56.28px' lengthAdjust='spacingAndGlyphs'>6,000,000,000</text>
+<text x='620.60' y='173.21' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='56.28px' lengthAdjust='spacingAndGlyphs'>8,000,000,000</text>
+<text x='620.60' y='78.96' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='61.17px' lengthAdjust='spacingAndGlyphs'>10,000,000,000</text>
 <polyline points='681.26,500.07 684.00,500.07 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='681.26,452.95 684.00,452.95 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='681.26,405.82 684.00,405.82 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
diff --git a/tests/testthat/_snaps/guides/axis-guides-vertical-negative-rotation.svg b/tests/testthat/_snaps/guides/axis-guides-vertical-negative-rotation.svg
index 7a90c21e3c..1d83ebc1e2 100644
--- a/tests/testthat/_snaps/guides/axis-guides-vertical-negative-rotation.svg
+++ b/tests/testthat/_snaps/guides/axis-guides-vertical-negative-rotation.svg
@@ -60,6 +60,16 @@
 <line x1='0.00' y1='30.32' x2='720.00' y2='30.32' style='stroke-width: 0.75; stroke: #FFFFFF;' />
 <line x1='0.00' y1='0.00' x2='720.00' y2='0.00' style='stroke-width: 0.75; stroke: #FFFFFF;' />
 <polyline points='36.00,547.20 684.00,547.20 ' style='stroke-width: 1.07; stroke-linecap: butt;' />
+<polyline points='94.91,544.46 94.91,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='153.82,544.46 153.82,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='212.73,544.46 212.73,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='271.64,544.46 271.64,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='330.55,544.46 330.55,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='389.45,544.46 389.45,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='448.36,544.46 448.36,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='507.27,544.46 507.27,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='566.18,544.46 566.18,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='625.09,544.46 625.09,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <text transform='translate(91.88,542.27) rotate(90)' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='22.02px' lengthAdjust='spacingAndGlyphs'>1,000</text>
 <text transform='translate(150.79,542.27) rotate(90)' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='22.02px' lengthAdjust='spacingAndGlyphs'>2,000</text>
 <text transform='translate(209.70,542.27) rotate(90)' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='22.02px' lengthAdjust='spacingAndGlyphs'>3,000</text>
@@ -70,27 +80,17 @@
 <text transform='translate(504.24,542.27) rotate(90)' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='22.02px' lengthAdjust='spacingAndGlyphs'>8,000</text>
 <text transform='translate(563.15,542.27) rotate(90)' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='22.02px' lengthAdjust='spacingAndGlyphs'>9,000</text>
 <text transform='translate(622.06,542.27) rotate(90)' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='26.92px' lengthAdjust='spacingAndGlyphs'>10,000</text>
-<polyline points='94.91,547.20 94.91,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='153.82,547.20 153.82,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='212.73,547.20 212.73,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='271.64,547.20 271.64,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='330.55,547.20 330.55,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='389.45,547.20 389.45,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='448.36,547.20 448.36,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='507.27,547.20 507.27,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='566.18,547.20 566.18,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='625.09,547.20 625.09,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='36.00,547.20 36.00,28.80 ' style='stroke-width: 1.07; stroke-linecap: butt;' />
-<polyline points='36.00,500.07 38.74,500.07 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='36.00,452.95 38.74,452.95 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='36.00,405.82 38.74,405.82 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='36.00,358.69 38.74,358.69 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='36.00,311.56 38.74,311.56 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='36.00,264.44 38.74,264.44 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='36.00,217.31 38.74,217.31 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='36.00,170.18 38.74,170.18 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='36.00,123.05 38.74,123.05 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='36.00,75.93 38.74,75.93 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,500.07 36.00,500.07 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,452.95 36.00,452.95 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,405.82 36.00,405.82 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,358.69 36.00,358.69 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,311.56 36.00,311.56 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,264.44 36.00,264.44 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,217.31 36.00,217.31 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,170.18 36.00,170.18 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,123.05 36.00,123.05 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,75.93 36.00,75.93 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <text transform='translate(40.93,500.07) rotate(90)' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='22.02px' lengthAdjust='spacingAndGlyphs'>1,000</text>
 <text transform='translate(40.93,452.95) rotate(90)' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='22.02px' lengthAdjust='spacingAndGlyphs'>2,000</text>
 <text transform='translate(40.93,405.82) rotate(90)' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='22.02px' lengthAdjust='spacingAndGlyphs'>3,000</text>
diff --git a/tests/testthat/_snaps/guides/axis-guides-vertical-rotation.svg b/tests/testthat/_snaps/guides/axis-guides-vertical-rotation.svg
index 0f4dbb29fa..f379bb7797 100644
--- a/tests/testthat/_snaps/guides/axis-guides-vertical-rotation.svg
+++ b/tests/testthat/_snaps/guides/axis-guides-vertical-rotation.svg
@@ -60,6 +60,16 @@
 <line x1='0.00' y1='30.32' x2='720.00' y2='30.32' style='stroke-width: 0.75; stroke: #FFFFFF;' />
 <line x1='0.00' y1='0.00' x2='720.00' y2='0.00' style='stroke-width: 0.75; stroke: #FFFFFF;' />
 <polyline points='36.00,547.20 684.00,547.20 ' style='stroke-width: 1.07; stroke-linecap: butt;' />
+<polyline points='94.91,544.46 94.91,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='153.82,544.46 153.82,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='212.73,544.46 212.73,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='271.64,544.46 271.64,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='330.55,544.46 330.55,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='389.45,544.46 389.45,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='448.36,544.46 448.36,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='507.27,544.46 507.27,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='566.18,544.46 566.18,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='625.09,544.46 625.09,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <text transform='translate(97.94,542.27) rotate(-90)' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='22.02px' lengthAdjust='spacingAndGlyphs'>1,000</text>
 <text transform='translate(156.85,542.27) rotate(-90)' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='22.02px' lengthAdjust='spacingAndGlyphs'>2,000</text>
 <text transform='translate(215.76,542.27) rotate(-90)' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='22.02px' lengthAdjust='spacingAndGlyphs'>3,000</text>
@@ -70,27 +80,17 @@
 <text transform='translate(510.30,542.27) rotate(-90)' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='22.02px' lengthAdjust='spacingAndGlyphs'>8,000</text>
 <text transform='translate(569.21,542.27) rotate(-90)' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='22.02px' lengthAdjust='spacingAndGlyphs'>9,000</text>
 <text transform='translate(628.12,542.27) rotate(-90)' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='26.92px' lengthAdjust='spacingAndGlyphs'>10,000</text>
-<polyline points='94.91,547.20 94.91,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='153.82,547.20 153.82,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='212.73,547.20 212.73,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='271.64,547.20 271.64,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='330.55,547.20 330.55,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='389.45,547.20 389.45,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='448.36,547.20 448.36,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='507.27,547.20 507.27,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='566.18,547.20 566.18,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='625.09,547.20 625.09,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='36.00,547.20 36.00,28.80 ' style='stroke-width: 1.07; stroke-linecap: butt;' />
-<polyline points='36.00,500.07 38.74,500.07 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='36.00,452.95 38.74,452.95 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='36.00,405.82 38.74,405.82 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='36.00,358.69 38.74,358.69 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='36.00,311.56 38.74,311.56 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='36.00,264.44 38.74,264.44 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='36.00,217.31 38.74,217.31 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='36.00,170.18 38.74,170.18 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='36.00,123.05 38.74,123.05 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='36.00,75.93 38.74,75.93 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,500.07 36.00,500.07 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,452.95 36.00,452.95 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,405.82 36.00,405.82 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,358.69 36.00,358.69 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,311.56 36.00,311.56 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,264.44 36.00,264.44 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,217.31 36.00,217.31 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,170.18 36.00,170.18 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,123.05 36.00,123.05 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,75.93 36.00,75.93 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <text transform='translate(46.99,500.07) rotate(-90)' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='22.02px' lengthAdjust='spacingAndGlyphs'>1,000</text>
 <text transform='translate(46.99,452.95) rotate(-90)' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='22.02px' lengthAdjust='spacingAndGlyphs'>2,000</text>
 <text transform='translate(46.99,405.82) rotate(-90)' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='22.02px' lengthAdjust='spacingAndGlyphs'>3,000</text>
diff --git a/tests/testthat/_snaps/guides/axis-guides-zero-rotation.svg b/tests/testthat/_snaps/guides/axis-guides-zero-rotation.svg
index ba629bd0f5..bb81af4971 100644
--- a/tests/testthat/_snaps/guides/axis-guides-zero-rotation.svg
+++ b/tests/testthat/_snaps/guides/axis-guides-zero-rotation.svg
@@ -60,6 +60,16 @@
 <line x1='0.00' y1='30.32' x2='720.00' y2='30.32' style='stroke-width: 0.75; stroke: #FFFFFF;' />
 <line x1='0.00' y1='0.00' x2='720.00' y2='0.00' style='stroke-width: 0.75; stroke: #FFFFFF;' />
 <polyline points='36.00,547.20 684.00,547.20 ' style='stroke-width: 1.07; stroke-linecap: butt;' />
+<polyline points='94.91,544.46 94.91,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='153.82,544.46 153.82,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='212.73,544.46 212.73,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='271.64,544.46 271.64,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='330.55,544.46 330.55,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='389.45,544.46 389.45,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='448.36,544.46 448.36,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='507.27,544.46 507.27,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='566.18,544.46 566.18,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='625.09,544.46 625.09,547.20 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <text x='94.91' y='542.27' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='22.02px' lengthAdjust='spacingAndGlyphs'>1,000</text>
 <text x='153.82' y='542.27' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='22.02px' lengthAdjust='spacingAndGlyphs'>2,000</text>
 <text x='212.73' y='542.27' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='22.02px' lengthAdjust='spacingAndGlyphs'>3,000</text>
@@ -70,27 +80,17 @@
 <text x='507.27' y='542.27' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='22.02px' lengthAdjust='spacingAndGlyphs'>8,000</text>
 <text x='566.18' y='542.27' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='22.02px' lengthAdjust='spacingAndGlyphs'>9,000</text>
 <text x='625.09' y='542.27' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='26.92px' lengthAdjust='spacingAndGlyphs'>10,000</text>
-<polyline points='94.91,547.20 94.91,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='153.82,547.20 153.82,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='212.73,547.20 212.73,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='271.64,547.20 271.64,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='330.55,547.20 330.55,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='389.45,547.20 389.45,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='448.36,547.20 448.36,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='507.27,547.20 507.27,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='566.18,547.20 566.18,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='625.09,547.20 625.09,544.46 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='36.00,547.20 36.00,28.80 ' style='stroke-width: 1.07; stroke-linecap: butt;' />
-<polyline points='36.00,500.07 38.74,500.07 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='36.00,452.95 38.74,452.95 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='36.00,405.82 38.74,405.82 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='36.00,358.69 38.74,358.69 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='36.00,311.56 38.74,311.56 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='36.00,264.44 38.74,264.44 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='36.00,217.31 38.74,217.31 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='36.00,170.18 38.74,170.18 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='36.00,123.05 38.74,123.05 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='36.00,75.93 38.74,75.93 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,500.07 36.00,500.07 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,452.95 36.00,452.95 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,405.82 36.00,405.82 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,358.69 36.00,358.69 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,311.56 36.00,311.56 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,264.44 36.00,264.44 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,217.31 36.00,217.31 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,170.18 36.00,170.18 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,123.05 36.00,123.05 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='38.74,75.93 36.00,75.93 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <text x='40.93' y='503.10' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='22.02px' lengthAdjust='spacingAndGlyphs'>1,000</text>
 <text x='40.93' y='455.97' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='22.02px' lengthAdjust='spacingAndGlyphs'>2,000</text>
 <text x='40.93' y='408.85' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='22.02px' lengthAdjust='spacingAndGlyphs'>3,000</text>
diff --git a/tests/testthat/_snaps/guides/guide-axis-customization.svg b/tests/testthat/_snaps/guides/guide-axis-customization.svg
index 3466dbe6d5..0b082ad619 100644
--- a/tests/testthat/_snaps/guides/guide-axis-customization.svg
+++ b/tests/testthat/_snaps/guides/guide-axis-customization.svg
@@ -264,15 +264,15 @@
 <rect x='44.77' y='22.78' width='630.45' height='512.25' style='stroke-width: 1.07; stroke: #333333;' />
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-<text x='27.86' y='252.83' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='9.79px' lengthAdjust='spacingAndGlyphs'>30</text>
 <text x='39.84' y='398.36' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='9.79px' lengthAdjust='spacingAndGlyphs'>20</text>
 <text x='39.84' y='107.31' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='9.79px' lengthAdjust='spacingAndGlyphs'>40</text>
+<text x='27.86' y='252.83' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='9.79px' lengthAdjust='spacingAndGlyphs'>30</text>
 <polyline points='42.03,395.33 44.77,395.33 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='42.03,249.81 44.77,249.81 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='42.03,104.28 44.77,104.28 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='675.23,395.33 677.97,395.33 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='675.23,249.81 677.97,249.81 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='675.23,104.28 677.97,104.28 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='677.97,395.33 675.23,395.33 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='677.97,249.81 675.23,249.81 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='677.97,104.28 675.23,104.28 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <text x='680.16' y='398.36' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='9.79px' lengthAdjust='spacingAndGlyphs'>20</text>
 <text x='680.16' y='107.31' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='9.79px' lengthAdjust='spacingAndGlyphs'>40</text>
 <text x='692.14' y='252.83' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='9.79px' lengthAdjust='spacingAndGlyphs'>30</text>
diff --git a/tests/testthat/_snaps/guides/guide-bins-can-show-arrows.svg b/tests/testthat/_snaps/guides/guide-bins-can-show-arrows.svg
index 1d3dca0376..3a553b96cc 100644
--- a/tests/testthat/_snaps/guides/guide-bins-can-show-arrows.svg
+++ b/tests/testthat/_snaps/guides/guide-bins-can-show-arrows.svg
@@ -65,12 +65,12 @@
 <circle cx='688.17' cy='300.25' r='5.64' style='stroke-width: 0.71; fill: #000000;' />
 <rect x='679.53' y='308.89' width='17.28' height='17.28' style='stroke-width: 1.07; stroke: none; fill: #FFFFFF;' />
 <circle cx='688.17' cy='317.53' r='6.41' style='stroke-width: 0.71; fill: #000000;' />
-<line x1='693.35' y1='274.33' x2='696.81' y2='274.33' style='stroke-width: 0.38; stroke-linecap: butt;' />
-<line x1='693.35' y1='291.61' x2='696.81' y2='291.61' style='stroke-width: 0.38; stroke-linecap: butt;' />
-<line x1='693.35' y1='308.89' x2='696.81' y2='308.89' style='stroke-width: 0.38; stroke-linecap: butt;' />
-<line x1='696.81' y1='326.17' x2='696.81' y2='257.05' style='stroke-width: 0.38;' />
-<polyline points='694.68,322.49 696.81,326.17 698.93,322.49 ' style='stroke-width: 0.38;' />
-<polyline points='698.93,260.74 696.81,257.05 694.68,260.74 ' style='stroke-width: 0.38;' />
+<polyline points='696.81,326.17 696.81,257.05 ' style='stroke-width: 0.38; stroke-linecap: butt;' />
+<polyline points='694.68,322.49 696.81,326.17 698.93,322.49 ' style='stroke-width: 0.38; stroke-linecap: butt;' />
+<polyline points='698.93,260.74 696.81,257.05 694.68,260.74 ' style='stroke-width: 0.38; stroke-linecap: butt;' />
+<polyline points='696.81,274.33 693.35,274.33 ' style='stroke-width: 0.38; stroke-linecap: butt;' />
+<polyline points='696.81,291.61 693.35,291.61 ' style='stroke-width: 0.38; stroke-linecap: butt;' />
+<polyline points='696.81,308.89 693.35,308.89 ' style='stroke-width: 0.38; stroke-linecap: butt;' />
 <text x='702.29' y='277.36' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>1.5</text>
 <text x='702.29' y='294.64' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>2.0</text>
 <text x='702.29' y='311.92' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>2.5</text>
diff --git a/tests/testthat/_snaps/guides/guide-bins-can-show-limits.svg b/tests/testthat/_snaps/guides/guide-bins-can-show-limits.svg
index dee77908af..c398df926b 100644
--- a/tests/testthat/_snaps/guides/guide-bins-can-show-limits.svg
+++ b/tests/testthat/_snaps/guides/guide-bins-can-show-limits.svg
@@ -65,12 +65,12 @@
 <circle cx='688.17' cy='300.25' r='5.64' style='stroke-width: 0.71; fill: #000000;' />
 <rect x='679.53' y='308.89' width='17.28' height='17.28' style='stroke-width: 1.07; stroke: none; fill: #FFFFFF;' />
 <circle cx='688.17' cy='317.53' r='6.41' style='stroke-width: 0.71; fill: #000000;' />
-<line x1='693.35' y1='257.05' x2='696.81' y2='257.05' style='stroke-width: 0.38; stroke-linecap: butt;' />
-<line x1='693.35' y1='274.33' x2='696.81' y2='274.33' style='stroke-width: 0.38; stroke-linecap: butt;' />
-<line x1='693.35' y1='291.61' x2='696.81' y2='291.61' style='stroke-width: 0.38; stroke-linecap: butt;' />
-<line x1='693.35' y1='308.89' x2='696.81' y2='308.89' style='stroke-width: 0.38; stroke-linecap: butt;' />
-<line x1='693.35' y1='326.17' x2='696.81' y2='326.17' style='stroke-width: 0.38; stroke-linecap: butt;' />
-<line x1='696.81' y1='326.17' x2='696.81' y2='257.05' style='stroke-width: 0.38; stroke-linecap: square;' />
+<polyline points='696.81,326.17 696.81,257.05 ' style='stroke-width: 0.38; stroke-linecap: butt;' />
+<polyline points='696.81,257.05 693.35,257.05 ' style='stroke-width: 0.38; stroke-linecap: butt;' />
+<polyline points='696.81,274.33 693.35,274.33 ' style='stroke-width: 0.38; stroke-linecap: butt;' />
+<polyline points='696.81,291.61 693.35,291.61 ' style='stroke-width: 0.38; stroke-linecap: butt;' />
+<polyline points='696.81,308.89 693.35,308.89 ' style='stroke-width: 0.38; stroke-linecap: butt;' />
+<polyline points='696.81,326.17 693.35,326.17 ' style='stroke-width: 0.38; stroke-linecap: butt;' />
 <text x='702.29' y='260.08' style='font-size: 8.80px; font-family: sans;' textLength='4.89px' lengthAdjust='spacingAndGlyphs'>1</text>
 <text x='702.29' y='277.36' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>1.5</text>
 <text x='702.29' y='294.64' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>2.0</text>
diff --git a/tests/testthat/_snaps/guides/guide-bins-can-show-ticks.svg b/tests/testthat/_snaps/guides/guide-bins-can-show-ticks.svg
index af4c9e0caa..18d41ecf3e 100644
--- a/tests/testthat/_snaps/guides/guide-bins-can-show-ticks.svg
+++ b/tests/testthat/_snaps/guides/guide-bins-can-show-ticks.svg
@@ -54,20 +54,20 @@
 <text x='351.90' y='568.24' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>x</text>
 <text transform='translate(13.05,283.95) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>y</text>
 <rect x='679.53' y='233.08' width='34.99' height='101.73' style='stroke-width: 1.07; stroke: none; fill: #FFFFFF;' />
+<text x='679.53' y='241.79' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>x</text>
 <rect x='679.53' y='313.21' width='17.28' height='21.60' style='stroke-width: 0.75; stroke: none; fill: #183550;' />
 <rect x='679.53' y='291.61' width='17.28' height='21.60' style='stroke-width: 0.75; stroke: none; fill: #22496C;' />
 <rect x='679.53' y='270.01' width='17.28' height='21.60' style='stroke-width: 0.75; stroke: none; fill: #336A98;' />
 <rect x='679.53' y='248.41' width='17.28' height='21.60' style='stroke-width: 0.75; stroke: none; fill: #4A99D6;' />
+<polyline points='696.81,313.21 693.35,313.21 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='696.81,291.61 693.35,291.61 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='696.81,270.01 693.35,270.01 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='679.53,313.21 682.98,313.21 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='679.53,291.61 682.98,291.61 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='679.53,270.01 682.98,270.01 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
 <text x='702.29' y='316.24' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>1.5</text>
 <text x='702.29' y='294.64' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>2.0</text>
 <text x='702.29' y='273.04' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>3.0</text>
-<text x='679.53' y='241.79' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>x</text>
-<line x1='679.53' y1='313.21' x2='682.98' y2='313.21' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='679.53' y1='291.61' x2='682.98' y2='291.61' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='679.53' y1='270.01' x2='682.98' y2='270.01' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='693.35' y1='313.21' x2='696.81' y2='313.21' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='693.35' y1='291.61' x2='696.81' y2='291.61' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='693.35' y1='270.01' x2='696.81' y2='270.01' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
 <text x='35.24' y='14.56' style='font-size: 13.20px; font-family: sans;' textLength='153.39px' lengthAdjust='spacingAndGlyphs'>guide_bins can show ticks</text>
 </g>
 </svg>
diff --git a/tests/testthat/_snaps/guides/guide-bins-looks-as-it-should.svg b/tests/testthat/_snaps/guides/guide-bins-looks-as-it-should.svg
index 042535c950..39c44206df 100644
--- a/tests/testthat/_snaps/guides/guide-bins-looks-as-it-should.svg
+++ b/tests/testthat/_snaps/guides/guide-bins-looks-as-it-should.svg
@@ -65,10 +65,10 @@
 <circle cx='688.17' cy='300.25' r='5.64' style='stroke-width: 0.71; fill: #000000;' />
 <rect x='679.53' y='308.89' width='17.28' height='17.28' style='stroke-width: 1.07; stroke: none; fill: #FFFFFF;' />
 <circle cx='688.17' cy='317.53' r='6.41' style='stroke-width: 0.71; fill: #000000;' />
-<line x1='693.35' y1='274.33' x2='696.81' y2='274.33' style='stroke-width: 0.38; stroke-linecap: butt;' />
-<line x1='693.35' y1='291.61' x2='696.81' y2='291.61' style='stroke-width: 0.38; stroke-linecap: butt;' />
-<line x1='693.35' y1='308.89' x2='696.81' y2='308.89' style='stroke-width: 0.38; stroke-linecap: butt;' />
-<line x1='696.81' y1='326.17' x2='696.81' y2='257.05' style='stroke-width: 0.38; stroke-linecap: square;' />
+<polyline points='696.81,326.17 696.81,257.05 ' style='stroke-width: 0.38; stroke-linecap: butt;' />
+<polyline points='696.81,274.33 693.35,274.33 ' style='stroke-width: 0.38; stroke-linecap: butt;' />
+<polyline points='696.81,291.61 693.35,291.61 ' style='stroke-width: 0.38; stroke-linecap: butt;' />
+<polyline points='696.81,308.89 693.35,308.89 ' style='stroke-width: 0.38; stroke-linecap: butt;' />
 <text x='702.29' y='277.36' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>1.5</text>
 <text x='702.29' y='294.64' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>2.0</text>
 <text x='702.29' y='311.92' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>2.5</text>
diff --git a/tests/testthat/_snaps/guides/guide-bins-sets-labels-when-limits-is-in-breaks.svg b/tests/testthat/_snaps/guides/guide-bins-sets-labels-when-limits-is-in-breaks.svg
index e2d0a86b9c..b558c84e13 100644
--- a/tests/testthat/_snaps/guides/guide-bins-sets-labels-when-limits-is-in-breaks.svg
+++ b/tests/testthat/_snaps/guides/guide-bins-sets-labels-when-limits-is-in-breaks.svg
@@ -296,12 +296,12 @@
 <circle cx='695.51' cy='308.89' r='1.95' style='stroke-width: 0.71; stroke: #3E81B7; fill: #3E81B7;' />
 <rect x='686.87' y='317.53' width='17.28' height='17.28' style='stroke-width: 1.07; stroke: none; fill: #FFFFFF;' />
 <circle cx='695.51' cy='326.17' r='1.95' style='stroke-width: 0.71; stroke: #4EA1E1; fill: #4EA1E1;' />
-<line x1='700.69' y1='248.41' x2='704.15' y2='248.41' style='stroke-width: 0.38; stroke-linecap: butt;' />
-<line x1='700.69' y1='265.69' x2='704.15' y2='265.69' style='stroke-width: 0.38; stroke-linecap: butt;' />
-<line x1='700.69' y1='282.97' x2='704.15' y2='282.97' style='stroke-width: 0.38; stroke-linecap: butt;' />
-<line x1='700.69' y1='300.25' x2='704.15' y2='300.25' style='stroke-width: 0.38; stroke-linecap: butt;' />
-<line x1='700.69' y1='317.53' x2='704.15' y2='317.53' style='stroke-width: 0.38; stroke-linecap: butt;' />
-<line x1='704.15' y1='334.81' x2='704.15' y2='248.41' style='stroke-width: 0.38; stroke-linecap: square;' />
+<polyline points='704.15,334.81 704.15,248.41 ' style='stroke-width: 0.38; stroke-linecap: butt;' />
+<polyline points='704.15,248.41 700.69,248.41 ' style='stroke-width: 0.38; stroke-linecap: butt;' />
+<polyline points='704.15,265.69 700.69,265.69 ' style='stroke-width: 0.38; stroke-linecap: butt;' />
+<polyline points='704.15,282.97 700.69,282.97 ' style='stroke-width: 0.38; stroke-linecap: butt;' />
+<polyline points='704.15,300.25 700.69,300.25 ' style='stroke-width: 0.38; stroke-linecap: butt;' />
+<polyline points='704.15,317.53 700.69,317.53 ' style='stroke-width: 0.38; stroke-linecap: butt;' />
 <text x='709.63' y='251.44' style='font-size: 8.80px; font-family: sans;' textLength='4.89px' lengthAdjust='spacingAndGlyphs'>1</text>
 <text x='709.63' y='268.72' style='font-size: 8.80px; font-family: sans;' textLength='4.89px' lengthAdjust='spacingAndGlyphs'>2</text>
 <text x='709.63' y='286.00' style='font-size: 8.80px; font-family: sans;' textLength='4.89px' lengthAdjust='spacingAndGlyphs'>3</text>
diff --git a/tests/testthat/_snaps/guides/guide-bins-understands-coinciding-limits-and-bins-2.svg b/tests/testthat/_snaps/guides/guide-bins-understands-coinciding-limits-and-bins-2.svg
index 4630e3449e..644678f65a 100644
--- a/tests/testthat/_snaps/guides/guide-bins-understands-coinciding-limits-and-bins-2.svg
+++ b/tests/testthat/_snaps/guides/guide-bins-understands-coinciding-limits-and-bins-2.svg
@@ -296,12 +296,12 @@
 <circle cx='680.82' cy='308.89' r='1.95' style='stroke-width: 0.71; stroke: #3E81B7; fill: #3E81B7;' />
 <rect x='672.18' y='317.53' width='17.28' height='17.28' style='stroke-width: 1.07; stroke: none; fill: #FFFFFF;' />
 <circle cx='680.82' cy='326.17' r='1.95' style='stroke-width: 0.71; stroke: #4EA1E1; fill: #4EA1E1;' />
-<line x1='686.01' y1='265.69' x2='689.46' y2='265.69' style='stroke-width: 0.38; stroke-linecap: butt;' />
-<line x1='686.01' y1='282.97' x2='689.46' y2='282.97' style='stroke-width: 0.38; stroke-linecap: butt;' />
-<line x1='686.01' y1='300.25' x2='689.46' y2='300.25' style='stroke-width: 0.38; stroke-linecap: butt;' />
-<line x1='686.01' y1='317.53' x2='689.46' y2='317.53' style='stroke-width: 0.38; stroke-linecap: butt;' />
-<line x1='686.01' y1='334.81' x2='689.46' y2='334.81' style='stroke-width: 0.38; stroke-linecap: butt;' />
-<line x1='689.46' y1='334.81' x2='689.46' y2='248.41' style='stroke-width: 0.38; stroke-linecap: square;' />
+<polyline points='689.46,334.81 689.46,248.41 ' style='stroke-width: 0.38; stroke-linecap: butt;' />
+<polyline points='689.46,265.69 686.01,265.69 ' style='stroke-width: 0.38; stroke-linecap: butt;' />
+<polyline points='689.46,282.97 686.01,282.97 ' style='stroke-width: 0.38; stroke-linecap: butt;' />
+<polyline points='689.46,300.25 686.01,300.25 ' style='stroke-width: 0.38; stroke-linecap: butt;' />
+<polyline points='689.46,317.53 686.01,317.53 ' style='stroke-width: 0.38; stroke-linecap: butt;' />
+<polyline points='689.46,334.81 686.01,334.81 ' style='stroke-width: 0.38; stroke-linecap: butt;' />
 <text x='694.94' y='268.72' style='font-size: 8.80px; font-family: sans;' textLength='19.58px' lengthAdjust='spacingAndGlyphs'>2000</text>
 <text x='694.94' y='286.00' style='font-size: 8.80px; font-family: sans;' textLength='19.58px' lengthAdjust='spacingAndGlyphs'>2002</text>
 <text x='694.94' y='303.28' style='font-size: 8.80px; font-family: sans;' textLength='19.58px' lengthAdjust='spacingAndGlyphs'>2004</text>
diff --git a/tests/testthat/_snaps/guides/guide-bins-understands-coinciding-limits-and-bins-3.svg b/tests/testthat/_snaps/guides/guide-bins-understands-coinciding-limits-and-bins-3.svg
index 7b0b6a956f..c0a8fc0cff 100644
--- a/tests/testthat/_snaps/guides/guide-bins-understands-coinciding-limits-and-bins-3.svg
+++ b/tests/testthat/_snaps/guides/guide-bins-understands-coinciding-limits-and-bins-3.svg
@@ -296,13 +296,13 @@
 <circle cx='680.82' cy='308.89' r='1.95' style='stroke-width: 0.71; stroke: #3E81B7; fill: #3E81B7;' />
 <rect x='672.18' y='317.53' width='17.28' height='17.28' style='stroke-width: 1.07; stroke: none; fill: #FFFFFF;' />
 <circle cx='680.82' cy='326.17' r='1.95' style='stroke-width: 0.71; stroke: #4EA1E1; fill: #4EA1E1;' />
-<line x1='686.01' y1='248.41' x2='689.46' y2='248.41' style='stroke-width: 0.38; stroke-linecap: butt;' />
-<line x1='686.01' y1='265.69' x2='689.46' y2='265.69' style='stroke-width: 0.38; stroke-linecap: butt;' />
-<line x1='686.01' y1='282.97' x2='689.46' y2='282.97' style='stroke-width: 0.38; stroke-linecap: butt;' />
-<line x1='686.01' y1='300.25' x2='689.46' y2='300.25' style='stroke-width: 0.38; stroke-linecap: butt;' />
-<line x1='686.01' y1='317.53' x2='689.46' y2='317.53' style='stroke-width: 0.38; stroke-linecap: butt;' />
-<line x1='686.01' y1='334.81' x2='689.46' y2='334.81' style='stroke-width: 0.38; stroke-linecap: butt;' />
-<line x1='689.46' y1='334.81' x2='689.46' y2='248.41' style='stroke-width: 0.38; stroke-linecap: square;' />
+<polyline points='689.46,334.81 689.46,248.41 ' style='stroke-width: 0.38; stroke-linecap: butt;' />
+<polyline points='689.46,248.41 686.01,248.41 ' style='stroke-width: 0.38; stroke-linecap: butt;' />
+<polyline points='689.46,265.69 686.01,265.69 ' style='stroke-width: 0.38; stroke-linecap: butt;' />
+<polyline points='689.46,282.97 686.01,282.97 ' style='stroke-width: 0.38; stroke-linecap: butt;' />
+<polyline points='689.46,300.25 686.01,300.25 ' style='stroke-width: 0.38; stroke-linecap: butt;' />
+<polyline points='689.46,317.53 686.01,317.53 ' style='stroke-width: 0.38; stroke-linecap: butt;' />
+<polyline points='689.46,334.81 686.01,334.81 ' style='stroke-width: 0.38; stroke-linecap: butt;' />
 <text x='694.94' y='251.44' style='font-size: 8.80px; font-family: sans;' textLength='19.58px' lengthAdjust='spacingAndGlyphs'>1999</text>
 <text x='694.94' y='268.72' style='font-size: 8.80px; font-family: sans;' textLength='19.58px' lengthAdjust='spacingAndGlyphs'>2000</text>
 <text x='694.94' y='286.00' style='font-size: 8.80px; font-family: sans;' textLength='19.58px' lengthAdjust='spacingAndGlyphs'>2002</text>
diff --git a/tests/testthat/_snaps/guides/guide-bins-understands-coinciding-limits-and-bins.svg b/tests/testthat/_snaps/guides/guide-bins-understands-coinciding-limits-and-bins.svg
index 82f71991a0..837acb103a 100644
--- a/tests/testthat/_snaps/guides/guide-bins-understands-coinciding-limits-and-bins.svg
+++ b/tests/testthat/_snaps/guides/guide-bins-understands-coinciding-limits-and-bins.svg
@@ -296,12 +296,12 @@
 <circle cx='680.82' cy='308.89' r='1.95' style='stroke-width: 0.71; stroke: #3E81B7; fill: #3E81B7;' />
 <rect x='672.18' y='317.53' width='17.28' height='17.28' style='stroke-width: 1.07; stroke: none; fill: #FFFFFF;' />
 <circle cx='680.82' cy='326.17' r='1.95' style='stroke-width: 0.71; stroke: #4EA1E1; fill: #4EA1E1;' />
-<line x1='686.01' y1='248.41' x2='689.46' y2='248.41' style='stroke-width: 0.38; stroke-linecap: butt;' />
-<line x1='686.01' y1='265.69' x2='689.46' y2='265.69' style='stroke-width: 0.38; stroke-linecap: butt;' />
-<line x1='686.01' y1='282.97' x2='689.46' y2='282.97' style='stroke-width: 0.38; stroke-linecap: butt;' />
-<line x1='686.01' y1='300.25' x2='689.46' y2='300.25' style='stroke-width: 0.38; stroke-linecap: butt;' />
-<line x1='686.01' y1='317.53' x2='689.46' y2='317.53' style='stroke-width: 0.38; stroke-linecap: butt;' />
-<line x1='689.46' y1='334.81' x2='689.46' y2='248.41' style='stroke-width: 0.38; stroke-linecap: square;' />
+<polyline points='689.46,334.81 689.46,248.41 ' style='stroke-width: 0.38; stroke-linecap: butt;' />
+<polyline points='689.46,248.41 686.01,248.41 ' style='stroke-width: 0.38; stroke-linecap: butt;' />
+<polyline points='689.46,265.69 686.01,265.69 ' style='stroke-width: 0.38; stroke-linecap: butt;' />
+<polyline points='689.46,282.97 686.01,282.97 ' style='stroke-width: 0.38; stroke-linecap: butt;' />
+<polyline points='689.46,300.25 686.01,300.25 ' style='stroke-width: 0.38; stroke-linecap: butt;' />
+<polyline points='689.46,317.53 686.01,317.53 ' style='stroke-width: 0.38; stroke-linecap: butt;' />
 <text x='694.94' y='251.44' style='font-size: 8.80px; font-family: sans;' textLength='19.58px' lengthAdjust='spacingAndGlyphs'>1999</text>
 <text x='694.94' y='268.72' style='font-size: 8.80px; font-family: sans;' textLength='19.58px' lengthAdjust='spacingAndGlyphs'>2000</text>
 <text x='694.94' y='286.00' style='font-size: 8.80px; font-family: sans;' textLength='19.58px' lengthAdjust='spacingAndGlyphs'>2002</text>
diff --git a/tests/testthat/_snaps/guides/guide-colorsteps-sets-labels-when-limits-is-in-breaks.svg b/tests/testthat/_snaps/guides/guide-colorsteps-sets-labels-when-limits-is-in-breaks.svg
index b38018f911..9575c4f9f9 100644
--- a/tests/testthat/_snaps/guides/guide-colorsteps-sets-labels-when-limits-is-in-breaks.svg
+++ b/tests/testthat/_snaps/guides/guide-colorsteps-sets-labels-when-limits-is-in-breaks.svg
@@ -285,6 +285,7 @@
 <text x='354.35' y='568.24' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='14.06px' lengthAdjust='spacingAndGlyphs'>cty</text>
 <text transform='translate(13.05,283.95) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='19.57px' lengthAdjust='spacingAndGlyphs'>hwy</text>
 <rect x='686.87' y='233.08' width='27.65' height='101.73' style='stroke-width: 1.07; stroke: none; fill: #FFFFFF;' />
+<text x='686.87' y='241.79' style='font-size: 11.00px; font-family: sans;' textLength='21.40px' lengthAdjust='spacingAndGlyphs'>year</text>
 <rect x='686.87' y='317.53' width='17.28' height='17.28' style='stroke-width: 0.75; stroke: none; fill: #16324C;' />
 <rect x='686.87' y='300.25' width='17.28' height='17.28' style='stroke-width: 0.75; stroke: none; fill: #214667;' />
 <rect x='686.87' y='282.97' width='17.28' height='17.28' style='stroke-width: 0.75; stroke: none; fill: #2F638E;' />
@@ -295,7 +296,6 @@
 <text x='709.63' y='303.28' style='font-size: 8.80px; font-family: sans;' textLength='4.89px' lengthAdjust='spacingAndGlyphs'>3</text>
 <text x='709.63' y='286.00' style='font-size: 8.80px; font-family: sans;' textLength='4.89px' lengthAdjust='spacingAndGlyphs'>4</text>
 <text x='709.63' y='268.72' style='font-size: 8.80px; font-family: sans;' textLength='4.89px' lengthAdjust='spacingAndGlyphs'>5</text>
-<text x='686.87' y='241.79' style='font-size: 11.00px; font-family: sans;' textLength='21.40px' lengthAdjust='spacingAndGlyphs'>year</text>
 <text x='32.79' y='14.56' style='font-size: 13.20px; font-family: sans;' textLength='305.26px' lengthAdjust='spacingAndGlyphs'>guide_colorsteps sets labels when limits is in breaks</text>
 </g>
 </svg>
diff --git a/tests/testthat/_snaps/guides/guide-colorsteps-understands-coinciding-limits-and-bins-2.svg b/tests/testthat/_snaps/guides/guide-colorsteps-understands-coinciding-limits-and-bins-2.svg
index 9427333e92..f1855cedf9 100644
--- a/tests/testthat/_snaps/guides/guide-colorsteps-understands-coinciding-limits-and-bins-2.svg
+++ b/tests/testthat/_snaps/guides/guide-colorsteps-understands-coinciding-limits-and-bins-2.svg
@@ -285,6 +285,7 @@
 <text x='347.01' y='568.24' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='14.06px' lengthAdjust='spacingAndGlyphs'>cty</text>
 <text transform='translate(13.05,283.95) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='19.57px' lengthAdjust='spacingAndGlyphs'>hwy</text>
 <rect x='672.18' y='233.08' width='42.34' height='101.73' style='stroke-width: 1.07; stroke: none; fill: #FFFFFF;' />
+<text x='672.18' y='241.79' style='font-size: 11.00px; font-family: sans;' textLength='21.40px' lengthAdjust='spacingAndGlyphs'>year</text>
 <rect x='672.18' y='317.53' width='17.28' height='17.28' style='stroke-width: 0.75; stroke: none; fill: #16324C;' />
 <rect x='672.18' y='300.25' width='17.28' height='17.28' style='stroke-width: 0.75; stroke: none; fill: #214667;' />
 <rect x='672.18' y='282.97' width='17.28' height='17.28' style='stroke-width: 0.75; stroke: none; fill: #2F638E;' />
@@ -295,7 +296,6 @@
 <text x='694.94' y='286.00' style='font-size: 8.80px; font-family: sans;' textLength='19.58px' lengthAdjust='spacingAndGlyphs'>2004</text>
 <text x='694.94' y='268.72' style='font-size: 8.80px; font-family: sans;' textLength='19.58px' lengthAdjust='spacingAndGlyphs'>2006</text>
 <text x='694.94' y='251.44' style='font-size: 8.80px; font-family: sans;' textLength='19.58px' lengthAdjust='spacingAndGlyphs'>2008</text>
-<text x='672.18' y='241.79' style='font-size: 11.00px; font-family: sans;' textLength='21.40px' lengthAdjust='spacingAndGlyphs'>year</text>
 <text x='32.79' y='14.56' style='font-size: 13.20px; font-family: sans;' textLength='336.85px' lengthAdjust='spacingAndGlyphs'>guide_colorsteps understands coinciding limits and bins 2</text>
 </g>
 </svg>
diff --git a/tests/testthat/_snaps/guides/guide-colorsteps-understands-coinciding-limits-and-bins-3.svg b/tests/testthat/_snaps/guides/guide-colorsteps-understands-coinciding-limits-and-bins-3.svg
index 922b4aac29..3682f1b2e0 100644
--- a/tests/testthat/_snaps/guides/guide-colorsteps-understands-coinciding-limits-and-bins-3.svg
+++ b/tests/testthat/_snaps/guides/guide-colorsteps-understands-coinciding-limits-and-bins-3.svg
@@ -285,6 +285,7 @@
 <text x='347.01' y='568.24' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='14.06px' lengthAdjust='spacingAndGlyphs'>cty</text>
 <text transform='translate(13.05,283.95) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='19.57px' lengthAdjust='spacingAndGlyphs'>hwy</text>
 <rect x='672.18' y='233.08' width='42.34' height='101.73' style='stroke-width: 1.07; stroke: none; fill: #FFFFFF;' />
+<text x='672.18' y='241.79' style='font-size: 11.00px; font-family: sans;' textLength='21.40px' lengthAdjust='spacingAndGlyphs'>year</text>
 <rect x='672.18' y='317.53' width='17.28' height='17.28' style='stroke-width: 0.75; stroke: none; fill: #16324C;' />
 <rect x='672.18' y='300.25' width='17.28' height='17.28' style='stroke-width: 0.75; stroke: none; fill: #214667;' />
 <rect x='672.18' y='282.97' width='17.28' height='17.28' style='stroke-width: 0.75; stroke: none; fill: #2F638E;' />
@@ -296,7 +297,6 @@
 <text x='694.94' y='286.00' style='font-size: 8.80px; font-family: sans;' textLength='19.58px' lengthAdjust='spacingAndGlyphs'>2004</text>
 <text x='694.94' y='268.72' style='font-size: 8.80px; font-family: sans;' textLength='19.58px' lengthAdjust='spacingAndGlyphs'>2006</text>
 <text x='694.94' y='251.44' style='font-size: 8.80px; font-family: sans;' textLength='19.58px' lengthAdjust='spacingAndGlyphs'>2008</text>
-<text x='672.18' y='241.79' style='font-size: 11.00px; font-family: sans;' textLength='21.40px' lengthAdjust='spacingAndGlyphs'>year</text>
 <text x='32.79' y='14.56' style='font-size: 13.20px; font-family: sans;' textLength='336.85px' lengthAdjust='spacingAndGlyphs'>guide_colorsteps understands coinciding limits and bins 3</text>
 </g>
 </svg>
diff --git a/tests/testthat/_snaps/guides/guide-colorsteps-understands-coinciding-limits-and-bins.svg b/tests/testthat/_snaps/guides/guide-colorsteps-understands-coinciding-limits-and-bins.svg
index e4e230d71a..61350097bc 100644
--- a/tests/testthat/_snaps/guides/guide-colorsteps-understands-coinciding-limits-and-bins.svg
+++ b/tests/testthat/_snaps/guides/guide-colorsteps-understands-coinciding-limits-and-bins.svg
@@ -285,6 +285,7 @@
 <text x='347.01' y='568.24' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='14.06px' lengthAdjust='spacingAndGlyphs'>cty</text>
 <text transform='translate(13.05,283.95) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='19.57px' lengthAdjust='spacingAndGlyphs'>hwy</text>
 <rect x='672.18' y='233.08' width='42.34' height='101.73' style='stroke-width: 1.07; stroke: none; fill: #FFFFFF;' />
+<text x='672.18' y='241.79' style='font-size: 11.00px; font-family: sans;' textLength='21.40px' lengthAdjust='spacingAndGlyphs'>year</text>
 <rect x='672.18' y='317.53' width='17.28' height='17.28' style='stroke-width: 0.75; stroke: none; fill: #16324C;' />
 <rect x='672.18' y='300.25' width='17.28' height='17.28' style='stroke-width: 0.75; stroke: none; fill: #214667;' />
 <rect x='672.18' y='282.97' width='17.28' height='17.28' style='stroke-width: 0.75; stroke: none; fill: #2F638E;' />
@@ -295,7 +296,6 @@
 <text x='694.94' y='303.28' style='font-size: 8.80px; font-family: sans;' textLength='19.58px' lengthAdjust='spacingAndGlyphs'>2002</text>
 <text x='694.94' y='286.00' style='font-size: 8.80px; font-family: sans;' textLength='19.58px' lengthAdjust='spacingAndGlyphs'>2004</text>
 <text x='694.94' y='268.72' style='font-size: 8.80px; font-family: sans;' textLength='19.58px' lengthAdjust='spacingAndGlyphs'>2006</text>
-<text x='672.18' y='241.79' style='font-size: 11.00px; font-family: sans;' textLength='21.40px' lengthAdjust='spacingAndGlyphs'>year</text>
 <text x='32.79' y='14.56' style='font-size: 13.20px; font-family: sans;' textLength='325.84px' lengthAdjust='spacingAndGlyphs'>guide_colorsteps understands coinciding limits and bins</text>
 </g>
 </svg>
diff --git a/tests/testthat/_snaps/guides/guide-coloursteps-can-have-bins-relative-to-binsize.svg b/tests/testthat/_snaps/guides/guide-coloursteps-can-have-bins-relative-to-binsize.svg
index f6ba570bce..ace585daf1 100644
--- a/tests/testthat/_snaps/guides/guide-coloursteps-can-have-bins-relative-to-binsize.svg
+++ b/tests/testthat/_snaps/guides/guide-coloursteps-can-have-bins-relative-to-binsize.svg
@@ -54,6 +54,7 @@
 <text x='351.90' y='568.24' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>x</text>
 <text transform='translate(13.05,283.95) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>y</text>
 <rect x='679.53' y='233.08' width='34.99' height='101.73' style='stroke-width: 1.07; stroke: none; fill: #FFFFFF;' />
+<text x='679.53' y='241.79' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>x</text>
 <rect x='679.53' y='333.95' width='17.28' height='0.86' style='stroke-width: 0.75; stroke: none; fill: #183550;' />
 <rect x='679.53' y='333.09' width='17.28' height='0.86' style='stroke-width: 0.75; stroke: none; fill: #183550;' />
 <rect x='679.53' y='332.22' width='17.28' height='0.86' style='stroke-width: 0.75; stroke: none; fill: #183550;' />
@@ -157,7 +158,6 @@
 <text x='702.29' y='323.15' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>1.5</text>
 <text x='702.29' y='308.90' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>2.0</text>
 <text x='702.29' y='280.39' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>3.0</text>
-<text x='679.53' y='241.79' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>x</text>
 <text x='35.24' y='14.56' style='font-size: 13.20px; font-family: sans;' textLength='297.96px' lengthAdjust='spacingAndGlyphs'>guide_coloursteps can have bins relative to binsize</text>
 </g>
 </svg>
diff --git a/tests/testthat/_snaps/guides/guide-coloursteps-can-show-limits.svg b/tests/testthat/_snaps/guides/guide-coloursteps-can-show-limits.svg
index 78c5da475f..3601641e36 100644
--- a/tests/testthat/_snaps/guides/guide-coloursteps-can-show-limits.svg
+++ b/tests/testthat/_snaps/guides/guide-coloursteps-can-show-limits.svg
@@ -54,6 +54,7 @@
 <text x='351.90' y='568.24' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>x</text>
 <text transform='translate(13.05,283.95) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>y</text>
 <rect x='679.53' y='233.08' width='34.99' height='101.73' style='stroke-width: 1.07; stroke: none; fill: #FFFFFF;' />
+<text x='679.53' y='241.79' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>x</text>
 <rect x='679.53' y='313.21' width='17.28' height='21.60' style='stroke-width: 0.75; stroke: none; fill: #183550;' />
 <rect x='679.53' y='291.61' width='17.28' height='21.60' style='stroke-width: 0.75; stroke: none; fill: #22496C;' />
 <rect x='679.53' y='270.01' width='17.28' height='21.60' style='stroke-width: 0.75; stroke: none; fill: #336A98;' />
@@ -63,7 +64,6 @@
 <text x='702.29' y='294.64' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>2.0</text>
 <text x='702.29' y='273.04' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>3.0</text>
 <text x='702.29' y='251.44' style='font-size: 8.80px; font-family: sans;' textLength='4.89px' lengthAdjust='spacingAndGlyphs'>4</text>
-<text x='679.53' y='241.79' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>x</text>
 <text x='35.24' y='14.56' style='font-size: 13.20px; font-family: sans;' textLength='200.34px' lengthAdjust='spacingAndGlyphs'>guide_coloursteps can show limits</text>
 </g>
 </svg>
diff --git a/tests/testthat/_snaps/guides/guide-coloursteps-looks-as-it-should.svg b/tests/testthat/_snaps/guides/guide-coloursteps-looks-as-it-should.svg
index 06c2992fca..9a28d6ba0f 100644
--- a/tests/testthat/_snaps/guides/guide-coloursteps-looks-as-it-should.svg
+++ b/tests/testthat/_snaps/guides/guide-coloursteps-looks-as-it-should.svg
@@ -54,6 +54,7 @@
 <text x='351.90' y='568.24' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>x</text>
 <text transform='translate(13.05,283.95) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>y</text>
 <rect x='679.53' y='233.08' width='34.99' height='101.73' style='stroke-width: 1.07; stroke: none; fill: #FFFFFF;' />
+<text x='679.53' y='241.79' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>x</text>
 <rect x='679.53' y='313.21' width='17.28' height='21.60' style='stroke-width: 0.75; stroke: none; fill: #183550;' />
 <rect x='679.53' y='291.61' width='17.28' height='21.60' style='stroke-width: 0.75; stroke: none; fill: #22496C;' />
 <rect x='679.53' y='270.01' width='17.28' height='21.60' style='stroke-width: 0.75; stroke: none; fill: #336A98;' />
@@ -61,7 +62,6 @@
 <text x='702.29' y='316.24' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>1.5</text>
 <text x='702.29' y='294.64' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>2.0</text>
 <text x='702.29' y='273.04' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>3.0</text>
-<text x='679.53' y='241.79' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>x</text>
 <text x='35.24' y='14.56' style='font-size: 13.20px; font-family: sans;' textLength='212.10px' lengthAdjust='spacingAndGlyphs'>guide_coloursteps looks as it should</text>
 </g>
 </svg>
diff --git a/tests/testthat/_snaps/guides/guide-title-and-text-positioning-and-alignment-via-themes.svg b/tests/testthat/_snaps/guides/guide-title-and-text-positioning-and-alignment-via-themes.svg
index 40e6580d27..09233a4cf7 100644
--- a/tests/testthat/_snaps/guides/guide-title-and-text-positioning-and-alignment-via-themes.svg
+++ b/tests/testthat/_snaps/guides/guide-title-and-text-positioning-and-alignment-via-themes.svg
@@ -56,20 +56,20 @@
 <text x='349.41' y='568.24' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>x</text>
 <text transform='translate(13.05,283.95) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>x</text>
 <rect x='672.10' y='134.43' width='42.42' height='131.62' style='stroke-width: 1.07; stroke: none; fill: #FFFFFF;' />
+<text x='693.31' y='173.03' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>x</text>
 <image width='17.28' height='86.40' x='672.10' y='179.65' preserveAspectRatio='none' xlink:href='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAEsCAYAAAACUNnVAAAAmElEQVQ4ja2UQRLDMAgDd3hk/tnX5agcknFaCoa0vnkMCEnGsL12GQhDYDpPwoDrpBFlRDWi/9Wu6AHC9FkLYLrzlhD3oJ3mDvRHRYy7IC8A7bCK8gpWKYDzeQVArDcDyD2YAnSofZvzaOA6Q7Oahp/dmRuVTQ0xU5TGP2o8Waool1obVuv1q8qP9xPvg633XlGLDtfIhNUBcBeA5ss0BXMAAAAASUVORK5CYII='/>
+<polyline points='689.38,245.03 685.92,245.03 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='689.38,223.29 685.92,223.29 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='689.38,201.54 685.92,201.54 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='689.38,179.80 685.92,179.80 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='672.10,245.03 675.55,245.03 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='672.10,223.29 675.55,223.29 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='672.10,201.54 675.55,201.54 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='672.10,179.80 675.55,179.80 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
 <text x='714.52' y='248.06' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='9.79px' lengthAdjust='spacingAndGlyphs'>25</text>
 <text x='714.52' y='226.31' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='9.79px' lengthAdjust='spacingAndGlyphs'>50</text>
 <text x='714.52' y='204.57' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='9.79px' lengthAdjust='spacingAndGlyphs'>75</text>
 <text x='714.52' y='182.82' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='14.68px' lengthAdjust='spacingAndGlyphs'>100</text>
-<text x='693.31' y='173.03' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>x</text>
-<line x1='672.10' y1='245.03' x2='675.55' y2='245.03' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='672.10' y1='223.29' x2='675.55' y2='223.29' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='672.10' y1='201.54' x2='675.55' y2='201.54' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='672.10' y1='179.80' x2='675.55' y2='179.80' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='685.92' y1='245.03' x2='689.38' y2='245.03' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='685.92' y1='223.29' x2='689.38' y2='223.29' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='685.92' y1='201.54' x2='689.38' y2='201.54' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='685.92' y1='179.80' x2='689.38' y2='179.80' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
 <rect x='672.10' y='277.01' width='42.42' height='156.45' style='stroke-width: 1.07; stroke: none; fill: #FFFFFF;' />
 <text x='693.31' y='315.61' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>x</text>
 <rect x='672.10' y='322.23' width='17.28' height='27.81' style='stroke-width: 1.07; stroke: none; fill: #FFFFFF;' />
diff --git a/tests/testthat/_snaps/guides/guide-titles-with-coord-trans.svg b/tests/testthat/_snaps/guides/guide-titles-with-coord-trans.svg
index 78de62f91c..bfe8ec8a98 100644
--- a/tests/testthat/_snaps/guides/guide-titles-with-coord-trans.svg
+++ b/tests/testthat/_snaps/guides/guide-titles-with-coord-trans.svg
@@ -31,16 +31,16 @@
 <rect x='45.03' y='48.19' width='629.95' height='496.92' style='stroke-width: 1.07; stroke: #333333;' />
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+<polyline points='45.03,45.45 45.03,48.19 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='202.51,45.45 202.51,48.19 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='360.00,45.45 360.00,48.19 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='517.49,45.45 517.49,48.19 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='674.97,45.45 674.97,48.19 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <text x='45.03' y='43.26' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='22.02px' lengthAdjust='spacingAndGlyphs'>0.950</text>
 <text x='202.51' y='43.26' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='22.02px' lengthAdjust='spacingAndGlyphs'>0.975</text>
 <text x='360.00' y='43.26' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='22.02px' lengthAdjust='spacingAndGlyphs'>1.000</text>
 <text x='517.49' y='43.26' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='22.02px' lengthAdjust='spacingAndGlyphs'>1.025</text>
 <text x='674.97' y='43.26' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='22.02px' lengthAdjust='spacingAndGlyphs'>1.050</text>
-<polyline points='45.03,48.19 45.03,45.45 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='202.51,48.19 202.51,45.45 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='360.00,48.19 360.00,45.45 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='517.49,48.19 517.49,45.45 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='674.97,48.19 674.97,45.45 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <text x='40.10' y='548.14' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='22.02px' lengthAdjust='spacingAndGlyphs'>0.950</text>
 <text x='40.10' y='423.91' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='22.02px' lengthAdjust='spacingAndGlyphs'>0.975</text>
 <text x='40.10' y='299.68' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='22.02px' lengthAdjust='spacingAndGlyphs'>1.000</text>
@@ -51,11 +51,11 @@
 <polyline points='42.29,296.65 45.03,296.65 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='42.29,172.42 45.03,172.42 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='42.29,48.19 45.03,48.19 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='674.97,545.11 677.71,545.11 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='674.97,420.88 677.71,420.88 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='674.97,296.65 677.71,296.65 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='674.97,172.42 677.71,172.42 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='674.97,48.19 677.71,48.19 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='677.71,545.11 674.97,545.11 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='677.71,420.88 674.97,420.88 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='677.71,296.65 674.97,296.65 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='677.71,172.42 674.97,172.42 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='677.71,48.19 674.97,48.19 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <text x='679.90' y='548.14' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='22.02px' lengthAdjust='spacingAndGlyphs'>0.950</text>
 <text x='679.90' y='423.91' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='22.02px' lengthAdjust='spacingAndGlyphs'>0.975</text>
 <text x='679.90' y='299.68' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='22.02px' lengthAdjust='spacingAndGlyphs'>1.000</text>
diff --git a/tests/testthat/_snaps/guides/guides-specified-in-guides.svg b/tests/testthat/_snaps/guides/guides-specified-in-guides.svg
index 81d6765c86..abdec7137c 100644
--- a/tests/testthat/_snaps/guides/guides-specified-in-guides.svg
+++ b/tests/testthat/_snaps/guides/guides-specified-in-guides.svg
@@ -264,29 +264,29 @@
 <rect x='44.77' y='45.67' width='643.04' height='489.36' style='stroke-width: 1.07; stroke: #333333;' />
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-<text x='187.67' y='30.67' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='33.27px' lengthAdjust='spacingAndGlyphs'>compact</text>
-<text x='366.30' y='30.67' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='30.33px' lengthAdjust='spacingAndGlyphs'>minivan</text>
-<text x='544.92' y='30.67' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='47.46px' lengthAdjust='spacingAndGlyphs'>subcompact</text>
+<polyline points='98.36,42.93 98.36,45.67 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='187.67,42.93 187.67,45.67 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='276.99,42.93 276.99,45.67 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='366.30,42.93 366.30,45.67 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='455.61,42.93 455.61,45.67 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='544.92,42.93 544.92,45.67 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='634.23,42.93 634.23,45.67 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <text x='98.36' y='40.74' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='29.36px' lengthAdjust='spacingAndGlyphs'>2seater</text>
 <text x='276.99' y='40.74' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='29.84px' lengthAdjust='spacingAndGlyphs'>midsize</text>
 <text x='455.61' y='40.74' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='25.44px' lengthAdjust='spacingAndGlyphs'>pickup</text>
 <text x='634.23' y='40.74' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='13.70px' lengthAdjust='spacingAndGlyphs'>suv</text>
-<polyline points='98.36,45.67 98.36,42.93 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='187.67,45.67 187.67,42.93 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='276.99,45.67 276.99,42.93 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='366.30,45.67 366.30,42.93 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='455.61,45.67 455.61,42.93 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='544.92,45.67 544.92,42.93 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='634.23,45.67 634.23,42.93 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<text x='27.86' y='265.58' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='9.79px' lengthAdjust='spacingAndGlyphs'>30</text>
+<text x='187.67' y='30.67' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='33.27px' lengthAdjust='spacingAndGlyphs'>compact</text>
+<text x='366.30' y='30.67' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='30.33px' lengthAdjust='spacingAndGlyphs'>minivan</text>
+<text x='544.92' y='30.67' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='47.46px' lengthAdjust='spacingAndGlyphs'>subcompact</text>
 <text x='39.84' y='404.60' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='9.79px' lengthAdjust='spacingAndGlyphs'>20</text>
 <text x='39.84' y='126.55' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='9.79px' lengthAdjust='spacingAndGlyphs'>40</text>
+<text x='27.86' y='265.58' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='9.79px' lengthAdjust='spacingAndGlyphs'>30</text>
 <polyline points='42.03,401.57 44.77,401.57 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='42.03,262.55 44.77,262.55 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='42.03,123.53 44.77,123.53 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='687.82,401.57 690.56,401.57 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='687.82,262.55 690.56,262.55 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='687.82,123.53 690.56,123.53 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='690.56,401.57 687.82,401.57 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='690.56,262.55 687.82,262.55 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='690.56,123.53 687.82,123.53 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <text x='692.75' y='404.60' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='9.79px' lengthAdjust='spacingAndGlyphs'>20</text>
 <text x='692.75' y='126.55' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='9.79px' lengthAdjust='spacingAndGlyphs'>40</text>
 <text x='704.73' y='265.58' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='9.79px' lengthAdjust='spacingAndGlyphs'>30</text>
diff --git a/tests/testthat/_snaps/guides/horizontal-gap-of-1cm-between-guide-and-guide-text.svg b/tests/testthat/_snaps/guides/horizontal-gap-of-1cm-between-guide-and-guide-text.svg
index bde5f6ee07..11b0044813 100644
--- a/tests/testthat/_snaps/guides/horizontal-gap-of-1cm-between-guide-and-guide-text.svg
+++ b/tests/testthat/_snaps/guides/horizontal-gap-of-1cm-between-guide-and-guide-text.svg
@@ -56,23 +56,23 @@
 <text x='340.47' y='568.24' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>x</text>
 <text transform='translate(13.05,283.95) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>y</text>
 <rect x='656.66' y='194.02' width='57.86' height='101.73' style='stroke-width: 1.07; stroke: none; fill: #FFFFFF;' />
+<text x='656.66' y='202.73' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>y</text>
 <image width='17.28' height='86.40' x='656.66' y='209.35' preserveAspectRatio='none' xlink:href='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAEsCAYAAAACUNnVAAAAmElEQVQ4ja2UQRLDMAgDd3hk/tnX5agcknFaCoa0vnkMCEnGsL12GQhDYDpPwoDrpBFlRDWi/9Wu6AHC9FkLYLrzlhD3oJ3mDvRHRYy7IC8A7bCK8gpWKYDzeQVArDcDyD2YAnSofZvzaOA6Q7Oahp/dmRuVTQ0xU5TGP2o8Waool1obVuv1q8qP9xPvg633XlGLDtfIhNUBcBeA5ss0BXMAAAAASUVORK5CYII='/>
+<polyline points='673.94,295.60 670.48,295.60 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='673.94,274.08 670.48,274.08 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='673.94,252.55 670.48,252.55 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='673.94,231.02 670.48,231.02 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='673.94,209.49 670.48,209.49 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='656.66,295.60 660.12,295.60 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='656.66,274.08 660.12,274.08 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='656.66,252.55 660.12,252.55 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='656.66,231.02 660.12,231.02 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='656.66,209.49 660.12,209.49 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
 <text x='702.29' y='298.63' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>1.0</text>
 <text x='702.29' y='277.10' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>1.5</text>
 <text x='702.29' y='255.58' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>2.0</text>
 <text x='702.29' y='234.05' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>2.5</text>
 <text x='702.29' y='212.52' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>3.0</text>
-<text x='656.66' y='202.73' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>y</text>
-<line x1='656.66' y1='295.60' x2='660.12' y2='295.60' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='656.66' y1='274.08' x2='660.12' y2='274.08' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='656.66' y1='252.55' x2='660.12' y2='252.55' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='656.66' y1='231.02' x2='660.12' y2='231.02' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='656.66' y1='209.49' x2='660.12' y2='209.49' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='670.48' y1='295.60' x2='673.94' y2='295.60' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='670.48' y1='274.08' x2='673.94' y2='274.08' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='670.48' y1='252.55' x2='673.94' y2='252.55' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='670.48' y1='231.02' x2='673.94' y2='231.02' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='670.48' y1='209.49' x2='673.94' y2='209.49' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
 <rect x='656.66' y='306.71' width='50.52' height='67.17' style='stroke-width: 1.07; stroke: none; fill: #FFFFFF;' />
 <text x='656.66' y='315.42' style='font-size: 11.00px; font-family: sans;' textLength='40.35px' lengthAdjust='spacingAndGlyphs'>factor(x)</text>
 <rect x='656.66' y='322.04' width='17.28' height='17.28' style='stroke-width: 1.07; stroke: none; fill: #FFFFFF;' />
diff --git a/tests/testthat/_snaps/guides/legend-inside-plot-bottom-left-of-legend-at-center.svg b/tests/testthat/_snaps/guides/legend-inside-plot-bottom-left-of-legend-at-center.svg
index 3c614e1a9b..2bf9fc2fa0 100644
--- a/tests/testthat/_snaps/guides/legend-inside-plot-bottom-left-of-legend-at-center.svg
+++ b/tests/testthat/_snaps/guides/legend-inside-plot-bottom-left-of-legend-at-center.svg
@@ -52,23 +52,23 @@
 <text x='377.33' y='568.24' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>x</text>
 <text transform='translate(13.05,283.95) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>y</text>
 <rect x='377.33' y='104.08' width='34.99' height='101.73' style='stroke-width: 1.07; fill: #FFFFFF;' />
+<text x='377.33' y='112.79' style='font-size: 11.00px; font-family: sans;' textLength='15.29px' lengthAdjust='spacingAndGlyphs'>1:3</text>
 <image width='17.28' height='86.40' x='377.33' y='119.42' preserveAspectRatio='none' xlink:href='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAEsCAYAAAACUNnVAAAAmElEQVQ4ja2UQRLDMAgDd3hk/tnX5agcknFaCoa0vnkMCEnGsL12GQhDYDpPwoDrpBFlRDWi/9Wu6AHC9FkLYLrzlhD3oJ3mDvRHRYy7IC8A7bCK8gpWKYDzeQVArDcDyD2YAnSofZvzaOA6Q7Oahp/dmRuVTQ0xU5TGP2o8Waool1obVuv1q8qP9xPvg633XlGLDtfIhNUBcBeA5ss0BXMAAAAASUVORK5CYII='/>
+<polyline points='394.61,205.67 391.15,205.67 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='394.61,184.14 391.15,184.14 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='394.61,162.62 391.15,162.62 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='394.61,141.09 391.15,141.09 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='394.61,119.56 391.15,119.56 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='377.33,205.67 380.78,205.67 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='377.33,184.14 380.78,184.14 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='377.33,162.62 380.78,162.62 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='377.33,141.09 380.78,141.09 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='377.33,119.56 380.78,119.56 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
 <text x='400.09' y='208.70' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>1.0</text>
 <text x='400.09' y='187.17' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>1.5</text>
 <text x='400.09' y='165.64' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>2.0</text>
 <text x='400.09' y='144.12' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>2.5</text>
 <text x='400.09' y='122.59' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>3.0</text>
-<text x='377.33' y='112.79' style='font-size: 11.00px; font-family: sans;' textLength='15.29px' lengthAdjust='spacingAndGlyphs'>1:3</text>
-<line x1='377.33' y1='205.67' x2='380.78' y2='205.67' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='377.33' y1='184.14' x2='380.78' y2='184.14' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='377.33' y1='162.62' x2='380.78' y2='162.62' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='377.33' y1='141.09' x2='380.78' y2='141.09' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='377.33' y1='119.56' x2='380.78' y2='119.56' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='391.15' y1='205.67' x2='394.61' y2='205.67' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='391.15' y1='184.14' x2='394.61' y2='184.14' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='391.15' y1='162.62' x2='394.61' y2='162.62' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='391.15' y1='141.09' x2='394.61' y2='141.09' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='391.15' y1='119.56' x2='394.61' y2='119.56' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
 <rect x='377.33' y='216.77' width='29.12' height='67.17' style='stroke-width: 1.07; fill: #FFFFFF;' />
 <text x='377.33' y='225.49' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>x</text>
 <rect x='377.33' y='232.11' width='17.28' height='17.28' style='stroke-width: 1.07; stroke: none; fill: #FFFFFF;' />
diff --git a/tests/testthat/_snaps/guides/legend-inside-plot-bottom-left.svg b/tests/testthat/_snaps/guides/legend-inside-plot-bottom-left.svg
index 21685b8367..2ccc33b55a 100644
--- a/tests/testthat/_snaps/guides/legend-inside-plot-bottom-left.svg
+++ b/tests/testthat/_snaps/guides/legend-inside-plot-bottom-left.svg
@@ -52,23 +52,23 @@
 <text x='377.33' y='568.24' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>x</text>
 <text transform='translate(13.05,283.95) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>y</text>
 <rect x='40.13' y='365.25' width='34.99' height='101.73' style='stroke-width: 1.07; fill: #FFFFFF;' />
+<text x='40.13' y='373.96' style='font-size: 11.00px; font-family: sans;' textLength='15.29px' lengthAdjust='spacingAndGlyphs'>1:3</text>
 <image width='17.28' height='86.40' x='40.13' y='380.58' preserveAspectRatio='none' xlink:href='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAEsCAYAAAACUNnVAAAAmElEQVQ4ja2UQRLDMAgDd3hk/tnX5agcknFaCoa0vnkMCEnGsL12GQhDYDpPwoDrpBFlRDWi/9Wu6AHC9FkLYLrzlhD3oJ3mDvRHRYy7IC8A7bCK8gpWKYDzeQVArDcDyD2YAnSofZvzaOA6Q7Oahp/dmRuVTQ0xU5TGP2o8Waool1obVuv1q8qP9xPvg633XlGLDtfIhNUBcBeA5ss0BXMAAAAASUVORK5CYII='/>
+<polyline points='57.41,466.84 53.96,466.84 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='57.41,445.31 53.96,445.31 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='57.41,423.78 53.96,423.78 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='57.41,402.25 53.96,402.25 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='57.41,380.72 53.96,380.72 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='40.13,466.84 43.59,466.84 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='40.13,445.31 43.59,445.31 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='40.13,423.78 43.59,423.78 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='40.13,402.25 43.59,402.25 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='40.13,380.72 43.59,380.72 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
 <text x='62.89' y='469.86' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>1.0</text>
 <text x='62.89' y='448.34' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>1.5</text>
 <text x='62.89' y='426.81' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>2.0</text>
 <text x='62.89' y='405.28' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>2.5</text>
 <text x='62.89' y='383.75' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>3.0</text>
-<text x='40.13' y='373.96' style='font-size: 11.00px; font-family: sans;' textLength='15.29px' lengthAdjust='spacingAndGlyphs'>1:3</text>
-<line x1='40.13' y1='466.84' x2='43.59' y2='466.84' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='40.13' y1='445.31' x2='43.59' y2='445.31' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='40.13' y1='423.78' x2='43.59' y2='423.78' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='40.13' y1='402.25' x2='43.59' y2='402.25' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='40.13' y1='380.72' x2='43.59' y2='380.72' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='53.96' y1='466.84' x2='57.41' y2='466.84' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='53.96' y1='445.31' x2='57.41' y2='445.31' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='53.96' y1='423.78' x2='57.41' y2='423.78' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='53.96' y1='402.25' x2='57.41' y2='402.25' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='53.96' y1='380.72' x2='57.41' y2='380.72' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
 <rect x='40.13' y='477.94' width='29.12' height='67.17' style='stroke-width: 1.07; fill: #FFFFFF;' />
 <text x='40.13' y='486.65' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>x</text>
 <rect x='40.13' y='493.27' width='17.28' height='17.28' style='stroke-width: 1.07; stroke: none; fill: #FFFFFF;' />
diff --git a/tests/testthat/_snaps/guides/legend-inside-plot-centered.svg b/tests/testthat/_snaps/guides/legend-inside-plot-centered.svg
index b5b3de752f..7b5535e219 100644
--- a/tests/testthat/_snaps/guides/legend-inside-plot-centered.svg
+++ b/tests/testthat/_snaps/guides/legend-inside-plot-centered.svg
@@ -52,23 +52,23 @@
 <text x='377.33' y='568.24' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>x</text>
 <text transform='translate(13.05,283.95) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>y</text>
 <rect x='359.83' y='194.02' width='34.99' height='101.73' style='stroke-width: 1.07; fill: #FFFFFF;' />
+<text x='359.83' y='202.73' style='font-size: 11.00px; font-family: sans;' textLength='15.29px' lengthAdjust='spacingAndGlyphs'>1:3</text>
 <image width='17.28' height='86.40' x='359.83' y='209.35' preserveAspectRatio='none' xlink:href='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAEsCAYAAAACUNnVAAAAmElEQVQ4ja2UQRLDMAgDd3hk/tnX5agcknFaCoa0vnkMCEnGsL12GQhDYDpPwoDrpBFlRDWi/9Wu6AHC9FkLYLrzlhD3oJ3mDvRHRYy7IC8A7bCK8gpWKYDzeQVArDcDyD2YAnSofZvzaOA6Q7Oahp/dmRuVTQ0xU5TGP2o8Waool1obVuv1q8qP9xPvg633XlGLDtfIhNUBcBeA5ss0BXMAAAAASUVORK5CYII='/>
+<polyline points='377.11,295.60 373.65,295.60 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='377.11,274.08 373.65,274.08 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='377.11,252.55 373.65,252.55 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='377.11,231.02 373.65,231.02 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='377.11,209.49 373.65,209.49 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='359.83,295.60 363.29,295.60 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='359.83,274.08 363.29,274.08 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='359.83,252.55 363.29,252.55 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='359.83,231.02 363.29,231.02 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='359.83,209.49 363.29,209.49 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
 <text x='382.59' y='298.63' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>1.0</text>
 <text x='382.59' y='277.10' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>1.5</text>
 <text x='382.59' y='255.58' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>2.0</text>
 <text x='382.59' y='234.05' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>2.5</text>
 <text x='382.59' y='212.52' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>3.0</text>
-<text x='359.83' y='202.73' style='font-size: 11.00px; font-family: sans;' textLength='15.29px' lengthAdjust='spacingAndGlyphs'>1:3</text>
-<line x1='359.83' y1='295.60' x2='363.29' y2='295.60' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='359.83' y1='274.08' x2='363.29' y2='274.08' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='359.83' y1='252.55' x2='363.29' y2='252.55' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='359.83' y1='231.02' x2='363.29' y2='231.02' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='359.83' y1='209.49' x2='363.29' y2='209.49' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='373.65' y1='295.60' x2='377.11' y2='295.60' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='373.65' y1='274.08' x2='377.11' y2='274.08' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='373.65' y1='252.55' x2='377.11' y2='252.55' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='373.65' y1='231.02' x2='377.11' y2='231.02' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='373.65' y1='209.49' x2='377.11' y2='209.49' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
 <rect x='359.83' y='306.71' width='29.12' height='67.17' style='stroke-width: 1.07; fill: #FFFFFF;' />
 <text x='359.83' y='315.42' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>x</text>
 <rect x='359.83' y='322.04' width='17.28' height='17.28' style='stroke-width: 1.07; stroke: none; fill: #FFFFFF;' />
diff --git a/tests/testthat/_snaps/guides/legend-inside-plot-top-right.svg b/tests/testthat/_snaps/guides/legend-inside-plot-top-right.svg
index 886e33deaf..9e40f28f1d 100644
--- a/tests/testthat/_snaps/guides/legend-inside-plot-top-right.svg
+++ b/tests/testthat/_snaps/guides/legend-inside-plot-top-right.svg
@@ -52,23 +52,23 @@
 <text x='377.33' y='568.24' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>x</text>
 <text transform='translate(13.05,283.95) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>y</text>
 <rect x='679.53' y='22.78' width='34.99' height='101.73' style='stroke-width: 1.07; fill: #FFFFFF;' />
+<text x='679.53' y='31.50' style='font-size: 11.00px; font-family: sans;' textLength='15.29px' lengthAdjust='spacingAndGlyphs'>1:3</text>
 <image width='17.28' height='86.40' x='679.53' y='38.12' preserveAspectRatio='none' xlink:href='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAEsCAYAAAACUNnVAAAAmElEQVQ4ja2UQRLDMAgDd3hk/tnX5agcknFaCoa0vnkMCEnGsL12GQhDYDpPwoDrpBFlRDWi/9Wu6AHC9FkLYLrzlhD3oJ3mDvRHRYy7IC8A7bCK8gpWKYDzeQVArDcDyD2YAnSofZvzaOA6Q7Oahp/dmRuVTQ0xU5TGP2o8Waool1obVuv1q8qP9xPvg633XlGLDtfIhNUBcBeA5ss0BXMAAAAASUVORK5CYII='/>
+<polyline points='696.81,124.37 693.35,124.37 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='696.81,102.84 693.35,102.84 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='696.81,81.32 693.35,81.32 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='696.81,59.79 693.35,59.79 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='696.81,38.26 693.35,38.26 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='679.53,124.37 682.98,124.37 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='679.53,102.84 682.98,102.84 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='679.53,81.32 682.98,81.32 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='679.53,59.79 682.98,59.79 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='679.53,38.26 682.98,38.26 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
 <text x='702.29' y='127.40' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>1.0</text>
 <text x='702.29' y='105.87' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>1.5</text>
 <text x='702.29' y='84.34' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>2.0</text>
 <text x='702.29' y='62.82' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>2.5</text>
 <text x='702.29' y='41.29' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>3.0</text>
-<text x='679.53' y='31.50' style='font-size: 11.00px; font-family: sans;' textLength='15.29px' lengthAdjust='spacingAndGlyphs'>1:3</text>
-<line x1='679.53' y1='124.37' x2='682.98' y2='124.37' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='679.53' y1='102.84' x2='682.98' y2='102.84' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='679.53' y1='81.32' x2='682.98' y2='81.32' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='679.53' y1='59.79' x2='682.98' y2='59.79' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='679.53' y1='38.26' x2='682.98' y2='38.26' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='693.35' y1='124.37' x2='696.81' y2='124.37' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='693.35' y1='102.84' x2='696.81' y2='102.84' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='693.35' y1='81.32' x2='696.81' y2='81.32' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='693.35' y1='59.79' x2='696.81' y2='59.79' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='693.35' y1='38.26' x2='696.81' y2='38.26' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
 <rect x='679.53' y='135.48' width='29.12' height='67.17' style='stroke-width: 1.07; fill: #FFFFFF;' />
 <text x='679.53' y='144.19' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>x</text>
 <rect x='679.53' y='150.81' width='17.28' height='17.28' style='stroke-width: 1.07; stroke: none; fill: #FFFFFF;' />
diff --git a/tests/testthat/_snaps/guides/multi-line-guide-title-works.svg b/tests/testthat/_snaps/guides/multi-line-guide-title-works.svg
index 4ae49eb03b..ff7dc3c3bf 100644
--- a/tests/testthat/_snaps/guides/multi-line-guide-title-works.svg
+++ b/tests/testthat/_snaps/guides/multi-line-guide-title-works.svg
@@ -56,25 +56,25 @@
 <text x='342.79' y='568.24' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>x</text>
 <text transform='translate(13.05,283.95) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>y</text>
 <rect x='661.30' y='170.26' width='53.22' height='125.49' style='stroke-width: 1.07; stroke: none; fill: #FFFFFF;' />
+<text x='661.30' y='178.97' style='font-size: 11.00px; font-family: sans;' textLength='15.29px' lengthAdjust='spacingAndGlyphs'>the</text>
+<text x='661.30' y='190.85' style='font-size: 11.00px; font-family: sans;' textLength='53.22px' lengthAdjust='spacingAndGlyphs'>continuous</text>
+<text x='661.30' y='202.73' style='font-size: 11.00px; font-family: sans;' textLength='49.53px' lengthAdjust='spacingAndGlyphs'>colorscale</text>
 <image width='17.28' height='86.40' x='661.30' y='209.35' preserveAspectRatio='none' xlink:href='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAEsCAYAAAACUNnVAAAAmElEQVQ4ja2UQRLDMAgDd3hk/tnX5agcknFaCoa0vnkMCEnGsL12GQhDYDpPwoDrpBFlRDWi/9Wu6AHC9FkLYLrzlhD3oJ3mDvRHRYy7IC8A7bCK8gpWKYDzeQVArDcDyD2YAnSofZvzaOA6Q7Oahp/dmRuVTQ0xU5TGP2o8Waool1obVuv1q8qP9xPvg633XlGLDtfIhNUBcBeA5ss0BXMAAAAASUVORK5CYII='/>
+<polyline points='678.58,295.60 675.13,295.60 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='678.58,274.08 675.13,274.08 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='678.58,252.55 675.13,252.55 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='678.58,231.02 675.13,231.02 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='678.58,209.49 675.13,209.49 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='661.30,295.60 664.76,295.60 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='661.30,274.08 664.76,274.08 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='661.30,252.55 664.76,252.55 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='661.30,231.02 664.76,231.02 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='661.30,209.49 664.76,209.49 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
 <text x='684.06' y='298.63' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>1.0</text>
 <text x='684.06' y='277.10' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>1.5</text>
 <text x='684.06' y='255.58' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>2.0</text>
 <text x='684.06' y='234.05' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>2.5</text>
 <text x='684.06' y='212.52' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>3.0</text>
-<text x='661.30' y='178.97' style='font-size: 11.00px; font-family: sans;' textLength='15.29px' lengthAdjust='spacingAndGlyphs'>the</text>
-<text x='661.30' y='190.85' style='font-size: 11.00px; font-family: sans;' textLength='53.22px' lengthAdjust='spacingAndGlyphs'>continuous</text>
-<text x='661.30' y='202.73' style='font-size: 11.00px; font-family: sans;' textLength='49.53px' lengthAdjust='spacingAndGlyphs'>colorscale</text>
-<line x1='661.30' y1='295.60' x2='664.76' y2='295.60' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='661.30' y1='274.08' x2='664.76' y2='274.08' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='661.30' y1='252.55' x2='664.76' y2='252.55' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='661.30' y1='231.02' x2='664.76' y2='231.02' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='661.30' y1='209.49' x2='664.76' y2='209.49' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='675.13' y1='295.60' x2='678.58' y2='295.60' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='675.13' y1='274.08' x2='678.58' y2='274.08' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='675.13' y1='252.55' x2='678.58' y2='252.55' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='675.13' y1='231.02' x2='678.58' y2='231.02' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='675.13' y1='209.49' x2='678.58' y2='209.49' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
 <rect x='661.30' y='306.71' width='49.53' height='90.93' style='stroke-width: 1.07; stroke: none; fill: #FFFFFF;' />
 <text x='661.30' y='315.42' style='font-size: 11.00px; font-family: sans;' textLength='15.29px' lengthAdjust='spacingAndGlyphs'>the</text>
 <text x='661.30' y='327.30' style='font-size: 11.00px; font-family: sans;' textLength='38.52px' lengthAdjust='spacingAndGlyphs'>discrete</text>
diff --git a/tests/testthat/_snaps/guides/one-combined-colorbar-for-colour-and-fill-aesthetics.svg b/tests/testthat/_snaps/guides/one-combined-colorbar-for-colour-and-fill-aesthetics.svg
index f49185354d..b8ca13811b 100644
--- a/tests/testthat/_snaps/guides/one-combined-colorbar-for-colour-and-fill-aesthetics.svg
+++ b/tests/testthat/_snaps/guides/one-combined-colorbar-for-colour-and-fill-aesthetics.svg
@@ -56,7 +56,22 @@
 <text x='355.57' y='568.24' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>x</text>
 <text transform='translate(13.05,283.95) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>y</text>
 <rect x='686.87' y='233.08' width='27.65' height='101.73' style='stroke-width: 1.07; stroke: none; fill: #FFFFFF;' />
+<text x='686.87' y='241.79' style='font-size: 11.00px; font-family: sans;' textLength='26.30px' lengthAdjust='spacingAndGlyphs'>value</text>
 <image width='17.28' height='86.40' x='686.87' y='248.41' preserveAspectRatio='none' xlink:href='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAEsCAYAAAACUNnVAAAA5ElEQVQ4jZ2PS3LEMAhEH1Tuf4qcMmXTWchmhIIyTjaqpn8gDn3KicBNgRMnjgK3iAsx0NlwRf3Blb5HiQfc+VDdojuhgV7cmdyBo+NCGujr4hSOI8clx5lGu1FY4cJStVTtV5XGR/WxURNthbl+Qcz1fQF5M2XbyJa+yDPGw41i5e6WoCaGZVvFwypmS7y46SCaI4tl2tYuyjFv7sYr0Y3kV8lE5aqwxGbO3lbtWt6o/6uKv1sWdRKEywIX+ZjK2HLNaIGzVdvxgSBcKpaxQ51FOCrjikZMeKQQivthQedAwIe+AYY+GH/hjc2DAAAAAElFTkSuQmCC'/>
+<polyline points='704.15,334.67 700.69,334.67 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='704.15,320.32 700.69,320.32 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='704.15,305.97 700.69,305.97 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='704.15,291.61 700.69,291.61 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='704.15,277.26 700.69,277.26 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='704.15,262.91 700.69,262.91 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='704.15,248.56 700.69,248.56 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='686.87,334.67 690.32,334.67 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='686.87,320.32 690.32,320.32 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='686.87,305.97 690.32,305.97 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='686.87,291.61 690.32,291.61 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='686.87,277.26 690.32,277.26 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='686.87,262.91 690.32,262.91 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='686.87,248.56 690.32,248.56 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
 <text x='709.63' y='337.70' style='font-size: 8.80px; font-family: sans;' textLength='4.89px' lengthAdjust='spacingAndGlyphs'>1</text>
 <text x='709.63' y='323.35' style='font-size: 8.80px; font-family: sans;' textLength='4.89px' lengthAdjust='spacingAndGlyphs'>2</text>
 <text x='709.63' y='308.99' style='font-size: 8.80px; font-family: sans;' textLength='4.89px' lengthAdjust='spacingAndGlyphs'>3</text>
@@ -64,21 +79,6 @@
 <text x='709.63' y='280.29' style='font-size: 8.80px; font-family: sans;' textLength='4.89px' lengthAdjust='spacingAndGlyphs'>5</text>
 <text x='709.63' y='265.94' style='font-size: 8.80px; font-family: sans;' textLength='4.89px' lengthAdjust='spacingAndGlyphs'>6</text>
 <text x='709.63' y='251.59' style='font-size: 8.80px; font-family: sans;' textLength='4.89px' lengthAdjust='spacingAndGlyphs'>7</text>
-<text x='686.87' y='241.79' style='font-size: 11.00px; font-family: sans;' textLength='26.30px' lengthAdjust='spacingAndGlyphs'>value</text>
-<line x1='686.87' y1='334.67' x2='690.32' y2='334.67' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='686.87' y1='320.32' x2='690.32' y2='320.32' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='686.87' y1='305.97' x2='690.32' y2='305.97' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='686.87' y1='291.61' x2='690.32' y2='291.61' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='686.87' y1='277.26' x2='690.32' y2='277.26' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='686.87' y1='262.91' x2='690.32' y2='262.91' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='686.87' y1='248.56' x2='690.32' y2='248.56' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='700.69' y1='334.67' x2='704.15' y2='334.67' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='700.69' y1='320.32' x2='704.15' y2='320.32' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='700.69' y1='305.97' x2='704.15' y2='305.97' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='700.69' y1='291.61' x2='704.15' y2='291.61' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='700.69' y1='277.26' x2='704.15' y2='277.26' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='700.69' y1='262.91' x2='704.15' y2='262.91' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='700.69' y1='248.56' x2='704.15' y2='248.56' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
 <text x='35.24' y='14.56' style='font-size: 13.20px; font-family: sans;' textLength='297.93px' lengthAdjust='spacingAndGlyphs'>one combined colorbar for colour and fill aesthetics</text>
 </g>
 </svg>
diff --git a/tests/testthat/_snaps/guides/padding-in-legend-box.svg b/tests/testthat/_snaps/guides/padding-in-legend-box.svg
index 171270dba8..d55d3978fb 100644
--- a/tests/testthat/_snaps/guides/padding-in-legend-box.svg
+++ b/tests/testthat/_snaps/guides/padding-in-legend-box.svg
@@ -52,23 +52,23 @@
 <text x='354.35' y='568.24' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>x</text>
 <text transform='translate(13.05,283.95) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>y</text>
 <rect x='679.53' y='194.02' width='34.99' height='101.73' style='stroke-width: 1.07; fill: #FFFFFF;' />
+<text x='679.53' y='202.73' style='font-size: 11.00px; font-family: sans;' textLength='15.29px' lengthAdjust='spacingAndGlyphs'>1:3</text>
 <image width='17.28' height='86.40' x='679.53' y='209.35' preserveAspectRatio='none' xlink:href='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAEsCAYAAAACUNnVAAAAmElEQVQ4ja2UQRLDMAgDd3hk/tnX5agcknFaCoa0vnkMCEnGsL12GQhDYDpPwoDrpBFlRDWi/9Wu6AHC9FkLYLrzlhD3oJ3mDvRHRYy7IC8A7bCK8gpWKYDzeQVArDcDyD2YAnSofZvzaOA6Q7Oahp/dmRuVTQ0xU5TGP2o8Waool1obVuv1q8qP9xPvg633XlGLDtfIhNUBcBeA5ss0BXMAAAAASUVORK5CYII='/>
+<polyline points='696.81,295.60 693.35,295.60 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='696.81,274.08 693.35,274.08 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='696.81,252.55 693.35,252.55 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='696.81,231.02 693.35,231.02 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='696.81,209.49 693.35,209.49 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='679.53,295.60 682.98,295.60 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='679.53,274.08 682.98,274.08 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='679.53,252.55 682.98,252.55 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='679.53,231.02 682.98,231.02 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='679.53,209.49 682.98,209.49 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
 <text x='702.29' y='298.63' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>1.0</text>
 <text x='702.29' y='277.10' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>1.5</text>
 <text x='702.29' y='255.58' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>2.0</text>
 <text x='702.29' y='234.05' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>2.5</text>
 <text x='702.29' y='212.52' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>3.0</text>
-<text x='679.53' y='202.73' style='font-size: 11.00px; font-family: sans;' textLength='15.29px' lengthAdjust='spacingAndGlyphs'>1:3</text>
-<line x1='679.53' y1='295.60' x2='682.98' y2='295.60' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='679.53' y1='274.08' x2='682.98' y2='274.08' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='679.53' y1='252.55' x2='682.98' y2='252.55' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='679.53' y1='231.02' x2='682.98' y2='231.02' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='679.53' y1='209.49' x2='682.98' y2='209.49' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='693.35' y1='295.60' x2='696.81' y2='295.60' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='693.35' y1='274.08' x2='696.81' y2='274.08' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='693.35' y1='252.55' x2='696.81' y2='252.55' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='693.35' y1='231.02' x2='696.81' y2='231.02' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='693.35' y1='209.49' x2='696.81' y2='209.49' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
 <rect x='679.53' y='306.71' width='29.12' height='67.17' style='stroke-width: 1.07; fill: #FFFFFF;' />
 <text x='679.53' y='315.42' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>x</text>
 <rect x='679.53' y='322.04' width='17.28' height='17.28' style='stroke-width: 1.07; stroke: none; fill: #FFFFFF;' />
diff --git a/tests/testthat/_snaps/guides/rotated-guide-titles-and-labels.svg b/tests/testthat/_snaps/guides/rotated-guide-titles-and-labels.svg
index c24ce9cfe3..1a4de9074b 100644
--- a/tests/testthat/_snaps/guides/rotated-guide-titles-and-labels.svg
+++ b/tests/testthat/_snaps/guides/rotated-guide-titles-and-labels.svg
@@ -67,23 +67,23 @@
 <text transform='translate(686.15,232.21) rotate(-90)' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='28.87px' lengthAdjust='spacingAndGlyphs'>long 10</text>
 <text transform='translate(708.91,232.21) rotate(-90)' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='28.87px' lengthAdjust='spacingAndGlyphs'>long 15</text>
 <rect x='651.72' y='272.04' width='30.64' height='101.73' style='stroke-width: 1.07; stroke: none; fill: #FFFFFF;' />
+<text x='667.04' y='279.61' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='26.30px' lengthAdjust='spacingAndGlyphs'>value</text>
 <image width='17.28' height='86.40' x='651.72' y='287.38' preserveAspectRatio='none' xlink:href='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAEsCAYAAAACUNnVAAAAmElEQVQ4ja2UQRLDMAgDd3hk/tnX5agcknFaCoa0vnkMCEnGsL12GQhDYDpPwoDrpBFlRDWi/9Wu6AHC9FkLYLrzlhD3oJ3mDvRHRYy7IC8A7bCK8gpWKYDzeQVArDcDyD2YAnSofZvzaOA6Q7Oahp/dmRuVTQ0xU5TGP2o8Waool1obVuv1q8qP9xPvg633XlGLDtfIhNUBcBeA5ss0BXMAAAAASUVORK5CYII='/>
+<polyline points='669.00,373.63 665.55,373.63 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='669.00,352.10 665.55,352.10 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='669.00,330.58 665.55,330.58 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='669.00,309.05 665.55,309.05 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='669.00,287.52 665.55,287.52 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='651.72,373.63 655.18,373.63 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='651.72,352.10 655.18,352.10 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='651.72,330.58 655.18,330.58 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='651.72,309.05 655.18,309.05 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='651.72,287.52 655.18,287.52 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
 <text transform='translate(672.37,373.63) rotate(-270)' text-anchor='middle' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>5.0</text>
 <text transform='translate(672.37,352.10) rotate(-270)' text-anchor='middle' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>7.5</text>
 <text transform='translate(672.37,330.58) rotate(-270)' text-anchor='middle' style='font-size: 8.80px; font-family: sans;' textLength='17.13px' lengthAdjust='spacingAndGlyphs'>10.0</text>
 <text transform='translate(672.37,309.05) rotate(-270)' text-anchor='middle' style='font-size: 8.80px; font-family: sans;' textLength='17.13px' lengthAdjust='spacingAndGlyphs'>12.5</text>
 <text transform='translate(672.37,287.52) rotate(-270)' text-anchor='middle' style='font-size: 8.80px; font-family: sans;' textLength='17.13px' lengthAdjust='spacingAndGlyphs'>15.0</text>
-<text x='667.04' y='279.61' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='26.30px' lengthAdjust='spacingAndGlyphs'>value</text>
-<line x1='651.72' y1='373.63' x2='655.18' y2='373.63' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='651.72' y1='352.10' x2='655.18' y2='352.10' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='651.72' y1='330.58' x2='655.18' y2='330.58' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='651.72' y1='309.05' x2='655.18' y2='309.05' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='651.72' y1='287.52' x2='655.18' y2='287.52' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='665.55' y1='373.63' x2='669.00' y2='373.63' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='665.55' y1='352.10' x2='669.00' y2='352.10' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='665.55' y1='330.58' x2='669.00' y2='330.58' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='665.55' y1='309.05' x2='669.00' y2='309.05' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='665.55' y1='287.52' x2='669.00' y2='287.52' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
 <text x='40.13' y='14.56' style='font-size: 13.20px; font-family: sans;' textLength='171.72px' lengthAdjust='spacingAndGlyphs'>rotated guide titles and labels</text>
 </g>
 </svg>
diff --git a/tests/testthat/_snaps/guides/vertical-gap-of-1cm-between-guide-title-and-guide.svg b/tests/testthat/_snaps/guides/vertical-gap-of-1cm-between-guide-title-and-guide.svg
index c3a9aeeb4e..9abc788f7d 100644
--- a/tests/testthat/_snaps/guides/vertical-gap-of-1cm-between-guide-title-and-guide.svg
+++ b/tests/testthat/_snaps/guides/vertical-gap-of-1cm-between-guide-title-and-guide.svg
@@ -56,23 +56,23 @@
 <text x='349.23' y='568.24' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>x</text>
 <text transform='translate(13.05,283.95) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>y</text>
 <rect x='674.17' y='162.45' width='34.99' height='124.60' style='stroke-width: 1.07; stroke: none; fill: #FFFFFF;' />
+<text x='674.17' y='171.17' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>y</text>
 <image width='17.28' height='86.40' x='674.17' y='200.65' preserveAspectRatio='none' xlink:href='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAEsCAYAAAACUNnVAAAAmElEQVQ4ja2UQRLDMAgDd3hk/tnX5agcknFaCoa0vnkMCEnGsL12GQhDYDpPwoDrpBFlRDWi/9Wu6AHC9FkLYLrzlhD3oJ3mDvRHRYy7IC8A7bCK8gpWKYDzeQVArDcDyD2YAnSofZvzaOA6Q7Oahp/dmRuVTQ0xU5TGP2o8Waool1obVuv1q8qP9xPvg633XlGLDtfIhNUBcBeA5ss0BXMAAAAASUVORK5CYII='/>
+<polyline points='691.45,286.91 688.00,286.91 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='691.45,265.38 688.00,265.38 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='691.45,243.85 688.00,243.85 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='691.45,222.33 688.00,222.33 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='691.45,200.80 688.00,200.80 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='674.17,286.91 677.63,286.91 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='674.17,265.38 677.63,265.38 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='674.17,243.85 677.63,243.85 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='674.17,222.33 677.63,222.33 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='674.17,200.80 677.63,200.80 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
 <text x='696.93' y='289.94' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>1.0</text>
 <text x='696.93' y='268.41' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>1.5</text>
 <text x='696.93' y='246.88' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>2.0</text>
 <text x='696.93' y='225.35' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>2.5</text>
 <text x='696.93' y='203.83' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>3.0</text>
-<text x='674.17' y='171.17' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>y</text>
-<line x1='674.17' y1='286.91' x2='677.63' y2='286.91' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='674.17' y1='265.38' x2='677.63' y2='265.38' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='674.17' y1='243.85' x2='677.63' y2='243.85' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='674.17' y1='222.33' x2='677.63' y2='222.33' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='674.17' y1='200.80' x2='677.63' y2='200.80' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='688.00' y1='286.91' x2='691.45' y2='286.91' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='688.00' y1='265.38' x2='691.45' y2='265.38' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='688.00' y1='243.85' x2='691.45' y2='243.85' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='688.00' y1='222.33' x2='691.45' y2='222.33' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='688.00' y1='200.80' x2='691.45' y2='200.80' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
 <rect x='674.17' y='315.40' width='40.35' height='90.04' style='stroke-width: 1.07; stroke: none; fill: #FFFFFF;' />
 <text x='674.17' y='324.11' style='font-size: 11.00px; font-family: sans;' textLength='40.35px' lengthAdjust='spacingAndGlyphs'>factor(x)</text>
 <rect x='674.17' y='353.60' width='17.28' height='17.28' style='stroke-width: 1.07; stroke: none; fill: #FFFFFF;' />
diff --git a/tests/testthat/_snaps/guides/white-to-red-colorbar-thick-black-ticks-green-frame.svg b/tests/testthat/_snaps/guides/white-to-red-colorbar-thick-black-ticks-green-frame.svg
index 601ce5379f..8c10cc5ff0 100644
--- a/tests/testthat/_snaps/guides/white-to-red-colorbar-thick-black-ticks-green-frame.svg
+++ b/tests/testthat/_snaps/guides/white-to-red-colorbar-thick-black-ticks-green-frame.svg
@@ -56,24 +56,24 @@
 <text x='351.90' y='568.24' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>x</text>
 <text transform='translate(13.05,283.95) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>x</text>
 <rect x='679.53' y='233.08' width='34.99' height='101.73' style='stroke-width: 1.07; stroke: none; fill: #FFFFFF;' />
+<text x='679.53' y='241.79' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>x</text>
 <image width='17.28' height='86.40' x='679.53' y='248.41' preserveAspectRatio='none' xlink:href='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAEsCAYAAAACUNnVAAAAeUlEQVQ4jcWPSw6AMAhEH2O9/5F1Y2pSARtL4oYA82HggEPsxlWaEM0QmyEkp+uj3WMvFnUTo7vjSRkVOQUEEZDLzBytJ3u/EbrMAHXkYYfzUbxLXyVV1LhMp59UjGhotRrthxhFpim69GVN8OjGR5c4ZKFLYeaEdwL6pgZTBMOKRwAAAABJRU5ErkJggg=='/>
 <rect x='679.53' y='248.41' width='17.28' height='86.40' style='stroke-width: 1.12; stroke: #00FF00;' />
+<polyline points='696.81,334.67 693.35,334.67 ' style='stroke-width: 1.88; stroke-linecap: butt;' />
+<polyline points='696.81,313.14 693.35,313.14 ' style='stroke-width: 1.88; stroke-linecap: butt;' />
+<polyline points='696.81,291.61 693.35,291.61 ' style='stroke-width: 1.88; stroke-linecap: butt;' />
+<polyline points='696.81,270.09 693.35,270.09 ' style='stroke-width: 1.88; stroke-linecap: butt;' />
+<polyline points='696.81,248.56 693.35,248.56 ' style='stroke-width: 1.88; stroke-linecap: butt;' />
+<polyline points='679.53,334.67 682.98,334.67 ' style='stroke-width: 1.88; stroke-linecap: butt;' />
+<polyline points='679.53,313.14 682.98,313.14 ' style='stroke-width: 1.88; stroke-linecap: butt;' />
+<polyline points='679.53,291.61 682.98,291.61 ' style='stroke-width: 1.88; stroke-linecap: butt;' />
+<polyline points='679.53,270.09 682.98,270.09 ' style='stroke-width: 1.88; stroke-linecap: butt;' />
+<polyline points='679.53,248.56 682.98,248.56 ' style='stroke-width: 1.88; stroke-linecap: butt;' />
 <text x='702.29' y='337.70' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>0.0</text>
 <text x='702.29' y='316.17' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>0.5</text>
 <text x='702.29' y='294.64' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>1.0</text>
 <text x='702.29' y='273.11' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>1.5</text>
 <text x='702.29' y='251.59' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>2.0</text>
-<text x='679.53' y='241.79' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>x</text>
-<line x1='679.53' y1='334.67' x2='682.98' y2='334.67' style='stroke-width: 1.88; stroke-linecap: butt;' />
-<line x1='679.53' y1='313.14' x2='682.98' y2='313.14' style='stroke-width: 1.88; stroke-linecap: butt;' />
-<line x1='679.53' y1='291.61' x2='682.98' y2='291.61' style='stroke-width: 1.88; stroke-linecap: butt;' />
-<line x1='679.53' y1='270.09' x2='682.98' y2='270.09' style='stroke-width: 1.88; stroke-linecap: butt;' />
-<line x1='679.53' y1='248.56' x2='682.98' y2='248.56' style='stroke-width: 1.88; stroke-linecap: butt;' />
-<line x1='693.35' y1='334.67' x2='696.81' y2='334.67' style='stroke-width: 1.88; stroke-linecap: butt;' />
-<line x1='693.35' y1='313.14' x2='696.81' y2='313.14' style='stroke-width: 1.88; stroke-linecap: butt;' />
-<line x1='693.35' y1='291.61' x2='696.81' y2='291.61' style='stroke-width: 1.88; stroke-linecap: butt;' />
-<line x1='693.35' y1='270.09' x2='696.81' y2='270.09' style='stroke-width: 1.88; stroke-linecap: butt;' />
-<line x1='693.35' y1='248.56' x2='696.81' y2='248.56' style='stroke-width: 1.88; stroke-linecap: butt;' />
 <text x='35.24' y='14.56' style='font-size: 13.20px; font-family: sans;' textLength='298.62px' lengthAdjust='spacingAndGlyphs'>white-to-red colorbar, thick black ticks, green frame</text>
 </g>
 </svg>
diff --git a/tests/testthat/_snaps/guides/white-to-red-colorbar-white-ticks-no-frame.svg b/tests/testthat/_snaps/guides/white-to-red-colorbar-white-ticks-no-frame.svg
index 94d8822b7e..16b1604f52 100644
--- a/tests/testthat/_snaps/guides/white-to-red-colorbar-white-ticks-no-frame.svg
+++ b/tests/testthat/_snaps/guides/white-to-red-colorbar-white-ticks-no-frame.svg
@@ -56,23 +56,23 @@
 <text x='351.90' y='568.24' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>x</text>
 <text transform='translate(13.05,283.95) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>x</text>
 <rect x='679.53' y='233.08' width='34.99' height='101.73' style='stroke-width: 1.07; stroke: none; fill: #FFFFFF;' />
+<text x='679.53' y='241.79' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>x</text>
 <image width='17.28' height='86.40' x='679.53' y='248.41' preserveAspectRatio='none' xlink:href='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAEsCAYAAAACUNnVAAAAeUlEQVQ4jcWPSw6AMAhEH2O9/5F1Y2pSARtL4oYA82HggEPsxlWaEM0QmyEkp+uj3WMvFnUTo7vjSRkVOQUEEZDLzBytJ3u/EbrMAHXkYYfzUbxLXyVV1LhMp59UjGhotRrthxhFpim69GVN8OjGR5c4ZKFLYeaEdwL6pgZTBMOKRwAAAABJRU5ErkJggg=='/>
+<polyline points='696.81,334.67 693.35,334.67 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='696.81,313.14 693.35,313.14 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='696.81,291.61 693.35,291.61 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='696.81,270.09 693.35,270.09 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='696.81,248.56 693.35,248.56 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='679.53,334.67 682.98,334.67 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='679.53,313.14 682.98,313.14 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='679.53,291.61 682.98,291.61 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='679.53,270.09 682.98,270.09 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
+<polyline points='679.53,248.56 682.98,248.56 ' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
 <text x='702.29' y='337.70' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>0.0</text>
 <text x='702.29' y='316.17' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>0.5</text>
 <text x='702.29' y='294.64' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>1.0</text>
 <text x='702.29' y='273.11' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>1.5</text>
 <text x='702.29' y='251.59' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>2.0</text>
-<text x='679.53' y='241.79' style='font-size: 11.00px; font-family: sans;' textLength='5.50px' lengthAdjust='spacingAndGlyphs'>x</text>
-<line x1='679.53' y1='334.67' x2='682.98' y2='334.67' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='679.53' y1='313.14' x2='682.98' y2='313.14' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='679.53' y1='291.61' x2='682.98' y2='291.61' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='679.53' y1='270.09' x2='682.98' y2='270.09' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='679.53' y1='248.56' x2='682.98' y2='248.56' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='693.35' y1='334.67' x2='696.81' y2='334.67' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='693.35' y1='313.14' x2='696.81' y2='313.14' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='693.35' y1='291.61' x2='696.81' y2='291.61' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='693.35' y1='270.09' x2='696.81' y2='270.09' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
-<line x1='693.35' y1='248.56' x2='696.81' y2='248.56' style='stroke-width: 0.38; stroke: #FFFFFF; stroke-linecap: butt;' />
 <text x='35.24' y='14.56' style='font-size: 13.20px; font-family: sans;' textLength='248.72px' lengthAdjust='spacingAndGlyphs'>white-to-red colorbar, white ticks, no frame</text>
 </g>
 </svg>
diff --git a/tests/testthat/_snaps/sec-axis/sec-axis-custom-transform.svg b/tests/testthat/_snaps/sec-axis/sec-axis-custom-transform.svg
index 7198e3f244..e94f6ea95e 100644
--- a/tests/testthat/_snaps/sec-axis/sec-axis-custom-transform.svg
+++ b/tests/testthat/_snaps/sec-axis/sec-axis-custom-transform.svg
@@ -75,15 +75,15 @@
 <polyline points='42.29,159.94 45.03,159.94 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
 <polyline points='42.29,103.23 45.03,103.23 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
 <polyline points='42.29,46.53 45.03,46.53 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
-<polyline points='687.57,500.03 690.31,500.03 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
-<polyline points='687.57,429.15 690.31,429.15 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
-<polyline points='687.57,358.27 690.31,358.27 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
-<polyline points='687.57,330.06 690.31,330.06 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
-<polyline points='687.57,273.35 690.31,273.35 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
-<polyline points='687.57,216.65 690.31,216.65 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
-<polyline points='687.57,159.94 690.31,159.94 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
-<polyline points='687.57,103.23 690.31,103.23 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
-<polyline points='687.57,46.53 690.31,46.53 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
+<polyline points='690.31,500.03 687.57,500.03 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
+<polyline points='690.31,429.15 687.57,429.15 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
+<polyline points='690.31,358.27 687.57,358.27 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
+<polyline points='690.31,330.06 687.57,330.06 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
+<polyline points='690.31,273.35 687.57,273.35 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
+<polyline points='690.31,216.65 687.57,216.65 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
+<polyline points='690.31,159.94 687.57,159.94 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
+<polyline points='690.31,103.23 687.57,103.23 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
+<polyline points='690.31,46.53 687.57,46.53 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
 <text x='692.50' y='503.06' style='font-size: 8.80px; font-family: sans;' textLength='22.02px' lengthAdjust='spacingAndGlyphs'>0.001</text>
 <text x='692.50' y='432.18' style='font-size: 8.80px; font-family: sans;' textLength='22.02px' lengthAdjust='spacingAndGlyphs'>0.010</text>
 <text x='692.50' y='361.29' style='font-size: 8.80px; font-family: sans;' textLength='22.02px' lengthAdjust='spacingAndGlyphs'>0.100</text>
diff --git a/tests/testthat/_snaps/sec-axis/sec-axis-datetime-scale.svg b/tests/testthat/_snaps/sec-axis/sec-axis-datetime-scale.svg
index 481dde58fc..fb76b1ef79 100644
--- a/tests/testthat/_snaps/sec-axis/sec-axis-datetime-scale.svg
+++ b/tests/testthat/_snaps/sec-axis/sec-axis-datetime-scale.svg
@@ -67,6 +67,19 @@
 <rect x='38.17' y='48.19' width='676.35' height='496.92' style='stroke-width: 1.07;' />
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+<polyline points='68.91,45.45 68.91,48.19 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
+<polyline points='120.15,45.45 120.15,48.19 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
+<polyline points='171.39,45.45 171.39,48.19 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
+<polyline points='222.63,45.45 222.63,48.19 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
+<polyline points='273.87,45.45 273.87,48.19 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
+<polyline points='325.11,45.45 325.11,48.19 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
+<polyline points='376.34,45.45 376.34,48.19 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
+<polyline points='427.58,45.45 427.58,48.19 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
+<polyline points='478.82,45.45 478.82,48.19 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
+<polyline points='530.06,45.45 530.06,48.19 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
+<polyline points='581.30,45.45 581.30,48.19 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
+<polyline points='632.54,45.45 632.54,48.19 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
+<polyline points='683.78,45.45 683.78,48.19 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
 <text x='68.91' y='43.26' text-anchor='middle' style='font-size: 8.80px; font-family: sans;' textLength='22.99px' lengthAdjust='spacingAndGlyphs'>04PM</text>
 <text x='120.15' y='43.26' text-anchor='middle' style='font-size: 8.80px; font-family: sans;' textLength='22.99px' lengthAdjust='spacingAndGlyphs'>06PM</text>
 <text x='171.39' y='43.26' text-anchor='middle' style='font-size: 8.80px; font-family: sans;' textLength='22.99px' lengthAdjust='spacingAndGlyphs'>08PM</text>
@@ -80,19 +93,6 @@
 <text x='581.30' y='43.26' text-anchor='middle' style='font-size: 8.80px; font-family: sans;' textLength='22.99px' lengthAdjust='spacingAndGlyphs'>12PM</text>
 <text x='632.54' y='43.26' text-anchor='middle' style='font-size: 8.80px; font-family: sans;' textLength='22.99px' lengthAdjust='spacingAndGlyphs'>02PM</text>
 <text x='683.78' y='43.26' text-anchor='middle' style='font-size: 8.80px; font-family: sans;' textLength='22.99px' lengthAdjust='spacingAndGlyphs'>04PM</text>
-<polyline points='68.91,48.19 68.91,45.45 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
-<polyline points='120.15,48.19 120.15,45.45 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
-<polyline points='171.39,48.19 171.39,45.45 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
-<polyline points='222.63,48.19 222.63,45.45 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
-<polyline points='273.87,48.19 273.87,45.45 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
-<polyline points='325.11,48.19 325.11,45.45 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
-<polyline points='376.34,48.19 376.34,45.45 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
-<polyline points='427.58,48.19 427.58,45.45 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
-<polyline points='478.82,48.19 478.82,45.45 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
-<polyline points='530.06,48.19 530.06,45.45 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
-<polyline points='581.30,48.19 581.30,45.45 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
-<polyline points='632.54,48.19 632.54,45.45 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
-<polyline points='683.78,48.19 683.78,45.45 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
 <text x='33.24' y='525.55' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='15.16px' lengthAdjust='spacingAndGlyphs'>-1.0</text>
 <text x='33.24' y='412.62' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='15.16px' lengthAdjust='spacingAndGlyphs'>-0.5</text>
 <text x='33.24' y='299.68' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>0.0</text>
diff --git a/tests/testthat/_snaps/sec-axis/sec-axis-independent-transformations.svg b/tests/testthat/_snaps/sec-axis/sec-axis-independent-transformations.svg
index 6cbf536afe..cbfaa55e5b 100644
--- a/tests/testthat/_snaps/sec-axis/sec-axis-independent-transformations.svg
+++ b/tests/testthat/_snaps/sec-axis/sec-axis-independent-transformations.svg
@@ -51,16 +51,16 @@
 <rect x='35.24' y='48.19' width='679.28' height='496.92' style='stroke-width: 1.07;' />
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+<polyline points='252.23,45.45 252.23,48.19 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
+<polyline points='474.53,45.45 474.53,48.19 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
+<polyline points='585.46,45.45 585.46,48.19 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
+<polyline points='658.10,45.45 658.10,48.19 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
+<polyline points='711.58,45.45 711.58,48.19 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
 <text x='252.23' y='43.26' text-anchor='middle' style='font-size: 8.80px; font-family: sans;' textLength='4.89px' lengthAdjust='spacingAndGlyphs'>5</text>
 <text x='474.53' y='43.26' text-anchor='middle' style='font-size: 8.80px; font-family: sans;' textLength='9.79px' lengthAdjust='spacingAndGlyphs'>10</text>
 <text x='585.46' y='43.26' text-anchor='middle' style='font-size: 8.80px; font-family: sans;' textLength='9.79px' lengthAdjust='spacingAndGlyphs'>15</text>
 <text x='658.10' y='43.26' text-anchor='middle' style='font-size: 8.80px; font-family: sans;' textLength='9.79px' lengthAdjust='spacingAndGlyphs'>20</text>
 <text x='711.58' y='43.26' text-anchor='middle' style='font-size: 8.80px; font-family: sans;' textLength='9.79px' lengthAdjust='spacingAndGlyphs'>25</text>
-<polyline points='252.23,48.19 252.23,45.45 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
-<polyline points='474.53,48.19 474.53,45.45 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
-<polyline points='585.46,48.19 585.46,45.45 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
-<polyline points='658.10,48.19 658.10,45.45 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
-<polyline points='711.58,48.19 711.58,45.45 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
 <text x='30.31' y='498.17' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>0.2</text>
 <text x='30.31' y='361.28' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>0.3</text>
 <text x='30.31' y='224.39' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>0.4</text>
diff --git a/tests/testthat/_snaps/sec-axis/sec-axis-monotonicity-test.svg b/tests/testthat/_snaps/sec-axis/sec-axis-monotonicity-test.svg
index 931b3cb820..98c4304d47 100644
--- a/tests/testthat/_snaps/sec-axis/sec-axis-monotonicity-test.svg
+++ b/tests/testthat/_snaps/sec-axis/sec-axis-monotonicity-test.svg
@@ -59,10 +59,10 @@
 <polyline points='25.16,185.60 27.90,185.60 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
 <polyline points='25.16,110.14 27.90,110.14 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
 <polyline points='25.16,46.53 27.90,46.53 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
-<polyline points='692.10,283.95 694.84,283.95 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
-<polyline points='692.10,185.60 694.84,185.60 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
-<polyline points='692.10,110.14 694.84,110.14 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
-<polyline points='692.10,46.53 694.84,46.53 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
+<polyline points='694.84,283.95 692.10,283.95 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
+<polyline points='694.84,185.60 692.10,185.60 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
+<polyline points='694.84,110.14 692.10,110.14 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
+<polyline points='694.84,46.53 692.10,46.53 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
 <text x='697.03' y='286.98' style='font-size: 8.80px; font-family: sans;' textLength='4.89px' lengthAdjust='spacingAndGlyphs'>1</text>
 <text x='697.03' y='188.63' style='font-size: 8.80px; font-family: sans;' textLength='4.89px' lengthAdjust='spacingAndGlyphs'>2</text>
 <text x='697.03' y='113.17' style='font-size: 8.80px; font-family: sans;' textLength='4.89px' lengthAdjust='spacingAndGlyphs'>3</text>
diff --git a/tests/testthat/_snaps/sec-axis/sec-axis-sec-power-transform.svg b/tests/testthat/_snaps/sec-axis/sec-axis-sec-power-transform.svg
index 5d751307cb..0a5ed00224 100644
--- a/tests/testthat/_snaps/sec-axis/sec-axis-sec-power-transform.svg
+++ b/tests/testthat/_snaps/sec-axis/sec-axis-sec-power-transform.svg
@@ -57,18 +57,18 @@
 <rect x='45.03' y='35.60' width='669.49' height='509.51' style='stroke-width: 1.07;' />
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+<polyline points='45.86,32.86 45.86,35.60 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
+<polyline points='75.46,32.86 75.46,35.60 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
+<polyline points='128.09,32.86 128.09,35.60 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
+<polyline points='221.68,32.86 221.68,35.60 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
+<polyline points='388.12,32.86 388.12,35.60 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
+<polyline points='684.09,32.86 684.09,35.60 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
 <text x='45.86' y='30.67' text-anchor='middle' style='font-size: 8.80px; font-family: sans;' textLength='20.06px' lengthAdjust='spacingAndGlyphs'>-0.25</text>
 <text x='75.46' y='30.67' text-anchor='middle' style='font-size: 8.80px; font-family: sans;' textLength='17.13px' lengthAdjust='spacingAndGlyphs'>0.00</text>
 <text x='128.09' y='30.67' text-anchor='middle' style='font-size: 8.80px; font-family: sans;' textLength='17.13px' lengthAdjust='spacingAndGlyphs'>0.25</text>
 <text x='221.68' y='30.67' text-anchor='middle' style='font-size: 8.80px; font-family: sans;' textLength='17.13px' lengthAdjust='spacingAndGlyphs'>0.50</text>
 <text x='388.12' y='30.67' text-anchor='middle' style='font-size: 8.80px; font-family: sans;' textLength='17.13px' lengthAdjust='spacingAndGlyphs'>0.75</text>
 <text x='684.09' y='30.67' text-anchor='middle' style='font-size: 8.80px; font-family: sans;' textLength='17.13px' lengthAdjust='spacingAndGlyphs'>1.00</text>
-<polyline points='45.86,35.60 45.86,32.86 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
-<polyline points='75.46,35.60 75.46,32.86 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
-<polyline points='128.09,35.60 128.09,32.86 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
-<polyline points='221.68,35.60 221.68,32.86 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
-<polyline points='388.12,35.60 388.12,32.86 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
-<polyline points='684.09,35.60 684.09,32.86 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
 <text x='40.10' y='548.14' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='22.02px' lengthAdjust='spacingAndGlyphs'>4.950</text>
 <text x='40.10' y='420.76' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='22.02px' lengthAdjust='spacingAndGlyphs'>4.975</text>
 <text x='40.10' y='293.38' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='22.02px' lengthAdjust='spacingAndGlyphs'>5.000</text>
diff --git a/tests/testthat/_snaps/sec-axis/sec-axis-skewed-transform.svg b/tests/testthat/_snaps/sec-axis/sec-axis-skewed-transform.svg
index f22e062f17..57ca1033e4 100644
--- a/tests/testthat/_snaps/sec-axis/sec-axis-skewed-transform.svg
+++ b/tests/testthat/_snaps/sec-axis/sec-axis-skewed-transform.svg
@@ -152,16 +152,16 @@
 <rect x='40.13' y='48.19' width='674.39' height='496.92' style='stroke-width: 1.07;' />
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+<polyline points='70.79,45.45 70.79,48.19 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
+<polyline points='172.97,45.45 172.97,48.19 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
+<polyline points='275.15,45.45 275.15,48.19 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
+<polyline points='377.33,45.45 377.33,48.19 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
+<polyline points='479.51,45.45 479.51,48.19 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
 <text x='70.79' y='43.26' text-anchor='middle' style='font-size: 8.80px; font-family: sans;' textLength='22.51px' lengthAdjust='spacingAndGlyphs'>1e-01</text>
 <text x='172.97' y='43.26' text-anchor='middle' style='font-size: 8.80px; font-family: sans;' textLength='24.72px' lengthAdjust='spacingAndGlyphs'>1e+00</text>
 <text x='275.15' y='43.26' text-anchor='middle' style='font-size: 8.80px; font-family: sans;' textLength='24.72px' lengthAdjust='spacingAndGlyphs'>1e+01</text>
 <text x='377.33' y='43.26' text-anchor='middle' style='font-size: 8.80px; font-family: sans;' textLength='24.72px' lengthAdjust='spacingAndGlyphs'>1e+02</text>
 <text x='479.51' y='43.26' text-anchor='middle' style='font-size: 8.80px; font-family: sans;' textLength='24.72px' lengthAdjust='spacingAndGlyphs'>1e+03</text>
-<polyline points='70.79,48.19 70.79,45.45 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
-<polyline points='172.97,48.19 172.97,45.45 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
-<polyline points='275.15,48.19 275.15,45.45 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
-<polyline points='377.33,48.19 377.33,45.45 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
-<polyline points='479.51,48.19 479.51,45.45 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
 <text x='35.20' y='526.01' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='17.13px' lengthAdjust='spacingAndGlyphs'>0.00</text>
 <text x='35.20' y='412.84' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='17.13px' lengthAdjust='spacingAndGlyphs'>0.25</text>
 <text x='35.20' y='299.68' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='17.13px' lengthAdjust='spacingAndGlyphs'>0.50</text>
diff --git a/tests/testthat/_snaps/sec-axis/sec-axis-with-division.svg b/tests/testthat/_snaps/sec-axis/sec-axis-with-division.svg
index 3fc8711769..e3105aa3cd 100644
--- a/tests/testthat/_snaps/sec-axis/sec-axis-with-division.svg
+++ b/tests/testthat/_snaps/sec-axis/sec-axis-with-division.svg
@@ -289,9 +289,9 @@
 <polyline points='30.05,402.66 32.79,402.66 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
 <polyline points='30.05,254.27 32.79,254.27 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
 <polyline points='30.05,105.88 32.79,105.88 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
-<polyline points='687.21,350.72 689.95,350.72 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
-<polyline points='687.21,466.96 689.95,466.96 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
-<polyline points='687.21,525.08 689.95,525.08 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
+<polyline points='689.95,350.72 687.21,350.72 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
+<polyline points='689.95,466.96 687.21,466.96 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
+<polyline points='689.95,525.08 687.21,525.08 ' style='stroke-width: 0.53; stroke-linecap: butt;' />
 <text x='692.14' y='353.75' style='font-size: 8.80px; font-family: sans;' textLength='9.79px' lengthAdjust='spacingAndGlyphs'>10</text>
 <text x='692.14' y='469.99' style='font-size: 8.80px; font-family: sans;' textLength='9.79px' lengthAdjust='spacingAndGlyphs'>15</text>
 <text x='692.14' y='528.11' style='font-size: 8.80px; font-family: sans;' textLength='9.79px' lengthAdjust='spacingAndGlyphs'>20</text>
diff --git a/tests/testthat/_snaps/theme/axes-styling.svg b/tests/testthat/_snaps/theme/axes-styling.svg
index 12c4dfa9c8..35e016656f 100644
--- a/tests/testthat/_snaps/theme/axes-styling.svg
+++ b/tests/testthat/_snaps/theme/axes-styling.svg
@@ -56,14 +56,14 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 <polyline points='40.13,48.19 679.87,48.19 ' style='stroke-width: 1.07; stroke: #FF0000; stroke-linecap: butt;' />
+<polyline points='166.14,45.45 166.14,48.19 ' style='stroke-width: 1.07; stroke: #FF0000; stroke-linecap: butt;' />
+<polyline points='327.69,45.45 327.69,48.19 ' style='stroke-width: 1.07; stroke: #FF0000; stroke-linecap: butt;' />
+<polyline points='489.24,45.45 489.24,48.19 ' style='stroke-width: 1.07; stroke: #FF0000; stroke-linecap: butt;' />
+<polyline points='650.79,45.45 650.79,48.19 ' style='stroke-width: 1.07; stroke: #FF0000; stroke-linecap: butt;' />
 <text x='166.14' y='43.26' text-anchor='middle' style='font-size: 8.80px; fill: #FF0000; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>2.5</text>
 <text x='327.69' y='43.26' text-anchor='middle' style='font-size: 8.80px; fill: #FF0000; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>5.0</text>
 <text x='489.24' y='43.26' text-anchor='middle' style='font-size: 8.80px; fill: #FF0000; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>7.5</text>
 <text x='650.79' y='43.26' text-anchor='middle' style='font-size: 8.80px; fill: #FF0000; font-family: sans;' textLength='17.13px' lengthAdjust='spacingAndGlyphs'>10.0</text>
-<polyline points='166.14,48.19 166.14,45.45 ' style='stroke-width: 1.07; stroke: #FF0000; stroke-linecap: butt;' />
-<polyline points='327.69,48.19 327.69,45.45 ' style='stroke-width: 1.07; stroke: #FF0000; stroke-linecap: butt;' />
-<polyline points='489.24,48.19 489.24,45.45 ' style='stroke-width: 1.07; stroke: #FF0000; stroke-linecap: butt;' />
-<polyline points='650.79,48.19 650.79,45.45 ' style='stroke-width: 1.07; stroke: #FF0000; stroke-linecap: butt;' />
 <polyline points='40.13,545.11 40.13,48.19 ' style='stroke-width: 1.07; stroke: #0000FF; stroke-linecap: butt;' />
 <text x='35.20' y='450.26' text-anchor='end' style='font-size: 8.80px; fill: #0000FF; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>2.5</text>
 <text x='35.20' y='324.78' text-anchor='end' style='font-size: 8.80px; fill: #0000FF; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>5.0</text>
@@ -74,10 +74,10 @@
 <polyline points='37.39,196.26 40.13,196.26 ' style='stroke-width: 1.07; stroke: #0000FF; stroke-linecap: butt;' />
 <polyline points='37.39,70.78 40.13,70.78 ' style='stroke-width: 1.07; stroke: #0000FF; stroke-linecap: butt;' />
 <polyline points='679.87,545.11 679.87,48.19 ' style='stroke-width: 1.07; stroke: #FFFF00; stroke-linecap: butt;' />
-<polyline points='679.87,447.23 682.61,447.23 ' style='stroke-width: 1.07; stroke: #FFFF00; stroke-linecap: butt;' />
-<polyline points='679.87,321.75 682.61,321.75 ' style='stroke-width: 1.07; stroke: #FFFF00; stroke-linecap: butt;' />
-<polyline points='679.87,196.26 682.61,196.26 ' style='stroke-width: 1.07; stroke: #FFFF00; stroke-linecap: butt;' />
-<polyline points='679.87,70.78 682.61,70.78 ' style='stroke-width: 1.07; stroke: #FFFF00; stroke-linecap: butt;' />
+<polyline points='682.61,447.23 679.87,447.23 ' style='stroke-width: 1.07; stroke: #FFFF00; stroke-linecap: butt;' />
+<polyline points='682.61,321.75 679.87,321.75 ' style='stroke-width: 1.07; stroke: #FFFF00; stroke-linecap: butt;' />
+<polyline points='682.61,196.26 679.87,196.26 ' style='stroke-width: 1.07; stroke: #FFFF00; stroke-linecap: butt;' />
+<polyline points='682.61,70.78 679.87,70.78 ' style='stroke-width: 1.07; stroke: #FFFF00; stroke-linecap: butt;' />
 <text x='684.80' y='450.26' style='font-size: 8.80px; fill: #FFFF00; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>2.5</text>
 <text x='684.80' y='324.78' style='font-size: 8.80px; fill: #FFFF00; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>5.0</text>
 <text x='684.80' y='199.29' style='font-size: 8.80px; fill: #FFFF00; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>7.5</text>
diff --git a/tests/testthat/_snaps/theme/ticks-length.svg b/tests/testthat/_snaps/theme/ticks-length.svg
index b11bd1f602..898b83062b 100644
--- a/tests/testthat/_snaps/theme/ticks-length.svg
+++ b/tests/testthat/_snaps/theme/ticks-length.svg
@@ -40,14 +40,14 @@
 <rect x='44.48' y='50.35' width='623.95' height='492.61' style='stroke-width: 1.07; stroke: #333333;' />
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+<polyline points='167.38,64.52 167.38,50.35 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='324.94,64.52 324.94,50.35 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='482.51,64.52 482.51,50.35 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='640.07,64.52 640.07,50.35 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <text x='167.38' y='43.26' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>2.5</text>
 <text x='324.94' y='43.26' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>5.0</text>
 <text x='482.51' y='43.26' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>7.5</text>
 <text x='640.07' y='43.26' text-anchor='middle' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='17.13px' lengthAdjust='spacingAndGlyphs'>10.0</text>
-<polyline points='167.38,50.35 167.38,64.52 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='324.94,50.35 324.94,64.52 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='482.51,50.35 482.51,64.52 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='640.07,50.35 640.07,64.52 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <text x='35.20' y='448.96' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>2.5</text>
 <text x='35.20' y='324.56' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>5.0</text>
 <text x='35.20' y='200.16' text-anchor='end' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>7.5</text>
@@ -56,10 +56,10 @@
 <polyline points='37.39,321.53 44.48,321.53 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='37.39,197.13 44.48,197.13 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <polyline points='37.39,72.74 44.48,72.74 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='668.43,445.93 682.61,445.93 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='668.43,321.53 682.61,321.53 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='668.43,197.13 682.61,197.13 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
-<polyline points='668.43,72.74 682.61,72.74 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='682.61,445.93 668.43,445.93 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='682.61,321.53 668.43,321.53 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='682.61,197.13 668.43,197.13 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
+<polyline points='682.61,72.74 668.43,72.74 ' style='stroke-width: 1.07; stroke: #333333; stroke-linecap: butt;' />
 <text x='684.80' y='448.96' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>2.5</text>
 <text x='684.80' y='324.56' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>5.0</text>
 <text x='684.80' y='200.16' style='font-size: 8.80px; fill: #4D4D4D; font-family: sans;' textLength='12.23px' lengthAdjust='spacingAndGlyphs'>7.5</text>

From d238d5704eb1a92ccfea12b4f8f7dd15ccc4f55c Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Sun, 13 Nov 2022 11:16:28 +0100
Subject: [PATCH 068/111] Don't map continuous scales

---
 R/scale-view.r | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/R/scale-view.r b/R/scale-view.r
index 0530df5c3a..7f96700416 100644
--- a/R/scale-view.r
+++ b/R/scale-view.r
@@ -136,7 +136,7 @@ ViewScale <- ggproto("ViewScale", NULL,
     if (self$is_discrete()) {
       self$scale$map(x, self$limits)
     } else {
-      self$scale$map(x, self$continuous_range)
+      x
     }
   },
   make_title = function(self, title) {

From 772093f731cbcb879cc037d95db0ba760a3dcfbe Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Sun, 13 Nov 2022 11:16:55 +0100
Subject: [PATCH 069/111] Pre-populate GuideNone where possible

---
 R/guides-.r | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/R/guides-.r b/R/guides-.r
index 2bf1565bd5..1f4e93a8e1 100644
--- a/R/guides-.r
+++ b/R/guides-.r
@@ -243,8 +243,8 @@ include_layer_in_guide <- function(layer, matched) {
 # Class -------------------------------------------------------------------
 
 # Guides object encapsulates multiple guides and their state.
-guides_list <- function(guides) {
-  ggproto(NULL, Guides, guides = guides)
+guides_list <- function(guides, .missing = guide_none()) {
+  ggproto(NULL, Guides, guides = guides, missing = .missing)
 }
 
 Guides <- ggproto(
@@ -253,6 +253,9 @@ Guides <- ggproto(
   # A list of guides to be updated by 'add' or populated upon construction.
   guides = list(),
 
+  # How to treat missing guides
+  missing = NULL,
+
   # An index parallel to `guides` for matching guides with scales
   # Currently not used, but should be useful for non-position training etc.
   scale_index = integer(),
@@ -277,7 +280,7 @@ Guides <- ggproto(
 
     # Set empty parameter guides to `guide_none`. Don't overwrite parameters,
     # because things like 'position' are relevant.
-    self$guides[is_empty] <- list(guide_none())
+    self$guides[is_empty] <- list(self$missing)
     return(NULL)
   },
 
@@ -326,7 +329,9 @@ Guides <- ggproto(
   # Setup routine for resolving and validating guides based on paired scales.
   setup = function(
     self, scales, aesthetics = NULL,
-    default = "none", keep_none = TRUE
+    default = guide_none(),
+    missing = guide_none(),
+    keep_none = TRUE
   ) {
 
     if (is.null(aesthetics)) {
@@ -353,7 +358,7 @@ Guides <- ggproto(
         scale     = scales[[idx]],
         guides    = guides,
         default   = default,
-        null      = guide_none()
+        null      = missing
       )
 
       if (isFALSE(guide)) {
@@ -385,7 +390,7 @@ Guides <- ggproto(
                  "{.or {.field {head(scales[[idx]]$aesthetics, 4)}}}."),
           i = "Use {?one of} {.or {.field {warn_aes}}} instead."
         ))
-        guide <- guide_none()
+        guide <- missing
       }
 
       guide

From 2cce9df38c585121c6d0c646e89eeffbba783c17 Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Sun, 13 Nov 2022 11:17:31 +0100
Subject: [PATCH 070/111] Speedup axis guide training

---
 R/coord-.r | 42 +++++++++++++++++++++++++++++-------------
 R/guide-.r |  7 +++----
 2 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/R/coord-.r b/R/coord-.r
index 34393f6627..3944ec6798 100644
--- a/R/coord-.r
+++ b/R/coord-.r
@@ -100,11 +100,18 @@ Coord <- ggproto("Coord",
 
     # TODO: This should ideally happen in the `guides()` function or earlier.
     if (!inherits(guides, "Guides")) {
-      guides <- guides_list(guides)
+      guides <- guides_list(
+        guides,
+        .missing = params$guide_missing %||% guide_none()
+      )
     }
 
     # Do guide setup
-    guides <- guides$setup(panel_params, aesthetics, default = guide_axis())
+    guides <- guides$setup(
+      panel_params, aesthetics,
+      default = params$guide_default %||% guide_axis(),
+      missing = params$guide_missing %||% guide_none()
+    )
     guide_params <- guides$get_params(aesthetics)
 
     # Resolve positions
@@ -140,16 +147,22 @@ Coord <- ggproto("Coord",
     # If the panel_params doesn't contain the scale, there's no guide for the aesthetic
     aesthetics <- intersect(aesthetics, names(panel_params$guides$aesthetics))
 
-    guide_params <- lapply(aesthetics, function(aesthetic) {
-
-      guide  <- panel_params$guides$get_guide(aesthetic)
-      params <- panel_params$guides$get_params(aesthetic)
-
-      params <- guide$train(params, panel_params[[aesthetic]])
-      params <- guide$transform(params, self, panel_params)
-      params <- guide$geom(params, layers, default_mapping)
-      params
-    })
+    guides <- panel_params$guides$get_guide(aesthetics)
+    empty  <- vapply(guides, inherits, logical(1), "GuideNone")
+    guide_params <- panel_params$guides$get_params(aesthetics)
+    aesthetics <- aesthetics[!empty]
+
+    guide_params[!empty] <- Map(
+      function(guide, guide_param, scale) {
+        guide_param <- guide$train(guide_param, scale)
+        guide_param <- guide$transform(guide_param, self, panel_params)
+        guide_param <- guide$geom(guide_param, layers, default_mapping)
+        guide_param
+      },
+      guide = guides[!empty],
+      guide_param = guide_params[!empty],
+      scale = panel_params[aesthetics]
+    )
 
     panel_params$guides$update_params(guide_params)
 
@@ -167,7 +180,10 @@ Coord <- ggproto("Coord",
   is_free = function() FALSE,
 
   setup_params = function(data) {
-    list()
+    list(
+      guide_default = guide_axis(),
+      guide_missing = guide_none()
+    )
   },
 
   setup_data = function(data, params = list()) {
diff --git a/R/guide-.r b/R/guide-.r
index 2d6b7be385..1184684b8d 100644
--- a/R/guide-.r
+++ b/R/guide-.r
@@ -124,8 +124,7 @@ Guide <- ggproto(
   # TODO: Maybe we only need the hash on demand during merging?
   extract_params = function(scale, params, hashables, ...) {
     # Make hash
-    mask <- new_data_mask(as_environment(params))
-    params$hash <- hash(lapply(unname(hashables), eval_tidy, data = mask))
+    params$hash <- hash(lapply(unname(hashables), eval_tidy, data = params))
     params
   },
 
@@ -143,8 +142,8 @@ Guide <- ggproto(
     key$.value <- breaks
     key$.label <- labels
 
-    if (is.numeric(key$.value)) {
-      key[is.finite(key$.value), , drop = FALSE]
+    if (is.numeric(breaks)) {
+      key[is.finite(breaks), , drop = FALSE]
     } else {
       key
     }

From 575dd9440eaa0e8bd9ca36e7e911e5de5977190a Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Sun, 13 Nov 2022 12:25:48 +0100
Subject: [PATCH 071/111] Don't glue theme elements

---
 R/guide-.r     |  2 --
 R/guide-axis.r | 20 ++++++++++++++++----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/R/guide-.r b/R/guide-.r
index 1184684b8d..1b28343a69 100644
--- a/R/guide-.r
+++ b/R/guide-.r
@@ -191,8 +191,6 @@ Guide <- ggproto(
   # `element_grob()`. String-interpolates aesthetic/position dependent elements.
   setup_elements = function(params, elements, theme) {
     is_char  <- vapply(elements, is.character, logical(1))
-    elements[is_char] <- lapply(elements[is_char], glue,
-                                .envir = params[c("aes", "position")])
     elements[is_char] <- lapply(elements[is_char], calc_element, theme = theme)
     elements
   },
diff --git a/R/guide-axis.r b/R/guide-axis.r
index 67972d7c3e..aec82328ca 100644
--- a/R/guide-axis.r
+++ b/R/guide-axis.r
@@ -81,10 +81,10 @@ GuideAxis <- ggproto(
   hashables = exprs(title, key$.value, key$.label, name),
 
   elements = list(
-    line  = "axis.line.{aes}.{position}",
-    text  = "axis.text.{aes}.{position}",
-    ticks = "axis.ticks.{aes}.{position}",
-    ticks_length = "axis.ticks.length.{aes}.{position}"
+    line  = "axis.line",
+    text  = "axis.text",
+    ticks = "axis.ticks",
+    ticks_length = "axis.ticks.length"
   ),
 
   extract_params = function(scale, params, hashables, ...) {
@@ -147,6 +147,18 @@ GuideAxis <- ggproto(
     return(list(guide = self, params = params))
   },
 
+  setup_elements = function(params, elements, theme) {
+    axis_elem <- c("line", "text", "ticks", "ticks_length")
+    is_char  <- vapply(elements[axis_elem], is.character, logical(1))
+    axis_elem <- axis_elem[is_char]
+    elements[axis_elem] <- paste(
+      unlist(elements[axis_elem]),
+      params$aes, params$position, sep = "."
+    )
+    elements[is_char] <- lapply(elements[is_char], calc_element, theme = theme)
+    elements
+  },
+
   override_elements = function(params, elements, theme) {
     label <- elements$text
     if (!inherits(label, "element_text")) {

From b7adfbe79775d0be6e930709a754959681be8fc8 Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Mon, 14 Nov 2022 21:32:33 +0100
Subject: [PATCH 072/111] Add NEWS bullet

---
 NEWS.md | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/NEWS.md b/NEWS.md
index 582d9f2794..c68f89aabc 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,5 +1,25 @@
 # ggplot2 (development version)
 
+* The guide system, as the last remaining chunk of ggplot2, has been rewritten 
+  in ggproto. The axes and legends now inherit from a <Guide> class, which makes
+  them extensible in the same manner as geoms, stats, facets and coords 
+  (#3329, @teunbrand). In addition, the following changes were made:
+    * Styling theme parts of the guide now inherit from the plot's theme 
+      (#2728). 
+    * Styling non-theme parts of the guides accept <element> objects, so that
+      the following is possible: `guide_colourbar(frame = element_rect(...))`.
+    * Primary axis titles are now placed at the primary guide, so that
+      `guides(x = guide_axis(position = "top"))` will display the title at the
+      top by default (#4650).
+    * Unknown secondary axis guide positions are now inferred as the opposite 
+      of the primary axis guide when the latter has a known `position` (#4650).
+    * `guide_colourbar()`, `guide_coloursteps()` and `guide_bins()` gain a
+      `ticks.length` argument.
+    * In `guide_bins()`, the title no longer arbitrarily becomes offset from
+      the guide when it has long labels.
+    * The `order` argument of guides now strictly needs to be a length-1 
+      integer (#4958).
+
 # ggplot2 3.4.0
 This is a minor release focusing on tightening up the internals and ironing out
 some inconsistencies in the API. The biggest change is the addition of the 

From 9fd9f31fcfc6a93b2df58ae06a456c9d5d1b4c98 Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Sun, 11 Dec 2022 14:16:55 +0100
Subject: [PATCH 073/111] Update test

---
 tests/testthat/test-coord-.r | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/testthat/test-coord-.r b/tests/testthat/test-coord-.r
index eccac03852..d357af2ade 100644
--- a/tests/testthat/test-coord-.r
+++ b/tests/testthat/test-coord-.r
@@ -37,6 +37,6 @@ test_that("guide names are not removed by `train_panel_guides()`", {
   layout$setup_panel_guides(plot$guides, plot$layers, plot$mapping)
 
   # Line showing change in outcome
-  expect_equal(names(layout$panel_params[[1]]$guides),
+  expect_equal(names(layout$panel_params[[1]]$guides$aesthetics),
                c("x", "y", "x.sec", "y.sec"))
 })

From 5792ea92c8e0109012f7648287607153d4f84f27 Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Sat, 31 Dec 2022 14:50:09 +0100
Subject: [PATCH 074/111] Prevent bug in guide axis

---
 R/guide-axis.r | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/R/guide-axis.r b/R/guide-axis.r
index aec82328ca..dce1f3a304 100644
--- a/R/guide-axis.r
+++ b/R/guide-axis.r
@@ -151,11 +151,13 @@ GuideAxis <- ggproto(
     axis_elem <- c("line", "text", "ticks", "ticks_length")
     is_char  <- vapply(elements[axis_elem], is.character, logical(1))
     axis_elem <- axis_elem[is_char]
-    elements[axis_elem] <- paste(
-      unlist(elements[axis_elem]),
-      params$aes, params$position, sep = "."
+    elements[axis_elem] <- lapply(
+      paste(
+        unlist(elements[axis_elem]),
+        params$aes, params$position, sep = "."
+      ),
+      calc_element, theme = theme
     )
-    elements[is_char] <- lapply(elements[is_char], calc_element, theme = theme)
     elements
   },
 

From e500551ee8fed0cebba08c5fb1181eab4361e7c3 Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Mon, 2 Jan 2023 15:02:20 +0100
Subject: [PATCH 075/111] Pluralise error message

---
 R/guide-.r | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/R/guide-.r b/R/guide-.r
index 1b28343a69..1c73b9c147 100644
--- a/R/guide-.r
+++ b/R/guide-.r
@@ -46,7 +46,7 @@ new_guide <- function(..., available_aes = "any", super) {
   if (length(missing_params) > 0) {
     cli::cli_abort(paste0(
       "The following parameter{?s} {?is/are} required for setting up a guide, ",
-      "but are missing: {.field {missing_params}}"
+      "but {?is/are} missing: {.field {missing_params}}"
     ))
   }
 

From 29af9b91f03934629e44abe7bee4073b8f6cfa3f Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Mon, 2 Jan 2023 15:36:09 +0100
Subject: [PATCH 076/111] Legend assembly conditional on grob being present

---
 R/guide-legend.r | 99 +++++++++++++++++++++++++++---------------------
 1 file changed, 55 insertions(+), 44 deletions(-)

diff --git a/R/guide-legend.r b/R/guide-legend.r
index 8be06b7978..c1a8ac7827 100644
--- a/R/guide-legend.r
+++ b/R/guide-legend.r
@@ -632,61 +632,72 @@ GuideLegend <- ggproto(
     )
 
     # Add background
-    gt <- gtable_add_grob(
-      gt, elements$background,
-      name = "background", clip = "off",
-      t = 1, r = -1, b = -1, l =1
-    )
+    if (!is.zero(elements$background)) {
+      gt <- gtable_add_grob(
+        gt, elements$background,
+        name = "background", clip = "off",
+        t = 1, r = -1, b = -1, l =1
+      )
+    }
 
     # Add title
-    gt <- gtable_add_grob(
-      gt,
-      justify_grobs(
-        grobs$title,
-        hjust = elements$title$hjust,
-        vjust = elements$title$vjust,
-        int_angle = elements$title$angle,
-        debug = elements$title$debug
-      ),
-      name = "title", clip = "off",
-      t = min(layout$title_row), r = max(layout$title_col),
-      b = max(layout$title_row), l = min(layout$title_col)
-    )
+    if (!is.zero(grobs$title)) {
+      gt <- gtable_add_grob(
+        gt,
+        justify_grobs(
+          grobs$title,
+          hjust = elements$title$hjust,
+          vjust = elements$title$vjust,
+          int_angle = elements$title$angle,
+          debug = elements$title$debug
+        ),
+        name = "title", clip = "off",
+        t = min(layout$title_row), r = max(layout$title_col),
+        b = max(layout$title_row), l = min(layout$title_col)
+      )
+    }
 
     # Extract appropriate part of layout
     layout   <- layout$layout
-    n_key_layers <- params$n_key_layers %||% 1L
-    key_cols <- rep(layout$key_col, each = n_key_layers)
-    key_rows <- rep(layout$key_row, each = n_key_layers)
 
     # Add keys
-    gt <- gtable_add_grob(
-      gt, grobs$decor,
-      name = names(grobs$decor) %||%
-        paste("key", key_rows, key_cols, c("bg", seq_len(n_key_layers - 1)),
-              sep = "-"),
-      clip = "off",
-      t = key_rows, r = key_cols, b = key_rows, l = key_cols
-    )
+    if (!is.zero(grobs$decor)) {
+      n_key_layers <- params$n_key_layers %||% 1L
+      key_cols <- rep(layout$key_col, each = n_key_layers)
+      key_rows <- rep(layout$key_row, each = n_key_layers)
+
+      # Add keys
+      gt <- gtable_add_grob(
+        gt, grobs$decor,
+        name = names(grobs$decor) %||%
+          paste("key", key_rows, key_cols, c("bg", seq_len(n_key_layers - 1)),
+                sep = "-"),
+        clip = "off",
+        t = key_rows, r = key_cols, b = key_rows, l = key_cols
+      )
+    }
 
-    labels <- if (params$rejust_labels %||% TRUE) {
-      justify_grobs(
-        grobs$labels,
-        hjust = elements$text$hjust, vjust = elements$text$vjust,
-        int_angle = elements$text$angle, debug = elements$text$debug
+    if (!is.zero(grobs$labels)) {
+      labels <- if (params$rejust_labels %||% TRUE) {
+        justify_grobs(
+          grobs$labels,
+          hjust = elements$text$hjust, vjust = elements$text$vjust,
+          int_angle = elements$text$angle, debug = elements$text$debug
+        )
+      } else {
+        grobs$labels
+      }
+
+      gt <- gtable_add_grob(
+        gt, labels,
+        name = names(labels) %||%
+          paste("label", layout$label_row, layout$label_col, sep = "-"),
+        clip = "off",
+        t = layout$label_row, r = layout$label_col,
+        b = layout$label_row, l = layout$label_col
       )
-    } else {
-      grobs$labels
     }
 
-    gt <- gtable_add_grob(
-      gt, labels,
-      name = names(labels) %||%
-        paste("label", layout$label_row, layout$label_col, sep = "-"),
-      clip = "off",
-      t = layout$label_row, r = layout$label_col,
-      b = layout$label_row, l = layout$label_col
-    )
     gt
   }
 )

From 5157221c65eb8042f5dcc2815656d3909e4b4839 Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Mon, 2 Jan 2023 22:36:02 +0100
Subject: [PATCH 077/111] `guides()` returns <Guides>

---
 NAMESPACE             | 2 +-
 R/guides-.r           | 8 ++++++--
 R/plot-construction.r | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/NAMESPACE b/NAMESPACE
index 681ecae2a7..3dae324e1d 100644
--- a/NAMESPACE
+++ b/NAMESPACE
@@ -55,12 +55,12 @@ S3method(ggplot_add,"NULL")
 S3method(ggplot_add,"function")
 S3method(ggplot_add,Coord)
 S3method(ggplot_add,Facet)
+S3method(ggplot_add,Guides)
 S3method(ggplot_add,Layer)
 S3method(ggplot_add,Scale)
 S3method(ggplot_add,by)
 S3method(ggplot_add,data.frame)
 S3method(ggplot_add,default)
-S3method(ggplot_add,guides)
 S3method(ggplot_add,labels)
 S3method(ggplot_add,list)
 S3method(ggplot_add,theme)
diff --git a/R/guides-.r b/R/guides-.r
index a389cab819..7cf84b956c 100644
--- a/R/guides-.r
+++ b/R/guides-.r
@@ -77,12 +77,16 @@ guides <- function(...) {
     args[idx_false] <- "none"
   }
 
-  structure(args, class = "guides")
+  guides_list(guides = args)
 }
 
 update_guides <- function(p, guides) {
   p <- plot_clone(p)
-  p$guides <- defaults(guides, p$guides)
+  if (inherits(p$guides, "Guides")) {
+    p$guides$add(guides)
+  } else {
+    p$guides <- guides
+  }
   p
 }
 
diff --git a/R/plot-construction.r b/R/plot-construction.r
index 34eddd3a1d..c4cafd2dc8 100644
--- a/R/plot-construction.r
+++ b/R/plot-construction.r
@@ -125,7 +125,7 @@ ggplot_add.labels <- function(object, plot, object_name) {
   update_labels(plot, object)
 }
 #' @export
-ggplot_add.guides <- function(object, plot, object_name) {
+ggplot_add.Guides <- function(object, plot, object_name) {
   update_guides(plot, object)
 }
 #' @export

From 8272173db0e0417d589c6fd9f7217b7c4fa3b5d8 Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Mon, 2 Jan 2023 22:37:43 +0100
Subject: [PATCH 078/111] guides() rejects unnamed guides

---
 R/guides-.r                  | 20 +++++++++++++++++++-
 tests/testthat/test-guides.R | 13 ++++++++++++-
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/R/guides-.r b/R/guides-.r
index 7cf84b956c..a787a06d92 100644
--- a/R/guides-.r
+++ b/R/guides-.r
@@ -64,7 +64,6 @@
 #'  )
 #' }
 guides <- function(...) {
-  # TODO: Somehow unify the `guides_list()` function with this one
   args <- list2(...)
   if (length(args) > 0) {
     if (is.list(args[[1]]) && !inherits(args[[1]], "guide")) args <- args[[1]]
@@ -77,6 +76,25 @@ guides <- function(...) {
     args[idx_false] <- "none"
   }
 
+  if (!is_named(args)) {
+    nms <- names(args)
+    if (is.null(nms)) {
+      msg <- "All guides are unnamed."
+    } else {
+      unnamed <- which(is.na(nms) | nms == "")
+      if (length(unnamed) == length(args)) {
+        msg <- "All guides are unnamed."
+      } else {
+        unnamed <- label_ordinal()(unnamed)
+        msg <- "The {.and {unnamed}} guide{?s} {?is/are} unnamed."
+      }
+    }
+    cli::cli_abort(c(
+      "Guides provided to {.fun guides} must be named.",
+      i = msg
+    ))
+  }
+
   guides_list(guides = args)
 }
 
diff --git a/tests/testthat/test-guides.R b/tests/testthat/test-guides.R
index 1b7f89e8a8..e884ceaa75 100644
--- a/tests/testthat/test-guides.R
+++ b/tests/testthat/test-guides.R
@@ -685,10 +685,21 @@ test_that("a warning is generated when guides(<scale> = FALSE) is specified", {
 
   # warn on guide(<scale> = FALSE)
   expect_warning(g <- guides(colour = FALSE), "The `<scale>` argument of `guides()` cannot be `FALSE`. Use \"none\" instead as of ggplot2 3.3.4.", fixed = TRUE)
-  expect_equal(g[["colour"]], "none")
+  expect_equal(g$guides[["colour"]], "none")
 
   # warn on scale_*(guide = FALSE)
   p <- ggplot(df, aes(x, y, colour = x)) + scale_colour_continuous(guide = FALSE)
   built <- expect_silent(ggplot_build(p))
   expect_snapshot_warning(ggplot_gtable(built))
 })
+
+test_that("guides() errors if unnamed guides are provided", {
+  expect_error(
+    guides("axis"),
+    "All guides are unnamed."
+  )
+  expect_error(
+    guides(x = "axis", "axis"),
+    "The 2nd guide is unnamed"
+  )
+})

From a1c8dabc3d78fac0e8b4382137e2a98c3ad58dbd Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Mon, 2 Jan 2023 23:10:03 +0100
Subject: [PATCH 079/111] Fix `calc_element()` not recognising 'character' as
 special keyword

---
 R/theme.r | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/R/theme.r b/R/theme.r
index ee8f9ea70f..e5381b445a 100644
--- a/R/theme.r
+++ b/R/theme.r
@@ -555,7 +555,16 @@ calc_element <- function(element, theme, verbose = FALSE, skip_blank = FALSE,
   # it is of the class specified in element_tree
   if (!is.null(el_out) &&
       !inherits(el_out, element_tree[[element]]$class)) {
-    cli::cli_abort("Theme element {.var {element}} must have class {.cls {ggplot_global$element_tree[[element]]$class}}", call = call)
+    msg <- "Theme element {.var {element}} must have class {.cls {ggplot_global$element_tree[[element]]$class}}"
+
+    # 'character' is keyword that may also mean 'numeric', see ?el_def
+    if (element_tree[[element]]$class == "character") {
+      if (!inherits(el_out, "numeric")) {
+        cli::cli_abort(msg, call = call)
+      }
+    } else {
+      cli::cli_abort(msg, call = call)
+    }
   }
 
   # Get the names of parents from the inheritance tree

From 49559f9dc09f9bdd1d5218117c77131ab1476c90 Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Mon, 2 Jan 2023 23:45:45 +0100
Subject: [PATCH 080/111] GuideLegend can skip computing missing stuff

---
 R/guide-legend.r | 105 +++++++++++++++++++++++++++--------------------
 1 file changed, 61 insertions(+), 44 deletions(-)

diff --git a/R/guide-legend.r b/R/guide-legend.r
index c1a8ac7827..ee5a897dea 100644
--- a/R/guide-legend.r
+++ b/R/guide-legend.r
@@ -353,16 +353,21 @@ GuideLegend <- ggproto(
   },
 
   setup_params = function(params) {
-    params$title.position <- arg_match0(
-      params$title.position %||%
-        switch(params$direction, vertical = "top", horizontal = "left"),
-      .trbl, arg_nm = "title.position"
-    )
-    params$label.position <- arg_match0(
-      params$label.position %||% "right",
-      .trbl, arg_nm = "label.position"
-    )
-    params$rejust_labels <- TRUE
+    if ("title.position" %in% names(params)) {
+      params$title.position <- arg_match0(
+        params$title.position %||%
+          switch(params$direction, vertical = "top", horizontal = "left"),
+        .trbl, arg_nm = "title.position"
+      )
+    }
+    if ("label.position" %in% names(params)) {
+      params$label.position <- arg_match0(
+        params$label.position %||% "right",
+        .trbl, arg_nm = "label.position"
+      )
+      params$rejust_labels <- TRUE
+    }
+
     params$n_breaks <- n_breaks <- nrow(params$key)
     params$n_key_layers <- length(params$decor) + 1 # +1 is key background
 
@@ -396,39 +401,42 @@ GuideLegend <- ggproto(
     elements$title <- title
 
     # Labels
-    label <- combine_elements(params$label.theme, elements$text)
-    if (!params$label || is.null(params$key$.label)) {
-      label <- element_blank()
-    } else {
-      hjust <- unname(label_hjust_defaults[params$label.position])
-      vjust <- unname(label_vjust_defaults[params$label.position])
-      # Expressions default to right-justified
-      if (hjust == 0 && any(is.expression(params$key$.label))) {
-        hjust <- 1
-      }
-      # Breaking justification inheritance for intuition purposes.
-      if (is.null(params$label.theme$hjust) &&
-          is.null(theme$legend.text$hjust)) {
-        label$hjust <- NULL
-      }
-      if (is.null(params$label.theme$vjust) &&
-          is.null(theme$legend.text$vjust)) {
-        label$vjust <- NULL
+    if (!is.null(elements$text)) {
+      label <- combine_elements(params$label.theme, elements$text)
+      if (!params$label || is.null(params$key$.label)) {
+        label <- element_blank()
+      } else {
+        hjust <- unname(label_hjust_defaults[params$label.position])
+        vjust <- unname(label_vjust_defaults[params$label.position])
+        # Expressions default to right-justified
+        if (hjust == 0 && any(is.expression(params$key$.label))) {
+          hjust <- 1
+        }
+        # Breaking justification inheritance for intuition purposes.
+        if (is.null(params$label.theme$hjust) &&
+            is.null(theme$legend.text$hjust)) {
+          label$hjust <- NULL
+        }
+        if (is.null(params$label.theme$vjust) &&
+            is.null(theme$legend.text$vjust)) {
+          label$vjust <- NULL
+        }
+        label$hjust <- params$label.hjust %||% elements$text.align %||%
+          label$hjust %||% hjust
+        label$vjust <- params$label.vjust %||% label$vjust %||% vjust
       }
-      label$hjust <- params$label.hjust %||% elements$text.align %||%
-        label$hjust %||% hjust
-      label$vjust <- params$label.vjust %||% label$vjust %||% vjust
+      elements$text <- label
     }
-    elements$text <- label
 
     # Keys
-    elements$key.width  <- width_cm( params$keywidth  %||% elements$key.width)
-    elements$key.height <- height_cm(params$keyheight %||% elements$key.height)
-
+    if (any(c("key.width", "key.height") %in% names(elements))) {
+      elements$key.width  <- width_cm( params$keywidth  %||% elements$key.width)
+      elements$key.height <- height_cm(params$keyheight %||% elements$key.height)
+    }
 
     # Spacing
     gap <- title$size %||% elements$theme.title$size %||%
-      elements$text$size  %||% 11
+      elements$text$size %||% 11
     gap <- unit(gap * 0.5, "pt")
     # Should maybe be elements$spacing.{x/y} instead of the theme's spacing?
     elements$hgap <- width_cm( theme$legend.spacing.x %||% gap)
@@ -439,12 +447,16 @@ GuideLegend <- ggproto(
     )
 
     # Evaluate backgrounds early
-    elements$background <- ggname(
-      "legend.background", element_grob(elements$background)
-    )
-    elements$key <- ggname(
-      "legend.key", element_grob(elements$key)
-    )
+    if (!is.null(elements$background)) {
+      elements$background <- ggname(
+        "legend.background", element_grob(elements$background)
+      )
+    }
+    if (!is.null(elements$key)) {
+      elements$key <- ggname(
+        "legend.key", element_grob(elements$key)
+      )
+    }
 
     elements
   },
@@ -510,7 +522,7 @@ GuideLegend <- ggproto(
     # Interleave gaps between keys and labels, which depends on the label
     # position. For unclear reasons, we need to adjust some gaps based on the
     # `byrow` parameter (see also #4352).
-    hgap <- elements$hgap
+    hgap <- elements$hgap %||% 0
     widths <- switch(
       params$label.position,
       "left"   = list(label_widths, hgap, widths, hgap),
@@ -519,7 +531,7 @@ GuideLegend <- ggproto(
     )
     widths  <- head(vec_interleave(!!!widths),  -1)
 
-    vgap <- elements$vgap
+    vgap <- elements$vgap %||% 0
     heights <- switch(
       params$label.position,
       "top"    = list(label_heights, vgap, heights, vgap),
@@ -707,6 +719,11 @@ label_vjust_defaults <- c(top = 0,   bottom = 1,   left = 0.5, right = 0.5)
 
 measure_legend_keys <- function(decor, n, dim, byrow = FALSE,
                                 default_width = 1, default_height = 1) {
+  if (is.null(decor)) {
+    ans <- list(widths = NULL, heights = NULL)
+    return(ans)
+  }
+
   # Vector padding in case rows * cols > keys
   zeroes <- rep(0, prod(dim) - n)
 

From ac3a59f8ada416680abedab877fbdffd6cfd8818 Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Tue, 3 Jan 2023 00:39:47 +0100
Subject: [PATCH 081/111] Give <Guides> nicer print method

---
 R/guides-.r | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/R/guides-.r b/R/guides-.r
index a787a06d92..3939c029ef 100644
--- a/R/guides-.r
+++ b/R/guides-.r
@@ -597,5 +597,30 @@ Guides <- ggproto(
     )
     guides$name <- "guide-box"
     guides
+  },
+
+  print = function(self) {
+
+    guides <- self$guides
+    header <- paste0("<Guides[", length(guides), "] ggproto object>\n")
+
+    if (length(guides) == 0) {
+      content <- "<empty>"
+    } else {
+      content <- lapply(guides, function(g) {
+        if (is.character(g)) {
+          paste0('"', g, '"')
+        } else {
+          paste0("<", class(g)[[1]], ">")
+        }
+      })
+      nms <- names(content)
+      nms <- format(nms, justify = "right")
+      content <- unlist(content, FALSE, FALSE)
+      content <- format(content, justify = "left")
+      content <- paste0(nms, " : ", content)
+    }
+    cat(c(header, content), sep = "\n")
+    invisible(self)
   }
 )

From 80da767d3728829e3e02e705d00e181e9aff3956 Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Wed, 18 Jan 2023 18:44:36 +0100
Subject: [PATCH 082/111] Fix #5152

---
 R/guide-bins.R               |  1 +
 tests/testthat/test-guides.R | 15 +++++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/R/guide-bins.R b/R/guide-bins.R
index b7d81bb07c..4695645e59 100644
--- a/R/guide-bins.R
+++ b/R/guide-bins.R
@@ -422,6 +422,7 @@ parse_binned_breaks = function(scale, breaks = scale$get_breaks(),
   if (length(breaks) == 0) {
     return(NULL)
   }
+  breaks <- sort(breaks)
   if (is.numeric(breaks)) {
     limits <- scale$get_limits()
     if (!is.numeric(scale$breaks)) {
diff --git a/tests/testthat/test-guides.R b/tests/testthat/test-guides.R
index e884ceaa75..f70cdd5160 100644
--- a/tests/testthat/test-guides.R
+++ b/tests/testthat/test-guides.R
@@ -257,6 +257,21 @@ test_that("legend reverse argument reverses the key", {
   expect_equal(fwd$colour, rev(rev$colour))
 })
 
+test_that("guide_coloursteps and guide_bins return ordered breaks", {
+  scale <- scale_colour_viridis_c(breaks = c(2, 3, 1))
+  scale$train(c(0, 4))
+
+  # Coloursteps guide is increasing order
+  g <- guide_colorsteps()
+  key <- g$train(scale = scale, aesthetic = "colour")$key
+  expect_true(all(diff(key$.value) > 0))
+
+  # Bins guide is decreasing order
+  g <- guide_bins()
+  key <- g$train(scale = scale, aesthetics = "colour", direction = "vertical")$key
+  expect_true(all(diff(key$.value) < 0))
+})
+
 # Visual tests ------------------------------------------------------------
 
 test_that("axis guides are drawn correctly", {

From 9024e1291ce8cff385cc6e9d14aad04920c32a40 Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Mon, 13 Feb 2023 18:56:18 +0100
Subject: [PATCH 083/111] Reduce `guides()` logic depth

---
 R/guides-.r | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/R/guides-.r b/R/guides-.r
index 3939c029ef..10169f1351 100644
--- a/R/guides-.r
+++ b/R/guides-.r
@@ -76,26 +76,28 @@ guides <- function(...) {
     args[idx_false] <- "none"
   }
 
-  if (!is_named(args)) {
-    nms <- names(args)
-    if (is.null(nms)) {
+  # The good path
+  if (is_named(args)) {
+    return(guides_list(guides = args))
+  }
+
+  # Raise error about unnamed guides
+  nms <- names(args)
+  if (is.null(nms)) {
+    msg <- "All guides are unnamed."
+  } else {
+    unnamed <- which(is.na(nms) | nms == "")
+    if (length(unnamed) == length(args)) {
       msg <- "All guides are unnamed."
     } else {
-      unnamed <- which(is.na(nms) | nms == "")
-      if (length(unnamed) == length(args)) {
-        msg <- "All guides are unnamed."
-      } else {
-        unnamed <- label_ordinal()(unnamed)
-        msg <- "The {.and {unnamed}} guide{?s} {?is/are} unnamed."
-      }
+      unnamed <- label_ordinal()(unnamed)
+      msg <- "The {.and {unnamed}} guide{?s} {?is/are} unnamed."
     }
-    cli::cli_abort(c(
-      "Guides provided to {.fun guides} must be named.",
-      i = msg
-    ))
   }
-
-  guides_list(guides = args)
+  cli::cli_abort(c(
+    "Guides provided to {.fun guides} must be named.",
+    i = msg
+  ))
 }
 
 update_guides <- function(p, guides) {

From bb9cf5545ccf0d0f18cc36cc9d10452f8a3367ea Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Mon, 13 Feb 2023 20:27:58 +0100
Subject: [PATCH 084/111] Make Guides$build method

---
 R/guides-.r | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 71 insertions(+)

diff --git a/R/guides-.r b/R/guides-.r
index 10169f1351..60b28a390f 100644
--- a/R/guides-.r
+++ b/R/guides-.r
@@ -601,6 +601,77 @@ Guides <- ggproto(
     guides
   },
 
+  # building non-position guides - called in ggplotGrob (plot-build.r)
+  #
+  # the procedure is as follows:
+  #
+  # 1. guides$setup()
+  #      generates a guide object for every scale-aesthetic pair
+  #
+  # 2. guides$train()
+  #      train each scale and generate guide definition for all guides
+  #      here, one guide object for one scale
+  #
+  # 2. guides$merge()
+  #      merge guide objects if they are overlayed
+  #      number of guide objects may be less than number of scales
+  #
+  # 3. guides$process_layers()
+  #      process layer information and generate geom info.
+  #
+  # 4. guides$draw()
+  #      generate guide grob from each guide object
+  #      one guide grob for one guide object
+  #
+  # 5. guides$assemble()
+  #      arrange all guide grobs
+
+  build = function(self, scales, layers, default_mapping,
+                   position, theme, labels) {
+
+    position  <- legend_position(position)
+    no_guides <- zeroGrob()
+    if (position == "none") {
+      return(no_guides)
+    }
+
+    theme$legend.key.width  <- theme$legend.key.width  %||% theme$legend.key.size
+    theme$legend.key.height <- theme$legend.key.height %||% theme$legend.key.size
+
+
+    direction <- if (position == "inside") "vertical" else position
+    theme$legend.box       <- theme$legend.box       %||% direction
+    theme$legend.direction <- theme$legend.direction %||% direction
+    theme$legend.box.just  <- theme$legend.box.just  %||% switch(
+      position,
+      inside     = c("center", "center"),
+      vertical   = c("left",   "top"),
+      horizontal = c("center", "top")
+    )
+
+    # Setup and train on scales
+    scales <- scales$non_position_scales()$scales
+    if (length(scales) == 0) {
+      return(no_guides)
+    }
+    guides <- self$setup(scales, keep_none = FALSE)
+    guides$train(scales, theme$legend.direction, labels)
+    if (length(guides$guides) == 0) {
+      return(no_guides)
+    }
+
+    # Merge and process layers
+    guides$merge()
+    guides$process_layers(layers, default_mapping)
+    if (length(guides$guides) == 0) {
+      return(no_guides)
+    }
+
+    # Draw and assemble
+    grobs <- guides$draw(theme)
+    guides$assemble(grobs, theme)
+  },
+
   print = function(self) {
 
     guides <- self$guides

From d3371ba35478240d6de9476c70f8cc78c83637ad Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Mon, 13 Feb 2023 20:28:52 +0100
Subject: [PATCH 085/111] Guarantee `guides` is `Guides`-class

---
 R/plot-build.r | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/R/plot-build.r b/R/plot-build.r
index b6102eed6e..0c69cb4481 100644
--- a/R/plot-build.r
+++ b/R/plot-build.r
@@ -167,7 +167,12 @@ ggplot_gtable.ggplot_built <- function(data) {
   theme <- plot_theme(plot)
 
   geom_grobs <- by_layer(function(l, d) l$draw_geom(d, layout), plot$layers, data, "converting geom to grob")
-  layout$setup_panel_guides(plot$guides, plot$layers, plot$mapping)
+
+  guides <- plot$guides
+  if (!inherits(guides, "Guides")) {
+    guides <- guides_list(guides)
+  }
+  layout$setup_panel_guides(guides, plot$layers, plot$mapping)
   plot_table <- layout$render(geom_grobs, data, theme, plot$labels)
 
   # Legends

From 7a77dd4e3866c88f640f202a15e7682ebf71b18d Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Mon, 13 Feb 2023 20:29:59 +0100
Subject: [PATCH 086/111] Integrate Guides$build

---
 R/guides-.r                  | 74 ------------------------------------
 R/plot-build.r               |  8 ++--
 tests/testthat/test-guides.R |  4 +-
 3 files changed, 5 insertions(+), 81 deletions(-)

diff --git a/R/guides-.r b/R/guides-.r
index 60b28a390f..a4cc22ea41 100644
--- a/R/guides-.r
+++ b/R/guides-.r
@@ -110,80 +110,6 @@ update_guides <- function(p, guides) {
   p
 }
 
-
-# building non-position guides - called in ggplotGrob (plot-build.r)
-#
-# the procedure is as follows:
-#
-# 1. guides$setup()
-#      generates a guide object for every scale-aesthetic pair
-#
-# 2. guides$train()
-#      train each scale and generate guide definition for all guides
-#      here, one guide object for one scale
-#
-# 2. guides$merge()
-#      merge guide objects if they are overlayed
-#      number of guide objects may be less than number of scales
-#
-# 3. guides$process_layers()
-#      process layer information and generate geom info.
-#
-# 4. guides$draw()
-#      generate guide grob from each guide object
-#      one guide grob for one guide object
-#
-# 5. guides$assemble()
-#      arrange all guide grobs
-
-build_guides <- function(scales, layers, default_mapping, position, theme, guides, labels) {
-  theme$legend.key.width  <- theme$legend.key.width  %||% theme$legend.key.size
-  theme$legend.key.height <- theme$legend.key.height %||% theme$legend.key.size
-
-  # Layout of legends depends on their overall location
-  position <- legend_position(position)
-  if (position == "inside") {
-    theme$legend.box <- theme$legend.box %||% "vertical"
-    theme$legend.direction <- theme$legend.direction %||% "vertical"
-    theme$legend.box.just <- theme$legend.box.just %||% c("center", "center")
-  } else if (position == "vertical") {
-    theme$legend.box <- theme$legend.box %||% "vertical"
-    theme$legend.direction <- theme$legend.direction %||% "vertical"
-    theme$legend.box.just <- theme$legend.box.just %||% c("left", "top")
-  } else if (position == "horizontal") {
-    theme$legend.box <- theme$legend.box %||% "horizontal"
-    theme$legend.direction <- theme$legend.direction %||% "horizontal"
-    theme$legend.box.just <- theme$legend.box.just %||% c("center", "top")
-  }
-
-  if (!inherits(guides, "Guides")) {
-    guides <- guides_list(guides)
-  }
-
-  no_guides <- zeroGrob()
-
-  scales <- scales$non_position_scales()$scales
-  if (length(scales) == 0) return(no_guides)
-
-  guides <- guides$setup(scales, keep_none = FALSE)
-
-  guides$train(scales, theme$legend.direction, labels)
-  if (length(guides$guides) == 0) return(no_guides)
-
-  # merge overlay guides
-  guides$merge()
-
-  # process layer information
-  guides$process_layers(layers, default_mapping)
-  if (length(guides$guides) == 0) return(no_guides)
-
-  # generate grob of each guide
-  guide_grobs <- guides$draw(theme)
-
-  # build up guides
-  guides$assemble(guide_grobs, theme)
-}
-
 # Simplify legend position to one of horizontal/vertical/inside
 legend_position <- function(position) {
   if (length(position) == 1) {
diff --git a/R/plot-build.r b/R/plot-build.r
index 0c69cb4481..332cd3c4b0 100644
--- a/R/plot-build.r
+++ b/R/plot-build.r
@@ -181,11 +181,9 @@ ggplot_gtable.ggplot_built <- function(data) {
     position <- "manual"
   }
 
-  legend_box <- if (position != "none") {
-    build_guides(plot$scales, plot$layers, plot$mapping, position, theme, plot$guides, plot$labels)
-  } else {
-    zeroGrob()
-  }
+  legend_box <- guides$build(
+    plot$scales, plot$layers, plot$mapping, position, theme, plot$labels
+  )
 
   if (is.zero(legend_box)) {
     position <- "none"
diff --git a/tests/testthat/test-guides.R b/tests/testthat/test-guides.R
index f70cdd5160..5a98dc31fa 100644
--- a/tests/testthat/test-guides.R
+++ b/tests/testthat/test-guides.R
@@ -113,13 +113,13 @@ test_that("guide_none() can be used in non-position scales", {
 
   built <- ggplot_build(p)
   plot <- built$plot
-  guides <- build_guides(
+  guides <- guides_list(plot$guides)
+  guides <- guides$build(
     plot$scales,
     plot$layers,
     plot$mapping,
     "right",
     theme_gray(),
-    plot$guides,
     plot$labels
   )
 

From daa8a6f5daa6ef38e99cdc80ab8f451f4dfaaf42 Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Mon, 13 Feb 2023 20:39:19 +0100
Subject: [PATCH 087/111] Remove superfluous check

---
 R/coord-.r | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/R/coord-.r b/R/coord-.r
index a8bf41d3be..3bbfcb136f 100644
--- a/R/coord-.r
+++ b/R/coord-.r
@@ -98,14 +98,6 @@ Coord <- ggproto("Coord",
     names(aesthetics) <- aesthetics
     is_sec <- grepl("sec$", aesthetics)
 
-    # TODO: This should ideally happen in the `guides()` function or earlier.
-    if (!inherits(guides, "Guides")) {
-      guides <- guides_list(
-        guides,
-        .missing = params$guide_missing %||% guide_none()
-      )
-    }
-
     # Do guide setup
     guides <- guides$setup(
       panel_params, aesthetics,

From 2a11d51ac69df58ae7b6d81bb3999c35f805cc22 Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Mon, 13 Feb 2023 20:46:43 +0100
Subject: [PATCH 088/111] Restructure constructor -> class -> helpers

---
 R/guides-.r | 160 ++++++++++++++++++++++++++--------------------------
 1 file changed, 80 insertions(+), 80 deletions(-)

diff --git a/R/guides-.r b/R/guides-.r
index a4cc22ea41..1e6e40fa75 100644
--- a/R/guides-.r
+++ b/R/guides-.r
@@ -110,86 +110,6 @@ update_guides <- function(p, guides) {
   p
 }
 
-# Simplify legend position to one of horizontal/vertical/inside
-legend_position <- function(position) {
-  if (length(position) == 1) {
-    if (position %in% c("top", "bottom")) {
-      "horizontal"
-    } else {
-      "vertical"
-    }
-  } else {
-    "inside"
-  }
-}
-
-# resolve the guide from the scale and guides
-resolve_guide <- function(aesthetic, scale, guides, default = "none", null = "none") {
-  guides[[aesthetic]] %||% scale$guide %|W|% default %||% null
-}
-
-# validate guide object
-validate_guide <- function(guide) {
-  # if guide is specified by character, then find the corresponding guide
-  if (is.character(guide)) {
-    fun <- find_global(paste0("guide_", guide), env = global_env(),
-                         mode = "function")
-    if (is.function(fun)) {
-      return(fun())
-    }
-  }
-  if (inherits(guide, "Guide")) {
-    guide
-  } else {
-    cli::cli_abort("Unknown guide: {guide}")
-  }
-}
-
-# Helpers -----------------------------------------------------------------
-
-matched_aes <- function(layer, guide) {
-  all <- names(c(layer$computed_mapping, layer$stat$default_aes))
-  geom <- c(layer$geom$required_aes, names(layer$geom$default_aes))
-
-  # Make sure that size guides are shown if a renaming layer is used
-  if (layer$geom$rename_size && "size" %in% all && !"linewidth" %in% all) geom <- c(geom, "size")
-  matched <- intersect(intersect(all, geom), names(guide$key))
-  matched <- setdiff(matched, names(layer$computed_geom_params))
-  setdiff(matched, names(layer$aes_params))
-}
-
-# This function is used by guides in guide_geom.* to determine whether
-# a given layer should be included in the guide
-# `matched` is the set of aesthetics that match between the layer and the guide
-include_layer_in_guide <- function(layer, matched) {
-  if (!is.logical(layer$show.legend)) {
-    cli::cli_warn("{.arg show.legend} must be a logical vector.")
-    layer$show.legend <- FALSE # save back to layer so we don't issue this warning more than once
-    return(FALSE)
-  }
-
-  if (length(matched) > 0) {
-    # This layer contributes to the legend
-
-    # check if this layer should be included, different behaviour depending on
-    # if show.legend is a logical or a named logical vector
-    if (is_named(layer$show.legend)) {
-      layer$show.legend <- rename_aes(layer$show.legend)
-      show_legend <- layer$show.legend[matched]
-      # we cannot use `isTRUE(is.na(show_legend))` here because
-      # 1. show_legend can be multiple NAs
-      # 2. isTRUE() was not tolerant for a named TRUE
-      show_legend <- show_legend[!is.na(show_legend)]
-      return(length(show_legend) == 0 || any(show_legend))
-    }
-    return(all(is.na(layer$show.legend)) || isTRUE(layer$show.legend))
-  }
-
-  # This layer does not contribute to the legend.
-  # Default is to exclude it, except if it is explicitly turned on
-  isTRUE(layer$show.legend)
-}
-
 # Class -------------------------------------------------------------------
 
 # Guides object encapsulates multiple guides and their state.
@@ -623,3 +543,83 @@ Guides <- ggproto(
     invisible(self)
   }
 )
+
+# Helpers -----------------------------------------------------------------
+
+matched_aes <- function(layer, guide) {
+  all <- names(c(layer$computed_mapping, layer$stat$default_aes))
+  geom <- c(layer$geom$required_aes, names(layer$geom$default_aes))
+
+  # Make sure that size guides are shown if a renaming layer is used
+  if (layer$geom$rename_size && "size" %in% all && !"linewidth" %in% all) geom <- c(geom, "size")
+  matched <- intersect(intersect(all, geom), names(guide$key))
+  matched <- setdiff(matched, names(layer$computed_geom_params))
+  setdiff(matched, names(layer$aes_params))
+}
+
+# This function is used by guides in guide_geom.* to determine whether
+# a given layer should be included in the guide
+# `matched` is the set of aesthetics that match between the layer and the guide
+include_layer_in_guide <- function(layer, matched) {
+  if (!is.logical(layer$show.legend)) {
+    cli::cli_warn("{.arg show.legend} must be a logical vector.")
+    layer$show.legend <- FALSE # save back to layer so we don't issue this warning more than once
+    return(FALSE)
+  }
+
+  if (length(matched) > 0) {
+    # This layer contributes to the legend
+
+    # check if this layer should be included, different behaviour depending on
+    # if show.legend is a logical or a named logical vector
+    if (is_named(layer$show.legend)) {
+      layer$show.legend <- rename_aes(layer$show.legend)
+      show_legend <- layer$show.legend[matched]
+      # we cannot use `isTRUE(is.na(show_legend))` here because
+      # 1. show_legend can be multiple NAs
+      # 2. isTRUE() was not tolerant for a named TRUE
+      show_legend <- show_legend[!is.na(show_legend)]
+      return(length(show_legend) == 0 || any(show_legend))
+    }
+    return(all(is.na(layer$show.legend)) || isTRUE(layer$show.legend))
+  }
+
+  # This layer does not contribute to the legend.
+  # Default is to exclude it, except if it is explicitly turned on
+  isTRUE(layer$show.legend)
+}
+
+# Simplify legend position to one of horizontal/vertical/inside
+legend_position <- function(position) {
+  if (length(position) == 1) {
+    if (position %in% c("top", "bottom")) {
+      "horizontal"
+    } else {
+      "vertical"
+    }
+  } else {
+    "inside"
+  }
+}
+
+# resolve the guide from the scale and guides
+resolve_guide <- function(aesthetic, scale, guides, default = "none", null = "none") {
+  guides[[aesthetic]] %||% scale$guide %|W|% default %||% null
+}
+
+# validate guide object
+validate_guide <- function(guide) {
+  # if guide is specified by character, then find the corresponding guide
+  if (is.character(guide)) {
+    fun <- find_global(paste0("guide_", guide), env = global_env(),
+                       mode = "function")
+    if (is.function(fun)) {
+      return(fun())
+    }
+  }
+  if (inherits(guide, "Guide")) {
+    guide
+  } else {
+    cli::cli_abort("Unknown guide: {guide}")
+  }
+}

From 26d037c1676a4f045e4a206645bdfdf3cc9c1f64 Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Mon, 13 Feb 2023 20:50:03 +0100
Subject: [PATCH 089/111] Omit NEWS bullet for now

---
 NEWS.md | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index 1178b67b9d..56dfdeaaf8 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,25 +1,5 @@
 # ggplot2 (development version)
 
-* The guide system, as the last remaining chunk of ggplot2, has been rewritten 
-  in ggproto. The axes and legends now inherit from a <Guide> class, which makes
-  them extensible in the same manner as geoms, stats, facets and coords 
-  (#3329, @teunbrand). In addition, the following changes were made:
-    * Styling theme parts of the guide now inherit from the plot's theme 
-      (#2728). 
-    * Styling non-theme parts of the guides accept <element> objects, so that
-      the following is possible: `guide_colourbar(frame = element_rect(...))`.
-    * Primary axis titles are now placed at the primary guide, so that
-      `guides(x = guide_axis(position = "top"))` will display the title at the
-      top by default (#4650).
-    * Unknown secondary axis guide positions are now inferred as the opposite 
-      of the primary axis guide when the latter has a known `position` (#4650).
-    * `guide_colourbar()`, `guide_coloursteps()` and `guide_bins()` gain a
-      `ticks.length` argument.
-    * In `guide_bins()`, the title no longer arbitrarily becomes offset from
-      the guide when it has long labels.
-    * The `order` argument of guides now strictly needs to be a length-1 
-      integer (#4958).
-
 * `ggsave()` warns when multiple `filename`s are given, and only writes to the
   first file (@teunbrand, #5114).
 * Fixed a regression in `geom_hex()` where aesthetics were replicated across 

From 16937c01898980ac5a49fe67b901a8c0fbc8ad27 Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Tue, 14 Feb 2023 18:02:43 +0100
Subject: [PATCH 090/111] Fix failing test

---
 tests/testthat/test-coord-.r | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/testthat/test-coord-.r b/tests/testthat/test-coord-.r
index d357af2ade..b72a4fbd8f 100644
--- a/tests/testthat/test-coord-.r
+++ b/tests/testthat/test-coord-.r
@@ -34,7 +34,7 @@ test_that("guide names are not removed by `train_panel_guides()`", {
   layout <- data$layout
   data <- data$data
 
-  layout$setup_panel_guides(plot$guides, plot$layers, plot$mapping)
+  layout$setup_panel_guides(guides_list(NULL), plot$layers, plot$mapping)
 
   # Line showing change in outcome
   expect_equal(names(layout$panel_params[[1]]$guides$aesthetics),

From 99f1724a4e8970a8a01a707b38a66840728a43de Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Tue, 14 Feb 2023 18:12:38 +0100
Subject: [PATCH 091/111] `Guide$build_decor()` recieves all grobs

---
 R/guide-.r         | 6 +++---
 R/guide-axis.r     | 2 +-
 R/guide-bins.R     | 6 +++---
 R/guide-colorbar.r | 4 ++--
 R/guide-legend.r   | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/R/guide-.r b/R/guide-.r
index 1c73b9c147..eb8a2294f0 100644
--- a/R/guide-.r
+++ b/R/guide-.r
@@ -224,7 +224,7 @@ Guide <- ggproto(
       labels = self$build_labels(key, elems, params),
       ticks  = self$build_ticks(key, elems, params)
     )
-    grobs$decor <- self$build_decor(params$decor, grobs$ticks, elems, params)
+    grobs$decor <- self$build_decor(params$decor, grobs, elems, params)
 
     # Arrange and assemble grobs
     sizes  <- self$measure_grobs(grobs, params, elems)
@@ -268,8 +268,8 @@ Guide <- ggproto(
   },
 
   # Renders 'decor', which can have different meanings for different guides.
-  # Ticks are provided because they may need to be combined with decor.
-  build_decor = function(decor, ticks, elements, params) {
+  # The other grobs are provided, as a colourbar might use the ticks for example
+  build_decor = function(decor, grobs, elements, params) {
     zeroGrob()
   },
 
diff --git a/R/guide-axis.r b/R/guide-axis.r
index dce1f3a304..d3ce1f7d36 100644
--- a/R/guide-axis.r
+++ b/R/guide-axis.r
@@ -227,7 +227,7 @@ GuideAxis <- ggproto(
   },
 
   # The decor in the axis guide is the axis line
-  build_decor = function(decor, ticks, elements, params) {
+  build_decor = function(decor, grobs, elements, params) {
     exec(
       element_grob,
       element = elements$line,
diff --git a/R/guide-bins.R b/R/guide-bins.R
index 4695645e59..4bcc6387fe 100644
--- a/R/guide-bins.R
+++ b/R/guide-bins.R
@@ -364,7 +364,7 @@ GuideBins <- ggproto(
     Guide$build_ticks(key$.value, elements, params, params$label.position)
   },
 
-  build_decor = function(decor, ticks, elements, params) {
+  build_decor = function(decor, grobs, elements, params) {
     params$n_breaks <- nkeys <- nrow(params$key) - 1
 
     dim <- if (params$direction == "vertical") c(nkeys, 1) else c(1, nkeys)
@@ -376,7 +376,7 @@ GuideBins <- ggproto(
     )
     sizes <- lapply(sizes, function(x) rep_len(max(x), length(x)))
 
-    decor <- GuideLegend$build_decor(decor, ticks, elements, params)
+    decor <- GuideLegend$build_decor(decor, grobs, elements, params)
     n_layers <- length(decor) / nkeys
     key_id <- rep(seq_len(nkeys), each = n_layers)
     key_nm <- paste("key", key_id, c("bg", seq_len(n_layers - 1)))
@@ -403,7 +403,7 @@ GuideBins <- ggproto(
     )
     axis <- element_grob(elements$line, x = axis$x, y = axis$y)
 
-    list(keys = gt, axis_line = axis, ticks = ticks)
+    list(keys = gt, axis_line = axis, ticks = grobs$ticks)
   },
 
   measure_grobs = function(grobs, params, elements) {
diff --git a/R/guide-colorbar.r b/R/guide-colorbar.r
index a5fe17e834..7d3a0a0aed 100644
--- a/R/guide-colorbar.r
+++ b/R/guide-colorbar.r
@@ -453,7 +453,7 @@ GuideColourbar <- ggproto(
     )
   },
 
-  build_decor = function(decor, ticks, elements, params) {
+  build_decor = function(decor, grobs, elements, params) {
 
     if (params$raster) {
       image <- switch(
@@ -492,7 +492,7 @@ GuideColourbar <- ggproto(
 
     frame <- element_grob(elements$frame, fill = NA)
 
-    list(bar = grob, frame = frame, ticks = ticks)
+    list(bar = grob, frame = frame, ticks = grobs$ticks)
   },
 
   measure_grobs = function(grobs, params, elements) {
diff --git a/R/guide-legend.r b/R/guide-legend.r
index ee5a897dea..4b696d250d 100644
--- a/R/guide-legend.r
+++ b/R/guide-legend.r
@@ -465,7 +465,7 @@ GuideLegend <- ggproto(
     zeroGrob()
   },
 
-  build_decor = function(decor, ticks, elements, params) {
+  build_decor = function(decor, grobs, elements, params) {
 
     key_size <- c(elements$key.width, elements$key.height) * 10
 

From 4bb5dd8b4e1e507b22d4c716b87a665d5384ef41 Mon Sep 17 00:00:00 2001
From: Teun van den Brand <tahvdbrand@gmail.com>
Date: Mon, 27 Feb 2023 18:25:54 +0100
Subject: [PATCH 092/111] Revert "Fix `calc_element()` not recognising
 'character' as special keyword"

This reverts commit a1c8dabc3d78fac0e8b4382137e2a98c3ad58dbd.
---
 R/theme.r | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/R/theme.r b/R/theme.r
index e1f113ea47..29f6e318bf 100644
--- a/R/theme.r
+++ b/R/theme.r
@@ -565,16 +565,7 @@ calc_element <- function(element, theme, verbose = FALSE, skip_blank = FALSE,
   # it is of the class specified in element_tree
   if (!is.null(el_out) &&
       !inherits(el_out, element_tree[[element]]$class)) {
-    msg <- "Theme element {.var {element}} must have class {.cls {ggplot_global$element_tree[[element]]$class}}"
-
-    # 'character' is keyword that may also mean 'numeric', see ?el_def
-    if (element_tree[[element]]$class == "character") {
-      if (!inherits(el_out, "numeric")) {
-        cli::cli_abort(msg, call = call)
-      }
-    } else {
-      cli::cli_abort(msg, call = call)
-    }
+    cli::cli_abort("Theme element {.var {element}} must have class {.cls {ggplot_global$element_tree[[element]]$class}}", call = call)
   }
 
   # Get the names of parents from the inheritance tree

From 676a4db86849144ef486ddd3b2ac8ee9a057eb67 Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Sun, 26 Mar 2023 14:58:23 +0200
Subject: [PATCH 093/111] Don't `Map()` setters

---
 R/coord-.R | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/R/coord-.R b/R/coord-.R
index 3bbfcb136f..0e46ff748b 100644
--- a/R/coord-.R
+++ b/R/coord-.R
@@ -110,7 +110,9 @@ Coord <- ggproto("Coord",
     scale_position <- lapply(panel_params[aesthetics], `[[`, "position")
     guide_position <- lapply(guide_params, `[[`, "position")
     guide_position[!is_sec] <- Map(
-      `%|W|%`, guide_position[!is_sec], scale_position[!is_sec]
+      function(guide, scale) guide %|W|% scale,
+      guide = guide_position[!is_sec],
+      scale = scale_position[!is_sec]
     )
     opposite <- c(
       "top"  = "bottom", "bottom" = "top",
@@ -122,7 +124,12 @@ Coord <- ggproto("Coord",
       prim = guide_position[!is_sec]
     )
     guide_params <- Map(
-      `[[<-`, x = guide_params, value = "position", i = guide_position
+      function(params, pos) {
+        params[["position"]] <- pos
+        params
+      },
+      params = guide_params,
+      pos    = guide_position
     )
 
     # Update positions

From 63337ba0e0bb313cf4ae56482eef90d803615670 Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Sun, 26 Mar 2023 15:02:31 +0200
Subject: [PATCH 094/111] Better variable names

---
 R/coord-cartesian-.R | 5 +++--
 R/guides-.R          | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/R/coord-cartesian-.R b/R/coord-cartesian-.R
index 0320088a14..cf4f5d31bd 100644
--- a/R/coord-cartesian-.R
+++ b/R/coord-cartesian-.R
@@ -145,8 +145,9 @@ view_scales_from_scale <- function(scale, coord_limits = NULL, expand = TRUE) {
 }
 
 panel_guides_grob <- function(guides, position, theme) {
-  guide <- guide_for_position(guides, position) %||% list(guide = guide_none())
-  guide$guide$draw(theme, guide$params)
+  pair <- guide_for_position(guides, position) %||%
+    list(guide = guide_none(), params = NULL)
+  pair$guide$draw(theme, pair$params)
 }
 
 guide_for_position <- function(guides, position) {
diff --git a/R/guides-.R b/R/guides-.R
index 1e6e40fa75..13af4f7c12 100644
--- a/R/guides-.R
+++ b/R/guides-.R
@@ -485,9 +485,9 @@ Guides <- ggproto(
     theme$legend.key.height <- theme$legend.key.height %||% theme$legend.key.size
 
 
-    direction <- if (position == "inside") "vertical" else position
-    theme$legend.box       <- theme$legend.box       %||% direction
-    theme$legend.direction <- theme$legend.direction %||% direction
+    default_direction <- if (position == "inside") "vertical" else position
+    theme$legend.box       <- theme$legend.box       %||% default_direction
+    theme$legend.direction <- theme$legend.direction %||% default_direction
     theme$legend.box.just  <- theme$legend.box.just  %||% switch(
       position,
       inside     = c("center", "center"),

From f8eee086935dc02c50e82b85effbd4854279439a Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Sun, 26 Mar 2023 15:08:12 +0200
Subject: [PATCH 095/111] Rename `$geom()` method to `$get_layer_key()`

---
 R/coord-.R         | 2 +-
 R/guide-.r         | 3 +--
 R/guide-colorbar.R | 2 +-
 R/guide-legend.R   | 2 +-
 R/guides-.R        | 2 +-
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/R/coord-.R b/R/coord-.R
index 0e46ff748b..adb7ec3d39 100644
--- a/R/coord-.R
+++ b/R/coord-.R
@@ -156,7 +156,7 @@ Coord <- ggproto("Coord",
       function(guide, guide_param, scale) {
         guide_param <- guide$train(guide_param, scale)
         guide_param <- guide$transform(guide_param, self, panel_params)
-        guide_param <- guide$geom(guide_param, layers, default_mapping)
+        guide_param <- guide$get_layer_key(guide_param, layers, default_mapping)
         guide_param
       },
       guide = guides[!empty],
diff --git a/R/guide-.r b/R/guide-.r
index eb8a2294f0..06f276e93b 100644
--- a/R/guide-.r
+++ b/R/guide-.r
@@ -175,8 +175,7 @@ Guide <- ggproto(
 
   # Function for extracting information from the layers.
   # Mostly applies to `guide_legend()` and `guide_binned()`
-  # TODO: Consider renaming this to a more informative name.
-  geom = function(params, layers, default_mapping) {
+  get_layer_key = function(params, layers, default_mapping) {
     return(params)
   },
 
diff --git a/R/guide-colorbar.R b/R/guide-colorbar.R
index 7bb3e42a5c..479ba41837 100644
--- a/R/guide-colorbar.R
+++ b/R/guide-colorbar.R
@@ -373,7 +373,7 @@ GuideColourbar <- ggproto(
     return(list(guide = self, params = params))
   },
 
-  geom = function(params, layers, default_mapping) {
+  get_layer_key = function(params, layers, default_mapping) {
 
     guide_layers <- lapply(layers, function(layer) {
 
diff --git a/R/guide-legend.R b/R/guide-legend.R
index 4b696d250d..bae10f8d49 100644
--- a/R/guide-legend.R
+++ b/R/guide-legend.R
@@ -294,7 +294,7 @@ GuideLegend <- ggproto(
   },
 
   # Arrange common data for vertical and horizontal legends
-  geom = function(params, layers, default_mapping) {
+  get_layer_key = function(params, layers, default_mapping) {
 
     decor <- lapply(layers, function(layer) {
 
diff --git a/R/guides-.R b/R/guides-.R
index 13af4f7c12..2340418aba 100644
--- a/R/guides-.R
+++ b/R/guides-.R
@@ -352,7 +352,7 @@ Guides <- ggproto(
   # Loop over guides to let them extract information from layers
   process_layers = function(self, layers, default_mapping) {
     params <- Map(
-      function(guide, param) guide$geom(param, layers, default_mapping),
+      function(guide, param) guide$get_layer_key(param, layers, default_mapping),
       guide = self$guides,
       param = self$params
     )

From f0f223c694a52bf8ff2538d2b712234d1b0b9652 Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Sun, 26 Mar 2023 15:27:23 +0200
Subject: [PATCH 096/111] Use dual type checks

---
 R/guide-bins.R     | 6 +++---
 R/guide-colorbar.R | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/R/guide-bins.R b/R/guide-bins.R
index 40ae7fcd41..bfdd9d0701 100644
--- a/R/guide-bins.R
+++ b/R/guide-bins.R
@@ -109,13 +109,13 @@ guide_bins <- function(
   ...
 ) {
 
-  if (!inherits(keywidth, c("NULL", "unit"))) {
+  if (!(is.null(keywidth) || is.unit(keywidth))) {
     keywidth <- unit(keywidth, default.unit)
   }
-  if (!inherits(keyheight, c("NULL", "unit"))) {
+  if (!(is.null(keyheight) || is.unit(keyheight))) {
     keyheight <- unit(keyheight, default.unit)
   }
-  if (!inherits(ticks.length, "unit")) {
+  if (!is.unit(ticks.length)) {
     ticks.length <- unit(ticks.length, default.unit)
   }
   if (!is.null(title.position)) {
diff --git a/R/guide-colorbar.R b/R/guide-colorbar.R
index 479ba41837..e1d349d130 100644
--- a/R/guide-colorbar.R
+++ b/R/guide-colorbar.R
@@ -158,13 +158,13 @@ guide_colourbar <- function(
   available_aes = c("colour", "color", "fill"),
   ...
 ) {
-  if (!inherits(barwidth, c("NULL", "unit"))) {
+  if (!(is.null(barwidth) || is.unit(barwidth))) {
     barwidth <- unit(barwidth, default.unit)
   }
-  if (!inherits(barheight, c("NULL", "unit"))) {
+  if (!(is.null(barheight) || is.unit(barheight))) {
     barheight <- unit(barheight, default.unit)
   }
-  if (!inherits(ticks.length, "unit")) {
+  if (!is.unit(ticks.length)) {
     ticks.length <- unit(ticks.length, default.unit)
   }
 

From 8eecb1c701421139a42a0bdc83301e9950b63362 Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Sun, 26 Mar 2023 15:34:58 +0200
Subject: [PATCH 097/111] Initialise <Guides>

---
 R/guides-.R    | 2 +-
 R/plot-build.R | 8 ++------
 R/plot.R       | 1 +
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/R/guides-.R b/R/guides-.R
index 2340418aba..93a037a3d8 100644
--- a/R/guides-.R
+++ b/R/guides-.R
@@ -113,7 +113,7 @@ update_guides <- function(p, guides) {
 # Class -------------------------------------------------------------------
 
 # Guides object encapsulates multiple guides and their state.
-guides_list <- function(guides, .missing = guide_none()) {
+guides_list <- function(guides = NULL, .missing = guide_none()) {
   ggproto(NULL, Guides, guides = guides, missing = .missing)
 }
 
diff --git a/R/plot-build.R b/R/plot-build.R
index 2dbb7adde5..663edd1d3f 100644
--- a/R/plot-build.R
+++ b/R/plot-build.R
@@ -168,11 +168,7 @@ ggplot_gtable.ggplot_built <- function(data) {
 
   geom_grobs <- by_layer(function(l, d) l$draw_geom(d, layout), plot$layers, data, "converting geom to grob")
 
-  guides <- plot$guides
-  if (!inherits(guides, "Guides")) {
-    guides <- guides_list(guides)
-  }
-  layout$setup_panel_guides(guides, plot$layers, plot$mapping)
+  layout$setup_panel_guides(plot$guides, plot$layers, plot$mapping)
   plot_table <- layout$render(geom_grobs, data, theme, plot$labels)
 
   # Legends
@@ -181,7 +177,7 @@ ggplot_gtable.ggplot_built <- function(data) {
     position <- "manual"
   }
 
-  legend_box <- guides$build(
+  legend_box <- plot$guides$build(
     plot$scales, plot$layers, plot$mapping, position, theme, plot$labels
   )
 
diff --git a/R/plot.R b/R/plot.R
index aef8b8f30f..4494b774bc 100644
--- a/R/plot.R
+++ b/R/plot.R
@@ -122,6 +122,7 @@ ggplot.default <- function(data = NULL, mapping = aes(), ...,
     data = data,
     layers = list(),
     scales = scales_list(),
+    guides = guides_list(),
     mapping = mapping,
     theme = list(),
     coordinates = coord_cartesian(default = TRUE),

From 5640d693b634259e271c730964cd567489bba266 Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Sun, 26 Mar 2023 15:41:44 +0200
Subject: [PATCH 098/111] Fix last code review issues

---
 R/guide-.r         | 2 +-
 R/guide-colorbar.R | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/R/guide-.r b/R/guide-.r
index 06f276e93b..ec56757b0f 100644
--- a/R/guide-.r
+++ b/R/guide-.r
@@ -114,7 +114,7 @@ Guide <- ggproto(
     params$aesthetic <- aesthetic %||% scale$aesthetics[1]
     params$key   <- inject(self$extract_key(scale, !!!params))
     if (is.null(params$key)) {
-      return(params$key)
+      return(NULL)
     }
     params$decor <- inject(self$extract_decor(scale, !!!params))
     self$extract_params(scale, params, self$hashables, ...)
diff --git a/R/guide-colorbar.R b/R/guide-colorbar.R
index e1d349d130..48f371bd3e 100644
--- a/R/guide-colorbar.R
+++ b/R/guide-colorbar.R
@@ -200,7 +200,7 @@ guide_colourbar <- function(
     # the ticks
     ticks <- if (ticks) element_line() else element_blank()
   }
-  if (!inherits(ticks, "element_blank")) {
+  if (inherits(ticks, "element_line")) {
     ticks$colour    <- ticks.colour    %||% ticks$colour    %||% "white"
     ticks$linewidth <- ticks.linewidth %||% ticks$linewidth %||% (0.5 / .pt)
   }

From 57687a1cc2641592bca2075061e2c84f3e0c85ff Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Sun, 26 Mar 2023 15:57:02 +0200
Subject: [PATCH 099/111] Rename guide-.r to guide-.R

---
 R/{guide-.r => guide-.R} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename R/{guide-.r => guide-.R} (100%)

diff --git a/R/guide-.r b/R/guide-.R
similarity index 100%
rename from R/guide-.r
rename to R/guide-.R

From 18f275f443154bcfec80bf64382c94cac883f849 Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Sun, 26 Mar 2023 15:58:00 +0200
Subject: [PATCH 100/111] Rename guide-axis.r to guide-axis.R

---
 R/{guide-axis.r => guide-axis.R} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename R/{guide-axis.r => guide-axis.R} (100%)

diff --git a/R/guide-axis.r b/R/guide-axis.R
similarity index 100%
rename from R/guide-axis.r
rename to R/guide-axis.R

From 4db47c891d4fcf83b05329905d9a64f98ea5ef5a Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Sun, 26 Mar 2023 15:58:21 +0200
Subject: [PATCH 101/111] Rename guide-none.r to guide-none.R

---
 R/{guide-none.r => guide-none.R} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename R/{guide-none.r => guide-none.R} (100%)

diff --git a/R/guide-none.r b/R/guide-none.R
similarity index 100%
rename from R/guide-none.r
rename to R/guide-none.R

From 6065f96c5fa7630cb1ebf8ac3d566f14260de16d Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Tue, 11 Apr 2023 18:45:23 +0200
Subject: [PATCH 102/111] Add statelessness test

---
 tests/testthat/test-guides.R | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/tests/testthat/test-guides.R b/tests/testthat/test-guides.R
index 424fbf0b9d..2399eda8bb 100644
--- a/tests/testthat/test-guides.R
+++ b/tests/testthat/test-guides.R
@@ -1,5 +1,35 @@
 skip_on_cran() # This test suite is long-running (on cran) and is skipped
 
+test_that("plotting does not induce state changes in guides", {
+
+  guides <- list(
+    x      = guide_axis(title = "X-axis"),
+    colour = guide_colourbar(title = "Colourbar"),
+    shape  = guide_legend(title = "Legend"),
+    size   = guide_bins(title = "Bins")
+  )
+  # If rendering a plot with these guides induces a state change,
+  # the hash of these guides should change
+  hashes <- vapply(guides, hash, character(1))
+
+  # Now render a plot using these guides
+  p <- ggplot(mpg, aes(displ, hwy, colour = cty, shape = factor(cyl),
+                       size = cyl)) +
+    geom_point() +
+    scale_size_binned() +
+    guides(!!!guides)
+  grob <- ggplotGrob(p)
+
+  # Test: has the hash changed?
+  new_hashes <- vapply(guides, hash, character(1))
+  expect_equal(hashes, new_hashes)
+
+  # Negative control: we are able to detect changes through hashes
+  guides$colour$nonsense <- "foobar"
+  new_hashes <- vapply(guides, hash, character(1))
+  expect_false(all(hashes == new_hashes))
+})
+
 test_that("colourbar trains without labels", {
   g <- guide_colorbar()
   sc <- scale_colour_continuous(limits = c(0, 4), labels = NULL)

From f1e48d1ddb33109d780cdef7adf7d1390313ba3a Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Wed, 12 Apr 2023 20:03:56 +0200
Subject: [PATCH 103/111] Swap test hashing for serialisation

---
 tests/testthat/test-guides.R | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/tests/testthat/test-guides.R b/tests/testthat/test-guides.R
index 2399eda8bb..2de2f5fe40 100644
--- a/tests/testthat/test-guides.R
+++ b/tests/testthat/test-guides.R
@@ -8,9 +8,8 @@ test_that("plotting does not induce state changes in guides", {
     shape  = guide_legend(title = "Legend"),
     size   = guide_bins(title = "Bins")
   )
-  # If rendering a plot with these guides induces a state change,
-  # the hash of these guides should change
-  hashes <- vapply(guides, hash, character(1))
+  # We take an immutable copy of the guides by serialising them
+  snap_old <- serialize(guides, NULL)
 
   # Now render a plot using these guides
   p <- ggplot(mpg, aes(displ, hwy, colour = cty, shape = factor(cyl),
@@ -20,14 +19,12 @@ test_that("plotting does not induce state changes in guides", {
     guides(!!!guides)
   grob <- ggplotGrob(p)
 
-  # Test: has the hash changed?
-  new_hashes <- vapply(guides, hash, character(1))
-  expect_equal(hashes, new_hashes)
+  # Test: have the guides changed by rendering the plot?
+  expect_identical(guides, unserialize(snap_old))
 
-  # Negative control: we are able to detect changes through hashes
+  # Negative control: if they would have changed, we'd detect it
   guides$colour$nonsense <- "foobar"
-  new_hashes <- vapply(guides, hash, character(1))
-  expect_false(all(hashes == new_hashes))
+  expect_false(isTRUE(all.equal(guides, unserialize(snap_old))))
 })
 
 test_that("colourbar trains without labels", {

From 365b3f54f04f090145984ee5db258d43c6725398 Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Sun, 16 Apr 2023 19:49:09 +0200
Subject: [PATCH 104/111] Purge `default_mapping` arguments, see #4475

---
 R/coord-.R                   |  4 ++--
 R/guide-.R                   |  2 +-
 R/guide-colorbar.R           |  2 +-
 R/guide-legend.R             |  2 +-
 R/guides-.R                  |  8 ++++----
 R/layout.R                   |  3 +--
 R/plot-build.R               |  2 +-
 tests/testthat/test-coord-.R |  2 +-
 tests/testthat/test-labels.R | 10 +++++-----
 9 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/R/coord-.R b/R/coord-.R
index adb7ec3d39..46deae8444 100644
--- a/R/coord-.R
+++ b/R/coord-.R
@@ -139,7 +139,7 @@ Coord <- ggproto("Coord",
     panel_params
   },
 
-  train_panel_guides = function(self, panel_params, layers, default_mapping, params = list()) {
+  train_panel_guides = function(self, panel_params, layers, params = list()) {
 
     aesthetics <- c("x", "y", "x.sec", "y.sec")
 
@@ -156,7 +156,7 @@ Coord <- ggproto("Coord",
       function(guide, guide_param, scale) {
         guide_param <- guide$train(guide_param, scale)
         guide_param <- guide$transform(guide_param, self, panel_params)
-        guide_param <- guide$get_layer_key(guide_param, layers, default_mapping)
+        guide_param <- guide$get_layer_key(guide_param, layers)
         guide_param
       },
       guide = guides[!empty],
diff --git a/R/guide-.R b/R/guide-.R
index ec56757b0f..a1c194bf99 100644
--- a/R/guide-.R
+++ b/R/guide-.R
@@ -175,7 +175,7 @@ Guide <- ggproto(
 
   # Function for extracting information from the layers.
   # Mostly applies to `guide_legend()` and `guide_binned()`
-  get_layer_key = function(params, layers, default_mapping) {
+  get_layer_key = function(params, layers) {
     return(params)
   },
 
diff --git a/R/guide-colorbar.R b/R/guide-colorbar.R
index 48f371bd3e..65291f37cc 100644
--- a/R/guide-colorbar.R
+++ b/R/guide-colorbar.R
@@ -373,7 +373,7 @@ GuideColourbar <- ggproto(
     return(list(guide = self, params = params))
   },
 
-  get_layer_key = function(params, layers, default_mapping) {
+  get_layer_key = function(params, layers) {
 
     guide_layers <- lapply(layers, function(layer) {
 
diff --git a/R/guide-legend.R b/R/guide-legend.R
index bae10f8d49..0e6193aa24 100644
--- a/R/guide-legend.R
+++ b/R/guide-legend.R
@@ -294,7 +294,7 @@ GuideLegend <- ggproto(
   },
 
   # Arrange common data for vertical and horizontal legends
-  get_layer_key = function(params, layers, default_mapping) {
+  get_layer_key = function(params, layers) {
 
     decor <- lapply(layers, function(layer) {
 
diff --git a/R/guides-.R b/R/guides-.R
index 93a037a3d8..fccaf315d8 100644
--- a/R/guides-.R
+++ b/R/guides-.R
@@ -350,16 +350,16 @@ Guides <- ggproto(
   },
 
   # Loop over guides to let them extract information from layers
-  process_layers = function(self, layers, default_mapping) {
+  process_layers = function(self, layers) {
     params <- Map(
-      function(guide, param) guide$get_layer_key(param, layers, default_mapping),
+      function(guide, param) guide$get_layer_key(param, layers),
       guide = self$guides,
       param = self$params
     )
     keep <- !vapply(params, is.null, logical(1))
     self$guides <- self$guides[keep]
     self$params <- params[keep]
-    self$aesthetics <- self$aesthetics[keep]
+    self$aesthetics  <- self$aesthetics[keep]
     self$scale_index <- self$scale_index[keep]
     return()
   },
@@ -508,7 +508,7 @@ Guides <- ggproto(
 
     # Merge and process layers
     guides$merge()
-    guides$process_layers(layers, default_mapping)
+    guides$process_layers(layers)
     if (length(guides$guides) == 0) {
       return(no_guides)
     }
diff --git a/R/layout.R b/R/layout.R
index 2b0fa56fa7..56841b647b 100644
--- a/R/layout.R
+++ b/R/layout.R
@@ -212,7 +212,7 @@ Layout <- ggproto("Layout", NULL,
     invisible()
   },
 
-  setup_panel_guides = function(self, guides, layers, default_mapping) {
+  setup_panel_guides = function(self, guides, layers) {
     self$panel_params <- lapply(
       self$panel_params,
       self$coord$setup_panel_guides,
@@ -224,7 +224,6 @@ Layout <- ggproto("Layout", NULL,
       self$panel_params,
       self$coord$train_panel_guides,
       layers,
-      default_mapping,
       self$coord_params
     )
 
diff --git a/R/plot-build.R b/R/plot-build.R
index 663edd1d3f..78b01a6fb8 100644
--- a/R/plot-build.R
+++ b/R/plot-build.R
@@ -168,7 +168,7 @@ ggplot_gtable.ggplot_built <- function(data) {
 
   geom_grobs <- by_layer(function(l, d) l$draw_geom(d, layout), plot$layers, data, "converting geom to grob")
 
-  layout$setup_panel_guides(plot$guides, plot$layers, plot$mapping)
+  layout$setup_panel_guides(plot$guides, plot$layers)
   plot_table <- layout$render(geom_grobs, data, theme, plot$labels)
 
   # Legends
diff --git a/tests/testthat/test-coord-.R b/tests/testthat/test-coord-.R
index b72a4fbd8f..c69eab0b51 100644
--- a/tests/testthat/test-coord-.R
+++ b/tests/testthat/test-coord-.R
@@ -34,7 +34,7 @@ test_that("guide names are not removed by `train_panel_guides()`", {
   layout <- data$layout
   data <- data$data
 
-  layout$setup_panel_guides(guides_list(NULL), plot$layers, plot$mapping)
+  layout$setup_panel_guides(guides_list(NULL), plot$layers)
 
   # Line showing change in outcome
   expect_equal(names(layout$panel_params[[1]]$guides$aesthetics),
diff --git a/tests/testthat/test-labels.R b/tests/testthat/test-labels.R
index 84ed4e2cfa..2517b8fac2 100644
--- a/tests/testthat/test-labels.R
+++ b/tests/testthat/test-labels.R
@@ -100,7 +100,7 @@ test_that("position axis label hierarchy works as intended", {
   # Guide titles overrule scale names
   p$layout$setup_panel_guides(
     guides_list(list(x = guide_axis("quuX"), y = guide_axis("corgE"))),
-    p$plot$layers, p$plot$mapping
+    p$plot$layers
   )
   expect_identical(
     p$layout$resolve_label(scale_x_continuous("Baz"), p$plot$labels),
@@ -127,7 +127,7 @@ test_that("position axis label hierarchy works as intended", {
   p$layout$setup_panel_guides(
     guides_list(list(x = guide_axis("quuX"), y = guide_axis("corgE"),
                      x.sec = guide_axis("waldo"), y.sec = guide_axis("fred"))),
-    p$plot$layers, p$plot$mapping
+    p$plot$layers
   )
   expect_identical(
     p$layout$resolve_label(xsec, p$plot$labels),
@@ -154,7 +154,7 @@ test_that("moving guide positions lets titles follow", {
       list(x = guide_axis("baz", position = "bottom"),
            y = guide_axis("qux", position = "left"))
     ),
-    p$plot$layers, p$plot$mapping
+    p$plot$layers
   )
   expect_identical(
     p$layout$resolve_label(p$layout$panel_scales_x[[1]], p$plot$labels),
@@ -171,7 +171,7 @@ test_that("moving guide positions lets titles follow", {
       list(x = guide_axis("baz", position = "top"),
            y = guide_axis("qux", position = "right"))
     ),
-    p$plot$layers, p$plot$mapping
+    p$plot$layers
   )
   expect_identical(
     p$layout$resolve_label(p$layout$panel_scales_x[[1]], p$plot$labels),
@@ -191,7 +191,7 @@ test_that("moving guide positions lets titles follow", {
            x.sec = guide_axis("quux"),
            y.sec = guide_axis("corge"))
     ),
-    p$plot$layers, p$plot$mapping
+    p$plot$layers
   )
   expect_identical(
     p$layout$resolve_label(p$layout$panel_scales_x[[1]], p$plot$labels),

From a23044384a42ea0e9e1b5f931253b322c0722c6f Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Sun, 16 Apr 2023 20:46:30 +0200
Subject: [PATCH 105/111] Test `Guides` instead of plain list

---
 tests/testthat/test-guides.R | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/tests/testthat/test-guides.R b/tests/testthat/test-guides.R
index 2de2f5fe40..ab69277a36 100644
--- a/tests/testthat/test-guides.R
+++ b/tests/testthat/test-guides.R
@@ -2,29 +2,23 @@ skip_on_cran() # This test suite is long-running (on cran) and is skipped
 
 test_that("plotting does not induce state changes in guides", {
 
-  guides <- list(
+  guides <- guides(
     x      = guide_axis(title = "X-axis"),
     colour = guide_colourbar(title = "Colourbar"),
     shape  = guide_legend(title = "Legend"),
     size   = guide_bins(title = "Bins")
   )
-  # We take an immutable copy of the guides by serialising them
-  snap_old <- serialize(guides, NULL)
 
-  # Now render a plot using these guides
   p <- ggplot(mpg, aes(displ, hwy, colour = cty, shape = factor(cyl),
                        size = cyl)) +
     geom_point() +
-    scale_size_binned() +
-    guides(!!!guides)
-  grob <- ggplotGrob(p)
+    guides
+
+  snapshot <- serialize(as.list(p$guides), NULL)
 
-  # Test: have the guides changed by rendering the plot?
-  expect_identical(guides, unserialize(snap_old))
+  grob <- ggplotGrob(p)
 
-  # Negative control: if they would have changed, we'd detect it
-  guides$colour$nonsense <- "foobar"
-  expect_false(isTRUE(all.equal(guides, unserialize(snap_old))))
+  expect_identical(as.list(p$guides), unserialize(snapshot))
 })
 
 test_that("colourbar trains without labels", {

From 5bd9e59178832f7e3f6572b73403e6b986ffec19 Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Sun, 16 Apr 2023 21:23:56 +0200
Subject: [PATCH 106/111] validator also validates output of function name
 input

---
 R/guides-.R | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/R/guides-.R b/R/guides-.R
index fccaf315d8..d333cfd93a 100644
--- a/R/guides-.R
+++ b/R/guides-.R
@@ -614,7 +614,7 @@ validate_guide <- function(guide) {
     fun <- find_global(paste0("guide_", guide), env = global_env(),
                        mode = "function")
     if (is.function(fun)) {
-      return(fun())
+      guide <- fun()
     }
   }
   if (inherits(guide, "Guide")) {

From 54b3a6a47c349096eebe4de52650458c205a788e Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Sun, 16 Apr 2023 21:57:02 +0200
Subject: [PATCH 107/111] remove unnecessary `scale_index` field

---
 R/guides-.R                  | 28 ++++++----------------------
 tests/testthat/test-guides.R |  2 +-
 2 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/R/guides-.R b/R/guides-.R
index d333cfd93a..dcef8f310e 100644
--- a/R/guides-.R
+++ b/R/guides-.R
@@ -126,9 +126,6 @@ Guides <- ggproto(
   # How to treat missing guides
   missing = NULL,
 
-  # An index parallel to `guides` for matching guides with scales
-  # Currently not used, but should be useful for non-position training etc.
-  scale_index = integer(),
 
   # A vector of aesthetics parallel to `guides` tracking which guide belongs to
   # which aesthetic. Used in `get_guide()` and `get_params()` method
@@ -200,8 +197,7 @@ Guides <- ggproto(
   setup = function(
     self, scales, aesthetics = NULL,
     default = guide_none(),
-    missing = guide_none(),
-    keep_none = TRUE
+    missing = guide_none()
   ) {
 
     if (is.null(aesthetics)) {
@@ -262,21 +258,12 @@ Guides <- ggproto(
       guide
     })
 
-    # Non-position guides drop `GuideNone`
-    if (!keep_none) {
-      is_none <- vapply(new_guides, inherits, logical(1), what = "GuideNone")
-      new_guides <- new_guides[!is_none]
-      scale_idx  <- scale_idx[!is_none]
-      aesthetics <- aesthetics[!is_none]
-    }
-
     # Create updated child
     ggproto(
       NULL, self,
-      guides      = new_guides,
-      scale_index = scale_idx,
-      aesthetics  = aesthetics,
-      params      = lapply(new_guides, `[[`, "params")
+      guides     = new_guides,
+      aesthetics = aesthetics,
+      params     = lapply(new_guides, `[[`, "params")
     )
   },
 
@@ -284,7 +271,6 @@ Guides <- ggproto(
   drop_none = function(self) {
     is_none <- vapply(self$guides, inherits, logical(1), what = "GuideNone")
     self$guides      <- self$guides[!is_none]
-    self$scale_index <- self$scale_index[!is_none]
     self$aesthetics  <- self$aesthetics[!is_none]
     self$params      <- self$params[!is_none]
     return()
@@ -304,7 +290,7 @@ Guides <- ggproto(
       guide = self$guides,
       param = self$params,
       aes   = self$aesthetics,
-      scale = scales[self$scale_index]
+      scale = scales
     )
     self$update_params(params)
     self$drop_none()
@@ -345,7 +331,6 @@ Guides <- ggproto(
     self$guides <- lapply(groups, `[[`, "guide")
     self$params <- lapply(groups, `[[`, "params")
     self$aesthetics  <- self$aesthetics[indices]
-    self$scale_index <- self$scale_index[indices]
     return()
   },
 
@@ -360,7 +345,6 @@ Guides <- ggproto(
     self$guides <- self$guides[keep]
     self$params <- params[keep]
     self$aesthetics  <- self$aesthetics[keep]
-    self$scale_index <- self$scale_index[keep]
     return()
   },
 
@@ -500,7 +484,7 @@ Guides <- ggproto(
     if (length(scales) == 0) {
       return(no_guides)
     }
-    guides <- self$setup(scales, keep_none = FALSE)
+    guides <- self$setup(scales)
     guides$train(scales, theme$legend.direction, labels)
     if (length(guides$guides) == 0) {
       return(no_guides)
diff --git a/tests/testthat/test-guides.R b/tests/testthat/test-guides.R
index ab69277a36..ca1ae2581d 100644
--- a/tests/testthat/test-guides.R
+++ b/tests/testthat/test-guides.R
@@ -166,7 +166,7 @@ test_that("guide merging for guide_legend() works as expected", {
     scales$add(scale2)
 
     guides <- guides_list(NULL)
-    guides <- guides$setup(scales$scales, keep_none = FALSE)
+    guides <- guides$setup(scales$scales)
     guides$train(scales$scales, "vertical", labs())
     guides$merge()
     guides$params

From a1bbe23d62e11febf1717afde1f0746b193dd3fb Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Sun, 16 Apr 2023 22:03:57 +0200
Subject: [PATCH 108/111] Deal with `guide_none()` once

---
 DESCRIPTION    |  2 +-
 R/guide-none.R |  2 ++
 R/guides-.R    | 19 +++++++++++--------
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/DESCRIPTION b/DESCRIPTION
index 5d1c2f272b..bd42367741 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -179,6 +179,7 @@ Collate:
     'guide-bins.R'
     'guide-colorbar.R'
     'guide-colorsteps.R'
+    'layer.R'
     'guide-none.R'
     'guides-.R'
     'guides-grid.R'
@@ -187,7 +188,6 @@ Collate:
     'import-standalone-types-check.R'
     'labeller.R'
     'labels.R'
-    'layer.R'
     'layer-sf.R'
     'layout.R'
     'limits.R'
diff --git a/R/guide-none.R b/R/guide-none.R
index 5a46430496..ae26a8a1e9 100644
--- a/R/guide-none.R
+++ b/R/guide-none.R
@@ -1,3 +1,5 @@
+#' @include layer.R
+NULL
 
 #' Empty guide
 #'
diff --git a/R/guides-.R b/R/guides-.R
index dcef8f310e..e16a2fff86 100644
--- a/R/guides-.R
+++ b/R/guides-.R
@@ -1,3 +1,6 @@
+#' @include guide-none.R
+NULL
+
 #' Set guides for each scale
 #'
 #' Guides for each scale can be set scale-by-scale with the `guide`
@@ -113,8 +116,8 @@ update_guides <- function(p, guides) {
 # Class -------------------------------------------------------------------
 
 # Guides object encapsulates multiple guides and their state.
-guides_list <- function(guides = NULL, .missing = guide_none()) {
-  ggproto(NULL, Guides, guides = guides, missing = .missing)
+guides_list <- function(guides = NULL) {
+  ggproto(NULL, Guides, guides = guides)
 }
 
 Guides <- ggproto(
@@ -123,16 +126,16 @@ Guides <- ggproto(
   # A list of guides to be updated by 'add' or populated upon construction.
   guides = list(),
 
-  # How to treat missing guides
-  missing = NULL,
-
+  # To avoid repeatedly calling `guide_none()` to substitute missing guides,
+  # we include its result as a field in the `Guides` class.
+  missing = guide_none(),
 
   # A vector of aesthetics parallel to `guides` tracking which guide belongs to
   # which aesthetic. Used in `get_guide()` and `get_params()` method
   aesthetics = character(),
 
   # Updates the parameters of the guides. NULL parameters indicate switch to
-  # `guide_none()`.
+  # `guide_none()` from `Guide$missing` field.
   update_params = function(self, params) {
     if (length(params) != length(self$params)) {
       cli::cli_abort(paste0(
@@ -196,8 +199,8 @@ Guides <- ggproto(
   # Setup routine for resolving and validating guides based on paired scales.
   setup = function(
     self, scales, aesthetics = NULL,
-    default = guide_none(),
-    missing = guide_none()
+    default = self$missing,
+    missing = self$missing
   ) {
 
     if (is.null(aesthetics)) {

From 91059d7d7488564a5a4be8dc5f5e20e4e5bc28ca Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Sun, 16 Apr 2023 22:40:37 +0200
Subject: [PATCH 109/111] Reorganise and clarify

---
 R/guides-.R | 237 +++++++++++++++++++++++++++++-----------------------
 1 file changed, 132 insertions(+), 105 deletions(-)

diff --git a/R/guides-.R b/R/guides-.R
index e16a2fff86..320cde125b 100644
--- a/R/guides-.R
+++ b/R/guides-.R
@@ -123,16 +123,31 @@ guides_list <- function(guides = NULL) {
 Guides <- ggproto(
   "Guides", NULL,
 
-  # A list of guides to be updated by 'add' or populated upon construction.
+  ## Fields --------------------------------------------------------------------
+
+  # `guides` is the only initially mutable field.
+  # It gets populated as a user adds `+ guides(...)` to a plot by the
+  # `Guides$add()` method.
   guides = list(),
 
   # To avoid repeatedly calling `guide_none()` to substitute missing guides,
-  # we include its result as a field in the `Guides` class.
+  # we include its result as a field in the `Guides` class. This field is
+  # never updated.
   missing = guide_none(),
 
-  # A vector of aesthetics parallel to `guides` tracking which guide belongs to
-  # which aesthetic. Used in `get_guide()` and `get_params()` method
-  aesthetics = character(),
+  ## Setters -------------------------------------------------------------------
+
+  # Function for adding new guides provided by user
+  add = function(self, guides) {
+    if (is.null(guides)) {
+      return(invisible())
+    }
+    if (inherits(guides, "Guides")) {
+      guides <- guides$guides
+    }
+    self$guides <- defaults(guides, self$guides)
+    invisible()
+  },
 
   # Updates the parameters of the guides. NULL parameters indicate switch to
   # `guide_none()` from `Guide$missing` field.
@@ -151,21 +166,20 @@ Guides <- ggproto(
     # Set empty parameter guides to `guide_none`. Don't overwrite parameters,
     # because things like 'position' are relevant.
     self$guides[is_empty] <- list(self$missing)
-    return(NULL)
+    invisible()
   },
 
-  # Function for adding new guides
-  add = function(self, guides) {
-    if (is.null(guides)) {
-      return()
-    }
-    if (inherits(guides, "Guides")) {
-      guides <- guides$guides
-    }
-    self$guides <- defaults(guides, self$guides)
-    return()
+  # Function for dropping GuideNone objects from the Guides object. Typically
+  # called after training the guides on scales.
+  subset_guides = function(self, i) {
+    self$guides     <- self$guides[i]
+    self$aesthetics <- self$aesthetics[i]
+    self$params     <- self$params[i]
+    invisible()
   },
 
+  ## Getters -------------------------------------------------------------------
+
   # Function for retrieving guides by index or aesthetic
   get_guide = function(self, index) {
     if (is.character(index)) {
@@ -196,7 +210,96 @@ Guides <- ggproto(
     }
   },
 
+  ## Building ------------------------------------------------------------------
+
+  # The `Guides$build()` method is called in ggplotGrob (plot-build.R) and makes
+  # the guide box for *non-position* scales.
+  # Note that position scales are handled in `Coord`s, which have their own
+  # procedures to do equivalent steps.
+  #
+  # The procedure is as follows:
+  #
+  # 1. Guides$setup()
+  #      generates a guide object for every scale-aesthetic pair
+  #
+  # 2. Guides$train()
+  #      train each scale and generate guide definition for all guides
+  #      here, one guide object for one scale
+  #
+  # 2. Guides$merge()
+  #      merge guide objects if they are overlayed
+  #      number of guide objects may be less than number of scales
+  #
+  # 3. Guides$process_layers()
+  #      process layer information and generate geom info.
+  #
+  # 4. Guides$draw()
+  #      generate guide grob from each guide object
+  #      one guide grob for one guide object
+  #
+  # 5. Guides$assemble()
+  #      arrange all guide grobs
+
+  build = function(self, scales, layers, default_mapping,
+                   position, theme, labels) {
+
+    position  <- legend_position(position)
+    no_guides <- zeroGrob()
+    if (position == "none") {
+      return(no_guides)
+    }
+
+    theme$legend.key.width  <- theme$legend.key.width  %||% theme$legend.key.size
+    theme$legend.key.height <- theme$legend.key.height %||% theme$legend.key.size
+
+
+    default_direction <- if (position == "inside") "vertical" else position
+    theme$legend.box       <- theme$legend.box       %||% default_direction
+    theme$legend.direction <- theme$legend.direction %||% default_direction
+    theme$legend.box.just  <- theme$legend.box.just  %||% switch(
+      position,
+      inside     = c("center", "center"),
+      vertical   = c("left",   "top"),
+      horizontal = c("center", "top")
+    )
+
+    # Setup and train on scales
+    scales <- scales$non_position_scales()$scales
+    if (length(scales) == 0) {
+      return(no_guides)
+    }
+    guides <- self$setup(scales)
+    guides$train(scales, theme$legend.direction, labels)
+    if (length(guides$guides) == 0) {
+      return(no_guides)
+    }
+
+    # Merge and process layers
+    guides$merge()
+    guides$process_layers(layers)
+    if (length(guides$guides) == 0) {
+      return(no_guides)
+    }
+
+    # Draw and assemble
+    grobs <- guides$draw(theme)
+    guides$assemble(grobs, theme)
+  },
+
   # Setup routine for resolving and validating guides based on paired scales.
+  #
+  # The output of the setup is a child `Guides` class with two additional
+  # mutable fields, both of which are parallel to the child's `Guides$guides`
+  # field.
+  #
+  # 1. The child's `Guides$params` manages all parameters of a guide that may
+  # need to be updated during subsequent steps. This ensures that we never need
+  # to update the `Guide` itself and risk reference class shenanigans.
+  #
+  # 2. The child's `Guides$aesthetics` holds the aesthetic name of the scale
+  # that spawned the guide. The `Coord`'s own build methods need this to
+  # correctly pick the primary and secondary guides.
+
   setup = function(
     self, scales, aesthetics = NULL,
     default = self$missing,
@@ -265,21 +368,14 @@ Guides <- ggproto(
     ggproto(
       NULL, self,
       guides     = new_guides,
-      aesthetics = aesthetics,
-      params     = lapply(new_guides, `[[`, "params")
+      # Extract the guide's params to manage separately
+      params     = lapply(new_guides, `[[`, "params"),
+      aesthetics = aesthetics
     )
   },
 
-  # Function for dropping GuideNone objects from the Guides object
-  drop_none = function(self) {
-    is_none <- vapply(self$guides, inherits, logical(1), what = "GuideNone")
-    self$guides      <- self$guides[!is_none]
-    self$aesthetics  <- self$aesthetics[!is_none]
-    self$params      <- self$params[!is_none]
-    return()
-  },
-
   # Loop over every guide-scale combination to perform training
+  # A strong assumption here is that `scales` is parallel to the guides
   train = function(self, scales, direction, labels) {
 
     params <- Map(
@@ -296,7 +392,8 @@ Guides <- ggproto(
       scale = scales
     )
     self$update_params(params)
-    self$drop_none()
+    is_none <- vapply(self$guides, inherits, logical(1), what = "GuideNone")
+    self$subset_guides(!is_none)
   },
 
   # Function to merge guides that encode the same information
@@ -334,21 +431,19 @@ Guides <- ggproto(
     self$guides <- lapply(groups, `[[`, "guide")
     self$params <- lapply(groups, `[[`, "params")
     self$aesthetics  <- self$aesthetics[indices]
-    return()
+    invisible()
   },
 
   # Loop over guides to let them extract information from layers
   process_layers = function(self, layers) {
-    params <- Map(
+    self$params <- Map(
       function(guide, param) guide$get_layer_key(param, layers),
       guide = self$guides,
       param = self$params
     )
-    keep <- !vapply(params, is.null, logical(1))
-    self$guides <- self$guides[keep]
-    self$params <- params[keep]
-    self$aesthetics  <- self$aesthetics[keep]
-    return()
+    keep <- !vapply(self$params, is.null, logical(1))
+    self$subset_guides(keep)
+    invisible()
   },
 
   # Loop over every guide, let them draw their grobs
@@ -360,6 +455,7 @@ Guides <- ggproto(
     )
   },
 
+  # Combining multiple guides in a guide box
   assemble = function(grobs, theme) {
     # Set spacing
     theme$legend.spacing   <- theme$legend.spacing    %||% unit(0.5, "lines")
@@ -434,76 +530,7 @@ Guides <- ggproto(
     guides
   },
 
-  # building non-position guides - called in ggplotGrob (plot-build.r)
-  #
-  # the procedure is as follows:
-  #
-  # 1. guides$setup()
-  #      generates a guide object for every scale-aesthetic pair
-  #
-  # 2. guides$train()
-  #      train each scale and generate guide definition for all guides
-  #      here, one guide object for one scale
-  #
-  # 2. guides$merge()
-  #      merge guide objects if they are overlayed
-  #      number of guide objects may be less than number of scales
-  #
-  # 3. guides$process_layers()
-  #      process layer information and generate geom info.
-  #
-  # 4. guides$draw()
-  #      generate guide grob from each guide object
-  #      one guide grob for one guide object
-  #
-  # 5. guides$assemble()
-  #      arrange all guide grobs
-
-  build = function(self, scales, layers, default_mapping,
-                   position, theme, labels) {
-
-    position  <- legend_position(position)
-    no_guides <- zeroGrob()
-    if (position == "none") {
-      return(no_guides)
-    }
-
-    theme$legend.key.width  <- theme$legend.key.width  %||% theme$legend.key.size
-    theme$legend.key.height <- theme$legend.key.height %||% theme$legend.key.size
-
-
-    default_direction <- if (position == "inside") "vertical" else position
-    theme$legend.box       <- theme$legend.box       %||% default_direction
-    theme$legend.direction <- theme$legend.direction %||% default_direction
-    theme$legend.box.just  <- theme$legend.box.just  %||% switch(
-      position,
-      inside     = c("center", "center"),
-      vertical   = c("left",   "top"),
-      horizontal = c("center", "top")
-    )
-
-    # Setup and train on scales
-    scales <- scales$non_position_scales()$scales
-    if (length(scales) == 0) {
-      return(no_guides)
-    }
-    guides <- self$setup(scales)
-    guides$train(scales, theme$legend.direction, labels)
-    if (length(guides$guides) == 0) {
-      return(no_guides)
-    }
-
-    # Merge and process layers
-    guides$merge()
-    guides$process_layers(layers)
-    if (length(guides$guides) == 0) {
-      return(no_guides)
-    }
-
-    # Draw and assemble
-    grobs <- guides$draw(theme)
-    guides$assemble(grobs, theme)
-  },
+  ## Utilities -----------------------------------------------------------------
 
   print = function(self) {
 

From 57b82f7a0b0f424c87f099179ccae4f11e85dabd Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Sun, 23 Apr 2023 22:50:18 +0200
Subject: [PATCH 110/111] Fix plot state bug

---
 R/guides-.R                  |  5 ++++-
 tests/testthat/test-guides.R | 18 ++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/R/guides-.R b/R/guides-.R
index 320cde125b..66883b0e58 100644
--- a/R/guides-.R
+++ b/R/guides-.R
@@ -106,7 +106,10 @@ guides <- function(...) {
 update_guides <- function(p, guides) {
   p <- plot_clone(p)
   if (inherits(p$guides, "Guides")) {
-    p$guides$add(guides)
+    old <- p$guides
+    new <- ggproto(NULL, old)
+    new$add(guides)
+    p$guides <- new
   } else {
     p$guides <- guides
   }
diff --git a/tests/testthat/test-guides.R b/tests/testthat/test-guides.R
index ca1ae2581d..71314e8cfb 100644
--- a/tests/testthat/test-guides.R
+++ b/tests/testthat/test-guides.R
@@ -21,6 +21,24 @@ test_that("plotting does not induce state changes in guides", {
   expect_identical(as.list(p$guides), unserialize(snapshot))
 })
 
+test_that("adding guides doesn't change plot state", {
+
+  p1 <- ggplot(mtcars, aes(disp, mpg))
+
+  expect_length(p1$guides$guides, 0)
+
+  p2 <- p1 + guides(y = guide_axis(angle = 45))
+
+  expect_length(p1$guides$guides, 0)
+  expect_length(p2$guides$guides, 1)
+
+  p3 <- p2 + guides(y = guide_axis(angle = 90))
+
+  expect_length(p3$guides$guides, 1)
+  expect_equal(p3$guides$guides[[1]]$params$angle, 90)
+  expect_equal(p2$guides$guides[[1]]$params$angle, 45)
+})
+
 test_that("colourbar trains without labels", {
   g <- guide_colorbar()
   sc <- scale_colour_continuous(limits = c(0, 4), labels = NULL)

From 700d717ee678c03f6ca2de9c52a0ecc9d935ba32 Mon Sep 17 00:00:00 2001
From: Teun van den Brand <49372158+teunbrand@users.noreply.github.com>
Date: Sun, 23 Apr 2023 22:52:51 +0200
Subject: [PATCH 111/111] Add news bullet

---
 NEWS.md | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/NEWS.md b/NEWS.md
index fc37b8305b..a205faf2ea 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,5 +1,28 @@
 # ggplot2 (development version)
 
+* The guide system, as the last remaining chunk of ggplot2, has been rewritten 
+  in ggproto. The axes and legends now inherit from a <Guide> class, which makes
+  them extensible in the same manner as geoms, stats, facets and coords 
+  (#3329, @teunbrand). In addition, the following changes were made:
+    * Styling theme parts of the guide now inherit from the plot's theme 
+      (#2728). 
+    * Styling non-theme parts of the guides accept <element> objects, so that
+      the following is possible: `guide_colourbar(frame = element_rect(...))`.
+    * Primary axis titles are now placed at the primary guide, so that
+      `guides(x = guide_axis(position = "top"))` will display the title at the
+      top by default (#4650).
+    * Unknown secondary axis guide positions are now inferred as the opposite 
+      of the primary axis guide when the latter has a known `position` (#4650).
+    * `guide_colourbar()`, `guide_coloursteps()` and `guide_bins()` gain a
+      `ticks.length` argument.
+    * In `guide_bins()`, the title no longer arbitrarily becomes offset from
+      the guide when it has long labels.
+    * The `order` argument of guides now strictly needs to be a length-1 
+      integer (#4958).
+    * More informative error for mismatched 
+     `direction`/`theme(legend.direction = ...)` arguments (#4364, #4930).
+    * `guide_coloursteps()` and `guide_bins()` sort breaks (#5152).
+
 * `geom_label()` now uses the `angle` aesthetic (@teunbrand, #2785)
 * 'lines' units in `geom_label()`, often used in the `label.padding` argument, 
   are now are relative to the text size. This causes a visual change, but fixes