make \abstractpages two commands and resolve #59

liuthesis.cls

@@ -793,33 +793,42 @@ Linköping \@publicationyear\\
   \renewcommand{\maketitle}{\makegraduatetitle}
 \fi
 
-\newcommand{\abstractpages}{%
-  \ifphd
-    \vspace*{6mm}
-    \ifxetex
-      \begin{swedish}
-        \else
-        \selectlanguage{swedish}
-        \fi
-        \setlength{\parindent}{0mm}
-        \setlength\parskip{8pt}\centerline{POPULÄRVETENSKAPLIG SAMMANFATTNING}
-        \vspace{3mm}
-        \footnotesize{\@sammanfattning}
-        \ifxetex
-      \end{swedish}
-    \else
-      \swedishenglish
-      {
-      }
-      {
-        \selectlanguage{english}
-      }
-    \fi
+\newcommand{\clearto}{
+  \ifprinterfriendly
+    \cleartooddpage
+  \else
+    \cleartorecto
   \fi
-  \newpage
+}
+
+\newcommand{\sammanfattning}{
+  \vspace*{6mm}
+  \ifxetex
+    \begin{swedish}
+  \else
+    \selectlanguage{swedish}
+  \fi
+  \setlength{\parindent}{0mm}
+    \setlength\parskip{8pt}\centerline{POPULÄRVETENSKAPLIG SAMMANFATTNING}
+    \vspace{3mm}
+    \footnotesize{\@sammanfattning}
+  \ifxetex
+    \end{swedish}
+  \else
+    \swedishenglish{}{
+      \selectlanguage{english}
+    }
+  \fi
+}
+
+\newcommand{\abstractpage}{%
   \vspace*{6mm}
   { \setlength{\parindent}{0mm}
-    \setlength\parskip{8pt}\centerline{ABSTRACT}
+    \swedishenglish{
+      \setlength\parskip{8pt}\centerline{SAMMANFATTNING}
+    }{
+      \setlength\parskip{8pt}\centerline{ABSTRACT}
+    }
     \vspace{3mm}
     \footnotesize{\@abstract}
   }
@@ -1041,32 +1050,56 @@ Linköping \@publicationyear\\
     \makededicationpage
   \fi
   \cleartorecto%
-  \phantomsection
-  \swedishenglish{\addcontentsline{toc}{chapter}{Sammanfattning}}
-  {\addcontentsline{toc}{chapter}{Abstract}}
-  \cleardoublepage
-  \ifstudent
-    \begin{abstract}
-      \@abstract
-    \end{abstract}
-  \else
-    \abstractpages
-  \fi
-  \cleardoublepage
-  \newpage
-  \@acknowledgments
-  \swedishenglish{\addcontentsline{toc}{chapter}{Författarens tack}}
-  {\addcontentsline{toc}{chapter}{Acknowledgments}}
-  \cleardoublepage
+
+  % add abstract or sammanfattning
+  \swedishenglish{%
+    \phantomsection
+    \addcontentsline{toc}{chapter}{Sammanfattning}
+    \abstractpage
+    \clearto
+    \phantomsection
+    \addcontentsline{toc}{chapter}{Författarens tack}
+    \@acknowledgments
+    \clearto
+  }{%
+    \iflith
+      \phantomsection
+      \addcontentsline{toc}{chapter}{Abstract}
+      \abstractpage
+      \clearto
+      \ifphd
+        \phantomsection
+        \addcontentsline{toc}{chapter}{Populärvetenskaplig sammanfattning}
+        \sammanfattning
+        \clearto
+      \fi
+    \fi
+
+    \iffilfak
+      \ifphd
+        \phantomsection
+        \addcontentsline{toc}{chapter}{Populärvetenskaplig sammanfattning}
+        \sammanfattning
+        \clearto
+      \fi
+      \phantomsection
+      \addcontentsline{toc}{chapter}{Abstract}
+      \abstractpage
+      \clearto
+    \fi
+
+    \clearto
+    \phantomsection
+    \addcontentsline{toc}{chapter}{Acknowledgments}
+    \@acknowledgments
+  }
+  \clearto
+  
   {\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}{}
-  \ifprinterfriendly
-    \cleartooddpage
-  \else
-    \cleartorecto
-  \fi
+  \clearto
   \pagenumbering{arabic}
   \pagestyle{ruled}
 }