diff options
| -rw-r--r-- | default.beamer | 43 | ||||
| -rw-r--r-- | default.latex | 7 |
2 files changed, 28 insertions, 22 deletions
diff --git a/default.beamer b/default.beamer index f0a266c7e..1419b09a9 100644 --- a/default.beamer +++ b/default.beamer @@ -1,22 +1,4 @@ \documentclass[$if(fontsize)$$fontsize$,$endif$$if(lang)$$babel-lang$,$endif$$if(handout)$handout,$endif$$if(beamer)$ignorenonframetext,$endif$$for(classoption)$$classoption$$sep$,$endfor$]{$documentclass$} -$if(theme)$ -\usetheme{$theme$} -$endif$ -$if(colortheme)$ -\usecolortheme{$colortheme$} -$endif$ -$if(fonttheme)$ -\usefonttheme{$fonttheme$} -$endif$ -$if(mainfont)$ -\usefonttheme{serif} % use mainfont rather than sansfont for slide text -$endif$ -$if(innertheme)$ -\useinnertheme{$innertheme$} -$endif$ -$if(outertheme)$ -\useoutertheme{$outertheme$} -$endif$ \setbeamertemplate{caption}[numbered] \setbeamertemplate{caption label separator}{: } \setbeamercolor{caption name}{fg=normal text.fg} @@ -62,6 +44,24 @@ $if(CJKmainfont)$ \setCJKmainfont[$for(CJKoptions)$$CJKoptions$$sep$,$endfor$]{$CJKmainfont$} $endif$ \fi +$if(theme)$ +\usetheme{$theme$} +$endif$ +$if(colortheme)$ +\usecolortheme{$colortheme$} +$endif$ +$if(fonttheme)$ +\usefonttheme{$fonttheme$} +$endif$ +$if(mainfont)$ +\usefonttheme{serif} % use mainfont rather than sansfont for slide text +$endif$ +$if(innertheme)$ +\useinnertheme{$innertheme$} +$endif$ +$if(outertheme)$ +\useoutertheme{$outertheme$} +$endif$ % use upquote if available, for straight quotes in verbatim environments \IfFileExists{upquote.sty}{\usepackage{upquote}}{} % use microtype if available @@ -89,7 +89,8 @@ $if(natbib)$ \bibliographystyle{$if(biblio-style)$$biblio-style$$else$plainnat$endif$} $endif$ $if(biblatex)$ -\usepackage{biblatex} +\usepackage$if(biblio-style)$[style=$biblio-style$]$endif${biblatex} +$if(biblatexoptions)$\ExecuteBibliographyOptions{$for(biblatexoptions)$$biblatexoptions$$sep$,$endfor$}$endif$ $for(bibliography)$ \addbibresource{$bibliography$} $endfor$ @@ -131,8 +132,7 @@ $endif$ \widowpenalties 1 10000 \raggedbottom -% Comment these out if you don't want a slide with just the -% part/section/subsection/subsubsection title: +$if(section-titles)$ \AtBeginPart{ \let\insertpartnumber\relax \let\partname\relax @@ -151,6 +151,7 @@ $endif$ \let\subsectionname\relax \frame{\subsectionpage} } +$endif$ $if(links-as-notes)$ % Make links footnotes instead of hotlinks: diff --git a/default.latex b/default.latex index 047e0d200..48ddc82e7 100644 --- a/default.latex +++ b/default.latex @@ -97,7 +97,8 @@ $if(natbib)$ \bibliographystyle{$if(biblio-style)$$biblio-style$$else$plainnat$endif$} $endif$ $if(biblatex)$ -\usepackage{biblatex} +\usepackage$if(biblio-style)$[style=$biblio-style$]$endif${biblatex} +$if(biblatexoptions)$\ExecuteBibliographyOptions{$for(biblatexoptions)$$biblatexoptions$$sep$,$endfor$}$endif$ $for(bibliography)$ \addbibresource{$bibliography$} $endfor$ @@ -140,8 +141,12 @@ $if(strikeout)$ $endif$ $if(indent)$ $else$ +\IfFileExists{parskip.sty}{% +\usepackage{parskip} +}{% else \setlength{\parindent}{0pt} \setlength{\parskip}{6pt plus 2pt minus 1pt} +} $endif$ \setlength{\emergencystretch}{3em} % prevent overfull lines \providecommand{\tightlist}{% |