fix #2602: --highlight-style was also deprecated

Author: yihui

DESCRIPTION

@@ -1,7 +1,7 @@
 Type: Package
 Package: rmarkdown
 Title: Dynamic Documents for R
-Version: 2.30
+Version: 2.30.1
 Authors@R: c(
     person("JJ", "Allaire", , "[email protected]", role = "aut"),
     person("Yihui", "Xie", , "[email protected]", role = c("aut", "cre"), comment = c(ORCID = "0000-0003-0645-5666")),

NEWS.md

@@ -1,3 +1,9 @@
+rmarkdown 2.31
+================================================================================
+
+- Use the argument `--syntax-highlighting` for Pandoc >= 3.8 since `--highlight-style` has been deprecated (thanks, @ywwry66, #2602).
+
+
 rmarkdown 2.30
 ================================================================================
 

R/github_document.R

@@ -142,7 +142,7 @@ github_document <- function(toc = FALSE,
         "rmarkdown/templates/github_document/resources/github.css")
       # provide a preview that looks like github
       args <- c(
-        self_contained_args(), "--highlight-style", "pygments",
+        self_contained_args(), pandoc_highlight_args("pygments"),
         "--template", pkg_file_arg(
           "rmarkdown/templates/github_document/resources/preview.html"),
         "--variable", paste0("github-markdown-css:", css),

R/pandoc.R

@@ -309,11 +309,13 @@ pandoc_include_args <- function(in_header = NULL,
 #' @rdname pandoc_args
 #' @export
 pandoc_highlight_args <- function(highlight, default = "tango") {
+  p38 <- pandoc_available("3.8")
   if (is.null(highlight)) {
-    if (pandoc_available("3.8")) "--syntax-highlighting=none" else "--no-highlight"
-  } else {
-    c("--highlight-style", if (identical(highlight, "default")) default else highlight)
+    if (!p38) return("--no-highlight")
+    highlight <- "none"
   }
+  if (identical(highlight, "default")) highlight <- default
+  c(if (p38) "--syntax-highlighting" else "--highlight-style", highlight)
 }
 
 #' @rdname pandoc_args

tests/testthat/test-pandoc.R

@@ -1,9 +1,8 @@
 test_that("build highlight args for pandoc correctly", {
-  hl_style <- function(name) c("--highlight-style", name)
-  expect_equal(pandoc_highlight_args(NULL), if (pandoc_available("3.8")) "--syntax-highlighting=none" else "--no-highlight")
-  expect_equal(pandoc_highlight_args("default"), hl_style("tango"))
-  expect_equal(pandoc_highlight_args("default", "zenburn"), hl_style("zenburn"))
-  expect_equal(pandoc_highlight_args("zenburn"), hl_style("zenburn"))
+  expect_equal(pandoc_highlight_args(NULL), if (pandoc_available("3.8")) c("--syntax-highlighting", "none") else "--no-highlight")
+  expect_equal(pandoc_highlight_args("default")[2], "tango")
+  expect_equal(pandoc_highlight_args("default", "zenburn")[2], "zenburn")
+  expect_equal(pandoc_highlight_args("zenburn")[2], "zenburn")
 })
 
 test_that("Detect if a theme file is providing in highlight", {