diff --git a/.travis.yml b/.travis.yml index 50cae23..c9eac4d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,28 +2,31 @@ language: r distro: xenial # binary packages sudo: true # dito cache: packages +branches: + only: + - master r: - - oldrel - - release - - devel +- oldrel +- release +- devel r_binary_packages: - # Additional packages for tests... - - roxygen2 - - devtools +# Additional packages for tests... +- roxygen2 +- devtools addons: apt: packages: - # Install the headers for the Cairo package. - - libcairo2-dev - - libjpeg-dev + # Install the headers for the Cairo package. + - libcairo2-dev + - libjpeg-dev script: - - R CMD build . - - R CMD check IRdisplay*.tar.gz --as-cran - - cat "/home/travis/build/IRkernel/IRdisplay/IRdisplay.Rcheck/00check.log" - - grep -q -R 'WARNING' "/home/travis/build/IRkernel/IRdisplay/IRdisplay.Rcheck/00check.log" ; [ $? -ne 0 ] - - grep -q -R 'NOTE' "/home/travis/build/IRkernel/IRdisplay/IRdisplay.Rcheck/00check.log"; [ $? -ne 0 ] - - Rscript -e 'devtools::test(reporter="check")' +- R CMD build . +- R CMD check IRdisplay*.tar.gz --as-cran +- cat "/home/travis/build/IRkernel/IRdisplay/IRdisplay.Rcheck/00check.log" +- grep -q -R 'WARNING' "/home/travis/build/IRkernel/IRdisplay/IRdisplay.Rcheck/00check.log" ; [ $? -ne 0 ] +- grep -q -R 'NOTE' "/home/travis/build/IRkernel/IRdisplay/IRdisplay.Rcheck/00check.log"; [ $? -ne 0 ] +- Rscript -e 'devtools::test(reporter="check")' diff --git a/DESCRIPTION b/DESCRIPTION index c0eb6c9..3b3d2e6 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -21,4 +21,4 @@ Imports: License: MIT + file LICENSE LazyData: true Encoding: UTF-8 -RoxygenNote: 6.1.1 +RoxygenNote: 7.1.1 diff --git a/NAMESPACE b/NAMESPACE index 89886f5..394adc6 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -10,6 +10,7 @@ export(display_markdown) export(display_pdf) export(display_png) export(display_svg) +export(display_text) export(irdisplay_option_defaults) export(prepare_mimebundle) export(publish_mimebundle) diff --git a/R/display_textual.r b/R/display_textual.r index 66351d0..6360be6 100644 --- a/R/display_textual.r +++ b/R/display_textual.r @@ -16,6 +16,10 @@ #' @rdname display-textual NULL +#' @rdname display-textual +#' @export +display_text <- function(data = NULL, file = NULL) display_raw('text/plain', FALSE, data, file) + #' @rdname display-textual #' @export display_json <- function(data = NULL, file = NULL) display_raw('application/json', FALSE, data, file) diff --git a/R/options.r b/R/options.r index dd53670..2cea6d1 100644 --- a/R/options.r +++ b/R/options.r @@ -19,6 +19,7 @@ #' } #' #' @rdname IRdisplay-options +#' @aliases IRdisplay-options #' @export irdisplay_option_defaults <- list( jupyter.display_mimetypes = c( diff --git a/README.md b/README.md index b1e37e0..6f84f46 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ IRdisplay [![b-Travis]][Travis] [![b-CRAN]][CRAN] ========= -[b-Travis]: https://travis-ci.org/IRkernel/IRdisplay.svg?branch=master "Build status" -[Travis]: https://travis-ci.org/IRkernel/IRdisplay +[b-Travis]: https://travis-ci.com/IRkernel/IRdisplay.svg?branch=master "Build status" +[Travis]: https://travis-ci.com/IRkernel/IRdisplay [b-CRAN]: https://www.r-pkg.org/badges/version/IRdisplay "Comprehensive R Archive Network" [CRAN]: https://cran.r-project.org/package=IRdisplay diff --git a/man/IRdisplay-options.Rd b/man/IRdisplay-options.Rd index 8bdc920..df31f93 100644 --- a/man/IRdisplay-options.Rd +++ b/man/IRdisplay-options.Rd @@ -3,8 +3,11 @@ \docType{data} \name{irdisplay_option_defaults} \alias{irdisplay_option_defaults} +\alias{IRdisplay-options} \title{IRdisplay options} -\format{An object of class \code{list} of length 2.} +\format{ +An object of class \code{list} of length 2. +} \usage{ irdisplay_option_defaults } diff --git a/man/display-textual.Rd b/man/display-textual.Rd index b014a2c..59ae911 100644 --- a/man/display-textual.Rd +++ b/man/display-textual.Rd @@ -2,6 +2,7 @@ % Please edit documentation in R/display_textual.r \name{display_} \alias{display_} +\alias{display_text} \alias{display_json} \alias{display_javascript} \alias{display_html} @@ -9,6 +10,8 @@ \alias{display_latex} \title{Display a specific textual output} \usage{ +display_text(data = NULL, file = NULL) + display_json(data = NULL, file = NULL) display_javascript(data = NULL, file = NULL) diff --git a/man/display.Rd b/man/display.Rd index f64e38c..aaa1627 100644 --- a/man/display.Rd +++ b/man/display.Rd @@ -5,12 +5,19 @@ \alias{prepare_mimebundle} \title{Create and use multiple available reprs} \usage{ -display(obj, ..., mimetypes = getOption("jupyter.display_mimetypes"), - error_handler = stop) +display( + obj, + ..., + mimetypes = getOption("jupyter.display_mimetypes"), + error_handler = stop +) -prepare_mimebundle(obj, - mimetypes = getOption("jupyter.display_mimetypes"), metadata = NULL, - error_handler = stop) +prepare_mimebundle( + obj, + mimetypes = getOption("jupyter.display_mimetypes"), + metadata = NULL, + error_handler = stop +) } \arguments{ \item{obj}{The object to create representations for}