diff options
| -rw-r--r-- | default.beamer | 2 | ||||
| -rw-r--r-- | default.latex | 20 |
2 files changed, 15 insertions, 7 deletions
diff --git a/default.beamer b/default.beamer index 5cc7d8389..b1f858a06 100644 --- a/default.beamer +++ b/default.beamer @@ -15,7 +15,7 @@ $if(outertheme)$ \useoutertheme{$outertheme$} $endif$ \setbeamertemplate{caption}[numbered] -\setbeamertemplate{caption label separator}{:} +\setbeamertemplate{caption label separator}{: } \setbeamercolor{caption name}{fg=normal text.fg} \usepackage{amssymb,amsmath} \usepackage{ifxetex,ifluatex} diff --git a/default.latex b/default.latex index c67dbfecb..e9eaa08b7 100644 --- a/default.latex +++ b/default.latex @@ -1,6 +1,6 @@ \documentclass[$if(fontsize)$$fontsize$,$endif$$if(lang)$$babel-lang$,$endif$$if(papersize)$$papersize$,$endif$$for(classoption)$$classoption$$sep$,$endfor$]{$documentclass$} $if(fontfamily)$ -\usepackage{$fontfamily$} +\usepackage[$fontfamilyoptions$]{$fontfamily$} $else$ \usepackage{lmodern} $endif$ @@ -27,16 +27,16 @@ $endif$ \defaultfontfeatures{Mapping=tex-text,Scale=MatchLowercase} \newcommand{\euro}{€} $if(mainfont)$ - \setmainfont{$mainfont$} + \setmainfont[$mainfontoptions$]{$mainfont$} $endif$ $if(sansfont)$ - \setsansfont{$sansfont$} + \setsansfont[$sansfontoptions$]{$sansfont$} $endif$ $if(monofont)$ - \setmonofont[Mapping=tex-ansi]{$monofont$} + \setmonofont[Mapping=tex-ansi$if(monofontoptions)$,$monofontoptions$$endif$]{$monofont$} $endif$ $if(mathfont)$ - \setmathfont(Digits,Latin,Greek){$mathfont$} + \setmathfont(Digits,Latin,Greek)[$mathfontoptions$]{$mathfont$} $endif$ $if(CJKmainfont)$ \usepackage{xeCJK} @@ -53,6 +53,8 @@ $endif$ $if(geometry)$ \usepackage[$for(geometry)$$geometry$$sep$,$endfor$]{geometry} $endif$ +\makeatletter +\@ifpackageloaded{hyperref}{}{% \ifxetex \usepackage[setpagesize=false, % page size defined by xetex unicode=false, % unicode breaks when used with xetex @@ -60,7 +62,13 @@ $endif$ \else \usepackage[unicode=true]{hyperref} \fi -\usepackage[usenames,dvipsnames]{color} +} +\@ifpackageloaded{color}{ + \PassOptionsToPackage{usenames,dvipsnames}{color} +}{% + \usepackage[usenames,dvipsnames]{color} +} +\makeatother \hypersetup{breaklinks=true, bookmarks=true, pdfauthor={$author-meta$}, |