From 7ebcd32d958e30ae672917a7bc4219632e8181f1 Mon Sep 17 00:00:00 2001
From: witiko <witiko@gmail.com>
Date: Sun, 12 Apr 2015 17:14:37 +0200
Subject: [PATCH] Finalized the `fi.sty` and `sci.sty` styles.

The `\thesis@blocks@titlePage` is no longer defined in `mu/base.sty`,
but in `mu/fi.sty` instead. In case of a rigorous thesis, an
advisor signature field is added to the title page.
---
 example.tex        |  2 +-
 fithesis.dtx       |  2 +-
 locale/czech.dtx   | 16 +++++++++-----
 locale/english.dtx |  6 +++---
 locale/slovak.dtx  | 19 +++++++++++------
 style/mu/base.dtx  | 32 ++--------------------------
 style/mu/fi.dtx    | 53 ++++++++++++++++++++++++++++++++++++++++++++++
 style/mu/sci.dtx   |  4 ++--
 8 files changed, 85 insertions(+), 49 deletions(-)

diff --git a/example.tex b/example.tex
index a4f3ae7..c9591a7 100644
--- a/example.tex
+++ b/example.tex
@@ -1,7 +1,7 @@
 \documentclass[color,cover]{fithesis3}
 \usepackage[utf8]{inputenc}
 \usepackage[slovak]{babel}
-\thesissetup{basepath=.}
+\thesissetup{basepath=.,type=r}
 \begin{document}
   Ahoj všetci!
 \end{document}
diff --git a/fithesis.dtx b/fithesis.dtx
index 724da3e..3892ebb 100644
--- a/fithesis.dtx
+++ b/fithesis.dtx
@@ -68,7 +68,7 @@
 %<*class>
 \NeedsTeXFormat{LaTeX2e}
 % \fi
-\def\thesis@version{2015/04/11 v0.3.09 fithesis3 MU thesis class}
+\def\thesis@version{2015/04/12 v0.3.09 fithesis3 MU thesis class}
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
diff --git a/locale/czech.dtx b/locale/czech.dtx
index e631b00..a6debac 100644
--- a/locale/czech.dtx
+++ b/locale/czech.dtx
@@ -2,14 +2,14 @@
 % This is the base file of the Czech locale. It defines all the
 % private macros mandated by the locale file interface.
 % \begin{macro}{\thesis@gender@koncovka}
-% The locale file defines the |\thesis@gender@koncovka| macro,
+% The locale file also defines the |\thesis@gender@koncovka| macro,
 % which expands to the correct verb ending based on the value of
 % the |\thesis@ifwoman| macro and the |\thesis@typeName@akuzativ|
 % containing the accusative case of the thesis type name.
 % \end{macro}\iffalse
 %<*base>
 % \fi\begin{macrocode}
-\ProvidesFile{fithesis3/locale/czech.def}[2015/04/08]
+\ProvidesFile{fithesis3/locale/czech.def}[2015/04/12]
 
 % Symbolický odkaz na anglický překlad
 \input{\thesis@localepath english.def}
@@ -141,17 +141,22 @@
 % It replaces the |\thesis@facultyName| placeholder with the
 % correct value and updates the |\thesis@placeholders@assignment|
 % and |\thesis@declaration| private macros in accordance with the
-% requirements of the faculty.
+% requirements of the faculty. The file also defines the
+% |\thesis@advisorSignature| macro required by the
+% |\thesis@titlePage| block defined within the
+% \texttt{style/mu/fi.sty} style file.
 % \iffalse
 %<*mu/fi>
 % \fi\begin{macrocode}
-\ProvidesFile{fithesis3/locale/mu/fi/czech.def}[2015/04/08]
+\ProvidesFile{fithesis3/locale/mu/fi/czech.def}[2015/04/12]
 \def\thesis@facultyName{Fakulta informatiky}
 
 % Zástupné texty
 \def\thesis@placeholders@assignment{MĂ­sto tohoto listu vloĹľte
   kopie oficiálního podepsaného zadání práce a prohlášení
   autora školního díla.}
+
+% OstatnĂ­
 \def\thesis@declaration{%
   Prohlašuji, že tato \thesis@lower{typeName} je mým původním
   autorským dílem, které jsem vypracoval\thesis@gender@koncovka\ 
@@ -159,6 +164,7 @@
   při vypracování používal\thesis@gender@koncovka\ nebo z~nich
   čerpal\thesis@gender@koncovka, v~práci řádně cituji s~uvedením
   úplného odkazu na příslušný zdroj.}
+\def\thesis@advisorSignature{Podpis vedoucĂ­ho}
 %    \end{macrocode}\iffalse
 %</mu/fi>
 % \fi\file{locale/mu/phil/czech.def}
@@ -199,7 +205,7 @@
 % \iffalse
 %<*mu/sci>
 % \fi\begin{macrocode}
-\ProvidesFile{fithesis3/locale/mu/sci/czech.def}[2015/04/10]
+\ProvidesFile{fithesis3/locale/mu/sci/czech.def}[2015/04/12]
 
 % Zástupné texty
 \def\thesis@facultyName{Přírodovědecká fakulta}
diff --git a/locale/english.dtx b/locale/english.dtx
index eecc717..32529a6 100644
--- a/locale/english.dtx
+++ b/locale/english.dtx
@@ -6,7 +6,7 @@
 % \iffalse
 %<*base-shared>
 % \fi\begin{macrocode}
-\ProvidesFile{fithesis3/locale/base.def}[2015/04/10]
+\ProvidesFile{fithesis3/locale/base.def}[2015/04/12]
 
 % Placeholders
 \def\thesis@placeholders@titleEn{Thesis Title}
@@ -29,8 +29,8 @@
 \def\thesis@keywordsTitleEn{Keywords}
 \def\thesis@thanksTitleEn{Acknowledgement}
 \def\thesis@declarationTitleEn{Declaration}
-\def\thesis@winterEn{Winter}
-\def\thesis@summerEn{Summer}
+\def\thesis@winterEn{Spring}
+\def\thesis@summerEn{Fall}
 \def\thesis@semesterEn{\thesis@season\ \thesis@year}
 \def\thesis@typeNameEn{%
   \ifx\thesis@type\thesis@bachelors%
diff --git a/locale/slovak.dtx b/locale/slovak.dtx
index f42dc5b..5e9230c 100644
--- a/locale/slovak.dtx
+++ b/locale/slovak.dtx
@@ -6,8 +6,7 @@
 % \begin{macro}{\thesis@gender@koncovka}
 % The locale file defines the |\thesis@gender@koncovka| macro,
 % which expands to the correct verb ending based on the value of
-% the |\thesis@ifwoman| macro and the |\thesis@typeName@akuzativ|
-% containing the accusative case of the thesis type name.
+% the |\thesis@ifwoman| macro.
 % \end{macro}\iffalse
 %<*base>
 % \fi\begin{macrocode}
@@ -150,11 +149,14 @@
 % from the respective Czech locale file.
 % It also updates the |\thesis@placeholders@assignment| and
 % |\thesis@declaration| private macros in accordance with the
-% requirements of the faculty.
+% requirements of the faculty. The file also defines the
+% |\thesis@advisorSignature| macro required by the
+% |\thesis@titlePage| block defined within the
+% \texttt{style/mu/fi.sty} style file.
 % \iffalse
 %<*mu/fi>
 % \fi\begin{macrocode}
-\ProvidesFile{fithesis3/locale/mu/fi/slovak.def}[2015/04/08]
+\ProvidesFile{fithesis3/locale/mu/fi/slovak.def}[2015/04/12]
 
 % SymbolickĂ˝ odkaz na ÄŤeskĂ˝ preklad
 \input{\thesis@localepath mu/fi/czech.def}
@@ -163,6 +165,8 @@
 \def\thesis@assignment{Namiesto tejto stránky vložte kópiu
   oficiálneho podpísaného zadania práce a prehlásenie autora
   školského diela.}
+
+% RĂ´zne
 \def\thesis@declaration{%
   Prehlasujem, že táto \thesis@lower{typeName} je mojím pôvodným
   autorským dielom, ktoré som vypracoval\thesis@gender@koncovka\ 
@@ -170,6 +174,7 @@
   vypracovaní používal\thesis@gender@koncovka\ alebo z~nich
   čerpal\thesis@gender@koncovka, v~práci riadne citujem
   s~uvedením úplného odkazu na príslušný zdroj.}
+\def\thesis@advisorSignature{Podpis vedĂşceho}
 %    \end{macrocode}\iffalse
 %</mu/fi>
 % \fi\file{locale/mu/phil/slovak.def}
@@ -204,8 +209,8 @@
 % This is the Slovak locale file specific to the Faculty of
 % Science at the Masaryk University in Brno.
 % It defines the private macros required by the
-% |\thesis@blocks@bibEntry| block defined within the
-% \texttt{style/mu/sci.sty} style file.
+% |\thesis@blocks@bibEntry| block
+% defined within the \texttt{style/mu/sci.sty} style file.
 % It also replaces the |\thesis@facultyName| and
 % |\thesis@placeholders@department| placeholders with the
 % correct value. The redefinitions of the |\thesis@abstractTitle|
@@ -217,7 +222,7 @@
 % \iffalse
 %<*mu/sci>
 % \fi\begin{macrocode}
-\ProvidesFile{fithesis3/locale/mu/sci/slovak.def}[2015/04/08]
+\ProvidesFile{fithesis3/locale/mu/sci/slovak.def}[2015/04/12]
 
 %% SymbolickĂ˝ odkaz na ÄŤeskĂ˝ preklad
 \input{\thesis@localepath mu/sci/czech.def}
diff --git a/style/mu/base.dtx b/style/mu/base.dtx
index 3b90540..6a8b28e 100644
--- a/style/mu/base.dtx
+++ b/style/mu/base.dtx
@@ -8,7 +8,7 @@
 % \texttt{style/base.tex}, regardless of the
 % value of the |\thesis@style| macro.
 %    \begin{macrocode}
-\ProvidesPackage{fithesis3/style/mu/base}[2015/04/08]
+\ProvidesPackage{fithesis3/style/mu/base}[2015/04/12]
 \NeedsTeXFormat{LaTeX2e}
 %    \end{macrocode}
 % The file recognizes the following options: \begin{itemize}
@@ -156,41 +156,13 @@
       {\sc \thesis@typeName}\\[0.3in]
       {\thesis@titlePage@Large\bf\thesis@author}
       \par\vfill
-      {\thesis@titlePage@large\thesis@place, \thesis@year}
+      {\thesis@titlePage@large\thesis@place, \thesis@semester}
       \end{center}
     \end{alwayssingle}
     \ifthesis@twoside\@twosidetrue\fi % Re-enable twoside
     \thesis@blocks@clear
   \fi}
 %    \end{macrocode}
-% \end{macro}\begin{macro}{\thesis@blocks@titlePage}
-% The |\thesis@blocks@titlePage| private macro typesets the thesis
-% title page. The title page is similar to the cover except for the
-% fact that if color typesetting is enables, the logo is loaded
-% from the |\thesis@logopath color/| directory instead of
-% |\thesis@logopath|.
-% \begin{macrocode}
-\def\thesis@blocks@titlePage{%
-  \thesis@blocks@clear
-  \begin{alwayssingle}
-    \thispagestyle{empty}
-    \begin{center}
-    {\sc\thesis@universityName\\\thesis@facultyName}
-    \vskip 1.4em
-    \edef\thesis@logopath@color{\thesis@logopath\ifthesis@color color/\fi}
-    \includegraphics[width=40mm]{%
-      \thesis@logopath@color\thesis@facultyLogo}\\[0.4in]
-    \let\footnotesize\small
-    \let\footnoterule\relax{}
-    {\thesis@titlePage@Huge\bf\thesis@TeXtitle\par\vfil}\vskip 0.8in
-    {\sc \thesis@typeName}\\[0.3in]
-    {\thesis@titlePage@Large\bf\thesis@author}
-    \par\vfill
-    {\thesis@titlePage@large\thesis@place, \thesis@year}
-    \end{center}
-  \end{alwayssingle}
-  \thesis@blocks@clear}
-%    \end{macrocode}
 % \end{macro}\begin{macro}{\thesis@blocks@tables}
 % The |\thesis@blocks@tables| private macro typesets the table of
 % contents and optionally the |\listoftables| and the
diff --git a/style/mu/fi.dtx b/style/mu/fi.dtx
index d18ed82..d602b5e 100644
--- a/style/mu/fi.dtx
+++ b/style/mu/fi.dtx
@@ -6,7 +6,60 @@
 % \url{https://www.fi.muni.cz/docs/BP_DP_na_FI.pdf}}.
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{fithesis3/style/mu/fi}[2015/04/12]
 %    \end{macrocode}
+% \begin{macro}{\thesis@blocks@titlePage}
+% The |\thesis@blocks@titlePage| private macro typesets the thesis
+% title page. Along with the macros required by the
+% locale file interface, the locale files need to define the
+% following private macros:
+% \begin{itemize}
+%   \item\DescribeMacro{\thesis@advisorSignature}%
+%     |\thesis@advisorSignature| -- The label of the advisor
+%     signature field typeset in the case of a rigorous thesis
+% \end{itemize}
+% \begin{macrocode}
+\def\thesis@blocks@titlePage{%
+  \thesis@blocks@clear
+  \begin{alwayssingle}
+    \thispagestyle{empty}
+    \begin{center}
+    {\thesis@titlePage@normalsize\sc\thesis@universityName\\%
+       \thesis@facultyName}
+    \vskip 1.4em
+    \edef\thesis@logopath@color{\thesis@logopath\ifthesis@color color/\fi}
+    \includegraphics[width=40mm]{%
+      \thesis@logopath@color\thesis@facultyLogo}\\[0.4in]
+    \let\footnotesize\small
+    \let\footnoterule\relax{}
+    {\thesis@titlePage@Huge\bf\thesis@TeXtitle\par\vfil}\vskip 0.8in
+    {\thesis@titlePage@normalsize\sc\thesis@typeName\\[0.3in]}
+    {\thesis@titlePage@Large\bf\thesis@author}
+    % If this is a rigorous thesis, typeset the name of the
+    % thesis advisor.
+    \ifx\thesis@type\thesis@rigorous%
+      {\thesis@titlePage@large\\[0.3in]
+        {\bf\thesis@advisorTitle:} \thesis@advisor}
+    \fi%
+    \par\vfill
+    {\thesis@titlePage@large\thesis@place, \thesis@semester
+    % If this is a rigorous thesis, create space for the advisor's
+    % signature
+    \ifx\thesis@type\thesis@rigorous%
+      \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
+      }}
+    \fi}
+    \end{center}
+  \end{alwayssingle}
+  \thesis@blocks@clear}
+%    \end{macrocode}
+% \end{macro}
 % The style file defines the autolayout preamble as the cover and
 % the title page followed by the assignment, declaration,
 % acknowledgement, abstract, keywords, table of contents and list
diff --git a/style/mu/sci.dtx b/style/mu/sci.dtx
index 85c6b8f..5bdfd59 100644
--- a/style/mu/sci.dtx
+++ b/style/mu/sci.dtx
@@ -6,7 +6,7 @@
 % \url{http://www.sci.muni.cz/NW/predpisy/od/OD-2014-05.pdf}}.
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{fithesis3/style/mu/sci}[2015/04/09]
+\ProvidesPackage{fithesis3/style/mu/sci}[2015/04/12]
 %    \end{macrocode}
 % The file loads the following packages:
 % \begin{itemize}
@@ -276,7 +276,7 @@
     \vfill
     {\bf\thesis@titlePage@Huge\thesis@TeXtitle\\[0.8em]}
     {\thesis@titlePage@large\thesis@typeName\\[1em]}
-    {\bf\thesis@titlePage@LARGE\thesis@author\\}
+    {\bf\thesis@titlePage@LARGE\thesis@author}\\
     \vfill\noindent
     % The bottom of the page
     {\bf\thesis@titlePage@large%
-- 
GitLab