errata

[phd-thesis.git] / preamble.tex

diff --git a/preamble.tex b/preamble.tex
index 8032729..ec4f61d 100644 (file)
--- a/preamble.tex
+++ b/preamble.tex
@@ -1,5 +1,23 @@
 \usepackage[utf8]{inputenc}  % Input encoding
-\usepackage[T2A,T1]{fontenc} % Font encoding
+\usepackage[X2,T1]{fontenc} % Font encoding
+\usepackage{ifxetex}
+\ifxetex%
+       \usepackage{amsmath}        % extra math
+       \usepackage{fontspec}
+       \usepackage{polyglossia}
+       \setmainlanguage[variant=british]{english}
+       \setotherlanguage{dutch}
+       \setotherlanguage{russian}
+       \newfontfamily{\cyrillicfont}{Liberation Serif}
+\else
+       \usepackage{lmodern}        % Nicer font
+       \usepackage{microtype}      % Better kerning
+       \usepackage{amsmath}        % extra math
+       \usepackage{amssymb}        % extra math symbols
+
+       \usepackage[dutch,russian,british]{babel}
+%      \babelfont[russian]{rm}{Liberation Serif}
+\fi
 
 % Typography, widows, orphans, fonts
 \input{preamble/typography}
@@ -10,9 +28,6 @@
 % Papersize and layout
 \input{preamble/layout}
 
-% Bibliography
-\input{preamble/bibliography}
-
 % Tables
 \input{preamble/table}
 
@@ -22,20 +37,21 @@
 % Graphics
 \input{preamble/graphics}
 
-% Crossreferences, hyperlinks and metadata
+% Crossreferences, urls and hyperlinks
 \input{preamble/crossref}
 
-% Glossaries and acronyms
-\input{preamble/glossaries}
+% Bibliography
+\input{preamble/bibliography}
+
 
 % Custom commands
 \input{preamble/commands}
 
+% Glossaries and acronyms
+\input{preamble/glossaries}
+
 % File structure, this must be last of the preamble
 \usepackage{subfiles}
 
-% Metadata (only works in main document)
-\ifSubfilesClassLoaded{}{
-       \usepackage{xmpincl}
-       \includexmp{CC_Attribution-NoDerivatives_4.0_International}
-}
+% Metadata (only works in main document) and should go after subfiles
+\input{preamble/metadata}