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
Loading
Loading
Loading
Loading
Loading
+36 −0
Original line number Diff line number Diff line
@@ -81,6 +81,9 @@
    type               = bc,
    programme          = NA,
    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,
    author             = Jane Doe,
    gender             = f,
@@ -113,6 +116,9 @@
    %% English thesis.
    programmeEn        = NA,
    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,
    titleEn            = The Economic Value of LaTeX,
    TeXtitleEn         = The Economic Value of \LaTeX,
@@ -171,6 +177,9 @@
    type          = bc,
    programme     = NA,
    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,
    author        = Jane Doe,
    gender        = f,
@@ -192,6 +201,9 @@
    %% English thesis.
    programmeEn   = NA,
    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,
    titleEn       = The Economic Value of LaTeX,
    TeXtitleEn    = The Economic Value of \LaTeX,
@@ -212,6 +224,9 @@
    type          = bc,
    programme     = NA,
    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,
    author        = Jane Doe,
    gender        = f,
@@ -238,6 +253,9 @@
    %% English thesis.
    programmeEn   = NA,
    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,
    titleEn       = LaTeX and Its Impact on the
                    Information Society,
@@ -344,6 +362,9 @@
    type          = bc,
    programme     = NA,
    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,
    author        = Jane Doe,
    gender        = f,
@@ -370,6 +391,9 @@
    %% English thesis.
    programmeEn   = NA,
    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,
    titleEn       = The Challenges of Teaching LaTeX
                    to Preschool Children,
@@ -392,6 +416,9 @@
    type               = bc,
    programme          = NA,
    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,
    author             = Jane Doe,
    gender             = f,
@@ -420,6 +447,9 @@
    %% English thesis.
    programmeEn        = NA,
    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,
    titleEn            = Plotting Data in LaTeX,
    TeXtitleEn         = Plotting Data in \LaTeX,
@@ -484,6 +514,9 @@
                      Statistics,
    programme       = 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,
    author          = Jane Doe,
    gender          = f,
@@ -510,6 +543,9 @@
    %% English thesis.
    programmeEn     = 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
	              Statistics,
    titleEn         = The Principles of the Typesetting of
+15 −5
Original line number Diff line number Diff line
@@ -956,6 +956,7 @@
%    \end{macrocode}
% \changes{v1.1.0}{2022/08/17}{^^A
%   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}
      {\sf\thesis@titlePage@LARGE\thesis@upper{author}\par}%
      \vfill\vfill
@@ -969,9 +970,11 @@
        {\sf\thesis@titlePage@large\thesis@@{bib@programme}: \thesis@programme\par}%
      \fi
      \ifthesis@blocks@titlePage@field@
        \ifx\thesis@field\empty\else
        \vspace{0.25cm}%
        {\sf\thesis@titlePage@large\thesis@@{fieldTitle}: \thesis@field@name\par}%
        \fi
      \fi
      \vfill
      {\sf\thesis@titlePage@large\thesis@place, \thesis@@{semester}%
%    \end{macrocode}
@@ -1257,6 +1260,8 @@
% \changes{v1.0.0}{2021/03/04}{The \cs{thesis@blocks@bibEntry} command
%   was expanded to more closely resemble Faculty of Science's bibEntry.
%   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}
\def\thesis@blocks@bibEntry{%
  \thesis@blocks@clear
@@ -1298,8 +1303,9 @@
      & \thesis@title \\
    \textbf{\thesis@@{bib@programme}:}
      & \thesis@programme \\
    \textbf{\thesis@@{bib@field}:}
      & \thesis@field \\
    \ifx\thesis@field\empty\else
    \textbf{\thesis@@{bib@field}:}%
      & \thesis@field \\\fi
    \textbf{\thesis@@{bib@advisor}:}
      & \thesis@advisor \\
    \textbf{\thesis@@{bib@academicYear}:}
@@ -1309,7 +1315,10 @@
    \textbf{\thesis@@{bib@keywords}:}
      & \thesis@TeXkeywords \\
  \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{%
  \ifthesis@english\else
  \thesis@blocks@clear
@@ -1350,8 +1359,9 @@
      & \thesis@titleEn \\
    \textbf{\thesis@english@bib@programme:}
      & \thesis@programmeEn \\
    \textbf{\thesis@english@bib@field:}
      & \thesis@fieldEn \\
    \ifx\thesis@fieldEn\empty\else
    \textbf{\thesis@english@bib@field:}%
      & \thesis@fieldEn@name \\\fi
    \textbf{\thesis@english@bib@advisor:}
      & \thesis@advisor \\
    \textbf{\thesis@english@bib@academicYear:}
+5 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@
% h_dokumentu.pdf}}.
%    \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{fithesis/style/mu/fithesis-mu-law}[2021/07/18]
\ProvidesPackage{fithesis/style/mu/fithesis-mu-law}[2024/03/06]
%    \end{macrocode}
% The file defines the color scheme of the respective faculty. Note
% the the color definitions are in RGB, which makes the resulting
@@ -54,6 +54,8 @@
% \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]}
% \changes{v1.1.1}{2024/03/06}{Updated the study field redefinition to
%   match the base definition. [TV]}
%    \begin{macrocode}
\thesis@blocks@titlePage@programme@false

@@ -69,10 +71,12 @@
      \thesis@programme\par}%
   \fi
   \ifthesis@blocks@titlePage@field@
     \ifx\thesis@field\empty\else
     \vspace{0.25cm}%
     {\sf\thesis@titlePage@large\thesis@@{fieldTitle}: 
      \thesis@field@name\par}%
     \fi
   \fi
   \vfill
}{}

+5 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@
% akulte_MU.pdf}}.
%    \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{fithesis/style/mu/fithesis-mu-med}[2021/07/18]
\ProvidesPackage{fithesis/style/mu/fithesis-mu-med}[2024/03/06]
%    \end{macrocode}
% The file defines the color scheme of the respective faculty. Note
% the the color definitions are in RGB, which makes the resulting
@@ -112,6 +112,8 @@
% \changes{v1.0.0}{2021/05/06}{Added conditional redefinition for the
%   study field. [TV]}
%    \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@xpatch\thesis@blocks@titlePage{%
@@ -126,10 +128,12 @@
      \thesis@programme\par}%
   \fi
   \ifthesis@blocks@titlePage@field@
     \ifx\thesis@field\empty\else
     \vspace{0.25cm}%
     {\sf\thesis@titlePage@large\thesis@@{fieldTitle}: 
      \thesis@field@name\par}%
     \fi
   \fi
   \vfill
}{}