chore: Add {tools} and {utils} to Suggests

rstudio · Dec 11, 2024 · ab1816b · ab1816b
1 parent 9b522f9
commit ab1816b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -55,6 +55,8 @@ Suggests:
     shiny (> 1.8.1),
     testthat,
     thematic,
+    tools,
+    utils,
     withr,
     yaml
 Config/Needs/deploy:

diff --git a/R/bs-theme-preset-brand.R b/R/bs-theme-preset-brand.R
@@ -260,6 +260,10 @@ brand_font_bunny <- function(
   style = NULL,
   display = NULL
 ) {
+  if (!is_installed("utils")) {
+    abort("The {utils} package is required.")
+  }
+
   weight <- brand_remap_font_weight(weight) %||% seq(100, 900, 100)
 
   style <- style %||% c("normal", "italic")
@@ -319,6 +323,10 @@ brand_font_bunny <- function(
 }
 
 brand_font_file <- function(family, files, brand_root = getwd()) {
+  if (!is_installed("tools")) {
+    abort("The {tools} package is required.")
+  }
+
   if (!(is.list(files) && length(files) > 0)) {
     abort(
       c(
@@ -345,7 +353,7 @@ brand_font_file <- function(family, files, brand_root = getwd()) {
       )
     }
     font_type <- switch(
-      sub(".+[.]([a-z0-9]+)$", "\\1", tolower(font_path)),
+      tools::file_ext(tolower(font_path)),
       # otc = "collection",
       # ttc = "collection",
       # eot = "embedded-opentype",