more conflict resolving

Merge branch 'main' into transform_alias # Conflicts: # NEWS.md # R/scale-continuous.R # man/cscale.Rd # man/pal_shape.Rd
r-lib · Nov 7, 2023 · ee4ee3d · ee4ee3d
2 parents 3447953 + 727bd71
commit ee4ee3d
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -35,8 +35,9 @@
   search of transformations. The S3 class of transformations has been
   renamed from `"trans"` to `"transform"`. `new_transform()` is the new 
   `trans_new()`.
+* Palette functions now have the `pal_`-prefix. The old `_pal`-suffixed versions
+  are kept for backward compatibility.
 
-
 # scales 1.2.1
 
 * Re-document to fix HTML issues in `.Rd`.

diff --git a/R/documentation.R b/R/documentation.R
@@ -9,4 +9,4 @@ seealso <- function(pattern) {
 
 seealso_transform <- function() seealso("^transform_")
 
-seealso_pal <- function() seealso("_pal$")
+seealso_pal <- function() seealso("^pal_")
diff --git a/R/pal-shape.R → R/pal-shape.r b/R/pal-shape.R → R/pal-shape.r
diff --git a/R/scale-continuous.R b/R/scale-continuous.R
@@ -14,11 +14,11 @@
 #'  \Sexpr[results=rd,stage=build]{scales:::seealso_transform()}.
 #' @export
 #' @examples
-#' with(mtcars, plot(disp, mpg, cex = cscale(hp, rescale_pal())))
-#' with(mtcars, plot(disp, mpg, cex = cscale(hp, rescale_pal(),
+#' with(mtcars, plot(disp, mpg, cex = cscale(hp, pal_rescale())))
+#' with(mtcars, plot(disp, mpg, cex = cscale(hp, pal_rescale(),
 #'   trans = transform_sqrt()
 #' )))
-#' with(mtcars, plot(disp, mpg, cex = cscale(hp, area_pal())))
+#' with(mtcars, plot(disp, mpg, cex = cscale(hp, pal_area())))
 #' with(mtcars, plot(disp, mpg,
 #'   pch = 20, cex = 5,
 #'   col = cscale(hp, pal_seq_gradient("grey80", "black"))

diff --git a/man/cscale.Rd b/man/cscale.Rd
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,4 +9,4 @@ seealso <- function(pattern) {

		seealso_transform <- function() seealso("^transform_")

		seealso_pal <- function() seealso("_pal$")
		seealso_pal <- function() seealso("^pal_")