Skip to content
Snippets Groups Projects
Commit 9ff81534 authored by Vít Starý Novotný's avatar Vít Starý Novotný
Browse files

Merge branch '33-support-for-omittable-field' into 'master'

Resolve "Support for omittable field"

Closes #33

See merge request !45
parents 52fb2fba 5e207f13
No related branches found
No related tags found
1 merge request!45Resolve "Support for omittable field"
Pipeline #
...@@ -81,6 +81,9 @@ ...@@ -81,6 +81,9 @@
type = bc, type = bc,
programme = NA, programme = NA,
field = Applied Econometrics, field = Applied Econometrics,
%% field = {}, %% Uncomment these lines (by removing the %%
%% %% at the beginning) to hide the field of
%% %% study in the Bibliographic Record.
department = Department of Finance, department = Department of Finance,
author = Jane Doe, author = Jane Doe,
gender = f, gender = f,
...@@ -113,6 +116,9 @@ ...@@ -113,6 +116,9 @@
%% English thesis. %% English thesis.
programmeEn = NA, programmeEn = NA,
fieldEn = Applied Econometrics, fieldEn = Applied Econometrics,
%% fieldEn = {}, %% Uncomment these lines (by removing the %%
%% %% at the beginning) to hide the field of
%% %% study in the Bibliographic Record.
departmentEn = Department of Finance, departmentEn = Department of Finance,
titleEn = The Economic Value of LaTeX, titleEn = The Economic Value of LaTeX,
TeXtitleEn = The Economic Value of \LaTeX, TeXtitleEn = The Economic Value of \LaTeX,
...@@ -171,6 +177,9 @@ ...@@ -171,6 +177,9 @@
type = bc, type = bc,
programme = NA, programme = NA,
field = Sport Management, field = Sport Management,
%% field = {}, %% Uncomment these lines (by removing the %%
%% %% at the beginning) to hide the field of study
%% %% in the Bibliographic Record and the Title Page.
department = Department of Social Sciences and Sport Management, department = Department of Social Sciences and Sport Management,
author = Jane Doe, author = Jane Doe,
gender = f, gender = f,
...@@ -192,6 +201,9 @@ ...@@ -192,6 +201,9 @@
%% English thesis. %% English thesis.
programmeEn = NA, programmeEn = NA,
fieldEn = Applied Econometrics, fieldEn = Applied Econometrics,
%% fieldEn = {}, %% Uncomment these lines (by removing the %%
%% %% at the beginning) to hide the field of
%% %% study in the Bibliographic Record.
departmentEn = Department of Finance, departmentEn = Department of Finance,
titleEn = The Economic Value of LaTeX, titleEn = The Economic Value of LaTeX,
TeXtitleEn = The Economic Value of \LaTeX, TeXtitleEn = The Economic Value of \LaTeX,
...@@ -212,6 +224,9 @@ ...@@ -212,6 +224,9 @@
type = bc, type = bc,
programme = NA, programme = NA,
field = Psychology, field = Psychology,
%% field = {}, %% Uncomment these lines (by removing the %%
%% %% at the beginning) to hide the field of
%% %% study in the Bibliographic Record.
department = Department of Health, department = Department of Health,
author = Jane Doe, author = Jane Doe,
gender = f, gender = f,
...@@ -238,6 +253,9 @@ ...@@ -238,6 +253,9 @@
%% English thesis. %% English thesis.
programmeEn = NA, programmeEn = NA,
fieldEn = Psychology, fieldEn = Psychology,
%% fieldEn = {}, %% Uncomment these lines (by removing the %%
%% %% at the beginning) to hide the field of
%% %% study in the Bibliographic Record.
departmentEn = Department of Health, departmentEn = Department of Health,
titleEn = LaTeX and Its Impact on the titleEn = LaTeX and Its Impact on the
Information Society, Information Society,
...@@ -344,6 +362,9 @@ ...@@ -344,6 +362,9 @@
type = bc, type = bc,
programme = NA, programme = NA,
field = Speech Therapy, field = Speech Therapy,
%% field = {}, %% Uncomment these lines (by removing the %%
%% %% at the beginning) to hide the field of study
%% %% in the Bibliographic Record and the Title Page.
department = Department of Primary Pedagogy, department = Department of Primary Pedagogy,
author = Jane Doe, author = Jane Doe,
gender = f, gender = f,
...@@ -370,6 +391,9 @@ ...@@ -370,6 +391,9 @@
%% English thesis. %% English thesis.
programmeEn = NA, programmeEn = NA,
fieldEn = Speech Therapy, fieldEn = Speech Therapy,
%% fieldEn = {}, %% Uncomment these lines (by removing the %%
%% %% at the beginning) to hide the field of
%% %% study in the Bibliographic Record.
departmentEn = Department of Primary Pedagogy, departmentEn = Department of Primary Pedagogy,
titleEn = The Challenges of Teaching LaTeX titleEn = The Challenges of Teaching LaTeX
to Preschool Children, to Preschool Children,
...@@ -392,6 +416,9 @@ ...@@ -392,6 +416,9 @@
type = bc, type = bc,
programme = NA, programme = NA,
field = Pharmacy, field = Pharmacy,
%% field = {}, %% Uncomment these lines (by removing the %%
%% %% at the beginning) to hide the field of study
%% %% in the Bibliographic Record and the Title Page.
department = Department of Pharmacy, department = Department of Pharmacy,
author = Jane Doe, author = Jane Doe,
gender = f, gender = f,
...@@ -420,6 +447,9 @@ ...@@ -420,6 +447,9 @@
%% English thesis. %% English thesis.
programmeEn = NA, programmeEn = NA,
fieldEn = Pharmacy, fieldEn = Pharmacy,
%% fieldEn = {}, %% Uncomment these lines (by removing the %%
%% %% at the beginning) to hide the field of
%% %% study in the Bibliographic Record.
departmentEn = Department of Pharmacy, departmentEn = Department of Pharmacy,
titleEn = Plotting Data in LaTeX, titleEn = Plotting Data in LaTeX,
TeXtitleEn = Plotting Data in \LaTeX, TeXtitleEn = Plotting Data in \LaTeX,
...@@ -484,6 +514,9 @@ ...@@ -484,6 +514,9 @@
Statistics, Statistics,
programme = Mathematics, programme = Mathematics,
field = Financial and Insurance Mathematics, field = Financial and Insurance Mathematics,
%% field = {}, %% Uncomment these lines (by removing the %%
%% %% at the beginning) to hide the field of
%% %% study in the Bibliographic Record.
type = bc, type = bc,
author = Jane Doe, author = Jane Doe,
gender = f, gender = f,
...@@ -510,6 +543,9 @@ ...@@ -510,6 +543,9 @@
%% English thesis. %% English thesis.
programmeEn = Mathematics, programmeEn = Mathematics,
fieldEn = Financial and Insurance Mathematics, fieldEn = Financial and Insurance Mathematics,
%% fieldEn = {}, %% Uncomment these lines (by removing the %%
%% %% at the beginning) to hide the field of
%% %% study in the Bibliographic Record.
departmentEn = Department of Mathematics and departmentEn = Department of Mathematics and
Statistics, Statistics,
titleEn = The Principles of the Typesetting of titleEn = The Principles of the Typesetting of
......
...@@ -956,6 +956,7 @@ ...@@ -956,6 +956,7 @@
% \end{macrocode} % \end{macrocode}
% \changes{v1.1.0}{2022/08/17}{^^A % \changes{v1.1.0}{2022/08/17}{^^A
% Typeset thesis title on cover and title pages in sans serif typeface. [VN]} % Typeset thesis title on cover and title pages in sans serif typeface. [VN]}
% \changes{v1.1.1}{2023/03/06}{The field of study shows only if not empty. [TV]}
% \begin{macrocode} % \begin{macrocode}
{\sf\thesis@titlePage@LARGE\thesis@upper{author}\par}% {\sf\thesis@titlePage@LARGE\thesis@upper{author}\par}%
\vfill\vfill \vfill\vfill
...@@ -969,8 +970,10 @@ ...@@ -969,8 +970,10 @@
{\sf\thesis@titlePage@large\thesis@@{bib@programme}: \thesis@programme\par}% {\sf\thesis@titlePage@large\thesis@@{bib@programme}: \thesis@programme\par}%
\fi \fi
\ifthesis@blocks@titlePage@field@ \ifthesis@blocks@titlePage@field@
\ifx\thesis@field\empty\else
\vspace{0.25cm}% \vspace{0.25cm}%
{\sf\thesis@titlePage@large\thesis@@{fieldTitle}: \thesis@field@name\par}% {\sf\thesis@titlePage@large\thesis@@{fieldTitle}: \thesis@field@name\par}%
\fi
\fi \fi
\vfill \vfill
{\sf\thesis@titlePage@large\thesis@place, \thesis@@{semester}% {\sf\thesis@titlePage@large\thesis@place, \thesis@@{semester}%
...@@ -1257,6 +1260,8 @@ ...@@ -1257,6 +1260,8 @@
% \changes{v1.0.0}{2021/03/04}{The \cs{thesis@blocks@bibEntry} command % \changes{v1.0.0}{2021/03/04}{The \cs{thesis@blocks@bibEntry} command
% was expanded to more closely resemble Faculty of Science's bibEntry. % was expanded to more closely resemble Faculty of Science's bibEntry.
% The \cs{thesis@blocks@bibEntryEn} was added. [TV]} % The \cs{thesis@blocks@bibEntryEn} was added. [TV]}
% \changes{v1.1.1}{2024/03/06}{If the \cs{thesis@field} key is empty string,
% the bibEntry field of study row does not appear. [TV]}
% \begin{macrocode} % \begin{macrocode}
\def\thesis@blocks@bibEntry{% \def\thesis@blocks@bibEntry{%
\thesis@blocks@clear \thesis@blocks@clear
...@@ -1298,8 +1303,9 @@ ...@@ -1298,8 +1303,9 @@
& \thesis@title \\ & \thesis@title \\
\textbf{\thesis@@{bib@programme}:} \textbf{\thesis@@{bib@programme}:}
& \thesis@programme \\ & \thesis@programme \\
\textbf{\thesis@@{bib@field}:} \ifx\thesis@field\empty\else
& \thesis@field \\ \textbf{\thesis@@{bib@field}:}%
& \thesis@field \\\fi
\textbf{\thesis@@{bib@advisor}:} \textbf{\thesis@@{bib@advisor}:}
& \thesis@advisor \\ & \thesis@advisor \\
\textbf{\thesis@@{bib@academicYear}:} \textbf{\thesis@@{bib@academicYear}:}
...@@ -1309,7 +1315,10 @@ ...@@ -1309,7 +1315,10 @@
\textbf{\thesis@@{bib@keywords}:} \textbf{\thesis@@{bib@keywords}:}
& \thesis@TeXkeywords \\ & \thesis@TeXkeywords \\
\end{thesis@newtable@old}}} \end{thesis@newtable@old}}}
% \end{macrocode}
% \changes{v1.1.1}{2024/03/06}{If the \cs{thesis@fieldEn} key is empty string,
% the bibEntryEn field of study row does not appear. [TV]}
% \begin{macrocode}
\def\thesis@blocks@bibEntryEn{% \def\thesis@blocks@bibEntryEn{%
\ifthesis@english\else \ifthesis@english\else
\thesis@blocks@clear \thesis@blocks@clear
...@@ -1350,8 +1359,9 @@ ...@@ -1350,8 +1359,9 @@
& \thesis@titleEn \\ & \thesis@titleEn \\
\textbf{\thesis@english@bib@programme:} \textbf{\thesis@english@bib@programme:}
& \thesis@programmeEn \\ & \thesis@programmeEn \\
\textbf{\thesis@english@bib@field:} \ifx\thesis@fieldEn\empty\else
& \thesis@fieldEn \\ \textbf{\thesis@english@bib@field:}%
& \thesis@fieldEn@name \\\fi
\textbf{\thesis@english@bib@advisor:} \textbf{\thesis@english@bib@advisor:}
& \thesis@advisor \\ & \thesis@advisor \\
\textbf{\thesis@english@bib@academicYear:} \textbf{\thesis@english@bib@academicYear:}
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
% h_dokumentu.pdf}}. % h_dokumentu.pdf}}.
% \begin{macrocode} % \begin{macrocode}
\NeedsTeXFormat{LaTeX2e} \NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{fithesis/style/mu/fithesis-mu-law}[2021/07/18] \ProvidesPackage{fithesis/style/mu/fithesis-mu-law}[2024/03/06]
% \end{macrocode} % \end{macrocode}
% The file defines the color scheme of the respective faculty. Note % The file defines the color scheme of the respective faculty. Note
% the the color definitions are in RGB, which makes the resulting % the the color definitions are in RGB, which makes the resulting
...@@ -54,6 +54,8 @@ ...@@ -54,6 +54,8 @@
% \changes{v1.0.0}{2021/03/22}{Added redefinition of the titlePage % \changes{v1.0.0}{2021/03/22}{Added redefinition of the titlePage
% layout as per the faculty requirements. Department name and % layout as per the faculty requirements. Department name and
% field are in the upper part of the titlePage. [TV]} % field are in the upper part of the titlePage. [TV]}
% \changes{v1.1.1}{2024/03/06}{Updated the study field redefinition to
% match the base definition. [TV]}
% \begin{macrocode} % \begin{macrocode}
\thesis@blocks@titlePage@programme@false \thesis@blocks@titlePage@programme@false
...@@ -69,9 +71,11 @@ ...@@ -69,9 +71,11 @@
\thesis@programme\par}% \thesis@programme\par}%
\fi \fi
\ifthesis@blocks@titlePage@field@ \ifthesis@blocks@titlePage@field@
\ifx\thesis@field\empty\else
\vspace{0.25cm}% \vspace{0.25cm}%
{\sf\thesis@titlePage@large\thesis@@{fieldTitle}: {\sf\thesis@titlePage@large\thesis@@{fieldTitle}:
\thesis@field@name\par}% \thesis@field@name\par}%
\fi
\fi \fi
\vfill \vfill
}{} }{}
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
% akulte_MU.pdf}}. % akulte_MU.pdf}}.
% \begin{macrocode} % \begin{macrocode}
\NeedsTeXFormat{LaTeX2e} \NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{fithesis/style/mu/fithesis-mu-med}[2021/07/18] \ProvidesPackage{fithesis/style/mu/fithesis-mu-med}[2024/03/06]
% \end{macrocode} % \end{macrocode}
% The file defines the color scheme of the respective faculty. Note % The file defines the color scheme of the respective faculty. Note
% the the color definitions are in RGB, which makes the resulting % the the color definitions are in RGB, which makes the resulting
...@@ -112,6 +112,8 @@ ...@@ -112,6 +112,8 @@
% \changes{v1.0.0}{2021/05/06}{Added conditional redefinition for the % \changes{v1.0.0}{2021/05/06}{Added conditional redefinition for the
% study field. [TV]} % study field. [TV]}
% \begin{macrocode} % \begin{macrocode}
% \changes{v1.1.1}{2024/03/06}{Updated the study field redefinition to
% match the base definition. [TV]}
\thesis@blocks@titlePage@field@false \thesis@blocks@titlePage@field@false
\thesis@xpatch\thesis@blocks@titlePage{% \thesis@xpatch\thesis@blocks@titlePage{%
...@@ -126,9 +128,11 @@ ...@@ -126,9 +128,11 @@
\thesis@programme\par}% \thesis@programme\par}%
\fi \fi
\ifthesis@blocks@titlePage@field@ \ifthesis@blocks@titlePage@field@
\ifx\thesis@field\empty\else
\vspace{0.25cm}% \vspace{0.25cm}%
{\sf\thesis@titlePage@large\thesis@@{fieldTitle}: {\sf\thesis@titlePage@large\thesis@@{fieldTitle}:
\thesis@field@name\par}% \thesis@field@name\par}%
\fi
\fi \fi
\vfill \vfill
}{} }{}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment