Merge pull request #41 from inbo/template_2018

Template 2018

DESCRIPTION

@@ -1,8 +1,8 @@
 Package: INBOmd
 Type: Package
 Title: Markdown Templates for INBO
-Version: 0.4.1.1
-Date: 2017-12-06
+Version: 0.4.2
+Date: 2018-04-10
 Authors@R: c(person("Thierry", "Onkelinx", email = "[email protected]", role = c("aut", "cre")), person("Floris", "Vanderhaeghe", email = "[email protected]", role = c("ctb")), person(family = "Instituut voor Natuur- en Bosonderzoek", email = "[email protected]", role = c("cph")))
 Description: Several templates to generate reports, presentations and posters.
 License: GPL-3 | file LICENSE
@@ -13,7 +13,7 @@ Suggests:
     knitr,
     pander,
     ggplot2,
-    bookdown,
+    bookdown (>= 0.7.7),
     webshot,
     INBOtheme (>= 0.5.4)
 Imports:

R/inbo_rapport.R

@@ -17,6 +17,7 @@
 #'   \item lof: display a list of figures. Defaults to TRUE
 #'   \item lot: display a list of tables. Defaults to TRUE
 #'   \item hyphenation: the correct hyphenation for certain words
+#'   \item flandersfont: Use the Flanders Art Sans font on title page? Defaults to FALSE. Note that this requires the font to be present on the system.
 #' }
 #' @export
 #' @importFrom rmarkdown output_format knitr_options pandoc_options pandoc_variable_arg includes_to_pandoc_args pandoc_version
@@ -80,6 +81,9 @@ inbo_rapport <- function(
   if (!"lot" %in% names(extra)) {
     extra$lot <- TRUE
   }
+  if (!"flandersfont" %in% names(extra)) {
+    extra$flandersfont <- FALSE
+  }
   if (extra$lof) {
     args <- c(args, pandoc_variable_arg("lof", TRUE))
   }
@@ -89,7 +93,10 @@ inbo_rapport <- function(
   if (extra$lof || extra$lot) {
     args <- c(args, pandoc_variable_arg("loft", TRUE))
   }
-  extra <- extra[!names(extra) %in% c("lof", "lot")]
+  if (extra$flandersfont) {
+    args <- c(args, pandoc_variable_arg("flandersfont", TRUE))
+  }
+  extra <- extra[!names(extra) %in% c("lof", "lot", "flandersfont")]
   if (length(extra) > 0) {
     args <- c(
       args,

appveyor.yml

@@ -16,6 +16,8 @@ cache:
 # Adapt as necessary starting from here
 
 build_script:
+  - Rscript -e "install.packages(c('backports', 'colorspace', 'digest', 'htmltools', 'lazyeval', 'plyr', 'Rcpp', 'rlang', 'scales', 'stringi', 'tibble'), repos = 'https://cloud.r-project.org/')"
+  - Rscript -e "remotes::install_github('rstudio/bookdown')"
   - travis-tool.sh install_deps
 
 test_script:
@@ -47,6 +49,7 @@ artifacts:
 environment:
   access_token:
     secure: yysQI1zM7yUTewFfHSAPixDMQPH2/Zik3AxI/WSOSM3eHOttl5ZzXbxrb6PjUn5y
+  PKGTYPE: source
 
 deploy:
   - provider: GitHub