summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/fithesis
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/source/latex/fithesis')
-rw-r--r--Master/texmf-dist/source/latex/fithesis/LICENSE.tex8
-rw-r--r--Master/texmf-dist/source/latex/fithesis/VERSION.tex2
-rw-r--r--Master/texmf-dist/source/latex/fithesis/fithesis.dtx7
-rw-r--r--Master/texmf-dist/source/latex/fithesis/style/mu/base.dtx51
-rw-r--r--Master/texmf-dist/source/latex/fithesis/style/mu/econ.dtx14
-rw-r--r--Master/texmf-dist/source/latex/fithesis/style/mu/fsps.dtx14
-rw-r--r--Master/texmf-dist/source/latex/fithesis/style/mu/law.dtx6
-rw-r--r--Master/texmf-dist/source/latex/fithesis/style/mu/med.dtx6
-rw-r--r--Master/texmf-dist/source/latex/fithesis/style/mu/sci.dtx16
9 files changed, 95 insertions, 29 deletions
diff --git a/Master/texmf-dist/source/latex/fithesis/LICENSE.tex b/Master/texmf-dist/source/latex/fithesis/LICENSE.tex
index 43ab5443ee8..907702267a6 100644
--- a/Master/texmf-dist/source/latex/fithesis/LICENSE.tex
+++ b/Master/texmf-dist/source/latex/fithesis/LICENSE.tex
@@ -1,9 +1,9 @@
\input docstrip.tex
\preamble
-Copyright 1998--2022 Daniel Marek (DM), Jan Pavlovič (JP),
- Vít Novotný (VN), Tereza Vrabcová (TV),
- Petr Sojka (PS)
+Copyright 1998--2024 Daniel Marek (DM), Jan Pavlovič (JP),
+ Petr Sojka (PS), Vít Starý Novotný (VN),
+ Tereza Vrabcová (TV)
http://www.fi.muni.cz/tech/unix/tex/fithesis.xhtml
Faculty of Informatics, Masaryk University (Brno, Czech Republic)
@@ -19,7 +19,7 @@ version 2005/12/01 or later.
This work has the LPPL maintenance status `maintained'.
-The Current Maintainer of this work is Vít Novotný (VN).
+The Current Maintainer of this work is Vít Starý Novotný (VN).
Send bug reports, requests for additions and questions
either to the fithesis discussion forum at
diff --git a/Master/texmf-dist/source/latex/fithesis/VERSION.tex b/Master/texmf-dist/source/latex/fithesis/VERSION.tex
index 5ecb9fe3098..d37d1d40deb 100644
--- a/Master/texmf-dist/source/latex/fithesis/VERSION.tex
+++ b/Master/texmf-dist/source/latex/fithesis/VERSION.tex
@@ -1 +1 @@
-2022/08/17 v1.1.0 fithesis4 MU thesis class
+2024/03/06 v1.1.1 fithesis4 MU thesis class
diff --git a/Master/texmf-dist/source/latex/fithesis/fithesis.dtx b/Master/texmf-dist/source/latex/fithesis/fithesis.dtx
index 4c7577def5d..ee42aa8ee64 100644
--- a/Master/texmf-dist/source/latex/fithesis/fithesis.dtx
+++ b/Master/texmf-dist/source/latex/fithesis/fithesis.dtx
@@ -57,7 +57,7 @@
\gdef\thesis@version@number{#1}
\gdef\thesis@version@date{#2}
\gdef\thesis@version{#2 #1 fithesis4 MU thesis class}}
-\thesis@versiondef{v1.1.0}{2022/08/17}}
+\thesis@versiondef{v1.1.1}{2024/03/06}}
% {\newwrite\f\openout\f=VERSION\write\f{\thesis@version}\closeout\f}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -419,8 +419,9 @@
%
% \title{The \textsf{fithesis4} class for the typesetting of theses written
% at the Masaryk University in Brno}
-% \author{Daniel Marek, Jan Pavlovič, Vít Novotný, Tereza Vrabcová, Petr Sojka}
-% \date{\today}
+% \author{Daniel Marek, Jan Pavlovič, Petr Sojka,\\
+% Vít Starý Novotný, Tereza Vrabcová}
+% \date{2024/03/06}
% \maketitle
%
% \begin{abstract}
diff --git a/Master/texmf-dist/source/latex/fithesis/style/mu/base.dtx b/Master/texmf-dist/source/latex/fithesis/style/mu/base.dtx
index 32a93f115b6..28dcb21d548 100644
--- a/Master/texmf-dist/source/latex/fithesis/style/mu/base.dtx
+++ b/Master/texmf-dist/source/latex/fithesis/style/mu/base.dtx
@@ -9,7 +9,7 @@
% after \texttt{style/fithesis-base.sty}, regardless of the value
% of the |\thesis@style| macro.
% \begin{macrocode}
-\ProvidesPackage{fithesis/style/mu/fithesis-mu-base}[2022/08/15]
+\ProvidesPackage{fithesis/style/mu/fithesis-mu-base}[2024/03/06]
\NeedsTeXFormat{LaTeX2e}
% \end{macrocode}
% The file recognizes the following options: \begin{itemize}
@@ -275,7 +275,7 @@
% \textsf{microtype} package gets loaded.
% \begin{macrocode}
\ifthesis@microtype@
- \thesis@require[final,babel]{microtype}
+ \thesis@require[final,babel,nopatch=item]{microtype}
\fi
% \end{macrocode}
% Using the |\ifxetex| and |\ifluatex| conditionals, a compound
@@ -639,11 +639,15 @@
% \changes{v1.1.0}{2022/08/15}{^^A
% Added the \texttt{colorbold} and \texttt{nocolorbold} package
% options for the Masaryk University in Brno. [TV]}
+% \changes{v1.1.1}{2024/03/06}{^^A
+% Only apply the \texttt{colorbold} package option if the \texttt{color}
+% package option is also enabled. [VN]}
% \begin{macrocode}
\let\thesis@bfseries@old\bfseries
\def\bfseries{%
\ifthesis@sansbold@\sffamily\fi
- \ifthesis@colorbold@\color{thesis@color@secondary}\fi\thesis@bfseries@old}
+ \ifthesis@color@\ifthesis@colorbold@\color{thesis@color@secondary}\fi\fi
+ \thesis@bfseries@old}
% \end{macrocode}
% The file defines several blocks to be used in the redefinitions
% of the |\thesis@blocks@preamble| and |\thesis@blocks@postamble|
@@ -952,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
@@ -965,8 +970,10 @@
{\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}%
@@ -1099,12 +1106,14 @@
% 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]}
+% \changes{v1.1.1}{2024/03/06}{Typeset \cs{thesis@TeXkeywords},
+% not \cs{thesis@keywords}. [VN]}
% \begin{macrocode}
\def\thesis@blocks@keywords{%
\begin{alwayssingle}%
{\let\thesis@blocks@clear\relax%
\chapter*{\vspace*{\fill}\thesis@@{keywordsTitle}}}%
- \noindent\leavevmode\thesis@keywords
+ \noindent\leavevmode\thesis@TeXkeywords
\end{alwayssingle}}
% \end{macrocode}
% \end{macro}\begin{macro}{\thesis@blocks@keywordsEn}
@@ -1114,6 +1123,8 @@
% \changes{v0.3.46}{2017/06/02}{Simplified the definition of
% \cs{thesis@blocks@keywordsEn} in
% \texttt{style/mu/fithesis-base.sty}. [VN]}
+% \changes{v1.1.1}{2024/03/06}{Typeset \cs{thesis@TeXkeywords},
+% not \cs{thesis@keywords}. [VN]}
% \begin{macrocode}
\def\thesis@blocks@keywordsEn{%
\ifthesis@english\else
@@ -1121,7 +1132,7 @@
\begin{alwayssingle}%
{\let\thesis@blocks@clear\relax%
\chapter*{\vspace*{\fill}\thesis@english@keywordsTitle}}%
- \noindent\leavevmode\thesis@keywordsEn
+ \noindent\leavevmode\thesis@TeXkeywordsEn
\end{alwayssingle}}%
\fi}
% \end{macrocode}
@@ -1227,6 +1238,15 @@
\pagestyle{thesisheadings}
\parindent 1.5em\relax}
% \end{macrocode}
+% \end{macro}\begin{macro}{\thesis@blocks@bibEntry@pagetotal}
+% The |\thesis@blocks@bibEntry@pageTotal| macro typeset the total number of
+% pages in the thesis in the format required by the bibliographic entry.
+% \changes{v1.1.1}{2024/03/06}{Add the \cs{thesis@blocks@bibEntry@pagetotal}
+% command for the Masaryk University in Brno. [TV, VN]}
+% \begin{macrocode}
+\def\thesis@blocks@bibEntry@pagetotal{%
+ \thesis@pages@preamble{} + \thesis@pages}
+% \end{macrocode}
% \end{macro}\begin{macro}{\thesis@blocks@bibEntry}
% The |\thesis@blocks@bibEntry| macro typesets a bibliographical
% entry. Along with the macros required by the locale file
@@ -1240,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
@@ -1281,18 +1303,22 @@
& \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}:}
& \thesis@academicYear \\
\textbf{\thesis@@{bib@pages}:}
- & \thesis@pages@preamble{} + \thesis@pages \\
+ & \thesis@blocks@bibEntry@pagetotal \\
\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
@@ -1333,14 +1359,15 @@
& \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:}
& \thesis@academicYear \\
\textbf{\thesis@english@bib@pages:}
- & \thesis@pages@preamble{} + \thesis@pages \\
+ & \thesis@blocks@bibEntry@pagetotal \\
\textbf{\thesis@english@bib@keywords:}
& \thesis@TeXkeywordsEn \\
\end{thesis@newtable@old}}
diff --git a/Master/texmf-dist/source/latex/fithesis/style/mu/econ.dtx b/Master/texmf-dist/source/latex/fithesis/style/mu/econ.dtx
index fc210098b30..5e87042cbff 100644
--- a/Master/texmf-dist/source/latex/fithesis/style/mu/econ.dtx
+++ b/Master/texmf-dist/source/latex/fithesis/style/mu/econ.dtx
@@ -22,7 +22,7 @@
% 768134/}}.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{fithesis/style/mu/fithesis-mu-econ}[2022/08/17]
+\ProvidesPackage{fithesis/style/mu/fithesis-mu-econ}[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
@@ -86,7 +86,17 @@
% \begin{macrocode}
\thesis@blocks@titlePage@field@false
% \end{macrocode}
-% \begin{macro}{\thesis@blocks@cover}
+% \begin{macro}{\thesis@blocks@bibEntry@pagetotal}
+% The |\thesis@blocks@bibEntry@pageTotal| macro typeset the total number of
+% pages in the thesis in the format required by the bibliographic entry.
+% The format is just the total number of pages, as mandated by the formal
+% requirements of the faculty.
+% \changes{v1.1.1}{2024/03/06}{Add the \cs{thesis@blocks@bibEntry@pagetotal}
+% command for the Masaryk University in Brno. [TV, VN]}
+% \begin{macrocode}
+\def\thesis@blocks@bibEntry@pagetotal{\thesis@pages}
+% \end{macrocode}
+% \end{macro}\begin{macro}{\thesis@blocks@cover}
% The |\thesis@blocks@cover| macro typesets the cover page. Compared
% to the definition within the \texttt{style/mu/base.sty} file, this
% macro does not include the title of the thesis, and typesets the
diff --git a/Master/texmf-dist/source/latex/fithesis/style/mu/fsps.dtx b/Master/texmf-dist/source/latex/fithesis/style/mu/fsps.dtx
index 30437fc417d..e4950b29028 100644
--- a/Master/texmf-dist/source/latex/fithesis/style/mu/fsps.dtx
+++ b/Master/texmf-dist/source/latex/fithesis/style/mu/fsps.dtx
@@ -12,7 +12,7 @@
% y_vypracovani_ZP_bc-mgr-rig.pdf}}.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{fithesis/style/mu/fithesis-mu-fsps}[2021/07/18]
+\ProvidesPackage{fithesis/style/mu/fithesis-mu-fsps}[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
@@ -58,7 +58,17 @@
% at the Masaryk University in Brno no longer
% redefine the \cs{thesis@blocks@titlePage@footer} macro, which
% is no longer defined. [VN]}
-% \begin{macro}{\thesis@blocks@frontMatter}
+% \begin{macro}{\thesis@blocks@bibEntry@pagetotal}
+% The |\thesis@blocks@bibEntry@pageTotal| macro typeset the total number of
+% pages in the thesis in the format required by the bibliographic entry.
+% The format is just the total number of pages, as mandated by the formal
+% requirements of the faculty.
+% \changes{v1.1.1}{2024/03/06}{Add the \cs{thesis@blocks@bibEntry@pagetotal}
+% command for the Masaryk University in Brno. [TV, VN]}
+% \begin{macrocode}
+\def\thesis@blocks@bibEntry@pagetotal{\thesis@pages}
+% \end{macrocode}
+% \end{macro}\begin{macro}{\thesis@blocks@frontMatter}
% The |\thesis@blocks@frontMatter| macro sets up the style of the
% front matter of the thesis. The leading is adjusted in
% accordance with the requirements of the faculty.
diff --git a/Master/texmf-dist/source/latex/fithesis/style/mu/law.dtx b/Master/texmf-dist/source/latex/fithesis/style/mu/law.dtx
index e7355d36340..06dbc8eb87e 100644
--- a/Master/texmf-dist/source/latex/fithesis/style/mu/law.dtx
+++ b/Master/texmf-dist/source/latex/fithesis/style/mu/law.dtx
@@ -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,9 +71,11 @@
\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
}{}
diff --git a/Master/texmf-dist/source/latex/fithesis/style/mu/med.dtx b/Master/texmf-dist/source/latex/fithesis/style/mu/med.dtx
index e3503425f82..5e3416c921c 100644
--- a/Master/texmf-dist/source/latex/fithesis/style/mu/med.dtx
+++ b/Master/texmf-dist/source/latex/fithesis/style/mu/med.dtx
@@ -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,9 +128,11 @@
\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
}{}
diff --git a/Master/texmf-dist/source/latex/fithesis/style/mu/sci.dtx b/Master/texmf-dist/source/latex/fithesis/style/mu/sci.dtx
index b66d576af32..64764dfd7e9 100644
--- a/Master/texmf-dist/source/latex/fithesis/style/mu/sci.dtx
+++ b/Master/texmf-dist/source/latex/fithesis/style/mu/sci.dtx
@@ -12,7 +12,7 @@
% _-_Pokyny_pro_vypracovani_bc._dipl._a_rigor.praci.pdf}}.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{fithesis/style/mu/fithesis-mu-sci}[2021/07/18]
+\ProvidesPackage{fithesis/style/mu/fithesis-mu-sci}[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
@@ -72,10 +72,19 @@
% \begin{macrocode}
\thesis@blocks@titlePage@field@false
\thesis@blocks@titlePage@programme@false
-
\thesis@blocks@assignment@hideIfDigital@false
% \end{macrocode}
-% \begin{macro}{\thesis@blocks@frontMatter}
+% \begin{macro}{\thesis@blocks@bibEntry@pagetotal}
+% The |\thesis@blocks@bibEntry@pageTotal| macro typeset the total number of
+% pages in the thesis in the format required by the bibliographic entry.
+% The format is just the total number of pages, as mandated by the formal
+% requirements of the faculty.
+% \changes{v1.1.1}{2024/03/06}{Add the \cs{thesis@blocks@bibEntry@pagetotal}
+% command for the Masaryk University in Brno. [TV, VN]}
+% \begin{macrocode}
+\def\thesis@blocks@bibEntry@pagetotal{\thesis@pages}
+% \end{macrocode}
+% \end{macro}\begin{macro}{\thesis@blocks@frontMatter}
% The |\thesis@blocks@frontMatter| macro sets up the style
% of the front matter front matter of the thesis. The front matter
% is typeset without any visible numbering, as mandated by the
@@ -91,6 +100,7 @@
\setcounter{page}{1}
\pagenumbering{arabic}}
% \end{macrocode}
+% \end{macro}\begin{macro}{\thesis@blocks@mainMatter}
% The |\thesis@blocks@mainMatter| macro sets up the style
% of the main matter of the thesis. The page numbering doesn't
% reset at the beginning of the main thesis in accordance with the