Skip to content

Commit

Permalink
Merge pull request #414 from dmurdoch/release1.3
Browse files Browse the repository at this point in the history
Release1.3 fix
  • Loading branch information
dmurdoch authored Mar 5, 2024
2 parents 630f621 + e1fb975 commit 41b9e90
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 1 deletion.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Package: rgl
Version: 1.3.0
Version: 1.3.1
Title: 3D Visualization Using OpenGL
Authors@R: c(person("Duncan", "Murdoch", role = c("aut", "cre"),
email = "[email protected]"),
Expand Down
7 changes: 7 additions & 0 deletions cran-comments.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
# 1.3.1

This adds a workaround to a bug in the interaction of the
`markdown` and `knitr` packages that caused the vignettes
to attempt to produce snapshots if Pandoc was not available,
even though Pandoc is not needed.

# 1.3.0

This small release is at the request of Tomas to adapt to
Expand Down
6 changes: 6 additions & 0 deletions vignettes/setup.R
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@ if (!requireNamespace("rmarkdown", quietly = TRUE)) {
knitr::knit_exit()
}

# If Pandoc is not installed, the output format won't be set
# knitr needs this; see https://github.com/rstudio/markdown/issues/115
if (is.null(knitr::opts_knit$get("rmarkdown.output.format"))){
knitr::opts_knit$set(rmarkdown.pandoc.to = "html")
}

# knitr::opts_chunk$set(snapshot = TRUE) # for snapshots instead of dynamic

documentedfns <- c()
Expand Down

0 comments on commit 41b9e90

Please sign in to comment.