Merge pull request #18 from xvrabcov/feature/elements-order

Feature/elements order

example/mu/example.dtx

@@ -100,8 +100,8 @@
 %<*econ>
 %    \end{macrocode}
 % \changes{v1.0.0}{2021/03/04}{Added elements that are used 
-%   by thesis@bibEntry and thesis@titlePage: field, fieldEn
-%   departmentEn. [TV]}
+%   by thesis@bibEntry and thesis@titlePage: field, fieldEn,
+%   departmentEn, programme, programmeEn. [TV]}
 %    \begin{macrocode}
 
 \thesissetup{
@@ -110,6 +110,7 @@
     university         = mu,
     faculty            = econ,
     type               = bc,
+    programme          = NA,
     field              = Applied Econometrics,
     department         = Department of Finance,
     author             = Jane Doe,
@@ -141,7 +142,8 @@
     %% The following keys are only useful, when you're using a
     %% locale other than English. You can safely omit them in an
     %% English thesis.
-    fieldEn        = Applied Econometrics,
+    programmeEn        = NA,
+    fieldEn            = Applied Econometrics,
     departmentEn       = Department of Finance,
     titleEn            = The Economic Value of LaTeX,
     TeXtitleEn         = The Economic Value of \LaTeX,
@@ -166,13 +168,14 @@
 %<*fi>
 %    \end{macrocode}
 % \changes{v1.0.0}{2021/03/04}{Added elements that are used
-%   by thesis@titlePage: field, department. [TV]}
+%   by thesis@titlePage: field, department, programme. [TV]}
 %    \begin{macrocode}
 \thesissetup{
     date        = \the\year/\the\month/\the\day,
     university  = mu,
     faculty     = fi,
     type        = bc,
+    programme   = Informatics,
     field       = Applied Informatics,
     department  = Department of Machine Learning and Data Processing,
     author      = Jane Doe,
@@ -204,13 +207,15 @@
 % \changes{v1.0.0}{2021/03/04}{Added elements that are used
 %   by thesis@bibEntry and thesis@titlePage: field, fieldEn,
 %   department, departmentEn, titleEn, TeXtitleEn, keywords, 
-%   keywordsEn, TeXkeywords, TeXkeywordsEn. [TV]}
+%   keywordsEn, TeXkeywords, TeXkeywordsEn, programme,
+%   programmeEn, abstract, abstractEn. [TV]}
 %    \begin{macrocode}
 \thesissetup{
     date          = \the\year/\the\month/\the\day,
     university    = mu,
     faculty       = fsps,
     type          = bc,
+    programme     = NA,
     field         = Sport Management,
     department    = Department of Social Sciences and Sport Management,
     author        = Jane Doe,
@@ -222,29 +227,42 @@
                     of Sports Tables,
     keywords      = {keyword1, keywords2, ...},
     TeXkeywords   = {keyword1, keywords2, \ldots},
+    abstract      = {%
+      This is the abstract of my thesis, which can
+
+      span multiple paragraphs.
+    },
     bib           = example.bib,
     %% The following keys are only useful, when you're using a
     %% locale other than English. You can safely omit them in an
     %% English thesis.
+    programmeEn   = NA,
     fieldEn       = Applied Econometrics,
     departmentEn  = Department of Finance,
     titleEn       = The Economic Value of LaTeX,
     TeXtitleEn    = The Economic Value of \LaTeX,
     keywordsEn    = {keyword1, keyword2, ...},
     TeXkeywordsEn = {keyword1, keyword2, \ldots},
+    abstractEn    = {%
+      This is the abstract of my thesis, which can
+
+      span multiple paragraphs.
+    },
 }
 %</fsps>
 %<*fss>
 %    \end{macrocode}
 % \changes{v1.0.0}{2021/03/04}{Added elements that are used
 %   by thesis@bibEntry and thesis@titlePage: field, fieldEn,
-%   department, departmentEn, titleEn, TeXtitleEn. [TV]}
+%   department, departmentEn, titleEn, TeXtitleEn, programme,
+%   programmeEn. [TV]}
 %    \begin{macrocode}
 \thesissetup{
     date          = \the\year/\the\month/\the\day,
     university    = mu,
     faculty       = fss,
     type          = bc,
+    programme     = NA,
     field         = Psychology,
     department    = Department of Health,
     author        = Jane Doe,
@@ -269,6 +287,7 @@
     %% The following keys are only useful, when you're using a
     %% locale other than English. You can safely omit them in an
     %% English thesis.
+    programmeEn   = NA,
     fieldEn       = Psychology,
     departmentEn  = Department of Health,
     titleEn       = LaTeX and Its Impact on the
@@ -287,13 +306,14 @@
 %<*law>
 %    \end{macrocode}
 % \changes{v1.0.0}{2021/03/04}{Added elements that are used
-%   by thesis@titlePage: field [TV]}
+%   by thesis@titlePage: field, programme [TV]}
 %    \begin{macrocode}
 \thesissetup{
     date          = \the\year/\the\month/\the\day,
     university    = mu,
     faculty       = law,
     type          = bc,
+    programme     = NA,
     field         = Law and Finance,
     department    = The Department of Commercial Law,
     author        = Jane Doe,
@@ -328,11 +348,16 @@
 }
 %</law>
 %<*med>
+%    \end{macrocode}
+% \changes{v1.0.0}{2021/03/22}{Added element that is used
+%   by thesis@titlePage: programme [TV]}
+%    \begin{macrocode}
 \thesissetup{
     date          = \the\year/\the\month/\the\day,
     university    = mu,
     faculty       = med,
     type          = bc,
+    programme     = NA,
     field         = Optometry,
     department    = The Department of Optometry and
                     Orthoptics,
@@ -372,13 +397,15 @@
 %    \end{macrocode}
 % \changes{v1.0.0}{2021/03/04}{Added elements that are used
 %   by thesis@bibEntry and thesis@titlePage: field, fieldEn,
-%   departmentEn, titleEn, TeXtitleEn. [TV]}
+%   departmentEn, titleEn, TeXtitleEn, programme, programmeEn.
+%   [TV]}
 %    \begin{macrocode}
 \thesissetup{
     date          = \the\year/\the\month/\the\day,
     university    = mu,
     faculty       = ped,
     type          = bc,
+    programme     = NA,
     field         = Speech Therapy,
     department    = Department of Primary Pedagogy,
     author        = Jane Doe,
@@ -404,6 +431,7 @@
     %% The following keys are only useful, when you're using a
     %% locale other than English. You can safely omit them in an
     %% English thesis.
+    programmeEn   = NA,
     fieldEn       = Speech Therapy,
     departmentEn  = Department of Primary Pedagogy,
     titleEn       = The Challenges of Teaching LaTeX
@@ -423,13 +451,15 @@
 %    \end{macrocode}
 % \changes{v1.0.0}{2021/03/04}{Added elements that are used
 %   by thesis@bibEntry and thesis@titlePage: fieldEn, departmentEn,
-%   titleEn, TeXtitleEn, keywordsEn, TeXkeywordsEn, abstractEn. [TV]}
+%   titleEn, TeXtitleEn, keywordsEn, TeXkeywordsEn, abstractEn,
+%   programme. [TV]}
 %    \begin{macrocode}
 \thesissetup{
     date        = \the\year/\the\month/\the\day,
     university  = mu,
     faculty     = phil,
     type        = bc,
+    programme   = NA,
     field       = Cognitive Sciences,
     department  = Department of Psychology,
     author      = Jane Doe,
@@ -475,6 +505,11 @@
 }
 %</phil>
 %<*sci>
+%    \end{macrocode}
+% \changes{v1.0.0}{2021/03/22}{Added elements that are used
+%   by thesis@bibEntry and thesis@titlePage: fieldEn,
+%   departmentEn, titleEn, TeXtitleEn, programmeEn. [TV]}
+%    \begin{macrocode}
 \thesissetup{
     date            = \the\year/\the\month/\the\day,
     university      = mu,
@@ -508,6 +543,24 @@
     %% beginning) and replace `assignment.pdf` with the filename
     %% of your scanned thesis assignment.
 %%    assignment         = assignment.pdf,
+    %% The following keys are only useful, when you're using a
+    %% locale other than English. You can safely omit them in an
+    %% English thesis.
+    programmeEn     = Mathematics,
+    fieldEn         = Financial and Insurance Mathematics,
+    departmentEn    = Department of Mathematics and
+	              Statistics,
+    titleEn         = The Principles of the Typesetting of
+                      Mathematics in TeX: the Program,
+    TeXtitleEn      = The Principles of the Typesetting of
+                      Mathematics in \TeX: the Program,
+    keywordsEn      = {keyword1, keyword2, ...},
+    TeXkeywordsEn   = {keyword1, keyword2, \ldots},
+    abstractEn      = {%
+      This is the abstract of my thesis, which can
+
+      span multiple paragraphs.
+    },
 }
 %</sci>
 %    \end{macrocode}

locale/english.dtx

@@ -74,7 +74,7 @@
 % \begin{macrocode}
 \gdef\thesis@english@advisorSignature{Signature of Thesis
   \thesis@english@advisorTitle}
-\gdef\thesis@english@fieldTitle{Field of study}
+\gdef\thesis@english@fieldTitle{Field of Study}
 \gdef\thesis@english@advisorTitle{Advisor}
 \gdef\thesis@english@authorTitle{Author}
 \gdef\thesis@english@abstractTitle{Abstract}

style/mu/base.dtx

@@ -906,12 +906,13 @@
       \par\vspace{0.75cm}%
       \ifthesis@blocks@titlePage@department@
         {\sf\thesis@titlePage@large\thesis@department@name}
-        \par\vspace{0.25cm}%
       \fi
       \ifthesis@blocks@titlePage@programme@
+	\par\vspace{0.25cm}%
         {\sf\thesis@titlePage@large\thesis@@{bib@programme}: \thesis@programme}\par
       \fi
       \ifthesis@blocks@titlePage@field@
+	\par\vspace{0.25cm}%
         {\sf\thesis@titlePage@large\thesis@@{fieldTitle}: \thesis@field@name}%
       \fi
       \par\vfill
@@ -934,6 +935,23 @@
     \end{center}%
   \end{alwayssingle}}
 %    \end{macrocode}
+% \end{macro}\begin{macro}{\thesis@blocks@seal}
+% \changes{v1.0.0}{2021/03/22}{Added macro for the seal of faculty.
+% [TV]}
+% The |\thesis@blocks@seal| macro typesets the seal of the faculty.
+% \begin{macrocode}
+\def\thesis@blocks@seal{%
+  \thesis@blocks@clear
+    \begin{alwayssingle}%
+      \thispagestyle{empty}%
+      \begin{center}%
+        \leavevmode
+        \par\vfill
+        \thesis@blocks@facultyLogo@color[width=6.3cm]%
+        \par\vfill\vfill\vfill\vfill
+      \end{center}%
+    \end{alwayssingle}}
+%    \end{macrocode}
 % \end{macro}\begin{macro}{\thesis@blocks@toc}
 % The |\thesis@blocks@toc| macro typesets the table of contents.
 % \begin{macrocode}
@@ -1020,15 +1038,16 @@
 % \end{macro}\begin{macro}{\thesis@blocks@keywords}
 % The |\thesis@blocks@keywords| macro typesets the
 % keywords.
+% \changes{v1.0.0}{2021/03/22}{Redefined keywords, keywordsEn
+%   macros so they by default start on the same page as the
+%   the previous element and are in the lower part of the page.
+%   [TV]}
 % \begin{macrocode}
 \def\thesis@blocks@keywords{%
   \begin{alwayssingle}%
-    % Start the new chapter without clearing the left page.
-    \clearpage
-    {\let\thesis@blocks@clear\relax
-    \chapter*{\thesis@@{keywordsTitle}}%
-    \noindent\thesis@TeXkeywords}%
-    \par\vfil\null
+    {\let\thesis@blocks@clear\relax%
+    \chapter*{\vspace*{\fill}\thesis@@{keywordsTitle}}}%
+    \leavevmode\thesis@keywords  
   \end{alwayssingle}}
 %    \end{macrocode}
 % \end{macro}\begin{macro}{\thesis@blocks@keywordsEn}
@@ -1043,12 +1062,9 @@
   \ifthesis@english\else
     {\thesis@selectLocale{english}%
     \begin{alwayssingle}%
-      % Start the new chapter without clearing the left page.
-      \clearpage
       {\let\thesis@blocks@clear\relax%
-      \chapter*{\thesis@english@keywordsTitle}}%
-      \noindent\thesis@TeXkeywordsEn
-      \par\vfil\null
+      \chapter*{\vspace*{\fill}\thesis@english@keywordsTitle}}%
+      \leavevmode\thesis@keywords
     \end{alwayssingle}}%
   \fi}
 %    \end{macrocode}
@@ -1206,6 +1222,8 @@
     \textbf{\thesis@@{bib@thesisTitle}:}
       & \thesis@title \\
     \textbf{\thesis@@{bib@programme}:}
+      & \thesis@programme \\
+    \textbf{\thesis@@{bib@field}:}
       & \thesis@field \\
     \textbf{\thesis@@{bib@advisor}:}
       & \thesis@advisor \\
@@ -1256,6 +1274,8 @@
     \textbf{\thesis@english@bib@thesisTitle:}
       & \thesis@titleEn \\
     \textbf{\thesis@english@bib@programme:}
+      & \thesis@programmeEn \\
+    \textbf{\thesis@english@bib@field:}
       & \thesis@fieldEn \\
     \textbf{\thesis@english@bib@advisor:}
       & \thesis@advisor \\

style/mu/econ.dtx

@@ -255,21 +255,23 @@
 % All blocks within the autolayout preamble that are not defined
 % within this file are defined in the
 % \texttt{style/mu/fithesis-base.sty} file.
+% \changes{v1.0.0}{2021/03/22}{Reorganised the blocks to fit the
+%   faculty's requirements. [TV]}
 %    \begin{macrocode}
 \def\thesis@blocks@preamble{%
   \thesis@blocks@coverMatter
     \thesis@blocks@cover
-  \thesis@blocks@frontMatter
     \thesis@blocks@titlePage
-    \thesis@blocks@assignment
+  \thesis@blocks@frontMatter
+    \thesis@blocks@seal
     \thesis@blocks@bibEntry
     \thesis@blocks@abstract
+    \thesis@blocks@bibEntryEn
     \thesis@blocks@abstractEn
-    \thesis@blocks@keywords
-    \thesis@blocks@keywordsEn
     \thesis@blocks@declaration
     \thesis@blocks@thanks
-    \thesis@blocks@toc}
+    \thesis@blocks@toc
+    \thesis@blocks@tables}
 %    \end{macrocode}
 % All blocks within the autolayout postamble that are not defined
 % within this file are defined in the \texttt{style/mu/base.sty}
@@ -280,5 +282,5 @@
 \def\thesis@blocks@postamble{%
   \ifx\thesis@doctoral\thesis@type\thesis@blocks@summary\else\fi
   \thesis@blocks@bibliography
-  \thesis@blocks@tables}
+}
 %    \end{macrocode}

style/mu/fi.dtx

@@ -83,21 +83,24 @@
 % All blocks within the autolayout preamble and postamble that are
 % not defined within this file are defined in the
 % \texttt{style/mu/fithesis-base.sty} file.
+% \changes{v1.0.0}{2021/03/22}{Reorganised the blocks to fit the
+%   faculty's requirements. [TV]}
 %    \begin{macrocode}
 \def\thesis@blocks@preamble{%
   \thesis@blocks@coverMatter
     \thesis@blocks@cover
     \thesis@blocks@titlePage
   \thesis@blocks@frontMatter
+    \thesis@blocks@seal
     \ifx\thesis@type\thesis@proposal
       \thesis@blocks@toc
     \else
       \thesis@blocks@assignment
       \thesis@blocks@declaration
-      \thesis@blocks@thanks
       \thesis@blocks@clearRight
         \thesis@blocks@abstract
         \thesis@blocks@keywords
+      \thesis@blocks@thanks
       \thesis@blocks@tables
     \fi}
 \def\thesis@blocks@postamble{%

style/mu/fsps.dtx

@@ -140,13 +140,19 @@
 % All blocks within the autolayout preamble and postamble that are
 % not defined within this file are defined in the
 % \texttt{style/mu/fithesis-base.sty} file.
+% \changes{v1.0.0}{2021/03/22}{Reorganised the blocks to fit the
+%   faculty's requirements. [TV]}
 %    \begin{macrocode}
 \def\thesis@blocks@preamble{%
   \thesis@blocks@coverMatter
     \thesis@blocks@cover
     \thesis@blocks@titlePage
   \thesis@blocks@frontMatter
-    \thesis@blocks@declaration
+    \thesis@blocks@seal
+    \thesis@blocks@bibEntry
+    \thesis@blocks@abstract
+    \thesis@blocks@bibEntryEn
+    \thesis@blocks@abstractEn
     \thesis@blocks@thanks
     \thesis@blocks@tables}
 \def\thesis@blocks@postamble{%

style/mu/fss.dtx

@@ -53,18 +53,19 @@
 % All blocks within the autolayout preamble and postamble that are
 % not defined within this file are defined in the
 % \texttt{style/mu/fithesis-base.sty} file.
+% \changes{v1.0.0}{2021/03/22}{Reorganised the blocks to fit the
+%   faculty's requirements. [TV]}
 %    \begin{macrocode}
 \def\thesis@blocks@preamble{%
   \thesis@blocks@coverMatter
     \thesis@blocks@cover
     \thesis@blocks@titlePage
   \thesis@blocks@frontMatter
-    \thesis@blocks@clearRight
-      \thesis@blocks@abstract
-      \thesis@blocks@abstractEn
-      \thesis@blocks@keywords
-      \thesis@blocks@keywordsEn
-    \thesis@blocks@assignment
+    \thesis@blocks@seal
+    \thesis@blocks@bibEntry
+    \thesis@blocks@abstract
+    \thesis@blocks@bibEntryEn
+    \thesis@blocks@abstractEn
     \thesis@blocks@declaration
     \thesis@blocks@thanks
     \thesis@blocks@tables}

style/mu/law.dtx

@@ -35,7 +35,10 @@
 %    \end{macrocode}
 % Each footnote is uniquely numbered across the entire document as
 % per the formal requirements of the faculty.
+% \changes{v1.0.0}{2021/03/22}{Added \textsf{regexpatch} package to
+%   redefine the layout of titlePage. [TV]}
 %    \begin{macrocode}
+\thesis@require{xpatch}
 \thesis@require{chngcntr}
 \counterwithout{footnote}{chapter}
 %    \end{macrocode}
@@ -53,6 +56,43 @@
     \thesis@titlePage@large\thesis@department@name\\\vskip 2em}}
 \let\thesis@blocks@titlePage@header=\thesis@blocks@cover@header
 %    \end{macrocode}
+% \changes{v1.0.0}{2021/03/22}{Added redefinition of the titlePage
+%   layout as per the faculty requirements. Department name and
+%   field are in the upper part of the titlePage. [TV]}
+%    \begin{macrocode}
+\xpatchcmd{\thesis@blocks@titlePage}
+{{\sf\thesis@titlePage@large\thesis@@{advisorTitle}: \thesis@advisor}%
+   \par\vspace{0.75cm}%
+   \ifthesis@blocks@titlePage@department@
+     {\sf\thesis@titlePage@large\thesis@department@name}
+   \fi
+   \ifthesis@blocks@titlePage@programme@
+     \par\vspace{0.25cm}%
+     {\sf\thesis@titlePage@large\thesis@@{bib@programme}: 
+	\thesis@programme}\par
+   \fi
+   \ifthesis@blocks@titlePage@field@
+     \par\vspace{0.25cm}%
+     {\sf\thesis@titlePage@large\thesis@@{fieldTitle}: 
+	\thesis@field@name}%
+   \fi
+   \par\vfill
+}
+{}{}{}
+
+\xpatchcmd{\thesis@blocks@titlePage}
+{{\sf\thesis@titlePage@large\thesis@@upper{facultyName}}%
+ \par\vspace{1.75cm}%
+}
+{{\sf\thesis@titlePage@large\thesis@@upper{facultyName}}%
+ \par\vspace{0.75cm}%
+ {\sf\thesis@titlePage@large\thesis@field}%
+ \par\vspace{0.25cm}%
+ {\sf\thesis@titlePage@large\thesis@department@name}
+ \par\vspace{1.75cm}%
+}
+{}{}
+%    \end{macrocode}
 % \begin{macro}{\thesis@blocks@frontMatter}
 % The |\thesis@blocks@frontMatter| macro sets up the style
 % of the front matter of the thesis. The page numbering is arabic
@@ -85,17 +125,21 @@
 % All blocks within the autolayout preamble that are not defined
 % within this file are defined in the
 % \texttt{style/mu/fithesis-base.sty} file.
+% \changes{v1.0.0}{2021/03/22}{Reorganised the blocks to fit the
+%   faculty's requirements. [TV]}
 %    \begin{macrocode}
 \def\thesis@blocks@preamble{%
   \thesis@blocks@coverMatter
     \thesis@blocks@cover
     \thesis@blocks@titlePage
   \thesis@blocks@frontMatter
+    \thesis@blocks@seal
     \thesis@blocks@declaration
     \thesis@blocks@clearRight
       \thesis@blocks@abstract
-      \thesis@blocks@abstractEn
       \thesis@blocks@keywords
+    \thesis@blocks@clearRight
+      \thesis@blocks@abstractEn
       \thesis@blocks@keywordsEn
     \thesis@blocks@thanks
     \thesis@blocks@tables}

style/mu/med.dtx

@@ -46,10 +46,13 @@
 % 16\,cm in accordance with the formal requirements of the faculty.
 % This leads to overfull lines and is against the good conscience
 % of the author of this style.
+% \changes{v1.0.0}{2021/03/22}{Added \textsf{xpatch} package to
+%   redefine layout of titlePage. [TV]}
 %    \begin{macrocode}
 \thesis@require{tikz}
 \thesis@require{geometry}
 \thesis@require{setspace}
+	\thesis@require{xpatch}
 \geometry{top=25mm,bottom=20mm,left=25mm,right=25mm,includeheadfoot}
 %    \end{macrocode}
 % \begin{macro}{\thesis@blocks@cover}
@@ -87,6 +90,43 @@
 %   no longer redefine the \cs{thesis@blocks@titlePage@footer}
 %   and \cs{thesis@blocks@titlePage@content} macros, which are no
 %   longer defined. [VN]}
+% \changes{v1.0.0}{2021/03/22}{Added redefinition of the titlePage
+%   layout as per the faculty requirements. Department name and
+%   programme are in the upper part of the titlePage. [TV]}
+%    \begin{macrocode}
+\xpatchcmd{\thesis@blocks@titlePage}
+{{\sf\thesis@titlePage@large\thesis@@{advisorTitle}: \thesis@advisor}%
+   \par\vspace{0.75cm}%
+   \ifthesis@blocks@titlePage@department@
+     {\sf\thesis@titlePage@large\thesis@department@name}
+   \fi
+   \ifthesis@blocks@titlePage@programme@
+     \par\vspace{0.25cm}%
+     {\sf\thesis@titlePage@large\thesis@@{bib@programme}: 
+	\thesis@programme}\par
+   \fi
+   \ifthesis@blocks@titlePage@field@
+     \par\vspace{0.25cm}%
+     {\sf\thesis@titlePage@large\thesis@@{fieldTitle}: 
+	\thesis@field@name}%
+   \fi
+   \par\vfill
+}
+{}{}{}
+
+\xpatchcmd{\thesis@blocks@titlePage}
+{{\sf\thesis@titlePage@large\thesis@@upper{facultyName}}%
+ \par\vspace{1.75cm}%
+}
+{{\sf\thesis@titlePage@large\thesis@@upper{facultyName}}%
+ \par\vspace{0.75cm}%
+ {\sf\thesis@titlePage@large\thesis@programme}%
+ \par\vspace{0.25cm}%
+ {\sf\thesis@titlePage@large\thesis@department@name}
+ \par\vspace{1.75cm}%
+}
+{}{}
+%    \end{macrocode}
 % \begin{macro}{\thesis@blocks@frontMatter}
 % The |\thesis@blocks@frontMatter| macro sets up the style of the
 % front matter of the thesis. The page numbering is arabic in
@@ -127,20 +167,22 @@
 % All blocks within the autolayout preamble and postamble that are
 % not defined within this file are defined in the
 % \texttt{style/mu/fithesis-base.sty} file.
+% \changes{v1.0.0}{2021/03/22}{Reorganised the blocks to fit the
+%   faculty's requirements. [TV]}
 %    \begin{macrocode}
 \def\thesis@blocks@preamble{%
   \thesis@blocks@coverMatter
     \thesis@blocks@cover
-  \thesis@blocks@frontMatter
     \thesis@blocks@titlePage
-    \onehalfspacing
+  \thesis@blocks@frontMatter
+    \thesis@blocks@seal
+    \thesis@blocks@declaration
     \thesis@blocks@clearRight
       \thesis@blocks@abstract
-      \thesis@blocks@abstractEn
       \thesis@blocks@keywords
+    \thesis@blocks@clearRight
+      \thesis@blocks@abstractEn
       \thesis@blocks@keywordsEn
-    \thesis@blocks@bibEntry
-    \thesis@blocks@declaration
     \thesis@blocks@thanks
     \thesis@blocks@tables}
 \def\thesis@blocks@postamble{%

style/mu/ped.dtx

@@ -50,17 +50,19 @@
 % All blocks within the autolayout preamble and postamble that are
 % not defined within this file are defined in the
 % \texttt{style/mu/fithesis-base.sty} file.
+% \changes{v1.0.0}{2021/03/22}{Reorganised the blocks to fit the
+%   faculty's requirements. [TV]}
 %    \begin{macrocode}
 \def\thesis@blocks@preamble{%
   \thesis@blocks@coverMatter
     \thesis@blocks@cover
     \thesis@blocks@titlePage
   \thesis@blocks@frontMatter
+    \thesis@blocks@seal
     \thesis@blocks@bibEntry
     \thesis@blocks@abstract
+    \thesis@blocks@bibEntryEn
     \thesis@blocks@abstractEn
-    \thesis@blocks@keywords
-    \thesis@blocks@keywordsEn
     \thesis@blocks@declaration
     \thesis@blocks@thanks
     \thesis@blocks@tables}

style/mu/phil.dtx

@@ -103,12 +103,15 @@
 % All blocks within the autolayout preamble and postamble that are
 % not defined within this file are defined in the
 % \texttt{style/mu/fithesis-base.sty} file.
+% \changes{v1.0.0}{2021/03/22}{Reorganised the blocks to fit the
+%   faculty's requirements. [TV]}
 %    \begin{macrocode}
 \def\thesis@blocks@preamble{%
   \thesis@blocks@coverMatter
     \thesis@blocks@cover
     \thesis@blocks@titlePage
   \thesis@blocks@frontMatter
+     \thesis@blocks@seal
 %    \end{macrocode}
 % In KISK theses, the bibliographical entry, the abstract, and the
 % keywords will be included after the cover matter.
@@ -118,9 +121,8 @@
     \ifx\thesis@department\thesis@departments@kisk
       \thesis@blocks@bibEntry
       \thesis@blocks@abstract
+      \thesis@blocks@bibEntryEn
       \thesis@blocks@abstractEn
-      \thesis@blocks@keywords
-      \thesis@blocks@keywordsEn
     \fi
     \thesis@blocks@declaration
     \ifx\thesis@doctoral\thesis@type\thesis@blocks@summary\else\fi

style/mu/sci.dtx

@@ -95,6 +95,8 @@
 % All blocks within the autolayout preamble and postamble that are
 % not defined within this file are defined in the
 % \texttt{style/mu/fithesis-base.sty} file.
+% \changes{v1.0.0}{2021/03/22}{Reorganised the blocks to fit the
+%   faculty's requirements. [TV]}
 %    \begin{macrocode}
 \def\thesis@blocks@preamble{
   \thesis@blocks@coverMatter
@@ -104,12 +106,16 @@
     \ifx\thesis@type\thesis@proposal
       \thesis@blocks@toc
     \else
-      \thesis@blocks@assignment
-      \thesis@blocks@declaration
-      \thesis@blocks@thanks
+      \thesis@blocks@seal
+      \thesis@blocks@bibEntry
+      \thesis@blocks@bibEntryEn
       \thesis@blocks@clearRight
         \thesis@blocks@abstract
-        \thesis@blocks@keywords
+      \thesis@blocks@clearRight
+	\thesis@blocks@abstractEn
+      \thesis@blocks@assignment
+      \thesis@blocks@thanks
+      \thesis@blocks@declaration
       \thesis@blocks@tables
     \fi}
 \def\thesis@blocks@postamble{%