Merge branch 'master' into 'master'

Don't typeset from \AtBeginDocument

See merge request olale55/liuthesis!37

liuthesis.cls

@@ -154,9 +154,9 @@
 
 \createvariable{divanumber}
 % Include the abstract
-\gdef\@abstract{\input{abstract}}
-\gdef\@sammanfattning{\input{sammanfattning.tex}}
-\gdef\@acknowledgments{\input{acknowledgments.tex}}
+\gdef\liuthesisabstract{\input{abstract}}
+\gdef\liuthesissammanfattning{\input{sammanfattning.tex}}
+\gdef\liuthesisacknowledgments{\input{acknowledgments.tex}}
 
 \newif\iflith
 \lithtrue
@@ -604,7 +604,7 @@
     \\[15mm]
     \small \textbf{Abstract}\\
     \begin{justify}
-      \@abstract
+      \liuthesisabstract
     \end{justify}
     \vfill
     \includegraphics[width=35mm]{liu_primary_black_en}
@@ -673,7 +673,7 @@
     \\[2\baselineskip]
     {\bfseries Abstract}\\
     \begin{justify}
-      \@abstract
+      \liuthesisabstract
     \end{justify}
   \vfill
   \begin{flushleft}
@@ -820,7 +820,7 @@
   \setlength{\parindent}{0mm}
     \setlength\parskip{8pt}\centerline{POPULÄRVETENSKAPLIG SAMMANFATTNING}
     \vspace{3mm}
-    \footnotesize{\@sammanfattning}
+    \footnotesize{\liuthesissammanfattning}
   \ifxetex
     \end{swedish}
   \else
@@ -837,7 +837,7 @@
   { \setlength{\parindent}{0mm}
     \setlength\parskip{8pt}\centerline{ABSTRACT}
     \vspace{3mm}
-    \footnotesize{\@abstract}
+    \footnotesize{\liuthesisabstract}
   }
 }
 
@@ -1029,7 +1029,7 @@ refer to its www home page:
 
 %% Load user settings from the file settings.tex
 
-\AtBeginDocument{%
+\AfterEndPreamble{%
   \resetlayout
   \checkandfixthelayout
   \pagestyle{empty}
@@ -1064,21 +1064,21 @@ refer to its www home page:
 \cleardoublepage
 \ifstudent
 \begin{abstract}
-  \@abstract
+  \liuthesisabstract
 \end{abstract}
 \else
 \abstractpages
 \fi
 \cleardoublepage
   \newpage
-  \@acknowledgments
+  \liuthesisacknowledgments
   \swedishenglish{\addcontentsline{toc}{chapter}{Författarens tack}}
   {\addcontentsline{toc}{chapter}{Acknowledgments}}
   \cleardoublepage
   {\pagestyle{plain}\tableofcontents\relax\cleardoublepage}
   \iftotalfigures {\pagestyle{plain}\listoffigures\relax\cleardoublepage}\fi
   \iftotaltables {\pagestyle{plain}\listoftables\relax\cleardoublepage}\fi
-  \@ifpackageloaded{todonotes}{\pagestyle{plain}\listoftodos\relax\cleardoublepage}{}
+  \ifdef{\listoftodos}{\ifdefempty{\listoftodos}{}{\pagestyle{plain}\listoftodos\relax\cleardoublepage}}{}
   \ifprinterfriendly
     \cleartooddpage
   \else