close #206: make ieee_article() work with bookdown::pdf_book() by exp…

…osing the `pandoc_args` argument (to avoid multiple matches of it)
rstudio · Mar 14, 2019 · e35d144 · e35d144
1 parent 1182e00
commit e35d144
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: rticles
 Type: Package
 Title: Article Formats for R Markdown
-Version: 0.6.1
+Version: 0.6.2
 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/NEWS b/NEWS
@@ -5,6 +5,8 @@ rticles 0.7
 
 - No longer hardcode the LaTeX engine to `xelatex` in `rsos_article()` (thanks, @bensprung, #198).
 
+- Added an argument `pandoc_args` to `ieee_article()` so that users can pass custom Pandoc arguments. This also makes it work with `bookdown::pdf_book()` (thanks, @espinielli, #206).
+
 rticles 0.6
 ---------------------------------------------------------------------
 

diff --git a/R/ieee_article.R b/R/ieee_article.R
@@ -59,6 +59,7 @@ ieee_article <- function(...,
                          with_array       = FALSE,
                          with_dblfloatfix = FALSE,
                          keep_tex         = TRUE,
+                         pandoc_args = NULL,
                          md_extensions    = c("-autolink_bare_uris")) {
 
   args <- c()
@@ -69,7 +70,7 @@ ieee_article <- function(...,
   args <- c(args, "hyphenfixes" = hyphenfixes)
 
   # Avoid declaration of pandoc variable if field is empty
-  if(nchar(IEEEspecialpaper) > 1){
+  if (nchar(IEEEspecialpaper) > 1) {
     args <- c(args, "IEEEspecialpaper" = IEEEspecialpaper)
   }
 
@@ -95,7 +96,7 @@ ieee_article <- function(...,
   pandoc_arg_list <- mapply(pandoc_arg_variable, names(args), args)
 
   inherit_pdf_document(...,
-                       pandoc_args = pandoc_arg_list,
+                       pandoc_args = c(pandoc_arg_list, pandoc_args),
                        template = find_resource("ieee_article", "template.tex"),
                        keep_tex = keep_tex,
                        md_extensions = md_extensions)

diff --git a/man/ieee_article.Rd b/man/ieee_article.Rd
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,6 +5,8 @@ rticles 0.7 @@
     - No longer hardcode the LaTeX engine to `xelatex` in `rsos_article()` (thanks, @bensprung, #198).
+    - Added an argument `pandoc_args` to `ieee_article()` so that users can pass custom Pandoc arguments. This also makes it work with `bookdown::pdf_book()` (thanks, @espinielli, #206).
     rticles 0.6
     ---------------------------------------------------------------------
@@ Expand Down @@