diff options
| -rw-r--r-- | default.beamer | 113 | ||||
| -rw-r--r-- | default.latex | 5 |
2 files changed, 78 insertions, 40 deletions
diff --git a/default.beamer b/default.beamer index b1f858a06..9198ef010 100644 --- a/default.beamer +++ b/default.beamer @@ -1,4 +1,4 @@ -\documentclass[$if(fontsize)$$fontsize$,$endif$$if(handout)$handout,$endif$$if(beamer)$ignorenonframetext,$endif$$for(classoption)$$classoption$$sep$,$endfor$]{$documentclass$} +\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$ @@ -8,6 +8,9 @@ $endif$ $if(fonttheme)$ \usefonttheme{$fonttheme$} $endif$ +$if(mainfont)$ +\usefonttheme{serif} % use mainfont rather than sansfont for slide text +$endif$ $if(innertheme)$ \useinnertheme{$innertheme$} $endif$ @@ -17,34 +20,66 @@ $endif$ \setbeamertemplate{caption}[numbered] \setbeamertemplate{caption label separator}{: } \setbeamercolor{caption name}{fg=normal text.fg} +$if(fontfamily)$ +\usepackage[$fontfamilyoptions$]{$fontfamily$} +$else$ +\usepackage{lmodern} +$endif$ \usepackage{amssymb,amsmath} \usepackage{ifxetex,ifluatex} \usepackage{fixltx2e} % provides \textsubscript -\usepackage{lmodern} -\ifxetex - \usepackage{fontspec,xltxtra,xunicode} - \defaultfontfeatures{Mapping=tex-text,Scale=MatchLowercase} - \newcommand{\euro}{€} -\else - \ifluatex - \usepackage{fontspec} - \defaultfontfeatures{Mapping=tex-text,Scale=MatchLowercase} - \newcommand{\euro}{€} +\ifnum 0\ifxetex 1\fi\ifluatex 1\fi=0 % if pdftex + \usepackage[T1]{fontenc} + \usepackage[utf8]{inputenc} +$if(euro)$ + \usepackage{eurosym} +$endif$ +\else % if luatex or xelatex + \ifxetex + \usepackage{mathspec} \else - \usepackage[T1]{fontenc} - \usepackage[utf8]{inputenc} - $if(euro)$ - \usepackage{eurosym} - $endif$ + \usepackage{fontspec} \fi + \defaultfontfeatures{Mapping=tex-text,Scale=MatchLowercase} + \newcommand{\euro}{€} +$if(mainfont)$ + \setmainfont[$mainfontoptions$]{$mainfont$} +$endif$ +$if(sansfont)$ + \setsansfont[$sansfontoptions$]{$sansfont$} +$endif$ +$if(monofont)$ + \setmonofont[Mapping=tex-ansi$if(monofontoptions)$,$monofontoptions$$endif$]{$monofont$} +$endif$ +$if(mathfont)$ + \setmathfont(Digits,Latin,Greek)[$mathfontoptions$]{$mathfont$} +$endif$ +$if(CJKmainfont)$ + \usepackage{xeCJK} + \setCJKmainfont[$CJKoptions$]{$CJKmainfont$} +$endif$ \fi % use upquote if available, for straight quotes in verbatim environments \IfFileExists{upquote.sty}{\usepackage{upquote}}{} % use microtype if available -\IfFileExists{microtype.sty}{\usepackage{microtype}}{} +\IfFileExists{microtype.sty}{% +\usepackage{microtype} +\UseMicrotypeSet[protrusion]{basicmath} % disable protrusion for tt fonts +}{} +$if(lang)$ +\ifxetex + \usepackage{polyglossia} + \setmainlanguage[$polyglossia-lang.options$]{$polyglossia-lang.name$} +$for(polyglossia-otherlangs)$ + \setotherlanguage[$polyglossia-otherlangs.options$]{$polyglossia-otherlangs.name$} +$endfor$ +\else + \usepackage[shorthands=off,$babel-lang$]{babel} +\fi +$endif$ $if(natbib)$ \usepackage{natbib} -\bibliographystyle{plainnat} +\bibliographystyle{$if(biblio-style)$$biblio-style$$else$plainnat$endif$} $endif$ $if(biblatex)$ \usepackage{biblatex} @@ -63,6 +98,7 @@ $highlighting-macros$ $endif$ $if(verbatim-in-note)$ \usepackage{fancyvrb} +\VerbatimFootnotes % allows verbatim text in footnotes $endif$ $if(tables)$ \usepackage{longtable,booktabs} @@ -72,11 +108,8 @@ $if(tables)$ \def\fnum@table{\tablename~\thetable} \makeatother $endif$ -$if(url)$ -\usepackage{url} -$endif$ $if(graphics)$ -\usepackage{graphicx} +\usepackage{graphicx,grffile} \makeatletter \def\maxwidth{\ifdim\Gin@nat@width>\linewidth\linewidth\else\Gin@nat@width\fi} \def\maxheight{\ifdim\Gin@nat@height>\textheight0.8\textheight\else\Gin@nat@height\fi} @@ -105,35 +138,40 @@ $endif$ \frame{\subsectionpage} } +$if(links-as-notes)$ +% Make links footnotes instead of hotlinks: +\renewcommand{\href}[2]{#2\footnote{\url{#1}}} +$endif$ $if(strikeout)$ \usepackage[normalem]{ulem} % avoid problems with \sout in headers with hyperref: \pdfstringdefDisableCommands{\renewcommand{\sout}{}} $endif$ -\setlength{\parindent}{0pt} -\setlength{\parskip}{6pt plus 2pt minus 1pt} \setlength{\emergencystretch}{3em} % prevent overfull lines \providecommand{\tightlist}{% \setlength{\itemsep}{0pt}\setlength{\parskip}{0pt}} $if(numbersections)$ +\setcounter{secnumdepth}{5} $else$ \setcounter{secnumdepth}{0} $endif$ -$if(verbatim-in-note)$ -\VerbatimFootnotes % allows verbatim text in footnotes -$endif$ -$if(lang)$ +$if(dir)$ \ifxetex - \usepackage{polyglossia} - \setmainlanguage{$mainlang$} - \setotherlanguages{$for(otherlang)$$otherlang$$sep$,$endfor$} -\else - \usepackage[shorthands=off,$lang$]{babel} + % load bidi as late as possible as it modifies e.g. graphicx + $if(latex-dir-rtl)$ + \usepackage[RTLdocument]{bidi} + $else$ + \usepackage{bidi} + $endif$ +\fi +\ifnum 0\ifxetex 1\fi\ifluatex 1\fi=0 % if pdftex + \TeXXeTstate=1 + \newcommand{\RL}[1]{\beginR #1\endR} + \newcommand{\LR}[1]{\beginL #1\endL} + \newenvironment{RTL}{\beginR}{\endR} + \newenvironment{LTR}{\beginL}{\endL} \fi $endif$ -$for(header-includes)$ -$header-includes$ -$endfor$ $if(title)$ \title{$title$} @@ -145,6 +183,9 @@ $if(author)$ \author{$for(author)$$author$$sep$ \and $endfor$} $endif$ \date{$date$} +$for(header-includes)$ +$header-includes$ +$endfor$ \begin{document} $if(title)$ diff --git a/default.latex b/default.latex index ae29bee7d..463b096b6 100644 --- a/default.latex +++ b/default.latex @@ -110,7 +110,7 @@ $highlighting-macros$ $endif$ $if(verbatim-in-note)$ \usepackage{fancyvrb} -\VerbatimFootnotes +\VerbatimFootnotes % allows verbatim text in footnotes $endif$ $if(tables)$ \usepackage{longtable,booktabs} @@ -145,9 +145,6 @@ $if(numbersections)$ $else$ \setcounter{secnumdepth}{0} $endif$ -$if(verbatim-in-note)$ -\VerbatimFootnotes % allows verbatim text in footnotes -$endif$ $if(dir)$ \ifxetex % load bidi as late as possible as it modifies e.g. graphicx |