diff options
author | Karl Berry <karl@freefriends.org> | 2021-05-25 20:44:43 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2021-05-25 20:44:43 +0000 |
commit | 2561f841ac2283792529f952e0c2c9762b49e5f6 (patch) | |
tree | fa93d1ecf992e0cbdc45513ac9ce9c4cbb23608e /Master/texmf-dist/source | |
parent | e71fd591d42e281900e78e316a69775c17017f55 (diff) |
fithesis (25may21)
git-svn-id: svn://tug.org/texlive/trunk@59338 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source')
32 files changed, 1294 insertions, 1301 deletions
diff --git a/Master/texmf-dist/source/latex/fithesis/LICENSE.tex b/Master/texmf-dist/source/latex/fithesis/LICENSE.tex index 4504265261a..a29d47f5a45 100644 --- a/Master/texmf-dist/source/latex/fithesis/LICENSE.tex +++ b/Master/texmf-dist/source/latex/fithesis/LICENSE.tex @@ -1,8 +1,9 @@ \input docstrip.tex \preamble -Copyright 1998--2018 Daniel Marek (DM), Jan Pavlovič (JP), - Vít Novotný (VN), Petr Sojka (PS) +Copyright 1998--2021 Daniel Marek (DM), Jan Pavlovič (JP), + Vít Novotný (VN), Tereza Vrabcová (TV), + Petr Sojka (PS) http://www.fi.muni.cz/tech/unix/tex/fithesis.xhtml Faculty of Informatics, Masaryk University (Brno, Czech Republic) diff --git a/Master/texmf-dist/source/latex/fithesis/VERSION.tex b/Master/texmf-dist/source/latex/fithesis/VERSION.tex index d0cfdde1f4a..a73c6a0baab 100644 --- a/Master/texmf-dist/source/latex/fithesis/VERSION.tex +++ b/Master/texmf-dist/source/latex/fithesis/VERSION.tex @@ -1 +1 @@ -2020/03/09 v0.3.51 fithesis3 MU thesis class +2021/05/24 v1.0.0 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 bfda069bcfe..842b36127e4 100644 --- a/Master/texmf-dist/source/latex/fithesis/fithesis.dtx +++ b/Master/texmf-dist/source/latex/fithesis/fithesis.dtx @@ -19,6 +19,7 @@ \usepackage{paralist} \usepackage{multicol} + % Making paragraphs numbered \makeatletter \renewcommand\paragraph{\@startsection{paragraph}{4}{\z@}% @@ -55,8 +56,8 @@ {\def\thesis@versiondef#1#2{ \gdef\thesis@version@number{#1} \gdef\thesis@version@date{#2} - \gdef\thesis@version{#2 #1 fithesis3 MU thesis class}} -\thesis@versiondef{v0.3.51}{2020/03/09}} + \gdef\thesis@version{#2 #1 fithesis4 MU thesis class}} +\thesis@versiondef{v1.0.0}{2021/05/24}} % {\newwrite\f\openout\f=VERSION\write\f{\thesis@version}\closeout\f} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -416,20 +417,17 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% \title{The \textsf{fithesis3} class for the typesetting of theses written +% \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ý, Petr Sojka} +% \author{Daniel Marek, Jan Pavlovič, Vít Novotný, Tereza Vrabcová, Petr Sojka} % \date{\today} % \maketitle % % \begin{abstract} % \noindent This document details the design and the implementation -% of the \textsf{fithesis3} document class. It contains technical +% of the \textsf{fithesis4} document class. It contains technical % information for anyone who wishes to extend the class with their -% locale or style files. Users who only wish to use the class are -% advised to consult the guides distributed along with the class, -% which only document the parts of the public API relevant to the -% given style files. +% locale or style files. % \end{abstract} % % \tableofcontents @@ -439,9 +437,9 @@ % The class requires the class specified in |\thesis@backend|, % whose default value is |[a4paper]{rapport3}|. If a different % base class is desired, it can be specified by redefining -% |\thesis@backend| prior to loading the \textsf{fithesis3} class. +% |\thesis@backend| prior to loading the \textsf{fithesis4} class. % \begin{macrocode} -\ProvidesClass{fithesis3}[\thesis@version] +\ProvidesClass{fithesis4}[\thesis@version] \ifx\thesis@backend\undefined \def\thesis@backend{[a4paper]{rapport3}} \fi\expandafter\LoadClass\thesis@backend @@ -464,6 +462,9 @@ % \item\textsf{inputenc} -- Used to enable the input UTF-8 % encoding. This package does not get loaded under % the \Hologo{XeTeX} and \Hologo{LuaTeX} engines. +% \changes{v1.0.0}{2021/04/30}{Added \cs{thesis@xpatch} command. [TV]} +% \item\textsf{xpatch} -- Used to redefine parts of code +% in macros without redefining the whole macro. % \end{itemize} % The \texttt{hyperref} package is also conditionally loaded during % the expansion of the |\thesis@load| macro (see Section @@ -478,6 +479,7 @@ \ifxetex\else\ifluatex\else \RequirePackage[utf8]{inputenc} \fi\fi +\RequirePackage{xpatch} % \end{macrocode} % \section{Public API} % \label{sec:public-api} @@ -771,7 +773,8 @@ % The Faculty of Medicine & \texttt{med} \\ % The Faculty of Education & \texttt{ped} \\ % The Faculty of Arts & \texttt{phil} \\ -% The Faculty of Sports Studies & \texttt{fsps} \\\bottomrule +% The Faculty of Sports Studies & \texttt{fsps} \\ +% The Faculty of Pharmacy & \texttt{pharm} \\\bottomrule % \end{tabularx}\end{center} % The \textit{identifier} is stored within the |\thesis@faculty| % macro, whose implicit value is \texttt{fi}. @@ -786,7 +789,7 @@ % The \marg{\texttt{department}=name} pair sets the name of the % department, at which the thesis is being written, to % \textit{name}. Unlike the university and faculty identifiers, -% \textsf{fithesis3} does not prescribe the format of the +% \textsf{fithesis4} does not prescribe the format of the % \textit{name}; the style files may internally parse it, or % typeset it as-is. The \textit{name} is stored within the % |\thesis@department| macro. @@ -864,13 +867,19 @@ % filename of the logo file to be used as the university logo to % \textit{filename}. The \textit{filename} is stored within the % |\thesis@universityLogo| macro, whose implicit value is -% \texttt{fithesis-base}. The \texttt{fithesis-} prefix serves to -% prevent package clashes with other similarly named files within -% the \TeX\ directory structure. The logo file is loaded from the -% |\thesis@logopath|\discretionary{}{}{}|\thesis@universityLogo| -% path. -% \begin{macrocode} -\def\thesis@universityLogo{fithesis-base} +% \texttt{fithesis-base}|-\thesis@locale|. The \texttt{fithesis-} +% prefix serves to prevent package clashes with other similarly +% named files within the \TeX\ directory structure. The logo file +% is loaded from the |\thesis@logopath|\discretionary{}{}{}^^A +% |\thesis@universityLogo| path. +% \changes{v1.0.0}{2021/03/19}{^^A +% Change \cs{thesis@universityLogo}, +% \cs{thesis@blocks@universityLogo@monochrome}, and +% \cs{thesis@blocks@universityLogo@color} to use the new logotype +% of the Masaryk University in Brno in the correct size and +% localization. Add \cs{thesis@blocks@seal}. [VN]} +% \begin{macrocode} +\def\thesis@universityLogo{fithesis-base-\thesis@locale} \define@key{thesis}{universityLogo}{% \def\thesis@universityLogo{#1}} % \end{macrocode} @@ -881,13 +890,19 @@ % of the logo file to be used as the faculty logo to % \textit{filename}. The \textit{filename} is stored within the % |\thesis@|\discretionary{}{}{}|facultyLogo| macro, whose -% implicit value is |fithesis-\thesis@faculty|. The +% implicit value is |fithesis-\thesis@faculty-\thesis@locale|. The % \texttt{fithesis-} prefix serves to prevent package clashes with % other similarly named files within the \TeX\ directory structure. % The logo file is loaded from the % |\thesis@logopath\thesis@facultyLogo| path. -% \begin{macrocode} -\def\thesis@facultyLogo{fithesis-\thesis@faculty} +% \changes{v1.0.0}{2021/04/24}{^^A +% Change \cs{thesis@facultyLogo}, +% \cs{thesis@blocks@facultyLogo@monochrome}, and +% \cs{thesis@blocks@facultyLogo@color} to use the new logotype +% of the Masaryk University in Brno in the correct size and +% localization. Add \cs{thesis@blocks@seal}. [VN]} +% \begin{macrocode} +\def\thesis@facultyLogo{fithesis-\thesis@faculty-\thesis@locale} \define@key{thesis}{facultyLogo}{% \def\thesis@facultyLogo{#1}} % \end{macrocode} @@ -896,13 +911,15 @@ % \subsubsection{The \texttt{style} key} % The \marg{\texttt{style}=filename} pair sets the filename of the % style file to be used to \textit{filename}. The \textit{filename} -% is stored within the |\thesis@style| macro, whose -% implicit value is |\thesis@university/fithesis-\thesis@faculty|. +% is stored within the |\thesis@style| macro, whose implicit value is +% |\thesis@university/fithesis-\thesis@university-\thesis@faculty|. % When the \textit{filename} is an empty token string, no style % files will be loaded during the main routine (see Section % \ref{sec:thesisload}). +% \changes{v1.0.0}{2021/02/21}{Files were renamed after +% breaking changes in package loading after PR 438 in \LaTeXe. [VN]} % \begin{macrocode} -\def\thesis@style{\thesis@university/fithesis-\thesis@faculty} +\def\thesis@style{\thesis@university/fithesis-\thesis@university-\thesis@faculty} \define@key{thesis}{style}{% \def\thesis@style{#1}} % \end{macrocode} @@ -1252,6 +1269,7 @@ % When the |\thesis@assignmentFiles| macro is defined and % non-empty, the style files should take that as a cue that the % user wishes to typeset the thesis assignment. + % \begin{macro}{\thesis@bibFiles} % \subsubsection{The \texttt{bib} key} % The \marg{\texttt{bib}=list} pair sets the comma-delimited @@ -1525,15 +1543,17 @@ \thesis@requireLocale{\thesis@locale} \fi % \end{macrocode} -% Coerce LuaTeX into defining |\l@|\textit{locale} for +% Coerce Lua\TeX{} into defining |\l@|\textit{locale} for % \textit{locale}s with known hyphenation patterns, unless -% \textsf{babel} has been loaded. In that case -% |\l@|\textit{locale} has already been defined. +% \textsf{babel} or \textsf{polyglossia} have been loaded. +% In that case, |\l@|\textit{locale} has already been defined. +% \changes{v1.0.0}{2020/02/21}{Only load \textsf{babel} in +% Lua\TeX{} if \textsf{polyglossia} has not been loaded yet.} % \begin{macrocode} \ifluatex \ltx@ifpackageloaded{babel}{}{ - % See <article.gmane.org/gmane.comp.tex.luatex.user/5680> - \RequirePackage[base]{babel}} + \ltx@ifpackageloaded{polyglossia}{}{ + \thesis@require{babel}}} \fi % \end{macrocode} % Fix the value of the |\ifthesis@english| macro. @@ -1627,7 +1647,7 @@ % \begin{macrocode} \def\thesis@exists#1#2{% \IfFileExists{#1}{#2}{% - \ClassWarning{fithesis3}{File #1 doesn't exist}}} + \ClassWarning{fithesis4}{File #1 doesn't exist}}} % \end{macrocode} % \end{macro}\begin{macro}{\thesis@input} % The |\thesis@input|\marg{file} macro inputs the given @@ -1656,9 +1676,11 @@ % If inheritance is enabled for style files, then the % |\thesis@requireStyle|\marg{style} macro sequentially % loads each of the following files, provided they exist: +% \changes{v1.0.0}{2021/02/21}{Files were renamed after +% breaking changes in package loading after PR 438 in \LaTeXe. [VN]} % \begin{enumerate} % \item|\thesis@stylepath fithesis-base.sty| -% \item|\thesis@stylepath\thesis@university/fithesis-base.sty| +% \item|\thesis@stylepath\thesis@university/fithesis-\thesis@university-base.sty| % \item|\thesis@stylepath| \textit{style}|.sty| % \end{enumerate}If inheritance is disabled for style files, then % only the last listed file is loaded. The \texttt{fithesis-} @@ -1669,7 +1691,7 @@ \ifthesis@style@inheritance \thesis@requireIfExists{\thesis@stylepath fithesis-base}% \thesis@requireIfExists{\thesis@stylepath\thesis@university - /fithesis-base} + /fithesis-\thesis@university-base} \fi \thesis@requireIfExists{\thesis@stylepath#1}} % \end{macrocode} @@ -1811,10 +1833,10 @@ }} % \end{macrocode} % \begin{macro}{\thesis@patch} -% The |\thesis@patch|\oarg{versions}\oarg{patch} macro expands +% The |\thesis@patch|\marg{versions}\marg{patch} macro expands % \textit{patch}, if |\thesis@version|\texttt{\discretionary{@}^^A % {@}{@}}|number| (defined at the top of the file -% \texttt{fithesis3.cls}) matches any of the comma-delimited +% \texttt{fithesis4.cls}) matches any of the comma-delimited % \textit{versions}. This macro enables the simple deployment of % version-targeted patches. % \begin{macrocode} @@ -1835,19 +1857,32 @@ \expandafter\thesis@patch@versions\expandafter,\relax,} % \end{macrocode} % \end{macro} +% \begin{macro}{\thesis@xpatch} +% \changes{v1.0.0}{2021/04/30}{Added \cs{thesis@xpatch} command. [TV]} +% The |\thesis@xpatch|\marg{command}\marg{search}\marg{replace} macro +% is used to to replace \textit{search} with \textit{replace} in the definition +% of \textit{command}. If the replacement fails, a class error is written to +% the output. +% \begin{macrocode} +\long\def\thesis@xpatch#1#2#3{% + \xpatchcmd{#1}{#2}{#3}{}% + {\ClassError{fithesis4}{% + Command \string#1 does not contain the searched text}{}}} +% \end{macrocode} +% \end{macro} % \iffalse %</class> % ^^A Old fithesis classes %<*oldclass1> \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{oldfithesis1}[2015/03/04 old fithesis will load fithesis3 MU thesis class] +\ProvidesClass{oldfithesis1}[2015/03/04 old fithesis will load fithesis2 MU thesis class] \ClassWarning{oldfithesis1}{% You are using the fithesis class, which has been deprecated. - The fithesis3 class will be used instead. + The fithesis2 class will be used instead. For more information, see <http://www.fi.muni.cz/tech/unix/tex/fithesis.xhtml>% -}\LoadClass{fithesis3} +}\LoadClass{fithesis2} %</oldclass1> % @@ -1863,6 +1898,19 @@ }\LoadClass{fithesis3} %</oldclass2> +% +%<*oldclass3> + +\NeedsTeXFormat{LaTeX2e} +\ProvidesClass{oldfithesis3}[2018/11/17 old fithesis3 will load fithesis4 MU thesis class] + +\ClassWarning{oldfithesis3}{% + You are using the fithesis3 class, which has been deprecated. + The fithesis4 class will be used instead. + For more information, see <http://www.fi.muni.cz/tech/unix/tex/fithesis.xhtml>% +}\LoadClass{fithesis4} + +%</oldclass3> % \fi % % \subsection{Locale files} @@ -1934,6 +1982,10 @@ % of the author's signature field % \item|\thesis@|\textit{locale}|@formattedDate| -- A formatted % date +% \changes{v1.0.0}{2021/02/26}{Lifted the \texttt{advisorSignature} +% string to the global locale file interface. [VN]} +% \item|\thesis@|\textit{locale}|@advisorSignature| -- The label +% of the author's signature field % \end{itemize} where \textit{locale} is the name of the locale. % % \def\file#1{\paragraph{The \texttt{#1} file}} @@ -2002,3 +2054,5 @@ % \input{style/mu/med.dtx} % \subsubsection{The style files of the Faculty of Sports Studies} % \input{style/mu/fsps.dtx} +% \subsubsection{The style files of the Faculty of Pharmacy} +% \input{style/mu/pharm.dtx} diff --git a/Master/texmf-dist/source/latex/fithesis/fithesis.ins b/Master/texmf-dist/source/latex/fithesis/fithesis.ins index c9aaccfbeea..df561dfb440 100644 --- a/Master/texmf-dist/source/latex/fithesis/fithesis.ins +++ b/Master/texmf-dist/source/latex/fithesis/fithesis.ins @@ -1,5 +1,6 @@ \input ./LICENSE \generate{\file{fithesis.cls}{\from{fithesis.dtx}{oldclass1}} \file{fithesis2.cls}{\from{fithesis.dtx}{oldclass2}} - \file{fithesis3.cls}{\from{fithesis.dtx}{class}}} + \file{fithesis3.cls}{\from{fithesis.dtx}{oldclass3}} + \file{fithesis4.cls}{\from{fithesis.dtx}{class}}} \endbatchfile diff --git a/Master/texmf-dist/source/latex/fithesis/locale/czech.dtx b/Master/texmf-dist/source/latex/fithesis/locale/czech.dtx index 884570b3e5a..a59cfd5cf02 100644 --- a/Master/texmf-dist/source/latex/fithesis/locale/czech.dtx +++ b/Master/texmf-dist/source/latex/fithesis/locale/czech.dtx @@ -2,7 +2,7 @@ % This is the base file of the Czech locale.\iffalse %<*base> % \fi\begin{macrocode} -\ProvidesFile{fithesis/locale/fithesis-czech.def}[2017/07/09] +\ProvidesFile{fithesis/locale/fithesis-czech.def}[2021/02/26] % \end{macrocode} % The locale file defines all the private macros mandated by the % locale file interface. @@ -74,9 +74,17 @@ \fi\fi\fi\fi\fi\fi \thesis@year}} +% \end{macrocode} +% \changes{v1.0.0}{2021/03/11}{Added title for summary. [TV]} +% \begin{macrocode} % Různé \gdef\thesis@czech@authorSignature{% Podpis autor\ifthesis@woman ky\else a\fi} +% \end{macrocode} +% \changes{v1.0.0}{2021/02/26}{Lifted the \texttt{advisorSignature} +% string to the global locale file interface. [VN]} +% \begin{macrocode} +\gdef\thesis@czech@advisorSignature{Podpis vedoucího} \gdef\thesis@czech@fieldTitle{Obor} \gdef\thesis@czech@advisorTitle{Vedoucí práce} \gdef\thesis@czech@authorTitle{Autor} @@ -84,6 +92,7 @@ \gdef\thesis@czech@keywordsTitle{Klíčová slova} \gdef\thesis@czech@thanksTitle{Poděkování} \gdef\thesis@czech@declarationTitle{Prohlášení} +\gdef\thesis@czech@summaryTitle{Resumé} \gdef\thesis@czech@idTitle{ID} \gdef\thesis@czech@typeName@sempaper{Seminární práce} \gdef\thesis@czech@typeName@bachelors{Bakalářská práce} @@ -185,6 +194,17 @@ \global\let\thesis@czech@bib@author\thesis@czech@authorTitle \gdef\thesis@czech@bib@thesisTitle{Název práce} \global\let\thesis@czech@bib@advisor\thesis@czech@advisorTitle +% \end{macrocode} +% \changes{v1.0.0}{2021/03/04}{Lifted the \texttt{bib@programme}, +% \texttt{bib@academicYear}, and \texttt{bib@pages} strings from +% \texttt{locale/mu/sci/*.def} to \texttt{locale/mu/*.def}, +% so that they can be shared with other faculties. [TV]} +% \begin{macrocode} +\gdef\thesis@czech@bib@programme{Studijní program} +\global\let\thesis@czech@bib@field\thesis@czech@fieldTitle +\gdef\thesis@czech@bib@academicYear{Akademický rok} +\gdef\thesis@czech@bib@pages{Počet stran} +\global\let\thesis@czech@bib@keywords\thesis@czech@keywordsTitle % Různé \gdef\thesis@czech@idTitle{UČO} @@ -278,17 +298,6 @@ % Zástupné texty \gdef\thesis@czech@facultyName{Ekonomicko-správní fakulta} -% Bibliografický záznam -% \end{macrocode} -% \changes{v0.3.46}{2017/06/02}{Defined strings required by -% \cs{thesis@blocks@bibEntry} from -% \texttt{style/mu/fithesis-econ.sty} in -% \texttt{locale/mu/econ/*.def}. [VN]} -% \begin{macrocode} -\gdef\thesis@czech@bib@thesisTitleEn{Název práce v angličtině} -\gdef\thesis@czech@bib@department{Katedra} -\gdef\thesis@czech@bib@year{Rok obhajoby} - % Různé % \end{macrocode} % \changes{v0.3.46}{2017/06/02}{Updated the @@ -347,15 +356,13 @@ % Informatics at the Masaryk University in Brno. % It replaces the \texttt{facultyName} placeholder with the % correct value and redefines the \texttt{declaration} string in -% accordance with the requirements of the faculty. The file also -% defines the \texttt{advisorSignature} string required by the -% |\thesis@blocks@titlePage| block defined within the -% \texttt{style/mu/\discretionary{}{}{}fithesis-fi.sty} -% style file. +% accordance with the requirements of the faculty. +% \changes{v1.0.0}{2021/02/26}{Lifted the \texttt{advisorSignature} +% string to the global locale file interface. [VN]} % \iffalse %<*mu/fi> % \fi\begin{macrocode} -\ProvidesFile{fithesis/locale/mu/fi/fithesis-czech.def}[2016/05/25] +\ProvidesFile{fithesis/locale/mu/fi/fithesis-czech.def}[2021/02/26] % Zástupné texty \gdef\thesis@czech@facultyName{Fakulta informatiky} @@ -377,7 +384,6 @@ s~uvedením úplného odkazu na příslušný zdroj.} % Ostatní -\gdef\thesis@czech@advisorSignature{Podpis vedoucího} \gdef\thesis@czech@typeName@proposal{Teze disertační práce} \gdef\thesis@czech@typeName@akuzativ@proposal{Tezi disertační práce} % \end{macrocode}\iffalse @@ -500,12 +506,26 @@ statně s~využitím informačních zdrojů, které jsou v~práci citovány.} -% Bibliografický záznam -\gdef\thesis@czech@bib@programme{Studijní program} -\global\let\thesis@czech@bib@field\thesis@czech@fieldTitle -\gdef\thesis@czech@bib@academicYear{Akademický rok} -\gdef\thesis@czech@bib@pages{Počet stran} -\global\let\thesis@czech@bib@keywords\thesis@czech@keywordsTitle % \end{macrocode}\iffalse %</mu/sci> +% \changes{v1.0.0}{2021/03/26}{Added specifics for the +% Faculty of Pharmacy. [TV]} +% \fi\file{locale/mu/pharm/fithesis-czech.def} +% This is the Czech locale file specific to the Faculty of Pharmacy +% at the Masaryk University in Brno. +% It replaces the \texttt{facultyName} placeholder with the +% correct value and redefines the \texttt{abstractTitle} +% accordance with the guidelines of the faculty. +% \iffalse +%<*mu/pharm> +% \fi\begin{macrocode} +\ProvidesFile{fithesis/locale/mu/pharm/fithesis-czech.def}[2021/03/26] + +% Zástupné texty +\gdef\thesis@czech@facultyName{Farmaceutická fakulta} + +% Ostatní +\gdef\thesis@czech@abstractTitle{Anotace} +% \end{macrocode}\iffalse +%</mu/pharm> % \fi diff --git a/Master/texmf-dist/source/latex/fithesis/locale/czech.ins b/Master/texmf-dist/source/latex/fithesis/locale/czech.ins index 65f9a2d2b65..18baede5a46 100644 --- a/Master/texmf-dist/source/latex/fithesis/locale/czech.ins +++ b/Master/texmf-dist/source/latex/fithesis/locale/czech.ins @@ -9,5 +9,6 @@ \file{mu/fi/fithesis-czech.def}{\from{czech.dtx}{mu/fi}} \file{mu/phil/fithesis-czech.def}{\from{czech.dtx}{mu/phil}} \file{mu/ped/fithesis-czech.def}{\from{czech.dtx}{mu/ped}} - \file{mu/sci/fithesis-czech.def}{\from{czech.dtx}{mu/sci}}} + \file{mu/sci/fithesis-czech.def}{\from{czech.dtx}{mu/sci}} + \file{mu/pharm/fithesis-czech.def}{\from{czech.dtx}{mu/pharm}}} \endbatchfile diff --git a/Master/texmf-dist/source/latex/fithesis/locale/english.dtx b/Master/texmf-dist/source/latex/fithesis/locale/english.dtx index 17a49c7370b..75b8a8e4251 100644 --- a/Master/texmf-dist/source/latex/fithesis/locale/english.dtx +++ b/Master/texmf-dist/source/latex/fithesis/locale/english.dtx @@ -2,7 +2,7 @@ % This is the base file of the English locale.\iffalse %<*base> % \fi\begin{macrocode} -\ProvidesFile{fithesis/locale/fithesis-english.def}[2017/09/08] +\ProvidesFile{fithesis/locale/fithesis-english.def}[2021/02/26] % \end{macrocode} % The locale file defines all the private macros mandated by the % locale file interface. @@ -63,9 +63,18 @@ \fi\fi\fi\fi\fi\fi \thesis@year}} +% \end{macrocode} +% \changes{v1.0.0}{2021/03/11}{Added title for summary. [TV]} +% \begin{macrocode} % Miscellaneous \gdef\thesis@english@authorSignature{Author's signature} -\gdef\thesis@english@fieldTitle{Field of study} +% \end{macrocode} +% \changes{v1.0.0}{2021/02/26}{Lifted the \texttt{advisorSignature} +% string to the global locale file interface. [VN]} +% \begin{macrocode} +\gdef\thesis@english@advisorSignature{Signature of Thesis + \thesis@english@advisorTitle} +\gdef\thesis@english@fieldTitle{Field of Study} \gdef\thesis@english@advisorTitle{Advisor} \gdef\thesis@english@authorTitle{Author} \gdef\thesis@english@abstractTitle{Abstract} @@ -76,6 +85,7 @@ % \begin{macrocode} \gdef\thesis@english@thanksTitle{Acknowledgements} \gdef\thesis@english@declarationTitle{Declaration} +\gdef\thesis@english@summaryTitle{Summary} \gdef\thesis@english@idTitle{ID} \gdef\thesis@english@typeName@sempaper{Seminar Paper} \gdef\thesis@english@typeName@bachelors{Bachelor's Thesis} @@ -165,6 +175,17 @@ \global\let\thesis@english@bib@author\thesis@english@authorTitle \gdef\thesis@english@bib@thesisTitle{Title of Thesis} \gdef\thesis@english@bib@advisor{Supervisor} +% \end{macrocode} +% \changes{v1.0.0}{2021/03/04}{Lifted the \texttt{bib@programme}, +% \texttt{bib@academicYear}, and \texttt{bib@pages} strings from +% \texttt{locale/mu/sci/*.def} to \texttt{locale/mu/*.def}, +% so that they can be shared with other faculties. [TV]} +% \begin{macrocode} +\gdef\thesis@english@bib@programme{Degree Programme} +\global\let\thesis@english@bib@field\thesis@english@fieldTitle +\gdef\thesis@english@bib@academicYear{Academic Year} +\gdef\thesis@english@bib@pages{Number of Pages} +\global\let\thesis@english@bib@keywords\thesis@english@keywordsTitle % Miscellaneous \gdef\thesis@english@idTitle{UČO} @@ -244,16 +265,6 @@ \gdef\thesis@english@facultyName{Faculty of Economics and Administration} -% Bibliographic entry -% \end{macrocode} -% \changes{v0.3.46}{2017/06/02}{Defined strings required by -% \cs{thesis@blocks@bibEntry} from -% \texttt{style/mu/fithesis-econ.sty} in -% \texttt{locale/mu/econ/*.def}. [VN]} -% \begin{macrocode} -\gdef\thesis@english@bib@department{Department} -\gdef\thesis@english@bib@year{Year of Defense} - % Miscellaneous % \end{macrocode} % \changes{v0.3.46}{2017/06/02}{Updated the @@ -291,15 +302,13 @@ % Informatics at the Masaryk University in Brno. It replaces the % \texttt{facultyName} placeholder with the correct value and % redefines the string in accordance with the requirements of the -% faculty. The file also defines the \texttt{advisorSignature} -% string required by the |\thesis@blocks@titlePage| block defined -% within the -% \texttt{style/mu/\discretionary{}{}{}fithesis-fi.sty} -% style file. +% faculty. +% \changes{v1.0.0}{2021/02/26}{Lifted the \texttt{advisorSignature} +% string to the global locale file interface. [VN]} % \iffalse %<*mu/fi> % \fi\begin{macrocode} -\ProvidesFile{fithesis/locale/mu/fi/fithesis-english.def}[2016/05/25] +\ProvidesFile{fithesis/locale/mu/fi/fithesis-english.def}[2021/02/26] % Placeholders \gdef\thesis@english@facultyName{Faculty of Informatics} @@ -317,8 +326,6 @@ \fi} % Others -\gdef\thesis@english@advisorSignature{Signature of Thesis - \thesis@english@advisorTitle} \gdef\thesis@english@typeName@proposal{Ph.D. Thesis Proposal} % \end{macrocode}\iffalse %</mu/fi> @@ -382,12 +389,26 @@ % Miscellaneous \global\let\thesis@english@advisorTitleEn=\thesis@english@bib@advisor -% Bibliographic entry -\gdef\thesis@english@bib@programme{Degree Programme} -\global\let\thesis@english@bib@field\thesis@english@fieldTitle -\gdef\thesis@english@bib@academicYear{Academic Year} -\gdef\thesis@english@bib@pages{Number of Pages} -\global\let\thesis@english@bib@keywords\thesis@english@keywordsTitle % \end{macrocode}\iffalse %</mu/sci> +% \changes{v1.0.0}{2021/03/26}{Added specifics for the +% Faculty of Pharmacy. [TV]} +% \fi\file{locale/mu/pharm/fithesis-english.def} +% This is the English locale file specific to the Faculty of Pharmacy +% at the Masaryk University in Brno. +% It replaces the \texttt{facultyName} placeholder with the +% correct value and redefines the \texttt{abstractTitle} +% in accordance with the guidelines of the faculty. +% \iffalse +%<*mu/pharm> +% \fi\begin{macrocode} +\ProvidesFile{fithesis/locale/mu/pharm/fithesis-english.def}[2021/03/26] + +% Placeholders +\gdef\thesis@english@facultyName{Faculty of Pharmacy} + +% Miscellaneous +\gdef\thesis@english@abstractTitle{Annotation} +% \end{macrocode}\iffalse +%</mu/pharm> % \fi diff --git a/Master/texmf-dist/source/latex/fithesis/locale/english.ins b/Master/texmf-dist/source/latex/fithesis/locale/english.ins index 0fb30f4bbe8..25e01726975 100644 --- a/Master/texmf-dist/source/latex/fithesis/locale/english.ins +++ b/Master/texmf-dist/source/latex/fithesis/locale/english.ins @@ -9,5 +9,6 @@ \file{mu/fi/fithesis-english.def}{\from{english.dtx}{mu/fi}} \file{mu/phil/fithesis-english.def}{\from{english.dtx}{mu/phil}} \file{mu/ped/fithesis-english.def}{\from{english.dtx}{mu/ped}} - \file{mu/sci/fithesis-english.def}{\from{english.dtx}{mu/sci}}} + \file{mu/sci/fithesis-english.def}{\from{english.dtx}{mu/sci}} + \file{mu/pharm/fithesis-english.def}{\from{english.dtx}{mu/pharm}}} \endbatchfile diff --git a/Master/texmf-dist/source/latex/fithesis/locale/slovak.dtx b/Master/texmf-dist/source/latex/fithesis/locale/slovak.dtx index dd6a87af1f1..73a9fff1113 100644 --- a/Master/texmf-dist/source/latex/fithesis/locale/slovak.dtx +++ b/Master/texmf-dist/source/latex/fithesis/locale/slovak.dtx @@ -2,7 +2,7 @@ % This is the base file of the Slovak locale.\iffalse %<*base> % \fi\begin{macrocode} -\ProvidesFile{fithesis/locale/fithesis-slovak.def}[2017/07/09] +\ProvidesFile{fithesis/locale/fithesis-slovak.def}[2021/02/26] % \end{macrocode} % The locale file defines all the private macros mandated by the % locale file interface. @@ -74,9 +74,17 @@ \fi\fi\fi\fi\fi\fi \thesis@year}} +% \end{macrocode} +% \changes{v1.0.0}{2021/03/11}{Added title for summary. [TV]} +% \begin{macrocode} % Rôzne \gdef\thesis@slovak@authorSignature{% Podpis autor\ifthesis@woman ky\else a\fi} +% \end{macrocode} +% \changes{v1.0.0}{2021/02/26}{Lifted the \texttt{advisorSignature} +% string to the global locale file interface. [VN]} +% \begin{macrocode} +\gdef\thesis@slovak@advisorSignature{Podpis vedúceho} \gdef\thesis@slovak@fieldTitle{Odbor} \gdef\thesis@slovak@advisorTitle{Vedúci práce} \gdef\thesis@slovak@authorTitle{Autor} @@ -84,6 +92,7 @@ \gdef\thesis@slovak@keywordsTitle{Kľúčové slová} \gdef\thesis@slovak@thanksTitle{Poďakovanie} \gdef\thesis@slovak@declarationTitle{Vyhlásenie} +\gdef\thesis@slovak@summaryTitle{Resumé} \gdef\thesis@slovak@idTitle{ID} \gdef\thesis@slovak@typeName@sempaper{Seminárna práca} \gdef\thesis@slovak@typeName@bachelors{Bakalárska práca} @@ -190,6 +199,17 @@ \global\let\thesis@slovak@bib@author\thesis@slovak@authorTitle \gdef\thesis@slovak@bib@thesisTitle{Názov práce} \global\let\thesis@slovak@bib@advisor\thesis@slovak@advisorTitle +% \end{macrocode} +% \changes{v1.0.0}{2021/03/04}{Lifted the \texttt{bib@programme}, +% \texttt{bib@academicYear}, and \texttt{bib@pages} strings from +% \texttt{locale/mu/sci/*.def} to \texttt{locale/mu/*.def}, +% so that they can be shared with other faculties. [TV]} +% \begin{macrocode} +\gdef\thesis@slovak@bib@programme{Študijný program} +\global\let\thesis@slovak@bib@field\thesis@slovak@fieldTitle +\gdef\thesis@slovak@bib@academicYear{Akademický rok} +\gdef\thesis@slovak@bib@pages{Počet strán} +\global\let\thesis@slovak@bib@keywords\thesis@slovak@keywordsTitle % Rôzne \gdef\thesis@slovak@idTitle{UČO} @@ -284,17 +304,6 @@ % Zástupné texty \gdef\thesis@slovak@facultyName{Ekonomicko-správna fakulta} -% Bibliografický záznam -% \end{macrocode} -% \changes{v0.3.46}{2017/06/02}{Defined strings required by -% \cs{thesis@blocks@bibEntry} from -% \texttt{style/mu/fithesis-econ.sty} in -% \texttt{locale/mu/econ/*.def}. [VN]} -% \begin{macrocode} -\gdef\thesis@slovak@bib@thesisTitleEn{Názov práce v angličtine} -\gdef\thesis@slovak@bib@department{Katedra} -\gdef\thesis@slovak@bib@year{Rok obhajoby} - % Rôzne % \end{macrocode} % \changes{v0.3.46}{2017/06/02}{Updated the @@ -321,7 +330,7 @@ \thesis@lower{slovak@typeName@akuzativ} \thesis@title{} spracoval% \thesis@slovak@gender@koncovka\ samostatne pod vedením \thesis@extra@advisorSkGenitiv\ - a~uved\ifthesis@woman la\else iol\fi\ v~nej všetky + a~uvied\ifthesis@woman la\else ol\fi\ v~nej všetky odborné zdroje v~súlade s~právnymi predpismi, vnútornými predpismi Masarykovej univerzity a~vnútornými aktmi riadenia Masarykovej univerzity a~Ekonomicko-správnej fakulty MU.} @@ -355,15 +364,13 @@ % Informatics at the Masaryk University in Brno. It replaces the % \texttt{facultyName} placeholder with the correct value and % redefines the \texttt{declaration} string in accordance with the -% requirements of the faculty. The file also defines the -% \texttt{advisorSignature} string required by the -% |\thesis@blocks@titlePage| block defined within the -% \texttt{style/mu/\discretionary{}{}{}fithesis-fi.sty} -% style file. +% requirements of the faculty. +% \changes{v1.0.0}{2021/02/26}{Lifted the \texttt{advisorSignature} +% string to the global locale file interface. [VN]} % \iffalse %<*mu/fi> % \fi\begin{macrocode} -\ProvidesFile{fithesis/locale/mu/fi/fithesis-slovak.def}[2016/05/25] +\ProvidesFile{fithesis/locale/mu/fi/fithesis-slovak.def}[2021/02/26] % Zástupné texty \gdef\thesis@slovak@facultyName{Fakulta informatiky} @@ -385,7 +392,6 @@ s~uvedením úplného odkazu na príslušný zdroj.} % Rôzne -\gdef\thesis@slovak@advisorSignature{Podpis vedúceho} \gdef\thesis@slovak@typeName@proposal{Tézy dizertačnej práce} \gdef\thesis@slovak@typeName@akuzativ@proposal{Tézy dizertačnej práce} % \end{macrocode}\iffalse @@ -494,12 +500,26 @@ % Zástupné texty \gdef\thesis@slovak@facultyName{Prírodovedecká fakulta} -% Bibliografický záznam -\gdef\thesis@slovak@bib@programme{Študijný program} -\global\let\thesis@slovak@bib@field\thesis@slovak@fieldTitle -\gdef\thesis@slovak@bib@academicYear{Akademický rok} -\gdef\thesis@slovak@bib@pages{Počet strán} -\global\let\thesis@slovak@bib@keywords\thesis@slovak@keywordsTitle % \end{macrocode}\iffalse %</mu/sci> +% \changes{v1.0.0}{2021/03/26}{Added specifics for the +% Faculty of Pharmacy. [TV]} +% \fi\file{locale/mu/pharm/fithesis-slovak.def} +% This is the Slovak locale file specific to the Faculty of Pharmacy +% at the Masaryk University in Brno. +% It replaces the \texttt{facultyName} placeholder with the +% correct value and redefines the \texttt{abstractTitle} +% in accordance with the guidelines of the faculty. +% \iffalse +%<*mu/pharm> +% \fi\begin{macrocode} +\ProvidesFile{fithesis/locale/mu/pharm/fithesis-slovak.def}[2021/03/26] + +% Zástupné texty +\gdef\thesis@slovak@facultyName{Farmaceutická fakulta} + +% Rôzne +\gdef\thesis@slovak@abstractTitle{Anotácie} +% \end{macrocode}\iffalse +%</mu/pharm> % \fi diff --git a/Master/texmf-dist/source/latex/fithesis/locale/slovak.ins b/Master/texmf-dist/source/latex/fithesis/locale/slovak.ins index cebead058eb..4104b78c975 100644 --- a/Master/texmf-dist/source/latex/fithesis/locale/slovak.ins +++ b/Master/texmf-dist/source/latex/fithesis/locale/slovak.ins @@ -9,5 +9,6 @@ \file{mu/fi/fithesis-slovak.def}{\from{slovak.dtx}{mu/fi}} \file{mu/phil/fithesis-slovak.def}{\from{slovak.dtx}{mu/phil}} \file{mu/ped/fithesis-slovak.def}{\from{slovak.dtx}{mu/ped}} - \file{mu/sci/fithesis-slovak.def}{\from{slovak.dtx}{mu/sci}}} + \file{mu/sci/fithesis-slovak.def}{\from{slovak.dtx}{mu/sci}} + \file{mu/pharm/fithesis-slovak.def}{\from{slovak.dtx}{mu/pharm}}} \endbatchfile 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 3c34a6cb0ee..f5cf38721cf 100644 --- a/Master/texmf-dist/source/latex/fithesis/style/mu/base.dtx +++ b/Master/texmf-dist/source/latex/fithesis/style/mu/base.dtx @@ -1,13 +1,15 @@ % \iffalse %<*base> % \fi\file{style/mu/fithesis-base.sty}\label{sec:fithesis-mu-base} +% \changes{v1.0.0}{2021/03/19}{Files were renamed after +% breaking changes in package loading after PR 438 in \LaTeXe. [VN]} % This is the base style file for theses written at the Masaryk % University in Brno. When inheritance is enabled for style files, % this file is always the second style file to be loaded right % after \texttt{style/fithesis-base.sty}, regardless of the value % of the |\thesis@style| macro. % \begin{macrocode} -\ProvidesPackage{fithesis/style/mu/fithesis-base}[2018/12/25] +\ProvidesPackage{fithesis/style/mu/fithesis-mu-base}[2021/05/23] \NeedsTeXFormat{LaTeX2e} % \end{macrocode} % The file recognizes the following options: \begin{itemize} @@ -109,7 +111,7 @@ % the very end of the preamble, there would either be a great % chance of an option clash, or the option would have to be % passed to the \textsf{xcolor} package before the preamble -% from the body of the \textsf{fithesis3} class thus breaking +% from the body of the \textsf{fithesis4} class thus breaking % the encapsulation. Naming the option \texttt{table} forces % the option to be processed by the \textsf{xcolor} package as % well and it is therefore an elegant solution to the problem @@ -175,7 +177,13 @@ \thesis@requireLocale{english} % \end{macrocode} % The file loads the following packages: \begin{itemize} -% \item\textsf{xcolor} -- Adds support for color manipulation. +% \item\textsf{xcolor} -- Adds support for color. +% \changes{v1.0.0}{2018/11/18}{^^A +% The \cs{bfseries} command switches to the sans serif typeface +% and to the secondary color in the style files of the Masaryk +% University in Brno, Czech Republic. [VN]} +% \item\textsf{caption} -- Adds support for changing the +% formatting of float captions. % \item\textsf{ifxetex} -- Used to detect the \Hologo{XeTeX} % engine. % \item\textsf{ifluatex} -- Used to detect the \Hologo{LuaTeX} @@ -189,14 +197,32 @@ % metadata into the resulting PDF document. % \item\textsf{keyval} -- Adds support for parsing % comma-delimited lists of key-value pairs. +% \item\textsf{tabularx} -- Provides the \texttt{tabularx} +% environment, which enables the typesetting of tables with +% flexible-width columns. +% \changes{v1.0.0}{2018/12/25}{^^A +% The packages \textsf{tabularx}, \textsf{tabu}, and +% \textsf{booktabs} are loaded by default, not only when +% the \texttt{table} class option has been specified. [VN]} +% \item\textsf{tabu} -- Provides the \texttt{tabu} environment, +% which enables the typesetting of complex tables. +% \item\textsf{booktabs} -- A package, which allows the creation +% of publication-quality tables in \LaTeX. % \end{itemize} +% \changes{v1.0.0}{2021/03/04}{Added required package tikz +% for bibEntry. [TV]} % \begin{macrocode} \thesis@require{xcolor} +\RequirePackage[labelfont=bf]{caption} \thesis@require{graphicx} \thesis@require{pdfpages} \thesis@require{keyval} \thesis@require{ifxetex} \thesis@require{ifluatex} +\thesis@require{tabularx} +\thesis@require{tabu} +\thesis@require{booktabs} +\thesis@require{tikz} % \end{macrocode} % If the |\thesis@microtype@| is set to true, then the % \textsf{microtype} package gets loaded. @@ -227,15 +253,20 @@ % \item\textsf{unicode-math} -- Allows the selection of % system-installed mathematical fonts. % \end{itemize} -% Under \Hologo{XeTeX} or \Hologo{LuaTeX}, the \textsf{TeX Gyre -% Pagella} and \textsf{TeX Gyre Pagella Math} are also selected as -% the main text and math fonts. +% Under \Hologo{XeTeX} or \Hologo{LuaTeX}, the \textsf{\TeX{} Gyre +% Pagella} and \textsf{\TeX{} Gyre Pagella Math} fonts are also +% selected as the main text and math fonts and the \textsf{\TeX{} +% Gyre Heros} font is selected as the main sans serif font. +% \changes{v1.0.0}{2018/11/18}{^^A +% The \TeX{} Gyre Heros is used as the main sans serif font +% instead of Latin Modern. [VN]} % \begin{macrocode} \ifthesis@xeluatex \ifthesis@palatino@ \thesis@require{fontspec} \thesis@require{unicode-math} \setmainfont[Ligatures=TeX]{TeX Gyre Pagella} + \setsansfont[Ligatures=TeX,Scale=MatchLowercase]{TeX Gyre Heros} \setmathfont[math-style=ISO,bold-style=ISO]{texgyrepagella-math.otf} \fi % \end{macrocode} @@ -250,6 +281,11 @@ % to \texttt{mathpazo}. % \item\textsf{tgpagella} -- Changes the default roman font % family to \TeX\ Gyre Pagella. +% \item\textsf{tgheros} -- Changes the default sans-serif font +% face to \TeX{} Gyre Heros. +% \changes{v1.0.0}{2018/11/18}{^^A +% The \TeX{} Gyre Heros is used as the main sans serif font +% instead of Latin Modern. [VN]} % \item\textsf{lmodern} -- Changes the default sans-serif and % monotype font faces to Latin Modern instead of the default % Computer Modern font family. @@ -262,31 +298,18 @@ \thesis@require{lmodern} \thesis@require{mathpazo} \thesis@require{tgpagella} + \thesis@require[scale=0.863]{tgheros} \RequirePackage[T1]{fontenc} \fi \fi % \end{macrocode} % If the |\thesis@newtable@| conditional is \texttt{true}, then % some of the dimensions associated with tables are modified in -% preparation for the coloring of the table cells. The following -% packages are also loaded: -% \begin{itemize} -% \item\textsf{tabularx} -- Provides the \texttt{tabularx} -% environment, which enables the typesetting of tables with -% flexible-width columns. -% \item\textsf{tabu} -- Provides the \texttt{tabu} environment, -% which enables the typesetting of complex tables. -% \item\textsf{booktabs} -- A package, which allows the creation -% of publication-quality tables in \LaTeX. -% \end{itemize} +% preparation for the coloring of the table cells. % \begin{macrocode} \let\thesis@newtable@old\tabular \let\endthesis@newtable@old\endtabular \ifthesis@newtable@ - % Load the packages. - \thesis@require{tabularx} - \thesis@require{tabu} - \thesis@require{booktabs} % Adjust the measurements. \setlength{\aboverulesep}{0pt} \setlength{\belowrulesep}{0pt} @@ -430,6 +453,10 @@ \thesis@bibliography@setup{ style = iso-numeric, sorting = none} + % FIXME: This is a hotfix for biblatex. + % It should be removed after v3.17 has been released. + % See https://tex.stackexchange.com/a/581469/70941. + \thesis@require{expl3} \thesis@require[ backend=biber, style=\thesis@bibliography@style, @@ -505,6 +532,14 @@ % links to \textit{color} and stores it under the name % \texttt{thesis@color@links}. The default color of links is % specified by the \textsf{hyperref} package. +% \item\marg{\texttt{secondary}=color} -- Stores the secondary +% color that is used with the bold type face under the name +% \texttt{thesis@color@secondary}. The default secondary color +% for the Masaryk University is RGB 0, 0, 220. +% \changes{v1.0.0}{2018/11/18}{^^A +% The \cs{bfseries} command switches to the sans serif typeface +% and to the secondary color in the style files of the Masaryk +% University in Brno, Czech Republic. [VN]} % \item\marg{\texttt{tableOdd}=color} -- Stores the color of the % odd rows of the redefined \texttt{tabular} and % \texttt{tabularx} environments under the name @@ -522,6 +557,9 @@ \define@key{thesis@color}{links}{% \definecolor{thesis@color@links}#1 \hypersetup{linkbordercolor=thesis@color@links}} +\define@key{thesis@color}{secondary}{% + \definecolor{thesis@color@secondary}#1} +\thesis@color@setup{secondary={RGB}{0, 0, 220}} \define@key{thesis@color}{tableOdd}{% \definecolor{thesis@color@tableOdd}#1} \define@key{thesis@color}{tableEven}{% @@ -529,6 +567,20 @@ \define@key{thesis@color}{tableEmph}{% \definecolor{thesis@color@tableEmph}#1} % \end{macrocode} +% \changes{v1.0.0}{2018/11/18}{^^A +% The \cs{bfseries} command switches to the sans serif typeface +% and to the secondary color in the style files of the Masaryk +% University in Brno, Czech Republic. [VN]} +% The |\bfseries| macro is redefined to switch to the sans serif +% type face in the secondary color. The original definition of +% |\bfseries| is stored in the +% \DescribeMacro{\thesis@bfseries@old}|\thesis@bfseries@old| +% macro. +% \begin{macrocode} +\let\thesis@bfseries@old\bfseries +\def\bfseries{% + \sffamily\color{thesis@color@secondary}\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| % macros by the subsequently loaded style files. @@ -592,15 +644,42 @@ \newpage \fi} % \end{macrocode} +% \end{macro}\begin{macro}{\thesis@blocks@logo} +% The |\thesis@blocks@logo|\marg{pathname}\marg{options} macro +% typesets the \textit{pathname} logo with the given +% \textit{options} passed to |\includegraphics|. +% \changes{v1.0.0}{2021/04/24}{^^A +% Change \cs{thesis@facultyLogo}, +% \cs{thesis@blocks@facultyLogo@monochrome}, and +% \cs{thesis@blocks@facultyLogo@color} to use the new logotype +% of the Masaryk University in Brno in the correct size and +% localization. Add \cs{thesis@blocks@seal}. [VN]} +% \begin{macrocode} +\newcommand{\thesis@blocks@logo}[2]{{% + \let\@logowidth\relax\newlength\@logowidth + \let\@logoheight\relax\newlength\@logoheight + \settowidth\@logowidth{\includegraphics[#2]{#1}}% + \settoheight\@logoheight{\includegraphics[#2]{#1}}% + \def\@maxwidth##1{\ifdim\@logowidth>##1 ##1\else\@logowidth\fi} + \def\@maxheight##1{\ifdim\@logoheight>##1 ##1\else\@logoheight\fi} + \includegraphics[width=\@maxwidth{6.3cm}, height=\@maxheight{4cm}, + keepaspectratio, #2]{#1}}} +% \end{macrocode} % \end{macro}\begin{macro}{\thesis@blocks@facultyLogo@monochrome} % The |\thesis@blocks@facultyLogo@monochrome|\oarg{options} % macro typesets the |\thesis@logopath\thesis@facultyLogo| logo % with the given \textit{options} passed to |\includegraphics|. +% \changes{v1.0.0}{2021/04/24}{^^A +% Change \cs{thesis@facultyLogo}, +% \cs{thesis@blocks@facultyLogo@monochrome}, and +% \cs{thesis@blocks@facultyLogo@color} to use the new logotype +% of the Masaryk University in Brno in the correct size and +% localization. Add \cs{thesis@blocks@seal}. [VN]} % \begin{macrocode} \newcommand{\thesis@blocks@facultyLogo@monochrome}[1]% - [width=40mm]{{% + [scale=0.95]{{% \edef\@path{\thesis@logopath\thesis@facultyLogo}% - \includegraphics[#1]{\@path}}} + \expandafter\thesis@blocks@logo\expandafter{\@path}{#1}}} % \end{macrocode} % \end{macro}\begin{macro}{\thesis@blocks@facultyLogo@color} % The |\thesis@blocks@facultyLogo@color|\oarg{options} @@ -610,23 +689,35 @@ % |\thesis@logopath\thesis@facultyLogo-color| logo % otherwise with the given \textit{options} passed to % |\includegraphics|. +% \changes{v1.0.0}{2021/04/24}{^^A +% Change \cs{thesis@facultyLogo}, +% \cs{thesis@blocks@facultyLogo@monochrome}, and +% \cs{thesis@blocks@facultyLogo@color} to use the new logotype +% of the Masaryk University in Brno in the correct size and +% localization. Add \cs{thesis@blocks@seal}. [VN]} % \begin{macrocode} \newcommand{\thesis@blocks@facultyLogo@color}[1]% - [width=40mm]{{% + [scale=0.95]{{% \edef\@path{\thesis@logopath\thesis@facultyLogo \ifthesis@color@-color\fi}% - \includegraphics[#1]{\@path}}} + \expandafter\thesis@blocks@logo\expandafter{\@path}{#1}}} % \end{macrocode} % \end{macro}\begin{macro}{\thesis@blocks@universityLogo@monochrome} % The |\thesis@blocks@universityLogo@monochrome|\oarg{options} % macro typesets the % |\thesis@logopath\thesis@universityLogo| logo % with the given \textit{options} passed to |\includegraphics|. +% \changes{v1.0.0}{2021/03/19}{^^A +% Change \cs{thesis@universityLogo}, +% \cs{thesis@blocks@universityLogo@monochrome}, and +% \cs{thesis@blocks@universityLogo@color} to use the new logotype +% of the Masaryk University in Brno in the correct size and +% localization. [VN]} % \begin{macrocode} \newcommand{\thesis@blocks@universityLogo@monochrome}[1]% - [width=40mm]{{% + [scale=0.9]{{% \edef\@path{\thesis@logopath\thesis@universityLogo}% - \includegraphics[#1]{\@path}}} + \expandafter\thesis@blocks@logo\expandafter{\@path}{#1}}} % \end{macrocode} % \end{macro}\begin{macro}{\thesis@blocks@universityLogo@color} % The |\thesis@blocks@universityLogo@color|\oarg{options} @@ -636,12 +727,18 @@ % |\thesis@logopath\thesis@universityLogo|\discretionary{}{}{}|-color| % logo otherwise with the given \textit{options} passed to % |\includegraphics|. +% \changes{v1.0.0}{2021/03/19}{^^A +% Change \cs{thesis@universityLogo}, +% \cs{thesis@blocks@universityLogo@monochrome}, and +% \cs{thesis@blocks@universityLogo@color} to use the new logotype +% of the Masaryk University in Brno in the correct size and +% localization. [VN]} % \begin{macrocode} \newcommand{\thesis@blocks@universityLogo@color}[1]% - [width=40mm]{{% + [scale=0.9]{{% \edef\@path{\thesis@logopath\thesis@universityLogo \ifthesis@color@-color\fi}% - \includegraphics[#1]{\@path}}} + \expandafter\thesis@blocks@logo\expandafter{\@path}{#1}}} % \end{macrocode} % The |\thesis@department@name| and |\thesis@field@name| macros and % their English counterparts provide a level of indirection that @@ -656,175 +753,183 @@ \let\thesis@fieldEn@name\thesis@fieldEn % \end{macrocode} % \end{macro}\begin{macro}{\thesis@blocks@cover} +% \changes{v1.0.0}{2021/04/23}{^^A +% The macro is no longer composed of three macros. [TV]} % The |\thesis@blocks@cover| macro typesets the thesis -% cover. It is composed of three macros: -% \begin{itemize} -% \item\DescribeMacro{\thesis@blocks@cover@header}^^A -% |\thesis@blocks@cover@header| -- The header of the cover -% page -% \item\DescribeMacro{\thesis@blocks@cover@content}^^A -% |\thesis@blocks@cover@content| -- The content of the cover -% page -% \item\DescribeMacro{\thesis@blocks@cover@footer}^^A -% |\thesis@blocks@cover@footer| -- The footer of the cover -% page -% \end{itemize} -% This allows the subsequently loaded style files to only redefine -% certain parts of the cover page. +% cover. +% \changes{v1.0.0}{2018/11/18}{^^A +% The \cs{bfseries} command switches to the sans serif typeface +% and to the secondary color in the style files of the Masaryk +% University in Brno, Czech Republic. [VN]} % \begin{macrocode} \def\thesis@blocks@cover{% \ifthesis@cover@ \thesis@blocks@clear \begin{alwayssingle}% + \colorlet{thesis@color@secondary}{black}% \thispagestyle{empty}% \begin{center}% - \thesis@blocks@cover@header - \thesis@blocks@facultyLogo@monochrome\\[0.4in]% - \let\footnotesize\small - \let\footnoterule\relax{}% - \thesis@blocks@cover@content - \par\vfill - \thesis@blocks@cover@footer + \thesis@blocks@universityLogo@monochrome\par + \vspace{0.75cm}% + {\sf\thesis@titlePage@large\thesis@@upper{facultyName}\par}% + \vfill + {\bf\thesis@titlePage@Huge\thesis@TeXtitle\par}% + \vspace{1.5cm}% + {\sf\thesis@titlePage@Large\thesis@@{typeName}\par}% + \vspace{1.5cm}% + {\sf\thesis@titlePage@LARGE\thesis@upper{author}\par}% + \vfill\vfill\vfill\vfill + {\sf\thesis@titlePage@large\thesis@place, \thesis@@{semester}\par}% \end{center}% \end{alwayssingle}% \fi} % \end{macrocode} -% The output of the |\thesis@blocks@cover@header| macro is -% controlled by the following conditionals: -% \begin{enumerate} -% \item|\ifthesis@blocks@cover@university@| -- This -% conditional expression determines, whether the university -% name is going to be included in the header of the cover. -% The default value of this conditional is \texttt{true}. -% \item|\ifthesis@blocks@cover@faculty@| -- This -% conditional expression determines, whether the faculty -% name is going to be included in the header of the cover. -% The default value of this conditional is \texttt{true}. -% \item|\ifthesis@blocks@cover@department@| -- This -% conditional expression determines, whether the department -% name is going to be included in the header of the cover. -% The default value of this conditional is \texttt{false}. -% \item|\ifthesis@blocks@cover@field@| -- This -% conditional expression determines, whether the field of -% study is going to be included in the header of the cover. -% The default value of this conditional is \texttt{false}. -% \end{enumerate} -% The sebsequently loaded style files can modify the value of these -% conditionals to alter the output of the -% |\thesis@blocks@cover@header| macro without altering its -% definition. +% \changes{v1.0.0}{2021/04/23}{Removed the header conditionals as the +% covers are unified for all faculties and shouldn't need to be +% modified. [TV]} +% \end{macro} +% \begin{macro}{\thesis@blocks@advisorSignature} +% The |\thesis@blocks@advisorSignature| macro produces space for +% the thesis advisor's signature. +% \changes{v1.0.0}{2021/02/26}{^^A +% The \cs{thesis@blocks@advisorSignature} macro is now defined +% for styles of all faculties at the Masaryk University in Brno, +% not just for the Faculty of Informatics, and is automatically +% used in the \cs{thesis@blocks@titlePage} macro for rigorous +% theses and PhD thesis proposals. [VN]} % \begin{macrocode} -\newif\ifthesis@blocks@cover@university@ -\thesis@blocks@cover@university@true -\newif\ifthesis@blocks@cover@faculty@ -\thesis@blocks@cover@faculty@true -\newif\ifthesis@blocks@cover@department@ -\thesis@blocks@cover@department@false -\newif\ifthesis@blocks@cover@field@ -\thesis@blocks@cover@field@false - -\def\thesis@blocks@cover@header{% - {\sc\ifthesis@blocks@cover@university@ - \thesis@titlePage@LARGE\thesis@@{universityName}\\% - \fi\ifthesis@blocks@cover@faculty@ - \thesis@titlePage@Large\thesis@@{facultyName}\\% - \fi\ifthesis@blocks@cover@department@ - \thesis@titlePage@large\thesis@department@name\\% - \fi} - \ifthesis@blocks@cover@field@ - {\thesis@titlePage@large\vskip 1em% - {\bf\thesis@@{fieldTitle}:} \thesis@field@name}% - \fi\vskip 2em} -\def\thesis@blocks@cover@content{% - {\thesis@titlePage@Huge\bf\thesis@TeXtitle\par\vfil}% - \vskip 0.8in% - {\thesis@titlePage@large\sc\thesis@@{typeName}}\\[0.3in]% - {\thesis@titlePage@Large\bf\thesis@author}} -\def\thesis@blocks@cover@footer{% - {\thesis@titlePage@large\thesis@place, \thesis@@{semester}}} +\def\thesis@blocks@advisorSignature{% + \let\@A\relax\newlength{\@A} + \settowidth{\@A}{\thesis@@{advisorSignature}} + \setlength{\@A}{\@A+1cm} + \hfill\raisebox{-0.5em}{\parbox{\@A}{ + \centering + \rule{\@A}{1pt}\\ + \thesis@@{advisorSignature} + }}}% % \end{macrocode} % \end{macro} % \begin{macro}{\thesis@blocks@titlePage} % The |\thesis@blocks@titlePage| macro typesets the thesis -% title page. It is composed of three macros: -% \begin{itemize} -% \item|\thesis@blocks@titlePage@header| -- The header of the -% cover page -% \item|\thesis@blocks@titlePage@content| -- The content of the -% cover page -% \item|\thesis@blocks@titlePage@footer| -- The footer of the -% cover page -% \end{itemize} -% This allows the subsequently loaded style files to only redefine -% certain parts of the title page. -% \begin{macrocode} -\def\thesis@blocks@titlePage{% - \thesis@blocks@clear - \begin{alwayssingle}% - \thispagestyle{empty}% - \begin{center}% - \thesis@blocks@titlePage@header - \thesis@blocks@facultyLogo@color\\[0.4in]% - \let\footnotesize\small - \let\footnoterule\relax{}% - \thesis@blocks@titlePage@content - \par\vfill - \thesis@blocks@titlePage@footer - \end{center}% - \end{alwayssingle}} -% \end{macrocode} -% The output of the |\thesis@blocks@titlePage@header| macro is +% title page. +% \changes{v1.0.0}{2018/11/18}{^^A +% The \cs{bfseries} command switches to the sans serif typeface +% and to the secondary color in the style files of the Masaryk +% University in Brno, Czech Republic. [VN]} +% \changes{v1.0.0}{2021/02/26}{^^A +% The \cs{thesis@blocks@titlePage} command no longer consists +% of the \cs{thesis@blocks@titlePage@header}, +% \cs{thesis@blocks@titlePage@content}, and +% \cs{thesis@blocks@titlePage@footer} macros, which are no +% longer defined. [VN]} +% The output of the |\thesis@blocks@titlePage| macro is % controlled by the following conditionals: % \begin{enumerate} -% \item|\ifthesis@blocks@titlePage@university@| -- This -% conditional expression determines, whether the university -% name is going to be included in the header of the title -% page. The default value of this conditional is -% \texttt{true}. -% \item|\ifthesis@blocks@titlePage@faculty@| -- This -% conditional expression determines, whether the faculty of -% study is going to be included in the header of the title -% page. The default value of this conditional is -% \texttt{true}. % \item|\ifthesis@blocks@titlePage@department@| -- This % conditional expression determines, whether the department -% name is going to be included in the header of the title -% page. The default value of this conditional is -% \texttt{false}. +% name is going to be included in the title page. The +% default value of this conditional is \texttt{true}. +% \changes{v1.0.0}{2021/02/26}{^^A +% The \cs{ifthesis@blocks@titlePage@department@} conditional +% now defaults to \texttt{true}. [VN]} % \item|\ifthesis@blocks@titlePage@field@| -- This % conditional expression determines, whether the field of -% study is going to be included in the header of the title -% page. The default value of this conditional is -% \texttt{false}. +% study is going to be included in the title page. The +% default value of this conditional is \texttt{true}. +% \changes{v1.0.0}{2021/02/26}{^^A +% The \cs{ifthesis@blocks@titlePage@field@} conditional +% now defaults to \texttt{true}. [VN]} +% \changes{v1.0.0}{2021/02/26}{^^A +% The \cs{ifthesis@blocks@titlePage@university@} and +% \cs{ifthesis@blocks@titlePage@faculty@} conditionals +% are no longer defined. [VN]} +% \item|\ifthesis@blocks@titlePage@programme@| -- This +% conditional expression determines, whether the study +% programme is going to be included in the title page. The +% default value of this conditional is \texttt{false}. +% \changes{v1.0.0}{2021/02/26}{^^A +% The \cs{ifthesis@blocks@titlePage@programme@} conditional +% is now defined and defaults to \texttt{false}. [VN]} % \end{enumerate} % The sebsequently loaded style files can modify the value of these % conditionals to alter the output of the -% |\thesis@blocks@titlePage@header| macro without altering its -% definition. +% |\thesis@blocks@titlePage| macro without altering its definition. % \begin{macrocode} -\newif\ifthesis@blocks@titlePage@university@ -\thesis@blocks@titlePage@university@true -\newif\ifthesis@blocks@titlePage@faculty@ -\thesis@blocks@titlePage@faculty@true \newif\ifthesis@blocks@titlePage@department@ -\thesis@blocks@titlePage@department@false +\thesis@blocks@titlePage@department@true \newif\ifthesis@blocks@titlePage@field@ -\thesis@blocks@titlePage@field@false +\thesis@blocks@titlePage@field@true +\newif\ifthesis@blocks@titlePage@programme@ +\thesis@blocks@titlePage@programme@true -\def\thesis@blocks@titlePage@header{% - {\sc\ifthesis@blocks@titlePage@university@ - \thesis@titlePage@LARGE\thesis@@{universityName}\\% - \fi\ifthesis@blocks@titlePage@faculty@ - \thesis@titlePage@Large\thesis@@{facultyName}\\% - \fi\ifthesis@blocks@titlePage@department@ - \thesis@titlePage@large\thesis@department@name\\% - \fi} - \ifthesis@blocks@titlePage@field@ - {\thesis@titlePage@large\vskip 1em% - {\bf\thesis@@{fieldTitle}:} \thesis@field@name}% - \fi\vskip 2em} -\let\thesis@blocks@titlePage@content=\thesis@blocks@cover@content -\let\thesis@blocks@titlePage@footer=\thesis@blocks@cover@footer +\def\thesis@blocks@titlePage{% + \thesis@blocks@clear + \begin{alwayssingle}% + \thispagestyle{empty}% + \begin{center}% + \thesis@blocks@universityLogo@color + \par\vspace{0.75cm}% + {\sf\thesis@titlePage@large\thesis@@upper{facultyName}\par}% + \vfill + {\bf\thesis@titlePage@Huge\thesis@TeXtitle\par}% + \vspace{1.5cm}% + {\sf\thesis@titlePage@Large\thesis@@{typeName}\par}% + \vspace{1.5cm}% + {\sf\thesis@titlePage@LARGE\thesis@upper{author}\par}% + \vfill\vfill + {\sf\thesis@titlePage@large\thesis@@{advisorTitle}: \thesis@advisor\par}% + \vspace{0.75cm}% + \ifthesis@blocks@titlePage@department@ + {\sf\thesis@titlePage@large\thesis@department@name\par}% + \fi + \ifthesis@blocks@titlePage@programme@ + \vspace{0.25cm}% + {\sf\thesis@titlePage@large\thesis@@{bib@programme}: \thesis@programme\par}% + \fi + \ifthesis@blocks@titlePage@field@ + \vspace{0.25cm}% + {\sf\thesis@titlePage@large\thesis@@{fieldTitle}: \thesis@field@name\par}% + \fi + \vfill + {\sf\thesis@titlePage@large\thesis@place, \thesis@@{semester}% +% \end{macrocode} +% If this is a rigorous thesis or a PhD thesis proposal, create +% space for the advisor's signature. +% \changes{v1.0.0}{2021/02/26}{^^A +% The \cs{thesis@blocks@advisorSignature} macro is now defined +% for styles of all faculties at the Masaryk University in Brno, +% not just for the Faculty of Informatics, and is automatically +% used in the \cs{thesis@blocks@titlePage} macro for rigorous +% theses and PhD thesis proposals. [VN]} +% \begin{macrocode} + \ifx\thesis@type\thesis@rigorous + \thesis@blocks@advisorSignature + \else\ifx\thesis@type\thesis@proposal + \thesis@blocks@advisorSignature + \fi\fi\par}% + \end{center}% + \end{alwayssingle}} +% \end{macrocode} +% \end{macro}\begin{macro}{\thesis@blocks@seal} +% The |\thesis@blocks@seal| macro typesets the seal of a faculty. +% \changes{v1.0.0}{2021/04/24}{^^A +% Change \cs{thesis@facultyLogo}, +% \cs{thesis@blocks@facultyLogo@monochrome}, and +% \cs{thesis@blocks@facultyLogo@color} to use the new logotype +% of the Masaryk University in Brno in the correct size and +% localization. Add \cs{thesis@blocks@seal}. [VN]} +% \begin{macrocode} +\def\thesis@blocks@seal{% + \thesis@blocks@clear + \begin{alwayssingle}% + \thispagestyle{empty}% + \begin{center}% + \leavevmode + \par\vfill + \thesis@blocks@facultyLogo@color + \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. @@ -873,11 +978,13 @@ % \end{macro}\begin{macro}{\thesis@blocks@abstract} % The |\thesis@blocks@abstract| macro typesets the % abstract. +% \changes{v1.0.0}{2021/03/05}{Changed \texttt{clearpage} +% to \texttt{vskip} so it is by default on the same page +% when the template contains bibEntry. [TV]} % \begin{macrocode} \def\thesis@blocks@abstract{% \begin{alwayssingle}% - % Start the new chapter without clearing the left page. - \clearpage + \vskip 40 \p@ {\let\thesis@blocks@clear\relax \chapter*{\thesis@@{abstractTitle}}}% \noindent\thesis@abstract @@ -891,13 +998,15 @@ % \changes{v0.3.46}{2017/06/02}{Simplified the definition of % \cs{thesis@blocks@abstractEn} in % \texttt{style/mu/fithesis-base.sty}. [VN]} +% \changes{v1.0.0}{2021/03/05}{Changed \texttt{clearpage} +% to \texttt{vskip} so it is by default on the same page +% when the template contains bibEntry. [TV]} % \begin{macrocode} \def\thesis@blocks@abstractEn{% \ifthesis@english\else {\thesis@selectLocale{english}% \begin{alwayssingle}% - % Start the new chapter without clearing the left page. - \clearpage + \vskip 40 \p@ {\let\thesis@blocks@clear\relax \chapter*{\thesis@english@abstractTitle}}% \noindent\thesis@abstractEn @@ -908,15 +1017,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}}}% + \noindent\leavevmode\thesis@keywords \end{alwayssingle}} % \end{macrocode} % \end{macro}\begin{macro}{\thesis@blocks@keywordsEn} @@ -931,12 +1041,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}}% + \noindent\leavevmode\thesis@keywordsEn \end{alwayssingle}}% \fi} % \end{macrocode} @@ -1052,15 +1159,114 @@ % \item\texttt{bib@pages} -- The abbreviation of pages used in % the bibliographical entry % \end{itemize} +% \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]} % \begin{macrocode} \def\thesis@blocks@bibEntry{% + \thesis@blocks@clear \chapter*{\thesis@@{bib@title}} - \noindent\thesis@upper{author@tail}, \thesis@author@head. - \emph{\thesis@title}. \thesis@place: \thesis@@{universityName}, - \thesis@@{facultyName}, \thesis@department@name, \thesis@year. - \thesis@pages\ \thesis@@{bib@pages}. - \thesis@@{advisorTitle}: \thesis@advisor - \thesis@blocks@clearRight} + {% Calculate the width of the columns + \let\@A\relax\newlength{\@A}\settowidth{\@A}{{% + \bf\thesis@@{bib@author}:}} + \let\@B\relax\newlength{\@B}\settowidth{\@B}{{% + \bf\thesis@@{bib@thesisTitle}:}} + \let\@C\relax\newlength{\@C}\settowidth{\@C}{{% + \bf\thesis@@{bib@programme}:}} + \let\@D\relax\newlength{\@D}\settowidth{\@D}{{% + \bf\thesis@@{bib@field}:}} + \let\@E\relax\newlength{\@E} + \settowidth{\@E}{{\bf\thesis@@{bib@advisor}:}} + \let\@F\relax\newlength{\@F}\settowidth{\@F}{{% + \bf\thesis@@{bib@academicYear}:}} + \let\@G\relax\newlength{\@G}\settowidth{\@G}{{% + \bf\thesis@@{bib@pages}:}} + \let\@H\relax\newlength{\@H}\settowidth{\@H}{{% + \bf\thesis@@{bib@keywords}:}} + \let\@skip\relax\newlength{\@skip}\setlength{\@skip}{16pt} + \let\@left\relax\newlength{\@left}\pgfmathsetlength{\@left}{% + max(\@A,\@B,\@C,\@D,\@E,\@F,\@G,\@H)} + \let\@right\relax\newlength{\@right}\setlength{\@right}{% + \textwidth-\@left-\@skip} + % Typeset the table + \noindent\begin{thesis@newtable@old}% + {@{}p{\@left}@{\hskip\@skip}p{\@right}@{}} + \textbf{\thesis@@{bib@author}% + \ifthesis@english\else\ifthesis@woman ka\fi\fi:} & + \noindent\parbox[t]{\@right}{ + \thesis@author\\ + \thesis@@{facultyName} \\ + \thesis@@{universityName}\\ + \thesis@department@name + }\\ + \textbf{\thesis@@{bib@thesisTitle}:} + & \thesis@title \\ + \textbf{\thesis@@{bib@programme}:} + & \thesis@programme \\ + \textbf{\thesis@@{bib@field}:} + & \thesis@field \\ + \textbf{\thesis@@{bib@advisor}:} + & \thesis@advisor \\ + \textbf{\thesis@@{bib@academicYear}:} + & \thesis@academicYear \\ + \textbf{\thesis@@{bib@pages}:} + & \thesis@pages@preamble{} + \thesis@pages \\ + \textbf{\thesis@@{bib@keywords}:} + & \thesis@TeXkeywords \\ + \end{thesis@newtable@old}}} + +\def\thesis@blocks@bibEntryEn{% + \ifthesis@english\else + \thesis@blocks@clear + \chapter*{\thesis@english@bib@title} + {% Calculate the width of the columns + \let\@A\relax\newlength{\@A}\settowidth{\@A}{{% + \bf\thesis@english@bib@author:}} + \let\@B\relax\newlength{\@B}\settowidth{\@B}{{% + \bf\thesis@english@bib@thesisTitle:}} + \let\@C\relax\newlength{\@C}\settowidth{\@C}{{% + \bf\thesis@english@bib@programme:}} + \let\@D\relax\newlength{\@D}\settowidth{\@D}{{% + \bf\thesis@english@bib@field:}} + \let\@E\relax\newlength{\@E} + \settowidth{\@E}{{\bf\thesis@english@bib@advisor:}} + \let\@F\relax\newlength{\@F}\settowidth{\@F}{{% + \bf\thesis@english@bib@academicYear:}} + \let\@G\relax\newlength{\@G}\settowidth{\@G}{{% + \bf\thesis@english@bib@pages:}} + \let\@H\relax\newlength{\@H}\settowidth{\@H}{{% + \bf\thesis@english@bib@keywords:}} + \let\@skip\relax\newlength{\@skip}\setlength{\@skip}{16pt} + \let\@left\relax\newlength{\@left}\pgfmathsetlength{\@left}{% + max(\@A,\@B,\@C,\@D,\@E,\@F,\@G,\@H)} + \let\@right\relax\newlength{\@right}\setlength{\@right}{% + \textwidth-\@left-\@skip} + % Typeset the table + \noindent\begin{thesis@newtable@old}% + {@{}p{\@left}@{\hskip\@skip}p{\@right}@{}} + \textbf{\thesis@english@authorTitle:} & + \noindent\parbox[t]{\@right}{ + \thesis@author\\ + \thesis@english@facultyName \\ + \thesis@english@universityName\\ + \thesis@departmentEn@name + }\\ + \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 \\ + \textbf{\thesis@english@bib@academicYear:} + & \thesis@academicYear \\ + \textbf{\thesis@english@bib@pages:} + & \thesis@pages@preamble{} + \thesis@pages \\ + \textbf{\thesis@english@bib@keywords:} + & \thesis@TeXkeywordsEn \\ + \end{thesis@newtable@old}} + \fi} % \end{macrocode} % \end{macro}\begin{macro}{\thesis@blocks@bibliography} % When |\ifthesis@bibliography@loaded@| is true and @@ -1081,8 +1287,8 @@ % The rest of the file comprises redefinitions of \LaTeX\ commands % and private \texttt{rapport3} class macros altering the layout of % the resulting document. Depending on the type size of 10, 11 or -% 12 points, either the \texttt{fithesis-10.clo}, -% \texttt{fithesis-11.clo} or \texttt{fithesis-12.clo} file is +% 12 points, either the \texttt{fithesis-mu-10.clo}, +% \texttt{fithesis-mu-11.clo} or \texttt{fithesis-mu-12.clo} file is % loaded from the |\thesis@stylepath| |mu| directory, respectively. % \begin{macrocode} % Table of contents will contain sectioning commands up to @@ -1092,7 +1298,11 @@ % Sections up to \subsection will be numbered. \setcounter{secnumdepth}{2} -% Load the `fithesis-1*.clo` size option. +% \end{macrocode} +% \changes{v1.0.0}{2021/02/21}{Files were renamed after +% breaking changes in package loading after PR 438 in \LaTeXe. [VN]} +% \begin{macrocode} +% Load the `fithesis-mu-1*.clo` size option. \input\thesis@stylepath mu/fithesis-1\thesis@ptsize.clo\relax % Define the running heading style. @@ -1126,6 +1336,12 @@ \let\@evenfoot\@oddfoot \fi \let\@mkboth\markboth} +% \end{macrocode} +% \changes{v1.0.0}{2021/05/23}{Redefine all predefined page styles of the +% backend class, so that they can't be accidentally activated. [VN]} +% \begin{macrocode} +\let\ps@headings\ps@thesisheadings +\let\ps@myheadings\ps@thesisheadings % Redefine the style of the chapter headings. \renewcommand*\chapter{% @@ -1212,16 +1428,26 @@ \renewcommand*\l@subsubsection{\@dottedtocline{3}{7.0em}{4.1em}} \renewcommand*\l@paragraph{\@dottedtocline{4}{10.0em}{5.0em}} \renewcommand*\l@subparagraph{\@dottedtocline{4}{12.0em}{6.0em}} -% \end{macrocode}\iffalse +% \end{macrocode} +% \changes{v1.0.0}{2021/03/04}{Styles for list of figures +% and list of tables were redefined to achieve +% unified look with toc. [TV]} +% \begin{macrocode} +\renewcommand*\l@figure{\@dottedtocline{1}{0.5em}{2.3em}} +\renewcommand*\l@table{\@dottedtocline{1}{0.5em}{2.3em}} +% \end{macrocode} +% \iffalse %</base> % \fi\file{style/mu/fithesis-10.clo} +% \changes{v1.0.0}{2021/02/21}{Files were renamed after +% breaking changes in package loading after PR 438 in \LaTeXe. [VN]} % This file is conditionally loaded by the % \texttt{style/mu/base.sty} file to redefine the page geometry to % match the type size of 10 points. % \begin{macrocode} %<*opt> %<*10pt> -\ProvidesFile{fithesis/style/mu/fithesis-10.clo}[2016/05/15] +\ProvidesFile{fithesis/style/mu/fithesis-mu-10.clo}[2021/02/21] \renewcommand{\normalsize}{\fontsize\@xpt{12}\selectfont \abovedisplayskip 10\p@ plus2\p@ minus5\p@ @@ -1259,12 +1485,14 @@ %</10pt> % \end{macrocode} % \file{style/mu/fithesis-11.clo} +% \changes{v1.0.0}{2021/02/21}{Files were renamed after +% breaking changes in package loading after PR 438 in \LaTeXe. [VN]} % This file is conditionally loaded by the % \texttt{style/mu/base.sty} file to redefine the page geometry to % match the type size of 11 points. % \begin{macrocode} %<*11pt> -\ProvidesFile{fithesis/style/mu/fithesis-11.clo}[2016/05/15] +\ProvidesFile{fithesis/style/mu/fithesis-mu-11.clo}[2021/02/21] \renewcommand{\normalsize}{\fontsize\@xipt{14}\selectfont \abovedisplayskip 11\p@ plus3\p@ minus6\p@ @@ -1302,6 +1530,8 @@ %</11pt> % \end{macrocode} % \file{style/mu/fithesis-12.clo} +% \changes{v1.0.0}{2021/02/21}{Files were renamed after +% breaking changes in package loading after PR 438 in \LaTeXe. [VN]} % This file is conditionally loaded by the % \texttt{style/mu/base.sty} file to redefine the page geometry to % match the type size of 12 points. The type dimensions defined by @@ -1333,7 +1563,7 @@ % should remain constant regardless of the font size setting. % \begin{macrocode} %<*12pt> -\ProvidesFile{fithesis/style/mu/fithesis-12.clo}[2016/05/15] +\ProvidesFile{fithesis/style/mu/fithesis-mu-12.clo}[2021/02/21] %</12pt> \def\thesis@titlePage@normalsize{\fontsize\@xiipt{14.5}% diff --git a/Master/texmf-dist/source/latex/fithesis/style/mu/base.ins b/Master/texmf-dist/source/latex/fithesis/style/mu/base.ins index d73cfb271b9..eb86511e558 100644 --- a/Master/texmf-dist/source/latex/fithesis/style/mu/base.ins +++ b/Master/texmf-dist/source/latex/fithesis/style/mu/base.ins @@ -1,6 +1,6 @@ \input ../../LICENSE -\generate{\file{fithesis-base.sty}{\from{base.dtx}{base}} - \file{fithesis-10.clo}{\from{base.dtx}{opt,10pt}} - \file{fithesis-11.clo}{\from{base.dtx}{opt,11pt}} - \file{fithesis-12.clo}{\from{base.dtx}{opt,12pt}}} +\generate{\file{fithesis-mu-base.sty}{\from{base.dtx}{base}} + \file{fithesis-mu-10.clo}{\from{base.dtx}{opt,10pt}} + \file{fithesis-mu-11.clo}{\from{base.dtx}{opt,11pt}} + \file{fithesis-mu-12.clo}{\from{base.dtx}{opt,12pt}}} \endbatchfile 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 da1bef6fcc7..ae3b199a775 100644 --- a/Master/texmf-dist/source/latex/fithesis/style/mu/econ.dtx +++ b/Master/texmf-dist/source/latex/fithesis/style/mu/econ.dtx @@ -1,17 +1,22 @@ % \file{style/mu/fithesis-econ.sty} +% \changes{v1.0.0}{2021/02/21}{Files were renamed after +% breaking changes in package loading after PR 438 in \LaTeXe. [VN]} % This is the style file for the theses written at the Faculty of % Economics and Administration at the Masaryk University in Brno. % It has been prepared in accordance with the formal requirements % \changes{v0.3.46}{2017/06/02}{The documentation now points to the % 2/2017 dean's directive for the Faculty of Economics and % Administration, Masaryk University, Brno. [VN]} -% published at the website of the faculty\footnote{See \url{htt^^A -% ps://is.muni.cz/auth/do/econ/uredni_deska/predpisy_ESF/smerni^^A -% ce/smernice_dekana/prehled/67159928/SmerniceDekana2017-c.9-o_^^A -% zaverecnych_pracich_2017.docx}}. +% \changes{v1.0.0}{2021/03/19}{Updated urls to show the most recent +% requirements and recommendations used in preparation of the +% template. [TV]} +% published at the website of the faculty\footnote{See \url{https:^^A +% //is.muni.cz/auth/do/econ/uredni_deska/predpisy_ESF/smernice/sme^^A +% rnice_dekana/94383996/} and \url{https://is.muni.cz/auth/do/econ^^A +% /uredni_deska/predpisy_ESF/smernice/smernice_dekana/104768134/}}. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fithesis/style/mu/fithesis-econ}[2018/06/11] +\ProvidesPackage{fithesis/style/mu/fithesis-mu-econ}[2021/04/24] % \end{macrocode} % The file defines the color scheme of the respective faculty. Note % the the color definitions are in RGB, which makes the resulting @@ -23,7 +28,7 @@ tableOdd={HTML}{F5ECEB}, tableEven={HTML}{EBD8D5}} % \end{macrocode} -% The bibliography support is enabled. The |authoryear| citations +% The bibliography support is enabled. The |iso-authoryear| citations % are used and the bibliography is sorted by name, title, and year. % \begin{macrocode} \thesis@bibliography@setup{ @@ -59,65 +64,46 @@ % \begin{macrocode} \thesis@blocks@assignment@hideIfDigital@false % \end{macrocode} -% \begin{macro}{\thesis@blocks@cover} -% The |\thesis@blocks@cover| macro typesets the thesis -% cover. +% \changes{v0.3.49}{2018/02/11}{Removed an extraneous \cs{vskip} in +% the style files for the Masaryk University in Brno. [VN]} +% \changes{v1.0.0}{2021/02/26}{^^A +% The style files for the Faculty of Economics and Administration +% at the Masaryk University in Brno +% 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/04/23}{^^A +% The style files for the Faculty of Economics and Administration +% no longer redefine the \cs{thesis@blocks@cover}. [TV]} +% \changes{v1.0.0}{2021/05/06}{Added redefinition of the conditional +% to exclude the study field from the title page. [TV]} % \begin{macrocode} -\def\thesis@blocks@cover{% - \ifthesis@cover@ - \thesis@blocks@clear - \begin{alwayssingle} - \thispagestyle{empty} - \begin{center} - {\sc\thesis@titlePage@LARGE\thesis@@{universityName}\\% - \thesis@titlePage@Large\thesis@@{facultyName}\\} - \vfill - {\bf\thesis@titlePage@Huge\thesis@@{typeName}} - \vfill - {\thesis@titlePage@large\thesis@place - \ \thesis@year\hfill\thesis@author} - \end{center} - \end{alwayssingle} - \fi} +\thesis@blocks@titlePage@field@false % \end{macrocode} -% \end{macro} -% The style file configures the title page header to include the -% name of the field of study and redefines the title page content -% not to include the author's name and the title page footer -% to include both the author's and advisor's name, the year and -% place of the thesis defense in accordance with the formal -% requirements of the faculty. +% \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 +% name of the author at the bottom of the page. % \begin{macrocode} -\thesis@blocks@titlePage@field@true -\def\thesis@blocks@titlePage@content{% - {\thesis@titlePage@Huge\bf\thesis@TeXtitle} - \ifthesis@english\else - {\\[0.1in]\thesis@titlePage@Large\bf\thesis@TeXtitleEn} - \fi {\\[0.3in]\thesis@titlePage@large\sc\thesis@@{typeName}\\}} -\def\thesis@blocks@titlePage@footer{% - {\thesis@titlePage@large - {% Calculate the width of the thesis author and advisor boxes - \let\@A\relax\newlength{\@A}\settowidth{\@A}{{% - \bf\thesis@@{advisorTitle}:}} - \let\@B\relax\newlength{\@B}\settowidth{\@B}{\thesis@advisor} - \let\@C\relax\newlength{\@C}\settowidth{\@C}{{% - \bf\thesis@@{authorTitle}:}} - \let\@D\relax\newlength{\@D}\settowidth{\@D}{\thesis@author} - \let\@left\relax\newlength{\@left}\pgfmathsetlength{\@left}{% - max(\@A,\@B)} - \let\@right\relax\newlength{\@right}\pgfmathsetlength{\@right}{% - max(\@C,\@D)} -% \end{macrocode} -% \changes{v0.3.49}{2018/02/11}{Removed an extraneous \cs{vskip} in -% the style files for the Masaryk University in Brno. [VN]} -% \begin{macrocode} - % Typeset the thesis author and advisor boxes - \begin{minipage}[t]{\@left} - {\bf\thesis@@{advisorTitle}:}\\\thesis@advisor - \end{minipage}\hfill\begin{minipage}[t]{\@right} - {\bf\thesis@@{authorTitle}:}\\\thesis@author - \end{minipage}}\\[4em]\thesis@place, \thesis@year}} +\thesis@xpatch\thesis@blocks@cover{% + \vfill + {\bf\thesis@titlePage@Huge\thesis@TeXtitle\par}% + \vspace{1.5cm}% + {\sf\thesis@titlePage@Large\thesis@@{typeName}\par}% + \vspace{1.5cm}% + {\sf\thesis@titlePage@LARGE\thesis@upper{author}\par}% + \vfill\vfill\vfill\vfill + {\sf\thesis@titlePage@large\thesis@place, \thesis@@{semester}\par}% +}{% + \vfill + {\bf\thesis@titlePage@Huge\thesis@@{typeName}\par}% + \vfill + {\sf\thesis@titlePage@large\thesis@place + \ \sf\thesis@year\hfill\thesis@author\par}% +} % \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 page numbering is arabic @@ -207,41 +193,18 @@ \end{minipage}} \end{alwayssingle}} % \end{macrocode} -% \end{macro}\begin{macro}{\thesis@blocks@abstract} +% \end{macro} % \changes{v0.3.46}{2017/06/02}{Redefined % \cs{thesis@blocks@abstract}, \cs{thesis@blocks@abstractEn}, % \cs{thesis@blocks@keywords}, and \cs{thesis@blocks@keywordsEn} % in \texttt{style/mu/fithesis-econ.sty} in accordance with the % example documents. The patch was submitted by Jana Ratajská. % [VN]} +% \changes{v1.0.0}{2021/03/11}{Macros for abstract and abstractEn +% were moved to \texttt{base.dtx}. [TV]} % The |\thesis@blocks@abstract| macro typesets the % abstract. This definition typesets the abstract on the same page. -% \begin{macrocode} -\def\thesis@blocks@abstract{% - \begin{alwayssingle}% - \vskip 40\p@ - {\let\thesis@blocks@clear\relax - \chapter*{\thesis@@{abstractTitle}}}% - \noindent\thesis@abstract - \end{alwayssingle}} -% \end{macrocode} -% \end{macro}\begin{macro}{\thesis@blocks@abstractEn} -% The |\thesis@blocks@abstractEn| macro typesets the abstract in -% English. If the current locale is English, the macro produces no -% output. This macro typesets the abstract on the same page. -% \begin{macrocode} -\def\thesis@blocks@abstractEn{% - \ifthesis@english\else - {\thesis@selectLocale{english}% - \begin{alwayssingle}% - \vskip 20\p@ - {\let\thesis@blocks@clear\relax - \chapter*{\thesis@english@abstractTitle}}% - \noindent\thesis@abstractEn - \end{alwayssingle}}% - \fi} -% \end{macrocode} -% \end{macro}\begin{macro}{\thesis@blocks@keywords} +% \begin{macro}{\thesis@blocks@keywords} % The |\thesis@blocks@keywords| macro typesets the keywords. This % definition typesets the keywords on the same page. % \begin{macrocode} @@ -269,64 +232,26 @@ \end{alwayssingle}}% \fi} % \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 -% interface, the locale files need to define the following macros: -% \begin{itemize} -% \item|\thesis@|\textit{locale}|@bib@author| -- The label of the -% author name entry -% \item|\thesis@|\textit{locale}|@bib@title| -- The label of the -% title name entry -% \item|\thesis@|\textit{locale}|@bib@titleEn| -- The label of the -% English title name entry (\cs{thesis@english@bib@titleEn} -% does not need to be defined) -% \item|\thesis@|\textit{locale}|@bib@department| -- The label of -% the department name entry -% \item|\thesis@|\textit{locale}|@bib@advisor| -- The label of -% the advisor name entry -% \item|\thesis@|\textit{locale}|@bib@year| -- The label of the -% year entry -% \end{itemize} -% \changes{v0.3.46}{2017/06/02}{Defined \cs{thesis@blocks@bibEntry} -% in \texttt{style/mu/fithesis-econ.sty} in accordance with the -% example documents. The patch was submitted by Jana Ratajská. -% [VN]} -% \changes{v0.3.51}{2020/03/09}{The \cs{thesis@blocks@bibEntry} -% command now accomodates long titles and other information that -% may span multiple lines. [VN]} +% \end{macro}\begin{macro}{\thesis@blocks@summary} +% \changes{v1.0.0}{2021/03/11}{Macro for the summary was added. [TV]} +% The |\thesis@blocks@summary| macro typesets the summary +% for doctoral theses. If the thesis type is not doctoral, the +% macro produces no output. % \begin{macrocode} -\def\thesis@blocks@bibEntry{% - \thesis@blocks@clear - {\let\@A\relax\newlength{\@A} - \settowidth{\@A}{{\bf\thesis@@{bib@author}}} - \@B=\@A - \settowidth{\@A}{{\bf\thesis@@{bib@thesisTitle}}} - \ifdim\@A>\@B\@B=\@A\fi - \ifthesis@english\else - \settowidth{\@A}{{\bf\thesis@@{bib@thesisTitleEn}}} - \ifdim\@A>\@B\@B=\@A\fi - \fi - \settowidth{\@A}{{\bf\thesis@@{bib@department}}} - \ifdim\@A>\@B\@B=\@A\fi - \settowidth{\@A}{{\bf\thesis@@{bib@advisor}}} - \ifdim\@A>\@B\@B=\@A\fi - \settowidth{\@A}{{\bf\thesis@@{bib@year}}} - \ifdim\@A>\@B\@B=\@A\fi - \noindent\begin{thesis@newtable@old}{@{}>{\bfseries}% - p{\dimexpr(\@B + \tabcolsep)}% - p{\dimexpr(\textwidth - \@B - 2\tabcolsep)}@{}} - \thesis@@{bib@author}: & \thesis@author \\ - \thesis@@{bib@thesisTitle}: & \thesis@title \\ - \ifthesis@english\else - \thesis@@{bib@thesisTitleEn}: & \thesis@titleEn \\ - \fi - \thesis@@{bib@department}: & \thesis@department \\ - \thesis@@{bib@advisor}: & \thesis@advisor \\ - \thesis@@{bib@year}: & \thesis@year \\ - \end{thesis@newtable@old}}} +\thesis@def@extra[{ + \thesis@placeholder@extra@summary +}]{summary} + +\def\thesis@blocks@summary{% + \begin{alwayssingle}% + \thesis@blocks@clear + {\let\thesis@blocks@clear\relax + \chapter*{\thesis@@{summaryTitle}}}% + \noindent\thesis@extra@summary + \end{alwayssingle}} % \end{macrocode} % \end{macro} +% % Note that there is no direct support for the seminar paper and % thesis proposal types. If you would like to change the contents % of the preamble and the postamble, you should modify the @@ -335,27 +260,38 @@ % 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]} +% \changes{v1.0.0}{2021/04/24}{^^A +% Change \cs{thesis@facultyLogo}, +% \cs{thesis@blocks@facultyLogo@monochrome}, and +% \cs{thesis@blocks@facultyLogo@color} to use the new logotype +% of the Masaryk University in Brno in the correct size and +% localization. Add \cs{thesis@blocks@seal}. [VN]} % \begin{macrocode} \def\thesis@blocks@preamble{% \thesis@blocks@coverMatter \thesis@blocks@cover \thesis@blocks@frontMatter \thesis@blocks@titlePage - \thesis@blocks@assignment + \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} % file. +% \changes{v1.0.0}{2021/03/11}{Added conditional to include summary +% in doctoral theses. [TV]} % \begin{macrocode} \def\thesis@blocks@postamble{% + \ifx\thesis@doctoral\thesis@type\thesis@blocks@summary\else\fi \thesis@blocks@bibliography - \thesis@blocks@tables} +} % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/fithesis/style/mu/econ.ins b/Master/texmf-dist/source/latex/fithesis/style/mu/econ.ins index a6689764cf4..955297f6ed9 100644 --- a/Master/texmf-dist/source/latex/fithesis/style/mu/econ.ins +++ b/Master/texmf-dist/source/latex/fithesis/style/mu/econ.ins @@ -1,3 +1,3 @@ \input ../../LICENSE -\generate{\file{fithesis-econ.sty}{\from{econ.dtx}{}}} +\generate{\file{fithesis-mu-econ.sty}{\from{econ.dtx}{}}} \endbatchfile diff --git a/Master/texmf-dist/source/latex/fithesis/style/mu/fi.dtx b/Master/texmf-dist/source/latex/fithesis/style/mu/fi.dtx index 28a15307439..96b699a11d7 100644 --- a/Master/texmf-dist/source/latex/fithesis/style/mu/fi.dtx +++ b/Master/texmf-dist/source/latex/fithesis/style/mu/fi.dtx @@ -1,14 +1,18 @@ % \file{style/mu/fithesis-fi.sty} +% \changes{v1.0.0}{2021/02/21}{Files were renamed after +% breaking changes in package loading after PR 438 in \LaTeXe. [VN]} +% \changes{v1.0.0}{2021/03/19}{Updated urls to show the most recent +% requirements and recommendations used in preparation of the +% template. [TV]} % This is the style file for the theses written at the Faculty of % Informatics at the Masaryk University in Brno. It has been -% prepared in accordance with the formal requirements published at -% the website of the faculty\footnote{See -% \url{https://is.muni.cz/do/fi/uredni_deska/predpisy/smernice/^^A -% Smernice_dekana_1_2018_zaverecne_prace.pdfa.pdf}, and -% \url{http://www.fi.muni.cz/docs/BP_DP_na_FI.pdf}.}. +% prepared in accordance with the faculty directive +% \footnote{See \url{https://is.muni.cz/auth/do/fi/^^A +% uredni_deska/predpisy/smernice/Smernice_dekana_1_2021^^A +% _zaverecne_prace.pdf}}. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fithesis/style/mu/fithesis-fi}[2016/04/18] +\ProvidesPackage{fithesis/style/mu/fithesis-mu-fi}[2021/04/24] % \end{macrocode} % The file defines the color scheme of the respective faculty. Note % the the color definitions are in RGB, which makes the resulting @@ -20,7 +24,7 @@ tableOdd={HTML}{FFF9E5}, tableEven={HTML}{FFECB3}} % \end{macrocode} -% The bibliography support is enabled. The |numeric| citations are +% The bibliography support is enabled. The |iso-numeric| citations are % used and the bibliography is sorted in citation order. % \begin{macrocode} \thesis@bibliography@setup{ @@ -38,51 +42,15 @@ \thesis@blocks@assignment@false \fi\fi % \end{macrocode} -% \begin{macro}{\thesis@blocks@titlePage} -% The style file redefines the cover and title page footers to -% include the thesis advisor's name and signature in case of a -% rigorous thesis. Along with the macros required by the -% locale file interface, the locale files need to define the -% following strings: -% \begin{itemize} -% \item\texttt{advisorSignature} -- The label of the advisor -% signature field typeset in the case of rigorous theses -% \end{itemize} -% \begin{macrocode} -\def\thesis@blocks@advisor{% - {\thesis@titlePage@large\\[0.3in] - {\bf\thesis@@{advisorTitle}:} \thesis@advisor}} -\def\thesis@blocks@titlePage@content{% - {\thesis@titlePage@Huge\bf\thesis@TeXtitle\par\vfil}\vskip 0.8in - {\thesis@titlePage@large\sc\thesis@@{typeName}\\[0.3in]} - {\thesis@titlePage@Large\bf\thesis@author} - % If this is a rigorous thesis or a PhD thesis proposal, - % typeset the name of the thesis advisor. - \ifx\thesis@type\thesis@rigorous - \thesis@blocks@advisor - \else\ifx\thesis@type\thesis@proposal - \thesis@blocks@advisor - \fi\fi}% -\def\thesis@blocks@advisorSignature{% - \let\@A\relax\newlength{\@A} - \settowidth{\@A}{\thesis@@{advisorSignature}} - \setlength{\@A}{\@A+1cm} - \hfill\raisebox{-0.5em}{\parbox{\@A}{ - \centering - \rule{\@A}{1pt}\\ - \thesis@@{advisorSignature} - }}}% -\def\thesis@blocks@titlePage@footer{% - {\thesis@titlePage@large\thesis@place, \thesis@@{semester} - % If this is a rigorous thesis or a PhD thesis proposal, - % create space for the advisor's signature. - \ifx\thesis@type\thesis@rigorous - \thesis@blocks@advisorSignature - \else\ifx\thesis@type\thesis@proposal - \thesis@blocks@advisorSignature - \fi\fi}} -% \end{macrocode} -% \end{macro}\begin{macro}{\thesis@blocks@declaration} +% \changes{v1.0.0}{2021/02/26}{^^A +% The \cs{thesis@blocks@advisorSignature} macro is now defined +% for styles of all faculties at the Masaryk University in Brno, +% not just for the Faculty of Informatics, and is automatically +% used in the \cs{thesis@blocks@titlePage} macro for rigorous +% theses and PhD thesis proposals. [VN]} +% \changes{v1.0.0}{2021/02/26}{Lifted the \texttt{advisorSignature} +% string to the global locale file interface. [VN]} +% \begin{macro}{\thesis@blocks@declaration} % The |\thesis@blocks@declaration| macro typesets the % declaration text. Compared to the definition within the % \texttt{style/mu/base.sty} file, this macro also @@ -101,6 +69,13 @@ \end{alwayssingle}} % \end{macrocode} % \end{macro} +% \changes{v1.0.0}{2021/05/06}{Added redefinition of conditionals +% to exclude the study field and the study programme from the + % title page. [TV]} +% \begin{macrocode} +\thesis@blocks@titlePage@field@false +\thesis@blocks@titlePage@programme@false +% \end{macrocode} % In Ph.D. theses, only the table of contents will be typeset in % the front matter as per the formal requirements of the % faculty\footnote{See @@ -114,19 +89,27 @@ % 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]} +% \changes{v1.0.0}{2021/04/24}{^^A +% Change \cs{thesis@facultyLogo}, +% \cs{thesis@blocks@facultyLogo@monochrome}, and +% \cs{thesis@blocks@facultyLogo@color} to use the new logotype +% of the Masaryk University in Brno in the correct size and +% localization. Add \cs{thesis@blocks@seal}. [VN]} % \begin{macrocode} \def\thesis@blocks@preamble{% \thesis@blocks@coverMatter \thesis@blocks@cover - \thesis@blocks@titlePage \thesis@blocks@frontMatter + \thesis@blocks@titlePage + \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@clear \thesis@blocks@abstract \thesis@blocks@keywords \thesis@blocks@tables diff --git a/Master/texmf-dist/source/latex/fithesis/style/mu/fi.ins b/Master/texmf-dist/source/latex/fithesis/style/mu/fi.ins index ccf95062180..2bf4970abf2 100644 --- a/Master/texmf-dist/source/latex/fithesis/style/mu/fi.ins +++ b/Master/texmf-dist/source/latex/fithesis/style/mu/fi.ins @@ -1,3 +1,3 @@ \input ../../LICENSE -\generate{\file{fithesis-fi.sty}{\from{fi.dtx}{}}} +\generate{\file{fithesis-mu-fi.sty}{\from{fi.dtx}{}}} \endbatchfile 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 9efba78442f..7082d5220b9 100644 --- a/Master/texmf-dist/source/latex/fithesis/style/mu/fsps.dtx +++ b/Master/texmf-dist/source/latex/fithesis/style/mu/fsps.dtx @@ -1,13 +1,18 @@ % \file{style/mu/fithesis-fsps.sty} +% \changes{v1.0.0}{2021/02/21}{Files were renamed after +% breaking changes in package loading after PR 438 in \LaTeXe. [VN]} +% \changes{v1.0.0}{2021/03/19}{Updated urls to show the most recent +% requirements and recommendations used in preparation of the +% template. [TV]} % This is the style file for the theses written at the Faculty of % Sports Studies at the Masaryk University in Brno. It has been % prepared in accordance with the formal requirements published at -% the website of the faculty\footnote{See \url{https://is.muni.^^A -% cz/auth/do/fsps/studijni/info-stud/SZZ/44862261/pokyny_ZP_13-^^A -% 5-2013.pdf}}. +% the website of the faculty\footnote{See \url{https://is.muni.cz/^^A +% auth/do/fsps/fak_predpisy/smernice-dekana/2020-03_Smernice_pokyn^^A +% y_vypracovani_ZP_bc-mgr-rig.pdf}}. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fithesis/style/mu/fithesis-fsps}[2018/02/11] +\ProvidesPackage{fithesis/style/mu/fithesis-mu-fsps}[2021/04/24] % \end{macrocode} % The file defines the color scheme of the respective faculty. Note % the the color definitions are in RGB, which makes the resulting @@ -19,12 +24,12 @@ tableOdd={HTML}{EBEFF5}, tableEven={HTML}{D1DAEB}} % \end{macrocode} -% The bibliography support is enabled. The |authoryear| citations +% The bibliography support is enabled. The |iso-authoryear| citations % are used and the bibliography is sorted by name, title, and year. % \begin{macrocode} \thesis@bibliography@setup{ style=iso-authoryear, - sorting=nty} + sorting=nyt} \thesis@bibliography@load % \end{macrocode} % The file loads the following packages: @@ -46,38 +51,13 @@ % \begin{macrocode} \setlength{\parindent}{1.25cm} % \end{macrocode} -% The style file redefines the title page content -% not to include the author's name and the title page footer -% to include both the author's and advisor's name, the year and -% place of the thesis defense in accordance with the formal -% requirements of the faculty. -% \begin{macrocode} -\def\thesis@blocks@titlePage@footer{% - {\thesis@titlePage@large - {% Calculate the width of the thesis author and advisor boxes - \let\@A\relax\newlength{\@A}\settowidth{\@A}{{% - \bf\thesis@@{advisorTitle}:}} - \let\@B\relax\newlength{\@B}\settowidth{\@B}{\thesis@advisor} - \let\@C\relax\newlength{\@C}\settowidth{\@C}{{% - \bf\thesis@@{authorTitle}:}} - \let\@D\relax\newlength{\@D}\settowidth{\@D}{\thesis@author} - \let\@E\relax\newlength{\@E}\settowidth{\@E}{\thesis@field} - \let\@F\relax\newlength{\@F}\pgfmathsetlength{\@F}{max(\@D,\@E)} - \let\@left\relax\newlength{\@left}\pgfmathsetlength{\@left}{% - max(\@A,\@B)} - \let\@right\relax\newlength{\@right}\pgfmathsetlength{\@right}{% - max(\@C,\@F)} -% \end{macrocode} % \changes{v0.3.49}{2018/02/11}{Removed an extraneous \cs{vskip} in % the style files for the Masaryk University in Brno. [VN]} -% \begin{macrocode} - % Typeset the thesis author and advisor boxes - \begin{minipage}[t]{\@left} - {\bf\thesis@@{advisorTitle}:}\\\thesis@advisor - \end{minipage}\hfill\begin{minipage}[t]{\@right} - {\bf\thesis@@{authorTitle}:}\\\thesis@author\\\thesis@field - \end{minipage}}\\[4em]\thesis@place, \thesis@year}} -% \end{macrocode} +% \changes{v1.0.0}{2021/02/26}{^^A +% The style files for the Faculty of Sports Studies +% 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} % The |\thesis@blocks@frontMatter| macro sets up the style of the % front matter of the thesis. The leading is adjusted in @@ -160,13 +140,25 @@ % 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]} +% \changes{v1.0.0}{2021/04/24}{^^A +% Change \cs{thesis@facultyLogo}, +% \cs{thesis@blocks@facultyLogo@monochrome}, and +% \cs{thesis@blocks@facultyLogo@color} to use the new logotype +% of the Masaryk University in Brno in the correct size and +% localization. Add \cs{thesis@blocks@seal}. [VN]} % \begin{macrocode} \def\thesis@blocks@preamble{% \thesis@blocks@coverMatter \thesis@blocks@cover - \thesis@blocks@titlePage \thesis@blocks@frontMatter - \thesis@blocks@declaration + \thesis@blocks@titlePage + \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{% diff --git a/Master/texmf-dist/source/latex/fithesis/style/mu/fsps.ins b/Master/texmf-dist/source/latex/fithesis/style/mu/fsps.ins index cc6eba67fde..2456ad8427b 100644 --- a/Master/texmf-dist/source/latex/fithesis/style/mu/fsps.ins +++ b/Master/texmf-dist/source/latex/fithesis/style/mu/fsps.ins @@ -1,3 +1,3 @@ \input ../../LICENSE -\generate{\file{fithesis-fsps.sty}{\from{fsps.dtx}{}}} +\generate{\file{fithesis-mu-fsps.sty}{\from{fsps.dtx}{}}} \endbatchfile diff --git a/Master/texmf-dist/source/latex/fithesis/style/mu/fss.dtx b/Master/texmf-dist/source/latex/fithesis/style/mu/fss.dtx index 820f180eea0..bb0b8d64ffb 100644 --- a/Master/texmf-dist/source/latex/fithesis/style/mu/fss.dtx +++ b/Master/texmf-dist/source/latex/fithesis/style/mu/fss.dtx @@ -1,21 +1,17 @@ % \file{style/mu/fithesis-fss.sty} +% \changes{v1.0.0}{2021/02/21}{Files were renamed after +% breaking changes in package loading after PR 438 in \LaTeXe. [VN]} +% \changes{v1.0.0}{2021/03/19}{Updated urls to show the most recent +% requirements and recommendations used in preparation of the +% template. [TV]} % This is the style file for the theses written at the Faculty of -% Social Studies at the Masaryk University in Brno. Since there -% exists no faculty-wide formal requirement or recommendation,^^A -% \footnote{See \url{https://medzur.fss.muni.cz/informace-pro-st^^A -% udenty/bakalarske-a-diplomove-prace}, \url{https://is.muni.cz/^^A -% do/fss/kspsp/mvplzszz/dp_pokyny.html}, \url{https://psych.fss.^^A -% muni.cz/media/3054818/pokyny_pro_psani_zaverecnych_praci.pdf}, -% \url{http://mve.fss.muni.cz/cs/studium/studijni-agenda/pokyny-^^A -% ke-szz}, \url{https://humenv.fss.muni.cz/mgr/zaverecne-prace}, -% and \url{https://medzur.fss.muni.cz/media/11356/pravidla_pro_z^^A -% averecne_prace_na_kmszu_verze_2013.pdf}.} -% this style is just a skeleton, which is unlikely to satisfy the -% exact requirements of any department and will require -% modification by the individual departments. +% Social Studies at the Masaryk University in Brno. It has been +% prepared in accordance with the MS template of the faculty +% \footnote{See \url{https://is.muni.cz/auth/do/fss/sablona_^^A +% zaverecne_prace/sablonaDP-MUNI-FSS.dotx}}. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fithesis/style/mu/fithesis-fss}[2016/04/18] +\ProvidesPackage{fithesis/style/mu/fithesis-mu-fss}[2021/04/24] % \end{macrocode} % The file defines the color scheme of the respective faculty. Note % the the color definitions are in RGB, which makes the resulting @@ -27,7 +23,7 @@ tableOdd={HTML}{E3F1EE}, tableEven={HTML}{C5E3DF}} % \end{macrocode} -% The bibliography support is enabled. The |authoryear| citations +% The bibliography support is enabled. The |iso-authoryear| citations % are used and the bibliography is sorted by name, title, and year. % \begin{macrocode} \thesis@bibliography@setup{ @@ -35,6 +31,11 @@ sorting=nty} \thesis@bibliography@load % \end{macrocode} +% \changes{v1.0.0}{2021/05/06}{Added redefinition of the conditional +% to exclude the study field from the title page. [TV]} +% \begin{macrocode} +\thesis@blocks@titlePage@field@false +% \end{macrocode} % \begin{macro}{\thesis@blocks@frontMatter} % The |\thesis@blocks@frontMatter| macro sets up the style % of the front matter of the thesis. @@ -54,18 +55,25 @@ % 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]} +% \changes{v1.0.0}{2021/04/24}{^^A +% Change \cs{thesis@facultyLogo}, +% \cs{thesis@blocks@facultyLogo@monochrome}, and +% \cs{thesis@blocks@facultyLogo@color} to use the new logotype +% of the Masaryk University in Brno in the correct size and +% localization. Add \cs{thesis@blocks@seal}. [VN]} % \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@titlePage + \thesis@blocks@seal + \thesis@blocks@bibEntry + \thesis@blocks@abstract + \thesis@blocks@bibEntryEn + \thesis@blocks@abstractEn \thesis@blocks@declaration \thesis@blocks@thanks \thesis@blocks@tables} diff --git a/Master/texmf-dist/source/latex/fithesis/style/mu/fss.ins b/Master/texmf-dist/source/latex/fithesis/style/mu/fss.ins index 8a2df3b0b9a..6031dcc5488 100644 --- a/Master/texmf-dist/source/latex/fithesis/style/mu/fss.ins +++ b/Master/texmf-dist/source/latex/fithesis/style/mu/fss.ins @@ -1,3 +1,3 @@ \input ../../LICENSE -\generate{\file{fithesis-fss.sty}{\from{fss.dtx}{}}} +\generate{\file{fithesis-mu-fss.sty}{\from{fss.dtx}{}}} \endbatchfile 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 fb02d5dde02..38aa08c95c4 100644 --- a/Master/texmf-dist/source/latex/fithesis/style/mu/law.dtx +++ b/Master/texmf-dist/source/latex/fithesis/style/mu/law.dtx @@ -1,13 +1,19 @@ % \file{style/mu/fithesis-law.sty} +% \changes{v1.0.0}{2021/02/21}{Files were renamed after +% breaking changes in package loading after PR 438 in \LaTeXe. [VN]} +% \changes{v1.0.0}{2021/03/19}{Updated urls to show the most recent +% requirements and recommendations used in preparation of the +% template. [TV]} % This is the style file for the theses written at the Faculty of % Law at the Masaryk University in Brno. It has been prepared in % accordance with the formal requirements published at the % website of the faculty\footnote{See \url{http://is.muni.cz/d^^A % o/law/ud/predp/smer/S-07-2012.pdf}, and \url{https://is.muni^^A -% .cz/do/law/ud/predp/smer/S-04-2013_O_citacich_dokumentu.pdf}}. +% .cz/do/law/ud/predp/smer/Smernice_dekana_c._3-2020_O_citacic^^A +% h_dokumentu.pdf}}. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fithesis/style/mu/fithesis-law}[2017/05/21] +\ProvidesPackage{fithesis/style/mu/fithesis-mu-law}[2021/04/24] % \end{macrocode} % The file defines the color scheme of the respective faculty. Note % the the color definitions are in RGB, which makes the resulting @@ -19,11 +25,14 @@ tableOdd={HTML}{F2EBF5}, tableEven={HTML}{E5CCED}} % \end{macrocode} -% The bibliography support is enabled. The |authoryear| citations +% The bibliography support is enabled. The |iso-authortitle| citations % are used and the bibliography is sorted by name, year, and title. +% \changes{v1.0.0}{2021/03/26}{^^A +% The Faculty of Law at the Masaryk University in Brno uses the ISO~690 +% author-title citation and reference style. [VN]} % \begin{macrocode} \thesis@bibliography@setup{% - style=iso-authoryear, + style=iso-authortitle, sorting=nyt} \thesis@bibliography@load % \end{macrocode} @@ -33,19 +42,51 @@ \thesis@require{chngcntr} \counterwithout{footnote}{chapter} % \end{macrocode} -% The style file configures the cover and title page headers to -% include only the faculty name and the department name. -% Along with the macros required by the locale file interface, -% the locale files need to define the following strings: -% \begin{itemize} -% \item\texttt{facultyLongName} -- The name of the faculty -% combined with the name of the university. -% \end{itemize} +% The style file configures the upper part of the title page headers +% to include the name of the department and the study field +% which are by default in the bottom part of the title page. +% \changes{v1.0.0}{2021/05/06}{Added conditional redefinition for the +% study programme. [TV]} +% \changes{v1.0.0}{2021/04/23}{^^A +% The style files for the Faculty of Law at the Masaryk University +% in Brno no longer redefine the \cs{thesis@blocks@cover@header} +% macro, which is no longer defined. [TV]} +% \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} -\def\thesis@blocks@cover@header{% - {\sc\thesis@titlePage@Large\thesis@@{facultyLongName}\\% - \thesis@titlePage@large\thesis@department@name\\\vskip 2em}} -\let\thesis@blocks@titlePage@header=\thesis@blocks@cover@header +\thesis@blocks@titlePage@programme@false + +\thesis@xpatch\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\par}% + \fi + \ifthesis@blocks@titlePage@programme@ + \vspace{0.25cm}% + {\sf\thesis@titlePage@large\thesis@@{bib@programme}: + \thesis@programme\par}% + \fi + \ifthesis@blocks@titlePage@field@ + \vspace{0.25cm}% + {\sf\thesis@titlePage@large\thesis@@{fieldTitle}: + \thesis@field@name\par}% + \fi + \vfill +}{} + +\thesis@xpatch\thesis@blocks@titlePage{% + {\sf\thesis@titlePage@large\thesis@@upper{facultyName}\par}% + \vfill +}{% + {\sf\thesis@titlePage@large\thesis@@upper{facultyName}\par}% + \vspace{0.5cm}% + {\sf\thesis@titlePage@large\thesis@field\par}% + \vspace{0.25cm}% + {\sf\thesis@titlePage@large\thesis@department@name\par}% + \vspace{1cm}% +} % \end{macrocode} % \begin{macro}{\thesis@blocks@frontMatter} % The |\thesis@blocks@frontMatter| macro sets up the style @@ -79,17 +120,27 @@ % 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]} +% \changes{v1.0.0}{2021/04/24}{^^A +% Change \cs{thesis@facultyLogo}, +% \cs{thesis@blocks@facultyLogo@monochrome}, and +% \cs{thesis@blocks@facultyLogo@color} to use the new logotype +% of the Masaryk University in Brno in the correct size and +% localization. Add \cs{thesis@blocks@seal}. [VN]} % \begin{macrocode} \def\thesis@blocks@preamble{% \thesis@blocks@coverMatter \thesis@blocks@cover - \thesis@blocks@titlePage \thesis@blocks@frontMatter + \thesis@blocks@titlePage + \thesis@blocks@seal \thesis@blocks@declaration - \thesis@blocks@clearRight + \thesis@blocks@clear \thesis@blocks@abstract - \thesis@blocks@abstractEn \thesis@blocks@keywords + \thesis@blocks@clear + \thesis@blocks@abstractEn \thesis@blocks@keywordsEn \thesis@blocks@thanks \thesis@blocks@tables} diff --git a/Master/texmf-dist/source/latex/fithesis/style/mu/law.ins b/Master/texmf-dist/source/latex/fithesis/style/mu/law.ins index c688afd3ec6..4f0d34b3eab 100644 --- a/Master/texmf-dist/source/latex/fithesis/style/mu/law.ins +++ b/Master/texmf-dist/source/latex/fithesis/style/mu/law.ins @@ -1,3 +1,3 @@ \input ../../LICENSE -\generate{\file{fithesis-law.sty}{\from{law.dtx}{}}} +\generate{\file{fithesis-mu-law.sty}{\from{law.dtx}{}}} \endbatchfile 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 812e4c7273d..aa514412e52 100644 --- a/Master/texmf-dist/source/latex/fithesis/style/mu/med.dtx +++ b/Master/texmf-dist/source/latex/fithesis/style/mu/med.dtx @@ -1,13 +1,21 @@ % \file{style/mu/fithesis-med.sty} +% \changes{v1.0.0}{2021/02/21}{Files were renamed after +% breaking changes in package loading after PR 438 in \LaTeXe. [VN]} +% \changes{v1.0.0}{2021/03/19}{Updated urls to show the most recent +% requirements and recommendations used in preparation of the +% template. [TV]} % This is the style file for the theses written at the Faculty of % Medicine at the Masaryk University in Brno. It has been prepared % in accordance with the formal requirements published at the -% website of the Department of Optometry and Orthoptics\footnote^^A -% {See \url{http://is.muni.cz/do/med/zpravyprac/Optometrie/NALE^^A -% ZITOSTI_ZAVERECNE_PRACE.doc}}. +% website of the faculty \footnote {See \url{https://is.muni.cz/do/^^A +% med/uredni_deska/pravni_normy/smernice_dekana/2020/smernice_lf_mu^^A +% _2_2020_-_pokyny_k_formalnim_nalezitostem_zaverecnych_bakalarskyc^^A +% h/Smernice_LF_MU_2-2020_-_Pokyny_k_formalnim_nalezitostem_zaverec^^A +% nych_bakalarskych_a_diplomovych_praci_vypracovanych_na_Lekarske_f^^A +% akulte_MU.pdf}}. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fithesis/style/mu/fithesis-med}[2018/06/11] +\ProvidesPackage{fithesis/style/mu/fithesis-mu-med}[2021/04/24] % \end{macrocode} % The file defines the color scheme of the respective faculty. Note % the the color definitions are in RGB, which makes the resulting @@ -19,14 +27,52 @@ tableOdd={HTML}{FFF5F6}, tableEven={HTML}{FFDEDF}} % \end{macrocode} -% The bibliography support is enabled. The |authoryear| citations +% The bibliography support is enabled. The |authortitle| citations % are used and the bibliography is sorted by year, name, and title. % \begin{macrocode} \thesis@bibliography@setup{% - style=iso-authoryear, + style=authortitle, sorting=ynt} \thesis@bibliography@load % \end{macrocode} +% The AMA citation style is defined using |authortitle| as the basis. +% The following code has been adapted from +% \url{https://tex.stackexchange.com/a/233423/70941}. +% \changes{v1.0.0}{2021/03/26}{^^A +% The Faculty of Medicine at the Masaryk University in Brno uses the +% AMA citation and reference style. [VN]} +% \begin{macrocode} +\ifthesis@bibliography@loaded@ + \DeclareNameAlias{sortname}{last-first} + \renewcommand*{\revsdnamepunct}{} + \DeclareFieldFormat[% + article,inbook,incollection,inproceedings,patent,thesis,unpublished]% + {title}{{#1\isdot}} + \renewbibmacro{in:}{} + \DeclareFieldFormat{pages}{#1} + \renewcommand*{\bibpagespunct}{\addcolon} + \DeclareFieldFormat{journaltitle}{#1\addperiod} + \DeclareFieldFormat{booktitle}{{#1}} + \DeclareFieldFormat{title}{{#1}} + \renewbibmacro*{journal+issuetitle}{% + \usebibmacro{journal}% + \setunit*{\addspace}% + \iffieldundef{series} + {} + {\newunit + \printfield{series}% + \setunit{\addspace}}% + \usebibmacro{issue+date}% + \setunit{\addsemicolon\addspace}% + \usebibmacro{volume+number+eid}% + \setunit{\addcolon\space}% + \usebibmacro{issue}% + \newunit% + } + \renewbibmacro*{issue+date}{\printfield{year}} + \renewcommand*{\finalnamedelim}{\multinamedelim} +\fi +% \end{macrocode} % The file loads the following packages: % \begin{itemize} % \item\textsf{tikz} -- Used for dimension arithmetic. @@ -44,64 +90,60 @@ \thesis@require{setspace} \geometry{top=25mm,bottom=20mm,left=25mm,right=25mm,includeheadfoot} % \end{macrocode} -% \begin{macro}{\thesis@blocks@cover} -% The |\thesis@blocks@cover| macro typesets the thesis -% cover. -% \begin{macrocode} -\def\thesis@blocks@cover{% - \ifthesis@cover@ - \thesis@blocks@clear - \begin{alwayssingle} - \thispagestyle{empty} - \begin{center} - {\sc\thesis@titlePage@LARGE\thesis@@{universityName}\\% - \thesis@titlePage@Large\thesis@@{facultyName}\\} - \vfill - {\bf\thesis@titlePage@Huge\thesis@@{typeName}} - \vfill - {\thesis@titlePage@large\thesis@place - \ \thesis@year\hfill\thesis@author} - \end{center} - \end{alwayssingle} - \fi} -% \end{macrocode} -% \end{macro} -% The style file redefines the title page content -% not to include the author's name and the title page footer -% to include both the author's and advisor's name, the field of -% study and the semester and place of the thesis defense in -% accordance with the requirements of the department. -% \begin{macrocode} -\def\thesis@blocks@titlePage@content{% - {\thesis@titlePage@Huge\bf\thesis@TeXtitle\\[0.3in]}% - {\thesis@titlePage@large{\sc\thesis@@{typeName}}\\}} -\def\thesis@blocks@titlePage@footer{% - {\thesis@titlePage@large - {% Calculate the width of the thesis author and advisor boxes - \let\@A\relax\newlength{\@A}\settowidth{\@A}{{% - \bf\thesis@@{advisorTitle}:}} - \let\@B\relax\newlength{\@B}\settowidth{\@B}{\thesis@advisor} - \let\@C\relax\newlength{\@C}\settowidth{\@C}{{% - \bf\thesis@@{authorTitle}:}} - \let\@D\relax\newlength{\@D}\settowidth{\@D}{\thesis@author} - \let\@E\relax\newlength{\@E}\settowidth{\@E}{{% - \bf\thesis@@{fieldTitle}:}} - \let\@F\relax\newlength{\@F}\settowidth{\@F}{\thesis@field@name} - \let\@left\relax\newlength{\@left}\pgfmathsetlength{\@left}{% - max(\@A,\@B)} - \let\@right\relax\newlength{\@right}\pgfmathsetlength{\@right}{% - max(\@C,\@D,\@E,\@F)} -% \end{macrocode} +% The style file configures the upper part of the title page headers +% to include the the name of the department and the study programme +% which are by default in the bottom part of the title page. Upon failure +% of the \textit{xpatchcmd}, \cs{thesis@xpatchError} is called. % \changes{v0.3.49}{2018/02/11}{Removed an extraneous \cs{vskip} in % the style files for the Masaryk University in Brno. [VN]} -% \begin{macrocode} - % Typeset the thesis author and advisor boxes - \begin{minipage}[t]{\@left} - {\bf\thesis@@{advisorTitle}:}\\\thesis@advisor - \end{minipage}\hfill\begin{minipage}[t]{\@right} - {\bf\thesis@@{authorTitle}:}\\\thesis@author - \\[1em]{\bf\thesis@@{fieldTitle}:}\\\thesis@field@name - \end{minipage}}\\[4em]\thesis@place, \thesis@@{semester}}} +% \changes{v1.0.0}{2021/02/26}{^^A +% The style files for the Faculty of Medicine +% at the Masaryk University in Brno +% 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]} +% \changes{v1.0.0}{2021/04/23}{^^A +% The style files of the Faculty of Medicine at the Masary University +% in Brno no longer redefine the \cs{thesis@blocks@cover} macro. +% [TV]} +% \changes{v1.0.0}{2021/05/06}{Added conditional redefinition for the +% study field. [TV]} +% \begin{macrocode} +\thesis@blocks@titlePage@field@false + +\thesis@xpatch\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\par}% + \fi + \ifthesis@blocks@titlePage@programme@ + \vspace{0.25cm}% + {\sf\thesis@titlePage@large\thesis@@{bib@programme}: + \thesis@programme\par}% + \fi + \ifthesis@blocks@titlePage@field@ + \vspace{0.25cm}% + {\sf\thesis@titlePage@large\thesis@@{fieldTitle}: + \thesis@field@name\par}% + \fi + \vfill +}{} + +\thesis@xpatch\thesis@blocks@titlePage{% + {\sf\thesis@titlePage@large\thesis@@upper{facultyName}\par}% + \vfill +}{% + {\sf\thesis@titlePage@large\thesis@@upper{facultyName}\par}% + \vspace{0.5cm}% + {\sf\thesis@titlePage@large\thesis@programme\par}% + \vspace{0.25cm}% + {\sf\thesis@titlePage@large\thesis@department@name\par}% + \vspace{1cm}% +} % \end{macrocode} % \begin{macro}{\thesis@blocks@frontMatter} % The |\thesis@blocks@frontMatter| macro sets up the style of the @@ -143,20 +185,28 @@ % 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]} +% \changes{v1.0.0}{2021/04/24}{^^A +% Change \cs{thesis@facultyLogo}, +% \cs{thesis@blocks@facultyLogo@monochrome}, and +% \cs{thesis@blocks@facultyLogo@color} to use the new logotype +% of the Masaryk University in Brno in the correct size and +% localization. Add \cs{thesis@blocks@seal}. [VN]} % \begin{macrocode} \def\thesis@blocks@preamble{% \thesis@blocks@coverMatter \thesis@blocks@cover \thesis@blocks@frontMatter \thesis@blocks@titlePage - \onehalfspacing - \thesis@blocks@clearRight + \thesis@blocks@seal + \thesis@blocks@declaration + \thesis@blocks@clear \thesis@blocks@abstract - \thesis@blocks@abstractEn \thesis@blocks@keywords + \thesis@blocks@clear + \thesis@blocks@abstractEn \thesis@blocks@keywordsEn - \thesis@blocks@bibEntry - \thesis@blocks@declaration \thesis@blocks@thanks \thesis@blocks@tables} \def\thesis@blocks@postamble{% diff --git a/Master/texmf-dist/source/latex/fithesis/style/mu/med.ins b/Master/texmf-dist/source/latex/fithesis/style/mu/med.ins index 7f59c26c1de..944e6d9a9bb 100644 --- a/Master/texmf-dist/source/latex/fithesis/style/mu/med.ins +++ b/Master/texmf-dist/source/latex/fithesis/style/mu/med.ins @@ -1,3 +1,3 @@ \input ../../LICENSE -\generate{\file{fithesis-med.sty}{\from{med.dtx}{}}} +\generate{\file{fithesis-mu-med.sty}{\from{med.dtx}{}}} \endbatchfile diff --git a/Master/texmf-dist/source/latex/fithesis/style/mu/ped.dtx b/Master/texmf-dist/source/latex/fithesis/style/mu/ped.dtx index 49c2b643cb1..88e2fb99188 100644 --- a/Master/texmf-dist/source/latex/fithesis/style/mu/ped.dtx +++ b/Master/texmf-dist/source/latex/fithesis/style/mu/ped.dtx @@ -1,13 +1,20 @@ % \file{style/mu/fithesis-ped.sty} +% \changes{v1.0.0}{2021/02/21}{Files were renamed after +% breaking changes in package loading after PR 438 in \LaTeXe. [VN]} +% \changes{v1.0.0}{2021/03/19}{Updated urls to show the most recent +% requirements and recommendations used in preparation of the +% template. [TV]} % This is the style file for the theses written at the Faculty of % Education at the Masaryk University in Brno. It has been prepared % in accordance with the formal requirements published at the -% of the faculty\footnote{See \url{https://is.muni.cz/do/ped/VPA^^A -% N/pokdek/c._1_2015_K_realizaci_zaverecnych_praci.pdf}, and -% \url{http://moodlinka.ics.muni.cz/course/view.php?id=632}}. +% of the faculty\footnote{See \url{K_realizaci_zaverecnych_praci^^A +% __bakalarskych__diplomovych__rigoroznich_a_zaverecnych_praci_CZV_}, +% and standard of the department of Pedagogy +% \url{http://www.ped.muni.cz/pedagogika/wp-content/uploads/2018^^A +% /08/standard_zaverecnych_praci_katedra_pedagogiky-opravene3_08.pdf}}. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fithesis/style/mu/fithesis-ped}[2016/04/18] +\ProvidesPackage{fithesis/style/mu/fithesis-mu-ped}[2021/04/24] % \end{macrocode} % The file defines the color scheme of the respective faculty. Note % the the color definitions are in RGB, which makes the resulting @@ -19,27 +26,25 @@ tableOdd={HTML}{FFF1E0}, tableEven={HTML}{FFDEB7}} % \end{macrocode} -% The bibliography support is enabled. The |numeric| citations are +% The bibliography support is enabled. The |apa| citations are % used and the bibliography is sorted by name, title, and year. +% \changes{v1.0.0}{2021/03/26}{^^A +% The Faculty of Education at the Masaryk University in Brno +% uses the APA citation and reference style. [VN]} % \begin{macrocode} \thesis@bibliography@setup{ - style=iso-numeric, + style=apa, sorting=nty} \thesis@bibliography@load % \end{macrocode} -% The style file configures the title page header to include the -% department name and the title page content to include the -% advisor's name. -% \begin{macrocode} -\thesis@blocks@titlePage@department@true -\def\thesis@blocks@titlePage@content{% - {\thesis@titlePage@Huge\bf\thesis@TeXtitle\par\vfil}\vskip 0.8in - {\thesis@titlePage@large\sc\thesis@@{typeName}\\[0.3in]} - {\thesis@titlePage@Large\bf\thesis@author} - % Typeset the name of the thesis advisor. - {\thesis@titlePage@large\\[0.3in] - {\bf\thesis@@{advisorTitle}:} \thesis@advisor}} -% \end{macrocode} +% \changes{v1.0.0}{2021/02/26}{^^A +% The \cs{ifthesis@blocks@titlePage@department@} conditional +% now defaults to \texttt{true}. [VN]} +% \changes{v1.0.0}{2021/02/26}{^^A +% The style files for the Faculty of Education +% at the Masaryk University in Brno no longer +% redefine the \cs{thesis@blocks@titlePage@content} macro, which +% is no longer defined. [VN]} % Note that there is no direct support for the seminar paper and % thesis proposal types. If you would like to change the contents % of the preamble and the postamble, you should modify the @@ -48,17 +53,25 @@ % 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]} +% \changes{v1.0.0}{2021/04/24}{^^A +% Change \cs{thesis@facultyLogo}, +% \cs{thesis@blocks@facultyLogo@monochrome}, and +% \cs{thesis@blocks@facultyLogo@color} to use the new logotype +% of the Masaryk University in Brno in the correct size and +% localization. Add \cs{thesis@blocks@seal}. [VN]} % \begin{macrocode} \def\thesis@blocks@preamble{% \thesis@blocks@coverMatter \thesis@blocks@cover - \thesis@blocks@titlePage \thesis@blocks@frontMatter + \thesis@blocks@titlePage + \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} diff --git a/Master/texmf-dist/source/latex/fithesis/style/mu/ped.ins b/Master/texmf-dist/source/latex/fithesis/style/mu/ped.ins index 802f987d456..380e8a7b50b 100644 --- a/Master/texmf-dist/source/latex/fithesis/style/mu/ped.ins +++ b/Master/texmf-dist/source/latex/fithesis/style/mu/ped.ins @@ -1,3 +1,3 @@ \input ../../LICENSE -\generate{\file{fithesis-ped.sty}{\from{ped.dtx}{}}} +\generate{\file{fithesis-mu-ped.sty}{\from{ped.dtx}{}}} \endbatchfile diff --git a/Master/texmf-dist/source/latex/fithesis/style/mu/pharm.dtx b/Master/texmf-dist/source/latex/fithesis/style/mu/pharm.dtx new file mode 100644 index 00000000000..33f2dcaf1f2 --- /dev/null +++ b/Master/texmf-dist/source/latex/fithesis/style/mu/pharm.dtx @@ -0,0 +1,106 @@ +% \file{style/mu/fithesis-pharm.sty} +% This is the style file for the theses written at the Faculty of +% Pharmacy at the Masaryk University in Brno. It has been prepared +% in accordance with the formal requirements. +% \begin{macrocode} +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{fithesis/style/mu/fithesis-mu-pharm}[2018/06/11] +% \end{macrocode} +% The file defines the color scheme of the respective faculty. Note +% the the color definitions are in RGB, which makes the resulting +% files generally unsuitable for printing. +% \begin{macrocode} +\thesis@color@setup{ + links={HTML}{A0B9C5}, + tableEmph={HTML}{B0C3CF}, + tableOdd={HTML}{EFF3F6}, + tableEven={HTML}{D6E1E6}} +% \end{macrocode} +% The bibliography support is enabled. The |authoryear| citations +% are used and the bibliography is sorted by name, title, and year. +% \begin{macrocode} +\thesis@bibliography@setup{ + style=iso-authoryear, + sorting=nty} +\thesis@bibliography@load +% \end{macrocode} +% The file loads the following packages: +% \begin{itemize} +% \item\textsf{tikz} -- Used for dimension arithmetic. +% \item\textsf{geometry} -- Allows for modifications of the type +% area dimensions. +% \item\textsf{setspace} -- Used for setting space. +% \end{itemize} +% \begin{macrocode} +\thesis@require{tikz} +\thesis@require{geometry} +\thesis@require{setspace} +\geometry{top=25mm,bottom=20mm,left=25mm,right=25mm,includeheadfoot} + +% \end{macrocode} +% Enable the inclusion of the scanned assignment inside the digital +% version of the document. +% \begin{macrocode} +\thesis@blocks@assignment@hideIfDigital@false +% \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 roman +% in accordance with the formal requirements of the faculty. +% \begin{macrocode} +\def\thesis@blocks@frontMatter{% +\thesis@blocks@clear + \newgeometry{top=25mm, bottom=20mm, left=35mm, right=15mm, includeheadfoot} + \pagestyle{empty} + \parindent 1.5em + \setcounter{page}{1} + \pagenumbering{roman}} +% \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 +% formal requirements of the faculty. +% \begin{macrocode} +\def\thesis@blocks@mainMatter{% + \thesis@blocks@clear + \newgeometry{top=25mm,bottom=20mm,left=35mm, + right=15mm, includeheadfoot} + \setcounter{page}{1} + \pagenumbering{arabic} + \pagestyle{thesisheadings} + \parindent 1.5em + \onehalfspacing} +% \end{macrocode} +% \end{macro} +% Note that there is no direct support for the seminar paper and +% thesis proposal types. If you would like to change the contents +% of the preamble and the postamble, you should modify the +% |\thesis@blocks@preamble| and |\thesis@blocks@postamble| macros. +% +% All blocks within the autolayout preamble that are not defined +% within this file are defined in the +% \texttt{style/mu/fithesis-base.sty} file. +% \begin{macrocode} +\def\thesis@blocks@preamble{% + \thesis@blocks@coverMatter + \thesis@blocks@cover + \thesis@blocks@frontMatter + \thesis@blocks@titlePage + \thesis@blocks@seal + \thesis@blocks@bibEntry + \thesis@blocks@abstract + \thesis@blocks@bibEntryEn + \thesis@blocks@abstractEn + \thesis@blocks@assignment + \thesis@blocks@declaration + \thesis@blocks@thanks + \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/fithesis-base.sty} file. +% \begin{macrocode} +\def\thesis@blocks@postamble{% + \thesis@blocks@bibliography} +% \end{macrocode} diff --git a/Master/texmf-dist/source/latex/fithesis/style/mu/pharm.ins b/Master/texmf-dist/source/latex/fithesis/style/mu/pharm.ins new file mode 100644 index 00000000000..5699c6351bc --- /dev/null +++ b/Master/texmf-dist/source/latex/fithesis/style/mu/pharm.ins @@ -0,0 +1,3 @@ +\input ../../LICENSE +\generate{\file{fithesis-mu-pharm.sty}{\from{pharm.dtx}{}}} +\endbatchfile diff --git a/Master/texmf-dist/source/latex/fithesis/style/mu/phil.dtx b/Master/texmf-dist/source/latex/fithesis/style/mu/phil.dtx index 2c95f139672..3ce3eadfc8f 100644 --- a/Master/texmf-dist/source/latex/fithesis/style/mu/phil.dtx +++ b/Master/texmf-dist/source/latex/fithesis/style/mu/phil.dtx @@ -1,12 +1,19 @@ % \file{style/mu/fithesis-phil.sty} +% \changes{v1.0.0}{2021/02/21}{Files were renamed after +% breaking changes in package loading after PR 438 in \LaTeXe. [VN]} +% \changes{v1.0.0}{2021/03/19}{Updated urls to show the most recent +% requirements and recommendations used in preparation of the +% template. [TV]} % This is the style file for the theses written at the Faculty of % Arts at the Masaryk University in Brno. It has been prepared in % accordance with the formal requirements published at the website -% of the faculty\footnote{See \url{https://is.muni.cz/do/phil/P^^A -% racoviste/SO/vzory_praci/Vzor_bakalarske_prace.pdf}}. +% of the department of Slavonic Studies\footnote{See \url{https://^^A +% slavistika.phil.muni.cz/media/2109309/diplomove-prace-pokyny.pdf} +% and the thesis Word template \url{https://is.muni.cz/auth/do/phi^^A +% l/Pracoviste/SO/vzory_praci/sablonaDP-MUNI-ARTS-dipl-obor.dotx}}. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fithesis/style/mu/fithesis-phil}[2016/04/18] +\ProvidesPackage{fithesis/style/mu/fithesis-mu-phil}[2021/04/24] % \end{macrocode} % The file defines the color scheme of the respective faculty. Note % the the color definitions are in RGB, which makes the resulting @@ -18,20 +25,20 @@ tableOdd={HTML}{EBF6FA}, tableEven={HTML}{D0EBF5}} % \end{macrocode} -% The bibliography support is enabled. The |numeric| citations are -% used and the bibliography is sorted by name, title, and year. +% The bibliography support is enabled. The |iso-authoryear| citations +% are used and the bibliography is sorted by name, title, and year. % \begin{macrocode} \thesis@bibliography@setup{ style=iso-authoryear, sorting=nty} \thesis@bibliography@load % \end{macrocode} -% The style file configures the title page header to include the -% department and the field name. -% \begin{macrocode} -\thesis@blocks@titlePage@department@true -\thesis@blocks@titlePage@field@true -% \end{macrocode} +% \changes{v1.0.0}{2021/02/26}{^^A +% The \cs{ifthesis@blocks@titlePage@department@} conditional +% now defaults to \texttt{true}. [VN]} +% \changes{v1.0.0}{2021/02/26}{^^A +% The \cs{ifthesis@blocks@titlePage@field@} conditional +% now defaults to \texttt{true}. [VN]} % The style file parses the value of the |\thesis@department| macro % and recognizes the following divisions of the Faculty of Arts: % \begin{itemize} @@ -54,21 +61,12 @@ \def\thesis@departmentEn@name{\thesis@english@departmentName} \fi % \end{macrocode} -% \begin{macro}{\thesis@blocks@titlePage} -% The style file redefines the cover and title page footers to include the -% thesis advisor's name. -% \changes{v0.3.51} {2018/11/05}{Always typeset the name of the advisor -% on the title page for the Faculty of Arts at the Masaryk University -% in Brno, Czech Republic. [VN]} -% \begin{macrocode} -\def\thesis@blocks@titlePage@content{% - {\thesis@titlePage@Huge\bf\thesis@TeXtitle\par\vfil}\vskip 0.8in - {\thesis@titlePage@large\sc\thesis@@{typeName}\\[0.3in]} - {\thesis@titlePage@Large\bf\thesis@author} - {\thesis@titlePage@large\\[0.3in] - {\bf\thesis@@{advisorTitle}:} \thesis@advisor}} -% \end{macrocode} -% \end{macro} +% \changes{v1.0.0}{2021/04/23}{^^A +% The style files of the Faculty of Arts at the Masaryk University +% in Brno no longer redefine the +% \cs{thesis@blocks@titlePage@content} macro, which is no longer +% defined. [TV]} +% % Note that there is no direct support for the seminar paper and % thesis proposal types. If you would like to change the contents % of the preamble and the postamble, you should modify the @@ -77,22 +75,32 @@ % 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]} +% \changes{v1.0.0}{2021/04/24}{^^A +% Change \cs{thesis@facultyLogo}, +% \cs{thesis@blocks@facultyLogo@monochrome}, and +% \cs{thesis@blocks@facultyLogo@color} to use the new logotype +% of the Masaryk University in Brno in the correct size and +% localization. Add \cs{thesis@blocks@seal}. [VN]} % \begin{macrocode} \def\thesis@blocks@preamble{% \thesis@blocks@coverMatter \thesis@blocks@cover - \thesis@blocks@titlePage \thesis@blocks@frontMatter + \thesis@blocks@titlePage + \thesis@blocks@seal % \end{macrocode} % In KISK theses, the bibliographical entry, the abstract, and the % keywords will be included after the cover matter. +% \changes{v1.0.0}{2021/03/11}{Added conditional to add summary for +% doctoral theses. [TV]} % \begin{macrocode} \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 \thesis@blocks@thanks diff --git a/Master/texmf-dist/source/latex/fithesis/style/mu/phil.ins b/Master/texmf-dist/source/latex/fithesis/style/mu/phil.ins index 0f6b211ca3e..46fc767cdf9 100644 --- a/Master/texmf-dist/source/latex/fithesis/style/mu/phil.ins +++ b/Master/texmf-dist/source/latex/fithesis/style/mu/phil.ins @@ -1,3 +1,3 @@ \input ../../LICENSE -\generate{\file{fithesis-phil.sty}{\from{phil.dtx}{}}} +\generate{\file{fithesis-mu-phil.sty}{\from{phil.dtx}{}}} \endbatchfile 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 db7059fbec5..106fec51971 100644 --- a/Master/texmf-dist/source/latex/fithesis/style/mu/sci.dtx +++ b/Master/texmf-dist/source/latex/fithesis/style/mu/sci.dtx @@ -1,14 +1,18 @@ % \file{style/mu/fithesis-sci.sty} +% \changes{v1.0.0}{2021/02/21}{Files were renamed after +% breaking changes in package loading after PR 438 in \LaTeXe. [VN]} +% \changes{v1.0.0}{2021/03/19}{Updated urls to show the most recent +% requirements and recommendations used in preparation of the +% template. [TV]} % This is the style file for the theses written at the Faculty of % Science at the Masaryk University in Brno. It has been % prepared in accordance with the formal requirements published at % the website of the faculty\footnote{See -% \url{http://www.sci.muni.cz/NW/predpisy/od/OD-2014-05.pdf}, and -% \url{http://www.sci.muni.cz/cz/BcMgrStudium/Legislativa/Sablon^^A -% y}}. +% \url{https://is.muni.cz/auth/do/sci/normy/OD/OD-2019_3/OD_3_2019^^A +% _-_Pokyny_pro_vypracovani_bc._dipl._a_rigor.praci.pdf}}. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fithesis/style/mu/fithesis-sci}[2017/06/02] +\ProvidesPackage{fithesis/style/mu/fithesis-mu-sci}[2021/04/24] % \end{macrocode} % The file defines the color scheme of the respective faculty. Note % the the color definitions are in RGB, which makes the resulting @@ -20,437 +24,58 @@ tableOdd={HTML}{EDF7F1}, tableEven={HTML}{CCEDD8}} % \end{macrocode} -% The bibliography support is enabled. The |numeric| citations are -% used and the bibliography is sorted in citation order. +% The bibliography support is enabled. The |iso-numeric| citations +% are used and the bibliography is sorted in citation order. % \begin{macrocode} \thesis@bibliography@setup{ style=iso-numeric, sorting=none} \thesis@bibliography@load % \end{macrocode} -% The file uses Czech locale strings within the macros. -% \begin{macrocode} -\thesis@requireLocale{czech} -% \end{macrocode} -% \begin{macro}{\ifthesis@czech} -% The |\ifthesis@czech| \ldots |\else| \ldots |\fi| conditional is made -% available for testing, whether or not the current locale is Czech. % \changes{v0.3.45}{2017/05/23}{Defined the % \cs{ifthesis@czech} macro in % \texttt{style/mu/fithesis-sci.sty}. The patch was submitted by % Juraj Pálenik. [VN]} -% \begin{macrocode} -\def\ifthesis@czech{ - \expandafter\def\expandafter\@czech\expandafter{\string - \czech}% - \expandafter\expandafter\expandafter\def\expandafter - \expandafter\expandafter\@locale\expandafter\expandafter - \expandafter{\expandafter\string\csname\thesis@locale\endcsname}% - \expandafter\csname\expandafter i\expandafter f\ifx\@locale - \@czech - true% - \else - false% - \fi\endcsname} -\ifthesis@czech - \expandafter\expandafter\expandafter\let\expandafter\expandafter - \csname ifthesis@czech\endcsname\csname iftrue\endcsname -\else - \expandafter\expandafter\expandafter\let\expandafter\expandafter - \csname ifthesis@czech\endcsname\csname iffalse\endcsname -\fi -% \end{macrocode} -% The file recognizes the following options: \begin{itemize} -% \item\texttt{abstractonsinglepage} -- The abstracts are going -% to be typeset on a single page as opposed to being spread -% across several pages. This is the default for theses whose main -% locale is neither Czech nor English. -% \end{itemize} % \changes{v0.3.45}{2017/05/24}{Defined the % \texttt{abstractonsinglepage} option in % \texttt{style/mu/fithesis-sci.sty}. The patch was submitted by % Juraj Pálenik. [VN]} -% \begin{macrocode} -\newif\ifthesis@abstractonsinglepage@ -\DeclareOption{abstractonsinglepage}{\thesis@abstractonsinglepage@true} -\ifthesis@czech\else\ifthesis@english\else - \ExecuteOptions{abstractonsinglepage} -\fi\fi -\ProcessOptions* -% \end{macrocode} -% \end{macro} -% The file loads the following packages: -% \begin{itemize} -% \item\textsf{tikz} -- Used for dimension arithmetic. -% \item\textsf{changepage} -- Used for width adjustments. -% \end{itemize} -% \begin{macrocode} -\thesis@require{tikz} -\thesis@require{changepage} -% \end{macrocode} -% In case of rigorous and doctoral theses, the style file hides the -% thesis assignment in accordance with the formal requirements of -% the faculty. -% \begin{macrocode} -\ifx\thesis@type\thesis@bachelors\else -\ifx\thesis@type\thesis@masters\else - \thesis@blocks@assignment@false -\fi\fi -% \end{macrocode} -% Enable the inclusion of the scanned assignment inside the digital -% version of the document. -% \begin{macrocode} -\thesis@blocks@assignment@hideIfDigital@false -% \end{macrocode} -% \begin{macro}{\thesis@blocks@bibEntry} -% The |\thesis@blocks@bibEntry| macro typesets a bibliographical -% entry. Along with the macros required by the locale file -% interface, the locale files need to define the following macros: -% \begin{itemize} -% \item|\thesis@|\textit{locale}|@bib@title| -- The title of the -% entire block -% \item|\thesis@|\textit{locale}|@bib@author| -- The label of the -% author name entry -% \item|\thesis@|\textit{locale}|@bib@title| -- The label of the -% title name entry -% \item|\thesis@|\textit{locale}|@bib@programme| -- The label of -% the programme name entry -% \item|\thesis@|\textit{locale}|@bib@field| -- The label of the -% field of study name entry -% \item|\thesis@|\textit{locale}|@bib@advisor| -- The label of -% the advisor name entry -% \item|\thesis@|\textit{locale}|@bib@academicYear| -- The label -% of the academic year entry -% \item|\thesis@|\textit{locale}|@bib@pages| -- The label of the -% number of pages entry -% \item|\thesis@|\textit{locale}|@bib@keywords| -- The label of -% the keywords entry -% \end{itemize} +% \changes{v1.0.0}{2021/05/06}{Added redefinition of the conditionals +% to exclude the study programme and the study field from the title +% page. [TV]} +% \changes{v1.0.0}{2021/03/12}{^^A +% The style file of the Faculty of Science at the Masaryk +% University in Brno, Czech Republic no longer defines the +% \cs{ifthesis@czech}, \cs{thesis@blocks@bibEntry}, +% \cs{thesis@blocks@bibEntryCs}, \cs{thesis@blocks@bibEntryEn}, +% \cs{thesis@blocks@abstractCs} macros, no longer defines the +% \texttt{abstractCs}, \texttt{programmeCs}, \texttt{fieldCs}, +% \texttt{titleCs}, \texttt{keywordsCs}, \texttt{departmentCs}, +% \texttt{TeXkeywordsCs}, and \texttt{TeXtitleCs} extra data +% fields, no longer defines the \texttt{abstractonsinglepage} +% option, and no longer overrides the \cs{thesis@blocks@cover}, +% \cs{thesis@blocks@titlePage}, \cs{thesis@blocks@thanks}, and +% \cs{thesis@blocks@declaration} macros. [VN]} % \changes{v0.3.45}{2017/05/26}{Bibliographical entries in % \texttt{style/mu/fithesis-sci.sty} now face each other when the % main locale is either Czech or English. [VN]} -% \begin{macrocode} -\def\thesis@blocks@bibEntry{% - \begin{alwayssingle}% - % Clear only the right page, if the main locale is Czech. - \ifthesis@czech - \begingroup - \let\thesis@blocks@clear\thesis@blocks@clearRight - \fi - \chapter*{\thesis@@{bib@title}}% - \ifthesis@czech - \endgroup - \fi - {% Calculate the width of the columns - \let\@A\relax\newlength{\@A}\settowidth{\@A}{{% - \bf\thesis@@{bib@author}:}} - \let\@B\relax\newlength{\@B}\settowidth{\@B}{{% - \bf\thesis@@{bib@thesisTitle}:}} - \let\@C\relax\newlength{\@C}\settowidth{\@C}{{% - \bf\thesis@@{bib@programme}:}} - \let\@D\relax\newlength{\@D}\settowidth{\@D}{{% - \bf\thesis@@{bib@field}:}} - % Unless this is a rigorous thesis, we will be typesetting the - % name of the thesis advisor. - \let\@E\relax\newlength{\@E} - \ifx\thesis@type\thesis@rigorous - \setlength{\@E}{0pt}% - \else - \settowidth{\@E}{{\bf\thesis@@{bib@advisor}:}} - \fi - \let\@F\relax\newlength{\@F}\settowidth{\@F}{{% - \bf\thesis@@{bib@academicYear}:}} - \let\@G\relax\newlength{\@G}\settowidth{\@G}{{% - \bf\thesis@@{bib@pages}:}} - \let\@H\relax\newlength{\@H}\settowidth{\@H}{{% - \bf\thesis@@{bib@keywords}:}} - \let\@skip\relax\newlength{\@skip}\setlength{\@skip}{16pt} - \let\@left\relax\newlength{\@left}\pgfmathsetlength{\@left}{% - max(\@A,\@B,\@C,\@D,\@E,\@F,\@G,\@H)} - \let\@right\relax\newlength{\@right}\setlength{\@right}{% - \textwidth-\@left-\@skip} - % Typeset the table - \renewcommand{\arraystretch}{2} - \noindent\begin{thesis@newtable@old}% - {@{}p{\@left}@{\hskip\@skip}p{\@right}@{}} - \textbf{\thesis@@{bib@author}:} & - \noindent\parbox[t]{\@right}{ - \thesis@author\\ - \thesis@@{facultyName}, - \thesis@@{universityName}\\ - \thesis@department@name - }\\ - \textbf{\thesis@@{bib@thesisTitle}:} - & \thesis@title \\ - \textbf{\thesis@@{bib@programme}:} - & \thesis@programme \\ - \textbf{\thesis@@{bib@field}:} - & \thesis@field@name \\ - % Unless this is a rigorous thesis, typeset the name of the - % thesis advisor. - \ifx\thesis@type\thesis@rigorous\else - \textbf{\thesis@@{bib@advisor}:} - & \thesis@advisor \\ - \fi - \textbf{\thesis@@{bib@academicYear}:} - & \thesis@academicYear \\ - \textbf{\thesis@@{bib@pages}:} - & \thesis@pages@preamble{} + \thesis@pages \\ - \textbf{\thesis@@{bib@keywords}:} - & \thesis@TeXkeywords \\ - \end{thesis@newtable@old}} - \end{alwayssingle}} -% \end{macrocode} -% \end{macro}\begin{macro}{\thesis@blocks@bibEntryEn} -% The |\thesis@blocks@bibEntryEn| macro typesets a bibliographical -% entry in English unless the current locale is English. -% \begin{macrocode} -\def\thesis@blocks@bibEntryEn{% - \ifthesis@english\else - {\thesis@selectLocale{english} - \begin{alwayssingle} - \chapter*{\thesis@english@bib@title}% - {% Calculate the width of the columns - \let\@A\relax\newlength{\@A}\settowidth{\@A}{{% - \bf\thesis@english@bib@author:}} - \let\@B\relax\newlength{\@B}\settowidth{\@B}{{% - \bf\thesis@english@bib@thesisTitle:}} - \let\@C\relax\newlength{\@C}\settowidth{\@C}{{% - \bf\thesis@english@bib@programme:}} - \let\@D\relax\newlength{\@D}\settowidth{\@D}{{% - \bf\thesis@english@bib@field:}} - % Unless this is a rigorous thesis, we will be typesetting - % the name of the thesis advisor. - \let\@E\relax\newlength{\@E} - \ifx\thesis@type\thesis@rigorous - \setlength{\@E}{0pt}% - \else - \settowidth{\@E}{{\bf\thesis@english@bib@advisor:}} - \fi - \let\@F\relax\newlength{\@F}\settowidth{\@F}{{% - \bf\thesis@english@bib@academicYear:}} - \let\@G\relax\newlength{\@G}\settowidth{\@G}{{% - \bf\thesis@english@bib@pages:}} - \let\@H\relax\newlength{\@H}\settowidth{\@H}{{% - \bf\thesis@english@bib@keywords:}} - \let\@skip\relax\newlength{\@skip}\setlength{\@skip}{16pt} - \let\@left\relax\newlength{\@left}\pgfmathsetlength{\@left}{% - max(\@A,\@B,\@C,\@D,\@E,\@F,\@G,\@H)} - \let\@right\relax\newlength{\@right}\setlength{\@right}{% - \textwidth-\@left-\@skip} - % Typeset the table - \renewcommand{\arraystretch}{2} - \noindent\begin{thesis@newtable@old}% - {@{}p{\@left}@{\hskip\@skip}p{\@right}@{}} - \textbf{\thesis@english@bib@author:} & - \noindent\parbox[t]{\@right}{ - \thesis@author\\ - \thesis@english@facultyName, - \thesis@english@universityName\\ - \thesis@departmentEn@name - }\\ - \textbf{\thesis@english@bib@thesisTitle:} - & \thesis@titleEn \\ - \textbf{\thesis@english@bib@programme:} - & \thesis@programmeEn \\ - \textbf{\thesis@english@bib@field:} - & \thesis@fieldEn@name \\ - % Unless this is a rigorous thesis, typeset the name of the - % thesis advisor. - \ifx\thesis@type\thesis@rigorous\else - \textbf{\thesis@english@bib@advisor:} - & \thesis@advisor \\ - \fi - \textbf{\thesis@english@bib@academicYear:} - & \thesis@academicYear \\ - \textbf{\thesis@english@bib@pages:} - & \thesis@pages@preamble{} + \thesis@pages \\ - \textbf{\thesis@english@bib@keywords:} - & \thesis@TeXkeywordsEn \\ - \end{thesis@newtable@old}} - \end{alwayssingle} - }% - \fi} -% \end{macrocode} -% \end{macro}\begin{macro}{\thesis@blocks@abstractCs} -% The |\thesis@blocks@abstractCs| macro typesets the -% abstract in Czech. If the current locale is Czech, the -% macro produces no output. The following extra data field is -% defined for the macro: \begin{itemize} -% \item|abstractCs| -- the Czech title of the thesis used for the -% typesetting. This extra data field will expand to -% |\thesis@abstract| if the current locale of the thesis -% is Czech. -% \end{itemize} % \changes{v0.3.45}{2017/05/28}{Defined the % \cs{thesis@blocks@abstractCs} macro in % \texttt{style/mu/fithesis-sci.sty}. The patch was submitted by % Juraj Pálenik. [VN]} -% \begin{macrocode} -\thesis@def@extra[{ - \ifthesis@czech - \thesis@abstract - \else - \thesis@placeholder@extra@abstractCs - \fi -}]{abstractCs} -\def\thesis@blocks@abstractCs{% - \ifthesis@czech\else - {\thesis@selectLocale{czech}% - \begin{alwayssingle}% - \ifthesis@abstractonsinglepage@ - \thesis@blocks@clear - \else - % Start the new chapter without clearing the left page. - \thesis@blocks@clearRight - \fi - {\let\thesis@blocks@clear\relax - \chapter*{\thesis@czech@abstractTitle}% - \thesis@extra@abstractCs}% - \par\vfil\null - \end{alwayssingle}}% - \fi} -% \end{macrocode} -% \end{macro}\begin{macro}{\thesis@blocks@bibEntryCs} -% The |\thesis@blocks@bibEntryCs| macro typesets a bibliographical -% entry in English unless the current locale is Czech. The -% macro uses the following extra data fields:\begin{itemize} -% \item|programmeCs| -- the Czech name of the author's study -% programme. This extra data field will expand to -% |\thesis@programme| if the current locale of the thesis -% is Czech. -% \item|fieldCs| -- the Czech name of the author's field of -% study. This extra data field will expand to -% |\thesis@field@name| if the current locale of the thesis -% is Czech. -% \item|keywordsCs| -- the Czech keywords of the thesis. -% This extra data field will expand to |\thesis@keywords| if -% the current locale of the thesis is Czech. -% \item|TeXkeywordsCs| -- the Czech \TeX{} keywords of the thesis. -% This extra data field will expand to |\thesis@TeXkeywords| if -% the current locale of the thesis is Czech. -% \end{itemize} % \changes{v0.3.45}{2017/05/21}{Defined the % \cs{thesis@blocks@bibEntryCs} macro in % \texttt{style/mu/fithesis-sci.sty}. The patch was submitted by % Juraj Pálenik. [VN]} -% \begin{macrocode} -\thesis@def@extra[{ - \ifthesis@czech - \thesis@programme - \else - \thesis@placeholder@extra@programmeCs - \fi -}]{programmeCs} -\thesis@def@extra[{ - \ifthesis@czech - \thesis@field@name - \else - \thesis@placeholder@extra@fieldCs - \fi -}]{fieldCs} -\thesis@def@extra[{ - \ifthesis@czech - \thesis@title - \else - \thesis@placeholder@extra@titleCs - \fi -}]{titleCs} -\thesis@def@extra[{ - \ifthesis@czech - \thesis@keywords - \else - \thesis@placeholder@extra@keywordsCs - \fi -}]{keywordsCs} -\thesis@def@extra[{ - \ifthesis@czech - \thesis@TeXkeywords - \else - \thesis@placeholder@extra@keywordsCs - \fi -}]{TeXkeywordsCs} -% \end{macrocode} -% \changes{v0.3.45}{2017/05/26}{Bibliographical entries in -% \texttt{style/mu/fithesis-sci.sty} now face each other when the -% main locale is either Czech or English. [VN]} -% \begin{macrocode} -\def\thesis@blocks@bibEntryCs{% - \ifthesis@czech\else - {\thesis@selectLocale{czech} - \begin{alwayssingle} - % Clear only the right page, if the main locale is English. - \ifthesis@english - \begingroup - \let\thesis@blocks@clear\thesis@blocks@clearRight - \fi - \chapter*{\thesis@czech@bib@title}% - \ifthesis@english - \endgroup - \fi - {% Calculate the width of the columns - \let\@A\relax\newlength{\@A}\settowidth{\@A}{{% - \bf\thesis@czech@bib@author:}} - \let\@B\relax\newlength{\@B}\settowidth{\@B}{{% - \bf\thesis@czech@bib@thesisTitle:}} - \let\@C\relax\newlength{\@C}\settowidth{\@C}{{% - \bf\thesis@czech@bib@programme:}} - \let\@D\relax\newlength{\@D}\settowidth{\@D}{{% - \bf\thesis@czech@bib@field:}} - % Unless this is a rigorous thesis, we will be typesetting - % the name of the thesis advisor. - \let\@E\relax\newlength{\@E} - \ifx\thesis@type\thesis@rigorous - \setlength{\@E}{0pt}% - \else - \settowidth{\@E}{{\bf\thesis@czech@bib@advisor:}} - \fi - \let\@F\relax\newlength{\@F}\settowidth{\@F}{{% - \bf\thesis@czech@bib@academicYear:}} - \let\@G\relax\newlength{\@G}\settowidth{\@G}{{% - \bf\thesis@czech@bib@pages:}} - \let\@H\relax\newlength{\@H}\settowidth{\@H}{{% - \bf\thesis@czech@bib@keywords:}} - \let\@skip\relax\newlength{\@skip}\setlength{\@skip}{16pt} - \let\@left\relax\newlength{\@left}\pgfmathsetlength{\@left}{% - max(\@A,\@B,\@C,\@D,\@E,\@F,\@G,\@H)} - \let\@right\relax\newlength{\@right}\setlength{\@right}{% - \textwidth-\@left-\@skip} - % Typeset the table - \renewcommand{\arraystretch}{2} - \noindent\begin{thesis@newtable@old}% - {@{}p{\@left}@{\hskip\@skip}p{\@right}@{}} - \textbf{\thesis@czech@bib@author:} & - \noindent\parbox[t]{\@right}{ - \thesis@author\\ - \thesis@czech@facultyName, - \thesis@czech@universityName\\ - \thesis@extra@departmentCs - }\\ - \textbf{\thesis@czech@bib@thesisTitle:} - & \thesis@extra@titleCs \\ - \textbf{\thesis@czech@bib@programme:} - & \thesis@extra@programmeCs \\ - \textbf{\thesis@czech@bib@field:} - & \thesis@extra@fieldCs \\ - % Unless this is a rigorous thesis, typeset the name of the - % thesis advisor. - \ifx\thesis@type\thesis@rigorous\else - \textbf{\thesis@czech@bib@advisor:} - & \thesis@advisor \\ - \fi - \textbf{\thesis@czech@bib@academicYear:} - & \thesis@academicYear \\ - \textbf{\thesis@czech@bib@pages:} - & \thesis@pages@preamble{} + \thesis@pages \\ - \textbf{\thesis@czech@bib@keywords:} - & \thesis@extra@TeXkeywordsCs \\ - \end{thesis@newtable@old}} - \end{alwayssingle} - }% - \fi} +% Enable the inclusion of the scanned assignment inside the digital +% version of the document. +% \begin{macrocode} +\thesis@blocks@titlePage@field@false +\thesis@blocks@titlePage@programme@false + +\thesis@blocks@assignment@hideIfDigital@false % \end{macrocode} -% \end{macro}\begin{macro}{\thesis@blocks@frontMatter} +% \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 @@ -463,181 +88,49 @@ \setcounter{page}{1} \pagenumbering{roman}} % \end{macrocode} -% \end{macro}\begin{macro}{\thesis@blocks@cover} -% The |\thesis@blocks@cover| macro typesets the thesis -% cover. The following extra data field is defined for the macro: -% \begin{itemize} -% \item|departmentCs| -- the Czech name of the department at -% which the thesis is being written. This extra data field will -% expand to |\thesis@department@name| if the main locale of the -% thesis is Czech. -% \end{itemize} -% \begin{macrocode} -\thesis@def@extra[{ - \ifthesis@czech - \thesis@department@name - \else - \thesis@placeholder@extra@departmentCs - \fi -}]{departmentCs} -\def\thesis@blocks@cover{{% - \thesis@selectLocale{czech} - \ifthesis@cover@ - \thesis@blocks@clear - \begin{alwayssingle} - \begin{center} - {\sc\thesis@titlePage@LARGE\thesis@czech@universityName\\% - \thesis@titlePage@Large\thesis@czech@facultyName\\[0.3em]% - \thesis@titlePage@normalsize\thesis@extra@departmentCs} - \vfill - {\bf\thesis@titlePage@Huge\thesis@czech@typeName} - \vfill - {\thesis@titlePage@large\thesis@place - \ \thesis@year\hfill\thesis@author} - \end{center} - \end{alwayssingle} - \fi}} -% \end{macrocode} -% \end{macro}\begin{macro}{\thesis@blocks@titlePage} -% The |\thesis@blocks@titlePage| macro typesets the thesis -% title page. Depending on the value of the |\ifthesis@color@| -% conditional, the faculty logo is loaded from either -% |\thesis@logopath|, if \texttt{false}, or from -% |\thesis@logopath color/|, if \texttt{true}. -% The following extra data field is defined for the macro: -% \begin{itemize} -% \item|TeXtitleCs| -- the Czech title of the thesis used for the -% typesetting. This extra data field will expand to -% |\thesis@TeXtitle| if the main locale of the thesis is Czech. -% \end{itemize} -% \begin{macrocode} -\thesis@def@extra[{ - \ifthesis@czech - \thesis@TeXtitle - \else - \thesis@placeholder@extra@titleCs - \fi -}]{TeXtitleCs} -\def\thesis@blocks@titlePage{{% - \thesis@blocks@clear - \thesis@selectLocale{czech} - \begin{alwayssingle} - % The top of the page - \begin{adjustwidth}{-12mm}{} - \begin{minipage}{30mm} - \thesis@blocks@universityLogo@color[width=30mm] - \end{minipage}\begin{minipage}{89mm} - \begin{center} - {\sc\thesis@titlePage@LARGE\thesis@czech@universityName\\% - \thesis@titlePage@Large\thesis@czech@facultyName\\[0.3em]% - \thesis@titlePage@normalsize\thesis@extra@departmentCs} - \rule{\textwidth}{2pt}\vspace*{2mm} - \end{center} - \end{minipage}\begin{minipage}{30mm} - \thesis@blocks@facultyLogo@color[width=30mm] - \end{minipage} - \end{adjustwidth} - % The middle of the page - \vfill - \parbox\textwidth{% Prevent vfills from squashing the leading - \bf\thesis@titlePage@Huge\thesis@extra@TeXtitleCs} - {\thesis@titlePage@Huge\\[0.8em]} - {\thesis@titlePage@large\thesis@czech@typeName\\[1em]} - {\bf\thesis@titlePage@LARGE\thesis@author\\} - \vfill\noindent - % The bottom of the page - {\bf\thesis@titlePage@normalsize - % Unless this is a rigorous thesis, typeset the name of the - % thesis advisor. - \ifx\thesis@type\thesis@rigorous\else - \thesis@czech@advisorTitle: \thesis@advisor\hfill - \fi - \thesis@place\ \thesis@year} - \end{alwayssingle}}} -% \end{macrocode} -% \end{macro}\begin{macro}{\thesis@blocks@thanks} -% The |\thesis@blocks@thanks| macro typesets the -% acknowledgements, if the |\thesis@thanks| macro is -% defined. Otherwise, the macro produces no output. -% As per the faculty requirements, the acknowledgements are -% positioned at the top of the page. +% \end{macro} +% \changes{v1.0.0}{2018/11/18}{^^A +% The \cs{bfseries} command switches to the sans serif typeface +% and to the secondary color in the style files of the Masaryk +% University in Brno, Czech Republic.} % \changes{v0.3.45}{2017/05/24}{Redefined the % \cs{thesis@blocks@thanks} and \cs{thesis@blocks@declaration} % macros in \texttt{style/mu/fithesis-sci.sty}. The patch was % submitted by Juraj Pálenik. [VN]} -% \begin{macrocode} -\def\thesis@blocks@thanks{% - \thesis@blocks@clear - \ifx\thesis@thanks\undefined\else - \begin{alwayssingle}% - \chapter*{\thesis@@{thanksTitle}}% - \leavevmode\thesis@thanks - \end{alwayssingle}% - \fi} -% \end{macrocode} -% \end{macro}\begin{macro}{\thesis@blocks@declaration} -% The |\thesis@blocks@declaration| macro typesets the declaration -% text. Unlike the generic |\thesis@blocks@declaration| macro from -% the \texttt{style/mu/fithesis-sci.sty} file, this definition -% includes the date and a blank line for the author's signature, as -% per the requirements of the faculty. -% \begin{macrocode} -\def\thesis@blocks@declaration{% - \begin{alwayssingle}% - \leavevmode\vfill - % Start the new chapter without clearing any page. - {\let\thesis@blocks@clear\relax - \chapter*{\thesis@@{declarationTitle}}}% - \thesis@declaration - \vskip 2cm% - {\let\@A\relax\newlength{\@A} - \settowidth{\@A}{\thesis@@{authorSignature}} - \setlength{\@A}{\@A+1cm} - \noindent\thesis@place, \thesis@@{formattedDate}\hfill - \begin{minipage}[t]{\@A}% - \centering\rule{\@A}{1pt}\\ - \thesis@@{authorSignature}\par - \end{minipage}} - \end{alwayssingle}} -% \end{macrocode} -% \end{macro} -% Note that there is no direct support for the seminar paper and -% thesis proposal types. If you would like to change the contents -% of the preamble and the postamble, you should modify the -% |\thesis@blocks@preamble| and |\thesis@blocks@postamble| macros. % % 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. The entire front matter -% is typeset as though the locale were Czech in accordance with the -% formal requirements of the faculty. +% \texttt{style/mu/fithesis-base.sty} file. +% \changes{v1.0.0}{2021/03/22}{Reorganised the blocks to fit the +% faculty's requirements. [TV]} +% \changes{v1.0.0}{2021/04/24}{^^A +% Change \cs{thesis@facultyLogo}, +% \cs{thesis@blocks@facultyLogo@monochrome}, and +% \cs{thesis@blocks@facultyLogo@color} to use the new logotype +% of the Masaryk University in Brno in the correct size and +% localization. Add \cs{thesis@blocks@seal}. [VN]} % \begin{macrocode} \def\thesis@blocks@preamble{ \thesis@blocks@coverMatter \thesis@blocks@cover \thesis@blocks@frontMatter \thesis@blocks@titlePage - \thesis@blocks@clearRight - \thesis@blocks@bibEntryCs + \thesis@blocks@seal + \ifx\thesis@type\thesis@proposal + \thesis@blocks@toc + \else + \thesis@blocks@seal \thesis@blocks@bibEntry \thesis@blocks@bibEntryEn - \thesis@blocks@abstractCs - \ifthesis@abstractonsinglepage@ - \begingroup - \let\clearpage\relax - \fi - \thesis@blocks@abstract - \thesis@blocks@abstractEn - \ifthesis@abstractonsinglepage@ - \endgroup - \fi - \thesis@blocks@assignment - {\thesis@selectLocale{czech}% - \thesis@blocks@thanks - \thesis@blocks@declaration - \thesis@blocks@clear - \pagestyle{plain}% - \thesis@blocks@tables}} + \thesis@blocks@clear + \thesis@blocks@abstract + \thesis@blocks@clearRight + \thesis@blocks@abstractEn + \thesis@blocks@assignment + \thesis@blocks@thanks + \thesis@blocks@declaration + \thesis@blocks@tables + \fi} \def\thesis@blocks@postamble{% \thesis@blocks@bibliography} % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/fithesis/style/mu/sci.ins b/Master/texmf-dist/source/latex/fithesis/style/mu/sci.ins index 2911d8b6e81..17d41cc9c0b 100644 --- a/Master/texmf-dist/source/latex/fithesis/style/mu/sci.ins +++ b/Master/texmf-dist/source/latex/fithesis/style/mu/sci.ins @@ -1,3 +1,3 @@ \input ../../LICENSE -\generate{\file{fithesis-sci.sty}{\from{sci.dtx}{}}} +\generate{\file{fithesis-mu-sci.sty}{\from{sci.dtx}{}}} \endbatchfile |