Refactor a little

parmsam · Jan 30, 2024 · 2ff3300 · 2ff3300
1 parent 17ae138
commit 2ff3300
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 25 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -21,8 +21,8 @@ Imports:
     rlang,
     rmarkdown,
     rstudioapi,
-    utils,
     tools,
+    utils,
     yaml
 Suggests: 
     curl,
@@ -32,7 +32,8 @@ Suggests:
     withr,
     xfun
 VignetteBuilder: 
-    knitr, quarto
+    knitr,
+    quarto
 Config/testthat/edition: 3
 Encoding: UTF-8
 Roxygen: list(markdown = TRUE)

diff --git a/R/quarto-package.R b/R/quarto-package.R
@@ -4,5 +4,6 @@
 ## usethis namespace: start
 #' @import rlang
 #' @importFrom cli cli_inform
+#' @importFrom tools vignetteEngine
 ## usethis namespace: end
 NULL
diff --git a/R/utils-vignettes.R b/R/utils-vignettes.R
@@ -0,0 +1,22 @@
+register_vignette_engines <- function(pkg) {
+  vignetteEngine(
+    name = "pdf",
+    package = "quarto",
+    pattern = "[.]qmd$",
+    weave = function(file, ..., encoding = "UTF-8") {
+      quarto_render(file, ..., output_format = "pdf")
+    },
+    tangle = vignetteEngine("knitr::rmarkdown")$tangle,
+    aspell = vignetteEngine("knitr::rmarkdown")$aspell
+  )
+  vignetteEngine(
+    name = "html",
+    package = "quarto",
+    pattern = "[.]qmd$",
+    weave = function(file, ..., encoding = "UTF-8") {
+      quarto_render(file, ..., output_format = "html")
+    },
+    tangle = vignetteEngine("knitr::rmarkdown")$tangle,
+    aspell = vignetteEngine("knitr::rmarkdown")$aspell
+  )
+}
diff --git a/R/zzz.R b/R/zzz.R
@@ -1,24 +1,4 @@
-
-#' Register engines to support Quarto vignettes
-#' @importFrom tools vignetteEngine
-#' @noRd
-.onLoad <- function(libname, pkgname) { # args ignored
-  vignetteEngine(name = "pdf",
-                 package = "quarto",
-                 pattern = "[.]qmd$",
-                 weave = function(file, ..., encoding = "UTF-8") {
-                   quarto_render(file, ..., output_format = "pdf")
-                 },
-                 tangle = vignetteEngine("knitr::rmarkdown")$tangle,
-                 aspell = vignetteEngine("knitr::rmarkdown")$aspell
-                 )
-  vignetteEngine(name = "html",
-                 package = "quarto",
-                 pattern = "[.]qmd$",
-                 weave = function(file, ..., encoding = "UTF-8") {
-                   quarto_render(file, ..., output_format = "html")
-                 },
-                 tangle = vignetteEngine("knitr::rmarkdown")$tangle,
-                 aspell = vignetteEngine("knitr::rmarkdown")$aspell
-                 )
+# Register engines to support Quarto vignettes
+.onLoad <- function(lib, pkg) {
+  register_vignette_engines(pkg)
 }