texlive[44472] Master/texmf-dist: fithesis (5jun17)
commits+karl at tug.org
commits+karl at tug.org
Tue Jun 6 01:11:22 CEST 2017
Revision: 44472
http://tug.org/svn/texlive?view=revision&revision=44472
Author: karl
Date: 2017-06-06 01:11:21 +0200 (Tue, 06 Jun 2017)
Log Message:
-----------
fithesis (5jun17)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/fithesis/fithesis.pdf
trunk/Master/texmf-dist/doc/latex/fithesis/guide/mu/econ.pdf
trunk/Master/texmf-dist/doc/latex/fithesis/guide/mu/fi.pdf
trunk/Master/texmf-dist/doc/latex/fithesis/guide/mu/fsps.pdf
trunk/Master/texmf-dist/doc/latex/fithesis/guide/mu/fss.pdf
trunk/Master/texmf-dist/doc/latex/fithesis/guide/mu/law.pdf
trunk/Master/texmf-dist/doc/latex/fithesis/guide/mu/med.pdf
trunk/Master/texmf-dist/doc/latex/fithesis/guide/mu/ped.pdf
trunk/Master/texmf-dist/doc/latex/fithesis/guide/mu/phil.pdf
trunk/Master/texmf-dist/doc/latex/fithesis/guide/mu/sci.pdf
trunk/Master/texmf-dist/source/latex/fithesis/fithesis.dtx
trunk/Master/texmf-dist/source/latex/fithesis/locale/czech.dtx
trunk/Master/texmf-dist/source/latex/fithesis/locale/english.dtx
trunk/Master/texmf-dist/source/latex/fithesis/locale/slovak.dtx
trunk/Master/texmf-dist/source/latex/fithesis/style/mu/base.dtx
trunk/Master/texmf-dist/source/latex/fithesis/style/mu/econ.dtx
trunk/Master/texmf-dist/source/latex/fithesis/style/mu/fsps.dtx
trunk/Master/texmf-dist/source/latex/fithesis/style/mu/law.dtx
trunk/Master/texmf-dist/source/latex/fithesis/style/mu/med.dtx
trunk/Master/texmf-dist/source/latex/fithesis/style/mu/sci.dtx
trunk/Master/texmf-dist/tex/latex/fithesis/fithesis3.cls
trunk/Master/texmf-dist/tex/latex/fithesis/locale/mu/econ/fithesis-czech.def
trunk/Master/texmf-dist/tex/latex/fithesis/locale/mu/econ/fithesis-english.def
trunk/Master/texmf-dist/tex/latex/fithesis/locale/mu/econ/fithesis-slovak.def
trunk/Master/texmf-dist/tex/latex/fithesis/locale/mu/fithesis-czech.def
trunk/Master/texmf-dist/tex/latex/fithesis/locale/mu/fithesis-english.def
trunk/Master/texmf-dist/tex/latex/fithesis/locale/mu/fithesis-slovak.def
trunk/Master/texmf-dist/tex/latex/fithesis/locale/mu/fsps/fithesis-english.def
trunk/Master/texmf-dist/tex/latex/fithesis/locale/mu/med/fithesis-czech.def
trunk/Master/texmf-dist/tex/latex/fithesis/locale/mu/med/fithesis-english.def
trunk/Master/texmf-dist/tex/latex/fithesis/locale/mu/med/fithesis-slovak.def
trunk/Master/texmf-dist/tex/latex/fithesis/locale/mu/ped/fithesis-slovak.def
trunk/Master/texmf-dist/tex/latex/fithesis/locale/mu/sci/fithesis-czech.def
trunk/Master/texmf-dist/tex/latex/fithesis/locale/mu/sci/fithesis-english.def
trunk/Master/texmf-dist/tex/latex/fithesis/locale/mu/sci/fithesis-slovak.def
trunk/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-base-color.pdf
trunk/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-base.pdf
trunk/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-econ-color.pdf
trunk/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-econ.pdf
trunk/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fi-color.pdf
trunk/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fi.pdf
trunk/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fsps-color.pdf
trunk/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fsps.pdf
trunk/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fss-color.pdf
trunk/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fss.pdf
trunk/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-law-color.pdf
trunk/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-law.pdf
trunk/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-med-color.pdf
trunk/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-med.pdf
trunk/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-ped-color.pdf
trunk/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-ped.pdf
trunk/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-phil-color.pdf
trunk/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-phil.pdf
trunk/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-sci-color.pdf
trunk/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-sci.pdf
trunk/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-base.sty
trunk/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-econ.sty
trunk/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-fsps.sty
trunk/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-law.sty
trunk/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-med.sty
trunk/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-sci.sty
Modified: trunk/Master/texmf-dist/doc/latex/fithesis/fithesis.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/fithesis/guide/mu/econ.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/fithesis/guide/mu/fi.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/fithesis/guide/mu/fsps.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/fithesis/guide/mu/fss.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/fithesis/guide/mu/law.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/fithesis/guide/mu/med.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/fithesis/guide/mu/ped.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/fithesis/guide/mu/phil.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/fithesis/guide/mu/sci.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/fithesis/fithesis.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/fithesis/fithesis.dtx 2017-06-05 23:10:52 UTC (rev 44471)
+++ trunk/Master/texmf-dist/source/latex/fithesis/fithesis.dtx 2017-06-05 23:11:21 UTC (rev 44472)
@@ -56,11 +56,12 @@
\gdef\thesis at version@number{#1}
\gdef\thesis at version@date{#2}
\gdef\thesis at version{#2 #1 fithesis3 MU thesis class}}
-\thesis at versiondef{v0.3.44}{2017/05/18}}
+\thesis at versiondef{v0.3.46}{2017/06/02}}
% {\newwrite\f\openout\f=VERSION\write\f{\thesis at 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 at autofalse
\fi}
% \end{macrocode}
-% \end{macro} ^^A The nested \ifthesis at auto macro definition
-% \end{macro} ^^A The \thesissetup macro definition
+% \end{macro}\begin{macro}{\thesis at pages@preamble}
+% The \cs{thesis at 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 at pages@preamble} and \cs{thesis at pages@postamble}
+% macros. The patch was submitted by Juraj Pálenik. [VN]}
+% \begin{macrocode}
+\ifx\thesis at pages@preamble\undefined
+ \def\thesis at pages@preamble{??}\fi
+% \end{macrocode}
+% \end{macro}\begin{macro}{\thesis at pages@postamble}
+% The \cs{thesis at 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 at pages@postamble\undefined
+ \def\thesis at pages@postamble{??}\fi
+% \end{macrocode}
+% \end{macro}
% The \DescribeMacro{\thesis at preamble}|\thesis at preamble|
% and \DescribeMacro{\thesis at postamble}|\thesis at postamble|
% macros temporarily switch to the hyphenation patterns and the
@@ -1290,29 +1314,172 @@
% \DescribeMacro{\thesis at blocks@preamble}|\thesis at blocks@preamble|
% or
% \DescribeMacro{\thesis at blocks@postamble}|\thesis at 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 at preamble| macro clears the
-% page. After leaving the group, the |\thesis at preamble| macro sets
-% up the style of the main matter by expanding the
+% After expanding |\thesis at blocks@preamble| inside a \TeX{} group,
+% the |\thesis at preamble| macro defines the
+% \cs{thesis at pages@preamble} macro, writes the definition to the
+% auxiliary file, and clears the page. After leaving the group,
+% the |\thesis at preamble| sets up the style of the main matter by
+% expanding the
% \DescribeMacro{\thesis at blocks@mainMatter}|\thesis at 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 at preamble{%
{\thesis at selectLocale{\thesis at locale}%
- \thesis at blocks@preamble\clearpage}
+ \thesis at blocks@preamble
+ \gdef\thesis at pages@preamble{\thepage}
+ \write\@auxout{\noexpand\gdef\noexpand
+ \thesis at pages@preamble{\thepage}}
+ \clearpage}
\thesis at blocks@mainMatter}
-\def\thesis at postamble{{%
- \thesis at selectLocale{\thesis at locale}%
+\let\thesis at blocks@preamble\relax
+\let\thesis at blocks@mainMatter\relax
+% \end{macro}
+% Before expanding |\thesis at blocks@postamble| inside a \TeX{}
+% group, the |\thesis at postamble| macro defines the
+% \cs{thesis at pages@postamble} macro, writes the definition to the
+% auxiliary file, and clears the page.
+% \begin{macrocode}
+\def\thesis at postamble{%
+ \gdef\thesis at pages@postamble{\thepage}
+ \write\@auxout{\noexpand\gdef\noexpand
+ \thesis at pages@postamble{\thepage}}
+ {\thesis at selectLocale{\thesis at locale}%
\thesis at blocks@postamble}}
-\let\thesis at blocks@preamble\relax
\let\thesis at blocks@postamble\relax
-\let\thesis at 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 at 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 at 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 at extra@KV at prefix{KV at thesis@extra@}
+\def\thesis at extra@XKV at fams{thesis at extra}
+\long\def\KV at thesis@extra#1{%
+% \end{macrocode}
+% Patch the \textsc{xkeyval} package to support unknown keys.
+% \begin{macrocode}
+ \long\def\XKV at s@tk at ys##1=##2=##3\@nil{%
+ \XKV at g@tkeyname##1=\@nil\XKV at tkey
+ \expandafter\KV@@sp at def\expandafter\XKV at tkey\expandafter{\XKV at tkey}%
+ \ifx\XKV at tkey\@empty
+ \XKV at toks{##2}%
+ \ifcat$\the\XKV at toks$\else
+ \XKV at err{no key specified for value `\the\XKV at toks'}%
+ \fi
+ \else
+ \@expandtwoargs\in@{,\XKV at tkey,}{,\XKV at na,}%
+ \ifin@\else
+ \XKV at knftrue
+ \KV@@sp at def\XKV at tempa{##2}%
+ \ifXKV at preset\XKV at s@tk at ys@{##3}\else
+ \ifXKV at pl
+ \XKV at for@eo\XKV at fams\XKV at tfam{%
+ \XKV at makehd\XKV at tfam
+ \XKV at s@tk at ys@{##3}%
+ }%
+ \else
+ \XKV at whilist\XKV at fams\XKV at tfam\ifXKV at knf\fi{%
+ \XKV at makehd\XKV at tfam
+ \XKV at s@tk at ys@{##3}%
+ }%
+ \fi
+ \fi
+ \ifXKV at knf
+ \ifXKV at inpox
+ \ifx\XKV at doxs\relax
+ \ifx\@currext\@clsextension\else
+ \let\CurrentOption\XKV at tkey\@unknownoptionerror
+ \fi
+ \else\XKV at doxs\fi
+ \else
+ \ifXKV at st
+ \XKV at addtolist@o\XKV at rm\CurrentOption
+ \else
+ \ifx\XKV at fams\thesis at extra@XKV at fams
+ \expandafter\long\expandafter\def\csname%
+ thesis at extra@\XKV at tkey\endcsname{##2}%
+ \else
+ \XKV at err{`\XKV at tkey' undefined in families
+ `\XKV at fams'}%
+ \fi
+ \fi
+ \fi
+ \else
+ \ifXKV at inpox\ifx\XKV at testclass\XKV at documentclass
+ \expandafter\XKV at useoption\expandafter{\CurrentOption}%
+ \fi\fi
+ \fi
+ \fi
+ \fi
+ }%
+ \setkeys{thesis at extra}{#1}%
+ \def\KV at prefix{KV at thesis@}}
+% \end{macrocode}
+% Patch the \textsc{keyval} package to support unknown keys.
+% \begin{macrocode}
+\long\def\KV at split#1=#2=#3\relax{%
+ \KV@@sp at def\@tempa{#1}%
+ \ifx\@tempa\@empty\else
+ \expandafter\let\expandafter\@tempc
+ \csname\KV at prefix\@tempa\endcsname
+ \ifx\@tempc\relax
+ \ifx\KV at prefix\thesis at extra@KV at prefix
+ \KV@@sp at def\@tempb{#2}%
+ \expandafter\let\csname thesis at extra@\@tempa\endcsname
+ \@tempb%
+ \else
+ \KV at errx
+ {\@tempa\space undefined}%
+ \fi
+ \else
+ \ifx\@empty#3\@empty
+ \KV at default
+ \else
+ \KV@@sp at def\@tempb{#2}%
+ \expandafter\@tempc\expandafter{\@tempb}\relax
+ \fi
+ \fi
+ \fi}
+% \end{macrocode}
+% \begin{macro}{\thesis at def@extra}
+% The |\thesis at def@extra|\oarg{definition}\marg{name} macro defines
+% the |\thesis at extra@|\textit{name} macro to expand
+% to either \textit{definition}, if specified, or to
+% |\thesis at placeholder@extra@|\textit{name}, where
+% |\thesis at placeholder@extra@|\textit{name} is defined to expand to
+% <<extra@\textit{name}>>. If |\thesis at extra@|\textit{name} has
+% already been defined by the user, |\thesis at def@extra| has no
+% effect.
+% \begin{macrocode}
+\newcommand{\thesis at def@extra}[2][]{%
+ \expandafter\ifx\csname thesis at extra@#2\endcsname\relax
+ \def\thesis at placeholder@extra{<<extra@#2>>}%
+ \expandafter\let\csname thesis at placeholder@extra@#2\endcsname
+ \thesis at placeholder@extra
+ \def\thesis at arg{#1}%
+ \ifx\empty\thesis at arg
+ \expandafter\let\csname thesis at extra@#2\endcsname
+ \thesis at placeholder@extra
+ \else
+ \expandafter\def\csname thesis at 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 at english| macro.
+% \changes{v0.3.45}{2017/05/23}{Updated the \cs{ifthesis at 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 at english
+ \expandafter\expandafter\expandafter\let\expandafter\expandafter
+ \csname ifthesis at english\endcsname\csname iftrue\endcsname
+\else
+ \expandafter\expandafter\expandafter\let\expandafter\expandafter
+ \csname ifthesis at 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 at style|, do nothing.
% \begin{macrocode}
@@ -1600,8 +1781,8 @@
% \end{macrocode}
% \subsection{General purpose macros}
% The \DescribeMacro{\thesis at pages}|\thesis at 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 at pages\undefined\def\thesis at 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}}
Modified: trunk/Master/texmf-dist/source/latex/fithesis/locale/czech.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/fithesis/locale/czech.dtx 2017-06-05 23:10:52 UTC (rev 44471)
+++ trunk/Master/texmf-dist/source/latex/fithesis/locale/czech.dtx 2017-06-05 23:11:21 UTC (rev 44472)
@@ -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 at czech@universityName{Masarykova univerzita}
@@ -150,6 +150,16 @@
% Bibliografický záznam
\gdef\thesis at czech@bib at title{Bibliografický záznam}
\gdef\thesis at czech@bib at pages{str}
+% \end{macrocode}
+% \changes{v0.3.46}{2017/06/02}{Lifted the \texttt{bib at author},
+% \texttt{bib at thesisTitle}, and \texttt{bib at 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 at czech@bib at author\thesis at czech@authorTitle
+\gdef\thesis at czech@bib at thesisTitle{Název práce}
+\global\let\thesis at czech@bib at advisor\thesis at czech@advisorTitle
% Různé
\gdef\thesis at 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 at 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 at czech@facultyName{Ekonomicko-správní fakulta}
+
+% Bibliografický záznam
+% \end{macrocode}
+% \changes{v0.3.46}{2017/06/02}{Defined strings required by
+% \cs{thesis at blocks@bibEntry} from
+% \texttt{style/mu/fithesis-econ.sty} in
+% \texttt{locale/mu/econ/*.def}. [VN]}
+% \begin{macrocode}
+\gdef\thesis at czech@bib at thesisTitleEn{Název práce v angličtině}
+\gdef\thesis at czech@bib at department{Katedra}
+\gdef\thesis at czech@bib at 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 at 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 at def@extra{advisorCsGenitiv}
+\gdef\thesis at czech@declaration{Prohlašuji, že jsem
+ \thesis at lower{czech at typeName@akuzativ} zpracoval%
+ \thesis at czech@gender at koncovka\ samostatně pod vedením
+ \thesis at extra@advisorCsGenitiv\
+ a~uvedl\thesis at czech@gender at 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]
+% Zástupné texty
+\gdef\thesis at czech@facultyName{Lékařská fakulta}
+
% Různé
\gdef\thesis at czech@abstractTitle{Anotace}
-
-% Zástupné texty
-\gdef\thesis at czech@facultyName{Lékařská fakulta}
% \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 at blocks@|\discretionary{}{}{}|bibEntry|
+% required by the |\thesis at 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 at czech@facultyName{Přírodovědecká fakulta}
@@ -404,11 +462,8 @@
citovány.}
% Bibliografický záznam
-\global\let\thesis at czech@bib at author\thesis at czech@authorTitle
-\gdef\thesis at czech@bib at thesisTitle{Název práce}
\gdef\thesis at czech@bib at programme{Studijní program}
\global\let\thesis at czech@bib at field\thesis at czech@fieldTitle
-\global\let\thesis at czech@bib at advisor\thesis at czech@advisorTitle
\gdef\thesis at czech@bib at academicYear{Akademický rok}
\gdef\thesis at czech@bib at pages{Počet stran}
\global\let\thesis at czech@bib at keywords\thesis at czech@keywordsTitle
Modified: trunk/Master/texmf-dist/source/latex/fithesis/locale/english.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/fithesis/locale/english.dtx 2017-06-05 23:10:52 UTC (rev 44471)
+++ trunk/Master/texmf-dist/source/latex/fithesis/locale/english.dtx 2017-06-05 23:11:21 UTC (rev 44472)
@@ -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 at english@universityName{Masaryk University}
\gdef\thesis at english@declaration{%
Hereby I declare that this paper is my original authorial work,
@@ -115,6 +115,16 @@
% Bibliographic entry
\gdef\thesis at english@bib at title{Bibliographic record}
\gdef\thesis at english@bib at pages{p}
+% \end{macrocode}
+% \changes{v0.3.46}{2017/06/02}{Lifted the \texttt{bib at author},
+% \texttt{bib at thesisTitle}, and \texttt{bib at 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 at english@bib at author\thesis at english@authorTitle
+\gdef\thesis at english@bib at thesisTitle{Title of Thesis}
+\gdef\thesis at english@bib at advisor{Supervisor}
% Miscellaneous
\gdef\thesis at 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 at 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 at 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 at english@facultyName{Faculty of Economics
and Administration}
+
+% Bibliographic entry
+% \end{macrocode}
+% \changes{v0.3.46}{2017/06/02}{Defined strings required by
+% \cs{thesis at blocks@bibEntry} from
+% \texttt{style/mu/fithesis-econ.sty} in
+% \texttt{locale/mu/econ/*.def}. [VN]}
+% \begin{macrocode}
+\gdef\thesis at english@bib at department{Department}
+\gdef\thesis at english@bib at 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 at 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]
+% Placeholders
+\gdef\thesis at english@facultyName{Faculty of Medicine}
+
% Miscellaneous
\gdef\thesis at english@abstractTitle{Annotation}
-
-% Placeholders
-\gdef\thesis at english@facultyName{Faculty of Medicine}
% \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 at english@facultyName{Faculty of Science}
@@ -309,11 +343,8 @@
\global\let\thesis at english@advisorTitleEn=\thesis at english@bib at advisor
% Bibliographic entry
-\global\let\thesis at english@bib at author\thesis at english@authorTitle
-\gdef\thesis at english@bib at thesisTitle{Title of Thesis}
\gdef\thesis at english@bib at programme{Degree Programme}
\global\let\thesis at english@bib at field\thesis at english@fieldTitle
-\gdef\thesis at english@bib at advisor{Supervisor}
\gdef\thesis at english@bib at academicYear{Academic Year}
\gdef\thesis at english@bib at pages{Number of Pages}
\global\let\thesis at english@bib at keywords\thesis at english@keywordsTitle
Modified: trunk/Master/texmf-dist/source/latex/fithesis/locale/slovak.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/fithesis/locale/slovak.dtx 2017-06-05 23:10:52 UTC (rev 44471)
+++ trunk/Master/texmf-dist/source/latex/fithesis/locale/slovak.dtx 2017-06-05 23:11:21 UTC (rev 44472)
@@ -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 at slovak@universityName{Masarykova univerzita}
@@ -147,9 +147,19 @@
\thesis at slovak@gender at koncovka\ samostatne len s~použitím
uvedenej literatúry a prameňov.}
-% Bibliografický zoznam
+% Bibliografický záznam
\gdef\thesis at slovak@bib at title{Bibliografický záznam}
\gdef\thesis at slovak@bib at pages{str}
+% \end{macrocode}
+% \changes{v0.3.46}{2017/06/02}{Lifted the \texttt{bib at author},
+% \texttt{bib at thesisTitle}, and \texttt{bib at 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 at slovak@bib at author\thesis at slovak@authorTitle
+\gdef\thesis at slovak@bib at thesisTitle{Názov práce}
+\global\let\thesis at slovak@bib at advisor\thesis at slovak@advisorTitle
% Rôzne
\gdef\thesis at 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 at 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 at slovak@facultyName{Ekonomicko-správna fakulta}
+
+% Bibliografický záznam
+% \end{macrocode}
+% \changes{v0.3.46}{2017/06/02}{Defined strings required by
+% \cs{thesis at blocks@bibEntry} from
+% \texttt{style/mu/fithesis-econ.sty} in
+% \texttt{locale/mu/econ/*.def}. [VN]}
+% \begin{macrocode}
+\gdef\thesis at slovak@bib at thesisTitleEn{Názov práce v angličtine}
+\gdef\thesis at slovak@bib at department{Katedra}
+\gdef\thesis at slovak@bib at 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 at 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 at def@extra{advisorSkGenitiv}
+\gdef\thesis at slovak@declaration{Vyhlasujem, že som
+ \thesis at lower{slovak at typeName@akuzativ} spracoval%
+ \thesis at slovak@gender at koncovka\ samostatne pod vedením
+ \thesis at extra@advisorSkGenitiv\
+ a~uved\ifthesis at 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]
+% Zástupné texty
+\gdef\thesis at slovak@facultyName{Lekárska fakulta}
+
% Rôzne
\gdef\thesis at slovak@abstractTitle{Anotácie}
-
-% Zástupné texty
-\gdef\thesis at slovak@facultyName{Lekárska fakulta}
% \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 at 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 at 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 at slovak@facultyName{Prírodovedecká fakulta}
+
+% Bibliografický záznam
+\gdef\thesis at slovak@bib at programme{Študijný program}
+\global\let\thesis at slovak@bib at field\thesis at slovak@fieldTitle
+\gdef\thesis at slovak@bib at academicYear{Akademický rok}
+\gdef\thesis at slovak@bib at pages{Počet strán}
+\global\let\thesis at slovak@bib at keywords\thesis at slovak@keywordsTitle
% \end{macrocode}\iffalse
%</mu/sci>
% \fi
Modified: trunk/Master/texmf-dist/source/latex/fithesis/style/mu/base.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/fithesis/style/mu/base.dtx 2017-06-05 23:10:52 UTC (rev 44471)
+++ trunk/Master/texmf-dist/source/latex/fithesis/style/mu/base.dtx 2017-06-05 23:11:21 UTC (rev 44472)
@@ -7,7 +7,7 @@
% after \texttt{style/fithesis-base.sty}, regardless of the value
% of the |\thesis at 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 at 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 at 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 at blocks@clear{%
\ifthesis at 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 at 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 at blocks@clear\relax
\chapter*{\thesis@@{abstractTitle}}}%
\noindent\thesis at abstract
\par\vfil\null
@@ -853,15 +861,19 @@
% The |\thesis at 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 at blocks@abstractEn} in
+% \texttt{style/mu/fithesis-base.sty}. [VN]}
% \begin{macrocode}
\def\thesis at blocks@abstractEn{%
\ifthesis at english\else
{\thesis at selectLocale{english}%
\begin{alwayssingle}%
- % Start the new chapter without clearing the right page
- {\def\cleardoublepage{}%
- \chapter*{\thesis at english@abstractTitle}%
- \thesis at abstractEn}%
+ % Start the new chapter without clearing the left page.
+ \clearpage
+ {\let\thesis at blocks@clear\relax
+ \chapter*{\thesis at english@abstractTitle}}%
+ \noindent\thesis at abstractEn
\par\vfil\null
\end{alwayssingle}}%
\fi}
@@ -872,8 +884,9 @@
% \begin{macrocode}
\def\thesis at 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 at blocks@clear\relax
\chapter*{\thesis@@{keywordsTitle}}%
\noindent\thesis at TeXkeywords}%
\par\vfil\null
@@ -883,15 +896,19 @@
% The |\thesis at 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 at blocks@keywordsEn} in
+% \texttt{style/mu/fithesis-base.sty}. [VN]}
% \begin{macrocode}
\def\thesis at blocks@keywordsEn{%
\ifthesis at english\else
{\thesis at selectLocale{english}%
\begin{alwayssingle}%
- % Start the new chapter without clearing the right page
- {\def\cleardoublepage{}%
- \chapter*{\thesis at english@keywordsTitle}%
- \thesis at TeXkeywordsEn}%
+ % Start the new chapter without clearing the left page.
+ \clearpage
+ {\let\thesis at blocks@clear\relax%
+ \chapter*{\thesis at english@keywordsTitle}}%
+ \noindent\thesis at 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}
Modified: trunk/Master/texmf-dist/source/latex/fithesis/style/mu/econ.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/fithesis/style/mu/econ.dtx 2017-06-05 23:10:52 UTC (rev 44471)
+++ trunk/Master/texmf-dist/source/latex/fithesis/style/mu/econ.dtx 2017-06-05 23:11:21 UTC (rev 44472)
@@ -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 at require{tikz}
\thesis at require{geometry}
+\thesis at require{array}
\geometry{top=25mm,bottom=20mm,left=25mm,right=25mm,includeheadfoot}
% \end{macrocode}
% \begin{macro}{\thesis at blocks@cover}
@@ -159,6 +165,137 @@
\listoffigures}
\fi
% \end{macrocode}
+% \begin{macro}{\thesis at blocks@declaration}
+% The |\thesis at blocks@declaration| macro typesets the declaration
+% text. Unlike the generic |\thesis at 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 at 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 at blocks@declaration{%
+ \begin{alwayssingle}%
+ \thesis at blocks@clear
+ \leavevmode\vfill
+ % Start the new chapter without clearing any page.
+ {\let\thesis at blocks@clear\relax
+ \chapter*{\thesis@@{declarationTitle}}}%
+ \thesis at declaration
+ \vskip 2cm%
+ {\let\@A\relax\newlength{\@A}
+ \settowidth{\@A}{\thesis@@{authorSignature}}
+ \setlength{\@A}{\@A+1cm}
+ \noindent\thesis at 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 at blocks@abstract}
+% \changes{v0.3.46}{2017/06/02}{Redefined
+% \cs{thesis at blocks@abstract}, \cs{thesis at blocks@abstractEn},
+% \cs{thesis at blocks@keywords}, and \cs{thesis at 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 at blocks@abstract| macro typesets the
+% abstract. This definition typesets the abstract on the same page.
+% \begin{macrocode}
+\def\thesis at blocks@abstract{%
+ \begin{alwayssingle}%
+ \vskip 40\p@
+ {\let\thesis at blocks@clear\relax
+ \chapter*{\thesis@@{abstractTitle}}}%
+ \noindent\thesis at abstract
+ \end{alwayssingle}}
+% \end{macrocode}
+% \end{macro}\begin{macro}{\thesis at blocks@abstractEn}
+% The |\thesis at 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 at blocks@abstractEn{%
+ \ifthesis at english\else
+ {\thesis at selectLocale{english}%
+ \begin{alwayssingle}%
+ \vskip 20\p@
+ {\let\thesis at blocks@clear\relax
+ \chapter*{\thesis at english@abstractTitle}}%
+ \noindent\thesis at abstractEn
+ \end{alwayssingle}}%
+ \fi}
+% \end{macrocode}
+% \end{macro}\begin{macro}{\thesis at blocks@keywords}
+% The |\thesis at blocks@keywords| macro typesets the keywords. This
+% definition typesets the keywords on the same page.
+% \begin{macrocode}
+\def\thesis at blocks@keywords{%
+ \begin{alwayssingle}%
+ \vskip 40\p@
+ {\let\thesis at blocks@clear\relax
+ \chapter*{\thesis@@{keywordsTitle}}%
+ \noindent\thesis at TeXkeywords}%
+ \end{alwayssingle}}
+% \end{macrocode}
+% \end{macro}\begin{macro}{\thesis at blocks@keywordsEn}
+% The |\thesis at blocks@keywordsEn| macro typesets the keywords in
+% English. If the current locale is English, the macro produces no
+% output.
+% \begin{macrocode}
+\def\thesis at blocks@keywordsEn{%
+ \ifthesis at english\else
+ {\thesis at selectLocale{english}%
+ \begin{alwayssingle}%
+ \vskip 20\p@
+ {\let\thesis at blocks@clear\relax%
+ \chapter*{\thesis at english@keywordsTitle}}%
+ \noindent\thesis at TeXkeywordsEn
+ \end{alwayssingle}}%
+ \fi}
+% \end{macrocode}
+% \end{macro}\begin{macro}{\thesis at blocks@bibEntry}
+% The |\thesis at 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 at author| -- The label of the
+% author name entry
+% \item|\thesis@|\textit{locale}|@bib at title| -- The label of the
+% title name entry
+% \item|\thesis@|\textit{locale}|@bib at titleEn| -- The label of the
+% English title name entry (\cs{thesis at english@bib at titleEn}
+% does not need to be defined)
+% \item|\thesis@|\textit{locale}|@bib at department| -- The label of
+% the department name entry
+% \item|\thesis@|\textit{locale}|@bib at advisor| -- The label of
+% the advisor name entry
+% \item|\thesis@|\textit{locale}|@bib at year| -- The label of the
+% year entry
+% \end{itemize}
+% \changes{v0.3.46}{2017/06/02}{Defined \cs{thesis at 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 at blocks@bibEntry{%
+ \thesis at blocks@clear
+ \noindent\begin{thesis at newtable@old}{@{}>{\bfseries}ll@{}}
+ \thesis@@{bib at author}: & \thesis at author \\
+ \thesis@@{bib at thesisTitle}: & \thesis at title \\
+ \ifthesis at english\else
+ \thesis@@{bib at thesisTitleEn}: & \thesis at titleEn \\
+ \fi
+ \thesis@@{bib at department}: & \thesis at department \\
+ \thesis@@{bib at advisor}: & \thesis at advisor \\
+ \thesis@@{bib at year}: & \thesis at year \\
+ \end{thesis at 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 at blocks@frontMatter
\thesis at blocks@titlePage
\thesis at blocks@assignment
- \thesis at blocks@clearRight
- \thesis at blocks@abstract
- \thesis at blocks@abstractEn
- \thesis at blocks@keywords
- \thesis at blocks@keywordsEn
+ \thesis at blocks@bibEntry
+ \thesis at blocks@abstract
+ \thesis at blocks@abstractEn
+ \thesis at blocks@keywords
+ \thesis at blocks@keywordsEn
\thesis at blocks@declaration
\thesis at blocks@thanks
\thesis at blocks@toc}
Modified: trunk/Master/texmf-dist/source/latex/fithesis/style/mu/fsps.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/fithesis/style/mu/fsps.dtx 2017-06-05 23:10:52 UTC (rev 44471)
+++ trunk/Master/texmf-dist/source/latex/fithesis/style/mu/fsps.dtx 2017-06-05 23:11:21 UTC (rev 44472)
@@ -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
Modified: trunk/Master/texmf-dist/source/latex/fithesis/style/mu/law.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/fithesis/style/mu/law.dtx 2017-06-05 23:10:52 UTC (rev 44471)
+++ trunk/Master/texmf-dist/source/latex/fithesis/style/mu/law.dtx 2017-06-05 23:11:21 UTC (rev 44472)
@@ -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
Modified: trunk/Master/texmf-dist/source/latex/fithesis/style/mu/med.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/fithesis/style/mu/med.dtx 2017-06-05 23:10:52 UTC (rev 44471)
+++ trunk/Master/texmf-dist/source/latex/fithesis/style/mu/med.dtx 2017-06-05 23:11:21 UTC (rev 44472)
@@ -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
Modified: trunk/Master/texmf-dist/source/latex/fithesis/style/mu/sci.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/fithesis/style/mu/sci.dtx 2017-06-05 23:10:52 UTC (rev 44471)
+++ trunk/Master/texmf-dist/source/latex/fithesis/style/mu/sci.dtx 2017-06-05 23:11:21 UTC (rev 44472)
@@ -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 at requireLocale{czech}
% \end{macrocode}
+% \begin{macro}{\ifthesis at czech}
+% The |\ifthesis at 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 at czech} macro in
+% \texttt{style/mu/fithesis-sci.sty}. The patch was submitted by
+% Juraj Pálenik. [VN]}
+% \begin{macrocode}
+\def\ifthesis at czech{
+ \expandafter\def\expandafter\@czech\expandafter{\string
+ \czech}%
+ \expandafter\expandafter\expandafter\def\expandafter
+ \expandafter\expandafter\@locale\expandafter\expandafter
+ \expandafter{\expandafter\string\csname\thesis at locale\endcsname}%
+ \expandafter\csname\expandafter i\expandafter f\ifx\@locale
+ \@czech
+ true%
+ \else
+ false%
+ \fi\endcsname}
+\ifthesis at czech
+ \expandafter\expandafter\expandafter\let\expandafter\expandafter
+ \csname ifthesis at czech\endcsname\csname iftrue\endcsname
+\else
+ \expandafter\expandafter\expandafter\let\expandafter\expandafter
+ \csname ifthesis at 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 at abstractonsinglepage@
+\DeclareOption{abstractonsinglepage}{\thesis at abstractonsinglepage@true}
+\ifthesis at czech\else\ifthesis at 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,53 +101,53 @@
\thesis at blocks@assignment at hideIfDigital@false
% \end{macrocode}
% \begin{macro}{\thesis at blocks@bibEntry}
-% The |\thesis at 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 at 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 at czech@bib at title}
-% |\thesis at czech@bib at title| -- The title of the entire block
-% \item\DescribeMacro{\thesis at czech@bib at author}
-% |\thesis at czech@bib at author| -- The label of the author name
-% entry
-% \item\DescribeMacro{\thesis at czech@bib at title}
-% |\thesis at czech@bib at title| -- The label of the title name
-% entry
-% \item\DescribeMacro{\thesis at czech@bib at programme}
-% |\thesis at czech@bib at programme| -- The label of the programme
-% name entry
-% \item\DescribeMacro{\thesis at czech@bib at field}
-% |\thesis at czech@bib at field| -- The label of the field of study
-% name entry
-% \item\DescribeMacro{\thesis at czech@bib at advisor}
-% |\thesis at czech@bib at advisor| -- The label of the advisor name
-% entry
-% \item\DescribeMacro{\thesis at czech@bib at academicYear}
-% |\thesis at czech@bib at academicYear| -- The label of the academic
-% year entry
-% \item\DescribeMacro{\thesis at czech@bib at pages}
-% |\thesis at czech@bib at pages| -- The label of the number of pages
-% entry
-% \item\DescribeMacro{\thesis at czech@bib at keywords}
-% |\thesis at czech@bib at keywords| -- The label of the keywords
-% entry
+% \item|\thesis@|\textit{locale}|@bib at title| -- The title of the
+% entire block
+% \item|\thesis@|\textit{locale}|@bib at author| -- The label of the
+% author name entry
+% \item|\thesis@|\textit{locale}|@bib at title| -- The label of the
+% title name entry
+% \item|\thesis@|\textit{locale}|@bib at programme| -- The label of
+% the programme name entry
+% \item|\thesis@|\textit{locale}|@bib at field| -- The label of the
+% field of study name entry
+% \item|\thesis@|\textit{locale}|@bib at advisor| -- The label of
+% the advisor name entry
+% \item|\thesis@|\textit{locale}|@bib at academicYear| -- The label
+% of the academic year entry
+% \item|\thesis@|\textit{locale}|@bib at pages| -- The label of the
+% number of pages entry
+% \item|\thesis@|\textit{locale}|@bib at 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 at blocks@bibEntry{%
\begin{alwayssingle}%
- {% Start the new chapter without clearing the right page
- {\def\cleardoublepage{}%
- \chapter*{\thesis at czech@bib at title}}%
- % Calculate the width of the columns
+ % Clear only the right page, if the main locale is Czech.
+ \ifthesis at czech
+ \begingroup
+ \let\thesis at blocks@clear\thesis at blocks@clearRight
+ \fi
+ \chapter*{\thesis@@{bib at title}}%
+ \ifthesis at czech
+ \endgroup
+ \fi
+ {% Calculate the width of the columns
\let\@A\relax\newlength{\@A}\settowidth{\@A}{{%
- \bf\thesis at czech@bib at author:}}
+ \bf\thesis@@{bib at author}:}}
\let\@B\relax\newlength{\@B}\settowidth{\@B}{{%
- \bf\thesis at czech@bib at thesisTitle:}}
+ \bf\thesis@@{bib at thesisTitle}:}}
\let\@C\relax\newlength{\@C}\settowidth{\@C}{{%
- \bf\thesis at czech@bib at programme:}}
+ \bf\thesis@@{bib at programme}:}}
\let\@D\relax\newlength{\@D}\settowidth{\@D}{{%
- \bf\thesis at czech@bib at field:}}
+ \bf\thesis@@{bib at field}:}}
% Unless this is a rigorous thesis, we will be typesetting the
% name of the thesis advisor.
\let\@E\relax\newlength{\@E}
@@ -107,14 +154,14 @@
\ifx\thesis at type\thesis at rigorous
\setlength{\@E}{0pt}%
\else
- \settowidth{\@E}{{\bf\thesis at czech@bib at advisor:}}
+ \settowidth{\@E}{{\bf\thesis@@{bib at advisor}:}}
\fi
\let\@F\relax\newlength{\@F}\settowidth{\@F}{{%
- \bf\thesis at czech@bib at academicYear:}}
+ \bf\thesis@@{bib at academicYear}:}}
\let\@G\relax\newlength{\@G}\settowidth{\@G}{{%
- \bf\thesis at czech@bib at pages:}}
+ \bf\thesis@@{bib at pages}:}}
\let\@H\relax\newlength{\@H}\settowidth{\@H}{{%
- \bf\thesis at czech@bib at keywords:}}
+ \bf\thesis@@{bib at 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 at newtable@old}%
{@{}p{\@left}@{\hskip\@skip}p{\@right}@{}}
- \textbf{\thesis at czech@bib at author:} &
+ \textbf{\thesis@@{bib at author}:} &
\noindent\parbox[t]{\@right}{
\thesis at author\\
- \thesis at czech@facultyName,
- \thesis at czech@universityName\\
+ \thesis@@{facultyName},
+ \thesis@@{universityName}\\
\thesis at department@name
}\\
- \textbf{\thesis at czech@bib at thesisTitle:}
+ \textbf{\thesis@@{bib at thesisTitle}:}
& \thesis at title \\
- \textbf{\thesis at czech@bib at programme:}
+ \textbf{\thesis@@{bib at programme}:}
& \thesis at programme \\
- \textbf{\thesis at czech@bib at field:}
+ \textbf{\thesis@@{bib at field}:}
& \thesis at field@name \\
% Unless this is a rigorous thesis, typeset the name of the
% thesis advisor.
\ifx\thesis at type\thesis at rigorous\else
- \textbf{\thesis at czech@bib at advisor:}
+ \textbf{\thesis@@{bib at advisor}:}
& \thesis at advisor \\
\fi
- \textbf{\thesis at czech@bib at academicYear:}
+ \textbf{\thesis@@{bib at academicYear}:}
& \thesis at academicYear \\
- \textbf{\thesis at czech@bib at pages:}
- & \thesis at pages \\
- \textbf{\thesis at czech@bib at keywords:}
+ \textbf{\thesis@@{bib at pages}:}
+ & \thesis at pages@preamble{} + \thesis at pages \\
+ \textbf{\thesis@@{bib at keywords}:}
& \thesis at TeXkeywords \\
\end{thesis at newtable@old}}
\end{alwayssingle}}
% \end{macrocode}
% \end{macro}\begin{macro}{\thesis at blocks@bibEntryEn}
-% The |\thesis at 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 at english@bib at title}
-% |\thesis at english@bib at title| -- The title of the entire block
-% \item\DescribeMacro{\thesis at english@bib at author}
-% |\thesis at english@bib at author| -- The label of the author name
-% entry
-% \item\DescribeMacro{\thesis at english@bib at title}
-% |\thesis at english@bib at title| -- The label of the title name
-% entry
-% \item\DescribeMacro{\thesis at english@bib at programme}
-% |\thesis at english@bib at programme| -- The label of the programme
-% name entry
-% \item\DescribeMacro{\thesis at english@bib at field}
-% |\thesis at english@bib at field| -- The label of the field of
-% study name entry
-% \item\DescribeMacro{\thesis at english@bib at advisor}
-% |\thesis at english@bib at advisor| -- The label of the advisor
-% name entry
-% \item\DescribeMacro{\thesis at english@bib at academicYear}
-% |\thesis at english@bib at academicYear| -- The label of the
-% academic year entry
-% \item\DescribeMacro{\thesis at english@bib at pages}
-% |\thesis at english@bib at pages| -- The label of the number of
-% pages entry
-% \item\DescribeMacro{\thesis at english@bib at keywords}
-% |\thesis at english@bib at keywords| -- The label of the keywords
-% entry
+% The |\thesis at blocks@bibEntryEn| macro typesets a bibliographical
+% entry in English unless the current locale is English.
+% \begin{macrocode}
+\def\thesis at blocks@bibEntryEn{%
+ \ifthesis at english\else
+ {\thesis at selectLocale{english}
+ \begin{alwayssingle}
+ \chapter*{\thesis at english@bib at title}%
+ {% Calculate the width of the columns
+ \let\@A\relax\newlength{\@A}\settowidth{\@A}{{%
+ \bf\thesis at english@bib at author:}}
+ \let\@B\relax\newlength{\@B}\settowidth{\@B}{{%
+ \bf\thesis at english@bib at thesisTitle:}}
+ \let\@C\relax\newlength{\@C}\settowidth{\@C}{{%
+ \bf\thesis at english@bib at programme:}}
+ \let\@D\relax\newlength{\@D}\settowidth{\@D}{{%
+ \bf\thesis at english@bib at field:}}
+ % Unless this is a rigorous thesis, we will be typesetting
+ % the name of the thesis advisor.
+ \let\@E\relax\newlength{\@E}
+ \ifx\thesis at type\thesis at rigorous
+ \setlength{\@E}{0pt}%
+ \else
+ \settowidth{\@E}{{\bf\thesis at english@bib at advisor:}}
+ \fi
+ \let\@F\relax\newlength{\@F}\settowidth{\@F}{{%
+ \bf\thesis at english@bib at academicYear:}}
+ \let\@G\relax\newlength{\@G}\settowidth{\@G}{{%
+ \bf\thesis at english@bib at pages:}}
+ \let\@H\relax\newlength{\@H}\settowidth{\@H}{{%
+ \bf\thesis at english@bib at 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 at newtable@old}%
+ {@{}p{\@left}@{\hskip\@skip}p{\@right}@{}}
+ \textbf{\thesis at english@bib at author:} &
+ \noindent\parbox[t]{\@right}{
+ \thesis at author\\
+ \thesis at english@facultyName,
+ \thesis at english@universityName\\
+ \thesis at departmentEn@name
+ }\\
+ \textbf{\thesis at english@bib at thesisTitle:}
+ & \thesis at titleEn \\
+ \textbf{\thesis at english@bib at programme:}
+ & \thesis at programmeEn \\
+ \textbf{\thesis at english@bib at field:}
+ & \thesis at fieldEn@name \\
+ % Unless this is a rigorous thesis, typeset the name of the
+ % thesis advisor.
+ \ifx\thesis at type\thesis at rigorous\else
+ \textbf{\thesis at english@bib at advisor:}
+ & \thesis at advisor \\
+ \fi
+ \textbf{\thesis at english@bib at academicYear:}
+ & \thesis at academicYear \\
+ \textbf{\thesis at english@bib at pages:}
+ & \thesis at pages@preamble{} + \thesis at pages \\
+ \textbf{\thesis at english@bib at keywords:}
+ & \thesis at TeXkeywordsEn \\
+ \end{thesis at newtable@old}}
+ \end{alwayssingle}
+ }%
+ \fi}
+% \end{macrocode}
+% \end{macro}\begin{macro}{\thesis at blocks@abstractCs}
+% The |\thesis at 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 at abstract| if the current locale of the thesis
+% is Czech.
% \end{itemize}
+% \changes{v0.3.45}{2017/05/28}{Defined the
+% \cs{thesis at blocks@abstractCs} macro in
+% \texttt{style/mu/fithesis-sci.sty}. The patch was submitted by
+% Juraj Pálenik. [VN]}
% \begin{macrocode}
-\def\thesis at blocks@bibEntryEn{%
- {\thesis at selectLocale{english}
- \begin{alwayssingle}
- % Start the new chapter without clearing the right page
- {\def\cleardoublepage{}%
- \chapter*{\thesis at english@bib at title}}%
- {% Calculate the width of the columns
- \let\@A\relax\newlength{\@A}\settowidth{\@A}{{%
- \bf\thesis at english@bib at author:}}
- \let\@B\relax\newlength{\@B}\settowidth{\@B}{{%
- \bf\thesis at english@bib at thesisTitle:}}
- \let\@C\relax\newlength{\@C}\settowidth{\@C}{{%
- \bf\thesis at english@bib at programme:}}
- \let\@D\relax\newlength{\@D}\settowidth{\@D}{{%
- \bf\thesis at english@bib at field:}}
- % Unless this is a rigorous thesis, we will be typesetting
- % the name of the thesis advisor.
- \let\@E\relax\newlength{\@E}
- \ifx\thesis at type\thesis at rigorous
- \setlength{\@E}{0pt}%
+\thesis at def@extra[{
+ \ifthesis at czech
+ \thesis at abstract
+ \else
+ \thesis at placeholder@extra at abstractCs
+ \fi
+}]{abstractCs}
+\def\thesis at blocks@abstractCs{%
+ \ifthesis at czech\else
+ {\thesis at selectLocale{czech}%
+ \begin{alwayssingle}%
+ \ifthesis at abstractonsinglepage@
+ \thesis at blocks@clear
\else
- \settowidth{\@E}{{\bf\thesis at english@bib at advisor:}}
+ % Start the new chapter without clearing the left page.
+ \thesis at blocks@clearRight
\fi
- \let\@F\relax\newlength{\@F}\settowidth{\@F}{{%
- \bf\thesis at english@bib at academicYear:}}
- \let\@G\relax\newlength{\@G}\settowidth{\@G}{{%
- \bf\thesis at english@bib at pages:}}
- \let\@H\relax\newlength{\@H}\settowidth{\@H}{{%
- \bf\thesis at english@bib at 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 at newtable@old}%
- {@{}p{\@left}@{\hskip\@skip}p{\@right}@{}}
- \textbf{\thesis at english@bib at author:} &
- \noindent\parbox[t]{\@right}{
- \thesis at author\\
- \thesis at english@facultyName,
- \thesis at english@universityName\\
- \thesis at departmentEn@name
- }\\
- \textbf{\thesis at english@bib at thesisTitle:}
- & \thesis at titleEn \\
- \textbf{\thesis at english@bib at programme:}
- & \thesis at programmeEn \\
- \textbf{\thesis at english@bib at field:}
- & \thesis at fieldEn@name \\
- % Unless this is a rigorous thesis, typeset the name of the
- % thesis advisor.
- \ifx\thesis at type\thesis at rigorous\else
- \textbf{\thesis at english@bib at advisor:}
- & \thesis at advisor \\
+ {\let\thesis at blocks@clear\relax
+ \chapter*{\thesis at czech@abstractTitle}%
+ \thesis at extra@abstractCs}%
+ \par\vfil\null
+ \end{alwayssingle}}%
+ \fi}
+% \end{macrocode}
+% \end{macro}\begin{macro}{\thesis at blocks@bibEntryCs}
+% The |\thesis at 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 at 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 at 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 at 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 at TeXkeywords| if
+% the current locale of the thesis is Czech.
+% \end{itemize}
+% \changes{v0.3.45}{2017/05/21}{Defined the
+% \cs{thesis at blocks@bibEntryCs} macro in
+% \texttt{style/mu/fithesis-sci.sty}. The patch was submitted by
+% Juraj Pálenik. [VN]}
+% \begin{macrocode}
+\thesis at def@extra[{
+ \ifthesis at czech
+ \thesis at programme
+ \else
+ \thesis at placeholder@extra at programmeCs
+ \fi
+}]{programmeCs}
+\thesis at def@extra[{
+ \ifthesis at czech
+ \thesis at field@name
+ \else
+ \thesis at placeholder@extra at fieldCs
+ \fi
+}]{fieldCs}
+\thesis at def@extra[{
+ \ifthesis at czech
+ \thesis at title
+ \else
+ \thesis at placeholder@extra at titleCs
+ \fi
+}]{titleCs}
+\thesis at def@extra[{
+ \ifthesis at czech
+ \thesis at keywords
+ \else
+ \thesis at placeholder@extra at keywordsCs
+ \fi
+}]{keywordsCs}
+\thesis at def@extra[{
+ \ifthesis at czech
+ \thesis at TeXkeywords
+ \else
+ \thesis at placeholder@extra at 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 at blocks@bibEntryCs{%
+ \ifthesis at czech\else
+ {\thesis at selectLocale{czech}
+ \begin{alwayssingle}
+ % Clear only the right page, if the main locale is English.
+ \ifthesis at english
+ \begingroup
+ \let\thesis at blocks@clear\thesis at blocks@clearRight
+ \fi
+ \chapter*{\thesis at czech@bib at title}%
+ \ifthesis at english
+ \endgroup
+ \fi
+ {% Calculate the width of the columns
+ \let\@A\relax\newlength{\@A}\settowidth{\@A}{{%
+ \bf\thesis at czech@bib at author:}}
+ \let\@B\relax\newlength{\@B}\settowidth{\@B}{{%
+ \bf\thesis at czech@bib at thesisTitle:}}
+ \let\@C\relax\newlength{\@C}\settowidth{\@C}{{%
+ \bf\thesis at czech@bib at programme:}}
+ \let\@D\relax\newlength{\@D}\settowidth{\@D}{{%
+ \bf\thesis at czech@bib at field:}}
+ % Unless this is a rigorous thesis, we will be typesetting
+ % the name of the thesis advisor.
+ \let\@E\relax\newlength{\@E}
+ \ifx\thesis at type\thesis at rigorous
+ \setlength{\@E}{0pt}%
+ \else
+ \settowidth{\@E}{{\bf\thesis at czech@bib at advisor:}}
\fi
- \textbf{\thesis at english@bib at academicYear:}
- & \thesis at academicYear \\
- \textbf{\thesis at english@bib at pages:}
- & \thesis at pages \\
- \textbf{\thesis at english@bib at keywords:}
- & \thesis at TeXkeywordsEn \\
- \end{thesis at newtable@old}}
- \end{alwayssingle}
- }}
+ \let\@F\relax\newlength{\@F}\settowidth{\@F}{{%
+ \bf\thesis at czech@bib at academicYear:}}
+ \let\@G\relax\newlength{\@G}\settowidth{\@G}{{%
+ \bf\thesis at czech@bib at pages:}}
+ \let\@H\relax\newlength{\@H}\settowidth{\@H}{{%
+ \bf\thesis at czech@bib at 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 at newtable@old}%
+ {@{}p{\@left}@{\hskip\@skip}p{\@right}@{}}
+ \textbf{\thesis at czech@bib at author:} &
+ \noindent\parbox[t]{\@right}{
+ \thesis at author\\
+ \thesis at czech@facultyName,
+ \thesis at czech@universityName\\
+ \thesis at extra@departmentCs
+ }\\
+ \textbf{\thesis at czech@bib at thesisTitle:}
+ & \thesis at extra@titleCs \\
+ \textbf{\thesis at czech@bib at programme:}
+ & \thesis at extra@programmeCs \\
+ \textbf{\thesis at czech@bib at field:}
+ & \thesis at extra@fieldCs \\
+ % Unless this is a rigorous thesis, typeset the name of the
+ % thesis advisor.
+ \ifx\thesis at type\thesis at rigorous\else
+ \textbf{\thesis at czech@bib at advisor:}
+ & \thesis at advisor \\
+ \fi
+ \textbf{\thesis at czech@bib at academicYear:}
+ & \thesis at academicYear \\
+ \textbf{\thesis at czech@bib at pages:}
+ & \thesis at pages@preamble{} + \thesis at pages \\
+ \textbf{\thesis at czech@bib at keywords:}
+ & \thesis at extra@TeXkeywordsCs \\
+ \end{thesis at newtable@old}}
+ \end{alwayssingle}
+ }%
+ \fi}
% \end{macrocode}
% \end{macro}\begin{macro}{\thesis at blocks@frontMatter}
% The |\thesis at blocks@frontMatter| macro sets up the style
@@ -260,6 +455,7 @@
% formal requirements of the faculty.
% \begin{macrocode}
\def\thesis at blocks@frontMatter{%
+ \thesis at blocks@clear
\pagestyle{empty}
\parindent 1.5em
\setcounter{page}{1}
@@ -267,17 +463,30 @@
% \end{macrocode}
% \end{macro}\begin{macro}{\thesis at blocks@cover}
% The |\thesis at 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 at department@name| if the main locale of the
+% thesis is Czech.
+% \end{itemize}
% \begin{macrocode}
-\def\thesis at blocks@cover{%
+\thesis at def@extra[{
+ \ifthesis at czech
+ \thesis at department@name
+ \else
+ \thesis at placeholder@extra at departmentCs
+ \fi
+}]{departmentCs}
+\def\thesis at blocks@cover{{%
+ \thesis at selectLocale{czech}
\ifthesis at cover@
\thesis at blocks@clear
\begin{alwayssingle}
- \thispagestyle{empty}
\begin{center}
{\sc\thesis at titlePage@LARGE\thesis at czech@universityName\\%
\thesis at titlePage@Large\thesis at czech@facultyName\\[0.3em]%
- \thesis at titlePage@large\thesis at department@name}
+ \thesis at titlePage@normalsize\thesis at extra@departmentCs}
\vfill
{\bf\thesis at titlePage@Huge\thesis at czech@typeName}
\vfill
@@ -285,7 +494,7 @@
\ \thesis at year\hfill\thesis at author}
\end{center}
\end{alwayssingle}
- \fi}
+ \fi}}
% \end{macrocode}
% \end{macro}\begin{macro}{\thesis at blocks@titlePage}
% The |\thesis at blocks@titlePage| macro typesets the thesis
@@ -293,11 +502,24 @@
% conditional, the faculty logo is loaded from either
% |\thesis at logopath|, if \texttt{false}, or from
% |\thesis at 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 at TeXtitle| if the main locale of the thesis is Czech.
+% \end{itemize}
% \begin{macrocode}
-\def\thesis at blocks@titlePage{%
+\thesis at def@extra[{
+ \ifthesis at czech
+ \thesis at TeXtitle
+ \else
+ \thesis at placeholder@extra at titleCs
+ \fi
+}]{TeXtitleCs}
+\def\thesis at blocks@titlePage{{%
\thesis at blocks@clear
+ \thesis at 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 at titlePage@LARGE\thesis at czech@universityName\\%
\thesis at titlePage@Large\thesis at czech@facultyName\\[0.3em]%
- \thesis at titlePage@normalsize\thesis at department@name}
+ \thesis at titlePage@normalsize\thesis at 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 at titlePage@Huge\thesis at TeXtitle}
+ \bf\thesis at titlePage@Huge\thesis at extra@TeXtitleCs}
{\thesis at titlePage@Huge\\[0.8em]}
{\thesis at titlePage@large\thesis at czech@typeName\\[1em]}
{\bf\thesis at titlePage@LARGE\thesis at author\\}
@@ -329,8 +551,28 @@
\thesis at czech@advisorTitle: \thesis at advisor\hfill
\fi
\thesis at place\ \thesis at year}
- \end{alwayssingle}}
+ \end{alwayssingle}}}
% \end{macrocode}
+% \end{macro}\begin{macro}{\thesis at blocks@thanks}
+% The |\thesis at blocks@thanks| macro typesets the
+% acknowledgement, if the |\thesis at 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 at blocks@thanks} and \cs{thesis at blocks@declaration}
+% macros in \texttt{style/mu/fithesis-sci.sty}. The patch was
+% submitted by Juraj Pálenik. [VN]}
+% \begin{macrocode}
+\def\thesis at blocks@thanks{%
+ \thesis at blocks@clear
+ \ifx\thesis at thanks\undefined\else
+ \begin{alwayssingle}%
+ \chapter*{\thesis@@{thanksTitle}}%
+ \leavevmode\thesis at thanks
+ \end{alwayssingle}%
+ \fi}
+% \end{macrocode}
% \end{macro}\begin{macro}{\thesis at blocks@declaration}
% The |\thesis at blocks@declaration| macro typesets the declaration
% text. Unlike the generic |\thesis at blocks@declaration| macro from
@@ -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 at czech@authorSignature}
-% |\thesis at czech@authorSignature| -- The label of the author's
-% signature field
-% \item\DescribeMacro{\thesis at czech@formattedDate}
-% |\thesis at czech@formattedDate| -- A formatted date
-% \end{itemize}
% \begin{macrocode}
\def\thesis at blocks@declaration{%
- \thesis at blocks@clear
\begin{alwayssingle}%
- \chapter*{\thesis@@{declarationTitle}}%
+ \leavevmode\vfill
+ % Start the new chapter without clearing any page.
+ {\let\thesis at blocks@clear\relax
+ \chapter*{\thesis@@{declarationTitle}}}%
\thesis at declaration
\vskip 2cm%
{\let\@A\relax\newlength{\@A}
\settowidth{\@A}{\thesis@@{authorSignature}}
\setlength{\@A}{\@A+1cm}
- \noindent\thesis at place, \thesis at czech@formattedDate\hfill
+ \noindent\thesis at 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 at blocks@preamble{{%
- \thesis at selectLocale{czech}%
+\def\thesis at blocks@preamble{
\thesis at blocks@coverMatter
\thesis at blocks@cover
\thesis at blocks@frontMatter
\thesis at blocks@titlePage
\thesis at blocks@clearRight
+ \thesis at blocks@bibEntryCs
\thesis at blocks@bibEntry
\thesis at blocks@bibEntryEn
- \thesis at blocks@abstract
- \thesis at blocks@abstractEn}
+ \thesis at blocks@abstractCs
+ \ifthesis at abstractonsinglepage@
+ \begingroup
+ \let\clearpage\relax
+ \fi
+ \thesis at blocks@abstract
+ \thesis at blocks@abstractEn
+ \ifthesis at abstractonsinglepage@
+ \endgroup
+ \fi
\thesis at blocks@assignment
{\thesis at selectLocale{czech}%
\thesis at blocks@thanks
\thesis at blocks@declaration
- \thesis at blocks@tables}}
+ \thesis at blocks@clear
+ \pagestyle{plain}%
+ \thesis at blocks@tables}}
\def\thesis at blocks@postamble{%
\thesis at blocks@bibliography}
% \end{macrocode}
Modified: trunk/Master/texmf-dist/tex/latex/fithesis/fithesis3.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/fithesis/fithesis3.cls 2017-06-05 23:10:52 UTC (rev 44471)
+++ trunk/Master/texmf-dist/tex/latex/fithesis/fithesis3.cls 2017-06-05 23:11:21 UTC (rev 44472)
@@ -54,7 +54,7 @@
\gdef\thesis at version@number{#1}
\gdef\thesis at version@date{#2}
\gdef\thesis at version{#2 #1 fithesis3 MU thesis class}}
-\thesis at versiondef{v0.3.44}{2017/05/18}}
+\thesis at versiondef{v0.3.46}{2017/06/02}}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ProvidesClass{fithesis3}[\thesis at version]
@@ -327,18 +327,124 @@
\else
\thesis at autofalse
\fi}
+\ifx\thesis at pages@preamble\undefined
+ \def\thesis at pages@preamble{??}\fi
+\ifx\thesis at pages@postamble\undefined
+ \def\thesis at pages@postamble{??}\fi
\def\thesis at preamble{%
{\thesis at selectLocale{\thesis at locale}%
- \thesis at blocks@preamble\clearpage}
+ \thesis at blocks@preamble
+ \gdef\thesis at pages@preamble{\thepage}
+ \write\@auxout{\noexpand\gdef\noexpand
+ \thesis at pages@preamble{\thepage}}
+ \clearpage}
\thesis at blocks@mainMatter}
-\def\thesis at postamble{{%
- \thesis at selectLocale{\thesis at locale}%
+\let\thesis at blocks@preamble\relax
+\let\thesis at blocks@mainMatter\relax
+\def\thesis at postamble{%
+ \gdef\thesis at pages@postamble{\thepage}
+ \write\@auxout{\noexpand\gdef\noexpand
+ \thesis at pages@postamble{\thepage}}
+ {\thesis at selectLocale{\thesis at locale}%
\thesis at blocks@postamble}}
-\let\thesis at blocks@preamble\relax
\let\thesis at blocks@postamble\relax
-\let\thesis at blocks@mainMatter\relax
+\def\thesis at extra@KV at prefix{KV at thesis@extra@}
+\def\thesis at extra@XKV at fams{thesis at extra}
+\long\def\KV at thesis@extra#1{%
+ \long\def\XKV at s@tk at ys##1=##2=##3\@nil{%
+ \XKV at g@tkeyname##1=\@nil\XKV at tkey
+ \expandafter\KV@@sp at def\expandafter\XKV at tkey\expandafter{\XKV at tkey}%
+ \ifx\XKV at tkey\@empty
+ \XKV at toks{##2}%
+ \ifcat$\the\XKV at toks$\else
+ \XKV at err{no key specified for value `\the\XKV at toks'}%
+ \fi
+ \else
+ \@expandtwoargs\in@{,\XKV at tkey,}{,\XKV at na,}%
+ \ifin@\else
+ \XKV at knftrue
+ \KV@@sp at def\XKV at tempa{##2}%
+ \ifXKV at preset\XKV at s@tk at ys@{##3}\else
+ \ifXKV at pl
+ \XKV at for@eo\XKV at fams\XKV at tfam{%
+ \XKV at makehd\XKV at tfam
+ \XKV at s@tk at ys@{##3}%
+ }%
+ \else
+ \XKV at whilist\XKV at fams\XKV at tfam\ifXKV at knf\fi{%
+ \XKV at makehd\XKV at tfam
+ \XKV at s@tk at ys@{##3}%
+ }%
+ \fi
+ \fi
+ \ifXKV at knf
+ \ifXKV at inpox
+ \ifx\XKV at doxs\relax
+ \ifx\@currext\@clsextension\else
+ \let\CurrentOption\XKV at tkey\@unknownoptionerror
+ \fi
+ \else\XKV at doxs\fi
+ \else
+ \ifXKV at st
+ \XKV at addtolist@o\XKV at rm\CurrentOption
+ \else
+ \ifx\XKV at fams\thesis at extra@XKV at fams
+ \expandafter\long\expandafter\def\csname%
+ thesis at extra@\XKV at tkey\endcsname{##2}%
+ \else
+ \XKV at err{`\XKV at tkey' undefined in families
+ `\XKV at fams'}%
+ \fi
+ \fi
+ \fi
+ \else
+ \ifXKV at inpox\ifx\XKV at testclass\XKV at documentclass
+ \expandafter\XKV at useoption\expandafter{\CurrentOption}%
+ \fi\fi
+ \fi
+ \fi
+ \fi
+ }%
+ \setkeys{thesis at extra}{#1}%
+ \def\KV at prefix{KV at thesis@}}
+\long\def\KV at split#1=#2=#3\relax{%
+ \KV@@sp at def\@tempa{#1}%
+ \ifx\@tempa\@empty\else
+ \expandafter\let\expandafter\@tempc
+ \csname\KV at prefix\@tempa\endcsname
+ \ifx\@tempc\relax
+ \ifx\KV at prefix\thesis at extra@KV at prefix
+ \KV@@sp at def\@tempb{#2}%
+ \expandafter\let\csname thesis at extra@\@tempa\endcsname
+ \@tempb%
+ \else
+ \KV at errx
+ {\@tempa\space undefined}%
+ \fi
+ \else
+ \ifx\@empty#3\@empty
+ \KV at default
+ \else
+ \KV@@sp at def\@tempb{#2}%
+ \expandafter\@tempc\expandafter{\@tempb}\relax
+ \fi
+ \fi
+ \fi}
+\newcommand{\thesis at def@extra}[2][]{%
+ \expandafter\ifx\csname thesis at extra@#2\endcsname\relax
+ \def\thesis at placeholder@extra{<<extra@#2>>}%
+ \expandafter\let\csname thesis at placeholder@extra@#2\endcsname
+ \thesis at placeholder@extra
+ \def\thesis at arg{#1}%
+ \ifx\empty\thesis at arg
+ \expandafter\let\csname thesis at extra@#2\endcsname
+ \thesis at placeholder@extra
+ \else
+ \expandafter\def\csname thesis at extra@#2\endcsname{#1}%
+ \fi
+ \fi}
\long\def\thesislong#1#2{%
\csname KV at thesis@#1\endcsname{#2}}
\newif\ifthesis at loaded\thesis at loadedfalse
@@ -357,6 +463,13 @@
% See <article.gmane.org/gmane.comp.tex.luatex.user/5680>
\RequirePackage[base]{babel}}
\fi
+\ifthesis at english
+ \expandafter\expandafter\expandafter\let\expandafter\expandafter
+ \csname ifthesis at english\endcsname\csname iftrue\endcsname
+\else
+ \expandafter\expandafter\expandafter\let\expandafter\expandafter
+ \csname ifthesis at english\endcsname\csname iffalse\endcsname
+\fi
\ifx\thesis at style\empty\else
\thesis at requireStyle{\thesis at style}
\fi
Modified: trunk/Master/texmf-dist/tex/latex/fithesis/locale/mu/econ/fithesis-czech.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/fithesis/locale/mu/econ/fithesis-czech.def 2017-06-05 23:10:52 UTC (rev 44471)
+++ trunk/Master/texmf-dist/tex/latex/fithesis/locale/mu/econ/fithesis-czech.def 2017-06-05 23:11:21 UTC (rev 44472)
@@ -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 at czech@facultyName{Ekonomicko-správní fakulta}
+
+\gdef\thesis at czech@bib at thesisTitleEn{Název práce v angličtině}
+\gdef\thesis at czech@bib at department{Katedra}
+\gdef\thesis at czech@bib at year{Rok obhajoby}
+
+\gdef\thesis at czech@abstractTitle{Anotace}
+\thesis at def@extra{advisorCsGenitiv}
+\gdef\thesis at czech@declaration{Prohlašuji, že jsem
+ \thesis at lower{czech at typeName@akuzativ} zpracoval%
+ \thesis at czech@gender at koncovka\ samostatně pod vedením
+ \thesis at extra@advisorCsGenitiv\
+ a~uvedl\thesis at czech@gender at 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'.
Modified: trunk/Master/texmf-dist/tex/latex/fithesis/locale/mu/econ/fithesis-english.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/fithesis/locale/mu/econ/fithesis-english.def 2017-06-05 23:10:52 UTC (rev 44471)
+++ trunk/Master/texmf-dist/tex/latex/fithesis/locale/mu/econ/fithesis-english.def 2017-06-05 23:11:21 UTC (rev 44472)
@@ -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 at english@facultyName{Faculty of Economics
and Administration}
+
+\gdef\thesis at english@bib at department{Department}
+\gdef\thesis at english@bib at year{Year of Defense}
+
+\gdef\thesis at english@abstractTitle{Annotation}
\endinput
%%
%% End of file `mu/econ/fithesis-english.def'.
Modified: trunk/Master/texmf-dist/tex/latex/fithesis/locale/mu/econ/fithesis-slovak.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/fithesis/locale/mu/econ/fithesis-slovak.def 2017-06-05 23:10:52 UTC (rev 44471)
+++ trunk/Master/texmf-dist/tex/latex/fithesis/locale/mu/econ/fithesis-slovak.def 2017-06-05 23:11:21 UTC (rev 44472)
@@ -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 at slovak@facultyName{Ekonomicko-správna fakulta}
+\gdef\thesis at slovak@bib at thesisTitleEn{Názov práce v angličtine}
+\gdef\thesis at slovak@bib at department{Katedra}
+\gdef\thesis at slovak@bib at year{Rok obhajoby}
+
+\gdef\thesis at slovak@abstractTitle{Anotácie}
+\thesis at def@extra{advisorSkGenitiv}
+\gdef\thesis at slovak@declaration{Vyhlasujem, že som
+ \thesis at lower{slovak at typeName@akuzativ} spracoval%
+ \thesis at slovak@gender at koncovka\ samostatne pod vedením
+ \thesis at extra@advisorSkGenitiv\
+ a~uved\ifthesis at 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'.
Modified: trunk/Master/texmf-dist/tex/latex/fithesis/locale/mu/fithesis-czech.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/fithesis/locale/mu/fithesis-czech.def 2017-06-05 23:10:52 UTC (rev 44471)
+++ trunk/Master/texmf-dist/tex/latex/fithesis/locale/mu/fithesis-czech.def 2017-06-05 23:11:21 UTC (rev 44472)
@@ -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 at czech@universityName{Masarykova univerzita}
\gdef\thesis at czech@declaration{Prohlašuji, že jsem
@@ -60,6 +60,9 @@
\gdef\thesis at czech@bib at title{Bibliografický záznam}
\gdef\thesis at czech@bib at pages{str}
+\global\let\thesis at czech@bib at author\thesis at czech@authorTitle
+\gdef\thesis at czech@bib at thesisTitle{Název práce}
+\global\let\thesis at czech@bib at advisor\thesis at czech@advisorTitle
\gdef\thesis at czech@idTitle{UČO}
\endinput
Modified: trunk/Master/texmf-dist/tex/latex/fithesis/locale/mu/fithesis-english.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/fithesis/locale/mu/fithesis-english.def 2017-06-05 23:10:52 UTC (rev 44471)
+++ trunk/Master/texmf-dist/tex/latex/fithesis/locale/mu/fithesis-english.def 2017-06-05 23:11:21 UTC (rev 44472)
@@ -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 at english@universityName{Masaryk University}
\gdef\thesis at english@declaration{%
Hereby I declare that this paper is my original authorial work,
@@ -59,6 +59,9 @@
\gdef\thesis at english@bib at title{Bibliographic record}
\gdef\thesis at english@bib at pages{p}
+\global\let\thesis at english@bib at author\thesis at english@authorTitle
+\gdef\thesis at english@bib at thesisTitle{Title of Thesis}
+\gdef\thesis at english@bib at advisor{Supervisor}
\gdef\thesis at english@idTitle{UČO}
\endinput
Modified: trunk/Master/texmf-dist/tex/latex/fithesis/locale/mu/fithesis-slovak.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/fithesis/locale/mu/fithesis-slovak.def 2017-06-05 23:10:52 UTC (rev 44471)
+++ trunk/Master/texmf-dist/tex/latex/fithesis/locale/mu/fithesis-slovak.def 2017-06-05 23:11:21 UTC (rev 44472)
@@ -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 at slovak@universityName{Masarykova univerzita}
\gdef\thesis at slovak@declaration{%
@@ -60,6 +60,9 @@
\gdef\thesis at slovak@bib at title{Bibliografický záznam}
\gdef\thesis at slovak@bib at pages{str}
+\global\let\thesis at slovak@bib at author\thesis at slovak@authorTitle
+\gdef\thesis at slovak@bib at thesisTitle{Názov práce}
+\global\let\thesis at slovak@bib at advisor\thesis at slovak@advisorTitle
\gdef\thesis at slovak@idTitle{UČO}
Modified: trunk/Master/texmf-dist/tex/latex/fithesis/locale/mu/fsps/fithesis-english.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/fithesis/locale/mu/fsps/fithesis-english.def 2017-06-05 23:10:52 UTC (rev 44471)
+++ trunk/Master/texmf-dist/tex/latex/fithesis/locale/mu/fsps/fithesis-english.def 2017-06-05 23:11:21 UTC (rev 44472)
@@ -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 at english@facultyName{Faculty of Sports Studies}
Modified: trunk/Master/texmf-dist/tex/latex/fithesis/locale/mu/med/fithesis-czech.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/fithesis/locale/mu/med/fithesis-czech.def 2017-06-05 23:10:52 UTC (rev 44471)
+++ trunk/Master/texmf-dist/tex/latex/fithesis/locale/mu/med/fithesis-czech.def 2017-06-05 23:11:21 UTC (rev 44472)
@@ -51,9 +51,9 @@
%%
\ProvidesFile{fithesis/locale/mu/med/fithesis-czech.def}[2016/03/23]
+\gdef\thesis at czech@facultyName{Lékařská fakulta}
+
\gdef\thesis at czech@abstractTitle{Anotace}
-
-\gdef\thesis at czech@facultyName{Lékařská fakulta}
\endinput
%%
%% End of file `mu/med/fithesis-czech.def'.
Modified: trunk/Master/texmf-dist/tex/latex/fithesis/locale/mu/med/fithesis-english.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/fithesis/locale/mu/med/fithesis-english.def 2017-06-05 23:10:52 UTC (rev 44471)
+++ trunk/Master/texmf-dist/tex/latex/fithesis/locale/mu/med/fithesis-english.def 2017-06-05 23:11:21 UTC (rev 44472)
@@ -51,9 +51,9 @@
%%
\ProvidesFile{fithesis/locale/mu/med/fithesis-english.def}[2016/03/23]
+\gdef\thesis at english@facultyName{Faculty of Medicine}
+
\gdef\thesis at english@abstractTitle{Annotation}
-
-\gdef\thesis at english@facultyName{Faculty of Medicine}
\endinput
%%
%% End of file `mu/med/fithesis-english.def'.
Modified: trunk/Master/texmf-dist/tex/latex/fithesis/locale/mu/med/fithesis-slovak.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/fithesis/locale/mu/med/fithesis-slovak.def 2017-06-05 23:10:52 UTC (rev 44471)
+++ trunk/Master/texmf-dist/tex/latex/fithesis/locale/mu/med/fithesis-slovak.def 2017-06-05 23:11:21 UTC (rev 44472)
@@ -52,9 +52,9 @@
\ProvidesFile{fithesis/locale/mu/med/fithesis-slovak.def}[2016/03/23]
+\gdef\thesis at slovak@facultyName{Lekárska fakulta}
+
\gdef\thesis at slovak@abstractTitle{Anotácie}
-
-\gdef\thesis at slovak@facultyName{Lekárska fakulta}
\endinput
%%
%% End of file `mu/med/fithesis-slovak.def'.
Modified: trunk/Master/texmf-dist/tex/latex/fithesis/locale/mu/ped/fithesis-slovak.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/fithesis/locale/mu/ped/fithesis-slovak.def 2017-06-05 23:10:52 UTC (rev 44471)
+++ trunk/Master/texmf-dist/tex/latex/fithesis/locale/mu/ped/fithesis-slovak.def 2017-06-05 23:11:21 UTC (rev 44472)
@@ -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 at slovak@facultyName{Pedagogická fakulta}
\endinput
Modified: trunk/Master/texmf-dist/tex/latex/fithesis/locale/mu/sci/fithesis-czech.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/fithesis/locale/mu/sci/fithesis-czech.def 2017-06-05 23:10:52 UTC (rev 44471)
+++ trunk/Master/texmf-dist/tex/latex/fithesis/locale/mu/sci/fithesis-czech.def 2017-06-05 23:11:21 UTC (rev 44472)
@@ -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 at 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 at czech@bib at author\thesis at czech@authorTitle
-\gdef\thesis at czech@bib at thesisTitle{Název práce}
\gdef\thesis at czech@bib at programme{Studijní program}
\global\let\thesis at czech@bib at field\thesis at czech@fieldTitle
-\global\let\thesis at czech@bib at advisor\thesis at czech@advisorTitle
\gdef\thesis at czech@bib at academicYear{Akademický rok}
\gdef\thesis at czech@bib at pages{Počet stran}
\global\let\thesis at czech@bib at keywords\thesis at czech@keywordsTitle
Modified: trunk/Master/texmf-dist/tex/latex/fithesis/locale/mu/sci/fithesis-english.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/fithesis/locale/mu/sci/fithesis-english.def 2017-06-05 23:10:52 UTC (rev 44471)
+++ trunk/Master/texmf-dist/tex/latex/fithesis/locale/mu/sci/fithesis-english.def 2017-06-05 23:11:21 UTC (rev 44472)
@@ -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 at english@facultyName{Faculty of Science}
\global\let\thesis at english@advisorTitleEn=\thesis at english@bib at advisor
-\global\let\thesis at english@bib at author\thesis at english@authorTitle
-\gdef\thesis at english@bib at thesisTitle{Title of Thesis}
\gdef\thesis at english@bib at programme{Degree Programme}
\global\let\thesis at english@bib at field\thesis at english@fieldTitle
-\gdef\thesis at english@bib at advisor{Supervisor}
\gdef\thesis at english@bib at academicYear{Academic Year}
\gdef\thesis at english@bib at pages{Number of Pages}
\global\let\thesis at english@bib at keywords\thesis at english@keywordsTitle
Modified: trunk/Master/texmf-dist/tex/latex/fithesis/locale/mu/sci/fithesis-slovak.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/fithesis/locale/mu/sci/fithesis-slovak.def 2017-06-05 23:10:52 UTC (rev 44471)
+++ trunk/Master/texmf-dist/tex/latex/fithesis/locale/mu/sci/fithesis-slovak.def 2017-06-05 23:11:21 UTC (rev 44472)
@@ -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 at slovak@facultyName{Prírodovedecká fakulta}
+
+\gdef\thesis at slovak@bib at programme{Študijný program}
+\global\let\thesis at slovak@bib at field\thesis at slovak@fieldTitle
+\gdef\thesis at slovak@bib at academicYear{Akademický rok}
+\gdef\thesis at slovak@bib at pages{Počet strán}
+\global\let\thesis at slovak@bib at keywords\thesis at slovak@keywordsTitle
\endinput
%%
%% End of file `mu/sci/fithesis-slovak.def'.
Modified: trunk/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-base-color.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-base.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-econ-color.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-econ.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fi-color.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fi.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fsps-color.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fsps.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fss-color.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fss.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-law-color.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-law.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-med-color.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-med.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-ped-color.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-ped.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-phil-color.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-phil.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-sci-color.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-sci.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-base.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-base.sty 2017-06-05 23:10:52 UTC (rev 44471)
+++ trunk/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-base.sty 2017-06-05 23:11:21 UTC (rev 44472)
@@ -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 at ptsize{0}}
\DeclareOption{11pt}{\def\thesis at ptsize{1}}
@@ -240,8 +240,11 @@
\def\thesis at blocks@clear{%
\ifthesis at twoside@
\clearpage
- \thispagestyle{empty}%
- \cleardoublepage
+ \ifodd\value{page}\else%
+ \thispagestyle{empty}%
+ \hbox{}%
+ \newpage
+ \fi
\else
\newpage
\fi}
@@ -384,8 +387,9 @@
\fi}
\def\thesis at 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 at blocks@clear\relax
\chapter*{\thesis@@{abstractTitle}}}%
\noindent\thesis at abstract
\par\vfil\null
@@ -394,17 +398,19 @@
\ifthesis at english\else
{\thesis at selectLocale{english}%
\begin{alwayssingle}%
- % Start the new chapter without clearing the right page
- {\def\cleardoublepage{}%
- \chapter*{\thesis at english@abstractTitle}%
- \thesis at abstractEn}%
+ % Start the new chapter without clearing the left page.
+ \clearpage
+ {\let\thesis at blocks@clear\relax
+ \chapter*{\thesis at english@abstractTitle}}%
+ \noindent\thesis at abstractEn
\par\vfil\null
\end{alwayssingle}}%
\fi}
\def\thesis at 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 at blocks@clear\relax
\chapter*{\thesis@@{keywordsTitle}}%
\noindent\thesis at TeXkeywords}%
\par\vfil\null
@@ -413,10 +419,11 @@
\ifthesis at english\else
{\thesis at selectLocale{english}%
\begin{alwayssingle}%
- % Start the new chapter without clearing the right page
- {\def\cleardoublepage{}%
- \chapter*{\thesis at english@keywordsTitle}%
- \thesis at TeXkeywordsEn}%
+ % Start the new chapter without clearing the left page.
+ \clearpage
+ {\let\thesis at blocks@clear\relax%
+ \chapter*{\thesis at english@keywordsTitle}}%
+ \noindent\thesis at 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}
Modified: trunk/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-econ.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-econ.sty 2017-06-05 23:10:52 UTC (rev 44471)
+++ trunk/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-econ.sty 2017-06-05 23:11:21 UTC (rev 44472)
@@ -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 at color@setup{
links={HTML}{F27995},
tableEmph={HTML}{E8B88B},
@@ -62,6 +62,7 @@
\thesis at bibliography@load
\thesis at require{tikz}
\thesis at require{geometry}
+\thesis at require{array}
\geometry{top=25mm,bottom=20mm,left=25mm,right=25mm,includeheadfoot}
\def\thesis at blocks@cover{%
\ifthesis at cover@
@@ -140,6 +141,70 @@
\addcontentsline{toc}{chapter}{\listfigurename}%
\listoffigures}
\fi
+\def\thesis at blocks@declaration{%
+ \begin{alwayssingle}%
+ \thesis at blocks@clear
+ \leavevmode\vfill
+ % Start the new chapter without clearing any page.
+ {\let\thesis at blocks@clear\relax
+ \chapter*{\thesis@@{declarationTitle}}}%
+ \thesis at declaration
+ \vskip 2cm%
+ {\let\@A\relax\newlength{\@A}
+ \settowidth{\@A}{\thesis@@{authorSignature}}
+ \setlength{\@A}{\@A+1cm}
+ \noindent\thesis at place, \thesis@@{formattedDate}\hfill
+ \begin{minipage}[t]{\@A}%
+ \centering\rule{\@A}{1pt}\\
+ \thesis@@{authorSignature}\par
+ \end{minipage}}
+ \end{alwayssingle}}
+\def\thesis at blocks@abstract{%
+ \begin{alwayssingle}%
+ \vskip 40\p@
+ {\let\thesis at blocks@clear\relax
+ \chapter*{\thesis@@{abstractTitle}}}%
+ \noindent\thesis at abstract
+ \end{alwayssingle}}
+\def\thesis at blocks@abstractEn{%
+ \ifthesis at english\else
+ {\thesis at selectLocale{english}%
+ \begin{alwayssingle}%
+ \vskip 20\p@
+ {\let\thesis at blocks@clear\relax
+ \chapter*{\thesis at english@abstractTitle}}%
+ \noindent\thesis at abstractEn
+ \end{alwayssingle}}%
+ \fi}
+\def\thesis at blocks@keywords{%
+ \begin{alwayssingle}%
+ \vskip 40\p@
+ {\let\thesis at blocks@clear\relax
+ \chapter*{\thesis@@{keywordsTitle}}%
+ \noindent\thesis at TeXkeywords}%
+ \end{alwayssingle}}
+\def\thesis at blocks@keywordsEn{%
+ \ifthesis at english\else
+ {\thesis at selectLocale{english}%
+ \begin{alwayssingle}%
+ \vskip 20\p@
+ {\let\thesis at blocks@clear\relax%
+ \chapter*{\thesis at english@keywordsTitle}}%
+ \noindent\thesis at TeXkeywordsEn
+ \end{alwayssingle}}%
+ \fi}
+\def\thesis at blocks@bibEntry{%
+ \thesis at blocks@clear
+ \noindent\begin{thesis at newtable@old}{@{}>{\bfseries}ll@{}}
+ \thesis@@{bib at author}: & \thesis at author \\
+ \thesis@@{bib at thesisTitle}: & \thesis at title \\
+ \ifthesis at english\else
+ \thesis@@{bib at thesisTitleEn}: & \thesis at titleEn \\
+ \fi
+ \thesis@@{bib at department}: & \thesis at department \\
+ \thesis@@{bib at advisor}: & \thesis at advisor \\
+ \thesis@@{bib at year}: & \thesis at year \\
+ \end{thesis at newtable@old}}
\def\thesis at blocks@preamble{%
\thesis at blocks@coverMatter
\thesis at blocks@cover
@@ -146,11 +211,11 @@
\thesis at blocks@frontMatter
\thesis at blocks@titlePage
\thesis at blocks@assignment
- \thesis at blocks@clearRight
- \thesis at blocks@abstract
- \thesis at blocks@abstractEn
- \thesis at blocks@keywords
- \thesis at blocks@keywordsEn
+ \thesis at blocks@bibEntry
+ \thesis at blocks@abstract
+ \thesis at blocks@abstractEn
+ \thesis at blocks@keywords
+ \thesis at blocks@keywordsEn
\thesis at blocks@declaration
\thesis at blocks@thanks
\thesis at blocks@toc}
Modified: trunk/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-fsps.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-fsps.sty 2017-06-05 23:10:52 UTC (rev 44471)
+++ trunk/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-fsps.sty 2017-06-05 23:11:21 UTC (rev 44472)
@@ -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 at color@setup{
links={HTML}{93BCF5},
tableEmph={HTML}{A8BDE3},
Modified: trunk/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-law.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-law.sty 2017-06-05 23:10:52 UTC (rev 44471)
+++ trunk/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-law.sty 2017-06-05 23:11:21 UTC (rev 44472)
@@ -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 at color@setup{
links={HTML}{CF86EB},
tableEmph={HTML}{D39BE8},
Modified: trunk/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-med.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-med.sty 2017-06-05 23:10:52 UTC (rev 44471)
+++ trunk/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-med.sty 2017-06-05 23:11:21 UTC (rev 44472)
@@ -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 at color@setup{
links={HTML}{F58E76},
tableEmph={HTML}{FF9D85},
Modified: trunk/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-sci.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-sci.sty 2017-06-05 23:10:52 UTC (rev 44471)
+++ trunk/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-sci.sty 2017-06-05 23:11:21 UTC (rev 44472)
@@ -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 at color@setup{
links={HTML}{20E366},
tableEmph={HTML}{8EDEAA},
@@ -61,6 +61,31 @@
sorting=none}
\thesis at bibliography@load
\thesis at requireLocale{czech}
+\def\ifthesis at czech{
+ \expandafter\def\expandafter\@czech\expandafter{\string
+ \czech}%
+ \expandafter\expandafter\expandafter\def\expandafter
+ \expandafter\expandafter\@locale\expandafter\expandafter
+ \expandafter{\expandafter\string\csname\thesis at locale\endcsname}%
+ \expandafter\csname\expandafter i\expandafter f\ifx\@locale
+ \@czech
+ true%
+ \else
+ false%
+ \fi\endcsname}
+\ifthesis at czech
+ \expandafter\expandafter\expandafter\let\expandafter\expandafter
+ \csname ifthesis at czech\endcsname\csname iftrue\endcsname
+\else
+ \expandafter\expandafter\expandafter\let\expandafter\expandafter
+ \csname ifthesis at czech\endcsname\csname iffalse\endcsname
+\fi
+\newif\ifthesis at abstractonsinglepage@
+\DeclareOption{abstractonsinglepage}{\thesis at abstractonsinglepage@true}
+\ifthesis at czech\else\ifthesis at english\else
+ \ExecuteOptions{abstractonsinglepage}
+\fi\fi
+\ProcessOptions*
\thesis at require{tikz}
\thesis at require{changepage}
\ifx\thesis at type\thesis at bachelors\else
@@ -70,18 +95,24 @@
\thesis at blocks@assignment at hideIfDigital@false
\def\thesis at blocks@bibEntry{%
\begin{alwayssingle}%
- {% Start the new chapter without clearing the right page
- {\def\cleardoublepage{}%
- \chapter*{\thesis at czech@bib at title}}%
- % Calculate the width of the columns
+ % Clear only the right page, if the main locale is Czech.
+ \ifthesis at czech
+ \begingroup
+ \let\thesis at blocks@clear\thesis at blocks@clearRight
+ \fi
+ \chapter*{\thesis@@{bib at title}}%
+ \ifthesis at czech
+ \endgroup
+ \fi
+ {% Calculate the width of the columns
\let\@A\relax\newlength{\@A}\settowidth{\@A}{{%
- \bf\thesis at czech@bib at author:}}
+ \bf\thesis@@{bib at author}:}}
\let\@B\relax\newlength{\@B}\settowidth{\@B}{{%
- \bf\thesis at czech@bib at thesisTitle:}}
+ \bf\thesis@@{bib at thesisTitle}:}}
\let\@C\relax\newlength{\@C}\settowidth{\@C}{{%
- \bf\thesis at czech@bib at programme:}}
+ \bf\thesis@@{bib at programme}:}}
\let\@D\relax\newlength{\@D}\settowidth{\@D}{{%
- \bf\thesis at czech@bib at field:}}
+ \bf\thesis@@{bib at field}:}}
% Unless this is a rigorous thesis, we will be typesetting the
% name of the thesis advisor.
\let\@E\relax\newlength{\@E}
@@ -88,14 +119,14 @@
\ifx\thesis at type\thesis at rigorous
\setlength{\@E}{0pt}%
\else
- \settowidth{\@E}{{\bf\thesis at czech@bib at advisor:}}
+ \settowidth{\@E}{{\bf\thesis@@{bib at advisor}:}}
\fi
\let\@F\relax\newlength{\@F}\settowidth{\@F}{{%
- \bf\thesis at czech@bib at academicYear:}}
+ \bf\thesis@@{bib at academicYear}:}}
\let\@G\relax\newlength{\@G}\settowidth{\@G}{{%
- \bf\thesis at czech@bib at pages:}}
+ \bf\thesis@@{bib at pages}:}}
\let\@H\relax\newlength{\@H}\settowidth{\@H}{{%
- \bf\thesis at czech@bib at keywords:}}
+ \bf\thesis@@{bib at 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 at newtable@old}%
{@{}p{\@left}@{\hskip\@skip}p{\@right}@{}}
- \textbf{\thesis at czech@bib at author:} &
+ \textbf{\thesis@@{bib at author}:} &
\noindent\parbox[t]{\@right}{
\thesis at author\\
- \thesis at czech@facultyName,
- \thesis at czech@universityName\\
+ \thesis@@{facultyName},
+ \thesis@@{universityName}\\
\thesis at department@name
}\\
- \textbf{\thesis at czech@bib at thesisTitle:}
+ \textbf{\thesis@@{bib at thesisTitle}:}
& \thesis at title \\
- \textbf{\thesis at czech@bib at programme:}
+ \textbf{\thesis@@{bib at programme}:}
& \thesis at programme \\
- \textbf{\thesis at czech@bib at field:}
+ \textbf{\thesis@@{bib at field}:}
& \thesis at field@name \\
% Unless this is a rigorous thesis, typeset the name of the
% thesis advisor.
\ifx\thesis at type\thesis at rigorous\else
- \textbf{\thesis at czech@bib at advisor:}
+ \textbf{\thesis@@{bib at advisor}:}
& \thesis at advisor \\
\fi
- \textbf{\thesis at czech@bib at academicYear:}
+ \textbf{\thesis@@{bib at academicYear}:}
& \thesis at academicYear \\
- \textbf{\thesis at czech@bib at pages:}
- & \thesis at pages \\
- \textbf{\thesis at czech@bib at keywords:}
+ \textbf{\thesis@@{bib at pages}:}
+ & \thesis at pages@preamble{} + \thesis at pages \\
+ \textbf{\thesis@@{bib at keywords}:}
& \thesis at TeXkeywords \\
\end{thesis at newtable@old}}
\end{alwayssingle}}
\def\thesis at blocks@bibEntryEn{%
- {\thesis at selectLocale{english}
- \begin{alwayssingle}
- % Start the new chapter without clearing the right page
- {\def\cleardoublepage{}%
- \chapter*{\thesis at english@bib at title}}%
- {% Calculate the width of the columns
- \let\@A\relax\newlength{\@A}\settowidth{\@A}{{%
- \bf\thesis at english@bib at author:}}
- \let\@B\relax\newlength{\@B}\settowidth{\@B}{{%
- \bf\thesis at english@bib at thesisTitle:}}
- \let\@C\relax\newlength{\@C}\settowidth{\@C}{{%
- \bf\thesis at english@bib at programme:}}
- \let\@D\relax\newlength{\@D}\settowidth{\@D}{{%
- \bf\thesis at english@bib at field:}}
- % Unless this is a rigorous thesis, we will be typesetting
- % the name of the thesis advisor.
- \let\@E\relax\newlength{\@E}
- \ifx\thesis at type\thesis at rigorous
- \setlength{\@E}{0pt}%
+ \ifthesis at english\else
+ {\thesis at selectLocale{english}
+ \begin{alwayssingle}
+ \chapter*{\thesis at english@bib at title}%
+ {% Calculate the width of the columns
+ \let\@A\relax\newlength{\@A}\settowidth{\@A}{{%
+ \bf\thesis at english@bib at author:}}
+ \let\@B\relax\newlength{\@B}\settowidth{\@B}{{%
+ \bf\thesis at english@bib at thesisTitle:}}
+ \let\@C\relax\newlength{\@C}\settowidth{\@C}{{%
+ \bf\thesis at english@bib at programme:}}
+ \let\@D\relax\newlength{\@D}\settowidth{\@D}{{%
+ \bf\thesis at english@bib at field:}}
+ % Unless this is a rigorous thesis, we will be typesetting
+ % the name of the thesis advisor.
+ \let\@E\relax\newlength{\@E}
+ \ifx\thesis at type\thesis at rigorous
+ \setlength{\@E}{0pt}%
+ \else
+ \settowidth{\@E}{{\bf\thesis at english@bib at advisor:}}
+ \fi
+ \let\@F\relax\newlength{\@F}\settowidth{\@F}{{%
+ \bf\thesis at english@bib at academicYear:}}
+ \let\@G\relax\newlength{\@G}\settowidth{\@G}{{%
+ \bf\thesis at english@bib at pages:}}
+ \let\@H\relax\newlength{\@H}\settowidth{\@H}{{%
+ \bf\thesis at english@bib at 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 at newtable@old}%
+ {@{}p{\@left}@{\hskip\@skip}p{\@right}@{}}
+ \textbf{\thesis at english@bib at author:} &
+ \noindent\parbox[t]{\@right}{
+ \thesis at author\\
+ \thesis at english@facultyName,
+ \thesis at english@universityName\\
+ \thesis at departmentEn@name
+ }\\
+ \textbf{\thesis at english@bib at thesisTitle:}
+ & \thesis at titleEn \\
+ \textbf{\thesis at english@bib at programme:}
+ & \thesis at programmeEn \\
+ \textbf{\thesis at english@bib at field:}
+ & \thesis at fieldEn@name \\
+ % Unless this is a rigorous thesis, typeset the name of the
+ % thesis advisor.
+ \ifx\thesis at type\thesis at rigorous\else
+ \textbf{\thesis at english@bib at advisor:}
+ & \thesis at advisor \\
+ \fi
+ \textbf{\thesis at english@bib at academicYear:}
+ & \thesis at academicYear \\
+ \textbf{\thesis at english@bib at pages:}
+ & \thesis at pages@preamble{} + \thesis at pages \\
+ \textbf{\thesis at english@bib at keywords:}
+ & \thesis at TeXkeywordsEn \\
+ \end{thesis at newtable@old}}
+ \end{alwayssingle}
+ }%
+ \fi}
+\thesis at def@extra[{
+ \ifthesis at czech
+ \thesis at abstract
+ \else
+ \thesis at placeholder@extra at abstractCs
+ \fi
+}]{abstractCs}
+\def\thesis at blocks@abstractCs{%
+ \ifthesis at czech\else
+ {\thesis at selectLocale{czech}%
+ \begin{alwayssingle}%
+ \ifthesis at abstractonsinglepage@
+ \thesis at blocks@clear
\else
- \settowidth{\@E}{{\bf\thesis at english@bib at advisor:}}
+ % Start the new chapter without clearing the left page.
+ \thesis at blocks@clearRight
\fi
- \let\@F\relax\newlength{\@F}\settowidth{\@F}{{%
- \bf\thesis at english@bib at academicYear:}}
- \let\@G\relax\newlength{\@G}\settowidth{\@G}{{%
- \bf\thesis at english@bib at pages:}}
- \let\@H\relax\newlength{\@H}\settowidth{\@H}{{%
- \bf\thesis at english@bib at 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 at newtable@old}%
- {@{}p{\@left}@{\hskip\@skip}p{\@right}@{}}
- \textbf{\thesis at english@bib at author:} &
- \noindent\parbox[t]{\@right}{
- \thesis at author\\
- \thesis at english@facultyName,
- \thesis at english@universityName\\
- \thesis at departmentEn@name
- }\\
- \textbf{\thesis at english@bib at thesisTitle:}
- & \thesis at titleEn \\
- \textbf{\thesis at english@bib at programme:}
- & \thesis at programmeEn \\
- \textbf{\thesis at english@bib at field:}
- & \thesis at fieldEn@name \\
- % Unless this is a rigorous thesis, typeset the name of the
- % thesis advisor.
- \ifx\thesis at type\thesis at rigorous\else
- \textbf{\thesis at english@bib at advisor:}
- & \thesis at advisor \\
+ {\let\thesis at blocks@clear\relax
+ \chapter*{\thesis at czech@abstractTitle}%
+ \thesis at extra@abstractCs}%
+ \par\vfil\null
+ \end{alwayssingle}}%
+ \fi}
+\thesis at def@extra[{
+ \ifthesis at czech
+ \thesis at programme
+ \else
+ \thesis at placeholder@extra at programmeCs
+ \fi
+}]{programmeCs}
+\thesis at def@extra[{
+ \ifthesis at czech
+ \thesis at field@name
+ \else
+ \thesis at placeholder@extra at fieldCs
+ \fi
+}]{fieldCs}
+\thesis at def@extra[{
+ \ifthesis at czech
+ \thesis at title
+ \else
+ \thesis at placeholder@extra at titleCs
+ \fi
+}]{titleCs}
+\thesis at def@extra[{
+ \ifthesis at czech
+ \thesis at keywords
+ \else
+ \thesis at placeholder@extra at keywordsCs
+ \fi
+}]{keywordsCs}
+\thesis at def@extra[{
+ \ifthesis at czech
+ \thesis at TeXkeywords
+ \else
+ \thesis at placeholder@extra at keywordsCs
+ \fi
+}]{TeXkeywordsCs}
+\def\thesis at blocks@bibEntryCs{%
+ \ifthesis at czech\else
+ {\thesis at selectLocale{czech}
+ \begin{alwayssingle}
+ % Clear only the right page, if the main locale is English.
+ \ifthesis at english
+ \begingroup
+ \let\thesis at blocks@clear\thesis at blocks@clearRight
+ \fi
+ \chapter*{\thesis at czech@bib at title}%
+ \ifthesis at english
+ \endgroup
+ \fi
+ {% Calculate the width of the columns
+ \let\@A\relax\newlength{\@A}\settowidth{\@A}{{%
+ \bf\thesis at czech@bib at author:}}
+ \let\@B\relax\newlength{\@B}\settowidth{\@B}{{%
+ \bf\thesis at czech@bib at thesisTitle:}}
+ \let\@C\relax\newlength{\@C}\settowidth{\@C}{{%
+ \bf\thesis at czech@bib at programme:}}
+ \let\@D\relax\newlength{\@D}\settowidth{\@D}{{%
+ \bf\thesis at czech@bib at field:}}
+ % Unless this is a rigorous thesis, we will be typesetting
+ % the name of the thesis advisor.
+ \let\@E\relax\newlength{\@E}
+ \ifx\thesis at type\thesis at rigorous
+ \setlength{\@E}{0pt}%
+ \else
+ \settowidth{\@E}{{\bf\thesis at czech@bib at advisor:}}
\fi
- \textbf{\thesis at english@bib at academicYear:}
- & \thesis at academicYear \\
- \textbf{\thesis at english@bib at pages:}
- & \thesis at pages \\
- \textbf{\thesis at english@bib at keywords:}
- & \thesis at TeXkeywordsEn \\
- \end{thesis at newtable@old}}
- \end{alwayssingle}
- }}
+ \let\@F\relax\newlength{\@F}\settowidth{\@F}{{%
+ \bf\thesis at czech@bib at academicYear:}}
+ \let\@G\relax\newlength{\@G}\settowidth{\@G}{{%
+ \bf\thesis at czech@bib at pages:}}
+ \let\@H\relax\newlength{\@H}\settowidth{\@H}{{%
+ \bf\thesis at czech@bib at 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 at newtable@old}%
+ {@{}p{\@left}@{\hskip\@skip}p{\@right}@{}}
+ \textbf{\thesis at czech@bib at author:} &
+ \noindent\parbox[t]{\@right}{
+ \thesis at author\\
+ \thesis at czech@facultyName,
+ \thesis at czech@universityName\\
+ \thesis at extra@departmentCs
+ }\\
+ \textbf{\thesis at czech@bib at thesisTitle:}
+ & \thesis at extra@titleCs \\
+ \textbf{\thesis at czech@bib at programme:}
+ & \thesis at extra@programmeCs \\
+ \textbf{\thesis at czech@bib at field:}
+ & \thesis at extra@fieldCs \\
+ % Unless this is a rigorous thesis, typeset the name of the
+ % thesis advisor.
+ \ifx\thesis at type\thesis at rigorous\else
+ \textbf{\thesis at czech@bib at advisor:}
+ & \thesis at advisor \\
+ \fi
+ \textbf{\thesis at czech@bib at academicYear:}
+ & \thesis at academicYear \\
+ \textbf{\thesis at czech@bib at pages:}
+ & \thesis at pages@preamble{} + \thesis at pages \\
+ \textbf{\thesis at czech@bib at keywords:}
+ & \thesis at extra@TeXkeywordsCs \\
+ \end{thesis at newtable@old}}
+ \end{alwayssingle}
+ }%
+ \fi}
\def\thesis at blocks@frontMatter{%
+ \thesis at blocks@clear
\pagestyle{empty}
\parindent 1.5em
\setcounter{page}{1}
\pagenumbering{roman}}
-\def\thesis at blocks@cover{%
+\thesis at def@extra[{
+ \ifthesis at czech
+ \thesis at department@name
+ \else
+ \thesis at placeholder@extra at departmentCs
+ \fi
+}]{departmentCs}
+\def\thesis at blocks@cover{{%
+ \thesis at selectLocale{czech}
\ifthesis at cover@
\thesis at blocks@clear
\begin{alwayssingle}
- \thispagestyle{empty}
\begin{center}
{\sc\thesis at titlePage@LARGE\thesis at czech@universityName\\%
\thesis at titlePage@Large\thesis at czech@facultyName\\[0.3em]%
- \thesis at titlePage@large\thesis at department@name}
+ \thesis at titlePage@normalsize\thesis at extra@departmentCs}
\vfill
{\bf\thesis at titlePage@Huge\thesis at czech@typeName}
\vfill
@@ -219,11 +390,18 @@
\ \thesis at year\hfill\thesis at author}
\end{center}
\end{alwayssingle}
- \fi}
-\def\thesis at blocks@titlePage{%
+ \fi}}
+\thesis at def@extra[{
+ \ifthesis at czech
+ \thesis at TeXtitle
+ \else
+ \thesis at placeholder@extra at titleCs
+ \fi
+}]{TeXtitleCs}
+\def\thesis at blocks@titlePage{{%
\thesis at blocks@clear
+ \thesis at 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 at titlePage@LARGE\thesis at czech@universityName\\%
\thesis at titlePage@Large\thesis at czech@facultyName\\[0.3em]%
- \thesis at titlePage@normalsize\thesis at department@name}
+ \thesis at titlePage@normalsize\thesis at 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 at titlePage@Huge\thesis at TeXtitle}
+ \bf\thesis at titlePage@Huge\thesis at extra@TeXtitleCs}
{\thesis at titlePage@Huge\\[0.8em]}
{\thesis at titlePage@large\thesis at czech@typeName\\[1em]}
{\bf\thesis at titlePage@LARGE\thesis at author\\}
@@ -255,38 +433,58 @@
\thesis at czech@advisorTitle: \thesis at advisor\hfill
\fi
\thesis at place\ \thesis at year}
- \end{alwayssingle}}
+ \end{alwayssingle}}}
+\def\thesis at blocks@thanks{%
+ \thesis at blocks@clear
+ \ifx\thesis at thanks\undefined\else
+ \begin{alwayssingle}%
+ \chapter*{\thesis@@{thanksTitle}}%
+ \leavevmode\thesis at thanks
+ \end{alwayssingle}%
+ \fi}
\def\thesis at blocks@declaration{%
- \thesis at blocks@clear
\begin{alwayssingle}%
- \chapter*{\thesis@@{declarationTitle}}%
+ \leavevmode\vfill
+ % Start the new chapter without clearing any page.
+ {\let\thesis at blocks@clear\relax
+ \chapter*{\thesis@@{declarationTitle}}}%
\thesis at declaration
\vskip 2cm%
{\let\@A\relax\newlength{\@A}
\settowidth{\@A}{\thesis@@{authorSignature}}
\setlength{\@A}{\@A+1cm}
- \noindent\thesis at place, \thesis at czech@formattedDate\hfill
+ \noindent\thesis at place, \thesis@@{formattedDate}\hfill
\begin{minipage}[t]{\@A}%
\centering\rule{\@A}{1pt}\\
\thesis@@{authorSignature}\par
\end{minipage}}
\end{alwayssingle}}
-\def\thesis at blocks@preamble{{%
- \thesis at selectLocale{czech}%
+\def\thesis at blocks@preamble{
\thesis at blocks@coverMatter
\thesis at blocks@cover
\thesis at blocks@frontMatter
\thesis at blocks@titlePage
\thesis at blocks@clearRight
+ \thesis at blocks@bibEntryCs
\thesis at blocks@bibEntry
\thesis at blocks@bibEntryEn
- \thesis at blocks@abstract
- \thesis at blocks@abstractEn}
+ \thesis at blocks@abstractCs
+ \ifthesis at abstractonsinglepage@
+ \begingroup
+ \let\clearpage\relax
+ \fi
+ \thesis at blocks@abstract
+ \thesis at blocks@abstractEn
+ \ifthesis at abstractonsinglepage@
+ \endgroup
+ \fi
\thesis at blocks@assignment
{\thesis at selectLocale{czech}%
\thesis at blocks@thanks
\thesis at blocks@declaration
- \thesis at blocks@tables}}
+ \thesis at blocks@clear
+ \pagestyle{plain}%
+ \thesis at blocks@tables}}
\def\thesis at blocks@postamble{%
\thesis at blocks@bibliography}
\endinput
More information about the tex-live-commits
mailing list