replace is.rel() with is_rel()

Author: teunbrand

R/guide-axis-logticks.R

@@ -108,7 +108,7 @@ guide_axis_logticks <- function(
   if (is_bare_numeric(mid))    mid  <- rel(mid)
   if (is_bare_numeric(short)) short <- rel(short)
 
-  check_fun <- function(x) (is.rel(x) || is.unit(x)) && length(x) == 1
+  check_fun <- function(x) (is_rel(x) || is.unit(x)) && length(x) == 1
   what <- "a {.cls rel} or {.cls unit} object of length 1"
   check_object(long,  check_fun, what)
   check_object(mid,   check_fun, what)

R/theme-elements.R

@@ -280,7 +280,12 @@ print.rel <- function(x, ...) print(noquote(paste(x, " *", sep = "")))
 #' Reports whether x is a rel object
 #' @param x An object to test
 #' @keywords internal
-is.rel <- function(x) inherits(x, "rel")
+is_rel <- function(x) inherits(x, "rel")
+
+is.rel <- function(x) {
+  deprecate_warn0("4.0.0", "is.rel()", "is_rel()")
+  is_rel(x)
+}
 
 #' Render a specified theme element into a grob
 #'

R/theme.R

@@ -904,9 +904,9 @@ combine_elements <- function(e1, e2) {
   }
 
   # Inheritance of rel objects
-  if (is.rel(e1)) {
+  if (is_rel(e1)) {
     # Both e1 and e2 are rel, give product as another rel
-    if (is.rel(e2)) {
+    if (is_rel(e2)) {
       return(rel(unclass(e1) * unclass(e2)))
     }
     # If e2 is a unit/numeric, return modified unit/numeric
@@ -946,12 +946,12 @@ combine_elements <- function(e1, e2) {
   e1[n] <- e2[n]
 
   # Calculate relative sizes
-  if (is.rel(e1$size)) {
+  if (is_rel(e1$size)) {
     e1$size <- e2$size * unclass(e1$size)
   }
 
   # Calculate relative linewidth
-  if (is.rel(e1$linewidth)) {
+  if (is_rel(e1$linewidth)) {
     e1$linewidth <- e2$linewidth * unclass(e1$linewidth)
   }