@@ -49,6 +49,15 @@ $endif$
4949$if(geometry)$
5050\usepackage[$for(geometry)$$geometry$$sep$,$endfor$]{geometry}
5151$endif$
52+$if(lang)$
53+\ifxetex
54+ \usepackage{polyglossia}
55+ \setdefaultlanguage{$lang$}
56+ \setmainlanguage{$mainlang$}
57+\else
58+ \usepackage[$lang$]{babel}
59+\fi
60+$endif$
5261$if(natbib)$
5362\usepackage{natbib}
5463\bibliographystyle{$if(biblio-style)$$biblio-style$$else$plainnat$endif$}
@@ -123,14 +132,6 @@ $endif$
123132$if(verbatim-in-note)$
124133\VerbatimFootnotes % allows verbatim text in footnotes
125134$endif$
126−$if(lang)$
127−\ifxetex
128− \usepackage{polyglossia}
129− \setmainlanguage{$mainlang$}
130−\else
131− \usepackage[$lang$]{babel}
132−\fi
133−$endif$
134135
135136$if(title)$
136137\title{$title$$if(subtitle)$\\\vspace{0.5em}{\large $subtitle$}$endif$}