summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-06-05 23:11:21 +0000
committerKarl Berry <karl@freefriends.org>2017-06-05 23:11:21 +0000
commitb24122a971cddb2ecf9c75a917ffbf9cef30c492 (patch)
tree6916b0da28e369f8e6d34d00468dc5bd83e54a38 /Master
parent2e05ff6e2fdfe8be763245181437e76214502d41 (diff)
fithesis (5jun17)
git-svn-id: svn://tug.org/texlive/trunk@44472 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/fithesis/fithesis.pdfbin648174 -> 706128 bytes
-rw-r--r--Master/texmf-dist/doc/latex/fithesis/guide/mu/econ.pdfbin369275 -> 371075 bytes
-rw-r--r--Master/texmf-dist/doc/latex/fithesis/guide/mu/fi.pdfbin374953 -> 375037 bytes
-rw-r--r--Master/texmf-dist/doc/latex/fithesis/guide/mu/fsps.pdfbin367735 -> 367731 bytes
-rw-r--r--Master/texmf-dist/doc/latex/fithesis/guide/mu/fss.pdfbin370148 -> 370181 bytes
-rw-r--r--Master/texmf-dist/doc/latex/fithesis/guide/mu/law.pdfbin377472 -> 377505 bytes
-rw-r--r--Master/texmf-dist/doc/latex/fithesis/guide/mu/med.pdfbin366997 -> 366984 bytes
-rw-r--r--Master/texmf-dist/doc/latex/fithesis/guide/mu/ped.pdfbin369283 -> 369317 bytes
-rw-r--r--Master/texmf-dist/doc/latex/fithesis/guide/mu/phil.pdfbin367882 -> 367882 bytes
-rw-r--r--Master/texmf-dist/doc/latex/fithesis/guide/mu/sci.pdfbin406317 -> 409015 bytes
-rw-r--r--Master/texmf-dist/source/latex/fithesis/fithesis.dtx234
-rw-r--r--Master/texmf-dist/source/latex/fithesis/locale/czech.dtx81
-rw-r--r--Master/texmf-dist/source/latex/fithesis/locale/english.dtx55
-rw-r--r--Master/texmf-dist/source/latex/fithesis/locale/slovak.dtx99
-rw-r--r--Master/texmf-dist/source/latex/fithesis/style/mu/base.dtx49
-rw-r--r--Master/texmf-dist/source/latex/fithesis/style/mu/econ.dtx153
-rw-r--r--Master/texmf-dist/source/latex/fithesis/style/mu/fsps.dtx2
-rw-r--r--Master/texmf-dist/source/latex/fithesis/style/mu/law.dtx2
-rw-r--r--Master/texmf-dist/source/latex/fithesis/style/mu/med.dtx2
-rw-r--r--Master/texmf-dist/source/latex/fithesis/style/mu/sci.dtx596
-rw-r--r--Master/texmf-dist/tex/latex/fithesis/fithesis3.cls125
-rw-r--r--Master/texmf-dist/tex/latex/fithesis/locale/mu/econ/fithesis-czech.def18
-rw-r--r--Master/texmf-dist/tex/latex/fithesis/locale/mu/econ/fithesis-english.def8
-rw-r--r--Master/texmf-dist/tex/latex/fithesis/locale/mu/econ/fithesis-slovak.def18
-rw-r--r--Master/texmf-dist/tex/latex/fithesis/locale/mu/fithesis-czech.def5
-rw-r--r--Master/texmf-dist/tex/latex/fithesis/locale/mu/fithesis-english.def5
-rw-r--r--Master/texmf-dist/tex/latex/fithesis/locale/mu/fithesis-slovak.def5
-rw-r--r--Master/texmf-dist/tex/latex/fithesis/locale/mu/fsps/fithesis-english.def2
-rw-r--r--Master/texmf-dist/tex/latex/fithesis/locale/mu/med/fithesis-czech.def4
-rw-r--r--Master/texmf-dist/tex/latex/fithesis/locale/mu/med/fithesis-english.def4
-rw-r--r--Master/texmf-dist/tex/latex/fithesis/locale/mu/med/fithesis-slovak.def4
-rw-r--r--Master/texmf-dist/tex/latex/fithesis/locale/mu/ped/fithesis-slovak.def2
-rw-r--r--Master/texmf-dist/tex/latex/fithesis/locale/mu/sci/fithesis-czech.def5
-rw-r--r--Master/texmf-dist/tex/latex/fithesis/locale/mu/sci/fithesis-english.def5
-rw-r--r--Master/texmf-dist/tex/latex/fithesis/locale/mu/sci/fithesis-slovak.def8
-rw-r--r--Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-base-color.pdfbin15158 -> 15158 bytes
-rw-r--r--Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-base.pdfbin15988 -> 15988 bytes
-rw-r--r--Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-econ-color.pdfbin12402 -> 12402 bytes
-rw-r--r--Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-econ.pdfbin12932 -> 12932 bytes
-rw-r--r--Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fi-color.pdfbin11804 -> 11804 bytes
-rw-r--r--Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fi.pdfbin11626 -> 11626 bytes
-rw-r--r--Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fsps-color.pdfbin11296 -> 11296 bytes
-rw-r--r--Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fsps.pdfbin11730 -> 11730 bytes
-rw-r--r--Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fss-color.pdfbin10854 -> 10854 bytes
-rw-r--r--Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fss.pdfbin11590 -> 11590 bytes
-rw-r--r--Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-law-color.pdfbin17676 -> 17676 bytes
-rw-r--r--Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-law.pdfbin18435 -> 18435 bytes
-rw-r--r--Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-med-color.pdfbin10052 -> 10052 bytes
-rw-r--r--Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-med.pdfbin10590 -> 10590 bytes
-rw-r--r--Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-ped-color.pdfbin9997 -> 9997 bytes
-rw-r--r--Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-ped.pdfbin10492 -> 10492 bytes
-rw-r--r--Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-phil-color.pdfbin11692 -> 11692 bytes
-rw-r--r--Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-phil.pdfbin12180 -> 12180 bytes
-rw-r--r--Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-sci-color.pdfbin24425 -> 24425 bytes
-rw-r--r--Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-sci.pdfbin25494 -> 25494 bytes
-rw-r--r--Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-base.sty39
-rw-r--r--Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-econ.sty77
-rw-r--r--Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-fsps.sty2
-rw-r--r--Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-law.sty2
-rw-r--r--Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-med.sty2
-rw-r--r--Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-sci.sty404
61 files changed, 1596 insertions, 421 deletions
diff --git a/Master/texmf-dist/doc/latex/fithesis/fithesis.pdf b/Master/texmf-dist/doc/latex/fithesis/fithesis.pdf
index 936471ec37d..3cddafd4134 100644
--- a/Master/texmf-dist/doc/latex/fithesis/fithesis.pdf
+++ b/Master/texmf-dist/doc/latex/fithesis/fithesis.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/fithesis/guide/mu/econ.pdf b/Master/texmf-dist/doc/latex/fithesis/guide/mu/econ.pdf
index 1d19322e45a..99ab2dff115 100644
--- a/Master/texmf-dist/doc/latex/fithesis/guide/mu/econ.pdf
+++ b/Master/texmf-dist/doc/latex/fithesis/guide/mu/econ.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/fithesis/guide/mu/fi.pdf b/Master/texmf-dist/doc/latex/fithesis/guide/mu/fi.pdf
index 454bec04c8f..59d9b7db506 100644
--- a/Master/texmf-dist/doc/latex/fithesis/guide/mu/fi.pdf
+++ b/Master/texmf-dist/doc/latex/fithesis/guide/mu/fi.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/fithesis/guide/mu/fsps.pdf b/Master/texmf-dist/doc/latex/fithesis/guide/mu/fsps.pdf
index 677d80e23e6..b01494a165c 100644
--- a/Master/texmf-dist/doc/latex/fithesis/guide/mu/fsps.pdf
+++ b/Master/texmf-dist/doc/latex/fithesis/guide/mu/fsps.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/fithesis/guide/mu/fss.pdf b/Master/texmf-dist/doc/latex/fithesis/guide/mu/fss.pdf
index 1a7b04b0bf1..c59ef52d1d0 100644
--- a/Master/texmf-dist/doc/latex/fithesis/guide/mu/fss.pdf
+++ b/Master/texmf-dist/doc/latex/fithesis/guide/mu/fss.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/fithesis/guide/mu/law.pdf b/Master/texmf-dist/doc/latex/fithesis/guide/mu/law.pdf
index 6837fdaa72e..bfe46910460 100644
--- a/Master/texmf-dist/doc/latex/fithesis/guide/mu/law.pdf
+++ b/Master/texmf-dist/doc/latex/fithesis/guide/mu/law.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/fithesis/guide/mu/med.pdf b/Master/texmf-dist/doc/latex/fithesis/guide/mu/med.pdf
index ee271dfb81f..9cb47903b5c 100644
--- a/Master/texmf-dist/doc/latex/fithesis/guide/mu/med.pdf
+++ b/Master/texmf-dist/doc/latex/fithesis/guide/mu/med.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/fithesis/guide/mu/ped.pdf b/Master/texmf-dist/doc/latex/fithesis/guide/mu/ped.pdf
index 8839be7178b..98ebefd34d1 100644
--- a/Master/texmf-dist/doc/latex/fithesis/guide/mu/ped.pdf
+++ b/Master/texmf-dist/doc/latex/fithesis/guide/mu/ped.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/fithesis/guide/mu/phil.pdf b/Master/texmf-dist/doc/latex/fithesis/guide/mu/phil.pdf
index ffb7862368d..ab0900761ac 100644
--- a/Master/texmf-dist/doc/latex/fithesis/guide/mu/phil.pdf
+++ b/Master/texmf-dist/doc/latex/fithesis/guide/mu/phil.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/fithesis/guide/mu/sci.pdf b/Master/texmf-dist/doc/latex/fithesis/guide/mu/sci.pdf
index cbb8d95e5b0..bf58b90a6fd 100644
--- a/Master/texmf-dist/doc/latex/fithesis/guide/mu/sci.pdf
+++ b/Master/texmf-dist/doc/latex/fithesis/guide/mu/sci.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/fithesis/fithesis.dtx b/Master/texmf-dist/source/latex/fithesis/fithesis.dtx
index 6cd07cfd184..857f69825b5 100644
--- a/Master/texmf-dist/source/latex/fithesis/fithesis.dtx
+++ b/Master/texmf-dist/source/latex/fithesis/fithesis.dtx
@@ -56,11 +56,12 @@
\gdef\thesis@version@number{#1}
\gdef\thesis@version@date{#2}
\gdef\thesis@version{#2 #1 fithesis3 MU thesis class}}
-\thesis@versiondef{v0.3.44}{2017/05/18}}
+\thesis@versiondef{v0.3.46}{2017/06/02}}
% {\newwrite\f\openout\f=VERSION\write\f{\thesis@version}\closeout\f}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
+% ^^A Since 0.3.45, all changes are documented at the change sites.
% \changes{v0.3.44} {2017/05/18}{Fixed the color in the logo of FI
% MU. [VN]}
% \changes{v0.3.44} {2017/05/18}{The captions in the examples for
@@ -484,17 +485,22 @@
% Any \oarg{options} passed to the class will be handed down to the
% loaded style files. The supported options are therefore documented
% in the subsections of Section \ref{sec:style-files} dedicated to
-% the respective style files. At the moment, all options are
-% processed by the \texttt{style/mu/fithesis-base.sty} style file
-% documented in Section \ref{sec:fithesis-mu-base}.
+% the respective style files.
+%
+% The class options specify the \emph{form} of the document.
%
% \subsection{The \cs{thesissetup} macro}
% \begin{macro}{\thesissetup}
% The main public macro is the |\thesissetup|\marg{keyvals}
% command, where \textit{keyvals} is a comma-delimited list of
-% key-value pairs as defined by the \textsf{keyval} package. This
-% macro needs to be included prior to the beginning of a \LaTeX\
-% document. When used, the \textit{keyvals} are processed.
+% \textit{key}=\textit{value} pairs as defined by the
+% \textsf{keyval} package. This macro needs to be included prior to
+% the beginning of a \LaTeX\ document. When the macro is expanded,
+% the \textit{key}=\textit{value} pairs are processed.
+%
+% Contrary to the class options, the \textit{key}=\textit{value}
+% pairs of the \cs{thesissetup} macro specify metainformation about
+% the document.
% \begin{macrocode}
\long\def\thesissetup#1{%
\setkeys{thesis}{#1}}
@@ -1280,8 +1286,26 @@
\thesis@autofalse
\fi}
% \end{macrocode}
-% \end{macro} ^^A The nested \ifthesis@auto macro definition
-% \end{macro} ^^A The \thesissetup macro definition
+% \end{macro}\begin{macro}{\thesis@pages@preamble}
+% The \cs{thesis@pages@preamble} macro contains the last page
+% number within the preamble of the document. During the first
+% \TeX{} compilation, the macro expands to ??.
+% \changes{v0.3.45}{2017/05/24}{Defined the
+% \cs{thesis@pages@preamble} and \cs{thesis@pages@postamble}
+% macros. The patch was submitted by Juraj Pálenik. [VN]}
+% \begin{macrocode}
+\ifx\thesis@pages@preamble\undefined
+ \def\thesis@pages@preamble{??}\fi
+% \end{macrocode}
+% \end{macro}\begin{macro}{\thesis@pages@postamble}
+% The \cs{thesis@pages@postamble} macro contains the last page
+% number prior to the postamble of the document. During the first
+% \TeX{} compilation, the macro expands to ??.
+% \begin{macrocode}
+\ifx\thesis@pages@postamble\undefined
+ \def\thesis@pages@postamble{??}\fi
+% \end{macrocode}
+% \end{macro}
% The \DescribeMacro{\thesis@preamble}|\thesis@preamble|
% and \DescribeMacro{\thesis@postamble}|\thesis@postamble|
% macros temporarily switch to the hyphenation patterns and the
@@ -1290,29 +1314,172 @@
% \DescribeMacro{\thesis@blocks@preamble}|\thesis@blocks@preamble|
% or
% \DescribeMacro{\thesis@blocks@postamble}|\thesis@blocks@postamble|
-% macros, respectively.
+% macros, respectively; the latter two macros are to be redefined
+% by the loaded style files.
%
-% Before leaving the group, the |\thesis@preamble| macro clears the
-% page. After leaving the group, the |\thesis@preamble| macro sets
-% up the style of the main matter by expanding the
+% After expanding |\thesis@blocks@preamble| inside a \TeX{} group,
+% the |\thesis@preamble| macro defines the
+% \cs{thesis@pages@preamble} macro, writes the definition to the
+% auxiliary file, and clears the page. After leaving the group,
+% the |\thesis@preamble| sets up the style of the main matter by
+% expanding the
% \DescribeMacro{\thesis@blocks@mainMatter}|\thesis@blocks@mainMatter|
-% macro. All the aforementioned |@block@| macros are defined as
-% |\relax| and are subject to redefinition by the loaded style
-% files.
+% macro.
% \begin{macrocode}
\def\thesis@preamble{%
{\thesis@selectLocale{\thesis@locale}%
- \thesis@blocks@preamble\clearpage}
+ \thesis@blocks@preamble
+ \gdef\thesis@pages@preamble{\thepage}
+ \write\@auxout{\noexpand\gdef\noexpand
+ \thesis@pages@preamble{\thepage}}
+ \clearpage}
\thesis@blocks@mainMatter}
-\def\thesis@postamble{{%
- \thesis@selectLocale{\thesis@locale}%
+\let\thesis@blocks@preamble\relax
+\let\thesis@blocks@mainMatter\relax
+% \end{macro}
+% Before expanding |\thesis@blocks@postamble| inside a \TeX{}
+% group, the |\thesis@postamble| macro defines the
+% \cs{thesis@pages@postamble} macro, writes the definition to the
+% auxiliary file, and clears the page.
+% \begin{macrocode}
+\def\thesis@postamble{%
+ \gdef\thesis@pages@postamble{\thepage}
+ \write\@auxout{\noexpand\gdef\noexpand
+ \thesis@pages@postamble{\thepage}}
+ {\thesis@selectLocale{\thesis@locale}%
\thesis@blocks@postamble}}
-\let\thesis@blocks@preamble\relax
\let\thesis@blocks@postamble\relax
-\let\thesis@blocks@mainMatter\relax
% \end{macrocode}
+% \subsubsection{The \texttt{extra} key}
+% \changes{v0.3.45}{2017/05/29}{Added the \texttt{extra} key
+% to \cs{thesissetup} and defined the helper
+% \cs{thesis@def@extra} macro. [VN]}
+% The \marg{\texttt{extra}=\marg{keyvals}} pair enables the
+% definition of extra data fields, where \textit{keyvals} is a
+% comma-delimited list of \textit{key}=\textit{value} pairs as
+% defined by the \textsf{keyval} package. For each
+% \textit{key}=\textit{value} pair, a |\thesis@extra@|\textit{key}
+% is defined to be \textit{value}. These extra data fields are
+% provided as a unified interface for passing additional data to
+% the style and locale files.
+% \begin{macrocode}
+\def\thesis@extra@KV@prefix{KV@thesis@extra@}
+\def\thesis@extra@XKV@fams{thesis@extra}
+\long\def\KV@thesis@extra#1{%
+% \end{macrocode}
+% Patch the \textsc{xkeyval} package to support unknown keys.
+% \begin{macrocode}
+ \long\def\XKV@s@tk@ys##1=##2=##3\@nil{%
+ \XKV@g@tkeyname##1=\@nil\XKV@tkey
+ \expandafter\KV@@sp@def\expandafter\XKV@tkey\expandafter{\XKV@tkey}%
+ \ifx\XKV@tkey\@empty
+ \XKV@toks{##2}%
+ \ifcat$\the\XKV@toks$\else
+ \XKV@err{no key specified for value `\the\XKV@toks'}%
+ \fi
+ \else
+ \@expandtwoargs\in@{,\XKV@tkey,}{,\XKV@na,}%
+ \ifin@\else
+ \XKV@knftrue
+ \KV@@sp@def\XKV@tempa{##2}%
+ \ifXKV@preset\XKV@s@tk@ys@{##3}\else
+ \ifXKV@pl
+ \XKV@for@eo\XKV@fams\XKV@tfam{%
+ \XKV@makehd\XKV@tfam
+ \XKV@s@tk@ys@{##3}%
+ }%
+ \else
+ \XKV@whilist\XKV@fams\XKV@tfam\ifXKV@knf\fi{%
+ \XKV@makehd\XKV@tfam
+ \XKV@s@tk@ys@{##3}%
+ }%
+ \fi
+ \fi
+ \ifXKV@knf
+ \ifXKV@inpox
+ \ifx\XKV@doxs\relax
+ \ifx\@currext\@clsextension\else
+ \let\CurrentOption\XKV@tkey\@unknownoptionerror
+ \fi
+ \else\XKV@doxs\fi
+ \else
+ \ifXKV@st
+ \XKV@addtolist@o\XKV@rm\CurrentOption
+ \else
+ \ifx\XKV@fams\thesis@extra@XKV@fams
+ \expandafter\long\expandafter\def\csname%
+ thesis@extra@\XKV@tkey\endcsname{##2}%
+ \else
+ \XKV@err{`\XKV@tkey' undefined in families
+ `\XKV@fams'}%
+ \fi
+ \fi
+ \fi
+ \else
+ \ifXKV@inpox\ifx\XKV@testclass\XKV@documentclass
+ \expandafter\XKV@useoption\expandafter{\CurrentOption}%
+ \fi\fi
+ \fi
+ \fi
+ \fi
+ }%
+ \setkeys{thesis@extra}{#1}%
+ \def\KV@prefix{KV@thesis@}}
+% \end{macrocode}
+% Patch the \textsc{keyval} package to support unknown keys.
+% \begin{macrocode}
+\long\def\KV@split#1=#2=#3\relax{%
+ \KV@@sp@def\@tempa{#1}%
+ \ifx\@tempa\@empty\else
+ \expandafter\let\expandafter\@tempc
+ \csname\KV@prefix\@tempa\endcsname
+ \ifx\@tempc\relax
+ \ifx\KV@prefix\thesis@extra@KV@prefix
+ \KV@@sp@def\@tempb{#2}%
+ \expandafter\let\csname thesis@extra@\@tempa\endcsname
+ \@tempb%
+ \else
+ \KV@errx
+ {\@tempa\space undefined}%
+ \fi
+ \else
+ \ifx\@empty#3\@empty
+ \KV@default
+ \else
+ \KV@@sp@def\@tempb{#2}%
+ \expandafter\@tempc\expandafter{\@tempb}\relax
+ \fi
+ \fi
+ \fi}
+% \end{macrocode}
+% \begin{macro}{\thesis@def@extra}
+% The |\thesis@def@extra|\oarg{definition}\marg{name} macro defines
+% the |\thesis@extra@|\textit{name} macro to expand
+% to either \textit{definition}, if specified, or to
+% |\thesis@placeholder@extra@|\textit{name}, where
+% |\thesis@placeholder@extra@|\textit{name} is defined to expand to
+% <<extra@\textit{name}>>. If |\thesis@extra@|\textit{name} has
+% already been defined by the user, |\thesis@def@extra| has no
+% effect.
+% \begin{macrocode}
+\newcommand{\thesis@def@extra}[2][]{%
+ \expandafter\ifx\csname thesis@extra@#2\endcsname\relax
+ \def\thesis@placeholder@extra{<<extra@#2>>}%
+ \expandafter\let\csname thesis@placeholder@extra@#2\endcsname
+ \thesis@placeholder@extra
+ \def\thesis@arg{#1}%
+ \ifx\empty\thesis@arg
+ \expandafter\let\csname thesis@extra@#2\endcsname
+ \thesis@placeholder@extra
+ \else
+ \expandafter\def\csname thesis@extra@#2\endcsname{#1}%
+ \fi
+ \fi}
+% \end{macrocode}
+% \end{macro}
+% \end{macro} ^^A The \thesissetup macro definition
% \subsection{The \cs{thesislong} macro}\label{sec:thesislong}
% \begin{macro}{\thesislong}
% The public macro |\thesislong|\marg{key}\marg{value}, can be
@@ -1367,6 +1534,20 @@
\RequirePackage[base]{babel}}
\fi
% \end{macrocode}
+% Fix the value of the |\ifthesis@english| macro.
+% \changes{v0.3.45}{2017/05/23}{Updated the \cs{ifthesis@english}
+% macro, so that it no longer dynamically reacts to changes of
+% the locale. Instead, it is now based on the main locale during
+% the expansion of \cs{thesisload}.}
+% \begin{macrocode}
+\ifthesis@english
+ \expandafter\expandafter\expandafter\let\expandafter\expandafter
+ \csname ifthesis@english\endcsname\csname iftrue\endcsname
+\else
+ \expandafter\expandafter\expandafter\let\expandafter\expandafter
+ \csname ifthesis@english\endcsname\csname iffalse\endcsname
+\fi
+% \end{macrocode}
% Consequently, the style files are loaded. If the user specified an
% explicit empty string as the value of |\thesis@style|, do nothing.
% \begin{macrocode}
@@ -1600,8 +1781,8 @@
% \end{macrocode}
% \subsection{General purpose macros}
% The \DescribeMacro{\thesis@pages}|\thesis@pages| macro contains
-% the total number of pages within the document. During the first
-% \TeX\ compilation, the macro expands to \texttt{??}.
+% the last page number within the document. During the first \TeX\
+% compilation, the macro expands to \texttt{??}.
% \begin{macrocode}
\ifx\thesis@pages\undefined\def\thesis@pages{??}\fi
% \end{macrocode}
@@ -1746,6 +1927,13 @@
% the current semester
% \item|\thesis@|\textit{locale}|@typeName| -- The name of the
% thesis type
+% \changes{v0.3.46}{2017/06/02}{Lifted the \texttt{authorSignature}
+% and \texttt{formattedDate} strings to the global locale file
+% interface. [VN]}
+% \item|\thesis@|\textit{locale}|@authorSignature| -- The label
+% of the author's signature field
+% \item|\thesis@|\textit{locale}|@formattedDate| -- A formatted
+% date
% \end{itemize} where \textit{locale} is the name of the locale.
%
% \def\file#1{\paragraph{The \texttt{#1} file}}
diff --git a/Master/texmf-dist/source/latex/fithesis/locale/czech.dtx b/Master/texmf-dist/source/latex/fithesis/locale/czech.dtx
index 7b27eaf0a5d..a36490d784a 100644
--- a/Master/texmf-dist/source/latex/fithesis/locale/czech.dtx
+++ b/Master/texmf-dist/source/latex/fithesis/locale/czech.dtx
@@ -137,7 +137,7 @@
% \iffalse
%<*mu>
% \fi\begin{macrocode}
-\ProvidesFile{fithesis/locale/mu/fithesis-czech.def}[2016/03/22]
+\ProvidesFile{fithesis/locale/mu/fithesis-czech.def}[2017/06/02]
% Zástupné texty
\gdef\thesis@czech@universityName{Masarykova univerzita}
@@ -150,6 +150,16 @@
% Bibliografický záznam
\gdef\thesis@czech@bib@title{Bibliografický záznam}
\gdef\thesis@czech@bib@pages{str}
+% \end{macrocode}
+% \changes{v0.3.46}{2017/06/02}{Lifted the \texttt{bib@author},
+% \texttt{bib@thesisTitle}, and \texttt{bib@advisor} strings from
+% \texttt{locale/mu/sci/*.def} to \texttt{locale/mu/*.def},
+% so that they can be shared with \texttt{locale/mu/econ/*.def}.
+% [VN]}
+% \begin{macrocode}
+\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
% Různé
\gdef\thesis@czech@idTitle{UČO}
@@ -182,7 +192,9 @@
% Studies at the Masaryk University in Brno. It replaces the
% \texttt{facultyName} placeholder with the correct value and
% redefines the \texttt{fieldTitle} string in accordance with the
-% common usage at the faculty.
+% common usage at the faculty. The locale file also redefines the
+% \texttt{declaration} string in accordance with the requirements
+% of the faculty.
% \iffalse
%<*mu/fsps>
% \fi\begin{macrocode}
@@ -226,13 +238,59 @@
% \fi\file{locale/mu/econ/fithesis-czech.def}
% This is the Czech locale file specific to the Faculty of
% Economics and Administration at the Masaryk University in Brno.
-% It replaces the \texttt{facultyName} placeholder with the
-% correct value.
+% It replaces the \texttt{facultyName} and \texttt{abstractTitle}
+% placeholders with the correct values. The locale file also
+% redefines the \texttt{declaration} string in accordance with
+% the requirements of the faculty and defines the private macros
+% required by the |\thesis@blocks@|\discretionary{}{}{}|bibEntry|
+% block defined within the \texttt{style/mu/fithesis-econ.sty}
+% style file.
% \iffalse
%<*mu/econ>
% \fi\begin{macrocode}
-\ProvidesFile{fithesis/locale/mu/econ/fithesis-czech.def}[2015/06/26]
+\ProvidesFile{fithesis/locale/mu/econ/fithesis-czech.def}[2017/06/02]
+
+% 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
+% \cs{abstractTitle} string in \texttt{locale/mu/econ/*.def} in
+% accordance with the 2/2017 dean's directive. The patch was
+% submitted by Jana Ratajská. [VN]}
+% \begin{macrocode}
+\gdef\thesis@czech@abstractTitle{Anotace}
+% \end{macrocode}
+% \changes{v0.3.46}{2017/06/02}{Updated the \cs{declaration} string
+% in \texttt{locale/mu/econ/*.def} in accordance with the 2/2017
+% dean's directive. [VN]}
+% The following extra data field is defined for
+% \texttt{declaration} string: \begin{itemize}
+% \item|advisorCsGenitiv| -- the advisor's name in
+% genitive following Czech morphology.
+% \end{itemize}
+% \begin{macrocode}
+\thesis@def@extra{advisorCsGenitiv}
+\gdef\thesis@czech@declaration{Prohlašuji, že jsem
+ \thesis@lower{czech@typeName@akuzativ} zpracoval%
+ \thesis@czech@gender@koncovka\ samostatně pod vedením
+ \thesis@extra@advisorCsGenitiv\
+ a~uvedl\thesis@czech@gender@koncovka\ v~ní všechny
+ odborné zdroje v~souladu s~právními předpisy, vnitřními
+ předpisy Masarykovy univerzity a~vnitřními akty řízení
+ Masarykovy univerzity a~Ekonomicko-správní fakulty MU.}
% \end{macrocode}\iffalse
%</mu/econ>
% \fi\file{locale/mu/med/fithesis-czech.def}
@@ -249,11 +307,11 @@
% \fi\begin{macrocode}
\ProvidesFile{fithesis/locale/mu/med/fithesis-czech.def}[2016/03/23]
-% Různé
-\gdef\thesis@czech@abstractTitle{Anotace}
-
% Zástupné texty
\gdef\thesis@czech@facultyName{Lékařská fakulta}
+
+% Různé
+\gdef\thesis@czech@abstractTitle{Anotace}
% \end{macrocode}\iffalse
%</mu/med>
% \fi\file{locale/mu/fi/fithesis-czech.def}
@@ -380,7 +438,7 @@
% \fi\file{locale/mu/sci/fithesis-czech.def}
% This is the Czech locale file specific to the Faculty of Science
% at the Masaryk University in Brno. It defines the private macros
-% required by the |\thesis@blocks@|\discretionary{}{}{}|bibEntry|
+% required by the |\thesis@blocks@|\discretionary{}{}{}|bibEntryCs|
% block defined within the
% \texttt{style/mu/fithesis-sci.sty} style file. It also
% replaces the \texttt{facultyName} placeholder with the correct
@@ -390,7 +448,7 @@
% \iffalse
%<*mu/sci>
% \fi\begin{macrocode}
-\ProvidesFile{fithesis/locale/mu/sci/fithesis-czech.def}[2017/05/15]
+\ProvidesFile{fithesis/locale/mu/sci/fithesis-czech.def}[2017/06/02]
% Zástupné texty
\gdef\thesis@czech@facultyName{Přírodovědecká fakulta}
@@ -404,11 +462,8 @@
citovány.}
% Bibliografický záznam
-\global\let\thesis@czech@bib@author\thesis@czech@authorTitle
-\gdef\thesis@czech@bib@thesisTitle{Název práce}
\gdef\thesis@czech@bib@programme{Studijní program}
\global\let\thesis@czech@bib@field\thesis@czech@fieldTitle
-\global\let\thesis@czech@bib@advisor\thesis@czech@advisorTitle
\gdef\thesis@czech@bib@academicYear{Akademický rok}
\gdef\thesis@czech@bib@pages{Počet stran}
\global\let\thesis@czech@bib@keywords\thesis@czech@keywordsTitle
diff --git a/Master/texmf-dist/source/latex/fithesis/locale/english.dtx b/Master/texmf-dist/source/latex/fithesis/locale/english.dtx
index 860080d534e..934547a6a0e 100644
--- a/Master/texmf-dist/source/latex/fithesis/locale/english.dtx
+++ b/Master/texmf-dist/source/latex/fithesis/locale/english.dtx
@@ -104,7 +104,7 @@
% \iffalse
%<*mu>
% \fi\begin{macrocode}
-\ProvidesFile{fithesis/locale/mu/fithesis-english.def}[2016/03/22]
+\ProvidesFile{fithesis/locale/mu/fithesis-english.def}[2017/06/02]
\gdef\thesis@english@universityName{Masaryk University}
\gdef\thesis@english@declaration{%
Hereby I declare that this paper is my original authorial work,
@@ -115,6 +115,16 @@
% Bibliographic entry
\gdef\thesis@english@bib@title{Bibliographic record}
\gdef\thesis@english@bib@pages{p}
+% \end{macrocode}
+% \changes{v0.3.46}{2017/06/02}{Lifted the \texttt{bib@author},
+% \texttt{bib@thesisTitle}, and \texttt{bib@advisor} strings from
+% \texttt{locale/mu/sci/*.def} to \texttt{locale/mu/*.def},
+% so that they can be shared with \texttt{locale/mu/econ/*.def}.
+% [VN]}
+% \begin{macrocode}
+\global\let\thesis@english@bib@author\thesis@english@authorTitle
+\gdef\thesis@english@bib@thesisTitle{Title of Thesis}
+\gdef\thesis@english@bib@advisor{Supervisor}
% Miscellaneous
\gdef\thesis@english@idTitle{UČO}
@@ -144,7 +154,7 @@
% \iffalse
%<*mu/fsps>
% \fi\begin{macrocode}
-\ProvidesFile{fithesis/locale/mu/fsps/fithesis-english.def}[2015/06/26]
+\ProvidesFile{fithesis/locale/mu/fsps/fithesis-english.def}[2017/06/02]
% Placeholders
\gdef\thesis@english@facultyName{Faculty of Sports Studies}
@@ -180,14 +190,38 @@
% \fi\file{locale/mu/econ/fithesis-english.def}
% This is the English locale file specific to the Faculty of
% Economics and Administration at the Masaryk University in Brno.
-% It replaces the \texttt{facultyName} placeholder with the
-% correct value.
+% It replaces the \texttt{facultyName} and \texttt{abstractTitle}
+% placeholders with the correct value. The locale file also defines
+% the private macros required by the
+% |\thesis@blocks@|\discretionary{}{}{}|bibEntry| block defined
+% within the \texttt{style/mu/fithesis-econ.sty} style file.
% \iffalse
%<*mu/econ>
% \fi\begin{macrocode}
-\ProvidesFile{fithesis/locale/mu/econ/fithesis-english.def}[2015/06/26]
+\ProvidesFile{fithesis/locale/mu/econ/fithesis-english.def}[2017/06/02]
+
+% Placeholders
\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
+% \cs{abstractTitle} string in \texttt{locale/mu/econ/*.def} in
+% accordance with the 2/2017 dean's directive. The patch was
+% submitted by Jana Ratajská. [VN]}
+% \begin{macrocode}
+\gdef\thesis@english@abstractTitle{Annotation}
% \end{macrocode}\iffalse
%</mu/econ>
% \fi\file{locale/mu/med/fithesis-english.def}
@@ -205,11 +239,11 @@
% \fi\begin{macrocode}
\ProvidesFile{fithesis/locale/mu/med/fithesis-english.def}[2016/03/23]
-% Miscellaneous
-\gdef\thesis@english@abstractTitle{Annotation}
-
% Placeholders
\gdef\thesis@english@facultyName{Faculty of Medicine}
+
+% Miscellaneous
+\gdef\thesis@english@abstractTitle{Annotation}
% \end{macrocode}\iffalse
%</mu/med>
% \fi\file{locale/mu/fi/fithesis-english.def}
@@ -300,7 +334,7 @@
% \iffalse
%<*mu/sci>
% \fi\begin{macrocode}
-\ProvidesFile{fithesis/locale/mu/sci/fithesis-english.def}[2016/03/23]
+\ProvidesFile{fithesis/locale/mu/sci/fithesis-english.def}[2017/06/02]
% Placeholders
\gdef\thesis@english@facultyName{Faculty of Science}
@@ -309,11 +343,8 @@
\global\let\thesis@english@advisorTitleEn=\thesis@english@bib@advisor
% Bibliographic entry
-\global\let\thesis@english@bib@author\thesis@english@authorTitle
-\gdef\thesis@english@bib@thesisTitle{Title of Thesis}
\gdef\thesis@english@bib@programme{Degree Programme}
\global\let\thesis@english@bib@field\thesis@english@fieldTitle
-\gdef\thesis@english@bib@advisor{Supervisor}
\gdef\thesis@english@bib@academicYear{Academic Year}
\gdef\thesis@english@bib@pages{Number of Pages}
\global\let\thesis@english@bib@keywords\thesis@english@keywordsTitle
diff --git a/Master/texmf-dist/source/latex/fithesis/locale/slovak.dtx b/Master/texmf-dist/source/latex/fithesis/locale/slovak.dtx
index e23ab05aa7c..0d24fe4d713 100644
--- a/Master/texmf-dist/source/latex/fithesis/locale/slovak.dtx
+++ b/Master/texmf-dist/source/latex/fithesis/locale/slovak.dtx
@@ -137,7 +137,7 @@
% \iffalse
%<*mu>
% \fi\begin{macrocode}
-\ProvidesFile{fithesis/locale/mu/fithesis-slovak.def}[2016/03/22]
+\ProvidesFile{fithesis/locale/mu/fithesis-slovak.def}[2017/06/02]
% Zástupné texty
\gdef\thesis@slovak@universityName{Masarykova univerzita}
@@ -147,9 +147,19 @@
\thesis@slovak@gender@koncovka\ samostatne len s~použitím
uvedenej literatúry a prameňov.}
-% Bibliografický zoznam
+% Bibliografický záznam
\gdef\thesis@slovak@bib@title{Bibliografický záznam}
\gdef\thesis@slovak@bib@pages{str}
+% \end{macrocode}
+% \changes{v0.3.46}{2017/06/02}{Lifted the \texttt{bib@author},
+% \texttt{bib@thesisTitle}, and \texttt{bib@advisor} strings from
+% \texttt{locale/mu/sci/*.def} to \texttt{locale/mu/*.def},
+% so that they can be shared with \texttt{locale/mu/econ/*.def}.
+% [VN]}
+% \begin{macrocode}
+\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
% Rôzne
\gdef\thesis@slovak@idTitle{UČO}
@@ -182,7 +192,9 @@
% Studies at the Masaryk University in Brno. It replaces the
% \texttt{facultyName} placeholder with the correct value and
% redefines the \texttt{fieldTitle} string in accordance with the
-% common usage at the faculty.
+% common usage at the faculty. The locale file also redefines the
+% \texttt{declaration} string in accordance with the requirements
+% of the faculty.
% \iffalse
%<*mu/fsps>
% \fi\begin{macrocode}
@@ -227,13 +239,59 @@
% \fi\file{locale/mu/econ/fithesis-slovak.def}
% This is the Slovak locale file specific to the Faculty of
% Economics and Administration at the Masaryk University in Brno.
-% It replaces the \texttt{facultyName} placeholder with the
-% correct value.
+% It replaces the \texttt{facultyName} and \texttt{abstractTitle}
+% placeholders with the correct values. The locale file also
+% redefines the \texttt{declaration} string in accordance with
+% the requirements of the faculty and defines the private macros
+% required by the |\thesis@blocks@|\discretionary{}{}{}|bibEntry|
+% block defined within the \texttt{style/mu/fithesis-econ.sty}
+% style file.
% \iffalse
%<*mu/econ>
% \fi\begin{macrocode}
-\ProvidesFile{fithesis/locale/mu/econ/fithesis-slovak.def}[2015/06/26]
+\ProvidesFile{fithesis/locale/mu/econ/fithesis-slovak.def}[2017/06/02]
+
+% 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
+% \cs{abstractTitle} string in \texttt{locale/mu/econ/*.def} in
+% accordance with the 2/2017 dean's directive. The patch was
+% submitted by Jana Ratajská. [VN]}
+% \begin{macrocode}
+\gdef\thesis@slovak@abstractTitle{Anotácie}
+% \end{macrocode}
+% \changes{v0.3.46}{2017/06/02}{Updated the \cs{declaration} string
+% in \texttt{locale/mu/econ/*.def} in accordance with the 2/2017
+% dean's directive. [VN]}
+% The following extra data field is defined for the
+% \texttt{declaration} string: \begin{itemize}
+% \item|advisorSkGenitiv| -- the advisor's name in
+% genitive following Slovak morphology.
+% \end{itemize}
+% \begin{macrocode}
+\thesis@def@extra{advisorSkGenitiv}
+\gdef\thesis@slovak@declaration{Vyhlasujem, že som
+ \thesis@lower{slovak@typeName@akuzativ} spracoval%
+ \thesis@slovak@gender@koncovka\ samostatne pod vedením
+ \thesis@extra@advisorSkGenitiv\
+ a~uved\ifthesis@woman la\else iol\fi\ v~nej všetky
+ odborné zdroje v~súlade s~právnymi predpismi, vnútornými
+ předpismi Masarykovej univerzity a~vnútornými aktmi riadenia
+ Masarykovej univerzity a~Ekonomicko-správnej fakulty MU.}
% \end{macrocode}\iffalse
%</mu/econ>
% \fi\file{locale/mu/med/fithesis-slovak.def}
@@ -252,11 +310,11 @@
% \fi\begin{macrocode}
\ProvidesFile{fithesis/locale/mu/med/fithesis-slovak.def}[2016/03/23]
-% Rôzne
-\gdef\thesis@slovak@abstractTitle{Anotácie}
-
% Zástupné texty
\gdef\thesis@slovak@facultyName{Lekárska fakulta}
+
+% Rôzne
+\gdef\thesis@slovak@abstractTitle{Anotácie}
% \end{macrocode}\iffalse
%</mu/med>
% \fi\file{locale/mu/fi/fithesis-slovak.def}
@@ -376,7 +434,7 @@
% \iffalse
%<*mu/ped>
% \fi\begin{macrocode}
-\ProvidesFile{fithesis/locale/mu/ped/fithesis-slovak.def}[2016/03/22]
+\ProvidesFile{fithesis/locale/mu/ped/fithesis-slovak.def}[2017/06/02]
% Zástupné texty
\gdef\thesis@slovak@facultyName{Pedagogická fakulta}
@@ -385,15 +443,30 @@
% \fi\file{locale/mu/sci/fithesis-slovak.def}
% This is the Slovak locale file specific to the Faculty of
% Science at the Masaryk University in Brno.
-% It replaces the \texttt{facultyName} placeholder with the
-% correct value.
+% The locale file also defines the private macros
+% required by the |\thesis@blocks@|\discretionary{}{}{}|bibEntry|
+% block defined within the \texttt{style/mu/fithesis-sci.sty} style
+% file. It also replaces the \texttt{facultyName} placeholder with
+% the correct value and redefines the \texttt{abstractTitle} and
+% \texttt{declaration} strings in accordance with the formal
+% requirements of the faculty.
+% \changes{v0.3.45}{2017/05/21}{Added Slovak localization for the
+% \texttt{style/mu/fithesis-sci.sty} style file. The localization
+% was submitted by Juraj Pálenik. [VN]}
% \iffalse
%<*mu/sci>
% \fi\begin{macrocode}
-\ProvidesFile{fithesis/locale/mu/sci/fithesis-slovak.def}[2015/06/26]
+\ProvidesFile{fithesis/locale/mu/sci/fithesis-slovak.def}[2017/05/21]
% 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>
% \fi
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 d2c4927a7a6..d0161dfb98f 100644
--- a/Master/texmf-dist/source/latex/fithesis/style/mu/base.dtx
+++ b/Master/texmf-dist/source/latex/fithesis/style/mu/base.dtx
@@ -7,7 +7,7 @@
% after \texttt{style/fithesis-base.sty}, regardless of the value
% of the |\thesis@style| macro.
% \begin{macrocode}
-\ProvidesPackage{fithesis/style/mu/fithesis-base}[2016/06/06]
+\ProvidesPackage{fithesis/style/mu/fithesis-base}[2017/06/02]
\NeedsTeXFormat{LaTeX2e}
% \end{macrocode}
% The file recognizes the following options: \begin{itemize}
@@ -531,12 +531,19 @@
% The |\thesis@blocks@clear| macro clears the current page.
% It also clears the next left-hand (even-numbered) page, when
% double-sided typesetting is enabled.
+% \changes{v0.3.45}{2017/05/24}{\cs{thesis@blocks@clear} now only
+% sets the pagestyle to |empty|, when there is a left-hand
+% (even-numbered) page to clear. [VN]}
+% \begin{macrocode}
% \begin{macrocode}
\def\thesis@blocks@clear{%
\ifthesis@twoside@
\clearpage
- \thispagestyle{empty}%
- \cleardoublepage
+ \ifodd\value{page}\else%
+ \thispagestyle{empty}%
+ \hbox{}%
+ \newpage
+ \fi
\else
\newpage
\fi}
@@ -842,8 +849,9 @@
% \begin{macrocode}
\def\thesis@blocks@abstract{%
\begin{alwayssingle}%
- % Start the new chapter without clearing the right page
- {\def\cleardoublepage{}
+ % Start the new chapter without clearing the left page.
+ \clearpage
+ {\let\thesis@blocks@clear\relax
\chapter*{\thesis@@{abstractTitle}}}%
\noindent\thesis@abstract
\par\vfil\null
@@ -853,15 +861,19 @@
% The |\thesis@blocks@abstractEn| macro typesets the
% abstract in English. If the current locale is English, the
% macro produces no output.
+% \changes{v0.3.46}{2017/06/02}{Simplified the definition of
+% \cs{thesis@blocks@abstractEn} in
+% \texttt{style/mu/fithesis-base.sty}. [VN]}
% \begin{macrocode}
\def\thesis@blocks@abstractEn{%
\ifthesis@english\else
{\thesis@selectLocale{english}%
\begin{alwayssingle}%
- % Start the new chapter without clearing the right page
- {\def\cleardoublepage{}%
- \chapter*{\thesis@english@abstractTitle}%
- \thesis@abstractEn}%
+ % Start the new chapter without clearing the left page.
+ \clearpage
+ {\let\thesis@blocks@clear\relax
+ \chapter*{\thesis@english@abstractTitle}}%
+ \noindent\thesis@abstractEn
\par\vfil\null
\end{alwayssingle}}%
\fi}
@@ -872,8 +884,9 @@
% \begin{macrocode}
\def\thesis@blocks@keywords{%
\begin{alwayssingle}%
- % Start the new chapter without clearing the right page
- {\def\cleardoublepage{}%
+ % Start the new chapter without clearing the left page.
+ \clearpage
+ {\let\thesis@blocks@clear\relax
\chapter*{\thesis@@{keywordsTitle}}%
\noindent\thesis@TeXkeywords}%
\par\vfil\null
@@ -883,15 +896,19 @@
% The |\thesis@blocks@keywordsEn| macro typesets the
% keywords in English. If the current locale is English, the
% macro produces no output.
+% \changes{v0.3.46}{2017/06/02}{Simplified the definition of
+% \cs{thesis@blocks@keywordsEn} in
+% \texttt{style/mu/fithesis-base.sty}. [VN]}
% \begin{macrocode}
\def\thesis@blocks@keywordsEn{%
\ifthesis@english\else
{\thesis@selectLocale{english}%
\begin{alwayssingle}%
- % Start the new chapter without clearing the right page
- {\def\cleardoublepage{}%
- \chapter*{\thesis@english@keywordsTitle}%
- \thesis@TeXkeywordsEn}%
+ % 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
\end{alwayssingle}}%
\fi}
@@ -1119,7 +1136,7 @@
\bfseries % \chapter (0)
\or
\slshape % \section (1)
- \else
+ \else
\rmfamily % \subsection (2), \subsubsection (3)
% \paragraph, \subparagraph (4)
\fi}
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 2464e35d51b..64c45ed5490 100644
--- a/Master/texmf-dist/source/latex/fithesis/style/mu/econ.dtx
+++ b/Master/texmf-dist/source/latex/fithesis/style/mu/econ.dtx
@@ -2,12 +2,15 @@
% 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{ht^^A
-% tp://is.muni.cz/auth/do/econ/predpisy/smernice/prehled/45931^^A
-% 363/Smernice2014-9.pdf}}.
+% tps://is.muni.cz/auth/do/econ/predpisy/smernice/prehled/6715^^A
+% 9928/SmerniceDekana2017-c.2-o_zaverecnych_pracich_2017.pdf}}.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{fithesis/style/mu/fithesis-econ}[2016/04/18]
+\ProvidesPackage{fithesis/style/mu/fithesis-econ}[2017/05/21]
% \end{macrocode}
% The file defines the color scheme of the respective faculty. Note
% the the color definitions are in RGB, which makes the resulting
@@ -32,6 +35,8 @@
% \item\textsf{tikz} -- Used for dimension arithmetic.
% \item\textsf{geometry} -- Allows for modifications of the type
% area dimensions.
+% \item\textsf{array} -- Enables |<{decl.}| and |>{decl.}|
+% declarations in table preambles.
% \end{itemize}
% In addition to this, the type area width is set to
% 16\,cm in accordance with the formal requirements of the faculty.
@@ -40,6 +45,7 @@
% \begin{macrocode}
\thesis@require{tikz}
\thesis@require{geometry}
+\thesis@require{array}
\geometry{top=25mm,bottom=20mm,left=25mm,right=25mm,includeheadfoot}
% \end{macrocode}
% \begin{macro}{\thesis@blocks@cover}
@@ -159,6 +165,137 @@
\listoffigures}
\fi
% \end{macrocode}
+% \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.
+% \changes{v0.3.46}{2017/06/02}{Redefined
+% \cs{thesis@blocks@declaration} in
+% \texttt{style/mu/fithesis-econ.sty} in accordance with the
+% example documents. The patch was submitted by Jana Ratajská.
+% [VN]}
+% \begin{macrocode}
+\def\thesis@blocks@declaration{%
+ \begin{alwayssingle}%
+ \thesis@blocks@clear
+ \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}\begin{macro}{\thesis@blocks@abstract}
+% \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]}
+% 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}
+% The |\thesis@blocks@keywords| macro typesets the keywords. This
+% definition typesets the keywords on the same page.
+% \begin{macrocode}
+\def\thesis@blocks@keywords{%
+ \begin{alwayssingle}%
+ \vskip 40\p@
+ {\let\thesis@blocks@clear\relax
+ \chapter*{\thesis@@{keywordsTitle}}%
+ \noindent\thesis@TeXkeywords}%
+ \end{alwayssingle}}
+% \end{macrocode}
+% \end{macro}\begin{macro}{\thesis@blocks@keywordsEn}
+% The |\thesis@blocks@keywordsEn| macro typesets the keywords in
+% English. If the current locale is English, the macro produces no
+% output.
+% \begin{macrocode}
+\def\thesis@blocks@keywordsEn{%
+ \ifthesis@english\else
+ {\thesis@selectLocale{english}%
+ \begin{alwayssingle}%
+ \vskip 20\p@
+ {\let\thesis@blocks@clear\relax%
+ \chapter*{\thesis@english@keywordsTitle}}%
+ \noindent\thesis@TeXkeywordsEn
+ \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]}
+% \begin{macrocode}
+\def\thesis@blocks@bibEntry{%
+ \thesis@blocks@clear
+ \noindent\begin{thesis@newtable@old}{@{}>{\bfseries}ll@{}}
+ \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}}
+% \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
@@ -174,11 +311,11 @@
\thesis@blocks@frontMatter
\thesis@blocks@titlePage
\thesis@blocks@assignment
- \thesis@blocks@clearRight
- \thesis@blocks@abstract
- \thesis@blocks@abstractEn
- \thesis@blocks@keywords
- \thesis@blocks@keywordsEn
+ \thesis@blocks@bibEntry
+ \thesis@blocks@abstract
+ \thesis@blocks@abstractEn
+ \thesis@blocks@keywords
+ \thesis@blocks@keywordsEn
\thesis@blocks@declaration
\thesis@blocks@thanks
\thesis@blocks@toc}
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 2c116f72556..07b8f3d8138 100644
--- a/Master/texmf-dist/source/latex/fithesis/style/mu/fsps.dtx
+++ b/Master/texmf-dist/source/latex/fithesis/style/mu/fsps.dtx
@@ -6,7 +6,7 @@
% auth/do/fsps/studijni/info-stud/SZZ/pokyny_ZP_13-5-2013.pdf}}.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{fithesis/style/mu/fithesis-fsps}[2017/05/15]
+\ProvidesPackage{fithesis/style/mu/fithesis-fsps}[2017/05/21]
% \end{macrocode}
% The file defines the color scheme of the respective faculty. Note
% the the color definitions are in RGB, which makes the resulting
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 f33a162ed51..9c7cb865f82 100644
--- a/Master/texmf-dist/source/latex/fithesis/style/mu/law.dtx
+++ b/Master/texmf-dist/source/latex/fithesis/style/mu/law.dtx
@@ -6,7 +6,7 @@
% o/law/ud/predp/smer/S-07-2012.pdf}}.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{fithesis/style/mu/fithesis-law}[2016/04/18]
+\ProvidesPackage{fithesis/style/mu/fithesis-law}[2017/05/21]
% \end{macrocode}
% The file defines the color scheme of the respective faculty. Note
% the the color definitions are in RGB, which makes the resulting
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 e4a795dcf07..fb7d837e90a 100644
--- a/Master/texmf-dist/source/latex/fithesis/style/mu/med.dtx
+++ b/Master/texmf-dist/source/latex/fithesis/style/mu/med.dtx
@@ -7,7 +7,7 @@
% ZITOSTI_ZAVERECNE_PRACE.doc}}.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{fithesis/style/mu/fithesis-med}[2016/04/18]
+\ProvidesPackage{fithesis/style/mu/fithesis-med}[2017/05/21]
% \end{macrocode}
% The file defines the color scheme of the respective faculty. Note
% the the color definitions are in RGB, which makes the resulting
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 1b79501dee8..365e52bf239 100644
--- a/Master/texmf-dist/source/latex/fithesis/style/mu/sci.dtx
+++ b/Master/texmf-dist/source/latex/fithesis/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{fithesis/style/mu/fithesis-sci}[2016/06/06]
+\ProvidesPackage{fithesis/style/mu/fithesis-sci}[2017/06/02]
% \end{macrocode}
% The file defines the color scheme of the respective faculty. Note
% the the color definitions are in RGB, which makes the resulting
@@ -30,6 +30,53 @@
% \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.
@@ -54,67 +101,67 @@
\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:
+% 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\DescribeMacro{\thesis@czech@bib@title}
-% |\thesis@czech@bib@title| -- The title of the entire block
-% \item\DescribeMacro{\thesis@czech@bib@author}
-% |\thesis@czech@bib@author| -- The label of the author name
-% entry
-% \item\DescribeMacro{\thesis@czech@bib@title}
-% |\thesis@czech@bib@title| -- The label of the title name
-% entry
-% \item\DescribeMacro{\thesis@czech@bib@programme}
-% |\thesis@czech@bib@programme| -- The label of the programme
-% name entry
-% \item\DescribeMacro{\thesis@czech@bib@field}
-% |\thesis@czech@bib@field| -- The label of the field of study
-% name entry
-% \item\DescribeMacro{\thesis@czech@bib@advisor}
-% |\thesis@czech@bib@advisor| -- The label of the advisor name
-% entry
-% \item\DescribeMacro{\thesis@czech@bib@academicYear}
-% |\thesis@czech@bib@academicYear| -- The label of the academic
-% year entry
-% \item\DescribeMacro{\thesis@czech@bib@pages}
-% |\thesis@czech@bib@pages| -- The label of the number of pages
-% entry
-% \item\DescribeMacro{\thesis@czech@bib@keywords}
-% |\thesis@czech@bib@keywords| -- The label of the keywords
-% entry
+% \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{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}%
- {% Start the new chapter without clearing the right page
- {\def\cleardoublepage{}%
- \chapter*{\thesis@czech@bib@title}}%
- % Calculate the width of the columns
+ % 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@czech@bib@author:}}
+ \bf\thesis@@{bib@author}:}}
\let\@B\relax\newlength{\@B}\settowidth{\@B}{{%
- \bf\thesis@czech@bib@thesisTitle:}}
+ \bf\thesis@@{bib@thesisTitle}:}}
\let\@C\relax\newlength{\@C}\settowidth{\@C}{{%
- \bf\thesis@czech@bib@programme:}}
+ \bf\thesis@@{bib@programme}:}}
\let\@D\relax\newlength{\@D}\settowidth{\@D}{{%
- \bf\thesis@czech@bib@field:}}
+ \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@czech@bib@advisor:}}
+ \settowidth{\@E}{{\bf\thesis@@{bib@advisor}:}}
\fi
\let\@F\relax\newlength{\@F}\settowidth{\@F}{{%
- \bf\thesis@czech@bib@academicYear:}}
+ \bf\thesis@@{bib@academicYear}:}}
\let\@G\relax\newlength{\@G}\settowidth{\@G}{{%
- \bf\thesis@czech@bib@pages:}}
+ \bf\thesis@@{bib@pages}:}}
\let\@H\relax\newlength{\@H}\settowidth{\@H}{{%
- \bf\thesis@czech@bib@keywords:}}
+ \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)}
@@ -124,134 +171,282 @@
\renewcommand{\arraystretch}{2}
\noindent\begin{thesis@newtable@old}%
{@{}p{\@left}@{\hskip\@skip}p{\@right}@{}}
- \textbf{\thesis@czech@bib@author:} &
+ \textbf{\thesis@@{bib@author}:} &
\noindent\parbox[t]{\@right}{
\thesis@author\\
- \thesis@czech@facultyName,
- \thesis@czech@universityName\\
+ \thesis@@{facultyName},
+ \thesis@@{universityName}\\
\thesis@department@name
}\\
- \textbf{\thesis@czech@bib@thesisTitle:}
+ \textbf{\thesis@@{bib@thesisTitle}:}
& \thesis@title \\
- \textbf{\thesis@czech@bib@programme:}
+ \textbf{\thesis@@{bib@programme}:}
& \thesis@programme \\
- \textbf{\thesis@czech@bib@field:}
+ \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@czech@bib@advisor:}
+ \textbf{\thesis@@{bib@advisor}:}
& \thesis@advisor \\
\fi
- \textbf{\thesis@czech@bib@academicYear:}
+ \textbf{\thesis@@{bib@academicYear}:}
& \thesis@academicYear \\
- \textbf{\thesis@czech@bib@pages:}
- & \thesis@pages \\
- \textbf{\thesis@czech@bib@keywords:}
+ \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. Along with the macros
-% required by the locale file interface, the locale files
-% need to define the following macros:
-% \begin{itemize}
-% \item\DescribeMacro{\thesis@english@bib@title}
-% |\thesis@english@bib@title| -- The title of the entire block
-% \item\DescribeMacro{\thesis@english@bib@author}
-% |\thesis@english@bib@author| -- The label of the author name
-% entry
-% \item\DescribeMacro{\thesis@english@bib@title}
-% |\thesis@english@bib@title| -- The label of the title name
-% entry
-% \item\DescribeMacro{\thesis@english@bib@programme}
-% |\thesis@english@bib@programme| -- The label of the programme
-% name entry
-% \item\DescribeMacro{\thesis@english@bib@field}
-% |\thesis@english@bib@field| -- The label of the field of
-% study name entry
-% \item\DescribeMacro{\thesis@english@bib@advisor}
-% |\thesis@english@bib@advisor| -- The label of the advisor
-% name entry
-% \item\DescribeMacro{\thesis@english@bib@academicYear}
-% |\thesis@english@bib@academicYear| -- The label of the
-% academic year entry
-% \item\DescribeMacro{\thesis@english@bib@pages}
-% |\thesis@english@bib@pages| -- The label of the number of
-% pages entry
-% \item\DescribeMacro{\thesis@english@bib@keywords}
-% |\thesis@english@bib@keywords| -- The label of the keywords
-% entry
-% \end{itemize}
+% The |\thesis@blocks@bibEntryEn| macro typesets a bibliographical
+% entry in English unless the current locale is English.
% \begin{macrocode}
\def\thesis@blocks@bibEntryEn{%
- {\thesis@selectLocale{english}
- \begin{alwayssingle}
- % Start the new chapter without clearing the right page
- {\def\cleardoublepage{}%
- \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}%
+ \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
- \settowidth{\@E}{{\bf\thesis@english@bib@advisor:}}
+ % Start the new chapter without clearing the left page.
+ \thesis@blocks@clearRight
\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 \\
+ {\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
- \textbf{\thesis@english@bib@academicYear:}
- & \thesis@academicYear \\
- \textbf{\thesis@english@bib@pages:}
- & \thesis@pages \\
- \textbf{\thesis@english@bib@keywords:}
- & \thesis@TeXkeywordsEn \\
- \end{thesis@newtable@old}}
- \end{alwayssingle}
- }}
+ \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}
% \end{macrocode}
% \end{macro}\begin{macro}{\thesis@blocks@frontMatter}
% The |\thesis@blocks@frontMatter| macro sets up the style
@@ -260,6 +455,7 @@
% formal requirements of the faculty.
% \begin{macrocode}
\def\thesis@blocks@frontMatter{%
+ \thesis@blocks@clear
\pagestyle{empty}
\parindent 1.5em
\setcounter{page}{1}
@@ -267,17 +463,30 @@
% \end{macrocode}
% \end{macro}\begin{macro}{\thesis@blocks@cover}
% The |\thesis@blocks@cover| macro typesets the thesis
-% cover.
+% 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}
-\def\thesis@blocks@cover{%
+\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}
- \thispagestyle{empty}
\begin{center}
{\sc\thesis@titlePage@LARGE\thesis@czech@universityName\\%
\thesis@titlePage@Large\thesis@czech@facultyName\\[0.3em]%
- \thesis@titlePage@large\thesis@department@name}
+ \thesis@titlePage@normalsize\thesis@extra@departmentCs}
\vfill
{\bf\thesis@titlePage@Huge\thesis@czech@typeName}
\vfill
@@ -285,7 +494,7 @@
\ \thesis@year\hfill\thesis@author}
\end{center}
\end{alwayssingle}
- \fi}
+ \fi}}
% \end{macrocode}
% \end{macro}\begin{macro}{\thesis@blocks@titlePage}
% The |\thesis@blocks@titlePage| macro typesets the thesis
@@ -293,11 +502,24 @@
% 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}
-\def\thesis@blocks@titlePage{%
+\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}
- \thispagestyle{empty}
% The top of the page
\begin{adjustwidth}{-12mm}{}
\begin{minipage}{30mm}
@@ -306,7 +528,7 @@
\begin{center}
{\sc\thesis@titlePage@LARGE\thesis@czech@universityName\\%
\thesis@titlePage@Large\thesis@czech@facultyName\\[0.3em]%
- \thesis@titlePage@normalsize\thesis@department@name}
+ \thesis@titlePage@normalsize\thesis@extra@departmentCs}
\rule{\textwidth}{2pt}\vspace*{2mm}
\end{center}
\end{minipage}\begin{minipage}{30mm}
@@ -316,7 +538,7 @@
% The middle of the page
\vfill
\parbox\textwidth{% Prevent vfills from squashing the leading
- \bf\thesis@titlePage@Huge\thesis@TeXtitle}
+ \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\\}
@@ -329,7 +551,27 @@
\thesis@czech@advisorTitle: \thesis@advisor\hfill
\fi
\thesis@place\ \thesis@year}
- \end{alwayssingle}}
+ \end{alwayssingle}}}
+% \end{macrocode}
+% \end{macro}\begin{macro}{\thesis@blocks@thanks}
+% The |\thesis@blocks@thanks| macro typesets the
+% acknowledgement, if the |\thesis@thanks| macro is
+% defined. Otherwise, the macro produces no output.
+% As per the faculty requirements, the acknowledgement is
+% positioned at the top of the page.
+% \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
@@ -337,27 +579,19 @@
% 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.
-%
-% Along with the macros required by the locale file interface, the
-% locale files need to define the following macros:
-% \begin{itemize}
-% \item\DescribeMacro{\thesis@czech@authorSignature}
-% |\thesis@czech@authorSignature| -- The label of the author's
-% signature field
-% \item\DescribeMacro{\thesis@czech@formattedDate}
-% |\thesis@czech@formattedDate| -- A formatted date
-% \end{itemize}
% \begin{macrocode}
\def\thesis@blocks@declaration{%
- \thesis@blocks@clear
\begin{alwayssingle}%
- \chapter*{\thesis@@{declarationTitle}}%
+ \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@czech@formattedDate\hfill
+ \noindent\thesis@place, \thesis@@{formattedDate}\hfill
\begin{minipage}[t]{\@A}%
\centering\rule{\@A}{1pt}\\
\thesis@@{authorSignature}\par
@@ -376,22 +610,32 @@
% is typeset as though the locale were Czech in accordance with the
% formal requirements of the faculty.
% \begin{macrocode}
-\def\thesis@blocks@preamble{{%
- \thesis@selectLocale{czech}%
+\def\thesis@blocks@preamble{
\thesis@blocks@coverMatter
\thesis@blocks@cover
\thesis@blocks@frontMatter
\thesis@blocks@titlePage
\thesis@blocks@clearRight
+ \thesis@blocks@bibEntryCs
\thesis@blocks@bibEntry
\thesis@blocks@bibEntryEn
- \thesis@blocks@abstract
- \thesis@blocks@abstractEn}
+ \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@tables}}
+ \thesis@blocks@clear
+ \pagestyle{plain}%
+ \thesis@blocks@tables}}
\def\thesis@blocks@postamble{%
\thesis@blocks@bibliography}
% \end{macrocode}
diff --git a/Master/texmf-dist/tex/latex/fithesis/fithesis3.cls b/Master/texmf-dist/tex/latex/fithesis/fithesis3.cls
index bab6089754b..b501edaa330 100644
--- a/Master/texmf-dist/tex/latex/fithesis/fithesis3.cls
+++ b/Master/texmf-dist/tex/latex/fithesis/fithesis3.cls
@@ -54,7 +54,7 @@
\gdef\thesis@version@number{#1}
\gdef\thesis@version@date{#2}
\gdef\thesis@version{#2 #1 fithesis3 MU thesis class}}
-\thesis@versiondef{v0.3.44}{2017/05/18}}
+\thesis@versiondef{v0.3.46}{2017/06/02}}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ProvidesClass{fithesis3}[\thesis@version]
@@ -327,18 +327,124 @@
\else
\thesis@autofalse
\fi}
+\ifx\thesis@pages@preamble\undefined
+ \def\thesis@pages@preamble{??}\fi
+\ifx\thesis@pages@postamble\undefined
+ \def\thesis@pages@postamble{??}\fi
\def\thesis@preamble{%
{\thesis@selectLocale{\thesis@locale}%
- \thesis@blocks@preamble\clearpage}
+ \thesis@blocks@preamble
+ \gdef\thesis@pages@preamble{\thepage}
+ \write\@auxout{\noexpand\gdef\noexpand
+ \thesis@pages@preamble{\thepage}}
+ \clearpage}
\thesis@blocks@mainMatter}
-\def\thesis@postamble{{%
- \thesis@selectLocale{\thesis@locale}%
+\let\thesis@blocks@preamble\relax
+\let\thesis@blocks@mainMatter\relax
+\def\thesis@postamble{%
+ \gdef\thesis@pages@postamble{\thepage}
+ \write\@auxout{\noexpand\gdef\noexpand
+ \thesis@pages@postamble{\thepage}}
+ {\thesis@selectLocale{\thesis@locale}%
\thesis@blocks@postamble}}
-\let\thesis@blocks@preamble\relax
\let\thesis@blocks@postamble\relax
-\let\thesis@blocks@mainMatter\relax
+\def\thesis@extra@KV@prefix{KV@thesis@extra@}
+\def\thesis@extra@XKV@fams{thesis@extra}
+\long\def\KV@thesis@extra#1{%
+ \long\def\XKV@s@tk@ys##1=##2=##3\@nil{%
+ \XKV@g@tkeyname##1=\@nil\XKV@tkey
+ \expandafter\KV@@sp@def\expandafter\XKV@tkey\expandafter{\XKV@tkey}%
+ \ifx\XKV@tkey\@empty
+ \XKV@toks{##2}%
+ \ifcat$\the\XKV@toks$\else
+ \XKV@err{no key specified for value `\the\XKV@toks'}%
+ \fi
+ \else
+ \@expandtwoargs\in@{,\XKV@tkey,}{,\XKV@na,}%
+ \ifin@\else
+ \XKV@knftrue
+ \KV@@sp@def\XKV@tempa{##2}%
+ \ifXKV@preset\XKV@s@tk@ys@{##3}\else
+ \ifXKV@pl
+ \XKV@for@eo\XKV@fams\XKV@tfam{%
+ \XKV@makehd\XKV@tfam
+ \XKV@s@tk@ys@{##3}%
+ }%
+ \else
+ \XKV@whilist\XKV@fams\XKV@tfam\ifXKV@knf\fi{%
+ \XKV@makehd\XKV@tfam
+ \XKV@s@tk@ys@{##3}%
+ }%
+ \fi
+ \fi
+ \ifXKV@knf
+ \ifXKV@inpox
+ \ifx\XKV@doxs\relax
+ \ifx\@currext\@clsextension\else
+ \let\CurrentOption\XKV@tkey\@unknownoptionerror
+ \fi
+ \else\XKV@doxs\fi
+ \else
+ \ifXKV@st
+ \XKV@addtolist@o\XKV@rm\CurrentOption
+ \else
+ \ifx\XKV@fams\thesis@extra@XKV@fams
+ \expandafter\long\expandafter\def\csname%
+ thesis@extra@\XKV@tkey\endcsname{##2}%
+ \else
+ \XKV@err{`\XKV@tkey' undefined in families
+ `\XKV@fams'}%
+ \fi
+ \fi
+ \fi
+ \else
+ \ifXKV@inpox\ifx\XKV@testclass\XKV@documentclass
+ \expandafter\XKV@useoption\expandafter{\CurrentOption}%
+ \fi\fi
+ \fi
+ \fi
+ \fi
+ }%
+ \setkeys{thesis@extra}{#1}%
+ \def\KV@prefix{KV@thesis@}}
+\long\def\KV@split#1=#2=#3\relax{%
+ \KV@@sp@def\@tempa{#1}%
+ \ifx\@tempa\@empty\else
+ \expandafter\let\expandafter\@tempc
+ \csname\KV@prefix\@tempa\endcsname
+ \ifx\@tempc\relax
+ \ifx\KV@prefix\thesis@extra@KV@prefix
+ \KV@@sp@def\@tempb{#2}%
+ \expandafter\let\csname thesis@extra@\@tempa\endcsname
+ \@tempb%
+ \else
+ \KV@errx
+ {\@tempa\space undefined}%
+ \fi
+ \else
+ \ifx\@empty#3\@empty
+ \KV@default
+ \else
+ \KV@@sp@def\@tempb{#2}%
+ \expandafter\@tempc\expandafter{\@tempb}\relax
+ \fi
+ \fi
+ \fi}
+\newcommand{\thesis@def@extra}[2][]{%
+ \expandafter\ifx\csname thesis@extra@#2\endcsname\relax
+ \def\thesis@placeholder@extra{<<extra@#2>>}%
+ \expandafter\let\csname thesis@placeholder@extra@#2\endcsname
+ \thesis@placeholder@extra
+ \def\thesis@arg{#1}%
+ \ifx\empty\thesis@arg
+ \expandafter\let\csname thesis@extra@#2\endcsname
+ \thesis@placeholder@extra
+ \else
+ \expandafter\def\csname thesis@extra@#2\endcsname{#1}%
+ \fi
+ \fi}
\long\def\thesislong#1#2{%
\csname KV@thesis@#1\endcsname{#2}}
\newif\ifthesis@loaded\thesis@loadedfalse
@@ -357,6 +463,13 @@
% See <article.gmane.org/gmane.comp.tex.luatex.user/5680>
\RequirePackage[base]{babel}}
\fi
+\ifthesis@english
+ \expandafter\expandafter\expandafter\let\expandafter\expandafter
+ \csname ifthesis@english\endcsname\csname iftrue\endcsname
+\else
+ \expandafter\expandafter\expandafter\let\expandafter\expandafter
+ \csname ifthesis@english\endcsname\csname iffalse\endcsname
+\fi
\ifx\thesis@style\empty\else
\thesis@requireStyle{\thesis@style}
\fi
diff --git a/Master/texmf-dist/tex/latex/fithesis/locale/mu/econ/fithesis-czech.def b/Master/texmf-dist/tex/latex/fithesis/locale/mu/econ/fithesis-czech.def
index bb2a231cc54..39b141a4408 100644
--- a/Master/texmf-dist/tex/latex/fithesis/locale/mu/econ/fithesis-czech.def
+++ b/Master/texmf-dist/tex/latex/fithesis/locale/mu/econ/fithesis-czech.def
@@ -49,8 +49,24 @@
%%
%% The names of the source files used are shown above.
%%
-\ProvidesFile{fithesis/locale/mu/econ/fithesis-czech.def}[2015/06/26]
+\ProvidesFile{fithesis/locale/mu/econ/fithesis-czech.def}[2017/06/02]
+
\gdef\thesis@czech@facultyName{Ekonomicko-správní fakulta}
+
+\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}
+
+\gdef\thesis@czech@abstractTitle{Anotace}
+\thesis@def@extra{advisorCsGenitiv}
+\gdef\thesis@czech@declaration{Prohlašuji, že jsem
+ \thesis@lower{czech@typeName@akuzativ} zpracoval%
+ \thesis@czech@gender@koncovka\ samostatně pod vedením
+ \thesis@extra@advisorCsGenitiv\
+ a~uvedl\thesis@czech@gender@koncovka\ v~ní všechny
+ odborné zdroje v~souladu s~právními předpisy, vnitřními
+ předpisy Masarykovy univerzity a~vnitřními akty řízení
+ Masarykovy univerzity a~Ekonomicko-správní fakulty MU.}
\endinput
%%
%% End of file `mu/econ/fithesis-czech.def'.
diff --git a/Master/texmf-dist/tex/latex/fithesis/locale/mu/econ/fithesis-english.def b/Master/texmf-dist/tex/latex/fithesis/locale/mu/econ/fithesis-english.def
index e4d405bc389..c4f7e8b44d4 100644
--- a/Master/texmf-dist/tex/latex/fithesis/locale/mu/econ/fithesis-english.def
+++ b/Master/texmf-dist/tex/latex/fithesis/locale/mu/econ/fithesis-english.def
@@ -49,9 +49,15 @@
%%
%% The names of the source files used are shown above.
%%
-\ProvidesFile{fithesis/locale/mu/econ/fithesis-english.def}[2015/06/26]
+\ProvidesFile{fithesis/locale/mu/econ/fithesis-english.def}[2017/06/02]
+
\gdef\thesis@english@facultyName{Faculty of Economics
and Administration}
+
+\gdef\thesis@english@bib@department{Department}
+\gdef\thesis@english@bib@year{Year of Defense}
+
+\gdef\thesis@english@abstractTitle{Annotation}
\endinput
%%
%% End of file `mu/econ/fithesis-english.def'.
diff --git a/Master/texmf-dist/tex/latex/fithesis/locale/mu/econ/fithesis-slovak.def b/Master/texmf-dist/tex/latex/fithesis/locale/mu/econ/fithesis-slovak.def
index a7721a30bed..ff5c20e4506 100644
--- a/Master/texmf-dist/tex/latex/fithesis/locale/mu/econ/fithesis-slovak.def
+++ b/Master/texmf-dist/tex/latex/fithesis/locale/mu/econ/fithesis-slovak.def
@@ -49,9 +49,25 @@
%%
%% The names of the source files used are shown above.
%%
-\ProvidesFile{fithesis/locale/mu/econ/fithesis-slovak.def}[2015/06/26]
+\ProvidesFile{fithesis/locale/mu/econ/fithesis-slovak.def}[2017/06/02]
+
\gdef\thesis@slovak@facultyName{Ekonomicko-správna fakulta}
+\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}
+
+\gdef\thesis@slovak@abstractTitle{Anotácie}
+\thesis@def@extra{advisorSkGenitiv}
+\gdef\thesis@slovak@declaration{Vyhlasujem, že som
+ \thesis@lower{slovak@typeName@akuzativ} spracoval%
+ \thesis@slovak@gender@koncovka\ samostatne pod vedením
+ \thesis@extra@advisorSkGenitiv\
+ a~uved\ifthesis@woman la\else iol\fi\ v~nej všetky
+ odborné zdroje v~súlade s~právnymi predpismi, vnútornými
+ předpismi Masarykovej univerzity a~vnútornými aktmi riadenia
+ Masarykovej univerzity a~Ekonomicko-správnej fakulty MU.}
+
\endinput
%%
%% End of file `mu/econ/fithesis-slovak.def'.
diff --git a/Master/texmf-dist/tex/latex/fithesis/locale/mu/fithesis-czech.def b/Master/texmf-dist/tex/latex/fithesis/locale/mu/fithesis-czech.def
index b28ec64b69a..c1fd1008418 100644
--- a/Master/texmf-dist/tex/latex/fithesis/locale/mu/fithesis-czech.def
+++ b/Master/texmf-dist/tex/latex/fithesis/locale/mu/fithesis-czech.def
@@ -49,7 +49,7 @@
%%
%% The names of the source files used are shown above.
%%
-\ProvidesFile{fithesis/locale/mu/fithesis-czech.def}[2016/03/22]
+\ProvidesFile{fithesis/locale/mu/fithesis-czech.def}[2017/06/02]
\gdef\thesis@czech@universityName{Masarykova univerzita}
\gdef\thesis@czech@declaration{Prohlašuji, že jsem
@@ -60,6 +60,9 @@
\gdef\thesis@czech@bib@title{Bibliografický záznam}
\gdef\thesis@czech@bib@pages{str}
+\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
\gdef\thesis@czech@idTitle{UČO}
\endinput
diff --git a/Master/texmf-dist/tex/latex/fithesis/locale/mu/fithesis-english.def b/Master/texmf-dist/tex/latex/fithesis/locale/mu/fithesis-english.def
index 37cb55f708a..d0038a2ead3 100644
--- a/Master/texmf-dist/tex/latex/fithesis/locale/mu/fithesis-english.def
+++ b/Master/texmf-dist/tex/latex/fithesis/locale/mu/fithesis-english.def
@@ -49,7 +49,7 @@
%%
%% The names of the source files used are shown above.
%%
-\ProvidesFile{fithesis/locale/mu/fithesis-english.def}[2016/03/22]
+\ProvidesFile{fithesis/locale/mu/fithesis-english.def}[2017/06/02]
\gdef\thesis@english@universityName{Masaryk University}
\gdef\thesis@english@declaration{%
Hereby I declare that this paper is my original authorial work,
@@ -59,6 +59,9 @@
\gdef\thesis@english@bib@title{Bibliographic record}
\gdef\thesis@english@bib@pages{p}
+\global\let\thesis@english@bib@author\thesis@english@authorTitle
+\gdef\thesis@english@bib@thesisTitle{Title of Thesis}
+\gdef\thesis@english@bib@advisor{Supervisor}
\gdef\thesis@english@idTitle{UČO}
\endinput
diff --git a/Master/texmf-dist/tex/latex/fithesis/locale/mu/fithesis-slovak.def b/Master/texmf-dist/tex/latex/fithesis/locale/mu/fithesis-slovak.def
index 0bc46c823e7..1af90e9f384 100644
--- a/Master/texmf-dist/tex/latex/fithesis/locale/mu/fithesis-slovak.def
+++ b/Master/texmf-dist/tex/latex/fithesis/locale/mu/fithesis-slovak.def
@@ -49,7 +49,7 @@
%%
%% The names of the source files used are shown above.
%%
-\ProvidesFile{fithesis/locale/mu/fithesis-slovak.def}[2016/03/22]
+\ProvidesFile{fithesis/locale/mu/fithesis-slovak.def}[2017/06/02]
\gdef\thesis@slovak@universityName{Masarykova univerzita}
\gdef\thesis@slovak@declaration{%
@@ -60,6 +60,9 @@
\gdef\thesis@slovak@bib@title{Bibliografický záznam}
\gdef\thesis@slovak@bib@pages{str}
+\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
\gdef\thesis@slovak@idTitle{UČO}
diff --git a/Master/texmf-dist/tex/latex/fithesis/locale/mu/fsps/fithesis-english.def b/Master/texmf-dist/tex/latex/fithesis/locale/mu/fsps/fithesis-english.def
index 54d013bcbda..a3186a173d6 100644
--- a/Master/texmf-dist/tex/latex/fithesis/locale/mu/fsps/fithesis-english.def
+++ b/Master/texmf-dist/tex/latex/fithesis/locale/mu/fsps/fithesis-english.def
@@ -49,7 +49,7 @@
%%
%% The names of the source files used are shown above.
%%
-\ProvidesFile{fithesis/locale/mu/fsps/fithesis-english.def}[2015/06/26]
+\ProvidesFile{fithesis/locale/mu/fsps/fithesis-english.def}[2017/06/02]
\gdef\thesis@english@facultyName{Faculty of Sports Studies}
diff --git a/Master/texmf-dist/tex/latex/fithesis/locale/mu/med/fithesis-czech.def b/Master/texmf-dist/tex/latex/fithesis/locale/mu/med/fithesis-czech.def
index 95428ca1c4a..b5263a740ee 100644
--- a/Master/texmf-dist/tex/latex/fithesis/locale/mu/med/fithesis-czech.def
+++ b/Master/texmf-dist/tex/latex/fithesis/locale/mu/med/fithesis-czech.def
@@ -51,9 +51,9 @@
%%
\ProvidesFile{fithesis/locale/mu/med/fithesis-czech.def}[2016/03/23]
-\gdef\thesis@czech@abstractTitle{Anotace}
-
\gdef\thesis@czech@facultyName{Lékařská fakulta}
+
+\gdef\thesis@czech@abstractTitle{Anotace}
\endinput
%%
%% End of file `mu/med/fithesis-czech.def'.
diff --git a/Master/texmf-dist/tex/latex/fithesis/locale/mu/med/fithesis-english.def b/Master/texmf-dist/tex/latex/fithesis/locale/mu/med/fithesis-english.def
index df6ebe4b653..a27b2188ddd 100644
--- a/Master/texmf-dist/tex/latex/fithesis/locale/mu/med/fithesis-english.def
+++ b/Master/texmf-dist/tex/latex/fithesis/locale/mu/med/fithesis-english.def
@@ -51,9 +51,9 @@
%%
\ProvidesFile{fithesis/locale/mu/med/fithesis-english.def}[2016/03/23]
-\gdef\thesis@english@abstractTitle{Annotation}
-
\gdef\thesis@english@facultyName{Faculty of Medicine}
+
+\gdef\thesis@english@abstractTitle{Annotation}
\endinput
%%
%% End of file `mu/med/fithesis-english.def'.
diff --git a/Master/texmf-dist/tex/latex/fithesis/locale/mu/med/fithesis-slovak.def b/Master/texmf-dist/tex/latex/fithesis/locale/mu/med/fithesis-slovak.def
index 24bb664eb1c..a6ba5dddc16 100644
--- a/Master/texmf-dist/tex/latex/fithesis/locale/mu/med/fithesis-slovak.def
+++ b/Master/texmf-dist/tex/latex/fithesis/locale/mu/med/fithesis-slovak.def
@@ -52,9 +52,9 @@
\ProvidesFile{fithesis/locale/mu/med/fithesis-slovak.def}[2016/03/23]
-\gdef\thesis@slovak@abstractTitle{Anotácie}
-
\gdef\thesis@slovak@facultyName{Lekárska fakulta}
+
+\gdef\thesis@slovak@abstractTitle{Anotácie}
\endinput
%%
%% End of file `mu/med/fithesis-slovak.def'.
diff --git a/Master/texmf-dist/tex/latex/fithesis/locale/mu/ped/fithesis-slovak.def b/Master/texmf-dist/tex/latex/fithesis/locale/mu/ped/fithesis-slovak.def
index 0c06624e230..c878a4d61f7 100644
--- a/Master/texmf-dist/tex/latex/fithesis/locale/mu/ped/fithesis-slovak.def
+++ b/Master/texmf-dist/tex/latex/fithesis/locale/mu/ped/fithesis-slovak.def
@@ -50,7 +50,7 @@
%% The names of the source files used are shown above.
%%
-\ProvidesFile{fithesis/locale/mu/ped/fithesis-slovak.def}[2016/03/22]
+\ProvidesFile{fithesis/locale/mu/ped/fithesis-slovak.def}[2017/06/02]
\gdef\thesis@slovak@facultyName{Pedagogická fakulta}
\endinput
diff --git a/Master/texmf-dist/tex/latex/fithesis/locale/mu/sci/fithesis-czech.def b/Master/texmf-dist/tex/latex/fithesis/locale/mu/sci/fithesis-czech.def
index 12937854ce7..496bb5239a5 100644
--- a/Master/texmf-dist/tex/latex/fithesis/locale/mu/sci/fithesis-czech.def
+++ b/Master/texmf-dist/tex/latex/fithesis/locale/mu/sci/fithesis-czech.def
@@ -49,7 +49,7 @@
%%
%% The names of the source files used are shown above.
%%
-\ProvidesFile{fithesis/locale/mu/sci/fithesis-czech.def}[2017/05/15]
+\ProvidesFile{fithesis/locale/mu/sci/fithesis-czech.def}[2017/06/02]
\gdef\thesis@czech@facultyName{Přírodovědecká fakulta}
@@ -60,11 +60,8 @@
statně s~využitím informačních zdrojů, které jsou v~práci
citovány.}
-\global\let\thesis@czech@bib@author\thesis@czech@authorTitle
-\gdef\thesis@czech@bib@thesisTitle{Název práce}
\gdef\thesis@czech@bib@programme{Studijní program}
\global\let\thesis@czech@bib@field\thesis@czech@fieldTitle
-\global\let\thesis@czech@bib@advisor\thesis@czech@advisorTitle
\gdef\thesis@czech@bib@academicYear{Akademický rok}
\gdef\thesis@czech@bib@pages{Počet stran}
\global\let\thesis@czech@bib@keywords\thesis@czech@keywordsTitle
diff --git a/Master/texmf-dist/tex/latex/fithesis/locale/mu/sci/fithesis-english.def b/Master/texmf-dist/tex/latex/fithesis/locale/mu/sci/fithesis-english.def
index 567631fc366..8374f89fc31 100644
--- a/Master/texmf-dist/tex/latex/fithesis/locale/mu/sci/fithesis-english.def
+++ b/Master/texmf-dist/tex/latex/fithesis/locale/mu/sci/fithesis-english.def
@@ -49,17 +49,14 @@
%%
%% The names of the source files used are shown above.
%%
-\ProvidesFile{fithesis/locale/mu/sci/fithesis-english.def}[2016/03/23]
+\ProvidesFile{fithesis/locale/mu/sci/fithesis-english.def}[2017/06/02]
\gdef\thesis@english@facultyName{Faculty of Science}
\global\let\thesis@english@advisorTitleEn=\thesis@english@bib@advisor
-\global\let\thesis@english@bib@author\thesis@english@authorTitle
-\gdef\thesis@english@bib@thesisTitle{Title of Thesis}
\gdef\thesis@english@bib@programme{Degree Programme}
\global\let\thesis@english@bib@field\thesis@english@fieldTitle
-\gdef\thesis@english@bib@advisor{Supervisor}
\gdef\thesis@english@bib@academicYear{Academic Year}
\gdef\thesis@english@bib@pages{Number of Pages}
\global\let\thesis@english@bib@keywords\thesis@english@keywordsTitle
diff --git a/Master/texmf-dist/tex/latex/fithesis/locale/mu/sci/fithesis-slovak.def b/Master/texmf-dist/tex/latex/fithesis/locale/mu/sci/fithesis-slovak.def
index 74dfec3e3ec..974d1f46cfb 100644
--- a/Master/texmf-dist/tex/latex/fithesis/locale/mu/sci/fithesis-slovak.def
+++ b/Master/texmf-dist/tex/latex/fithesis/locale/mu/sci/fithesis-slovak.def
@@ -50,9 +50,15 @@
%% The names of the source files used are shown above.
%%
-\ProvidesFile{fithesis/locale/mu/sci/fithesis-slovak.def}[2015/06/26]
+\ProvidesFile{fithesis/locale/mu/sci/fithesis-slovak.def}[2017/05/21]
\gdef\thesis@slovak@facultyName{Prírodovedecká fakulta}
+
+\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
\endinput
%%
%% End of file `mu/sci/fithesis-slovak.def'.
diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-base-color.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-base-color.pdf
index 3909cdff49d..629c9afa0b3 100644
--- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-base-color.pdf
+++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-base-color.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-base.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-base.pdf
index 002fbbb3f14..d3d9baab2e9 100644
--- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-base.pdf
+++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-base.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-econ-color.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-econ-color.pdf
index 7ee285dc6e8..64d745802dd 100644
--- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-econ-color.pdf
+++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-econ-color.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-econ.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-econ.pdf
index fb3ea46209c..f232a9e0525 100644
--- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-econ.pdf
+++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-econ.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fi-color.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fi-color.pdf
index 97dc5ad3de6..bbc0e3edab4 100644
--- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fi-color.pdf
+++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fi-color.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fi.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fi.pdf
index d8aa1c2fc69..f22e6b1e7b5 100644
--- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fi.pdf
+++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fi.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fsps-color.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fsps-color.pdf
index c802ca57248..7211bca4e0b 100644
--- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fsps-color.pdf
+++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fsps-color.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fsps.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fsps.pdf
index ad7521f7a3f..c3417d05192 100644
--- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fsps.pdf
+++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fsps.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fss-color.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fss-color.pdf
index 41c62081b11..04f50c5161c 100644
--- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fss-color.pdf
+++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fss-color.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fss.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fss.pdf
index 5ce4989d33e..8aab1300b95 100644
--- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fss.pdf
+++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fss.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-law-color.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-law-color.pdf
index bae66eef509..384a9b086ef 100644
--- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-law-color.pdf
+++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-law-color.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-law.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-law.pdf
index 019a8abfd3d..8ff53737f43 100644
--- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-law.pdf
+++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-law.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-med-color.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-med-color.pdf
index e66cbaa7178..54859508f78 100644
--- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-med-color.pdf
+++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-med-color.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-med.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-med.pdf
index 664148cbcbf..9c2a6187a36 100644
--- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-med.pdf
+++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-med.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-ped-color.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-ped-color.pdf
index 247ea2f725e..da3c873d3d2 100644
--- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-ped-color.pdf
+++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-ped-color.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-ped.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-ped.pdf
index b7a280fe6b2..0e9e98ee34b 100644
--- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-ped.pdf
+++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-ped.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-phil-color.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-phil-color.pdf
index 28123e82e9e..c41033f719b 100644
--- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-phil-color.pdf
+++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-phil-color.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-phil.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-phil.pdf
index 78305482091..020c703185a 100644
--- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-phil.pdf
+++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-phil.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-sci-color.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-sci-color.pdf
index 6bb868ae327..9460814c020 100644
--- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-sci-color.pdf
+++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-sci-color.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-sci.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-sci.pdf
index 3e4c2975714..886f6862640 100644
--- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-sci.pdf
+++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-sci.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-base.sty b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-base.sty
index a544a3f0ad4..58978444cf2 100644
--- a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-base.sty
+++ b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-base.sty
@@ -49,7 +49,7 @@
%%
%% The names of the source files used are shown above.
%%
-\ProvidesPackage{fithesis/style/mu/fithesis-base}[2016/06/06]
+\ProvidesPackage{fithesis/style/mu/fithesis-base}[2017/06/02]
\NeedsTeXFormat{LaTeX2e}
\DeclareOption{10pt}{\def\thesis@ptsize{0}}
\DeclareOption{11pt}{\def\thesis@ptsize{1}}
@@ -240,8 +240,11 @@
\def\thesis@blocks@clear{%
\ifthesis@twoside@
\clearpage
- \thispagestyle{empty}%
- \cleardoublepage
+ \ifodd\value{page}\else%
+ \thispagestyle{empty}%
+ \hbox{}%
+ \newpage
+ \fi
\else
\newpage
\fi}
@@ -384,8 +387,9 @@
\fi}
\def\thesis@blocks@abstract{%
\begin{alwayssingle}%
- % Start the new chapter without clearing the right page
- {\def\cleardoublepage{}
+ % Start the new chapter without clearing the left page.
+ \clearpage
+ {\let\thesis@blocks@clear\relax
\chapter*{\thesis@@{abstractTitle}}}%
\noindent\thesis@abstract
\par\vfil\null
@@ -394,17 +398,19 @@
\ifthesis@english\else
{\thesis@selectLocale{english}%
\begin{alwayssingle}%
- % Start the new chapter without clearing the right page
- {\def\cleardoublepage{}%
- \chapter*{\thesis@english@abstractTitle}%
- \thesis@abstractEn}%
+ % Start the new chapter without clearing the left page.
+ \clearpage
+ {\let\thesis@blocks@clear\relax
+ \chapter*{\thesis@english@abstractTitle}}%
+ \noindent\thesis@abstractEn
\par\vfil\null
\end{alwayssingle}}%
\fi}
\def\thesis@blocks@keywords{%
\begin{alwayssingle}%
- % Start the new chapter without clearing the right page
- {\def\cleardoublepage{}%
+ % Start the new chapter without clearing the left page.
+ \clearpage
+ {\let\thesis@blocks@clear\relax
\chapter*{\thesis@@{keywordsTitle}}%
\noindent\thesis@TeXkeywords}%
\par\vfil\null
@@ -413,10 +419,11 @@
\ifthesis@english\else
{\thesis@selectLocale{english}%
\begin{alwayssingle}%
- % Start the new chapter without clearing the right page
- {\def\cleardoublepage{}%
- \chapter*{\thesis@english@keywordsTitle}%
- \thesis@TeXkeywordsEn}%
+ % 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
\end{alwayssingle}}%
\fi}
@@ -554,7 +561,7 @@
\bfseries % \chapter (0)
\or
\slshape % \section (1)
-\else
+ \else
\rmfamily % \subsection (2), \subsubsection (3)
% \paragraph, \subparagraph (4)
\fi}
diff --git a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-econ.sty b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-econ.sty
index 7cfa25d43dd..a5b318f357e 100644
--- a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-econ.sty
+++ b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-econ.sty
@@ -50,7 +50,7 @@
%% The names of the source files used are shown above.
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{fithesis/style/mu/fithesis-econ}[2016/04/18]
+\ProvidesPackage{fithesis/style/mu/fithesis-econ}[2017/05/21]
\thesis@color@setup{
links={HTML}{F27995},
tableEmph={HTML}{E8B88B},
@@ -62,6 +62,7 @@
\thesis@bibliography@load
\thesis@require{tikz}
\thesis@require{geometry}
+\thesis@require{array}
\geometry{top=25mm,bottom=20mm,left=25mm,right=25mm,includeheadfoot}
\def\thesis@blocks@cover{%
\ifthesis@cover@
@@ -140,17 +141,81 @@
\addcontentsline{toc}{chapter}{\listfigurename}%
\listoffigures}
\fi
+\def\thesis@blocks@declaration{%
+ \begin{alwayssingle}%
+ \thesis@blocks@clear
+ \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}}
+\def\thesis@blocks@abstract{%
+ \begin{alwayssingle}%
+ \vskip 40\p@
+ {\let\thesis@blocks@clear\relax
+ \chapter*{\thesis@@{abstractTitle}}}%
+ \noindent\thesis@abstract
+ \end{alwayssingle}}
+\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}
+\def\thesis@blocks@keywords{%
+ \begin{alwayssingle}%
+ \vskip 40\p@
+ {\let\thesis@blocks@clear\relax
+ \chapter*{\thesis@@{keywordsTitle}}%
+ \noindent\thesis@TeXkeywords}%
+ \end{alwayssingle}}
+\def\thesis@blocks@keywordsEn{%
+ \ifthesis@english\else
+ {\thesis@selectLocale{english}%
+ \begin{alwayssingle}%
+ \vskip 20\p@
+ {\let\thesis@blocks@clear\relax%
+ \chapter*{\thesis@english@keywordsTitle}}%
+ \noindent\thesis@TeXkeywordsEn
+ \end{alwayssingle}}%
+ \fi}
+\def\thesis@blocks@bibEntry{%
+ \thesis@blocks@clear
+ \noindent\begin{thesis@newtable@old}{@{}>{\bfseries}ll@{}}
+ \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}}
\def\thesis@blocks@preamble{%
\thesis@blocks@coverMatter
\thesis@blocks@cover
\thesis@blocks@frontMatter
\thesis@blocks@titlePage
\thesis@blocks@assignment
- \thesis@blocks@clearRight
- \thesis@blocks@abstract
- \thesis@blocks@abstractEn
- \thesis@blocks@keywords
- \thesis@blocks@keywordsEn
+ \thesis@blocks@bibEntry
+ \thesis@blocks@abstract
+ \thesis@blocks@abstractEn
+ \thesis@blocks@keywords
+ \thesis@blocks@keywordsEn
\thesis@blocks@declaration
\thesis@blocks@thanks
\thesis@blocks@toc}
diff --git a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-fsps.sty b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-fsps.sty
index b3d6bd4325c..d127f973dd5 100644
--- a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-fsps.sty
+++ b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-fsps.sty
@@ -50,7 +50,7 @@
%% The names of the source files used are shown above.
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{fithesis/style/mu/fithesis-fsps}[2017/05/15]
+\ProvidesPackage{fithesis/style/mu/fithesis-fsps}[2017/05/21]
\thesis@color@setup{
links={HTML}{93BCF5},
tableEmph={HTML}{A8BDE3},
diff --git a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-law.sty b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-law.sty
index 73a6c529d24..84e6d86c2b1 100644
--- a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-law.sty
+++ b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-law.sty
@@ -50,7 +50,7 @@
%% The names of the source files used are shown above.
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{fithesis/style/mu/fithesis-law}[2016/04/18]
+\ProvidesPackage{fithesis/style/mu/fithesis-law}[2017/05/21]
\thesis@color@setup{
links={HTML}{CF86EB},
tableEmph={HTML}{D39BE8},
diff --git a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-med.sty b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-med.sty
index 95a6e41eb3e..0d64203b392 100644
--- a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-med.sty
+++ b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-med.sty
@@ -50,7 +50,7 @@
%% The names of the source files used are shown above.
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{fithesis/style/mu/fithesis-med}[2016/04/18]
+\ProvidesPackage{fithesis/style/mu/fithesis-med}[2017/05/21]
\thesis@color@setup{
links={HTML}{F58E76},
tableEmph={HTML}{FF9D85},
diff --git a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-sci.sty b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-sci.sty
index 53d383b639f..3aeb70ba081 100644
--- a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-sci.sty
+++ b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-sci.sty
@@ -50,7 +50,7 @@
%% The names of the source files used are shown above.
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{fithesis/style/mu/fithesis-sci}[2016/06/06]
+\ProvidesPackage{fithesis/style/mu/fithesis-sci}[2017/06/02]
\thesis@color@setup{
links={HTML}{20E366},
tableEmph={HTML}{8EDEAA},
@@ -61,6 +61,31 @@
sorting=none}
\thesis@bibliography@load
\thesis@requireLocale{czech}
+\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
+\newif\ifthesis@abstractonsinglepage@
+\DeclareOption{abstractonsinglepage}{\thesis@abstractonsinglepage@true}
+\ifthesis@czech\else\ifthesis@english\else
+ \ExecuteOptions{abstractonsinglepage}
+\fi\fi
+\ProcessOptions*
\thesis@require{tikz}
\thesis@require{changepage}
\ifx\thesis@type\thesis@bachelors\else
@@ -70,32 +95,38 @@
\thesis@blocks@assignment@hideIfDigital@false
\def\thesis@blocks@bibEntry{%
\begin{alwayssingle}%
- {% Start the new chapter without clearing the right page
- {\def\cleardoublepage{}%
- \chapter*{\thesis@czech@bib@title}}%
- % Calculate the width of the columns
+ % 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@czech@bib@author:}}
+ \bf\thesis@@{bib@author}:}}
\let\@B\relax\newlength{\@B}\settowidth{\@B}{{%
- \bf\thesis@czech@bib@thesisTitle:}}
+ \bf\thesis@@{bib@thesisTitle}:}}
\let\@C\relax\newlength{\@C}\settowidth{\@C}{{%
- \bf\thesis@czech@bib@programme:}}
+ \bf\thesis@@{bib@programme}:}}
\let\@D\relax\newlength{\@D}\settowidth{\@D}{{%
- \bf\thesis@czech@bib@field:}}
+ \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@czech@bib@advisor:}}
+ \settowidth{\@E}{{\bf\thesis@@{bib@advisor}:}}
\fi
\let\@F\relax\newlength{\@F}\settowidth{\@F}{{%
- \bf\thesis@czech@bib@academicYear:}}
+ \bf\thesis@@{bib@academicYear}:}}
\let\@G\relax\newlength{\@G}\settowidth{\@G}{{%
- \bf\thesis@czech@bib@pages:}}
+ \bf\thesis@@{bib@pages}:}}
\let\@H\relax\newlength{\@H}\settowidth{\@H}{{%
- \bf\thesis@czech@bib@keywords:}}
+ \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)}
@@ -105,113 +136,253 @@
\renewcommand{\arraystretch}{2}
\noindent\begin{thesis@newtable@old}%
{@{}p{\@left}@{\hskip\@skip}p{\@right}@{}}
- \textbf{\thesis@czech@bib@author:} &
+ \textbf{\thesis@@{bib@author}:} &
\noindent\parbox[t]{\@right}{
\thesis@author\\
- \thesis@czech@facultyName,
- \thesis@czech@universityName\\
+ \thesis@@{facultyName},
+ \thesis@@{universityName}\\
\thesis@department@name
}\\
- \textbf{\thesis@czech@bib@thesisTitle:}
+ \textbf{\thesis@@{bib@thesisTitle}:}
& \thesis@title \\
- \textbf{\thesis@czech@bib@programme:}
+ \textbf{\thesis@@{bib@programme}:}
& \thesis@programme \\
- \textbf{\thesis@czech@bib@field:}
+ \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@czech@bib@advisor:}
+ \textbf{\thesis@@{bib@advisor}:}
& \thesis@advisor \\
\fi
- \textbf{\thesis@czech@bib@academicYear:}
+ \textbf{\thesis@@{bib@academicYear}:}
& \thesis@academicYear \\
- \textbf{\thesis@czech@bib@pages:}
- & \thesis@pages \\
- \textbf{\thesis@czech@bib@keywords:}
+ \textbf{\thesis@@{bib@pages}:}
+ & \thesis@pages@preamble{} + \thesis@pages \\
+ \textbf{\thesis@@{bib@keywords}:}
& \thesis@TeXkeywords \\
\end{thesis@newtable@old}}
\end{alwayssingle}}
\def\thesis@blocks@bibEntryEn{%
- {\thesis@selectLocale{english}
- \begin{alwayssingle}
- % Start the new chapter without clearing the right page
- {\def\cleardoublepage{}%
- \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}%
+ \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}
+\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
- \settowidth{\@E}{{\bf\thesis@english@bib@advisor:}}
+ % Start the new chapter without clearing the left page.
+ \thesis@blocks@clearRight
\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 \\
+ {\let\thesis@blocks@clear\relax
+ \chapter*{\thesis@czech@abstractTitle}%
+ \thesis@extra@abstractCs}%
+ \par\vfil\null
+ \end{alwayssingle}}%
+ \fi}
+\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}
+\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
- \textbf{\thesis@english@bib@academicYear:}
- & \thesis@academicYear \\
- \textbf{\thesis@english@bib@pages:}
- & \thesis@pages \\
- \textbf{\thesis@english@bib@keywords:}
- & \thesis@TeXkeywordsEn \\
- \end{thesis@newtable@old}}
- \end{alwayssingle}
- }}
+ \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}
\def\thesis@blocks@frontMatter{%
+ \thesis@blocks@clear
\pagestyle{empty}
\parindent 1.5em
\setcounter{page}{1}
\pagenumbering{roman}}
-\def\thesis@blocks@cover{%
+\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}
- \thispagestyle{empty}
\begin{center}
{\sc\thesis@titlePage@LARGE\thesis@czech@universityName\\%
\thesis@titlePage@Large\thesis@czech@facultyName\\[0.3em]%
- \thesis@titlePage@large\thesis@department@name}
+ \thesis@titlePage@normalsize\thesis@extra@departmentCs}
\vfill
{\bf\thesis@titlePage@Huge\thesis@czech@typeName}
\vfill
@@ -219,11 +390,18 @@
\ \thesis@year\hfill\thesis@author}
\end{center}
\end{alwayssingle}
- \fi}
-\def\thesis@blocks@titlePage{%
+ \fi}}
+\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}
- \thispagestyle{empty}
% The top of the page
\begin{adjustwidth}{-12mm}{}
\begin{minipage}{30mm}
@@ -232,7 +410,7 @@
\begin{center}
{\sc\thesis@titlePage@LARGE\thesis@czech@universityName\\%
\thesis@titlePage@Large\thesis@czech@facultyName\\[0.3em]%
- \thesis@titlePage@normalsize\thesis@department@name}
+ \thesis@titlePage@normalsize\thesis@extra@departmentCs}
\rule{\textwidth}{2pt}\vspace*{2mm}
\end{center}
\end{minipage}\begin{minipage}{30mm}
@@ -242,7 +420,7 @@
% The middle of the page
\vfill
\parbox\textwidth{% Prevent vfills from squashing the leading
- \bf\thesis@titlePage@Huge\thesis@TeXtitle}
+ \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\\}
@@ -255,38 +433,58 @@
\thesis@czech@advisorTitle: \thesis@advisor\hfill
\fi
\thesis@place\ \thesis@year}
- \end{alwayssingle}}
-\def\thesis@blocks@declaration{%
+ \end{alwayssingle}}}
+\def\thesis@blocks@thanks{%
\thesis@blocks@clear
+ \ifx\thesis@thanks\undefined\else
+ \begin{alwayssingle}%
+ \chapter*{\thesis@@{thanksTitle}}%
+ \leavevmode\thesis@thanks
+ \end{alwayssingle}%
+ \fi}
+\def\thesis@blocks@declaration{%
\begin{alwayssingle}%
- \chapter*{\thesis@@{declarationTitle}}%
+ \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@czech@formattedDate\hfill
+ \noindent\thesis@place, \thesis@@{formattedDate}\hfill
\begin{minipage}[t]{\@A}%
\centering\rule{\@A}{1pt}\\
\thesis@@{authorSignature}\par
\end{minipage}}
\end{alwayssingle}}
-\def\thesis@blocks@preamble{{%
- \thesis@selectLocale{czech}%
+\def\thesis@blocks@preamble{
\thesis@blocks@coverMatter
\thesis@blocks@cover
\thesis@blocks@frontMatter
\thesis@blocks@titlePage
\thesis@blocks@clearRight
+ \thesis@blocks@bibEntryCs
\thesis@blocks@bibEntry
\thesis@blocks@bibEntryEn
- \thesis@blocks@abstract
- \thesis@blocks@abstractEn}
+ \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@tables}}
+ \thesis@blocks@clear
+ \pagestyle{plain}%
+ \thesis@blocks@tables}}
\def\thesis@blocks@postamble{%
\thesis@blocks@bibliography}
\endinput