Skip to content

Commit

Permalink
Merge pull request #18 from xvrabcov/feature/elements-order
Browse files Browse the repository at this point in the history 
Feature/elements order
  • Loading branch information
@xvrabcov
xvrabcov authored Mar 23, 2021
2 parents 65b5911 + c6f6857 commit a88e313
Show file tree
Hide file tree
Showing 12 changed files with 231 additions and 50 deletions.
71 changes: 62 additions & 9 deletions example/mu/example.dtx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand All @@ -110,6 +110,7 @@
university = mu,
faculty = econ,
type = bc,
programme = NA,
field = Applied Econometrics,
department = Department of Finance,
author = Jane Doe,
Expand Down Expand Up @@ -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,
Expand All @@ -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,
Expand Down Expand Up @@ -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,
Expand All @@ -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,
Expand All @@ -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
Expand All @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand All @@ -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
Expand All @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion locale/english.dtx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
44 changes: 32 additions & 12 deletions style/mu/base.dtx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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}
Expand Down Expand Up @@ -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}
Expand All @@ -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}
Expand Down Expand Up @@ -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 \\
Expand Down Expand Up @@ -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 \\
Expand Down
14 changes: 8 additions & 6 deletions style/mu/econ.dtx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand All @@ -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}
5 changes: 4 additions & 1 deletion style/mu/fi.dtx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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{%
Expand Down
Loading

0 comments on commit a88e313

Please sign in to comment.