Merge branch 'master' into use-params-for-doc

stan-dev · Dec 17, 2020 · 2259468 · 2259468
2 parents 8810cd7 + dcdffb7
commit 2259468
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 10 deletions.
diff --git a/R/knitr.R b/R/knitr.R
@@ -84,7 +84,7 @@ eng_cmdstan <- function(options) {
     }
     file <- write_stan_file(options$code, dir = dir)
     mod <- cmdstan_model(file)
-    assign(output_var, mod, envir = knitr::knit_global())
+    assign(output_var, mod, envir = cmdstanr_knitr_env())
   }
   options$engine <- "stan" # for syntax highlighting
   code <- paste(options$code, collapse = "\n")

diff --git a/R/zzz.R b/R/zzz.R
@@ -1,12 +1,3 @@
-.onAttach <- function(...) {
-  startup_messages()
-}
-
-.onLoad <- function(...) {
-  cmdstanr_initialize()
-}
-
-
 startup_messages <- function() {
   packageStartupMessage("This is cmdstanr version ", utils::packageVersion("cmdstanr"))
   packageStartupMessage("- Online documentation and vignettes at mc-stan.org/cmdstanr")
@@ -65,3 +56,23 @@ cmdstanr_initialize <- function() {
   }
   invisible(TRUE)
 }
+
+cmdstanr_knitr_env_function_generator <- function(env1) {
+  function(env2 = NULL) {
+    if (!is.null(env2)) {
+      env1 <<- env2
+    }
+    invisible(env1)
+  }
+}
+cmdstanr_knitr_env <- cmdstanr_knitr_env_function_generator(new.env())
+
+
+.onAttach <- function(...) {
+  startup_messages()
+}
+
+.onLoad <- function(...) {
+  cmdstanr_knitr_env(knitr::knit_global())
+  cmdstanr_initialize()
+}