diff --git a/ChangeLog b/ChangeLog index d958d40..0f9207c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,10 @@ 2018-10-09 Dirk Eddelbuettel - * DESCRIPTION (Version, Date): Rolled minor version + * DESCRIPTION (Version, Date): Rolled minor version + + * inst/rmarkdown/templates/monash/resources/template.tex: Provide + better fallbacks for fontsize, titlefontsize, colortheme + * inst/rmarkdown/templates/monash/skeleton/skeleton.Rmd: Idem 2018-10-09 Rob Hyndman diff --git a/inst/rmarkdown/templates/monash/resources/template.tex b/inst/rmarkdown/templates/monash/resources/template.tex index 3098754..efe127e 100644 --- a/inst/rmarkdown/templates/monash/resources/template.tex +++ b/inst/rmarkdown/templates/monash/resources/template.tex @@ -1,6 +1,6 @@ \PassOptionsToPackage{unicode=true}{hyperref} % options for packages loaded elsewhere \PassOptionsToPackage{hyphens}{url} -\documentclass[$if(fontsize)$$fontsize$,$endif$$if(lang)$$babel-lang$,$endif$$if(handout)$handout,$endif$$if(colorlinks)$dvipsnames,$endif$$if(beamer)$ignorenonframetext,$endif$$for(classoption)$$classoption$$sep$,$endfor$]{$documentclass$} +\documentclass[$if(fontsize)$$fontsize$,$else$14pt,$endif$$if(lang)$$babel-lang$,$endif$$if(handout)$handout,$endif$$if(colorlinks)$dvipsnames,$endif$$if(beamer)$ignorenonframetext,$endif$$for(classoption)$$classoption$$sep$,$endfor$]{$documentclass$} \setbeamertemplate{caption}[numbered] \setbeamertemplate{caption label separator}{: } \setbeamercolor{caption name}{fg=normal text.fg} @@ -63,6 +63,8 @@ $endif$ $if(colortheme)$ \usecolortheme{$colortheme$} +$else$ + \usecolortheme{monashwhite} $endif$ $if(fonttheme)$ @@ -71,6 +73,8 @@ $endif$ $if(titlefontsize)$ \setbeamerfont{title}{series=\bfseries,parent=structure,size=\fontsize{$titlefontsize$}{32}} +$else$ + \setbeamerfont{title}{series=\bfseries,parent=structure,size=\fontsize{22pt}{32}} $endif$ $if(mainfont)$ diff --git a/inst/rmarkdown/templates/monash/skeleton/skeleton.Rmd b/inst/rmarkdown/templates/monash/skeleton/skeleton.Rmd index a6fddfc..162b620 100644 --- a/inst/rmarkdown/templates/monash/skeleton/skeleton.Rmd +++ b/inst/rmarkdown/templates/monash/skeleton/skeleton.Rmd @@ -2,10 +2,7 @@ title: Monash Beamer Class Demonstration author: Rob J Hyndman date: \today -fontsize: 14pt -titlefontsize: 22pt classoption: compress -colortheme: monashblue toc: true output: binb::monash ---