moving the doc of extra_dependencies from html_document to html_docum…

…ent_base, otherwise the latter can't inherit it from the former because of the change in roxygen2 7.2.0: r-lib/roxygen2#1316
rstudio · Aug 16, 2022 · 32f1c77 · 32f1c77
1 parent 63b7ecf
commit 32f1c77
Show file tree

Hide file tree

Showing 10 changed files with 111 additions and 50 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -87,5 +87,5 @@ Suggests:
 VignetteBuilder: knitr
 Config/Needs/website: rstudio/quillt, pkgdown
 Encoding: UTF-8
-RoxygenNote: 7.1.2
+RoxygenNote: 7.2.1
 SystemRequirements: pandoc (>= 1.14) - http://pandoc.org
diff --git a/R/html_document.R b/R/html_document.R
@@ -124,6 +124,9 @@
 #'  Note that if you don't use the "default" template then some features of
 #'  \code{html_document} won't be available (see the Templates section below for
 #'  more details).
+#' @param extra_dependencies Extra dependencies as a list of the
+#'   \code{html_dependency} class objects typically generated by
+#'   \code{htmltools::\link{htmlDependency}()}.
 #' @param css CSS and/or Sass files to include. Files with an extension of .sass
 #'  or .scss are compiled to CSS via `sass::sass()`. Also, if `theme` is a
 #'  [bslib::bs_theme()] object, Sass code may reference the relevant Bootstrap
@@ -138,8 +141,8 @@
 #'  default definition of R Markdown. See the \code{\link{rmarkdown_format}} for
 #'  additional details.
 #' @param pandoc_args Additional command line options to pass to pandoc
-#' @param extra_dependencies,... Additional function arguments to pass to the
-#'  base R Markdown HTML output formatter \code{\link{html_document_base}}
+#' @param ... Additional function arguments to pass to the base R Markdown HTML
+#'   output formatter \code{\link{html_document_base}}
 #' @return R Markdown output format to pass to \code{\link{render}}
 #'
 #' @section Highlighting:

diff --git a/R/html_document_base.R b/R/html_document_base.R
@@ -7,9 +7,6 @@
 #'
 #' @param dependency_resolver A dependency resolver
 #' @param copy_resources Copy resources
-#' @param extra_dependencies Extra dependencies as a list of the
-#'   \code{html_dependency} class objects typically generated by
-#'   \code{htmltools::\link{htmlDependency}()}.
 #' @param bootstrap_compatible Bootstrap compatible
 #' @param ... Ignored
 #'

diff --git a/man/github_document.Rd b/man/github_document.Rd
diff --git a/man/html_document.Rd b/man/html_document.Rd
diff --git a/man/html_document_base.Rd b/man/html_document_base.Rd
diff --git a/man/html_notebook.Rd b/man/html_notebook.Rd
diff --git a/man/html_vignette.Rd b/man/html_vignette.Rd
diff --git a/man/ioslides_presentation.Rd b/man/ioslides_presentation.Rd