homogenize use of rmarkdown::pandoc_variable_arg

Author: cderv

R/article.R

@@ -194,7 +194,7 @@ ims_article <- function(journal = c("aoas", "aap", "aop", "aos", "sts"),
                         keep_tex = TRUE, citation_package = "natbib",
                         md_extensions = c(
                           "-autolink_bare_uris" # disables automatic links
-                        ), ...) {
+                        ), pandoc_args = NULL, ...) {
 
   journal <- match.arg(journal)
   if (length(journal) > 1) stop("Please choose just one ", dQuote("journal"))
@@ -213,7 +213,7 @@ ims_article <- function(journal = c("aoas", "aap", "aop", "aos", "sts"),
 
   pdf_document_format(
     "ims", keep_tex = keep_tex, citation_package = citation_package,
-    md_extensions = md_extensions, pandoc_args = pandoc_arg_list,
+    md_extensions = md_extensions, pandoc_args = c(pandoc_arg_list, pandoc_args),
     ...
   )
 }

R/ieee_article.R

@@ -34,6 +34,7 @@
 #' Shell, Michael. "How to use the IEEEtran LATEX class." Journal of LATEX Class
 #'  Files 1.11 (2002): 10-20.
 #' \url{http://mirrors.rit.edu/CTAN/macros/latex/contrib/IEEEtran/IEEEtran_HOWTO.pdf}
+#' @importFrom rmarkdown pandoc_variable_arg
 #' @export
 ieee_article <- function(
   draftmode   = c("final", "draft", "draftcls", "draftclsnofoot"),
@@ -74,13 +75,10 @@ ieee_article <- function(
 
   args <- c(args, plist[plist])
 
-  # pandoc_variable_arg not exported from rmarkdown
-  pandoc_arg_variable <- function(var_name, value) {
-    c("-V", paste0(var_name, "=", value))
-  }
-
   # Convert to pandoc arguments
-  pandoc_arg_list <- mapply(pandoc_arg_variable, names(args), args)
+  pandoc_arg_list <- mapply(rmarkdown::pandoc_arg_variable, names(args), args,
+                            USE.NAMES = FALSE, SIMPLIFY = FALSE)
+  pandoc_arg_list <- unlist(pandoc_arg_list)
 
   pdf_document_format(
     "ieee", pandoc_args = c(pandoc_arg_list, pandoc_args),

R/rsos_article.R

@@ -17,12 +17,12 @@ rsos_article <- function(
 
   template <- find_resource('rsos')
   args <- c(
-    "--template", template, pandoc_variable_arg("documentclass", "article"),
-    pandoc_args, "--natbib", includes_to_pandoc_args(includes)
+    "--template", template, rmarkdown::pandoc_variable_arg("documentclass", "article"),
+    pandoc_args, "--natbib", rmarkdown::includes_to_pandoc_args(includes)
   )
 
   if (length(extra) > 0) args <- c(args, sapply(names(extra), function(x){
-    pandoc_variable_arg(x, extra[[x]])
+    rmarkdown::pandoc_variable_arg(x, extra[[x]])
   }))
 
   opts_chunk <- list(