Correctly build variables for pandoc

This fix also addition of 91bc2bd and add tests
rstudio · May 2, 2023 · 0af04e4 · 0af04e4
1 parent 04743ea
commit 0af04e4
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 15 deletions.
diff --git a/R/article.R b/R/article.R
@@ -252,7 +252,7 @@ ims_article <- function(journal = c("aoas", "aap", "aop", "aos", "sts"),
   )
 
   # Convert to pandoc arguments
-  pandoc_arg_list <- vec_to_pandoc_variable_args(args)
+  pandoc_arg_list <- list_to_pandoc_variable_args(args)
 
   pdf_document_format(
     "ims",

diff --git a/R/ieee_article.R b/R/ieee_article.R
@@ -75,7 +75,7 @@ ieee_article <- function(draftmode = c("final", "draft", "draftcls", "draftclsno
   args <- c(args, plist[plist])
 
   # Convert to pandoc arguments
-  pandoc_arg_list <- vec_to_pandoc_variable_args(args)
+  pandoc_arg_list <- list_to_pandoc_variable_args(args)
 
   pdf_document_format(
     "ieee",

diff --git a/R/oup_article.R b/R/oup_article.R
@@ -100,7 +100,7 @@ oup_article <- function( # Controls template to use. 1 for newer template.
   )
 
   # Convert to pandoc arguments
-  args <- vec_to_pandoc_variable_args(args)
+  args <- list_to_pandoc_variable_args(args)
 
   # namedate
   if (namedate) {

diff --git a/R/utils.R b/R/utils.R
@@ -139,9 +139,19 @@ render_draft <- function(journal, output_options = NULL, quiet = FALSE) {
 }
 
 # Use to create variables command for Pandoc from a named vector
-vec_to_pandoc_variable_args <- function(v_args) {
-  truthy <- Filter(isTRUE, v_args)
-  v_args <- setdiff(v_args, truthy)
+list_to_pandoc_variable_args <- function(v_args) {
+  truthy <- which(sapply(v_args, isTRUE))
+  truthy_arg <- NULL
+  if (length(truthy) > 0) {
+    truthy_arg <- mapply(
+      rmarkdown::pandoc_variable_arg,
+      names(v_args[truthy]),
+      SIMPLIFY = FALSE,
+      USE.NAMES = FALSE
+    )
+    v_args <- v_args[-truthy]
+  }
+
   # Convert to pandoc arguments
   pandoc_arg_list <-  c(
     mapply(
@@ -151,12 +161,7 @@ vec_to_pandoc_variable_args <- function(v_args) {
       SIMPLIFY = FALSE,
       USE.NAMES = FALSE
     ),
-    mapply(
-      rmarkdown::pandoc_variable_arg,
-      names(truthy),
-      SIMPLIFY = FALSE,
-      USE.NAMES = FALSE
-    )
+    truthy_arg
   )
   unlist(pandoc_arg_list)
 }
@@ -210,7 +215,7 @@ pdf_document_format <- function(format,
   fmt$inherits <- "pdf_document"
 
   ## Set some variables to adapt template based on Pandoc version
-  args <- vec_to_pandoc_variable_args(list(
+  args <- list_to_pandoc_variable_args(list(
     pandoc3 = rmarkdown::pandoc_available("3")
   ))
   fmt$pandoc$args <- c(fmt$pandoc$args, args)

diff --git a/tests/testit/test-utils.R b/tests/testit/test-utils.R
@@ -38,13 +38,24 @@ assert("all journals are listed and have a template folder", {
 })
 
 assert("Named vector is transformed to pandoc variable args", {
-  (vec_to_pandoc_variable_args(c(a = "b")) %==%
+  (list_to_pandoc_variable_args(c(a = "b")) %==%
     c(rmarkdown::pandoc_variable_arg("a", "b"))
   )
-  (vec_to_pandoc_variable_args(c(a = "b", c = "d")) %==%
+  (list_to_pandoc_variable_args(c(a = "b", c = "d")) %==%
     c(
       rmarkdown::pandoc_variable_arg("a", "b"),
       rmarkdown::pandoc_variable_arg("c", "d")
     )
   )
+  (list_to_pandoc_variable_args(list(c = TRUE)) %==%
+    c(
+      rmarkdown::pandoc_variable_arg("c")
+    )
+  )
+  (list_to_pandoc_variable_args(list(a = "b", c = TRUE)) %==%
+    c(
+      rmarkdown::pandoc_variable_arg("a", "b"),
+      rmarkdown::pandoc_variable_arg("c")
+    )
+  )
 })