remove html output functions (moved to htmltools)

FilomenaC · Apr 3, 2014 · bc5b01e · bc5b01e
1 parent de9c127
commit bc5b01e
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 213 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -16,6 +16,7 @@ Imports:
     yaml (>= 2.1.5)
 Suggests:
     caTools,
+    htmltools,
     httpuv (>= 1.2.2)
 SystemRequirements: pandoc (>= 1.12.3) - http://johnmacfarlane.net/pandoc
 License: GPL-3
diff --git a/NAMESPACE b/NAMESPACE
@@ -1,13 +1,9 @@
-S3method(print,html_output)
 export(beamer_presentation)
 export(default_output_format)
 export(draft)
-export(html_dependency)
 export(html_document)
-export(html_output)
 export(includes)
 export(ioslides_presentation)
-export(knit_print.html_output)
 export(knitr_options)
 export(knitr_options_html)
 export(knitr_options_pdf)

diff --git a/R/html_output.R b/R/html_output.R
diff --git a/R/render.R b/R/render.R
@@ -184,9 +184,11 @@ render <- function(input,
               "adding YAML params")
     }
 
-    # attach to search path during the knit (so that the knit_print
-    # S3 method in rmarkdown is discovered during knitting)
-    require(rmarkdown)
+    # ensure that htmltools::knit_print.html_output is available on the
+    # search path if it exists. note that htmltools doesn't register
+    # this explicitly as an S3 method so that it doesn't need to depend
+    # on knitr via importFrom(knitr, knit_print)
+    suppressWarnings(require("htmltools", quietly = TRUE))
 
     # perform the knit
     input <- knitr::knit(knit_input,

diff --git a/man/html_dependency.Rd b/man/html_dependency.Rd
diff --git a/man/html_output.Rd b/man/html_output.Rd
diff --git a/rmarkdown.Rproj b/rmarkdown.Rproj
@@ -18,4 +18,4 @@ StripTrailingWhitespace: Yes
 BuildType: Package
 PackageUseDevtools: Yes
 PackageInstallArgs: --no-multiarch --with-keep.source
-PackageRoxygenize: rd,collate
+PackageRoxygenize: rd,collate,namespace