From 15eee95f9ad6eaab0456ffce72cda3c2599cc316 Mon Sep 17 00:00:00 2001 From: Rob J Hyndman Date: Wed, 21 Nov 2018 21:14:39 +1100 Subject: [PATCH 1/4] Fixed handling of monash colortheme option --- R/binb.R | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/R/binb.R b/R/binb.R index 7f7b5d9..5df279f 100644 --- a/R/binb.R +++ b/R/binb.R @@ -161,15 +161,18 @@ monash <- function(toc = FALSE, dev = 'pdf', df_print = "default", fonttheme = "default", + colortheme = "monashwhite", highlight = "tango", keep_tex = FALSE, latex_engine = "pdflatex", citation_package = c("none", "natbib", "biblatex"), includes = NULL, md_extensions = NULL, - pandoc_args = NULL) { + pandoc_args = NULL, + ...) { - for (f in c("beamercolorthememonash.sty", "beamerfontthememonash.sty", + fcolortheme <- paste0("beamercolortheme",colortheme,".sty") + for (f in c("beamerfontthememonash.sty",fcolortheme, "beamerthememonash.sty", "titlepage.png", "figs/")) if (!file.exists(f)) file.copy(system.file("rmarkdown", "templates", "monash", "skeleton", @@ -191,6 +194,7 @@ monash <- function(toc = FALSE, dev = dev, df_print = df_print, theme = "monash", + colortheme = colortheme, fonttheme = fonttheme, highlight = highlight, keep_tex = keep_tex, From 82f5fa89e8fc71aa543bcd8a4ba9fd41f1b3df54 Mon Sep 17 00:00:00 2001 From: Rob J Hyndman Date: Thu, 22 Nov 2018 07:57:48 +1100 Subject: [PATCH 2/4] Removed monashwhite from autoloading. --- inst/rmarkdown/templates/monash/skeleton/beamerthememonash.sty | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inst/rmarkdown/templates/monash/skeleton/beamerthememonash.sty b/inst/rmarkdown/templates/monash/skeleton/beamerthememonash.sty index bd714c3..55b0b4e 100644 --- a/inst/rmarkdown/templates/monash/skeleton/beamerthememonash.sty +++ b/inst/rmarkdown/templates/monash/skeleton/beamerthememonash.sty @@ -4,7 +4,7 @@ \RequirePackage{beamerthememetropolis} % For binb, one can alter the color theme by by setting eg 'colortheme: monashblue' in the YAML header -\usecolortheme{monashwhite} +%\usecolortheme{monashwhite} \usefonttheme{monash} \metroset{progressbar=foot} From 57a04011a44eb50e07a3edd79cc9fea8cb0afca5 Mon Sep 17 00:00:00 2001 From: Rob J Hyndman Date: Thu, 22 Nov 2018 07:58:42 +1100 Subject: [PATCH 3/4] Improved spacing in toc --- .../rmarkdown/templates/monash/skeleton/beamerthememonash.sty | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/inst/rmarkdown/templates/monash/skeleton/beamerthememonash.sty b/inst/rmarkdown/templates/monash/skeleton/beamerthememonash.sty index 55b0b4e..efc8bbb 100644 --- a/inst/rmarkdown/templates/monash/skeleton/beamerthememonash.sty +++ b/inst/rmarkdown/templates/monash/skeleton/beamerthememonash.sty @@ -46,9 +46,11 @@ \setbeamertemplate{section in toc}[square] \setbeamerfont{section number projected}{size=\large} - \setbeamertemplate{section in toc shaded}[default][50] +\usepackage{etoolbox} +\patchcmd{\beamer@sectionintoc}{\vskip1.5em}{\vskip0.2em}{}{} + % Figure placement \RequirePackage[absolute,overlay]{textpos} \setlength{\TPHorizModule}{1cm} From b2632a6377c683acf96151c918b3338cd855147c Mon Sep 17 00:00:00 2001 From: Rob J Hyndman Date: Thu, 22 Nov 2018 08:30:57 +1100 Subject: [PATCH 4/4] Now passing checks --- DESCRIPTION | 2 +- R/binb.R | 4 ++-- man/metropolis.Rd | 10 ++++++---- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index dc01e08..eac6426 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -18,4 +18,4 @@ Imports: rmarkdown, knitr VignetteBuilder: knitr License: GPL (>= 2) Encoding: UTF-8 -RoxygenNote: 6.1.0 +RoxygenNote: 6.1.1 diff --git a/R/binb.R b/R/binb.R index 5df279f..d432051 100644 --- a/R/binb.R +++ b/R/binb.R @@ -21,6 +21,7 @@ ##' @param dev A character variable defaulting to \dQuote{pdf}. ##' @param df_print A character variable defaulting to \dQuote{default}. ##' @param fonttheme A character variable defaulting to \dQuote{default}. +##' @param colortheme For the \sQuote{Monash} theme only. A character variable defaulting to \dQuote{monashwhite}. ##' @param highlight A character variable defaulting to \dQuote{tango}. ##' @param keep_tex A logical variable defaulting to \code{FALSE}. ##' @param latex_engine A character variable defaulting to \dQuote{xelatex}. @@ -168,8 +169,7 @@ monash <- function(toc = FALSE, citation_package = c("none", "natbib", "biblatex"), includes = NULL, md_extensions = NULL, - pandoc_args = NULL, - ...) { + pandoc_args = NULL) { fcolortheme <- paste0("beamercolortheme",colortheme,".sty") for (f in c("beamerfontthememonash.sty",fcolortheme, diff --git a/man/metropolis.Rd b/man/metropolis.Rd index fd04c0a..d9fc064 100644 --- a/man/metropolis.Rd +++ b/man/metropolis.Rd @@ -26,10 +26,10 @@ iqss(toc = FALSE, slide_level = 3, incremental = FALSE, monash(toc = FALSE, slide_level = 2, incremental = FALSE, fig_width = 8, fig_height = 5, fig_crop = TRUE, fig_caption = TRUE, dev = "pdf", df_print = "default", - fonttheme = "default", highlight = "tango", keep_tex = FALSE, - latex_engine = "pdflatex", citation_package = c("none", "natbib", - "biblatex"), includes = NULL, md_extensions = NULL, - pandoc_args = NULL) + fonttheme = "default", colortheme = "monashwhite", + highlight = "tango", keep_tex = FALSE, latex_engine = "pdflatex", + citation_package = c("none", "natbib", "biblatex"), includes = NULL, + md_extensions = NULL, pandoc_args = NULL) presento(toc = FALSE, slide_level = 2, incremental = FALSE, fig_width = 10, fig_height = 7, fig_crop = TRUE, @@ -75,6 +75,8 @@ presento(toc = FALSE, slide_level = 2, incremental = FALSE, \item{md_extensions}{An optional character variable defaulting to \code{NULL}.} \item{pandoc_args}{An optional character variable defaulting to \code{NULL}.} + +\item{colortheme}{For the \sQuote{Monash} theme only. A character variable defaulting to \dQuote{monashwhite}.} } \value{ RMarkdown content processed is returned for use by the