wrong logic in the PR #1170 797c7fa; should use || instead of &&

I discovered this while investigating #1216
rstudio · Dec 12, 2017 · c10baa5 · c10baa5
1 parent 07f7d8e
commit c10baa5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: rmarkdown
 Type: Package
 Title: Dynamic Documents for R
-Version: 1.8.3
+Version: 1.8.4
 Authors@R: c(
   person("JJ", "Allaire", role = "aut", email = "jj@rstudio.com"),
   person("Yihui", "Xie", role = c("aut", "cre"), email = "xie@yihui.name", comment = c(ORCID = "0000-0003-0645-5666")),

diff --git a/R/md_document.R b/R/md_document.R
@@ -61,7 +61,7 @@ md_document <- function(variant = "markdown_strict",
                         pandoc_args = NULL) {
 
   # base pandoc options for all markdown output
-  args <- c(if (variant != "markdown" && !preserve_yaml) "--standalone")
+  args <- c(if (variant != "markdown" || !preserve_yaml) "--standalone")
 
   # table of contents
   args <- c(args, pandoc_toc_args(toc, toc_depth))