enable figure cropping in pdf_document() only when both pdfcrop and g…

…hostscript are found (yihui/knitr#954), and do not limit this feature to non-Windows platforms
rstudio · Sep 9, 2020 · f45bb70 · f45bb70
1 parent fdfb39a
commit f45bb70
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: rmarkdown
 Type: Package
 Title: Dynamic Documents for R
-Version: 2.3.3
+Version: 2.3.4
 Authors@R: c(
   person("JJ", "Allaire", role = "aut", email = "[email protected]"),
   person("Yihui", "Xie", role = c("aut", "cre"), email = "[email protected]", comment = c(ORCID = "0000-0003-0645-5666")),

diff --git a/NEWS.md b/NEWS.md
@@ -9,6 +9,8 @@ rmarkdown 2.4
 
 - Added the `number_sections` argument to the `word_document()` output format. This requires Pandoc >= v2.10.1, and is set to `FALSE` by default (thanks, @jooyoungseo, #1869).
 
+- For the output format `pdf_document`, the option `fig_crop` will not be enabled unless both the programs `pdfcrop` and `ghostscript` are found (thanks, @dalupus, yihui/knitr#954).
+
 
 rmarkdown 2.3
 ================================================================================

diff --git a/R/output_format.R b/R/output_format.R
@@ -258,8 +258,8 @@ knitr_options_pdf <- function(fig_width,
 
   knit_hooks <- NULL
 
-  # apply cropping if requested and we have pdfcrop
-  crop <- fig_crop && !is_windows() && nzchar(find_program("pdfcrop"))
+  # apply cropping if requested and we have pdfcrop and ghostscript
+  crop <- fig_crop && find_program("pdfcrop") != '' && tools::find_gs_cmd() != ''
   if (crop) {
     knit_hooks = list(crop = knitr::hook_pdfcrop)
     opts_chunk$crop = TRUE